Skip to content

Commit

Permalink
Release v1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@petkaantonov
petkaantonov committed Feb 17, 2014
1 parent 992b56c commit 1b0f868
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 11 deletions.
118 changes: 112 additions & 6 deletions browser/bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5176,6 +5176,7 @@ Promise.reject = Promise.rejected = function Promise$Reject(reason) {
var trace = new Error(reason + "");
ret._setCarriedStackTrace(trace);
}
ret._ensurePossibleRejectionHandled();
return ret;
};

Expand All @@ -5189,6 +5190,7 @@ function Promise$_resolveFromSyncValue(value, caller) {
this._cleanValues();
this._setRejected();
this._settledValue = value.e;
this._ensurePossibleRejectionHandled();
}
else {
var maybePromise = Promise._cast(value, caller, void 0);
Expand Down Expand Up @@ -6090,7 +6092,9 @@ function Promise$_notifyUnhandledRejection() {
this._unsetCarriedStackTrace();
reason = trace;
}
CapturedTrace.possiblyUnhandledRejection(reason, this);
if (typeof CapturedTrace.possiblyUnhandledRejection === "function") {
CapturedTrace.possiblyUnhandledRejection(reason, this);
}
}
};

Expand Down Expand Up @@ -6906,6 +6910,15 @@ function parameterCount(fn) {
return 0;
}

function propertyAccess(id) {
var rident = /^[a-z$_][a-z$_0-9]*$/i;

if (rident.test(id)) {
return "." + id;
}
else return "['" + id.replace(/(['\\])/g, "\\$1") + "']";
}

function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
ASSERT(((typeof fn) === "function"),
"typeof fn === \u0022function\u0022");
Expand All @@ -6925,7 +6938,7 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {

if (typeof callback === "string" &&
receiver === THIS) {
return "this['" + callback + "']("+args.join(",") +
return "this" + propertyAccess(callback) + "("+args.join(",") +
comma +" fn);"+
"break;";
}
Expand All @@ -6951,7 +6964,7 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
"args[i] = fn;" +

(typeof callback === "string"
? "this['" + callback + "'].apply("
? "this" + propertyAccess(callback) + ".apply("
: "callback.apply(") +

(receiver === THIS ? "this" : "receiver") +
Expand Down Expand Up @@ -9767,6 +9780,7 @@ Promise.reject = Promise.rejected = function Promise$Reject(reason) {
var trace = new Error(reason + "");
ret._setCarriedStackTrace(trace);
}
ret._ensurePossibleRejectionHandled();
return ret;
};

Expand All @@ -9780,6 +9794,7 @@ function Promise$_resolveFromSyncValue(value, caller) {
this._cleanValues();
this._setRejected();
this._settledValue = value.e;
this._ensurePossibleRejectionHandled();
}
else {
var maybePromise = Promise._cast(value, caller, void 0);
Expand Down Expand Up @@ -10574,7 +10589,9 @@ function Promise$_notifyUnhandledRejection() {
this._unsetCarriedStackTrace();
reason = trace;
}
CapturedTrace.possiblyUnhandledRejection(reason, this);
if (typeof CapturedTrace.possiblyUnhandledRejection === "function") {
CapturedTrace.possiblyUnhandledRejection(reason, this);
}
}
};

Expand Down Expand Up @@ -11032,6 +11049,15 @@ function parameterCount(fn) {
return 0;
}

function propertyAccess(id) {
var rident = /^[a-z$_][a-z$_0-9]*$/i;

if (rident.test(id)) {
return "." + id;
}
else return "['" + id.replace(/(['\\])/g, "\\$1") + "']";
}

function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
var newParameterCount = Math.max(0, parameterCount(fn) - 1);
var argumentOrder = switchCaseArgumentOrder(newParameterCount);
Expand All @@ -11049,7 +11075,7 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {

if (typeof callback === "string" &&
receiver === THIS) {
return "this['" + callback + "']("+args.join(",") +
return "this" + propertyAccess(callback) + "("+args.join(",") +
comma +" fn);"+
"break;";
}
Expand All @@ -11075,7 +11101,7 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
"args[i] = fn;" +

(typeof callback === "string"
? "this['" + callback + "'].apply("
? "this" + propertyAccess(callback) + ".apply("
: "callback.apply(") +

(receiver === THIS ? "this" : "receiver") +
Expand Down Expand Up @@ -31373,6 +31399,12 @@ function onUnhandledSucceed( done, testAgainst ) {
});
}

function async(fn) {
return function() {
setTimeout(function(){fn()}, 13);
};
}

function onDone(done) {
return function() {
Promise.onPossiblyUnhandledRejection(null);
Expand Down Expand Up @@ -31803,10 +31835,84 @@ describe("Will not report rejections that are handled in time", function() {
}, 13 );

});
});

describe("immediate failures without .then", function(done) {
var err = new Error('');
specify("Promise.reject", function(done) {
onUnhandledSucceed(done, function(e) {
return e === err;
});

Promise.reject(err);
});

specify("new Promise throw", function(done) {
onUnhandledSucceed(done, function(e) {
return e === err;
});

new Promise(function() {
throw err;
});
});

specify("new Promise reject", function(done) {
onUnhandledSucceed(done, function(e) {
return e === err;
});

new Promise(function(_, r) {
r(err);
});
});

specify("Promise.method", function(done) {
onUnhandledSucceed(done, function(e) {
return e === err;
});

Promise.method(function() {
throw err;
})();
});
});

describe("immediate failures with .then", function(done) {
var err = new Error('');
specify("Promise.reject", function(done) {
onUnhandledFail();

Promise.reject(err).caught(async(done));
});

specify("new Promise throw", function(done) {
onUnhandledFail();

new Promise(function() {
throw err;
}).caught(async(done));
});

specify("new Promise reject", function(done) {
onUnhandledFail();

new Promise(function(_, r) {
r(err);
}).caught(async(done));
});

specify("Promise.method", function(done) {
onUnhandledFail();

Promise.method(function() {
throw err;
})().caught(async(done));
});
});



if (Promise.hasLongStackTraces()) {
describe("Gives long stack traces for non-errors", function() {

Expand Down
21 changes: 17 additions & 4 deletions js/browser/bluebird.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* bluebird build version 1.0.5
* bluebird build version 1.0.6
* Features enabled: core, timers, race, any, call_get, filter, generators, map, nodeify, promisify, props, reduce, settle, some, progress, cancel, synchronous_inspection
*/
/**
Expand Down Expand Up @@ -1889,6 +1889,7 @@ Promise.reject = Promise.rejected = function Promise$Reject(reason) {
var trace = new Error(reason + "");
ret._setCarriedStackTrace(trace);
}
ret._ensurePossibleRejectionHandled();
return ret;
};

Expand All @@ -1902,6 +1903,7 @@ function Promise$_resolveFromSyncValue(value, caller) {
this._cleanValues();
this._setRejected();
this._settledValue = value.e;
this._ensurePossibleRejectionHandled();
}
else {
var maybePromise = Promise._cast(value, caller, void 0);
Expand Down Expand Up @@ -2696,7 +2698,9 @@ function Promise$_notifyUnhandledRejection() {
this._unsetCarriedStackTrace();
reason = trace;
}
CapturedTrace.possiblyUnhandledRejection(reason, this);
if (typeof CapturedTrace.possiblyUnhandledRejection === "function") {
CapturedTrace.possiblyUnhandledRejection(reason, this);
}
}
};

Expand Down Expand Up @@ -3479,6 +3483,15 @@ function parameterCount(fn) {
return 0;
}

function propertyAccess(id) {
var rident = /^[a-z$_][a-z$_0-9]*$/i;

if (rident.test(id)) {
return "." + id;
}
else return "['" + id.replace(/(['\\])/g, "\\$1") + "']";
}

function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
var newParameterCount = Math.max(0, parameterCount(fn) - 1);
var argumentOrder = switchCaseArgumentOrder(newParameterCount);
Expand All @@ -3496,7 +3509,7 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {

if (typeof callback === "string" &&
receiver === THIS) {
return "this['" + callback + "']("+args.join(",") +
return "this" + propertyAccess(callback) + "("+args.join(",") +
comma +" fn);"+
"break;";
}
Expand All @@ -3522,7 +3535,7 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
"args[i] = fn;" +

(typeof callback === "string"
? "this['" + callback + "'].apply("
? "this" + propertyAccess(callback) + ".apply("
: "callback.apply(") +

(receiver === THIS ? "this" : "receiver") +
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bluebird",
"description": "Full featured Promises/A+ implementation with exceptionally good performance",
"version": "1.0.5",
"version": "1.0.6",
"keywords": [
"promise",
"performance",
Expand Down

0 comments on commit 1b0f868

Please sign in to comment.