@nx/js 16.8.0-beta.3 → 16.8.0-beta.5

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.librarySchematic = exports.addLint = exports.libraryGeneratorInternal = exports.libraryGenerator = 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 ts_config_1 = require("../../utils/typescript/ts-config");
@@ -13,82 +12,82 @@ const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
 const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
-function libraryGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield libraryGeneratorInternal(tree, Object.assign({ 
-            // provide a default projectNameAndRootFormat to avoid breaking changes
-            // to external generators invoking this one
-            projectNameAndRootFormat: 'derived' }, schema));
+async function libraryGenerator(tree, schema) {
+    return await libraryGeneratorInternal(tree, {
+        // provide a default projectNameAndRootFormat to avoid breaking changes
+        // to external generators invoking this one
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.libraryGenerator = libraryGenerator;
-function libraryGeneratorInternal(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const filesDir = (0, path_1.join)(__dirname, './files');
-        const tasks = [];
-        tasks.push(yield (0, init_1.default)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true, tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json' })));
-        const options = yield normalizeOptions(tree, schema);
-        createFiles(tree, options, `${filesDir}/lib`);
-        addProject(tree, options);
-        tasks.push(addProjectDependencies(tree, options));
-        if (options.publishable) {
-            tasks.push(yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { skipFormat: true })));
-        }
-        if (options.bundler === 'vite') {
-            const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-            const viteTask = yield viteConfigurationGenerator(tree, {
-                project: options.name,
-                newProject: true,
-                uiFramework: 'none',
-                includeVitest: options.unitTestRunner === 'vitest',
-                includeLib: true,
-                skipFormat: true,
-                testEnvironment: options.testEnvironment,
-            });
-            tasks.push(viteTask);
-        }
-        if (options.linter !== 'none') {
-            const lintCallback = yield addLint(tree, options);
-            tasks.push(lintCallback);
-        }
-        if (options.unitTestRunner === 'jest') {
-            const jestCallback = yield addJest(tree, options);
-            tasks.push(jestCallback);
-            if (options.bundler === 'swc' || options.bundler === 'rollup') {
-                replaceJestConfig(tree, options, `${filesDir}/jest-config`);
-            }
-        }
-        else if (options.unitTestRunner === 'vitest' &&
-            options.bundler !== 'vite' // Test would have been set up already
-        ) {
-            const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-            const vitestTask = yield vitestGenerator(tree, {
-                project: options.name,
-                uiFramework: 'none',
-                coverageProvider: 'c8',
-                skipFormat: true,
-                testEnvironment: options.testEnvironment,
-            });
-            tasks.push(vitestTask);
-        }
-        if (!schema.skipTsConfig) {
-            (0, ts_config_1.addTsConfigPath)(tree, options.importPath, [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
-            ]);
-        }
-        if (options.bundler !== 'none') {
-            addBundlerDependencies(tree, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+async function libraryGeneratorInternal(tree, schema) {
+    const filesDir = (0, path_1.join)(__dirname, './files');
+    const tasks = [];
+    tasks.push(await (0, init_1.default)(tree, {
+        ...schema,
+        skipFormat: true,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+    }));
+    const options = await normalizeOptions(tree, schema);
+    createFiles(tree, options, `${filesDir}/lib`);
+    addProject(tree, options);
+    tasks.push(addProjectDependencies(tree, options));
+    if (options.publishable) {
+        tasks.push(await (0, generator_1.default)(tree, { ...options, skipFormat: true }));
+    }
+    if (options.bundler === 'vite') {
+        const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const viteTask = await viteConfigurationGenerator(tree, {
+            project: options.name,
+            newProject: true,
+            uiFramework: 'none',
+            includeVitest: options.unitTestRunner === 'vitest',
+            includeLib: true,
+            skipFormat: true,
+            testEnvironment: options.testEnvironment,
+        });
+        tasks.push(viteTask);
+    }
+    if (options.linter !== 'none') {
+        const lintCallback = await addLint(tree, options);
+        tasks.push(lintCallback);
+    }
+    if (options.unitTestRunner === 'jest') {
+        const jestCallback = await addJest(tree, options);
+        tasks.push(jestCallback);
+        if (options.bundler === 'swc' || options.bundler === 'rollup') {
+            replaceJestConfig(tree, options, `${filesDir}/jest-config`);
         }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+    }
+    else if (options.unitTestRunner === 'vitest' &&
+        options.bundler !== 'vite' // Test would have been set up already
+    ) {
+        const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const vitestTask = await vitestGenerator(tree, {
+            project: options.name,
+            uiFramework: 'none',
+            coverageProvider: 'c8',
+            skipFormat: true,
+            testEnvironment: options.testEnvironment,
+        });
+        tasks.push(vitestTask);
+    }
+    if (!schema.skipTsConfig) {
+        (0, ts_config_1.addTsConfigPath)(tree, options.importPath, [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
+        ]);
+    }
+    if (options.bundler !== 'none') {
+        addBundlerDependencies(tree, options);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 function addProject(tree, options) {
-    var _a;
-    var _b;
     const projectConfiguration = {
         root: options.projectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
@@ -125,7 +124,7 @@ function addProject(tree, options) {
         if (!options.minimal &&
             // TODO(jack): assets for rollup have validation that we need to fix (assets must be under <project-root>/src)
             options.bundler !== 'rollup') {
-            (_a = (_b = projectConfiguration.targets.build.options).assets) !== null && _a !== void 0 ? _a : (_b.assets = []);
+            projectConfiguration.targets.build.options.assets ??= [];
             projectConfiguration.targets.build.options.assets.push((0, devkit_1.joinPathFragments)(options.projectRoot, '*.md'));
         }
         if (options.publishable) {
@@ -147,50 +146,94 @@ function addProject(tree, options) {
         }, true);
     }
 }
-function addLint(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
-        const task = lintProjectGenerator(tree, {
-            project: options.name,
-            linter: options.linter,
-            skipFormat: true,
-            tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
-            ],
-            unitTestRunner: options.unitTestRunner,
-            eslintFilePatterns: [
-                `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
-            ],
-            setParserOptionsProject: options.setParserOptionsProject,
-            rootProject: options.rootProject,
-        });
-        // Also update the root ESLint config. The lintProjectGenerator will not generate it for root projects.
-        // But we need to set the package.json checks.
-        if (options.rootProject) {
-            const { addOverrideToLintConfig, isEslintConfigSupported,
-            // nx-ignore-next-line
-             } = require('@nx/linter/src/generators/utils/eslint-file');
-            if (isEslintConfigSupported(tree)) {
-                addOverrideToLintConfig(tree, '', {
-                    files: ['*.json'],
-                    parser: 'jsonc-eslint-parser',
-                    rules: {
-                        '@nx/dependency-checks': 'error',
-                    },
-                });
-            }
-        }
-        return task;
+async function addLint(tree, options) {
+    const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    const task = lintProjectGenerator(tree, {
+        project: options.name,
+        linter: options.linter,
+        skipFormat: true,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
+        ],
+        unitTestRunner: options.unitTestRunner,
+        eslintFilePatterns: [
+            `${options.projectRoot}/**/*.${options.js ? 'js' : 'ts'}`,
+        ],
+        setParserOptionsProject: options.setParserOptionsProject,
+        rootProject: options.rootProject,
     });
+    const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
+    // nx-ignore-next-line
+     } = require('@nx/linter/src/generators/utils/eslint-file');
+    // Also update the root ESLint config. The lintProjectGenerator will not generate it for root projects.
+    // But we need to set the package.json checks.
+    if (options.rootProject) {
+        if (isEslintConfigSupported(tree)) {
+            addOverrideToLintConfig(tree, '', {
+                files: ['*.json'],
+                parser: 'jsonc-eslint-parser',
+                rules: {
+                    '@nx/dependency-checks': 'error',
+                },
+            });
+        }
+    }
+    // If project lints package.json with @nx/dependency-checks, then add ignore files for
+    // build configuration files such as vite.config.ts. These config files need to be
+    // ignored, otherwise we will errors on missing dependencies that are for dev only.
+    if (lintConfigHasOverride(tree, projectConfiguration.root, (o) => Array.isArray(o.files)
+        ? o.files.some((f) => f.match(/\.json$/))
+        : !!o.files?.match(/\.json$/), true)) {
+        updateOverrideInLintConfig(tree, projectConfiguration.root, (o) => o.rules?.['@nx/dependency-checks'], (o) => {
+            const value = o.rules['@nx/dependency-checks'];
+            let ruleSeverity;
+            let ruleOptions;
+            if (Array.isArray(value)) {
+                ruleSeverity = value[0];
+                ruleOptions = value[1];
+            }
+            else {
+                ruleSeverity = value;
+                ruleOptions = {};
+            }
+            if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
+                ruleOptions.ignoredFiles = [
+                    '{projectRoot}/vite.config.{js,ts,mjs,mts}',
+                ];
+                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+            }
+            else if (options.bundler === 'rollup') {
+                ruleOptions.ignoredFiles = [
+                    '{projectRoot}/rollup.config.{js,ts,mjs,mts}',
+                ];
+                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+            }
+            else if (options.bundler === 'esbuild') {
+                ruleOptions.ignoredFiles = [
+                    '{projectRoot}/esbuild.config.{js,ts,mjs,mts}',
+                ];
+                o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
+            }
+            return o;
+        });
+    }
+    return task;
 }
 exports.addLint = addLint;
 function addBundlerDependencies(tree, options) {
     (0, devkit_1.updateJson)(tree, `${options.projectRoot}/package.json`, (json) => {
         if (options.bundler === 'tsc') {
-            json.dependencies = Object.assign(Object.assign({}, json.dependencies), { tslib: versions_1.tsLibVersion });
+            json.dependencies = {
+                ...json.dependencies,
+                tslib: versions_1.tsLibVersion,
+            };
         }
         else if (options.bundler === 'swc') {
-            json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@swc/helpers': versions_1.swcHelpersVersion });
+            json.dependencies = {
+                ...json.dependencies,
+                '@swc/helpers': versions_1.swcHelpersVersion,
+            };
         }
         return json;
     });
@@ -198,7 +241,15 @@ function addBundlerDependencies(tree, options) {
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.strict) {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { 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,
+            };
         }
         return json;
     });
@@ -213,9 +264,20 @@ function addBabelRc(tree, options) {
 function createFiles(tree, options, filesDir) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.projectNames.projectFileName);
     createProjectTsConfigJson(tree, options);
-    (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
+    (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
+        ...options,
+        dot: '.',
+        className,
         name,
-        propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), buildable: options.bundler && options.bundler !== 'none', hasUnitTestRunner: options.unitTestRunner !== 'none' }));
+        propertyName,
+        js: !!options.js,
+        cliCommand: 'nx',
+        strict: undefined,
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        buildable: options.bundler && options.bundler !== 'none',
+        hasUnitTestRunner: options.unitTestRunner !== 'none',
+    });
     if (options.bundler === 'swc' || options.bundler === 'rollup') {
         (0, add_swc_dependencies_1.addSwcDependencies)(tree);
         (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' ? 'commonjs' : 'es6');
@@ -239,11 +301,23 @@ function createFiles(tree, options, filesDir) {
             if (json.private && (options.publishable || options.rootProject)) {
                 delete json.private;
             }
-            return Object.assign(Object.assign(Object.assign({}, json), { dependencies: Object.assign(Object.assign({}, json.dependencies), determineDependencies(options)) }), determineEntryFields(options));
+            return {
+                ...json,
+                dependencies: {
+                    ...json.dependencies,
+                    ...determineDependencies(options),
+                },
+                ...determineEntryFields(options),
+            };
         });
     }
     else {
-        (0, devkit_1.writeJson)(tree, packageJsonPath, Object.assign({ name: options.importPath, version: '0.0.1', dependencies: determineDependencies(options) }, determineEntryFields(options)));
+        (0, devkit_1.writeJson)(tree, packageJsonPath, {
+            name: options.importPath,
+            version: '0.0.1',
+            dependencies: determineDependencies(options),
+            ...determineEntryFields(options),
+        });
     }
     if (options.config === 'npm-scripts') {
         (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
@@ -263,14 +337,21 @@ function createFiles(tree, options, filesDir) {
     }
     updateTsConfig(tree, options);
 }
-function addJest(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-        return yield configurationGenerator(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: false, skipSerializers: true, testEnvironment: options.testEnvironment, skipFormat: true, compiler: options.bundler === 'swc' || options.bundler === 'tsc'
-                ? options.bundler
-                : options.bundler === 'rollup'
-                    ? 'swc'
-                    : undefined }));
+async function addJest(tree, options) {
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+    return await configurationGenerator(tree, {
+        ...options,
+        project: options.name,
+        setupFile: 'none',
+        supportTsx: false,
+        skipSerializers: true,
+        testEnvironment: options.testEnvironment,
+        skipFormat: true,
+        compiler: options.bundler === 'swc' || options.bundler === 'tsc'
+            ? options.bundler
+            : options.bundler === 'rollup'
+                ? 'swc'
+                : undefined,
     });
 }
 function replaceJestConfig(tree, options, filesDir) {
@@ -289,91 +370,93 @@ function replaceJestConfig(tree, options, filesDir) {
         testEnvironment: options.testEnvironment,
     });
 }
-function normalizeOptions(tree, options) {
-    var _a, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        /**
-         * We are deprecating the compiler and the buildable options.
-         * However, we want to keep the existing behavior for now.
-         *
-         * So, if the user has not provided a bundler, we will use the compiler option, if any.
-         *
-         * If the user has not provided a bundler and no compiler, but has set buildable to true,
-         * we will use tsc, since that is the compiler the old generator used to default to, if buildable was true
-         * and no compiler was provided.
-         *
-         * If the user has not provided a bundler and no compiler, and has not set buildable to true, then
-         * set the bundler to tsc, to preserve old default behaviour (buildable: true by default).
-         *
-         * If it's publishable, we need to build the code before publishing it, so again
-         * we default to `tsc`. In the previous version of this, it would set `buildable` to true
-         * and that would default to `tsc`.
-         *
-         * In the past, the only way to get a non-buildable library was to set buildable to false.
-         * Now, the only way to get a non-buildble library is to set bundler to none.
-         * By default, with nothing provided, libraries are buildable with `@nx/js:tsc`.
-         */
-        options.bundler = (_b = (_a = options.bundler) !== null && _a !== void 0 ? _a : options.compiler) !== null && _b !== void 0 ? _b : 'tsc';
-        // ensure programmatic runs have an expected default
-        if (!options.config) {
-            options.config = 'project';
-        }
-        if (options.publishable) {
-            if (!options.importPath) {
-                throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-            }
-            if (options.bundler === 'none') {
-                options.bundler = 'tsc';
-            }
-        }
-        // This is to preserve old behaviour, buildable: false
-        if (options.publishable === false && options.buildable === false) {
-            options.bundler = 'none';
-        }
-        const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
-        if (options.config === 'npm-scripts') {
-            options.unitTestRunner = 'none';
-            options.linter = Linter.None;
-            options.bundler = 'none';
-        }
-        if ((options.bundler === 'swc' || options.bundler === 'rollup') &&
-            options.skipTypeCheck == null) {
-            options.skipTypeCheck = false;
-        }
-        if (!options.unitTestRunner && options.bundler === 'vite') {
-            options.unitTestRunner = 'vitest';
-        }
-        else if (!options.unitTestRunner && options.config !== 'npm-scripts') {
-            options.unitTestRunner = 'jest';
+async function normalizeOptions(tree, options) {
+    /**
+     * We are deprecating the compiler and the buildable options.
+     * However, we want to keep the existing behavior for now.
+     *
+     * So, if the user has not provided a bundler, we will use the compiler option, if any.
+     *
+     * If the user has not provided a bundler and no compiler, but has set buildable to true,
+     * we will use tsc, since that is the compiler the old generator used to default to, if buildable was true
+     * and no compiler was provided.
+     *
+     * If the user has not provided a bundler and no compiler, and has not set buildable to true, then
+     * set the bundler to tsc, to preserve old default behaviour (buildable: true by default).
+     *
+     * If it's publishable, we need to build the code before publishing it, so again
+     * we default to `tsc`. In the previous version of this, it would set `buildable` to true
+     * and that would default to `tsc`.
+     *
+     * In the past, the only way to get a non-buildable library was to set buildable to false.
+     * Now, the only way to get a non-buildble library is to set bundler to none.
+     * By default, with nothing provided, libraries are buildable with `@nx/js:tsc`.
+     */
+    options.bundler = options.bundler ?? options.compiler ?? 'tsc';
+    // ensure programmatic runs have an expected default
+    if (!options.config) {
+        options.config = 'project';
+    }
+    if (options.publishable) {
+        if (!options.importPath) {
+            throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
         }
-        if (!options.linter && options.config !== 'npm-scripts') {
-            options.linter = Linter.EsLint;
+        if (options.bundler === 'none') {
+            options.bundler = 'tsc';
         }
-        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,
-            rootProject: options.rootProject,
-            callingGenerator: '@nx/js:library',
-        });
-        options.rootProject = projectRoot === '.';
-        const fileName = getCaseAwareFileName({
-            fileName: options.simpleName
-                ? projectNames.projectSimpleName
-                : projectNames.projectFileName,
-            pascalCaseFiles: options.pascalCaseFiles,
-        });
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        (_c = options.minimal) !== null && _c !== void 0 ? _c : (options.minimal = false);
-        return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectNames,
-            projectRoot,
-            parsedTags,
-            importPath });
+    }
+    // This is to preserve old behaviour, buildable: false
+    if (options.publishable === false && options.buildable === false) {
+        options.bundler = 'none';
+    }
+    const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+    if (options.config === 'npm-scripts') {
+        options.unitTestRunner = 'none';
+        options.linter = Linter.None;
+        options.bundler = 'none';
+    }
+    if ((options.bundler === 'swc' || options.bundler === 'rollup') &&
+        options.skipTypeCheck == null) {
+        options.skipTypeCheck = false;
+    }
+    if (!options.unitTestRunner && options.bundler === 'vite') {
+        options.unitTestRunner = 'vitest';
+    }
+    else if (!options.unitTestRunner && options.config !== 'npm-scripts') {
+        options.unitTestRunner = 'jest';
+    }
+    if (!options.linter && options.config !== 'npm-scripts') {
+        options.linter = Linter.EsLint;
+    }
+    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,
+        rootProject: options.rootProject,
+        callingGenerator: '@nx/js:library',
     });
+    options.rootProject = projectRoot === '.';
+    const fileName = getCaseAwareFileName({
+        fileName: options.simpleName
+            ? projectNames.projectSimpleName
+            : projectNames.projectFileName,
+        pascalCaseFiles: options.pascalCaseFiles,
+    });
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    options.minimal ??= false;
+    return {
+        ...options,
+        fileName,
+        name: projectName,
+        projectNames,
+        projectRoot,
+        parsedTags,
+        importPath,
+    };
 }
 function getCaseAwareFileName(options) {
     const normalized = (0, devkit_1.names)(options.fileName);
@@ -428,7 +511,11 @@ function createProjectTsConfigJson(tree, options) {
         extends: options.rootProject
             ? undefined
             : (0, ts_config_1.getRelativePathToRootTsConfig)(tree, options.projectRoot),
-        compilerOptions: Object.assign(Object.assign({}, (options.rootProject ? create_ts_config_1.tsConfigBaseOptions : {})), { module: 'commonjs', allowJs: options.js ? true : undefined }),
+        compilerOptions: {
+            ...(options.rootProject ? create_ts_config_1.tsConfigBaseOptions : {}),
+            module: 'commonjs',
+            allowJs: options.js ? true : undefined,
+        },
         files: [],
         include: [],
         references: [