@code-pushup/utils 0.85.0 → 0.86.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/utils",
3
- "version": "0.85.0",
3
+ "version": "0.86.0",
4
4
  "description": "Low-level utilities (helper functions, etc.) used by Code PushUp CLI",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/code-pushup/cli/tree/main/packages/utils#readme",
@@ -27,7 +27,7 @@
27
27
  "node": ">=17.0.0"
28
28
  },
29
29
  "dependencies": {
30
- "@code-pushup/models": "0.85.0",
30
+ "@code-pushup/models": "0.86.0",
31
31
  "@isaacs/cliui": "^8.0.2",
32
32
  "@poppinss/cliui": "^6.4.0",
33
33
  "ansis": "^3.3.0",
package/src/lib/env.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { DEFAULT_PERSIST_FILENAME, DEFAULT_PERSIST_FORMAT, DEFAULT_PERSIST_OUTPUT_DIR, DEFAULT_PERSIST_SKIP_REPORT, formatSchema, } from '@code-pushup/models';
2
- import { ui } from './logging.js';
3
2
  export function isCI() {
4
3
  return isEnvVarEnabled('CI');
5
4
  }
@@ -11,9 +10,6 @@ export function isEnvVarEnabled(name) {
11
10
  if (typeof value === 'boolean') {
12
11
  return value;
13
12
  }
14
- if (process.env[name]) {
15
- ui().logger.warning(`Environment variable ${name} expected to be a boolean (true/false/1/0), but received value ${process.env[name]}. Treating it as disabled.`);
16
- }
17
13
  return false;
18
14
  }
19
15
  export function coerceBooleanValue(value) {
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/lib/env.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/lib/env.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,EAE3B,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,MAAM,UAAU,IAAI;IAClB,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAEpD,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,iBAAiB,GAAG;YACxB,CAAC,MAAM,EAAE,OAAO,CAAC;YACjB,CAAC,IAAI,EAAE,KAAK,CAAC;YACb,CAAC,KAAK,EAAE,IAAI,CAAC;SACd,CAAC;QACF,MAAM,cAAc,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAC3C,yDAAyD;QACzD,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,iBAAiB,EAAE,CAAC;YACxD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;gBAClE,OAAO,cAAc,KAAK,SAAS,CAAC;YACtC,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ,KAAK,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAUD,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,MAAM,UAAU,eAAe,CAAC,MAAkB;IAChD,OAAO;QACL,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;QAC/C,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ;QAC5C,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QACzD,uBAAuB,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAuB;IACvD,MAAM,OAAO,GAAG,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,UAAU,CAAC;SACrD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;SAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IAChC,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACpE,OAAO;QACL,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,CAAC,qBAAqB,IAAI,0BAA0B;YAClE,QAAQ,EAAE,GAAG,CAAC,mBAAmB,IAAI,wBAAwB;YAC7D,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB;YAC1D,WAAW,EAAE,WAAW,IAAI,2BAA2B;SACxD;KACF,CAAC;AACJ,CAAC"}
@@ -1,10 +1,10 @@
1
- import { bold, gray } from 'ansis';
1
+ import ansis from 'ansis';
2
2
  import { bundleRequire } from 'bundle-require';
3
3
  import { mkdir, readFile, readdir, rm, stat } from 'node:fs/promises';
4
4
  import path from 'node:path';
5
5
  import { formatBytes } from './formatting.js';
6
6
  import { logMultipleResults } from './log-results.js';
7
- import { ui } from './logging.js';
7
+ import { logger } from './logger.js';
8
8
  export async function readTextFile(filePath) {
9
9
  const buffer = await readFile(filePath);
10
10
  return buffer.toString();
@@ -38,7 +38,7 @@ export async function ensureDirectoryExists(baseDir) {
38
38
  }
39
39
  catch (error) {
40
40
  const fsError = error;
41
- ui().logger.warning(fsError.message);
41
+ logger.warn(fsError.message);
42
42
  if (fsError.code !== 'EEXIST') {
43
43
  throw error;
44
44
  }
@@ -52,10 +52,10 @@ export async function removeDirectoryIfExists(dir) {
52
52
  export function logMultipleFileResults(fileResults, messagePrefix) {
53
53
  const succeededTransform = (result) => {
54
54
  const [fileName, size] = result.value;
55
- const formattedSize = size ? ` (${gray(formatBytes(size))})` : '';
56
- return `- ${bold(fileName)}${formattedSize}`;
55
+ const formattedSize = size ? ` (${ansis.gray(formatBytes(size))})` : '';
56
+ return `- ${ansis.bold(fileName)}${formattedSize}`;
57
57
  };
58
- const failedTransform = (result) => `- ${bold(result.reason)}`;
58
+ const failedTransform = (result) => `- ${ansis.bold(`${result.reason}`)}`;
59
59
  logMultipleResults(fileResults, messagePrefix, succeededTransform, failedTransform);
60
60
  }
61
61
  export async function importModule(options) {
@@ -1 +1 @@
1
- {"version":3,"file":"file-system.js","sourceRoot":"","sources":["../../../src/lib/file-system.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file-system.js","sourceRoot":"","sources":["../../../src/lib/file-system.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { simpleGit } from 'simple-git';
2
2
  import { commitSchema, validate } from '@code-pushup/models';
3
3
  import { stringifyError } from '../errors.js';
4
- import { ui } from '../logging.js';
4
+ import { logger } from '../logger.js';
5
5
  import { isSemver } from '../semver.js';
6
6
  export async function getLatestCommit(git = simpleGit()) {
7
7
  try {
@@ -13,7 +13,7 @@ export async function getLatestCommit(git = simpleGit()) {
13
13
  return validate(commitSchema, log.latest);
14
14
  }
15
15
  catch (error) {
16
- ui().logger.error(stringifyError(error));
16
+ logger.error(stringifyError(error));
17
17
  return null;
18
18
  }
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"git.commits-and-tags.js","sourceRoot":"","sources":["../../../../src/lib/git/git.commits-and-tags.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git.commits-and-tags.js","sourceRoot":"","sources":["../../../../src/lib/git/git.commits-and-tags.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import path from 'node:path';
2
2
  import { simpleGit } from 'simple-git';
3
- import { ui } from '../logging.js';
3
+ import { logger } from '../logger.js';
4
4
  import { toUnixPath } from '../transform.js';
5
5
  export function getGitRoot(git = simpleGit()) {
6
6
  return git.revparse('--show-toplevel');
@@ -50,7 +50,7 @@ export async function safeCheckout(branchOrHash, forceCleanStatus = false, git =
50
50
  if (forceCleanStatus) {
51
51
  await git.raw(['reset', '--hard']);
52
52
  await git.clean(['f', 'd']);
53
- ui().logger.info(`git status cleaned`);
53
+ logger.info(`git status cleaned`);
54
54
  }
55
55
  await guardAgainstLocalChanges(git);
56
56
  await git.checkout(branchOrHash);
@@ -1 +1 @@
1
- {"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/lib/git/git.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/lib/git/git.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
1
  export declare function logMultipleResults<T>(results: PromiseSettledResult<T>[], messagePrefix: string, succeededTransform?: (result: PromiseFulfilledResult<T>) => string, failedTransform?: (result: PromiseRejectedResult) => string): void;
2
- export declare function logPromiseResults<T extends PromiseFulfilledResult<unknown> | PromiseRejectedResult>(results: T[], logMessage: string, getMsg: (result: T) => string): void;
2
+ export declare function logPromiseResults<T extends PromiseFulfilledResult<unknown>[] | PromiseRejectedResult[]>(results: T, logMessage: string, getMsg: (result: T[number]) => string): void;
@@ -1,5 +1,5 @@
1
1
  import { isPromiseFulfilledResult, isPromiseRejectedResult } from './guards.js';
2
- import { ui } from './logging.js';
2
+ import { logger } from './logger.js';
3
3
  export function logMultipleResults(results, messagePrefix, succeededTransform, failedTransform) {
4
4
  if (succeededTransform) {
5
5
  const succeededResults = results.filter(isPromiseFulfilledResult);
@@ -13,11 +13,11 @@ export function logMultipleResults(results, messagePrefix, succeededTransform, f
13
13
  export function logPromiseResults(results, logMessage, getMsg) {
14
14
  if (results.length > 0) {
15
15
  const log = results[0]?.status === 'fulfilled'
16
- ? (m) => {
17
- ui().logger.success(m);
16
+ ? (message) => {
17
+ logger.debug(message);
18
18
  }
19
- : (m) => {
20
- ui().logger.warning(m);
19
+ : (message) => {
20
+ logger.warn(message);
21
21
  };
22
22
  log(logMessage);
23
23
  results.forEach(result => {
@@ -1 +1 @@
1
- {"version":3,"file":"log-results.js","sourceRoot":"","sources":["../../../src/lib/log-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,MAAM,UAAU,kBAAkB,CAChC,OAAkC,EAClC,aAAqB,EACrB,kBAAkE,EAClE,eAA2D;IAE3D,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAElE,iBAAiB,CACf,gBAAgB,EAChB,GAAG,aAAa,iBAAiB,EACjC,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAE9D,iBAAiB,CACf,aAAa,EACb,GAAG,aAAa,WAAW,EAC3B,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAE/B,OAAY,EAAE,UAAkB,EAAE,MAA6B;IAC/D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,GAAG,GACP,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW;YAChC,CAAC,CAAC,CAAC,CAAS,EAAE,EAAE;gBACZ,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;YACH,CAAC,CAAC,CAAC,CAAS,EAAE,EAAE;gBACZ,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC;QAER,GAAG,CAAC,UAAU,CAAC,CAAC;QAChB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"log-results.js","sourceRoot":"","sources":["../../../src/lib/log-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,UAAU,kBAAkB,CAChC,OAAkC,EAClC,aAAqB,EACrB,kBAAkE,EAClE,eAA2D;IAE3D,IAAI,kBAAkB,EAAE,CAAC;QACvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAElE,iBAAiB,CACf,gBAAgB,EAChB,GAAG,aAAa,iBAAiB,EACjC,kBAAkB,CACnB,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QAE9D,iBAAiB,CACf,aAAa,EACb,GAAG,aAAa,WAAW,EAC3B,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAE/B,OAAU,EAAE,UAAkB,EAAE,MAAqC;IACrE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,GAAG,GACP,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,WAAW;YAChC,CAAC,CAAC,CAAC,OAAe,EAAE,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YACH,CAAC,CAAC,CAAC,OAAe,EAAE,EAAE;gBAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC,CAAC;QAER,GAAG,CAAC,UAAU,CAAC,CAAC;QAChB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import isaacs_cliui from '@isaacs/cliui';
2
2
  import { cliui } from '@poppinss/cliui';
3
- import { underline } from 'ansis';
3
+ import ansis from 'ansis';
4
4
  import { TERMINAL_WIDTH } from './reports/constants.js';
5
5
  // eslint-disable-next-line functional/no-let
6
6
  let cliUISingleton;
@@ -33,6 +33,6 @@ export function logListItem(args) {
33
33
  cliUIExtendedSingleton?.logger.log(content);
34
34
  }
35
35
  export function link(text) {
36
- return underline.blueBright(text);
36
+ return ansis.underline.blueBright(text);
37
37
  }
38
38
  //# sourceMappingURL=logging.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/lib/logging.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAoBxD,6CAA6C;AAC7C,IAAI,cAAqC,CAAC;AAC1C,6CAA6C;AAC7C,IAAI,sBAAyC,CAAC;AAE9C,MAAM,UAAU,EAAE;IAChB,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,cAAc,GAAG,KAAK,EAAE,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,sBAAsB,GAAG;YACvB,GAAG,cAAc;YACjB,GAAG,EAAE,IAAI,CAAC,EAAE;gBACV,WAAW,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;SACF,CAAC;IACJ,CAAC;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,6CAA6C;AAC7C,IAAI,gBAAgC,CAAC;AACrC,MAAM,UAAU,WAAW,CAAC,IAA8B;IACxD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,gBAAgB,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC;IAC5C,qDAAqD;IACrD,gBAAgB,CAAC,IAAI,GAAG,EAAE,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC"}
1
+ {"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/lib/logging.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAoBxD,6CAA6C;AAC7C,IAAI,cAAqC,CAAC;AAC1C,6CAA6C;AAC7C,IAAI,sBAAyC,CAAC;AAE9C,MAAM,UAAU,EAAE;IAChB,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,cAAc,GAAG,KAAK,EAAE,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,sBAAsB,GAAG;YACvB,GAAG,cAAc;YACjB,GAAG,EAAE,IAAI,CAAC,EAAE;gBACV,WAAW,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;SACF,CAAC;IACJ,CAAC;IAED,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,6CAA6C;AAC7C,IAAI,gBAAgC,CAAC;AACrC,MAAM,UAAU,WAAW,CAAC,IAA8B;IACxD,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,gBAAgB,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC;IAC5C,qDAAqD;IACrD,gBAAgB,CAAC,IAAI,GAAG,EAAE,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC"}
@@ -1,29 +1,27 @@
1
- import { bold, cyan, cyanBright, green, red } from 'ansis';
2
- import { isVerbose } from '../env.js';
1
+ import cliui from '@isaacs/cliui';
2
+ import ansis from 'ansis';
3
+ import { logger } from '../logger.js';
3
4
  import { ui } from '../logging.js';
4
5
  import { CODE_PUSHUP_DOMAIN, FOOTER_PREFIX, REPORT_HEADLINE_TEXT, REPORT_RAW_OVERVIEW_TABLE_HEADERS, TERMINAL_WIDTH, } from './constants.js';
5
6
  import { applyScoreColor, countCategoryAudits, scoreTargetIcon, } from './utils.js';
6
- function log(msg = '') {
7
- ui().logger.log(msg);
8
- }
9
7
  export function logStdoutSummary(report) {
10
8
  const { plugins, categories, packageName, version } = report;
11
- log(reportToHeaderSection({ packageName, version }));
12
- log();
9
+ logger.info(reportToHeaderSection({ packageName, version }));
10
+ logger.newline();
13
11
  logPlugins(plugins);
14
12
  if (categories && categories.length > 0) {
15
13
  logCategories({ plugins, categories });
16
14
  }
17
- log(`${FOOTER_PREFIX} ${CODE_PUSHUP_DOMAIN}`);
18
- log();
15
+ logger.info(`${FOOTER_PREFIX} ${CODE_PUSHUP_DOMAIN}`);
16
+ logger.newline();
19
17
  }
20
18
  function reportToHeaderSection({ packageName, version, }) {
21
- return `${bold(REPORT_HEADLINE_TEXT)} - ${packageName}@${version}`;
19
+ return `${ansis.bold(REPORT_HEADLINE_TEXT)} - ${packageName}@${version}`;
22
20
  }
23
21
  export function logPlugins(plugins) {
24
22
  plugins.forEach(plugin => {
25
23
  const { title, audits } = plugin;
26
- const filteredAudits = isVerbose() || audits.length === 1
24
+ const filteredAudits = logger.isVerbose() || audits.length === 1
27
25
  ? audits
28
26
  : audits.filter(({ score }) => score !== 1);
29
27
  const diff = audits.length - filteredAudits.length;
@@ -34,40 +32,38 @@ export function logPlugins(plugins) {
34
32
  : `... ${diff} audits with perfect scores omitted for brevity ...`;
35
33
  logRow(1, notice);
36
34
  }
37
- log();
35
+ logger.newline();
38
36
  });
39
37
  }
40
38
  function logAudits(pluginTitle, audits) {
41
- log();
42
- log(bold.magentaBright(`${pluginTitle} audits`));
43
- log();
39
+ logger.newline();
40
+ logger.info(ansis.bold.magentaBright(`${pluginTitle} audits`));
41
+ logger.newline();
44
42
  audits.forEach(({ score, title, displayValue, value }) => {
45
43
  logRow(score, title, displayValue || `${value}`);
46
44
  });
47
45
  }
48
46
  function logRow(score, title, value) {
49
- ui().row([
50
- {
51
- text: applyScoreColor({ score, text: '●' }),
52
- width: 2,
53
- padding: [0, 1, 0, 0],
54
- },
55
- {
56
- text: title,
57
- // eslint-disable-next-line @typescript-eslint/no-magic-numbers
58
- padding: [0, 3, 0, 0],
59
- },
60
- ...(value
61
- ? [
62
- {
63
- text: cyanBright(value),
64
- // eslint-disable-next-line @typescript-eslint/no-magic-numbers
65
- width: 20,
66
- padding: [0, 0, 0, 0],
67
- },
68
- ]
69
- : []),
70
- ]);
47
+ const ui = cliui({ width: TERMINAL_WIDTH });
48
+ ui.div({
49
+ text: applyScoreColor({ score, text: '●' }),
50
+ width: 2,
51
+ padding: [0, 1, 0, 0],
52
+ }, {
53
+ text: title,
54
+ // eslint-disable-next-line @typescript-eslint/no-magic-numbers
55
+ padding: [0, 3, 0, 0],
56
+ }, ...(value
57
+ ? [
58
+ {
59
+ text: ansis.cyanBright(value),
60
+ // eslint-disable-next-line @typescript-eslint/no-magic-numbers
61
+ width: 20,
62
+ padding: [0, 0, 0, 0],
63
+ },
64
+ ]
65
+ : []));
66
+ logger.info(ui.toString());
71
67
  }
72
68
  export function logCategories({ plugins, categories, }) {
73
69
  const hAlign = (idx) => (idx === 0 ? 'left' : 'right');
@@ -76,26 +72,27 @@ export function logCategories({ plugins, categories, }) {
76
72
  `${binaryIconPrefix(score, scoreTarget)}${applyScoreColor({ score })}`,
77
73
  countCategoryAudits(refs, plugins),
78
74
  ]);
75
+ // TODO: replace @poppinss/cliui
79
76
  const table = ui().table();
80
77
  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
81
78
  table.columnWidths([TERMINAL_WIDTH - 9 - 10 - 4, 9, 10]);
82
79
  table.head(REPORT_RAW_OVERVIEW_TABLE_HEADERS.map((heading, idx) => ({
83
- content: cyan(heading),
80
+ content: ansis.cyan(heading),
84
81
  hAlign: hAlign(idx),
85
82
  })));
86
83
  rows.forEach(row => table.row(row.map((content, idx) => ({
87
84
  content: content.toString(),
88
85
  hAlign: hAlign(idx),
89
86
  }))));
90
- log(bold.magentaBright('Categories'));
91
- log();
87
+ logger.info(ansis.bold.magentaBright('Categories'));
88
+ logger.newline();
92
89
  table.render();
93
- log();
90
+ logger.newline();
94
91
  }
95
92
  export function binaryIconPrefix(score, scoreTarget) {
96
93
  return scoreTargetIcon(score, scoreTarget, {
97
- passIcon: bold(green('✓')),
98
- failIcon: bold(red('✗')),
94
+ passIcon: ansis.bold(ansis.green('✓')),
95
+ failIcon: ansis.bold(ansis.red('✗')),
99
96
  postfix: ' ',
100
97
  });
101
98
  }
@@ -1 +1 @@
1
- {"version":3,"file":"log-stdout-summary.js","sourceRoot":"","sources":["../../../../src/lib/reports/log-stdout-summary.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log-stdout-summary.js","sourceRoot":"","sources":["../../../../src/lib/reports/log-stdout-summary.ts"],"names":[],"mappings":"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"}