refactor(@schematics/angular): update service to use new workspace rules

Author: clydin

packages/schematics/angular/service/index.ts

@@ -8,7 +8,6 @@
 import { strings } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicsException,
   Tree,
   apply,
   applyTemplates,
@@ -21,18 +20,13 @@ import {
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as ServiceOptions } from './schema';
 
 export default function (options: ServiceOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     const parsedPath = parseName(options.path, options.name);

packages/schematics/angular/service/index_spec.ts

@@ -41,37 +41,41 @@ describe('Service Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should create a service', () => {
+  it('should create a service', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('service', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
   });
 
-  it('service should be tree-shakeable', () => {
+  it('service should be tree-shakeable', async () => {
     const options = { ...defaultOptions};
 
-    const tree = schematicRunner.runSchematic('service', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.service.ts');
     expect(content).toMatch(/providedIn: 'root'/);
   });
 
-  it('should respect the skipTests flag', () => {
+  it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = schematicRunner.runSchematic('service', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
     expect(files).not.toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('service', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('service', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.service.ts');
   });
 });