fix(@schematics/angular): Remove module option from service schematic

fixes angular/angular-cli#10170

Author: Brocco

packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts

@@ -1,8 +1,7 @@
-import { Injectable } from '@angular/core';<% if (providedIn) { %>
-import { <%= providedIn %> } from '<%= providedInPath %>';<% } %>
+import { Injectable } from '@angular/core';
 
 @Injectable({
-  providedIn: <%= providedIn || "'root'" %>
+  providedIn: 'root'
 })
 export class <%= classify(name) %>Service {
 

packages/schematics/angular/service/index.ts

@@ -5,11 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, strings } from '@angular-devkit/core';
+import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
-  SchematicsException,
   Tree,
   apply,
   filter,
@@ -19,41 +18,12 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-import { getFirstNgModuleName } from '../utility/ast-utils';
 import { getWorkspace } from '../utility/config';
-import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { parseName } from '../utility/parse-name';
 import { Schema as ServiceOptions } from './schema';
 
-function getModuleNameFromPath(host: Tree, modulePath: Path) {
-  if (!host.exists(modulePath)) {
-    throw new SchematicsException(`File ${modulePath} does not exist.`);
-  }
-
-  const text = host.read(modulePath);
-  if (text === null) {
-    throw new SchematicsException(`File ${modulePath} cannot be read.`);
-  }
-  const sourceText = text.toString('utf-8');
-  const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-
-  return getFirstNgModuleName(source);
-}
-
-function stripTsExtension(path: string): string {
-  if (!path.endsWith('.ts')) {
-    throw new SchematicsException(`File ${path} is not a Typescript file.`);
-  }
-
-  return path.substr(0, path.length - 3);
-}
-
 export default function (options: ServiceOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
-    let providedByModule = '';
-    let providedInPath = '';
-
     const workspace = getWorkspace(host);
     if (!options.project) {
       options.project = Object.keys(workspace.projects)[0];
@@ -64,25 +34,6 @@ export default function (options: ServiceOptions): Rule {
       options.path = `/${project.root}/src/app`;
     }
 
-    if (options.module) {
-      const modulePath = findModuleFromOptions(host, options);
-      if (!modulePath || !host.exists(modulePath)) {
-        throw new Error('Specified module does not exist');
-      }
-      providedByModule = getModuleNameFromPath(host, modulePath) || '';
-
-      if (!providedByModule) {
-        throw new SchematicsException(`module option did not point to an @NgModule.`);
-      }
-
-      const servicePath = `/${options.path}/`
-        + (options.flat ? '' : strings.dasherize(options.name) + '/')
-        + strings.dasherize(options.name)
-        + '.service';
-
-      providedInPath = stripTsExtension(buildRelativePath(servicePath, modulePath));
-    }
-
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
@@ -93,8 +44,6 @@ export default function (options: ServiceOptions): Rule {
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
-        providedIn: providedByModule,
-        providedInPath: providedInPath,
       }),
       move(parsedPath.path),
     ]);

packages/schematics/angular/service/index_spec.ts

@@ -20,7 +20,6 @@ describe('Service Schematic', () => {
   const defaultOptions: ServiceOptions = {
     name: 'foo',
     spec: true,
-    module: undefined,
     flat: false,
   };
 
@@ -62,26 +61,6 @@ describe('Service Schematic', () => {
     expect(content).toMatch(/providedIn: 'root'/);
   });
 
-  it('should import a specified module', () => {
-    const options = { ...defaultOptions, module: 'app.module.ts' };
-
-    const tree = schematicRunner.runSchematic('service', options, appTree);
-    const content = tree.readContent('/projects/bar/src/app/foo/foo.service.ts');
-    expect(content).toMatch(/import { AppModule } from '..\/app.module'/);
-    expect(content).toMatch(/providedIn: AppModule/);
-  });
-
-  it('should fail if specified module does not exist', () => {
-    const options = { ...defaultOptions, module: '/projects/bar/src/app/app.moduleXXX.ts' };
-    let thrownError: Error | null = null;
-    try {
-      schematicRunner.runSchematic('service', options, appTree);
-    } catch (err) {
-      thrownError = err;
-    }
-    expect(thrownError).toBeDefined();
-  });
-
   it('should respect the spec flag', () => {
     const options = { ...defaultOptions, spec: false };
 

packages/schematics/angular/service/schema.d.ts

@@ -27,8 +27,4 @@ export interface Schema {
      * Specifies if a spec file is generated.
      */
     spec?: boolean;
-    /**
-     * Allows specification of the providing module.
-     */
-    module?: string;
 }

packages/schematics/angular/service/schema.json

@@ -32,12 +32,6 @@
       "type": "boolean",
       "default": true,
       "description": "Specifies if a spec file is generated."
-    },
-    "module": {
-      "type": "string",
-      "default": "",
-      "description": "Allows specification of the providing module.",
-      "alias": "m"
     }
   },
   "required": []