@nmakarov/cli-toolkit 0.75.0 → 0.76.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/dist/cli-runner.cjs +29 -10
- package/dist/cli-runner.cjs.map +1 -1
- package/dist/cli-runner.js +29 -10
- package/dist/cli-runner.js.map +1 -1
- package/dist/index.cjs +29 -10
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +29 -10
- package/dist/index.js.map +1 -1
- package/dist/init.cjs +27 -10
- package/dist/init.cjs.map +1 -1
- package/dist/init.js +27 -10
- package/dist/init.js.map +1 -1
- package/dist/logger.cjs +27 -10
- package/dist/logger.cjs.map +1 -1
- package/dist/logger.js +27 -10
- package/dist/logger.js.map +1 -1
- package/dist/tasks.cjs +2 -0
- package/dist/tasks.cjs.map +1 -1
- package/dist/tasks.js +2 -0
- package/dist/tasks.js.map +1 -1
- package/package.json +1 -1
package/dist/cli-runner.js
CHANGED
|
@@ -2516,7 +2516,8 @@ var LEVEL_COLORS = {
|
|
|
2516
2516
|
silly: chalk.gray,
|
|
2517
2517
|
request: chalk.green,
|
|
2518
2518
|
response: chalk.yellow,
|
|
2519
|
-
|
|
2519
|
+
// Magenta stands out from white info / green request lines.
|
|
2520
|
+
progress: chalk.magentaBright,
|
|
2520
2521
|
results: chalk.magenta
|
|
2521
2522
|
};
|
|
2522
2523
|
var Logger = class _Logger {
|
|
@@ -2535,7 +2536,8 @@ var Logger = class _Logger {
|
|
|
2535
2536
|
this.updateTransport();
|
|
2536
2537
|
}
|
|
2537
2538
|
/**
|
|
2538
|
-
* Configure logger options. Accepts both LoggerOptions shape and flat param names
|
|
2539
|
+
* Configure logger options. Accepts both LoggerOptions shape and flat param names
|
|
2540
|
+
* (levels string, progressWithTimes, progressWithRate, progressThrottleMs).
|
|
2539
2541
|
*/
|
|
2540
2542
|
configure(options) {
|
|
2541
2543
|
if (options.mode !== void 0) {
|
|
@@ -2555,10 +2557,12 @@ var Logger = class _Logger {
|
|
|
2555
2557
|
}
|
|
2556
2558
|
if (options.progress !== void 0) {
|
|
2557
2559
|
if (options.progress.withTimes !== void 0) this.options.progressTimes = options.progress.withTimes;
|
|
2560
|
+
if (options.progress.withRate !== void 0) this.options.progressRate = options.progress.withRate;
|
|
2558
2561
|
if (options.progress.throttleMs !== void 0) this.options.progressThrottle = options.progress.throttleMs;
|
|
2559
2562
|
}
|
|
2560
2563
|
const flat = options;
|
|
2561
2564
|
if (flat.progressWithTimes !== void 0) this.options.progressTimes = flat.progressWithTimes;
|
|
2565
|
+
if (flat.progressWithRate !== void 0) this.options.progressRate = flat.progressWithRate;
|
|
2562
2566
|
if (flat.progressThrottleMs !== void 0) this.options.progressThrottle = flat.progressThrottleMs;
|
|
2563
2567
|
}
|
|
2564
2568
|
/**
|
|
@@ -2575,6 +2579,7 @@ var Logger = class _Logger {
|
|
|
2575
2579
|
timestamp: "boolean default false",
|
|
2576
2580
|
levels: "string",
|
|
2577
2581
|
progressWithTimes: "boolean default false",
|
|
2582
|
+
progressWithRate: "boolean default false",
|
|
2578
2583
|
progressThrottleMs: "number"
|
|
2579
2584
|
};
|
|
2580
2585
|
const discovered = context.params.getAllForModule("logger", paramDefs);
|
|
@@ -2593,6 +2598,7 @@ var Logger = class _Logger {
|
|
|
2593
2598
|
timestamp: false,
|
|
2594
2599
|
levels: DEFAULT_LEVELS,
|
|
2595
2600
|
progressTimes: false,
|
|
2601
|
+
progressRate: false,
|
|
2596
2602
|
progressThrottle: void 0
|
|
2597
2603
|
};
|
|
2598
2604
|
}
|
|
@@ -2658,15 +2664,23 @@ var Logger = class _Logger {
|
|
|
2658
2664
|
if (!this.startTimes[prefix ?? ""]) {
|
|
2659
2665
|
this.startTimes[prefix ?? ""] = Date.now();
|
|
2660
2666
|
}
|
|
2661
|
-
|
|
2667
|
+
const wantTimes = this.options.progressTimes;
|
|
2668
|
+
const wantRate = this.options.progressRate;
|
|
2669
|
+
if (wantTimes || wantRate) {
|
|
2662
2670
|
const elapsedSeconds = (Date.now() - this.startTimes[prefix ?? ""]) / 1e3;
|
|
2663
|
-
|
|
2664
|
-
|
|
2665
|
-
|
|
2666
|
-
remaining =
|
|
2671
|
+
const intervals = count > 1 ? count - 1 : 0;
|
|
2672
|
+
const itemsPerSec = intervals > 0 && elapsedSeconds > 0 ? intervals / elapsedSeconds : -1;
|
|
2673
|
+
if (wantTimes) {
|
|
2674
|
+
let remaining = -1;
|
|
2675
|
+
if (itemsPerSec > 0) {
|
|
2676
|
+
remaining = (total - count) / itemsPerSec;
|
|
2677
|
+
}
|
|
2678
|
+
payload.elapsed = this.round(elapsedSeconds, 2);
|
|
2679
|
+
payload.remaining = remaining >= 0 ? this.round(remaining, 2) : remaining;
|
|
2680
|
+
}
|
|
2681
|
+
if (wantRate) {
|
|
2682
|
+
payload.rate = itemsPerSec >= 0 ? this.round(itemsPerSec, 2) : itemsPerSec;
|
|
2667
2683
|
}
|
|
2668
|
-
payload.elapsed = this.round(elapsedSeconds, 2);
|
|
2669
|
-
payload.remaining = remaining >= 0 ? this.round(remaining, 2) : remaining;
|
|
2670
2684
|
}
|
|
2671
2685
|
if (count >= total) {
|
|
2672
2686
|
delete this.startTimes[prefix ?? ""];
|
|
@@ -2731,10 +2745,13 @@ var Logger = class _Logger {
|
|
|
2731
2745
|
parts.push(formatter.bold(struct.message));
|
|
2732
2746
|
}
|
|
2733
2747
|
if (struct.level === "progress") {
|
|
2748
|
+
const formatter = LEVEL_COLORS[struct.level];
|
|
2734
2749
|
if (struct.elapsed !== void 0 && struct.remaining !== void 0) {
|
|
2735
|
-
const formatter = LEVEL_COLORS[struct.level];
|
|
2736
2750
|
parts.push(formatter(`${struct.elapsed}/${struct.remaining}`));
|
|
2737
2751
|
}
|
|
2752
|
+
if (struct.rate !== void 0) {
|
|
2753
|
+
parts.push(formatter(struct.rate >= 0 ? `${struct.rate}/s` : "-/s"));
|
|
2754
|
+
}
|
|
2738
2755
|
}
|
|
2739
2756
|
if (struct.chunks && struct.chunks.length) {
|
|
2740
2757
|
parts.push(this.inspectChunks(struct.chunks));
|
|
@@ -6542,6 +6559,7 @@ var LOGGER_RUNTIME_KEYS = [
|
|
|
6542
6559
|
"route",
|
|
6543
6560
|
"prefix",
|
|
6544
6561
|
"progressWithTimes",
|
|
6562
|
+
"progressWithRate",
|
|
6545
6563
|
"progressThrottleMs"
|
|
6546
6564
|
];
|
|
6547
6565
|
var DEFAULT_RUNTIME_PARAM_SPECS = [
|
|
@@ -6645,6 +6663,7 @@ function coerceRuntimeValue(key, value) {
|
|
|
6645
6663
|
case "showLevel":
|
|
6646
6664
|
case "timestamp":
|
|
6647
6665
|
case "progressWithTimes":
|
|
6666
|
+
case "progressWithRate":
|
|
6648
6667
|
if (typeof value === "boolean") return value;
|
|
6649
6668
|
if (value === "true" || value === "1") return true;
|
|
6650
6669
|
if (value === "false" || value === "0") return false;
|