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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "0.0.0-pr-27957-a99d5ea",
+  "version": "0.0.0-pr-28229-afe192c",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -32,15 +32,14 @@
   },
   "dependencies": {
     "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/node": "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",
   "types": "./index.d.ts"
-}
+}

package/src/generators/application/application.js

@@ -152,9 +152,6 @@ function addAppFiles(tree, options) {
     if (options.js) {
         (0, devkit_1.toJS)(tree);
     }
-    if (options.pascalCaseFiles) {
-        devkit_1.logger.warn('NOTE: --pascalCaseFiles is a noop');
-    }
 }
 function addProxy(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.frontendProject);
@@ -275,7 +272,6 @@ function updateTsConfigOptions(tree, options) {
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
@@ -363,7 +359,6 @@ async function applicationGeneratorInternal(tree, schema) {
             projectType: options.framework === 'none' ? 'cli' : 'server',
             name: options.rootProject ? 'e2e' : `${options.name}-e2e`,
             directory: options.rootProject ? 'e2e' : `${options.appProjectRoot}-e2e`,
-            projectNameAndRootFormat: 'as-provided',
             project: options.name,
             port: options.port,
             isNest: options.isNest,
@@ -394,16 +389,14 @@ async function applicationGeneratorInternal(tree, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, projectRoot: appProjectRoot, 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: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/node:application',
     });
     options.rootProject = appProjectRoot === '.';
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     options.bundler = options.bundler ?? 'esbuild';
     options.e2eTestRunner = options.e2eTestRunner ?? 'jest';
     const parsedTags = options.tags

package/src/generators/application/files/common/tsconfig.app.json

@@ -5,6 +5,5 @@
     "module": "commonjs",
     "types": ["node"]
   },
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"],
   "include": ["src/**/*.ts"]
 }

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

@@ -1,12 +1,10 @@
-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;
+  name?: string;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner?: 'jest' | 'none';
   e2eTestRunner?: 'jest' | 'none';
   linter?: Linter | LinterType;
@@ -16,7 +14,6 @@ export interface Schema {
   /** @deprecated use `swcJest` instead */
   babelJest?: boolean;
   js?: boolean;
-  pascalCaseFiles?: boolean;
   setParserOptionsProject?: boolean;
   standaloneConfig?: boolean;
   bundler?: 'esbuild' | 'webpack';

package/src/generators/application/schema.json

@@ -6,27 +6,21 @@
   "description": "Nx Application Options Schema.",
   "type": "object",
   "properties": {
-    "name": {
-      "description": "The name of the application.",
+    "directory": {
+      "description": "The directory of the new application.",
       "type": "string",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the node application?",
-      "x-priority": "important",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "name": {
+      "description": "The name of the application.",
       "type": "string",
+      "pattern": "^[a-zA-Z][^:]*$",
       "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"]
-    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",
@@ -72,12 +66,6 @@
       "default": false,
       "x-deprecated": "Use --swcJest instead for faster compilation"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case file names.",
-      "alias": "P",
-      "default": false
-    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
@@ -132,5 +120,5 @@
       "description": "Add a docker build target"
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

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

@@ -14,7 +14,6 @@ const config_file_1 = require("@nx/jest/src/utils/config/config-file");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...options,
     });
 }
@@ -127,15 +126,11 @@ async function e2eProjectGeneratorInternal(host, _options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(tree, options) {
+    options.directory = options.directory ?? `${options.project}-e2e`;
     const { projectName: e2eProjectName, projectRoot: e2eProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
-        name: options.name ?? `${options.project}-e2e`,
+        name: options.name,
         projectType: 'library',
         directory: options.rootProject ? 'e2e' : options.directory,
-        projectNameAndRootFormat: options.rootProject
-            ? 'as-provided'
-            : options.projectNameAndRootFormat,
-        // this is an internal generator, don't save defaults
-        callingGenerator: null,
     });
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&

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

@@ -1,10 +1,7 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-
 export interface Schema {
   project: string;
   projectType: 'server' | 'cli';
   directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   name?: string;
   port?: number;
   linter?: 'eslint' | 'none';

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

@@ -18,11 +18,6 @@
       "type": "string",
       "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"]
-    },
     "name": {
       "description": "The name of the e2e project. Defaults to the project name with '-e2e' suffix.",
       "type": "string"

package/src/generators/library/library.js

@@ -14,7 +14,6 @@ const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaul
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }
@@ -52,25 +51,20 @@ async function libraryGeneratorInternal(tree, schema) {
 }
 exports.default = libraryGenerator;
 async function normalizeOptions(tree, options) {
-    const { projectName, names: projectNames, projectRoot, importPath, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(tree, options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/node:library',
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const fileName = getCaseAwareFileName({
-        fileName: options.simpleModuleName
-            ? projectNames.projectSimpleName
-            : projectNames.projectFileName,
-        pascalCaseFiles: options.pascalCaseFiles,
-    });
+    const fileName = (0, devkit_1.names)(options.simpleModuleName
+        ? projectNames.projectSimpleName
+        : projectNames.projectFileName).fileName;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
@@ -83,10 +77,6 @@ async function normalizeOptions(tree, options) {
         importPath,
     };
 }
-function getCaseAwareFileName(options) {
-    const normalized = (0, devkit_1.names)(options.fileName);
-    return options.pascalCaseFiles ? normalized.className : normalized.fileName;
-}
 function createFiles(tree, options) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.fileName);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, {

package/src/generators/library/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;
   simpleModuleName?: boolean;
   skipTsConfig?: boolean;
   skipFormat?: boolean;
@@ -18,7 +16,6 @@ export interface Schema {
   rootDir?: string;
   babelJest?: boolean;
   js?: boolean;
-  pascalCaseFiles?: boolean;
   strict?: boolean;
   standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/library/schema.json

@@ -12,29 +12,24 @@
     }
   ],
   "properties": {
-    "name": {
+    "directory": {
       "type": "string",
-      "description": "Library name",
+      "description": "A directory where the lib is placed",
+      "alias": "dir",
       "$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-prompt": "Which directory do you want to create the library in?"
     },
-    "directory": {
+    "name": {
       "type": "string",
-      "description": "A directory where the lib is placed",
-      "alias": "dir",
+      "description": "Library name",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
       "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"]
-    },
     "simpleModuleName": {
-      "description": "Keep the module name simple (when using `--directory`).",
+      "description": "Keep the module name simple.",
       "type": "boolean",
       "default": false
     },
@@ -104,12 +99,6 @@
       "description": "Use `babel` instead of `ts-jest`.",
       "default": false
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case file names.",
-      "alias": "P",
-      "default": false
-    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript files rather than TypeScript files.",
@@ -132,5 +121,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }