fix(misc): ensure provided import path has precedence over scoped pro…

…ject name
nrwl · Aug 10, 2023 · 5bf6493 · 5bf6493
1 parent 1478d60
commit 5bf6493
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/packages/devkit/src/generators/project-name-directory-utils.spec.ts b/packages/devkit/src/generators/project-name-directory-utils.spec.ts
@@ -72,6 +72,26 @@ describe('determineProjectNamesAndDirectories', () => {
       });
     });
 
+    it('should use provided import path over scoped name when format is "as-provided"', async () => {
+      const result = await determineProjectNamesAndDirectories(tree, {
+        name: '@scope/libName',
+        directory: 'shared',
+        projectType: 'library',
+        nameDirectoryFormat: 'as-provided',
+        importPath: '@custom-scope/lib-name',
+      });
+
+      expect(result).toEqual({
+        projectName: '@scope/lib-name',
+        names: {
+          projectSimpleName: 'lib-name',
+          projectFileName: 'lib-name',
+        },
+        importPath: '@custom-scope/lib-name',
+        projectDirectory: 'shared',
+      });
+    });
+
     it('should return the directory as the project name when directory is not provided and format is "as-provided"', async () => {
       updateJson(tree, 'package.json', (json) => {
         json.name = 'lib-name';
@@ -322,6 +342,26 @@ describe('determineProjectNamesAndDirectories', () => {
       });
     });
 
+    it('should use provided import path over scoped name when format is "as-provided"', async () => {
+      const result = await determineProjectNamesAndDirectories(tree, {
+        name: '@scope/libName',
+        directory: 'shared',
+        projectType: 'library',
+        nameDirectoryFormat: 'as-provided',
+        importPath: '@custom-scope/lib-name',
+      });
+
+      expect(result).toEqual({
+        projectName: '@scope/lib-name',
+        names: {
+          projectSimpleName: 'lib-name',
+          projectFileName: 'lib-name',
+        },
+        importPath: '@custom-scope/lib-name',
+        projectDirectory: 'shared',
+      });
+    });
+
     it('should return the directory as the project name when directory is not provided and format is "as-provided"', async () => {
       updateJson(tree, 'package.json', (json) => {
         json.name = 'lib-name';

diff --git a/packages/devkit/src/generators/project-name-directory-utils.ts b/packages/devkit/src/generators/project-name-directory-utils.ts
@@ -156,7 +156,7 @@ function getProjectNameDirectoryFormats(
             projectSimpleName: nameWithoutScope,
             projectFileName: nameWithoutScope,
           },
-          importPath: asProvidedProjectName,
+          importPath: options.importPath ?? asProvidedProjectName,
           projectDirectory: asProvidedProjectDirectory,
         },
       },