diff --git a/README.md b/README.md index 0ce6aab3d..95ee2d43c 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,22 @@ npm install git+https://github.com/angular/angular-devkit-architect-cli-builds.g ``` ---- +# Architect CLI + +This package contains the executable for running an [Architect Builder](/packages/angular_devkit/architect/README.md). + +# Usage + +``` +architect [project][:target][:configuration] [options, ...] + +Run a project target. +If project/target/configuration are not specified, the workspace defaults will be used. + +Options: + --help Show available options for project target. + Shows this message instead when ran without the run argument. + + +Any additional option is passed the target, overriding existing options. +``` diff --git a/bin/architect.d.ts b/bin/architect.d.ts index 980409b99..2b1611b75 100644 --- a/bin/architect.d.ts +++ b/bin/architect.d.ts @@ -1,2 +1,9 @@ #!/usr/bin/env node -import 'symbol-observable'; +/** + * @license + * Copyright Google LLC 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 + */ +export {}; diff --git a/bin/architect.js b/bin/architect.js index 5d4d6b704..83bb26ecf 100644 --- a/bin/architect.js +++ b/bin/architect.js @@ -1,17 +1,45 @@ #!/usr/bin/env node "use strict"; +/** + * @license + * Copyright Google LLC 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 + */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -require("symbol-observable"); -// symbol polyfill must go first -// tslint:disable-next-line:ordered-imports import-groups const architect_1 = require("@angular-devkit/architect"); +const node_1 = require("@angular-devkit/architect/node"); const core_1 = require("@angular-devkit/core"); -const node_1 = require("@angular-devkit/core/node"); +const node_2 = require("@angular-devkit/core/node"); +const ansiColors = __importStar(require("ansi-colors")); const fs_1 = require("fs"); -const minimist = require("minimist"); -const path = require("path"); -const rxjs_1 = require("rxjs"); +const minimist_1 = __importDefault(require("minimist")); +const path = __importStar(require("path")); const operators_1 = require("rxjs/operators"); +const progress_1 = require("../src/progress"); function findUp(names, from) { if (!Array.isArray(names)) { names = [names]; @@ -32,7 +60,7 @@ function findUp(names, from) { /** * Show usage of the CLI tool, and exit the process. */ -function usage(exitCode = 0) { +function usage(logger, exitCode = 0) { logger.info(core_1.tags.stripIndent ` architect [project][:target][:configuration] [options, ...] @@ -46,74 +74,128 @@ function usage(exitCode = 0) { Any additional option is passed the target, overriding existing options. `); - process.exit(exitCode); - throw 0; // The node typing sometimes don't have a never type for process.exit(). + return process.exit(exitCode); } -/** Parse the command line. */ -const argv = minimist(process.argv.slice(2), { boolean: ['help'] }); -/** Create the DevKit Logger used through the CLI. */ -const logger = node_1.createConsoleLogger(argv['verbose']); -// Check the target. -const targetStr = argv._.shift(); -if (!targetStr && argv.help) { - // Show architect usage if there's no target. - usage(); +function _targetStringFromTarget({ project, target, configuration }) { + return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`; } -// Split a target into its parts. -let project, targetName, configuration; -if (targetStr) { - [project, targetName, configuration] = targetStr.split(':'); -} -// Load workspace configuration file. -const currentPath = process.cwd(); -const configFileNames = [ - 'angular.json', - '.angular.json', - 'workspace.json', - '.workspace.json', -]; -const configFilePath = findUp(configFileNames, currentPath); -if (!configFilePath) { - logger.fatal(`Workspace configuration file (${configFileNames.join(', ')}) cannot be found in ` - + `'${currentPath}' or in parent directories.`); - process.exit(3); - throw 3; // TypeScript doesn't know that process.exit() never returns. +// Create a separate instance to prevent unintended global changes to the color configuration +// Create function is not defined in the typings. See: https://github.com/doowb/ansi-colors/pull/44 +const colors = ansiColors.create(); +async function _executeTarget(parentLogger, workspace, root, argv, registry) { + const architectHost = new node_1.WorkspaceNodeModulesArchitectHost(workspace, root); + const architect = new architect_1.Architect(architectHost, registry); + // Split a target into its parts. + const targetStr = argv._.shift() || ''; + const [project, target, configuration] = targetStr.split(':'); + const targetSpec = { project, target, configuration }; + delete argv['help']; + const logger = new core_1.logging.Logger('jobs'); + const logs = []; + logger.subscribe((entry) => logs.push({ ...entry, message: `${entry.name}: ` + entry.message })); + const { _, ...options } = argv; + const run = await architect.scheduleTarget(targetSpec, options, { logger }); + const bars = new progress_1.MultiProgressBar(':name :bar (:current/:total) :status'); + run.progress.subscribe((update) => { + const data = bars.get(update.id) || { + id: update.id, + builder: update.builder, + target: update.target, + status: update.status || '', + name: ((update.target ? _targetStringFromTarget(update.target) : update.builder.name) + + ' '.repeat(80)).substr(0, 40), + }; + if (update.status !== undefined) { + data.status = update.status; + } + switch (update.state) { + case architect_1.BuilderProgressState.Error: + data.status = 'Error: ' + update.error; + bars.update(update.id, data); + break; + case architect_1.BuilderProgressState.Stopped: + data.status = 'Done.'; + bars.complete(update.id); + bars.update(update.id, data, update.total, update.total); + break; + case architect_1.BuilderProgressState.Waiting: + bars.update(update.id, data); + break; + case architect_1.BuilderProgressState.Running: + bars.update(update.id, data, update.current, update.total); + break; + } + bars.render(); + }); + // Wait for full completion of the builder. + try { + const { success } = await run.output + .pipe(operators_1.tap((result) => { + if (result.success) { + parentLogger.info(colors.green('SUCCESS')); + } + else { + parentLogger.info(colors.red('FAILURE')); + } + parentLogger.info('Result: ' + JSON.stringify({ ...result, info: undefined }, null, 4)); + parentLogger.info('\nLogs:'); + logs.forEach((l) => parentLogger.next(l)); + logs.splice(0); + })) + .toPromise(); + await run.stop(); + bars.terminate(); + return success ? 0 : 1; + } + catch (err) { + parentLogger.info(colors.red('ERROR')); + parentLogger.info('\nLogs:'); + logs.forEach((l) => parentLogger.next(l)); + parentLogger.fatal('Exception:'); + parentLogger.fatal(err.stack); + return 2; + } } -const root = core_1.dirname(core_1.normalize(configFilePath)); -const configContent = fs_1.readFileSync(configFilePath, 'utf-8'); -const workspaceJson = JSON.parse(configContent); -const host = new node_1.NodeJsSyncHost(); -const workspace = new core_1.experimental.workspace.Workspace(root, host); -let lastBuildEvent = { success: true }; -workspace.loadWorkspaceFromJson(workspaceJson).pipe(operators_1.concatMap(ws => new architect_1.Architect(ws).loadArchitect()), operators_1.concatMap(architect => { - const overrides = Object.assign({}, argv); - delete overrides['help']; - delete overrides['_']; - const targetSpec = { - project, - target: targetName, - configuration, - overrides, - }; - // TODO: better logging of what's happening. - if (argv.help) { - // TODO: add target help - return rxjs_1.throwError('Target help NYI.'); - // architect.help(targetOptions, logger); +async function main(args) { + /** Parse the command line. */ + const argv = minimist_1.default(args, { boolean: ['help'] }); + /** Create the DevKit Logger used through the CLI. */ + const logger = node_2.createConsoleLogger(argv['verbose'], process.stdout, process.stderr, { + info: (s) => s, + debug: (s) => s, + warn: (s) => colors.bold.yellow(s), + error: (s) => colors.bold.red(s), + fatal: (s) => colors.bold.red(s), + }); + // Check the target. + const targetStr = argv._[0] || ''; + if (!targetStr || argv.help) { + // Show architect usage if there's no target. + usage(logger); } - else { - const builderConfig = architect.getBuilderConfiguration(targetSpec); - return architect.run(builderConfig, { logger }); + // Load workspace configuration file. + const currentPath = process.cwd(); + const configFileNames = ['angular.json', '.angular.json', 'workspace.json', '.workspace.json']; + const configFilePath = findUp(configFileNames, currentPath); + if (!configFilePath) { + logger.fatal(`Workspace configuration file (${configFileNames.join(', ')}) cannot be found in ` + + `'${currentPath}' or in parent directories.`); + return 3; } -})).subscribe({ - next: (buildEvent => lastBuildEvent = buildEvent), - complete: () => process.exit(lastBuildEvent.success ? 0 : 1), - error: (err) => { - logger.fatal(err.message); - if (err.stack) { - logger.fatal(err.stack); - } - process.exit(1); - }, + const root = path.dirname(configFilePath); + const registry = new core_1.schema.CoreSchemaRegistry(); + registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults); + // Show usage of deprecated options + registry.useXDeprecatedProvider((msg) => logger.warn(msg)); + const { workspace } = await core_1.workspaces.readWorkspace(configFilePath, core_1.workspaces.createWorkspaceHost(new node_2.NodeJsSyncHost())); + // Clear the console. + process.stdout.write('\u001Bc'); + return await _executeTarget(logger, workspace, root, argv, registry); +} +main(process.argv.slice(2)).then((code) => { + process.exit(code); +}, (err) => { + // eslint-disable-next-line no-console + console.error('Error: ' + err.stack || err.message || err); + process.exit(-1); }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"architect.js","sourceRoot":"./","sources":["packages/angular_devkit/architect_cli/bin/architect.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\n/**\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport 'symbol-observable';\n// symbol polyfill must go first\n// tslint:disable-next-line:ordered-imports import-groups\nimport { Architect } from '@angular-devkit/architect';\nimport { dirname, experimental, normalize, tags } from '@angular-devkit/core';\nimport { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';\nimport { existsSync, readFileSync } from 'fs';\nimport * as minimist from 'minimist';\nimport * as path from 'path';\nimport { throwError } from 'rxjs';\nimport { concatMap } from 'rxjs/operators';\n\n\nfunction findUp(names: string | string[], from: string) {\n  if (!Array.isArray(names)) {\n    names = [names];\n  }\n  const root = path.parse(from).root;\n\n  let currentDir = from;\n  while (currentDir && currentDir !== root) {\n    for (const name of names) {\n      const p = path.join(currentDir, name);\n      if (existsSync(p)) {\n        return p;\n      }\n    }\n\n    currentDir = path.dirname(currentDir);\n  }\n\n  return null;\n}\n\n/**\n * Show usage of the CLI tool, and exit the process.\n */\nfunction usage(exitCode = 0): never {\n  logger.info(tags.stripIndent`\n    architect [project][:target][:configuration] [options, ...]\n\n    Run a project target.\n    If project/target/configuration are not specified, the workspace defaults will be used.\n\n    Options:\n        --help              Show available options for project target.\n                            Shows this message instead when ran without the run argument.\n\n\n    Any additional option is passed the target, overriding existing options.\n  `);\n\n  process.exit(exitCode);\n  throw 0;  // The node typing sometimes don't have a never type for process.exit().\n}\n\n/** Parse the command line. */\nconst argv = minimist(process.argv.slice(2), { boolean: ['help'] });\n\n/** Create the DevKit Logger used through the CLI. */\nconst logger = createConsoleLogger(argv['verbose']);\n\n// Check the target.\nconst targetStr = argv._.shift();\nif (!targetStr && argv.help) {\n  // Show architect usage if there's no target.\n  usage();\n}\n\n// Split a target into its parts.\nlet project: string, targetName: string, configuration: string;\nif (targetStr) {\n  [project, targetName, configuration] = targetStr.split(':');\n}\n\n// Load workspace configuration file.\nconst currentPath = process.cwd();\nconst configFileNames = [\n  'angular.json',\n  '.angular.json',\n  'workspace.json',\n  '.workspace.json',\n];\n\nconst configFilePath = findUp(configFileNames, currentPath);\n\nif (!configFilePath) {\n  logger.fatal(`Workspace configuration file (${configFileNames.join(', ')}) cannot be found in `\n    + `'${currentPath}' or in parent directories.`);\n  process.exit(3);\n  throw 3;  // TypeScript doesn't know that process.exit() never returns.\n}\n\nconst root = dirname(normalize(configFilePath));\nconst configContent = readFileSync(configFilePath, 'utf-8');\nconst workspaceJson = JSON.parse(configContent);\n\nconst host = new NodeJsSyncHost();\nconst workspace = new experimental.workspace.Workspace(root, host);\n\nlet lastBuildEvent = { success: true };\n\nworkspace.loadWorkspaceFromJson(workspaceJson).pipe(\n  concatMap(ws => new Architect(ws).loadArchitect()),\n  concatMap(architect => {\n\n    const overrides = { ...argv };\n    delete overrides['help'];\n    delete overrides['_'];\n\n    const targetSpec = {\n      project,\n      target: targetName,\n      configuration,\n      overrides,\n    };\n\n    // TODO: better logging of what's happening.\n    if (argv.help) {\n      // TODO: add target help\n      return throwError('Target help NYI.');\n      // architect.help(targetOptions, logger);\n    } else {\n      const builderConfig = architect.getBuilderConfiguration(targetSpec);\n\n      return architect.run(builderConfig, { logger });\n    }\n  }),\n).subscribe({\n  next: (buildEvent => lastBuildEvent = buildEvent),\n  complete: () => process.exit(lastBuildEvent.success ? 0 : 1),\n  error: (err: Error) => {\n    logger.fatal(err.message);\n    if (err.stack) {\n      logger.fatal(err.stack);\n    }\n    process.exit(1);\n  },\n});\n"]} \ No newline at end of file diff --git a/package.json b/package.json index 7de032ab5..8af4a610d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,9 @@ { "name": "@angular-devkit/architect-cli", - "version": "0.12.0-rc.0", + "version": "0.1300.0-next.0", "description": "Angular Architect CLI", + "homepage": "https://github.com/angular/angular-cli", + "experimental": true, "bin": { "architect": "./bin/architect.js" }, @@ -17,24 +19,26 @@ "tooling" ], "dependencies": { - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0b7dd0e", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0b7dd0e", - "minimist": "1.2.0", - "symbol-observable": "1.2.0", - "rxjs": "6.3.3" + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#9eb599da2", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#9eb599da2", + "ansi-colors": "4.1.1", + "minimist": "1.2.5", + "progress": "2.0.3", + "rxjs": "6.6.7", + "symbol-observable": "4.0.0" }, "repository": { "type": "git", "url": "https://github.com/angular/angular-cli.git" }, "engines": { - "node": ">= 8.9.0", - "npm": ">= 5.5.1" + "node": "^12.20.0 || >=14.0.0", + "npm": "^6.11.0 || ^7.5.6", + "yarn": ">= 1.13.0" }, "author": "Angular Authors", "license": "MIT", "bugs": { "url": "https://github.com/angular/angular-cli/issues" - }, - "homepage": "https://github.com/angular/angular-cli" + } } diff --git a/src/progress.d.ts b/src/progress.d.ts new file mode 100644 index 000000000..d8550e868 --- /dev/null +++ b/src/progress.d.ts @@ -0,0 +1,22 @@ +/** + * @license + * Copyright Google LLC 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 + */ +/// +export declare class MultiProgressBar { + private _status; + private _stream; + private _bars; + constructor(_status: string, _stream?: NodeJS.WriteStream); + private _add; + complete(id: Key): void; + add(id: Key, data: T): void; + get(key: Key): T | undefined; + has(key: Key): boolean; + update(key: Key, data: T, current?: number, total?: number): void; + render(max?: number, sort?: (a: T, b: T) => number): void; + terminate(): void; +} diff --git a/src/progress.js b/src/progress.js new file mode 100644 index 000000000..e64961cc1 --- /dev/null +++ b/src/progress.js @@ -0,0 +1,112 @@ +"use strict"; +/** + * @license + * Copyright Google LLC 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 + */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + __setModuleDefault(result, mod); + return result; +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MultiProgressBar = void 0; +const progress_1 = __importDefault(require("progress")); +const readline = __importStar(require("readline")); +class MultiProgressBar { + constructor(_status, _stream = process.stderr) { + this._status = _status; + this._stream = _stream; + this._bars = new Map(); + } + _add(id, data) { + const width = Math.min(80, this._stream.columns || 80); + const value = { + data, + bar: new progress_1.default(this._status, { + renderThrottle: 0, + clear: true, + total: 1, + width: width, + complete: '#', + incomplete: '.', + stream: this._stream, + }), + }; + this._bars.set(id, value); + readline.moveCursor(this._stream, 0, 1); + return value; + } + complete(id) { + const maybeBar = this._bars.get(id); + if (maybeBar) { + maybeBar.bar.complete = true; + } + } + add(id, data) { + this._add(id, data); + } + get(key) { + const maybeValue = this._bars.get(key); + return maybeValue && maybeValue.data; + } + has(key) { + return this._bars.has(key); + } + update(key, data, current, total) { + let maybeBar = this._bars.get(key); + if (!maybeBar) { + maybeBar = this._add(key, data); + } + maybeBar.data = data; + if (total !== undefined) { + maybeBar.bar.total = total; + } + if (current !== undefined) { + maybeBar.bar.curr = Math.max(0, Math.min(current, maybeBar.bar.total)); + } + } + render(max = Infinity, sort) { + const stream = this._stream; + readline.moveCursor(stream, 0, -this._bars.size); + readline.cursorTo(stream, 0); + let values = this._bars.values(); + if (sort) { + values = [...values].sort((a, b) => sort(a.data, b.data)); + } + for (const { data, bar } of values) { + if (max-- == 0) { + return; + } + bar.render(data); + readline.moveCursor(stream, 0, 1); + readline.cursorTo(stream, 0); + } + } + terminate() { + for (const { bar } of this._bars.values()) { + bar.terminate(); + } + this._bars.clear(); + } +} +exports.MultiProgressBar = MultiProgressBar; diff --git a/uniqueId b/uniqueId index 16d518091..847d54924 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Fri Dec 21 2018 21:43:48 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Aug 13 2021 20:44:51 GMT+0000 (Coordinated Universal Time) \ No newline at end of file