core-js-pure 3.25.4 → 3.26.0

package/README.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[![fundraising](https://opencollective.com/core-js/all/badge.svg?label=fundraising)](https://opencollective.com/core-js) [![PRs welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/zloirock/core-js/blob/master/CONTRIBUTING.md) [![version](https://img.shields.io/npm/v/core-js-pure.svg)](https://www.npmjs.com/package/core-js-pure) [![core-js-pure downloads](https://img.shields.io/npm/dm/core-js-pure.svg?label=npm%20i%20core-js-pure)](https://npm-stat.com/charts.html?package=core-js&package=core-js-pure&package=core-js-compat&from=2014-11-18) [![tests](https://github.com/zloirock/core-js/workflows/tests/badge.svg)](https://github.com/zloirock/core-js/actions) [![eslint](https://github.com/zloirock/core-js/workflows/eslint/badge.svg)](https://github.com/zloirock/core-js/actions)
+[![fundraising](https://opencollective.com/core-js/all/badge.svg?label=fundraising)](https://opencollective.com/core-js) [![PRs welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/zloirock/core-js/blob/master/CONTRIBUTING.md) [![version](https://img.shields.io/npm/v/core-js-pure.svg)](https://www.npmjs.com/package/core-js-pure) [![core-js-pure downloads](https://img.shields.io/npm/dm/core-js-pure.svg?label=npm%20i%20core-js-pure)](https://npm-stat.com/charts.html?package=core-js&package=core-js-pure&package=core-js-compat&from=2014-11-18)
 
 </div>
 

package/actual/array/from-async.js

@@ -0,0 +1,8 @@
+require('../../modules/es.array.iterator');
+require('../../modules/es.object.to-string');
+require('../../modules/es.promise');
+require('../../modules/es.string.iterator');
+require('../../modules/esnext.array.from-async');
+var path = require('../../internals/path');
+
+module.exports = path.Array.fromAsync;

package/actual/array/index.js

@@ -3,6 +3,7 @@ require('../../modules/es.map');
 require('../../modules/es.object.to-string');
 require('../../modules/esnext.array.find-last');
 require('../../modules/esnext.array.find-last-index');
+require('../../modules/esnext.array.from-async');
 require('../../modules/esnext.array.group');
 require('../../modules/esnext.array.group-by');
 require('../../modules/esnext.array.group-by-to-map');

package/actual/self.js

@@ -0,0 +1,3 @@
+var parent = require('../stable/self');
+
+module.exports = parent;

package/features/instance/is-well-formed.js

@@ -0,0 +1 @@
+module.exports = require('../../full/instance/is-well-formed');

package/features/instance/to-well-formed.js

@@ -0,0 +1 @@
+module.exports = require('../../full/instance/to-well-formed');

package/features/self.js

@@ -0,0 +1 @@
+module.exports = require('../full/self');

package/features/string/is-well-formed.js

@@ -0,0 +1 @@
+module.exports = require('../../full/string/is-well-formed');

package/features/string/to-well-formed.js

@@ -0,0 +1 @@
+module.exports = require('../../full/string/to-well-formed');

package/features/string/virtual/is-well-formed.js

@@ -0,0 +1 @@
+module.exports = require('../../../full/string/virtual/is-well-formed');

package/features/string/virtual/to-well-formed.js

@@ -0,0 +1 @@
+module.exports = require('../../../full/string/virtual/to-well-formed');

package/full/array/from-async.js

@@ -1,8 +1,3 @@
-require('../../modules/es.array.iterator');
-require('../../modules/es.object.to-string');
-require('../../modules/es.promise');
-require('../../modules/es.string.iterator');
-require('../../modules/esnext.array.from-async');
-var path = require('../../internals/path');
+var parent = require('../../actual/array/from-async');
 
-module.exports = path.Array.fromAsync;
+module.exports = parent;

package/full/array/index.js

@@ -1,6 +1,5 @@
 var parent = require('../../actual/array');
 require('../../modules/es.promise');
-require('../../modules/esnext.array.from-async');
 // TODO: Remove from `core-js@4`
 require('../../modules/esnext.array.at');
 // TODO: Remove from `core-js@4`

package/full/index.js

@@ -361,8 +361,10 @@ require('../modules/esnext.set.union');
 require('../modules/esnext.string.at');
 require('../modules/esnext.string.cooked');
 require('../modules/esnext.string.code-points');
+require('../modules/esnext.string.is-well-formed');
 require('../modules/esnext.string.match-all');
 require('../modules/esnext.string.replace-all');
+require('../modules/esnext.string.to-well-formed');
 require('../modules/esnext.symbol.async-dispose');
 require('../modules/esnext.symbol.dispose');
 require('../modules/esnext.symbol.matcher');
@@ -401,6 +403,7 @@ require('../modules/web.dom-exception.stack');
 require('../modules/web.dom-exception.to-string-tag');
 require('../modules/web.immediate');
 require('../modules/web.queue-microtask');
+require('../modules/web.self');
 require('../modules/web.structured-clone');
 require('../modules/web.timers');
 require('../modules/web.url');

package/full/instance/is-well-formed.js

@@ -0,0 +1,10 @@
+var isPrototypeOf = require('../../internals/object-is-prototype-of');
+var method = require('../string/virtual/is-well-formed');
+
+var StringPrototype = String.prototype;
+
+module.exports = function (it) {
+  var own = it.isWellFormed;
+  return typeof it == 'string' || it === StringPrototype
+    || (isPrototypeOf(StringPrototype, it) && own === StringPrototype.isWellFormed) ? method : own;
+};

package/full/instance/to-well-formed.js

@@ -0,0 +1,10 @@
+var isPrototypeOf = require('../../internals/object-is-prototype-of');
+var method = require('../string/virtual/to-well-formed');
+
+var StringPrototype = String.prototype;
+
+module.exports = function (it) {
+  var own = it.toWellFormed;
+  return typeof it == 'string' || it === StringPrototype
+    || (isPrototypeOf(StringPrototype, it) && own === StringPrototype.toWellFormed) ? method : own;
+};

package/full/self.js

@@ -0,0 +1,3 @@
+var parent = require('../actual/self');
+
+module.exports = parent;

package/full/string/index.js

@@ -3,8 +3,10 @@ var parent = require('../../actual/string');
 require('../../modules/esnext.string.at');
 require('../../modules/esnext.string.cooked');
 require('../../modules/esnext.string.code-points');
+require('../../modules/esnext.string.is-well-formed');
 // TODO: remove from `core-js@4`
 require('../../modules/esnext.string.match-all');
 require('../../modules/esnext.string.replace-all');
+require('../../modules/esnext.string.to-well-formed');
 
 module.exports = parent;

package/full/string/is-well-formed.js

@@ -0,0 +1,3 @@
+require('../../modules/esnext.string.is-well-formed');
+
+module.exports = require('../../internals/entry-unbind')('String', 'isWellFormed');

package/full/string/to-well-formed.js

@@ -0,0 +1,3 @@
+require('../../modules/esnext.string.to-well-formed');
+
+module.exports = require('../../internals/entry-unbind')('String', 'toWellFormed');

package/full/string/virtual/index.js

@@ -2,8 +2,10 @@ var parent = require('../../../actual/string/virtual');
 // TODO: remove from `core-js@4`
 require('../../../modules/esnext.string.at');
 require('../../../modules/esnext.string.code-points');
+require('../../../modules/esnext.string.is-well-formed');
 // TODO: remove from `core-js@4`
 require('../../../modules/esnext.string.match-all');
 require('../../../modules/esnext.string.replace-all');
+require('../../../modules/esnext.string.to-well-formed');
 
 module.exports = parent;

package/full/string/virtual/is-well-formed.js

@@ -0,0 +1,3 @@
+require('../../../modules/esnext.string.is-well-formed');
+
+module.exports = require('../../../internals/entry-virtual')('String').isWellFormed;

package/full/string/virtual/to-well-formed.js

@@ -0,0 +1,3 @@
+require('../../../modules/esnext.string.to-well-formed');
+
+module.exports = require('../../../internals/entry-virtual')('String').toWellFormed;

package/internals/array-from-async.js

@@ -1,9 +1,11 @@
 'use strict';
 var bind = require('../internals/function-bind-context');
+var uncurryThis = require('../internals/function-uncurry-this');
 var toObject = require('../internals/to-object');
 var isConstructor = require('../internals/is-constructor');
 var getAsyncIterator = require('../internals/get-async-iterator');
 var getIterator = require('../internals/get-iterator');
+var getIteratorDirect = require('../internals/get-iterator-direct');
 var getIteratorMethod = require('../internals/get-iterator-method');
 var getMethod = require('../internals/get-method');
 var getVirtual = require('../internals/entry-virtual');
@@ -13,7 +15,20 @@ var AsyncFromSyncIterator = require('../internals/async-from-sync-iterator');
 var toArray = require('../internals/async-iterator-iteration').toArray;
 
 var ASYNC_ITERATOR = wellKnownSymbol('asyncIterator');
-var arrayIterator = getVirtual('Array').values;
+var arrayIterator = uncurryThis(getVirtual('Array').values);
+var arrayIteratorNext = uncurryThis(arrayIterator([]).next);
+
+var safeArrayIterator = function () {
+  return new SafeArrayIterator(this);
+};
+
+var SafeArrayIterator = function (O) {
+  this.iterator = arrayIterator(O);
+};
+
+SafeArrayIterator.prototype.next = function () {
+  return arrayIteratorNext(this.iterator);
+};
 
 // `Array.fromAsync` method implementation
 // https://github.com/tc39/proposal-array-from-async
@@ -26,11 +41,11 @@ module.exports = function fromAsync(asyncItems /* , mapfn = undefined, thisArg =
     var O = toObject(asyncItems);
     if (mapfn !== undefined) mapfn = bind(mapfn, thisArg);
     var usingAsyncIterator = getMethod(O, ASYNC_ITERATOR);
-    var usingSyncIterator = usingAsyncIterator ? undefined : getIteratorMethod(O) || arrayIterator;
+    var usingSyncIterator = usingAsyncIterator ? undefined : getIteratorMethod(O) || safeArrayIterator;
     var A = isConstructor(C) ? new C() : [];
     var iterator = usingAsyncIterator
       ? getAsyncIterator(O, usingAsyncIterator)
-      : new AsyncFromSyncIterator(getIterator(O, usingSyncIterator));
+      : new AsyncFromSyncIterator(getIteratorDirect(getIterator(O, usingSyncIterator)));
     resolve(toArray(iterator, mapfn, A));
   });
 };

package/internals/async-from-sync-iterator.js

@@ -22,12 +22,9 @@ var asyncFromSyncIteratorContinuation = function (result, resolve, reject) {
   }, reject);
 };
 
-var AsyncFromSyncIterator = function AsyncIterator(iterator) {
-  setInternalState(this, {
-    type: ASYNC_FROM_SYNC_ITERATOR,
-    iterator: anObject(iterator),
-    next: iterator.next
-  });
+var AsyncFromSyncIterator = function AsyncIterator(iteratorRecord) {
+  iteratorRecord.type = ASYNC_FROM_SYNC_ITERATOR;
+  setInternalState(this, iteratorRecord);
 };
 
 AsyncFromSyncIterator.prototype = defineBuiltIns(create(AsyncIteratorPrototype), {

package/internals/async-iterator-create-proxy.js

@@ -79,11 +79,10 @@ var createAsyncIteratorProxyPrototype = function (IS_ITERATOR) {
       return exit ? state : enqueue(state, function () {
         state.done = true;
         var iterator = state.iterator;
-        var innerIterator = state.innerIterator;
         var returnMethod, result;
         var completion = perform(function () {
-          if (innerIterator) try {
-            iteratorClose(innerIterator, 'return');
+          if (state.inner) try {
+            iteratorClose(state.inner.iterator, 'return');
           } catch (error) {
             return iteratorClose(iterator, 'throw', error);
           }
@@ -125,6 +124,7 @@ module.exports = function (nextHandler, IS_ITERATOR) {
     } else state = record;
     state.type = ASYNC_ITERATOR_PROXY;
     state.nextHandler = nextHandler;
+    state.counter = 0;
     state.done = false;
     state.awaiting = null;
     setInternalState(this, state);

package/internals/async-iterator-iteration.js

@@ -4,6 +4,7 @@
 var call = require('../internals/function-call');
 var aCallable = require('../internals/a-callable');
 var anObject = require('../internals/an-object');
+var isObject = require('../internals/is-object');
 var doesNotExceedSafeInteger = require('../internals/does-not-exceed-safe-integer');
 var getBuiltIn = require('../internals/get-built-in');
 var getIteratorDirect = require('../internals/get-iterator-direct');
@@ -19,7 +20,7 @@ var createMethod = function (TYPE) {
     var Promise = getBuiltIn('Promise');
     var iterator = record.iterator;
     var next = record.next;
-    var index = 0;
+    var counter = 0;
     var MAPPING = fn !== undefined;
     if (MAPPING || !IS_TO_ARRAY) aCallable(fn);
 
@@ -30,36 +31,41 @@ var createMethod = function (TYPE) {
 
       var loop = function () {
         try {
-          if (IS_TO_ARRAY && MAPPING) try {
-            doesNotExceedSafeInteger(index);
+          if (MAPPING) try {
+            doesNotExceedSafeInteger(counter);
           } catch (error5) { ifAbruptCloseAsyncIterator(error5); }
           Promise.resolve(anObject(call(next, iterator))).then(function (step) {
             try {
               if (anObject(step).done) {
                 if (IS_TO_ARRAY) {
-                  target.length = index;
+                  target.length = counter;
                   resolve(target);
                 } else resolve(IS_SOME ? false : IS_EVERY || undefined);
               } else {
                 var value = step.value;
                 try {
                   if (MAPPING) {
-                    Promise.resolve(IS_TO_ARRAY ? fn(value, index) : fn(value)).then(function (result) {
+                    var result = fn(value, counter);
+
+                    var handler = function ($result) {
                       if (IS_FOR_EACH) {
                         loop();
                       } else if (IS_EVERY) {
-                        result ? loop() : closeAsyncIteration(iterator, resolve, false, reject);
+                        $result ? loop() : closeAsyncIteration(iterator, resolve, false, reject);
                       } else if (IS_TO_ARRAY) {
                         try {
-                          target[index++] = result;
+                          target[counter++] = $result;
                           loop();
                         } catch (error4) { ifAbruptCloseAsyncIterator(error4); }
                       } else {
-                        result ? closeAsyncIteration(iterator, resolve, IS_SOME || value, reject) : loop();
+                        $result ? closeAsyncIteration(iterator, resolve, IS_SOME || value, reject) : loop();
                       }
-                    }, ifAbruptCloseAsyncIterator);
+                    };
+
+                    if (isObject(result)) Promise.resolve(result).then(handler, ifAbruptCloseAsyncIterator);
+                    else handler(result);
                   } else {
-                    target[index++] = value;
+                    target[counter++] = value;
                     loop();
                   }
                 } catch (error3) { ifAbruptCloseAsyncIterator(error3); }

package/internals/classof-raw.js

@@ -1,7 +1,7 @@
-var uncurryThis = require('../internals/function-uncurry-this');
+var uncurryThisRaw = require('../internals/function-uncurry-this-raw');
 
-var toString = uncurryThis({}.toString);
-var stringSlice = uncurryThis(''.slice);
+var toString = uncurryThisRaw({}.toString);
+var stringSlice = uncurryThisRaw(''.slice);
 
 module.exports = function (it) {
   return stringSlice(toString(it), 8, -1);

package/internals/function-uncurry-this-raw.js

@@ -0,0 +1,11 @@
+var NATIVE_BIND = require('../internals/function-bind-native');
+
+var FunctionPrototype = Function.prototype;
+var call = FunctionPrototype.call;
+var uncurryThisWithBind = NATIVE_BIND && FunctionPrototype.bind.bind(call, call);
+
+module.exports = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
+  return function () {
+    return call.apply(fn, arguments);
+  };
+};

package/internals/function-uncurry-this.js

@@ -1,16 +1,9 @@
-var NATIVE_BIND = require('../internals/function-bind-native');
-
-var $Function = Function;
-var FunctionPrototype = $Function.prototype;
-var bind = FunctionPrototype.bind;
-var call = FunctionPrototype.call;
-var uncurryThis = NATIVE_BIND && bind.bind(call, call);
+var classofRaw = require('../internals/classof-raw');
+var uncurryThisRaw = require('../internals/function-uncurry-this-raw');
 
 module.exports = function (fn) {
   // Nashorn bug:
   //   https://github.com/zloirock/core-js/issues/1128
   //   https://github.com/zloirock/core-js/issues/1130
-  return fn instanceof $Function ? NATIVE_BIND ? uncurryThis(fn) : function () {
-    return call.apply(fn, arguments);
-  } : undefined;
+  if (classofRaw(fn) === 'Function') return uncurryThisRaw(fn);
 };

package/internals/get-async-iterator-flattenable.js

@@ -0,0 +1,28 @@
+var call = require('../internals/function-call');
+var isCallable = require('../internals/is-callable');
+var toObject = require('../internals/to-object');
+var getIteratorDirect = require('../internals/get-iterator-direct');
+var getIteratorMethod = require('../internals/get-iterator-method');
+var getMethod = require('../internals/get-method');
+var wellKnownSymbol = require('../internals/well-known-symbol');
+var AsyncFromSyncIterator = require('../internals/async-from-sync-iterator');
+
+var ASYNC_ITERATOR = wellKnownSymbol('asyncIterator');
+
+module.exports = function from(obj) {
+  var object = toObject(obj);
+  var alreadyAsync = true;
+  var method = getMethod(object, ASYNC_ITERATOR);
+  var iterator;
+  if (!isCallable(method)) {
+    method = getIteratorMethod(object);
+    alreadyAsync = false;
+  }
+  if (isCallable(method)) {
+    iterator = call(method, object);
+  } else {
+    iterator = object;
+    alreadyAsync = true;
+  }
+  return getIteratorDirect(alreadyAsync ? iterator : new AsyncFromSyncIterator(getIteratorDirect(iterator)));
+};

package/internals/get-async-iterator.js

@@ -2,6 +2,7 @@ var call = require('../internals/function-call');
 var AsyncFromSyncIterator = require('../internals/async-from-sync-iterator');
 var anObject = require('../internals/an-object');
 var getIterator = require('../internals/get-iterator');
+var getIteratorDirect = require('../internals/get-iterator-direct');
 var getMethod = require('../internals/get-method');
 var wellKnownSymbol = require('../internals/well-known-symbol');
 
@@ -9,5 +10,5 @@ var ASYNC_ITERATOR = wellKnownSymbol('asyncIterator');
 
 module.exports = function (it, usingIterator) {
   var method = arguments.length < 2 ? getMethod(it, ASYNC_ITERATOR) : usingIterator;
-  return method ? anObject(call(method, it)) : new AsyncFromSyncIterator(getIterator(it));
+  return method ? anObject(call(method, it)) : new AsyncFromSyncIterator(getIteratorDirect(getIterator(it)));
 };

package/internals/get-iterator-flattenable.js

@@ -0,0 +1,11 @@
+var call = require('../internals/function-call');
+var isCallable = require('../internals/is-callable');
+var toObject = require('../internals/to-object');
+var getIteratorDirect = require('../internals/get-iterator-direct');
+var getIteratorMethod = require('../internals/get-iterator-method');
+
+module.exports = function (obj) {
+  var object = toObject(obj);
+  var method = getIteratorMethod(object);
+  return getIteratorDirect(isCallable(method) ? call(method, object) : object);
+};

package/internals/internal-state.js

@@ -1,6 +1,5 @@
 var NATIVE_WEAK_MAP = require('../internals/weak-map-basic-detection');
 var global = require('../internals/global');
-var uncurryThis = require('../internals/function-uncurry-this');
 var isObject = require('../internals/is-object');
 var createNonEnumerableProperty = require('../internals/create-non-enumerable-property');
 var hasOwn = require('../internals/has-own-property');
@@ -28,20 +27,22 @@ var getterFor = function (TYPE) {
 
 if (NATIVE_WEAK_MAP || shared.state) {
   var store = shared.state || (shared.state = new WeakMap());
-  var wmget = uncurryThis(store.get);
-  var wmhas = uncurryThis(store.has);
-  var wmset = uncurryThis(store.set);
+  /* eslint-disable no-self-assign -- prototype methods protection */
+  store.get = store.get;
+  store.has = store.has;
+  store.set = store.set;
+  /* eslint-enable no-self-assign -- prototype methods protection */
   set = function (it, metadata) {
-    if (wmhas(store, it)) throw TypeError(OBJECT_ALREADY_INITIALIZED);
+    if (store.has(it)) throw TypeError(OBJECT_ALREADY_INITIALIZED);
     metadata.facade = it;
-    wmset(store, it, metadata);
+    store.set(it, metadata);
     return metadata;
   };
   get = function (it) {
-    return wmget(store, it) || {};
+    return store.get(it) || {};
   };
   has = function (it) {
-    return wmhas(store, it);
+    return store.has(it);
   };
 } else {
   var STATE = sharedKey('state');

package/internals/iterator-create-proxy.js

@@ -44,9 +44,8 @@ var createIteratorProxyPrototype = function (IS_ITERATOR) {
         var returnMethod = getMethod(iterator, 'return');
         return returnMethod ? call(returnMethod, iterator) : createIterResultObject(undefined, true);
       }
-      var innerIterator = state.innerIterator;
-      if (innerIterator) try {
-        iteratorClose(innerIterator, 'return');
+      if (state.inner) try {
+        iteratorClose(state.inner.iterator, 'return');
       } catch (error) {
         return iteratorClose(iterator, 'throw', error);
       }
@@ -75,6 +74,7 @@ module.exports = function (nextHandler, IS_ITERATOR) {
     } else state = record;
     state.type = ITERATOR_PROXY;
     state.nextHandler = nextHandler;
+    state.counter = 0;
     state.done = false;
     setInternalState(this, state);
   };

package/internals/shared.js

@@ -4,9 +4,9 @@ var store = require('../internals/shared-store');
 (module.exports = function (key, value) {
   return store[key] || (store[key] = value !== undefined ? value : {});
 })('versions', []).push({
-  version: '3.25.4',
+  version: '3.26.0',
   mode: IS_PURE ? 'pure' : 'global',
   copyright: '© 2014-2022 Denis Pushkarev (zloirock.ru)',
-  license: 'https://github.com/zloirock/core-js/blob/v3.25.4/LICENSE',
+  license: 'https://github.com/zloirock/core-js/blob/v3.26.0/LICENSE',
   source: 'https://github.com/zloirock/core-js'
 });

package/modules/esnext.async-iterator.filter.js

@@ -4,6 +4,7 @@ var $ = require('../internals/export');
 var call = require('../internals/function-call');
 var aCallable = require('../internals/a-callable');
 var anObject = require('../internals/an-object');
+var isObject = require('../internals/is-object');
 var getIteratorDirect = require('../internals/get-iterator-direct');
 var createAsyncIteratorProxy = require('../internals/async-iterator-create-proxy');
 var createIterResultObject = require('../internals/create-iter-result-object');
@@ -34,9 +35,14 @@ var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) {
             } else {
               var value = step.value;
               try {
-                Promise.resolve(filterer(value)).then(function (selected) {
+                var result = filterer(value, state.counter++);
+
+                var handler = function (selected) {
                   selected ? resolve(createIterResultObject(value, false)) : loop();
-                }, ifAbruptCloseAsyncIterator);
+                };
+
+                if (isObject(result)) Promise.resolve(result).then(handler, ifAbruptCloseAsyncIterator);
+                else handler(result);
               } catch (error3) { ifAbruptCloseAsyncIterator(error3); }
             }
           } catch (error2) { doneAndReject(error2); }

package/modules/esnext.async-iterator.flat-map.js

@@ -4,17 +4,17 @@ var $ = require('../internals/export');
 var call = require('../internals/function-call');
 var aCallable = require('../internals/a-callable');
 var anObject = require('../internals/an-object');
+var isObject = require('../internals/is-object');
 var getIteratorDirect = require('../internals/get-iterator-direct');
 var createAsyncIteratorProxy = require('../internals/async-iterator-create-proxy');
 var createIterResultObject = require('../internals/create-iter-result-object');
-var getAsyncIterator = require('../internals/get-async-iterator');
+var getAsyncIteratorFlattenable = require('../internals/get-async-iterator-flattenable');
 var closeAsyncIteration = require('../internals/async-iterator-close');
 
 var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) {
   var state = this;
   var iterator = state.iterator;
   var mapper = state.mapper;
-  var innerIterator;
 
   return new Promise(function (resolve, reject) {
     var doneAndReject = function (error) {
@@ -36,13 +36,17 @@ var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) {
             } else {
               var value = step.value;
               try {
-                Promise.resolve(mapper(value)).then(function (mapped) {
+                var result = mapper(value, state.counter++);
+
+                var handler = function (mapped) {
                   try {
-                    state.innerIterator = innerIterator = getAsyncIterator(mapped);
-                    state.innerNext = aCallable(innerIterator.next);
+                    state.inner = getAsyncIteratorFlattenable(mapped);
                     innerLoop();
                   } catch (error4) { ifAbruptCloseAsyncIterator(error4); }
-                }, ifAbruptCloseAsyncIterator);
+                };
+
+                if (isObject(result)) Promise.resolve(result).then(handler, ifAbruptCloseAsyncIterator);
+                else handler(result);
               } catch (error3) { ifAbruptCloseAsyncIterator(error3); }
             }
           } catch (error2) { doneAndReject(error2); }
@@ -51,12 +55,13 @@ var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) {
     };
 
     var innerLoop = function () {
-      if (innerIterator = state.innerIterator) {
+      var inner = state.inner;
+      if (inner) {
         try {
-          Promise.resolve(anObject(call(state.innerNext, innerIterator))).then(function (result) {
+          Promise.resolve(anObject(call(inner.next, inner.iterator))).then(function (result) {
             try {
               if (anObject(result).done) {
-                state.innerIterator = state.innerNext = null;
+                state.inner = null;
                 outerLoop();
               } else resolve(createIterResultObject(result.value, false));
             } catch (error1) { ifAbruptCloseAsyncIterator(error1); }
@@ -73,8 +78,7 @@ $({ target: 'AsyncIterator', proto: true, real: true, forced: true }, {
   flatMap: function flatMap(mapper) {
     return new AsyncIteratorProxy(getIteratorDirect(this), {
       mapper: aCallable(mapper),
-      innerIterator: null,
-      innerNext: null
+      inner: null
     });
   }
 });