@plugjs/plug 0.4.27 → 0.4.29

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.
Files changed (59) hide show
  1. package/dist/async.cjs +3 -3
  2. package/dist/async.cjs.map +1 -1
  3. package/dist/async.d.ts +1 -1
  4. package/dist/async.mjs +3 -3
  5. package/dist/async.mjs.map +1 -1
  6. package/dist/build.cjs +6 -6
  7. package/dist/build.cjs.map +1 -1
  8. package/dist/build.d.ts +1 -1
  9. package/dist/build.mjs +4 -4
  10. package/dist/build.mjs.map +1 -1
  11. package/dist/cli.mjs +1 -1
  12. package/dist/fork.cjs +1 -1
  13. package/dist/fork.cjs.map +1 -1
  14. package/dist/fork.mjs +1 -1
  15. package/dist/fork.mjs.map +1 -1
  16. package/dist/helpers.cjs +15 -3
  17. package/dist/helpers.cjs.map +1 -1
  18. package/dist/helpers.d.ts +2 -2
  19. package/dist/helpers.mjs +17 -5
  20. package/dist/helpers.mjs.map +1 -1
  21. package/dist/logging/colors.cjs +5 -0
  22. package/dist/logging/colors.cjs.map +2 -2
  23. package/dist/logging/colors.d.ts +2 -0
  24. package/dist/logging/colors.mjs +4 -0
  25. package/dist/logging/colors.mjs.map +2 -2
  26. package/dist/logging/report.cjs +3 -3
  27. package/dist/logging/report.cjs.map +1 -1
  28. package/dist/logging/report.mjs +5 -5
  29. package/dist/logging/report.mjs.map +1 -1
  30. package/dist/logging/spinner.cjs +2 -2
  31. package/dist/logging/spinner.cjs.map +1 -1
  32. package/dist/logging/spinner.mjs +3 -3
  33. package/dist/logging/spinner.mjs.map +1 -1
  34. package/dist/types.cjs +0 -12
  35. package/dist/types.cjs.map +1 -1
  36. package/dist/types.d.ts +1 -10
  37. package/dist/types.mjs +0 -5
  38. package/dist/types.mjs.map +2 -2
  39. package/dist/utils/jsonc.cjs +76 -0
  40. package/dist/utils/jsonc.cjs.map +6 -0
  41. package/dist/utils/jsonc.d.ts +17 -0
  42. package/dist/utils/jsonc.mjs +50 -0
  43. package/dist/utils/jsonc.mjs.map +6 -0
  44. package/dist/utils.cjs +2 -0
  45. package/dist/utils.cjs.map +1 -1
  46. package/dist/utils.d.ts +1 -0
  47. package/dist/utils.mjs +1 -0
  48. package/dist/utils.mjs.map +1 -1
  49. package/package.json +2 -1
  50. package/src/async.ts +2 -3
  51. package/src/build.ts +17 -10
  52. package/src/fork.ts +1 -1
  53. package/src/helpers.ts +18 -6
  54. package/src/logging/colors.ts +11 -0
  55. package/src/logging/report.ts +5 -5
  56. package/src/logging/spinner.ts +3 -3
  57. package/src/types.ts +1 -15
  58. package/src/utils/jsonc.ts +62 -0
  59. package/src/utils.ts +1 -0
package/dist/async.cjs CHANGED
@@ -29,13 +29,13 @@ module.exports = __toCommonJS(async_exports);
29
29
  var import_node_async_hooks = require("node:async_hooks");
30
30
  var import_asserts = require("./asserts.cjs");
31
31
  var import_singleton = require("./utils/singleton.cjs");
32
- function runAsync(context, taskName, callback) {
32
+ function runAsync(context, callback) {
33
33
  return storage.run(context, async () => {
34
34
  try {
35
- tasks.add(taskName);
35
+ tasks.add(context.taskName);
36
36
  return await callback();
37
37
  } finally {
38
- tasks.delete(taskName);
38
+ tasks.delete(context.taskName);
39
39
  }
40
40
  });
41
41
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/async.ts"],
4
- "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,8BAAkC;AAElC,qBAAuB;AACvB,uBAA6B;AAYtB,SAAS,SACZ,SACA,UACA,UACU;AACZ,SAAO,QAAQ,IAAI,SAAS,YAAY;AACtC,QAAI;AACF,YAAM,IAAI,QAAQ;AAClB,aAAO,MAAM,SAAS;AAAA,IACxB,UAAE;AACA,YAAM,OAAO,QAAQ;AAAA,IACvB;AAAA,EACF,CAAC;AACH;AAMO,SAAS,iBAAsC;AACpD,SAAO,QAAQ,SAAS;AAC1B;AAMO,SAAS,iBAA0B;AACxC,QAAM,UAAU,QAAQ,SAAS;AACjC,6BAAO,SAAS,oCAAoC;AACpD,SAAO;AACT;AAKO,SAAS,eAAyB;AACvC,SAAO,CAAE,GAAG,KAAM,EAAE,KAAK;AAC3B;AAOA,IAAM,aAAa,OAAO,IAAI,sCAAsC;AACpE,IAAM,WAAW,OAAO,IAAI,2CAA2C;AAEvE,IAAM,cAAU,+BAAa,YAAY,MAAM,IAAI,0CAA2B,CAAC;AAC/E,IAAM,YAAQ,+BAAa,UAAU,MAAM,oBAAI,IAAY,CAAC;",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,8BAAkC;AAElC,qBAAuB;AACvB,uBAA6B;AAYtB,SAAS,SACZ,SACA,UACU;AACZ,SAAO,QAAQ,IAAI,SAAS,YAAY;AACtC,QAAI;AACF,YAAM,IAAI,QAAQ,QAAQ;AAC1B,aAAO,MAAM,SAAS;AAAA,IACxB,UAAE;AACA,YAAM,OAAO,QAAQ,QAAQ;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAMO,SAAS,iBAAsC;AACpD,SAAO,QAAQ,SAAS;AAC1B;AAMO,SAAS,iBAA0B;AACxC,QAAM,UAAU,QAAQ,SAAS;AACjC,6BAAO,SAAS,oCAAoC;AACpD,SAAO;AACT;AAKO,SAAS,eAAyB;AACvC,SAAO,CAAE,GAAG,KAAM,EAAE,KAAK;AAC3B;AAOA,IAAM,aAAa,OAAO,IAAI,sCAAsC;AACpE,IAAM,WAAW,OAAO,IAAI,2CAA2C;AAEvE,IAAM,cAAU,+BAAa,YAAY,MAAM,IAAI,0CAA2B,CAAC;AAC/E,IAAM,YAAQ,+BAAa,UAAU,MAAM,oBAAI,IAAY,CAAC;",
5
5
  "names": []
6
6
  }
package/dist/async.d.ts CHANGED
@@ -3,7 +3,7 @@ import type { Context } from './pipe';
3
3
  * Run the specified `callback` associating the specified {@link Context} and task
4
4
  * name with the current asynchronous invocation context.
5
5
  */
6
- export declare function runAsync<T>(context: Context, taskName: string, callback: () => Promise<T>): Promise<T>;
6
+ export declare function runAsync<T>(context: Context, callback: () => Promise<T>): Promise<T>;
7
7
  /**
8
8
  * Returns the {@link Context} associated with the current asynchronous
9
9
  * invocation context or `undefined`.
package/dist/async.mjs CHANGED
@@ -2,13 +2,13 @@
2
2
  import { AsyncLocalStorage } from "node:async_hooks";
3
3
  import { assert } from "./asserts.mjs";
4
4
  import { getSingleton } from "./utils/singleton.mjs";
5
- function runAsync(context, taskName, callback) {
5
+ function runAsync(context, callback) {
6
6
  return storage.run(context, async () => {
7
7
  try {
8
- tasks.add(taskName);
8
+ tasks.add(context.taskName);
9
9
  return await callback();
10
10
  } finally {
11
- tasks.delete(taskName);
11
+ tasks.delete(context.taskName);
12
12
  }
13
13
  });
14
14
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/async.ts"],
4
- "mappings": ";AAAA,SAAS,yBAAyB;AAElC,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAYtB,SAAS,SACZ,SACA,UACA,UACU;AACZ,SAAO,QAAQ,IAAI,SAAS,YAAY;AACtC,QAAI;AACF,YAAM,IAAI,QAAQ;AAClB,aAAO,MAAM,SAAS;AAAA,IACxB,UAAE;AACA,YAAM,OAAO,QAAQ;AAAA,IACvB;AAAA,EACF,CAAC;AACH;AAMO,SAAS,iBAAsC;AACpD,SAAO,QAAQ,SAAS;AAC1B;AAMO,SAAS,iBAA0B;AACxC,QAAM,UAAU,QAAQ,SAAS;AACjC,SAAO,SAAS,oCAAoC;AACpD,SAAO;AACT;AAKO,SAAS,eAAyB;AACvC,SAAO,CAAE,GAAG,KAAM,EAAE,KAAK;AAC3B;AAOA,IAAM,aAAa,OAAO,IAAI,sCAAsC;AACpE,IAAM,WAAW,OAAO,IAAI,2CAA2C;AAEvE,IAAM,UAAU,aAAa,YAAY,MAAM,IAAI,kBAA2B,CAAC;AAC/E,IAAM,QAAQ,aAAa,UAAU,MAAM,oBAAI,IAAY,CAAC;",
4
+ "mappings": ";AAAA,SAAS,yBAAyB;AAElC,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAYtB,SAAS,SACZ,SACA,UACU;AACZ,SAAO,QAAQ,IAAI,SAAS,YAAY;AACtC,QAAI;AACF,YAAM,IAAI,QAAQ,QAAQ;AAC1B,aAAO,MAAM,SAAS;AAAA,IACxB,UAAE;AACA,YAAM,OAAO,QAAQ,QAAQ;AAAA,IAC/B;AAAA,EACF,CAAC;AACH;AAMO,SAAS,iBAAsC;AACpD,SAAO,QAAQ,SAAS;AAC1B;AAMO,SAAS,iBAA0B;AACxC,QAAM,UAAU,QAAQ,SAAS;AACjC,SAAO,SAAS,oCAAoC;AACpD,SAAO;AACT;AAKO,SAAS,eAAyB;AACvC,SAAO,CAAE,GAAG,KAAM,EAAE,KAAK;AAC3B;AAOA,IAAM,aAAa,OAAO,IAAI,sCAAsC;AACpE,IAAM,WAAW,OAAO,IAAI,2CAA2C;AAEvE,IAAM,UAAU,aAAa,YAAY,MAAM,IAAI,kBAA2B,CAAC;AAC/E,IAAM,QAAQ,aAAa,UAAU,MAAM,oBAAI,IAAY,CAAC;",
5
5
  "names": []
6
6
  }
package/dist/build.cjs CHANGED
@@ -33,7 +33,7 @@ var import_logging = require("./logging.cjs");
33
33
  var import_pipe = require("./pipe.cjs");
34
34
  var import_caller = require("./utils/caller.cjs");
35
35
  var import_singleton = require("./utils/singleton.cjs");
36
- var import_types = require("./types.cjs");
36
+ var buildMarker = Symbol.for("plugjs:plug:types:Build");
37
37
  var taskCallMarker = Symbol.for("plugjs:plug:types:TaskCall");
38
38
  function isTaskCall(something) {
39
39
  return something[taskCallMarker] === taskCallMarker;
@@ -95,7 +95,7 @@ var TaskImpl = class {
95
95
  await before.invoke(state, before.name);
96
96
  context.log.info("Running...");
97
97
  const now = Date.now();
98
- const promise = (0, import_async.runAsync)(context, taskName, async () => {
98
+ const promise = (0, import_async.runAsync)(context, async () => {
99
99
  return await this._def.call(build2) || void 0;
100
100
  }).then(async (result) => {
101
101
  const level = taskName.startsWith("_") ? "info" : "notice";
@@ -145,7 +145,7 @@ function build(def) {
145
145
  } catch (error) {
146
146
  if (state.fails.size) {
147
147
  logger.error("");
148
- logger.error(state.fails.size, state.fails.size === 1 ? "task" : "tasks", "failed:");
148
+ logger.error((0, import_logging.$plur)(state.fails.size, "task", "tasks"), "failed:");
149
149
  state.fails.forEach((task) => logger.error((0, import_logging.$gry)("*"), (0, import_logging.$t)(task.name)));
150
150
  logger.error("");
151
151
  }
@@ -171,15 +171,15 @@ function build(def) {
171
171
  });
172
172
  }
173
173
  const compiled = merge(props, callables);
174
- Object.defineProperty(compiled, import_types.buildMarker, { value: invoke });
174
+ Object.defineProperty(compiled, buildMarker, { value: invoke });
175
175
  return compiled;
176
176
  }
177
177
  function isBuild(build2) {
178
- return build2 && typeof build2[import_types.buildMarker] === "function";
178
+ return build2 && typeof build2[buildMarker] === "function";
179
179
  }
180
180
  function invokeTasks(build2, tasks, props) {
181
181
  if (isBuild(build2)) {
182
- return build2[import_types.buildMarker](tasks, props);
182
+ return build2[buildMarker](tasks, props);
183
183
  } else {
184
184
  throw new TypeError("Invalid build instance");
185
185
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/build.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["build", "promise", "start", "invoke"]
6
6
  }
package/dist/build.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Build, BuildProps, BuildDef, ThisBuild, BuildTasks } from './types';
1
+ import type { Build, BuildDef, BuildProps, BuildTasks, ThisBuild } from './types';
2
2
  /** Compile a {@link BuildDef | build definition} into a {@link Build} */
3
3
  export declare function build<D extends BuildDef, B extends ThisBuild<D>>(def: D & ThisType<B>): Build<D>;
4
4
  /** Check if the specified build is actually a {@link Build} */
package/dist/build.mjs CHANGED
@@ -1,11 +1,11 @@
1
1
  // build.ts
2
2
  import { assert } from "./asserts.mjs";
3
3
  import { runAsync } from "./async.mjs";
4
- import { $gry, $ms, $p, $t, getLogger, logOptions } from "./logging.mjs";
4
+ import { $gry, $ms, $p, $plur, $t, getLogger, logOptions } from "./logging.mjs";
5
5
  import { Context, ContextPromises, PipeImpl } from "./pipe.mjs";
6
6
  import { findCaller } from "./utils/caller.mjs";
7
7
  import { getSingleton } from "./utils/singleton.mjs";
8
- import { buildMarker } from "./types.mjs";
8
+ var buildMarker = Symbol.for("plugjs:plug:types:Build");
9
9
  var taskCallMarker = Symbol.for("plugjs:plug:types:TaskCall");
10
10
  function isTaskCall(something) {
11
11
  return something[taskCallMarker] === taskCallMarker;
@@ -67,7 +67,7 @@ var TaskImpl = class {
67
67
  await before.invoke(state, before.name);
68
68
  context.log.info("Running...");
69
69
  const now = Date.now();
70
- const promise = runAsync(context, taskName, async () => {
70
+ const promise = runAsync(context, async () => {
71
71
  return await this._def.call(build2) || void 0;
72
72
  }).then(async (result) => {
73
73
  const level = taskName.startsWith("_") ? "info" : "notice";
@@ -117,7 +117,7 @@ function build(def) {
117
117
  } catch (error) {
118
118
  if (state.fails.size) {
119
119
  logger.error("");
120
- logger.error(state.fails.size, state.fails.size === 1 ? "task" : "tasks", "failed:");
120
+ logger.error($plur(state.fails.size, "task", "tasks"), "failed:");
121
121
  state.fails.forEach((task) => logger.error($gry("*"), $t(task.name)));
122
122
  logger.error("");
123
123
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/build.ts"],
4
- "mappings": ";AAAA,SAAS,cAAc;AACvB,SAAS,gBAAgB;AACzB,SAAS,MAAM,KAAK,IAAI,IAAI,WAAW,kBAAkB;AACzD,SAAS,SAAS,iBAAiB,gBAAgB;AACnD,SAAS,kBAAkB;AAC3B,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAwB5B,IAAM,iBAAiB,OAAO,IAAI,4BAA4B;AAG9D,SAAS,WAAW,WAAuC;AACzD,SAAO,UAAU,cAAc,MAAM;AACvC;AAGA,SAAS,MAAY,GAAM,GAAa;AACtC,SAAO,OAAO,OAAO,uBAAO,OAAO,IAAI,GAAG,GAAG,CAAC;AAChD;AAGA,SAAS,UAAU,OAMT;AACR,QAAM;AAAA,IACJ,QAAQ,oBAAI,IAAI;AAAA,IAChB,QAAQ,oBAAI,IAAI;AAAA,IAChB,QAAQ,CAAC;AAAA,IACT,QAAQ,CAAC;AAAA,IACT,QAAQ,CAAC;AAAA,EACX,IAAI;AAEJ,SAAO,EAAE,OAAO,OAAO,OAAO,OAAO,MAAM;AAC7C;AAMA,IAAM,YAAY,OAAO,IAAI,8BAA8B;AAC3D,IAAM,SAAS,aAAa,WAAW,OAAO,EAAE,IAAI,EAAE,EAAE;AAExD,IAAM,WAAN,MAAoD;AAAA,EAQlD,YACoB,MACA,WACC,MACjB,QACA,QACF;AALkB;AACA;AACC;AAInB,SAAK,QAAQ;AACb,SAAK,QAAQ;AAAA,EACf;AAAA,EAhBgB,SAAyB,CAAC;AAAA,EAC1B,QAAwB,CAAC;AAAA,EACzB,KAAa,EAAG,OAAO;AAAA,EAEvC;AAAA,EACA;AAAA,EAaA,MAAM,OAAO,OAAc,UAA8B;AACvD,WAAO,CAAE,MAAM,MAAM,SAAS,IAAI,GAAG,8BAA8B,GAAG,QAAQ,CAAC,EAAE;AAGjF,UAAM,SAAS,MAAM,MAAM,IAAI,IAAI;AACnC,QAAI;AAAQ,aAAO;AAGnB,YAAQ,UAAU;AAAA,MAChB,OAAO,MAAM,KAAK,OAAO,MAAM,KAAK;AAAA,MACpC,OAAO,MAAM,KAAK,OAAO,MAAM,KAAK;AAAA,MACpC,OAAO,CAAE,GAAG,MAAM,OAAO,IAAK;AAAA,MAC9B,OAAO,MAAM;AAAA,MACb,OAAO,MAAM;AAAA,IACf,CAAC;AAGD,UAAM,UAAU,IAAI,QAAQ,KAAK,WAAW,QAAQ;AAGpD,UAAMA,SAAQ,IAAI,MAAM,CAAC,GAAG;AAAA,MAC1B,KAAK,CAAC,GAAQ,SAA+C;AAE3D,YAAI,QAAQ,MAAM,OAAO;AACvB,iBAAO,MAAY;AACjB,kBAAMC,WAAW,MAAc,MAAM,IAAI,EAAG,OAAO,OAAO,IAAI;AAC9D,mBAAO,IAAI,SAAS,SAASA,QAAO;AAAA,UACtC;AAAA,QACF,WAAW,QAAQ,MAAM,OAAO;AAC9B,iBAAQ,MAAc,MAAM,IAAI;AAAA,QAClC;AAAA,MACF;AAAA,IACF,CAAC;AAGD,eAAW,UAAU,KAAK;AAAQ,YAAM,OAAO,OAAO,OAAO,OAAO,IAAI;AAGxE,YAAQ,IAAI,KAAK,YAAY;AAC7B,UAAM,MAAM,KAAK,IAAI;AAGrB,UAAM,UAAU,SAAS,SAAS,UAAU,YAAY;AACtD,aAAO,MAAM,KAAK,KAAK,KAAKD,MAAK,KAAK;AAAA,IACxC,CAAC,EAAE,KAAK,OAAO,WAAW;AACxB,YAAM,QAAQ,SAAS,WAAW,GAAG,IAAI,SAAS;AAClD,cAAQ,IAAI,KAAK,EAAE,WAAW,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE;AACrD,aAAO;AAAA,IACT,CAAC,EAAE,MAAM,CAAC,UAAU;AAClB,YAAM,MAAM,IAAI,IAAI;AACpB,YAAM,QAAQ,IAAI,KAAK,WAAW,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK;AAAA,IAClE,CAAC,EAAE,QAAQ,YAAY;AACrB,YAAM,gBAAgB,KAAK,OAAO;AAAA,IACpC,CAAC,EAAE,KAAK,OAAO,WAAW;AACxB,iBAAW,SAAS,KAAK;AAAO,cAAM,MAAM,OAAO,OAAO,MAAM,IAAI;AACpE,aAAO;AAAA,IACT,CAAC;AAGD,UAAM,MAAM,IAAI,MAAM,OAAO;AAC7B,WAAO;AAAA,EACT;AACF;AAOO,SAAS,MAEd,KAAgC;AAChC,QAAM,YAAY,WAAW,KAAK;AAClC,QAAM,QAA8B,CAAC;AACrC,QAAM,QAAgC,CAAC;AAGvC,aAAW,CAAE,KAAK,GAAI,KAAK,OAAO,QAAQ,GAAG,GAAG;AAC9C,QAAI,MAAM;AACV,QAAI,WAAW,GAAG,GAAG;AACnB,YAAM,GAAG,IAAI,IAAI;AACjB,YAAM,IAAI;AAAA,IACZ,WAAW,OAAO,QAAQ,UAAU;AAClC,YAAM,GAAG,IAAI;AAAA,IACf,WAAW,OAAO,QAAQ,YAAY;AACpC,YAAM,GAAG,IAAI,IAAI,SAAS,KAAK,WAAW,KAAK,OAAO,KAAK;AAE3D,YAAM,IAAI;AAAA,IACZ;AAIA,QAAI,MAAM,WAAW;AAAY,iBAAW,aAAa;AAAA,EAC3D;AAGA,QAAM,QAAQ,eAAeE,OACzB,UACA,gBAAoD,CAAC,GAC3C;AAEZ,UAAM,QAAQ,UAAU,EAAE,OAAO,OAAO,MAAM,OAAO,aAAa,EAAE,CAAC;AACrE,UAAM,SAAS,UAAU;AACzB,WAAO,OAAO,aAAa;AAC3B,UAAM,MAAM,KAAK,IAAI;AAErB,QAAI;AACF,YAAM,SAAS,MAAM,SAAS,KAAK;AACnC,aAAO,OAAO,oBAAoB,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE;AACzD,aAAO;AAAA,IACT,SAAS,OAAO;AACd,UAAI,MAAM,MAAM,MAAM;AACpB,eAAO,MAAM,EAAE;AACf,eAAO,MAAM,MAAM,MAAM,MAAM,MAAM,MAAM,SAAS,IAAI,SAAS,SAAS,SAAS;AACnF,cAAM,MAAM,QAAQ,CAAC,SAAS,OAAO,MAAM,KAAK,GAAG,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC;AACpE,eAAO,MAAM,EAAE;AAAA,MACjB;AACA,YAAM,OAAO,KAAK,gBAAgB,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK;AAAA,IAClE;AAAA,EACF;AAGA,QAAM,SAAS,eAAeC,QAC1B,WACA,gBAAoD,CAAC,GACxC;AACf,UAAM,MAAM,OAAO,UAAgC;AACjD,iBAAW,QAAQ,WAAW;AAC5B,cAAM,OAAO,MAAM,IAAI;AACvB,eAAO,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAC,EAAE;AACnE,cAAM,KAAK,OAAO,OAAO,IAAI;AAAA,MAC/B;AAAA,IACF,GAAG,aAAa;AAAA,EAClB;AAGA,QAAM,YAAsC,CAAC;AAC7C,aAAW,CAAE,MAAM,IAAK,KAAK,OAAO,QAAQ,KAAK,GAAG;AAElD,UAAM,WAAW,OAAO,kBACtB,MAAM,OAAO,UACX,KAAK,OAAO,OAAO,IAAI,GAAG,aAAa;AAG3C,cAAU,IAAI,IAAI,OAAO,iBAAiB,UAAU;AAAA,MAClD,CAAC,cAAc,GAAG,EAAE,OAAO,eAAe;AAAA,MAC1C,QAAQ,EAAE,OAAO,KAAK;AAAA,MACtB,QAAQ,EAAE,OAAO,KAAK;AAAA,IACxB,CAAC;AAAA,EACH;AAGA,QAAM,WAAW,MAAM,OAAO,SAAS;AACvC,SAAO,eAAe,UAAU,aAAa,EAAE,OAAO,OAAO,CAAC;AAC9D,SAAO;AACT;AAGO,SAAS,QAAQH,QAAiD;AACvE,SAAOA,UAAS,OAAOA,OAAM,WAAW,MAAM;AAChD;AAGO,SAAS,YACZA,QACA,OACA,OACa;AACf,MAAI,QAAQA,MAAK,GAAG;AAClB,WAAOA,OAAM,WAAW,EAAE,OAAO,KAAK;AAAA,EACxC,OAAO;AACL,UAAM,IAAI,UAAU,wBAAwB;AAAA,EAC9C;AACF;AAOO,SAAS,WACZA,QACA,UACA,OACI;AACN,QAAM,WAAWA,OAAM,QAAQ;AAC/B,SAAO,WAAW,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC,sBAAsB;AAExE,aAAW,QAAQ,OAAO;AACxB,UAAM,aAAaA,OAAM,IAAI;AAC7B,WAAO,WAAW,UAAU,GAAG,SAAS,GAAG,IAAI,CAAC,qBAAqB,GAAG,QAAQ,CAAC,sBAAsB;AACvG,QAAI,SAAS,KAAK,OAAO,SAAS,WAAW,IAAI;AAAG;AACpD,aAAS,KAAK,OAAO,KAAK,WAAW,IAAI;AAAA,EAC3C;AACF;AAGO,SAAS,UACZA,QACA,UACA,OACI;AACN,QAAM,WAAWA,OAAM,QAAQ;AAC/B,SAAO,WAAW,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC,sBAAsB;AAExE,aAAW,QAAQ,OAAO;AACxB,UAAM,YAAYA,OAAM,IAAI;AAC5B,WAAO,WAAW,SAAS,GAAG,SAAS,GAAG,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC,sBAAsB;AACrG,QAAI,SAAS,KAAK,MAAM,SAAS,UAAU,IAAI;AAAG;AAClD,aAAS,KAAK,MAAM,KAAK,UAAU,IAAI;AAAA,EACzC;AACF;",
4
+ "mappings": "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",
5
5
  "names": ["build", "promise", "start", "invoke"]
6
6
  }
package/dist/cli.mjs CHANGED
@@ -13,7 +13,7 @@ var { TRACE, DEBUG, INFO, NOTICE, WARN, ERROR, OFF } = logLevels;
13
13
  var $bnd = (s) => $blu($und(s));
14
14
  var $gnd = (s) => $gry($und(s));
15
15
  var $wnd = (s) => $wht($und(s));
16
- var version = true ? "0.4.27" : "0.0.0-dev";
16
+ var version = true ? "0.4.29" : "0.0.0-dev";
17
17
  function help() {
18
18
  console.log(`${$bnd("Usage:")}
19
19
 
package/dist/fork.cjs CHANGED
@@ -146,7 +146,7 @@ Node.js ${process.version} (pid=${process.pid})
146
146
  } = message;
147
147
  const context = new import_pipe.Context(buildFile, taskName);
148
148
  context.log.debug("Message from parent process for PID", process.pid, message);
149
- const result = (0, import_async.runAsync)(context, taskName, async () => {
149
+ const result = (0, import_async.runAsync)(context, async () => {
150
150
  (0, import_asserts.assert)((0, import_paths.resolveFile)(scriptFile), `Script file ${(0, import_logging.$p)(scriptFile)} not found`);
151
151
  const script = await import(scriptFile);
152
152
  let Ctor;
package/dist/fork.cjs.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/fork.ts"],
4
- "mappings": "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",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;AAErB,qBAAqC;AACrC,mBAAyB;AACzB,mBAAsB;AACtB,qBAA2C;AAC3C,mBAA6C;AAC7C,kBAAiC;AAgD1B,IAAe,cAAf,MAAuD;AAAA,EAC5D,YACqB,aACA,YACA,aACnB;AAHmB;AACA;AACA;AAAA,EAClB;AAAA,EAEH,KAAK,OAAc,SAAuC;AACxD,UAAM,UAAoB;AAAA,MACxB,YAAY,KAAK;AAAA,MACjB,YAAY,KAAK;AAAA,MACjB,iBAAiB,KAAK;AAAA,MACtB,UAAU,QAAQ;AAAA,MAClB,WAAW,QAAQ;AAAA,MACnB,UAAU,MAAM;AAAA,MAChB,WAAW,CAAE,GAAG,MAAM,cAAc,CAAE;AAAA,IACxC;AAGA,UAAM,aAAS,8BAAgB,UAAS;AACxC,YAAQ,IAAI,MAAM,+BAA2B,mBAAG,KAAK,WAAW,CAAC;AAGjE,UAAM,MAAM,EAAE,GAAG,QAAQ,KAAK,GAAG,0BAAW,QAAQ,QAAQ,UAAU,CAAC,EAAE;AAGzE,aAAS,IAAI,KAAK,WAAW,SAAS,GAAG,KAAK,GAAG,KAAM;AACrD,UAAI,KAAK,WAAW,CAAC,KAAK;AAAM;AAChC,UAAI,OAAO,KAAK,WAAW,CAAC,MAAM,UAAU;AAC1C,YAAI,OAAO,KAAK,WAAW,CAAC,EAAE,gBAAgB,UAAU;AACtD,gBAAM,MAAM,IAAI,mBAAmB,QAAQ,QAAQ,KAAK,WAAW,CAAC,EAAE,WAAW;AACjF,kBAAQ,IAAI,MAAM,+CAA2C,mBAAG,GAAG,CAAC;AAAA,QACtE;AACA,YAAI,OAAO,KAAK,WAAW,CAAC,EAAE,gBAAgB,UAAU;AACtD,gBAAM,QAAQ,IAAI,yBAAyB,KAAK,WAAW,CAAC,EAAE;AAC9D,kBAAQ,IAAI,MAAM,gDAA4C,mBAAG,KAAK,CAAC;AAAA,QACzE;AAAA,MACF;AAAA,IACF;AAGA,UAAM,YAAQ,gCAAK,QAAQ;AAAA,MACzB,OAAO,CAAE,UAAU,WAAW,WAAW,OAAO,MAAO;AAAA,MACvD;AAAA,IACF,CAAC;AAGD,QAAI,MAAM,MAAM,CAAC,GAAG;AAClB,YAAM,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,SAAS,0BAAW,OAAO,MAAM,IAAI,CAAC;AAAA,IACnE;AAEA,YAAQ,IAAI,KAAK,eAAW,mBAAG,MAAM,OAAG,qBAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AAGlE,QAAI,OAAO;AACX,WAAO,IAAI,QAAoB,CAAC,SAAS,WAAW;AAClD,UAAI,WAAmC;AAEvC,YAAM,GAAG,SAAS,CAAC,UAAU;AAC3B,gBAAQ,IAAI,MAAM,6BAA6B,KAAK;AACpD,eAAO,QAAQ,OAAO,4BAAa,KAAK,CAAC;AAAA,MAC3C,CAAC;AAED,YAAM,GAAG,WAAW,CAAC,YAAwB;AAC3C,gBAAQ,IAAI,MAAM,6CAA6C,MAAM,KAAK,OAAO;AACjF,mBAAW;AAAA,MACb,CAAC;AAED,YAAM,GAAG,QAAQ,CAAC,MAAM,WAAW;AACjC,YAAI,QAAQ;AACV,kBAAQ,IAAI,MAAM,0CAA0C,MAAM,QAAI,qBAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AAChG,iBAAO,QAAQ,OAAO,4BAAa,KAAK,CAAC;AAAA,QAC3C,WAAW,SAAS,GAAG;AACrB,kBAAQ,IAAI,MAAM,wCAAwC,IAAI,QAAI,qBAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AAC5F,iBAAO,QAAQ,OAAO,4BAAa,KAAK,CAAC;AAAA,QAC3C,WAAW,CAAE,UAAU;AACrB,kBAAQ,IAAI,MAAM,iDAA6C,qBAAK,QAAQ,MAAM,GAAG,GAAG,CAAC;AACzF,iBAAO,QAAQ,OAAO,4BAAa,KAAK,CAAC;AAAA,QAC3C,WAAW,SAAS,QAAQ;AAE1B,iBAAO,QAAQ,OAAO,4BAAa,KAAK,CAAC;AAAA,QAC3C;AAGA,eAAO,QAAQ,QAAQ,SAAS,YAAY,SAAS,YACjD,mBAAM,QAAQ,SAAS,QAAQ,EAAE,IAAI,GAAG,SAAS,SAAS,EAAE,MAAM,IAClE,MAAS;AAAA,MACf,CAAC;AAGD,UAAI;AACF,cAAM,SAAS,MAAM,KAAK,SAAS,CAAC,UAAU;AAC5C,cAAI,OAAO;AACT,oBAAQ,IAAI,MAAM,mEAAmE,KAAK;AAC1F,mBAAO,4BAAa,KAAK,CAAC;AAAA,UAC5B;AAAA,QACF,CAAC;AACD,YAAI,CAAE,QAAQ;AACZ,kBAAQ,IAAI,MAAM,oEAAoE;AACtF,iBAAO,4BAAa,KAAK,CAAC;AAAA,QAC5B;AAAA,MACF,SAAS,OAAO;AACd,gBAAQ,IAAI,MAAM,mEAAmE,KAAK;AAC1F,eAAO,4BAAa,KAAK,CAAC;AAAA,MAC5B;AAAA,IACF,CAAC,EAAE,QAAQ,MAAM,OAAO,IAAI;AAAA,EAC9B;AACF;AAYA,IAAK,QAAQ,KAAK,CAAC,UAAM,8BAAgB,UAAS,KAAO,QAAQ,MAAO;AAEtE,UAAQ,GAAG,qBAAqB,CAAC,OAAO,WAAW;AAEjD,YAAQ;AAAA,UACJ,qBAAK,kEAAkE;AAAA,MACvE;AAAA,SAAY,MAAM;AAAA,MAAM;AAAA,MACxB;AAAA,UAAa,QAAQ,OAAO,SAAS,QAAQ,GAAG;AAAA;AAAA,IAAK;AACzD,YAAQ,SAAS,MAAM,QAAQ,KAAK,CAAC,CAAC;AAAA,EACxC,CAAC;AAGD,QAAM,UAAU,WAAW,MAAM;AAE/B,YAAQ,MAAM,mCAAmC;AACjD,YAAQ,KAAK,CAAC;AAAA,EAChB,GAAG,GAAI,EAAE,MAAM;AAGf,UAAQ,GAAG,WAAW,CAAC,YAAsB;AAC3C,iBAAa,OAAO;AAEpB,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,IAAI;AAGJ,UAAM,UAAU,IAAI,oBAAQ,WAAW,QAAQ;AAC/C,YAAQ,IAAI,MAAM,uCAAuC,QAAQ,KAAK,OAAO;AAG7E,UAAM,aAAS,uBAAS,SAAS,YAAY;AAE3C,qCAAO,0BAAY,UAAU,GAAG,mBAAe,mBAAG,UAAU,CAAC,YAAY;AACzE,YAAM,SAAS,MAAM,OAAO;AAG5B,UAAI;AACJ,UAAI,eAAe,WAAW;AAC5B,eAAO;AACP,eAAO,QAAS,OAAO,SAAS;AAAa,iBAAO,KAAK;AACzD,mCAAO,OAAO,SAAS,YAAY,cAAU,mBAAG,UAAU,CAAC,wCAAwC;AAAA,MACrG,OAAO;AACL,eAAO,OAAO,UAAU;AACxB,YAAK,CAAE,QAAU,OAAO;AAAU,iBAAO,OAAO,QAAQ,UAAU;AAClE,mCAAO,OAAO,SAAS,YAAY,cAAU,mBAAG,UAAU,CAAC,qBAAqB,UAAU,GAAG;AAAA,MAC/F;AAGA,YAAM,OAAO,IAAI,KAAK,GAAG,eAAe;AACxC,YAAM,QAAQ,mBAAM,QAAQ,QAAQ,EAAE,IAAI,GAAG,SAAS,EAAE,MAAM;AAG9D,aAAO,KAAK,KAAK,OAAO,OAAO;AAAA,IACjC,CAAC;AAGD,UAAM,UAAU,OAAO,KAAK,CAACA,YAAW;AACtC,YAAMC,WAAsBD,UAC1B,EAAE,QAAQ,OAAO,UAAUA,QAAO,WAAW,WAAW,CAAE,GAAGA,QAAO,cAAc,CAAE,EAAE,IACtF,EAAE,QAAQ,MAAM;AAClB,aAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,gBAAQ,KAAMC,UAAS,CAAC,QAAe,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC;AAAA,MACtE,CAAC;AAAA,IACH,GAAG,CAAC,UAAU;AACZ,cAAQ,IAAI,MAAM,KAAK;AACvB,aAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,gBAAQ,KAAM,EAAE,QAAQ,KAAK,GAAG,CAAC,QAAe,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAC;AAAA,MAC/E,CAAC;AAAA,IACH,CAAC;AAGD,YAAQ,KAAK,MAAM;AACjB,cAAQ,IAAI,MAAM,qBAAqB;AACvC,cAAQ,WAAW;AACnB,cAAQ,WAAW;AAAA,IACrB,GAAG,CAAC,UAAU;AAEZ,cAAQ,IAAI,oDAAoD,KAAK;AACrE,cAAQ,WAAW;AAAA,IACrB,CAAC,EAAE,QAAQ,MAAM;AAEf,gCAAW,OAAO,IAAI;AAGtB,iBAAW,MAAM;AAEf,gBAAQ,IAAI,mDAAmD,QAAQ,KAAK,UAAU;AACtF,gBAAQ,KAAK,CAAC;AAAA,MAChB,GAAG,GAAI,EAAE,MAAM;AAAA,IACjB,CAAC;AAAA,EACH,CAAC;AACH;AAmBO,SAAS,eACZ,UACA,YACA,aAAqB,WACjB;AAEN,QAAM,OAAO,cAAc,YAAY;AAAA,IACrC,eAAe,MAAa;AAC1B,YAAM,YAAY,MAAM,UAAU;AAAA,IACpC;AAAA,EACF;AAGA,2BAAQ,UAAU,IAAW;AAC/B;",
5
5
  "names": ["result", "message"]
6
6
  }
package/dist/fork.mjs CHANGED
@@ -121,7 +121,7 @@ Node.js ${process.version} (pid=${process.pid})
121
121
  } = message;
122
122
  const context = new Context(buildFile, taskName);
123
123
  context.log.debug("Message from parent process for PID", process.pid, message);
124
- const result = runAsync(context, taskName, async () => {
124
+ const result = runAsync(context, async () => {
125
125
  assert(resolveFile(scriptFile), `Script file ${$p(scriptFile)} not found`);
126
126
  const script = await import(scriptFile);
127
127
  let Ctor;
package/dist/fork.mjs.map CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/fork.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["result", "message"]
6
6
  }
package/dist/helpers.cjs CHANGED
@@ -45,6 +45,7 @@ var import_logging = require("./logging.cjs");
45
45
  var import_paths = require("./paths.cjs");
46
46
  var import_pipe = require("./pipe.cjs");
47
47
  var import_build = require("./plugs/build.cjs");
48
+ var import_utils = require("./utils.cjs");
48
49
  var import_exec = require("./utils/exec.cjs");
49
50
  var import_options = require("./utils/options.cjs");
50
51
  var import_walk = require("./utils/walk.cjs");
@@ -131,7 +132,7 @@ function exec(cmd, ...args) {
131
132
  const { params, options } = (0, import_options.parseOptions)(args);
132
133
  return (0, import_exec.execChild)(cmd, params, options, (0, import_async.requireContext)());
133
134
  }
134
- function parseJson(file) {
135
+ function parseJson(file, strict = false) {
135
136
  const jsonFile = (0, import_async.requireContext)().resolve(file);
136
137
  let jsonText;
137
138
  try {
@@ -144,9 +145,20 @@ function parseJson(file) {
144
145
  import_logging.log.fail(`Error reading ${(0, import_logging.$p)(jsonFile)}`, error);
145
146
  }
146
147
  try {
147
- return JSON.parse(jsonText);
148
+ return (0, import_utils.parseJsonc)(jsonText, {
149
+ disallowComments: strict,
150
+ allowTrailingComma: !strict
151
+ });
148
152
  } catch (error) {
149
- import_logging.log.fail(`Error parsing ${(0, import_logging.$p)(jsonFile)}`, error);
153
+ if (error instanceof import_utils.JsoncError) {
154
+ const errors = error.errors;
155
+ import_logging.log.error(`Found ${(0, import_logging.$plur)(errors.length, "error", "errors")} parsing ${(0, import_logging.$p)(jsonFile)}`);
156
+ for (const e of errors) {
157
+ import_logging.log.error(` ${(0, import_logging.$wht)(e.code)} ${(0, import_logging.$gry)("at line")} ${(0, import_logging.$ylw)(e.line)}${(0, import_logging.$gry)(", column")} ${(0, import_logging.$ylw)(e.column)}`);
158
+ }
159
+ throw new import_asserts.BuildFailure();
160
+ } else
161
+ throw error;
150
162
  }
151
163
  }
152
164
  // Annotate the CommonJS export names for ESM import in node:
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/helpers.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["context"]
6
6
  }
package/dist/helpers.d.ts CHANGED
@@ -113,8 +113,8 @@ export declare function mkdtemp(): AbsolutePath;
113
113
  */
114
114
  export declare function exec(cmd: string, ...args: [...args: string[]] | [...args: string[], options: ExecChildOptions]): Promise<void>;
115
115
  /**
116
- * Read and parse a JSON file, throwing an error if not found.
116
+ * Read and parse a JSON/JSONC file, throwing an error if not found.
117
117
  *
118
118
  * @params file The JSON file to parse
119
119
  */
120
- export declare function parseJson(file: string): any;
120
+ export declare function parseJson(file: string, strict?: boolean): any;
package/dist/helpers.mjs CHANGED
@@ -2,11 +2,11 @@
2
2
  import { mkdtempSync, readFileSync } from "node:fs";
3
3
  import { tmpdir } from "node:os";
4
4
  import { join } from "node:path";
5
- import { assert, assertPromises } from "./asserts.mjs";
5
+ import { BuildFailure, assert, assertPromises } from "./asserts.mjs";
6
6
  import { requireContext } from "./async.mjs";
7
7
  import { Files } from "./files.mjs";
8
8
  import { rm } from "./fs.mjs";
9
- import { $p, log } from "./logging.mjs";
9
+ import { $gry, $p, $plur, $wht, $ylw, log } from "./logging.mjs";
10
10
  import {
11
11
  commonPath,
12
12
  getAbsoluteParent,
@@ -16,6 +16,7 @@ import {
16
16
  } from "./paths.mjs";
17
17
  import { PipeImpl } from "./pipe.mjs";
18
18
  import { RunBuild } from "./plugs/build.mjs";
19
+ import { JsoncError, parseJsonc } from "./utils.mjs";
19
20
  import { execChild } from "./utils/exec.mjs";
20
21
  import { parseOptions } from "./utils/options.mjs";
21
22
  import { walk } from "./utils/walk.mjs";
@@ -102,7 +103,7 @@ function exec(cmd, ...args) {
102
103
  const { params, options } = parseOptions(args);
103
104
  return execChild(cmd, params, options, requireContext());
104
105
  }
105
- function parseJson(file) {
106
+ function parseJson(file, strict = false) {
106
107
  const jsonFile = requireContext().resolve(file);
107
108
  let jsonText;
108
109
  try {
@@ -115,9 +116,20 @@ function parseJson(file) {
115
116
  log.fail(`Error reading ${$p(jsonFile)}`, error);
116
117
  }
117
118
  try {
118
- return JSON.parse(jsonText);
119
+ return parseJsonc(jsonText, {
120
+ disallowComments: strict,
121
+ allowTrailingComma: !strict
122
+ });
119
123
  } catch (error) {
120
- log.fail(`Error parsing ${$p(jsonFile)}`, error);
124
+ if (error instanceof JsoncError) {
125
+ const errors = error.errors;
126
+ log.error(`Found ${$plur(errors.length, "error", "errors")} parsing ${$p(jsonFile)}`);
127
+ for (const e of errors) {
128
+ log.error(` ${$wht(e.code)} ${$gry("at line")} ${$ylw(e.line)}${$gry(", column")} ${$ylw(e.column)}`);
129
+ }
130
+ throw new BuildFailure();
131
+ } else
132
+ throw error;
121
133
  }
122
134
  }
123
135
  export {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/helpers.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["context"]
6
6
  }
@@ -27,6 +27,7 @@ __export(colors_exports, {
27
27
  $mgt: () => $mgt,
28
28
  $ms: () => $ms,
29
29
  $p: () => $p,
30
+ $plur: () => $plur,
30
31
  $red: () => $red,
31
32
  $t: () => $t,
32
33
  $und: () => $und,
@@ -111,6 +112,9 @@ function $wht(string) {
111
112
  function $und(string) {
112
113
  return colorize(und, string);
113
114
  }
115
+ function $plur(number, singular, plural, colorize2 = _colors) {
116
+ return colorize2 ? number === 1 ? `${$ylw(number)} ${singular}` : `${$ylw(number)} ${plural}` : number === 1 ? `${number} ${singular}` : `${number} ${plural}`;
117
+ }
114
118
  // Annotate the CommonJS export names for ESM import in node:
115
119
  0 && (module.exports = {
116
120
  $blu,
@@ -120,6 +124,7 @@ function $und(string) {
120
124
  $mgt,
121
125
  $ms,
122
126
  $p,
127
+ $plur,
123
128
  $red,
124
129
  $t,
125
130
  $und,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/logging/colors.ts"],
4
- "mappings": "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",
5
- "names": []
4
+ "mappings": "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",
5
+ "names": ["colorize"]
6
6
  }
@@ -23,3 +23,5 @@ export declare function $cyn(string: any): string;
23
23
  export declare function $wht(string: any): string;
24
24
  /** Underline. */
25
25
  export declare function $und(string: any): string;
26
+ /** Pluralize (not really colors, but peace, love unity and respect). */
27
+ export declare function $plur(number: number, singular: string, plural: string, colorize?: boolean): string;
@@ -76,6 +76,9 @@ function $wht(string) {
76
76
  function $und(string) {
77
77
  return colorize(und, string);
78
78
  }
79
+ function $plur(number, singular, plural, colorize2 = _colors) {
80
+ return colorize2 ? number === 1 ? `${$ylw(number)} ${singular}` : `${$ylw(number)} ${plural}` : number === 1 ? `${number} ${singular}` : `${number} ${plural}`;
81
+ }
79
82
  export {
80
83
  $blu,
81
84
  $cyn,
@@ -84,6 +87,7 @@ export {
84
87
  $mgt,
85
88
  $ms,
86
89
  $p,
90
+ $plur,
87
91
  $red,
88
92
  $t,
89
93
  $und,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/logging/colors.ts"],
4
- "mappings": ";AAAA,SAAS,WAAW;AAEpB,SAAS,4BAA4B,gCAAgC;AACrE,SAAS,kBAAkB;AAO3B,IAAI,UAAU,WAAW;AACzB,WAAW,GAAG,WAAW,CAAC,EAAE,OAAO,MAAM,UAAU,MAAM;AAMzD,IAAM,MAAM;AAEZ,IAAM,MAAM;AAEZ,IAAM,MAAM;AACZ,IAAM,MAAM;AACZ,IAAM,MAAM;AACZ,IAAM,MAAM;AACZ,IAAM,MAAM;AACZ,IAAM,MAAM;AACZ,IAAM,MAAM;AACZ,IAAM,MAAM;AAEZ,IAAM,MAAM;AAIZ,SAAS,SAAS,OAAe,QAAqB;AACpD,MAAI,CAAE;AAAS,WAAO,GAAG,MAAM;AAC/B,QAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,IAAI;AACpC,SAAO,MAAM,IAAI,CAAC,SAAS,GAAG,KAAK,GAAG,IAAI,GAAG,GAAG,EAAE,EAAE,KAAK,IAAI;AAC/D;AAGO,SAAS,GAAG,MAA4B;AAC7C,QAAM,YAAY,2BAA2B;AAC7C,QAAM,WAAW,yBAAyB,WAAW,IAAI;AACzD,QAAM,WAAW,YAAY,OAAO,OAAO,IAAI,GAAG,GAAG,QAAQ;AAC7D,SAAO,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,QAAQ,GAAG,GAAG,KAAK,IAAI,QAAQ;AACjE;AAGO,SAAS,GAAG,MAAc,SAAS,MAAc;AACtD,SAAO,UAAU,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,KAAK,SAAS,IAAI,IAAI,MAAM;AAClE;AAGO,SAAS,IAAI,QAAgB,MAAuB;AACzD,MAAI;AACJ,MAAI,UAAU,KAAO;AAEnB,UAAM,UAAU,KAAK,MAAM,SAAS,GAAK;AACzC,UAAM,UAAU,KAAK,MAAO,SAAS,MAAS,GAAI;AAClD,aAAS,GAAG,OAAO,KAAK,OAAO;AAAA,EACjC,WAAW,UAAU,KAAO;AAE1B,UAAM,UAAU,KAAK,MAAM,SAAS,GAAI;AACxC,UAAM,UAAU,KAAK,MAAM,SAAS,MAAO,GAAG;AAC9C,aAAS,GAAG,OAAO,IAAI,OAAO;AAAA,EAChC,WAAW,UAAU,KAAM;AAEzB,UAAM,UAAU,KAAK,MAAM,SAAS,GAAI;AACxC,UAAM,UAAU,KAAK,MAAM,SAAS,MAAO,EAAE;AAC7C,aAAS,GAAG,OAAO,IAAI,OAAO;AAAA,EAChC,OAAO;AAEL,aAAS,GAAG,MAAM;AAAA,EACpB;AAEA,SAAO,OACL,UACE,GAAG,GAAG,IAAI,IAAI,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,KACrC,IAAI,IAAI,IAAI,MAAM,MACpB,UACE,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,KACvB,IAAI,MAAM;AAChB;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,UAAU,GAAG,GAAG,GAAG,MAAM,GAAG,GAAG,KAAK;AAC7C;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;AAGO,SAAS,KAAK,QAAqB;AACxC,SAAO,SAAS,KAAK,MAAM;AAC7B;",
5
- "names": []
4
+ "mappings": "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",
5
+ "names": ["colorize"]
6
6
  }
@@ -26,9 +26,9 @@ module.exports = __toCommonJS(report_exports);
26
26
  var import_asserts = require("../asserts.cjs");
27
27
  var import_fs = require("../fs.cjs");
28
28
  var import_colors = require("./colors.cjs");
29
+ var import_github = require("./github.cjs");
29
30
  var import_levels = require("./levels.cjs");
30
31
  var import_options = require("./options.cjs");
31
- var import_github = require("./github.cjs");
32
32
  var _showSources = import_options.logOptions.showSources;
33
33
  var _githubAnnotations = import_options.logOptions.githubAnnotations;
34
34
  import_options.logOptions.on("changed", (options) => {
@@ -274,12 +274,12 @@ var ReportImpl = class {
274
274
  this._emitter(options, [""]);
275
275
  const status = ["Found"];
276
276
  if (this.errors) {
277
- status.push((0, import_colors.$red)(this.errors), this.errors === 1 ? "error" : "errors");
277
+ status.push((0, import_colors.$plur)(this.errors, "error", "errors"));
278
278
  }
279
279
  if (this.warnings) {
280
280
  if (this.errors)
281
281
  status.push("and");
282
- status.push((0, import_colors.$ylw)(this.warnings), this.warnings === 1 ? "warning" : "warnings");
282
+ status.push((0, import_colors.$plur)(this.warnings, "warning", "warnings"));
283
283
  }
284
284
  if (this.errors || this.warnings) {
285
285
  this._emitter(options, status);