angular · jelbourn · Sep 6, 2018 · Sep 5, 2018 · Sep 6, 2018 · Sep 6, 2018
diff --git a/src/lib/schematics/address-form/index.ts b/src/lib/schematics/address-form/index.ts
@@ -30,7 +30,7 @@ export default function(options: Schema): Rule {
  */
 function addFormModulesToModule(options: Schema) {
   return (host: Tree) => {
-    const modulePath = findModuleFromOptions(host, options);
+    const modulePath = findModuleFromOptions(host, options)!;
     addModuleImportToModule(host, modulePath, 'MatInputModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatSelectModule', '@angular/material');

diff --git a/src/lib/schematics/dashboard/index.ts b/src/lib/schematics/dashboard/index.ts
@@ -30,7 +30,7 @@ export default function(options: Schema): Rule {
  */
 function addNavModulesToModule(options: Schema) {
   return (host: Tree) => {
-    const modulePath = findModuleFromOptions(host, options);
+    const modulePath = findModuleFromOptions(host, options)!;
     addModuleImportToModule(host, modulePath, 'MatGridListModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatCardModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatMenuModule', '@angular/material');

diff --git a/src/lib/schematics/install/fonts/head-element.ts b/src/lib/schematics/install/fonts/head-element.ts
@@ -33,7 +33,9 @@ export function appendElementToHead(host: Tree, project: WorkspaceProject, eleme
     throw `Could not find '<head>' element in HTML file: ${indexPath}`;
   }
 
-  const endTagOffset = headTag.sourceCodeLocation.endTag.startOffset;
+  // We always have access to the source code location here because the `getHeadTagElement`
+  // function explicitly has the `sourceCodeLocationInfo` option enabled.
+  const endTagOffset = headTag.sourceCodeLocation!.endTag.startOffset;
   const indentationOffset = getChildElementIndentation(headTag);
   const insertion = `${' '.repeat(indentationOffset)}${elementHtml}`;
 

diff --git a/src/lib/schematics/install/fonts/project-index-html.ts b/src/lib/schematics/install/fonts/project-index-html.ts
@@ -8,14 +8,15 @@
 
 import {SchematicsException} from '@angular-devkit/schematics';
 import {WorkspaceProject} from '@schematics/angular/utility/config';
+import {getArchitectOptions} from '../../utils/architect-options';
 
 /** Looks for the index HTML file in the given project and returns its path. */
 export function getIndexHtmlPath(project: WorkspaceProject): string {
-  const buildTarget = project.architect.build.options;
+  const buildOptions = getArchitectOptions(project, 'build');
 
-  if (buildTarget.index && buildTarget.index.endsWith('index.html')) {
-    return buildTarget.index;
+  if (!buildOptions.index) {
+    throw new SchematicsException('No project "index.html" file could be found.');
   }
 
-  throw new SchematicsException('No index.html file was found.');
+  return buildOptions.index;
 }
diff --git a/src/lib/schematics/install/gestures/hammerjs-import.ts b/src/lib/schematics/install/gestures/hammerjs-import.ts
@@ -10,7 +10,7 @@ import {Rule, Tree} from '@angular-devkit/schematics';
 import {getWorkspace} from '@schematics/angular/utility/config';
 import {getProjectFromWorkspace} from '../../utils/get-project';
 import {Schema} from '../schema';
-import {getProjectMainFile} from './project-main-file';
+import {getProjectMainFile} from '../../utils/project-main-file';
 
 const hammerjsImportStatement = `import 'hammerjs';`;
 

diff --git a/src/lib/schematics/install/index.spec.ts b/src/lib/schematics/install/index.spec.ts
@@ -1,6 +1,6 @@
 import {Tree} from '@angular-devkit/schematics';
 import {SchematicTestRunner} from '@angular-devkit/schematics/testing';
-import {getProjectStyleFile} from '@angular/material/schematics/utils/project-style-file';
+import {getProjectStyleFile} from '../utils/project-style-file';
 import {getIndexHtmlPath} from './fonts/project-index-html';
 import {getProjectFromWorkspace} from '../utils/get-project';
 import {getFileContent} from '@schematics/angular/utility/test';
@@ -71,10 +71,10 @@ describe('material-install-schematic', () => {
     const expectedStylesPath = normalize(`/${project.root}/src/styles.scss`);
 
     const buffer = tree.read(expectedStylesPath);
-    const src = buffer!.toString();
+    const themeContent = buffer!.toString();
 
-    expect(src.indexOf(`@import '~@angular/material/theming';`)).toBeGreaterThan(-1);
-    expect(src.indexOf(`$app-primary`)).toBeGreaterThan(-1);
+    expect(themeContent).toContain(`@import '~@angular/material/theming';`);
+    expect(themeContent).toContain(`$app-primary: mat-palette(`);
   });
 
   it('should create a custom theme file if no SCSS file could be found', () => {
@@ -112,7 +112,7 @@ describe('material-install-schematic', () => {
     const workspace = getWorkspace(tree);
     const project = getProjectFromWorkspace(workspace);
 
-    const defaultStylesPath = getProjectStyleFile(project);
+    const defaultStylesPath = getProjectStyleFile(project)!;
     const htmlContent = tree.read(defaultStylesPath)!.toString();
 
     expect(htmlContent).toContain('html, body { height: 100%; }');

diff --git a/src/lib/schematics/install/index.ts b/src/lib/schematics/install/index.ts
@@ -94,9 +94,9 @@ function addMaterialAppStyles(options: Schema) {
     const workspace = getWorkspace(host);
     const project = getProjectFromWorkspace(workspace, options.project);
     const styleFilePath = getProjectStyleFile(project);
-    const buffer = host.read(styleFilePath);
+    const buffer = host.read(styleFilePath!);
 
-    if (!buffer) {
+    if (!styleFilePath || !buffer) {
       return console.warn(`Could not find styles file: "${styleFilePath}". Skipping styles ` +
         `generation. Please consider manually adding the "Roboto" font and resetting the ` +
         `body margin.`);

diff --git a/src/lib/schematics/install/schema.json b/src/lib/schematics/install/schema.json
@@ -4,6 +4,13 @@
   "title": "Material Install Options Schema",
   "type": "object",
   "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,

diff --git a/src/lib/schematics/install/schema.ts b/src/lib/schematics/install/schema.ts
@@ -7,6 +7,10 @@
  */
 
 export interface Schema {
+
+  /** Name of the project to target. */
+  project: string;
+
   /** Whether to skip package.json install. */
   skipPackageJson: boolean;
 
@@ -15,7 +19,4 @@ export interface Schema {
 
   /** Name of pre-built theme to install. */
   theme: 'indigo-pink' | 'deeppurple-amber' | 'pink-bluegrey' | 'purple-green' | 'custom';
-
-  /** Name of the project to target. */
-  project?: string;
 }
diff --git a/src/lib/schematics/install/theming/theming.ts b/src/lib/schematics/install/theming/theming.ts
@@ -31,7 +31,7 @@ export function addThemeToAppStyles(options: Schema): (host: Tree) => Tree {
     if (themeName === 'custom') {
       insertCustomTheme(project, options.project, host, workspace);
     } else {
-      insertPrebuiltTheme(project, host, themeName, workspace, options.project);
+      insertPrebuiltTheme(project, host, themeName, workspace);
     }
 
     return host;
@@ -49,13 +49,20 @@ function insertCustomTheme(project: WorkspaceProject, projectName: string, host:
   const themeContent = createCustomTheme(projectName);
 
   if (!stylesPath) {
+    if (!project.sourceRoot) {
+      throw new Error(`Could not find source root for project: "${projectName}". Please make ` +
+        `sure that the "sourceRoot" property is set in the workspace config.`);
+    }
+
     // Normalize the path through the devkit utilities because we want to avoid having
     // unnecessary path segments and windows backslash delimiters.
     const customThemePath = normalize(join(project.sourceRoot, 'custom-theme.scss'));
 
     host.create(customThemePath, themeContent);
-    addStyleToTarget(project.architect['build'], host, customThemePath, workspace);
-    return;
+
+    // Architect is always defined because we initially asserted if the default builder
+    // configuration is set up or not.
+    return addStyleToTarget(project.architect!['build'], host, customThemePath, workspace);
   }
 
   const insertion = new InsertChange(stylesPath, 0, themeContent);
@@ -67,17 +74,15 @@ function insertCustomTheme(project: WorkspaceProject, projectName: string, host:
 
 /** Insert a pre-built theme into the angular.json file. */
 function insertPrebuiltTheme(project: WorkspaceProject, host: Tree, theme: string,
-                             workspace: WorkspaceSchema, projectName: string) {
+                             workspace: WorkspaceSchema) {
 
   // Path needs to be always relative to the `package.json` or workspace root.
   const themePath =  `./node_modules/@angular/material/prebuilt-themes/${theme}.css`;
 
-  if (project.architect) {
-    addStyleToTarget(project.architect['build'], host, themePath, workspace);
-    addStyleToTarget(project.architect['test'], host, themePath, workspace);
-  } else {
-    throw new SchematicsException(`${projectName} does not have an architect configuration`);
-  }
+  // Architect is always defined because we initially asserted if the default builder
+  // configuration is set up or not.
+  addStyleToTarget(project.architect!['build'], host, themePath, workspace);
+  addStyleToTarget(project.architect!['test'], host, themePath, workspace);
 }
 
 /** Adds a style entry to the given target. */

diff --git a/src/lib/schematics/nav/index.ts b/src/lib/schematics/nav/index.ts
@@ -30,7 +30,7 @@ export default function(options: Schema): Rule {
  */
 function addNavModulesToModule(options: Schema) {
   return (host: Tree) => {
-    const modulePath = findModuleFromOptions(host, options);
+    const modulePath = findModuleFromOptions(host, options)!;
     addModuleImportToModule(host, modulePath, 'LayoutModule', '@angular/cdk/layout');
     addModuleImportToModule(host, modulePath, 'MatToolbarModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');

diff --git a/src/lib/schematics/table/index.ts b/src/lib/schematics/table/index.ts
@@ -30,7 +30,7 @@ export default function(options: Schema): Rule {
  */
 function addTableModulesToModule(options: Schema) {
   return (host: Tree) => {
-    const modulePath = findModuleFromOptions(host, options);
+    const modulePath = findModuleFromOptions(host, options)!;
     addModuleImportToModule(host, modulePath, 'MatTableModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatPaginatorModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatSortModule', '@angular/material');

diff --git a/src/lib/schematics/tree/index.ts b/src/lib/schematics/tree/index.ts
@@ -30,7 +30,7 @@ export default function(options: Schema): Rule {
  */
 function addTreeModulesToModule(options: Schema) {
   return (host: Tree) => {
-    const modulePath = findModuleFromOptions(host, options);
+    const modulePath = findModuleFromOptions(host, options)!;
     addModuleImportToModule(host, modulePath, 'MatTreeModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatIconModule', '@angular/material');
     addModuleImportToModule(host, modulePath, 'MatButtonModule', '@angular/material');

diff --git a/src/lib/schematics/tsconfig.json b/src/lib/schematics/tsconfig.json
@@ -5,6 +5,7 @@
     "moduleResolution": "node",
     "outDir": "../../../dist/schematics",
     "noEmitOnError": false,
+    "strictNullChecks": true,
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
     "sourceMap": true,

diff --git a/src/lib/schematics/update/material/data/input-names.ts b/src/lib/schematics/update/material/data/input-names.ts
@@ -15,17 +15,11 @@ export interface MaterialInputNameData {
   /** The new name for the @Input(). */
   replaceWith: string;
   /** Whitelist where this replacement is made. If omitted it is made in all HTML & CSS */
-  whitelist?: {
+  whitelist: {
     /** Limit to elements with any of these element tags. */
     elements?: string[],
     /** Limit to elements with any of these attributes. */
     attributes?: string[],
-    /**
-     * Whether inputs in stylesheets should be updated or not. Note that inputs inside of
-     * stylesheets usually don't make sense, but if developers use an input as a plain one-time
-     * attribute, it can be targeted through CSS selectors.
-     */
-    stylesheet?: boolean,
   };
 }
 

diff --git a/src/lib/schematics/update/material/data/output-names.ts b/src/lib/schematics/update/material/data/output-names.ts
@@ -15,7 +15,7 @@ export interface MaterialOutputNameData {
   /** The new name for the @Output(). */
   replaceWith: string;
   /** Whitelist where this replacement is made. If omitted it is made in all HTML & CSS */
-  whitelist?: {
+  whitelist: {
     /** Limit to elements with any of these element tags. */
     elements?: string[],
     /** Limit to elements with any of these attributes. */

diff --git a/src/lib/schematics/update/material/data/property-names.ts b/src/lib/schematics/update/material/data/property-names.ts
@@ -17,7 +17,7 @@ export interface MaterialPropertyNameData {
   /** Whitelist where this replacement is made. If omitted it is made for all Classes. */
   whitelist: {
     /** Replace the property only when its type is one of the given Classes. */
-    classes?: string[];
+    classes: string[];
   };
 }
 

diff --git a/src/lib/schematics/update/material/transform-change-data.ts b/src/lib/schematics/update/material/transform-change-data.ts
@@ -33,5 +33,5 @@ export function getChangesForTarget<T>(target: TargetVersion, data: VersionChang
     return [];
   }
 
-  return data[target].reduce((result, changes) => result.concat(changes.changes), []);
+  return data[target]!.reduce((result, prData) => result.concat(prData.changes), [] as T[]);
 }
diff --git a/src/lib/schematics/update/rules/class-inheritance/classInheritanceCheckRule.ts b/src/lib/schematics/update/rules/class-inheritance/classInheritanceCheckRule.ts
@@ -41,6 +41,7 @@ export class Walker extends ProgramAwareRuleWalker {
 
   visitClassDeclaration(node: ts.ClassDeclaration) {
     const baseTypes = determineBaseTypes(node);
+    const className = node.name ? node.name.text : '{unknown-name}';
 
     if (!baseTypes) {
       return;
@@ -50,7 +51,7 @@ export class Walker extends ProgramAwareRuleWalker {
       const data = this.propertyNames.get(typeName);
 
       if (data) {
-        this.addFailureAtNode(node, `Found class "${bold(node.name.text)}" which extends class ` +
+        this.addFailureAtNode(node, `Found class "${bold(className)}" which extends class ` +
             `"${bold(typeName)}". Please note that the base class property ` +
             `"${red(data.replace)}" has changed to "${green(data.replaceWith)}". ` +
             `You may need to update your class as well`);

diff --git a/src/lib/schematics/update/rules/class-inheritance/classInheritanceMiscRule.ts b/src/lib/schematics/update/rules/class-inheritance/classInheritanceMiscRule.ts
@@ -25,17 +25,19 @@ export class Walker extends ProgramAwareRuleWalker {
 
   visitClassDeclaration(node: ts.ClassDeclaration) {
     const baseTypes = determineBaseTypes(node);
+    const className = node.name ? node.name.text : '{unknown-name}';
 
     if (!baseTypes) {
       return;
     }
 
     if (baseTypes.includes('MatFormFieldControl')) {
       const hasFloatLabelMember = node.members
-          .find(member => member.name && member.name.getText() === 'shouldFloatLabel');
+          .filter(member => member.name)
+          .find(member => member.name!.getText() === 'shouldFloatLabel');
 
       if (!hasFloatLabelMember) {
-        this.addFailureAtNode(node, `Found class "${bold(node.name.text)}" which extends ` +
+        this.addFailureAtNode(node, `Found class "${bold(className)}" which extends ` +
             `"${bold('MatFormFieldControl')}". This class must define ` +
             `"${green('shouldLabelFloat')}" which is now a required property.`);
       }

diff --git a/src/lib/schematics/update/rules/input-names/inputNamesStylesheetRule.ts b/src/lib/schematics/update/rules/input-names/inputNamesStylesheetRule.ts
@@ -68,10 +68,6 @@ export class Walker extends ComponentWalker {
     const replacements: {failureMessage: string, replacement: Replacement}[] = [];
 
     this.data.forEach(name => {
-      if (name.whitelist && !name.whitelist.stylesheet) {
-        return;
-      }
-
       const currentSelector = `[${name.replace}]`;
       const updatedSelector = `[${name.replaceWith}]`;
 

diff --git a/src/lib/schematics/update/rules/input-names/inputNamesTemplateRule.ts b/src/lib/schematics/update/rules/input-names/inputNamesTemplateRule.ts
@@ -55,16 +55,16 @@ export class Walker extends ComponentWalker {
 
     this.data.forEach(name => {
       const whitelist = name.whitelist;
-      const relativeOffsets = [];
+      const relativeOffsets: number[] = [];
       const failureMessage = `Found deprecated @Input() "${red(name.replace)}"` +
         ` which has been renamed to "${green(name.replaceWith)}"`;
 
-      if (!whitelist || whitelist.attributes) {
+      if (whitelist.attributes) {
         relativeOffsets.push(
           ...findInputsOnElementWithAttr(templateContent, name.replace, whitelist.attributes));
       }
 
-      if (!whitelist || whitelist.elements) {
+      if (whitelist.elements) {
         relativeOffsets.push(
           ...findInputsOnElementWithTag(templateContent, name.replace, whitelist.elements));
       }

diff --git a/src/lib/schematics/update/rules/output-names/outputNamesTemplateRule.ts b/src/lib/schematics/update/rules/output-names/outputNamesTemplateRule.ts
@@ -55,16 +55,16 @@ export class Walker extends ComponentWalker {
 
     this.data.forEach(name => {
       const whitelist = name.whitelist;
-      const relativeOffsets = [];
+      const relativeOffsets: number[] = [];
       const failureMessage = `Found deprecated @Output() "${red(name.replace)}"` +
         ` which has been renamed to "${green(name.replaceWith)}"`;
 
-      if (!whitelist || whitelist.attributes) {
+      if (whitelist.attributes) {
         relativeOffsets.push(
           ...findOutputsOnElementWithAttr(templateContent, name.replace, whitelist.attributes));
       }
 
-      if (!whitelist || whitelist.elements) {
+      if (whitelist.elements) {
         relativeOffsets.push(
           ...findOutputsOnElementWithTag(templateContent, name.replace, whitelist.elements));
       }

diff --git a/src/lib/schematics/update/rules/signature-check/constructorSignatureCheckRule.ts b/src/lib/schematics/update/rules/signature-check/constructorSignatureCheckRule.ts
@@ -40,7 +40,8 @@ export class Walker extends ProgramAwareRuleWalker {
     return signature.getParameters()
       .map(param => param.declarations[0] as ts.ParameterDeclaration)
       .map(node => node.type)
-      .map(node => this.getTypeChecker().getTypeFromTypeNode(node));
+      // TODO(devversion): handle non resolvable constructor types
+      .map(typeNode => this.getTypeChecker().getTypeFromTypeNode(typeNode!));
   }
 
   private checkExpressionSignature(node: ts.CallExpression | ts.NewExpression) {
@@ -50,7 +51,7 @@ export class Walker extends ProgramAwareRuleWalker {
 
     // TODO(devversion): Consider handling pass-through classes better.
     // TODO(devversion): e.g. `export class CustomCalendar extends MatCalendar {}`
-    if (!classType || !constructorChecks.includes(className)) {
+    if (!classType || !constructorChecks.includes(className) || !node.arguments) {
       return;
     }
 
@@ -62,6 +63,8 @@ export class Walker extends ProgramAwareRuleWalker {
     // TODO(devversion): we should check if the type is assignable to the signature
     // TODO(devversion): blocked on https://github.com/Microsoft/TypeScript/issues/9879
     const doesMatchSignature = classSignatures.some(signature => {
+      // TODO(devversion): better handling if signature item type is unresolved but assignable
+      // to everything.
       return signature.every((type, index) => callExpressionSignature[index] === type) &&
           signature.length === callExpressionSignature.length;
     });

diff --git a/src/lib/schematics/update/typescript/base-types.ts b/src/lib/schematics/update/typescript/base-types.ts
@@ -15,8 +15,8 @@ export function determineBaseTypes(node: ts.ClassDeclaration): string[] | null {
   }
 
   return node.heritageClauses
-    .reduce((types, clause) => types.concat(clause.types), [])
+    .reduce((types, clause) => types.concat(clause.types), [] as ts.ExpressionWithTypeArguments[])
     .map(typeExpression => typeExpression.expression)
     .filter(expression => expression && ts.isIdentifier(expression))
-    .map(identifier => identifier.text);
+    .map((identifier: ts.Identifier) => identifier.text);
 }