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

package/src/generators/federate-module/schema.json

@@ -37,11 +37,6 @@
       "description": "The directory of the new remote application if one needs to be created.",
       "type": "string"
     },
-    "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"]
-    },
     "style": {
       "description": "The file extension to be used for style files for the remote if one needs to be created.",
       "type": "string",

package/src/generators/host/host.d.ts

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

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
-exports.hostInternal = hostInternal;
 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");
@@ -12,13 +11,7 @@ const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
-async function host(tree, options) {
-    return await hostInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function hostInternal(tree, schema) {
+async function host(tree, schema) {
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -44,14 +37,12 @@ async function hostInternal(tree, schema) {
             }
         });
     }
-    const { projectName: hostProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    const { projectName: hostProjectName, projectRoot: appRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:host',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const appInstallTask = await (0, application_1.default)(tree, {
         ...options,
         standalone: options.standalone,
@@ -83,16 +74,11 @@ async function hostInternal(tree, schema) {
         installTasks.push(ssrInstallTask);
     }
     for (const remote of remotesToGenerate) {
-        let remoteDirectory = options.directory;
-        if (options.projectNameAndRootFormat === 'as-provided' &&
-            options.directory) {
-            /**
-             * With the `as-provided` format, the provided directory would be the root
-             * of the host application. Append the remote name to the host parent
-             * directory to get the remote directory.
-             */
-            remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
-        }
+        const remoteDirectory = options.directory
+            ? (0, devkit_1.joinPathFragments)(options.directory, '..', remote)
+            : appRoot === '.'
+                ? remote
+                : (0, devkit_1.joinPathFragments)(appRoot, '..', remote);
         await (0, remote_1.default)(tree, {
             ...options,
             name: remote,

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

@@ -1,10 +1,10 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   remotes?: string[];
   dynamic?: boolean;
   setParserOptionsProject?: boolean;
@@ -14,8 +14,6 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;

package/src/generators/host/schema.json

@@ -12,14 +12,20 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name to give to the host Angular application.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name to give to the host Angular application.",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "remotes": {
       "type": "array",
@@ -31,15 +37,6 @@
       "description": "Should the host application use dynamic federation?",
       "default": false
     },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
-    },
-    "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"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -181,5 +178,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/generators/init/init.js

@@ -2,10 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = angularInitGenerator;
 const devkit_1 = require("@nx/devkit");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const version_utils_1 = require("../utils/version-utils");
+const plugin_1 = require("../../plugins/plugin");
 async function angularInitGenerator(tree, options) {
     ignoreAngularCacheDirectory(tree);
     const installTask = installAngularDevkitCoreIfMissing(tree, options);
+    // For Angular inference plugin, we only want it during import since our
+    // generators do not use `angular.json`, and `nx init` should split
+    // `angular.json` into multiple `project.json` files -- as this is preferred
+    // by most folks we've talked to.
+    options.addPlugin ??= process.env.NX_RUNNING_NX_IMPORT === 'true';
+    if (options.addPlugin) {
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodesV2, {
+            targetNamePrefix: ['', 'angular:', 'angular-'],
+        }, options.updatePackageScripts);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -3,4 +3,7 @@ export interface Schema {
   skipInstall?: boolean;
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
+  /* internal */
+  addPlugin?: boolean;
+  updatePackageScripts?: boolean;
 }

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

@@ -9,8 +9,9 @@ async function addStandaloneComponent(tree, { libraryOptions, componentOptions }
     await (0, component_1.componentGenerator)(tree, {
         ...componentOptions,
         name: componentOptions.name,
-        directory: (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, 'src', 'lib', componentOptions.flat ? '' : componentOptions.name),
-        nameAndDirectoryFormat: 'as-provided',
+        path: (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, 'src', 'lib', componentOptions.flat
+            ? `${componentOptions.name}`
+            : `${componentOptions.name}/${componentOptions.name}`),
         standalone: true,
         export: true,
         skipFormat: true,

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

@@ -22,13 +22,12 @@ async function normalizeOptions(host, schema) {
         skipModule: schema.skipModule || schema.standalone,
         ...schema,
     };
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:library',
     });
     const fileName = options.simpleName
         ? projectNames.projectSimpleName

package/src/generators/library/lib/normalized-schema.d.ts

@@ -2,12 +2,12 @@ import { UnitTestRunner } from '../../../utils/test-runners';
 import type { Linter, LinterType } from '@nx/eslint';
 export interface NormalizedSchema {
     libraryOptions: {
-        name: string;
+        directory: string;
+        name?: string;
         addTailwind?: boolean;
         skipFormat?: boolean;
         simpleName?: boolean;
         addModuleSpec?: boolean;
-        directory?: string;
         sourceDir?: string;
         buildable?: boolean;
         publishable?: boolean;

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

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function libraryGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
-exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
@@ -24,14 +23,6 @@ const set_generator_defaults_1 = require("./lib/set-generator-defaults");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function libraryGenerator(tree, schema) {
-    return await libraryGeneratorInternal(tree, {
-        // provide a default projectNameAndRootFormat to avoid breaking changes
-        // to external generators invoking this one
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function libraryGeneratorInternal(tree, schema) {
     // Do some validation checks
     if (!schema.routing && schema.lazy) {
         throw new Error(`To use "--lazy" option, "--routing" must also be set.`);

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

@@ -1,15 +1,13 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   addTailwind?: boolean;
   skipFormat?: boolean;
   simpleName?: boolean;
   addModuleSpec?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   sourceDir?: string;
   buildable?: boolean;
   publishable?: boolean;

package/src/generators/library/schema.json

@@ -9,22 +9,16 @@
     "name": {
       "type": "string",
       "description": "The name of the library.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "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][^:]*)$"
+      "x-priority": "important"
     },
     "directory": {
       "type": "string",
       "description": "A directory where the library is placed.",
-      "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"]
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Which directory do you want to create the library in?"
     },
     "publishable": {
       "type": "boolean",
@@ -203,6 +197,6 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"],
+  "required": ["directory"],
   "examplesFile": "../../../docs/library-examples.md"
 }

package/src/generators/move/move.d.ts

@@ -1,4 +1,3 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function angularMoveGenerator(tree: Tree, schema: Schema): Promise<void>;
-export declare function angularMoveGeneratorInternal(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/move/move.js

@@ -1,15 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMoveGenerator = angularMoveGenerator;
-exports.angularMoveGeneratorInternal = angularMoveGeneratorInternal;
 const move_1 = require("@nx/workspace/src/generators/move/move");
 async function angularMoveGenerator(tree, schema) {
-    await angularMoveGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function angularMoveGeneratorInternal(tree, schema) {
     process.env.NX_ANGULAR_MOVE_INVOKED = 'true';
-    await (0, move_1.moveGeneratorInternal)(tree, schema);
+    await (0, move_1.moveGenerator)(tree, schema);
 }

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

@@ -1,5 +1,3 @@
-import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-
 export interface Schema {
   projectName: string;
   destination: string;
@@ -7,5 +5,4 @@ export interface Schema {
   importPath?: string;
   skipFormat?: boolean;
   newProjectName?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
 }

package/src/generators/move/schema.json

@@ -35,11 +35,6 @@
       },
       "x-priority": "important"
     },
-    "projectNameAndRootFormat": {
-      "description": "Whether to generate the new project name and destination 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": "The new import path to use in the `tsconfig.base.json`."

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

@@ -5,13 +5,8 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'pipe',
-        callingGenerator: '@nx/angular:pipe',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
+        path: options.path,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -1,27 +1,14 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   skipTests?: boolean;
   skipImport?: boolean;
   standalone?: boolean;
   module?: string;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/pipe/schema.json

@@ -7,40 +7,19 @@
   "additionalProperties": false,
   "description": "Creates an Angular pipe.",
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the pipe.",
+      "description": "The path at which to create the pipe file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the pipe?"
-    },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the pipe 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", "path"],
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the pipe 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"]
+      "x-prompt": "What is the path of the new pipe?"
     },
-    "project": {
+    "name": {
       "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "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."
-    },
-    "flat": {
-      "type": "boolean",
-      "default": true,
-      "description": "When true (the default) creates files at the top level of the project.",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
+      "description": "The name of the pipe.",
+      "x-prompt": "What name would you like to use for the pipe?"
     },
     "skipTests": {
       "type": "boolean",
@@ -73,5 +52,5 @@
       "description": "Skip formatting of files."
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/remote/remote.d.ts

@@ -1,5 +1,4 @@
 import { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function remote(tree: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function remoteInternal(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function remote(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default remote;

package/src/generators/remote/remote.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remote = remote;
-exports.remoteInternal = remoteInternal;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const test_runners_1 = require("../../utils/test-runners");
@@ -10,27 +9,19 @@ const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const versions_1 = require("@nx/js/src/utils/versions");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
-async function remote(tree, options) {
-    return await remoteInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function remoteInternal(tree, schema) {
+async function remote(tree, schema) {
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
     if (options.host && !projects.has(options.host)) {
         throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
     }
-    const { projectName: remoteProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'application');
+    const { projectName: remoteProjectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:remote',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const port = options.port ?? (0, lib_1.findNextAvailablePort)(tree);
     const appInstallTask = await (0, application_1.applicationGenerator)(tree, {
         ...options,

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

@@ -1,10 +1,10 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
-  name: string;
+  directory: string;
+  name?: string;
   host?: string;
   port?: number;
   setParserOptionsProject?: boolean;
@@ -13,8 +13,6 @@ export interface Schema {
   prefix?: string;
   style?: Styles;
   skipTests?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter | LinterType;
   unitTestRunner?: UnitTestRunner;

package/src/generators/remote/schema.json

@@ -12,14 +12,20 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
-      "description": "The name to give to the remote Angular app.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name to give to the remote Angular app.",
+      "pattern": "^[a-zA-Z][^:]*$",
+      "x-priority": "important"
     },
     "host": {
       "type": "string",
@@ -31,15 +37,6 @@
       "type": "number",
       "description": "The port on which this app should be served."
     },
-    "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
-    },
-    "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"]
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -174,5 +171,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": ["directory"]
 }

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

@@ -6,13 +6,8 @@ const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     options.type ??= 'component';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: options.type,
-        callingGenerator: '@nx/angular:scam',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
+        path: options.path,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam/scam.js

@@ -13,8 +13,6 @@ async function scamGenerator(tree, rawOptions) {
         export: false,
         standalone: false,
         skipFormat: true,
-        // options are already normalize, use them as is
-        nameAndDirectoryFormat: 'as-provided',
     });
     (0, lib_1.convertComponentToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);

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

@@ -1,9 +1,8 @@
 import { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
 
 export interface Schema {
-  name: string;
-  directory?: string;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
+  path: string;
+  name?: string;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
@@ -18,21 +17,10 @@ export interface Schema {
   skipSelector?: boolean;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {
+  name: string;
   directory: string;
   projectName: string;
   fileName: string;