some tweaks

Author: zloirock

packages/core-js/modules/esnext.promise.all-keyed.js

@@ -49,8 +49,8 @@ $({ target: 'Promise', stat: true, forced: true }, {
             --remaining;
             if (remaining === 0) {
               var res = create(null);
-              forEach(keys, function (k, idx) {
-                createProperty(res, k, values[idx]);
+              forEach(keys, function (k, i) {
+                createProperty(res, k, values[i]);
               });
               resolve(res);
             }

packages/core-js/modules/esnext.promise.all-settled-keyed.js

@@ -28,13 +28,6 @@ $({ target: 'Promise', stat: true, forced: true }, {
     var resolve = capability.resolve;
     var reject = capability.reject;
     var result = perform(function () {
-      var wrapResolve = function () {
-        var res = create(null);
-        forEach(keys, function (k, idx) {
-          createProperty(res, k, values[idx]);
-        });
-        resolve(res);
-      };
       var promiseResolve = aCallable(C.resolve);
       var allKeys = ownKeys(anObject(promises));
       var keys = [];
@@ -44,26 +37,31 @@ $({ target: 'Promise', stat: true, forced: true }, {
       forEach(allKeys, function (key) {
         var desc = getOwnPropertyDescriptor.f(promises, key);
         if (desc && desc.enumerable) {
+          var createElementResolver = function (rejection) {
+            return function (value) {
+              if (alreadyCalled) return;
+              alreadyCalled = true;
+              values[index] = rejection
+                ? { status: 'rejected', reason: value }
+                : { status: 'fulfilled', value: value };
+              if (--remaining) return;
+              var res = create(null);
+              forEach(keys, function (k, i) {
+                createProperty(res, k, values[i]);
+              });
+              resolve(res);
+            };
+          };
           var index = counter;
           var alreadyCalled = false;
           remaining++;
           keys[index] = key;
           values[index] = undefined;
-          call(promiseResolve, C, promises[key]).then(function (value) {
-            if (alreadyCalled) return;
-            alreadyCalled = true;
-            values[index] = { status: 'fulfilled', value: value };
-            --remaining || wrapResolve();
-          }, function (error) {
-            if (alreadyCalled) return;
-            alreadyCalled = true;
-            values[index] = { status: 'rejected', reason: error };
-            --remaining || wrapResolve();
-          });
+          call(promiseResolve, C, promises[key]).then(createElementResolver(false), createElementResolver(true));
           counter++;
         }
       });
-      --remaining || wrapResolve();
+      --remaining || resolve(create(null));
     });
     if (result.error) reject(result.value);
     return capability.promise;

tests/unit-pure/esnext.promise.all-keyed.js

@@ -1,7 +1,6 @@
 import $allKeyed from '@core-js/pure/full/promise/all-keyed';
 import Promise from '@core-js/pure/full/promise';
-import Symbol from '@core-js/pure/full/symbol';
-import Object from '@core-js/pure/full/object';
+import Symbol from '@core-js/pure/es/symbol';
 
 QUnit.test('Promise.allKeyed', assert => {
   assert.isFunction(Promise.allKeyed);

tests/unit-pure/esnext.promise.all-settled-keyed.js

@@ -1,7 +1,6 @@
 import $allSettledKeyed from '@core-js/pure/full/promise/all-settled-keyed';
 import Promise from '@core-js/pure/full/promise';
-import Symbol from '@core-js/pure/full/symbol';
-import Object from '@core-js/pure/full/object';
+import Symbol from '@core-js/pure/es/symbol';
 
 QUnit.test('Promise.allSettledKeyed', assert => {
   const { allSettledKeyed } = Promise;
@@ -38,7 +37,6 @@ QUnit.test('Promise.allSettledKeyed, resolved with rejection', assert => {
 });
 
 QUnit.test('Promise.allSettledKeyed, rejected', assert => {
-  // eslint-disable-next-line promise/valid-params -- required for testing
   return Promise.allSettledKeyed().then(() => {
     assert.avoid();
   }, () => {