@code-pushup/nx-plugin 0.57.0 → 0.58.0

package/README.md

@@ -46,7 +46,7 @@ Examples:
 #### CLI
 
 Install JS packages configure a target in your project json.
-See [CLI executor docs](./src/executor/cli/README.md) for details
+See [CLI executor docs](./src/executors/cli/README.md) for details
 
 Examples:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/nx-plugin",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "license": "MIT",
   "description": "Nx plugin to integrate the Code PushUp CLI into your workspace 🛠️",
   "publishConfig": {
@@ -32,8 +32,8 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@code-pushup/models": "0.57.0",
-    "@code-pushup/utils": "0.57.0",
+    "@code-pushup/models": "0.58.0",
+    "@code-pushup/utils": "0.58.0",
     "@nx/devkit": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "nx": "^17.0.0 || ^18.0.0 || ^19.0.0",
     "zod": "^3.22.4"

package/src/executors/cli/README.md

@@ -74,4 +74,4 @@ Show what will be executed without actually executing it:
 | **dryRun**        | `boolean` | To debug the executor, dry run the command without real execution. |
 | **bin**           | `string`  | Path to Code PushUp CLI                                            |
 
-For all other options see the [CLI autorun documentation](../../cli/packages/cli/README.md#autorun-command).
+For all other options see the [CLI autorun documentation](../../../../cli/README.md#autorun-command).

package/src/executors/cli/executor.js

@@ -8,8 +8,9 @@ const context_js_1 = require("../internal/context.js");
 const utils_js_1 = require("./utils.js");
 function runAutorunExecutor(terminalAndExecutorOptions, context) {
     const normalizedContext = (0, context_js_1.normalizeContext)(context);
-    const cliArgumentObject = (0, utils_js_1.parseAutorunExecutorOptions)(terminalAndExecutorOptions, normalizedContext);
-    const { dryRun, verbose, command } = terminalAndExecutorOptions;
+    const mergedOptions = (0, utils_js_1.mergeExecutorOptions)(context.target?.options, terminalAndExecutorOptions);
+    const cliArgumentObject = (0, utils_js_1.parseAutorunExecutorOptions)(mergedOptions, normalizedContext);
+    const { dryRun, verbose, command } = mergedOptions;
     const commandString = (0, cli_js_1.createCliCommand)({ command, args: cliArgumentObject });
     const commandStringOptions = context.cwd ? { cwd: context.cwd } : {};
     if (verbose) {

package/src/executors/cli/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/cli/executor.ts"],"names":[],"mappings":";;AAaA,qCAsCC;AAnDD,uCAA0D;AAC1D,2DAA8C;AAC9C,+CAAsD;AACtD,uDAA0D;AAE1D,yCAAyD;AAQzD,SAAwB,kBAAkB,CACxC,0BAAyD,EACzD,OAAwB;IAExB,MAAM,iBAAiB,GAAG,IAAA,6BAAgB,EAAC,OAAO,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,IAAA,sCAA2B,EACnD,0BAA0B,EAC1B,iBAAiB,CAClB,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,0BAA0B,CAAC;IAEhE,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC7E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,IAAI,OAAO,EAAE,CAAC;QACZ,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACjD,eAAM,CAAC,IAAI,CAAC,YAAY,aAAa,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,eAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,0EAA0E;YAC1E,qCAAqC;YACrC,IAAA,6BAAQ,EAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAc;aACtB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,aAAa;KACvB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/cli/executor.ts"],"names":[],"mappings":";;AAaA,qCA0CC;AAvDD,uCAA0D;AAC1D,2DAA8C;AAC9C,+CAAsD;AACtD,uDAA0D;AAE1D,yCAA+E;AAQ/E,SAAwB,kBAAkB,CACxC,0BAAyD,EACzD,OAAwB;IAExB,MAAM,iBAAiB,GAAG,IAAA,6BAAgB,EAAC,OAAO,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,+BAAoB,EACxC,OAAO,CAAC,MAAM,EAAE,OAAO,EACvB,0BAA0B,CAC3B,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAA,sCAA2B,EACnD,aAAa,EACb,iBAAiB,CAClB,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAEnD,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC7E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,IAAI,OAAO,EAAE,CAAC;QACZ,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACjD,eAAM,CAAC,IAAI,CAAC,YAAY,aAAa,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,eAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,0EAA0E;YAC1E,qCAAqC;YACrC,IAAA,6BAAQ,EAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,OAAO,CAAC,OAAO,CAAC;gBACrB,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAc;aACtB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,aAAa;KACvB,CAAC,CAAC;AACL,CAAC"}

package/src/executors/cli/utils.d.ts

@@ -2,3 +2,16 @@ import type { NormalizedExecutorContext } from '../internal/context.js';
 import type { AutorunCommandExecutorOnlyOptions, AutorunCommandExecutorOptions } from './schema.js';
 export declare function parseAutorunExecutorOnlyOptions(options: Partial<AutorunCommandExecutorOnlyOptions>): AutorunCommandExecutorOnlyOptions;
 export declare function parseAutorunExecutorOptions(options: Partial<AutorunCommandExecutorOptions>, normalizedContext: NormalizedExecutorContext): AutorunCommandExecutorOptions;
+/**
+ * Deeply merges executor options.
+ *
+ * @param targetOptions - The original options from the target configuration.
+ * @param cliOptions - The options from Nx, combining target options and CLI arguments.
+ * @returns A new object with deeply merged properties.
+ *
+ * Nx performs a shallow merge by default, where command-line arguments can override entire objects
+ * (e.g., `--persist.filename` replaces the entire `persist` object).
+ * This function ensures that nested properties are deeply merged,
+ * preserving the original target options where CLI arguments are not provided.
+ */
+export declare function mergeExecutorOptions(targetOptions: Partial<AutorunCommandExecutorOptions>, cliOptions: Partial<AutorunCommandExecutorOptions>): AutorunCommandExecutorOptions;

package/src/executors/cli/utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAutorunExecutorOnlyOptions = parseAutorunExecutorOnlyOptions;
 exports.parseAutorunExecutorOptions = parseAutorunExecutorOptions;
+exports.mergeExecutorOptions = mergeExecutorOptions;
 const config_js_1 = require("../internal/config.js");
 function parseAutorunExecutorOnlyOptions(options) {
     const { projectPrefix, dryRun, onlyPlugins } = options;
@@ -26,4 +27,38 @@ function parseAutorunExecutorOptions(options, normalizedContext) {
             : undefined,
     };
 }
+/**
+ * Deeply merges executor options.
+ *
+ * @param targetOptions - The original options from the target configuration.
+ * @param cliOptions - The options from Nx, combining target options and CLI arguments.
+ * @returns A new object with deeply merged properties.
+ *
+ * Nx performs a shallow merge by default, where command-line arguments can override entire objects
+ * (e.g., `--persist.filename` replaces the entire `persist` object).
+ * This function ensures that nested properties are deeply merged,
+ * preserving the original target options where CLI arguments are not provided.
+ */
+function mergeExecutorOptions(targetOptions, cliOptions) {
+    return {
+        ...targetOptions,
+        ...cliOptions,
+        ...(targetOptions?.persist || cliOptions?.persist
+            ? {
+                persist: {
+                    ...targetOptions?.persist,
+                    ...cliOptions?.persist,
+                },
+            }
+            : {}),
+        ...(targetOptions?.upload || cliOptions?.upload
+            ? {
+                upload: {
+                    ...targetOptions?.upload,
+                    ...cliOptions?.upload,
+                },
+            }
+            : {}),
+    };
+}
 //# sourceMappingURL=utils.js.map

package/src/executors/cli/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/cli/utils.ts"],"names":[],"mappings":";;AAWA,0EASC;AAED,kEAkBC;AAxCD,qDAI+B;AAO/B,SAAgB,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACvD,OAAO;QACL,GAAG,CAAC,aAAa,IAAI,EAAE,aAAa,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjC,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAA+C,EAC/C,iBAA4C;IAE5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5D,MAAM,iBAAiB,GACrB,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,CAAC;IACzE,OAAO;QACL,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,IAAA,wBAAY,EAAC,OAAO,EAAE,iBAAiB,CAAC;QAC3C,OAAO,EAAE,IAAA,yBAAa,EAAC,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB,CAAC;QACxE,mGAAmG;QACnG,qDAAqD;QACrD,6CAA6C;QAC7C,MAAM,EAAE,iBAAiB;YACvB,CAAC,CAAC,IAAA,wBAAY,EAAC,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,EAAE,iBAAiB,CAAC;YAC/D,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/executors/cli/utils.ts"],"names":[],"mappings":";;AAWA,0EASC;AAED,kEAkBC;AAcD,oDAwBC;AA9ED,qDAI+B;AAO/B,SAAgB,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACvD,OAAO;QACL,GAAG,CAAC,aAAa,IAAI,EAAE,aAAa,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,IAAI,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;QACjC,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAA+C,EAC/C,iBAA4C;IAE5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5D,MAAM,iBAAiB,GACrB,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,CAAC;IACzE,OAAO;QACL,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,IAAA,wBAAY,EAAC,OAAO,EAAE,iBAAiB,CAAC;QAC3C,OAAO,EAAE,IAAA,yBAAa,EAAC,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB,CAAC;QACxE,mGAAmG;QACnG,qDAAqD;QACrD,6CAA6C;QAC7C,MAAM,EAAE,iBAAiB;YACvB,CAAC,CAAC,IAAA,wBAAY,EAAC,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,EAAE,iBAAiB,CAAC;YAC/D,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,oBAAoB,CAClC,aAAqD,EACrD,UAAkD;IAElD,OAAO;QACL,GAAG,aAAa;QAChB,GAAG,UAAU;QACb,GAAG,CAAC,aAAa,EAAE,OAAO,IAAI,UAAU,EAAE,OAAO;YAC/C,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,GAAG,aAAa,EAAE,OAAO;oBACzB,GAAG,UAAU,EAAE,OAAO;iBACvB;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,aAAa,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM;YAC7C,CAAC,CAAC;gBACE,MAAM,EAAE;oBACN,GAAG,aAAa,EAAE,MAAM;oBACxB,GAAG,UAAU,EAAE,MAAM;iBACtB;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}

package/src/index.d.ts

@@ -9,3 +9,4 @@ export { generateCodePushupConfig } from './generators/configuration/code-pushup
 export { createNodes } from './plugin/index.js';
 export { executeProcess, type ProcessConfig, } from './internal/execute-process.js';
 export { objectToCliArgs } from './executors/internal/cli.js';
+export type { AutorunCommandExecutorOptions } from './executors/cli/schema.js';