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

package/src/generators/scam/schema.json

@@ -6,41 +6,26 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:scam my-sample --directory=my-lib/src/lib/my-sample",
+      "command": "nx g @nx/angular:scam my-lib/src/lib/my-sample/my-sample",
       "description": "Generate a `MySampleComponent` component in the `my-lib` library."
     }
   ],
   "description": "Creates a new Angular SCAM.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "The path at which to create the SCAM file, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the component?"
-    },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the SCAM files. 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 SCAM 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 SCAM?"
     },
-    "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."
+      "description": "The name of the component.",
+      "x-prompt": "What name would you like to use for the component?"
     },
     "displayBlock": {
       "description": "Specifies if the style will contain `:host { display: block; }`.",
@@ -90,12 +75,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create the new files at the top level of the current project.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "selector": {
       "type": "string",
       "format": "html-selector",
@@ -138,5 +117,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/scam-directive/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: 'directive',
-        callingGenerator: '@nx/angular:scam-directive',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
+        path: options.path,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

package/src/generators/scam-directive/scam-directive.js

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

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

@@ -1,30 +1,18 @@
 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;
   inlineScam?: boolean;
   prefix?: string;
   selector?: 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 {
+  name: string;
   directory: string;
   export: boolean;
   fileName: string;

package/src/generators/scam-directive/schema.json

@@ -13,13 +13,18 @@
   "description": "Creates a new, generic Angular directive definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the directive.",
+      "description": "The path at which to create the SCAM Directive files, relative to the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "What is the path of the new directive?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the directive.",
       "x-prompt": "What name would you like to use for the directive?",
       "x-priority": "important"
     },
@@ -92,5 +97,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

package/src/generators/scam-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:scam-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/scam-pipe/scam-pipe.js

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

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

@@ -1,28 +1,16 @@
 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;
   inlineScam?: 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;
   export: boolean;
   fileName: string;

package/src/generators/scam-pipe/schema.json

@@ -6,43 +6,28 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/angular:scam-pipe --project=my-lib --flat=false my-transformation",
+      "command": "nx g @nx/angular:scam-pipe mylib/src/lib/my-transformation/my-transformation",
       "description": "Generates a `MyTransformationPipe` in a `my-transformation` folder in the `my-lib` project"
     }
   ],
   "description": "Creates a new, generic Angular pipe definition in the given or default project.",
   "additionalProperties": false,
   "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?",
-      "x-priority": "important"
+      "x-prompt": "What is the path of the new pipe?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "The directory at which to create the component 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"],
+      "description": "The name of the pipe.",
+      "x-prompt": "What name would you like to use for the pipe?",
       "x-priority": "important"
     },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component 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.",
-      "$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."
-    },
     "skipTests": {
       "type": "boolean",
       "description": "Do not create `spec.ts` test files for the new pipe.",
@@ -73,5 +58,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

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

@@ -3,6 +3,4 @@ export interface StoriesGeneratorOptions {
   interactionTests?: boolean;
   skipFormat?: boolean;
   ignorePaths?: string[];
-  cypressProject?: string;
-  generateCypressSpecs?: boolean;
 }

package/src/generators/stories/schema.json

@@ -25,16 +25,6 @@
       "x-priority": "important",
       "default": true
     },
-    "generateCypressSpecs": {
-      "type": "boolean",
-      "description": "Specifies whether to automatically generate `*.spec.ts` files in the Cypress e2e app generated by the `cypress-configure` generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
-    "cypressProject": {
-      "type": "string",
-      "description": "The Cypress project to generate the stories under. This is inferred from `name` by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/stories/stories.js

@@ -3,26 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularStoriesGenerator = angularStoriesGenerator;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const component_cypress_spec_1 = tslib_1.__importDefault(require("../component-cypress-spec/component-cypress-spec"));
 const component_story_1 = tslib_1.__importDefault(require("../component-story/component-story"));
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
-const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const minimatch_1 = require("minimatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
-    const e2eProjectName = options.cypressProject ?? `${options.name}-e2e`;
-    const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
     const componentsInfo = [];
     for (const entryPoint of entryPoints) {
         const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
         componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
     }
-    if (options.generateCypressSpecs && !e2eProject) {
-        devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
-    }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
         const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
         return shouldIgnorePath;
@@ -39,18 +32,6 @@ async function angularStoriesGenerator(tree, options) {
             interactionTests: options.interactionTests ?? true,
             skipFormat: true,
         });
-        if (options.generateCypressSpecs && e2eProject) {
-            await (0, component_cypress_spec_1.default)(tree, {
-                projectName: options.name,
-                projectPath: info.moduleFolderPath,
-                cypressProject: options.cypressProject,
-                componentName: info.name,
-                componentPath: info.path,
-                componentFileName: info.componentFileName,
-                specDirectory: (0, devkit_1.joinPathFragments)(info.entryPointName, info.path),
-                skipFormat: true,
-            });
-        }
     }
     const tasks = [];
     if (options.interactionTests) {

package/src/generators/storybook-configuration/lib/generate-stories.js

@@ -2,17 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStories = generateStories;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../../utils/versions");
 const stories_1 = require("../../stories/stories");
 async function generateStories(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { getE2eProjectName } = require('@nx/cypress/src/utils/project-name');
-    const e2eProjectName = getE2eProjectName(options.project, project.root, options.cypressDirectory);
     await (0, stories_1.angularStoriesGenerator)(tree, {
         name: options.project,
-        generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
-        cypressProject: e2eProjectName,
         ignorePaths: options.ignorePaths,
         interactionTests: options.interactionTests,
         skipFormat: true,

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -8,9 +8,7 @@ async function generateStorybookConfiguration(tree, options) {
     return await configurationGenerator(tree, {
         project: options.project,
         uiFramework: '@storybook/angular',
-        configureCypress: options.configureCypress,
         linter: options.linter,
-        cypressDirectory: options.cypressDirectory,
         tsConfiguration: options.tsConfiguration,
         interactionTests: options.interactionTests,
         configureStaticServe: options.configureStaticServe,

package/src/generators/storybook-configuration/schema.d.ts

@@ -9,7 +9,4 @@ export interface StorybookConfigurationOptions {
   skipFormat?: boolean;
   ignorePaths?: string[];
   interactionTests?: boolean;
-  configureCypress?: boolean;
-  generateCypressSpecs?: boolean;
-  cypressDirectory?: string;
 }

package/src/generators/storybook-configuration/schema.json

@@ -26,11 +26,6 @@
       "x-priority": "important",
       "default": true
     },
-    "configureCypress": {
-      "type": "boolean",
-      "description": "Specifies whether to configure Cypress or not.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "generateStories": {
       "type": "boolean",
       "description": "Specifies whether to automatically generate `*.stories.ts` files for components declared in this project or not.",
@@ -38,11 +33,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "generateCypressSpecs": {
-      "type": "boolean",
-      "description": "Specifies whether to automatically generate test files in the generated Cypress e2e app.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "configureStaticServe": {
       "type": "boolean",
       "description": "Specifies whether to configure a static file server target for serving storybook. Helpful for speeding up CI build/test times.",
@@ -50,11 +40,6 @@
       "default": true,
       "x-priority": "important"
     },
-    "cypressDirectory": {
-      "type": "string",
-      "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -6,11 +6,8 @@ const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
-const validate_options_1 = require("./lib/validate-options");
-// TODO(katerina): Nx 19 -> remove Cypress
 async function storybookConfigurationGenerator(tree, options) {
     (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
-    (0, validate_options_1.validateOptions)(options);
     const storybookGeneratorInstallTask = await (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, {
         ...options,
         interactionTests: options.interactionTests ?? true, // default is true

package/src/generators/utils/testing.js

@@ -17,22 +17,20 @@ const remote_1 = require("../remote/remote");
 async function generateTestApplication(tree, options) {
     tree.write('.gitignore', '');
     await (0, application_1.applicationGenerator)(tree, {
-        projectNameAndRootFormat: 'as-provided',
         ...options,
     });
 }
 async function generateTestHostApplication(tree, options) {
     tree.write('.gitignore', '');
-    await (0, host_1.host)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
+    await (0, host_1.host)(tree, { ...options });
 }
 async function generateTestRemoteApplication(tree, options) {
     tree.write('.gitignore', '');
-    await (0, remote_1.remote)(tree, { projectNameAndRootFormat: 'as-provided', ...options });
+    await (0, remote_1.remote)(tree, { ...options });
 }
 async function generateTestLibrary(tree, options) {
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
-        projectNameAndRootFormat: 'as-provided',
         ...options,
     });
 }
@@ -40,19 +38,18 @@ async function createStorybookTestWorkspaceForLib(libName) {
     let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
     tree.write('.gitignore', '');
     await (0, library_1.libraryGenerator)(tree, {
-        name: libName,
+        directory: libName,
         buildable: false,
         linter: eslint_1.Linter.EsLint,
         publishable: false,
         simpleName: false,
         skipFormat: true,
         unitTestRunner: test_runners_1.UnitTestRunner.Jest,
-        projectNameAndRootFormat: 'as-provided',
         standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-button',
-        project: libName,
+        path: `${libName}/src/lib/test-button/test-button`,
         standalone: false,
         skipFormat: true,
     });
@@ -82,8 +79,7 @@ export class TestButtonComponent {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'barrel-button',
-        project: libName,
-        path: `${libName}/src/lib/barrel`,
+        path: `${libName}/src/lib/barrel/barrel-button/barrel-button`,
         module: 'barrel',
         standalone: false,
         skipFormat: true,
@@ -105,16 +101,14 @@ export class BarrelModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-button',
-        project: libName,
-        path: `${libName}/src/lib/variable-declare`,
+        path: `${libName}/src/lib/variable-declare/variable-declare-button/variable-declare-button`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-view',
-        project: libName,
-        path: `${libName}/src/lib/variable-declare`,
+        path: `${libName}/src/lib/variable-declare/variable-declare-view/variable-declare-view`,
         module: 'variable-declare',
         standalone: false,
         skipFormat: true,
@@ -142,24 +136,21 @@ export class VariableDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-button',
-        project: libName,
-        path: `${libName}/src/lib/variable-spread-declare`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-button/variable-spread-declare-button`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-view',
-        project: libName,
-        path: `${libName}/src/lib/variable-spread-declare`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-view/variable-spread-declare-view`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-anotherview',
-        project: libName,
-        path: `${libName}/src/lib/variable-spread-declare`,
+        path: `${libName}/src/lib/variable-spread-declare/variable-spread-declare-anotherview/variable-spread-declare-anotherview`,
         module: 'variable-spread-declare',
         standalone: false,
         skipFormat: true,
@@ -187,16 +178,14 @@ export class VariableSpreadDeclareModule {}`);
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp1',
-        project: libName,
-        path: `${libName}/src/lib/static-member-declarations`,
+        path: `${libName}/src/lib/static-member-declarations/cmp1/cmp1`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp2',
-        project: libName,
-        path: `${libName}/src/lib/static-member-declarations`,
+        path: `${libName}/src/lib/static-member-declarations/cmp2/cmp2`,
         module: 'static-member-declarations',
         standalone: false,
         skipFormat: true,
@@ -222,15 +211,14 @@ export class StaticMemberDeclarationsModule {
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'nested-button',
-        project: libName,
         module: 'nested',
-        path: `${libName}/src/lib/nested`,
+        path: `${libName}/src/lib/nested/nested-button/nested-button`,
         standalone: false,
         skipFormat: true,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-other',
-        project: libName,
+        path: `${libName}/src/lib/test-other/test-other`,
         standalone: false,
         skipFormat: true,
     });

package/src/plugins/plugin.d.ts

@@ -0,0 +1,19 @@
+import { type CreateNodesV2 } from '@nx/devkit';
+export interface AngularPluginOptions {
+    targetNamePrefix?: string;
+}
+type AngularTargetConfiguration = {
+    builder: string;
+    options?: Record<string, any>;
+    configurations?: Record<string, any>;
+    defaultConfiguration?: string;
+};
+export type AngularProjectConfiguration = {
+    projectType: 'application' | 'library';
+    root: string;
+    sourceRoot?: string;
+    architect?: Record<string, AngularTargetConfiguration>;
+    targets?: Record<string, AngularTargetConfiguration>;
+};
+export declare const createNodesV2: CreateNodesV2<AngularPluginOptions>;
+export {};