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

package/src/generators/init/init.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const linter_1 = require("@nx/linter");
@@ -9,75 +8,92 @@ const js_1 = require("@nx/js");
 const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
 const versions_1 = require("../../utils/versions");
-function angularInitGenerator(tree, rawOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const tasks = [];
-        const options = normalizeOptions(rawOptions);
-        const pkgVersions = (0, version_utils_1.versions)(tree);
-        const peerDepsToInstall = ['@angular-devkit/core'];
-        let devkitVersion;
-        peerDepsToInstall.forEach((pkg) => {
-            var _a;
-            const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
-            if (!packageVersion) {
-                devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : pkgVersions.angularDevkitVersion);
-                try {
-                    (0, devkit_1.ensurePackage)(pkg, devkitVersion);
-                }
-                catch (_b) {
-                    // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
-                }
-                if (!options.skipPackageJson) {
-                    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
-                }
+async function angularInitGenerator(tree, rawOptions) {
+    const tasks = [];
+    const options = normalizeOptions(rawOptions);
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    const peerDepsToInstall = ['@angular-devkit/core'];
+    let devkitVersion;
+    peerDepsToInstall.forEach((pkg) => {
+        const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
+        if (!packageVersion) {
+            devkitVersion ??=
+                (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+                    pkgVersions.angularDevkitVersion;
+            try {
+                (0, devkit_1.ensurePackage)(pkg, devkitVersion);
+            }
+            catch {
+                // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
+            }
+            if (!options.skipPackageJson) {
+                tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
             }
-        });
-        setDefaults(tree, options);
-        const jsTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
-        tasks.push(jsTask);
-        if (!options.skipPackageJson) {
-            tasks.push(updateDependencies(tree, pkgVersions));
-        }
-        const unitTestTask = yield addUnitTestRunner(tree, options, pkgVersions.jestPresetAngularVersion);
-        tasks.push(unitTestTask);
-        const e2eTask = yield addE2ETestRunner(tree, options);
-        tasks.push(e2eTask);
-        ignoreAngularCacheDirectory(tree);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
+    setDefaults(tree, options);
+    const jsTask = await (0, js_1.initGenerator)(tree, {
+        ...options,
+        tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        js: false,
+        skipFormat: true,
+    });
+    tasks.push(jsTask);
+    if (!options.skipPackageJson) {
+        tasks.push(updateDependencies(tree, pkgVersions));
+    }
+    const unitTestTask = await addUnitTestRunner(tree, options, pkgVersions.jestPresetAngularVersion);
+    tasks.push(unitTestTask);
+    const e2eTask = await addE2ETestRunner(tree, options);
+    tasks.push(e2eTask);
+    ignoreAngularCacheDirectory(tree);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.angularInitGenerator = angularInitGenerator;
 function normalizeOptions(options) {
-    var _a, _b, _c, _d, _e, _f, _g;
     return {
-        e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : test_runners_1.E2eTestRunner.Cypress,
-        linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint,
-        skipFormat: (_c = options.skipFormat) !== null && _c !== void 0 ? _c : false,
-        skipInstall: (_d = options.skipInstall) !== null && _d !== void 0 ? _d : false,
-        skipPackageJson: (_e = options.skipPackageJson) !== null && _e !== void 0 ? _e : false,
-        style: (_f = options.style) !== null && _f !== void 0 ? _f : 'css',
-        unitTestRunner: (_g = options.unitTestRunner) !== null && _g !== void 0 ? _g : test_runners_1.UnitTestRunner.Jest,
+        e2eTestRunner: options.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        skipFormat: options.skipFormat ?? false,
+        skipInstall: options.skipInstall ?? false,
+        skipPackageJson: options.skipPackageJson ?? false,
+        style: options.style ?? 'css',
+        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
         rootProject: options.rootProject,
     };
 }
 function setDefaults(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     nxJson.generators = nxJson.generators || {};
-    nxJson.generators['@nx/angular:application'] = Object.assign({ style: options.style, linter: options.linter, unitTestRunner: options.unitTestRunner, e2eTestRunner: options.e2eTestRunner }, (nxJson.generators['@nx/angular:application'] || {}));
-    nxJson.generators['@nx/angular:library'] = Object.assign({ linter: options.linter, unitTestRunner: options.unitTestRunner }, (nxJson.generators['@nx/angular:library'] || {}));
-    nxJson.generators['@nx/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nx/angular:component'] || {}));
+    nxJson.generators['@nx/angular:application'] = {
+        style: options.style,
+        linter: options.linter,
+        unitTestRunner: options.unitTestRunner,
+        e2eTestRunner: options.e2eTestRunner,
+        ...(nxJson.generators['@nx/angular:application'] || {}),
+    };
+    nxJson.generators['@nx/angular:library'] = {
+        linter: options.linter,
+        unitTestRunner: options.unitTestRunner,
+        ...(nxJson.generators['@nx/angular:library'] || {}),
+    };
+    nxJson.generators['@nx/angular:component'] = {
+        style: options.style,
+        ...(nxJson.generators['@nx/angular:component'] || {}),
+    };
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
 function updateDependencies(tree, versions) {
-    var _a, _b, _c, _d, _e;
-    const angularVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : versions.angularVersion;
-    const angularDevkitVersion = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : versions.angularDevkitVersion;
-    const rxjsVersion = (_c = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs')) !== null && _c !== void 0 ? _c : versions.rxjsVersion;
-    const tsLibVersion = (_d = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib')) !== null && _d !== void 0 ? _d : versions.tsLibVersion;
-    const zoneJsVersion = (_e = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js')) !== null && _e !== void 0 ? _e : versions.zoneJsVersion;
+    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core') ??
+        versions.angularVersion;
+    const angularDevkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+        versions.angularDevkitVersion;
+    const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? versions.rxjsVersion;
+    const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? versions.tsLibVersion;
+    const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? versions.zoneJsVersion;
     return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
         '@angular/animations': angularVersion,
         '@angular/common': angularVersion,
@@ -99,51 +115,44 @@ function updateDependencies(tree, versions) {
         '@schematics/angular': angularDevkitVersion,
     });
 }
-function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
-    var _a;
-    var _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        switch (options.unitTestRunner) {
-            case test_runners_1.UnitTestRunner.Jest:
-                if (!options.skipPackageJson) {
-                    (_a = (_b = process.env).npm_config_legacy_peer_deps) !== null && _a !== void 0 ? _a : (_b.npm_config_legacy_peer_deps = 'true');
-                    (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
-                        'jest-preset-angular': jestPresetAngularVersion,
-                    });
-                }
-                return (0, jest_1.jestInitGenerator)(tree, {
-                    skipPackageJson: options.skipPackageJson,
+async function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
+    switch (options.unitTestRunner) {
+        case test_runners_1.UnitTestRunner.Jest:
+            if (!options.skipPackageJson) {
+                process.env.npm_config_legacy_peer_deps ??= 'true';
+                (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+                    'jest-preset-angular': jestPresetAngularVersion,
                 });
-            default:
-                return () => { };
-        }
-    });
+            }
+            return (0, jest_1.jestInitGenerator)(tree, {
+                skipPackageJson: options.skipPackageJson,
+            });
+        default:
+            return () => { };
+    }
 }
-function addE2ETestRunner(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        switch (options.e2eTestRunner) {
-            case test_runners_1.E2eTestRunner.Cypress:
-                const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-                return cypressInitGenerator(tree, {
-                    skipPackageJson: options.skipPackageJson,
-                });
-            case test_runners_1.E2eTestRunner.Playwright:
-                const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-                return playwrightInitGenerator(tree, {
-                    skipFormat: true,
-                    skipPackageJson: options.skipPackageJson,
-                });
-            default:
-                return () => { };
-        }
-    });
+async function addE2ETestRunner(tree, options) {
+    switch (options.e2eTestRunner) {
+        case test_runners_1.E2eTestRunner.Cypress:
+            const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            return cypressInitGenerator(tree, {
+                skipPackageJson: options.skipPackageJson,
+            });
+        case test_runners_1.E2eTestRunner.Playwright:
+            const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+            return playwrightInitGenerator(tree, {
+                skipFormat: true,
+                skipPackageJson: options.skipPackageJson,
+            });
+        default:
+            return () => { };
+    }
 }
 function ignoreAngularCacheDirectory(tree) {
-    var _a, _b;
     const { cli } = (0, devkit_1.readNxJson)(tree);
     // angular-specific cli config is supported though is not included in the
     // NxJsonConfiguration type
-    const angularCacheDir = (_b = (_a = cli === null || cli === void 0 ? void 0 : cli.cache) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : '.angular';
+    const angularCacheDir = cli?.cache?.path ?? '.angular';
     addGitIgnoreEntry(tree, angularCacheDir);
     addPrettierIgnoreEntry(tree, angularCacheDir);
 }

package/src/generators/library/lib/add-standalone-component.js

@@ -1,23 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addStandaloneComponent = void 0;
-const tslib_1 = require("tslib");
 const component_1 = require("../../component/component");
 const add_load_children_1 = require("./add-load-children");
 const add_children_1 = require("./add-children");
-function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, component_1.default)(tree, Object.assign(Object.assign({}, componentOptions), { name: componentOptions.name, standalone: true, export: true, project: libraryOptions.name, flat: componentOptions.flat, skipFormat: true }));
-        if (libraryOptions.routing) {
-            if (libraryOptions.parent) {
-                if (libraryOptions.lazy) {
-                    (0, add_load_children_1.addLoadChildren)(tree, libraryOptions);
-                }
-                else {
-                    (0, add_children_1.addChildren)(tree, libraryOptions);
-                }
+async function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
+    await (0, component_1.default)(tree, {
+        ...componentOptions,
+        name: componentOptions.name,
+        standalone: true,
+        export: true,
+        project: libraryOptions.name,
+        flat: componentOptions.flat,
+        skipFormat: true,
+    });
+    if (libraryOptions.routing) {
+        if (libraryOptions.parent) {
+            if (libraryOptions.lazy) {
+                (0, add_load_children_1.addLoadChildren)(tree, libraryOptions);
+            }
+            else {
+                (0, add_children_1.addChildren)(tree, libraryOptions);
             }
         }
-    });
+    }
 }
 exports.addStandaloneComponent = addStandaloneComponent;

package/src/generators/library/lib/enable-strict-type-checking.js

@@ -10,7 +10,6 @@ function enableStrictTypeChecking(host, options) {
 }
 exports.enableStrictTypeChecking = enableStrictTypeChecking;
 function setLibraryStrictDefault(host, isStrict) {
-    var _a;
     // set the default so future libraries use it
     // unless the user has previously set this value
     const nxJson = (0, devkit_1.readNxJson)(host);
@@ -18,7 +17,7 @@ function setLibraryStrictDefault(host, isStrict) {
     nxJson.generators['@nx/angular:library'] =
         nxJson.generators['@nx/angular:library'] || {};
     nxJson.generators['@nx/angular:library'].strict =
-        (_a = nxJson.generators['@nx/angular:library'].strict) !== null && _a !== void 0 ? _a : isStrict;
+        nxJson.generators['@nx/angular:library'].strict ?? isStrict;
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
 exports.setLibraryStrictDefault = setLibraryStrictDefault;
@@ -26,11 +25,24 @@ function updateTsConfig(host, options) {
     // Update the settings in the tsconfig.app.json to enable strict type checking.
     // This matches the settings defined by the Angular CL https://angular.io/guide/strict-mode
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.json`, (json) => {
-        var _a, _b;
         // update the TypeScript settings
-        json.compilerOptions = Object.assign(Object.assign({}, ((_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {})), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
+        json.compilerOptions = {
+            ...(json.compilerOptions ?? {}),
+            forceConsistentCasingInFileNames: true,
+            strict: true,
+            noImplicitOverride: true,
+            noPropertyAccessFromIndexSignature: true,
+            noImplicitReturns: true,
+            noFallthroughCasesInSwitch: true,
+        };
         // update Angular Template Settings
-        json.angularCompilerOptions = Object.assign(Object.assign({}, ((_b = json.angularCompilerOptions) !== null && _b !== void 0 ? _b : {})), { enableI18nLegacyMessageIdFormat: false, strictInjectionParameters: true, strictInputAccessModifiers: true, strictTemplates: true });
+        json.angularCompilerOptions = {
+            ...(json.angularCompilerOptions ?? {}),
+            enableI18nLegacyMessageIdFormat: false,
+            strictInjectionParameters: true,
+            strictInputAccessModifiers: true,
+            strictTemplates: true,
+        };
         return json;
     });
 }

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

@@ -1,65 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 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");
 const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
-function normalizeOptions(host, schema) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // Create a schema with populated default values
-        const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, publishable: false, simpleName: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, 
-            // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
-            compilationMode: schema.publishable
-                ? 'partial'
-                : (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule: schema.skipModule || schema.standalone }, schema);
-        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'library',
-            directory: options.directory,
-            importPath: options.importPath,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/angular:library',
-        });
-        const fileName = options.simpleName
-            ? projectNames.projectSimpleName
-            : projectNames.projectFileName;
-        const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
-        const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
-        const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
-        const ngCliSchematicLibRoot = projectName;
-        const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
-            modulePath,
-            parsedTags,
-            fileName,
-            importPath,
-            ngCliSchematicLibRoot, standaloneComponentName: `${(0, devkit_1.names)(projectNames.projectSimpleName).className}Component` });
-        const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector", "flat"]);
-        return {
-            libraryOptions,
-            componentOptions: {
-                name: fileName,
-                standalone: libraryOptions.standalone,
-                displayBlock,
-                inlineStyle,
-                inlineTemplate,
-                viewEncapsulation,
-                changeDetection,
-                style,
-                skipTests,
-                selector,
-                skipSelector,
-                flat,
-            },
-        };
+async function normalizeOptions(host, schema) {
+    // Create a schema with populated default values
+    const options = {
+        buildable: false,
+        linter: linter_1.Linter.EsLint,
+        publishable: false,
+        simpleName: false,
+        skipFormat: false,
+        unitTestRunner: test_runners_1.UnitTestRunner.Jest,
+        // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
+        compilationMode: schema.publishable
+            ? 'partial'
+            : schema.compilationMode ?? 'full',
+        skipModule: schema.skipModule || schema.standalone,
+        ...schema,
+    };
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'library',
+        directory: options.directory,
+        importPath: options.importPath,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/angular:library',
     });
+    const fileName = options.simpleName
+        ? projectNames.projectSimpleName
+        : projectNames.projectFileName;
+    const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
+    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
+    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
+    const ngCliSchematicLibRoot = projectName;
+    const allNormalizedOptions = {
+        ...options,
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
+        prefix,
+        name: projectName,
+        projectRoot,
+        entryFile: 'index',
+        moduleName,
+        modulePath,
+        parsedTags,
+        fileName,
+        importPath,
+        ngCliSchematicLibRoot,
+        standaloneComponentName: `${(0, devkit_1.names)(projectNames.projectSimpleName).className}Component`,
+    };
+    const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat, ...libraryOptions } = allNormalizedOptions;
+    return {
+        libraryOptions,
+        componentOptions: {
+            name: fileName,
+            standalone: libraryOptions.standalone,
+            displayBlock,
+            inlineStyle,
+            inlineTemplate,
+            viewEncapsulation,
+            changeDetection,
+            style,
+            skipTests,
+            selector,
+            skipSelector,
+            flat,
+        },
+    };
 }
 exports.normalizeOptions = normalizeOptions;