fix(@angular/cli): use correct schematic defaults considering workspace

Fix #14986

This PR includes some refactoring to simplify the interaction
of the `NodeWorkflow` and the `BaseWorkflow` with the registry.

We were registering redundant `addPostTransform`s. Some of them in
the constructor of the `BaseWorkflow`, which did not allow us to
intercept `addUndefinedDefaults`.

Additionally, we were setting the `validateOptionsWithSchema` transform
multiple times unnecessarily.

An issue left to fix is support for the `--project` option in
schematic commands. Currently, `getProjectName` does not know about
this option, since `createWorkflow` does not know how to parse the
command line arguments. The parsing logic is implemented partially
by the concrete implementation of the `SchematicCommand` template
method.

Author: mgechev

etc/api/angular_devkit/schematics/tools/index.d.ts

@@ -28,6 +28,7 @@ export declare type FileSystemCollection = Collection<FileSystemCollectionDescri
 export declare type FileSystemCollectionDesc = CollectionDescription<FileSystemCollectionDescription>;
 
 export interface FileSystemCollectionDescription {
+    readonly name: string;
     readonly path: string;
     readonly schematics: {
         [name: string]: FileSystemSchematicDesc;
@@ -92,9 +93,11 @@ export interface FileSystemSchematicDescription extends FileSystemSchematicJsonD
 
 export interface FileSystemSchematicJsonDescription {
     readonly aliases?: string[];
+    readonly collection: FileSystemCollectionDescription;
     readonly description: string;
     readonly extends?: string;
     readonly factory: string;
+    readonly name: string;
     readonly schema?: string;
 }
 
@@ -135,6 +138,7 @@ export declare class NodeWorkflow extends workflow.BaseWorkflow {
         dryRun?: boolean;
         root?: Path;
         packageManager?: string;
+        registry?: schema.CoreSchemaRegistry;
     });
 }
 

packages/angular/cli/BUILD

@@ -31,6 +31,7 @@ ts_library(
         "//packages/angular_devkit/architect:node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
+        "//packages/angular_devkit/schematics:formats",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tools",
         # @typings: es2017.object

packages/angular/cli/models/schematic-command.ts

@@ -17,10 +17,12 @@ import {
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { DryRunEvent, UnsuccessfulWorkflowExecution, workflow } from '@angular-devkit/schematics';
+import { standardFormats } from '@angular-devkit/schematics/src/formats';
 import {
   FileSystemCollection,
   FileSystemEngine,
   FileSystemSchematic,
+  FileSystemSchematicDescription,
   NodeWorkflow,
   validateOptionsWithSchema,
 } from '@angular-devkit/schematics/tools';
@@ -247,6 +249,7 @@ export abstract class SchematicCommand<
       dryRun,
       packageManager: getPackageManager(this.workspace.root),
       root: normalize(this.workspace.root),
+      registry: new schema.CoreSchemaRegistry(standardFormats)
     });
     workflow.engineHost.registerContextTransform(context => {
       // This is run by ALL schematics, so if someone uses `externalSchematics(...)` which
@@ -262,15 +265,7 @@ export abstract class SchematicCommand<
       }
     });
 
-    workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
-
-    if (options.defaults) {
-      workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);
-    } else {
-      workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
-    }
-
-    workflow.registry.addSmartDefaultProvider('projectName', () => {
+    const getProjectName = () => {
       if (this._workspace) {
         try {
           return (
@@ -292,7 +287,24 @@ export abstract class SchematicCommand<
       }
 
       return undefined;
-    });
+    };
+
+    workflow.engineHost.registerOptionsTransform(
+      <T extends {}>(schematic: FileSystemSchematicDescription, current: T) => ({
+        ...getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName()),
+        ...current,
+      })
+    );
+
+    if (options.defaults) {
+      workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);
+    } else {
+      workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    }
+
+    workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
+
+    workflow.registry.addSmartDefaultProvider('projectName', getProjectName);
 
     if (options.interactive !== false && isTTY()) {
       workflow.registry.usePromptProvider((definitions: Array<schema.PromptDefinition>) => {

packages/angular_devkit/schematics/BUILD

@@ -13,13 +13,36 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 
 licenses(["notice"])  # MIT License
 
+# @angular-devkit/schematics/src/formats
+
+ts_library(
+    name = "formats",
+    srcs = glob(
+        include = ["src/formats/**/*.ts"],
+        exclude = [
+            "src/formats/**/*_spec.ts",
+            "src/formats/**/*_benchmark.ts",
+        ],
+    ),
+    module_name = "@angular-devkit/schematics/src/formats",
+    module_root = "src/formats/index.d.ts",
+    deps = [
+        "//packages/angular_devkit/core",
+        "@npm//@types/node",
+        "@npm//rxjs",
+        "@npm//tslint",
+        "@npm//typescript",
+    ],
+)
+
 # @angular-devkit/schematics
 
 ts_library(
     name = "schematics",
     srcs = glob(
         include = ["src/**/*.ts"],
         exclude = [
+            "src/formats/**/*.ts",
             "src/**/*_spec.ts",
             "src/**/*_spec_large.ts",
             "src/**/*_benchmark.ts",
@@ -28,6 +51,7 @@ ts_library(
     module_name = "@angular-devkit/schematics",
     module_root = "src/index.d.ts",
     deps = [
+        ":formats",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
         "@npm//@types/node",
@@ -48,6 +72,7 @@ ts_library(
     tsconfig = "//:tsconfig-test.json",
     # @external_end
     deps = [
+        "formats",
         ":schematics",
         ":testing",
         "//packages/angular_devkit/core",

packages/angular_devkit/schematics/src/workflow/base.ts

@@ -10,7 +10,7 @@ import { EMPTY, Observable, Subject, concat, from, of, throwError } from 'rxjs';
 import { concatMap, defaultIfEmpty, ignoreElements, last, map, tap } from 'rxjs/operators';
 import { Engine, EngineHost, SchematicEngine } from '../engine';
 import { UnsuccessfulWorkflowExecution } from '../exception/exception';
-import { standardFormats } from '../formats';
+import { standardFormats } from '../formats/index';
 import { DryRunEvent, DryRunSink } from '../sink/dryrun';
 import { HostSink } from '../sink/host';
 import { Sink } from '../sink/sink';
@@ -63,7 +63,6 @@ export abstract class BaseWorkflow implements Workflow {
   constructor(options: BaseWorkflowOptions) {
     this._host = options.host;
     this._engineHost = options.engineHost;
-
     if (options.registry) {
       this._registry = options.registry;
     } else {

packages/angular_devkit/schematics/tools/description.ts

@@ -19,6 +19,7 @@ import {
 
 
 export interface FileSystemCollectionDescription {
+  readonly name: string;
   readonly path: string;
   readonly version?: string;
   readonly schematics: { [name: string]: FileSystemSchematicDesc };
@@ -28,6 +29,8 @@ export interface FileSystemCollectionDescription {
 export interface FileSystemSchematicJsonDescription {
   readonly aliases?: string[];
   readonly factory: string;
+  readonly name: string;
+  readonly collection: FileSystemCollectionDescription;
   readonly description: string;
   readonly schema?: string;
   readonly extends?: string;

packages/angular_devkit/schematics/tools/workflow/node-workflow.ts

@@ -5,14 +5,13 @@
  * 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, getSystemPath, virtualFs } from '@angular-devkit/core';
+import { Path, getSystemPath, schema, virtualFs } from '@angular-devkit/core';
 import {
   workflow,
 } from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
 import { BuiltinTaskExecutor } from '../../tasks/node';
 import { FileSystemEngine } from '../description';
 import { NodeModulesEngineHost } from '../node-module-engine-host';
-import { validateOptionsWithSchema } from '../schema-option-transform';
 
 /**
  * A workflow specifically for Node tools.
@@ -24,7 +23,8 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
       force?: boolean;
       dryRun?: boolean;
       root?: Path,
-      packageManager?: string;
+      packageManager?: string,
+      registry?: schema.CoreSchemaRegistry
     },
   ) {
     const engineHost = new NodeModulesEngineHost();
@@ -34,9 +34,9 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
 
       force: options.force,
       dryRun: options.dryRun,
+      registry: options.registry
     });
 
-    engineHost.registerOptionsTransform(validateOptionsWithSchema(this._registry));
     engineHost.registerTaskExecutor(
       BuiltinTaskExecutor.NodePackage,
       {

packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
+import { schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import * as path from 'path';
@@ -14,7 +15,7 @@ import * as path from 'path';
 describe('NodeWorkflow', () => {
   // TODO: this test seems to either not work on windows or on linux.
   xit('works', done => {
-    const workflow = new NodeWorkflow(new NodeJsSyncHost(), { dryRun: true });
+    const workflow = new NodeWorkflow(new NodeJsSyncHost(), { dryRun: true, registry: new schema.CoreSchemaRegistry() });
     const collection = path.join(__dirname, '../../../../schematics/angular/package.json');
 
     workflow.execute({

packages/angular_devkit/schematics_cli/BUILD

@@ -26,6 +26,7 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "//packages/angular_devkit/schematics",
+        "//packages/angular_devkit/schematics:formats",
         "//packages/angular_devkit/schematics:tasks",
         "//packages/angular_devkit/schematics:tools",
         "@npm//@types/inquirer",

packages/angular_devkit/schematics_cli/bin/schematics.ts

@@ -7,7 +7,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import 'symbol-observable';
 // symbol polyfill must go first
 // tslint:disable-next-line:ordered-imports import-groups
 import {
@@ -25,9 +24,11 @@ import {
   SchematicEngine,
   UnsuccessfulWorkflowExecution,
 } from '@angular-devkit/schematics';
-import { NodeModulesEngineHost, NodeWorkflow } from '@angular-devkit/schematics/tools';
+import { standardFormats } from '@angular-devkit/schematics/src/formats';
+import { NodeModulesEngineHost, NodeWorkflow, validateOptionsWithSchema } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as minimist from 'minimist';
+import 'symbol-observable';
 
 
 /**
@@ -160,9 +161,12 @@ export async function main({
 
   /** Create a Virtual FS Host scoped to where the process is being run. **/
   const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(process.cwd()));
+  const registry = new schema.CoreSchemaRegistry(standardFormats);
 
   /** Create the workflow that will be executed with this run. */
-  const workflow = new NodeWorkflow(fsHost, { force, dryRun });
+  const workflow = new NodeWorkflow(fsHost, { force, dryRun, registry });
+  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+  workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(registry));
 
   // Indicate to the user when nothing has been done. This is automatically set to off when there's
   // a new DryRunEvent.