@angular-devkit/architect 0.800.0-rc.1 → 0.800.0

package/node/node-modules-architect-host.d.ts

@@ -5,7 +5,7 @@
  * 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 { experimental, json } from '@angular-devkit/core';
+import { experimental, json, workspaces } from '@angular-devkit/core';
 import { BuilderInfo } from '../src';
 import { Target } from '../src/input-schema';
 import { ArchitectHost, Builder } from '../src/internal';
@@ -13,9 +13,13 @@ export declare type NodeModulesBuilderInfo = BuilderInfo & {
     import: string;
 };
 export declare class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModulesBuilderInfo> {
-    protected _workspace: experimental.workspace.Workspace;
+    protected _workspace: experimental.workspace.Workspace | workspaces.WorkspaceDefinition;
     protected _root: string;
+    /**
+     * @deprecated
+     */
     constructor(_workspace: experimental.workspace.Workspace, _root: string);
+    constructor(_workspace: workspaces.WorkspaceDefinition, _root: string);
     getBuilderNameForTarget(target: Target): Promise<any>;
     /**
      * Resolve a builder. This needs to be a string which will be used in a dynamic `import()`
@@ -29,4 +33,5 @@ export declare class WorkspaceNodeModulesArchitectHost implements ArchitectHost<
     getWorkspaceRoot(): Promise<string>;
     getOptionsForTarget(target: Target): Promise<json.JsonObject | null>;
     loadBuilder(info: NodeModulesBuilderInfo): Promise<Builder>;
+    private findProjectTarget;
 }

package/node/node-modules-architect-host.js

@@ -10,7 +10,11 @@ class WorkspaceNodeModulesArchitectHost {
         this._root = _root;
     }
     async getBuilderNameForTarget(target) {
-        return this._workspace.getProjectTargets(target.project)[target.target]['builder'];
+        const targetDefinition = this.findProjectTarget(target);
+        if (!targetDefinition) {
+            throw new Error('Project target does not exist.');
+        }
+        return targetDefinition.builder;
     }
     /**
      * Resolve a builder. This needs to be a string which will be used in a dynamic `import()`
@@ -59,7 +63,7 @@ class WorkspaceNodeModulesArchitectHost {
         return this._root;
     }
     async getOptionsForTarget(target) {
-        const targetSpec = this._workspace.getProjectTargets(target.project)[target.target];
+        const targetSpec = this.findProjectTarget(target);
         if (targetSpec === undefined) {
             return null;
         }
@@ -78,5 +82,18 @@ class WorkspaceNodeModulesArchitectHost {
         }
         throw new Error('Builder is not a builder');
     }
+    findProjectTarget(target) {
+        // NOTE: Remove conditional when deprecated support for experimental workspace API is removed.
+        if ('getProjectTargets' in this._workspace) {
+            return this._workspace.getProjectTargets(target.project)[target.target];
+        }
+        else {
+            const projectDefinition = this._workspace.projects.get(target.project);
+            if (!projectDefinition) {
+                throw new Error('Project does not exist.');
+            }
+            return projectDefinition.targets.get(target.target);
+        }
+    }
 }
 exports.WorkspaceNodeModulesArchitectHost = WorkspaceNodeModulesArchitectHost;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@angular-devkit/architect",
-  "version": "0.800.0-rc.1",
+  "version": "0.800.0",
   "description": "Angular Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
-    "@angular-devkit/core": "8.0.0-rc.1",
+    "@angular-devkit/core": "8.0.0",
     "rxjs": "6.4.0"
   },
   "builders": "./builders/builders.json",

package/src/architect.d.ts

@@ -15,11 +15,10 @@ export interface ScheduleOptions {
 }
 export declare class Architect {
     private _host;
-    private _registry;
     private readonly _scheduler;
     private readonly _jobCache;
     private readonly _infoCache;
-    constructor(_host: ArchitectHost, _registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
+    constructor(_host: ArchitectHost, registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
     has(name: experimental.jobs.JobName): Observable<boolean>;
     scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
     scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;

package/src/architect.js

@@ -23,7 +23,8 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
         info,
     };
     function handler(argument, context) {
-        const inboundBus = context.inboundBus.pipe(operators_1.concatMap(message => {
+        // Add input validation to the inbound bus.
+        const inboundBusWithInputValidation = context.inboundBus.pipe(operators_1.concatMap(message => {
             if (message.kind === core_1.experimental.jobs.JobInboundMessageKind.Input) {
                 const v = message.value;
                 const options = {
@@ -31,16 +32,11 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
                     ...v.options,
                 };
                 // Validate v against the options schema.
-                return registry.compile(info.optionSchema).pipe(operators_1.concatMap(validation => validation(options)), operators_1.map(result => {
-                    if (result.success) {
-                        return { ...v, options: result.data };
-                    }
-                    else if (result.errors) {
-                        throw new core_1.json.schema.SchemaValidationException(result.errors);
-                    }
-                    else {
-                        return v;
+                return registry.compile(info.optionSchema).pipe(operators_1.concatMap(validation => validation(options)), operators_1.map(({ data, success, errors }) => {
+                    if (success) {
+                        return { ...v, options: data };
                     }
+                    throw new core_1.json.schema.SchemaValidationException(errors);
                 }), operators_1.map(value => ({ ...message, value })));
             }
             else {
@@ -50,7 +46,10 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
         // Using a share replay because the job might be synchronously sending input, but
         // asynchronously listening to it.
         operators_1.shareReplay(1));
-        return rxjs_1.from(host.loadBuilder(info)).pipe(operators_1.concatMap(builder => {
+        // Make an inboundBus that completes instead of erroring out.
+        // We'll merge the errors into the output instead.
+        const inboundBus = rxjs_1.onErrorResumeNext(inboundBusWithInputValidation);
+        const output = rxjs_1.from(host.loadBuilder(info)).pipe(operators_1.concatMap(builder => {
             if (builder === null) {
                 throw new Error(`Cannot load builder for builderInfo ${JSON.stringify(info, null, 2)}`);
             }
@@ -69,7 +68,14 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
                     return output;
                 }
             }));
-        }));
+        }), 
+        // Share subscriptions to the output, otherwise the the handler will be re-run.
+        operators_1.shareReplay());
+        // Separate the errors from the inbound bus into their own observable that completes when the
+        // builder output does.
+        const inboundBusErrors = inboundBusWithInputValidation.pipe(operators_1.ignoreElements(), operators_1.takeUntil(rxjs_1.onErrorResumeNext(output.pipe(operators_1.last()))));
+        // Return the builder output plus any input errors.
+        return rxjs_1.merge(inboundBusErrors, output);
     }
     return rxjs_1.of(Object.assign(handler, { jobDescription }));
 }
@@ -197,9 +203,7 @@ function _validateOptionsFactory(host, registry) {
             if (success) {
                 return rxjs_1.of(data);
             }
-            else {
-                throw new core_1.json.schema.SchemaValidationException(errors);
-            }
+            throw new core_1.json.schema.SchemaValidationException(errors);
         })).toPromise();
     }, {
         name: '..validateOptions',
@@ -214,23 +218,22 @@ function _validateOptionsFactory(host, registry) {
     });
 }
 class Architect {
-    constructor(_host, _registry = new core_1.json.schema.CoreSchemaRegistry(), additionalJobRegistry) {
+    constructor(_host, registry = new core_1.json.schema.CoreSchemaRegistry(), additionalJobRegistry) {
         this._host = _host;
-        this._registry = _registry;
         this._jobCache = new Map();
         this._infoCache = new Map();
         const privateArchitectJobRegistry = new core_1.experimental.jobs.SimpleJobRegistry();
         // Create private jobs.
         privateArchitectJobRegistry.register(_getTargetOptionsFactory(_host));
         privateArchitectJobRegistry.register(_getBuilderNameForTargetFactory(_host));
-        privateArchitectJobRegistry.register(_validateOptionsFactory(_host, _registry));
+        privateArchitectJobRegistry.register(_validateOptionsFactory(_host, registry));
         const jobRegistry = new core_1.experimental.jobs.FallbackRegistry([
-            new ArchitectTargetJobRegistry(_host, _registry, this._jobCache, this._infoCache),
-            new ArchitectBuilderJobRegistry(_host, _registry, this._jobCache, this._infoCache),
+            new ArchitectTargetJobRegistry(_host, registry, this._jobCache, this._infoCache),
+            new ArchitectBuilderJobRegistry(_host, registry, this._jobCache, this._infoCache),
             privateArchitectJobRegistry,
             ...(additionalJobRegistry ? [additionalJobRegistry] : []),
         ]);
-        this._scheduler = new core_1.experimental.jobs.SimpleScheduler(jobRegistry, _registry);
+        this._scheduler = new core_1.experimental.jobs.SimpleScheduler(jobRegistry, registry);
     }
     has(name) {
         return this._scheduler.has(name);

package/testing/index2.d.ts

@@ -1,8 +0,0 @@
-/**
- * @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
- */
-export * from './testing-architect-host';

package/testing/index2.js

@@ -1,13 +0,0 @@
-"use strict";
-/**
- * @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
- */
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./testing-architect-host"));