bluebird - npm Package Compare versions

Comparing version 0.7.1-5 to 0.7.2-0

js/bluebird.js

@@ -219,2 +219,3 @@ /* jshint -W014, -W116, -W106 */
     }
+    current.push( "From previous event:" );
     var lines = current.concat( prev );
@@ -226,4 +227,6 @@
     for( var i = 0, len = lines.length; i < len; ++i ) {
-        if( rignore.test( lines[i] ) ||
-            ( i > 0 && !rtraceline.test( lines[i] ) )
+
+        if( ( rignore.test( lines[i] ) ||
+            ( i > 0 && !rtraceline.test( lines[i] ) ) &&
+            lines[i] !== "From previous event:" )
         ) {
@@ -846,3 +849,3 @@ continue;
     var ret = new Promise();
-    ret._setTrace();
+    ret._setTrace( this.uncancellable );
     ret._unsetCancellable();
@@ -1086,3 +1089,3 @@ ret._assumeStateOf( this, true );
     var ret = new Promise();
-    ret._setTrace();
+    ret._setTrace( Promise.fulfilled );
     if( ret._tryAssumeStateOf( value, false ) ) {
@@ -1099,3 +1102,3 @@ return ret;
     var ret = new Promise();
-    ret._setTrace();
+    ret._setTrace( Promise.rejected );
     ret._cleanValues();
@@ -1149,3 +1152,5 @@ ret._setRejected();
     if( longStackTraces && !haveInternalData ) {
-        ret._traceParent = this;
+        ret._traceParent = this._peekContext() === this._traceParent
+            ? this._traceParent
+            : this;
         ret._setTrace( typeof caller === "function" ? caller : this._then );
@@ -1250,2 +1255,19 @@ }
 
+method._unsetAt = function Promise$_unsetAt( index ) {
+    if( index === 0 ) {
+        this._fulfill0 =
+        this._reject0 =
+        this._progress0 =
+        this._promise0 =
+        this._receiver0 = void 0;
+    }
+    else {
+        this[ index - 5 + 0 ] =
+        this[ index - 5 + 1 ] =
+        this[ index - 5 + 2 ] =
+        this[ index - 5 + 3 ] =
+        this[ index - 5 + 4 ] = void 0;
+    }
+};
+
 var fulfiller = new Function("p",
@@ -1333,3 +1355,3 @@ "'use strict';return function Promise$_fulfiller(a){ p.fulfill( a ); }" );
     }
-
+    this._unsetAt( index );
     var obj = this._resolvedValue;
@@ -1695,2 +1717,3 @@ var ret = obj;
         var receiver = this._receiverAt( i );
+        this._unsetAt( i );
         if( fn !== void 0 ) {
@@ -1720,2 +1743,4 @@ this._resolvePromise(
         var promise = this._promiseAt( i );
+        var receiver = this._receiverAt( i );
+        this._unsetAt( i );
         if( fn !== void 0 ) {
@@ -1725,3 +1750,3 @@ rejectionWasHandled = true;
                 fn,
-                this._receiverAt( i ),
+                receiver,
                 reason,
@@ -1728,0 +1753,0 @@ promise

package.json

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

README.md

@@ -132,11 +132,8 @@ #Introduction
         at evenMoreInner (<anonymous>:7:13)
+    From previous event:
         at inner (<anonymous>:6:36)
-        at Function.Promise$Fulfilled (<anonymous>:1073:9)
-        at inner (<anonymous>:6:24)
+    From previous event:
         at outer (<anonymous>:5:32)
-        at Function.Promise$Fulfilled (<anonymous>:1073:9)
-        at outer (<anonymous>:5:20)
+    From previous event:
         at <anonymous>:4:21
-        at Function.Promise$Fulfilled (<anonymous>:1073:9)
-        at <anonymous>:4:9
         at Object.InjectedScript._evaluateOn (<anonymous>:572:39)
@@ -143,0 +140,0 @@ at Object.InjectedScript._evaluateAndWrap (<anonymous>:531:52)

src/captured_trace.js

@@ -42,2 +42,3 @@ var CapturedTrace = (function() {
 
+CONSTANT(FROM_PREVIOUS_EVENT, "From previous event:");
 CapturedTrace.combine = function CapturedTrace$Combine( current, prev ) {
@@ -56,2 +57,3 @@ var curLast = current.length - 1;
     }
+    current.push( FROM_PREVIOUS_EVENT );
     var lines = current.concat( prev );
@@ -65,4 +67,6 @@
     for( var i = 0, len = lines.length; i < len; ++i ) {
-        if( rignore.test( lines[i] ) ||
-            ( i > 0 && !rtraceline.test( lines[i] ) )
+
+        if( ( rignore.test( lines[i] ) ||
+            ( i > 0 && !rtraceline.test( lines[i] ) ) &&
+            lines[i] !== FROM_PREVIOUS_EVENT )
         ) {
@@ -69,0 +73,0 @@ continue;

src/promise.js

@@ -264,3 +264,3 @@ var Promise = (function() {
     var ret = new Promise();
-    ret._setTrace();
+    ret._setTrace( this.uncancellable );
     ret._unsetCancellable();
@@ -713,3 +713,3 @@ ret._assumeStateOf( this, true );
     var ret = new Promise();
-    ret._setTrace();
+    ret._setTrace( Promise.fulfilled );
     if( ret._tryAssumeStateOf( value, false ) ) {
@@ -736,3 +736,3 @@ return ret;
     var ret = new Promise();
-    ret._setTrace();
+    ret._setTrace( Promise.rejected );
     ret._cleanValues();
@@ -859,3 +859,5 @@ ret._setRejected();
     if( longStackTraces && !haveInternalData ) {
-        ret._traceParent = this;
+        ret._traceParent = this._peekContext() === this._traceParent
+            ? this._traceParent
+            : this;
         ret._setTrace( typeof caller === "function" ? caller : this._then );
@@ -983,2 +985,23 @@ }
 
+method._unsetAt = function Promise$_unsetAt( index ) {
+    ASSERT( typeof index === "number" );
+    ASSERT( index >= 0 );
+    ASSERT( index < this._length() );
+    ASSERT( index % CALLBACK_SIZE === 0 );
+    if( index === 0 ) {
+        this._fulfill0 =
+        this._reject0 =
+        this._progress0 =
+        this._promise0 =
+        this._receiver0 = void 0;
+    }
+    else {
+        this[ index - CALLBACK_SIZE + CALLBACK_FULFILL_OFFSET ] =
+        this[ index - CALLBACK_SIZE + CALLBACK_REJECT_OFFSET ] =
+        this[ index - CALLBACK_SIZE + CALLBACK_PROGRESS_OFFSET ] =
+        this[ index - CALLBACK_SIZE + CALLBACK_PROMISE_OFFSET ] =
+        this[ index - CALLBACK_SIZE + CALLBACK_RECEIVER_OFFSET ] = void 0;
+    }
+};
+
 var fulfiller = new Function("p",
@@ -1073,3 +1096,3 @@ "'use strict';return function Promise$_fulfiller(a){ p.fulfill( a ); }" );
     }
-
+    this._unsetAt( index );
     var obj = this._resolvedValue;
@@ -1468,2 +1491,3 @@ var ret = obj;
         var receiver = this._receiverAt( i );
+        this._unsetAt( i );
         if( fn !== void 0 ) {
@@ -1494,2 +1518,4 @@ this._resolvePromise(
         var promise = this._promiseAt( i );
+        var receiver = this._receiverAt( i );
+        this._unsetAt( i );
         if( fn !== void 0 ) {
@@ -1499,3 +1525,3 @@ rejectionWasHandled = true;
                 fn,
-                this._receiverAt( i ),
+                receiver,
                 reason,
@@ -1502,0 +1528,0 @@ promise

No alert changes

Improved metrics

Total package byte prevSize

213111

increased by0.81%

Lines of code

5290

increased by1.01%

Worsened metrics

Number of lines in readme file

263

decreased by-1.13%

No dependency changes