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

package/generators.json

@@ -4,17 +4,17 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "plugin": {
-      "factory": "./src/generators/plugin/plugin",
+      "factory": "./src/generators/plugin/plugin#pluginGeneratorInternal",
       "schema": "./src/generators/plugin/schema.json",
       "description": "Create a Nx Plugin."
     },
     "create-package": {
-      "factory": "./src/generators/create-package/create-package",
+      "factory": "./src/generators/create-package/create-package#createPackageGeneratorInternal",
       "schema": "./src/generators/create-package/schema.json",
       "description": "Create a package which can be used by npx to create a new workspace"
     },
     "e2e-project": {
-      "factory": "./src/generators/e2e-project/e2e",
+      "factory": "./src/generators/e2e-project/e2e#e2eProjectGeneratorInternal",
       "schema": "./src/generators/e2e-project/schema.json",
       "description": "Create a E2E application for a Nx Plugin."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "16.8.0-beta.0",
+  "version": "16.8.0-beta.2",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -28,13 +28,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/nx-plugin": "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",
+    "@nrwl/nx-plugin": "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",
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "dotenv": "~16.3.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0"
   },
@@ -42,5 +41,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

package/src/executors/e2e/e2e.impl.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import type { ExecutorContext } from '@nx/devkit';
 import type { NxPluginE2EExecutorOptions } from './schema';
 export declare function nxPluginE2EExecutor(options: NxPluginE2EExecutorOptions, context: ExecutorContext): AsyncGenerator<{

package/src/executors/e2e/e2e.impl.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxPluginE2EExecutor = void 0;
 const tslib_1 = require("tslib");
-require("dotenv/config");
 const devkit_1 = require("@nx/devkit");
 const jest_impl_1 = require("@nx/jest/src/executors/jest/jest.impl");
 // TODO(v18): remove this

package/src/generators/create-package/create-package.d.ts

@@ -1,5 +1,6 @@
 import { Tree, GeneratorCallback } from '@nx/devkit';
 import { CreatePackageSchema } from './schema';
 export declare function createPackageGenerator(host: Tree, schema: CreatePackageSchema): Promise<GeneratorCallback>;
+export declare function createPackageGeneratorInternal(host: Tree, schema: CreatePackageSchema): Promise<GeneratorCallback>;
 export default createPackageGenerator;
 export declare const createPackageSchematic: (generatorOptions: CreatePackageSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/create-package/create-package.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPackageSchematic = exports.createPackageGenerator = void 0;
+exports.createPackageSchematic = exports.createPackageGeneratorInternal = exports.createPackageGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
@@ -10,9 +10,15 @@ const normalize_schema_1 = require("./utils/normalize-schema");
 const has_generator_1 = require("../../utils/has-generator");
 const path_1 = require("path");
 function createPackageGenerator(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield createPackageGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.createPackageGenerator = createPackageGenerator;
+function createPackageGeneratorInternal(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
-        const options = (0, normalize_schema_1.normalizeSchema)(host, schema);
+        const options = yield (0, normalize_schema_1.normalizeSchema)(host, schema);
         const pluginPackageName = yield addPresetGenerator(host, options);
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
             'create-nx-workspace': versions_1.nxVersion,
@@ -28,7 +34,7 @@ function createPackageGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.createPackageGenerator = createPackageGenerator;
+exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 /**
  * Add a preset generator to the plugin if it doesn't exist
  * @param host

package/src/generators/create-package/schema.d.ts

@@ -1,3 +1,4 @@
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
 import type { Linter } from '@nx/linter';
 
 export interface CreatePackageSchema {
@@ -6,6 +7,7 @@ export interface CreatePackageSchema {
 
   // options to create cli package, passed to js library generator
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   skipFormat: boolean;
   tags?: string;
   unitTestRunner: 'jest' | 'none';

package/src/generators/create-package/schema.json

@@ -37,6 +37,11 @@
       "type": "string",
       "description": "A directory where the app is placed."
     },
+    "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"]
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",

package/src/generators/create-package/utils/normalize-schema.d.ts

@@ -2,9 +2,7 @@ import { Tree } from '@nx/devkit';
 import { CreatePackageSchema } from '../schema';
 export interface NormalizedSchema extends CreatePackageSchema {
     bundler: 'swc' | 'tsc';
-    libsDir: string;
     projectName: string;
     projectRoot: string;
-    projectDirectory: string;
 }
-export declare function normalizeSchema(host: Tree, schema: CreatePackageSchema): NormalizedSchema;
+export declare function normalizeSchema(host: Tree, schema: CreatePackageSchema): Promise<NormalizedSchema>;

package/src/generators/create-package/utils/normalize-schema.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = void 0;
-const devkit_1 = require("@nx/devkit");
+const tslib_1 = require("tslib");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeSchema(host, schema) {
     var _a;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(schema.directory);
-    const { libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
-    const name = (0, devkit_1.names)(schema.name).fileName;
-    const fullProjectDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`
-        : name;
-    const projectName = fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
-    return Object.assign(Object.assign({}, schema), { bundler: (_a = schema.compiler) !== null && _a !== void 0 ? _a : 'tsc', libsDir,
-        projectName,
-        projectRoot,
-        name, projectDirectory: fullProjectDirectory });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName, names: projectNames, projectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: schema.name,
+            projectType: 'library',
+            directory: schema.directory,
+            projectNameAndRootFormat: schema.projectNameAndRootFormat,
+            callingGenerator: '@nx/plugin:create-package',
+        });
+        schema.projectNameAndRootFormat = projectNameAndRootFormat;
+        return Object.assign(Object.assign({}, schema), { bundler: (_a = schema.compiler) !== null && _a !== void 0 ? _a : 'tsc', projectName,
+            projectRoot, name: projectNames.projectSimpleName });
+    });
 }
 exports.normalizeSchema = normalizeSchema;

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

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

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

@@ -1,28 +1,46 @@
 "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 devkit_1 = require("@nx/devkit");
+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 generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
 const add_local_registry_scripts_1 = require("@nx/js/src/utils/add-local-registry-scripts");
-const path_1 = require("path");
 const linter_1 = require("@nx/linter");
+const path_1 = require("path");
 function normalizeOptions(host, options) {
     var _a;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
-    const { appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
-    const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
-    const projectRoot = projectDirectory && !options.rootProject
-        ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
-        : options.rootProject
-            ? projectName
-            : (0, devkit_1.joinPathFragments)(appsDir, projectName);
-    const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
-    return Object.assign(Object.assign({}, options), { projectName, linter: (_a = options.linter) !== null && _a !== void 0 ? _a : linter_1.Linter.EsLint, pluginPropertyName,
-        projectRoot });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectName = options.rootProject ? 'e2e' : `${options.pluginName}-e2e`;
+        let projectRoot;
+        if (options.projectNameAndRootFormat === 'as-provided') {
+            const projectNameAndRootOptions = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+                name: projectName,
+                projectType: 'application',
+                directory: options.rootProject || !options.projectDirectory
+                    ? projectName
+                    : `${options.projectDirectory}-e2e`,
+                projectNameAndRootFormat: `as-provided`,
+                callingGenerator: '@nx/plugin:e2e-project',
+            });
+            projectRoot = projectNameAndRootOptions.projectRoot;
+        }
+        else {
+            const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.projectDirectory);
+            const { appsDir: defaultAppsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+            const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
+            projectRoot = options.rootProject
+                ? projectName
+                : projectDirectory
+                    ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
+                    : (0, devkit_1.joinPathFragments)(appsDir, projectName);
+        }
+        const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
+        return Object.assign(Object.assign({}, options), { projectName, linter: (_a = options.linter) !== null && _a !== void 0 ? _a : linter_1.Linter.EsLint, pluginPropertyName,
+            projectRoot });
+    });
 }
 function validatePlugin(host, pluginName) {
     try {
@@ -82,10 +100,16 @@ function addLintingToApplication(tree, options) {
     });
 }
 function e2eProjectGenerator(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield e2eProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.e2eProjectGenerator = e2eProjectGenerator;
+function e2eProjectGeneratorInternal(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
         validatePlugin(host, schema.pluginName);
-        const options = normalizeOptions(host, schema);
+        const options = yield normalizeOptions(host, schema);
         addFiles(host, options);
         tasks.push(yield (0, generator_1.setupVerdaccio)(host, {
             skipFormat: true,
@@ -100,6 +124,6 @@ function e2eProjectGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.e2eProjectGenerator = e2eProjectGenerator;
+exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
 exports.default = e2eProjectGenerator;
 exports.e2eProjectSchematic = (0, devkit_1.convertNxGenerator)(e2eProjectGenerator);

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

@@ -1,9 +1,11 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
+import type { Linter } from '@nx/linter';
 
 export interface Schema {
   pluginName: string;
   npmPackageName: string;
   projectDirectory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   pluginOutputPath?: string;
   jestConfig?: string;
   linter?: Linter;

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

@@ -21,6 +21,11 @@
       "type": "string",
       "description": "the directory where the plugin is placed."
     },
+    "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"]
+    },
     "pluginOutputPath": {
       "type": "string",
       "description": "the output path of the plugin after it builds.",

package/src/generators/lint-checks/generator.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const logger_1 = require("nx/src/utils/logger");
 const package_json_1 = require("nx/src/utils/package-json");
+const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
+const flat_config_1 = require("@nx/linter/src/utils/flat-config");
 function pluginLintCheckGenerator(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
@@ -52,17 +54,14 @@ function addMigrationJsonChecks(host, options, packageJson) {
         eslintTargetConfiguration.options.lintFilePatterns.push(migrationsJsonPath);
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
         // Update project level eslintrc
-        (0, devkit_1.updateJson)(host, `${projectConfiguration.root}/.eslintrc.json`, (c) => {
-            const override = c.overrides.find((o) => {
-                var _a, _b, _c, _d;
-                return ((_b = Object.keys((_a = o.rules) !== null && _a !== void 0 ? _a : {})) === null || _b === void 0 ? void 0 : _b.includes('@nx/nx-plugin-checks')) ||
-                    ((_d = Object.keys((_c = o.rules) !== null && _c !== void 0 ? _c : {})) === null || _d === void 0 ? void 0 : _d.includes('@nrwl/nx/nx-plugin-checks'));
-            });
-            if (Array.isArray(override === null || override === void 0 ? void 0 : override.files) &&
-                !override.files.includes(relativeMigrationsJsonPath)) {
-                override.files.push(relativeMigrationsJsonPath);
-            }
-            return c;
+        (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => {
+            var _a, _b, _c, _d;
+            return ((_b = Object.keys((_a = o.rules) !== null && _a !== void 0 ? _a : {})) === null || _b === void 0 ? void 0 : _b.includes('@nx/nx-plugin-checks')) ||
+                ((_d = Object.keys((_c = o.rules) !== null && _c !== void 0 ? _c : {})) === null || _d === void 0 ? void 0 : _d.includes('@nrwl/nx/nx-plugin-checks'));
+        }, (o) => {
+            const fileSet = new Set(Array.isArray(o.files) ? o.files : [o.files]);
+            fileSet.add(relativeMigrationsJsonPath);
+            return Object.assign(Object.assign({}, o), { files: Array.from(fileSet) });
         });
     }
 }
@@ -100,64 +99,62 @@ function updateProjectTarget(host, options, packageJson) {
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
 }
 function updateProjectEslintConfig(host, options, packageJson) {
-    var _a, _b, _c;
-    // Update the project level lint configuration to specify
-    // the plugin schema rule for generated files
-    const eslintPath = `${options.root}/.eslintrc.json`;
-    if (host.exists(eslintPath)) {
-        const eslintConfig = (0, devkit_1.readJson)(host, eslintPath);
-        (_a = eslintConfig.overrides) !== null && _a !== void 0 ? _a : (eslintConfig.overrides = []);
-        let entry = eslintConfig.overrides.find((x) => {
+    if ((0, eslint_file_1.isEslintConfigSupported)(host, options.root)) {
+        const lookup = (o) => {
             var _a, _b;
-            return Object.keys((_a = x.rules) !== null && _a !== void 0 ? _a : {}).includes('@nx/nx-plugin-checks') ||
-                Object.keys((_b = x.rules) !== null && _b !== void 0 ? _b : {}).includes('@nrwl/nx/nx-plugin-checks');
-        });
-        const newentry = !entry;
-        entry !== null && entry !== void 0 ? entry : (entry = { files: [] });
-        entry.files = [
-            ...new Set([
-                ...((_b = entry.files) !== null && _b !== void 0 ? _b : []),
-                ...[
-                    './package.json',
-                    packageJson.generators,
-                    packageJson.executors,
-                    packageJson.schematics,
-                    packageJson.builders,
-                ].filter((f) => !!f),
-            ]),
-        ];
-        entry.parser = 'jsonc-eslint-parser';
-        (_c = entry.rules) !== null && _c !== void 0 ? _c : (entry.rules = {
-            '@nx/nx-plugin-checks': 'error',
-        });
-        if (newentry) {
-            eslintConfig.overrides.push(entry);
+            return Object.keys((_a = o.rules) !== null && _a !== void 0 ? _a : {}).includes('@nx/nx-plugin-checks') ||
+                Object.keys((_b = o.rules) !== null && _b !== void 0 ? _b : {}).includes('@nrwl/nx/nx-plugin-checks');
+        };
+        const files = [
+            './package.json',
+            packageJson.generators,
+            packageJson.executors,
+            packageJson.schematics,
+            packageJson.builders,
+        ].filter((f) => !!f);
+        const parser = (0, flat_config_1.useFlatConfig)(host)
+            ? { languageOptions: { parser: 'jsonc-eslint-parser' } }
+            : { parser: 'jsonc-eslint-parser' };
+        if ((0, eslint_file_1.lintConfigHasOverride)(host, options.root, lookup)) {
+            // update it
+            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.root, lookup, (o) => (Object.assign(Object.assign(Object.assign(Object.assign({}, o), { files: [
+                    ...new Set([
+                        ...(Array.isArray(o.files) ? o.files : [o.files]),
+                        ...files,
+                    ]),
+                ] }), parser), { rules: Object.assign(Object.assign({}, o.rules), { '@nx/nx-plugin-checks': 'error' }) })));
+        }
+        else {
+            // add it
+            (0, eslint_file_1.addOverrideToLintConfig)(host, options.root, Object.assign(Object.assign({ files }, parser), { rules: {
+                    '@nx/nx-plugin-checks': 'error',
+                } }));
         }
-        (0, devkit_1.writeJson)(host, eslintPath, eslintConfig);
     }
 }
 // Update the root eslint to specify a parser for json files
 // This is required, otherwise every json file that is not overriden
 // will display false errors in the IDE
 function updateRootEslintConfig(host) {
-    var _a;
-    if (host.exists('.eslintrc.json')) {
-        const rootESLint = (0, devkit_1.readJson)(host, '.eslintrc.json');
-        (_a = rootESLint.overrides) !== null && _a !== void 0 ? _a : (rootESLint.overrides = []);
-        if (!eslintConfigContainsJsonOverride(rootESLint)) {
-            rootESLint.overrides.push({
+    if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
+        if (!(0, eslint_file_1.lintConfigHasOverride)(host, '', (o) => {
+            var _a;
+            return Array.isArray(o.files)
+                ? o.files.some((f) => f.match(/\.json$/))
+                : !!((_a = o.files) === null || _a === void 0 ? void 0 : _a.match(/\.json$/));
+        }, true)) {
+            (0, eslint_file_1.addOverrideToLintConfig)(host, '', {
                 files: '*.json',
                 parser: 'jsonc-eslint-parser',
                 rules: {},
-            });
-            (0, devkit_1.writeJson)(host, '.eslintrc.json', rootESLint);
+            }, { checkBaseConfig: true });
         }
     }
     else {
         devkit_1.output.note({
             title: 'Unable to update root eslint config.',
             bodyLines: [
-                'We only automatically update the root eslint config if it is json.',
+                'We only automatically update the root eslint config if it is json or flat config.',
                 'If you are using a different format, you will need to update it manually.',
                 'You need to set the parser to jsonc-eslint-parser for json files.',
             ],
@@ -180,14 +177,6 @@ function setupVsCodeLintingForJsonFiles(host) {
     }
     (0, devkit_1.writeJson)(host, '.vscode/settings.json', existing);
 }
-function eslintConfigContainsJsonOverride(eslintConfig) {
-    return eslintConfig.overrides.some((x) => {
-        if (typeof x.files === 'string' && x.files.includes('.json')) {
-            return true;
-        }
-        return Array.isArray(x.files) && x.files.some((f) => f.includes('.json'));
-    });
-}
 function projectIsEsLintEnabled(project) {
     return !!getEsLintOptions(project);
 }

package/src/generators/plugin/plugin.d.ts

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

package/src/generators/plugin/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pluginSchematic = exports.pluginGenerator = void 0;
+exports.pluginSchematic = exports.pluginGeneratorInternal = exports.pluginGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
@@ -54,7 +54,13 @@ function updatePluginConfig(host, options) {
 }
 function pluginGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, normalize_schema_1.normalizeOptions)(host, schema);
+        return yield pluginGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.pluginGenerator = pluginGenerator;
+function pluginGeneratorInternal(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield (0, normalize_schema_1.normalizeOptions)(host, schema);
         const tasks = [];
         tasks.push(yield (0, js_1.libraryGenerator)(host, Object.assign(Object.assign({}, schema), { config: 'project', bundler: options.bundler, publishable: options.publishable, importPath: options.npmPackageName, skipFormat: true })));
         if (options.bundler === 'tsc') {
@@ -77,10 +83,11 @@ function pluginGenerator(host, schema) {
             tasks.push(yield (0, e2e_1.e2eProjectGenerator)(host, {
                 pluginName: options.name,
                 projectDirectory: options.projectDirectory,
-                pluginOutputPath: `dist/${options.libsDir}/${options.projectDirectory}`,
+                pluginOutputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.projectRoot),
                 npmPackageName: options.npmPackageName,
                 skipFormat: true,
                 rootProject: options.rootProject,
+                projectNameAndRootFormat: options.projectNameAndRootFormat,
             }));
         }
         if (options.linter === linter_1.Linter.EsLint && !options.skipLintChecks) {
@@ -92,6 +99,6 @@ function pluginGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.pluginGenerator = pluginGenerator;
+exports.pluginGeneratorInternal = pluginGeneratorInternal;
 exports.default = pluginGenerator;
 exports.pluginSchematic = (0, devkit_1.convertNxGenerator)(pluginGenerator);

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

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

package/src/generators/plugin/schema.json

@@ -20,12 +20,18 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the plugin?",
-      "x-priority": "important"
+      "x-priority": "important",
+      "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 plugin is placed."
     },
+    "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"]
+    },
     "importPath": {
       "type": "string",
       "description": "How the plugin will be published, like `@myorg/my-awesome-plugin`. Note this must be a valid NPM name.",

package/src/generators/plugin/utils/normalize-schema.d.ts

@@ -3,7 +3,6 @@ import { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
     name: string;
     fileName: string;
-    libsDir: string;
     projectRoot: string;
     projectDirectory: string;
     parsedTags: string[];
@@ -11,4 +10,4 @@ export interface NormalizedSchema extends Schema {
     bundler: 'swc' | 'tsc';
     publishable: boolean;
 }
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

package/src/generators/plugin/utils/normalize-schema.js

@@ -1,32 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeOptions(host, options) {
     var _a, _b;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const { libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    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}`
-        : options.rootProject
-            ? '.'
-            : name;
-    const projectName = options.rootProject
-        ? name
-        : fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
-    const fileName = projectName;
-    const projectRoot = options.rootProject
-        ? fullProjectDirectory
-        : (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const npmPackageName = options.importPath || (0, get_import_path_1.getImportPath)(host, name);
-    return Object.assign(Object.assign({}, options), { bundler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'tsc', fileName,
-        libsDir, name: projectName, projectRoot, projectDirectory: fullProjectDirectory, parsedTags,
-        npmPackageName, publishable: (_b = options.publishable) !== null && _b !== void 0 ? _b : false });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName, projectRoot, importPath: npmPackageName, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'library',
+            directory: options.directory,
+            importPath: options.importPath,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator: '@nx/plugin:plugin',
+        });
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        options.rootProject = projectRoot === '.';
+        let projectDirectory = projectRoot;
+        if (options.projectNameAndRootFormat === 'derived') {
+            let { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+            if (!layoutDirectory) {
+                const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
+                layoutDirectory = libsDir;
+            }
+            if (projectRoot.startsWith(`${layoutDirectory}/`)) {
+                projectDirectory = projectRoot.replace(`${layoutDirectory}/`, '');
+            }
+        }
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        return Object.assign(Object.assign({}, options), { bundler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'tsc', fileName: projectName, name: projectName, projectRoot,
+            projectDirectory,
+            parsedTags,
+            npmPackageName, publishable: (_b = options.publishable) !== null && _b !== void 0 ? _b : false });
+    });
 }
 exports.normalizeOptions = normalizeOptions;