@nx/node 16.8.0-beta.0 → 16.8.0-beta.2

package/generators.json

@@ -11,14 +11,14 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application",
+      "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
       "description": "Create a node application."
     },
     "library": {
-      "factory": "./src/generators/library/library",
+      "factory": "./src/generators/library/library#libraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "16.8.0-beta.0",
+  "version": "16.8.0-beta.2",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -30,17 +30,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/node": "16.8.0-beta.0",
-    "@nx/devkit": "16.8.0-beta.0",
-    "@nx/jest": "16.8.0-beta.0",
-    "@nx/js": "16.8.0-beta.0",
-    "@nx/linter": "16.8.0-beta.0",
-    "@nx/workspace": "16.8.0-beta.0",
+    "@nrwl/node": "16.8.0-beta.2",
+    "@nx/devkit": "16.8.0-beta.2",
+    "@nx/jest": "16.8.0-beta.2",
+    "@nx/js": "16.8.0-beta.2",
+    "@nx/linter": "16.8.0-beta.2",
+    "@nx/workspace": "16.8.0-beta.2",
     "tslib": "^2.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

package/src/generators/application/application.d.ts

@@ -6,5 +6,6 @@ export interface NormalizedSchema extends Schema {
 }
 export declare function addLintingToApplication(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<any>;
+export declare function applicationGeneratorInternal(tree: Tree, schema: Schema): Promise<any>;
 export default applicationGenerator;
 export declare const applicationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/application.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationSchematic = exports.applicationGenerator = exports.addLintingToApplication = void 0;
+exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = exports.addLintingToApplication = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
+const versions_1 = require("@nx/js/src/utils/versions");
+const linter_1 = require("@nx/linter");
+const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
 const path_1 = require("path");
-const init_1 = require("../init/init");
-const versions_1 = require("../../utils/versions");
+const versions_2 = require("../../utils/versions");
 const e2e_project_1 = require("../e2e-project/e2e-project");
+const init_1 = require("../init/init");
 const setup_docker_1 = require("../setup-docker/setup-docker");
-const lint_project_1 = require("@nx/linter/src/generators/lint-project/lint-project");
-const versions_2 = require("@nx/js/src/utils/versions");
 function getWebpackBuildConfig(project, options) {
     return {
         executor: `@nx/webpack:webpack`,
@@ -160,33 +161,33 @@ exports.addLintingToApplication = addLintingToApplication;
 function addProjectDependencies(tree, options) {
     const bundlers = {
         webpack: {
-            '@nx/webpack': versions_1.nxVersion,
+            '@nx/webpack': versions_2.nxVersion,
         },
         esbuild: {
-            '@nx/esbuild': versions_1.nxVersion,
-            esbuild: versions_2.esbuildVersion,
+            '@nx/esbuild': versions_2.nxVersion,
+            esbuild: versions_1.esbuildVersion,
         },
     };
     const frameworkDependencies = {
         express: {
-            express: versions_1.expressVersion,
+            express: versions_2.expressVersion,
         },
         koa: {
-            koa: versions_1.koaVersion,
+            koa: versions_2.koaVersion,
         },
         fastify: {
-            fastify: versions_1.fastifyVersion,
-            'fastify-plugin': versions_1.fastifyPluginVersion,
-            '@fastify/autoload': versions_1.fastifyAutoloadVersion,
-            '@fastify/sensible': versions_1.fastifySensibleVersion,
+            fastify: versions_2.fastifyVersion,
+            'fastify-plugin': versions_2.fastifyPluginVersion,
+            '@fastify/autoload': versions_2.fastifyAutoloadVersion,
+            '@fastify/sensible': versions_2.fastifySensibleVersion,
         },
     };
     const frameworkDevDependencies = {
         express: {
-            '@types/express': versions_1.expressTypingsVersion,
+            '@types/express': versions_2.expressTypingsVersion,
         },
         koa: {
-            '@types/koa': versions_1.koaTypingsVersion,
+            '@types/koa': versions_2.koaTypingsVersion,
         },
         fastify: {},
     };
@@ -204,10 +205,16 @@ function updateTsConfigOptions(tree, options) {
 }
 function applicationGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(tree, schema);
+        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.applicationGenerator = applicationGenerator;
+function applicationGeneratorInternal(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield normalizeOptions(tree, schema);
         const tasks = [];
         if (options.framework === 'nest') {
-            const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_1.nxVersion);
+            const { applicationGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', versions_2.nxVersion);
             return yield applicationGenerator(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
         }
         const initTask = yield (0, init_1.initGenerator)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true }));
@@ -230,7 +237,7 @@ function applicationGenerator(tree, schema) {
             tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/app/app.spec.ts'));
         }
         if (options.e2eTestRunner === 'jest') {
-            const e2eTask = yield (0, e2e_project_1.e2eProjectGenerator)(tree, Object.assign(Object.assign({}, options), { projectType: options.framework === 'none' ? 'cli' : 'server', name: options.rootProject ? 'e2e' : `${options.name}-e2e`, project: options.name, port: options.port, isNest: options.isNest, skipFormat: true }));
+            const e2eTask = yield (0, e2e_project_1.e2eProjectGenerator)(tree, Object.assign(Object.assign({}, options), { projectType: options.framework === 'none' ? 'cli' : 'server', name: options.rootProject ? 'e2e' : `${options.name}-e2e`, directory: options.rootProject ? 'e2e' : `${options.appProjectRoot}-e2e`, projectNameAndRootFormat: 'as-provided', project: options.name, port: options.port, isNest: options.isNest, skipFormat: true }));
             tasks.push(e2eTask);
         }
         if (options.js) {
@@ -249,27 +256,30 @@ function applicationGenerator(tree, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 function normalizeOptions(host, options) {
     var _a, _b, _c, _d, _e, _f;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
-    const appDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-    const appProjectName = appDirectory.replace(new RegExp('/', 'g'), '-');
-    const appProjectRoot = options.rootProject
-        ? '.'
-        : (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
-    options.bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'esbuild';
-    options.e2eTestRunner = (_b = options.e2eTestRunner) !== null && _b !== void 0 ? _b : 'jest';
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(appProjectName).fileName, frontendProject: options.frontendProject
-            ? (0, devkit_1.names)(options.frontendProject).fileName
-            : undefined, appProjectRoot,
-        parsedTags, linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : 'jest', rootProject: (_e = options.rootProject) !== null && _e !== void 0 ? _e : false, port: (_f = options.port) !== null && _f !== void 0 ? _f : 3000 });
+    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)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator: '@nx/node:application',
+        });
+        options.rootProject = appProjectRoot === '.';
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        options.bundler = (_a = options.bundler) !== null && _a !== void 0 ? _a : 'esbuild';
+        options.e2eTestRunner = (_b = options.e2eTestRunner) !== null && _b !== void 0 ? _b : 'jest';
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        return Object.assign(Object.assign({}, options), { name: appProjectName, frontendProject: options.frontendProject
+                ? (0, devkit_1.names)(options.frontendProject).fileName
+                : undefined, appProjectRoot,
+            parsedTags, linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : 'jest', rootProject: (_e = options.rootProject) !== null && _e !== void 0 ? _e : false, port: (_f = options.port) !== null && _f !== void 0 ? _f : 3000 });
+    });
 }
 exports.default = applicationGenerator;
 exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);

package/src/generators/application/schema.d.ts

@@ -1,10 +1,12 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
 
 export interface Schema {
   name: string;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'jest' | 'none';
   linter?: Linter;

package/src/generators/application/schema.json

@@ -14,13 +14,19 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the node application?",
-      "x-priority": "important"
+      "x-priority": "important",
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "directory": {
       "description": "The directory of the new application.",
       "type": "string",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",

package/src/generators/e2e-project/e2e-project.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
-export declare function e2eProjectGenerator(host: Tree, _options: Schema): Promise<GeneratorCallback>;
+export declare function e2eProjectGenerator(host: Tree, options: Schema): Promise<GeneratorCallback>;
+export declare function e2eProjectGeneratorInternal(host: Tree, _options: Schema): Promise<GeneratorCallback>;
 export default e2eProjectGenerator;
 export declare const e2eProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/e2e-project/e2e-project.js

@@ -1,18 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.e2eProjectSchematic = exports.e2eProjectGenerator = void 0;
+exports.e2eProjectSchematic = exports.e2eProjectGeneratorInternal = exports.e2eProjectGenerator = void 0;
 const tslib_1 = require("tslib");
-const path = require("path");
 const devkit_1 = require("@nx/devkit");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const linter_1 = require("@nx/linter");
-const versions_1 = require("../../utils/versions");
-const path_1 = require("path");
 const global_eslint_config_1 = require("@nx/linter/src/generators/init/global-eslint-config");
-function e2eProjectGenerator(host, _options) {
+const path = require("path");
+const versions_1 = require("../../utils/versions");
+const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
+function e2eProjectGenerator(host, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield e2eProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+    });
+}
+exports.e2eProjectGenerator = e2eProjectGenerator;
+function e2eProjectGeneratorInternal(host, _options) {
     var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
-        const options = normalizeOptions(host, _options);
+        const options = yield normalizeOptions(host, _options);
         const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
         (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
             root: options.e2eProjectRoot,
@@ -55,31 +62,13 @@ function e2eProjectGenerator(host, _options) {
                 rootProject: options.rootProject,
             });
             tasks.push(linterTask);
-            (0, devkit_1.updateJson)(host, (0, path_1.join)(options.e2eProjectRoot, '.eslintrc.json'), (json) => {
-                if (options.rootProject) {
-                    json.plugins = ['@nx'];
-                    json.extends = [];
-                }
-                json.overrides = [
-                    ...(options.rootProject
-                        ? [global_eslint_config_1.globalTypeScriptOverrides, global_eslint_config_1.globalJavaScriptOverrides]
-                        : []),
-                    /**
-                     * In order to ensure maximum efficiency when typescript-eslint generates TypeScript Programs
-                     * behind the scenes during lint runs, we need to make sure the project is configured to use its
-                     * own specific tsconfigs, and not fall back to the ones in the root of the workspace.
-                     */
-                    {
-                        files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
-                        /**
-                         * Having an empty rules object present makes it more obvious to the user where they would
-                         * extend things from if they needed to
-                         */
-                        rules: {},
-                    },
-                ];
-                return json;
-            });
+            if (options.rootProject && (0, eslint_file_1.isEslintConfigSupported)(host)) {
+                (0, eslint_file_1.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
+                (0, eslint_file_1.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
+                    global_eslint_config_1.typeScriptOverride,
+                    global_eslint_config_1.javaScriptOverride,
+                ]);
+            }
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(host);
@@ -87,21 +76,23 @@ function e2eProjectGenerator(host, _options) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.e2eProjectGenerator = e2eProjectGenerator;
+exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
 function normalizeOptions(tree, options) {
     var _a, _b;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(tree).appsDir;
-    const name = (_a = options.name) !== null && _a !== void 0 ? _a : `${options.project}-e2e`;
-    const appDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(name).fileName}`
-        : (0, devkit_1.names)(name).fileName;
-    const e2eProjectName = appDirectory.replace(new RegExp('/', 'g'), '-');
-    const e2eProjectRoot = options.rootProject
-        ? 'e2e'
-        : (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
-    return Object.assign(Object.assign({}, options), { e2eProjectRoot,
-        e2eProjectName, port: (_b = options.port) !== null && _b !== void 0 ? _b : 3000, rootProject: !!options.rootProject });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+            name: (_a = options.name) !== null && _a !== void 0 ? _a : `${options.project}-e2e`,
+            projectType: 'library',
+            directory: options.rootProject ? 'e2e' : options.directory,
+            projectNameAndRootFormat: options.rootProject
+                ? 'as-provided'
+                : options.projectNameAndRootFormat,
+            // this is an internal generator, don't save defaults
+            callingGenerator: null,
+        });
+        return Object.assign(Object.assign({}, options), { e2eProjectRoot,
+            e2eProjectName, port: (_b = options.port) !== null && _b !== void 0 ? _b : 3000, rootProject: !!options.rootProject });
+    });
 }
 exports.default = e2eProjectGenerator;
 exports.e2eProjectSchematic = (0, devkit_1.convertNxGenerator)(e2eProjectGenerator);

package/src/generators/e2e-project/schema.d.ts

@@ -1,7 +1,10 @@
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+
 export interface Schema {
   project: string;
   projectType: 'server' | 'cli';
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   name?: string;
   port?: number;
   linter?: 'eslint' | 'none';

package/src/generators/e2e-project/schema.json

@@ -18,6 +18,11 @@
       "type": "string",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "name": {
       "description": "The name of the e2e project. Defaults to the project name with '-e2e' suffix.",
       "type": "string"

package/src/generators/library/library.d.ts

@@ -1,13 +1,13 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export interface NormalizedSchema extends Schema {
-    name: string;
     fileName: string;
+    projectName: string;
     projectRoot: string;
-    projectDirectory: string;
     parsedTags: string[];
     compiler: 'swc' | 'tsc';
 }
 export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function libraryGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;
 export declare const librarySchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -1,17 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.librarySchematic = exports.libraryGenerator = void 0;
+exports.librarySchematic = 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 js_1 = require("@nx/js");
-const path_1 = require("path");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
+const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const path_1 = require("path");
 const init_1 = require("../init/init");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 function libraryGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(tree, schema);
+        return yield libraryGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.libraryGenerator = libraryGenerator;
+function libraryGeneratorInternal(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield normalizeOptions(tree, schema);
         const tasks = [
             yield (0, init_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true })),
         ];
@@ -31,29 +37,35 @@ function libraryGenerator(tree, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.libraryGenerator = libraryGenerator;
+exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;
 exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
 function normalizeOptions(tree, options) {
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const { npmScope, libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
-    const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const fullProjectDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`
-        : name;
-    const projectName = fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
-    const fileName = getCaseAwareFileName({
-        fileName: options.simpleModuleName ? name : projectName,
-        pascalCaseFiles: options.pascalCaseFiles,
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName, names: projectNames, projectRoot, importPath, projectNameAndRootFormat, } = 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/node:library',
+        });
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        const fileName = getCaseAwareFileName({
+            fileName: options.simpleModuleName
+                ? projectNames.projectSimpleName
+                : projectNames.projectFileName,
+            pascalCaseFiles: options.pascalCaseFiles,
+        });
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        return Object.assign(Object.assign({}, options), { fileName,
+            projectName,
+            projectRoot,
+            parsedTags,
+            importPath });
     });
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const importPath = options.importPath || (0, get_import_path_1.getImportPath)(tree, fullProjectDirectory);
-    return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectRoot, projectDirectory: fullProjectDirectory, parsedTags,
-        importPath });
 }
 function getCaseAwareFileName(options) {
     const normalized = (0, devkit_1.names)(options.fileName);
@@ -78,17 +90,14 @@ function updateProject(tree, options) {
     if (!options.publishable && !options.buildable) {
         return;
     }
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
     const rootProject = options.projectRoot === '.' || options.projectRoot === '';
     project.targets = project.targets || {};
     project.targets.build = {
         executor: `@nx/js:${options.compiler}`,
         outputs: ['{options.outputPath}'],
         options: {
-            outputPath: (0, devkit_1.joinPathFragments)('dist', rootProject
-                ? options.projectDirectory
-                : `${libsDir}/${options.projectDirectory}`),
+            outputPath: (0, devkit_1.joinPathFragments)('dist', rootProject ? options.projectName : options.projectRoot),
             tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
             packageJson: `${options.projectRoot}/package.json`,
             main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
@@ -102,5 +111,5 @@ function updateProject(tree, options) {
     if (options.rootDir) {
         project.targets.build.options.srcRootForCompilationRoot = options.rootDir;
     }
-    (0, devkit_1.updateProjectConfiguration)(tree, options.name, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
 }

package/src/generators/library/schema.d.ts

@@ -1,8 +1,10 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
 
 export interface Schema {
   name: string;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   simpleModuleName?: boolean;
   skipTsConfig?: boolean;
   skipFormat?: boolean;

package/src/generators/library/schema.json

@@ -19,13 +19,19 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?"
+      "x-prompt": "What name would you like to use for the library?",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
     },
     "directory": {
       "type": "string",
       "description": "A directory where the lib is placed",
       "alias": "dir"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "simpleModuleName": {
       "description": "Keep the module name simple (when using `--directory`).",
       "type": "boolean",