@angular/cli 1.7.3 → 1.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/commands/generate.js
CHANGED
|
@@ -4,6 +4,8 @@ const chalk_1 = require("chalk");
|
|
|
4
4
|
const stringUtils = require('ember-cli-string-utils');
|
|
5
5
|
const common_tags_1 = require("common-tags");
|
|
6
6
|
const config_1 = require("../models/config");
|
|
7
|
+
const core_1 = require("@angular-devkit/core");
|
|
8
|
+
const operators_1 = require("rxjs/operators");
|
|
7
9
|
const schematics_1 = require("../utilities/schematics");
|
|
8
10
|
const dynamic_path_parser_1 = require("../utilities/dynamic-path-parser");
|
|
9
11
|
const app_utils_1 = require("../utilities/app-utils");
|
|
@@ -170,12 +172,37 @@ exports.default = Command.extend({
|
|
|
170
172
|
if (collectionName === '@schematics/angular' && schematicName === 'interface' && rawArgs[2]) {
|
|
171
173
|
commandOptions.type = rawArgs[2];
|
|
172
174
|
}
|
|
175
|
+
const logger = new core_1.logging.IndentLogger('cling');
|
|
176
|
+
const loggerSubscription = logger.pipe(operators_1.filter(entry => (entry.level != 'debug')))
|
|
177
|
+
.subscribe(entry => {
|
|
178
|
+
let color = (x) => core_1.terminal.dim(core_1.terminal.white(x));
|
|
179
|
+
let output = process.stdout;
|
|
180
|
+
switch (entry.level) {
|
|
181
|
+
case 'info':
|
|
182
|
+
color = core_1.terminal.white;
|
|
183
|
+
break;
|
|
184
|
+
case 'warn':
|
|
185
|
+
color = core_1.terminal.yellow;
|
|
186
|
+
break;
|
|
187
|
+
case 'error':
|
|
188
|
+
color = core_1.terminal.red;
|
|
189
|
+
output = process.stderr;
|
|
190
|
+
break;
|
|
191
|
+
case 'fatal':
|
|
192
|
+
color = (x) => core_1.terminal.bold(core_1.terminal.red(x));
|
|
193
|
+
output = process.stderr;
|
|
194
|
+
break;
|
|
195
|
+
}
|
|
196
|
+
output.write(color(entry.message) + '\n');
|
|
197
|
+
});
|
|
173
198
|
return schematicRunTask.run({
|
|
174
199
|
taskOptions: commandOptions,
|
|
175
200
|
workingDir: cwd,
|
|
176
201
|
collectionName,
|
|
177
|
-
schematicName
|
|
178
|
-
|
|
202
|
+
schematicName,
|
|
203
|
+
logger: this.logger
|
|
204
|
+
})
|
|
205
|
+
.then(() => loggerSubscription.unsubscribe());
|
|
179
206
|
},
|
|
180
207
|
printDetailedHelp: function (_options, rawArgs) {
|
|
181
208
|
const engineHost = schematics_1.getEngineHost();
|
package/commands/generate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["commands/generate.ts"],"names":[],"mappings":";;AAAA,iCAA0B;AAC1B,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACtD,6CAAsC;AACtC,6CAA6C;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["commands/generate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/tasks/schematic-run.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { logging } from '@angular-devkit/core';
|
|
1
2
|
export interface SchematicRunOptions {
|
|
2
3
|
taskOptions: SchematicOptions;
|
|
3
4
|
workingDir: string;
|
|
4
5
|
emptyHost: boolean;
|
|
5
6
|
collectionName: string;
|
|
6
7
|
schematicName: string;
|
|
8
|
+
logger: logging.Logger;
|
|
7
9
|
}
|
|
8
10
|
export interface SchematicOptions {
|
|
9
11
|
dryRun: boolean;
|
package/tasks/schematic-run.js
CHANGED
|
@@ -13,7 +13,7 @@ const { green, red, yellow } = chalk_1.default;
|
|
|
13
13
|
const Task = require('../ember-cli/lib/models/task');
|
|
14
14
|
exports.default = Task.extend({
|
|
15
15
|
run: function (options) {
|
|
16
|
-
const { taskOptions, workingDir, emptyHost, collectionName, schematicName } = options;
|
|
16
|
+
const { taskOptions, workingDir, emptyHost, collectionName, schematicName, logger } = options;
|
|
17
17
|
const ui = this.ui;
|
|
18
18
|
const packageManager = config_1.CliConfig.fromGlobal().get('packageManager');
|
|
19
19
|
const engineHost = schematics_2.getEngineHost();
|
|
@@ -77,7 +77,7 @@ exports.default = Task.extend({
|
|
|
77
77
|
}
|
|
78
78
|
});
|
|
79
79
|
return new Promise((resolve, reject) => {
|
|
80
|
-
schematic.call(opts, host).pipe(operators_1.map((tree) => schematics_1.Tree.optimize(tree)), operators_1.concatMap((tree) => {
|
|
80
|
+
schematic.call(opts, host, { logger }).pipe(operators_1.map((tree) => schematics_1.Tree.optimize(tree)), operators_1.concatMap((tree) => {
|
|
81
81
|
return dryRunSink.commit(tree).pipe(operators_1.ignoreElements(), operators_1.concat(of_1.of(tree)));
|
|
82
82
|
}), operators_1.concatMap((tree) => {
|
|
83
83
|
if (!error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schematic-run.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/schematic-run.ts"],"names":[],"mappings":";;AAAA,2DAQoC;AACpC,gEAA4E;AAC5E,4DAAkE;AAClE,2CAAwD;AACxD,6BAA6B;AAC7B,iCAA0B;AAC1B,6CAA6C;AAC7C,8CAAwE;AACxE,wDAAgG;
|
|
1
|
+
{"version":3,"file":"schematic-run.js","sourceRoot":"/users/hansl/sources/hansl/angular-cli/","sources":["tasks/schematic-run.ts"],"names":[],"mappings":";;AAAA,2DAQoC;AACpC,gEAA4E;AAC5E,4DAAkE;AAClE,2CAAwD;AACxD,6BAA6B;AAC7B,iCAA0B;AAC1B,6CAA6C;AAC7C,8CAAwE;AACxE,wDAAgG;AAGhG,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,eAAK,CAAC;AACrC,MAAM,IAAI,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAAC;AA2BrD,kBAAe,IAAI,CAAC,MAAM,CAAC;IACzB,GAAG,EAAE,UAAU,OAA4B;QACzC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE9F,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAEnB,MAAM,cAAc,GAAG,kBAAS,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,0BAAa,EAAE,CAAC;QACnC,UAAU,CAAC,oBAAoB,CAC7B,0BAAmB,CAAC,WAAW,EAC/B;YACE,aAAa,EAAE,UAAU;YACzB,cAAc,EAAE,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc;SACtE,CACF,CAAC;QACF,UAAU,CAAC,oBAAoB,CAC7B,0BAAmB,CAAC,qBAAqB,EACzC,EAAE,aAAa,EAAE,UAAU,EAAE,CAC9B,CAAC;QAEF,MAAM,UAAU,GAAG,0BAAa,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,yBAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAE1D,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAEpE,MAAM,cAAc,GAAG,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,IAAI,qBAAQ,WAAW,EAAK,cAAc,CAAE,CAAC;QAEnD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,sBAAS,EAAE,CAAC,CAAC,CAAC,IAAI,2BAAc,CAAC,IAAI,sBAAc,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9F,MAAM,IAAI,GAAG,OAAY,CAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,IAAI,2BAAc,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1D,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,MAAM,YAAY,GAAoB,EAAE,CAAC;QACzC,MAAM,aAAa,GAAa,EAAE,CAAC;QAEnC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,KAAkB,EAAE,EAAE;YACnD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;YACjF,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnB,KAAK,OAAO;oBACV,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,IAAI,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC;oBACxF,EAAE,CAAC,SAAS,CAAC,UAAU,SAAS,IAAI,IAAI,GAAG,CAAC,CAAC;oBAC7C,KAAK,GAAG,IAAI,CAAC;oBACb,KAAK,CAAC;gBACR,KAAK,QAAQ;oBACX,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,MAAM;wBACb,OAAO,EAAE,QAAQ;wBACjB,OAAO,EAAE,GAAG,SAAS,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,SAAS;qBACxD,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC/B,KAAK,CAAC;gBACR,KAAK,QAAQ;oBACX,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,KAAK;wBACZ,OAAO,EAAE,QAAQ;wBACjB,OAAO,EAAE,GAAG,SAAS,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,SAAS;qBACxD,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC/B,KAAK,CAAC;gBACR,KAAK,QAAQ;oBACX,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,GAAG;wBACV,OAAO,EAAE,QAAQ;wBACjB,OAAO,EAAE,GAAG,SAAS,EAAE;qBACxB,CAAC,CAAC;oBACH,KAAK,CAAC;gBACR,KAAK,QAAQ;oBACX,MAAM,WAAW,GAAG,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7E,YAAY,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,MAAM;wBACb,OAAO,EAAE,QAAQ;wBACjB,OAAO,EAAE,GAAG,SAAS,OAAO,WAAW,EAAE;qBAC1C,CAAC,CAAC;oBACH,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAC7B,KAAK,CAAC;YACV,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CACzC,eAAG,CAAC,CAAC,IAAU,EAAE,EAAE,CAAC,iBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EACxC,qBAAS,CAAC,CAAC,IAAU,EAAE,EAAE;gBACvB,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACjC,0BAAc,EAAE,EAChB,kBAAM,CAAC,OAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,qBAAS,CAAC,CAAC,IAAU,EAAE,EAAE;gBACvB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;oBACX,4BAA4B;oBAC5B,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC1F,CAAC;gBAED,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC;oBACzB,MAAM,CAAC,OAAY,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;gBACD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAC7B,0BAAc,EAAE,EAChB,kBAAM,CAAC,OAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,qBAAS,CAAC,GAAG,EAAE;gBACb,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;oBACjB,MAAM,CAAC,sBAAS,EAAE,CAAC,gBAAgB,EAAE,CAAC;gBACxC,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACN,MAAM,CAAC,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC,CAAC;iBACF,SAAS,CAAC;gBACT,KAAK,CAAC,GAAG;oBACP,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;oBAC3C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACtB,CAAC;gBACD,QAAQ;oBACN,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;wBAChB,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,kDAAkD,CAAC,CAAC,CAAC;oBAC3E,CAAC;oBACD,OAAO,CAAC,EAAC,aAAa,EAAC,CAAC,CAAC;gBAC3B,CAAC;aACF,CAAC,CAAC;QACP,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,MAAuB,EAAE,EAAE;YAChC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;YAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;gBACjD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YAE/D,EAAE,CAAC,CAAC,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC;gBAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC;oBAC5B,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;gBAEH,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAClB,GAAG,EAAE,IAAI;oBACT,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,CAAC;4BACR,KAAK,EAAE,aAAa;iCACjB,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iCAC3C,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;yBACvD,CAAC;iBACH,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,qBAAqB,SAA4B,EAAE,OAAyB;IAC1E,MAAM,UAAU,GAAS,SAAS,CAAC,WAAY,CAAC,UAAU;QACxD,CAAC,CAAO,SAAS,CAAC,WAAY,CAAC,UAAU,CAAC,UAAU;QACpD,CAAC,CAAC,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACrC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,CAAC;YACpE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,IAAI,cAAc,qBACb,OAAO,EACP,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAC3D,CAAC;IACF,cAAc,qBACT,cAAc,EACd,gBAAgB,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAC/D,CAAC;IAEF,MAAM,CAAC,cAAc,CAAC;AACxB,CAAC;AAED,sBAAsB,aAAqB,EAAE,UAAoB,EAAE,OAAY;IAC7E,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAG,EAAE,EAAE;QACzC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QACvF,MAAM,CAAC,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,MAAM,oBAAoB,GAAQ;IAChC,UAAU,EAAE,UAAU;IACtB,QAAQ,EAAE,QAAQ;IAClB,MAAM,EAAE,MAAM;CACf,CAAC;AAEF,MAAM,kBAAkB,GAAQ;IAC9B,SAAS,EAAE,SAAS;IACpB,QAAQ,EAAE,QAAQ;CACnB,CAAC;AAEF,0BAA0B,aAAqB,EAAE,UAAoB,EAAE,OAAY;IACjF,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAG,EAAE,EAAE;QAEzC,EAAE,CAAC,CAAC,aAAa,KAAK,aAAa,IAAI,aAAa,KAAK,WAAW,CAAC,CAAC,CAAC;YACrE,EAAE,CAAC,CAAC,GAAG,KAAK,mBAAmB,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAChD,GAAG,CAAC,GAAG,CAAC,GAAG,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrD,GAAG,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QACD,MAAM,CAAC,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,qBAAqB,aAAqB,EAAE,GAAW;IACrD,MAAM,QAAQ,GAAG,YAAY,aAAa,IAAI,GAAG,EAAE,CAAC;IACpD,MAAM,CAAC,kBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACtC,CAAC"}
|