bluebird - npm Package Compare versions

Comparing version 0.10.8-0 to 0.10.9-0

js/main/any.js

@@ -26,2 +26,3 @@ /**
     var SomePromiseArray = require( "./some_promise_array.js" )(PromiseArray);
+    var ASSERT = require( "./assert.js" );
 
@@ -35,5 +36,9 @@ function Promise$_Any( promises, useBound, caller ) {
         );
+        var promise = ret.promise();
+        if (promise.isRejected()) {
+            return promise;
+        }
         ret.setHowMany( 1 );
         ret.setUnwrap();
-        return ret.promise();
+        return promise;
     }
@@ -40,0 +45,0 @@

js/main/captured_trace.js

@@ -29,5 +29,7 @@ /**
 var rignore = new RegExp(
-    "\\b(?:Promise(?:Array|Spawn)?\\$_\\w+|tryCatch(?:1|2|Apply)|setTimeout" +
-    "|CatchFilter\\$_\\w+|makeNodePromisified|processImmediate|process._tic" +
-    "kCallback|nextTick|Async\\$\\w+)\\b"
+    "\\b(?:[\\w.]*Promise(?:Array|Spawn)?\\$\\w+|" +
+    "tryCatch(?:1|2|Apply)|new \\w*PromiseArray|" +
+    "\\w*PromiseArray\\.\\w*PromiseArray|" +
+    "setTimeout|CatchFilter\\$_\\w+|makeNodePromisified|processImmediate|" +
+    "process._tickCallback|nextTick|Async\\$\\w+)\\b"
 );
@@ -161,14 +163,4 @@
         return function CapturedTrace$_captureStackTrace(
-            receiver, ignoreUntil, isTopLevel ) {
-            var prev = -1;
-            if( !isTopLevel ) {
-                prev = Error.stackTraceLimit;
-                Error.stackTraceLimit =
-                    Math.max(1, Math.min(10000, prev) / 3 | 0);
-            }
+            receiver, ignoreUntil) {
             captureStackTrace( receiver, ignoreUntil );
-
-            if( !isTopLevel ) {
-                Error.stackTraceLimit = prev;
-            }
         };
@@ -175,0 +167,0 @@ }

js/main/promise_array.js

@@ -42,6 +42,10 @@ /**
 function PromiseArray( values, caller, boundTo ) {
+    var d = this._resolver = Promise.defer( caller );
+    if (Promise.hasLongStackTraces() &&
+        Promise.is(values)) {
+        d.promise._traceParent = values;
+    }
     this._values = values;
-    this._resolver = Promise.pending( caller );
     if( boundTo !== void 0 ) {
-        this._resolver.promise._setBoundTo( boundTo );
+        d.promise._setBoundTo( boundTo );
     }
@@ -69,3 +73,4 @@ this._length = 0;
             if( !isArray( values ) ) {
-                this._fulfill( toResolutionValue( fulfillValueIfEmpty ) );
+                var err = new Promise.TypeError("expecting an array, a promise or a thenable");
+                this.__hardReject__(err);
                 return;
@@ -191,2 +196,4 @@ }
 
+
+PromiseArray.prototype.__hardReject__ =
 PromiseArray.prototype._reject = function PromiseArray$_reject( reason ) {
@@ -193,0 +200,0 @@ ensureNotHandled( reason );

js/main/promise.js

@@ -953,4 +953,4 @@ /**
 
+function Promise$_All( promises, PromiseArray, caller, boundTo ) {
 
-function Promise$_All( promises, PromiseArray, caller, boundTo ) {
     var list = null;
@@ -978,7 +978,5 @@ if (isArray(promises)) {
     }
-    return new PromiseArray(
-        [ apiRejection( "expecting an array, a promise or a thenable" ) ],
-        caller,
-        boundTo
-    );
+    return {
+        promise: function() {return apiRejection("expecting an array, a promise or a thenable");}
+    };
 }
@@ -985,0 +983,0 @@

js/main/props.js

@@ -27,11 +27,14 @@ /**
     var util = require( "./util.js" );
-    var isPrimitive = util.isPrimitive;
+    var apiRejection = require("./errors_api_rejection")(Promise);
+    var isObject = util.isObject;
 
     function Promise$_Props( promises, useBound, caller ) {
         var ret;
-        if( isPrimitive( promises ) ) {
-            ret = Promise.fulfilled( promises, caller );
+        var castValue = Promise._cast(promises, caller, void 0);
+
+        if (!isObject(castValue)) {
+            return apiRejection(".props cannot be used on a primitive value");
         }
-        else if( Promise.is( promises ) ) {
-            ret = promises._then( Promise.props, void 0, void 0,
+        else if( Promise.is( castValue ) ) {
+            ret = castValue._then( Promise.props, void 0, void 0,
                             void 0, void 0, caller );
@@ -41,5 +44,5 @@ }
             ret = new PropertiesPromiseArray(
-                promises,
+                castValue,
                 caller,
-                useBound === true ? promises._boundTo : void 0
+                useBound === true ? castValue._boundTo : void 0
             ).promise();
@@ -49,3 +52,3 @@ useBound = false;
         if( useBound === true ) {
-            ret._boundTo = promises._boundTo;
+            ret._boundTo = castValue._boundTo;
         }
@@ -62,2 +65,2 @@ return ret;
     };
-};
+};

js/main/some.js

@@ -38,4 +38,8 @@ /**
         );
+        var promise = ret.promise();
+        if (promise.isRejected()) {
+            return promise;
+        }
         ret.setHowMany( howMany );
-        return ret.promise();
+        return promise;
     }
@@ -51,2 +55,2 @@
 
-};
+};

js/zalgo/any.js

@@ -26,2 +26,3 @@ /**
     var SomePromiseArray = require( "./some_promise_array.js" )(PromiseArray);
+    var ASSERT = require( "./assert.js" );
 
@@ -35,5 +36,9 @@ function Promise$_Any( promises, useBound, caller ) {
         );
+        var promise = ret.promise();
+        if (promise.isRejected()) {
+            return promise;
+        }
         ret.setHowMany( 1 );
         ret.setUnwrap();
-        return ret.promise();
+        return promise;
     }
@@ -40,0 +45,0 @@

js/zalgo/captured_trace.js

@@ -29,5 +29,7 @@ /**
 var rignore = new RegExp(
-    "\\b(?:Promise(?:Array|Spawn)?\\$_\\w+|tryCatch(?:1|2|Apply)|setTimeout" +
-    "|CatchFilter\\$_\\w+|makeNodePromisified|processImmediate|process._tic" +
-    "kCallback|nextTick|Async\\$\\w+)\\b"
+    "\\b(?:[\\w.]*Promise(?:Array|Spawn)?\\$\\w+|" +
+    "tryCatch(?:1|2|Apply)|new \\w*PromiseArray|" +
+    "\\w*PromiseArray\\.\\w*PromiseArray|" +
+    "setTimeout|CatchFilter\\$_\\w+|makeNodePromisified|processImmediate|" +
+    "process._tickCallback|nextTick|Async\\$\\w+)\\b"
 );
@@ -161,14 +163,4 @@
         return function CapturedTrace$_captureStackTrace(
-            receiver, ignoreUntil, isTopLevel ) {
-            var prev = -1;
-            if( !isTopLevel ) {
-                prev = Error.stackTraceLimit;
-                Error.stackTraceLimit =
-                    Math.max(1, Math.min(10000, prev) / 3 | 0);
-            }
+            receiver, ignoreUntil) {
             captureStackTrace( receiver, ignoreUntil );
-
-            if( !isTopLevel ) {
-                Error.stackTraceLimit = prev;
-            }
         };
@@ -175,0 +167,0 @@ }

js/zalgo/promise_array.js

@@ -42,6 +42,10 @@ /**
 function PromiseArray( values, caller, boundTo ) {
+    var d = this._resolver = Promise.defer( caller );
+    if (Promise.hasLongStackTraces() &&
+        Promise.is(values)) {
+        d.promise._traceParent = values;
+    }
     this._values = values;
-    this._resolver = Promise.pending( caller );
     if( boundTo !== void 0 ) {
-        this._resolver.promise._setBoundTo( boundTo );
+        d.promise._setBoundTo( boundTo );
     }
@@ -69,3 +73,4 @@ this._length = 0;
             if( !isArray( values ) ) {
-                this._fulfill( toResolutionValue( fulfillValueIfEmpty ) );
+                var err = new Promise.TypeError("expecting an array, a promise or a thenable");
+                this.__hardReject__(err);
                 return;
@@ -191,2 +196,4 @@ }
 
+
+PromiseArray.prototype.__hardReject__ =
 PromiseArray.prototype._reject = function PromiseArray$_reject( reason ) {
@@ -193,0 +200,0 @@ ensureNotHandled( reason );

js/zalgo/promise.js

@@ -949,4 +949,4 @@ /**
 
+function Promise$_All( promises, PromiseArray, caller, boundTo ) {
 
-function Promise$_All( promises, PromiseArray, caller, boundTo ) {
     var list = null;
@@ -974,7 +974,5 @@ if (isArray(promises)) {
     }
-    return new PromiseArray(
-        [ apiRejection( "expecting an array, a promise or a thenable" ) ],
-        caller,
-        boundTo
-    );
+    return {
+        promise: function() {return apiRejection("expecting an array, a promise or a thenable");}
+    };
 }
@@ -981,0 +979,0 @@

js/zalgo/props.js

@@ -27,11 +27,14 @@ /**
     var util = require( "./util.js" );
-    var isPrimitive = util.isPrimitive;
+    var apiRejection = require("./errors_api_rejection")(Promise);
+    var isObject = util.isObject;
 
     function Promise$_Props( promises, useBound, caller ) {
         var ret;
-        if( isPrimitive( promises ) ) {
-            ret = Promise.fulfilled( promises, caller );
+        var castValue = Promise._cast(promises, caller, void 0);
+
+        if (!isObject(castValue)) {
+            return apiRejection(".props cannot be used on a primitive value");
         }
-        else if( Promise.is( promises ) ) {
-            ret = promises._then( Promise.props, void 0, void 0,
+        else if( Promise.is( castValue ) ) {
+            ret = castValue._then( Promise.props, void 0, void 0,
                             void 0, void 0, caller );
@@ -41,5 +44,5 @@ }
             ret = new PropertiesPromiseArray(
-                promises,
+                castValue,
                 caller,
-                useBound === true ? promises._boundTo : void 0
+                useBound === true ? castValue._boundTo : void 0
             ).promise();
@@ -49,3 +52,3 @@ useBound = false;
         if( useBound === true ) {
-            ret._boundTo = promises._boundTo;
+            ret._boundTo = castValue._boundTo;
         }
@@ -62,2 +65,2 @@ return ret;
     };
-};
+};

js/zalgo/some.js

@@ -38,4 +38,8 @@ /**
         );
+        var promise = ret.promise();
+        if (promise.isRejected()) {
+            return promise;
+        }
         ret.setHowMany( howMany );
-        return ret.promise();
+        return promise;
     }
@@ -51,2 +55,2 @@
 
-};
+};

package.json

 {
   "name": "bluebird",
   "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-  "version": "0.10.8-0",
+  "version": "0.10.9-0",
   "keywords": [
@@ -6,0 +6,0 @@ "promise",

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

455321

increased by0.15%

Lines of code

9423

increased by0.21%

No dependency changes