@nx/plugin 21.5.0-beta.0 → 21.5.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "21.5.0-beta.0",
+  "version": "21.5.0-beta.1",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -28,13 +28,13 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.5.0-beta.0",
-    "@nx/jest": "21.5.0-beta.0",
-    "@nx/js": "21.5.0-beta.0",
-    "@nx/eslint": "21.5.0-beta.0"
+    "@nx/devkit": "21.5.0-beta.1",
+    "@nx/jest": "21.5.0-beta.1",
+    "@nx/js": "21.5.0-beta.1",
+    "@nx/eslint": "21.5.0-beta.1"
   },
   "devDependencies": {
-    "nx": "21.5.0-beta.0"
+    "nx": "21.5.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/executor/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/executor/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAmCvC,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,iBAsBzB;AAqHD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAajE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/executor/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAmCvC,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,iBAsBzB;AAsID,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAajE;AAED,eAAe,iBAAiB,CAAC"}

package/src/generators/executor/executor.js

@@ -84,12 +84,25 @@ async function updateExecutorJson(host, options) {
     });
 }
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory: initialDirectory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
         allowedFileExtensions: ['ts'],
         fileExtension: 'ts',
     });
+    // Check if the path looks like a directory path (doesn't end with a filename)
+    // If so, include the artifact name as a subdirectory
+    let directory = initialDirectory;
+    const normalizedPath = options.path.replace(/^\.?\//, '').replace(/\/$/, '');
+    const pathSegments = normalizedPath.split('/');
+    const lastSegment = pathSegments[pathSegments.length - 1];
+    // If the last segment doesn't end with a known file extension and matches the artifact name,
+    // it's likely a directory path, so we should create a subdirectory
+    const knownFileExtensions = ['.ts', '.js', '.jsx', '.tsx'];
+    const hasKnownFileExtension = knownFileExtensions.some((ext) => lastSegment.endsWith(ext));
+    if (!hasKnownFileExtension && lastSegment === name) {
+        directory = (0, devkit_1.joinPathFragments)(initialDirectory, name);
+    }
     const { className, propertyName } = (0, devkit_1.names)(name);
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     let description;

package/src/generators/generator/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA0EvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,UAAU,CAAC,EAAE,OAAO,iBAuBrB;AA2ED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAalE;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2FvC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,UAAU,CAAC,EAAE,OAAO,iBAuBrB;AA2ED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAalE;AAED,eAAe,kBAAkB,CAAC"}

package/src/generators/generator/generator.js

@@ -11,12 +11,25 @@ const paths_1 = require("../../utils/paths");
 const versions_1 = require("../../utils/versions");
 const generator_1 = require("../lint-checks/generator");
 async function normalizeOptions(tree, options) {
-    const { artifactName: name, directory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory: initialDirectory, fileName, project, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
         allowedFileExtensions: ['ts'],
         fileExtension: 'ts',
     });
+    // Check if the path looks like a directory path (doesn't end with a filename)
+    // If so, include the artifact name as a subdirectory
+    let directory = initialDirectory;
+    const normalizedPath = options.path.replace(/^\.?\//, '').replace(/\/$/, '');
+    const pathSegments = normalizedPath.split('/');
+    const lastSegment = pathSegments[pathSegments.length - 1];
+    // If the last segment doesn't end with a known file extension and matches the artifact name,
+    // it's likely a directory path, so we should create a subdirectory
+    const knownFileExtensions = ['.ts', '.js', '.jsx', '.tsx'];
+    const hasKnownFileExtension = knownFileExtensions.some((ext) => lastSegment.endsWith(ext));
+    if (!hasKnownFileExtension && lastSegment === name) {
+        directory = (0, devkit_1.joinPathFragments)(initialDirectory, name);
+    }
     const { className, propertyName } = (0, devkit_1.names)(name);
     const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     let description;