@angular-devkit/architect 0.800.0 → 0.800.4

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

@@ -67,8 +67,9 @@ class WorkspaceNodeModulesArchitectHost {
         if (targetSpec === undefined) {
             return null;
         }
-        if (target.configuration && !targetSpec['configurations']) {
-            throw new Error('Configuration not set in the workspace.');
+        if (target.configuration
+            && !(targetSpec['configurations'] && targetSpec['configurations'][target.configuration])) {
+            throw new Error(`Configuration '${target.configuration}' is not set in the workspace.`);
         }
         return {
             ...targetSpec['options'],

package/package.json

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

package/src/api.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, experimental, json, logging } from '@angular-devkit/core';
-import { Observable } from 'rxjs';
+import { Observable, SubscribableOrPromise } from 'rxjs';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
 import { Schema as RealBuilderOutput } from './output-schema';
 import { Schema as RealBuilderProgress, State as BuilderProgressState } from './progress-schema';
@@ -211,7 +211,8 @@ export interface BuilderContext {
 /**
  * An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
  */
-export declare type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+export declare type BuilderOutputLike = SubscribableOrPromise<BuilderOutput> | BuilderOutput;
+export declare function isBuilderOutput(obj: any): obj is BuilderOutput;
 /**
  * A builder handler function. The function signature passed to `createBuilder()`.
  */

package/src/api.js

@@ -4,6 +4,14 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const progress_schema_1 = require("./progress-schema");
 exports.BuilderProgressState = progress_schema_1.State;
+// tslint:disable-next-line:no-any
+function isBuilderOutput(obj) {
+    if (!obj || typeof obj.then === 'function' || typeof obj.subscribe === 'function') {
+        return false;
+    }
+    return typeof obj.success === 'boolean';
+}
+exports.isBuilderOutput = isBuilderOutput;
 /**
  * Returns a string of "project:target[:configuration]" for the target object.
  */

package/src/architect.js

@@ -239,7 +239,8 @@ class Architect {
         return this._scheduler.has(name);
     }
     scheduleBuilder(name, options, scheduleOptions = {}) {
-        if (!/^[^:]+:[^:]+$/.test(name)) {
+        // The below will match 'project:target:configuration'
+        if (!/^[^:]+:[^:]+(:[^:]+)?$/.test(name)) {
             throw new Error('Invalid builder name: ' + JSON.stringify(name));
         }
         return schedule_by_name_1.scheduleByName(name, options, {

package/src/create-builder.js

@@ -143,16 +143,16 @@ function createBuilder(fn) {
                 let result;
                 try {
                     result = fn(i.options, context);
+                    if (api_1.isBuilderOutput(result)) {
+                        result = rxjs_1.of(result);
+                    }
+                    else {
+                        result = rxjs_1.from(result);
+                    }
                 }
                 catch (e) {
                     result = rxjs_1.throwError(e);
                 }
-                if (core_1.isPromise(result)) {
-                    result = rxjs_1.from(result);
-                }
-                else if (!rxjs_1.isObservable(result)) {
-                    result = rxjs_1.of(result);
-                }
                 // Manage some state automatically.
                 progress({ state: api_1.BuilderProgressState.Running, current: 0, total: 1 }, context);
                 subscriptions.push(result.pipe(operators_1.tap(() => {