@nx/express 16.8.0-beta.1 → 16.8.0-beta.3

package/generators.json

@@ -12,7 +12,7 @@
     },
 
     "application": {
-      "factory": "./src/generators/application/application#applicationGenerator",
+      "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/express",
-  "version": "16.8.0-beta.1",
+  "version": "16.8.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for Express contains executors and generators for allowing your workspace to create powerful Express Node applications and APIs.",
   "repository": {
@@ -30,9 +30,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/express": "16.8.0-beta.1",
-    "@nx/devkit": "16.8.0-beta.1",
-    "@nx/node": "16.8.0-beta.1",
+    "@nrwl/express": "16.8.0-beta.3",
+    "@nx/devkit": "16.8.0-beta.3",
+    "@nx/node": "16.8.0-beta.3",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
@@ -47,5 +47,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
+  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
 }

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

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

package/src/generators/application/application.js

@@ -1,8 +1,9 @@
 "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 project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const node_1 = require("@nx/node");
 const path_1 = require("path");
 const init_1 = require("../init/init");
@@ -26,7 +27,7 @@ const app = express();
 app.use('/assets', express.static(path.join(__dirname, 'assets')));
 
 app.get('/api', (req, res) => {
-  res.send({ message: 'Welcome to ${options.name}!' });
+  res.send({ message: 'Welcome to ${options.appProjectName}!' });
 });
 
 const port = process.env.PORT || 3333;
@@ -41,7 +42,13 @@ server.on('error', console.error);
 }
 function applicationGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(tree, schema);
+        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.applicationGenerator = applicationGenerator;
+function applicationGeneratorInternal(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield normalizeOptions(tree, schema);
         const initTask = yield (0, init_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
         const applicationTask = yield (0, node_1.applicationGenerator)(tree, Object.assign(Object.assign({}, schema), { bundler: 'webpack', skipFormat: true }));
         addMainFile(tree, options);
@@ -55,15 +62,20 @@ function applicationGenerator(tree, schema) {
         });
     });
 }
-exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;
 exports.applicationSchematic = (0, devkit_1.convertNxGenerator)(applicationGenerator);
 function normalizeOptions(host, options) {
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
-        : (0, devkit_1.names)(options.name).fileName;
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
-    const appProjectRoot = (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
-    return Object.assign(Object.assign({}, options), { appProjectRoot });
+    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)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/express:application',
+        });
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        return Object.assign(Object.assign({}, options), { appProjectName,
+            appProjectRoot });
+    });
 }

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

@@ -1,11 +1,13 @@
-import { UnitTestRunner } from '../../utils/test-runners';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter } from '@nx/linter';
+import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
   name: string;
   skipFormat: boolean;
   skipPackageJson: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   unitTestRunner: UnitTestRunner;
   tags?: string;
   linter: Linter;

package/src/generators/application/schema.json

@@ -14,12 +14,17 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the node application?",
-      "pattern": "^[a-zA-Z].*$"
+      "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",