use NewPromiseCapability logic in Promise#finally

zloirock · Jul 18, 2017 · 86ed553 · 86ed553
1 parent ed59a9c
commit 86ed553
Show file tree

Hide file tree

Showing 15 changed files with 1,106 additions and 1,053 deletions.
diff --git a/client/core.js b/client/core.js
diff --git a/client/core.min.js b/client/core.min.js
diff --git a/client/core.min.js.map b/client/core.min.js.map
diff --git a/client/library.js b/client/library.js
diff --git a/client/library.min.js b/client/library.min.js
diff --git a/client/library.min.js.map b/client/library.min.js.map
diff --git a/client/shim.js b/client/shim.js
diff --git a/client/shim.min.js b/client/shim.min.js
diff --git a/client/shim.min.js.map b/client/shim.min.js.map
diff --git a/library/modules/_promise-resolve.js b/library/modules/_promise-resolve.js
@@ -0,0 +1,8 @@
+var newPromiseCapability = require('./_new-promise-capability');
+
+module.exports = function (C, x) {
+  var promiseCapability = newPromiseCapability.f(C);
+  var resolve = promiseCapability.resolve;
+  resolve(x);
+  return promiseCapability.promise;
+};
diff --git a/library/modules/es6.promise.js b/library/modules/es6.promise.js
@@ -13,6 +13,7 @@ var task = require('./_task').set;
 var microtask = require('./_microtask')();
 var newPromiseCapabilityModule = require('./_new-promise-capability');
 var perform = require('./_perform');
+var promiseResolve = require('./_promise-resolve');
 var PROMISE = 'Promise';
 var TypeError = global.TypeError;
 var process = global.process;
@@ -238,10 +239,7 @@ $export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
   resolve: function resolve(x) {
     // instanceof instead of internal slot check because we should fix it without replacement native Promise core
     if (x instanceof $Promise && sameConstructor(x.constructor, this)) return x;
-    var capability = newPromiseCapability(this);
-    var $$resolve = capability.resolve;
-    $$resolve(x);
-    return capability.promise;
+    return promiseResolve(this, x);
   }
 });
 $export($export.S + $export.F * !(USE_NATIVE && require('./_iter-detect')(function (iter) {

diff --git a/library/modules/es7.promise.finally.js b/library/modules/es7.promise.finally.js
@@ -4,16 +4,17 @@ var $export = require('./_export');
 var core = require('./_core');
 var global = require('./_global');
 var speciesConstructor = require('./_species-constructor');
+var promiseResolve = require('./_promise-resolve');
 
 $export($export.P, 'Promise', { 'finally': function (onFinally) {
   var C = speciesConstructor(this, core.Promise || global.Promise);
   var isFunction = typeof onFinally == 'function';
   return this.then(
     isFunction ? function (x) {
-      return new C(function (resolve) { resolve(onFinally()); }).then(function () { return x; });
+      return promiseResolve(C, onFinally()).then(function () { return x; });
     } : onFinally,
     isFunction ? function (e) {
-      return new C(function (resolve) { resolve(onFinally()); }).then(function () { throw e; });
+      return promiseResolve(C, onFinally()).then(function () { throw e; });
     } : onFinally
   );
 } });
diff --git a/modules/_promise-resolve.js b/modules/_promise-resolve.js
@@ -0,0 +1,8 @@
+var newPromiseCapability = require('./_new-promise-capability');
+
+module.exports = function (C, x) {
+  var promiseCapability = newPromiseCapability.f(C);
+  var resolve = promiseCapability.resolve;
+  resolve(x);
+  return promiseCapability.promise;
+};
diff --git a/modules/es6.promise.js b/modules/es6.promise.js
@@ -13,6 +13,7 @@ var task = require('./_task').set;
 var microtask = require('./_microtask')();
 var newPromiseCapabilityModule = require('./_new-promise-capability');
 var perform = require('./_perform');
+var promiseResolve = require('./_promise-resolve');
 var PROMISE = 'Promise';
 var TypeError = global.TypeError;
 var process = global.process;
@@ -238,10 +239,7 @@ $export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
   resolve: function resolve(x) {
     // instanceof instead of internal slot check because we should fix it without replacement native Promise core
     if (x instanceof $Promise && sameConstructor(x.constructor, this)) return x;
-    var capability = newPromiseCapability(this);
-    var $$resolve = capability.resolve;
-    $$resolve(x);
-    return capability.promise;
+    return promiseResolve(this, x);
   }
 });
 $export($export.S + $export.F * !(USE_NATIVE && require('./_iter-detect')(function (iter) {

diff --git a/modules/es7.promise.finally.js b/modules/es7.promise.finally.js
@@ -4,16 +4,17 @@ var $export = require('./_export');
 var core = require('./_core');
 var global = require('./_global');
 var speciesConstructor = require('./_species-constructor');
+var promiseResolve = require('./_promise-resolve');
 
 $export($export.P, 'Promise', { 'finally': function (onFinally) {
   var C = speciesConstructor(this, core.Promise || global.Promise);
   var isFunction = typeof onFinally == 'function';
   return this.then(
     isFunction ? function (x) {
-      return new C(function (resolve) { resolve(onFinally()); }).then(function () { return x; });
+      return promiseResolve(C, onFinally()).then(function () { return x; });
     } : onFinally,
     isFunction ? function (e) {
-      return new C(function (resolve) { resolve(onFinally()); }).then(function () { throw e; });
+      return promiseResolve(C, onFinally()).then(function () { throw e; });
     } : onFinally
   );
 } });