chore: cleanup schematics (#12266)

Author: devversion

src/lib/schematics/address-form/index.ts

@@ -1,4 +1,12 @@
-import {chain, Rule, noop, Tree, SchematicContext} from '@angular-devkit/schematics';
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {chain, Rule, noop, Tree} from '@angular-devkit/schematics';
 import {Schema} from './schema';
 import {addModuleImportToModule, findModuleFromOptions} from '../utils/ast';
 import {buildComponent} from '../utils/devkit-utils/component';

src/lib/schematics/address-form/schema.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {Schema as ComponentSchema} from '@schematics/angular/component/schema';
 
 export interface Schema extends ComponentSchema {}

src/lib/schematics/dashboard/index_spec.ts renamed to src/lib/schematics/dashboard/index.spec.ts

@@ -1,6 +1,5 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {join} from 'path';
-import {Tree} from '@angular-devkit/schematics';
 import {createTestApp} from '../utils/testing';
 import {getFileContent} from '@schematics/angular/utility/test';
 

src/lib/schematics/dashboard/index.ts

@@ -1,4 +1,12 @@
-import {chain, Rule, noop, Tree, SchematicContext} from '@angular-devkit/schematics';
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {chain, Rule, noop, Tree} from '@angular-devkit/schematics';
 import {Schema} from './schema';
 import {addModuleImportToModule, findModuleFromOptions} from '../utils/ast';
 import {buildComponent} from '../utils/devkit-utils/component';

src/lib/schematics/dashboard/schema.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {Schema as ComponentSchema} from '@schematics/angular/component/schema';
 
 export interface Schema extends ComponentSchema {}

src/lib/schematics/install/custom-theme.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {Project} from '../utils/devkit-utils/config';
 
 /** Create custom theme for the given application configuration. */

src/lib/schematics/install/index_spec.ts renamed to src/lib/schematics/install/index.spec.ts

@@ -57,8 +57,8 @@ describe('material-shell-schematic', () => {
     const config: any = getConfig(tree);
     const workspace = getWorkspace(tree);
     const project = getProjectFromWorkspace(workspace, config.project.name);
-  
-    const indexPath = getIndexHtmlPath(tree, project);
+
+    const indexPath = getIndexHtmlPath(project);
     const buffer: any = tree.read(indexPath);
     const indexSrc = buffer.toString();
     expect(indexSrc.indexOf('fonts.googleapis.com')).toBeGreaterThan(-1);

src/lib/schematics/install/index.ts

@@ -1,4 +1,19 @@
-import {chain, noop, Rule, Tree, SchematicContext, SchematicsException} from '@angular-devkit/schematics';
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {
+  chain,
+  noop,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  Tree,
+} from '@angular-devkit/schematics';
 import {NodePackageInstallTask} from '@angular-devkit/schematics/tasks';
 import {addModuleImportToRootModule, getStylesPath} from '../utils/ast';
 import {InsertChange} from '../utils/devkit-utils/change';
@@ -10,7 +25,6 @@ import {Schema} from './schema';
 import {addThemeToAppStyles} from './theming';
 import * as parse5 from 'parse5';
 
-
 /**
  * Scaffolds the basics of a Angular Material application, this includes:
  *  - Add Packages to package.json
@@ -19,7 +33,8 @@ import * as parse5 from 'parse5';
  */
 export default function(options: Schema): Rule {
   if (!parse5) {
-    throw new SchematicsException('parse5 depedency not found! Please install parse5 from npm to continue.');
+    throw new SchematicsException('Parse5 is required but could not be found! Please install ' +
+      '"parse5" manually in order to continue.');
   }
 
   return chain([
@@ -80,7 +95,7 @@ function addBodyMarginToStyles(options: Schema) {
     const workspace = getWorkspace(host);
     const project = getProjectFromWorkspace(workspace, options.project);
 
-    const stylesPath = getStylesPath(host, project);
+    const stylesPath = getStylesPath(project);
 
     const buffer = host.read(stylesPath);
     if (buffer) {

src/lib/schematics/install/schema.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+
 export interface Schema {
   /** Whether to skip package.json install. */
   skipPackageJson: boolean;

src/lib/schematics/install/theming.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {SchematicsException, Tree} from '@angular-devkit/schematics';
 import {getStylesPath} from '../utils/ast';
 import {InsertChange} from '../utils/devkit-utils/change';
@@ -34,7 +42,7 @@ export function addThemeToAppStyles(options: Schema): (host: Tree) => Tree {
 
 /** Insert a custom theme to styles.scss file. */
 function insertCustomTheme(project: Project, host: Tree) {
-  const stylesPath = getStylesPath(host, project);
+  const stylesPath = getStylesPath(project);
 
   const buffer = host.read(stylesPath);
   if (buffer) {

src/lib/schematics/nav/index_spec.ts renamed to src/lib/schematics/nav/index.spec.ts

@@ -1,6 +1,5 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {join} from 'path';
-import {Tree} from '@angular-devkit/schematics';
 import {createTestApp} from '../utils/testing';
 import {getFileContent} from '@schematics/angular/utility/test';
 

src/lib/schematics/nav/index.ts

@@ -1,4 +1,12 @@
-import {chain, Rule, noop, Tree, SchematicContext} from '@angular-devkit/schematics';
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {chain, Rule, noop, Tree} from '@angular-devkit/schematics';
 import {Schema} from './schema';
 import {addModuleImportToModule, findModuleFromOptions} from '../utils/ast';
 import {buildComponent} from '../utils/devkit-utils/component';

src/lib/schematics/nav/schema.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {Schema as ComponentSchema} from '@schematics/angular/component/schema';
 
 export interface Schema extends ComponentSchema {}

src/lib/schematics/table/index_spec.ts renamed to src/lib/schematics/table/index.spec.ts

@@ -1,6 +1,5 @@
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
 import {join} from 'path';
-import {Tree} from '@angular-devkit/schematics';
 import {createTestApp} from '../utils/testing';
 import {getFileContent} from '@schematics/angular/utility/test';
 

src/lib/schematics/table/index.ts

@@ -1,4 +1,12 @@
-import {chain, Rule, noop, Tree, SchematicContext} from '@angular-devkit/schematics';
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {chain, Rule, noop, Tree} from '@angular-devkit/schematics';
 import {Schema} from './schema';
 import {addModuleImportToModule, findModuleFromOptions} from '../utils/ast';
 import {buildComponent} from '../utils/devkit-utils/component';

src/lib/schematics/table/schema.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {Schema as ComponentSchema} from '@schematics/angular/component/schema';
 
 export interface Schema extends ComponentSchema {}

src/lib/schematics/tree/index.ts

@@ -1,7 +1,15 @@
-import {chain, Rule, noop, Tree, SchematicContext} from '@angular-devkit/schematics';
-import {Schema} from './schema';
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {chain, noop, Rule, Tree} from '@angular-devkit/schematics';
 import {addModuleImportToModule, findModuleFromOptions} from '../utils/ast';
 import {buildComponent} from '../utils/devkit-utils/component';
+import {Schema} from './schema';
 
 /**
  * Scaffolds a new tree component.

src/lib/schematics/tree/schema.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {Schema as ComponentSchema} from '@schematics/angular/component/schema';
 
 export interface Schema extends ComponentSchema {}

src/lib/schematics/update/material/color.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {bold, green, red} from 'chalk';
 
 const colorFns = {
@@ -8,7 +16,7 @@ const colorFns = {
 
 export function color(message: string): string {
   // 'r{{text}}' with red 'text', 'g{{text}}' with green 'text', and 'b{{text}}' with bold 'text'.
-  return message.replace(/(.)\{\{(.*?)\}\}/g, (m, fnName, text) => {
+  return message.replace(/(.)\{\{(.*?)\}\}/g, (_m, fnName, text) => {
     const fn = colorFns[fnName];
     return fn ? fn(text) : text;
   });

src/lib/schematics/update/material/component-data.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+
 export interface MaterialExportAsNameData {
   /** The exportAs name to replace. */
   replace: string;
@@ -25,7 +33,7 @@ export interface MaterialCssNameData {
     html?: boolean,
     /** Replace this name in TypeScript strings. */
     strings?: boolean
-  }
+  };
 }
 
 export interface MaterialAttributeSelectorData {
@@ -44,7 +52,7 @@ export interface MaterialPropertyNameData {
   whitelist: {
     /** Replace the property only when its type is one of the given Classes. */
     classes?: string[];
-  }
+  };
 }
 
 export interface MaterialClassNameData {
@@ -67,7 +75,7 @@ export interface MaterialInputNameData {
     attributes?: string[],
     /** Whether to ignore CSS attribute selectors when doing this replacement. */
     css?: boolean,
-  }
+  };
 }
 
 export interface MaterialOutputNameData {
@@ -83,7 +91,7 @@ export interface MaterialOutputNameData {
     attributes?: string[],
     /** Whether to ignore CSS attribute selectors when doing this replacement. */
     css?: boolean,
-  }
+  };
 }
 
 export interface MaterialMethodCallData {
@@ -92,13 +100,13 @@ export interface MaterialMethodCallData {
   invalidArgCounts: {
     count: number,
     message: string
-  }[]
+  }[];
 }
 
 type Changes<T> = {
   pr: string;
   changes: T[]
-}
+};
 
 function getChanges<T>(allChanges: Changes<T>[]): T[] {
   return allChanges.reduce((result, changes) => result.concat(changes.changes), []);

src/lib/schematics/update/material/extra-stylsheets.ts

@@ -1 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+
 export const EXTRA_STYLESHEETS_GLOB_KEY = 'MD_EXTRA_STYLESHEETS_GLOB';

src/lib/schematics/update/material/typescript-specifiers.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 * as ts from 'typescript';
 import {getExportDeclaration, getImportDeclaration} from '../typescript/imports';
 
@@ -20,6 +28,6 @@ export function isMaterialExportDeclaration(node: ts.Node) {
 /** Whether the declaration is part of Angular Material. */
 function isMaterialDeclaration(declaration: ts.ImportDeclaration | ts.ExportDeclaration) {
   const moduleSpecifier = declaration.moduleSpecifier.getText();
-  return moduleSpecifier.indexOf(materialModuleSpecifier) !== -1||
+  return moduleSpecifier.indexOf(materialModuleSpecifier) !== -1 ||
       moduleSpecifier.indexOf(cdkModuleSpecifier) !== -1;
 }

src/lib/schematics/update/rules/checkClassDeclarationMiscRule.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 {bold, green} from 'chalk';
 import {ProgramAwareRuleWalker, RuleFailure, Rules} from 'tslint';
 import * as ts from 'typescript';
@@ -27,7 +35,7 @@ export class CheckClassDeclarationMiscWalker extends ProgramAwareRuleWalker {
                 `Found class "${bold(declaration.name.text)}" which extends` +
                 ` "${bold('MatFormFieldControl')}". This class must define` +
                 ` "${green('shouldLabelFloat')}" which is now a required property.`
-            )
+            );
           }
         }
       });