Release v1.2.4

petkaantonov · Apr 27, 2014 · ca0f2f8 · ca0f2f8
1 parent 968df84
commit ca0f2f8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bluebird",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "homepage": "https://github.com/petkaantonov/bluebird",
   "authors": [
     "Petka Antonov <[email protected]>"
@@ -32,4 +32,4 @@
     "dsl",
     "fluent interface"
   ]
-}
+}
diff --git a/browser/bundle.js b/browser/bundle.js
@@ -4293,7 +4293,7 @@ else {
     var str = {}.toString;
     var proto = {}.constructor.prototype;
 
-    function ObjectKeys(o) {
+    var ObjectKeys = function ObjectKeys(o) {
         var ret = [];
         for (var key in o) {
             if (has.call(o, key)) {
@@ -4303,16 +4303,16 @@ else {
         return ret;
     }
 
-    function ObjectDefineProperty(o, key, desc) {
+    var ObjectDefineProperty = function ObjectDefineProperty(o, key, desc) {
         o[key] = desc.value;
         return o;
     }
 
-    function ObjectFreeze(obj) {
+    var ObjectFreeze = function ObjectFreeze(obj) {
         return obj;
     }
 
-    function ObjectGetPrototypeOf(obj) {
+    var ObjectGetPrototypeOf = function ObjectGetPrototypeOf(obj) {
         try {
             return Object(obj).constructor.prototype;
         }
@@ -4321,7 +4321,7 @@ else {
         }
     }
 
-    function ArrayIsArray(obj) {
+    var ArrayIsArray = function ArrayIsArray(obj) {
         try {
             return str.call(obj) === "[object Array]";
         }
@@ -6612,6 +6612,9 @@ PromiseResolver.prototype.toString = function PromiseResolver$toString() {
 PromiseResolver.prototype.resolve =
 PromiseResolver.prototype.fulfill = function PromiseResolver$resolve(value) {
     var promise = this.promise;
+    if ((promise === void 0) || (promise._tryFollow === void 0)) {
+        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.");
+    }
     if (promise._tryFollow(value)) {
         return;
     }
@@ -6620,6 +6623,9 @@ PromiseResolver.prototype.fulfill = function PromiseResolver$resolve(value) {
 
 PromiseResolver.prototype.reject = function PromiseResolver$reject(reason) {
     var promise = this.promise;
+    if ((promise === void 0) || (promise._attachExtraTrace === void 0)) {
+        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.");
+    }
     errors.markAsOriginatingFromRejection(reason);
     var trace = errors.canAttach(reason) ? reason : new Error(reason + "");
     promise._attachExtraTrace(trace);
@@ -6930,9 +6936,8 @@ function parameterCount(fn) {
     return 0;
 }
 
+var rident = /^[a-z$_][a-z$_0-9]*$/i;
 function propertyAccess(id) {
-    var rident = /^[a-z$_][a-z$_0-9]*$/i;
-
     if (rident.test(id)) {
         return "." + id;
     }
@@ -6970,6 +6975,10 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
         "break;";
     }
 
+    if (!rident.test(callbackName)) {
+        callbackName = "promisified";
+    }
+
     function generateArgumentSwitchCase() {
         var ret = "";
         for(var i = 0; i < argumentOrder.length; ++i) {
@@ -24119,6 +24128,8 @@ describe( "Promisify from prototype to object", function() {
 
         };
 
+        method["---invalid---"] = function(){};
+
         if ((function(){"use strict"; return this === void 0})()) {
             Object.defineProperty(method, "thrower", {
                 enumerable: true,

diff --git a/js/browser/bluebird.js b/js/browser/bluebird.js
@@ -1,5 +1,5 @@
 /**
- * bluebird build version 1.2.3
+ * bluebird build version 1.2.4
  * Features enabled: core, timers, race, any, call_get, filter, generators, map, nodeify, promisify, props, reduce, settle, some, progress, cancel
 */
 /**
@@ -949,7 +949,7 @@ else {
     var str = {}.toString;
     var proto = {}.constructor.prototype;
 
-    function ObjectKeys(o) {
+    var ObjectKeys = function ObjectKeys(o) {
         var ret = [];
         for (var key in o) {
             if (has.call(o, key)) {
@@ -959,16 +959,16 @@ else {
         return ret;
     }
 
-    function ObjectDefineProperty(o, key, desc) {
+    var ObjectDefineProperty = function ObjectDefineProperty(o, key, desc) {
         o[key] = desc.value;
         return o;
     }
 
-    function ObjectFreeze(obj) {
+    var ObjectFreeze = function ObjectFreeze(obj) {
         return obj;
     }
 
-    function ObjectGetPrototypeOf(obj) {
+    var ObjectGetPrototypeOf = function ObjectGetPrototypeOf(obj) {
         try {
             return Object(obj).constructor.prototype;
         }
@@ -977,7 +977,7 @@ else {
         }
     }
 
-    function ArrayIsArray(obj) {
+    var ArrayIsArray = function ArrayIsArray(obj) {
         try {
             return str.call(obj) === "[object Array]";
         }
@@ -3098,6 +3098,9 @@ PromiseResolver.prototype.toString = function PromiseResolver$toString() {
 PromiseResolver.prototype.resolve =
 PromiseResolver.prototype.fulfill = function PromiseResolver$resolve(value) {
     var promise = this.promise;
+    if ((promise === void 0) || (promise._tryFollow === void 0)) {
+        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.");
+    }
     if (promise._tryFollow(value)) {
         return;
     }
@@ -3106,6 +3109,9 @@ PromiseResolver.prototype.fulfill = function PromiseResolver$resolve(value) {
 
 PromiseResolver.prototype.reject = function PromiseResolver$reject(reason) {
     var promise = this.promise;
+    if ((promise === void 0) || (promise._attachExtraTrace === void 0)) {
+        throw new TypeError("Illegal invocation, resolver resolve/reject must be called within a resolver context. Consider using the promise constructor instead.");
+    }
     errors.markAsOriginatingFromRejection(reason);
     var trace = errors.canAttach(reason) ? reason : new Error(reason + "");
     promise._attachExtraTrace(trace);
@@ -3412,9 +3418,8 @@ function parameterCount(fn) {
     return 0;
 }
 
+var rident = /^[a-z$_][a-z$_0-9]*$/i;
 function propertyAccess(id) {
-    var rident = /^[a-z$_][a-z$_0-9]*$/i;
-
     if (rident.test(id)) {
         return "." + id;
     }
@@ -3450,6 +3455,10 @@ function makeNodePromisifiedEval(callback, receiver, originalName, fn) {
         "break;";
     }
 
+    if (!rident.test(callbackName)) {
+        callbackName = "promisified";
+    }
+
     function generateArgumentSwitchCase() {
         var ret = "";
         for(var i = 0; i < argumentOrder.length; ++i) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bluebird",
     "description": "Full featured Promises/A+ implementation with exceptionally good performance",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "keywords": [
         "promise",
         "performance",