@nx/plugin 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28229-afe192c

package/generators.json

@@ -4,12 +4,12 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "plugin": {
-      "factory": "./src/generators/plugin/plugin#pluginGeneratorInternal",
+      "factory": "./src/generators/plugin/plugin",
       "schema": "./src/generators/plugin/schema.json",
       "description": "Create a Nx Plugin."
     },
     "create-package": {
-      "factory": "./src/generators/create-package/create-package#createPackageGeneratorInternal",
+      "factory": "./src/generators/create-package/create-package",
       "schema": "./src/generators/create-package/schema.json",
       "description": "Create a package which can be used by npx to create a new workspace"
     },
@@ -19,17 +19,17 @@
       "description": "Create a E2E application for a Nx Plugin."
     },
     "migration": {
-      "factory": "./src/generators/migration/migration#migrationGeneratorInternal",
+      "factory": "./src/generators/migration/migration",
       "schema": "./src/generators/migration/schema.json",
       "description": "Create a migration for an Nx Plugin."
     },
     "generator": {
-      "factory": "./src/generators/generator/generator#generatorGeneratorInternal",
+      "factory": "./src/generators/generator/generator",
       "schema": "./src/generators/generator/schema.json",
       "description": "Create a generator for an Nx Plugin."
     },
     "executor": {
-      "factory": "./src/generators/executor/executor#executorGeneratorInternal",
+      "factory": "./src/generators/executor/executor",
       "schema": "./src/generators/executor/schema.json",
       "description": "Create an executor for an Nx Plugin."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "0.0.0-pr-27957-a99d5ea",
+  "version": "0.0.0-pr-28229-afe192c",
   "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": {
@@ -27,16 +27,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-27957-a99d5ea",
-    "@nx/jest": "0.0.0-pr-27957-a99d5ea",
-    "@nx/js": "0.0.0-pr-27957-a99d5ea",
-    "@nx/eslint": "0.0.0-pr-27957-a99d5ea",
-    "@nrwl/nx-plugin": "0.0.0-pr-27957-a99d5ea"
+    "@nx/devkit": "0.0.0-pr-28229-afe192c",
+    "@nx/jest": "0.0.0-pr-28229-afe192c",
+    "@nx/js": "0.0.0-pr-28229-afe192c",
+    "@nx/eslint": "0.0.0-pr-28229-afe192c"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "commonjs"
-}
+}

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

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } 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;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPackageGenerator = createPackageGenerator;
-exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
@@ -12,12 +11,6 @@ const has_generator_1 = require("../../utils/has-generator");
 const path_1 = require("path");
 const versions_2 = require("@nx/js/src/utils/versions");
 async function createPackageGenerator(host, schema) {
-    return await createPackageGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function createPackageGeneratorInternal(host, schema) {
     const tasks = [];
     const options = await (0, normalize_schema_1.normalizeSchema)(host, schema);
     const pluginPackageName = await addPresetGenerator(host, options);
@@ -48,10 +41,9 @@ async function addPresetGenerator(host, schema) {
     if (!(0, has_generator_1.hasGenerator)(host, schema.project, 'preset')) {
         await (0, generator_1.default)(host, {
             name: 'preset',
-            directory: (0, path_1.join)(projectRoot, 'src/generators/preset'),
+            path: (0, path_1.join)(projectRoot, 'src/generators/preset'),
             unitTestRunner: schema.unitTestRunner,
             skipFormat: true,
-            nameAndDirectoryFormat: 'as-provided',
         });
     }
     return (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))?.name;
@@ -59,6 +51,7 @@ async function addPresetGenerator(host, schema) {
 async function createCliPackage(host, options, pluginPackageName) {
     await (0, js_1.libraryGenerator)(host, {
         ...options,
+        directory: options.directory,
         rootProject: false,
         config: 'project',
         publishable: true,

package/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__

@@ -12,14 +12,17 @@ async function main() {
 
   // This assumes "<%= preset %>" and "<%= projectName %>" are at the same version
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const presetVersion = require('../package.json').version,
+  const presetVersion = require('../package.json').version;
 
   // TODO: update below to customize the workspace
-  const { directory } = await createWorkspace(`<%= preset %>@${presetVersion}`, {
-    name,
-    nxCloud: 'skip',
-    packageManager: 'npm',
-  });
+  const { directory } = await createWorkspace(
+    `<%= preset %>@${presetVersion}`,
+    {
+      name,
+      nxCloud: 'skip',
+      packageManager: 'npm',
+    }
+  );
 
   console.log(`Successfully created the workspace: ${directory}.`);
 }

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

@@ -1,13 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 export interface CreatePackageSchema {
   name: string;
   project: string;
+  directory: string;
 
   // 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

@@ -7,14 +7,18 @@
   "examplesFile": "../../../docs/generators/create-package-examples.md",
   "type": "object",
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "The package name of cli, e.g. `create-framework-package`. Note this must be a valid NPM name to be published.",
-      "pattern": "create-.+|^@.+/create(?:-.+)?",
+      "description": "A directory where the app is placed.",
       "$default": {
         "$source": "argv",
         "index": 0
-      },
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "The package name of cli, e.g. `create-framework-package`. Note this must be a valid NPM name to be published.",
+      "pattern": "create-.+|^@.+/create(?:-.+)?",
       "x-priority": "important"
     },
     "project": {
@@ -33,15 +37,6 @@
       "description": "Test runner to use for unit tests.",
       "default": "jest"
     },
-    "directory": {
-      "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",
@@ -71,5 +66,5 @@
       "x-prompt": "What is the name of the e2e project? Leave blank to skip e2e tests"
     }
   },
-  "required": ["name", "project"]
+  "required": ["directory", "name", "project"]
 }

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSchema = normalizeSchema;
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeSchema(host, schema) {
-    const { projectName, names: projectNames, projectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    if (!schema.directory) {
+        throw new Error(`Please provide the --directory option. It should be the directory containing the project '${schema.project}'.`);
+    }
+    const { projectName, names: projectNames, projectRoot, } = await (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 {
         ...schema,
         bundler: schema.compiler ?? 'tsc',

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

@@ -17,28 +17,14 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     let projectRoot;
-    if (options.projectNameAndRootFormat === 'as-provided') {
-        const projectNameAndRootOptions = await (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 ?? defaultAppsDir;
-        projectRoot = options.rootProject
+    const projectNameAndRootOptions = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: projectName,
+        projectType: 'application',
+        directory: options.rootProject || !options.projectDirectory
             ? projectName
-            : projectDirectory
-                ? (0, devkit_1.joinPathFragments)(appsDir, `${projectDirectory}-e2e`)
-                : (0, devkit_1.joinPathFragments)(appsDir, projectName);
-    }
+            : `${options.projectDirectory}-e2e`,
+    });
+    projectRoot = projectNameAndRootOptions.projectRoot;
     const pluginPropertyName = (0, devkit_1.names)(options.pluginName).propertyName;
     return {
         ...options,
@@ -117,7 +103,6 @@ async function addLintingToApplication(tree, options) {
 async function e2eProjectGenerator(host, schema) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

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

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

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

@@ -21,11 +21,6 @@
       "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/executor/executor.d.ts

@@ -1,6 +1,5 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function createExecutorsJson(host: Tree, projectRoot: string, projectName: string, skipLintChecks?: boolean): Promise<void>;
-export declare function executorGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function executorGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
+export declare function executorGenerator(host: Tree, schema: Schema): Promise<void>;
 export default executorGenerator;

package/src/generators/executor/executor.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createExecutorsJson = createExecutorsJson;
 exports.executorGenerator = executorGenerator;
-exports.executorGeneratorInternal = executorGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
@@ -10,19 +9,19 @@ const versions_1 = require("../../utils/versions");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const path_1 = require("path");
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), options.directory, {
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/executor'), options.path, {
         ...options,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete((0, devkit_1.joinPathFragments)(options.directory, `executor.spec.ts`));
+        host.delete((0, devkit_1.joinPathFragments)(options.path, `executor.spec.ts`));
     }
 }
 function addHasherFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/hasher'), options.directory, {
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/hasher'), options.path, {
         ...options,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete((0, devkit_1.joinPathFragments)(options.directory, 'hasher.spec.ts'));
+        host.delete((0, devkit_1.joinPathFragments)(options.path, 'hasher.spec.ts'));
     }
 }
 async function createExecutorsJson(host, projectRoot, projectName, skipLintChecks) {
@@ -63,12 +62,12 @@ async function updateExecutorJson(host, options) {
         let executors = json.executors ?? json.builders;
         executors ||= {};
         executors[options.name] = {
-            implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'executor')}`,
-            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'schema.json')}`,
+            implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'executor')}`,
+            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'schema.json')}`,
             description: options.description,
         };
         if (options.includeHasher) {
-            executors[options.name].hasher = `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'hasher')}`;
+            executors[options.name].hasher = `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'hasher')}`;
         }
         json.executors = executors;
         return json;
@@ -76,14 +75,9 @@ async function updateExecutorJson(host, options) {
 }
 async function normalizeOptions(tree, options) {
     const { project, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'executor',
-        callingGenerator: '@nx/plugin:executor',
         name: options.name,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
-        directory: options.directory,
+        path: options.path,
         fileName: 'executor',
-        derivedDirectory: 'executors',
     });
     const { className, propertyName } = (0, devkit_1.names)(artifactName);
     const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
@@ -105,13 +99,7 @@ async function normalizeOptions(tree, options) {
         projectRoot,
     };
 }
-async function executorGenerator(tree, rawOptions) {
-    await executorGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function executorGeneratorInternal(host, schema) {
+async function executorGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     addFiles(host, options);
     if (options.includeHasher) {

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

@@ -1,17 +1,9 @@
-import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 export interface Schema {
-  name: string;
-  directory?: string;
+  path: string;
+  name?: string;
   description?: string;
   unitTestRunner: 'jest' | 'none';
   includeHasher: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
   skipLintChecks?: boolean;
   skipFormat?: boolean;
-
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/executor/schema.json

@@ -13,20 +13,20 @@
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Executor name.",
+      "description": "Path at which to generate the executor file.",
+      "x-prompt": "What path would you like to use for the executor?",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the executor?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the executor file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir"],
+      "description": "Executor name.",
+      "x-prompt": "What name would you like to use for the executor?",
       "x-priority": "important"
     },
     "description": {
@@ -50,20 +50,6 @@
       "default": false,
       "description": "Do not add an eslint configuration for plugin json files."
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the executor in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files.",
@@ -71,6 +57,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "additionalProperties": false
 }

package/src/generators/generator/generator.d.ts

@@ -1,6 +1,5 @@
 import { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function createGeneratorsJson(host: Tree, projectRoot: string, projectName: string, skipLintChecks?: boolean, skipFormat?: boolean): Promise<void>;
-export declare function generatorGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function generatorGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
+export declare function generatorGenerator(host: Tree, schema: Schema): Promise<void>;
 export default generatorGenerator;

package/src/generators/generator/generator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGeneratorsJson = createGeneratorsJson;
 exports.generatorGenerator = generatorGenerator;
-exports.generatorGeneratorInternal = generatorGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const has_generator_1 = require("../../utils/has-generator");
 const generator_1 = require("../lint-checks/generator");
@@ -11,14 +10,9 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 const path_1 = require("path");
 async function normalizeOptions(tree, options) {
     const { project, fileName, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'generator',
-        callingGenerator: '@nx/plugin:generator',
         name: options.name,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
-        directory: options.directory,
+        path: options.path,
         fileName: 'generator',
-        derivedDirectory: 'generators',
     });
     const { className, propertyName } = (0, devkit_1.names)(artifactName);
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
@@ -31,8 +25,8 @@ async function normalizeOptions(tree, options) {
     }
     return {
         ...options,
-        project,
         directory,
+        project,
         fileName,
         className,
         propertyName,
@@ -42,17 +36,17 @@ async function normalizeOptions(tree, options) {
     };
 }
 function addFiles(host, options) {
-    const indexPath = (0, path_1.join)(options.directory, 'files/src/index.ts.template');
+    const indexPath = (0, path_1.join)(options.path, 'files/src/index.ts.template');
     if (!host.exists(indexPath)) {
         host.write(indexPath, 'const variable = "<%= name %>";');
     }
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files/generator'), options.directory, {
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files/generator'), options.path, {
         ...options,
         generatorFnName: `${options.propertyName}Generator`,
         schemaInterfaceName: `${options.className}GeneratorSchema`,
     });
     if (options.unitTestRunner === 'none') {
-        host.delete((0, path_1.join)(options.directory, `generator.spec.ts`));
+        host.delete((0, path_1.join)(options.path, `generator.spec.ts`));
     }
 }
 async function createGeneratorsJson(host, projectRoot, projectName, skipLintChecks, skipFormat) {
@@ -94,8 +88,8 @@ async function updateGeneratorJson(host, options) {
         let generators = json.generators ?? json.schematics;
         generators = generators || {};
         generators[options.name] = {
-            factory: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'generator')}`,
-            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), 'schema.json')}`,
+            factory: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'generator')}`,
+            schema: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), 'schema.json')}`,
             description: options.description,
         };
         // @todo(v17): Remove this, prop is defunct.
@@ -106,13 +100,7 @@ async function updateGeneratorJson(host, options) {
         return json;
     });
 }
-async function generatorGenerator(tree, rawOptions) {
-    await generatorGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function generatorGeneratorInternal(host, schema) {
+async function generatorGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     if ((0, has_generator_1.hasGenerator)(host, options.project, options.name)) {
         throw new Error(`Generator ${options.name} already exists.`);

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

@@ -1,16 +1,10 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  directory?: string;
-  name: string;
+  path: string;
+  name?: string;
   description?: string;
   unitTestRunner: 'jest' | 'none';
   skipLintChecks?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
-
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/generator/schema.json

@@ -7,25 +7,25 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g generator my-generator --project=my-plugin",
+      "command": "nx g generator libs/my-plugin/src/generators//my-generator",
       "description": "Generate `libs/my-plugin/src/generators/my-generator`"
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Generator name.",
+      "description": "Path where the generator will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the generator?",
+      "x-prompt": "Where should the generator be generated?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the generator file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir"],
+      "description": "Generator name.",
+      "x-prompt": "What name would you like to use for the generator?",
       "x-priority": "important"
     },
     "description": {
@@ -44,27 +44,13 @@
       "default": false,
       "description": "Do not add an eslint configuration for plugin json files."
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "skipFormat": {
       "type": "boolean",
       "default": false,
       "description": "Do not format files with prettier.",
       "x-priority": "internal"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the generator in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
     }
   },
-  "required": ["name"],
+  "required": ["path"],
   "additionalProperties": false
 }

package/src/generators/migration/migration.d.ts

@@ -1,5 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function migrationGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function migrationGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
+export declare function migrationGenerator(host: Tree, schema: Schema): Promise<void>;
 export default migrationGenerator;

package/src/generators/migration/migration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrationGenerator = migrationGenerator;
-exports.migrationGeneratorInternal = migrationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const path_1 = require("path");
@@ -18,25 +17,19 @@ async function normalizeOptions(tree, options) {
         name = (0, devkit_1.names)(`update-${options.packageVersion}`).fileName;
     }
     const { project, fileName, artifactName, filePath, directory } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'migration',
-        callingGenerator: '@nx/plugin:migration',
         name: name,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
-        directory: options.directory,
+        path: options.path,
         fileName: name,
-        derivedDirectory: 'migrations',
     });
-    const { className, propertyName } = (0, devkit_1.names)(artifactName);
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     const description = options.description ?? `Migration for v${options.packageVersion}`;
     // const { root: projectRoot, sourceRoot: projectSourceRoot } =
     //   readProjectConfiguration(host, options.project);
     const normalized = {
         ...options,
+        directory,
         project,
         name: artifactName,
-        directory,
         description,
         projectRoot,
         projectSourceRoot,
@@ -44,7 +37,10 @@ async function normalizeOptions(tree, options) {
     return normalized;
 }
 function addFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), options.directory, { ...options, tmpl: '' });
+    (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/migration'), options.path, {
+        ...options,
+        tmpl: '',
+    });
 }
 function updateMigrationsJson(host, options) {
     const configuredMigrationPath = (0, package_json_1.readNxMigrateConfig)((0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'))).migrations;
@@ -56,7 +52,7 @@ function updateMigrationsJson(host, options) {
     generators[options.name] = {
         version: options.packageVersion,
         description: options.description,
-        implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.directory), options.name)}`,
+        implementation: `./${(0, devkit_1.joinPathFragments)((0, path_1.relative)(options.projectRoot, options.path), options.name)}`,
     };
     migrations.generators = generators;
     if (options.packageJsonUpdates) {
@@ -110,13 +106,7 @@ function updateProjectConfig(host, options) {
         (0, devkit_1.updateProjectConfiguration)(host, options.project, project);
     }
 }
-async function migrationGenerator(tree, rawOptions) {
-    await migrationGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function migrationGeneratorInternal(host, schema) {
+async function migrationGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     addFiles(host, options);
     updateMigrationsJson(host, options);

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

@@ -1,16 +1,10 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
+  path: string;
   name?: string;
-  directory?: string;
   description?: string;
   packageVersion: string;
   packageJsonUpdates?: boolean;
   skipFormat?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
-
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }

package/src/generators/migration/schema.json

@@ -7,24 +7,25 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g migration my-migration --project=my-plugin --version=1.0.0",
-      "description": "Adds a new migration to the project `my-plugin`, which will be triggered when migrating to version 1.0.0 or above from a previous version."
+      "command": "nx g migration my-plugin/my-migration --version=1.0.0",
+      "description": "Adds a new migration inside `my-plugin`, which will be triggered when migrating to version 1.0.0 or above from a previous version."
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "Migration name.",
+      "description": "Path where the migration will be generated.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "Where should the migration be generated?",
       "x-priority": "important"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the migration file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
-      "aliases": ["dir"]
+      "description": "Migration name.",
+      "x-priority": "important"
     },
     "description": {
       "type": "string",
@@ -37,15 +38,6 @@
       "x-prompt": "What version would you like to use for the migration?",
       "x-priority": "important"
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "packageJsonUpdates": {
       "type": "boolean",
       "description": "Whether or not to include `package.json` updates.",
@@ -56,13 +48,8 @@
       "type": "boolean",
       "default": false,
       "description": "Do not eslint configuration for plugin json files."
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the migration in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
     }
   },
-  "required": ["packageVersion"],
+  "required": ["packageVersion", "path"],
   "additionalProperties": false
 }

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

@@ -1,5 +1,4 @@
 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;

package/src/generators/plugin/plugin.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginGenerator = pluginGenerator;
-exports.pluginGeneratorInternal = pluginGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
@@ -52,12 +51,6 @@ function updatePluginConfig(host, options) {
     }
 }
 async function pluginGenerator(host, schema) {
-    return await pluginGeneratorInternal(host, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function pluginGeneratorInternal(host, schema) {
     const options = await (0, normalize_schema_1.normalizeOptions)(host, schema);
     const tasks = [];
     tasks.push(await (0, js_1.libraryGenerator)(host, {
@@ -68,7 +61,6 @@ async function pluginGeneratorInternal(host, schema) {
         bundler: options.bundler,
         publishable: options.publishable,
         importPath: options.npmPackageName,
-        projectNameAndRootFormat: 'as-provided',
         skipFormat: true,
     }));
     if (options.bundler === 'tsc') {
@@ -95,7 +87,6 @@ async function pluginGeneratorInternal(host, schema) {
             npmPackageName: options.npmPackageName,
             skipFormat: true,
             rootProject: options.rootProject,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
         }));
     }
     if (options.linter === eslint_1.Linter.EsLint && !options.skipLintChecks) {

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

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

package/src/generators/plugin/schema.json

@@ -12,25 +12,19 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Plugin name",
+      "description": "A directory where the plugin is placed.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the plugin?",
-      "x-priority": "important",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
+      "x-prompt": "Which directory do you want to create the plugin in?"
     },
-    "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`).",
+    "name": {
       "type": "string",
-      "enum": ["as-provided", "derived"]
+      "description": "Plugin name",
+      "x-priority": "important"
     },
     "importPath": {
       "type": "string",
@@ -100,5 +94,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

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

@@ -1,31 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
-const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
-    const { projectName, projectRoot, importPath: npmPackageName, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName, projectRoot, importPath: npmPackageName, } = await (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 projectDirectory = projectRoot;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

package/src/generators/preset/generator.js

@@ -17,7 +17,6 @@ async function default_1(tree, options) {
     const pluginTask = await (0, plugin_1.pluginGenerator)(tree, {
         compiler: 'tsc',
         linter: eslint_1.Linter.EsLint,
-        name: pluginProjectName,
         skipFormat: true,
         unitTestRunner: 'jest',
         importPath: options.pluginName,
@@ -25,8 +24,8 @@ async function default_1(tree, options) {
         publishable: true,
         // when creating a CLI package, the plugin will be in the packages folder
         directory: options.createPackageName && options.createPackageName !== 'false'
-            ? 'packages'
-            : undefined,
+            ? `packages/${pluginProjectName}`
+            : pluginProjectName,
         rootProject: options.createPackageName ? false : true,
     });
     tasks.push(pluginTask);
@@ -34,7 +33,7 @@ async function default_1(tree, options) {
     if (options.createPackageName) {
         const e2eProject = `${options.pluginName}-e2e`;
         const cliTask = await (0, create_package_1.default)(tree, {
-            directory: 'packages',
+            directory: `packages/${options.createPackageName}`,
             name: options.createPackageName,
             e2eProject: e2eProject,
             project: options.pluginName,

package/src/utils/testing-utils/async-commands.js

@@ -19,6 +19,7 @@ function runCommandAsync(command, opts = {
         (0, child_process_1.exec)(command, {
             cwd: opts.cwd ?? (0, paths_1.tmpProjPath)(),
             env: { ...process.env, ...opts.env },
+            windowsHide: true,
         }, (err, stdout, stderr) => {
             if (!opts.silenceError && err) {
                 reject(err);

package/src/utils/testing-utils/commands.js

@@ -21,6 +21,7 @@ function runNxCommand(command, opts = {
         const execSyncOptions = {
             cwd,
             env: { ...process.env, ...opts.env },
+            windowsHide: true,
         };
         if ((0, utils_1.fileExists)((0, paths_1.tmpProjPath)('package.json'))) {
             const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(cwd));

package/src/utils/testing-utils/nx-project.js

@@ -8,8 +8,8 @@ exports.ensureNxProject = ensureNxProject;
 const devkit_1 = require("@nx/devkit");
 const devkit_2 = require("@nx/devkit");
 const child_process_1 = require("child_process");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
 const paths_1 = require("./paths");
 const utils_1 = require("./utils");
 function runNxNewCommand(args, silent) {
@@ -17,6 +17,7 @@ function runNxNewCommand(args, silent) {
     return (0, child_process_1.execSync)(`node ${require.resolve('nx')} new proj --nx-workspace-root=${localTmpDir} --no-interactive --skip-install --collection=@nx/workspace --npmScope=proj --preset=apps ${args || ''}`, {
         cwd: localTmpDir,
         ...(silent && false ? { stdio: ['ignore', 'ignore', 'ignore'] } : {}),
+        windowsHide: true,
     });
 }
 function patchPackageJsonForPlugin(npmPackageName, distPath) {
@@ -44,6 +45,7 @@ function runPackageManagerInstall(silent = true) {
     const install = (0, child_process_1.execSync)(pmc.install, {
         cwd,
         ...(silent ? { stdio: ['ignore', 'ignore', 'ignore'] } : {}),
+        windowsHide: true,
     });
     return install ? install.toString() : '';
 }
@@ -64,6 +66,6 @@ function newNxProject(npmPackageName, pluginDistPath) {
  * It will also copy `@nx` packages to the e2e directory
  */
 function ensureNxProject(npmPackageName, pluginDistPath) {
-    (0, fs_extra_1.ensureDirSync)((0, paths_1.tmpProjPath)());
+    (0, node_fs_1.mkdirSync)((0, paths_1.tmpProjPath)(), { recursive: true });
     newNxProject(npmPackageName, pluginDistPath);
 }

package/src/utils/testing-utils/utils.js

@@ -15,7 +15,7 @@ exports.removeTmpProject = removeTmpProject;
 exports.getCwd = getCwd;
 exports.exists = exists;
 exports.getSize = getSize;
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const paths_1 = require("./paths");
 const devkit_1 = require("@nx/devkit");
@@ -28,8 +28,11 @@ Object.defineProperty(exports, "fileExists", { enumerable: true, get: function (
  */
 function copyNodeModules(modules) {
     modules.forEach((module) => {
-        (0, fs_extra_1.removeSync)(`${(0, paths_1.tmpProjPath)()}/node_modules/${module}`);
-        (0, fs_extra_1.copySync)(`./node_modules/${module}`, `${(0, paths_1.tmpProjPath)()}/node_modules/${module}`);
+        (0, node_fs_1.rmSync)(`${(0, paths_1.tmpProjPath)()}/node_modules/${module}`, {
+            recursive: true,
+            force: true,
+        });
+        (0, node_fs_1.cpSync)(`./node_modules/${module}`, `${(0, paths_1.tmpProjPath)()}/node_modules/${module}`, { recursive: true });
     });
 }
 /**
@@ -51,12 +54,12 @@ function expectTestsPass(output) {
  * @param content Content to replace the original content with
  */
 function updateFile(file, content) {
-    (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, paths_1.tmpProjPath)(file)));
+    (0, node_fs_1.mkdirSync)((0, path_1.dirname)((0, paths_1.tmpProjPath)(file)), { recursive: true });
     if (typeof content === 'string') {
-        (0, fs_extra_1.writeFileSync)((0, paths_1.tmpProjPath)(file), content);
+        (0, node_fs_1.writeFileSync)((0, paths_1.tmpProjPath)(file), content);
     }
     else {
-        (0, fs_extra_1.writeFileSync)((0, paths_1.tmpProjPath)(file), content((0, fs_extra_1.readFileSync)((0, paths_1.tmpProjPath)(file)).toString()));
+        (0, node_fs_1.writeFileSync)((0, paths_1.tmpProjPath)(file), content((0, node_fs_1.readFileSync)((0, paths_1.tmpProjPath)(file)).toString()));
     }
 }
 /**
@@ -65,8 +68,8 @@ function updateFile(file, content) {
  * @param newPath New path
  */
 function renameFile(path, newPath) {
-    (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, paths_1.tmpProjPath)(newPath)));
-    (0, fs_extra_1.renameSync)((0, paths_1.tmpProjPath)(path), (0, paths_1.tmpProjPath)(newPath));
+    (0, node_fs_1.mkdirSync)((0, path_1.dirname)((0, paths_1.tmpProjPath)(newPath)), { recursive: true });
+    (0, node_fs_1.renameSync)((0, paths_1.tmpProjPath)(path), (0, paths_1.tmpProjPath)(newPath));
 }
 /**
  * Check if the file or directory exists.
@@ -89,7 +92,7 @@ function checkFilesExist(...expectedPaths) {
  * @param dirName Directory name within the e2e directory.
  */
 function listFiles(dirName) {
-    return (0, fs_extra_1.readdirSync)((0, paths_1.tmpProjPath)(dirName));
+    return (0, node_fs_1.readdirSync)((0, paths_1.tmpProjPath)(dirName));
 }
 /**
  * Read a JSON file.
@@ -105,22 +108,22 @@ function readJson(path, options) {
  */
 function readFile(path) {
     const filePath = (0, path_1.isAbsolute)(path) ? path : (0, paths_1.tmpProjPath)(path);
-    return (0, fs_extra_1.readFileSync)(filePath, 'utf-8');
+    return (0, node_fs_1.readFileSync)(filePath, 'utf-8');
 }
 /**
  * Deletes the e2e directory
  */
 function cleanup() {
-    (0, fs_extra_1.removeSync)((0, paths_1.tmpProjPath)());
+    (0, node_fs_1.rmSync)((0, paths_1.tmpProjPath)(), { recursive: true, force: true });
 }
 /**
  * Remove the dist folder from the e2e directory
  */
 function rmDist() {
-    (0, fs_extra_1.removeSync)(`${(0, paths_1.tmpProjPath)()}/dist`);
+    (0, node_fs_1.rmSync)(`${(0, paths_1.tmpProjPath)()}/dist`, { recursive: true, force: true });
 }
 function removeTmpProject(project) {
-    (0, fs_extra_1.removeSync)(`${(0, paths_1.tmpFolder)()}/${project}`);
+    (0, node_fs_1.rmSync)(`${(0, paths_1.tmpFolder)()}/${project}`, { recursive: true, force: true });
 }
 /**
  * Get the currend `cwd` in the process
@@ -140,5 +143,5 @@ function exists(path) {
  * @param filePath Path to the file
  */
 function getSize(filePath) {
-    return (0, fs_extra_1.statSync)(filePath).size;
+    return (0, node_fs_1.statSync)(filePath).size;
 }