@angular-devkit/architect 0.1900.0-next.4 → 0.1900.0-next.6

package/package.json

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

package/src/architect.js

@@ -12,6 +12,7 @@ const core_1 = require("@angular-devkit/core");
 const rxjs_1 = require("rxjs");
 const api_1 = require("./api");
 const jobs_1 = require("./jobs");
+const options_1 = require("./options");
 const schedule_by_name_1 = require("./schedule-by-name");
 const inputSchema = require('./input-schema.json');
 const outputSchema = require('./output-schema.json');
@@ -28,10 +29,7 @@ function _createJobHandlerFromBuilderInfo(info, target, host, registry, baseOpti
         const inboundBusWithInputValidation = context.inboundBus.pipe((0, rxjs_1.concatMap)(async (message) => {
             if (message.kind === jobs_1.JobInboundMessageKind.Input) {
                 const v = message.value;
-                const options = {
-                    ...baseOptions,
-                    ...v.options,
-                };
+                const options = (0, options_1.mergeOptions)(baseOptions, v.options);
                 // Validate v against the options schema.
                 const validation = await registry.compile(info.optionSchema);
                 const validationResult = await validation(options);

package/src/options.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @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.dev/license
+ */
+import { json } from '@angular-devkit/core';
+import { BuilderInput } from './api';
+type OverrideOptions = BuilderInput['options'];
+export declare function mergeOptions(baseOptions: json.JsonObject, overrideOptions: OverrideOptions): json.JsonObject;
+export {};

package/src/options.js

@@ -0,0 +1,29 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeOptions = mergeOptions;
+const core_1 = require("@angular-devkit/core");
+function mergeOptions(baseOptions, overrideOptions) {
+    if (!overrideOptions) {
+        return { ...baseOptions };
+    }
+    const options = {
+        ...baseOptions,
+        ...overrideOptions,
+    };
+    // For object-object overrides, we merge one layer deep.
+    for (const key of Object.keys(overrideOptions)) {
+        const override = overrideOptions[key];
+        const base = baseOptions[key];
+        if (core_1.json.isJsonObject(base) && core_1.json.isJsonObject(override)) {
+            options[key] = { ...base, ...override };
+        }
+    }
+    return options;
+}