@nx/nest 16.8.0-beta.0 → 16.8.0-beta.2

package/generators.json

@@ -108,7 +108,7 @@
   },
   "generators": {
     "application": {
-      "factory": "./src/generators/application/application",
+      "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
@@ -128,7 +128,7 @@
       "hidden": true
     },
     "library": {
-      "factory": "./src/generators/library/library",
+      "factory": "./src/generators/library/library#libraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/nest",
-  "version": "16.8.0-beta.0",
+  "version": "16.8.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
   "repository": {
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "@nestjs/schematics": "^9.1.0",
-    "@nrwl/nest": "16.8.0-beta.0",
-    "@nx/devkit": "16.8.0-beta.0",
-    "@nx/js": "16.8.0-beta.0",
-    "@nx/linter": "16.8.0-beta.0",
-    "@nx/node": "16.8.0-beta.0",
+    "@nrwl/nest": "16.8.0-beta.2",
+    "@nx/devkit": "16.8.0-beta.2",
+    "@nx/js": "16.8.0-beta.2",
+    "@nx/linter": "16.8.0-beta.2",
+    "@nx/node": "16.8.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "enquirer": "~2.3.6",
     "semver": "7.5.3",
@@ -45,5 +45,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

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

@@ -1,5 +1,6 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { ApplicationGeneratorOptions } from './schema';
 export declare function applicationGenerator(tree: Tree, rawOptions: ApplicationGeneratorOptions): Promise<GeneratorCallback>;
+export declare function applicationGeneratorInternal(tree: Tree, rawOptions: ApplicationGeneratorOptions): Promise<GeneratorCallback>;
 export default applicationGenerator;
 export declare const applicationSchematic: (generatorOptions: ApplicationGeneratorOptions) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/application.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationSchematic = exports.applicationGenerator = void 0;
+exports.applicationSchematic = exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("@nx/node");
@@ -8,7 +8,13 @@ const init_1 = require("../init/init");
 const lib_1 = require("./lib");
 function applicationGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, rawOptions));
+    });
+}
+exports.applicationGenerator = applicationGenerator;
+function applicationGeneratorInternal(tree, rawOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield (0, lib_1.normalizeOptions)(tree, rawOptions);
         const initTask = yield (0, init_1.initGenerator)(tree, {
             skipPackageJson: options.skipPackageJson,
             unitTestRunner: options.unitTestRunner,
@@ -23,6 +29,6 @@ function applicationGenerator(tree, rawOptions) {
         return (0, devkit_1.runTasksInSerial)(initTask, nodeApplicationTask);
     });
 }
-exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;
 exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);

package/src/generators/application/lib/create-files.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 function createFiles(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src'), {
         tmpl: '',
-        name: options.name,
+        name: options.appProjectName,
         root: options.appProjectRoot,
     });
 }

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
 import type { Schema as NodeApplicationGeneratorOptions } from '@nx/node/src/generators/application/schema';
 import type { ApplicationGeneratorOptions, NormalizedOptions } from '../schema';
-export declare function normalizeOptions(tree: Tree, options: ApplicationGeneratorOptions): NormalizedOptions;
+export declare function normalizeOptions(tree: Tree, options: ApplicationGeneratorOptions): Promise<NormalizedOptions>;
 export declare function toNodeApplicationGeneratorOptions(options: NormalizedOptions): NodeApplicationGeneratorOptions;

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

@@ -1,19 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toNodeApplicationGeneratorOptions = exports.normalizeOptions = void 0;
-const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
+const tslib_1 = require("tslib");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const linter_1 = require("@nx/linter");
 function normalizeOptions(tree, options) {
     var _a, _b, _c, _d;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appDirectory = projectDirectory
-        ? `${(0, devkit_2.names)(projectDirectory).fileName}/${(0, devkit_2.names)(options.name).fileName}`
-        : (0, devkit_2.names)(options.name).fileName;
-    const appProjectRoot = options.rootProject
-        ? '.'
-        : (0, devkit_2.joinPathFragments)(layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_2.getWorkspaceLayout)(tree).appsDir, appDirectory);
-    return Object.assign(Object.assign({}, options), { strict: (_a = options.strict) !== null && _a !== void 0 ? _a : false, appProjectRoot, linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest', e2eTestRunner: (_d = options.e2eTestRunner) !== null && _d !== void 0 ? _d : 'jest' });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator: '@nx/nest:application',
+        });
+        options.rootProject = appProjectRoot === '.';
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        return Object.assign(Object.assign({}, options), { strict: (_a = options.strict) !== null && _a !== void 0 ? _a : false, appProjectName,
+            appProjectRoot, linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : 'jest', e2eTestRunner: (_d = options.e2eTestRunner) !== null && _d !== void 0 ? _d : 'jest' });
+    });
 }
 exports.normalizeOptions = normalizeOptions;
 function toNodeApplicationGeneratorOptions(options) {

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

@@ -1,8 +1,10 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
 
 export interface ApplicationGeneratorOptions {
   name: string;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   frontendProject?: string;
   linter?: Linter;
   skipFormat?: boolean;
@@ -17,5 +19,6 @@ export interface ApplicationGeneratorOptions {
 }
 
 interface NormalizedOptions extends ApplicationGeneratorOptions {
+  appProjectName: string;
   appProjectRoot: Path;
 }

package/src/generators/application/schema.json

@@ -13,12 +13,18 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the node application?"
+      "x-prompt": "What name would you like to use for the node application?",
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "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"]
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/library/lib/add-project.js

@@ -11,9 +11,7 @@ function addProject(tree, options) {
         executor: '@nx/js:tsc',
         outputs: ['{options.outputPath}'],
         options: {
-            outputPath: options.libsDir && options.libsDir !== '.'
-                ? `dist/${options.libsDir}/${options.projectDirectory}`
-                : `dist/${options.projectDirectory}`,
+            outputPath: `dist/${options.projectRoot}`,
             tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
             packageJson: `${options.projectRoot}/package.json`,
             main: `${options.projectRoot}/src/index.ts`,

package/src/generators/library/lib/normalize-options.d.ts

@@ -1,5 +1,5 @@
-import type { LibraryGeneratorSchema as JsLibraryGeneratorSchema } from '@nx/js/src/utils/schema';
 import { Tree } from '@nx/devkit';
+import type { LibraryGeneratorSchema as JsLibraryGeneratorSchema } from '@nx/js/src/utils/schema';
 import type { LibraryGeneratorOptions, NormalizedOptions } from '../schema';
-export declare function normalizeOptions(tree: Tree, options: LibraryGeneratorOptions): NormalizedOptions;
+export declare function normalizeOptions(tree: Tree, options: LibraryGeneratorOptions): Promise<NormalizedOptions>;
 export declare function toJsLibraryGeneratorOptions(options: LibraryGeneratorOptions): JsLibraryGeneratorSchema;

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

@@ -1,27 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toJsLibraryGeneratorOptions = exports.normalizeOptions = void 0;
-const linter_1 = require("@nx/linter");
-const devkit_1 = require("@nx/devkit");
+const tslib_1 = require("tslib");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
+const linter_1 = require("@nx/linter");
 function normalizeOptions(tree, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const { libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
-    const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const fullProjectDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`
-        : name;
-    const projectName = fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
-    const fileName = options.simpleName ? name : projectName;
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const normalized = Object.assign(Object.assign({}, options), { strict: (_a = options.strict) !== null && _a !== void 0 ? _a : true, controller: (_b = options.controller) !== null && _b !== void 0 ? _b : false, fileName, global: (_c = options.global) !== null && _c !== void 0 ? _c : false, linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, parsedTags, prefix: (0, get_npm_scope_1.getNpmScope)(tree), projectDirectory: fullProjectDirectory, projectName,
-        projectRoot, service: (_e = options.service) !== null && _e !== void 0 ? _e : false, target: (_f = options.target) !== null && _f !== void 0 ? _f : 'es6', testEnvironment: (_g = options.testEnvironment) !== null && _g !== void 0 ? _g : 'node', unitTestRunner: (_h = options.unitTestRunner) !== null && _h !== void 0 ? _h : 'jest', libsDir });
-    return normalized;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName, names: projectNames, projectRoot, importPath, } = yield (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/nest:library',
+        });
+        const fileName = options.simpleName
+            ? projectNames.projectSimpleName
+            : projectNames.projectFileName;
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        const normalized = Object.assign(Object.assign({}, options), { strict: (_a = options.strict) !== null && _a !== void 0 ? _a : true, controller: (_b = options.controller) !== null && _b !== void 0 ? _b : false, fileName, global: (_c = options.global) !== null && _c !== void 0 ? _c : false, linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, parsedTags, prefix: (0, get_npm_scope_1.getNpmScope)(tree), // we could also allow customizing this
+            projectName,
+            projectRoot,
+            importPath, service: (_e = options.service) !== null && _e !== void 0 ? _e : false, target: (_f = options.target) !== null && _f !== void 0 ? _f : 'es6', testEnvironment: (_g = options.testEnvironment) !== null && _g !== void 0 ? _g : 'node', unitTestRunner: (_h = options.unitTestRunner) !== null && _h !== void 0 ? _h : 'jest' });
+        return normalized;
+    });
 }
 exports.normalizeOptions = normalizeOptions;
 function toJsLibraryGeneratorOptions(options) {

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

@@ -1,5 +1,6 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { LibraryGeneratorOptions } from './schema';
 export declare function libraryGenerator(tree: Tree, rawOptions: LibraryGeneratorOptions): Promise<GeneratorCallback>;
+export declare function libraryGeneratorInternal(tree: Tree, rawOptions: LibraryGeneratorOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;
 export declare const librarySchematic: (generatorOptions: LibraryGeneratorOptions) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.librarySchematic = exports.libraryGenerator = void 0;
+exports.librarySchematic = exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
@@ -8,7 +8,13 @@ const lib_1 = require("../init/lib");
 const lib_2 = require("./lib");
 function libraryGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_2.normalizeOptions)(tree, rawOptions);
+        return yield libraryGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, rawOptions));
+    });
+}
+exports.libraryGenerator = libraryGenerator;
+function libraryGeneratorInternal(tree, rawOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield (0, lib_2.normalizeOptions)(tree, rawOptions);
         yield (0, js_1.libraryGenerator)(tree, (0, lib_2.toJsLibraryGeneratorOptions)(options));
         const installDepsTask = (0, lib_1.addDependencies)(tree);
         (0, lib_2.deleteFiles)(tree, options);
@@ -22,6 +28,6 @@ function libraryGenerator(tree, rawOptions) {
         return installDepsTask;
     });
 }
-exports.libraryGenerator = libraryGenerator;
+exports.libraryGeneratorInternal = libraryGeneratorInternal;
 exports.default = libraryGenerator;
 exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);

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

@@ -1,11 +1,13 @@
-import { Linter } from '@nx/linter';
-import { UnitTestRunner } from '../utils';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
+import type { UnitTestRunner } from '../utils';
 
 export interface LibraryGeneratorOptions {
   name: string;
   buildable?: boolean;
   controller?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   global?: boolean;
   importPath?: string;
   linter?: Linter;
@@ -38,8 +40,6 @@ export interface NormalizedOptions extends LibraryGeneratorOptions {
   fileName: string;
   parsedTags: string[];
   prefix: string;
-  projectDirectory: string;
   projectName: string;
   projectRoot: Path;
-  libsDir: string;
 }

package/src/generators/library/schema.json

@@ -19,13 +19,19 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the library?"
+      "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][^:]*)$"
     },
     "directory": {
       "description": "A directory where the library is placed.",
       "type": "string",
       "alias": "dir"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",