@nx/angular 17.0.0-rc.0 → 17.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.0.0-rc.0",
+  "version": "17.0.0-rc.1",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -79,15 +79,15 @@
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
     "enquirer": "^2.3.6",
-    "@nx/devkit": "17.0.0-rc.0",
-    "@nx/cypress": "17.0.0-rc.0",
-    "@nx/jest": "17.0.0-rc.0",
-    "@nx/js": "17.0.0-rc.0",
-    "@nx/eslint": "17.0.0-rc.0",
-    "@nx/webpack": "17.0.0-rc.0",
-    "@nx/web": "17.0.0-rc.0",
-    "@nx/workspace": "17.0.0-rc.0",
-    "@nrwl/angular": "17.0.0-rc.0"
+    "@nx/devkit": "17.0.0-rc.1",
+    "@nx/cypress": "17.0.0-rc.1",
+    "@nx/jest": "17.0.0-rc.1",
+    "@nx/js": "17.0.0-rc.1",
+    "@nx/eslint": "17.0.0-rc.1",
+    "@nx/webpack": "17.0.0-rc.1",
+    "@nx/web": "17.0.0-rc.1",
+    "@nx/workspace": "17.0.0-rc.1",
+    "@nrwl/angular": "17.0.0-rc.1"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",

package/src/generators/component/lib/component.js

@@ -10,7 +10,7 @@ function exportComponentInEntryPoint(tree, schema) {
     if (!schema.export || schema.skipImport) {
         return;
     }
-    const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
     if (projectType === 'application') {
         return;
     }

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

@@ -6,7 +6,7 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 const selector_1 = require("../../utils/selector");
 async function normalizeOptions(tree, options) {
     options.type ??= 'component';
-    const { artifactName: name, directory, fileName, filePath, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         artifactType: 'component',
         callingGenerator: '@nx/angular:component',
         name: options.name,
@@ -19,13 +19,13 @@ async function normalizeOptions(tree, options) {
     const { className } = (0, devkit_1.names)(name);
     const { className: suffixClassName } = (0, devkit_1.names)(options.type);
     const symbolName = `${className}${suffixClassName}`;
-    const { prefix, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    const { prefix, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const selector = options.selector ??
         (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'fileName');
     return {
         ...options,
         name,
-        project,
+        projectName,
         changeDetection: options.changeDetection ?? 'Default',
         style: options.style ?? 'css',
         directory,

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

@@ -38,7 +38,7 @@ export interface Schema {
 export interface NormalizedSchema extends Schema {
   directory: string;
   filePath: string;
-  project: string;
+  projectName: string;
   projectSourceRoot: string;
   projectRoot: string;
   selector: string;

package/src/generators/directive/directive.js

@@ -20,7 +20,7 @@ async function directiveGenerator(tree, schema) {
     }
     if (!options.skipImport && !options.standalone) {
         const modulePath = (0, utils_1.findModule)(tree, options.directory, options.module);
-        (0, utils_1.addToNgModule)(tree, options.directory, modulePath, '', options.symbolName, options.fileName, 'declarations', options.flat, options.export);
+        (0, utils_1.addToNgModule)(tree, options.directory, modulePath, options.name, options.symbolName, options.fileName, 'declarations', true, options.export);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const selector_1 = require("../../utils/selector");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, filePath, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         artifactType: 'directive',
         callingGenerator: '@nx/angular:directive',
         name: options.name,
@@ -18,12 +18,12 @@ async function normalizeOptions(tree, options) {
     const { className } = (0, devkit_1.names)(name);
     const { className: suffixClassName } = (0, devkit_1.names)('directive');
     const symbolName = `${className}${suffixClassName}`;
-    const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const selector = options.selector ??
         (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'propertyName');
     return {
         ...options,
-        project,
+        projectName,
         name,
         directory,
         fileName,

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

@@ -31,5 +31,5 @@ export interface NormalizedSchema extends Schema {
   filePath: string;
   fileName: string;
   symbolName: string;
-  project: string;
+  projectName: string;
 }

package/src/generators/federate-module/federate-module.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 async function federateModuleGenerator(tree, schema) {
     if (!tree.exists(schema.path)) {
-        throw new Error((0, devkit_1.stripIndents) `The "path" provided does not exist. Please verify the path is correct and pointing to a file that exists in the workspace.
+        throw new Error((0, devkit_1.stripIndents) `The "path" provided  does not exist. Please verify the path is correct and pointing to a file that exists in the workspace.
     
     Path: ${schema.path}`);
     }

package/src/generators/ng-add/schema.d.ts

@@ -3,10 +3,6 @@ import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface GeneratorOptions {
-  /**
-   * @deprecated This should be inferred with {@link getNpmScope}
-   */
-  npmScope?: string;
   defaultBase?: string;
 
   unitTestRunner?: UnitTestRunner;

package/src/generators/ng-add/schema.json

@@ -6,11 +6,6 @@
   "description": "Migrates an Angular CLI workspace to Nx or adds the Angular plugin to an Nx workspace. NOTE: Does not work in the `--dry-run` mode.",
   "type": "object",
   "properties": {
-    "npmScope": {
-      "type": "string",
-      "description": "Npm scope for importing libs. NOTE: only used if running the generator in an Angular CLI workspace.",
-      "x-deprecated": "This will be inferred from your root package.json"
-    },
     "defaultBase": {
       "type": "string",
       "description": "Default base branch for affected. NOTE: only used if running the generator in an Angular CLI workspace.",

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

@@ -4,7 +4,7 @@ exports.normalizeOptions = void 0;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, filePath, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    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,
@@ -19,7 +19,7 @@ async function normalizeOptions(tree, options) {
     const symbolName = `${className}${suffixClassName}`;
     return {
         ...options,
-        project,
+        projectName,
         name,
         directory,
         fileName,

package/src/generators/pipe/pipe.js

@@ -21,7 +21,7 @@ async function pipeGenerator(tree, rawOptions) {
     }
     if (!options.skipImport && !options.standalone) {
         const modulePath = (0, utils_1.findModule)(tree, options.directory, options.module);
-        (0, utils_1.addToNgModule)(tree, options.directory, modulePath, '', options.symbolName, options.fileName, 'declarations', options.flat, options.export);
+        (0, utils_1.addToNgModule)(tree, options.directory, modulePath, options.name, options.symbolName, options.fileName, 'declarations', true, options.export);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

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

@@ -27,7 +27,7 @@ export interface Schema {
 export interface NormalizedSchema extends Schema {
   directory: string;
   filePath: string;
-  project: string;
+  projectName: string;
   fileName: string;
   symbolName: string;
 }

package/src/generators/remote/remote.js

@@ -9,6 +9,7 @@ const application_1 = require("../application/application");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
+const versions_1 = require("@nx/js/src/utils/versions");
 async function remote(tree, options) {
     return await remoteInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -58,7 +59,10 @@ async function remoteInternal(tree, schema) {
         prefix: options.prefix,
         typescriptConfiguration,
     });
-    let installTasks = [appInstallTask];
+    const installSwcHelpersTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@swc/helpers': versions_1.swcHelpersVersion,
+    });
+    let installTasks = [appInstallTask, installSwcHelpersTask];
     if (options.ssr) {
         let ssrInstallTask = await (0, lib_1.addSsr)(tree, {
             appName: remoteProjectName,

package/src/generators/scam/lib/index.d.ts

@@ -1,3 +1,2 @@
 export * from './convert-component-to-scam';
 export * from './normalize-options';
-export * from './validate-options';

package/src/generators/scam/lib/index.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./convert-component-to-scam"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
-tslib_1.__exportStar(require("./validate-options"), exports);

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

@@ -5,7 +5,7 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     options.type ??= 'component';
-    const { artifactName: name, directory, fileName, filePath, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    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,
@@ -27,7 +27,7 @@ async function normalizeOptions(tree, options) {
         filePath,
         name,
         symbolName,
-        project,
+        projectName,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/scam/scam.js

@@ -6,16 +6,16 @@ const component_1 = require("../component/component");
 const export_scam_1 = require("../utils/export-scam");
 const lib_1 = require("./lib");
 async function scamGenerator(tree, rawOptions) {
-    (0, lib_1.validateOptions)(tree, rawOptions);
-    const { inlineScam, ...generatorOptions } = rawOptions;
+    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     await (0, component_1.componentGenerator)(tree, {
-        ...generatorOptions,
+        ...options,
         skipImport: true,
         export: false,
         standalone: false,
         skipFormat: true,
+        // options are already normalize, use them as is
+        nameAndDirectoryFormat: 'as-provided',
     });
-    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     (0, lib_1.convertComponentToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);
     if (!options.skipFormat) {

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

@@ -34,7 +34,7 @@ export interface Schema {
 
 export interface NormalizedSchema extends Schema {
   directory: string;
-  project: string;
+  projectName: string;
   fileName: string;
   filePath: string;
   symbolName: string;

package/src/generators/scam-directive/lib/index.d.ts

@@ -1,3 +1,2 @@
 export * from './convert-directive-to-scam';
 export * from './normalize-options';
-export * from './validate-options';

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

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./convert-directive-to-scam"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
-tslib_1.__exportStar(require("./validate-options"), exports);

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

@@ -4,7 +4,7 @@ exports.normalizeOptions = void 0;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, filePath, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    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,
@@ -26,7 +26,7 @@ async function normalizeOptions(tree, options) {
         filePath,
         name,
         symbolName,
-        project,
+        projectName,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -6,16 +6,16 @@ const directive_1 = require("../directive/directive");
 const export_scam_1 = require("../utils/export-scam");
 const lib_1 = require("./lib");
 async function scamDirectiveGenerator(tree, rawOptions) {
-    (0, lib_1.validateOptions)(tree, rawOptions);
-    const { inlineScam, ...directiveOptions } = rawOptions;
+    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     await (0, directive_1.directiveGenerator)(tree, {
-        ...directiveOptions,
+        ...options,
         skipImport: true,
         export: false,
         standalone: false,
         skipFormat: true,
+        // options are already normalize, use them as is
+        nameAndDirectoryFormat: 'as-provided',
     });
-    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     (0, lib_1.convertDirectiveToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);
     await (0, devkit_1.formatFiles)(tree);

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

@@ -30,5 +30,5 @@ export interface NormalizedSchema extends Schema {
   filePath: string;
   inlineScam: boolean;
   symbolName: string;
-  project: string;
+  projectName: string;
 }

package/src/generators/scam-pipe/lib/index.d.ts

@@ -1,3 +1,2 @@
 export * from './convert-pipe-to-scam';
 export * from './normalize-options';
-export * from './validate-options';

package/src/generators/scam-pipe/lib/index.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./convert-pipe-to-scam"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
-tslib_1.__exportStar(require("./validate-options"), exports);

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

@@ -4,7 +4,7 @@ exports.normalizeOptions = void 0;
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, filePath, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    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,
@@ -26,7 +26,7 @@ async function normalizeOptions(tree, options) {
         filePath,
         name,
         symbolName,
-        project,
+        projectName,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -6,16 +6,16 @@ const pipe_1 = require("../pipe/pipe");
 const export_scam_1 = require("../utils/export-scam");
 const lib_1 = require("./lib");
 async function scamPipeGenerator(tree, rawOptions) {
-    (0, lib_1.validateOptions)(tree, rawOptions);
-    const { inlineScam, ...pipeOptions } = rawOptions;
+    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     await (0, pipe_1.pipeGenerator)(tree, {
-        ...pipeOptions,
+        ...options,
         skipImport: true,
         export: false,
         standalone: false,
         skipFormat: true,
+        // options are already normalize, use them as is
+        nameAndDirectoryFormat: 'as-provided',
     });
-    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     (0, lib_1.convertPipeToScam)(tree, options);
     (0, export_scam_1.exportScam)(tree, options);
     await (0, devkit_1.formatFiles)(tree);

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

@@ -27,6 +27,6 @@ export interface NormalizedSchema extends Schema {
   fileName: string;
   filePath: string;
   inlineScam: boolean;
-  project: string;
+  projectName: string;
   symbolName: string;
 }

package/src/generators/stories/schema.json

@@ -46,6 +46,9 @@
         "type": "string",
         "description": "Path to ignore."
       },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
       "examples": [
         "apps/my-app/src/not-stories/**",
         "**/**/src/**/not-stories/**",

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

@@ -80,6 +80,9 @@
         "type": "string",
         "description": "Path to ignore."
       },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
       "examples": [
         "apps/my-app/src/not-stories/**",
         "**/**/src/**/not-stories/**",

package/src/generators/utils/export-scam.d.ts

@@ -3,7 +3,7 @@ export type GenerationOptions = {
     directory: string;
     filePath: string;
     name: string;
-    project: string;
+    projectName: string;
     export?: boolean;
     inlineScam?: boolean;
 };

package/src/generators/utils/export-scam.js

@@ -8,7 +8,7 @@ function exportScam(tree, options) {
     if (!options.export) {
         return;
     }
-    const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
     const projectSourceRoot = sourceRoot ?? (0, devkit_1.joinPathFragments)(root, 'src');
     if (projectType === 'application') {
         devkit_1.logger.warn('--export=true was ignored as the project the SCAM is being generated in is not a library.');

package/src/generators/utils/path.d.ts

@@ -1,20 +1 @@
-import type { Tree } from '@nx/devkit';
-export declare function pathStartsWith(path1: string, path2: string): boolean;
 export declare function getRelativeImportToFile(sourceFilePath: string, targetFilePath: string): string;
-export type PathGenerationOptions = {
-    name: string;
-    project: string;
-    flat?: boolean;
-    path?: string;
-    type?: string;
-};
-export type GenerationPaths = {
-    directory: string;
-    fileName: string;
-    filePath: string;
-    name: string;
-    path: string;
-    root: string;
-    sourceRoot: string;
-};
-export declare function normalizeNameAndPaths(tree: Tree, options: PathGenerationOptions): GenerationPaths;

package/src/generators/utils/path.js

@@ -1,41 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeNameAndPaths = exports.getRelativeImportToFile = exports.pathStartsWith = void 0;
+exports.getRelativeImportToFile = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const names_1 = require("./names");
-function pathStartsWith(path1, path2) {
-    const normalizedPath1 = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, path1);
-    const normalizedPath2 = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, path2);
-    return normalizedPath1.startsWith(normalizedPath2);
-}
-exports.pathStartsWith = pathStartsWith;
 function getRelativeImportToFile(sourceFilePath, targetFilePath) {
     const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(sourceFilePath), (0, path_1.dirname)(targetFilePath));
     return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
 }
 exports.getRelativeImportToFile = getRelativeImportToFile;
-function normalizeNameAndPaths(tree, options) {
-    const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const projectSourceRoot = sourceRoot ?? (0, devkit_1.joinPathFragments)(root, 'src');
-    const { name, path: namePath } = (0, names_1.parseNameWithPath)(options.name);
-    const path = options.path ??
-        (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib', namePath);
-    const directory = options.flat
-        ? (0, devkit_1.normalizePath)(path)
-        : (0, devkit_1.joinPathFragments)(path, name);
-    const fileName = options.type
-        ? `${name}.${(0, devkit_1.names)(options.type).fileName}`
-        : name;
-    const filePath = (0, devkit_1.joinPathFragments)(directory, `${fileName}.ts`);
-    return {
-        directory,
-        fileName,
-        filePath,
-        name,
-        path,
-        root,
-        sourceRoot,
-    };
-}
-exports.normalizeNameAndPaths = normalizeNameAndPaths;

package/src/generators/utils/project.d.ts

@@ -1,5 +1,3 @@
 import type { Tree } from '@nx/devkit';
-export declare function normalizeDirectory(appName: string, directoryName: string): string;
-export declare function normalizeProjectName(appName: string, directoryName: string): string;
 export declare function normalizeNewProjectPrefix(prefix: string | undefined, npmScope: string | undefined, fallbackPrefix: string): string;
 export declare function getProjectPrefix(tree: Tree, project: string): string | undefined;

package/src/generators/utils/project.js

@@ -1,18 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectPrefix = exports.normalizeNewProjectPrefix = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
+exports.getProjectPrefix = exports.normalizeNewProjectPrefix = void 0;
 const devkit_1 = require("@nx/devkit");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
-function normalizeDirectory(appName, directoryName) {
-    return directoryName
-        ? `${(0, devkit_1.names)(directoryName).fileName}/${(0, devkit_1.names)(appName).fileName}`
-        : (0, devkit_1.names)(appName).fileName;
-}
-exports.normalizeDirectory = normalizeDirectory;
-function normalizeProjectName(appName, directoryName) {
-    return normalizeDirectory(appName, directoryName).replace(/\//g, '-');
-}
-exports.normalizeProjectName = normalizeProjectName;
 function normalizeNewProjectPrefix(prefix, npmScope, fallbackPrefix) {
     // Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
     // to it and let it fall through to the Angular schematic to handle it

package/src/generators/utils/validations.d.ts

@@ -1,4 +1,3 @@
 import type { Tree } from '@nx/devkit';
 export declare function validateProject(tree: Tree, projectName: string): void;
 export declare function validateStandaloneOption(tree: Tree, standalone: boolean | undefined, angularVersion?: string): void;
-export declare function validatePathIsUnderProjectRoot(tree: Tree, projectName: string, path: string): void;

package/src/generators/utils/validations.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validatePathIsUnderProjectRoot = exports.validateStandaloneOption = exports.validateProject = void 0;
+exports.validateStandaloneOption = exports.validateProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
-const path_1 = require("./path");
 const version_utils_1 = require("./version-utils");
 function validateProject(tree, projectName) {
     const projects = (0, devkit_1.getProjects)(tree);
@@ -23,18 +22,3 @@ function validateStandaloneOption(tree, standalone, angularVersion) {
     }
 }
 exports.validateStandaloneOption = validateStandaloneOption;
-function validatePathIsUnderProjectRoot(tree, projectName, path) {
-    if (!path) {
-        return;
-    }
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    let pathToComponent = (0, devkit_1.normalizePath)(path);
-    pathToComponent = pathToComponent.startsWith('/')
-        ? pathToComponent.slice(1)
-        : pathToComponent;
-    if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
-        throw new Error(`The path provided (${path}) does not exist under the project root (${root}). ` +
-            `Please make sure to provide a path that exists under the project root.`);
-    }
-}
-exports.validatePathIsUnderProjectRoot = validatePathIsUnderProjectRoot;

package/src/generators/scam/lib/validate-options.d.ts

@@ -1,3 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function validateOptions(tree: Tree, options: Schema): void;

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

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateOptions = void 0;
-const validations_1 = require("../../utils/validations");
-function validateOptions(tree, options) {
-    (0, validations_1.validateProject)(tree, options.project);
-    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
-}
-exports.validateOptions = validateOptions;

package/src/generators/scam-directive/lib/validate-options.d.ts

@@ -1,3 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function validateOptions(tree: Tree, options: Schema): void;

package/src/generators/scam-directive/lib/validate-options.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateOptions = void 0;
-const validations_1 = require("../../utils/validations");
-function validateOptions(tree, options) {
-    (0, validations_1.validateProject)(tree, options.project);
-    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
-}
-exports.validateOptions = validateOptions;

package/src/generators/scam-pipe/lib/validate-options.d.ts

@@ -1,3 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function validateOptions(tree: Tree, options: Schema): void;

package/src/generators/scam-pipe/lib/validate-options.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateOptions = void 0;
-const validations_1 = require("../../utils/validations");
-function validateOptions(tree, options) {
-    (0, validations_1.validateProject)(tree, options.project);
-    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
-}
-exports.validateOptions = validateOptions;

package/src/generators/utils/get-new-project-name.d.ts

@@ -1,6 +0,0 @@
-/**
- * Joins path segments replacing slashes with dashes
- *
- * @param path
- */
-export declare function getNewProjectName(path: string): string;

package/src/generators/utils/get-new-project-name.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewProjectName = void 0;
-const devkit_1 = require("@nx/devkit");
-/**
- * Joins path segments replacing slashes with dashes
- *
- * @param path
- */
-function getNewProjectName(path) {
-    // strip leading '/' or './' or '../' and trailing '/' and replaces '/' with '-'
-    return (0, devkit_1.normalizePath)(path)
-        .replace(/(^\.{0,2}\/|\.{1,2}\/|\/$)/g, '')
-        .split('/')
-        .filter((x) => !!x)
-        .join('-');
-}
-exports.getNewProjectName = getNewProjectName;

package/src/generators/utils/names.d.ts

@@ -1,5 +0,0 @@
-export type NameInfo = {
-    name: string;
-    path: string;
-};
-export declare function parseNameWithPath(rawName: string): NameInfo;

package/src/generators/utils/names.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseNameWithPath = void 0;
-const devkit_1 = require("@nx/devkit");
-function parseNameWithPath(rawName) {
-    const parsedName = (0, devkit_1.normalizePath)(rawName).split('/');
-    const name = parsedName.pop();
-    const path = parsedName.join('/');
-    return { name, path };
-}
-exports.parseNameWithPath = parseNameWithPath;