@nx/nest 16.8.0-beta.4 → 16.8.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
   "repository": {
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nrwl/nest": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
-    "@nx/linter": "16.8.0-beta.4",
-    "@nx/node": "16.8.0-beta.4",
+    "@nrwl/nest": "16.8.0-beta.6",
+    "@nx/devkit": "16.8.0-beta.6",
+    "@nx/js": "16.8.0-beta.6",
+    "@nx/linter": "16.8.0-beta.6",
+    "@nx/node": "16.8.0-beta.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6",
     "semver": "7.5.3",
@@ -45,5 +45,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "0cc6ba996f2ef09f00b932c8eacf42de642457f3"
 }

package/src/generators/application/application.js

@@ -1,33 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("@nx/node");
 const init_1 = require("../init/init");
 const lib_1 = require("./lib");
-function applicationGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, rawOptions));
+async function applicationGenerator(tree, rawOptions) {
+    return await applicationGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...rawOptions,
     });
 }
 exports.applicationGenerator = applicationGenerator;
-function applicationGeneratorInternal(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const initTask = yield (0, init_1.initGenerator)(tree, {
-            skipPackageJson: options.skipPackageJson,
-            unitTestRunner: options.unitTestRunner,
-            skipFormat: true,
-        });
-        const nodeApplicationTask = yield (0, node_1.applicationGenerator)(tree, (0, lib_1.toNodeApplicationGeneratorOptions)(options));
-        (0, lib_1.createFiles)(tree, options);
-        (0, lib_1.updateTsConfig)(tree, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(initTask, nodeApplicationTask);
+async function applicationGeneratorInternal(tree, rawOptions) {
+    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
+    const initTask = await (0, init_1.initGenerator)(tree, {
+        skipPackageJson: options.skipPackageJson,
+        unitTestRunner: options.unitTestRunner,
+        skipFormat: true,
     });
+    const nodeApplicationTask = await (0, node_1.applicationGenerator)(tree, (0, lib_1.toNodeApplicationGeneratorOptions)(options));
+    (0, lib_1.createFiles)(tree, options);
+    (0, lib_1.updateTsConfig)(tree, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(initTask, nodeApplicationTask);
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;

package/src/generators/application/lib/normalize-options.js

@@ -1,25 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toNodeApplicationGeneratorOptions = exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const linter_1 = require("@nx/linter");
-function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-            name: options.name,
-            projectType: 'application',
-            directory: options.directory,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            rootProject: options.rootProject,
-            callingGenerator: '@nx/nest:application',
-        });
-        options.rootProject = appProjectRoot === '.';
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        return Object.assign(Object.assign({}, options), { strict: (_a = options.strict) !== null && _a !== void 0 ? _a : false, appProjectName,
-            appProjectRoot, linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest', e2eTestRunner: (_d = options.e2eTestRunner) !== null && _d !== void 0 ? _d : 'jest' });
+async function normalizeOptions(tree, options) {
+    const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: options.name,
+        projectType: 'application',
+        directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        rootProject: options.rootProject,
+        callingGenerator: '@nx/nest:application',
     });
+    options.rootProject = appProjectRoot === '.';
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    return {
+        ...options,
+        strict: options.strict ?? false,
+        appProjectName,
+        appProjectRoot,
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        unitTestRunner: options.unitTestRunner ?? 'jest',
+        e2eTestRunner: options.e2eTestRunner ?? 'jest',
+    };
 }
 exports.normalizeOptions = normalizeOptions;
 function toNodeApplicationGeneratorOptions(options) {

package/src/generators/application/lib/update-tsconfig.js

@@ -7,7 +7,14 @@ function updateTsConfig(tree, options) {
         json.compilerOptions.emitDecoratorMetadata = true;
         json.compilerOptions.target = 'es2021';
         if (options.strict) {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { strictNullChecks: true, noImplicitAny: true, strictBindCallApply: true, forceConsistentCasingInFileNames: true, noFallthroughCasesInSwitch: true });
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                strictNullChecks: true,
+                noImplicitAny: true,
+                strictBindCallApply: true,
+                forceConsistentCasingInFileNames: true,
+                noFallthroughCasesInSwitch: true,
+            };
         }
         return json;
     });

package/src/generators/class/class.js

@@ -11,5 +11,9 @@ exports.classGenerator = classGenerator;
 exports.default = classGenerator;
 exports.classSchematic = (0, devkit_1.convertNxGenerator)(classGenerator);
 function normalizeClassOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/controller/controller.js

@@ -11,5 +11,11 @@ exports.controllerGenerator = controllerGenerator;
 exports.default = controllerGenerator;
 exports.controllerSchematic = (0, devkit_1.convertNxGenerator)(controllerGenerator);
 function normalizeControllerOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, module: options.module, skipImport: options.skipImport, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        module: options.module,
+        skipImport: options.skipImport,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.conversionSchematic = exports.conversionGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const application_1 = require("@nx/node/src/generators/application/application");
@@ -9,103 +8,101 @@ const library_1 = require("@nx/js/src/generators/library/library");
 /**
  * @deprecated This generator will be removed in v17
  */
-function conversionGenerator(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        /**
-         * The ProjectConverter instance encapsulates all the standard operations we need
-         * to perform in order to convert a project from TSLint to ESLint, as well as some
-         * extensibility points for adjusting the behavior on a per package basis.
-         *
-         * E.g. @nx/angular projects might need to make different changes to the final
-         * ESLint config when compared with @nx/nest projects.
-         *
-         * See the ProjectConverter implementation for a full breakdown of what it does.
-         */
-        const projectConverter = new linter_1.ProjectConverter({
-            host,
-            projectName: options.project,
-            ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
-            eslintInitializer: ({ projectName, projectConfig }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                /**
-                 * Using .js is not an option with NestJS, so we always set it to false when
-                 * delegating to the external (more generic) generators below.
-                 */
-                const js = false;
-                /**
-                 * We set the parserOptions.project config just in case the converted config uses
-                 * rules which require type-checking. Later in the conversion we check if it actually
-                 * does and remove the config again if it doesn't, so that it is most efficient.
-                 */
-                const setParserOptionsProject = true;
-                if (projectConfig.projectType === 'application') {
-                    yield (0, application_1.addLintingToApplication)(host, {
-                        linter: 'eslint',
-                        name: projectName,
-                        appProjectRoot: projectConfig.root,
-                        js,
-                        setParserOptionsProject,
-                        parsedTags: [],
-                        skipFormat: options.skipFormat,
-                    });
-                }
-                if (projectConfig.projectType === 'library') {
-                    yield (0, library_1.addLint)(host, {
-                        linter: 'eslint',
-                        name: projectName,
-                        projectRoot: projectConfig.root,
-                        js,
-                        setParserOptionsProject,
-                    });
-                }
-            }),
-        });
-        /**
-         * If root eslint configuration already exists it will not be recreated
-         * but we also don't want to re-run the tslint config conversion
-         * as it was likely already done
-         */
-        const rootEslintConfigExists = host.exists('.eslintrc.json');
-        /**
-         * Create the standard (which is applicable to the current package) ESLint setup
-         * for converting the project.
-         */
-        const eslintInitInstallTask = yield projectConverter.initESLint();
-        /**
-         * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json.
-         */
-        const rootConfigInstallTask = yield projectConverter.convertRootTSLintConfig((json) => removeCodelyzerRelatedRules(json), rootEslintConfigExists);
-        /**
-         * Convert the project's tslint.json to an equivalent ESLint config.
-         */
-        const projectConfigInstallTask = yield projectConverter.convertProjectConfig((json) => json);
-        /**
-         * Clean up the original TSLint configuration for the project.
-         */
-        projectConverter.removeProjectTSLintFile();
-        // Only project shouldn't be added as a default
-        const { project } = options, defaults = tslib_1.__rest(options, ["project"]);
-        /**
-         * Store user preferences for the collection
-         */
-        projectConverter.setDefaults('@nx/nest', defaults);
-        /**
-         * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
-         */
-        let uninstallTSLintTask = () => Promise.resolve(undefined);
-        if (options.removeTSLintIfNoMoreTSLintTargets &&
-            !projectConverter.isTSLintUsedInWorkspace()) {
-            uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield eslintInitInstallTask();
-            yield rootConfigInstallTask();
-            yield projectConfigInstallTask();
-            yield uninstallTSLintTask();
-        });
+async function conversionGenerator(host, options) {
+    /**
+     * The ProjectConverter instance encapsulates all the standard operations we need
+     * to perform in order to convert a project from TSLint to ESLint, as well as some
+     * extensibility points for adjusting the behavior on a per package basis.
+     *
+     * E.g. @nx/angular projects might need to make different changes to the final
+     * ESLint config when compared with @nx/nest projects.
+     *
+     * See the ProjectConverter implementation for a full breakdown of what it does.
+     */
+    const projectConverter = new linter_1.ProjectConverter({
+        host,
+        projectName: options.project,
+        ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
+        eslintInitializer: async ({ projectName, projectConfig }) => {
+            /**
+             * Using .js is not an option with NestJS, so we always set it to false when
+             * delegating to the external (more generic) generators below.
+             */
+            const js = false;
+            /**
+             * We set the parserOptions.project config just in case the converted config uses
+             * rules which require type-checking. Later in the conversion we check if it actually
+             * does and remove the config again if it doesn't, so that it is most efficient.
+             */
+            const setParserOptionsProject = true;
+            if (projectConfig.projectType === 'application') {
+                await (0, application_1.addLintingToApplication)(host, {
+                    linter: 'eslint',
+                    name: projectName,
+                    appProjectRoot: projectConfig.root,
+                    js,
+                    setParserOptionsProject,
+                    parsedTags: [],
+                    skipFormat: options.skipFormat,
+                });
+            }
+            if (projectConfig.projectType === 'library') {
+                await (0, library_1.addLint)(host, {
+                    linter: 'eslint',
+                    name: projectName,
+                    projectRoot: projectConfig.root,
+                    js,
+                    setParserOptionsProject,
+                });
+            }
+        },
     });
+    /**
+     * If root eslint configuration already exists it will not be recreated
+     * but we also don't want to re-run the tslint config conversion
+     * as it was likely already done
+     */
+    const rootEslintConfigExists = host.exists('.eslintrc.json');
+    /**
+     * Create the standard (which is applicable to the current package) ESLint setup
+     * for converting the project.
+     */
+    const eslintInitInstallTask = await projectConverter.initESLint();
+    /**
+     * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json.
+     */
+    const rootConfigInstallTask = await projectConverter.convertRootTSLintConfig((json) => removeCodelyzerRelatedRules(json), rootEslintConfigExists);
+    /**
+     * Convert the project's tslint.json to an equivalent ESLint config.
+     */
+    const projectConfigInstallTask = await projectConverter.convertProjectConfig((json) => json);
+    /**
+     * Clean up the original TSLint configuration for the project.
+     */
+    projectConverter.removeProjectTSLintFile();
+    // Only project shouldn't be added as a default
+    const { project, ...defaults } = options;
+    /**
+     * Store user preferences for the collection
+     */
+    projectConverter.setDefaults('@nx/nest', defaults);
+    /**
+     * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
+     */
+    let uninstallTSLintTask = () => Promise.resolve(undefined);
+    if (options.removeTSLintIfNoMoreTSLintTargets &&
+        !projectConverter.isTSLintUsedInWorkspace()) {
+        uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return async () => {
+        await eslintInitInstallTask();
+        await rootConfigInstallTask();
+        await projectConfigInstallTask();
+        await uninstallTSLintTask();
+    };
 }
 exports.conversionGenerator = conversionGenerator;
 exports.conversionSchematic = (0, devkit_1.convertNxGenerator)(conversionGenerator);

package/src/generators/decorator/decorator.js

@@ -11,5 +11,8 @@ exports.decoratorGenerator = decoratorGenerator;
 exports.default = decoratorGenerator;
 exports.decoratorSchematic = (0, devkit_1.convertNxGenerator)(decoratorGenerator);
 function normalizeDecoratorOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+    };
 }

package/src/generators/filter/filter.js

@@ -11,5 +11,9 @@ exports.filterGenerator = filterGenerator;
 exports.default = filterGenerator;
 exports.filterSchematic = (0, devkit_1.convertNxGenerator)(filterGenerator);
 function normalizeFilterOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/gateway/gateway.js

@@ -11,5 +11,9 @@ exports.gatewayGenerator = gatewayGenerator;
 exports.default = gatewayGenerator;
 exports.gatewaySchematic = (0, devkit_1.convertNxGenerator)(gatewayGenerator);
 function normalizeGatewayOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/guard/guard.js

@@ -11,5 +11,9 @@ exports.guardGenerator = guardGenerator;
 exports.default = guardGenerator;
 exports.guardSchematic = (0, devkit_1.convertNxGenerator)(guardGenerator);
 function normalizeGuardOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/init/init.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSchematic = exports.initGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("@nx/node");
 const lib_1 = require("./lib");
-function initGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(rawOptions);
-        const tasks = [];
-        const nodeInitTask = yield (0, node_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        tasks.push(nodeInitTask);
-        if (!options.skipPackageJson) {
-            const installPackagesTask = (0, lib_1.addDependencies)(tree);
-            tasks.push(installPackagesTask);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function initGenerator(tree, rawOptions) {
+    const options = (0, lib_1.normalizeOptions)(rawOptions);
+    const tasks = [];
+    const nodeInitTask = await (0, node_1.initGenerator)(tree, {
+        ...options,
+        skipFormat: true,
     });
+    tasks.push(nodeInitTask);
+    if (!options.skipPackageJson) {
+        const installPackagesTask = (0, lib_1.addDependencies)(tree);
+        tasks.push(installPackagesTask);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;

package/src/generators/init/lib/normalize-options.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 function normalizeOptions(options) {
-    var _a;
-    return Object.assign(Object.assign({}, options), { unitTestRunner: (_a = options.unitTestRunner) !== null && _a !== void 0 ? _a : 'jest' });
+    return {
+        ...options,
+        unitTestRunner: options.unitTestRunner ?? 'jest',
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/interceptor/interceptor.js

@@ -11,5 +11,9 @@ exports.interceptorGenerator = interceptorGenerator;
 exports.default = interceptorGenerator;
 exports.interceptorSchematic = (0, devkit_1.convertNxGenerator)(interceptorGenerator);
 function normalizeInterceptorOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/library/lib/create-files.js

@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 function createFiles(tree, options) {
-    const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.projectName)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), fileName: options.fileName });
+    const substitutions = {
+        ...options,
+        ...(0, devkit_1.names)(options.projectName),
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        fileName: options.fileName,
+    };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), options.projectRoot, substitutions);
     if (options.controller) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'controller'), options.projectRoot, substitutions);

package/src/generators/library/lib/normalize-options.js

@@ -1,39 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toJsLibraryGeneratorOptions = exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const linter_1 = require("@nx/linter");
-function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/nest:library',
-        });
-        const fileName = options.simpleName
-            ? projectNames.projectSimpleName
-            : projectNames.projectFileName;
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        const normalized = Object.assign(Object.assign({}, options), { strict: (_a = options.strict) !== null && _a !== void 0 ? _a : true, controller: (_b = options.controller) !== null && _b !== void 0 ? _b : false, fileName, global: (_c = options.global) !== null && _c !== void 0 ? _c : false, linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, parsedTags, prefix: (0, get_npm_scope_1.getNpmScope)(tree), // we could also allow customizing this
-            projectName,
-            projectRoot,
-            importPath, service: (_e = options.service) !== null && _e !== void 0 ? _e : false, target: (_f = options.target) !== null && _f !== void 0 ? _f : 'es6', testEnvironment: (_g = options.testEnvironment) !== null && _g !== void 0 ? _g : 'node', unitTestRunner: (_h = options.unitTestRunner) !== null && _h !== void 0 ? _h : 'jest' });
-        return normalized;
+async function normalizeOptions(tree, options) {
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/nest:library',
     });
+    const fileName = options.simpleName
+        ? projectNames.projectSimpleName
+        : projectNames.projectFileName;
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    const normalized = {
+        ...options,
+        strict: options.strict ?? true,
+        controller: options.controller ?? false,
+        fileName,
+        global: options.global ?? false,
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        parsedTags,
+        prefix: (0, get_npm_scope_1.getNpmScope)(tree),
+        projectName,
+        projectRoot,
+        importPath,
+        service: options.service ?? false,
+        target: options.target ?? 'es6',
+        testEnvironment: options.testEnvironment ?? 'node',
+        unitTestRunner: options.unitTestRunner ?? 'jest',
+    };
+    return normalized;
 }
 exports.normalizeOptions = normalizeOptions;
 function toJsLibraryGeneratorOptions(options) {
     return {
         name: options.name,
-        bundler: (options === null || options === void 0 ? void 0 : options.buildable) ? 'tsc' : 'none',
+        bundler: options?.buildable ? 'tsc' : 'none',
         directory: options.directory,
         importPath: options.importPath,
         linter: options.linter,

package/src/generators/library/lib/update-tsconfig.js

@@ -7,7 +7,14 @@ function updateTsConfig(tree, options) {
     return (0, devkit_1.updateJson)(tree, `${project.root}/tsconfig.lib.json`, (json) => {
         json.compilerOptions.target = options.target;
         if (options.strict) {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { strictNullChecks: true, noImplicitAny: true, strictBindCallApply: true, forceConsistentCasingInFileNames: true, noFallthroughCasesInSwitch: true });
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                strictNullChecks: true,
+                noImplicitAny: true,
+                strictBindCallApply: true,
+                forceConsistentCasingInFileNames: true,
+                noFallthroughCasesInSwitch: true,
+            };
         }
         return json;
     });

package/src/generators/library/library.js

@@ -1,32 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const lib_1 = require("../init/lib");
 const lib_2 = require("./lib");
-function libraryGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield libraryGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, rawOptions));
+async function libraryGenerator(tree, rawOptions) {
+    return await libraryGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...rawOptions,
     });
 }
 exports.libraryGenerator = libraryGenerator;
-function libraryGeneratorInternal(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, lib_2.normalizeOptions)(tree, rawOptions);
-        yield (0, js_1.libraryGenerator)(tree, (0, lib_2.toJsLibraryGeneratorOptions)(options));
-        const installDepsTask = (0, lib_1.addDependencies)(tree);
-        (0, lib_2.deleteFiles)(tree, options);
-        (0, lib_2.createFiles)(tree, options);
-        (0, lib_2.addExportsToBarrelFile)(tree, options);
-        (0, lib_2.updateTsConfig)(tree, options);
-        (0, lib_2.addProject)(tree, options);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return installDepsTask;
-    });
+async function libraryGeneratorInternal(tree, rawOptions) {
+    const options = await (0, lib_2.normalizeOptions)(tree, rawOptions);
+    await (0, js_1.libraryGenerator)(tree, (0, lib_2.toJsLibraryGeneratorOptions)(options));
+    const installDepsTask = (0, lib_1.addDependencies)(tree);
+    (0, lib_2.deleteFiles)(tree, options);
+    (0, lib_2.createFiles)(tree, options);
+    (0, lib_2.addExportsToBarrelFile)(tree, options);
+    (0, lib_2.updateTsConfig)(tree, options);
+    (0, lib_2.addProject)(tree, options);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return installDepsTask;
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;

package/src/generators/middleware/middleware.js

@@ -11,5 +11,9 @@ exports.middlewareGenerator = middlewareGenerator;
 exports.default = middlewareGenerator;
 exports.middlewareSchematic = (0, devkit_1.convertNxGenerator)(middlewareGenerator);
 function normalizeMiddlewareOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/module/module.js

@@ -11,5 +11,10 @@ exports.moduleGenerator = moduleGenerator;
 exports.default = moduleGenerator;
 exports.moduleSchematic = (0, devkit_1.convertNxGenerator)(moduleGenerator);
 function normalizeModuleOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, module: options.module, skipImport: options.skipImport });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        module: options.module,
+        skipImport: options.skipImport,
+    };
 }

package/src/generators/pipe/pipe.js

@@ -11,5 +11,9 @@ exports.pipeGenerator = pipeGenerator;
 exports.default = pipeGenerator;
 exports.pipeSchematic = (0, devkit_1.convertNxGenerator)(pipeGenerator);
 function normalizePipeOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/provider/provider.js

@@ -11,5 +11,9 @@ exports.providerGenerator = providerGenerator;
 exports.default = providerGenerator;
 exports.providerSchematic = (0, devkit_1.convertNxGenerator)(providerGenerator);
 function normalizeProviderOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/resolver/resolver.js

@@ -11,5 +11,9 @@ exports.resolverGenerator = resolverGenerator;
 exports.default = resolverGenerator;
 exports.resolverSchematic = (0, devkit_1.convertNxGenerator)(resolverGenerator);
 function normalizeResolverOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/resource/resource.js

@@ -11,5 +11,9 @@ exports.resourceGenerator = resourceGenerator;
 exports.default = resourceGenerator;
 exports.resourceSchematic = (0, devkit_1.convertNxGenerator)(resourceGenerator);
 function normalizeResourceOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/service/service.js

@@ -11,5 +11,9 @@ exports.serviceGenerator = serviceGenerator;
 exports.default = serviceGenerator;
 exports.serviceSchematic = (0, devkit_1.convertNxGenerator)(serviceGenerator);
 function normalizeServiceOptions(tree, options) {
-    return Object.assign(Object.assign({}, (0, utils_1.normalizeOptions)(tree, options)), { language: options.language, spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner) });
+    return {
+        ...(0, utils_1.normalizeOptions)(tree, options),
+        language: options.language,
+        spec: (0, utils_1.unitTestRunnerToSpec)(options.unitTestRunner),
+    };
 }

package/src/generators/utils/normalize-options.js

@@ -4,7 +4,14 @@ exports.unitTestRunnerToSpec = exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 function normalizeOptions(tree, options) {
     const { sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const normalizedOptions = Object.assign(Object.assign({}, options), { flat: options.flat, name: (0, devkit_1.names)(options.name).fileName, path: options.directory, skipFormat: options.skipFormat, sourceRoot });
+    const normalizedOptions = {
+        ...options,
+        flat: options.flat,
+        name: (0, devkit_1.names)(options.name).fileName,
+        path: options.directory,
+        skipFormat: options.skipFormat,
+        sourceRoot,
+    };
     return normalizedOptions;
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/utils/run-nest-schematic.js

@@ -1,18 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runNestSchematic = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function runNestSchematic(tree, schematic, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { skipFormat } = options, schematicOptions = tslib_1.__rest(options, ["skipFormat"]);
-        const { wrapAngularDevkitSchematic } = require('@nx/devkit/ngcli-adapter');
-        const nestSchematic = wrapAngularDevkitSchematic('@nestjs/schematics', schematic);
-        const result = yield nestSchematic(tree, schematicOptions);
-        if (!skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return result;
-    });
+async function runNestSchematic(tree, schematic, options) {
+    const { skipFormat, ...schematicOptions } = options;
+    const { wrapAngularDevkitSchematic } = require('@nx/devkit/ngcli-adapter');
+    const nestSchematic = wrapAngularDevkitSchematic('@nestjs/schematics', schematic);
+    const result = await nestSchematic(tree, schematicOptions);
+    if (!skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return result;
 }
 exports.runNestSchematic = runNestSchematic;

package/src/migrations/update-13-2-0/update-to-nest-8.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const semver_2 = require("semver");
@@ -8,54 +7,59 @@ const object_sort_1 = require("nx/src/utils/object-sort");
 const nestJsSchematicsVersion = '^9.0.0';
 const nestJsVersion8 = '^8.0.0';
 const rxjsVersion7 = '^7.0.0';
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const shouldUpdate = yield isUpdatable(tree);
-        if (!shouldUpdate) {
-            return;
-        }
-        updateVersion(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-        return () => {
-            devkit_1.logger.info('Please make sure to run npm install or yarn install to get the latest packages added by this migration');
-        };
-    });
+async function update(tree) {
+    const shouldUpdate = await isUpdatable(tree);
+    if (!shouldUpdate) {
+        return;
+    }
+    updateVersion(tree);
+    await (0, devkit_1.formatFiles)(tree);
+    return () => {
+        devkit_1.logger.info('Please make sure to run npm install or yarn install to get the latest packages added by this migration');
+    };
 }
 exports.default = update;
-function isUpdatable(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const json = (0, devkit_1.readJson)(tree, 'package.json');
-        if (json.dependencies['@angular/core']) {
-            const rxjs = (0, semver_1.checkAndCleanWithSemver)('rxjs', json.dependencies['rxjs']);
-            if ((0, semver_2.satisfies)(rxjs, rxjsVersion7)) {
-                return true;
-            }
-            const { Confirm } = require('enquirer');
-            const prompt = new Confirm({
-                name: 'question',
-                message: 'Do you want to update to RxJS 7 + Nest 8?',
-                initial: true,
-            });
-            return yield prompt.run();
+async function isUpdatable(tree) {
+    const json = (0, devkit_1.readJson)(tree, 'package.json');
+    if (json.dependencies['@angular/core']) {
+        const rxjs = (0, semver_1.checkAndCleanWithSemver)('rxjs', json.dependencies['rxjs']);
+        if ((0, semver_2.satisfies)(rxjs, rxjsVersion7)) {
+            return true;
         }
-        return true;
-    });
+        const { Confirm } = require('enquirer');
+        const prompt = new Confirm({
+            name: 'question',
+            message: 'Do you want to update to RxJS 7 + Nest 8?',
+            initial: true,
+        });
+        return await prompt.run();
+    }
+    return true;
 }
 function updateVersion(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
         json.dependencies = json.dependencies || {};
         json.devDependencies = json.devDependencies || {};
         const rxjs = (0, semver_1.checkAndCleanWithSemver)('rxjs', json.dependencies['rxjs']);
-        json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@nestjs/common': nestJsVersion8, '@nestjs/core': nestJsVersion8, rxjs: (0, semver_2.satisfies)(rxjs, rxjsVersion7)
+        json.dependencies = {
+            ...json.dependencies,
+            '@nestjs/common': nestJsVersion8,
+            '@nestjs/core': nestJsVersion8,
+            rxjs: (0, semver_2.satisfies)(rxjs, rxjsVersion7)
                 ? json.dependencies['rxjs']
-                : rxjsVersion7 });
+                : rxjsVersion7,
+        };
         if (json.dependencies['@nestjs/platform-express']) {
             json.dependencies['@nestjs/platform-express'] = nestJsVersion8;
         }
         if (json.dependencies['@nestjs/platform-fastify']) {
             json.dependencies['@nestjs/platform-fastify'] = nestJsVersion8;
         }
-        json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { '@nestjs/schematics': nestJsSchematicsVersion, '@nestjs/testing': nestJsVersion8 });
+        json.devDependencies = {
+            ...json.devDependencies,
+            '@nestjs/schematics': nestJsSchematicsVersion,
+            '@nestjs/testing': nestJsVersion8,
+        };
         if (json.devDependencies['jasmine-marbles']) {
             json.devDependencies['jasmine-marbles'] = '~0.9.1';
         }

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 devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nest', '@nx/nest');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nest', '@nx/nest');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-4-0-cache-manager/nestjs-10-updates.js

@@ -1,54 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfigTarget = exports.updateCacheManagerImport = exports.updateNestJs10 = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const typescript_1 = require("typescript");
 const JS_TS_FILE_MATCHER = /\.[jt]sx?$/;
 const importMatch = ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="CacheModule"], Identifier[name="CacheModule"]):has(StringLiteral[value="@nestjs/common"])';
-function updateNestJs10(tree) {
-    var _a, _b, _c, _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nestProjects = yield getNestProejcts();
-        if (nestProjects.length === 0) {
-            return;
-        }
-        let installCacheModuleDeps = false;
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const projectName of nestProjects) {
-            const projectConfig = projects.get(projectName);
-            const tsConfig = (_d = (_c = (_b = (_a = projectConfig.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.tsConfig) !== null && _d !== void 0 ? _d : (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'application'
+async function updateNestJs10(tree) {
+    const nestProjects = await getNestProejcts();
+    if (nestProjects.length === 0) {
+        return;
+    }
+    let installCacheModuleDeps = false;
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const projectName of nestProjects) {
+        const projectConfig = projects.get(projectName);
+        const tsConfig = projectConfig.targets?.build?.options?.tsConfig ??
+            (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'application'
                 ? 'tsconfig.app.json'
                 : 'tsconfig.lib.json');
-            if (tree.exists(tsConfig)) {
-                updateTsConfigTarget(tree, tsConfig);
-            }
-            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
-                if (!JS_TS_FILE_MATCHER.test(filePath)) {
-                    return;
-                }
-                installCacheModuleDeps =
-                    updateCacheManagerImport(tree, filePath) || installCacheModuleDeps;
-            });
+        if (tree.exists(tsConfig)) {
+            updateTsConfigTarget(tree, tsConfig);
         }
-        yield (0, devkit_1.formatFiles)(tree);
-        return installCacheModuleDeps
-            ? (0, devkit_1.addDependenciesToPackageJson)(tree, {
-                '@nestjs/cache-manager': '^2.0.0',
-                'cache-manager': '^5.2.3',
-            }, {})
-            : () => { };
-    });
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.root, (filePath) => {
+            if (!JS_TS_FILE_MATCHER.test(filePath)) {
+                return;
+            }
+            installCacheModuleDeps =
+                updateCacheManagerImport(tree, filePath) || installCacheModuleDeps;
+        });
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    return installCacheModuleDeps
+        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {
+            '@nestjs/cache-manager': '^2.0.0',
+            'cache-manager': '^5.2.3',
+        }, {})
+        : () => { };
 }
 exports.updateNestJs10 = updateNestJs10;
-function getNestProejcts() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        return Object.entries(projectGraph.dependencies)
-            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]) && target === 'npm:@nestjs/common'; }))
-            .map(([projectName]) => projectName);
-    });
+async function getNestProejcts() {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    return Object.entries(projectGraph.dependencies)
+        .filter(([node, dep]) => dep.some(({ target }) => !projectGraph.externalNodes?.[node] && target === 'npm:@nestjs/common'))
+        .map(([projectName]) => projectName);
 }
 // change import { CacheModule } from '@nestjs/common';
 // to import { CacheModule } from '@nestjs/cache-manager';