bluebird - npm Package Compare versions

Comparing version 0.9.4-1 to 0.9.5-0

Gruntfile.js

@@ -11,2 +11,22 @@ "use strict";
 
+    var optionalModuleDependencyMap = {
+        "any.js": ['Promise', 'Promise$_All', 'PromiseArray'],
+        "call_get.js": ['Promise'],
+        "filter.js": ['Promise', 'Promise$_All', 'PromiseArray', 'apiRejection'],
+        "generators.js": ['Promise', 'apiRejection'],
+        "map.js": ['Promise', 'Promise$_All', 'PromiseArray', 'apiRejection'],
+        "nodeify.js": ['Promise'],
+        "promisify.js": ['Promise'],
+        "props.js": ['Promise', 'PromiseArray'],
+        "reduce.js": ['Promise', 'Promise$_All', 'PromiseArray', 'apiRejection'],
+        "settle.js": ['Promise', 'Promise$_All', 'PromiseArray'],
+        "some.js": ['Promise', 'Promise$_All', 'PromiseArray', 'apiRejection'],
+        "progress.js": ['Promise'],
+        "cancel.js": ['Promise'],
+        "simple_thenables.js": ['Promise'],
+        "complex_thenables.js": ['Promise'],
+        "synchronous_inspection.js": ['Promise']
+
+    };
+
     var optionalModuleRequireMap = {
@@ -33,8 +53,8 @@ "any.js": true,
     function getOptionalRequireCode( srcs ) {
-        return srcs.reduce(function(ret, cur){
+        return srcs.reduce(function(ret, cur, i){
             if( optionalModuleRequireMap[cur] ) {
-                ret += "require('./"+cur+"')(Promise, Promise$_All);\n";
+                ret += "require('./"+cur+"')("+ optionalModuleDependencyMap[cur] +");\n";
             }
             return ret;
-        }, "") + "\nPromise.prototype = Promise.prototype;\n";
+        }, "") + "\nPromise.prototype = Promise.prototype;\nreturn Promise;\n";
     }
@@ -67,3 +87,3 @@
     function applyOptionalRequires( src, optionalRequireCode ) {
-        return src + optionalRequireCode;
+        return src + src.replace( /};([^}]*)$/, optionalRequireCode + "\n};$1");
     }
@@ -405,3 +425,2 @@
         "./src/global.js",
-        "./src/get_promise.js",
         "./src/util.js",
@@ -411,2 +430,3 @@ "./src/schedule.js",
         "./src/errors.js",
+        "./src/errors_api_rejection.js",
         "./src/captured_trace.js",
@@ -413,0 +433,0 @@ "./src/async.js",

js/main/any_promise_array.js

@@ -23,4 +23,4 @@ /**
 "use strict";
+module.exports = function( PromiseArray ) {
 var ASSERT = require("./assert.js");
-var PromiseArray = require( "./promise_array.js" );
 var util = require("./util.js");
@@ -55,2 +55,3 @@ var inherits = util.inherits;
 
-module.exports = AnyPromiseArray;
+return AnyPromiseArray;
+};

js/main/any.js

@@ -23,5 +23,6 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
-    var AnyPromiseArray = require( "./any_promise_array.js" );
+module.exports = function( Promise, Promise$_All, PromiseArray ) {
 
+    var AnyPromiseArray = require( "./any_promise_array.js" )(PromiseArray);
+
     function Promise$_Any( promises, useBound, caller ) {
@@ -28,0 +29,0 @@ return Promise$_All(

js/main/bluebird.js

@@ -23,3 +23,3 @@ /**
 "use strict";
-var Promise = require("./promise.js");
-module.exports = Promise;
+var Promise = require("./promise.js")();
+module.exports = Promise;

js/main/captured_trace.js

@@ -23,2 +23,3 @@ /**
 "use strict";
+module.exports = function() {
 var ASSERT = require("./assert.js");
@@ -202,2 +203,3 @@ var inherits = require( "./util.js").inherits;
 
-module.exports = CapturedTrace;
+return CapturedTrace;
+};

js/main/catch_filter.js

@@ -52,2 +52,2 @@ /**
 
-module.exports = CatchFilter;
+module.exports = CatchFilter;

js/main/complex_thenables.js

@@ -319,5 +319,3 @@ /**
 
-
     Promise._cast = Promise$_Cast;
-};
-
+};

js/main/errors.js

@@ -23,3 +23,2 @@ /**
 "use strict";
-var getPromise = require( "./get_promise.js" );
 var global = require("./global.js");
@@ -30,3 +29,2 @@ var util = require( "./util.js");
 var notEnumerableProp = util.notEnumerableProp;
-var Promise = getPromise.get();
 
@@ -61,12 +59,2 @@ function isStackAttached( val ) {
 
-function apiRejection( msg ) {
-    var error = new TypeError( msg );
-    var ret = Promise.rejected( error );
-    var parent = ret._peekContext();
-    if( parent != null ) {
-        parent._attachExtraTrace( error );
-    }
-    return ret;
-}
-
 function attachDefaultState( obj ) {
@@ -127,5 +115,3 @@ try {
     isHandled: isHandled,
-    canAttach: canAttach,
-    apiRejection: apiRejection
-};
-
+    canAttach: canAttach
+};

js/main/filter.js

@@ -23,7 +23,4 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
 
-    var errors = require( "./errors.js");
-    var apiRejection = errors.apiRejection;
-    var PromiseArray = require( "./promise_array.js" );
     var ASSERT = require( "./assert.js" );
@@ -30,0 +27,0 @@

js/main/generators.js

@@ -23,7 +23,6 @@ /**
 "use strict";
-module.exports = function( Promise ) {
-    var PromiseSpawn = require( "./promise_spawn.js" );
+module.exports = function( Promise, apiRejection ) {
+    var PromiseSpawn = require( "./promise_spawn.js" )(Promise);
     var errors = require( "./errors.js");
     var TypeError = errors.TypeError;
-    var apiRejection = errors.apiRejection;
 
@@ -30,0 +29,0 @@ Promise.coroutine = function Promise$Coroutine( generatorFunction ) {

js/main/map.js

@@ -23,7 +23,4 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
 
-    var errors = require( "./errors.js" );
-    var PromiseArray = require( "./promise_array.js" );
-    var apiRejection = errors.apiRejection;
     var ASSERT = require( "./assert.js" );
@@ -30,0 +27,0 @@

js/main/nodeify.js

@@ -24,3 +24,2 @@ /**
 module.exports = function( Promise ) {
-
     var util = require( "./util.js" );
@@ -65,2 +64,2 @@ var async = require( "./async.js" );
     };
-};
+};

js/main/progress.js

@@ -84,2 +84,2 @@ /**
     };
-};
+};

js/main/promise_array.js

@@ -23,4 +23,4 @@ /**
 "use strict";
+module.exports = function( Promise ) {
 var ASSERT = require("./assert.js");
-var Promise = require("./get_promise").get();
 var ensureNotHandled = require( "./errors.js").ensureNotHandled;
@@ -215,2 +215,3 @@ var util = require("./util.js");
 
-module.exports = PromiseArray;
+return PromiseArray;
+};

js/main/promise_spawn.js

@@ -23,3 +23,3 @@ /**
 "use strict";
-var Promise = require("./get_promise.js").get();
+module.exports = function( Promise ) {
 var errors = require( "./errors.js" );
@@ -95,2 +95,3 @@ var TypeError = errors.TypeError;
 
-module.exports = PromiseSpawn;
+return PromiseSpawn;
+};

js/main/promise.js

@@ -23,12 +23,12 @@ /**
 "use strict";
+module.exports = function() {
 var global = require("./global.js");
 var ASSERT = require("./assert.js");
-var getPromise = require("./get_promise.js");
-getPromise.set( Promise );
+
 var util = require( "./util.js" );
 var async = require( "./async.js" );
 var errors = require( "./errors.js" );
-var PromiseArray = require( "./promise_array.js" );
+var PromiseArray = require( "./promise_array.js" )(Promise);
 
-var CapturedTrace = require( "./captured_trace.js");
+var CapturedTrace = require( "./captured_trace.js")();
 var CatchFilter = require( "./catch_filter.js");
@@ -55,3 +55,3 @@ var PromiseResolver = require( "./promise_resolver.js" );
 var canAttach = errors.canAttach;
-var apiRejection = errors.apiRejection;
+var apiRejection = require("./errors_api_rejection")(Promise);
 
@@ -946,20 +946,964 @@ var APPLY = {};
 Promise.TypeError = TypeError;
+};/**
+ * Copyright (c) 2013 Petka Antonov
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:</p>
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+"use strict";
+module.exports = function() {
+var global = require("./global.js");
+var ASSERT = require("./assert.js");
 
-module.exports = Promise;
-require('./synchronous_inspection.js')(Promise, Promise$_All);
-require('./any.js')(Promise, Promise$_All);
-require('./call_get.js')(Promise, Promise$_All);
-require('./filter.js')(Promise, Promise$_All);
-require('./generators.js')(Promise, Promise$_All);
-require('./map.js')(Promise, Promise$_All);
-require('./nodeify.js')(Promise, Promise$_All);
-require('./promisify.js')(Promise, Promise$_All);
-require('./props.js')(Promise, Promise$_All);
-require('./reduce.js')(Promise, Promise$_All);
-require('./settle.js')(Promise, Promise$_All);
-require('./some.js')(Promise, Promise$_All);
-require('./progress.js')(Promise, Promise$_All);
-require('./cancel.js')(Promise, Promise$_All);
-require('./complex_thenables.js')(Promise, Promise$_All);
+var util = require( "./util.js" );
+var async = require( "./async.js" );
+var errors = require( "./errors.js" );
+var PromiseArray = require( "./promise_array.js" )(Promise);
 
+var CapturedTrace = require( "./captured_trace.js")();
+var CatchFilter = require( "./catch_filter.js");
+var PromiseResolver = require( "./promise_resolver.js" );
+
+var isArray = util.isArray;
+var notEnumerableProp = util.notEnumerableProp;
+var isObject = util.isObject;
+var ensurePropertyExpansion = util.ensurePropertyExpansion;
+var errorObj = util.errorObj;
+var tryCatch1 = util.tryCatch1;
+var tryCatch2 = util.tryCatch2;
+var tryCatchApply = util.tryCatchApply;
+
+var TypeError = errors.TypeError;
+var CancellationError = errors.CancellationError;
+var TimeoutError = errors.TimeoutError;
+var ensureNotHandled = errors.ensureNotHandled;
+var withHandledMarked = errors.withHandledMarked;
+var withStackAttached = errors.withStackAttached;
+var isStackAttached = errors.isStackAttached;
+var isHandled = errors.isHandled;
+var canAttach = errors.canAttach;
+var apiRejection = require("./errors_api_rejection")(Promise);
+
+var APPLY = {};
+
+
+function isPromise( obj ) {
+    if( typeof obj !== "object" ) return false;
+    return obj instanceof Promise;
+}
+
+function Promise( resolver ) {
+    this._bitField = 67108864;
+    this._fulfill0 = void 0;
+    this._reject0 = void 0;
+    this._progress0 = void 0;
+    this._promise0 = void 0;
+    this._receiver0 = void 0;
+    this._resolvedValue = void 0;
+    this._cancellationParent = void 0;
+    this._boundTo = void 0;
+    if( longStackTraces ) this._traceParent = this._peekContext();
+    if( typeof resolver === "function" ) this._resolveResolver( resolver );
+
+}
+
+Promise.prototype.bind = function Promise$bind( obj ) {
+    var ret = new Promise();
+    ret._setTrace( this.bind, this );
+    ret._assumeStateOf( this, true );
+    ret._setBoundTo( obj );
+    return ret;
+};
+
+Promise.prototype.toString = function Promise$toString() {
+    return "[object Promise]";
+};
+
+Promise.prototype.caught = Promise.prototype["catch"] =
+function Promise$catch( fn ) {
+    var len = arguments.length;
+    if( len > 1 ) {
+        var catchInstances = new Array( len - 1 ),
+            j = 0, i;
+        for( i = 0; i < len - 1; ++i ) {
+            var item = arguments[i];
+            if( typeof item === "function" &&
+                ( item.prototype instanceof Error ||
+                item === Error ) ) {
+                catchInstances[j++] = item;
+            }
+            else {
+                var catchFilterTypeError =
+                    new TypeError(
+                        "A catch filter must be an error constructor");
+
+                this._attachExtraTrace( catchFilterTypeError );
+                async.invoke( this._reject, this, catchFilterTypeError );
+                return;
+            }
+        }
+        catchInstances.length = j;
+        fn = arguments[i];
+        var catchFilter = new CatchFilter( catchInstances, fn, this._boundTo );
+        return this._then( void 0, catchFilter.doFilter, void 0,
+            catchFilter, void 0, this.caught );
+    }
+    return this._then( void 0, fn, void 0, void 0, void 0, this.caught );
+};
+
+function thrower( r ) {
+    throw r;
+}
+function slowFinally( ret, reasonOrValue ) {
+    if( this.isFulfilled() ) {
+        return ret._then(function() {
+            return reasonOrValue;
+        }, thrower, void 0, this, void 0, slowFinally );
+    }
+    else {
+        return ret._then(function() {
+            ensureNotHandled( reasonOrValue );
+            throw reasonOrValue;
+        }, thrower, void 0, this, void 0, slowFinally );
+    }
+}
+Promise.prototype.lastly = Promise.prototype["finally"] =
+function Promise$finally( fn ) {
+    var r = function( reasonOrValue ) {
+        var ret = this._isBound() ? fn.call( this._boundTo ) : fn();
+        if( isPromise( ret ) ) {
+            return slowFinally.call( this, ret, reasonOrValue );
+        }
+
+        if( this.isRejected() ) {
+            ensureNotHandled( reasonOrValue );
+            throw reasonOrValue;
+        }
+        return reasonOrValue;
+    };
+    return this._then( r, r, void 0, this, void 0, this.lastly );
+};
+
+Promise.prototype.then =
+function Promise$then( didFulfill, didReject, didProgress ) {
+    return this._then( didFulfill, didReject, didProgress,
+        void 0, void 0, this.then );
+};
+
+Promise.prototype.done =
+function Promise$done( didFulfill, didReject, didProgress ) {
+    var promise = this._then( didFulfill, didReject, didProgress,
+        void 0, void 0, this.done );
+    promise._setIsFinal();
+};
+
+Promise.prototype.spread = function Promise$spread( didFulfill, didReject ) {
+    return this._then( didFulfill, didReject, void 0,
+        APPLY, void 0, this.spread );
+};
+Promise.prototype.isFulfilled = function Promise$isFulfilled() {
+    return ( this._bitField & 268435456 ) > 0;
+};
+
+Promise.prototype.isRejected = function Promise$isRejected() {
+    return ( this._bitField & 134217728 ) > 0;
+};
+
+Promise.prototype.isPending = function Promise$isPending() {
+    return !this.isResolved();
+};
+
+Promise.prototype.isResolved = function Promise$isResolved() {
+    return ( this._bitField & 402653184 ) > 0;
+};
+
+Promise.prototype.isCancellable = function Promise$isCancellable() {
+    return !this.isResolved() &&
+        this._cancellable();
+};
+
+Promise.prototype.toJSON = function Promise$toJSON() {
+    var ret = {
+        isFulfilled: false,
+        isRejected: false,
+        fulfillmentValue: void 0,
+        rejectionReason: void 0
+    };
+    if( this.isFulfilled() ) {
+        ret.fulfillmentValue = this._resolvedValue;
+        ret.isFulfilled = true;
+    }
+    else if( this.isRejected() ) {
+        ret.rejectionReason = this._resolvedValue;
+        ret.isRejected = true;
+    }
+    return ret;
+};
+
+Promise.prototype.all = function Promise$all() {
+    return Promise$_all( this, true, this.all );
+};
+
+Promise.is = isPromise;
+
+function Promise$_all( promises, useBound, caller ) {
+    return Promise$_All(
+        promises,
+        PromiseArray,
+        caller,
+        useBound === true ? promises._boundTo : void 0
+    ).promise();
+}
+Promise.all = function Promise$All( promises ) {
+    return Promise$_all( promises, false, Promise.all );
+};
+
+Promise.join = function Promise$Join() {
+    var ret = new Array( arguments.length );
+    for( var i = 0, len = ret.length; i < len; ++i ) {
+        ret[i] = arguments[i];
+    }
+    return Promise$_All( ret, PromiseArray, Promise.join, void 0 ).promise();
+};
+Promise.fulfilled = function Promise$Fulfilled( value, caller ) {
+    var ret = new Promise();
+    ret._setTrace( typeof caller === "function"
+        ? caller
+        : Promise.fulfilled, void 0 );
+    if( ret._tryAssumeStateOf( value, false ) ) {
+        return ret;
+    }
+    ret._cleanValues();
+    ret._setFulfilled();
+    ret._resolvedValue = value;
+    return ret;
+};
+
+Promise.rejected = function Promise$Rejected( reason ) {
+    var ret = new Promise();
+    ret._setTrace( Promise.rejected, void 0 );
+    ret._cleanValues();
+    ret._setRejected();
+    ret._resolvedValue = reason;
+    return ret;
+};
+
+Promise["try"] = Promise.attempt = function Promise$Try( fn, args, ctx ) {
+    var ret = new Promise();
+    ret._setTrace( Promise.attempt, void 0 );
+    ret._cleanValues();
+    if( typeof fn !== "function" ) {
+        ret._setRejected();
+        ret._resolvedValue = new TypeError("fn must be a function");
+        return ret;
+    }
+    var value = isArray( args )
+        ? tryCatchApply( fn, args, ctx )
+        : tryCatch1( fn, ctx, args );
+
+    if( value === errorObj ) {
+        ret._setRejected();
+        ret._resolvedValue = value.e;
+    }
+    else {
+        ret._setFulfilled();
+        ret._resolvedValue = value;
+    }
+    return ret;
+};
+
+Promise.pending = function Promise$Pending( caller ) {
+    var promise = new Promise();
+    promise._setTrace( typeof caller === "function"
+                              ? caller : Promise.pending, void 0 );
+    return new PromiseResolver( promise );
+};
+
+Promise.bind = function Promise$Bind( obj ) {
+    var ret = new Promise();
+    ret._setTrace( Promise.bind, void 0 );
+    ret._setFulfilled();
+    ret._setBoundTo( obj );
+    return ret;
+};
+
+Promise.cast = function Promise$Cast( obj, caller ) {
+    var ret = Promise._cast( obj, caller );
+    if( !( ret instanceof Promise ) ) {
+        return Promise.fulfilled( ret, caller );
+    }
+    return ret;
+};
+
+Promise.onPossiblyUnhandledRejection =
+function Promise$OnPossiblyUnhandledRejection( fn ) {
+    if( typeof fn === "function" ) {
+        CapturedTrace.possiblyUnhandledRejection = fn;
+    }
+    else {
+        CapturedTrace.possiblyUnhandledRejection = void 0;
+    }
+};
+
+var longStackTraces = false || false || !!(
+    typeof process !== "undefined" &&
+    typeof process.execPath === "string" &&
+    typeof process.env === "object" &&
+    process.env[ "BLUEBIRD_DEBUG" ]
+);
+
+Promise.longStackTraces = function Promise$LongStackTraces() {
+    if( async.haveItemsQueued() &&
+        longStackTraces === false
+    ) {
+        throw new Error("Cannot enable long stack traces " +
+        "after promises have been created");
+    }
+    longStackTraces = true;
+};
+
+Promise.hasLongStackTraces = function Promise$HasLongStackTraces() {
+    return longStackTraces;
+};
+
+Promise.prototype._then =
+function Promise$_then(
+    didFulfill,
+    didReject,
+    didProgress,
+    receiver,
+    internalData,
+    caller
+) {
+    var haveInternalData = internalData !== void 0;
+    var ret = haveInternalData ? internalData : new Promise();
+
+    if( longStackTraces && !haveInternalData ) {
+        var haveSameContext = this._peekContext() === this._traceParent;
+        ret._traceParent = haveSameContext ? this._traceParent : this;
+        ret._setTrace( typeof caller === "function" ?
+            caller : this._then, this );
+
+    }
+
+    if( !haveInternalData ) {
+        ret._boundTo = this._boundTo;
+    }
+
+    var callbackIndex =
+        this._addCallbacks( didFulfill, didReject, didProgress, ret, receiver );
+
+    if( this.isResolved() ) {
+        async.invoke( this._resolveLast, this, callbackIndex );
+    }
+    else if( !haveInternalData && this.isCancellable() ) {
+        ret._cancellationParent = this;
+    }
+
+    if( this._isDelegated() ) {
+        this._unsetDelegated();
+        var x = this._resolvedValue;
+        if( !this._tryThenable( x ) ) {
+            async.invoke( this._fulfill, this, x );
+        }
+    }
+    return ret;
+};
+
+Promise.prototype._length = function Promise$_length() {
+    return this._bitField & 16777215;
+};
+
+Promise.prototype._isFollowingOrFulfilledOrRejected =
+function Promise$_isFollowingOrFulfilledOrRejected() {
+    return ( this._bitField & 939524096 ) > 0;
+};
+
+Promise.prototype._setLength = function Promise$_setLength( len ) {
+    this._bitField = ( this._bitField & -16777216 ) |
+        ( len & 16777215 ) ;
+};
+
+Promise.prototype._cancellable = function Promise$_cancellable() {
+    return ( this._bitField & 67108864 ) > 0;
+};
+
+Promise.prototype._setFulfilled = function Promise$_setFulfilled() {
+    this._bitField = this._bitField | 268435456;
+};
+
+Promise.prototype._setRejected = function Promise$_setRejected() {
+    this._bitField = this._bitField | 134217728;
+};
+
+Promise.prototype._setFollowing = function Promise$_setFollowing() {
+    this._bitField = this._bitField | 536870912;
+};
+
+Promise.prototype._setDelegated = function Promise$_setDelegated() {
+    this._bitField = this._bitField | -1073741824;
+};
+
+Promise.prototype._setIsFinal = function Promise$_setIsFinal() {
+    this._bitField = this._bitField | 33554432;
+};
+
+Promise.prototype._isFinal = function Promise$_isFinal() {
+    return ( this._bitField & 33554432 ) > 0;
+};
+
+Promise.prototype._isDelegated = function Promise$_isDelegated() {
+    return ( this._bitField & -1073741824 ) === -1073741824;
+};
+
+Promise.prototype._unsetDelegated = function Promise$_unsetDelegated() {
+    this._bitField = this._bitField & ( ~-1073741824 );
+};
+
+Promise.prototype._setCancellable = function Promise$_setCancellable() {
+    this._bitField = this._bitField | 67108864;
+};
+
+Promise.prototype._unsetCancellable = function Promise$_unsetCancellable() {
+    this._bitField = this._bitField & ( ~67108864 );
+};
+
+Promise.prototype._receiverAt = function Promise$_receiverAt( index ) {
+    var ret;
+    if( index === 0 ) {
+        ret = this._receiver0;
+    }
+    else {
+        ret = this[ index + 4 - 5 ];
+    }
+    if( this._isBound() && ret === void 0 ) {
+        return this._boundTo;
+    }
+    return ret;
+};
+
+Promise.prototype._promiseAt = function Promise$_promiseAt( index ) {
+    if( index === 0 ) return this._promise0;
+    return this[ index + 3 - 5 ];
+};
+
+Promise.prototype._fulfillAt = function Promise$_fulfillAt( index ) {
+    if( index === 0 ) return this._fulfill0;
+    return this[ index + 0 - 5 ];
+};
+
+Promise.prototype._rejectAt = function Promise$_rejectAt( index ) {
+    if( index === 0 ) return this._reject0;
+    return this[ index + 1 - 5 ];
+};
+
+Promise.prototype._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;
+    }
+};
+
+Promise.prototype._resolveResolver =
+function Promise$_resolveResolver( resolver ) {
+    this._setTrace( this._resolveResolver, void 0 );
+    var p = new PromiseResolver( this );
+    this._pushContext();
+    var r = tryCatch2( resolver, this, function Promise$_fulfiller( val ) {
+        p.fulfill( val );
+    }, function Promise$_rejecter( val ) {
+        p.reject( val );
+    });
+    this._popContext();
+    if( r === errorObj ) {
+        p.reject( r.e );
+    }
+};
+
+Promise.prototype._addCallbacks = function Promise$_addCallbacks(
+    fulfill,
+    reject,
+    progress,
+    promise,
+    receiver
+) {
+    fulfill = typeof fulfill === "function" ? fulfill : void 0;
+    reject = typeof reject === "function" ? reject : void 0;
+    progress = typeof progress === "function" ? progress : void 0;
+    var index = this._length();
+
+    if( index === 0 ) {
+        this._fulfill0 = fulfill;
+        this._reject0  = reject;
+        this._progress0 = progress;
+        this._promise0 = promise;
+        this._receiver0 = receiver;
+        this._setLength( index + 5 );
+        return index;
+    }
+
+    this[ index - 5 + 0 ] = fulfill;
+    this[ index - 5 + 1 ] = reject;
+    this[ index - 5 + 2 ] = progress;
+    this[ index - 5 + 3 ] = promise;
+    this[ index - 5 + 4 ] = receiver;
+
+    this._setLength( index + 5 );
+    return index;
+};
+
+Promise.prototype._spreadSlowCase =
+function Promise$_spreadSlowCase( targetFn, promise, values, boundTo ) {
+    promise._assumeStateOf(
+            Promise$_All( values, PromiseArray, this._spreadSlowCase, boundTo )
+            .promise()
+            ._then( function() {
+                return targetFn.apply( boundTo, arguments );
+            }, void 0, void 0, APPLY, void 0,
+                    this._spreadSlowCase ),
+        false
+    );
+};
+
+Promise.prototype._setBoundTo = function Promise$_setBoundTo( obj ) {
+    this._boundTo = obj;
+};
+
+Promise.prototype._isBound = function Promise$_isBound() {
+    return this._boundTo !== void 0;
+};
+
+
+var ignore = CatchFilter.prototype.doFilter;
+Promise.prototype._resolvePromise = function Promise$_resolvePromise(
+    onFulfilledOrRejected, receiver, value, promise
+) {
+    var isRejected = this.isRejected();
+
+    if( isRejected &&
+        typeof value === "object" &&
+        value !== null ) {
+        var handledState = value["__promiseHandled__"];
+
+        if( handledState === void 0 ) {
+            notEnumerableProp( value, "__promiseHandled__", 2 );
+        }
+        else {
+            value["__promiseHandled__"] =
+                withHandledMarked( handledState );
+        }
+    }
+
+    if( !isPromise( promise ) ) {
+        return onFulfilledOrRejected.call( receiver, value, promise );
+    }
+
+    var x;
+    if( !isRejected && receiver === APPLY ) {
+        if( isArray( value ) ) {
+            for( var i = 0, len = value.length; i < len; ++i ) {
+                if( isPromise( value[i] ) ) {
+                    this._spreadSlowCase(
+                        onFulfilledOrRejected,
+                        promise,
+                        value,
+                        this._boundTo
+                    );
+                    return;
+                }
+            }
+            promise._pushContext();
+            x = tryCatchApply( onFulfilledOrRejected, value, this._boundTo );
+        }
+        else {
+            this._spreadSlowCase( onFulfilledOrRejected, promise,
+                    value, this._boundTo );
+            return;
+        }
+    }
+    else {
+        promise._pushContext();
+        x = tryCatch1( onFulfilledOrRejected, receiver, value );
+    }
+
+    promise._popContext();
+
+    if( x === errorObj ) {
+        ensureNotHandled(x.e);
+        if( onFulfilledOrRejected !== ignore ) {
+            promise._attachExtraTrace( x.e );
+        }
+        async.invoke( promise._reject, promise, x.e );
+    }
+    else if( x === promise ) {
+        var selfResolutionError =
+            new TypeError( "Circular thenable chain" );
+        this._attachExtraTrace( selfResolutionError );
+        async.invoke(
+            promise._reject,
+            promise,
+            selfResolutionError
+        );
+    }
+    else {
+        if( promise._tryAssumeStateOf( x, true ) ) {
+            return;
+        }
+        else if( Promise._couldBeThenable( x ) ) {
+
+            if( promise._length() === 0 ) {
+                promise._resolvedValue = x;
+                promise._setDelegated();
+                return;
+            }
+            else if( promise._tryThenable( x ) ) {
+                return;
+            }
+        }
+        async.invoke( promise._fulfill, promise, x );
+    }
+};
+
+Promise.prototype._assumeStateOf =
+function Promise$_assumeStateOf( promise, mustAsync ) {
+    this._setFollowing();
+    if( promise.isPending() ) {
+        if( promise._cancellable()  ) {
+            this._cancellationParent = promise;
+        }
+        promise._then(
+            this._resolveFulfill,
+            this._resolveReject,
+            this._resolveProgress,
+            this,
+            void 0,            this._tryAssumeStateOf
+        );
+    }
+    else if( promise.isFulfilled() ) {
+        if( mustAsync === true )
+            async.invoke( this._resolveFulfill, this, promise._resolvedValue );
+        else
+            this._resolveFulfill( promise._resolvedValue );
+    }
+    else {
+        if( mustAsync === true )
+            async.invoke( this._resolveReject, this, promise._resolvedValue );
+        else
+            this._resolveReject( promise._resolvedValue );
+    }
+
+    if( longStackTraces &&
+        promise._traceParent == null ) {
+        promise._traceParent = this;
+    }
+};
+
+Promise.prototype._tryAssumeStateOf =
+function Promise$_tryAssumeStateOf( value, mustAsync ) {
+    if( !isPromise( value ) ||
+        this._isFollowingOrFulfilledOrRejected() ) return false;
+
+    this._assumeStateOf( value, mustAsync );
+    return true;
+};
+
+Promise.prototype._setTrace = function Promise$_setTrace( caller, parent ) {
+    if( longStackTraces ) {
+        var context = this._peekContext();
+        var isTopLevel = context === void 0;
+        if( parent !== void 0 &&
+            parent._traceParent === context ) {
+            this._trace = parent._trace;
+        }
+        else {
+            this._trace = new CapturedTrace(
+                typeof caller === "function"
+                ? caller
+                : this._setTrace,
+                isTopLevel
+            );
+        }
+    }
+    return this;
+};
+
+Promise.prototype._attachExtraTrace =
+function Promise$_attachExtraTrace( error ) {
+    if( longStackTraces &&
+        canAttach( error ) ) {
+        var promise = this;
+        var stack = error.stack;
+        stack = typeof stack === "string"
+            ? stack.split("\n") : [];
+        var headerLineCount = 1;
+
+        while( promise != null &&
+            promise._trace != null ) {
+            stack = CapturedTrace.combine(
+                stack,
+                promise._trace.stack.split( "\n" )
+            );
+            promise = promise._traceParent;
+        }
+
+        var max = Error.stackTraceLimit + headerLineCount;
+        var len = stack.length;
+        if( len  > max ) {
+            stack.length = max;
+        }
+        if( stack.length <= headerLineCount ) {
+            error.stack = "(No stack trace)";
+        }
+        else {
+            error.stack = stack.join("\n");
+        }
+        error["__promiseHandled__"] =
+            withStackAttached( error["__promiseHandled__"] );
+    }
+};
+
+Promise.prototype._notifyUnhandledRejection =
+function Promise$_notifyUnhandledRejection( reason ) {
+    if( !isHandled( reason["__promiseHandled__"] ) ) {
+        reason["__promiseHandled__"] =
+            withHandledMarked( reason["__promiseHandled__"] );
+        CapturedTrace.possiblyUnhandledRejection( reason, this );
+    }
+};
+
+Promise.prototype._unhandledRejection =
+function Promise$_unhandledRejection( reason ) {
+    if( !isHandled( reason["__promiseHandled__"] ) ) {
+        async.invokeLater( this._notifyUnhandledRejection, this, reason );
+    }
+};
+
+Promise.prototype._cleanValues = function Promise$_cleanValues() {
+    this._cancellationParent = void 0;
+};
+
+Promise.prototype._fulfill = function Promise$_fulfill( value ) {
+    if( this._isFollowingOrFulfilledOrRejected() ) return;
+    this._resolveFulfill( value );
+
+};
+
+Promise.prototype._reject = function Promise$_reject( reason ) {
+    if( this._isFollowingOrFulfilledOrRejected() ) return;
+    this._resolveReject( reason );
+};
+
+Promise.prototype._doResolveAt = function Promise$_doResolveAt( i ) {
+    var fn = this.isFulfilled()
+        ? this._fulfillAt( i )
+        : this._rejectAt( i );
+    var value = this._resolvedValue;
+    var receiver = this._receiverAt( i );
+    var promise = this._promiseAt( i );
+    this._unsetAt( i );
+    this._resolvePromise( fn, receiver, value, promise );
+};
+
+Promise.prototype._resolveFulfill = function Promise$_resolveFulfill( value ) {
+    this._cleanValues();
+    this._setFulfilled();
+    this._resolvedValue = value;
+    var len = this._length();
+    this._setLength( 0 );
+    for( var i = 0; i < len; i+= 5 ) {
+        if( this._fulfillAt( i ) !== void 0 ) {
+            async.invoke( this._doResolveAt, this, i );
+        }
+        else {
+            var promise = this._promiseAt( i );
+            this._unsetAt( i );
+            async.invoke( promise._fulfill, promise, value );
+        }
+    }
+
+};
+
+Promise.prototype._resolveLast = function Promise$_resolveLast( index ) {
+    this._setLength( 0 );
+    var fn;
+    if( this.isFulfilled() ) {
+        fn = this._fulfillAt( index );
+    }
+    else {
+        fn = this._rejectAt( index );
+    }
+
+    if( fn !== void 0 ) {
+        async.invoke( this._doResolveAt, this, index );
+    }
+    else {
+        var promise = this._promiseAt( index );
+        var value = this._resolvedValue;
+        this._unsetAt( index );
+        if( this.isFulfilled() ) {
+            async.invoke( promise._fulfill, promise, value );
+        }
+        else {
+            async.invoke( promise._reject, promise, value );
+        }
+    }
+
+};
+
+Promise.prototype._resolveReject = function Promise$_resolveReject( reason ) {
+    this._cleanValues();
+    this._setRejected();
+    this._resolvedValue = reason;
+    if( this._isFinal() ) {
+        async.invokeLater( thrower, void 0, reason );
+        return;
+    }
+    var len = this._length();
+    this._setLength( 0 );
+    var rejectionWasHandled = false;
+    for( var i = 0; i < len; i+= 5 ) {
+        if( this._rejectAt( i ) !== void 0 ) {
+            rejectionWasHandled = true;
+            async.invoke( this._doResolveAt, this, i );
+        }
+        else {
+            var promise = this._promiseAt( i );
+            this._unsetAt( i );
+            if( !rejectionWasHandled )
+                rejectionWasHandled = promise._length() > 0;
+            async.invoke( promise._reject, promise, reason );
+        }
+    }
+
+    if( !rejectionWasHandled &&
+        CapturedTrace.possiblyUnhandledRejection !== void 0
+    ) {
+
+        if( isObject( reason ) ) {
+            var handledState = reason["__promiseHandled__"];
+            var newReason = reason;
+
+            if( handledState === void 0 ) {
+                newReason = ensurePropertyExpansion(reason,
+                    "__promiseHandled__", 0 );
+                handledState = 0;
+            }
+            else if( isHandled( handledState ) ) {
+                return;
+            }
+
+            if( !isStackAttached( handledState ) )  {
+                this._attachExtraTrace( newReason );
+            }
+            async.invoke( this._unhandledRejection, this, newReason );
+
+        }
+    }
+
+};
+
+var contextStack = [];
+Promise.prototype._peekContext = function Promise$_peekContext() {
+    var lastIndex = contextStack.length - 1;
+    if( lastIndex >= 0 ) {
+        return contextStack[ lastIndex ];
+    }
+    return void 0;
+
+};
+
+Promise.prototype._pushContext = function Promise$_pushContext() {
+    if( !longStackTraces ) return;
+    contextStack.push( this );
+};
+
+Promise.prototype._popContext = function Promise$_popContext() {
+    if( !longStackTraces ) return;
+    contextStack.pop();
+};
+
+
+function Promise$_All( promises, PromiseArray, caller, boundTo ) {
+    if( isPromise( promises ) ||
+        isArray( promises ) ) {
+
+        return new PromiseArray(
+            promises,
+            typeof caller === "function"
+                ? caller
+                : Promise$_All,
+            boundTo
+        );
+    }
+    return new PromiseArray(
+        [ apiRejection( "expecting an array or a promise" ) ],
+        caller,
+        boundTo
+    );
+}
+
+var old = global.Promise;
+
+Promise.noConflict = function() {
+    if( global.Promise === Promise ) {
+        global.Promise = old;
+    }
+    return Promise;
+};
+
+
+if( !CapturedTrace.isSupported() ) {
+    Promise.longStackTraces = function(){};
+    CapturedTrace.possiblyUnhandledRejection = function(){};
+    Promise.onPossiblyUnhandledRejection = function(){};
+    longStackTraces = false;
+}
+
+Promise.CancellationError = CancellationError;
+Promise.TimeoutError = TimeoutError;
+Promise.TypeError = TypeError;
+require('./synchronous_inspection.js')(Promise);
+require('./any.js')(Promise,Promise$_All,PromiseArray);
+require('./call_get.js')(Promise);
+require('./filter.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./generators.js')(Promise,apiRejection);
+require('./map.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./nodeify.js')(Promise);
+require('./promisify.js')(Promise);
+require('./props.js')(Promise,PromiseArray);
+require('./reduce.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./settle.js')(Promise,Promise$_All,PromiseArray);
+require('./some.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./progress.js')(Promise);
+require('./cancel.js')(Promise);
+require('./complex_thenables.js')(Promise);
+
 Promise.prototype = Promise.prototype;
+return Promise;
+
+};

js/main/properties_promise_array.js

@@ -23,5 +23,4 @@ /**
 "use strict";
+module.exports = function(Promise, PromiseArray) {
 var ASSERT = require("./assert.js");
-var Promise = require("./get_promise.js").get();
-var PromiseArray = require( "./promise_array.js" );
 var util = require("./util.js");
@@ -77,2 +76,3 @@ var inherits = util.inherits;
 
-module.exports = PropertiesPromiseArray;
+return PropertiesPromiseArray;
+};

js/main/props.js

@@ -23,4 +23,5 @@ /**
 "use strict";
-module.exports = function( Promise ) {
-    var PropertiesPromiseArray = require( "./properties_promise_array.js" );
+module.exports = function( Promise, PromiseArray ) {
+    var PropertiesPromiseArray = require("./properties_promise_array.js")(
+        Promise, PromiseArray);
     var util = require( "./util.js" );
@@ -59,4 +60,2 @@ var isPrimitive = util.isPrimitive;
     };
-};
-
-
+};

js/main/reduce.js

@@ -23,8 +23,5 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
 
     var ASSERT = require( "./assert.js" );
-    var errors = require( "./errors.js");
-    var PromiseArray = require( "./promise_array.js" );
-    var apiRejection = errors.apiRejection;
 
@@ -31,0 +28,0 @@ function Promise$_reducer( fulfilleds, initialValue ) {

js/main/settle.js

@@ -23,5 +23,6 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray ) {
 
-    var SettledPromiseArray = require( "./settled_promise_array.js" );
+    var SettledPromiseArray = require( "./settled_promise_array.js" )(
+        Promise, PromiseArray);
 
@@ -44,2 +45,3 @@ function Promise$_Settle( promises, useBound, caller ) {
     };
-};
+
+};

js/main/settled_promise_array.js

@@ -23,4 +23,4 @@ /**
 "use strict";
+module.exports = function( Promise, PromiseArray ) {
 var ASSERT = require("./assert.js");
-var PromiseArray = require( "./promise_array.js" );
 var PromiseInspection = require( "./promise_inspection.js" );
@@ -60,2 +60,3 @@ var util = require("./util.js");
 
-module.exports = SettledPromiseArray;
+return SettledPromiseArray;
+};

js/main/some_promise_array.js

@@ -23,6 +23,7 @@ /**
 "use strict";
-var PromiseArray = require( "./promise_array.js" );
+module.exports = function ( PromiseArray ) {
 var util = require("./util.js");
 var inherits = util.inherits;
 var isArray = util.isArray;
+
 function SomePromiseArray( values, caller, boundTo ) {
@@ -109,2 +110,3 @@ this.constructor$( values, caller, boundTo );
 
-module.exports = SomePromiseArray;
+return SomePromiseArray;
+};

js/main/some.js

@@ -23,6 +23,5 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
-    var errors = require( "./errors.js" );
-    var apiRejection = errors.apiRejection;
-    var SomePromiseArray = require( "./some_promise_array.js" );
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
+
+    var SomePromiseArray = require( "./some_promise_array.js" )(PromiseArray);
     var ASSERT = require( "./assert.js" );
@@ -51,3 +50,3 @@
     };
-};
 
+};

js/zalgo/any_promise_array.js

@@ -23,4 +23,4 @@ /**
 "use strict";
+module.exports = function( PromiseArray ) {
 var ASSERT = require("./assert.js");
-var PromiseArray = require( "./promise_array.js" );
 var util = require("./util.js");
@@ -55,2 +55,3 @@ var inherits = util.inherits;
 
-module.exports = AnyPromiseArray;
+return AnyPromiseArray;
+};

js/zalgo/any.js

@@ -23,5 +23,6 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
-    var AnyPromiseArray = require( "./any_promise_array.js" );
+module.exports = function( Promise, Promise$_All, PromiseArray ) {
 
+    var AnyPromiseArray = require( "./any_promise_array.js" )(PromiseArray);
+
     function Promise$_Any( promises, useBound, caller ) {
@@ -28,0 +29,0 @@ return Promise$_All(

js/zalgo/bluebird.js

@@ -23,3 +23,3 @@ /**
 "use strict";
-var Promise = require("./promise.js");
-module.exports = Promise;
+var Promise = require("./promise.js")();
+module.exports = Promise;

js/zalgo/captured_trace.js

@@ -23,2 +23,3 @@ /**
 "use strict";
+module.exports = function() {
 var ASSERT = require("./assert.js");
@@ -202,2 +203,3 @@ var inherits = require( "./util.js").inherits;
 
-module.exports = CapturedTrace;
+return CapturedTrace;
+};

js/zalgo/catch_filter.js

@@ -52,2 +52,2 @@ /**
 
-module.exports = CatchFilter;
+module.exports = CatchFilter;

js/zalgo/complex_thenables.js

@@ -317,5 +317,3 @@ /**
 
-
     Promise._cast = Promise$_Cast;
-};
-
+};

js/zalgo/errors.js

@@ -23,3 +23,2 @@ /**
 "use strict";
-var getPromise = require( "./get_promise.js" );
 var global = require("./global.js");
@@ -30,3 +29,2 @@ var util = require( "./util.js");
 var notEnumerableProp = util.notEnumerableProp;
-var Promise = getPromise.get();
 
@@ -61,12 +59,2 @@ function isStackAttached( val ) {
 
-function apiRejection( msg ) {
-    var error = new TypeError( msg );
-    var ret = Promise.rejected( error );
-    var parent = ret._peekContext();
-    if( parent != null ) {
-        parent._attachExtraTrace( error );
-    }
-    return ret;
-}
-
 function attachDefaultState( obj ) {
@@ -127,5 +115,3 @@ try {
     isHandled: isHandled,
-    canAttach: canAttach,
-    apiRejection: apiRejection
-};
-
+    canAttach: canAttach
+};

js/zalgo/filter.js

@@ -23,7 +23,4 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
 
-    var errors = require( "./errors.js");
-    var apiRejection = errors.apiRejection;
-    var PromiseArray = require( "./promise_array.js" );
     var ASSERT = require( "./assert.js" );
@@ -30,0 +27,0 @@

js/zalgo/generators.js

@@ -23,7 +23,6 @@ /**
 "use strict";
-module.exports = function( Promise ) {
-    var PromiseSpawn = require( "./promise_spawn.js" );
+module.exports = function( Promise, apiRejection ) {
+    var PromiseSpawn = require( "./promise_spawn.js" )(Promise);
     var errors = require( "./errors.js");
     var TypeError = errors.TypeError;
-    var apiRejection = errors.apiRejection;
 
@@ -30,0 +29,0 @@ Promise.coroutine = function Promise$Coroutine( generatorFunction ) {

js/zalgo/map.js

@@ -23,7 +23,4 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
 
-    var errors = require( "./errors.js" );
-    var PromiseArray = require( "./promise_array.js" );
-    var apiRejection = errors.apiRejection;
     var ASSERT = require( "./assert.js" );
@@ -30,0 +27,0 @@

js/zalgo/nodeify.js

@@ -24,3 +24,2 @@ /**
 module.exports = function( Promise ) {
-
     var util = require( "./util.js" );
@@ -65,2 +64,2 @@ var async = require( "./async.js" );
     };
-};
+};

js/zalgo/progress.js

@@ -84,2 +84,2 @@ /**
     };
-};
+};

js/zalgo/promise_array.js

@@ -23,4 +23,4 @@ /**
 "use strict";
+module.exports = function( Promise ) {
 var ASSERT = require("./assert.js");
-var Promise = require("./get_promise").get();
 var ensureNotHandled = require( "./errors.js").ensureNotHandled;
@@ -215,2 +215,3 @@ var util = require("./util.js");
 
-module.exports = PromiseArray;
+return PromiseArray;
+};

js/zalgo/promise_spawn.js

@@ -23,3 +23,3 @@ /**
 "use strict";
-var Promise = require("./get_promise.js").get();
+module.exports = function( Promise ) {
 var errors = require( "./errors.js" );
@@ -95,2 +95,3 @@ var TypeError = errors.TypeError;
 
-module.exports = PromiseSpawn;
+return PromiseSpawn;
+};

js/zalgo/promise.js

@@ -23,12 +23,12 @@ /**
 "use strict";
+module.exports = function() {
 var global = require("./global.js");
 var ASSERT = require("./assert.js");
-var getPromise = require("./get_promise.js");
-getPromise.set( Promise );
+
 var util = require( "./util.js" );
 var async = require( "./async.js" );
 var errors = require( "./errors.js" );
-var PromiseArray = require( "./promise_array.js" );
+var PromiseArray = require( "./promise_array.js" )(Promise);
 
-var CapturedTrace = require( "./captured_trace.js");
+var CapturedTrace = require( "./captured_trace.js")();
 var CatchFilter = require( "./catch_filter.js");
@@ -55,3 +55,3 @@ var PromiseResolver = require( "./promise_resolver.js" );
 var canAttach = errors.canAttach;
-var apiRejection = errors.apiRejection;
+var apiRejection = require("./errors_api_rejection")(Promise);
 
@@ -942,20 +942,960 @@ var APPLY = {};
 Promise.TypeError = TypeError;
+};/**
+ * Copyright (c) 2013 Petka Antonov
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:</p>
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+"use strict";
+module.exports = function() {
+var global = require("./global.js");
+var ASSERT = require("./assert.js");
 
-module.exports = Promise;
-require('./synchronous_inspection.js')(Promise, Promise$_All);
-require('./any.js')(Promise, Promise$_All);
-require('./call_get.js')(Promise, Promise$_All);
-require('./filter.js')(Promise, Promise$_All);
-require('./generators.js')(Promise, Promise$_All);
-require('./map.js')(Promise, Promise$_All);
-require('./nodeify.js')(Promise, Promise$_All);
-require('./promisify.js')(Promise, Promise$_All);
-require('./props.js')(Promise, Promise$_All);
-require('./reduce.js')(Promise, Promise$_All);
-require('./settle.js')(Promise, Promise$_All);
-require('./some.js')(Promise, Promise$_All);
-require('./progress.js')(Promise, Promise$_All);
-require('./cancel.js')(Promise, Promise$_All);
-require('./complex_thenables.js')(Promise, Promise$_All);
+var util = require( "./util.js" );
+var async = require( "./async.js" );
+var errors = require( "./errors.js" );
+var PromiseArray = require( "./promise_array.js" )(Promise);
 
+var CapturedTrace = require( "./captured_trace.js")();
+var CatchFilter = require( "./catch_filter.js");
+var PromiseResolver = require( "./promise_resolver.js" );
+
+var isArray = util.isArray;
+var notEnumerableProp = util.notEnumerableProp;
+var isObject = util.isObject;
+var ensurePropertyExpansion = util.ensurePropertyExpansion;
+var errorObj = util.errorObj;
+var tryCatch1 = util.tryCatch1;
+var tryCatch2 = util.tryCatch2;
+var tryCatchApply = util.tryCatchApply;
+
+var TypeError = errors.TypeError;
+var CancellationError = errors.CancellationError;
+var TimeoutError = errors.TimeoutError;
+var ensureNotHandled = errors.ensureNotHandled;
+var withHandledMarked = errors.withHandledMarked;
+var withStackAttached = errors.withStackAttached;
+var isStackAttached = errors.isStackAttached;
+var isHandled = errors.isHandled;
+var canAttach = errors.canAttach;
+var apiRejection = require("./errors_api_rejection")(Promise);
+
+var APPLY = {};
+
+
+function isPromise( obj ) {
+    if( typeof obj !== "object" ) return false;
+    return obj instanceof Promise;
+}
+
+function Promise( resolver ) {
+    this._bitField = 67108864;
+    this._fulfill0 = void 0;
+    this._reject0 = void 0;
+    this._progress0 = void 0;
+    this._promise0 = void 0;
+    this._receiver0 = void 0;
+    this._resolvedValue = void 0;
+    this._cancellationParent = void 0;
+    this._boundTo = void 0;
+    if( longStackTraces ) this._traceParent = this._peekContext();
+    if( typeof resolver === "function" ) this._resolveResolver( resolver );
+
+}
+
+Promise.prototype.bind = function Promise$bind( obj ) {
+    var ret = new Promise();
+    ret._setTrace( this.bind, this );
+    ret._assumeStateOf( this, true );
+    ret._setBoundTo( obj );
+    return ret;
+};
+
+Promise.prototype.toString = function Promise$toString() {
+    return "[object Promise]";
+};
+
+Promise.prototype.caught = Promise.prototype["catch"] =
+function Promise$catch( fn ) {
+    var len = arguments.length;
+    if( len > 1 ) {
+        var catchInstances = new Array( len - 1 ),
+            j = 0, i;
+        for( i = 0; i < len - 1; ++i ) {
+            var item = arguments[i];
+            if( typeof item === "function" &&
+                ( item.prototype instanceof Error ||
+                item === Error ) ) {
+                catchInstances[j++] = item;
+            }
+            else {
+                var catchFilterTypeError =
+                    new TypeError(
+                        "A catch filter must be an error constructor");
+
+                this._attachExtraTrace( catchFilterTypeError );
+                this._reject(catchFilterTypeError);
+                return;
+            }
+        }
+        catchInstances.length = j;
+        fn = arguments[i];
+        var catchFilter = new CatchFilter( catchInstances, fn, this._boundTo );
+        return this._then( void 0, catchFilter.doFilter, void 0,
+            catchFilter, void 0, this.caught );
+    }
+    return this._then( void 0, fn, void 0, void 0, void 0, this.caught );
+};
+
+function thrower( r ) {
+    throw r;
+}
+function slowFinally( ret, reasonOrValue ) {
+    if( this.isFulfilled() ) {
+        return ret._then(function() {
+            return reasonOrValue;
+        }, thrower, void 0, this, void 0, slowFinally );
+    }
+    else {
+        return ret._then(function() {
+            ensureNotHandled( reasonOrValue );
+            throw reasonOrValue;
+        }, thrower, void 0, this, void 0, slowFinally );
+    }
+}
+Promise.prototype.lastly = Promise.prototype["finally"] =
+function Promise$finally( fn ) {
+    var r = function( reasonOrValue ) {
+        var ret = this._isBound() ? fn.call( this._boundTo ) : fn();
+        if( isPromise( ret ) ) {
+            return slowFinally.call( this, ret, reasonOrValue );
+        }
+
+        if( this.isRejected() ) {
+            ensureNotHandled( reasonOrValue );
+            throw reasonOrValue;
+        }
+        return reasonOrValue;
+    };
+    return this._then( r, r, void 0, this, void 0, this.lastly );
+};
+
+Promise.prototype.then =
+function Promise$then( didFulfill, didReject, didProgress ) {
+    return this._then( didFulfill, didReject, didProgress,
+        void 0, void 0, this.then );
+};
+
+Promise.prototype.done =
+function Promise$done( didFulfill, didReject, didProgress ) {
+    var promise = this._then( didFulfill, didReject, didProgress,
+        void 0, void 0, this.done );
+    promise._setIsFinal();
+};
+
+Promise.prototype.spread = function Promise$spread( didFulfill, didReject ) {
+    return this._then( didFulfill, didReject, void 0,
+        APPLY, void 0, this.spread );
+};
+Promise.prototype.isFulfilled = function Promise$isFulfilled() {
+    return ( this._bitField & 268435456 ) > 0;
+};
+
+Promise.prototype.isRejected = function Promise$isRejected() {
+    return ( this._bitField & 134217728 ) > 0;
+};
+
+Promise.prototype.isPending = function Promise$isPending() {
+    return !this.isResolved();
+};
+
+Promise.prototype.isResolved = function Promise$isResolved() {
+    return ( this._bitField & 402653184 ) > 0;
+};
+
+Promise.prototype.isCancellable = function Promise$isCancellable() {
+    return !this.isResolved() &&
+        this._cancellable();
+};
+
+Promise.prototype.toJSON = function Promise$toJSON() {
+    var ret = {
+        isFulfilled: false,
+        isRejected: false,
+        fulfillmentValue: void 0,
+        rejectionReason: void 0
+    };
+    if( this.isFulfilled() ) {
+        ret.fulfillmentValue = this._resolvedValue;
+        ret.isFulfilled = true;
+    }
+    else if( this.isRejected() ) {
+        ret.rejectionReason = this._resolvedValue;
+        ret.isRejected = true;
+    }
+    return ret;
+};
+
+Promise.prototype.all = function Promise$all() {
+    return Promise$_all( this, true, this.all );
+};
+
+Promise.is = isPromise;
+
+function Promise$_all( promises, useBound, caller ) {
+    return Promise$_All(
+        promises,
+        PromiseArray,
+        caller,
+        useBound === true ? promises._boundTo : void 0
+    ).promise();
+}
+Promise.all = function Promise$All( promises ) {
+    return Promise$_all( promises, false, Promise.all );
+};
+
+Promise.join = function Promise$Join() {
+    var ret = new Array( arguments.length );
+    for( var i = 0, len = ret.length; i < len; ++i ) {
+        ret[i] = arguments[i];
+    }
+    return Promise$_All( ret, PromiseArray, Promise.join, void 0 ).promise();
+};
+Promise.fulfilled = function Promise$Fulfilled( value, caller ) {
+    var ret = new Promise();
+    ret._setTrace( typeof caller === "function"
+        ? caller
+        : Promise.fulfilled, void 0 );
+    if( ret._tryAssumeStateOf( value, false ) ) {
+        return ret;
+    }
+    ret._cleanValues();
+    ret._setFulfilled();
+    ret._resolvedValue = value;
+    return ret;
+};
+
+Promise.rejected = function Promise$Rejected( reason ) {
+    var ret = new Promise();
+    ret._setTrace( Promise.rejected, void 0 );
+    ret._cleanValues();
+    ret._setRejected();
+    ret._resolvedValue = reason;
+    return ret;
+};
+
+Promise["try"] = Promise.attempt = function Promise$Try( fn, args, ctx ) {
+    var ret = new Promise();
+    ret._setTrace( Promise.attempt, void 0 );
+    ret._cleanValues();
+    if( typeof fn !== "function" ) {
+        ret._setRejected();
+        ret._resolvedValue = new TypeError("fn must be a function");
+        return ret;
+    }
+    var value = isArray( args )
+        ? tryCatchApply( fn, args, ctx )
+        : tryCatch1( fn, ctx, args );
+
+    if( value === errorObj ) {
+        ret._setRejected();
+        ret._resolvedValue = value.e;
+    }
+    else {
+        ret._setFulfilled();
+        ret._resolvedValue = value;
+    }
+    return ret;
+};
+
+Promise.pending = function Promise$Pending( caller ) {
+    var promise = new Promise();
+    promise._setTrace( typeof caller === "function"
+                              ? caller : Promise.pending, void 0 );
+    return new PromiseResolver( promise );
+};
+
+Promise.bind = function Promise$Bind( obj ) {
+    var ret = new Promise();
+    ret._setTrace( Promise.bind, void 0 );
+    ret._setFulfilled();
+    ret._setBoundTo( obj );
+    return ret;
+};
+
+Promise.cast = function Promise$Cast( obj, caller ) {
+    var ret = Promise._cast( obj, caller );
+    if( !( ret instanceof Promise ) ) {
+        return Promise.fulfilled( ret, caller );
+    }
+    return ret;
+};
+
+Promise.onPossiblyUnhandledRejection =
+function Promise$OnPossiblyUnhandledRejection( fn ) {
+    if( typeof fn === "function" ) {
+        CapturedTrace.possiblyUnhandledRejection = fn;
+    }
+    else {
+        CapturedTrace.possiblyUnhandledRejection = void 0;
+    }
+};
+
+var longStackTraces = false || false || !!(
+    typeof process !== "undefined" &&
+    typeof process.execPath === "string" &&
+    typeof process.env === "object" &&
+    process.env[ "BLUEBIRD_DEBUG" ]
+);
+
+Promise.longStackTraces = function Promise$LongStackTraces() {
+    if( async.haveItemsQueued() &&
+        longStackTraces === false
+    ) {
+        throw new Error("Cannot enable long stack traces " +
+        "after promises have been created");
+    }
+    longStackTraces = true;
+};
+
+Promise.hasLongStackTraces = function Promise$HasLongStackTraces() {
+    return longStackTraces;
+};
+
+Promise.prototype._then =
+function Promise$_then(
+    didFulfill,
+    didReject,
+    didProgress,
+    receiver,
+    internalData,
+    caller
+) {
+    var haveInternalData = internalData !== void 0;
+    var ret = haveInternalData ? internalData : new Promise();
+
+    if( longStackTraces && !haveInternalData ) {
+        var haveSameContext = this._peekContext() === this._traceParent;
+        ret._traceParent = haveSameContext ? this._traceParent : this;
+        ret._setTrace( typeof caller === "function" ?
+            caller : this._then, this );
+
+    }
+
+    if( !haveInternalData ) {
+        ret._boundTo = this._boundTo;
+    }
+
+    var callbackIndex =
+        this._addCallbacks( didFulfill, didReject, didProgress, ret, receiver );
+
+    if( this.isResolved() ) {
+        this._resolveLast(callbackIndex);
+    }
+    else if( !haveInternalData && this.isCancellable() ) {
+        ret._cancellationParent = this;
+    }
+
+    if( this._isDelegated() ) {
+        this._unsetDelegated();
+        var x = this._resolvedValue;
+        if( !this._tryThenable( x ) ) {
+            this._fulfill(x);
+        }
+    }
+    return ret;
+};
+
+Promise.prototype._length = function Promise$_length() {
+    return this._bitField & 16777215;
+};
+
+Promise.prototype._isFollowingOrFulfilledOrRejected =
+function Promise$_isFollowingOrFulfilledOrRejected() {
+    return ( this._bitField & 939524096 ) > 0;
+};
+
+Promise.prototype._setLength = function Promise$_setLength( len ) {
+    this._bitField = ( this._bitField & -16777216 ) |
+        ( len & 16777215 ) ;
+};
+
+Promise.prototype._cancellable = function Promise$_cancellable() {
+    return ( this._bitField & 67108864 ) > 0;
+};
+
+Promise.prototype._setFulfilled = function Promise$_setFulfilled() {
+    this._bitField = this._bitField | 268435456;
+};
+
+Promise.prototype._setRejected = function Promise$_setRejected() {
+    this._bitField = this._bitField | 134217728;
+};
+
+Promise.prototype._setFollowing = function Promise$_setFollowing() {
+    this._bitField = this._bitField | 536870912;
+};
+
+Promise.prototype._setDelegated = function Promise$_setDelegated() {
+    this._bitField = this._bitField | -1073741824;
+};
+
+Promise.prototype._setIsFinal = function Promise$_setIsFinal() {
+    this._bitField = this._bitField | 33554432;
+};
+
+Promise.prototype._isFinal = function Promise$_isFinal() {
+    return ( this._bitField & 33554432 ) > 0;
+};
+
+Promise.prototype._isDelegated = function Promise$_isDelegated() {
+    return ( this._bitField & -1073741824 ) === -1073741824;
+};
+
+Promise.prototype._unsetDelegated = function Promise$_unsetDelegated() {
+    this._bitField = this._bitField & ( ~-1073741824 );
+};
+
+Promise.prototype._setCancellable = function Promise$_setCancellable() {
+    this._bitField = this._bitField | 67108864;
+};
+
+Promise.prototype._unsetCancellable = function Promise$_unsetCancellable() {
+    this._bitField = this._bitField & ( ~67108864 );
+};
+
+Promise.prototype._receiverAt = function Promise$_receiverAt( index ) {
+    var ret;
+    if( index === 0 ) {
+        ret = this._receiver0;
+    }
+    else {
+        ret = this[ index + 4 - 5 ];
+    }
+    if( this._isBound() && ret === void 0 ) {
+        return this._boundTo;
+    }
+    return ret;
+};
+
+Promise.prototype._promiseAt = function Promise$_promiseAt( index ) {
+    if( index === 0 ) return this._promise0;
+    return this[ index + 3 - 5 ];
+};
+
+Promise.prototype._fulfillAt = function Promise$_fulfillAt( index ) {
+    if( index === 0 ) return this._fulfill0;
+    return this[ index + 0 - 5 ];
+};
+
+Promise.prototype._rejectAt = function Promise$_rejectAt( index ) {
+    if( index === 0 ) return this._reject0;
+    return this[ index + 1 - 5 ];
+};
+
+Promise.prototype._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;
+    }
+};
+
+Promise.prototype._resolveResolver =
+function Promise$_resolveResolver( resolver ) {
+    this._setTrace( this._resolveResolver, void 0 );
+    var p = new PromiseResolver( this );
+    this._pushContext();
+    var r = tryCatch2( resolver, this, function Promise$_fulfiller( val ) {
+        p.fulfill( val );
+    }, function Promise$_rejecter( val ) {
+        p.reject( val );
+    });
+    this._popContext();
+    if( r === errorObj ) {
+        p.reject( r.e );
+    }
+};
+
+Promise.prototype._addCallbacks = function Promise$_addCallbacks(
+    fulfill,
+    reject,
+    progress,
+    promise,
+    receiver
+) {
+    fulfill = typeof fulfill === "function" ? fulfill : void 0;
+    reject = typeof reject === "function" ? reject : void 0;
+    progress = typeof progress === "function" ? progress : void 0;
+    var index = this._length();
+
+    if( index === 0 ) {
+        this._fulfill0 = fulfill;
+        this._reject0  = reject;
+        this._progress0 = progress;
+        this._promise0 = promise;
+        this._receiver0 = receiver;
+        this._setLength( index + 5 );
+        return index;
+    }
+
+    this[ index - 5 + 0 ] = fulfill;
+    this[ index - 5 + 1 ] = reject;
+    this[ index - 5 + 2 ] = progress;
+    this[ index - 5 + 3 ] = promise;
+    this[ index - 5 + 4 ] = receiver;
+
+    this._setLength( index + 5 );
+    return index;
+};
+
+Promise.prototype._spreadSlowCase =
+function Promise$_spreadSlowCase( targetFn, promise, values, boundTo ) {
+    promise._assumeStateOf(
+            Promise$_All( values, PromiseArray, this._spreadSlowCase, boundTo )
+            .promise()
+            ._then( function() {
+                return targetFn.apply( boundTo, arguments );
+            }, void 0, void 0, APPLY, void 0,
+                    this._spreadSlowCase ),
+        false
+    );
+};
+
+Promise.prototype._setBoundTo = function Promise$_setBoundTo( obj ) {
+    this._boundTo = obj;
+};
+
+Promise.prototype._isBound = function Promise$_isBound() {
+    return this._boundTo !== void 0;
+};
+
+
+var ignore = CatchFilter.prototype.doFilter;
+Promise.prototype._resolvePromise = function Promise$_resolvePromise(
+    onFulfilledOrRejected, receiver, value, promise
+) {
+    var isRejected = this.isRejected();
+
+    if( isRejected &&
+        typeof value === "object" &&
+        value !== null ) {
+        var handledState = value["__promiseHandled__"];
+
+        if( handledState === void 0 ) {
+            notEnumerableProp( value, "__promiseHandled__", 2 );
+        }
+        else {
+            value["__promiseHandled__"] =
+                withHandledMarked( handledState );
+        }
+    }
+
+    if( !isPromise( promise ) ) {
+        return onFulfilledOrRejected.call( receiver, value, promise );
+    }
+
+    var x;
+    if( !isRejected && receiver === APPLY ) {
+        if( isArray( value ) ) {
+            for( var i = 0, len = value.length; i < len; ++i ) {
+                if( isPromise( value[i] ) ) {
+                    this._spreadSlowCase(
+                        onFulfilledOrRejected,
+                        promise,
+                        value,
+                        this._boundTo
+                    );
+                    return;
+                }
+            }
+            promise._pushContext();
+            x = tryCatchApply( onFulfilledOrRejected, value, this._boundTo );
+        }
+        else {
+            this._spreadSlowCase( onFulfilledOrRejected, promise,
+                    value, this._boundTo );
+            return;
+        }
+    }
+    else {
+        promise._pushContext();
+        x = tryCatch1( onFulfilledOrRejected, receiver, value );
+    }
+
+    promise._popContext();
+
+    if( x === errorObj ) {
+        ensureNotHandled(x.e);
+        if( onFulfilledOrRejected !== ignore ) {
+            promise._attachExtraTrace( x.e );
+        }
+        promise._reject(x.e);
+    }
+    else if( x === promise ) {
+        var selfResolutionError =
+            new TypeError( "Circular thenable chain" );
+        this._attachExtraTrace( selfResolutionError );
+        promise._reject(selfResolutionError);
+    }
+    else {
+        if( promise._tryAssumeStateOf( x, true ) ) {
+            return;
+        }
+        else if( Promise._couldBeThenable( x ) ) {
+
+            if( promise._length() === 0 ) {
+                promise._resolvedValue = x;
+                promise._setDelegated();
+                return;
+            }
+            else if( promise._tryThenable( x ) ) {
+                return;
+            }
+        }
+        promise._fulfill(x);
+    }
+};
+
+Promise.prototype._assumeStateOf =
+function Promise$_assumeStateOf( promise, mustAsync ) {
+    this._setFollowing();
+    if( promise.isPending() ) {
+        if( promise._cancellable()  ) {
+            this._cancellationParent = promise;
+        }
+        promise._then(
+            this._resolveFulfill,
+            this._resolveReject,
+            this._resolveProgress,
+            this,
+            void 0,            this._tryAssumeStateOf
+        );
+    }
+    else if( promise.isFulfilled() ) {
+        if( mustAsync === true )
+            this._resolveFulfill(promise._resolvedValue);
+        else
+            this._resolveFulfill( promise._resolvedValue );
+    }
+    else {
+        if( mustAsync === true )
+            this._resolveReject(promise._resolvedValue);
+        else
+            this._resolveReject( promise._resolvedValue );
+    }
+
+    if( longStackTraces &&
+        promise._traceParent == null ) {
+        promise._traceParent = this;
+    }
+};
+
+Promise.prototype._tryAssumeStateOf =
+function Promise$_tryAssumeStateOf( value, mustAsync ) {
+    if( !isPromise( value ) ||
+        this._isFollowingOrFulfilledOrRejected() ) return false;
+
+    this._assumeStateOf( value, mustAsync );
+    return true;
+};
+
+Promise.prototype._setTrace = function Promise$_setTrace( caller, parent ) {
+    if( longStackTraces ) {
+        var context = this._peekContext();
+        var isTopLevel = context === void 0;
+        if( parent !== void 0 &&
+            parent._traceParent === context ) {
+            this._trace = parent._trace;
+        }
+        else {
+            this._trace = new CapturedTrace(
+                typeof caller === "function"
+                ? caller
+                : this._setTrace,
+                isTopLevel
+            );
+        }
+    }
+    return this;
+};
+
+Promise.prototype._attachExtraTrace =
+function Promise$_attachExtraTrace( error ) {
+    if( longStackTraces &&
+        canAttach( error ) ) {
+        var promise = this;
+        var stack = error.stack;
+        stack = typeof stack === "string"
+            ? stack.split("\n") : [];
+        var headerLineCount = 1;
+
+        while( promise != null &&
+            promise._trace != null ) {
+            stack = CapturedTrace.combine(
+                stack,
+                promise._trace.stack.split( "\n" )
+            );
+            promise = promise._traceParent;
+        }
+
+        var max = Error.stackTraceLimit + headerLineCount;
+        var len = stack.length;
+        if( len  > max ) {
+            stack.length = max;
+        }
+        if( stack.length <= headerLineCount ) {
+            error.stack = "(No stack trace)";
+        }
+        else {
+            error.stack = stack.join("\n");
+        }
+        error["__promiseHandled__"] =
+            withStackAttached( error["__promiseHandled__"] );
+    }
+};
+
+Promise.prototype._notifyUnhandledRejection =
+function Promise$_notifyUnhandledRejection( reason ) {
+    if( !isHandled( reason["__promiseHandled__"] ) ) {
+        reason["__promiseHandled__"] =
+            withHandledMarked( reason["__promiseHandled__"] );
+        CapturedTrace.possiblyUnhandledRejection( reason, this );
+    }
+};
+
+Promise.prototype._unhandledRejection =
+function Promise$_unhandledRejection( reason ) {
+    if( !isHandled( reason["__promiseHandled__"] ) ) {
+        async.invokeLater( this._notifyUnhandledRejection, this, reason );
+    }
+};
+
+Promise.prototype._cleanValues = function Promise$_cleanValues() {
+    this._cancellationParent = void 0;
+};
+
+Promise.prototype._fulfill = function Promise$_fulfill( value ) {
+    if( this._isFollowingOrFulfilledOrRejected() ) return;
+    this._resolveFulfill( value );
+
+};
+
+Promise.prototype._reject = function Promise$_reject( reason ) {
+    if( this._isFollowingOrFulfilledOrRejected() ) return;
+    this._resolveReject( reason );
+};
+
+Promise.prototype._doResolveAt = function Promise$_doResolveAt( i ) {
+    var fn = this.isFulfilled()
+        ? this._fulfillAt( i )
+        : this._rejectAt( i );
+    var value = this._resolvedValue;
+    var receiver = this._receiverAt( i );
+    var promise = this._promiseAt( i );
+    this._unsetAt( i );
+    this._resolvePromise( fn, receiver, value, promise );
+};
+
+Promise.prototype._resolveFulfill = function Promise$_resolveFulfill( value ) {
+    this._cleanValues();
+    this._setFulfilled();
+    this._resolvedValue = value;
+    var len = this._length();
+    this._setLength( 0 );
+    for( var i = 0; i < len; i+= 5 ) {
+        if( this._fulfillAt( i ) !== void 0 ) {
+            this._doResolveAt(i);
+        }
+        else {
+            var promise = this._promiseAt( i );
+            this._unsetAt( i );
+            promise._fulfill(value);
+        }
+    }
+
+};
+
+Promise.prototype._resolveLast = function Promise$_resolveLast( index ) {
+    this._setLength( 0 );
+    var fn;
+    if( this.isFulfilled() ) {
+        fn = this._fulfillAt( index );
+    }
+    else {
+        fn = this._rejectAt( index );
+    }
+
+    if( fn !== void 0 ) {
+        this._doResolveAt(index);
+    }
+    else {
+        var promise = this._promiseAt( index );
+        var value = this._resolvedValue;
+        this._unsetAt( index );
+        if( this.isFulfilled() ) {
+            promise._fulfill(value);
+        }
+        else {
+            promise._reject(value);
+        }
+    }
+
+};
+
+Promise.prototype._resolveReject = function Promise$_resolveReject( reason ) {
+    this._cleanValues();
+    this._setRejected();
+    this._resolvedValue = reason;
+    if( this._isFinal() ) {
+        async.invokeLater( thrower, void 0, reason );
+        return;
+    }
+    var len = this._length();
+    this._setLength( 0 );
+    var rejectionWasHandled = false;
+    for( var i = 0; i < len; i+= 5 ) {
+        if( this._rejectAt( i ) !== void 0 ) {
+            rejectionWasHandled = true;
+            this._doResolveAt(i);
+        }
+        else {
+            var promise = this._promiseAt( i );
+            this._unsetAt( i );
+            if( !rejectionWasHandled )
+                rejectionWasHandled = promise._length() > 0;
+            promise._reject(reason);
+        }
+    }
+
+    if( !rejectionWasHandled &&
+        CapturedTrace.possiblyUnhandledRejection !== void 0
+    ) {
+
+        if( isObject( reason ) ) {
+            var handledState = reason["__promiseHandled__"];
+            var newReason = reason;
+
+            if( handledState === void 0 ) {
+                newReason = ensurePropertyExpansion(reason,
+                    "__promiseHandled__", 0 );
+                handledState = 0;
+            }
+            else if( isHandled( handledState ) ) {
+                return;
+            }
+
+            if( !isStackAttached( handledState ) )  {
+                this._attachExtraTrace( newReason );
+            }
+            this._unhandledRejection(newReason);
+
+        }
+    }
+
+};
+
+var contextStack = [];
+Promise.prototype._peekContext = function Promise$_peekContext() {
+    var lastIndex = contextStack.length - 1;
+    if( lastIndex >= 0 ) {
+        return contextStack[ lastIndex ];
+    }
+    return void 0;
+
+};
+
+Promise.prototype._pushContext = function Promise$_pushContext() {
+    if( !longStackTraces ) return;
+    contextStack.push( this );
+};
+
+Promise.prototype._popContext = function Promise$_popContext() {
+    if( !longStackTraces ) return;
+    contextStack.pop();
+};
+
+
+function Promise$_All( promises, PromiseArray, caller, boundTo ) {
+    if( isPromise( promises ) ||
+        isArray( promises ) ) {
+
+        return new PromiseArray(
+            promises,
+            typeof caller === "function"
+                ? caller
+                : Promise$_All,
+            boundTo
+        );
+    }
+    return new PromiseArray(
+        [ apiRejection( "expecting an array or a promise" ) ],
+        caller,
+        boundTo
+    );
+}
+
+var old = global.Promise;
+
+Promise.noConflict = function() {
+    if( global.Promise === Promise ) {
+        global.Promise = old;
+    }
+    return Promise;
+};
+
+
+if( !CapturedTrace.isSupported() ) {
+    Promise.longStackTraces = function(){};
+    CapturedTrace.possiblyUnhandledRejection = function(){};
+    Promise.onPossiblyUnhandledRejection = function(){};
+    longStackTraces = false;
+}
+
+Promise.CancellationError = CancellationError;
+Promise.TimeoutError = TimeoutError;
+Promise.TypeError = TypeError;
+require('./synchronous_inspection.js')(Promise);
+require('./any.js')(Promise,Promise$_All,PromiseArray);
+require('./call_get.js')(Promise);
+require('./filter.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./generators.js')(Promise,apiRejection);
+require('./map.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./nodeify.js')(Promise);
+require('./promisify.js')(Promise);
+require('./props.js')(Promise,PromiseArray);
+require('./reduce.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./settle.js')(Promise,Promise$_All,PromiseArray);
+require('./some.js')(Promise,Promise$_All,PromiseArray,apiRejection);
+require('./progress.js')(Promise);
+require('./cancel.js')(Promise);
+require('./complex_thenables.js')(Promise);
+
 Promise.prototype = Promise.prototype;
+return Promise;
+
+};

js/zalgo/properties_promise_array.js

@@ -23,5 +23,4 @@ /**
 "use strict";
+module.exports = function(Promise, PromiseArray) {
 var ASSERT = require("./assert.js");
-var Promise = require("./get_promise.js").get();
-var PromiseArray = require( "./promise_array.js" );
 var util = require("./util.js");
@@ -77,2 +76,3 @@ var inherits = util.inherits;
 
-module.exports = PropertiesPromiseArray;
+return PropertiesPromiseArray;
+};

js/zalgo/props.js

@@ -23,4 +23,5 @@ /**
 "use strict";
-module.exports = function( Promise ) {
-    var PropertiesPromiseArray = require( "./properties_promise_array.js" );
+module.exports = function( Promise, PromiseArray ) {
+    var PropertiesPromiseArray = require("./properties_promise_array.js")(
+        Promise, PromiseArray);
     var util = require( "./util.js" );
@@ -59,4 +60,2 @@ var isPrimitive = util.isPrimitive;
     };
-};
-
-
+};

js/zalgo/reduce.js

@@ -23,8 +23,5 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
 
     var ASSERT = require( "./assert.js" );
-    var errors = require( "./errors.js");
-    var PromiseArray = require( "./promise_array.js" );
-    var apiRejection = errors.apiRejection;
 
@@ -31,0 +28,0 @@ function Promise$_reducer( fulfilleds, initialValue ) {

js/zalgo/settle.js

@@ -23,5 +23,6 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
+module.exports = function( Promise, Promise$_All, PromiseArray ) {
 
-    var SettledPromiseArray = require( "./settled_promise_array.js" );
+    var SettledPromiseArray = require( "./settled_promise_array.js" )(
+        Promise, PromiseArray);
 
@@ -44,2 +45,3 @@ function Promise$_Settle( promises, useBound, caller ) {
     };
-};
+
+};

js/zalgo/settled_promise_array.js

@@ -23,4 +23,4 @@ /**
 "use strict";
+module.exports = function( Promise, PromiseArray ) {
 var ASSERT = require("./assert.js");
-var PromiseArray = require( "./promise_array.js" );
 var PromiseInspection = require( "./promise_inspection.js" );
@@ -60,2 +60,3 @@ var util = require("./util.js");
 
-module.exports = SettledPromiseArray;
+return SettledPromiseArray;
+};

js/zalgo/some_promise_array.js

@@ -23,6 +23,7 @@ /**
 "use strict";
-var PromiseArray = require( "./promise_array.js" );
+module.exports = function ( PromiseArray ) {
 var util = require("./util.js");
 var inherits = util.inherits;
 var isArray = util.isArray;
+
 function SomePromiseArray( values, caller, boundTo ) {
@@ -109,2 +110,3 @@ this.constructor$( values, caller, boundTo );
 
-module.exports = SomePromiseArray;
+return SomePromiseArray;
+};

js/zalgo/some.js

@@ -23,6 +23,5 @@ /**
 "use strict";
-module.exports = function( Promise, Promise$_All ) {
-    var errors = require( "./errors.js" );
-    var apiRejection = errors.apiRejection;
-    var SomePromiseArray = require( "./some_promise_array.js" );
+module.exports = function( Promise, Promise$_All, PromiseArray, apiRejection ) {
+
+    var SomePromiseArray = require( "./some_promise_array.js" )(PromiseArray);
     var ASSERT = require( "./assert.js" );
@@ -51,3 +50,3 @@
     };
-};
 
+};

package.json

 {
   "name": "bluebird",
   "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-  "version": "0.9.4-1",
+  "version": "0.9.5-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

454728

increased by14.45%

Number of package files

84

increased by2.44%

Lines of code

10343

increased by19.2%

Worsened metrics

Number of low supply chain risk alerts

21

increased by23.53%

No dependency changes