@angular-devkit/architect 0.1900.0-next.1 → 0.1900.0-next.10

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Google, Inc.
+Copyright (c) 2010-2024 Google LLC. https://angular.dev/license
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@angular-devkit/architect",
-  "version": "0.1900.0-next.1",
+  "version": "0.1900.0-next.10",
   "description": "Angular Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
-    "@angular-devkit/core": "19.0.0-next.1",
+    "@angular-devkit/core": "19.0.0-next.10",
     "rxjs": "7.8.1"
   },
   "builders": "./builders/builders.json",
@@ -17,7 +17,7 @@
     "devkit",
     "sdk"
   ],
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"

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;
+}