fix(@schematics/angular): Allow for scoped library names

fixes angular/angular-cli#10172

Author: Brocco

packages/schematics/angular/library/files/__projectRoot__/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "<%= dasherize(name) %>",
+  "name": "<%= packageName %>",
   "version": "0.0.1",
   "peerDependencies": {
     "@angular/common": "^6.0.0-rc.0 || ^6.0.0",

packages/schematics/angular/library/index.ts

@@ -171,17 +171,28 @@ export default function (options: LibraryOptions): Rule {
     if (!options.name) {
       throw new SchematicsException(`Invalid options, "name" is required.`);
     }
-    const name = options.name;
+    // If scoped project (i.e. "@foo/bar"), convert projectDir to "foo-bar".
+    const packageName = options.name;
+    let scopeName = '';
+    if (/@[\S]*\/[\S]*/.test(options.name)) {
+      const [scope, name] = options.name.split('/');
+      scopeName = scope.replace('@', '');
+      options.name = name;
+    }
 
     const workspace = getWorkspace(host);
     const newProjectRoot = workspace.newProjectRoot;
-    const projectRoot = `${newProjectRoot}/${options.name}`;
+    let projectRoot = `${newProjectRoot}/${options.name}`;
+    if (scopeName) {
+      projectRoot = `${newProjectRoot}/${scopeName}/${options.name}`;
+    }
     const sourceDir = `${projectRoot}/src/lib`;
 
     const templateSource = apply(url('./files'), [
       template({
         ...strings,
         ...options,
+        packageName,
         projectRoot,
       }),
       // TODO: Moving inside `branchAndMerge` should work but is bugged right now.
@@ -193,27 +204,27 @@ export default function (options: LibraryOptions): Rule {
       branchAndMerge(mergeWith(templateSource)),
       addAppToWorkspaceFile(options, workspace),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
-      options.skipTsConfig ? noop() : updateTsConfig(name),
+      options.skipTsConfig ? noop() : updateTsConfig(options.name),
       schematic('module', {
-        name: name,
+        name: options.name,
         commonModule: false,
         flat: true,
         path: sourceDir,
         spec: false,
       }),
       schematic('component', {
-        name: name,
+        name: options.name,
         inlineStyle: true,
         inlineTemplate: true,
         flat: true,
         path: sourceDir,
         export: true,
       }),
       schematic('service', {
-        name: name,
+        name: options.name,
         flat: true,
         path: sourceDir,
-        module: `${name}.module.ts`,
+        module: `${options.name}.module.ts`,
       }),
     ])(host, context);
   };

packages/schematics/angular/library/index_spec.ts

@@ -166,4 +166,21 @@ describe('Library Schematic', () => {
       expect(tsConfigJson.compilerOptions.paths).toBeUndefined();
     });
   });
+
+  it(`should support creating scoped libraries`, () => {
+    const scopedName = '@myscope/mylib';
+    const options = { ...defaultOptions, name: scopedName };
+    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+
+    const pkgJsonPath = '/projects/myscope/mylib/package.json';
+    expect(tree.files).toContain(pkgJsonPath);
+    expect(tree.files).toContain('/projects/myscope/mylib/src/lib/mylib.module.ts');
+    expect(tree.files).toContain('/projects/myscope/mylib/src/lib/mylib.component.ts');
+
+    const pkgJson = JSON.parse(tree.readContent(pkgJsonPath));
+    expect(pkgJson.name).toEqual(scopedName);
+
+    const tsConfigJson = JSON.parse(tree.readContent('/projects/myscope/mylib/tsconfig.spec.json'));
+    expect(tsConfigJson.extends).toEqual('../../../tsconfig.json');
+  });
 });