@nx/expo 17.0.0-beta.6 → 17.0.0-beta.8

package/generators.json

@@ -24,7 +24,7 @@
       "description": "Create a library"
     },
     "component": {
-      "factory": "./src/generators/component/component#expoComponentGenerator",
+      "factory": "./src/generators/component/component#expoComponentGeneratorInternal",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a component",
       "aliases": ["c"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "17.0.0-beta.6",
+  "version": "17.0.0-beta.8",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -34,14 +34,14 @@
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/detox": "17.0.0-beta.6",
-    "@nx/devkit": "17.0.0-beta.6",
-    "@nx/jest": "17.0.0-beta.6",
-    "@nx/js": "17.0.0-beta.6",
-    "@nx/linter": "17.0.0-beta.6",
-    "@nx/react": "17.0.0-beta.6",
-    "@nx/webpack": "17.0.0-beta.6",
-    "@nrwl/expo": "17.0.0-beta.6"
+    "@nx/detox": "17.0.0-beta.8",
+    "@nx/devkit": "17.0.0-beta.8",
+    "@nx/jest": "17.0.0-beta.8",
+    "@nx/js": "17.0.0-beta.8",
+    "@nx/eslint": "17.0.0-beta.8",
+    "@nx/react": "17.0.0-beta.8",
+    "@nx/webpack": "17.0.0-beta.8",
+    "@nrwl/expo": "17.0.0-beta.8"
   },
   "peerDependencies": {
     "expo": ">= 49.0.0",

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDetox = void 0;
 const detox_1 = require("@nx/detox");
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 async function addDetox(host, options) {
     if (options?.e2eTestRunner !== 'detox') {
         return () => { };
     }
     return (0, detox_1.detoxApplicationGenerator)(host, {
         ...options,
-        linter: linter_1.Linter.EsLint,
+        linter: eslint_1.Linter.EsLint,
         e2eName: `${options.projectName}-e2e`,
         e2eDirectory: `${options.appProjectRoot}-e2e`,
         projectNameAndRootFormat: 'as-provided',

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

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 export interface Schema {
   name: string;

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

@@ -1,4 +1,5 @@
 import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function expoComponentGenerator(host: Tree, schema: Schema): Promise<void>;
+export declare function expoComponentGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
 export default expoComponentGenerator;

package/src/generators/component/component.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expoComponentGenerator = void 0;
+exports.expoComponentGeneratorInternal = exports.expoComponentGenerator = void 0;
 const ts = require("typescript");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const path_1 = require("path");
 async function expoComponentGenerator(host, schema) {
+    return expoComponentGeneratorInternal(host, {
+        nameAndDirectoryFormat: 'derived',
+        ...schema,
+    });
+}
+exports.expoComponentGenerator = expoComponentGenerator;
+async function expoComponentGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     addExportsToBarrel(host, options);
@@ -14,10 +21,9 @@ async function expoComponentGenerator(host, schema) {
         await (0, devkit_1.formatFiles)(host);
     }
 }
-exports.expoComponentGenerator = expoComponentGenerator;
+exports.expoComponentGeneratorInternal = expoComponentGeneratorInternal;
 function createComponentFiles(host, options) {
-    const componentDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), componentDir, {
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.directory, {
         ...options,
         tmpl: '',
     });
@@ -42,9 +48,15 @@ function addExportsToBarrel(host, options) {
         const indexSource = host.read(indexFilePath, 'utf-8');
         if (indexSource !== null) {
             const indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
-            const changes = (0, devkit_1.applyChangesToString)(indexSource, (0, add_import_1.addImport)(indexSourceFile, `export * from './${options.directory}/${options.fileName}';`));
+            const relativePathFromIndex = getRelativeImportToFile(indexFilePath, options.filePath);
+            const changes = (0, devkit_1.applyChangesToString)(indexSource, (0, add_import_1.addImport)(indexSourceFile, `export * from '${relativePathFromIndex}';`));
             host.write(indexFilePath, changes);
         }
     }
 }
+function getRelativeImportToFile(indexPath, filePath) {
+    const { name, dir } = (0, path_1.parse)(filePath);
+    const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(indexPath), dir);
+    return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, name)}`;
+}
 exports.default = expoComponentGenerator;

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

@@ -4,5 +4,6 @@ export interface NormalizedSchema extends Schema {
     projectSourceRoot: string;
     fileName: string;
     className: string;
+    filePath: string;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -2,17 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 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 { className, fileName } = (0, devkit_1.names)(options.name);
-    const componentFileName = options.pascalCaseFiles ? className : fileName;
-    const project = (0, devkit_1.getProjects)(host).get(options.project);
-    if (!project) {
-        devkit_1.logger.error(`Cannot find the ${options.project} project. Please double check the project name.`);
-        throw new Error();
-    }
+    const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+        artifactType: 'component',
+        callingGenerator: '@nx/expo:component',
+        name: options.name,
+        directory: options.directory,
+        derivedDirectory: options.directory,
+        flat: options.flat,
+        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        project: options.project,
+        fileExtension: 'tsx',
+        pascalCaseFile: options.pascalCaseFiles,
+    });
+    const project = (0, devkit_1.getProjects)(host).get(projectName);
+    const { className } = (0, devkit_1.names)(name);
     const { sourceRoot: projectSourceRoot, projectType } = project;
-    const directory = await getDirectory(host, options);
     if (options.export && projectType === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
@@ -21,26 +28,12 @@ async function normalizeOptions(host, options) {
         ...options,
         directory,
         className,
-        fileName: componentFileName,
+        fileName,
+        filePath,
         projectSourceRoot,
     };
 }
 exports.normalizeOptions = normalizeOptions;
-async function getDirectory(host, options) {
-    const fileName = (0, devkit_1.names)(options.name).fileName;
-    const workspace = (0, devkit_1.getProjects)(host);
-    let baseDir;
-    if (options.directory) {
-        baseDir = options.directory;
-    }
-    else {
-        baseDir =
-            workspace.get(options.project).projectType === 'application'
-                ? 'app'
-                : 'lib';
-    }
-    return options.flat ? baseDir : (0, devkit_1.joinPathFragments)(baseDir, fileName);
-}
 function assertValidOptions(options) {
     const slashes = ['/', '\\'];
     slashes.forEach((s) => {

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

@@ -3,13 +3,23 @@
  */
 export interface Schema {
   name: string;
+  /**
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18.
+   */
   project: string;
   directory?: string;
   skipFormat: boolean; // default is false
   skipTests: boolean; // default is false
+  /**
+   * @deprecated Provide the name in pascal-case and use the `as-provided` format. This option will be removed in Nx v18.
+   */
   export: boolean; // default is false
   pascalCaseFiles: boolean; // default is false
   classComponent: boolean; // default is false
   js: boolean; // default is false
+  /**
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18.
+   */
   flat: boolean; // default is false
+  nameAndDirectoryFormat?: 'as-provided' | 'derived';
 }

package/src/generators/component/schema.json

@@ -22,7 +22,7 @@
       "$default": {
         "$source": "projectName"
       },
-      "x-prompt": "What is the name of the project for this component?"
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
     },
     "name": {
       "type": "string",
@@ -51,13 +51,19 @@
     },
     "directory": {
       "type": "string",
-      "description": "Create the component under this directory (can be nested).",
+      "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"]
+    },
     "flat": {
       "type": "boolean",
       "description": "Create component at the source root rather than its own directory.",
-      "default": false
+      "default": false,
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "export": {
       "type": "boolean",
@@ -70,7 +76,8 @@
       "type": "boolean",
       "description": "Use pascal case component file name (e.g. App.tsx).",
       "alias": "P",
-      "default": false
+      "default": false,
+      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
     },
     "classComponent": {
       "type": "boolean",
@@ -79,5 +86,5 @@
       "default": false
     }
   },
-  "required": ["name", "project"]
+  "required": ["name"]
 }

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

@@ -1,5 +1,5 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
 
 /**
  * Same as the @nx/react library schema, except it removes keys: style, component, routing, appProject

package/src/utils/add-linting.d.ts

@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
 import { GeneratorCallback, Tree } from '@nx/devkit';
 interface NormalizedSchema {
     linter?: Linter;

package/src/utils/add-linting.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const linter_1 = require("@nx/linter");
+const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
-const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
+const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 async function addLinting(host, options) {
-    if (options.linter === linter_1.Linter.None) {
+    if (options.linter === eslint_1.Linter.None) {
         return () => { };
     }
     const tasks = [];
-    const lintTask = await (0, linter_1.lintProjectGenerator)(host, {
+    const lintTask = await (0, eslint_1.lintProjectGenerator)(host, {
         linter: options.linter,
         project: options.projectName,
         tsConfigPaths: options.tsConfigPaths,