refactor(@schematics/angular): minor cleanup of unneeded @angular-devkit/core imports

Several imported types and values from `@angular-devkit/core` could be removed while still
maintaining the same functionality. This further reduces the schematics direct dependence
on the `@angular-devkit/core` package.

Author: clydin

packages/schematics/angular/utility/find-module_spec.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Path } from '@angular-devkit/core';
 import { EmptyTree, Tree } from '@angular-devkit/schematics';
 import { ModuleOptions, buildRelativePath, findModule, findModuleFromOptions } from './find-module';
 
@@ -107,51 +106,51 @@ describe('find-module', () => {
       tree.create('/projects/my-proj/src/app.module.ts', '');
       options.module = 'app.module.ts';
       options.path = '/projects/my-proj/src';
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/app.module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/app.module.ts');
     });
 
     it('should find a module when name has underscore', () => {
       tree.create('/projects/my-proj/src/feature_module/app_test.module.ts', '');
       options.path = '/projects/my-proj/src';
       options.name = 'feature_module/new_component';
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/feature_module/app_test.module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/feature_module/app_test.module.ts');
     });
 
     it('should find a module when name has uppercase', () => {
       tree.create('/projects/my-proj/src/featureModule/appTest.module.ts', '');
       options.path = '/projects/my-proj/src';
       options.name = 'featureModule/newComponent';
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/featureModule/appTest.module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/featureModule/appTest.module.ts');
     });
 
     it('should find a module if flat is true', () => {
       tree.create('/projects/my-proj/src/module/app_test.module.ts', '');
       options.path = '/projects/my-proj/src';
       options.flat = true;
       options.name = '/module/directive';
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/module/app_test.module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/module/app_test.module.ts');
     });
 
     it('should find a module in a sub dir', () => {
       tree.create('/projects/my-proj/src/admin/foo.module.ts', '');
       options.name = 'other/test';
       options.module = 'admin/foo';
       options.path = '/projects/my-proj/src';
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts');
     });
 
     it('should find a module in a sub dir (2)', () => {
       tree.create('/projects/my-proj/src/admin/foo.module.ts', '');
       options.name = 'admin/hello';
       options.module = 'foo';
       options.path = '/projects/my-proj/src';
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts');
     });
 
     it('should find a module using custom ext', () => {
@@ -160,16 +159,16 @@ describe('find-module', () => {
       options.path = '/projects/my-proj/src';
       options.moduleExt = '_module.ts';
       // Should find module using custom moduleExt
-      const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toBe('/projects/my-proj/src/app_module.ts' as Path);
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toBe('/projects/my-proj/src/app_module.ts');
       // Should not find module if using invalid ext
       options.moduleExt = '-module.ts';
-      expect(() => findModuleFromOptions(tree, options)).toThrowError(
+      expect(() => findModuleFromOptions(tree, options) as string).toThrowError(
         /Specified module 'app' does not exist/,
       );
       // Should not find module if using default ext
       options.moduleExt = undefined; // use default ext
-      expect(() => findModuleFromOptions(tree, options)).toThrowError(
+      expect(() => findModuleFromOptions(tree, options) as string).toThrowError(
         /Specified module 'app' does not exist/,
       );
     });
@@ -182,13 +181,13 @@ describe('find-module', () => {
 
       // moduleExt ignored because exact path is found
       options.module = 'app.module.ts';
-      modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toBe('/projects/my-proj/src/app.module.ts' as Path);
+      modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toBe('/projects/my-proj/src/app.module.ts');
 
       // moduleExt ignored because module + .ts is found
       options.module = 'app.module';
-      modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toBe('/projects/my-proj/src/app.module.ts' as Path);
+      modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toBe('/projects/my-proj/src/app.module.ts');
     });
   });
 

packages/schematics/angular/utility/parse-name.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// import { relative, Path } from "../../../angular_devkit/core/src/virtual-fs";
 import { Path, basename, dirname, join, normalize } from '@angular-devkit/core';
 
 export interface Location {

packages/schematics/angular/utility/validation.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { tags } from '@angular-devkit/core';
 import { SchematicsException } from '@angular-devkit/schematics';
 
 // Must start with a letter, and must contain only alphanumeric characters or dashes.
@@ -15,7 +14,6 @@ export const htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*
 
 export function validateHtmlSelector(selector: string): void {
   if (selector && !htmlSelectorRe.test(selector)) {
-    throw new SchematicsException(tags.oneLine`Selector (${selector})
-        is invalid.`);
+    throw new SchematicsException(`Selector (${selector}) is invalid.`);
   }
 }