@angular-devkit/architect 0.1701.2 → 0.1702.0-next.1

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@angular-devkit/architect",
-  "version": "0.1701.2",
+  "version": "0.1702.0-next.1",
   "description": "Angular Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
-    "@angular-devkit/core": "17.1.2",
+    "@angular-devkit/core": "17.2.0-next.1",
     "rxjs": "7.8.1"
   },
   "builders": "./builders/builders.json",

package/src/api.d.ts

@@ -249,9 +249,10 @@ export type BuilderInfo = json.JsonObject & {
  */
 export declare function targetStringFromTarget({ project, target, configuration }: Target): string;
 /**
- * Return a Target tuple from a string.
+ * Return a Target tuple from a specifier string.
+ * Supports abbreviated target specifiers (examples: `::`, `::development`, or `:build:production`).
  */
-export declare function targetFromTargetString(str: string): Target;
+export declare function targetFromTargetString(specifier: string, abbreviatedProjectName?: string, abbreviatedTargetName?: string): Target;
 /**
  * Schedule a target, and forget about its run. This will return an observable of outputs, that
  * as a teardown will stop the target from running. This means that the Run object this returns

package/src/api.js

@@ -51,16 +51,17 @@ function targetStringFromTarget({ project, target, configuration }) {
 }
 exports.targetStringFromTarget = targetStringFromTarget;
 /**
- * Return a Target tuple from a string.
+ * Return a Target tuple from a specifier string.
+ * Supports abbreviated target specifiers (examples: `::`, `::development`, or `:build:production`).
  */
-function targetFromTargetString(str) {
-    const tuple = str.split(/:/, 3);
+function targetFromTargetString(specifier, abbreviatedProjectName, abbreviatedTargetName) {
+    const tuple = specifier.split(':', 3);
     if (tuple.length < 2) {
-        throw new Error('Invalid target string: ' + JSON.stringify(str));
+        throw new Error('Invalid target string: ' + JSON.stringify(specifier));
     }
     return {
-        project: tuple[0],
-        target: tuple[1],
+        project: tuple[0] || abbreviatedProjectName || '',
+        target: tuple[1] || abbreviatedTargetName || '',
         ...(tuple[2] !== undefined && { configuration: tuple[2] }),
     };
 }

package/src/jobs/index.d.ts

@@ -5,6 +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 * as strategy from './strategy';
 export * from './api';
 export * from './create-job-handler';
 export * from './exception';
@@ -12,4 +13,4 @@ export * from './dispatcher';
 export * from './fallback-registry';
 export * from './simple-registry';
 export * from './simple-scheduler';
-export * from './strategy';
+export { strategy };

package/src/jobs/index.js

@@ -17,10 +17,25 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.strategy = void 0;
+const strategy = __importStar(require("./strategy"));
+exports.strategy = strategy;
 __exportStar(require("./api"), exports);
 __exportStar(require("./create-job-handler"), exports);
 __exportStar(require("./exception"), exports);
@@ -28,4 +43,3 @@ __exportStar(require("./dispatcher"), exports);
 __exportStar(require("./fallback-registry"), exports);
 __exportStar(require("./simple-registry"), exports);
 __exportStar(require("./simple-scheduler"), exports);
-__exportStar(require("./strategy"), exports);

package/src/jobs/strategy.d.ts

@@ -7,22 +7,20 @@
  */
 import { JsonValue } from '@angular-devkit/core';
 import { JobDescription, JobHandler } from './api';
-export declare namespace strategy {
-    type JobStrategy<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue> = (handler: JobHandler<A, I, O>, options?: Partial<Readonly<JobDescription>>) => JobHandler<A, I, O>;
-    /**
-     * Creates a JobStrategy that serializes every call. This strategy can be mixed between jobs.
-     */
-    function serialize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(): JobStrategy<A, I, O>;
-    /**
-     * Creates a JobStrategy that will always reuse a running job, and restart it if the job ended.
-     * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
-     * is.
-     */
-    function reuse<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
-    /**
-     * Creates a JobStrategy that will reuse a running job if the argument matches.
-     * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
-     * is.
-     */
-    function memoize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
-}
+export type JobStrategy<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue> = (handler: JobHandler<A, I, O>, options?: Partial<Readonly<JobDescription>>) => JobHandler<A, I, O>;
+/**
+ * Creates a JobStrategy that serializes every call. This strategy can be mixed between jobs.
+ */
+export declare function serialize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(): JobStrategy<A, I, O>;
+/**
+ * Creates a JobStrategy that will always reuse a running job, and restart it if the job ended.
+ * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
+ * is.
+ */
+export declare function reuse<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
+/**
+ * Creates a JobStrategy that will reuse a running job if the argument matches.
+ * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
+ * is.
+ */
+export declare function memoize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;

package/src/jobs/strategy.js

@@ -7,92 +7,88 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strategy = void 0;
+exports.memoize = exports.reuse = exports.serialize = void 0;
 const core_1 = require("@angular-devkit/core");
 const rxjs_1 = require("rxjs");
 const api_1 = require("./api");
-// eslint-disable-next-line @typescript-eslint/no-namespace
-var strategy;
-(function (strategy) {
-    /**
-     * Creates a JobStrategy that serializes every call. This strategy can be mixed between jobs.
-     */
-    function serialize() {
-        let latest = (0, rxjs_1.of)();
-        return (handler, options) => {
-            const newHandler = (argument, context) => {
-                const previous = latest;
-                latest = (0, rxjs_1.concat)(previous.pipe((0, rxjs_1.ignoreElements)()), new rxjs_1.Observable((o) => handler(argument, context).subscribe(o))).pipe((0, rxjs_1.shareReplay)(0));
-                return latest;
-            };
-            return Object.assign(newHandler, {
-                jobDescription: Object.assign({}, handler.jobDescription, options),
-            });
+/**
+ * Creates a JobStrategy that serializes every call. This strategy can be mixed between jobs.
+ */
+function serialize() {
+    let latest = (0, rxjs_1.of)();
+    return (handler, options) => {
+        const newHandler = (argument, context) => {
+            const previous = latest;
+            latest = (0, rxjs_1.concat)(previous.pipe((0, rxjs_1.ignoreElements)()), new rxjs_1.Observable((o) => handler(argument, context).subscribe(o))).pipe((0, rxjs_1.shareReplay)(0));
+            return latest;
         };
-    }
-    strategy.serialize = serialize;
-    /**
-     * Creates a JobStrategy that will always reuse a running job, and restart it if the job ended.
-     * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
-     * is.
-     */
-    function reuse(replayMessages = false) {
-        let inboundBus = new rxjs_1.Subject();
-        let run = null;
-        let state = null;
-        return (handler, options) => {
-            const newHandler = (argument, context) => {
-                // Forward inputs.
-                const subscription = context.inboundBus.subscribe(inboundBus);
-                if (run) {
-                    return (0, rxjs_1.concat)(
-                    // Update state.
-                    (0, rxjs_1.of)(state), run).pipe((0, rxjs_1.finalize)(() => subscription.unsubscribe()));
+        return Object.assign(newHandler, {
+            jobDescription: Object.assign({}, handler.jobDescription, options),
+        });
+    };
+}
+exports.serialize = serialize;
+/**
+ * Creates a JobStrategy that will always reuse a running job, and restart it if the job ended.
+ * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
+ * is.
+ */
+function reuse(replayMessages = false) {
+    let inboundBus = new rxjs_1.Subject();
+    let run = null;
+    let state = null;
+    return (handler, options) => {
+        const newHandler = (argument, context) => {
+            // Forward inputs.
+            const subscription = context.inboundBus.subscribe(inboundBus);
+            if (run) {
+                return (0, rxjs_1.concat)(
+                // Update state.
+                (0, rxjs_1.of)(state), run).pipe((0, rxjs_1.finalize)(() => subscription.unsubscribe()));
+            }
+            run = handler(argument, { ...context, inboundBus: inboundBus.asObservable() }).pipe((0, rxjs_1.tap)((message) => {
+                if (message.kind == api_1.JobOutboundMessageKind.Start ||
+                    message.kind == api_1.JobOutboundMessageKind.OnReady ||
+                    message.kind == api_1.JobOutboundMessageKind.End) {
+                    state = message;
                 }
-                run = handler(argument, { ...context, inboundBus: inboundBus.asObservable() }).pipe((0, rxjs_1.tap)((message) => {
-                    if (message.kind == api_1.JobOutboundMessageKind.Start ||
-                        message.kind == api_1.JobOutboundMessageKind.OnReady ||
-                        message.kind == api_1.JobOutboundMessageKind.End) {
-                        state = message;
-                    }
-                }, undefined, () => {
-                    subscription.unsubscribe();
-                    inboundBus = new rxjs_1.Subject();
-                    run = null;
-                }), replayMessages ? (0, rxjs_1.shareReplay)() : (0, rxjs_1.share)());
-                return run;
-            };
-            return Object.assign(newHandler, handler, options || {});
+            }, undefined, () => {
+                subscription.unsubscribe();
+                inboundBus = new rxjs_1.Subject();
+                run = null;
+            }), replayMessages ? (0, rxjs_1.shareReplay)() : (0, rxjs_1.share)());
+            return run;
         };
-    }
-    strategy.reuse = reuse;
-    /**
-     * Creates a JobStrategy that will reuse a running job if the argument matches.
-     * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
-     * is.
-     */
-    function memoize(replayMessages = false) {
-        const runs = new Map();
-        return (handler, options) => {
-            const newHandler = (argument, context) => {
-                const argumentJson = JSON.stringify((0, core_1.isJsonObject)(argument)
-                    ? Object.keys(argument)
-                        .sort()
-                        .reduce((result, key) => {
-                        result[key] = argument[key];
-                        return result;
-                    }, {})
-                    : argument);
-                const maybeJob = runs.get(argumentJson);
-                if (maybeJob) {
-                    return maybeJob;
-                }
-                const run = handler(argument, context).pipe(replayMessages ? (0, rxjs_1.shareReplay)() : (0, rxjs_1.share)());
-                runs.set(argumentJson, run);
-                return run;
-            };
-            return Object.assign(newHandler, handler, options || {});
+        return Object.assign(newHandler, handler, options || {});
+    };
+}
+exports.reuse = reuse;
+/**
+ * Creates a JobStrategy that will reuse a running job if the argument matches.
+ * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
+ * is.
+ */
+function memoize(replayMessages = false) {
+    const runs = new Map();
+    return (handler, options) => {
+        const newHandler = (argument, context) => {
+            const argumentJson = JSON.stringify((0, core_1.isJsonObject)(argument)
+                ? Object.keys(argument)
+                    .sort()
+                    .reduce((result, key) => {
+                    result[key] = argument[key];
+                    return result;
+                }, {})
+                : argument);
+            const maybeJob = runs.get(argumentJson);
+            if (maybeJob) {
+                return maybeJob;
+            }
+            const run = handler(argument, context).pipe(replayMessages ? (0, rxjs_1.shareReplay)() : (0, rxjs_1.share)());
+            runs.set(argumentJson, run);
+            return run;
         };
-    }
-    strategy.memoize = memoize;
-})(strategy || (exports.strategy = strategy = {}));
+        return Object.assign(newHandler, handler, options || {});
+    };
+}
+exports.memoize = memoize;