@code-pushup/nx-plugin 0.91.0 → 0.92.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@code-pushup/nx-plugin",
3
- "version": "0.91.0",
3
+ "version": "0.92.1",
4
4
  "license": "MIT",
5
5
  "description": "Nx plugin to integrate the Code PushUp CLI into your workspace 🛠️",
6
6
  "publishConfig": {
@@ -32,8 +32,8 @@
32
32
  "generators": "./generators.json",
33
33
  "executors": "./executors.json",
34
34
  "dependencies": {
35
- "@code-pushup/models": "0.91.0",
36
- "@code-pushup/utils": "0.91.0",
35
+ "@code-pushup/models": "0.92.1",
36
+ "@code-pushup/utils": "0.92.1",
37
37
  "@nx/devkit": ">=17.0.0",
38
38
  "nx": ">=17.0.0"
39
39
  },
@@ -3,18 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = runAutorunExecutor;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const execute_process_js_1 = require("../../internal/execute-process.js");
6
- const cli_js_1 = require("../internal/cli.js");
7
6
  const context_js_1 = require("../internal/context.js");
8
7
  const utils_js_1 = require("./utils.js");
8
+ /* eslint-disable-next-line max-lines-per-function */
9
9
  async function runAutorunExecutor(terminalAndExecutorOptions, context) {
10
+ const { objectToCliArgs, formatCommandStatus } = await Promise.resolve().then(() => require('@code-pushup/utils'));
10
11
  const normalizedContext = (0, context_js_1.normalizeContext)(context);
11
- const mergedOptions = (0, utils_js_1.mergeExecutorOptions)(context.target?.options, terminalAndExecutorOptions);
12
- const cliArgumentObject = (0, utils_js_1.parseAutorunExecutorOptions)(mergedOptions, normalizedContext);
13
- const { dryRun, verbose, command, bin } = mergedOptions;
14
- const commandString = (0, cli_js_1.createCliCommandString)({
15
- command,
16
- args: cliArgumentObject,
17
- bin,
12
+ const cliArgumentObject = (0, utils_js_1.parseAutorunExecutorOptions)(terminalAndExecutorOptions, normalizedContext);
13
+ const { dryRun, verbose, command: cliCommand, bin, } = terminalAndExecutorOptions;
14
+ const command = bin ? `node` : 'npx';
15
+ const positionals = [
16
+ bin ?? '@code-pushup/cli',
17
+ ...(cliCommand ? [cliCommand] : []),
18
+ ];
19
+ const args = [...positionals, ...objectToCliArgs(cliArgumentObject)];
20
+ const commandString = formatCommandStatus([command, ...args].join(' '), {
21
+ cwd: context.cwd,
18
22
  });
19
23
  if (verbose) {
20
24
  devkit_1.logger.info(`Run CLI executor ${command ?? ''}`);
@@ -26,7 +30,8 @@ async function runAutorunExecutor(terminalAndExecutorOptions, context) {
26
30
  else {
27
31
  try {
28
32
  await (0, execute_process_js_1.executeProcess)({
29
- ...(0, cli_js_1.createCliCommandObject)({ command, args: cliArgumentObject, bin }),
33
+ command,
34
+ args,
30
35
  ...(context.cwd ? { cwd: context.cwd } : {}),
31
36
  });
32
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/cli/executor.ts"],"names":[],"mappings":";;AAgBA,qCA4CC;AA5DD,uCAA0D;AAC1D,0EAAmE;AACnE,+CAG4B;AAC5B,uDAA0D;AAE1D,yCAA+E;AAQhE,KAAK,UAAU,kBAAkB,CAC9C,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,EAAE,GAAG,aAAa,CAAC;IACxD,MAAM,aAAa,GAAG,IAAA,+BAAsB,EAAC;QAC3C,OAAO;QACP,IAAI,EAAE,iBAAiB;QACvB,GAAG;KACJ,CAAC,CAAC;IACH,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,MAAM,IAAA,mCAAc,EAAC;gBACnB,GAAG,IAAA,+BAAsB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,CAAC;gBACpE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC;aAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,aAAa;KACvB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/cli/executor.ts"],"names":[],"mappings":";;AAaA,qCAqDC;AAlED,uCAA0D;AAC1D,0EAAmE;AACnE,uDAA0D;AAE1D,yCAAyD;AAQzD,qDAAqD;AACtC,KAAK,UAAU,kBAAkB,CAC9C,0BAAyD,EACzD,OAAwB;IAExB,MAAM,EAAE,eAAe,EAAE,mBAAmB,EAAE,GAAG,2CAC/C,oBAAoB,EACrB,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAA,6BAAgB,EAAC,OAAO,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,IAAA,sCAA2B,EACnD,0BAA0B,EAC1B,iBAAiB,CAClB,CAAC;IACF,MAAM,EACJ,MAAM,EACN,OAAO,EACP,OAAO,EAAE,UAAU,EACnB,GAAG,GACJ,GAAG,0BAA0B,CAAC;IAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IACrC,MAAM,WAAW,GAAG;QAClB,GAAG,IAAI,kBAAkB;QACzB,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACpC,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,GAAG,WAAW,EAAE,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACrE,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACtE,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IACH,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,MAAM,IAAA,mCAAc,EAAC;gBACnB,OAAO;gBACP,IAAI;gBACJ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC;aAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,aAAa;KACvB,CAAC;AACJ,CAAC"}
@@ -3,16 +3,3 @@ import type { AutorunCommandExecutorOnlyOptions, AutorunCommandExecutorOptions,
3
3
  export declare function parseAutorunExecutorOnlyOptions(options: Partial<AutorunCommandExecutorOnlyOptions>): AutorunCommandExecutorOnlyOptions;
4
4
  export declare function parsePrintConfigExecutorOptions(options: Partial<PrintConfigCommandExecutorOptions>): PrintConfigCommandExecutorOptions;
5
5
  export declare function parseAutorunExecutorOptions(options: Partial<AutorunCommandExecutorOptions>, normalizedContext: NormalizedExecutorContext): AutorunCommandExecutorOptions;
6
- /**
7
- * Deeply merges executor options.
8
- *
9
- * @param targetOptions - The original options from the target configuration.
10
- * @param cliOptions - The options from Nx, combining target options and CLI arguments.
11
- * @returns A new object with deeply merged properties.
12
- *
13
- * Nx performs a shallow merge by default, where command-line arguments can override entire objects
14
- * (e.g., `--persist.filename` replaces the entire `persist` object).
15
- * This function ensures that nested properties are deeply merged,
16
- * preserving the original target options where CLI arguments are not provided.
17
- */
18
- export declare function mergeExecutorOptions(targetOptions: Partial<AutorunCommandExecutorOptions>, cliOptions: Partial<AutorunCommandExecutorOptions>): AutorunCommandExecutorOptions;
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseAutorunExecutorOnlyOptions = parseAutorunExecutorOnlyOptions;
4
4
  exports.parsePrintConfigExecutorOptions = parsePrintConfigExecutorOptions;
5
5
  exports.parseAutorunExecutorOptions = parseAutorunExecutorOptions;
6
- exports.mergeExecutorOptions = mergeExecutorOptions;
7
6
  const config_js_1 = require("../internal/config.js");
8
7
  function parseAutorunExecutorOnlyOptions(options) {
9
8
  const { projectPrefix, dryRun, onlyPlugins } = options;
@@ -20,7 +19,7 @@ function parsePrintConfigExecutorOptions(options) {
20
19
  };
21
20
  }
22
21
  function parseAutorunExecutorOptions(options, normalizedContext) {
23
- const { projectPrefix, persist, upload, command } = options;
22
+ const { projectPrefix, persist, upload, command, output } = options;
24
23
  const needsUploadParams = command === 'upload' || command === 'autorun' || command === undefined;
25
24
  const uploadCfg = (0, config_js_1.uploadConfig)({ projectPrefix, ...upload }, normalizedContext);
26
25
  const hasApiToken = uploadCfg?.apiKey != null;
@@ -28,6 +27,7 @@ function parseAutorunExecutorOptions(options, normalizedContext) {
28
27
  ...parsePrintConfigExecutorOptions(options),
29
28
  ...parseAutorunExecutorOnlyOptions(options),
30
29
  ...(0, config_js_1.globalConfig)(options, normalizedContext),
30
+ ...(output ? { output } : {}),
31
31
  persist: (0, config_js_1.persistConfig)({ projectPrefix, ...persist }, normalizedContext),
32
32
  // @TODO This is a hack to avoid validation errors of upload config for commands that dont need it.
33
33
  // Fix: use utils and execute the core logic directly
@@ -35,38 +35,4 @@ function parseAutorunExecutorOptions(options, normalizedContext) {
35
35
  ...(needsUploadParams && hasApiToken ? { upload: uploadCfg } : {}),
36
36
  };
37
37
  }
38
- /**
39
- * Deeply merges executor options.
40
- *
41
- * @param targetOptions - The original options from the target configuration.
42
- * @param cliOptions - The options from Nx, combining target options and CLI arguments.
43
- * @returns A new object with deeply merged properties.
44
- *
45
- * Nx performs a shallow merge by default, where command-line arguments can override entire objects
46
- * (e.g., `--persist.filename` replaces the entire `persist` object).
47
- * This function ensures that nested properties are deeply merged,
48
- * preserving the original target options where CLI arguments are not provided.
49
- */
50
- function mergeExecutorOptions(targetOptions, cliOptions) {
51
- return {
52
- ...targetOptions,
53
- ...cliOptions,
54
- ...(targetOptions?.persist || cliOptions?.persist
55
- ? {
56
- persist: {
57
- ...targetOptions?.persist,
58
- ...cliOptions?.persist,
59
- },
60
- }
61
- : {}),
62
- ...(targetOptions?.upload || cliOptions?.upload
63
- ? {
64
- upload: {
65
- ...targetOptions?.upload,
66
- ...cliOptions?.upload,
67
- },
68
- }
69
- : {}),
70
- };
71
- }
72
38
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/executors/cli/utils.ts"],"names":[],"mappings":";;AAYA,0EASC;AAED,0EAOC;AAED,kEAsBC;AAcD,oDAwBC;AA5FD,qDAI+B;AAQ/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,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,OAAO;QACL,GAAG,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC;KAC1B,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,MAAM,SAAS,GAAG,IAAA,wBAAY,EAC5B,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,EAC5B,iBAAiB,CAClB,CAAC;IACF,MAAM,WAAW,GAAG,SAAS,EAAE,MAAM,IAAI,IAAI,CAAC;IAC9C,OAAO;QACL,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,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,GAAG,CAAC,iBAAiB,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/executors/cli/utils.ts"],"names":[],"mappings":";;AAYA,0EASC;AAED,0EAOC;AAED,kEAuBC;AAvDD,qDAI+B;AAQ/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,+BAA+B,CAC7C,OAAmD;IAEnD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,OAAO;QACL,GAAG,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAA+C,EAC/C,iBAA4C;IAE5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpE,MAAM,iBAAiB,GACrB,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,CAAC;IACzE,MAAM,SAAS,GAAG,IAAA,wBAAY,EAC5B,EAAE,aAAa,EAAE,GAAG,MAAM,EAAE,EAC5B,iBAAiB,CAClB,CAAC;IACF,MAAM,WAAW,GAAG,SAAS,EAAE,MAAM,IAAI,IAAI,CAAC;IAC9C,OAAO;QACL,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,+BAA+B,CAAC,OAAO,CAAC;QAC3C,GAAG,IAAA,wBAAY,EAAC,OAAO,EAAE,iBAAiB,CAAC;QAC3C,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAA,yBAAa,EAAC,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB,CAAC;QACxE,mGAAmG;QACnG,qDAAqD;QACrD,6CAA6C;QAC7C,GAAG,CAAC,iBAAiB,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC"}
package/src/index.d.ts CHANGED
@@ -5,7 +5,6 @@ declare const plugin: {
5
5
  };
6
6
  export default plugin;
7
7
  export type { AutorunCommandExecutorOptions } from './executors/cli/schema.js';
8
- export { objectToCliArgs } from './executors/internal/cli.js';
9
8
  export { generateCodePushupConfig } from './generators/configuration/code-pushup-config.js';
10
9
  export { configurationGenerator } from './generators/configuration/generator.js';
11
10
  export type { ConfigurationGeneratorOptions } from './generators/configuration/schema.js';
package/src/index.js CHANGED
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.createNodesV2 = exports.createNodes = exports.initSchematic = exports.initGenerator = exports.configurationGenerator = exports.generateCodePushupConfig = exports.objectToCliArgs = void 0;
17
+ exports.createNodesV2 = exports.createNodes = exports.initSchematic = exports.initGenerator = exports.configurationGenerator = exports.generateCodePushupConfig = void 0;
18
18
  const index_js_1 = require("./plugin/index.js");
19
19
  // default export for nx.json#plugins
20
20
  const plugin = {
@@ -24,8 +24,6 @@ const plugin = {
24
24
  createNodes: index_js_1.createNodes,
25
25
  };
26
26
  exports.default = plugin;
27
- var cli_js_1 = require("./executors/internal/cli.js");
28
- Object.defineProperty(exports, "objectToCliArgs", { enumerable: true, get: function () { return cli_js_1.objectToCliArgs; } });
29
27
  var code_pushup_config_js_1 = require("./generators/configuration/code-pushup-config.js");
30
28
  Object.defineProperty(exports, "generateCodePushupConfig", { enumerable: true, get: function () { return code_pushup_config_js_1.generateCodePushupConfig; } });
31
29
  var generator_js_1 = require("./generators/configuration/generator.js");
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA+D;AAE/D,qCAAqC;AACrC,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,wBAAwB;IAC9B,aAAa,EAAb,wBAAa;IACb,gDAAgD;IAChD,WAAW,EAAX,sBAAW;CACZ,CAAC;AAEF,kBAAe,MAAM,CAAC;AAGtB,sDAA8D;AAArD,yGAAA,eAAe,OAAA;AACxB,0FAA4F;AAAnF,iIAAA,wBAAwB,OAAA;AACjC,wEAAiF;AAAxE,sHAAA,sBAAsB,OAAA;AAE/B,+DAA8E;AAArE,6GAAA,aAAa,OAAA;AAAE,6GAAA,aAAa,OAAA;AAErC,yDAAuC;AACvC,8CAA+D;AAAtD,uGAAA,WAAW,OAAA;AAAE,yGAAA,aAAa,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA+D;AAE/D,qCAAqC;AACrC,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,wBAAwB;IAC9B,aAAa,EAAb,wBAAa;IACb,gDAAgD;IAChD,WAAW,EAAX,sBAAW;CACZ,CAAC;AAEF,kBAAe,MAAM,CAAC;AAGtB,0FAA4F;AAAnF,iIAAA,wBAAwB,OAAA;AACjC,wEAAiF;AAAxE,sHAAA,sBAAsB,OAAA;AAE/B,+DAA8E;AAArE,6GAAA,aAAa,OAAA;AAAE,6GAAA,aAAa,OAAA;AAErC,yDAAuC;AACvC,8CAA+D;AAAtD,uGAAA,WAAW,OAAA;AAAE,yGAAA,aAAa,OAAA"}
@@ -2,5 +2,4 @@ import type { TargetConfiguration } from '@nx/devkit';
2
2
  import type { RunCommandsOptions } from 'nx/src/executors/run-commands/run-commands.impl';
3
3
  export declare function createConfigurationTarget(options?: {
4
4
  projectName?: string;
5
- bin?: string;
6
- }): TargetConfiguration<RunCommandsOptions>;
5
+ }): Promise<TargetConfiguration<RunCommandsOptions>>;
@@ -1,17 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createConfigurationTarget = createConfigurationTarget;
4
- const cli_js_1 = require("../../executors/internal/cli.js");
5
4
  const constants_js_1 = require("../../internal/constants.js");
6
- function createConfigurationTarget(options) {
7
- const { projectName, bin = constants_js_1.PACKAGE_NAME } = options ?? {};
8
- const args = (0, cli_js_1.objectToCliArgs)({
5
+ async function createConfigurationTarget(options) {
6
+ const { projectName } = options ?? {};
7
+ const { objectToCliArgs } = await Promise.resolve().then(() => require('@code-pushup/utils'));
8
+ const args = objectToCliArgs({
9
9
  ...(projectName ? { project: projectName } : {}),
10
10
  });
11
- const argsString = args.length > 0 ? args.join(' ') : '';
12
- const baseCommand = `nx g ${bin}:configuration`;
11
+ const argsString = args.length > 0 ? ` ${args.join(' ')}` : '';
13
12
  return {
14
- command: argsString ? `${baseCommand} ${argsString}` : baseCommand,
13
+ command: `nx g ${constants_js_1.PACKAGE_NAME}:configuration${argsString}`,
15
14
  };
16
15
  }
17
16
  //# sourceMappingURL=configuration-target.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"configuration-target.js","sourceRoot":"","sources":["../../../../src/plugin/target/configuration-target.ts"],"names":[],"mappings":";;AAKA,8DAaC;AAhBD,4DAAkE;AAClE,8DAA2D;AAE3D,SAAgB,yBAAyB,CAAC,OAGzC;IACC,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,2BAAY,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC1D,MAAM,IAAI,GAAG,IAAA,wBAAe,EAAC;QAC3B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,MAAM,WAAW,GAAG,QAAQ,GAAG,gBAAgB,CAAC;IAChD,OAAO;QACL,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,WAAW;KACnE,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"configuration-target.js","sourceRoot":"","sources":["../../../../src/plugin/target/configuration-target.ts"],"names":[],"mappings":";;AAIA,8DAYC;AAdD,8DAA2D;AAEpD,KAAK,UAAU,yBAAyB,CAAC,OAE/C;IACC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,EAAE,eAAe,EAAE,GAAG,2CAAa,oBAAoB,EAAC,CAAC;IAC/D,MAAM,IAAI,GAAG,eAAe,CAAC;QAC3B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,OAAO;QACL,OAAO,EAAE,QAAQ,2BAAY,iBAAiB,UAAU,EAAE;KAC3D,CAAC;AACJ,CAAC"}
@@ -15,9 +15,8 @@ async function createTargets(normalizedContext) {
15
15
  }
16
16
  : // if NO code-pushup.config.*.(ts|js|mjs) is present return configuration target
17
17
  {
18
- [`${targetName}--configuration`]: (0, configuration_target_js_1.createConfigurationTarget)({
18
+ [`${targetName}--configuration`]: await (0, configuration_target_js_1.createConfigurationTarget)({
19
19
  projectName: normalizedContext.projectJson.name,
20
- bin,
21
20
  }),
22
21
  };
23
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"targets.js","sourceRoot":"","sources":["../../../../src/plugin/target/targets.ts"],"names":[],"mappings":";;AAgBA,sCAkBC;AAlCD,+CAA2C;AAC3C,kDAAiD;AAKjD,uEAAsE;AACtE,iDAA0D;AAC1D,6DAA4D;AAQrD,KAAK,UAAU,aAAa,CAAC,iBAAuC;IACzE,MAAM,EACJ,UAAU,GAAG,6BAAc,EAC3B,GAAG,EACH,aAAa,GACd,GAAG,iBAAiB,CAAC,aAAa,CAAC;IACpC,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAO,EAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/D,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,uCAAwB,CAAC,CAAC;QACzE,CAAC,CAAC;YACE,CAAC,UAAU,CAAC,EAAE,IAAA,yCAAoB,EAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC;SAC3D;QACH,CAAC,CAAC,gFAAgF;YAChF;gBACE,CAAC,GAAG,UAAU,iBAAiB,CAAC,EAAE,IAAA,mDAAyB,EAAC;oBAC1D,WAAW,EAAE,iBAAiB,CAAC,WAAW,CAAC,IAAI;oBAC/C,GAAG;iBACJ,CAAC;aACH,CAAC;AACR,CAAC"}
1
+ {"version":3,"file":"targets.js","sourceRoot":"","sources":["../../../../src/plugin/target/targets.ts"],"names":[],"mappings":";;AAgBA,sCAiBC;AAjCD,+CAA2C;AAC3C,kDAAiD;AAKjD,uEAAsE;AACtE,iDAA0D;AAC1D,6DAA4D;AAQrD,KAAK,UAAU,aAAa,CAAC,iBAAuC;IACzE,MAAM,EACJ,UAAU,GAAG,6BAAc,EAC3B,GAAG,EACH,aAAa,GACd,GAAG,iBAAiB,CAAC,aAAa,CAAC;IACpC,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAO,EAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC/D,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,uCAAwB,CAAC,CAAC;QACzE,CAAC,CAAC;YACE,CAAC,UAAU,CAAC,EAAE,IAAA,yCAAoB,EAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC;SAC3D;QACH,CAAC,CAAC,gFAAgF;YAChF;gBACE,CAAC,GAAG,UAAU,iBAAiB,CAAC,EAAE,MAAM,IAAA,mDAAyB,EAAC;oBAChE,WAAW,EAAE,iBAAiB,CAAC,WAAW,CAAC,IAAI;iBAChD,CAAC;aACH,CAAC;AACR,CAAC"}
@@ -1,16 +0,0 @@
1
- export declare function createCliCommandString(options?: {
2
- args?: Record<string, unknown>;
3
- command?: string;
4
- bin?: string;
5
- }): string;
6
- export declare function createCliCommandObject(options?: {
7
- args?: Record<string, unknown>;
8
- command?: string;
9
- bin?: string;
10
- }): import('@code-pushup/utils').ProcessConfig;
11
- type ArgumentValue = number | string | boolean | string[];
12
- export type CliArgsObject<T extends object = Record<string, ArgumentValue>> = T extends never ? Record<string, ArgumentValue | undefined> | {
13
- _: string;
14
- } : T;
15
- export declare function objectToCliArgs<T extends object = Record<string, ArgumentValue>>(params?: CliArgsObject<T>): string[];
16
- export {};
@@ -1,52 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createCliCommandString = createCliCommandString;
4
- exports.createCliCommandObject = createCliCommandObject;
5
- exports.objectToCliArgs = objectToCliArgs;
6
- function createCliCommandString(options) {
7
- const { bin = '@code-pushup/cli', command, args } = options ?? {};
8
- return `npx ${bin} ${objectToCliArgs({ _: command ?? [], ...args }).join(' ')}`;
9
- }
10
- function createCliCommandObject(options) {
11
- const { bin = '@code-pushup/cli', command, args } = options ?? {};
12
- return {
13
- command: 'npx',
14
- args: [bin, ...objectToCliArgs({ _: command ?? [], ...args })],
15
- };
16
- }
17
- // @TODO import from @code-pushup/utils => get rid of poppins for cjs support
18
- function objectToCliArgs(params) {
19
- if (!params) {
20
- return [];
21
- }
22
- return Object.entries(params).flatMap(([key, value]) => {
23
- // process/file/script
24
- if (key === '_') {
25
- return (Array.isArray(value) ? value : [`${value}`]).filter(v => v != null);
26
- }
27
- const prefix = key.length === 1 ? '-' : '--';
28
- // "-*" arguments (shorthands)
29
- if (Array.isArray(value)) {
30
- return value.map(v => `${prefix}${key}="${v}"`);
31
- }
32
- if (typeof value === 'object') {
33
- return Object.entries(value).flatMap(
34
- // transform nested objects to the dot notation `key.subkey`
35
- ([k, v]) => objectToCliArgs({ [`${key}.${k}`]: v }));
36
- }
37
- if (typeof value === 'string') {
38
- return [`${prefix}${key}="${value}"`];
39
- }
40
- if (typeof value === 'number') {
41
- return [`${prefix}${key}=${value}`];
42
- }
43
- if (typeof value === 'boolean') {
44
- return [`${prefix}${value ? '' : 'no-'}${key}`];
45
- }
46
- if (value === undefined) {
47
- return [];
48
- }
49
- throw new Error(`Unsupported type ${typeof value} for key ${key}`);
50
- });
51
- }
52
- //# sourceMappingURL=cli.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/executors/internal/cli.ts"],"names":[],"mappings":"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"}