@matter/tools 0.13.0-alpha.0-20250324-d7b7d9731 → 0.13.0-alpha.0-20250327-8b06e5a79
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/cjs/util/progress.d.ts +3 -0
- package/dist/cjs/util/progress.d.ts.map +1 -1
- package/dist/cjs/util/progress.js +42 -14
- package/dist/cjs/util/progress.js.map +1 -1
- package/dist/esm/util/progress.d.ts +3 -0
- package/dist/esm/util/progress.d.ts.map +1 -1
- package/dist/esm/util/progress.js +43 -15
- package/dist/esm/util/progress.js.map +1 -1
- package/package.json +3 -3
- package/src/util/progress.ts +41 -13
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Package } from "./package.js";
|
|
7
|
+
export declare const STATUS_ICON_SUCCESS: import("../ansi-text/text-builder.js").TextBuilder;
|
|
8
|
+
export declare const STATUS_ICON_FAILURE: import("../ansi-text/text-builder.js").TextBuilder;
|
|
7
9
|
export declare class Progress {
|
|
8
10
|
#private;
|
|
9
11
|
status: Progress.Status;
|
|
@@ -30,5 +32,6 @@ export declare namespace Progress {
|
|
|
30
32
|
Success = "success",
|
|
31
33
|
Failure = "failure"
|
|
32
34
|
}
|
|
35
|
+
function formatDuration(duration: number): string;
|
|
33
36
|
}
|
|
34
37
|
//# sourceMappingURL=progress.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../src/util/progress.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../src/util/progress.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,eAAO,MAAM,mBAAmB,oDAAkB,CAAC;AACnD,eAAO,MAAM,mBAAmB,oDAAuB,CAAC;AA2ExD,qBAAa,QAAQ;;IACjB,MAAM,kBAA2B;;IAWjC,SAAS,CAAC,IAAI,EAAE,OAAO;IAIvB,WAAW,CAAC,IAAI,EAAE,OAAO;IAIzB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;IAI9B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO;IAcxD,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAwBnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;IAO/B,IAAI,CAAC,IAAI,EAAE,MAAM;IAIjB,KAAK;IAQL,CAAC,MAAM,CAAC,OAAO,CAAC;IAIhB,OAAO;IAMD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IA2B7C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAiBtD;AAED,yBAAiB,QAAQ,CAAC;IACtB,KAAY,MAAM;QACd,OAAO,YAAY;QACnB,OAAO,YAAY;QACnB,OAAO,YAAY;QACnB,OAAO,YAAY;KACtB;IAED,SAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,UAiB9C;CACJ"}
|
|
@@ -18,7 +18,9 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
18
18
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
19
|
var progress_exports = {};
|
|
20
20
|
__export(progress_exports, {
|
|
21
|
-
Progress: () => Progress
|
|
21
|
+
Progress: () => Progress,
|
|
22
|
+
STATUS_ICON_FAILURE: () => STATUS_ICON_FAILURE,
|
|
23
|
+
STATUS_ICON_SUCCESS: () => STATUS_ICON_SUCCESS
|
|
22
24
|
});
|
|
23
25
|
module.exports = __toCommonJS(progress_exports);
|
|
24
26
|
var import_node_process = require("node:process");
|
|
@@ -30,6 +32,8 @@ var import_text_builder = require("../ansi-text/text-builder.js");
|
|
|
30
32
|
* Copyright 2022-2025 Matter.js Authors
|
|
31
33
|
* SPDX-License-Identifier: Apache-2.0
|
|
32
34
|
*/
|
|
35
|
+
const STATUS_ICON_SUCCESS = import_text_builder.ansi.green("\u2713");
|
|
36
|
+
const STATUS_ICON_FAILURE = import_text_builder.ansi.bright.red("\u2717");
|
|
33
37
|
const SPINNER = "\u25D0\u25D3\u25D1\u25D2";
|
|
34
38
|
const SPINNER_INTERVAL = 100;
|
|
35
39
|
function packageIdentity(pkg) {
|
|
@@ -46,13 +50,25 @@ const writeStatus = (() => {
|
|
|
46
50
|
const actualWrite = stream.write;
|
|
47
51
|
stream.write = (payload, ...params) => {
|
|
48
52
|
if (lastStatus) {
|
|
49
|
-
|
|
53
|
+
if (payload[0] !== "\n" && payload[0] !== 10) {
|
|
54
|
+
actualWrite.call(stream, "\n");
|
|
55
|
+
}
|
|
50
56
|
lastStatus = void 0;
|
|
51
57
|
}
|
|
52
58
|
if (!payload.length) {
|
|
53
59
|
return true;
|
|
54
60
|
}
|
|
55
|
-
|
|
61
|
+
switch (payload[payload.length - 1]) {
|
|
62
|
+
case "\n":
|
|
63
|
+
case 10:
|
|
64
|
+
case "\r":
|
|
65
|
+
case 13:
|
|
66
|
+
needNewline = false;
|
|
67
|
+
break;
|
|
68
|
+
default:
|
|
69
|
+
needNewline = true;
|
|
70
|
+
break;
|
|
71
|
+
}
|
|
56
72
|
return actualWrite.call(stream, payload, ...params);
|
|
57
73
|
};
|
|
58
74
|
}
|
|
@@ -131,12 +147,12 @@ class Progress {
|
|
|
131
147
|
}
|
|
132
148
|
success(text) {
|
|
133
149
|
this.status = Progress.Status.Success;
|
|
134
|
-
writeStatus(` ${
|
|
150
|
+
writeStatus(` ${STATUS_ICON_SUCCESS} ${text} ${this.#duration}`);
|
|
135
151
|
this.#start = this.#ongoingText = void 0;
|
|
136
152
|
}
|
|
137
153
|
failure(text) {
|
|
138
154
|
this.status = Progress.Status.Failure;
|
|
139
|
-
writeStatus(` ${
|
|
155
|
+
writeStatus(` ${STATUS_ICON_FAILURE} ${text} ${this.#duration}`);
|
|
140
156
|
this.#start = this.#ongoingText = void 0;
|
|
141
157
|
}
|
|
142
158
|
info(label, value) {
|
|
@@ -198,15 +214,8 @@ class Progress {
|
|
|
198
214
|
return result;
|
|
199
215
|
}
|
|
200
216
|
get #duration() {
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
ms = Math.round(ms / 10) / 100;
|
|
204
|
-
} else if (ms < 1e4) {
|
|
205
|
-
ms = Math.round(ms / 100) / 10;
|
|
206
|
-
} else {
|
|
207
|
-
ms = Math.trunc(ms / 1e3);
|
|
208
|
-
}
|
|
209
|
-
return `${import_text_builder.ansi.dim.yellow}(${ms}s)${import_text_builder.ansi.not.dim.not.yellow}`;
|
|
217
|
+
const duration = this.#start ? (/* @__PURE__ */ new Date()).getTime() - this.#start : 0;
|
|
218
|
+
return Progress.formatDuration(duration);
|
|
210
219
|
}
|
|
211
220
|
}
|
|
212
221
|
((Progress2) => {
|
|
@@ -217,5 +226,24 @@ class Progress {
|
|
|
217
226
|
Status2["Success"] = "success";
|
|
218
227
|
Status2["Failure"] = "failure";
|
|
219
228
|
})(Status = Progress2.Status || (Progress2.Status = {}));
|
|
229
|
+
function formatDuration(duration) {
|
|
230
|
+
let seconds;
|
|
231
|
+
if (duration < 1e4) {
|
|
232
|
+
seconds = (duration / 1e3).toPrecision(2);
|
|
233
|
+
if (seconds.startsWith("0.")) {
|
|
234
|
+
seconds = seconds.slice(1);
|
|
235
|
+
}
|
|
236
|
+
while (seconds.endsWith("0")) {
|
|
237
|
+
seconds = seconds.slice(0, seconds.length - 1);
|
|
238
|
+
}
|
|
239
|
+
if (seconds === ".") {
|
|
240
|
+
seconds = "0";
|
|
241
|
+
}
|
|
242
|
+
} else {
|
|
243
|
+
seconds = Math.trunc(duration / 1e3);
|
|
244
|
+
}
|
|
245
|
+
return `${import_text_builder.ansi.dim.yellow}(${seconds}s)${import_text_builder.ansi.not.dim.not.yellow}`;
|
|
246
|
+
}
|
|
247
|
+
Progress2.formatDuration = formatDuration;
|
|
220
248
|
})(Progress || (Progress = {}));
|
|
221
249
|
//# sourceMappingURL=progress.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/util/progress.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,0BAA+B;AAC/B,oBAAuB;AACvB,iBAAoB;AACpB,0BAAqB;AATrB;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["writeStatus", "Progress", "Status"]
|
|
6
6
|
}
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Package } from "./package.js";
|
|
7
|
+
export declare const STATUS_ICON_SUCCESS: import("../ansi-text/text-builder.js").TextBuilder;
|
|
8
|
+
export declare const STATUS_ICON_FAILURE: import("../ansi-text/text-builder.js").TextBuilder;
|
|
7
9
|
export declare class Progress {
|
|
8
10
|
#private;
|
|
9
11
|
status: Progress.Status;
|
|
@@ -30,5 +32,6 @@ export declare namespace Progress {
|
|
|
30
32
|
Success = "success",
|
|
31
33
|
Failure = "failure"
|
|
32
34
|
}
|
|
35
|
+
function formatDuration(duration: number): string;
|
|
33
36
|
}
|
|
34
37
|
//# sourceMappingURL=progress.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../src/util/progress.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../src/util/progress.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,eAAO,MAAM,mBAAmB,oDAAkB,CAAC;AACnD,eAAO,MAAM,mBAAmB,oDAAuB,CAAC;AA2ExD,qBAAa,QAAQ;;IACjB,MAAM,kBAA2B;;IAWjC,SAAS,CAAC,IAAI,EAAE,OAAO;IAIvB,WAAW,CAAC,IAAI,EAAE,OAAO;IAIzB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;IAI9B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO;IAcxD,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAwBnC,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG;IAO/B,IAAI,CAAC,IAAI,EAAE,MAAM;IAIjB,KAAK;IAQL,CAAC,MAAM,CAAC,OAAO,CAAC;IAIhB,OAAO;IAMD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IA2B7C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAiBtD;AAED,yBAAiB,QAAQ,CAAC;IACtB,KAAY,MAAM;QACd,OAAO,YAAY;QACnB,OAAO,YAAY;QACnB,OAAO,YAAY;QACnB,OAAO,YAAY;KACtB;IAED,SAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,UAiB9C;CACJ"}
|
|
@@ -7,6 +7,8 @@ import { stderr, stdout } from "node:process";
|
|
|
7
7
|
import { screen } from "../ansi-text/screen.js";
|
|
8
8
|
import { std } from "../ansi-text/std.js";
|
|
9
9
|
import { ansi } from "../ansi-text/text-builder.js";
|
|
10
|
+
const STATUS_ICON_SUCCESS = ansi.green("\u2713");
|
|
11
|
+
const STATUS_ICON_FAILURE = ansi.bright.red("\u2717");
|
|
10
12
|
const SPINNER = "\u25D0\u25D3\u25D1\u25D2";
|
|
11
13
|
const SPINNER_INTERVAL = 100;
|
|
12
14
|
function packageIdentity(pkg) {
|
|
@@ -23,13 +25,25 @@ const writeStatus = (() => {
|
|
|
23
25
|
const actualWrite = stream.write;
|
|
24
26
|
stream.write = (payload, ...params) => {
|
|
25
27
|
if (lastStatus) {
|
|
26
|
-
|
|
28
|
+
if (payload[0] !== "\n" && payload[0] !== 10) {
|
|
29
|
+
actualWrite.call(stream, "\n");
|
|
30
|
+
}
|
|
27
31
|
lastStatus = void 0;
|
|
28
32
|
}
|
|
29
33
|
if (!payload.length) {
|
|
30
34
|
return true;
|
|
31
35
|
}
|
|
32
|
-
|
|
36
|
+
switch (payload[payload.length - 1]) {
|
|
37
|
+
case "\n":
|
|
38
|
+
case 10:
|
|
39
|
+
case "\r":
|
|
40
|
+
case 13:
|
|
41
|
+
needNewline = false;
|
|
42
|
+
break;
|
|
43
|
+
default:
|
|
44
|
+
needNewline = true;
|
|
45
|
+
break;
|
|
46
|
+
}
|
|
33
47
|
return actualWrite.call(stream, payload, ...params);
|
|
34
48
|
};
|
|
35
49
|
}
|
|
@@ -108,12 +122,12 @@ class Progress {
|
|
|
108
122
|
}
|
|
109
123
|
success(text) {
|
|
110
124
|
this.status = Progress.Status.Success;
|
|
111
|
-
writeStatus(` ${
|
|
125
|
+
writeStatus(` ${STATUS_ICON_SUCCESS} ${text} ${this.#duration}`);
|
|
112
126
|
this.#start = this.#ongoingText = void 0;
|
|
113
127
|
}
|
|
114
128
|
failure(text) {
|
|
115
129
|
this.status = Progress.Status.Failure;
|
|
116
|
-
writeStatus(` ${
|
|
130
|
+
writeStatus(` ${STATUS_ICON_FAILURE} ${text} ${this.#duration}`);
|
|
117
131
|
this.#start = this.#ongoingText = void 0;
|
|
118
132
|
}
|
|
119
133
|
info(label, value) {
|
|
@@ -175,15 +189,8 @@ class Progress {
|
|
|
175
189
|
return result;
|
|
176
190
|
}
|
|
177
191
|
get #duration() {
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
ms = Math.round(ms / 10) / 100;
|
|
181
|
-
} else if (ms < 1e4) {
|
|
182
|
-
ms = Math.round(ms / 100) / 10;
|
|
183
|
-
} else {
|
|
184
|
-
ms = Math.trunc(ms / 1e3);
|
|
185
|
-
}
|
|
186
|
-
return `${ansi.dim.yellow}(${ms}s)${ansi.not.dim.not.yellow}`;
|
|
192
|
+
const duration = this.#start ? (/* @__PURE__ */ new Date()).getTime() - this.#start : 0;
|
|
193
|
+
return Progress.formatDuration(duration);
|
|
187
194
|
}
|
|
188
195
|
}
|
|
189
196
|
((Progress2) => {
|
|
@@ -194,8 +201,29 @@ class Progress {
|
|
|
194
201
|
Status2["Success"] = "success";
|
|
195
202
|
Status2["Failure"] = "failure";
|
|
196
203
|
})(Status = Progress2.Status || (Progress2.Status = {}));
|
|
204
|
+
function formatDuration(duration) {
|
|
205
|
+
let seconds;
|
|
206
|
+
if (duration < 1e4) {
|
|
207
|
+
seconds = (duration / 1e3).toPrecision(2);
|
|
208
|
+
if (seconds.startsWith("0.")) {
|
|
209
|
+
seconds = seconds.slice(1);
|
|
210
|
+
}
|
|
211
|
+
while (seconds.endsWith("0")) {
|
|
212
|
+
seconds = seconds.slice(0, seconds.length - 1);
|
|
213
|
+
}
|
|
214
|
+
if (seconds === ".") {
|
|
215
|
+
seconds = "0";
|
|
216
|
+
}
|
|
217
|
+
} else {
|
|
218
|
+
seconds = Math.trunc(duration / 1e3);
|
|
219
|
+
}
|
|
220
|
+
return `${ansi.dim.yellow}(${seconds}s)${ansi.not.dim.not.yellow}`;
|
|
221
|
+
}
|
|
222
|
+
Progress2.formatDuration = formatDuration;
|
|
197
223
|
})(Progress || (Progress = {}));
|
|
198
224
|
export {
|
|
199
|
-
Progress
|
|
225
|
+
Progress,
|
|
226
|
+
STATUS_ICON_FAILURE,
|
|
227
|
+
STATUS_ICON_SUCCESS
|
|
200
228
|
};
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/util/progress.ts"],
  "sourcesContent": ["/**\n * @license\n * Copyright 2022-2025 Matter.js Authors\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { stderr, stdout } from \"node:process\";\nimport { screen } from \"../ansi-text/screen.js\";\nimport { std } from \"../ansi-text/std.js\";\nimport { ansi } from \"../ansi-text/text-builder.js\";\nimport { Package } from \"./package.js\";\n\nconst SPINNER = \"\u25D0\u25D3\u25D1\u25D2\"; //\"\u285C\u2814\u2822\u28A3\"; //[\"\u26AB\uFE0E\", \"\u26AA\uFE0E\"]; \"\u2848\u2814\u2822\u2881\";\nconst SPINNER_INTERVAL = 100;\n\nfunction packageIdentity(pkg: Package) {\n    let identity = ansi.bold(pkg.name).toString();\n    if (pkg.json.version) {\n        identity = `${identity}@${pkg.json.version}`;\n    }\n    return identity;\n}\n\n/**\n * Intercept writes to stderr and stdout so we can ensure our updates appear on different lines from other output.\n */\nconst writeStatus = (() => {\n    let lastStatus: undefined | string;\n    let needNewline = false;\n\n    function intercept(stream: NodeJS.WriteStream) {\n        const actualWrite = stream.write;\n        stream.write = (payload: Uint8Array | string, ...params: any[]) => {\n            if (lastStatus) {\n                actualWrite.call(stream, \"\\n\");\n                lastStatus = undefined;\n            }\n\n            if (!payload.length) {\n                return true;\n            }\n\n            // Require a newline for status updates any time the cursor does not end at the beginning of a line\n            needNewline = payload[payload.length - 1] !== \"\\n\" && payload[payload.length - 1] !== \"\\r\";\n\n            return actualWrite.call(stream, payload, ...params);\n        };\n    }\n\n    intercept(stdout);\n    intercept(stderr);\n\n    return function writeStatus(text: string, willOverwrite = false) {\n        text += willOverwrite ? `${screen.erase.toEol}\\r` : `${screen.erase.toEol}\\n`;\n        if (text === lastStatus) {\n            return;\n        }\n\n        std.out.state({ buffer: true }, () => {\n            if (lastStatus) {\n                lastStatus = undefined;\n            } else if (needNewline && !text.startsWith(\"\\n\")) {\n                std.out(\"\\n\");\n            }\n\n            std.out.writeTruncated(text);\n        });\n\n        lastStatus = text;\n    };\n})();\n\nexport class Progress {\n    status = Progress.Status.Startup;\n    #ongoingText?: string;\n    #start?: number;\n    #spinner = \"\u29D7\";\n    #refreshInterval?: ReturnType<typeof setInterval>;\n    #spinnerPosition = 0;\n    #spinnerWindow?: number;\n    #subtasks = Array<string>();\n\n    constructor() {}\n\n    emphasize(text: unknown) {\n        return ansi.bold(`${text}`);\n    }\n\n    deemphasize(text: unknown) {\n        return ansi.dim(`${text}`);\n    }\n\n    skip(why: string, pkg: Package) {\n        std.out.write(ansi.dim(`Skip ${packageIdentity(pkg)}: ${why}\\n\\n`));\n    }\n\n    startup(what: string, pkgOrOverwrite?: Package | boolean) {\n        if (process.stdout.isTTY) {\n            this.#updateSpinner();\n            this.#refreshInterval = setInterval(this.refresh.bind(this), SPINNER_INTERVAL);\n        }\n\n        this.status = Progress.Status.Startup;\n        if (pkgOrOverwrite === undefined || typeof pkgOrOverwrite === \"boolean\") {\n            writeStatus(what, pkgOrOverwrite ?? true);\n        } else {\n            writeStatus(`${what} ${packageIdentity(pkgOrOverwrite)}`);\n        }\n    }\n\n    update(text: string, extra?: string) {\n        this.status = Progress.Status.Ongoing;\n        let duration;\n        if (this.#start === undefined) {\n            this.#start = new Date().getTime();\n            duration = \"\";\n        } else {\n            duration = this.#duration;\n        }\n        extra = extra === undefined ? \"\" : ` ${extra}`;\n        this.#ongoingText = `${text} ${duration}${extra}`;\n        this.#writeOngoing();\n    }\n\n    #writeOngoing() {\n        if (!this.#ongoingText) {\n            return;\n        }\n\n        const subtask = this.#subtasks.length ? ansi.dim(` (${this.#subtasks[this.#subtasks.length - 1]})`) : \"\";\n\n        writeStatus(`  ${ansi.yellow(this.#spinner)} ${this.#ongoingText}${subtask}`, true);\n    }\n\n    success(text: string) {\n        this.status = Progress.Status.Success;\n        writeStatus(`  ${ansi.green(\"\u2713\")} ${text} ${this.#duration}`);\n        this.#start = this.#ongoingText = undefined;\n    }\n\n    failure(text: string) {\n        this.status = Progress.Status.Failure;\n        writeStatus(`  ${ansi.bright.red(\"\u2717\")} ${text} ${this.#duration}`);\n        this.#start = this.#ongoingText = undefined;\n    }\n\n    info(label: string, value?: any) {\n        if (value) {\n            label = `${ansi.dim(label)} ${value}`;\n        }\n        writeStatus(`  ${ansi.dim(\"\u2023\")} ${label}`);\n    }\n\n    warn(text: string) {\n        std.out.write(`    ${ansi.yellow(\"Warning:\")} ${text}\\n`);\n    }\n\n    close() {\n        if (this.#refreshInterval) {\n            clearInterval(this.#refreshInterval);\n            this.#refreshInterval = undefined;\n        }\n        writeStatus(\"\");\n    }\n\n    [Symbol.dispose]() {\n        this.close();\n    }\n\n    refresh() {\n        if (this.#updateSpinner()) {\n            this.#writeOngoing();\n        }\n    }\n\n    async subtask(text: string, fn: () => Promise<void>) {\n        this.#subtasks.push(text);\n\n        try {\n            await fn();\n        } finally {\n            this.#subtasks.pop();\n        }\n    }\n\n    #updateSpinner() {\n        if (!stdout.isTTY) {\n            return false;\n        }\n\n        const window = Math.floor(new Date().getTime() / SPINNER_INTERVAL);\n        if (this.#spinnerWindow === window) {\n            return false;\n        }\n        this.#spinnerWindow = window;\n\n        this.#spinnerPosition = (this.#spinnerPosition + 1) % SPINNER.length;\n        this.#spinner = SPINNER[this.#spinnerPosition];\n\n        return true;\n    }\n\n    async run<T>(what: string, fn: () => T | Promise<T>) {\n        this.update(what);\n        let result: T;\n        try {\n            result = await fn();\n        } catch (e) {\n            this.failure(what);\n            throw e;\n        }\n        this.success(what);\n        return result;\n    }\n\n    get #duration() {\n        let ms = this.#start ? new Date().getTime() - this.#start : 0;\n        if (ms < 1000) {\n            ms = Math.round(ms / 10) / 100;\n        } else if (ms < 10000) {\n            ms = Math.round(ms / 100) / 10;\n        } else {\n            ms = Math.trunc(ms / 1000);\n        }\n        return `${ansi.dim.yellow}(${ms}s)${ansi.not.dim.not.yellow}`;\n    }\n}\n\nexport namespace Progress {\n    export enum Status {\n        Startup = \"startup\",\n        Ongoing = \"ongoing\",\n        Success = \"success\",\n        Failure = \"failure\",\n    }\n}\n"],
  "mappings": "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",
  "names": ["writeStatus", "Progress", "Status"]
}

|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/util/progress.ts"],
  "sourcesContent": ["/**\n * @license\n * Copyright 2022-2025 Matter.js Authors\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { stderr, stdout } from \"node:process\";\nimport { screen } from \"../ansi-text/screen.js\";\nimport { std } from \"../ansi-text/std.js\";\nimport { ansi } from \"../ansi-text/text-builder.js\";\nimport { Package } from \"./package.js\";\n\nexport const STATUS_ICON_SUCCESS = ansi.green(\"\u2713\");\nexport const STATUS_ICON_FAILURE = ansi.bright.red(\"\u2717\");\n\nconst SPINNER = \"\u25D0\u25D3\u25D1\u25D2\"; //\"\u285C\u2814\u2822\u28A3\"; //[\"\u26AB\uFE0E\", \"\u26AA\uFE0E\"]; \"\u2848\u2814\u2822\u2881\";\nconst SPINNER_INTERVAL = 100;\n\nfunction packageIdentity(pkg: Package) {\n    let identity = ansi.bold(pkg.name).toString();\n    if (pkg.json.version) {\n        identity = `${identity}@${pkg.json.version}`;\n    }\n    return identity;\n}\n\n/**\n * Intercept writes to stderr and stdout so we can ensure our updates appear on different lines from other output.\n */\nconst writeStatus = (() => {\n    let lastStatus: undefined | string;\n    let needNewline = false;\n\n    function intercept(stream: NodeJS.WriteStream) {\n        const actualWrite = stream.write;\n        stream.write = (payload: Uint8Array | string, ...params: any[]) => {\n            if (lastStatus) {\n                if (payload[0] !== \"\\n\" && payload[0] !== 0xa) {\n                    actualWrite.call(stream, \"\\n\");\n                }\n                lastStatus = undefined;\n            }\n\n            if (!payload.length) {\n                return true;\n            }\n\n            // Require a newline for status updates any time the cursor does not end at the beginning of a line\n            switch (payload[payload.length - 1]) {\n                case \"\\n\":\n                case 0xa:\n                case \"\\r\":\n                case 0xd:\n                    needNewline = false;\n                    break;\n\n                default:\n                    needNewline = true;\n                    break;\n            }\n\n            return actualWrite.call(stream, payload, ...params);\n        };\n    }\n\n    intercept(stdout);\n    intercept(stderr);\n\n    return function writeStatus(text: string, willOverwrite = false) {\n        text += willOverwrite ? `${screen.erase.toEol}\\r` : `${screen.erase.toEol}\\n`;\n        if (text === lastStatus) {\n            return;\n        }\n\n        std.out.state({ buffer: true }, () => {\n            if (lastStatus) {\n                lastStatus = undefined;\n            } else if (needNewline && !text.startsWith(\"\\n\")) {\n                std.out(\"\\n\");\n            }\n\n            std.out.writeTruncated(text);\n        });\n\n        lastStatus = text;\n    };\n})();\n\nexport class Progress {\n    status = Progress.Status.Startup;\n    #ongoingText?: string;\n    #start?: number;\n    #spinner = \"\u29D7\";\n    #refreshInterval?: ReturnType<typeof setInterval>;\n    #spinnerPosition = 0;\n    #spinnerWindow?: number;\n    #subtasks = Array<string>();\n\n    constructor() {}\n\n    emphasize(text: unknown) {\n        return ansi.bold(`${text}`);\n    }\n\n    deemphasize(text: unknown) {\n        return ansi.dim(`${text}`);\n    }\n\n    skip(why: string, pkg: Package) {\n        std.out.write(ansi.dim(`Skip ${packageIdentity(pkg)}: ${why}\\n\\n`));\n    }\n\n    startup(what: string, pkgOrOverwrite?: Package | boolean) {\n        if (process.stdout.isTTY) {\n            this.#updateSpinner();\n            this.#refreshInterval = setInterval(this.refresh.bind(this), SPINNER_INTERVAL);\n        }\n\n        this.status = Progress.Status.Startup;\n        if (pkgOrOverwrite === undefined || typeof pkgOrOverwrite === \"boolean\") {\n            writeStatus(what, pkgOrOverwrite ?? true);\n        } else {\n            writeStatus(`${what} ${packageIdentity(pkgOrOverwrite)}`);\n        }\n    }\n\n    update(text: string, extra?: string) {\n        this.status = Progress.Status.Ongoing;\n        let duration;\n        if (this.#start === undefined) {\n            this.#start = new Date().getTime();\n            duration = \"\";\n        } else {\n            duration = this.#duration;\n        }\n        extra = extra === undefined ? \"\" : ` ${extra}`;\n        this.#ongoingText = `${text} ${duration}${extra}`;\n        this.#writeOngoing();\n    }\n\n    #writeOngoing() {\n        if (!this.#ongoingText) {\n            return;\n        }\n\n        const subtask = this.#subtasks.length ? ansi.dim(` (${this.#subtasks[this.#subtasks.length - 1]})`) : \"\";\n\n        writeStatus(`  ${ansi.yellow(this.#spinner)} ${this.#ongoingText}${subtask}`, true);\n    }\n\n    success(text: string) {\n        this.status = Progress.Status.Success;\n        writeStatus(`  ${STATUS_ICON_SUCCESS} ${text} ${this.#duration}`);\n        this.#start = this.#ongoingText = undefined;\n    }\n\n    failure(text: string) {\n        this.status = Progress.Status.Failure;\n        writeStatus(`  ${STATUS_ICON_FAILURE} ${text} ${this.#duration}`);\n        this.#start = this.#ongoingText = undefined;\n    }\n\n    info(label: string, value?: any) {\n        if (value) {\n            label = `${ansi.dim(label)} ${value}`;\n        }\n        writeStatus(`  ${ansi.dim(\"\u2023\")} ${label}`);\n    }\n\n    warn(text: string) {\n        std.out.write(`    ${ansi.yellow(\"Warning:\")} ${text}\\n`);\n    }\n\n    close() {\n        if (this.#refreshInterval) {\n            clearInterval(this.#refreshInterval);\n            this.#refreshInterval = undefined;\n        }\n        writeStatus(\"\");\n    }\n\n    [Symbol.dispose]() {\n        this.close();\n    }\n\n    refresh() {\n        if (this.#updateSpinner()) {\n            this.#writeOngoing();\n        }\n    }\n\n    async subtask(text: string, fn: () => Promise<void>) {\n        this.#subtasks.push(text);\n\n        try {\n            await fn();\n        } finally {\n            this.#subtasks.pop();\n        }\n    }\n\n    #updateSpinner() {\n        if (!stdout.isTTY) {\n            return false;\n        }\n\n        const window = Math.floor(new Date().getTime() / SPINNER_INTERVAL);\n        if (this.#spinnerWindow === window) {\n            return false;\n        }\n        this.#spinnerWindow = window;\n\n        this.#spinnerPosition = (this.#spinnerPosition + 1) % SPINNER.length;\n        this.#spinner = SPINNER[this.#spinnerPosition];\n\n        return true;\n    }\n\n    async run<T>(what: string, fn: () => T | Promise<T>) {\n        this.update(what);\n        let result: T;\n        try {\n            result = await fn();\n        } catch (e) {\n            this.failure(what);\n            throw e;\n        }\n        this.success(what);\n        return result;\n    }\n\n    get #duration() {\n        const duration = this.#start ? new Date().getTime() - this.#start : 0;\n        return Progress.formatDuration(duration);\n    }\n}\n\nexport namespace Progress {\n    export enum Status {\n        Startup = \"startup\",\n        Ongoing = \"ongoing\",\n        Success = \"success\",\n        Failure = \"failure\",\n    }\n\n    export function formatDuration(duration: number) {\n        let seconds;\n        if (duration < 10000) {\n            seconds = (duration / 1000).toPrecision(2);\n            if (seconds.startsWith(\"0.\")) {\n                seconds = seconds.slice(1);\n            }\n            while (seconds.endsWith(\"0\")) {\n                seconds = seconds.slice(0, seconds.length - 1);\n            }\n            if (seconds === \".\") {\n                seconds = \"0\";\n            }\n        } else {\n            seconds = Math.trunc(duration / 1000);\n        }\n        return `${ansi.dim.yellow}(${seconds}s)${ansi.not.dim.not.yellow}`;\n    }\n}\n"],
  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,QAAQ,cAAc;AAC/B,SAAS,cAAc;AACvB,SAAS,WAAW;AACpB,SAAS,YAAY;AAGd,MAAM,sBAAsB,KAAK,MAAM,QAAG;AAC1C,MAAM,sBAAsB,KAAK,OAAO,IAAI,QAAG;AAEtD,MAAM,UAAU;AAChB,MAAM,mBAAmB;AAEzB,SAAS,gBAAgB,KAAc;AACnC,MAAI,WAAW,KAAK,KAAK,IAAI,IAAI,EAAE,SAAS;AAC5C,MAAI,IAAI,KAAK,SAAS;AAClB,eAAW,GAAG,QAAQ,IAAI,IAAI,KAAK,OAAO;AAAA,EAC9C;AACA,SAAO;AACX;AAKA,MAAM,eAAe,MAAM;AACvB,MAAI;AACJ,MAAI,cAAc;AAElB,WAAS,UAAU,QAA4B;AAC3C,UAAM,cAAc,OAAO;AAC3B,WAAO,QAAQ,CAAC,YAAiC,WAAkB;AAC/D,UAAI,YAAY;AACZ,YAAI,QAAQ,CAAC,MAAM,QAAQ,QAAQ,CAAC,MAAM,IAAK;AAC3C,sBAAY,KAAK,QAAQ,IAAI;AAAA,QACjC;AACA,qBAAa;AAAA,MACjB;AAEA,UAAI,CAAC,QAAQ,QAAQ;AACjB,eAAO;AAAA,MACX;AAGA,cAAQ,QAAQ,QAAQ,SAAS,CAAC,GAAG;AAAA,QACjC,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACD,wBAAc;AACd;AAAA,QAEJ;AACI,wBAAc;AACd;AAAA,MACR;AAEA,aAAO,YAAY,KAAK,QAAQ,SAAS,GAAG,MAAM;AAAA,IACtD;AAAA,EACJ;AAEA,YAAU,MAAM;AAChB,YAAU,MAAM;AAEhB,SAAO,SAASA,aAAY,MAAc,gBAAgB,OAAO;AAC7D,YAAQ,gBAAgB,GAAG,OAAO,MAAM,KAAK,OAAO,GAAG,OAAO,MAAM,KAAK;AAAA;AACzE,QAAI,SAAS,YAAY;AACrB;AAAA,IACJ;AAEA,QAAI,IAAI,MAAM,EAAE,QAAQ,KAAK,GAAG,MAAM;AAClC,UAAI,YAAY;AACZ,qBAAa;AAAA,MACjB,WAAW,eAAe,CAAC,KAAK,WAAW,IAAI,GAAG;AAC9C,YAAI,IAAI,IAAI;AAAA,MAChB;AAEA,UAAI,IAAI,eAAe,IAAI;AAAA,IAC/B,CAAC;AAED,iBAAa;AAAA,EACjB;AACJ,GAAG;AAEI,MAAM,SAAS;AAAA,EAClB,SAAS,SAAS,OAAO;AAAA,EACzB;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA,mBAAmB;AAAA,EACnB;AAAA,EACA,YAAY,MAAc;AAAA,EAE1B,cAAc;AAAA,EAAC;AAAA,EAEf,UAAU,MAAe;AACrB,WAAO,KAAK,KAAK,GAAG,IAAI,EAAE;AAAA,EAC9B;AAAA,EAEA,YAAY,MAAe;AACvB,WAAO,KAAK,IAAI,GAAG,IAAI,EAAE;AAAA,EAC7B;AAAA,EAEA,KAAK,KAAa,KAAc;AAC5B,QAAI,IAAI,MAAM,KAAK,IAAI,QAAQ,gBAAgB,GAAG,CAAC,KAAK,GAAG;AAAA;AAAA,CAAM,CAAC;AAAA,EACtE;AAAA,EAEA,QAAQ,MAAc,gBAAoC;AACtD,QAAI,QAAQ,OAAO,OAAO;AACtB,WAAK,eAAe;AACpB,WAAK,mBAAmB,YAAY,KAAK,QAAQ,KAAK,IAAI,GAAG,gBAAgB;AAAA,IACjF;AAEA,SAAK,SAAS,SAAS,OAAO;AAC9B,QAAI,mBAAmB,UAAa,OAAO,mBAAmB,WAAW;AACrE,kBAAY,MAAM,kBAAkB,IAAI;AAAA,IAC5C,OAAO;AACH,kBAAY,GAAG,IAAI,IAAI,gBAAgB,cAAc,CAAC,EAAE;AAAA,IAC5D;AAAA,EACJ;AAAA,EAEA,OAAO,MAAc,OAAgB;AACjC,SAAK,SAAS,SAAS,OAAO;AAC9B,QAAI;AACJ,QAAI,KAAK,WAAW,QAAW;AAC3B,WAAK,UAAS,oBAAI,KAAK,GAAE,QAAQ;AACjC,iBAAW;AAAA,IACf,OAAO;AACH,iBAAW,KAAK;AAAA,IACpB;AACA,YAAQ,UAAU,SAAY,KAAK,IAAI,KAAK;AAC5C,SAAK,eAAe,GAAG,IAAI,IAAI,QAAQ,GAAG,KAAK;AAC/C,SAAK,cAAc;AAAA,EACvB;AAAA,EAEA,gBAAgB;AACZ,QAAI,CAAC,KAAK,cAAc;AACpB;AAAA,IACJ;AAEA,UAAM,UAAU,KAAK,UAAU,SAAS,KAAK,IAAI,KAAK,KAAK,UAAU,KAAK,UAAU,SAAS,CAAC,CAAC,GAAG,IAAI;AAEtG,gBAAY,KAAK,KAAK,OAAO,KAAK,QAAQ,CAAC,IAAI,KAAK,YAAY,GAAG,OAAO,IAAI,IAAI;AAAA,EACtF;AAAA,EAEA,QAAQ,MAAc;AAClB,SAAK,SAAS,SAAS,OAAO;AAC9B,gBAAY,KAAK,mBAAmB,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;AAChE,SAAK,SAAS,KAAK,eAAe;AAAA,EACtC;AAAA,EAEA,QAAQ,MAAc;AAClB,SAAK,SAAS,SAAS,OAAO;AAC9B,gBAAY,KAAK,mBAAmB,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;AAChE,SAAK,SAAS,KAAK,eAAe;AAAA,EACtC;AAAA,EAEA,KAAK,OAAe,OAAa;AAC7B,QAAI,OAAO;AACP,cAAQ,GAAG,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK;AAAA,IACvC;AACA,gBAAY,KAAK,KAAK,IAAI,QAAG,CAAC,IAAI,KAAK,EAAE;AAAA,EAC7C;AAAA,EAEA,KAAK,MAAc;AACf,QAAI,IAAI,MAAM,OAAO,KAAK,OAAO,UAAU,CAAC,IAAI,IAAI;AAAA,CAAI;AAAA,EAC5D;AAAA,EAEA,QAAQ;AACJ,QAAI,KAAK,kBAAkB;AACvB,oBAAc,KAAK,gBAAgB;AACnC,WAAK,mBAAmB;AAAA,IAC5B;AACA,gBAAY,EAAE;AAAA,EAClB;AAAA,EAEA,CAAC,OAAO,OAAO,IAAI;AACf,SAAK,MAAM;AAAA,EACf;AAAA,EAEA,UAAU;AACN,QAAI,KAAK,eAAe,GAAG;AACvB,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ,MAAc,IAAyB;AACjD,SAAK,UAAU,KAAK,IAAI;AAExB,QAAI;AACA,YAAM,GAAG;AAAA,IACb,UAAE;AACE,WAAK,UAAU,IAAI;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,iBAAiB;AACb,QAAI,CAAC,OAAO,OAAO;AACf,aAAO;AAAA,IACX;AAEA,UAAM,SAAS,KAAK,OAAM,oBAAI,KAAK,GAAE,QAAQ,IAAI,gBAAgB;AACjE,QAAI,KAAK,mBAAmB,QAAQ;AAChC,aAAO;AAAA,IACX;AACA,SAAK,iBAAiB;AAEtB,SAAK,oBAAoB,KAAK,mBAAmB,KAAK,QAAQ;AAC9D,SAAK,WAAW,QAAQ,KAAK,gBAAgB;AAE7C,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,IAAO,MAAc,IAA0B;AACjD,SAAK,OAAO,IAAI;AAChB,QAAI;AACJ,QAAI;AACA,eAAS,MAAM,GAAG;AAAA,IACtB,SAAS,GAAG;AACR,WAAK,QAAQ,IAAI;AACjB,YAAM;AAAA,IACV;AACA,SAAK,QAAQ,IAAI;AACjB,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,YAAY;AACZ,UAAM,WAAW,KAAK,UAAS,oBAAI,KAAK,GAAE,QAAQ,IAAI,KAAK,SAAS;AACpE,WAAO,SAAS,eAAe,QAAQ;AAAA,EAC3C;AACJ;AAAA,CAEO,CAAUC,cAAV;AACI,MAAK;AAAL,IAAKC,YAAL;AACH,IAAAA,QAAA,aAAU;AACV,IAAAA,QAAA,aAAU;AACV,IAAAA,QAAA,aAAU;AACV,IAAAA,QAAA,aAAU;AAAA,KAJF,SAAAD,UAAA,WAAAA,UAAA;AAOL,WAAS,eAAe,UAAkB;AAC7C,QAAI;AACJ,QAAI,WAAW,KAAO;AAClB,iBAAW,WAAW,KAAM,YAAY,CAAC;AACzC,UAAI,QAAQ,WAAW,IAAI,GAAG;AAC1B,kBAAU,QAAQ,MAAM,CAAC;AAAA,MAC7B;AACA,aAAO,QAAQ,SAAS,GAAG,GAAG;AAC1B,kBAAU,QAAQ,MAAM,GAAG,QAAQ,SAAS,CAAC;AAAA,MACjD;AACA,UAAI,YAAY,KAAK;AACjB,kBAAU;AAAA,MACd;AAAA,IACJ,OAAO;AACH,gBAAU,KAAK,MAAM,WAAW,GAAI;AAAA,IACxC;AACA,WAAO,GAAG,KAAK,IAAI,MAAM,IAAI,OAAO,KAAK,KAAK,IAAI,IAAI,IAAI,MAAM;AAAA,EACpE;AAjBO,EAAAA,UAAS;AAAA,GARH;",
  "names": ["writeStatus", "Progress", "Status"]
}

|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/util/progress.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,QAAQ,cAAc;AAC/B,SAAS,cAAc;AACvB,SAAS,WAAW;AACpB,SAAS,YAAY;
|
|
4
|
+
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,QAAQ,cAAc;AAC/B,SAAS,cAAc;AACvB,SAAS,WAAW;AACpB,SAAS,YAAY;AAGd,MAAM,sBAAsB,KAAK,MAAM,QAAG;AAC1C,MAAM,sBAAsB,KAAK,OAAO,IAAI,QAAG;AAEtD,MAAM,UAAU;AAChB,MAAM,mBAAmB;AAEzB,SAAS,gBAAgB,KAAc;AACnC,MAAI,WAAW,KAAK,KAAK,IAAI,IAAI,EAAE,SAAS;AAC5C,MAAI,IAAI,KAAK,SAAS;AAClB,eAAW,GAAG,QAAQ,IAAI,IAAI,KAAK,OAAO;AAAA,EAC9C;AACA,SAAO;AACX;AAKA,MAAM,eAAe,MAAM;AACvB,MAAI;AACJ,MAAI,cAAc;AAElB,WAAS,UAAU,QAA4B;AAC3C,UAAM,cAAc,OAAO;AAC3B,WAAO,QAAQ,CAAC,YAAiC,WAAkB;AAC/D,UAAI,YAAY;AACZ,YAAI,QAAQ,CAAC,MAAM,QAAQ,QAAQ,CAAC,MAAM,IAAK;AAC3C,sBAAY,KAAK,QAAQ,IAAI;AAAA,QACjC;AACA,qBAAa;AAAA,MACjB;AAEA,UAAI,CAAC,QAAQ,QAAQ;AACjB,eAAO;AAAA,MACX;AAGA,cAAQ,QAAQ,QAAQ,SAAS,CAAC,GAAG;AAAA,QACjC,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AAAA,QACL,KAAK;AACD,wBAAc;AACd;AAAA,QAEJ;AACI,wBAAc;AACd;AAAA,MACR;AAEA,aAAO,YAAY,KAAK,QAAQ,SAAS,GAAG,MAAM;AAAA,IACtD;AAAA,EACJ;AAEA,YAAU,MAAM;AAChB,YAAU,MAAM;AAEhB,SAAO,SAASA,aAAY,MAAc,gBAAgB,OAAO;AAC7D,YAAQ,gBAAgB,GAAG,OAAO,MAAM,KAAK,OAAO,GAAG,OAAO,MAAM,KAAK;AAAA;AACzE,QAAI,SAAS,YAAY;AACrB;AAAA,IACJ;AAEA,QAAI,IAAI,MAAM,EAAE,QAAQ,KAAK,GAAG,MAAM;AAClC,UAAI,YAAY;AACZ,qBAAa;AAAA,MACjB,WAAW,eAAe,CAAC,KAAK,WAAW,IAAI,GAAG;AAC9C,YAAI,IAAI,IAAI;AAAA,MAChB;AAEA,UAAI,IAAI,eAAe,IAAI;AAAA,IAC/B,CAAC;AAED,iBAAa;AAAA,EACjB;AACJ,GAAG;AAEI,MAAM,SAAS;AAAA,EAClB,SAAS,SAAS,OAAO;AAAA,EACzB;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA,mBAAmB;AAAA,EACnB;AAAA,EACA,YAAY,MAAc;AAAA,EAE1B,cAAc;AAAA,EAAC;AAAA,EAEf,UAAU,MAAe;AACrB,WAAO,KAAK,KAAK,GAAG,IAAI,EAAE;AAAA,EAC9B;AAAA,EAEA,YAAY,MAAe;AACvB,WAAO,KAAK,IAAI,GAAG,IAAI,EAAE;AAAA,EAC7B;AAAA,EAEA,KAAK,KAAa,KAAc;AAC5B,QAAI,IAAI,MAAM,KAAK,IAAI,QAAQ,gBAAgB,GAAG,CAAC,KAAK,GAAG;AAAA;AAAA,CAAM,CAAC;AAAA,EACtE;AAAA,EAEA,QAAQ,MAAc,gBAAoC;AACtD,QAAI,QAAQ,OAAO,OAAO;AACtB,WAAK,eAAe;AACpB,WAAK,mBAAmB,YAAY,KAAK,QAAQ,KAAK,IAAI,GAAG,gBAAgB;AAAA,IACjF;AAEA,SAAK,SAAS,SAAS,OAAO;AAC9B,QAAI,mBAAmB,UAAa,OAAO,mBAAmB,WAAW;AACrE,kBAAY,MAAM,kBAAkB,IAAI;AAAA,IAC5C,OAAO;AACH,kBAAY,GAAG,IAAI,IAAI,gBAAgB,cAAc,CAAC,EAAE;AAAA,IAC5D;AAAA,EACJ;AAAA,EAEA,OAAO,MAAc,OAAgB;AACjC,SAAK,SAAS,SAAS,OAAO;AAC9B,QAAI;AACJ,QAAI,KAAK,WAAW,QAAW;AAC3B,WAAK,UAAS,oBAAI,KAAK,GAAE,QAAQ;AACjC,iBAAW;AAAA,IACf,OAAO;AACH,iBAAW,KAAK;AAAA,IACpB;AACA,YAAQ,UAAU,SAAY,KAAK,IAAI,KAAK;AAC5C,SAAK,eAAe,GAAG,IAAI,IAAI,QAAQ,GAAG,KAAK;AAC/C,SAAK,cAAc;AAAA,EACvB;AAAA,EAEA,gBAAgB;AACZ,QAAI,CAAC,KAAK,cAAc;AACpB;AAAA,IACJ;AAEA,UAAM,UAAU,KAAK,UAAU,SAAS,KAAK,IAAI,KAAK,KAAK,UAAU,KAAK,UAAU,SAAS,CAAC,CAAC,GAAG,IAAI;AAEtG,gBAAY,KAAK,KAAK,OAAO,KAAK,QAAQ,CAAC,IAAI,KAAK,YAAY,GAAG,OAAO,IAAI,IAAI;AAAA,EACtF;AAAA,EAEA,QAAQ,MAAc;AAClB,SAAK,SAAS,SAAS,OAAO;AAC9B,gBAAY,KAAK,mBAAmB,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;AAChE,SAAK,SAAS,KAAK,eAAe;AAAA,EACtC;AAAA,EAEA,QAAQ,MAAc;AAClB,SAAK,SAAS,SAAS,OAAO;AAC9B,gBAAY,KAAK,mBAAmB,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;AAChE,SAAK,SAAS,KAAK,eAAe;AAAA,EACtC;AAAA,EAEA,KAAK,OAAe,OAAa;AAC7B,QAAI,OAAO;AACP,cAAQ,GAAG,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK;AAAA,IACvC;AACA,gBAAY,KAAK,KAAK,IAAI,QAAG,CAAC,IAAI,KAAK,EAAE;AAAA,EAC7C;AAAA,EAEA,KAAK,MAAc;AACf,QAAI,IAAI,MAAM,OAAO,KAAK,OAAO,UAAU,CAAC,IAAI,IAAI;AAAA,CAAI;AAAA,EAC5D;AAAA,EAEA,QAAQ;AACJ,QAAI,KAAK,kBAAkB;AACvB,oBAAc,KAAK,gBAAgB;AACnC,WAAK,mBAAmB;AAAA,IAC5B;AACA,gBAAY,EAAE;AAAA,EAClB;AAAA,EAEA,CAAC,OAAO,OAAO,IAAI;AACf,SAAK,MAAM;AAAA,EACf;AAAA,EAEA,UAAU;AACN,QAAI,KAAK,eAAe,GAAG;AACvB,WAAK,cAAc;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,MAAM,QAAQ,MAAc,IAAyB;AACjD,SAAK,UAAU,KAAK,IAAI;AAExB,QAAI;AACA,YAAM,GAAG;AAAA,IACb,UAAE;AACE,WAAK,UAAU,IAAI;AAAA,IACvB;AAAA,EACJ;AAAA,EAEA,iBAAiB;AACb,QAAI,CAAC,OAAO,OAAO;AACf,aAAO;AAAA,IACX;AAEA,UAAM,SAAS,KAAK,OAAM,oBAAI,KAAK,GAAE,QAAQ,IAAI,gBAAgB;AACjE,QAAI,KAAK,mBAAmB,QAAQ;AAChC,aAAO;AAAA,IACX;AACA,SAAK,iBAAiB;AAEtB,SAAK,oBAAoB,KAAK,mBAAmB,KAAK,QAAQ;AAC9D,SAAK,WAAW,QAAQ,KAAK,gBAAgB;AAE7C,WAAO;AAAA,EACX;AAAA,EAEA,MAAM,IAAO,MAAc,IAA0B;AACjD,SAAK,OAAO,IAAI;AAChB,QAAI;AACJ,QAAI;AACA,eAAS,MAAM,GAAG;AAAA,IACtB,SAAS,GAAG;AACR,WAAK,QAAQ,IAAI;AACjB,YAAM;AAAA,IACV;AACA,SAAK,QAAQ,IAAI;AACjB,WAAO;AAAA,EACX;AAAA,EAEA,IAAI,YAAY;AACZ,UAAM,WAAW,KAAK,UAAS,oBAAI,KAAK,GAAE,QAAQ,IAAI,KAAK,SAAS;AACpE,WAAO,SAAS,eAAe,QAAQ;AAAA,EAC3C;AACJ;AAAA,CAEO,CAAUC,cAAV;AACI,MAAK;AAAL,IAAKC,YAAL;AACH,IAAAA,QAAA,aAAU;AACV,IAAAA,QAAA,aAAU;AACV,IAAAA,QAAA,aAAU;AACV,IAAAA,QAAA,aAAU;AAAA,KAJF,SAAAD,UAAA,WAAAA,UAAA;AAOL,WAAS,eAAe,UAAkB;AAC7C,QAAI;AACJ,QAAI,WAAW,KAAO;AAClB,iBAAW,WAAW,KAAM,YAAY,CAAC;AACzC,UAAI,QAAQ,WAAW,IAAI,GAAG;AAC1B,kBAAU,QAAQ,MAAM,CAAC;AAAA,MAC7B;AACA,aAAO,QAAQ,SAAS,GAAG,GAAG;AAC1B,kBAAU,QAAQ,MAAM,GAAG,QAAQ,SAAS,CAAC;AAAA,MACjD;AACA,UAAI,YAAY,KAAK;AACjB,kBAAU;AAAA,MACd;AAAA,IACJ,OAAO;AACH,gBAAU,KAAK,MAAM,WAAW,GAAI;AAAA,IACxC;AACA,WAAO,GAAG,KAAK,IAAI,MAAM,IAAI,OAAO,KAAK,KAAK,IAAI,IAAI,IAAI,MAAM;AAAA,EACpE;AAjBO,EAAAA,UAAS;AAAA,GARH;",
|
|
5
5
|
"names": ["writeStatus", "Progress", "Status"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/tools",
|
|
3
|
-
"version": "0.13.0-alpha.0-
|
|
3
|
+
"version": "0.13.0-alpha.0-20250327-8b06e5a79",
|
|
4
4
|
"description": "Matter.js tooling",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"minimatch": "^10.0.1",
|
|
66
66
|
"typescript": "~5.8.2",
|
|
67
67
|
"type-fest": "^4.37.0",
|
|
68
|
-
"typedoc": "^0.28.
|
|
68
|
+
"typedoc": "^0.28.1",
|
|
69
69
|
"typedoc-github-theme": "^0.2.1"
|
|
70
70
|
},
|
|
71
71
|
"optionalDependencies": {
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"devDependencies": {
|
|
75
75
|
"@types/madge": "^5.0.3",
|
|
76
76
|
"@types/minimatch": "^5.1.2",
|
|
77
|
-
"@types/node": "^22.13.
|
|
77
|
+
"@types/node": "^22.13.12",
|
|
78
78
|
"detective-typescript": "^14.0.0"
|
|
79
79
|
},
|
|
80
80
|
"publishConfig": {
|
package/src/util/progress.ts
CHANGED
|
@@ -10,6 +10,9 @@ import { std } from "../ansi-text/std.js";
|
|
|
10
10
|
import { ansi } from "../ansi-text/text-builder.js";
|
|
11
11
|
import { Package } from "./package.js";
|
|
12
12
|
|
|
13
|
+
export const STATUS_ICON_SUCCESS = ansi.green("✓");
|
|
14
|
+
export const STATUS_ICON_FAILURE = ansi.bright.red("✗");
|
|
15
|
+
|
|
13
16
|
const SPINNER = "◐◓◑◒"; //"⡜⠔⠢⢣"; //["⚫︎", "⚪︎"]; "⡈⠔⠢⢁";
|
|
14
17
|
const SPINNER_INTERVAL = 100;
|
|
15
18
|
|
|
@@ -32,7 +35,9 @@ const writeStatus = (() => {
|
|
|
32
35
|
const actualWrite = stream.write;
|
|
33
36
|
stream.write = (payload: Uint8Array | string, ...params: any[]) => {
|
|
34
37
|
if (lastStatus) {
|
|
35
|
-
|
|
38
|
+
if (payload[0] !== "\n" && payload[0] !== 0xa) {
|
|
39
|
+
actualWrite.call(stream, "\n");
|
|
40
|
+
}
|
|
36
41
|
lastStatus = undefined;
|
|
37
42
|
}
|
|
38
43
|
|
|
@@ -41,7 +46,18 @@ const writeStatus = (() => {
|
|
|
41
46
|
}
|
|
42
47
|
|
|
43
48
|
// Require a newline for status updates any time the cursor does not end at the beginning of a line
|
|
44
|
-
|
|
49
|
+
switch (payload[payload.length - 1]) {
|
|
50
|
+
case "\n":
|
|
51
|
+
case 0xa:
|
|
52
|
+
case "\r":
|
|
53
|
+
case 0xd:
|
|
54
|
+
needNewline = false;
|
|
55
|
+
break;
|
|
56
|
+
|
|
57
|
+
default:
|
|
58
|
+
needNewline = true;
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
45
61
|
|
|
46
62
|
return actualWrite.call(stream, payload, ...params);
|
|
47
63
|
};
|
|
@@ -134,13 +150,13 @@ export class Progress {
|
|
|
134
150
|
|
|
135
151
|
success(text: string) {
|
|
136
152
|
this.status = Progress.Status.Success;
|
|
137
|
-
writeStatus(` ${
|
|
153
|
+
writeStatus(` ${STATUS_ICON_SUCCESS} ${text} ${this.#duration}`);
|
|
138
154
|
this.#start = this.#ongoingText = undefined;
|
|
139
155
|
}
|
|
140
156
|
|
|
141
157
|
failure(text: string) {
|
|
142
158
|
this.status = Progress.Status.Failure;
|
|
143
|
-
writeStatus(` ${
|
|
159
|
+
writeStatus(` ${STATUS_ICON_FAILURE} ${text} ${this.#duration}`);
|
|
144
160
|
this.#start = this.#ongoingText = undefined;
|
|
145
161
|
}
|
|
146
162
|
|
|
@@ -214,15 +230,8 @@ export class Progress {
|
|
|
214
230
|
}
|
|
215
231
|
|
|
216
232
|
get #duration() {
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
ms = Math.round(ms / 10) / 100;
|
|
220
|
-
} else if (ms < 10000) {
|
|
221
|
-
ms = Math.round(ms / 100) / 10;
|
|
222
|
-
} else {
|
|
223
|
-
ms = Math.trunc(ms / 1000);
|
|
224
|
-
}
|
|
225
|
-
return `${ansi.dim.yellow}(${ms}s)${ansi.not.dim.not.yellow}`;
|
|
233
|
+
const duration = this.#start ? new Date().getTime() - this.#start : 0;
|
|
234
|
+
return Progress.formatDuration(duration);
|
|
226
235
|
}
|
|
227
236
|
}
|
|
228
237
|
|
|
@@ -233,4 +242,23 @@ export namespace Progress {
|
|
|
233
242
|
Success = "success",
|
|
234
243
|
Failure = "failure",
|
|
235
244
|
}
|
|
245
|
+
|
|
246
|
+
export function formatDuration(duration: number) {
|
|
247
|
+
let seconds;
|
|
248
|
+
if (duration < 10000) {
|
|
249
|
+
seconds = (duration / 1000).toPrecision(2);
|
|
250
|
+
if (seconds.startsWith("0.")) {
|
|
251
|
+
seconds = seconds.slice(1);
|
|
252
|
+
}
|
|
253
|
+
while (seconds.endsWith("0")) {
|
|
254
|
+
seconds = seconds.slice(0, seconds.length - 1);
|
|
255
|
+
}
|
|
256
|
+
if (seconds === ".") {
|
|
257
|
+
seconds = "0";
|
|
258
|
+
}
|
|
259
|
+
} else {
|
|
260
|
+
seconds = Math.trunc(duration / 1000);
|
|
261
|
+
}
|
|
262
|
+
return `${ansi.dim.yellow}(${seconds}s)${ansi.not.dim.not.yellow}`;
|
|
263
|
+
}
|
|
236
264
|
}
|