@code-pushup/cli 0.82.0 → 0.84.0

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/cli",
3
- "version": "0.82.0",
3
+ "version": "0.84.0",
4
4
  "license": "MIT",
5
5
  "description": "A CLI to run all kinds of code quality measurements to align your team with company goals",
6
6
  "homepage": "https://code-pushup.dev",
@@ -45,9 +45,9 @@
45
45
  "node": ">=20"
46
46
  },
47
47
  "dependencies": {
48
- "@code-pushup/models": "0.82.0",
49
- "@code-pushup/core": "0.82.0",
50
- "@code-pushup/utils": "0.82.0",
48
+ "@code-pushup/models": "0.84.0",
49
+ "@code-pushup/core": "0.84.0",
50
+ "@code-pushup/utils": "0.84.0",
51
51
  "yargs": "^17.7.2",
52
52
  "ansis": "^3.3.0",
53
53
  "simple-git": "^3.20.0"
@@ -1,5 +1,5 @@
1
1
  import { autoloadRc, readRcByPath } from '@code-pushup/core';
2
- import { DEFAULT_PERSIST_FILENAME, DEFAULT_PERSIST_FORMAT, DEFAULT_PERSIST_OUTPUT_DIR, uploadConfigSchema, } from '@code-pushup/models';
2
+ import { DEFAULT_PERSIST_FILENAME, DEFAULT_PERSIST_FORMAT, DEFAULT_PERSIST_OUTPUT_DIR, uploadConfigSchema, validate, } from '@code-pushup/models';
3
3
  function buildPersistConfig(cliPersist, rcPersist) {
4
4
  return {
5
5
  outputDir: cliPersist?.outputDir ??
@@ -19,10 +19,7 @@ export async function coreConfigMiddleware(processArgs) {
19
19
  const { persist: rcPersist, upload: rcUpload, ...remainingRcConfig } = importedRc;
20
20
  const upload = rcUpload == null && cliUpload == null
21
21
  ? undefined
22
- : uploadConfigSchema.parse({
23
- ...rcUpload,
24
- ...cliUpload,
25
- });
22
+ : validate(uploadConfigSchema, { ...rcUpload, ...cliUpload });
26
23
  return {
27
24
  ...(config != null && { config }),
28
25
  cache: normalizeCache(cliCache),
@@ -1 +1 @@
1
- {"version":3,"file":"core-config.middleware.js","sourceRoot":"","sources":["../../../../src/lib/implementation/core-config.middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core-config.middleware.js","sourceRoot":"","sources":["../../../../src/lib/implementation/core-config.middleware.ts"],"names":[],"mappings":"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"}
@@ -16,9 +16,8 @@ export declare const yargsDecorator: {
16
16
  * returns configurable yargs CLI for code-pushup
17
17
  *
18
18
  * @example
19
- * yargsCli(hideBin(process.argv))
20
- * // bootstrap CLI; format arguments
21
- * .argv;
19
+ * // bootstrap CLI; format arguments
20
+ * yargsCli(hideBin(process.argv)).argv;
22
21
  */
23
22
  export declare function yargsCli<T = unknown>(argv: string[], cfg: {
24
23
  usageMessage?: string;
@@ -2,7 +2,7 @@
2
2
  import { blue, dim, green } from 'ansis';
3
3
  import { createRequire } from 'node:module';
4
4
  import yargs, {} from 'yargs';
5
- import { formatSchema } from '@code-pushup/models';
5
+ import { formatSchema, validate, } from '@code-pushup/models';
6
6
  import { TERMINAL_WIDTH } from '@code-pushup/utils';
7
7
  import { descriptionStyle, formatNestedValues, formatObjectValue, headerStyle, titleStyle, } from './implementation/formatting.js';
8
8
  import { logErrorBeforeThrow } from './implementation/global.utils.js';
@@ -23,9 +23,8 @@ export const yargsDecorator = {
23
23
  * returns configurable yargs CLI for code-pushup
24
24
  *
25
25
  * @example
26
- * yargsCli(hideBin(process.argv))
27
- * // bootstrap CLI; format arguments
28
- * .argv;
26
+ * // bootstrap CLI; format arguments
27
+ * yargsCli(hideBin(process.argv)).argv;
29
28
  */
30
29
  export function yargsCli(argv, cfg) {
31
30
  const { usageMessage, scriptName, noExitProcess } = cfg;
@@ -94,12 +93,14 @@ function validatePersistFormat(persist) {
94
93
  if (persist.format != null) {
95
94
  persist.format
96
95
  .flatMap(format => format.split(','))
97
- .forEach(format => formatSchema.parse(format));
96
+ .forEach(format => {
97
+ validate(formatSchema, format);
98
+ });
98
99
  }
99
100
  return true;
100
101
  }
101
102
  catch {
102
- throw new Error(`Invalid persist.format option. Valid options are: ${formatSchema.options.join(', ')}`);
103
+ throw new TypeError(`Invalid persist.format option. Valid options are: ${formatSchema.options.join(', ')}`);
103
104
  }
104
105
  }
105
106
  //# sourceMappingURL=yargs-cli.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"yargs-cli.js","sourceRoot":"","sources":["../../../src/lib/yargs-cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"yargs-cli.js","sourceRoot":"","sources":["../../../src/lib/yargs-cli.ts"],"names":[],"mappings":"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"}