@nx/react-native 0.0.0-pr-28218-5048fd1 → 0.0.0-pr-28229-afe192c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-28218-5048fd1",
+  "version": "0.0.0-pr-28229-afe192c",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -36,12 +36,12 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-28218-5048fd1",
-    "@nx/jest": "0.0.0-pr-28218-5048fd1",
-    "@nx/js": "0.0.0-pr-28218-5048fd1",
-    "@nx/eslint": "0.0.0-pr-28218-5048fd1",
-    "@nx/react": "0.0.0-pr-28218-5048fd1",
-    "@nx/workspace": "0.0.0-pr-28218-5048fd1"
+    "@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",
+    "@nx/react": "0.0.0-pr-28229-afe192c",
+    "@nx/workspace": "0.0.0-pr-28229-afe192c"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/lib/add-e2e.js

@@ -30,7 +30,6 @@ async function addE2e(host, options) {
                 ...options,
                 e2eName: options.e2eProjectName,
                 e2eDirectory: options.e2eProjectRoot,
-                projectNameAndRootFormat: 'as-provided',
                 appProject: options.projectName,
                 appDisplayName: options.displayName,
                 appName: options.name,

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

@@ -4,13 +4,12 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
-    const { projectName: appProjectName, names: projectNames, 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, names: projectNames, projectRoot: appProjectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
-    options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -1,13 +1,11 @@
-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;
   displayName?: string;
   style?: string;
   skipFormat?: boolean;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner: 'jest' | 'none'; // default is jest
   classComponent?: boolean;

package/src/generators/application/schema.json

@@ -16,29 +16,24 @@
   ],
   "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 application?",
-      "pattern": "^[a-zA-Z][^:]*$"
+      "x-prompt": "Which directory do you want to create the application in?"
     },
-    "displayName": {
-      "description": "The display name to show in the application. Defaults to name.",
+    "name": {
+      "description": "The name of the application.",
+      "pattern": "^[a-zA-Z][^:]*$",
       "type": "string"
     },
-    "directory": {
-      "description": "The directory of the new application.",
+    "displayName": {
+      "description": "The display name to show in the application. Defaults to name.",
       "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",
@@ -99,5 +94,5 @@
       "x-priority": "important"
     }
   },
-  "required": []
+  "required": ["directory"]
 }

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

@@ -1,6 +1,7 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
+    directory: string;
     projectSourceRoot: string;
     fileName: string;
     className: string;

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

@@ -4,13 +4,12 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function normalizeOptions(host, options) {
-    assertValidOptions(options);
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+        path: options.path,
         name: options.name,
-        directory: options.directory,
-        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
         fileExtension: 'tsx',
     });
+    assertValidOptions({ name, directory });
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { className } = (0, devkit_1.names)(name);
     const { sourceRoot: projectSourceRoot, projectType } = project;
@@ -20,6 +19,7 @@ async function normalizeOptions(host, options) {
     options.classComponent = options.classComponent ?? false;
     return {
         ...options,
+        name,
         directory,
         className,
         fileName,
@@ -37,7 +37,7 @@ function assertValidOptions(options) {
             if (options.directory) {
                 suggestion = `${options.directory}${s}${suggestion}`;
             }
-            throw new Error(`Found "${s}" in the component name. Did you mean to use the --directory option (e.g. \`nx g c ${name} --directory ${suggestion}\`)?`);
+            throw new Error(`Found "${s}" in the component name. Did you mean to use the --path option (e.g. \`nx g c ${suggestion}/${name} \`)?`);
         }
     });
 }

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

@@ -1,14 +1,11 @@
-import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-
 /**
  * Same as the @nx/react library schema, except it removes keys: style, routing, globalCss
  */
 export interface Schema {
-  name: string;
+  path: string;
+  name?: string;
   skipTests?: boolean;
-  directory?: string;
   export?: boolean;
   classComponent?: boolean;
   js?: boolean;
-  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/component/schema.json

@@ -7,22 +7,27 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/react-native:component my-component --directory=mylib/src/lib/my-component",
+      "command": "nx g @nx/react-native:component mylib/src/lib/my-component/my-component ",
       "description": "Generate a component in the `mylib` library"
     },
     {
-      "command": "nx g @nx/react-native:component my-component --directory=mylib/src/lib/my-component --classComponent",
+      "command": "nx g @nx/react-native:component mylib/src/lib/my-component/my-component --classComponent",
       "description": "Generate a class component in the `mylib` library"
     }
   ],
   "properties": {
-    "name": {
+    "path": {
       "type": "string",
-      "description": "The name of the component.",
+      "description": "The path at which to create the component file.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
+      "x-prompt": "What path would you like to use for the component?"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the component.",
       "x-prompt": "What name would you like to use for the component?"
     },
     "js": {
@@ -35,16 +40,6 @@
       "description": "When true, does not create `spec.ts` test files for the new component.",
       "default": false
     },
-    "directory": {
-      "type": "string",
-      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the project root.",
-      "x-priority": "important"
-    },
-    "nameAndDirectoryFormat": {
-      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
-      "type": "string",
-      "enum": ["as-provided", "derived"]
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project `index.ts` (if it exists).",
@@ -59,5 +54,5 @@
       "default": false
     }
   },
-  "required": ["name"]
+  "required": ["path"]
 }

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

@@ -4,12 +4,12 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
         importPath: options.importPath,
-        projectNameAndRootFormat: options.projectNameAndRootFormat,
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

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

@@ -1,13 +1,11 @@
-import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter, LinterType } from '@nx/eslint';
 
 /**
  * Same as the @nx/react library schema, except it removes keys: style, component, routing, appProject
  */
 export interface Schema {
-  name: string;
-  directory?: string;
-  projectNameAndRootFormat?: ProjectNameAndRootFormat;
+  directory: string;
+  name?: string;
   skipTsConfig: boolean;
   skipFormat: boolean;
   tags?: string;

package/src/generators/library/schema.json

@@ -12,27 +12,22 @@
     }
   ],
   "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"]
-    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
@@ -97,5 +92,5 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name"]
+  "required": ["directory"]
 }

package/src/utils/testing-generators.js

@@ -11,10 +11,9 @@ async function createApp(tree, appName) {
         skipFormat: true,
         style: 'css',
         unitTestRunner: 'none',
-        name: appName,
+        directory: appName,
         e2eTestRunner: 'none',
         install: false,
-        projectNameAndRootFormat: 'as-provided',
         bundler: 'webpack',
     });
 }