atma-utils - npm Package Compare versions

Comparing version 0.1.8 to 0.1.9

lib/utils.embed.js

@@ -202,3 +202,7 @@ // source /src/refs.js
 		while ( obj != null && ++i < imax ) {
-			obj = obj[chain[i]];
+			var key = chain[i];
+			if (key.charCodeAt(key.length - 1) === 63 /*?*/) {
+				key = key.slice(0, -1);
+			}
+			obj = obj[key];
 		}
@@ -215,6 +219,10 @@ return obj;
 			key = chain[i];
-			if (obj[key] == null)
-				obj[key] = {};
-
-			obj = obj[key];
+			if (key.charCodeAt(key.length - 1) === 63 /*?*/) {
+				key = key.slice(0, -1);
+			}
+			var x = obj[key];
+			if (x == null) {
+				x = obj[key] = {};
+			}
+			obj = x;
 		}
@@ -593,3 +601,3 @@ obj[chain[i]] = val;
 		if (filename != null) {
-			str += str_format(' at {0}({1}:{2})\n', filename, lineNum, rowNum);
+			str += str_format(' at {0}:{1}:{2}\n', filename, lineNum, rowNum);
 		}
@@ -692,3 +700,7 @@ return str + error_formatCursor(lines, lineNum, rowNum);
 (function(){
-	class_Dfr = function(){};
+	class_Dfr = function(mix){
+		if (typeof mix === 'function') {
+			return class_Dfr.run(mix);
+		}
+	};
 	class_Dfr.prototype = {
@@ -819,5 +831,5 @@ _isAsync: true,
 						var override = fn.apply(this, arguments);
-						if (override != null) {
-							if (isDeferred(override) === true) {
-								override.pipe(dfr);
+						if (override != null && override !== dfr) {
+							if (isDeferred(override)) {
+								override.then(delegate(dfr, 'resolve'), delegate(dfr, 'reject'));
 								return;
@@ -870,2 +882,35 @@ }
 	};
+	class_Dfr.all = function(promises){
+		var dfr = new class_Dfr,
+			arr = new Array(promises.length),
+			wait = promises.length,
+			error = null;
+		if (wait === 0) {
+			return dfr.resolve(arr);
+		}
+		function tick (index) {
+			if (error != null) {
+				return;
+			}
+			var args = _Array_slice.call(arguments, 1);
+			arr.splice.apply(arr, [index, 0].concat(args));
+			if (--wait === 0) {
+				dfr.resolve(arr);
+			}
+		}
+		function onReject (err) {
+			dfr.reject(error = err);
+		}
+		var imax = promises.length,
+			i = -1;
+		while(++i < imax){
+			var x = promises[i];
+			if (x == null || x.then == null) {
+				tick(i, x);
+				continue;
+			}
+			x.then(tick.bind(null, i), onReject);
+		}		
+		return dfr; 
+	};
 
@@ -908,11 +953,6 @@ // PRIVATE
 	function isDeferred(x){
-		if (x == null || typeof x !== 'object')
-			return false;
-
-		if (x instanceof class_Dfr)
-			return true;
-
-		return typeof x.done === 'function'
-			&& typeof x.fail === 'function'
-			;
+		return x != null 
+			&& typeof x === 'object' 
+			&& is_Function(x.then)
+		;
 	}
@@ -919,0 +959,0 @@ }());

lib/utils.js

@@ -219,3 +219,7 @@ (function(factory){
 			while ( obj != null && ++i < imax ) {
-				obj = obj[chain[i]];
+				var key = chain[i];
+				if (key.charCodeAt(key.length - 1) === 63 /*?*/) {
+					key = key.slice(0, -1);
+				}
+				obj = obj[key];
 			}
@@ -232,6 +236,10 @@ return obj;
 				key = chain[i];
-				if (obj[key] == null)
-					obj[key] = {};
-	
-				obj = obj[key];
+				if (key.charCodeAt(key.length - 1) === 63 /*?*/) {
+					key = key.slice(0, -1);
+				}
+				var x = obj[key];
+				if (x == null) {
+					x = obj[key] = {};
+				}
+				obj = x;
 			}
@@ -610,3 +618,3 @@ obj[chain[i]] = val;
 			if (filename != null) {
-				str += str_format(' at {0}({1}:{2})\n', filename, lineNum, rowNum);
+				str += str_format(' at {0}:{1}:{2}\n', filename, lineNum, rowNum);
 			}
@@ -709,3 +717,7 @@ return str + error_formatCursor(lines, lineNum, rowNum);
 	(function(){
-		class_Dfr = function(){};
+		class_Dfr = function(mix){
+			if (typeof mix === 'function') {
+				return class_Dfr.run(mix);
+			}
+		};
 		class_Dfr.prototype = {
@@ -836,5 +848,5 @@ _isAsync: true,
 							var override = fn.apply(this, arguments);
-							if (override != null) {
-								if (isDeferred(override) === true) {
-									override.pipe(dfr);
+							if (override != null && override !== dfr) {
+								if (isDeferred(override)) {
+									override.then(delegate(dfr, 'resolve'), delegate(dfr, 'reject'));
 									return;
@@ -887,2 +899,35 @@ }
 		};
+		class_Dfr.all = function(promises){
+			var dfr = new class_Dfr,
+				arr = new Array(promises.length),
+				wait = promises.length,
+				error = null;
+			if (wait === 0) {
+				return dfr.resolve(arr);
+			}
+			function tick (index) {
+				if (error != null) {
+					return;
+				}
+				var args = _Array_slice.call(arguments, 1);
+				arr.splice.apply(arr, [index, 0].concat(args));
+				if (--wait === 0) {
+					dfr.resolve(arr);
+				}
+			}
+			function onReject (err) {
+				dfr.reject(error = err);
+			}
+			var imax = promises.length,
+				i = -1;
+			while(++i < imax){
+				var x = promises[i];
+				if (x == null || x.then == null) {
+					tick(i, x);
+					continue;
+				}
+				x.then(tick.bind(null, i), onReject);
+			}		
+			return dfr; 
+		};
 	
@@ -925,11 +970,6 @@ // PRIVATE
 		function isDeferred(x){
-			if (x == null || typeof x !== 'object')
-				return false;
-	
-			if (x instanceof class_Dfr)
-				return true;
-	
-			return typeof x.done === 'function'
-				&& typeof x.fail === 'function'
-				;
+			return x != null 
+				&& typeof x === 'object' 
+				&& is_Function(x.then)
+			;
 		}
@@ -936,0 +976,0 @@ }());

package.json

 {
     "name": "atma-utils",
     "description": "Helpers",
-    "version": "0.1.8",
+    "version": "0.1.9",
     "author": "Alexander Kit <[e-mail]>",
@@ -17,2 +17,3 @@ "repository": {
     "main": "lib/utils.js",
+    "types": "./types/module.d.ts",
     "devDependencies": {
@@ -19,0 +20,0 @@ "atma": ">0.9.26",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

67732

increased by11.03%

Number of package files

15

increased by275%

Lines of code

2509

increased by8.01%

No dependency changes