@nx/devkit 16.8.0-beta.4 → 16.8.0-beta.5

package/nx.js

@@ -6,14 +6,18 @@ exports.requireNx = void 0;
 // - import {} from 'nx/src/devkit-internals'
 function requireNx() {
     try {
-        let result = Object.assign({}, require('nx/src/devkit-exports'));
+        let result = { ...require('nx/src/devkit-exports') };
         try {
-            result = Object.assign(Object.assign({}, result), require('nx/src/devkit-internals'));
+            result = {
+                ...result,
+                // Remove in Nx v18, devkit should not support Nx v16.0.2 at that point.
+                ...require('nx/src/devkit-internals'),
+            };
         }
-        catch (_a) { }
+        catch { }
         return result;
     }
-    catch (_b) {
+    catch {
         // Remove in Nx V17, devkit should not support Nx < 16 at that point.
         return require('./nx-reexports-pre16');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/devkit": "16.8.0-beta.4",
+    "@nrwl/devkit": "16.8.0-beta.5",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
@@ -46,5 +46,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/src/executors/parse-target-string.js

@@ -4,7 +4,7 @@ exports.targetToTargetString = exports.parseTargetString = void 0;
 const nx_1 = require("../../nx");
 let { readCachedProjectGraph, splitTarget } = (0, nx_1.requireNx)();
 // TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
-splitTarget = splitTarget !== null && splitTarget !== void 0 ? splitTarget : require('nx/src/utils/split-target').splitTarget;
+splitTarget = splitTarget ?? require('nx/src/utils/split-target').splitTarget;
 function parseTargetString(targetString, projectGraph) {
     if (!projectGraph) {
         try {

package/src/executors/read-target-options.js

@@ -6,14 +6,14 @@ const path_1 = require("path");
 let { Workspaces, getExecutorInformation, calculateDefaultProjectName, combineOptionsForExecutor, } = (0, nx_1.requireNx)();
 // TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
 combineOptionsForExecutor =
-    combineOptionsForExecutor !== null && combineOptionsForExecutor !== void 0 ? combineOptionsForExecutor : require('nx/src/utils/params').combineOptionsForExecutor;
+    combineOptionsForExecutor ??
+        require('nx/src/utils/params').combineOptionsForExecutor;
 /**
  * Reads and combines options for a given target.
  *
  * Works as if you invoked the target yourself without passing any command lint overrides.
  */
 function readTargetOptions({ project, target, configuration }, context) {
-    var _a;
     const projectConfiguration = (context.workspace || context.projectsConfigurations).projects[project];
     const targetConfiguration = projectConfiguration.targets[target];
     // TODO(v18): remove Workspaces.
@@ -27,6 +27,6 @@ function readTargetOptions({ project, target, configuration }, context) {
         ? calculateDefaultProjectName(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration)
         : // TODO(v18): remove calculateDefaultProjectName. This is to be backwards compatible with Nx 16.5 and below.
             ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
-    return combineOptionsForExecutor({}, (_a = configuration !== null && configuration !== void 0 ? configuration : targetConfiguration.defaultConfiguration) !== null && _a !== void 0 ? _a : '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.cwd, context.root));
+    return combineOptionsForExecutor({}, configuration ?? targetConfiguration.defaultConfiguration ?? '', targetConfiguration, schema, defaultProject, (0, path_1.relative)(context.cwd, context.root));
 }
 exports.readTargetOptions = readTargetOptions;

package/src/generators/format-files.js

@@ -1,52 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatFiles = void 0;
-const tslib_1 = require("tslib");
 const path = require("path");
 const nx_1 = require("../../nx");
 let { updateJson, readJson, sortObjectByKeys } = (0, nx_1.requireNx)();
 // TODO: Remove this in Nx 18 when Nx 16.7.0 is no longer supported
 sortObjectByKeys =
-    sortObjectByKeys !== null && sortObjectByKeys !== void 0 ? sortObjectByKeys : require('nx/src/utils/object-sort').sortObjectByKeys;
+    sortObjectByKeys ?? require('nx/src/utils/object-sort').sortObjectByKeys;
 /**
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
-function formatFiles(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let prettier;
+async function formatFiles(tree) {
+    let prettier;
+    try {
+        prettier = await Promise.resolve().then(() => require('prettier'));
+    }
+    catch { }
+    sortTsConfig(tree);
+    if (!prettier)
+        return;
+    const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
+    const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
+    await Promise.all(Array.from(files).map(async (file) => {
         try {
-            prettier = yield Promise.resolve().then(() => require('prettier'));
-        }
-        catch (_a) { }
-        sortTsConfig(tree);
-        if (!prettier)
-            return;
-        const files = new Set(tree.listChanges().filter((file) => file.type !== 'DELETE'));
-        const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
-        yield Promise.all(Array.from(files).map((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                const systemPath = path.join(tree.root, file.path);
-                const resolvedOptions = yield prettier.resolveConfig(systemPath, {
-                    editorconfig: true,
-                });
-                const options = Object.assign(Object.assign(Object.assign({}, resolvedOptions), changedPrettierInTree), { filepath: systemPath });
-                if (file.path.endsWith('.swcrc')) {
-                    options.parser = 'json';
-                }
-                const support = yield prettier.getFileInfo(systemPath, options);
-                if (support.ignored || !support.inferredParser) {
-                    return;
-                }
-                tree.write(file.path, 
-                // In prettier v3 the format result is a promise
-                yield prettier.format(file.content.toString('utf-8'), options));
+            const systemPath = path.join(tree.root, file.path);
+            const resolvedOptions = await prettier.resolveConfig(systemPath, {
+                editorconfig: true,
+            });
+            const options = {
+                ...resolvedOptions,
+                ...changedPrettierInTree,
+                filepath: systemPath,
+            };
+            if (file.path.endsWith('.swcrc')) {
+                options.parser = 'json';
             }
-            catch (e) {
-                console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
+            const support = await prettier.getFileInfo(systemPath, options);
+            if (support.ignored || !support.inferredParser) {
+                return;
             }
-        })));
-    });
+            tree.write(file.path, 
+            // In prettier v3 the format result is a promise
+            await prettier.format(file.content.toString('utf-8'), options));
+        }
+        catch (e) {
+            console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
+        }
+    }));
 }
 exports.formatFiles = formatFiles;
 function sortTsConfig(tree) {
@@ -55,7 +56,13 @@ function sortTsConfig(tree) {
         if (!tsConfigPath) {
             return;
         }
-        updateJson(tree, tsConfigPath, (tsconfig) => (Object.assign(Object.assign({}, tsconfig), { compilerOptions: Object.assign(Object.assign({}, tsconfig.compilerOptions), { paths: sortObjectByKeys(tsconfig.compilerOptions.paths) }) })));
+        updateJson(tree, tsConfigPath, (tsconfig) => ({
+            ...tsconfig,
+            compilerOptions: {
+                ...tsconfig.compilerOptions,
+                paths: sortObjectByKeys(tsconfig.compilerOptions.paths),
+            },
+        }));
     }
     catch (e) {
         // catch noop
@@ -74,7 +81,7 @@ function getChangedPrettierConfigInTree(tree) {
         try {
             return readJson(tree, '.prettierrc');
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }

package/src/generators/generate-files.js

@@ -81,9 +81,9 @@ function allFilesInDir(parent) {
                     res = [...res, ...allFilesInDir(child)];
                 }
             }
-            catch (_a) { }
+            catch { }
         });
     }
-    catch (_a) { }
+    catch { }
     return res;
 }

package/src/generators/project-name-and-root-utils.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineProjectNameAndRootOptions = void 0;
-const tslib_1 = require("tslib");
 const enquirer_1 = require("enquirer");
 const nx_1 = require("../../nx");
 const get_workspace_layout_1 = require("../utils/get-workspace-layout");
 const names_1 = require("../utils/names");
 const { joinPathFragments, normalizePath, logger, readJson, readNxJson, updateNxJson, stripIndents, } = (0, nx_1.requireNx)();
-function determineProjectNameAndRootOptions(tree, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        validateName(options.name, options.projectNameAndRootFormat);
-        const formats = getProjectNameAndRootFormats(tree, options);
-        const format = (_a = options.projectNameAndRootFormat) !== null && _a !== void 0 ? _a : (yield determineFormat(tree, formats, options.callingGenerator));
-        return Object.assign(Object.assign({}, formats[format]), { projectNameAndRootFormat: format });
-    });
+async function determineProjectNameAndRootOptions(tree, options) {
+    validateName(options.name, options.projectNameAndRootFormat);
+    const formats = getProjectNameAndRootFormats(tree, options);
+    const format = options.projectNameAndRootFormat ??
+        (await determineFormat(tree, formats, options.callingGenerator));
+    return {
+        ...formats[format],
+        projectNameAndRootFormat: format,
+    };
 }
 exports.determineProjectNameAndRootOptions = determineProjectNameAndRootOptions;
 function validateName(name, projectNameAndRootFormat) {
@@ -37,70 +37,65 @@ function validateName(name, projectNameAndRootFormat) {
         throw new Error(`The project name should match the pattern "${pattern}". The provided value "${name}" does not match.`);
     }
 }
-function determineFormat(tree, formats, callingGenerator) {
-    var _a, _b;
-    var _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!formats.derived) {
-            return 'as-provided';
-        }
-        if (process.env.NX_INTERACTIVE !== 'true' || !isTTY()) {
-            return 'derived';
-        }
-        const asProvidedDescription = `As provided:
+async function determineFormat(tree, formats, callingGenerator) {
+    if (!formats.derived) {
+        return 'as-provided';
+    }
+    if (process.env.NX_INTERACTIVE !== 'true' || !isTTY()) {
+        return 'derived';
+    }
+    const asProvidedDescription = `As provided:
     Name: ${formats['as-provided'].projectName}
     Root: ${formats['as-provided'].projectRoot}`;
-        const asProvidedSelectedValue = `${formats['as-provided'].projectName} @ ${formats['as-provided'].projectRoot}`;
-        const derivedDescription = `Derived:
+    const asProvidedSelectedValue = `${formats['as-provided'].projectName} @ ${formats['as-provided'].projectRoot}`;
+    const derivedDescription = `Derived:
     Name: ${formats['derived'].projectName}
     Root: ${formats['derived'].projectRoot}`;
-        const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot}`;
-        const result = yield (0, enquirer_1.prompt)({
-            type: 'select',
-            name: 'format',
-            message: 'What should be the project name and where should it be generated?',
-            choices: [
-                {
-                    message: asProvidedDescription,
-                    name: asProvidedSelectedValue,
-                },
-                {
-                    message: derivedDescription,
-                    name: derivedSelectedValue,
-                },
-            ],
-            initial: 'as-provided',
-        }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
-        const deprecationWarning = stripIndents `
+    const derivedSelectedValue = `${formats['derived'].projectName} @ ${formats['derived'].projectRoot}`;
+    const result = await (0, enquirer_1.prompt)({
+        type: 'select',
+        name: 'format',
+        message: 'What should be the project name and where should it be generated?',
+        choices: [
+            {
+                message: asProvidedDescription,
+                name: asProvidedSelectedValue,
+            },
+            {
+                message: derivedDescription,
+                name: derivedSelectedValue,
+            },
+        ],
+        initial: 'as-provided',
+    }).then(({ format }) => format === asProvidedSelectedValue ? 'as-provided' : 'derived');
+    const deprecationWarning = stripIndents `
     In Nx 18, generating projects will no longer derive the name and root.
     Please provide the exact project name and root in the future.`;
-        if (result === 'as-provided' && callingGenerator) {
-            const { saveDefault } = yield (0, enquirer_1.prompt)({
-                type: 'confirm',
-                message: `Would you like to configure Nx to always take project name and root as provided for ${callingGenerator}?`,
-                name: 'saveDefault',
-                initial: true,
-            });
-            if (saveDefault) {
-                const nxJson = readNxJson(tree);
-                (_a = nxJson.generators) !== null && _a !== void 0 ? _a : (nxJson.generators = {});
-                (_b = (_c = nxJson.generators)[callingGenerator]) !== null && _b !== void 0 ? _b : (_c[callingGenerator] = {});
-                nxJson.generators[callingGenerator].projectNameAndRootFormat = result;
-                updateNxJson(tree, nxJson);
-            }
-            else {
-                logger.warn(deprecationWarning);
-            }
+    if (result === 'as-provided' && callingGenerator) {
+        const { saveDefault } = await (0, enquirer_1.prompt)({
+            type: 'confirm',
+            message: `Would you like to configure Nx to always take project name and root as provided for ${callingGenerator}?`,
+            name: 'saveDefault',
+            initial: true,
+        });
+        if (saveDefault) {
+            const nxJson = readNxJson(tree);
+            nxJson.generators ??= {};
+            nxJson.generators[callingGenerator] ??= {};
+            nxJson.generators[callingGenerator].projectNameAndRootFormat = result;
+            updateNxJson(tree, nxJson);
         }
         else {
-            const example = `Example: nx g ${callingGenerator} ${formats[result].projectName} --directory ${formats[result].projectRoot}`;
-            logger.warn(deprecationWarning + '\n' + example);
+            logger.warn(deprecationWarning);
         }
-        return result;
-    });
+    }
+    else {
+        const example = `Example: nx g ${callingGenerator} ${formats[result].projectName} --directory ${formats[result].projectRoot}`;
+        logger.warn(deprecationWarning + '\n' + example);
+    }
+    return result;
 }
 function getProjectNameAndRootFormats(tree, options) {
-    var _a, _b, _c;
     const name = (0, names_1.names)(options.name).fileName;
     const directory = options.directory
         ? normalizePath(options.directory.replace(/^\.?\//, ''))
@@ -120,7 +115,7 @@ function getProjectNameAndRootFormats(tree, options) {
                     projectSimpleName: nameWithoutScope,
                     projectFileName: nameWithoutScope,
                 },
-                importPath: (_a = options.importPath) !== null && _a !== void 0 ? _a : asProvidedProjectName,
+                importPath: options.importPath ?? asProvidedProjectName,
                 projectRoot: asProvidedProjectDirectory,
             },
         };
@@ -133,7 +128,8 @@ function getProjectNameAndRootFormats(tree, options) {
             npmScope = getNpmScope(tree);
             asProvidedImportPath =
                 asProvidedProjectDirectory === '.'
-                    ? (_b = readJson(tree, 'package.json').name) !== null && _b !== void 0 ? _b : getImportPath(npmScope, asProvidedProjectName)
+                    ? readJson(tree, 'package.json').name ??
+                        getImportPath(npmScope, asProvidedProjectName)
                     : getImportPath(npmScope, asProvidedProjectName);
         }
     }
@@ -159,7 +155,8 @@ function getProjectNameAndRootFormats(tree, options) {
         if (!derivedImportPath) {
             derivedImportPath =
                 derivedProjectDirectory === '.'
-                    ? (_c = readJson(tree, 'package.json').name) !== null && _c !== void 0 ? _c : getImportPath(npmScope, derivedProjectName)
+                    ? readJson(tree, 'package.json').name ??
+                        getImportPath(npmScope, derivedProjectName)
                     : getImportPath(npmScope, derivedProjectDirectoryWithoutLayout);
         }
     }
@@ -198,13 +195,13 @@ function getImportPath(npmScope, name) {
 function getNpmScope(tree) {
     const nxJson = readNxJson(tree);
     // TODO(v17): Remove reading this from nx.json
-    if (nxJson === null || nxJson === void 0 ? void 0 : nxJson.npmScope) {
+    if (nxJson?.npmScope) {
         return nxJson.npmScope;
     }
     const { name } = tree.exists('package.json')
         ? readJson(tree, 'package.json')
         : { name: null };
-    return (name === null || name === void 0 ? void 0 : name.startsWith('@')) ? name.split('/')[0].substring(1) : undefined;
+    return name?.startsWith('@') ? name.split('/')[0].substring(1) : undefined;
 }
 function isTTY() {
     return !!process.stdout.isTTY && process.env['CI'] !== 'true';

package/src/generators/run-tasks-in-serial.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTasksInSerial = void 0;
-const tslib_1 = require("tslib");
 /**
  * Run tasks in serial
  *
  * @param tasks The tasks to run in serial.
  */
 function runTasksInSerial(...tasks) {
-    return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return async () => {
         for (const task of tasks) {
-            yield task();
+            await task();
         }
-    });
+    };
 }
 exports.runTasksInSerial = runTasksInSerial;

package/src/generators/visit-not-ignored-files.js

@@ -15,16 +15,16 @@ function visitNotIgnoredFiles(tree, dirPath = tree.root, visitor) {
         ig.add(tree.read('.gitignore', 'utf-8'));
     }
     if (tree.exists('.nxignore')) {
-        ig !== null && ig !== void 0 ? ig : (ig = (0, ignore_1.default)());
+        ig ??= (0, ignore_1.default)();
         ig.add(tree.read('.nxignore', 'utf-8'));
     }
     dirPath = normalizePathRelativeToRoot(dirPath, tree.root);
-    if (dirPath !== '' && (ig === null || ig === void 0 ? void 0 : ig.ignores(dirPath))) {
+    if (dirPath !== '' && ig?.ignores(dirPath)) {
         return;
     }
     for (const child of tree.children(dirPath)) {
         const fullPath = (0, path_1.join)(dirPath, child);
-        if (ig === null || ig === void 0 ? void 0 : ig.ignores(fullPath)) {
+        if (ig?.ignores(fullPath)) {
             continue;
         }
         if (tree.isFile(fullPath)) {

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const format_files_1 = require("../../generators/format-files");
 const replace_package_1 = require("../../utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/devkit', '@nx/devkit');
-        yield (0, format_files_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/devkit', '@nx/devkit');
+    await (0, format_files_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/utils/async-iterable/combine-async-iterables.js

@@ -1,69 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.combineAsyncIterables = void 0;
-const tslib_1 = require("tslib");
-function combineAsyncIterables(..._iterators) {
-    return tslib_1.__asyncGenerator(this, arguments, function* combineAsyncIterables_1() {
-        // Convert iterables into iterators with next, return, throws methods.
-        // If it's already an iterator, keep it.
-        const iterators = _iterators.map((it) => {
-            if (typeof it['next'] === 'function') {
-                return it;
-            }
-            else {
-                return (function wrapped() {
-                    return tslib_1.__asyncGenerator(this, arguments, function* wrapped_1() {
-                        var _a, e_1, _b, _c;
-                        try {
-                            for (var _d = true, it_1 = tslib_1.__asyncValues(it), it_1_1; it_1_1 = yield tslib_1.__await(it_1.next()), _a = it_1_1.done, !_a; _d = true) {
-                                _c = it_1_1.value;
-                                _d = false;
-                                const val = _c;
-                                yield yield tslib_1.__await(val);
-                            }
-                        }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                        finally {
-                            try {
-                                if (!_d && !_a && (_b = it_1.return)) yield tslib_1.__await(_b.call(it_1));
-                            }
-                            finally { if (e_1) throw e_1.error; }
-                        }
-                    });
-                })();
-            }
-        });
-        let [options] = iterators;
-        if (typeof options.next === 'function') {
-            options = Object.create(null);
+async function* combineAsyncIterables(..._iterators) {
+    // Convert iterables into iterators with next, return, throws methods.
+    // If it's already an iterator, keep it.
+    const iterators = _iterators.map((it) => {
+        if (typeof it['next'] === 'function') {
+            return it;
         }
         else {
-            iterators.shift();
-        }
-        const getNextAsyncIteratorValue = getNextAsyncIteratorFactory(options);
-        try {
-            const asyncIteratorsValues = new Map(iterators.map((it, idx) => [idx, getNextAsyncIteratorValue(it, idx)]));
-            do {
-                const { iterator, index } = yield tslib_1.__await(Promise.race(asyncIteratorsValues.values()));
-                if (iterator.done) {
-                    asyncIteratorsValues.delete(index);
-                }
-                else {
-                    yield yield tslib_1.__await(iterator.value);
-                    asyncIteratorsValues.set(index, getNextAsyncIteratorValue(iterators[index], index));
+            return (async function* wrapped() {
+                for await (const val of it) {
+                    yield val;
                 }
-            } while (asyncIteratorsValues.size > 0);
-        }
-        finally {
-            yield tslib_1.__await(Promise.allSettled(iterators.map((it) => { var _a; return (_a = it['return']) === null || _a === void 0 ? void 0 : _a.call(it); })));
+            })();
         }
     });
+    let [options] = iterators;
+    if (typeof options.next === 'function') {
+        options = Object.create(null);
+    }
+    else {
+        iterators.shift();
+    }
+    const getNextAsyncIteratorValue = getNextAsyncIteratorFactory(options);
+    try {
+        const asyncIteratorsValues = new Map(iterators.map((it, idx) => [idx, getNextAsyncIteratorValue(it, idx)]));
+        do {
+            const { iterator, index } = await Promise.race(asyncIteratorsValues.values());
+            if (iterator.done) {
+                asyncIteratorsValues.delete(index);
+            }
+            else {
+                yield iterator.value;
+                asyncIteratorsValues.set(index, getNextAsyncIteratorValue(iterators[index], index));
+            }
+        } while (asyncIteratorsValues.size > 0);
+    }
+    finally {
+        await Promise.allSettled(iterators.map((it) => it['return']?.()));
+    }
 }
 exports.combineAsyncIterables = combineAsyncIterables;
 function getNextAsyncIteratorFactory(options) {
-    return (asyncIterator, index) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return async (asyncIterator, index) => {
         try {
-            const iterator = yield asyncIterator.next();
+            const iterator = await asyncIterator.next();
             return { index, iterator };
         }
         catch (err) {
@@ -72,5 +54,5 @@ function getNextAsyncIteratorFactory(options) {
             }
             return Promise.reject(err);
         }
-    });
+    };
 }

package/src/utils/async-iterable/create-async-iterable.js

@@ -10,29 +10,26 @@ function createAsyncIterable(listener) {
         [Symbol.asyncIterator]() {
             listener({
                 next: (value) => {
-                    var _a;
                     if (done || error)
                         return;
                     if (pullQueue.length > 0) {
-                        (_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[0]({ value, done: false });
+                        pullQueue.shift()?.[0]({ value, done: false });
                     }
                     else {
                         pushQueue.push(value);
                     }
                 },
                 error: (err) => {
-                    var _a;
                     if (done || error)
                         return;
                     if (pullQueue.length > 0) {
-                        (_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[1](err);
+                        pullQueue.shift()?.[1](err);
                     }
                     error = err;
                 },
                 done: () => {
-                    var _a;
                     if (pullQueue.length > 0) {
-                        (_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[0]({ value: undefined, done: true });
+                        pullQueue.shift()?.[0]({ value: undefined, done: true });
                     }
                     done = true;
                 },

package/src/utils/async-iterable/map-async-iteratable.js

@@ -1,23 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapAsyncIterable = void 0;
-const tslib_1 = require("tslib");
-function mapAsyncIterable(data, transform) {
-    return tslib_1.__asyncGenerator(this, arguments, function* mapAsyncIterable_1() {
-        function f() {
-            return tslib_1.__asyncGenerator(this, arguments, function* f_1() {
-                const generator = data[Symbol.asyncIterator] || data[Symbol.iterator];
-                const iterator = generator.call(data);
-                let index = 0;
-                let item = yield tslib_1.__await(iterator.next());
-                while (!item.done) {
-                    yield yield tslib_1.__await(yield tslib_1.__await(transform(yield tslib_1.__await(item.value), index, data)));
-                    index++;
-                    item = yield tslib_1.__await(iterator.next());
-                }
-            });
+async function* mapAsyncIterable(data, transform) {
+    async function* f() {
+        const generator = data[Symbol.asyncIterator] || data[Symbol.iterator];
+        const iterator = generator.call(data);
+        let index = 0;
+        let item = await iterator.next();
+        while (!item.done) {
+            yield await transform(await item.value, index, data);
+            index++;
+            item = await iterator.next();
         }
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(f()))));
-    });
+    }
+    return yield* f();
 }
 exports.mapAsyncIterable = mapAsyncIterable;