Address feedback

Author: devversion

src/lib/schematics/utils/build-component.ts

@@ -39,7 +39,7 @@ import {validateHtmlSelector, validateName} from '@schematics/angular/utility/va
 import {readFileSync} from 'fs';
 import {dirname, join, resolve} from 'path';
 import * as ts from 'typescript';
-import {setDefaultSchematicOptions} from './schematic-options';
+import {getDefaultComponentOptions} from './schematic-options';
 
 function readIntoSourceFile(host: Tree, modulePath: string): ts.SourceFile {
   const text = host.read(modulePath);
@@ -163,12 +163,17 @@ export function buildComponent(options: ComponentOptions,
   return (host: Tree, context: FileSystemSchematicContext) => {
     const workspace = getWorkspace(host);
     const project = workspace.projects[options.project || workspace.defaultProject];
+    const defaultComponentOptions = getDefaultComponentOptions(project);
 
     const schematicFilesUrl = './files';
     const schematicFilesPath = resolve(dirname(context.schematic.description.path),
         schematicFilesUrl);
 
-    setDefaultSchematicOptions(project, options);
+    // Add the default component option values to the options if an option is not explicitly
+    // specified but a default component option is available.
+    Object.keys(options)
+      .filter(optionName => options[optionName] == null && defaultComponentOptions[optionName])
+      .forEach(optionName => options[optionName] = defaultComponentOptions[optionName]);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);

src/lib/schematics/utils/schematic-options.ts

@@ -7,49 +7,36 @@
  */
 
 import {WorkspaceProject} from '@schematics/angular/utility/config';
-import {Schema as ComponentOptions} from '@schematics/angular/component/schema';
 
 /**
- * Looks for options that are not explicitly specified but can fall back to a default value that
- * has been specified at project initialization (ng new or ng init).
+ * Returns the default options for the `@schematics/angular:component` schematic which would
+ * have been specified at project initialization (ng new or ng init).
  *
  * This is necessary because the Angular CLI only exposes the default values for the "--style",
  * "--inlineStyle", "--skipTests" and "--inlineTemplate" options to the "component" schematic.
  */
-export function setDefaultSchematicOptions(project: WorkspaceProject,
-                                           options: ComponentOptions) {
-
+export function getDefaultComponentOptions(project: WorkspaceProject) {
   // Note: Not all options which are available when running "ng new" will be stored in the
-  // workspace config. List of options which will be stored in the configuration:
+  // workspace config. List of options which will be available in the configuration:
   // angular/angular-cli/blob/master/packages/schematics/angular/application/index.ts#L109-L131
-
-  if (!options.styleext) {
-    options.styleext = getDefaultSchematicOption(project, 'styleext', 'css');
-  }
-
-  if (options.inlineStyle === undefined) {
-    options.inlineStyle = getDefaultSchematicOption(project, 'inlineStyle', false);
-  }
-
-  if (options.inlineTemplate === undefined) {
-    options.inlineTemplate = getDefaultSchematicOption(project, 'inlineTemplate', false);
-  }
-
-  if (options.spec === undefined) {
-    options.spec = getDefaultSchematicOption(project, 'spec', true);
-  }
+  return {
+    styleext: getDefaultComponentOption(project, 'styleext', 'css'),
+    inlineStyle: getDefaultComponentOption(project, 'inlineStyle', false),
+    inlineTemplate: getDefaultComponentOption(project, 'inlineTemplate', false),
+    spec: getDefaultComponentOption(project, 'spec', true),
+  };
 }
 
 /**
  * Gets the default value for the specified option. The default options will be determined
  * by looking at the stored schematic options for `@schematics/angular:component` in the
  * CLI workspace configuration.
  */
-function getDefaultSchematicOption<T>(project: WorkspaceProject, optionName: string,
+function getDefaultComponentOption<T>(project: WorkspaceProject, optionName: string,
                                       fallbackValue: T): T | null {
   if (project.schematics &&
       project.schematics['@schematics/angular:component'] &&
-      project.schematics['@schematics/angular:component'][optionName] !== undefined) {
+      project.schematics['@schematics/angular:component'][optionName] != null) {
 
     return project.schematics['@schematics/angular:component'][optionName];
   }