Merge pull request #185 from angular/master

Don't skip children with script source attached

Author: GulajavaMinistudio

bin/schematics

@@ -11,4 +11,4 @@
 
 require('../lib/bootstrap-local');
 const packages = require('../lib/packages').packages;
-require(packages['@angular-devkit/schematics-cli'].bin['schematics']);
+require(packages['@angular-devkit/schematics-cli'].bin['schematics']).main({ args: process.argv.slice(2) });

docs/specifications/schematic-prompts.md

@@ -0,0 +1,121 @@
+# Schematic Prompts
+
+Schematic prompts provide the ability to introduce user interaction into the schematic execution. The schematic runtime supports the ability to allow schematic options to be configured to display a customizable question to the user and then use the response as the value for the option.  These prompts are displayed before the execution of the schematic.  This allows users direct the operation of the schematic without requiring indepth knowledge of the full spectrum of options available to the user.
+
+To enable this capability, the JSON Schema used to define the schematic's options supports extensions to allow the declarative definition of the prompts and their respective behavior.  No additional logic or changes are required to the JavaScript for a schematic to support the prompts.
+
+## Basic Usage
+
+To illustrate the addition of a prompt to an existing schematic the following example JSON schema for a hypothetical _hello world_ schematic will be used.
+
+```json
+{
+    "properties": {
+        "name": {
+            "type": "string",
+            "minLength": 1,
+            "default": "world"
+        },
+        "useColor": {
+            "type": "boolean"
+        }
+    }
+}
+```
+
+Suppose it would be preferred if the user was asked for their name.  This can be accomplished by augmenting the `name` property definition with an `x-prompt` field.
+```json
+"x-prompt": "What is your name?"
+```
+In most cases, only the text of the prompt is required.  To minimize the amount of necessary configuration, the above _shorthand_ form is supported and will typically be all that is required.  Full details regarding the _longhand_ form can be found in the **Configuration Reference** section.
+
+Adding a prompt to allow the user to decided whether the schematic will use color when executing its hello action is also very similar.  The schema with both prompts would be as follows:
+```json
+{
+    "properties": {
+        "name": {
+            "type": "string",
+            "minLength": 1,
+            "default": "world",
+            "x-prompt": "What is your name?"
+        },
+        "useColor": {
+            "type": "boolean",
+            "x-prompt": "Would you like the response in color?"
+        }
+    }
+}
+```
+
+Prompts have several different types which provide the ability to display an input method that best represents the schematic option's potential values.
+
+* `confirmation` - A **yes** or **no** question; ideal for boolean options
+* `input` - textual input; ideal for string or number options
+* `list` - a predefined set of items which may be selected
+
+When using the _shorthand_ form, the most appropriate type will automatically be selected based on the property's schema.  In the example, the `name` prompt will use an `input` type because it it is a `string` property.  The `useColor` prompt will use a `confirmation` type because it is a boolean property with `yes` corresponding to `true` and `no` corresponding to `false`.
+
+It is also important that the response from the user conforms to the contraints of the property.  By specifying constraints using the JSON schema, the prompt runtime will automatically validate the response provided by the user.  If the value is not acceptable, the user will be asked to enter a new value.  This ensures that any values passed to the schematic will meet the expectations of the schematic's implementation  and removes the need to add additional checks within the schematic's code.
+
+##  Configuration Reference
+
+The `x-prompt` field supports two alternatives to enable a prompt for a schematic option.  A shorthand form when additional customization is not required and a longhand form providing the ability for more control over the prompt.  All user responses are validated against the property's schema. For example, string type properties can use a minimum length or regular expression constraint to control the allowed values.  In the event the response fails validation, the user will be asked to enter a new value.
+
+### Longhand Form
+
+In the this form, the `x-prompt` field is an object with subfields that can be used to customize the behavior of the prompt.  Note that some fields only apply to specific prompt types.
+
+| Field | Data Value | Default |
+|-|-|-|
+| `type` | `confirmation`, `input`, `list` | see shorthand section for details
+| `message` | string | N/A (required)
+| `items` | string and/or `label`/`value` object pair | only valid with type `list`
+
+
+### Shorthand Form
+
+`x-prompt` [type: string] --> Question to display to the user.
+
+For this usage, the type of the prompt is determined by the type of the containing property.
+
+| Property Schema  | Prompt Type | Notes |
+|-|:-:|:-:|
+| `"type": "boolean"` | `confirmation`  |   |
+| `"type": "string"`  | `input`  |   |
+| `"type": "number"`  | `input` | only valid numbers accepted  |
+| `"type": "integer"` | `input` | only valid numbers accepted  |
+| `"enum": [...]` | `list` | enum members become list selections
+
+### `x-prompt` Schema
+
+```json
+{
+    "oneOf": [
+        { "type": "string" },
+        {
+            "type": "object",
+            "properties": {
+                "type": { "type": "string" },
+                "message": { "type": "string" },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "oneOf": [
+                            { "type": "string" },
+                            {
+                                "type": "object",
+                                "properties": {
+                                    "label": { "type": "string" },
+                                    "value": { }
+                                },
+                                "required": [ "value" ]
+                            }
+                        ]
+                    }
+                }
+            },
+            "required": [ "message" ]
+        }
+    ]
+}
+```

packages/angular/cli/commands/config-impl.ts

@@ -18,7 +18,7 @@ import {
 } from '@angular-devkit/core';
 import { writeFileSync } from 'fs';
 import { Command } from '../models/command';
-import { Arguments } from '../models/interface';
+import { Arguments, CommandScope } from '../models/interface';
 import {
   getWorkspace,
   getWorkspaceRaw,
@@ -178,6 +178,10 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
   public async run(options: ConfigCommandSchema & Arguments) {
     const level = options.global ? 'global' : 'local';
 
+    if (!options.global) {
+      await this.validateScope(CommandScope.InProject);
+    }
+
     let config =
       (getWorkspace(level) as {} as { _workspace: experimental.workspace.WorkspaceSchema });
 

packages/angular/cli/commands/config.json

@@ -5,7 +5,7 @@
   "$longDescription": "",
 
   "$aliases": [],
-  "$scope": "in",
+  "$scope": "all",
   "$type": "native",
   "$impl": "./config-impl#ConfigCommand",
 

packages/angular/cli/models/command.ts

@@ -114,8 +114,8 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     }
   }
 
-  async validateScope(): Promise<void> {
-    switch (this.description.scope) {
+  async validateScope(scope?: CommandScope): Promise<void> {
+    switch (scope === undefined ? this.description.scope : scope) {
       case CommandScope.OutProject:
         if (this.workspace.configFile) {
           this.logger.fatal(tags.oneLine`

packages/angular/cli/upgrade/version.ts

@@ -182,7 +182,7 @@ export class Version {
 
         Please run the following command to install a compatible version of TypeScript.
 
-            npm install typescript@'${currentCombo.typescript}'
+            npm install typescript@"${currentCombo.typescript}"
 
         To disable this warning run "ng config cli.warnings.typescriptMismatch false".
       ` + '\n')));

packages/angular_devkit/build_angular/package.json

@@ -24,7 +24,7 @@
     "karma-source-map-support": "1.3.0",
     "less": "3.8.1",
     "less-loader": "4.1.0",
-    "license-webpack-plugin": "1.4.0",
+    "license-webpack-plugin": "2.0.1",
     "loader-utils": "1.1.0",
     "mini-css-extract-plugin": "0.4.3",
     "minimatch": "3.0.4",

packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. 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 'core-js/es7/reflect';

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts

@@ -79,8 +79,10 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
 
   if (buildOptions.extractLicenses) {
     extraPlugins.push(new LicenseWebpackPlugin({
-      pattern: /.*/,
-      suppressErrors: true,
+      stats: {
+        warnings: false,
+        errors: false
+      },
       perChunkOutput: false,
       outputFilename: `3rdpartylicenses.txt`
     }));

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts

@@ -62,6 +62,13 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     entryPoints['polyfills'] = [path.resolve(root, buildOptions.polyfills)];
   }
 
+  if (!buildOptions.aot) {
+    entryPoints['polyfills'] = [
+      ...(entryPoints['polyfills'] || []),
+      path.join(__dirname, '..', 'jit-polyfills.js'),
+    ];
+  }
+
   // determine hashing format
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as any);
 

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts

@@ -110,7 +110,7 @@ export function getAotConfig(
     });
   }
 
-  const test = /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/;
+  const test = /(?:\.ngfactory\.js|\.ngstyle\.js|\.tsx?)$/;
 
   return {
     module: { rules: [{ test, use: loaders }] },

packages/angular_devkit/core/src/virtual-fs/host/memory.ts

@@ -180,7 +180,7 @@ export class SimpleMemoryHost implements Host<{}> {
     path = this._toAbsolute(path);
     if (this._isDirectory(path)) {
       for (const [cachePath] of this._cache.entries()) {
-        if (path.startsWith(cachePath + NormalizedSep)) {
+        if (cachePath.startsWith(path + NormalizedSep) || cachePath === path) {
           this._cache.delete(cachePath);
         }
       }

packages/angular_devkit/core/src/virtual-fs/host/memory_spec.ts

@@ -65,6 +65,22 @@ describe('SimpleMemoryHost', () => {
     expect(host.exists(normalize('/sub/file1'))).toBe(false);
   });
 
+  it('can delete directory', () => {
+    const host = new SyncDelegateHost(new SimpleMemoryHost());
+
+    const buffer = stringToFileBuffer('hello');
+
+    expect(host.exists(normalize('/sub/file1'))).toBe(false);
+    host.write(normalize('/sub/file1'), buffer);
+    host.write(normalize('/subfile.2'), buffer);
+    expect(host.exists(normalize('/sub/file1'))).toBe(true);
+    expect(host.exists(normalize('/subfile.2'))).toBe(true);
+    host.delete(normalize('/sub'));
+    expect(host.exists(normalize('/sub/file1'))).toBe(false);
+    expect(host.exists(normalize('/sub'))).toBe(false);
+    expect(host.exists(normalize('/subfile.2'))).toBe(true);
+  });
+
   it('can rename', () => {
     const host = new SyncDelegateHost(new SimpleMemoryHost());