nrwl
diff --git a/‎docs/generated/packages/js/generators/library.json
Lines changed: 8 additions & 3 deletions b/‎docs/generated/packages/js/generators/library.json
Lines changed: 8 additions & 3 deletions
diff --git a/‎e2e/js/src/js.test.ts
Lines changed: 51 additions & 0 deletions b/‎e2e/js/src/js.test.ts
Lines changed: 51 additions & 0 deletions
diff --git a/‎packages/devkit/package.json
Lines changed: 1 addition & 0 deletions b/‎packages/devkit/package.json
Lines changed: 1 addition & 0 deletions
@@ -1,6 +1,6 @@
 {
   "name": "library",
-  "factory": "./src/generators/library/library#libraryGenerator",
+  "factory": "./src/generators/library/library#libraryGeneratorInternal",
   "schema": {
     "$schema": "http://json-schema.org/schema",
     "$id": "NxTypescriptLibrary",
@@ -14,13 +14,18 @@
         "description": "Library name.",
         "$default": { "$source": "argv", "index": 0 },
         "x-prompt": "What name would you like to use for the library?",
-        "pattern": "^[a-zA-Z].*$"
+        "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
       },
       "directory": {
         "type": "string",
         "description": "A directory where the lib is placed.",
         "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",
@@ -142,7 +147,7 @@
   "aliases": ["lib"],
   "x-type": "library",
   "description": "Create a library",
-  "implementation": "/packages/js/src/generators/library/library#libraryGenerator.ts",
+  "implementation": "/packages/js/src/generators/library/library#libraryGeneratorInternal.ts",
   "hidden": false,
   "path": "/packages/js/src/generators/library/schema.json",
   "type": "generator"
 
@@ -230,4 +230,55 @@ export function ${lib}Wildcard() {
     // restore nx.json
     updateFile('nx.json', () => originalNxJson);
   });
+
+  it('should generate project with name and directory as provided when --project-name-and-root-format=as-provided', async () => {
+    const lib1 = uniq('lib1');
+    runCLI(
+      `generate @nx/js:lib ${lib1} --directory=shared --bundler=tsc --project-name-and-root-format=as-provided`
+    );
+
+    // check files are generated without the layout directory ("libs/") and
+    // in the directory provided (no project name appended)
+    checkFilesExist('shared/src/index.ts');
+    // check project name is as provided (no prefixed directory name)
+    expect(runCLI(`build ${lib1}`)).toContain(
+      'Done compiling TypeScript files'
+    );
+    // check tests pass
+    const testResult = await runCLIAsync(`test ${lib1}`);
+    expect(testResult.combinedOutput).toContain(
+      'Test Suites: 1 passed, 1 total'
+    );
+  }, 500_000);
+
+  it('should support generating with a scoped project name when --project-name-and-root-format=as-provided', async () => {
+    const scopedLib = uniq('@my-org/lib1');
+
+    // assert scoped project names are not supported when --project-name-and-root-format=derived
+    expect(() =>
+      runCLI(
+        `generate @nx/js:lib ${scopedLib} --bundler=tsc --project-name-and-root-format=derived`
+      )
+    ).toThrow();
+
+    runCLI(
+      `generate @nx/js:lib ${scopedLib} --bundler=tsc --project-name-and-root-format=as-provided`
+    );
+
+    // check files are generated without the layout directory ("libs/") and
+    // using the project name as the directory when no directory is provided
+    checkFilesExist(
+      `${scopedLib}/src/index.ts`,
+      `${scopedLib}/src/lib/${scopedLib.split('/')[1]}.ts`
+    );
+    // check build works
+    expect(runCLI(`build ${scopedLib}`)).toContain(
+      'Done compiling TypeScript files'
+    );
+    // check tests pass
+    const testResult = await runCLIAsync(`test ${scopedLib}`);
+    expect(testResult.combinedOutput).toContain(
+      'Test Suites: 1 passed, 1 total'
+    );
+  }, 500_000);
 });
@@ -29,6 +29,7 @@
   "homepage": "https://nx.dev",
   "dependencies": {
     "ejs": "^3.1.7",
+    "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",