@angular-devkit/architect 0.1500.0-next.4 → 0.1500.0-next.5

package/node/BUILD.bazel

@@ -3,7 +3,9 @@
 # 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
 
+load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "ts_library")
+load("//tools:toolchain_info.bzl", "TOOLCHAINS_NAMES", "TOOLCHAINS_VERSIONS")
 
 licenses(["notice"])
 
@@ -21,7 +23,35 @@ ts_library(
         "//packages/angular_devkit/architect",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core/node",
+        "//tests/angular_devkit/architect/node/jobs:jobs_test_lib",
         "@npm//@types/node",
         "@npm//rxjs",
     ],
 )
+
+ts_library(
+    name = "node_test_lib",
+    testonly = True,
+    srcs = glob(
+        include = [
+            "**/*_spec.ts",
+        ],
+    ),
+    deps = [
+        ":node",
+        "//packages/angular_devkit/architect",
+    ],
+)
+
+[
+    jasmine_node_test(
+        name = "node_test_" + toolchain_name,
+        srcs = [":node_test_lib"],
+        tags = [toolchain_name],
+        toolchain = toolchain,
+    )
+    for toolchain_name, toolchain in zip(
+        TOOLCHAINS_NAMES,
+        TOOLCHAINS_VERSIONS,
+    )
+]

package/node/index.d.ts

@@ -5,4 +5,6 @@
  * 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 jobs from './jobs/job-registry';
 export * from './node-modules-architect-host';
+export { jobs };

package/node/index.js

@@ -17,8 +17,23 @@ 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.jobs = void 0;
+const jobs = __importStar(require("./jobs/job-registry"));
+exports.jobs = jobs;
 __exportStar(require("./node-modules-architect-host"), exports);

package/node/jobs/job-registry.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @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
+ */
+import { jobs } from '@angular-devkit/architect';
+import { JsonValue } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+export declare class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements jobs.Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    protected _resolve(name: string): string | null;
+    /**
+     * Get a job description for a named job.
+     *
+     * @param name The name of the job.
+     * @returns A description, or null if the job is not registered.
+     */
+    get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: jobs.JobName): Observable<jobs.JobHandler<A, I, O> | null>;
+}

package/node/jobs/job-registry.js

@@ -0,0 +1,59 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeModuleJobRegistry = void 0;
+const core_1 = require("@angular-devkit/core");
+const rxjs_1 = require("rxjs");
+class NodeModuleJobRegistry {
+    _resolve(name) {
+        try {
+            return require.resolve(name);
+        }
+        catch (e) {
+            if (e.code === 'MODULE_NOT_FOUND') {
+                return null;
+            }
+            throw e;
+        }
+    }
+    /**
+     * Get a job description for a named job.
+     *
+     * @param name The name of the job.
+     * @returns A description, or null if the job is not registered.
+     */
+    get(name) {
+        const [moduleName, exportName] = name.split(/#/, 2);
+        const resolvedPath = this._resolve(moduleName);
+        if (!resolvedPath) {
+            return (0, rxjs_1.of)(null);
+        }
+        const pkg = require(resolvedPath);
+        const handler = pkg[exportName || 'default'];
+        if (!handler) {
+            return (0, rxjs_1.of)(null);
+        }
+        function _getValue(...fields) {
+            return fields.find((x) => core_1.schema.isJsonSchema(x)) || true;
+        }
+        const argument = _getValue(pkg.argument, handler.argument);
+        const input = _getValue(pkg.input, handler.input);
+        const output = _getValue(pkg.output, handler.output);
+        const channels = _getValue(pkg.channels, handler.channels);
+        return (0, rxjs_1.of)(Object.assign(handler.bind(undefined), {
+            jobDescription: {
+                argument,
+                input,
+                output,
+                channels,
+            },
+        }));
+    }
+}
+exports.NodeModuleJobRegistry = NodeModuleJobRegistry;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@angular-devkit/architect",
-  "version": "0.1500.0-next.4",
+  "version": "0.1500.0-next.5",
   "description": "Angular Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
-    "@angular-devkit/core": "15.0.0-next.4",
+    "@angular-devkit/core": "15.0.0-next.5",
     "rxjs": "6.6.7"
   },
   "builders": "./builders/builders.json",
@@ -22,7 +22,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^14.20.0 || >=16.10.0",
+    "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/src/api.d.ts

@@ -5,14 +5,15 @@
  * 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 { analytics, experimental, json, logging } from '@angular-devkit/core';
+import { json, logging } from '@angular-devkit/core';
 import { Observable, SubscribableOrPromise } from 'rxjs';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
+import { Registry } from './jobs';
 import { Schema as RealBuilderOutput } from './output-schema';
 import { State as BuilderProgressState, Schema as RealBuilderProgress } from './progress-schema';
 export declare type Target = json.JsonObject & RealTarget;
 export { BuilderProgressState };
-export declare type BuilderRegistry = experimental.jobs.Registry<json.JsonObject, BuilderInput, BuilderOutput>;
+export declare type BuilderRegistry = Registry<json.JsonObject, BuilderInput, BuilderOutput>;
 /**
  * An API typed BuilderProgress. The interface generated from the schema is too permissive,
  * so this API is the one we show in our API. Please note that not all fields are in there; this
@@ -204,11 +205,6 @@ export interface BuilderContext {
      * @param status Update the status string. If omitted the status string is not modified.
      */
     reportProgress(current: number, total?: number, status?: string): void;
-    /**
-     * API to report analytics. This might be undefined if the feature is unsupported. This might
-     * not be undefined, but the backend could also not report anything.
-     */
-    readonly analytics: analytics.Analytics;
     /**
      * Add teardown logic to this Context, so that when it's being stopped it will execute teardown.
      */

package/src/architect.d.ts

@@ -5,21 +5,21 @@
  * 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 { analytics, experimental, json, logging } from '@angular-devkit/core';
+import { json, logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { BuilderRun, Target } from './api';
 import { ArchitectHost } from './internal';
+import { JobName, Registry } from './jobs';
 export interface ScheduleOptions {
     logger?: logging.Logger;
-    analytics?: analytics.Analytics;
 }
 export declare class Architect {
     private _host;
     private readonly _scheduler;
     private readonly _jobCache;
     private readonly _infoCache;
-    constructor(_host: ArchitectHost, registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
-    has(name: experimental.jobs.JobName): Observable<boolean>;
+    constructor(_host: ArchitectHost, registry?: json.schema.SchemaRegistry, additionalJobRegistry?: Registry);
+    has(name: 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

@@ -12,6 +12,7 @@ const core_1 = require("@angular-devkit/core");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const api_1 = require("./api");
+const jobs_1 = require("./jobs");
 const schedule_by_name_1 = require("./schedule-by-name");
 const inputSchema = require('./input-schema.json');
 const outputSchema = require('./output-schema.json');
@@ -26,7 +27,7 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
     function handler(argument, context) {
         // Add input validation to the inbound bus.
         const inboundBusWithInputValidation = context.inboundBus.pipe((0, operators_1.concatMap)((message) => {
-            if (message.kind === core_1.experimental.jobs.JobInboundMessageKind.Input) {
+            if (message.kind === jobs_1.JobInboundMessageKind.Input) {
                 const v = message.value;
                 const options = {
                     ...baseOptions,
@@ -56,7 +57,7 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
                 throw new Error(`Cannot load builder for builderInfo ${JSON.stringify(info, null, 2)}`);
             }
             return builder.handler(argument, { ...context, inboundBus }).pipe((0, operators_1.map)((output) => {
-                if (output.kind === core_1.experimental.jobs.JobOutboundMessageKind.Output) {
+                if (output.kind === jobs_1.JobOutboundMessageKind.Output) {
                     // Add target to it.
                     return {
                         ...output,
@@ -168,7 +169,7 @@ class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
     }
 }
 function _getTargetOptionsFactory(host) {
-    return core_1.experimental.jobs.createJobHandler((target) => {
+    return (0, jobs_1.createJobHandler)((target) => {
         return host.getOptionsForTarget(target).then((options) => {
             if (options === null) {
                 throw new Error(`Invalid target: ${JSON.stringify(target)}.`);
@@ -182,7 +183,7 @@ function _getTargetOptionsFactory(host) {
     });
 }
 function _getProjectMetadataFactory(host) {
-    return core_1.experimental.jobs.createJobHandler((target) => {
+    return (0, jobs_1.createJobHandler)((target) => {
         return host.getProjectMetadata(target).then((options) => {
             if (options === null) {
                 throw new Error(`Invalid target: ${JSON.stringify(target)}.`);
@@ -198,7 +199,7 @@ function _getProjectMetadataFactory(host) {
     });
 }
 function _getBuilderNameForTargetFactory(host) {
-    return core_1.experimental.jobs.createJobHandler(async (target) => {
+    return (0, jobs_1.createJobHandler)(async (target) => {
         const builderName = await host.getBuilderNameForTarget(target);
         if (!builderName) {
             throw new Error(`No builder were found for target ${(0, api_1.targetStringFromTarget)(target)}.`);
@@ -211,7 +212,7 @@ function _getBuilderNameForTargetFactory(host) {
     });
 }
 function _validateOptionsFactory(host, registry) {
-    return core_1.experimental.jobs.createJobHandler(async ([builderName, options]) => {
+    return (0, jobs_1.createJobHandler)(async ([builderName, options]) => {
         // Get option schema from the host.
         const builderInfo = await host.resolveBuilder(builderName);
         if (!builderInfo) {
@@ -240,19 +241,19 @@ class Architect {
         this._host = _host;
         this._jobCache = new Map();
         this._infoCache = new Map();
-        const privateArchitectJobRegistry = new core_1.experimental.jobs.SimpleJobRegistry();
+        const privateArchitectJobRegistry = new jobs_1.SimpleJobRegistry();
         // Create private jobs.
         privateArchitectJobRegistry.register(_getTargetOptionsFactory(_host));
         privateArchitectJobRegistry.register(_getBuilderNameForTargetFactory(_host));
         privateArchitectJobRegistry.register(_validateOptionsFactory(_host, registry));
         privateArchitectJobRegistry.register(_getProjectMetadataFactory(_host));
-        const jobRegistry = new core_1.experimental.jobs.FallbackRegistry([
+        const jobRegistry = new jobs_1.FallbackRegistry([
             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 jobs_1.SimpleScheduler(jobRegistry, registry);
     }
     has(name) {
         return this._scheduler.has(name);
@@ -267,7 +268,6 @@ class Architect {
             logger: scheduleOptions.logger || new core_1.logging.NullLogger(),
             currentDirectory: this._host.getCurrentDirectory(),
             workspaceRoot: this._host.getWorkspaceRoot(),
-            analytics: scheduleOptions.analytics,
         });
     }
     scheduleTarget(target, overrides = {}, scheduleOptions = {}) {
@@ -276,7 +276,6 @@ class Architect {
             logger: scheduleOptions.logger || new core_1.logging.NullLogger(),
             currentDirectory: this._host.getCurrentDirectory(),
             workspaceRoot: this._host.getWorkspaceRoot(),
-            analytics: scheduleOptions.analytics,
         });
     }
 }

package/src/create-builder.js

@@ -13,16 +13,16 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const api_1 = require("./api");
 const internal_1 = require("./internal");
+const jobs_1 = require("./jobs");
 const schedule_by_name_1 = require("./schedule-by-name");
 // eslint-disable-next-line max-lines-per-function
 function createBuilder(fn) {
-    const cjh = core_1.experimental.jobs.createJobHandler;
+    const cjh = jobs_1.createJobHandler;
     // eslint-disable-next-line max-lines-per-function
     const handler = cjh((options, context) => {
         const scheduler = context.scheduler;
         const progressChannel = context.createChannel('progress');
         const logChannel = context.createChannel('log');
-        const analyticsChannel = context.createChannel('analytics');
         let currentState = api_1.BuilderProgressState.Stopped;
         const teardownLogics = [];
         let tearingDown = false;
@@ -55,12 +55,12 @@ function createBuilder(fn) {
             const subscriptions = [];
             const inputSubscription = context.inboundBus.subscribe((i) => {
                 switch (i.kind) {
-                    case core_1.experimental.jobs.JobInboundMessageKind.Stop:
+                    case jobs_1.JobInboundMessageKind.Stop:
                         // Run teardown logic then complete.
                         tearingDown = true;
                         Promise.all(teardownLogics.map((fn) => fn() || Promise.resolve())).then(() => observer.complete(), (err) => observer.error(err));
                         break;
-                    case core_1.experimental.jobs.JobInboundMessageKind.Input:
+                    case jobs_1.JobInboundMessageKind.Input:
                         if (!tearingDown) {
                             onInput(i.value);
                         }
@@ -151,7 +151,6 @@ function createBuilder(fn) {
                                 progress({ state: currentState, current, total, status }, context);
                         }
                     },
-                    analytics: new core_1.analytics.ForwardingAnalytics((report) => analyticsChannel.next(report)),
                     addTeardown(teardown) {
                         teardownLogics.push(teardown);
                     },

package/src/index.d.ts

@@ -5,6 +5,8 @@
  * 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 jobs from './jobs';
 export * from './api';
 export { Architect, ScheduleOptions } from './architect';
 export { createBuilder } from './create-builder';
+export { jobs };

package/src/index.js

@@ -17,11 +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.createBuilder = exports.Architect = void 0;
+exports.jobs = exports.createBuilder = exports.Architect = void 0;
+const jobs = __importStar(require("./jobs"));
+exports.jobs = jobs;
 __exportStar(require("./api"), exports);
 var architect_1 = require("./architect");
 Object.defineProperty(exports, "Architect", { enumerable: true, get: function () { return architect_1.Architect; } });

package/src/internal.d.ts

@@ -5,8 +5,9 @@
  * 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 { json } from '@angular-devkit/core';
 import { BuilderInfo, BuilderInput, BuilderOutput, Target } from './api';
+import { JobDescription, JobHandler } from './jobs';
 /**
  * BuilderSymbol used for knowing if a function was created using createBuilder(). This is a
  * property set on the function that should be `true`.
@@ -25,21 +26,21 @@ export declare const BuilderVersionSymbol: unique symbol;
  * A Specialization of the JobHandler type. This exposes BuilderDescription as the job description
  * type.
  */
-export declare type BuilderJobHandler<A extends json.JsonObject = json.JsonObject, I extends BuilderInput = BuilderInput, O extends BuilderOutput = BuilderOutput> = experimental.jobs.JobHandler<A, I, O> & {
+export declare type BuilderJobHandler<A extends json.JsonObject = json.JsonObject, I extends BuilderInput = BuilderInput, O extends BuilderOutput = BuilderOutput> = JobHandler<A, I, O> & {
     jobDescription: BuilderDescription;
 };
 /**
  * A Builder description, which is used internally. Adds the builder info which is the
  * metadata attached to a builder in Architect.
  */
-export interface BuilderDescription extends experimental.jobs.JobDescription {
+export interface BuilderDescription extends JobDescription {
     info: BuilderInfo;
 }
 /**
  * A Builder instance. Use createBuilder() to create one of these.
  */
 export interface Builder<OptionT extends json.JsonObject = json.JsonObject> {
-    handler: experimental.jobs.JobHandler<json.JsonObject, BuilderInput, BuilderOutput>;
+    handler: JobHandler<json.JsonObject, BuilderInput, BuilderOutput>;
     [BuilderSymbol]: true;
     [BuilderVersionSymbol]: string;
 }