fix(@schematics/angular): Fix generation within a library project

fixes #10344

Author: Brocco

packages/schematics/angular/class/index.ts

@@ -32,7 +32,8 @@ export default function (options: ClassOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     options.type = !!options.type ? `.${options.type}` : '';

packages/schematics/angular/component/index.ts

@@ -113,7 +113,8 @@ export default function(options: ComponentOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     options.module = findModuleFromOptions(host, options);

packages/schematics/angular/directive/index.ts

@@ -110,7 +110,8 @@ export default function (options: DirectiveOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     options.module = findModuleFromOptions(host, options);

packages/schematics/angular/enum/index.ts

@@ -32,7 +32,8 @@ export default function (options: EnumOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     const parsedPath = parseName(options.path, options.name);

packages/schematics/angular/guard/index.ts

@@ -74,7 +74,8 @@ export default function (options: GuardOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     if (options.module) {

packages/schematics/angular/interface/index.ts

@@ -32,7 +32,8 @@ export default function (options: InterfaceOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     const parsedPath = parseName(options.path, options.name);

packages/schematics/angular/library/index_spec.ts

@@ -8,6 +8,7 @@
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
 import { getFileContent } from '../../angular/utility/test';
+import { Schema as ComponentOptions } from '../component/schema';
 import { latestVersions } from '../utility/latest-versions';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as GenerateLibrarySchema } from './schema';
@@ -203,4 +204,14 @@ describe('Library Schematic', () => {
       expect(tsConfigJson.compilerOptions.paths).toBeUndefined();
     });
   });
+
+  it('should generate inside of a library', () => {
+    let tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    const componentOptions: ComponentOptions = {
+      name: 'comp',
+      project: 'foo',
+    };
+    tree = schematicRunner.runSchematic('component', componentOptions, tree);
+    expect(tree.exists('/projects/foo/src/lib/comp/comp.component.ts')).toBe(true);
+  });
 });

packages/schematics/angular/module/index.ts

@@ -79,7 +79,8 @@ export default function (options: ModuleOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
     if (options.module) {
       options.module = findModuleFromOptions(host, options);

packages/schematics/angular/pipe/index.ts

@@ -94,7 +94,8 @@ export default function (options: PipeOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     const parsedPath = parseName(options.path, options.name);

packages/schematics/angular/service/index.ts

@@ -31,7 +31,8 @@ export default function (options: ServiceOptions): Rule {
     const project = workspace.projects[options.project];
 
     if (options.path === undefined) {
-      options.path = `/${project.root}/src/app`;
+      const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+      options.path = `/${project.root}/src/${projectDirName}`;
     }
 
     const parsedPath = parseName(options.path, options.name);