@hot-updater/cloudflare 0.27.1 → 0.29.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/iac/index.cjs +719 -905
- package/dist/iac/{index.js → index.mjs} +677 -851
- package/dist/index.cjs +558 -674
- package/dist/index.d.cts +3 -3
- package/dist/{index.d.ts → index.d.mts} +3 -3
- package/dist/{index.js → index.mjs} +550 -654
- package/dist/worker/index.cjs +225 -0
- package/dist/worker/index.d.cts +39 -0
- package/dist/worker/index.d.mts +39 -0
- package/dist/worker/index.mjs +217 -0
- package/package.json +25 -16
- package/sql/bundles.sql +4 -1
- package/src/cloudflareWorkerDatabase.ts +360 -0
- package/src/d1Database.spec.ts +173 -0
- package/src/d1Database.ts +366 -0
- package/src/index.ts +2 -0
- package/src/r2Storage.ts +129 -0
- package/src/r2WorkerStorage.ts +94 -0
- package/src/utils/createWrangler.ts +27 -0
- package/src/worker/index.ts +33 -0
- package/worker/dist/README.md +1 -1
- package/worker/dist/index.js +8753 -5053
- package/worker/dist/index.js.map +4 -4
- package/worker/migrations/0004_hot-updater_0.29.0.sql +11 -0
- package/worker/src/getUpdateInfo.ts +200 -0
- package/worker/src/index.integration.spec.ts +171 -0
- package/worker/src/index.ts +87 -0
- package/worker/src/testWorker.ts +5 -0
- /package/dist/iac/{index.d.ts → index.d.mts} +0 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createRequire } from "node:module";
|
|
2
|
+
import { DEFAULT_ROLLOUT_COHORT_COUNT } from "@hot-updater/core";
|
|
2
3
|
import { calculatePagination, createDatabasePlugin, createStorageKeyBuilder, createStoragePlugin, getContentType, parseStorageUri } from "@hot-updater/plugin-core";
|
|
3
4
|
import Cloudflare from "cloudflare";
|
|
4
5
|
import { fileURLToPath } from "node:url";
|
|
@@ -17,20 +18,17 @@ import { appendFileSync, createReadStream, createWriteStream, readFileSync, stat
|
|
|
17
18
|
import { finished } from "node:stream/promises";
|
|
18
19
|
import { Duplex, PassThrough, Readable, Transform, Writable, getDefaultHighWaterMark } from "node:stream";
|
|
19
20
|
import { Buffer as Buffer$1 } from "node:buffer";
|
|
20
|
-
|
|
21
|
-
//#region rolldown:runtime
|
|
21
|
+
//#region \0rolldown/runtime.js
|
|
22
22
|
var __create = Object.create;
|
|
23
23
|
var __defProp = Object.defineProperty;
|
|
24
24
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
25
25
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
26
26
|
var __getProtoOf = Object.getPrototypeOf;
|
|
27
27
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
28
|
-
var
|
|
29
|
-
return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
|
|
30
|
-
};
|
|
28
|
+
var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
|
|
31
29
|
var __copyProps = (to, from, except, desc) => {
|
|
32
|
-
if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i
|
|
33
|
-
key = keys[i
|
|
30
|
+
if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
|
|
31
|
+
key = keys[i];
|
|
34
32
|
if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
|
|
35
33
|
get: ((k) => from[k]).bind(null, key),
|
|
36
34
|
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
@@ -43,12 +41,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
43
41
|
enumerable: true
|
|
44
42
|
}) : target, mod));
|
|
45
43
|
var __require = /* @__PURE__ */ createRequire(import.meta.url);
|
|
46
|
-
|
|
47
44
|
//#endregion
|
|
48
45
|
//#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/utils.js
|
|
49
|
-
var require_utils = /* @__PURE__ */
|
|
46
|
+
var require_utils = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
50
47
|
const { inspect: inspect$1 } = __require("util");
|
|
51
|
-
function getIndexPos
|
|
48
|
+
function getIndexPos(text, index) {
|
|
52
49
|
let lineIdx = 0, colIdx = index, pos = 0;
|
|
53
50
|
do {
|
|
54
51
|
pos = text.indexOf("\n", pos);
|
|
@@ -62,31 +59,30 @@ var require_utils = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-mi
|
|
|
62
59
|
column: colIdx + 1
|
|
63
60
|
};
|
|
64
61
|
}
|
|
65
|
-
function messageGap
|
|
62
|
+
function messageGap(level) {
|
|
66
63
|
return " ".repeat(level * 4);
|
|
67
64
|
}
|
|
68
|
-
function addInspection
|
|
65
|
+
function addInspection(type, cb) {
|
|
69
66
|
type[inspect$1.custom] = cb;
|
|
70
67
|
}
|
|
71
68
|
module.exports = {
|
|
72
|
-
getIndexPos
|
|
73
|
-
messageGap
|
|
74
|
-
addInspection
|
|
69
|
+
getIndexPos,
|
|
70
|
+
messageGap,
|
|
71
|
+
addInspection
|
|
75
72
|
};
|
|
76
|
-
})
|
|
77
|
-
|
|
73
|
+
}));
|
|
78
74
|
//#endregion
|
|
79
75
|
//#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/error.js
|
|
80
|
-
var require_error = /* @__PURE__ */
|
|
76
|
+
var require_error = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
81
77
|
const { EOL } = __require("os");
|
|
82
78
|
const { addInspection, messageGap } = require_utils();
|
|
83
|
-
const parsingErrorCode
|
|
79
|
+
const parsingErrorCode = {
|
|
84
80
|
unclosedMLC: 0,
|
|
85
81
|
unclosedText: 1,
|
|
86
82
|
unclosedQI: 2,
|
|
87
83
|
multiLineQI: 3
|
|
88
84
|
};
|
|
89
|
-
Object.freeze(parsingErrorCode
|
|
85
|
+
Object.freeze(parsingErrorCode);
|
|
90
86
|
const errorMessages = [
|
|
91
87
|
{
|
|
92
88
|
name: "unclosedMLC",
|
|
@@ -105,7 +101,7 @@ var require_error = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-mi
|
|
|
105
101
|
message: "Multi-line quoted identifiers are not supported."
|
|
106
102
|
}
|
|
107
103
|
];
|
|
108
|
-
var SQLParsingError
|
|
104
|
+
var SQLParsingError = class extends Error {
|
|
109
105
|
constructor(code, position) {
|
|
110
106
|
const err = errorMessages[code].message;
|
|
111
107
|
const message = `Error parsing SQL at {line:${position.line},col:${position.column}}: ${err}`;
|
|
@@ -117,7 +113,7 @@ var require_error = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-mi
|
|
|
117
113
|
Error.captureStackTrace(this, this.constructor);
|
|
118
114
|
}
|
|
119
115
|
};
|
|
120
|
-
SQLParsingError
|
|
116
|
+
SQLParsingError.prototype.toString = function(level) {
|
|
121
117
|
level = level > 0 ? parseInt(level) : 0;
|
|
122
118
|
const gap = messageGap(level + 1);
|
|
123
119
|
return [
|
|
@@ -128,22 +124,21 @@ var require_error = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-mi
|
|
|
128
124
|
`${messageGap(level)}}`
|
|
129
125
|
].join(EOL);
|
|
130
126
|
};
|
|
131
|
-
addInspection(SQLParsingError
|
|
127
|
+
addInspection(SQLParsingError.prototype, function() {
|
|
132
128
|
return this.toString();
|
|
133
129
|
});
|
|
134
130
|
module.exports = {
|
|
135
|
-
SQLParsingError
|
|
136
|
-
parsingErrorCode
|
|
131
|
+
SQLParsingError,
|
|
132
|
+
parsingErrorCode
|
|
137
133
|
};
|
|
138
|
-
})
|
|
139
|
-
|
|
134
|
+
}));
|
|
140
135
|
//#endregion
|
|
141
136
|
//#region ../../node_modules/.pnpm/pg-minify@1.6.5/node_modules/pg-minify/lib/parser.js
|
|
142
|
-
var require_parser = /* @__PURE__ */
|
|
137
|
+
var require_parser = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
143
138
|
const { parsingErrorCode, SQLParsingError } = require_error();
|
|
144
139
|
const { getIndexPos } = require_utils();
|
|
145
140
|
const compressors = ".,;:()[]=<>+-*/|!?@#";
|
|
146
|
-
function minify
|
|
141
|
+
function minify(sql, options) {
|
|
147
142
|
if (typeof sql !== "string") throw new TypeError("Input SQL must be a text string.");
|
|
148
143
|
if (!sql.length) return "";
|
|
149
144
|
sql = sql.replace(/\r\n/g, "\n");
|
|
@@ -166,15 +161,15 @@ var require_parser = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-m
|
|
|
166
161
|
continue;
|
|
167
162
|
}
|
|
168
163
|
if (s === "/" && s1 === "*") {
|
|
169
|
-
let c
|
|
170
|
-
while (++c
|
|
171
|
-
lastOpen = c
|
|
164
|
+
let c = idx + 1, open = 0, close = 0, lastOpen, lastClose;
|
|
165
|
+
while (++c < len - 1 && close <= open) if (sql[c] === "/" && sql[c + 1] === "*") {
|
|
166
|
+
lastOpen = c;
|
|
172
167
|
open++;
|
|
173
|
-
c
|
|
174
|
-
} else if (sql[c
|
|
175
|
-
lastClose = c
|
|
168
|
+
c++;
|
|
169
|
+
} else if (sql[c] === "*" && sql[c + 1] === "/") {
|
|
170
|
+
lastClose = c;
|
|
176
171
|
close++;
|
|
177
|
-
c
|
|
172
|
+
c++;
|
|
178
173
|
}
|
|
179
174
|
if (close <= open) {
|
|
180
175
|
idx = lastOpen;
|
|
@@ -207,9 +202,9 @@ var require_parser = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-m
|
|
|
207
202
|
do {
|
|
208
203
|
closeIdx = sql.indexOf("'", closeIdx + 1);
|
|
209
204
|
if (closeIdx > 0) {
|
|
210
|
-
let i
|
|
211
|
-
while (sql[--i
|
|
212
|
-
if ((closeIdx - i
|
|
205
|
+
let i = closeIdx;
|
|
206
|
+
while (sql[--i] === "\\");
|
|
207
|
+
if ((closeIdx - i) % 2) {
|
|
213
208
|
let step = closeIdx;
|
|
214
209
|
while (++step < len && sql[step] === "'");
|
|
215
210
|
if ((step - closeIdx) % 2) {
|
|
@@ -267,22 +262,17 @@ var require_parser = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/pg-m
|
|
|
267
262
|
function isGap(s) {
|
|
268
263
|
return s === " " || s === " " || s === "\r" || s === "\n";
|
|
269
264
|
}
|
|
270
|
-
module.exports = minify
|
|
271
|
-
})
|
|
272
|
-
|
|
265
|
+
module.exports = minify;
|
|
266
|
+
}));
|
|
273
267
|
//#endregion
|
|
274
|
-
//#region
|
|
275
|
-
var
|
|
268
|
+
//#region src/d1Database.ts
|
|
269
|
+
var import_lib = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
276
270
|
const parser = require_parser();
|
|
277
271
|
const error = require_error();
|
|
278
272
|
parser.SQLParsingError = error.SQLParsingError;
|
|
279
273
|
parser.parsingErrorCode = error.parsingErrorCode;
|
|
280
274
|
module.exports = parser;
|
|
281
|
-
})
|
|
282
|
-
|
|
283
|
-
//#endregion
|
|
284
|
-
//#region src/d1Database.ts
|
|
285
|
-
var import_lib = /* @__PURE__ */ __toESM(require_lib(), 1);
|
|
275
|
+
})))(), 1);
|
|
286
276
|
async function resolvePage(singlePage) {
|
|
287
277
|
const results = [];
|
|
288
278
|
for await (const page of singlePage.iterPages()) {
|
|
@@ -302,11 +292,67 @@ function buildWhereClause(conditions) {
|
|
|
302
292
|
clauses.push("platform = ?");
|
|
303
293
|
params.push(conditions.platform);
|
|
304
294
|
}
|
|
295
|
+
if (conditions.enabled !== void 0) {
|
|
296
|
+
clauses.push("enabled = ?");
|
|
297
|
+
params.push(conditions.enabled ? 1 : 0);
|
|
298
|
+
}
|
|
299
|
+
if (conditions.id?.in) if (conditions.id.in.length === 0) clauses.push("1 = 0");
|
|
300
|
+
else {
|
|
301
|
+
clauses.push(`id IN (${conditions.id.in.map(() => "?").join(", ")})`);
|
|
302
|
+
params.push(...conditions.id.in);
|
|
303
|
+
}
|
|
304
|
+
if (conditions.id?.eq) {
|
|
305
|
+
clauses.push("id = ?");
|
|
306
|
+
params.push(conditions.id.eq);
|
|
307
|
+
}
|
|
308
|
+
if (conditions.id?.gt) {
|
|
309
|
+
clauses.push("id > ?");
|
|
310
|
+
params.push(conditions.id.gt);
|
|
311
|
+
}
|
|
312
|
+
if (conditions.id?.gte) {
|
|
313
|
+
clauses.push("id >= ?");
|
|
314
|
+
params.push(conditions.id.gte);
|
|
315
|
+
}
|
|
316
|
+
if (conditions.id?.lt) {
|
|
317
|
+
clauses.push("id < ?");
|
|
318
|
+
params.push(conditions.id.lt);
|
|
319
|
+
}
|
|
320
|
+
if (conditions.id?.lte) {
|
|
321
|
+
clauses.push("id <= ?");
|
|
322
|
+
params.push(conditions.id.lte);
|
|
323
|
+
}
|
|
324
|
+
if (conditions.targetAppVersionNotNull) clauses.push("target_app_version IS NOT NULL");
|
|
325
|
+
if (conditions.targetAppVersion !== void 0) if (conditions.targetAppVersion === null) clauses.push("target_app_version IS NULL");
|
|
326
|
+
else {
|
|
327
|
+
clauses.push("target_app_version = ?");
|
|
328
|
+
params.push(conditions.targetAppVersion);
|
|
329
|
+
}
|
|
330
|
+
if (conditions.targetAppVersionIn) if (conditions.targetAppVersionIn.length === 0) clauses.push("1 = 0");
|
|
331
|
+
else {
|
|
332
|
+
clauses.push(`target_app_version IN (${conditions.targetAppVersionIn.map(() => "?").join(", ")})`);
|
|
333
|
+
params.push(...conditions.targetAppVersionIn);
|
|
334
|
+
}
|
|
335
|
+
if (conditions.fingerprintHash !== void 0) if (conditions.fingerprintHash === null) clauses.push("fingerprint_hash IS NULL");
|
|
336
|
+
else {
|
|
337
|
+
clauses.push("fingerprint_hash = ?");
|
|
338
|
+
params.push(conditions.fingerprintHash);
|
|
339
|
+
}
|
|
305
340
|
return {
|
|
306
341
|
sql: clauses.length > 0 ? ` WHERE ${clauses.join(" AND ")}` : "",
|
|
307
342
|
params
|
|
308
343
|
};
|
|
309
344
|
}
|
|
345
|
+
function parseTargetCohorts(value) {
|
|
346
|
+
if (!value) return null;
|
|
347
|
+
if (Array.isArray(value)) return value.filter((v) => typeof v === "string");
|
|
348
|
+
if (typeof value === "string") try {
|
|
349
|
+
const parsed = JSON.parse(value);
|
|
350
|
+
if (Array.isArray(parsed)) return parsed.filter((v) => typeof v === "string");
|
|
351
|
+
} catch {
|
|
352
|
+
return null;
|
|
353
|
+
}
|
|
354
|
+
return null;
|
|
355
|
+
}
|
|
310
356
|
function transformRowToBundle(row) {
|
|
311
357
|
return {
|
|
312
358
|
id: row.id,
|
|
@@ -320,7 +366,9 @@ function transformRowToBundle(row) {
|
|
|
320
366
|
targetAppVersion: row.target_app_version,
|
|
321
367
|
storageUri: row.storage_uri,
|
|
322
368
|
fingerprintHash: row.fingerprint_hash,
|
|
323
|
-
metadata: row?.metadata ? JSON.parse(row?.metadata) : {}
|
|
369
|
+
metadata: row?.metadata ? JSON.parse(row?.metadata) : {},
|
|
370
|
+
rolloutCohortCount: row.rollout_cohort_count ?? DEFAULT_ROLLOUT_COHORT_COUNT,
|
|
371
|
+
targetCohorts: parseTargetCohorts(row.target_cohorts)
|
|
324
372
|
};
|
|
325
373
|
}
|
|
326
374
|
const d1Database = createDatabasePlugin({
|
|
@@ -337,12 +385,12 @@ const d1Database = createDatabasePlugin({
|
|
|
337
385
|
params
|
|
338
386
|
})))[0]?.total || 0;
|
|
339
387
|
}
|
|
340
|
-
async function getPaginatedBundles(conditions, limit, offset) {
|
|
388
|
+
async function getPaginatedBundles(conditions, limit, offset, orderBy) {
|
|
341
389
|
const { sql: whereClause, params } = buildWhereClause(conditions);
|
|
342
390
|
const sql = (0, import_lib.default)(`
|
|
343
391
|
SELECT * FROM bundles
|
|
344
392
|
${whereClause}
|
|
345
|
-
ORDER BY id DESC
|
|
393
|
+
${orderBy?.direction === "asc" ? "ORDER BY id ASC" : "ORDER BY id DESC"}
|
|
346
394
|
LIMIT ?
|
|
347
395
|
OFFSET ?
|
|
348
396
|
`);
|
|
@@ -368,9 +416,9 @@ const d1Database = createDatabasePlugin({
|
|
|
368
416
|
return transformRowToBundle(rows[0]);
|
|
369
417
|
},
|
|
370
418
|
async getBundles(options) {
|
|
371
|
-
const { where = {}, limit, offset } = options;
|
|
419
|
+
const { where = {}, limit, offset, orderBy } = options;
|
|
372
420
|
const totalCount = await getTotalCount(where);
|
|
373
|
-
bundles = await getPaginatedBundles(where, limit, offset);
|
|
421
|
+
bundles = await getPaginatedBundles(where, limit, offset, orderBy);
|
|
374
422
|
const pagination = calculatePagination(totalCount, {
|
|
375
423
|
limit,
|
|
376
424
|
offset
|
|
@@ -417,9 +465,11 @@ const d1Database = createDatabasePlugin({
|
|
|
417
465
|
target_app_version,
|
|
418
466
|
storage_uri,
|
|
419
467
|
fingerprint_hash,
|
|
420
|
-
metadata
|
|
468
|
+
metadata,
|
|
469
|
+
rollout_cohort_count,
|
|
470
|
+
target_cohorts
|
|
421
471
|
)
|
|
422
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
472
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
423
473
|
`);
|
|
424
474
|
const params = [
|
|
425
475
|
bundle.id,
|
|
@@ -433,7 +483,9 @@ const d1Database = createDatabasePlugin({
|
|
|
433
483
|
bundle.targetAppVersion,
|
|
434
484
|
bundle.storageUri,
|
|
435
485
|
bundle.fingerprintHash,
|
|
436
|
-
bundle.metadata ? JSON.stringify(bundle.metadata) : JSON.stringify({})
|
|
486
|
+
bundle.metadata ? JSON.stringify(bundle.metadata) : JSON.stringify({}),
|
|
487
|
+
bundle.rolloutCohortCount ?? DEFAULT_ROLLOUT_COHORT_COUNT,
|
|
488
|
+
bundle.targetCohorts ? JSON.stringify(bundle.targetCohorts) : null
|
|
437
489
|
];
|
|
438
490
|
await cf.d1.database.query(config.databaseId, {
|
|
439
491
|
account_id: config.accountId,
|
|
@@ -445,7 +497,6 @@ const d1Database = createDatabasePlugin({
|
|
|
445
497
|
};
|
|
446
498
|
}
|
|
447
499
|
});
|
|
448
|
-
|
|
449
500
|
//#endregion
|
|
450
501
|
//#region ../../node_modules/.pnpm/is-plain-obj@4.1.0/node_modules/is-plain-obj/index.js
|
|
451
502
|
function isPlainObject(value) {
|
|
@@ -453,7 +504,6 @@ function isPlainObject(value) {
|
|
|
453
504
|
const prototype = Object.getPrototypeOf(value);
|
|
454
505
|
return (prototype === null || prototype === Object.prototype || Object.getPrototypeOf(prototype) === null) && !(Symbol.toStringTag in value) && !(Symbol.iterator in value);
|
|
455
506
|
}
|
|
456
|
-
|
|
457
507
|
//#endregion
|
|
458
508
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/file-url.js
|
|
459
509
|
const safeNormalizeFileUrl = (file, name) => {
|
|
@@ -464,7 +514,6 @@ const safeNormalizeFileUrl = (file, name) => {
|
|
|
464
514
|
const normalizeDenoExecPath = (file) => isDenoExecPath(file) ? file.toString() : file;
|
|
465
515
|
const isDenoExecPath = (file) => typeof file !== "string" && file && Object.getPrototypeOf(file) === String.prototype;
|
|
466
516
|
const normalizeFileUrl = (file) => file instanceof URL ? fileURLToPath(file) : file;
|
|
467
|
-
|
|
468
517
|
//#endregion
|
|
469
518
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/parameters.js
|
|
470
519
|
const normalizeParameters = (rawFile, rawArguments = [], rawOptions = {}) => {
|
|
@@ -482,7 +531,6 @@ const normalizeParameters = (rawFile, rawArguments = [], rawOptions = {}) => {
|
|
|
482
531
|
options
|
|
483
532
|
];
|
|
484
533
|
};
|
|
485
|
-
|
|
486
534
|
//#endregion
|
|
487
535
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/utils/uint-array.js
|
|
488
536
|
const { toString: objectToString$1 } = Object.prototype;
|
|
@@ -522,7 +570,6 @@ const getJoinLength = (uint8Arrays) => {
|
|
|
522
570
|
for (const uint8Array of uint8Arrays) joinLength += uint8Array.length;
|
|
523
571
|
return joinLength;
|
|
524
572
|
};
|
|
525
|
-
|
|
526
573
|
//#endregion
|
|
527
574
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/template.js
|
|
528
575
|
const isTemplateString = (templates) => Array.isArray(templates) && Array.isArray(templates.raw);
|
|
@@ -549,7 +596,7 @@ const parseTemplate = ({ templates, expressions, tokens, index, template }) => {
|
|
|
549
596
|
const newTokens = concatTokens(tokens, nextTokens, leadingWhitespaces);
|
|
550
597
|
if (index === expressions.length) return newTokens;
|
|
551
598
|
const expression = expressions[index];
|
|
552
|
-
return concatTokens(newTokens, Array.isArray(expression) ? expression.map((expression
|
|
599
|
+
return concatTokens(newTokens, Array.isArray(expression) ? expression.map((expression) => parseExpression(expression)) : [parseExpression(expression)], trailingWhitespaces);
|
|
553
600
|
};
|
|
554
601
|
const splitByWhitespaces = (template, rawTemplate) => {
|
|
555
602
|
if (rawTemplate.length === 0) return {
|
|
@@ -611,7 +658,6 @@ const getSubprocessResult = ({ stdout }) => {
|
|
|
611
658
|
if (stdout === void 0) throw new TypeError("Missing result.stdout in template expression. This is probably due to the previous subprocess' \"stdout\" option.");
|
|
612
659
|
throw new TypeError(`Unexpected "${typeof stdout}" stdout in template expression`);
|
|
613
660
|
};
|
|
614
|
-
|
|
615
661
|
//#endregion
|
|
616
662
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/utils/standard-stream.js
|
|
617
663
|
const isStandardStream = (stream) => STANDARD_STREAMS.includes(stream);
|
|
@@ -626,7 +672,6 @@ const STANDARD_STREAMS_ALIASES = [
|
|
|
626
672
|
"stderr"
|
|
627
673
|
];
|
|
628
674
|
const getStreamName = (fdNumber) => STANDARD_STREAMS_ALIASES[fdNumber] ?? `stdio[${fdNumber}]`;
|
|
629
|
-
|
|
630
675
|
//#endregion
|
|
631
676
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/specific.js
|
|
632
677
|
const normalizeFdSpecificOptions = (options) => {
|
|
@@ -681,7 +726,6 @@ const FD_SPECIFIC_OPTIONS = [
|
|
|
681
726
|
"stripFinalNewline"
|
|
682
727
|
];
|
|
683
728
|
const getFdSpecificValue = (optionArray, fdNumber) => fdNumber === "ipc" ? optionArray.at(-1) : optionArray[fdNumber];
|
|
684
|
-
|
|
685
729
|
//#endregion
|
|
686
730
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/values.js
|
|
687
731
|
const isVerbose = ({ verbose }, fdNumber) => getFdVerbose(verbose, fdNumber) !== "none";
|
|
@@ -698,7 +742,6 @@ const VERBOSE_VALUES = [
|
|
|
698
742
|
"short",
|
|
699
743
|
"full"
|
|
700
744
|
];
|
|
701
|
-
|
|
702
745
|
//#endregion
|
|
703
746
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/escape.js
|
|
704
747
|
const joinCommand = (filePath, rawArguments) => {
|
|
@@ -719,7 +762,7 @@ const escapeControlCharacter = (character) => {
|
|
|
719
762
|
};
|
|
720
763
|
const getSpecialCharRegExp = () => {
|
|
721
764
|
try {
|
|
722
|
-
return new RegExp("\\p{Separator}|\\p{Other}", "gu");
|
|
765
|
+
return /* @__PURE__ */ new RegExp("\\p{Separator}|\\p{Other}", "gu");
|
|
723
766
|
} catch {
|
|
724
767
|
return /[\s\u0000-\u001F\u007F-\u009F\u00AD]/g;
|
|
725
768
|
}
|
|
@@ -739,7 +782,6 @@ const quoteString = (escapedArgument) => {
|
|
|
739
782
|
return platform === "win32" ? `"${escapedArgument.replaceAll("\"", "\"\"")}"` : `'${escapedArgument.replaceAll("'", "'\\''")}'`;
|
|
740
783
|
};
|
|
741
784
|
const NO_ESCAPE_REGEXP = /^[\w./-]+$/;
|
|
742
|
-
|
|
743
785
|
//#endregion
|
|
744
786
|
//#region ../../node_modules/.pnpm/is-unicode-supported@2.1.0/node_modules/is-unicode-supported/index.js
|
|
745
787
|
function isUnicodeSupported() {
|
|
@@ -748,7 +790,6 @@ function isUnicodeSupported() {
|
|
|
748
790
|
if (process$1.platform !== "win32") return TERM !== "linux";
|
|
749
791
|
return Boolean(env.WT_SESSION) || Boolean(env.TERMINUS_SUBLIME) || env.ConEmuTask === "{cmd::Cmder}" || TERM_PROGRAM === "Terminus-Sublime" || TERM_PROGRAM === "vscode" || TERM === "xterm-256color" || TERM === "alacritty" || TERM === "rxvt-unicode" || TERM === "rxvt-unicode-256color" || env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
|
|
750
792
|
}
|
|
751
|
-
|
|
752
793
|
//#endregion
|
|
753
794
|
//#region ../../node_modules/.pnpm/figures@6.1.0/node_modules/figures/index.js
|
|
754
795
|
const common = {
|
|
@@ -1027,11 +1068,8 @@ const fallbackSymbols = {
|
|
|
1027
1068
|
...common,
|
|
1028
1069
|
...specialFallbackSymbols
|
|
1029
1070
|
};
|
|
1030
|
-
const
|
|
1031
|
-
|
|
1032
|
-
var figures_default = figures;
|
|
1033
|
-
const replacements = Object.entries(specialMainSymbols);
|
|
1034
|
-
|
|
1071
|
+
const figures = isUnicodeSupported() ? mainSymbols : fallbackSymbols;
|
|
1072
|
+
Object.entries(specialMainSymbols);
|
|
1035
1073
|
//#endregion
|
|
1036
1074
|
//#region ../../node_modules/.pnpm/yoctocolors@2.1.1/node_modules/yoctocolors/base.js
|
|
1037
1075
|
const hasColors = tty?.WriteStream?.prototype?.hasColors?.() ?? false;
|
|
@@ -1054,48 +1092,47 @@ const format = (open, close) => {
|
|
|
1054
1092
|
return result;
|
|
1055
1093
|
};
|
|
1056
1094
|
};
|
|
1057
|
-
|
|
1095
|
+
format(0, 0);
|
|
1058
1096
|
const bold = format(1, 22);
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1073
|
-
|
|
1097
|
+
format(2, 22);
|
|
1098
|
+
format(3, 23);
|
|
1099
|
+
format(4, 24);
|
|
1100
|
+
format(53, 55);
|
|
1101
|
+
format(7, 27);
|
|
1102
|
+
format(8, 28);
|
|
1103
|
+
format(9, 29);
|
|
1104
|
+
format(30, 39);
|
|
1105
|
+
format(31, 39);
|
|
1106
|
+
format(32, 39);
|
|
1107
|
+
format(33, 39);
|
|
1108
|
+
format(34, 39);
|
|
1109
|
+
format(35, 39);
|
|
1110
|
+
format(36, 39);
|
|
1111
|
+
format(37, 39);
|
|
1074
1112
|
const gray = format(90, 39);
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1113
|
+
format(40, 49);
|
|
1114
|
+
format(41, 49);
|
|
1115
|
+
format(42, 49);
|
|
1116
|
+
format(43, 49);
|
|
1117
|
+
format(44, 49);
|
|
1118
|
+
format(45, 49);
|
|
1119
|
+
format(46, 49);
|
|
1120
|
+
format(47, 49);
|
|
1121
|
+
format(100, 49);
|
|
1084
1122
|
const redBright = format(91, 39);
|
|
1085
|
-
|
|
1123
|
+
format(92, 39);
|
|
1086
1124
|
const yellowBright = format(93, 39);
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1125
|
+
format(94, 39);
|
|
1126
|
+
format(95, 39);
|
|
1127
|
+
format(96, 39);
|
|
1128
|
+
format(97, 39);
|
|
1129
|
+
format(101, 49);
|
|
1130
|
+
format(102, 49);
|
|
1131
|
+
format(103, 49);
|
|
1132
|
+
format(104, 49);
|
|
1133
|
+
format(105, 49);
|
|
1134
|
+
format(106, 49);
|
|
1135
|
+
format(107, 49);
|
|
1099
1136
|
//#endregion
|
|
1100
1137
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/default.js
|
|
1101
1138
|
const defaultVerboseFunction = ({ type, message, timestamp, piped, commandId, result: { failed = false } = {}, options: { reject = true } }) => {
|
|
@@ -1111,8 +1148,8 @@ const defaultVerboseFunction = ({ type, message, timestamp, piped, commandId, re
|
|
|
1111
1148
|
const serializeTimestamp = (timestamp) => `${padField(timestamp.getHours(), 2)}:${padField(timestamp.getMinutes(), 2)}:${padField(timestamp.getSeconds(), 2)}.${padField(timestamp.getMilliseconds(), 3)}`;
|
|
1112
1149
|
const padField = (field, padding) => String(field).padStart(padding, "0");
|
|
1113
1150
|
const getFinalIcon = ({ failed, reject }) => {
|
|
1114
|
-
if (!failed) return
|
|
1115
|
-
return reject ?
|
|
1151
|
+
if (!failed) return figures.tick;
|
|
1152
|
+
return reject ? figures.cross : figures.warning;
|
|
1116
1153
|
};
|
|
1117
1154
|
const ICONS = {
|
|
1118
1155
|
command: ({ piped }) => piped ? "|" : "$",
|
|
@@ -1129,7 +1166,6 @@ const COLORS = {
|
|
|
1129
1166
|
error: ({ reject }) => reject ? redBright : yellowBright,
|
|
1130
1167
|
duration: () => gray
|
|
1131
1168
|
};
|
|
1132
|
-
|
|
1133
1169
|
//#endregion
|
|
1134
1170
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/custom.js
|
|
1135
1171
|
const applyVerboseOnLines = (printedLines, verboseInfo, fdNumber) => {
|
|
@@ -1142,7 +1178,6 @@ const applyVerboseFunction = (verboseLine, verboseObject, verboseFunction) => {
|
|
|
1142
1178
|
if (typeof printedLine === "string") return printedLine;
|
|
1143
1179
|
};
|
|
1144
1180
|
const appendNewline = (printedLine) => printedLine.endsWith("\n") ? printedLine : `${printedLine}\n`;
|
|
1145
|
-
|
|
1146
1181
|
//#endregion
|
|
1147
1182
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/log.js
|
|
1148
1183
|
const verboseLog = ({ type, verboseMessage, fdNumber, verboseInfo, result }) => {
|
|
@@ -1153,7 +1188,7 @@ const verboseLog = ({ type, verboseMessage, fdNumber, verboseInfo, result }) =>
|
|
|
1153
1188
|
})), verboseInfo, fdNumber);
|
|
1154
1189
|
if (finalLines !== "") console.warn(finalLines.slice(0, -1));
|
|
1155
1190
|
};
|
|
1156
|
-
const getVerboseObject = ({ type, result, verboseInfo: { escapedCommand, commandId, rawOptions: { piped = false
|
|
1191
|
+
const getVerboseObject = ({ type, result, verboseInfo: { escapedCommand, commandId, rawOptions: { piped = false, ...options } } }) => ({
|
|
1157
1192
|
type,
|
|
1158
1193
|
escapedCommand,
|
|
1159
1194
|
commandId: `${commandId}`,
|
|
@@ -1176,7 +1211,6 @@ const serializeVerboseMessage = (message) => {
|
|
|
1176
1211
|
return escapeLines(typeof message === "string" ? message : inspect(message)).replaceAll(" ", " ".repeat(TAB_SIZE));
|
|
1177
1212
|
};
|
|
1178
1213
|
const TAB_SIZE = 2;
|
|
1179
|
-
|
|
1180
1214
|
//#endregion
|
|
1181
1215
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/start.js
|
|
1182
1216
|
const logCommand = (escapedCommand, verboseInfo) => {
|
|
@@ -1187,7 +1221,6 @@ const logCommand = (escapedCommand, verboseInfo) => {
|
|
|
1187
1221
|
verboseInfo
|
|
1188
1222
|
});
|
|
1189
1223
|
};
|
|
1190
|
-
|
|
1191
1224
|
//#endregion
|
|
1192
1225
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/info.js
|
|
1193
1226
|
const getVerboseInfo = (verbose, escapedCommand, rawOptions) => {
|
|
@@ -1211,12 +1244,10 @@ const validateVerbose = (verbose) => {
|
|
|
1211
1244
|
}
|
|
1212
1245
|
}
|
|
1213
1246
|
};
|
|
1214
|
-
|
|
1215
1247
|
//#endregion
|
|
1216
1248
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/return/duration.js
|
|
1217
1249
|
const getStartTime = () => hrtime.bigint();
|
|
1218
1250
|
const getDurationMs = (startTime) => Number(hrtime.bigint() - startTime) / 1e6;
|
|
1219
|
-
|
|
1220
1251
|
//#endregion
|
|
1221
1252
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/command.js
|
|
1222
1253
|
const handleCommand = (filePath, rawArguments, rawOptions) => {
|
|
@@ -1231,51 +1262,49 @@ const handleCommand = (filePath, rawArguments, rawOptions) => {
|
|
|
1231
1262
|
verboseInfo
|
|
1232
1263
|
};
|
|
1233
1264
|
};
|
|
1234
|
-
|
|
1235
1265
|
//#endregion
|
|
1236
1266
|
//#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js
|
|
1237
|
-
var require_windows = /* @__PURE__ */
|
|
1238
|
-
module.exports = isexe
|
|
1239
|
-
isexe
|
|
1267
|
+
var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1268
|
+
module.exports = isexe;
|
|
1269
|
+
isexe.sync = sync;
|
|
1240
1270
|
var fs$2 = __require("fs");
|
|
1241
|
-
function checkPathExt(path
|
|
1271
|
+
function checkPathExt(path, options) {
|
|
1242
1272
|
var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
|
|
1243
1273
|
if (!pathext) return true;
|
|
1244
1274
|
pathext = pathext.split(";");
|
|
1245
1275
|
if (pathext.indexOf("") !== -1) return true;
|
|
1246
|
-
for (var i
|
|
1247
|
-
var p = pathext[i
|
|
1248
|
-
if (p && path
|
|
1276
|
+
for (var i = 0; i < pathext.length; i++) {
|
|
1277
|
+
var p = pathext[i].toLowerCase();
|
|
1278
|
+
if (p && path.substr(-p.length).toLowerCase() === p) return true;
|
|
1249
1279
|
}
|
|
1250
1280
|
return false;
|
|
1251
1281
|
}
|
|
1252
|
-
function checkStat
|
|
1282
|
+
function checkStat(stat, path, options) {
|
|
1253
1283
|
if (!stat.isSymbolicLink() && !stat.isFile()) return false;
|
|
1254
|
-
return checkPathExt(path
|
|
1284
|
+
return checkPathExt(path, options);
|
|
1255
1285
|
}
|
|
1256
|
-
function isexe
|
|
1257
|
-
fs$2.stat(path
|
|
1258
|
-
cb(er, er ? false : checkStat
|
|
1286
|
+
function isexe(path, options, cb) {
|
|
1287
|
+
fs$2.stat(path, function(er, stat) {
|
|
1288
|
+
cb(er, er ? false : checkStat(stat, path, options));
|
|
1259
1289
|
});
|
|
1260
1290
|
}
|
|
1261
|
-
function sync
|
|
1262
|
-
return checkStat
|
|
1291
|
+
function sync(path, options) {
|
|
1292
|
+
return checkStat(fs$2.statSync(path), path, options);
|
|
1263
1293
|
}
|
|
1264
|
-
})
|
|
1265
|
-
|
|
1294
|
+
}));
|
|
1266
1295
|
//#endregion
|
|
1267
1296
|
//#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js
|
|
1268
|
-
var require_mode = /* @__PURE__ */
|
|
1269
|
-
module.exports = isexe
|
|
1270
|
-
isexe
|
|
1297
|
+
var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1298
|
+
module.exports = isexe;
|
|
1299
|
+
isexe.sync = sync;
|
|
1271
1300
|
var fs$1 = __require("fs");
|
|
1272
|
-
function isexe
|
|
1273
|
-
fs$1.stat(path
|
|
1301
|
+
function isexe(path, options, cb) {
|
|
1302
|
+
fs$1.stat(path, function(er, stat) {
|
|
1274
1303
|
cb(er, er ? false : checkStat(stat, options));
|
|
1275
1304
|
});
|
|
1276
1305
|
}
|
|
1277
|
-
function sync
|
|
1278
|
-
return checkStat(fs$1.statSync(path
|
|
1306
|
+
function sync(path, options) {
|
|
1307
|
+
return checkStat(fs$1.statSync(path), options);
|
|
1279
1308
|
}
|
|
1280
1309
|
function checkStat(stat, options) {
|
|
1281
1310
|
return stat.isFile() && checkMode(stat, options);
|
|
@@ -1286,24 +1315,23 @@ var require_mode = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/isexe@
|
|
|
1286
1315
|
var gid = stat.gid;
|
|
1287
1316
|
var myUid = options.uid !== void 0 ? options.uid : process.getuid && process.getuid();
|
|
1288
1317
|
var myGid = options.gid !== void 0 ? options.gid : process.getgid && process.getgid();
|
|
1289
|
-
var u
|
|
1318
|
+
var u = parseInt("100", 8);
|
|
1290
1319
|
var g = parseInt("010", 8);
|
|
1291
|
-
var o
|
|
1292
|
-
var ug = u
|
|
1293
|
-
return mod & o
|
|
1320
|
+
var o = parseInt("001", 8);
|
|
1321
|
+
var ug = u | g;
|
|
1322
|
+
return mod & o || mod & g && gid === myGid || mod & u && uid === myUid || mod & ug && myUid === 0;
|
|
1294
1323
|
}
|
|
1295
|
-
})
|
|
1296
|
-
|
|
1324
|
+
}));
|
|
1297
1325
|
//#endregion
|
|
1298
1326
|
//#region ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js
|
|
1299
|
-
var require_isexe = /* @__PURE__ */
|
|
1327
|
+
var require_isexe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1300
1328
|
__require("fs");
|
|
1301
1329
|
var core;
|
|
1302
1330
|
if (process.platform === "win32" || global.TESTING_WINDOWS) core = require_windows();
|
|
1303
1331
|
else core = require_mode();
|
|
1304
|
-
module.exports = isexe
|
|
1305
|
-
isexe
|
|
1306
|
-
function isexe
|
|
1332
|
+
module.exports = isexe;
|
|
1333
|
+
isexe.sync = sync;
|
|
1334
|
+
function isexe(path, options, cb) {
|
|
1307
1335
|
if (typeof options === "function") {
|
|
1308
1336
|
cb = options;
|
|
1309
1337
|
options = {};
|
|
@@ -1311,13 +1339,13 @@ var require_isexe = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/isexe
|
|
|
1311
1339
|
if (!cb) {
|
|
1312
1340
|
if (typeof Promise !== "function") throw new TypeError("callback not provided");
|
|
1313
1341
|
return new Promise(function(resolve, reject) {
|
|
1314
|
-
isexe
|
|
1342
|
+
isexe(path, options || {}, function(er, is) {
|
|
1315
1343
|
if (er) reject(er);
|
|
1316
1344
|
else resolve(is);
|
|
1317
1345
|
});
|
|
1318
1346
|
});
|
|
1319
1347
|
}
|
|
1320
|
-
core(path
|
|
1348
|
+
core(path, options || {}, function(er, is) {
|
|
1321
1349
|
if (er) {
|
|
1322
1350
|
if (er.code === "EACCES" || options && options.ignoreErrors) {
|
|
1323
1351
|
er = null;
|
|
@@ -1327,19 +1355,18 @@ var require_isexe = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/isexe
|
|
|
1327
1355
|
cb(er, is);
|
|
1328
1356
|
});
|
|
1329
1357
|
}
|
|
1330
|
-
function sync(path
|
|
1358
|
+
function sync(path, options) {
|
|
1331
1359
|
try {
|
|
1332
|
-
return core.sync(path
|
|
1360
|
+
return core.sync(path, options || {});
|
|
1333
1361
|
} catch (er) {
|
|
1334
1362
|
if (options && options.ignoreErrors || er.code === "EACCES") return false;
|
|
1335
1363
|
else throw er;
|
|
1336
1364
|
}
|
|
1337
1365
|
}
|
|
1338
|
-
})
|
|
1339
|
-
|
|
1366
|
+
}));
|
|
1340
1367
|
//#endregion
|
|
1341
1368
|
//#region ../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js
|
|
1342
|
-
var require_which = /* @__PURE__ */
|
|
1369
|
+
var require_which = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1343
1370
|
const isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
|
|
1344
1371
|
const path$4 = __require("path");
|
|
1345
1372
|
const COLON = isWindows ? ";" : ":";
|
|
@@ -1359,7 +1386,7 @@ var require_which = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/which
|
|
|
1359
1386
|
pathExtExe
|
|
1360
1387
|
};
|
|
1361
1388
|
};
|
|
1362
|
-
const which
|
|
1389
|
+
const which = (cmd, opt, cb) => {
|
|
1363
1390
|
if (typeof opt === "function") {
|
|
1364
1391
|
cb = opt;
|
|
1365
1392
|
opt = {};
|
|
@@ -1367,20 +1394,20 @@ var require_which = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/which
|
|
|
1367
1394
|
if (!opt) opt = {};
|
|
1368
1395
|
const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
|
|
1369
1396
|
const found = [];
|
|
1370
|
-
const step = (i
|
|
1371
|
-
if (i
|
|
1372
|
-
const ppRaw = pathEnv[i
|
|
1397
|
+
const step = (i) => new Promise((resolve, reject) => {
|
|
1398
|
+
if (i === pathEnv.length) return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
|
|
1399
|
+
const ppRaw = pathEnv[i];
|
|
1373
1400
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
1374
1401
|
const pCmd = path$4.join(pathPart, cmd);
|
|
1375
|
-
resolve(subStep(!pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd, i
|
|
1402
|
+
resolve(subStep(!pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd, i, 0));
|
|
1376
1403
|
});
|
|
1377
|
-
const subStep = (p, i
|
|
1378
|
-
if (ii === pathExt.length) return resolve(step(i
|
|
1404
|
+
const subStep = (p, i, ii) => new Promise((resolve, reject) => {
|
|
1405
|
+
if (ii === pathExt.length) return resolve(step(i + 1));
|
|
1379
1406
|
const ext = pathExt[ii];
|
|
1380
1407
|
isexe(p + ext, { pathExt: pathExtExe }, (er, is) => {
|
|
1381
1408
|
if (!er && is) if (opt.all) found.push(p + ext);
|
|
1382
1409
|
else return resolve(p + ext);
|
|
1383
|
-
return resolve(subStep(p, i
|
|
1410
|
+
return resolve(subStep(p, i, ii + 1));
|
|
1384
1411
|
});
|
|
1385
1412
|
});
|
|
1386
1413
|
return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
|
|
@@ -1389,8 +1416,8 @@ var require_which = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/which
|
|
|
1389
1416
|
opt = opt || {};
|
|
1390
1417
|
const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
|
|
1391
1418
|
const found = [];
|
|
1392
|
-
for (let i
|
|
1393
|
-
const ppRaw = pathEnv[i
|
|
1419
|
+
for (let i = 0; i < pathEnv.length; i++) {
|
|
1420
|
+
const ppRaw = pathEnv[i];
|
|
1394
1421
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
1395
1422
|
const pCmd = path$4.join(pathPart, cmd);
|
|
1396
1423
|
const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
|
|
@@ -1406,25 +1433,23 @@ var require_which = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/which
|
|
|
1406
1433
|
if (opt.nothrow) return null;
|
|
1407
1434
|
throw getNotFoundError(cmd);
|
|
1408
1435
|
};
|
|
1409
|
-
module.exports = which
|
|
1410
|
-
which
|
|
1411
|
-
})
|
|
1412
|
-
|
|
1436
|
+
module.exports = which;
|
|
1437
|
+
which.sync = whichSync;
|
|
1438
|
+
}));
|
|
1413
1439
|
//#endregion
|
|
1414
1440
|
//#region ../../node_modules/.pnpm/path-key@3.1.1/node_modules/path-key/index.js
|
|
1415
|
-
var require_path_key = /* @__PURE__ */
|
|
1416
|
-
const pathKey
|
|
1441
|
+
var require_path_key = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1442
|
+
const pathKey = (options = {}) => {
|
|
1417
1443
|
const environment = options.env || process.env;
|
|
1418
1444
|
if ((options.platform || process.platform) !== "win32") return "PATH";
|
|
1419
1445
|
return Object.keys(environment).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
|
|
1420
1446
|
};
|
|
1421
|
-
module.exports = pathKey
|
|
1422
|
-
module.exports.default = pathKey
|
|
1423
|
-
})
|
|
1424
|
-
|
|
1447
|
+
module.exports = pathKey;
|
|
1448
|
+
module.exports.default = pathKey;
|
|
1449
|
+
}));
|
|
1425
1450
|
//#endregion
|
|
1426
1451
|
//#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
|
|
1427
|
-
var require_resolveCommand = /* @__PURE__ */
|
|
1452
|
+
var require_resolveCommand = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1428
1453
|
const path$3 = __require("path");
|
|
1429
1454
|
const which = require_which();
|
|
1430
1455
|
const getPathKey = require_path_key();
|
|
@@ -1448,15 +1473,14 @@ var require_resolveCommand = /* @__PURE__ */ __commonJS({ "../../node_modules/.p
|
|
|
1448
1473
|
if (resolved) resolved = path$3.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
|
|
1449
1474
|
return resolved;
|
|
1450
1475
|
}
|
|
1451
|
-
function resolveCommand
|
|
1476
|
+
function resolveCommand(parsed) {
|
|
1452
1477
|
return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
|
|
1453
1478
|
}
|
|
1454
|
-
module.exports = resolveCommand
|
|
1455
|
-
})
|
|
1456
|
-
|
|
1479
|
+
module.exports = resolveCommand;
|
|
1480
|
+
}));
|
|
1457
1481
|
//#endregion
|
|
1458
1482
|
//#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/escape.js
|
|
1459
|
-
var require_escape = /* @__PURE__ */
|
|
1483
|
+
var require_escape = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1460
1484
|
const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
|
|
1461
1485
|
function escapeCommand(arg) {
|
|
1462
1486
|
arg = arg.replace(metaCharsRegExp, "^$1");
|
|
@@ -1473,34 +1497,31 @@ var require_escape = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cros
|
|
|
1473
1497
|
}
|
|
1474
1498
|
module.exports.command = escapeCommand;
|
|
1475
1499
|
module.exports.argument = escapeArgument;
|
|
1476
|
-
})
|
|
1477
|
-
|
|
1500
|
+
}));
|
|
1478
1501
|
//#endregion
|
|
1479
1502
|
//#region ../../node_modules/.pnpm/shebang-regex@3.0.0/node_modules/shebang-regex/index.js
|
|
1480
|
-
var require_shebang_regex = /* @__PURE__ */
|
|
1503
|
+
var require_shebang_regex = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1481
1504
|
module.exports = /^#!(.*)/;
|
|
1482
|
-
})
|
|
1483
|
-
|
|
1505
|
+
}));
|
|
1484
1506
|
//#endregion
|
|
1485
1507
|
//#region ../../node_modules/.pnpm/shebang-command@2.0.0/node_modules/shebang-command/index.js
|
|
1486
|
-
var require_shebang_command = /* @__PURE__ */
|
|
1508
|
+
var require_shebang_command = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1487
1509
|
const shebangRegex = require_shebang_regex();
|
|
1488
1510
|
module.exports = (string = "") => {
|
|
1489
1511
|
const match = string.match(shebangRegex);
|
|
1490
1512
|
if (!match) return null;
|
|
1491
|
-
const [path
|
|
1492
|
-
const binary = path
|
|
1513
|
+
const [path, argument] = match[0].replace(/#! ?/, "").split(" ");
|
|
1514
|
+
const binary = path.split("/").pop();
|
|
1493
1515
|
if (binary === "env") return argument;
|
|
1494
1516
|
return argument ? `${binary} ${argument}` : binary;
|
|
1495
1517
|
};
|
|
1496
|
-
})
|
|
1497
|
-
|
|
1518
|
+
}));
|
|
1498
1519
|
//#endregion
|
|
1499
1520
|
//#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js
|
|
1500
|
-
var require_readShebang = /* @__PURE__ */
|
|
1521
|
+
var require_readShebang = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1501
1522
|
const fs = __require("fs");
|
|
1502
1523
|
const shebangCommand = require_shebang_command();
|
|
1503
|
-
function readShebang
|
|
1524
|
+
function readShebang(command) {
|
|
1504
1525
|
const size = 150;
|
|
1505
1526
|
const buffer = Buffer.alloc(size);
|
|
1506
1527
|
let fd;
|
|
@@ -1511,17 +1532,16 @@ var require_readShebang = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm
|
|
|
1511
1532
|
} catch (e) {}
|
|
1512
1533
|
return shebangCommand(buffer.toString());
|
|
1513
1534
|
}
|
|
1514
|
-
module.exports = readShebang
|
|
1515
|
-
})
|
|
1516
|
-
|
|
1535
|
+
module.exports = readShebang;
|
|
1536
|
+
}));
|
|
1517
1537
|
//#endregion
|
|
1518
1538
|
//#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js
|
|
1519
|
-
var require_parse = /* @__PURE__ */
|
|
1539
|
+
var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1520
1540
|
const path$2 = __require("path");
|
|
1521
1541
|
const resolveCommand = require_resolveCommand();
|
|
1522
1542
|
const escape = require_escape();
|
|
1523
1543
|
const readShebang = require_readShebang();
|
|
1524
|
-
const isWin
|
|
1544
|
+
const isWin = process.platform === "win32";
|
|
1525
1545
|
const isExecutableRegExp = /\.(?:com|exe)$/i;
|
|
1526
1546
|
const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
|
|
1527
1547
|
function detectShebang(parsed) {
|
|
@@ -1535,7 +1555,7 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross
|
|
|
1535
1555
|
return parsed.file;
|
|
1536
1556
|
}
|
|
1537
1557
|
function parseNonShell(parsed) {
|
|
1538
|
-
if (!isWin
|
|
1558
|
+
if (!isWin) return parsed;
|
|
1539
1559
|
const commandFile = detectShebang(parsed);
|
|
1540
1560
|
const needsShell = !isExecutableRegExp.test(commandFile);
|
|
1541
1561
|
if (parsed.options.forceShell || needsShell) {
|
|
@@ -1554,7 +1574,7 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross
|
|
|
1554
1574
|
}
|
|
1555
1575
|
return parsed;
|
|
1556
1576
|
}
|
|
1557
|
-
function parse
|
|
1577
|
+
function parse(command, args, options) {
|
|
1558
1578
|
if (args && !Array.isArray(args)) {
|
|
1559
1579
|
options = args;
|
|
1560
1580
|
args = null;
|
|
@@ -1573,12 +1593,11 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cross
|
|
|
1573
1593
|
};
|
|
1574
1594
|
return options.shell ? parsed : parseNonShell(parsed);
|
|
1575
1595
|
}
|
|
1576
|
-
module.exports = parse
|
|
1577
|
-
})
|
|
1578
|
-
|
|
1596
|
+
module.exports = parse;
|
|
1597
|
+
}));
|
|
1579
1598
|
//#endregion
|
|
1580
1599
|
//#region ../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/enoent.js
|
|
1581
|
-
var require_enoent = /* @__PURE__ */
|
|
1600
|
+
var require_enoent = /* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1582
1601
|
const isWin = process.platform === "win32";
|
|
1583
1602
|
function notFoundError(original, syscall) {
|
|
1584
1603
|
return Object.assign(/* @__PURE__ */ new Error(`${syscall} ${original.command} ENOENT`), {
|
|
@@ -1589,15 +1608,15 @@ var require_enoent = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cros
|
|
|
1589
1608
|
spawnargs: original.args
|
|
1590
1609
|
});
|
|
1591
1610
|
}
|
|
1592
|
-
function hookChildProcess(cp
|
|
1611
|
+
function hookChildProcess(cp, parsed) {
|
|
1593
1612
|
if (!isWin) return;
|
|
1594
|
-
const originalEmit = cp
|
|
1595
|
-
cp
|
|
1613
|
+
const originalEmit = cp.emit;
|
|
1614
|
+
cp.emit = function(name, arg1) {
|
|
1596
1615
|
if (name === "exit") {
|
|
1597
1616
|
const err = verifyENOENT(arg1, parsed);
|
|
1598
|
-
if (err) return originalEmit.call(cp
|
|
1617
|
+
if (err) return originalEmit.call(cp, "error", err);
|
|
1599
1618
|
}
|
|
1600
|
-
return originalEmit.apply(cp
|
|
1619
|
+
return originalEmit.apply(cp, arguments);
|
|
1601
1620
|
};
|
|
1602
1621
|
}
|
|
1603
1622
|
function verifyENOENT(status, parsed) {
|
|
@@ -1614,45 +1633,37 @@ var require_enoent = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/cros
|
|
|
1614
1633
|
verifyENOENTSync,
|
|
1615
1634
|
notFoundError
|
|
1616
1635
|
};
|
|
1617
|
-
})
|
|
1618
|
-
|
|
1636
|
+
}));
|
|
1619
1637
|
//#endregion
|
|
1620
|
-
//#region ../../node_modules/.pnpm/
|
|
1621
|
-
var
|
|
1638
|
+
//#region ../../node_modules/.pnpm/path-key@4.0.0/node_modules/path-key/index.js
|
|
1639
|
+
var import_cross_spawn = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
|
|
1622
1640
|
const cp = __require("child_process");
|
|
1623
1641
|
const parse = require_parse();
|
|
1624
1642
|
const enoent = require_enoent();
|
|
1625
|
-
function spawn
|
|
1643
|
+
function spawn(command, args, options) {
|
|
1626
1644
|
const parsed = parse(command, args, options);
|
|
1627
1645
|
const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
|
|
1628
1646
|
enoent.hookChildProcess(spawned, parsed);
|
|
1629
1647
|
return spawned;
|
|
1630
1648
|
}
|
|
1631
|
-
function spawnSync
|
|
1649
|
+
function spawnSync(command, args, options) {
|
|
1632
1650
|
const parsed = parse(command, args, options);
|
|
1633
1651
|
const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
|
|
1634
1652
|
result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
|
|
1635
1653
|
return result;
|
|
1636
1654
|
}
|
|
1637
|
-
module.exports = spawn
|
|
1638
|
-
module.exports.spawn = spawn
|
|
1639
|
-
module.exports.sync = spawnSync
|
|
1655
|
+
module.exports = spawn;
|
|
1656
|
+
module.exports.spawn = spawn;
|
|
1657
|
+
module.exports.sync = spawnSync;
|
|
1640
1658
|
module.exports._parse = parse;
|
|
1641
1659
|
module.exports._enoent = enoent;
|
|
1642
|
-
})
|
|
1643
|
-
|
|
1644
|
-
//#endregion
|
|
1645
|
-
//#region ../../node_modules/.pnpm/path-key@4.0.0/node_modules/path-key/index.js
|
|
1646
|
-
var import_cross_spawn = /* @__PURE__ */ __toESM(require_cross_spawn(), 1);
|
|
1660
|
+
})))(), 1);
|
|
1647
1661
|
function pathKey(options = {}) {
|
|
1648
|
-
const { env = process.env, platform
|
|
1649
|
-
if (platform
|
|
1662
|
+
const { env = process.env, platform = process.platform } = options;
|
|
1663
|
+
if (platform !== "win32") return "PATH";
|
|
1650
1664
|
return Object.keys(env).reverse().find((key) => key.toUpperCase() === "PATH") || "Path";
|
|
1651
1665
|
}
|
|
1652
|
-
|
|
1653
|
-
//#endregion
|
|
1654
|
-
//#region ../../node_modules/.pnpm/unicorn-magic@0.3.0/node_modules/unicorn-magic/node.js
|
|
1655
|
-
const execFileOriginal = promisify(execFile);
|
|
1666
|
+
promisify(execFile);
|
|
1656
1667
|
function toPath(urlOrPath) {
|
|
1657
1668
|
return urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
|
|
1658
1669
|
}
|
|
@@ -1667,16 +1678,14 @@ function traversePathUp(startPath) {
|
|
|
1667
1678
|
}
|
|
1668
1679
|
} };
|
|
1669
1680
|
}
|
|
1670
|
-
const TEN_MEGABYTES_IN_BYTES = 10 * 1024 * 1024;
|
|
1671
|
-
|
|
1672
1681
|
//#endregion
|
|
1673
1682
|
//#region ../../node_modules/.pnpm/npm-run-path@6.0.0/node_modules/npm-run-path/index.js
|
|
1674
|
-
const npmRunPath = ({ cwd = process$1.cwd(), path: pathOption = process$1.env[pathKey()], preferLocal = true, execPath
|
|
1683
|
+
const npmRunPath = ({ cwd = process$1.cwd(), path: pathOption = process$1.env[pathKey()], preferLocal = true, execPath = process$1.execPath, addExecPath = true } = {}) => {
|
|
1675
1684
|
const cwdPath = path.resolve(toPath(cwd));
|
|
1676
1685
|
const result = [];
|
|
1677
1686
|
const pathParts = pathOption.split(path.delimiter);
|
|
1678
1687
|
if (preferLocal) applyPreferLocal(result, pathParts, cwdPath);
|
|
1679
|
-
if (addExecPath) applyExecPath(result, pathParts, execPath
|
|
1688
|
+
if (addExecPath) applyExecPath(result, pathParts, execPath, cwdPath);
|
|
1680
1689
|
return pathOption === "" || pathOption === path.delimiter ? `${result.join(path.delimiter)}${pathOption}` : [...result, pathOption].join(path.delimiter);
|
|
1681
1690
|
};
|
|
1682
1691
|
const applyPreferLocal = (result, pathParts, cwdPath) => {
|
|
@@ -1685,18 +1694,17 @@ const applyPreferLocal = (result, pathParts, cwdPath) => {
|
|
|
1685
1694
|
if (!pathParts.includes(pathPart)) result.push(pathPart);
|
|
1686
1695
|
}
|
|
1687
1696
|
};
|
|
1688
|
-
const applyExecPath = (result, pathParts, execPath
|
|
1689
|
-
const pathPart = path.resolve(cwdPath, toPath(execPath
|
|
1697
|
+
const applyExecPath = (result, pathParts, execPath, cwdPath) => {
|
|
1698
|
+
const pathPart = path.resolve(cwdPath, toPath(execPath), "..");
|
|
1690
1699
|
if (!pathParts.includes(pathPart)) result.push(pathPart);
|
|
1691
1700
|
};
|
|
1692
|
-
const npmRunPathEnv = ({ env = process$1.env
|
|
1701
|
+
const npmRunPathEnv = ({ env = process$1.env, ...options } = {}) => {
|
|
1693
1702
|
env = { ...env };
|
|
1694
1703
|
const pathName = pathKey({ env });
|
|
1695
1704
|
options.path = env[pathName];
|
|
1696
1705
|
env[pathName] = npmRunPath(options);
|
|
1697
1706
|
return env;
|
|
1698
1707
|
};
|
|
1699
|
-
|
|
1700
1708
|
//#endregion
|
|
1701
1709
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/return/final-error.js
|
|
1702
1710
|
const getFinalError = (originalError, message, isSync) => {
|
|
@@ -1717,18 +1725,17 @@ const setErrorName = (ErrorClass, value) => {
|
|
|
1717
1725
|
configurable: false
|
|
1718
1726
|
});
|
|
1719
1727
|
};
|
|
1720
|
-
const isExecaError = (error
|
|
1728
|
+
const isExecaError = (error) => isErrorInstance(error) && execaErrorSymbol in error;
|
|
1721
1729
|
const execaErrorSymbol = Symbol("isExecaError");
|
|
1722
1730
|
const isErrorInstance = (value) => Object.prototype.toString.call(value) === "[object Error]";
|
|
1723
1731
|
var ExecaError = class extends Error {};
|
|
1724
1732
|
setErrorName(ExecaError, ExecaError.name);
|
|
1725
1733
|
var ExecaSyncError = class extends Error {};
|
|
1726
1734
|
setErrorName(ExecaSyncError, ExecaSyncError.name);
|
|
1727
|
-
|
|
1728
1735
|
//#endregion
|
|
1729
|
-
//#region ../../node_modules/.pnpm/human-signals@8.0.
|
|
1736
|
+
//#region ../../node_modules/.pnpm/human-signals@8.0.1/node_modules/human-signals/build/src/realtime.js
|
|
1730
1737
|
const getRealtimeSignals = () => {
|
|
1731
|
-
const length =
|
|
1738
|
+
const length = 64 - SIGRTMIN + 1;
|
|
1732
1739
|
return Array.from({ length }, getRealtimeSignal);
|
|
1733
1740
|
};
|
|
1734
1741
|
const getRealtimeSignal = (value, index) => ({
|
|
@@ -1739,10 +1746,8 @@ const getRealtimeSignal = (value, index) => ({
|
|
|
1739
1746
|
standard: "posix"
|
|
1740
1747
|
});
|
|
1741
1748
|
const SIGRTMIN = 34;
|
|
1742
|
-
const SIGRTMAX = 64;
|
|
1743
|
-
|
|
1744
1749
|
//#endregion
|
|
1745
|
-
//#region ../../node_modules/.pnpm/human-signals@8.0.
|
|
1750
|
+
//#region ../../node_modules/.pnpm/human-signals@8.0.1/node_modules/human-signals/build/src/core.js
|
|
1746
1751
|
const SIGNALS = [
|
|
1747
1752
|
{
|
|
1748
1753
|
name: "SIGHUP",
|
|
@@ -2014,9 +2019,8 @@ const SIGNALS = [
|
|
|
2014
2019
|
standard: "other"
|
|
2015
2020
|
}
|
|
2016
2021
|
];
|
|
2017
|
-
|
|
2018
2022
|
//#endregion
|
|
2019
|
-
//#region ../../node_modules/.pnpm/human-signals@8.0.
|
|
2023
|
+
//#region ../../node_modules/.pnpm/human-signals@8.0.1/node_modules/human-signals/build/src/signals.js
|
|
2020
2024
|
const getSignals = () => {
|
|
2021
2025
|
const realtimeSignals = getRealtimeSignals();
|
|
2022
2026
|
return [...SIGNALS, ...realtimeSignals].map(normalizeSignal$1);
|
|
@@ -2034,12 +2038,11 @@ const normalizeSignal$1 = ({ name, number: defaultNumber, description, action, f
|
|
|
2034
2038
|
standard
|
|
2035
2039
|
};
|
|
2036
2040
|
};
|
|
2037
|
-
|
|
2038
2041
|
//#endregion
|
|
2039
|
-
//#region ../../node_modules/.pnpm/human-signals@8.0.
|
|
2042
|
+
//#region ../../node_modules/.pnpm/human-signals@8.0.1/node_modules/human-signals/build/src/main.js
|
|
2040
2043
|
const getSignalsByName = () => {
|
|
2041
|
-
const signals
|
|
2042
|
-
return Object.fromEntries(signals
|
|
2044
|
+
const signals = getSignals();
|
|
2045
|
+
return Object.fromEntries(signals.map(getSignalByName));
|
|
2043
2046
|
};
|
|
2044
2047
|
const getSignalByName = ({ name, number, description, supported, action, forced, standard }) => [name, {
|
|
2045
2048
|
name,
|
|
@@ -2052,13 +2055,12 @@ const getSignalByName = ({ name, number, description, supported, action, forced,
|
|
|
2052
2055
|
}];
|
|
2053
2056
|
const signalsByName = getSignalsByName();
|
|
2054
2057
|
const getSignalsByNumber = () => {
|
|
2055
|
-
const signals
|
|
2056
|
-
const
|
|
2057
|
-
const signalsA = Array.from({ length }, (value, number) => getSignalByNumber(number, signals$1));
|
|
2058
|
+
const signals = getSignals();
|
|
2059
|
+
const signalsA = Array.from({ length: 65 }, (value, number) => getSignalByNumber(number, signals));
|
|
2058
2060
|
return Object.assign({}, ...signalsA);
|
|
2059
2061
|
};
|
|
2060
|
-
const getSignalByNumber = (number, signals
|
|
2061
|
-
const signal = findSignalByNumber(number, signals
|
|
2062
|
+
const getSignalByNumber = (number, signals) => {
|
|
2063
|
+
const signal = findSignalByNumber(number, signals);
|
|
2062
2064
|
if (signal === void 0) return {};
|
|
2063
2065
|
const { name, description, supported, action, forced, standard } = signal;
|
|
2064
2066
|
return { [number]: {
|
|
@@ -2071,13 +2073,12 @@ const getSignalByNumber = (number, signals$1) => {
|
|
|
2071
2073
|
standard
|
|
2072
2074
|
} };
|
|
2073
2075
|
};
|
|
2074
|
-
const findSignalByNumber = (number, signals
|
|
2075
|
-
const signal = signals
|
|
2076
|
+
const findSignalByNumber = (number, signals) => {
|
|
2077
|
+
const signal = signals.find(({ name }) => constants.signals[name] === number);
|
|
2076
2078
|
if (signal !== void 0) return signal;
|
|
2077
|
-
return signals
|
|
2079
|
+
return signals.find((signalA) => signalA.number === number);
|
|
2078
2080
|
};
|
|
2079
|
-
|
|
2080
|
-
|
|
2081
|
+
getSignalsByNumber();
|
|
2081
2082
|
//#endregion
|
|
2082
2083
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/terminate/signal.js
|
|
2083
2084
|
const normalizeKillSignal = (killSignal) => {
|
|
@@ -2107,7 +2108,6 @@ Available signal numbers: ${getAvailableSignalIntegers()}.`;
|
|
|
2107
2108
|
const getAvailableSignalNames = () => Object.keys(constants.signals).sort().map((signalName) => `'${signalName}'`).join(", ");
|
|
2108
2109
|
const getAvailableSignalIntegers = () => [...new Set(Object.values(constants.signals).sort((signalInteger, signalIntegerTwo) => signalInteger - signalIntegerTwo))].join(", ");
|
|
2109
2110
|
const getSignalDescription = (signal) => signalsByName[signal].description;
|
|
2110
|
-
|
|
2111
2111
|
//#endregion
|
|
2112
2112
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/terminate/kill.js
|
|
2113
2113
|
const normalizeForceKillAfterDelay = (forceKillAfterDelay) => {
|
|
@@ -2118,8 +2118,8 @@ const normalizeForceKillAfterDelay = (forceKillAfterDelay) => {
|
|
|
2118
2118
|
};
|
|
2119
2119
|
const DEFAULT_FORCE_KILL_TIMEOUT = 1e3 * 5;
|
|
2120
2120
|
const subprocessKill = ({ kill, options: { forceKillAfterDelay, killSignal }, onInternalError, context, controller }, signalOrError, errorArgument) => {
|
|
2121
|
-
const { signal, error
|
|
2122
|
-
emitKillError(error
|
|
2121
|
+
const { signal, error } = parseKillArguments(signalOrError, errorArgument, killSignal);
|
|
2122
|
+
emitKillError(error, onInternalError);
|
|
2123
2123
|
const killResult = kill(signal);
|
|
2124
2124
|
setKillTimeout({
|
|
2125
2125
|
kill,
|
|
@@ -2133,16 +2133,16 @@ const subprocessKill = ({ kill, options: { forceKillAfterDelay, killSignal }, on
|
|
|
2133
2133
|
return killResult;
|
|
2134
2134
|
};
|
|
2135
2135
|
const parseKillArguments = (signalOrError, errorArgument, killSignal) => {
|
|
2136
|
-
const [signal = killSignal, error
|
|
2136
|
+
const [signal = killSignal, error] = isErrorInstance(signalOrError) ? [void 0, signalOrError] : [signalOrError, errorArgument];
|
|
2137
2137
|
if (typeof signal !== "string" && !Number.isInteger(signal)) throw new TypeError(`The first argument must be an error instance or a signal name string/integer: ${String(signal)}`);
|
|
2138
|
-
if (error
|
|
2138
|
+
if (error !== void 0 && !isErrorInstance(error)) throw new TypeError(`The second argument is optional. If specified, it must be an error instance: ${error}`);
|
|
2139
2139
|
return {
|
|
2140
2140
|
signal: normalizeSignalArgument(signal),
|
|
2141
|
-
error
|
|
2141
|
+
error
|
|
2142
2142
|
};
|
|
2143
2143
|
};
|
|
2144
|
-
const emitKillError = (error
|
|
2145
|
-
if (error
|
|
2144
|
+
const emitKillError = (error, onInternalError) => {
|
|
2145
|
+
if (error !== void 0) onInternalError.reject(error);
|
|
2146
2146
|
};
|
|
2147
2147
|
const setKillTimeout = async ({ kill, signal, forceKillAfterDelay, killSignal, killResult, context, controller }) => {
|
|
2148
2148
|
if (signal === killSignal && killResult) killOnTimeout({
|
|
@@ -2159,13 +2159,11 @@ const killOnTimeout = async ({ kill, forceKillAfterDelay, context, controllerSig
|
|
|
2159
2159
|
if (kill("SIGKILL")) context.isForcefullyTerminated ??= true;
|
|
2160
2160
|
} catch {}
|
|
2161
2161
|
};
|
|
2162
|
-
|
|
2163
2162
|
//#endregion
|
|
2164
2163
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/utils/abort-signal.js
|
|
2165
2164
|
const onAbortedSignal = async (mainSignal, stopSignal) => {
|
|
2166
2165
|
if (!mainSignal.aborted) await once(mainSignal, "abort", { signal: stopSignal });
|
|
2167
2166
|
};
|
|
2168
|
-
|
|
2169
2167
|
//#endregion
|
|
2170
2168
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/terminate/cancel.js
|
|
2171
2169
|
const validateCancelSignal = ({ cancelSignal }) => {
|
|
@@ -2178,18 +2176,17 @@ const terminateOnCancel = async (subprocess, cancelSignal, context, { signal })
|
|
|
2178
2176
|
subprocess.kill();
|
|
2179
2177
|
throw cancelSignal.reason;
|
|
2180
2178
|
};
|
|
2181
|
-
|
|
2182
2179
|
//#endregion
|
|
2183
2180
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/validation.js
|
|
2184
|
-
const validateIpcMethod = ({ methodName, isSubprocess, ipc, isConnected
|
|
2181
|
+
const validateIpcMethod = ({ methodName, isSubprocess, ipc, isConnected }) => {
|
|
2185
2182
|
validateIpcOption(methodName, isSubprocess, ipc);
|
|
2186
|
-
validateConnection(methodName, isSubprocess, isConnected
|
|
2183
|
+
validateConnection(methodName, isSubprocess, isConnected);
|
|
2187
2184
|
};
|
|
2188
2185
|
const validateIpcOption = (methodName, isSubprocess, ipc) => {
|
|
2189
2186
|
if (!ipc) throw new Error(`${getMethodName(methodName, isSubprocess)} can only be used if the \`ipc\` option is \`true\`.`);
|
|
2190
2187
|
};
|
|
2191
|
-
const validateConnection = (methodName, isSubprocess, isConnected
|
|
2192
|
-
if (!isConnected
|
|
2188
|
+
const validateConnection = (methodName, isSubprocess, isConnected) => {
|
|
2189
|
+
if (!isConnected) throw new Error(`${getMethodName(methodName, isSubprocess)} cannot be used: the ${getOtherProcessName(isSubprocess)} has already exited or disconnected.`);
|
|
2193
2190
|
};
|
|
2194
2191
|
const throwOnEarlyDisconnect = (isSubprocess) => {
|
|
2195
2192
|
throw new Error(`${getMethodName("getOneMessage", isSubprocess)} could not complete: the ${getOtherProcessName(isSubprocess)} exited or disconnected.`);
|
|
@@ -2203,7 +2200,7 @@ const [receivedMessage] = await Promise.all([
|
|
|
2203
2200
|
${getMethodName("sendMessage", isSubprocess, "message, {strict: true}")},
|
|
2204
2201
|
]);`);
|
|
2205
2202
|
};
|
|
2206
|
-
const getStrictResponseError = (error
|
|
2203
|
+
const getStrictResponseError = (error, isSubprocess) => new Error(`${getMethodName("sendMessage", isSubprocess)} failed when sending an acknowledgment response to the ${getOtherProcessName(isSubprocess)}.`, { cause: error });
|
|
2207
2204
|
const throwOnMissingStrict = (isSubprocess) => {
|
|
2208
2205
|
throw new Error(`${getMethodName("sendMessage", isSubprocess)} failed: the ${getOtherProcessName(isSubprocess)} is not listening to incoming messages.`);
|
|
2209
2206
|
};
|
|
@@ -2214,11 +2211,11 @@ const getAbortDisconnectError = () => /* @__PURE__ */ new Error(`\`cancelSignal\
|
|
|
2214
2211
|
const throwOnMissingParent = () => {
|
|
2215
2212
|
throw new Error("`getCancelSignal()` cannot be used without setting the `cancelSignal` subprocess option.");
|
|
2216
2213
|
};
|
|
2217
|
-
const handleEpipeError = ({ error
|
|
2218
|
-
if (error
|
|
2214
|
+
const handleEpipeError = ({ error, methodName, isSubprocess }) => {
|
|
2215
|
+
if (error.code === "EPIPE") throw new Error(`${getMethodName(methodName, isSubprocess)} cannot be used: the ${getOtherProcessName(isSubprocess)} is disconnecting.`, { cause: error });
|
|
2219
2216
|
};
|
|
2220
|
-
const handleSerializationError = ({ error
|
|
2221
|
-
if (isSerializationError(error
|
|
2217
|
+
const handleSerializationError = ({ error, methodName, isSubprocess, message }) => {
|
|
2218
|
+
if (isSerializationError(error)) throw new Error(`${getMethodName(methodName, isSubprocess)}'s argument type is invalid: the message cannot be serialized: ${String(message)}.`, { cause: error });
|
|
2222
2219
|
};
|
|
2223
2220
|
const isSerializationError = ({ code, message }) => SERIALIZATION_ERROR_CODES.has(code) || SERIALIZATION_ERROR_MESSAGES.some((serializationErrorMessage) => message.includes(serializationErrorMessage));
|
|
2224
2221
|
const SERIALIZATION_ERROR_CODES = new Set(["ERR_MISSING_ARGS", "ERR_INVALID_ARG_TYPE"]);
|
|
@@ -2233,7 +2230,6 @@ const getOtherProcessName = (isSubprocess) => isSubprocess ? "parent process" :
|
|
|
2233
2230
|
const disconnect = (anyProcess) => {
|
|
2234
2231
|
if (anyProcess.connected) anyProcess.disconnect();
|
|
2235
2232
|
};
|
|
2236
|
-
|
|
2237
2233
|
//#endregion
|
|
2238
2234
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/utils/deferred.js
|
|
2239
2235
|
const createDeferred = () => {
|
|
@@ -2246,7 +2242,6 @@ const createDeferred = () => {
|
|
|
2246
2242
|
});
|
|
2247
2243
|
return Object.assign(promise, methods);
|
|
2248
2244
|
};
|
|
2249
|
-
|
|
2250
2245
|
//#endregion
|
|
2251
2246
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/fd-options.js
|
|
2252
2247
|
const getToStream = (destination, to = "stdin") => {
|
|
@@ -2323,7 +2318,6 @@ const serializeOptionValue = (value) => {
|
|
|
2323
2318
|
if (typeof value === "string") return `'${value}'`;
|
|
2324
2319
|
return typeof value === "number" ? `${value}` : "Stream";
|
|
2325
2320
|
};
|
|
2326
|
-
|
|
2327
2321
|
//#endregion
|
|
2328
2322
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/utils/max-listeners.js
|
|
2329
2323
|
const incrementMaxListeners = (eventEmitter, maxListenersIncrement, signal) => {
|
|
@@ -2334,7 +2328,6 @@ const incrementMaxListeners = (eventEmitter, maxListenersIncrement, signal) => {
|
|
|
2334
2328
|
eventEmitter.setMaxListeners(eventEmitter.getMaxListeners() - maxListenersIncrement);
|
|
2335
2329
|
});
|
|
2336
2330
|
};
|
|
2337
|
-
|
|
2338
2331
|
//#endregion
|
|
2339
2332
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/reference.js
|
|
2340
2333
|
const addReference = (channel, reference) => {
|
|
@@ -2361,7 +2354,6 @@ const redoAddedReferences = (channel, isSubprocess) => {
|
|
|
2361
2354
|
addReferenceCount(channel);
|
|
2362
2355
|
}
|
|
2363
2356
|
};
|
|
2364
|
-
|
|
2365
2357
|
//#endregion
|
|
2366
2358
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/incoming.js
|
|
2367
2359
|
const onMessage = async ({ anyProcess, channel, isSubprocess, ipcEmitter }, wrappedMessage) => {
|
|
@@ -2395,7 +2387,6 @@ const onDisconnect = async ({ anyProcess, channel, isSubprocess, ipcEmitter, bou
|
|
|
2395
2387
|
ipcEmitter.emit("disconnect");
|
|
2396
2388
|
};
|
|
2397
2389
|
const INCOMING_MESSAGES = /* @__PURE__ */ new WeakMap();
|
|
2398
|
-
|
|
2399
2390
|
//#endregion
|
|
2400
2391
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/forward.js
|
|
2401
2392
|
const getIpcEmitter = (anyProcess, channel, isSubprocess) => {
|
|
@@ -2433,7 +2424,6 @@ const isConnected = (anyProcess) => {
|
|
|
2433
2424
|
const ipcEmitter = IPC_EMITTERS.get(anyProcess);
|
|
2434
2425
|
return ipcEmitter === void 0 ? anyProcess.channel !== null : ipcEmitter.connected;
|
|
2435
2426
|
};
|
|
2436
|
-
|
|
2437
2427
|
//#endregion
|
|
2438
2428
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/strict.js
|
|
2439
2429
|
const handleSendStrict = ({ anyProcess, channel, isSubprocess, message, strict }) => {
|
|
@@ -2469,8 +2459,8 @@ const handleStrictRequest = async ({ wrappedMessage, anyProcess, channel, isSubp
|
|
|
2469
2459
|
isSubprocess,
|
|
2470
2460
|
ipc: true
|
|
2471
2461
|
}, response);
|
|
2472
|
-
} catch (error
|
|
2473
|
-
ipcEmitter.emit("strict:error", error
|
|
2462
|
+
} catch (error) {
|
|
2463
|
+
ipcEmitter.emit("strict:error", error);
|
|
2474
2464
|
}
|
|
2475
2465
|
return message;
|
|
2476
2466
|
};
|
|
@@ -2505,7 +2495,6 @@ const throwOnDisconnect$1 = async (anyProcess, isSubprocess, { signal }) => {
|
|
|
2505
2495
|
};
|
|
2506
2496
|
const REQUEST_TYPE = "execa:ipc:request";
|
|
2507
2497
|
const RESPONSE_TYPE = "execa:ipc:response";
|
|
2508
|
-
|
|
2509
2498
|
//#endregion
|
|
2510
2499
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/outgoing.js
|
|
2511
2500
|
const startSendMessage = (anyProcess, wrappedMessage, strict) => {
|
|
@@ -2535,7 +2524,6 @@ const waitForOutgoingMessages = async (anyProcess, ipcEmitter, wrappedMessage) =
|
|
|
2535
2524
|
const OUTGOING_MESSAGES = /* @__PURE__ */ new WeakMap();
|
|
2536
2525
|
const hasMessageListeners = (anyProcess, ipcEmitter) => ipcEmitter.listenerCount("message") > getMinListenerCount(anyProcess);
|
|
2537
2526
|
const getMinListenerCount = (anyProcess) => SUBPROCESS_OPTIONS.has(anyProcess) && !getFdSpecificValue(SUBPROCESS_OPTIONS.get(anyProcess).options.buffer, "ipc") ? 1 : 0;
|
|
2538
|
-
|
|
2539
2527
|
//#endregion
|
|
2540
2528
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/send.js
|
|
2541
2529
|
const sendMessage$1 = ({ anyProcess, channel, isSubprocess, ipc }, message, { strict = false } = {}) => {
|
|
@@ -2572,9 +2560,9 @@ const sendMessageAsync = async ({ anyProcess, channel, methodName, isSubprocess,
|
|
|
2572
2560
|
wrappedMessage,
|
|
2573
2561
|
message
|
|
2574
2562
|
});
|
|
2575
|
-
} catch (error
|
|
2563
|
+
} catch (error) {
|
|
2576
2564
|
disconnect(anyProcess);
|
|
2577
|
-
throw error
|
|
2565
|
+
throw error;
|
|
2578
2566
|
} finally {
|
|
2579
2567
|
endSendMessage(outgoingMessagesState);
|
|
2580
2568
|
}
|
|
@@ -2583,19 +2571,19 @@ const sendOneMessage = async ({ anyProcess, methodName, isSubprocess, wrappedMes
|
|
|
2583
2571
|
const sendMethod = getSendMethod(anyProcess);
|
|
2584
2572
|
try {
|
|
2585
2573
|
await Promise.all([waitForStrictResponse(wrappedMessage, anyProcess, isSubprocess), sendMethod(wrappedMessage)]);
|
|
2586
|
-
} catch (error
|
|
2574
|
+
} catch (error) {
|
|
2587
2575
|
handleEpipeError({
|
|
2588
|
-
error
|
|
2576
|
+
error,
|
|
2589
2577
|
methodName,
|
|
2590
2578
|
isSubprocess
|
|
2591
2579
|
});
|
|
2592
2580
|
handleSerializationError({
|
|
2593
|
-
error
|
|
2581
|
+
error,
|
|
2594
2582
|
methodName,
|
|
2595
2583
|
isSubprocess,
|
|
2596
2584
|
message
|
|
2597
2585
|
});
|
|
2598
|
-
throw error
|
|
2586
|
+
throw error;
|
|
2599
2587
|
}
|
|
2600
2588
|
};
|
|
2601
2589
|
const getSendMethod = (anyProcess) => {
|
|
@@ -2605,7 +2593,6 @@ const getSendMethod = (anyProcess) => {
|
|
|
2605
2593
|
return sendMethod;
|
|
2606
2594
|
};
|
|
2607
2595
|
const PROCESS_SEND_METHODS = /* @__PURE__ */ new WeakMap();
|
|
2608
|
-
|
|
2609
2596
|
//#endregion
|
|
2610
2597
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/graceful.js
|
|
2611
2598
|
const sendAbort = (subprocess, message) => {
|
|
@@ -2656,7 +2643,6 @@ const abortOnDisconnect = () => {
|
|
|
2656
2643
|
cancelController.abort(getAbortDisconnectError());
|
|
2657
2644
|
};
|
|
2658
2645
|
const cancelController = new AbortController();
|
|
2659
|
-
|
|
2660
2646
|
//#endregion
|
|
2661
2647
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/terminate/graceful.js
|
|
2662
2648
|
const validateGracefulCancel = ({ gracefulCancel, cancelSignal, ipc, serialization }) => {
|
|
@@ -2686,16 +2672,15 @@ const sendOnAbort = async ({ subprocess, cancelSignal, forceKillAfterDelay, cont
|
|
|
2686
2672
|
};
|
|
2687
2673
|
const getReason = ({ reason }) => {
|
|
2688
2674
|
if (!(reason instanceof DOMException)) return reason;
|
|
2689
|
-
const error
|
|
2690
|
-
Object.defineProperty(error
|
|
2675
|
+
const error = new Error(reason.message);
|
|
2676
|
+
Object.defineProperty(error, "stack", {
|
|
2691
2677
|
value: reason.stack,
|
|
2692
2678
|
enumerable: false,
|
|
2693
2679
|
configurable: true,
|
|
2694
2680
|
writable: true
|
|
2695
2681
|
});
|
|
2696
|
-
return error
|
|
2682
|
+
return error;
|
|
2697
2683
|
};
|
|
2698
|
-
|
|
2699
2684
|
//#endregion
|
|
2700
2685
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/terminate/timeout.js
|
|
2701
2686
|
const validateTimeout = ({ timeout }) => {
|
|
@@ -2708,7 +2693,6 @@ const killAfterTimeout = async (subprocess, timeout, context, { signal }) => {
|
|
|
2708
2693
|
subprocess.kill();
|
|
2709
2694
|
throw new DiscardedError();
|
|
2710
2695
|
};
|
|
2711
|
-
|
|
2712
2696
|
//#endregion
|
|
2713
2697
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/node.js
|
|
2714
2698
|
const mapNode = ({ options }) => {
|
|
@@ -2718,7 +2702,7 @@ const mapNode = ({ options }) => {
|
|
|
2718
2702
|
node: true
|
|
2719
2703
|
} };
|
|
2720
2704
|
};
|
|
2721
|
-
const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = false, nodePath = execPath, nodeOptions = execArgv.filter((nodeOption) => !nodeOption.startsWith("--inspect")), cwd, execPath: formerNodePath
|
|
2705
|
+
const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = false, nodePath = execPath, nodeOptions = execArgv.filter((nodeOption) => !nodeOption.startsWith("--inspect")), cwd, execPath: formerNodePath, ...options }) => {
|
|
2722
2706
|
if (formerNodePath !== void 0) throw new TypeError("The \"execPath\" option has been removed. Please use the \"nodePath\" option instead.");
|
|
2723
2707
|
const normalizedNodePath = safeNormalizeFileUrl(nodePath, "The \"nodePath\" option");
|
|
2724
2708
|
const resolvedNodePath = path.resolve(cwd, normalizedNodePath);
|
|
@@ -2748,7 +2732,6 @@ const handleNodeOption = (file, commandArguments, { node: shouldHandleNode = fal
|
|
|
2748
2732
|
}
|
|
2749
2733
|
];
|
|
2750
2734
|
};
|
|
2751
|
-
|
|
2752
2735
|
//#endregion
|
|
2753
2736
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/ipc-input.js
|
|
2754
2737
|
const validateIpcInputOption = ({ ipcInput, ipc, serialization }) => {
|
|
@@ -2759,15 +2742,15 @@ const validateIpcInputOption = ({ ipcInput, ipc, serialization }) => {
|
|
|
2759
2742
|
const validateAdvancedInput = (ipcInput) => {
|
|
2760
2743
|
try {
|
|
2761
2744
|
serialize(ipcInput);
|
|
2762
|
-
} catch (error
|
|
2763
|
-
throw new Error("The `ipcInput` option is not serializable with a structured clone.", { cause: error
|
|
2745
|
+
} catch (error) {
|
|
2746
|
+
throw new Error("The `ipcInput` option is not serializable with a structured clone.", { cause: error });
|
|
2764
2747
|
}
|
|
2765
2748
|
};
|
|
2766
2749
|
const validateJsonInput = (ipcInput) => {
|
|
2767
2750
|
try {
|
|
2768
2751
|
JSON.stringify(ipcInput);
|
|
2769
|
-
} catch (error
|
|
2770
|
-
throw new Error("The `ipcInput` option is not serializable with JSON.", { cause: error
|
|
2752
|
+
} catch (error) {
|
|
2753
|
+
throw new Error("The `ipcInput` option is not serializable with JSON.", { cause: error });
|
|
2771
2754
|
}
|
|
2772
2755
|
};
|
|
2773
2756
|
const validateIpcInput = {
|
|
@@ -2778,7 +2761,6 @@ const sendIpcInput = async (subprocess, ipcInput) => {
|
|
|
2778
2761
|
if (ipcInput === void 0) return;
|
|
2779
2762
|
await subprocess.sendMessage(ipcInput);
|
|
2780
2763
|
};
|
|
2781
|
-
|
|
2782
2764
|
//#endregion
|
|
2783
2765
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/encoding-option.js
|
|
2784
2766
|
const validateEncoding = ({ encoding }) => {
|
|
@@ -2786,7 +2768,7 @@ const validateEncoding = ({ encoding }) => {
|
|
|
2786
2768
|
const correctEncoding = getCorrectEncoding(encoding);
|
|
2787
2769
|
if (correctEncoding !== void 0) throw new TypeError(`Invalid option \`encoding: ${serializeEncoding(encoding)}\`.
|
|
2788
2770
|
Please rename it to ${serializeEncoding(correctEncoding)}.`);
|
|
2789
|
-
const correctEncodings = [...ENCODINGS].map((correctEncoding
|
|
2771
|
+
const correctEncodings = [...ENCODINGS].map((correctEncoding) => serializeEncoding(correctEncoding)).join(", ");
|
|
2790
2772
|
throw new TypeError(`Invalid option \`encoding: ${serializeEncoding(encoding)}\`.
|
|
2791
2773
|
Please rename it to one of: ${correctEncodings}.`);
|
|
2792
2774
|
};
|
|
@@ -2815,7 +2797,6 @@ const ENCODING_ALIASES = {
|
|
|
2815
2797
|
binary: "latin1"
|
|
2816
2798
|
};
|
|
2817
2799
|
const serializeEncoding = (encoding) => typeof encoding === "string" ? `"${encoding}"` : String(encoding);
|
|
2818
|
-
|
|
2819
2800
|
//#endregion
|
|
2820
2801
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/cwd.js
|
|
2821
2802
|
const normalizeCwd = (cwd = getDefaultCwd()) => {
|
|
@@ -2825,9 +2806,9 @@ const normalizeCwd = (cwd = getDefaultCwd()) => {
|
|
|
2825
2806
|
const getDefaultCwd = () => {
|
|
2826
2807
|
try {
|
|
2827
2808
|
return process$1.cwd();
|
|
2828
|
-
} catch (error
|
|
2829
|
-
error
|
|
2830
|
-
throw error
|
|
2809
|
+
} catch (error) {
|
|
2810
|
+
error.message = `The current directory does not exist.\n${error.message}`;
|
|
2811
|
+
throw error;
|
|
2831
2812
|
}
|
|
2832
2813
|
};
|
|
2833
2814
|
const fixCwdError = (originalMessage, cwd) => {
|
|
@@ -2835,13 +2816,12 @@ const fixCwdError = (originalMessage, cwd) => {
|
|
|
2835
2816
|
let cwdStat;
|
|
2836
2817
|
try {
|
|
2837
2818
|
cwdStat = statSync(cwd);
|
|
2838
|
-
} catch (error
|
|
2839
|
-
return `The "cwd" option is invalid: ${cwd}.\n${error
|
|
2819
|
+
} catch (error) {
|
|
2820
|
+
return `The "cwd" option is invalid: ${cwd}.\n${error.message}\n${originalMessage}`;
|
|
2840
2821
|
}
|
|
2841
2822
|
if (!cwdStat.isDirectory()) return `The "cwd" option is not a directory: ${cwd}.\n${originalMessage}`;
|
|
2842
2823
|
return originalMessage;
|
|
2843
2824
|
};
|
|
2844
|
-
|
|
2845
2825
|
//#endregion
|
|
2846
2826
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/arguments/options.js
|
|
2847
2827
|
const normalizeOptions = (filePath, rawArguments, rawOptions) => {
|
|
@@ -2866,7 +2846,7 @@ const normalizeOptions = (filePath, rawArguments, rawOptions) => {
|
|
|
2866
2846
|
options
|
|
2867
2847
|
};
|
|
2868
2848
|
};
|
|
2869
|
-
const addDefaultOptions = ({ extendEnv = true, preferLocal = false, cwd, localDir: localDirectory = cwd, encoding = "utf8", reject = true, cleanup = true, all = false, windowsHide = true, killSignal = "SIGTERM", forceKillAfterDelay = true, gracefulCancel = false, ipcInput, ipc = ipcInput !== void 0 || gracefulCancel, serialization = "advanced"
|
|
2849
|
+
const addDefaultOptions = ({ extendEnv = true, preferLocal = false, cwd, localDir: localDirectory = cwd, encoding = "utf8", reject = true, cleanup = true, all = false, windowsHide = true, killSignal = "SIGTERM", forceKillAfterDelay = true, gracefulCancel = false, ipcInput, ipc = ipcInput !== void 0 || gracefulCancel, serialization = "advanced", ...options }) => ({
|
|
2870
2850
|
...options,
|
|
2871
2851
|
extendEnv,
|
|
2872
2852
|
preferLocal,
|
|
@@ -2898,7 +2878,6 @@ const getEnv = ({ env: envOption, extendEnv, preferLocal, node, localDirectory,
|
|
|
2898
2878
|
});
|
|
2899
2879
|
return env;
|
|
2900
2880
|
};
|
|
2901
|
-
|
|
2902
2881
|
//#endregion
|
|
2903
2882
|
//#region ../../node_modules/.pnpm/strip-final-newline@4.0.0/node_modules/strip-final-newline/index.js
|
|
2904
2883
|
function stripFinalNewline(input) {
|
|
@@ -2912,22 +2891,20 @@ const LF = "\n";
|
|
|
2912
2891
|
const LF_BINARY = LF.codePointAt(0);
|
|
2913
2892
|
const CR = "\r";
|
|
2914
2893
|
const CR_BINARY = CR.codePointAt(0);
|
|
2915
|
-
|
|
2916
2894
|
//#endregion
|
|
2917
2895
|
//#region ../../node_modules/.pnpm/is-stream@4.0.1/node_modules/is-stream/index.js
|
|
2918
2896
|
function isStream(stream, { checkOpen = true } = {}) {
|
|
2919
2897
|
return stream !== null && typeof stream === "object" && (stream.writable || stream.readable || !checkOpen || stream.writable === void 0 && stream.readable === void 0) && typeof stream.pipe === "function";
|
|
2920
2898
|
}
|
|
2921
|
-
function isWritableStream(stream, { checkOpen = true } = {}) {
|
|
2899
|
+
function isWritableStream$1(stream, { checkOpen = true } = {}) {
|
|
2922
2900
|
return isStream(stream, { checkOpen }) && (stream.writable || !checkOpen) && typeof stream.write === "function" && typeof stream.end === "function" && typeof stream.writable === "boolean" && typeof stream.writableObjectMode === "boolean" && typeof stream.destroy === "function" && typeof stream.destroyed === "boolean";
|
|
2923
2901
|
}
|
|
2924
|
-
function isReadableStream(stream, { checkOpen = true } = {}) {
|
|
2902
|
+
function isReadableStream$1(stream, { checkOpen = true } = {}) {
|
|
2925
2903
|
return isStream(stream, { checkOpen }) && (stream.readable || !checkOpen) && typeof stream.read === "function" && typeof stream.readable === "boolean" && typeof stream.readableObjectMode === "boolean" && typeof stream.destroy === "function" && typeof stream.destroyed === "boolean";
|
|
2926
2904
|
}
|
|
2927
2905
|
function isDuplexStream(stream, options) {
|
|
2928
|
-
return isWritableStream(stream, options) && isReadableStream(stream, options);
|
|
2906
|
+
return isWritableStream$1(stream, options) && isReadableStream$1(stream, options);
|
|
2929
2907
|
}
|
|
2930
|
-
|
|
2931
2908
|
//#endregion
|
|
2932
2909
|
//#region ../../node_modules/.pnpm/@sec-ant+readable-stream@0.4.1/node_modules/@sec-ant/readable-stream/dist/ponyfill/asyncIterator.js
|
|
2933
2910
|
const a = Object.getPrototypeOf(Object.getPrototypeOf(
|
|
@@ -3008,11 +2985,10 @@ function h({ preventCancel: r = !1 } = {}) {
|
|
|
3008
2985
|
const t = new c(this.getReader(), r), s = Object.create(u);
|
|
3009
2986
|
return s[n] = t, s;
|
|
3010
2987
|
}
|
|
3011
|
-
|
|
3012
2988
|
//#endregion
|
|
3013
2989
|
//#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/stream.js
|
|
3014
2990
|
const getAsyncIterable = (stream) => {
|
|
3015
|
-
if (isReadableStream(stream, { checkOpen: false }) && nodeImports.on !== void 0) return getStreamIterable(stream);
|
|
2991
|
+
if (isReadableStream$1(stream, { checkOpen: false }) && nodeImports.on !== void 0) return getStreamIterable(stream);
|
|
3016
2992
|
if (typeof stream?.[Symbol.asyncIterator] === "function") return stream;
|
|
3017
2993
|
if (toString.call(stream) === "[object ReadableStream]") return h.call(stream);
|
|
3018
2994
|
throw new TypeError("The first argument must be a Readable, a ReadableStream, or an async iterable.");
|
|
@@ -3024,9 +3000,9 @@ const getStreamIterable = async function* (stream) {
|
|
|
3024
3000
|
handleStreamEnd(stream, controller, state);
|
|
3025
3001
|
try {
|
|
3026
3002
|
for await (const [chunk] of nodeImports.on(stream, "data", { signal: controller.signal })) yield chunk;
|
|
3027
|
-
} catch (error
|
|
3003
|
+
} catch (error) {
|
|
3028
3004
|
if (state.error !== void 0) throw state.error;
|
|
3029
|
-
else if (!controller.signal.aborted) throw error
|
|
3005
|
+
else if (!controller.signal.aborted) throw error;
|
|
3030
3006
|
} finally {
|
|
3031
3007
|
stream.destroy();
|
|
3032
3008
|
}
|
|
@@ -3039,14 +3015,13 @@ const handleStreamEnd = async (stream, controller, state) => {
|
|
|
3039
3015
|
writable: false,
|
|
3040
3016
|
error: false
|
|
3041
3017
|
});
|
|
3042
|
-
} catch (error
|
|
3043
|
-
state.error = error
|
|
3018
|
+
} catch (error) {
|
|
3019
|
+
state.error = error;
|
|
3044
3020
|
} finally {
|
|
3045
3021
|
controller.abort();
|
|
3046
3022
|
}
|
|
3047
3023
|
};
|
|
3048
3024
|
const nodeImports = {};
|
|
3049
|
-
|
|
3050
3025
|
//#endregion
|
|
3051
3026
|
//#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/contents.js
|
|
3052
3027
|
const getStreamContents$1 = async (stream, { init, convertChunk, getSize, truncateChunk, addChunk, getFinalChunk, finalize }, { maxBuffer = Number.POSITIVE_INFINITY } = {}) => {
|
|
@@ -3072,8 +3047,8 @@ const getStreamContents$1 = async (stream, { init, convertChunk, getSize, trunca
|
|
|
3072
3047
|
maxBuffer
|
|
3073
3048
|
});
|
|
3074
3049
|
return finalize(state);
|
|
3075
|
-
} catch (error
|
|
3076
|
-
const normalizedError = typeof error
|
|
3050
|
+
} catch (error) {
|
|
3051
|
+
const normalizedError = typeof error === "object" && error !== null ? error : new Error(error);
|
|
3077
3052
|
normalizedError.bufferedData = finalize(state);
|
|
3078
3053
|
throw normalizedError;
|
|
3079
3054
|
}
|
|
@@ -3122,7 +3097,6 @@ var MaxBufferError = class extends Error {
|
|
|
3122
3097
|
super("maxBuffer exceeded");
|
|
3123
3098
|
}
|
|
3124
3099
|
};
|
|
3125
|
-
|
|
3126
3100
|
//#endregion
|
|
3127
3101
|
//#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/utils.js
|
|
3128
3102
|
const identity = (value) => value;
|
|
@@ -3132,7 +3106,6 @@ const throwObjectStream = (chunk) => {
|
|
|
3132
3106
|
throw new Error(`Streams in object mode are not supported: ${String(chunk)}`);
|
|
3133
3107
|
};
|
|
3134
3108
|
const getLengthProperty = (convertedChunk) => convertedChunk.length;
|
|
3135
|
-
|
|
3136
3109
|
//#endregion
|
|
3137
3110
|
//#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/array.js
|
|
3138
3111
|
async function getStreamAsArray(stream, options) {
|
|
@@ -3160,7 +3133,6 @@ const arrayMethods = {
|
|
|
3160
3133
|
getFinalChunk: noop$1,
|
|
3161
3134
|
finalize: getContentsProperty
|
|
3162
3135
|
};
|
|
3163
|
-
|
|
3164
3136
|
//#endregion
|
|
3165
3137
|
//#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/array-buffer.js
|
|
3166
3138
|
async function getStreamAsArrayBuffer(stream, options) {
|
|
@@ -3212,7 +3184,6 @@ const arrayBufferMethods = {
|
|
|
3212
3184
|
getFinalChunk: noop$1,
|
|
3213
3185
|
finalize: finalizeArrayBuffer
|
|
3214
3186
|
};
|
|
3215
|
-
|
|
3216
3187
|
//#endregion
|
|
3217
3188
|
//#region ../../node_modules/.pnpm/get-stream@9.0.1/node_modules/get-stream/source/string.js
|
|
3218
3189
|
async function getStreamAsString(stream, options) {
|
|
@@ -3222,11 +3193,11 @@ const initString = () => ({
|
|
|
3222
3193
|
contents: "",
|
|
3223
3194
|
textDecoder: new TextDecoder()
|
|
3224
3195
|
});
|
|
3225
|
-
const useTextDecoder = (chunk, { textDecoder
|
|
3196
|
+
const useTextDecoder = (chunk, { textDecoder }) => textDecoder.decode(chunk, { stream: true });
|
|
3226
3197
|
const addStringChunk = (convertedChunk, { contents }) => contents + convertedChunk;
|
|
3227
3198
|
const truncateStringChunk = (convertedChunk, chunkSize) => convertedChunk.slice(0, chunkSize);
|
|
3228
|
-
const getFinalStringChunk = ({ textDecoder
|
|
3229
|
-
const finalChunk = textDecoder
|
|
3199
|
+
const getFinalStringChunk = ({ textDecoder }) => {
|
|
3200
|
+
const finalChunk = textDecoder.decode();
|
|
3230
3201
|
return finalChunk === "" ? void 0 : finalChunk;
|
|
3231
3202
|
};
|
|
3232
3203
|
const stringMethods = {
|
|
@@ -3245,18 +3216,17 @@ const stringMethods = {
|
|
|
3245
3216
|
getFinalChunk: getFinalStringChunk,
|
|
3246
3217
|
finalize: getContentsProperty
|
|
3247
3218
|
};
|
|
3248
|
-
|
|
3249
3219
|
//#endregion
|
|
3250
3220
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/max-buffer.js
|
|
3251
|
-
const handleMaxBuffer = ({ error
|
|
3252
|
-
if (!(error
|
|
3253
|
-
if (fdNumber === "all") return error
|
|
3254
|
-
error
|
|
3221
|
+
const handleMaxBuffer = ({ error, stream, readableObjectMode, lines, encoding, fdNumber }) => {
|
|
3222
|
+
if (!(error instanceof MaxBufferError)) throw error;
|
|
3223
|
+
if (fdNumber === "all") return error;
|
|
3224
|
+
error.maxBufferInfo = {
|
|
3255
3225
|
fdNumber,
|
|
3256
3226
|
unit: getMaxBufferUnit(readableObjectMode, lines, encoding)
|
|
3257
3227
|
};
|
|
3258
3228
|
stream.destroy();
|
|
3259
|
-
throw error
|
|
3229
|
+
throw error;
|
|
3260
3230
|
};
|
|
3261
3231
|
const getMaxBufferUnit = (readableObjectMode, lines, encoding) => {
|
|
3262
3232
|
if (readableObjectMode) return "objects";
|
|
@@ -3266,22 +3236,22 @@ const getMaxBufferUnit = (readableObjectMode, lines, encoding) => {
|
|
|
3266
3236
|
};
|
|
3267
3237
|
const checkIpcMaxBuffer = (subprocess, ipcOutput, maxBuffer) => {
|
|
3268
3238
|
if (ipcOutput.length !== maxBuffer) return;
|
|
3269
|
-
const error
|
|
3270
|
-
error
|
|
3271
|
-
throw error
|
|
3239
|
+
const error = new MaxBufferError();
|
|
3240
|
+
error.maxBufferInfo = { fdNumber: "ipc" };
|
|
3241
|
+
throw error;
|
|
3272
3242
|
};
|
|
3273
|
-
const getMaxBufferMessage = (error
|
|
3274
|
-
const { streamName, threshold, unit } = getMaxBufferInfo(error
|
|
3243
|
+
const getMaxBufferMessage = (error, maxBuffer) => {
|
|
3244
|
+
const { streamName, threshold, unit } = getMaxBufferInfo(error, maxBuffer);
|
|
3275
3245
|
return `Command's ${streamName} was larger than ${threshold} ${unit}`;
|
|
3276
3246
|
};
|
|
3277
|
-
const getMaxBufferInfo = (error
|
|
3278
|
-
if (error
|
|
3247
|
+
const getMaxBufferInfo = (error, maxBuffer) => {
|
|
3248
|
+
if (error?.maxBufferInfo === void 0) return {
|
|
3279
3249
|
streamName: "output",
|
|
3280
3250
|
threshold: maxBuffer[1],
|
|
3281
3251
|
unit: "bytes"
|
|
3282
3252
|
};
|
|
3283
|
-
const { maxBufferInfo: { fdNumber, unit } } = error
|
|
3284
|
-
delete error
|
|
3253
|
+
const { maxBufferInfo: { fdNumber, unit } } = error;
|
|
3254
|
+
delete error.maxBufferInfo;
|
|
3285
3255
|
const threshold = getFdSpecificValue(maxBuffer, fdNumber);
|
|
3286
3256
|
if (fdNumber === "ipc") return {
|
|
3287
3257
|
streamName: "IPC output",
|
|
@@ -3301,7 +3271,6 @@ const truncateMaxBufferSync = (result, isMaxBuffer, maxBuffer) => {
|
|
|
3301
3271
|
return result.length > maxBufferValue ? result.slice(0, maxBufferValue) : result;
|
|
3302
3272
|
};
|
|
3303
3273
|
const getMaxBufferSync = ([, stdoutMaxBuffer]) => stdoutMaxBuffer;
|
|
3304
|
-
|
|
3305
3274
|
//#endregion
|
|
3306
3275
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/return/message.js
|
|
3307
3276
|
const createMessages = ({ stdio, all, ipcOutput, originalError, signal, signalDescription, exitCode, escapedCommand, timedOut, isCanceled, isGracefullyCanceled, isMaxBuffer, isForcefullyTerminated, forceKillAfterDelay, killSignal, maxBuffer, timeout, cwd }) => {
|
|
@@ -3363,7 +3332,6 @@ const serializeMessageItem = (messageItem) => {
|
|
|
3363
3332
|
if (isUint8Array(messageItem)) return uint8ArrayToString(messageItem);
|
|
3364
3333
|
return "";
|
|
3365
3334
|
};
|
|
3366
|
-
|
|
3367
3335
|
//#endregion
|
|
3368
3336
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/return/result.js
|
|
3369
3337
|
const makeSuccessResult = ({ command, escapedCommand, stdio, all, ipcOutput, options: { cwd }, startTime }) => omitUndefinedProperties({
|
|
@@ -3386,8 +3354,8 @@ const makeSuccessResult = ({ command, escapedCommand, stdio, all, ipcOutput, opt
|
|
|
3386
3354
|
ipcOutput,
|
|
3387
3355
|
pipedFrom: []
|
|
3388
3356
|
});
|
|
3389
|
-
const makeEarlyError = ({ error
|
|
3390
|
-
error
|
|
3357
|
+
const makeEarlyError = ({ error, command, escapedCommand, fileDescriptors, options, startTime, isSync }) => makeError({
|
|
3358
|
+
error,
|
|
3391
3359
|
command,
|
|
3392
3360
|
escapedCommand,
|
|
3393
3361
|
startTime,
|
|
@@ -3423,9 +3391,9 @@ const makeError = ({ error: originalError, command, escapedCommand, startTime, t
|
|
|
3423
3391
|
timeout,
|
|
3424
3392
|
cwd
|
|
3425
3393
|
});
|
|
3426
|
-
const error
|
|
3427
|
-
Object.assign(error
|
|
3428
|
-
error
|
|
3394
|
+
const error = getFinalError(originalError, message, isSync);
|
|
3395
|
+
Object.assign(error, getErrorProperties({
|
|
3396
|
+
error,
|
|
3429
3397
|
command,
|
|
3430
3398
|
escapedCommand,
|
|
3431
3399
|
startTime,
|
|
@@ -3444,9 +3412,9 @@ const makeError = ({ error: originalError, command, escapedCommand, startTime, t
|
|
|
3444
3412
|
originalMessage,
|
|
3445
3413
|
shortMessage
|
|
3446
3414
|
}));
|
|
3447
|
-
return error
|
|
3415
|
+
return error;
|
|
3448
3416
|
};
|
|
3449
|
-
const getErrorProperties = ({ error
|
|
3417
|
+
const getErrorProperties = ({ error, command, escapedCommand, startTime, timedOut, isCanceled, isGracefullyCanceled, isMaxBuffer, isForcefullyTerminated, exitCode, signal, signalDescription, stdio, all, ipcOutput, cwd, originalMessage, shortMessage }) => omitUndefinedProperties({
|
|
3450
3418
|
shortMessage,
|
|
3451
3419
|
originalMessage,
|
|
3452
3420
|
command,
|
|
@@ -3463,7 +3431,7 @@ const getErrorProperties = ({ error: error$1, command, escapedCommand, startTime
|
|
|
3463
3431
|
exitCode,
|
|
3464
3432
|
signal,
|
|
3465
3433
|
signalDescription,
|
|
3466
|
-
code: error
|
|
3434
|
+
code: error.cause?.code,
|
|
3467
3435
|
stdout: stdio[1],
|
|
3468
3436
|
stderr: stdio[2],
|
|
3469
3437
|
all,
|
|
@@ -3481,7 +3449,6 @@ const normalizeExitPayload = (rawExitCode, rawSignal) => {
|
|
|
3481
3449
|
signalDescription: signal === void 0 ? void 0 : getSignalDescription(rawSignal)
|
|
3482
3450
|
};
|
|
3483
3451
|
};
|
|
3484
|
-
|
|
3485
3452
|
//#endregion
|
|
3486
3453
|
//#region ../../node_modules/.pnpm/parse-ms@4.0.0/node_modules/parse-ms/index.js
|
|
3487
3454
|
const toZeroIfInfinity = (value) => Number.isFinite(value) ? value : 0;
|
|
@@ -3516,11 +3483,10 @@ function parseMilliseconds(milliseconds) {
|
|
|
3516
3483
|
}
|
|
3517
3484
|
throw new TypeError("Expected a finite number or bigint");
|
|
3518
3485
|
}
|
|
3519
|
-
|
|
3520
3486
|
//#endregion
|
|
3521
3487
|
//#region ../../node_modules/.pnpm/pretty-ms@9.2.0/node_modules/pretty-ms/index.js
|
|
3522
3488
|
const isZero = (value) => value === 0 || value === 0n;
|
|
3523
|
-
const pluralize = (word, count
|
|
3489
|
+
const pluralize = (word, count) => count === 1 || count === 1n ? word : `${word}s`;
|
|
3524
3490
|
const SECOND_ROUNDING_EPSILON = 1e-7;
|
|
3525
3491
|
const ONE_DAY_IN_MILLISECONDS = 24n * 60n * 60n * 1000n;
|
|
3526
3492
|
function prettyMilliseconds(milliseconds, options) {
|
|
@@ -3569,16 +3535,16 @@ function prettyMilliseconds(milliseconds, options) {
|
|
|
3569
3535
|
add(Number(parsed.minutes), "minute", "m");
|
|
3570
3536
|
if (!options.hideSeconds) if (options.separateMilliseconds || options.formatSubMilliseconds || !options.colonNotation && milliseconds < 1e3) {
|
|
3571
3537
|
const seconds = Number(parsed.seconds);
|
|
3572
|
-
const milliseconds
|
|
3538
|
+
const milliseconds = Number(parsed.milliseconds);
|
|
3573
3539
|
const microseconds = Number(parsed.microseconds);
|
|
3574
3540
|
const nanoseconds = Number(parsed.nanoseconds);
|
|
3575
3541
|
add(seconds, "second", "s");
|
|
3576
3542
|
if (options.formatSubMilliseconds) {
|
|
3577
|
-
add(milliseconds
|
|
3543
|
+
add(milliseconds, "millisecond", "ms");
|
|
3578
3544
|
add(microseconds, "microsecond", "µs");
|
|
3579
3545
|
add(nanoseconds, "nanosecond", "ns");
|
|
3580
3546
|
} else {
|
|
3581
|
-
const millisecondsAndBelow = milliseconds
|
|
3547
|
+
const millisecondsAndBelow = milliseconds + microseconds / 1e3 + nanoseconds / 1e6;
|
|
3582
3548
|
const millisecondsDecimalDigits = typeof options.millisecondsDecimalDigits === "number" ? options.millisecondsDecimalDigits : 0;
|
|
3583
3549
|
const millisecondsString = millisecondsDecimalDigits ? millisecondsAndBelow.toFixed(millisecondsDecimalDigits) : millisecondsAndBelow >= 1 ? Math.round(millisecondsAndBelow) : Math.ceil(millisecondsAndBelow);
|
|
3584
3550
|
add(Number.parseFloat(millisecondsString), "millisecond", "ms", millisecondsString);
|
|
@@ -3593,7 +3559,6 @@ function prettyMilliseconds(milliseconds, options) {
|
|
|
3593
3559
|
if (typeof options.unitCount === "number") result = result.slice(0, Math.max(options.unitCount, 1));
|
|
3594
3560
|
return sign + result.join(separator);
|
|
3595
3561
|
}
|
|
3596
|
-
|
|
3597
3562
|
//#endregion
|
|
3598
3563
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/error.js
|
|
3599
3564
|
const logError = (result, verboseInfo) => {
|
|
@@ -3604,7 +3569,6 @@ const logError = (result, verboseInfo) => {
|
|
|
3604
3569
|
result
|
|
3605
3570
|
});
|
|
3606
3571
|
};
|
|
3607
|
-
|
|
3608
3572
|
//#endregion
|
|
3609
3573
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/complete.js
|
|
3610
3574
|
const logResult = (result, verboseInfo) => {
|
|
@@ -3620,7 +3584,6 @@ const logDuration = (result, verboseInfo) => {
|
|
|
3620
3584
|
result
|
|
3621
3585
|
});
|
|
3622
3586
|
};
|
|
3623
|
-
|
|
3624
3587
|
//#endregion
|
|
3625
3588
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/return/reject.js
|
|
3626
3589
|
const handleResult = (result, verboseInfo, { reject }) => {
|
|
@@ -3628,7 +3591,6 @@ const handleResult = (result, verboseInfo, { reject }) => {
|
|
|
3628
3591
|
if (result.failed && reject) throw result;
|
|
3629
3592
|
return result;
|
|
3630
3593
|
};
|
|
3631
|
-
|
|
3632
3594
|
//#endregion
|
|
3633
3595
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/type.js
|
|
3634
3596
|
const getStdioItemType = (value, optionName) => {
|
|
@@ -3695,10 +3657,10 @@ const KNOWN_STDIO_STRINGS = new Set([
|
|
|
3695
3657
|
"overlapped",
|
|
3696
3658
|
"pipe"
|
|
3697
3659
|
]);
|
|
3698
|
-
const isReadableStream
|
|
3699
|
-
const isWritableStream
|
|
3700
|
-
const isWebStream = (value) => isReadableStream
|
|
3701
|
-
const isTransformStream = (value) => isReadableStream
|
|
3660
|
+
const isReadableStream = (value) => Object.prototype.toString.call(value) === "[object ReadableStream]";
|
|
3661
|
+
const isWritableStream = (value) => Object.prototype.toString.call(value) === "[object WritableStream]";
|
|
3662
|
+
const isWebStream = (value) => isReadableStream(value) || isWritableStream(value);
|
|
3663
|
+
const isTransformStream = (value) => isReadableStream(value?.readable) && isWritableStream(value?.writable);
|
|
3702
3664
|
const isAsyncIterableObject = (value) => isObject(value) && typeof value[Symbol.asyncIterator] === "function";
|
|
3703
3665
|
const isIterableObject = (value) => isObject(value) && typeof value[Symbol.iterator] === "function";
|
|
3704
3666
|
const isObject = (value) => typeof value === "object" && value !== null;
|
|
@@ -3736,7 +3698,6 @@ const TYPE_TO_MESSAGE = {
|
|
|
3736
3698
|
string: "a string",
|
|
3737
3699
|
uint8Array: "a Uint8Array"
|
|
3738
3700
|
};
|
|
3739
|
-
|
|
3740
3701
|
//#endregion
|
|
3741
3702
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/object-mode.js
|
|
3742
3703
|
const getTransformObjectModes = (objectMode, index, newTransforms, direction) => direction === "output" ? getOutputObjectModes(objectMode, index, newTransforms) : getInputObjectModes(objectMode, index, newTransforms);
|
|
@@ -3759,7 +3720,6 @@ const getFdObjectMode = (stdioItems, direction) => {
|
|
|
3759
3720
|
if (lastTransform === void 0) return false;
|
|
3760
3721
|
return direction === "input" ? lastTransform.value.writableObjectMode : lastTransform.value.readableObjectMode;
|
|
3761
3722
|
};
|
|
3762
|
-
|
|
3763
3723
|
//#endregion
|
|
3764
3724
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/normalize.js
|
|
3765
3725
|
const normalizeTransforms = (stdioItems, optionName, direction, options) => [...stdioItems.filter(({ type }) => !TRANSFORM_TYPES.has(type)), ...getTransforms(stdioItems, optionName, direction, options)];
|
|
@@ -3836,7 +3796,6 @@ const normalizeGenerator = ({ stdioItem, stdioItem: { value }, index, newTransfo
|
|
|
3836
3796
|
};
|
|
3837
3797
|
};
|
|
3838
3798
|
const sortTransforms = (newTransforms, direction) => direction === "input" ? newTransforms.reverse() : newTransforms;
|
|
3839
|
-
|
|
3840
3799
|
//#endregion
|
|
3841
3800
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/direction.js
|
|
3842
3801
|
const getStreamDirection = (stdioItems, fdNumber, optionName) => {
|
|
@@ -3860,10 +3819,10 @@ const guessStreamDirection = {
|
|
|
3860
3819
|
iterable: alwaysInput,
|
|
3861
3820
|
asyncIterable: alwaysInput,
|
|
3862
3821
|
uint8Array: alwaysInput,
|
|
3863
|
-
webStream: (value) => isWritableStream
|
|
3822
|
+
webStream: (value) => isWritableStream(value) ? "output" : "input",
|
|
3864
3823
|
nodeStream(value) {
|
|
3865
|
-
if (!isReadableStream(value, { checkOpen: false })) return "output";
|
|
3866
|
-
return isWritableStream(value, { checkOpen: false }) ? void 0 : "input";
|
|
3824
|
+
if (!isReadableStream$1(value, { checkOpen: false })) return "output";
|
|
3825
|
+
return isWritableStream$1(value, { checkOpen: false }) ? void 0 : "input";
|
|
3867
3826
|
},
|
|
3868
3827
|
webTransform: anyDirection,
|
|
3869
3828
|
duplex: anyDirection,
|
|
@@ -3883,14 +3842,12 @@ const getStandardStreamDirection = (value) => {
|
|
|
3883
3842
|
].includes(value)) return "output";
|
|
3884
3843
|
};
|
|
3885
3844
|
const DEFAULT_DIRECTION = "output";
|
|
3886
|
-
|
|
3887
3845
|
//#endregion
|
|
3888
3846
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/array.js
|
|
3889
3847
|
const normalizeIpcStdioArray = (stdioArray, ipc) => ipc && !stdioArray.includes("ipc") ? [...stdioArray, "ipc"] : stdioArray;
|
|
3890
|
-
|
|
3891
3848
|
//#endregion
|
|
3892
3849
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/stdio-option.js
|
|
3893
|
-
const normalizeStdioOption = ({ stdio, ipc, buffer
|
|
3850
|
+
const normalizeStdioOption = ({ stdio, ipc, buffer, ...options }, verboseInfo, isSync) => {
|
|
3894
3851
|
const stdioArray = getStdioArray(stdio, options).map((stdioOption, fdNumber) => addDefaultValue(stdioOption, fdNumber));
|
|
3895
3852
|
return isSync ? normalizeStdioSync(stdioArray, buffer, verboseInfo) : normalizeIpcStdioArray(stdioArray, ipc);
|
|
3896
3853
|
};
|
|
@@ -3914,7 +3871,6 @@ const addDefaultValue = (stdioOption, fdNumber) => {
|
|
|
3914
3871
|
};
|
|
3915
3872
|
const normalizeStdioSync = (stdioArray, buffer, verboseInfo) => stdioArray.map((stdioOption, fdNumber) => !buffer[fdNumber] && fdNumber !== 0 && !isFullVerbose(verboseInfo, fdNumber) && isOutputPipeOnly(stdioOption) ? "ignore" : stdioOption);
|
|
3916
3873
|
const isOutputPipeOnly = (stdioOption) => stdioOption === "pipe" || Array.isArray(stdioOption) && stdioOption.every((item) => item === "pipe");
|
|
3917
|
-
|
|
3918
3874
|
//#endregion
|
|
3919
3875
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/native.js
|
|
3920
3876
|
const handleNativeStream = ({ stdioItem, stdioItem: { type }, isStdioArray, fdNumber, direction, isSync }) => {
|
|
@@ -3983,7 +3939,6 @@ const getStandardStream = (fdNumber, value, optionName) => {
|
|
|
3983
3939
|
if (standardStream === void 0) throw new TypeError(`The \`${optionName}: ${value}\` option is invalid: no such standard stream.`);
|
|
3984
3940
|
return standardStream;
|
|
3985
3941
|
};
|
|
3986
|
-
|
|
3987
3942
|
//#endregion
|
|
3988
3943
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/input-option.js
|
|
3989
3944
|
const handleInputOptions = ({ input, inputFile }, fdNumber) => fdNumber === 0 ? [...handleInputOption(input), ...handleInputFileOption(inputFile)] : [];
|
|
@@ -3993,7 +3948,7 @@ const handleInputOption = (input) => input === void 0 ? [] : [{
|
|
|
3993
3948
|
optionName: "input"
|
|
3994
3949
|
}];
|
|
3995
3950
|
const getInputType = (input) => {
|
|
3996
|
-
if (isReadableStream(input, { checkOpen: false })) return "nodeStream";
|
|
3951
|
+
if (isReadableStream$1(input, { checkOpen: false })) return "nodeStream";
|
|
3997
3952
|
if (typeof input === "string") return "string";
|
|
3998
3953
|
if (isUint8Array(input)) return "uint8Array";
|
|
3999
3954
|
throw new Error("The `input` option must be a string, a Uint8Array or a Node.js Readable stream.");
|
|
@@ -4013,7 +3968,6 @@ const getInputFileType = (inputFile) => {
|
|
|
4013
3968
|
};
|
|
4014
3969
|
throw new Error("The `inputFile` option must be a file path string or a file URL.");
|
|
4015
3970
|
};
|
|
4016
|
-
|
|
4017
3971
|
//#endregion
|
|
4018
3972
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/duplicate.js
|
|
4019
3973
|
const filterDuplicates = (stdioItems) => stdioItems.filter((stdioItemOne, indexOne) => stdioItems.every((stdioItemTwo, indexTwo) => stdioItemOne.value !== stdioItemTwo.value || indexOne >= indexTwo || stdioItemOne.type === "generator" || stdioItemOne.type === "asyncGenerator"));
|
|
@@ -4074,10 +4028,9 @@ const validateDuplicateTransform = ({ otherStdioItems, type, value, optionName }
|
|
|
4074
4028
|
const throwOnDuplicateStream = (stdioItem, optionName, type) => {
|
|
4075
4029
|
if (stdioItem !== void 0) throw new TypeError(`The \`${stdioItem.optionName}\` and \`${optionName}\` options must not target ${TYPE_TO_MESSAGE[type]} that is the same.`);
|
|
4076
4030
|
};
|
|
4077
|
-
|
|
4078
4031
|
//#endregion
|
|
4079
4032
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/handle.js
|
|
4080
|
-
const handleStdio = (addProperties
|
|
4033
|
+
const handleStdio = (addProperties, options, verboseInfo, isSync) => {
|
|
4081
4034
|
const fileDescriptors = getFinalFileDescriptors({
|
|
4082
4035
|
initialFileDescriptors: normalizeStdioOption(options, verboseInfo, isSync).map((stdioOption, fdNumber) => getFileDescriptor({
|
|
4083
4036
|
stdioOption,
|
|
@@ -4085,7 +4038,7 @@ const handleStdio = (addProperties$2, options, verboseInfo, isSync) => {
|
|
|
4085
4038
|
options,
|
|
4086
4039
|
isSync
|
|
4087
4040
|
})),
|
|
4088
|
-
addProperties
|
|
4041
|
+
addProperties,
|
|
4089
4042
|
options,
|
|
4090
4043
|
isSync
|
|
4091
4044
|
});
|
|
@@ -4134,7 +4087,7 @@ const initializeStdioItem = (value, optionName) => ({
|
|
|
4134
4087
|
const validateStdioArray = (stdioItems, isStdioArray, optionName) => {
|
|
4135
4088
|
if (stdioItems.length === 0) throw new TypeError(`The \`${optionName}\` option must not be an empty array.`);
|
|
4136
4089
|
if (!isStdioArray) return;
|
|
4137
|
-
for (const { value, optionName
|
|
4090
|
+
for (const { value, optionName } of stdioItems) if (INVALID_STDIO_ARRAY_OPTIONS.has(value)) throw new Error(`The \`${optionName}\` option must not include \`${value}\`.`);
|
|
4138
4091
|
};
|
|
4139
4092
|
const INVALID_STDIO_ARRAY_OPTIONS = new Set(["ignore", "ipc"]);
|
|
4140
4093
|
const validateStreams = (stdioItems) => {
|
|
@@ -4150,29 +4103,29 @@ const validateFileObjectMode = (stdioItems, objectMode) => {
|
|
|
4150
4103
|
const fileStdioItem = stdioItems.find(({ type }) => FILE_TYPES.has(type));
|
|
4151
4104
|
if (fileStdioItem !== void 0) throw new TypeError(`The \`${fileStdioItem.optionName}\` option cannot use both files and transforms in objectMode.`);
|
|
4152
4105
|
};
|
|
4153
|
-
const getFinalFileDescriptors = ({ initialFileDescriptors, addProperties
|
|
4106
|
+
const getFinalFileDescriptors = ({ initialFileDescriptors, addProperties, options, isSync }) => {
|
|
4154
4107
|
const fileDescriptors = [];
|
|
4155
4108
|
try {
|
|
4156
4109
|
for (const fileDescriptor of initialFileDescriptors) fileDescriptors.push(getFinalFileDescriptor({
|
|
4157
4110
|
fileDescriptor,
|
|
4158
4111
|
fileDescriptors,
|
|
4159
|
-
addProperties
|
|
4112
|
+
addProperties,
|
|
4160
4113
|
options,
|
|
4161
4114
|
isSync
|
|
4162
4115
|
}));
|
|
4163
4116
|
return fileDescriptors;
|
|
4164
|
-
} catch (error
|
|
4117
|
+
} catch (error) {
|
|
4165
4118
|
cleanupCustomStreams(fileDescriptors);
|
|
4166
|
-
throw error
|
|
4119
|
+
throw error;
|
|
4167
4120
|
}
|
|
4168
4121
|
};
|
|
4169
|
-
const getFinalFileDescriptor = ({ fileDescriptor: { direction, objectMode, stdioItems }, fileDescriptors, addProperties
|
|
4122
|
+
const getFinalFileDescriptor = ({ fileDescriptor: { direction, objectMode, stdioItems }, fileDescriptors, addProperties, options, isSync }) => {
|
|
4170
4123
|
return {
|
|
4171
4124
|
direction,
|
|
4172
4125
|
objectMode,
|
|
4173
4126
|
stdioItems: stdioItems.map((stdioItem) => addStreamProperties({
|
|
4174
4127
|
stdioItem,
|
|
4175
|
-
addProperties
|
|
4128
|
+
addProperties,
|
|
4176
4129
|
direction,
|
|
4177
4130
|
options,
|
|
4178
4131
|
fileDescriptors,
|
|
@@ -4180,7 +4133,7 @@ const getFinalFileDescriptor = ({ fileDescriptor: { direction, objectMode, stdio
|
|
|
4180
4133
|
}))
|
|
4181
4134
|
};
|
|
4182
4135
|
};
|
|
4183
|
-
const addStreamProperties = ({ stdioItem, addProperties
|
|
4136
|
+
const addStreamProperties = ({ stdioItem, addProperties, direction, options, fileDescriptors, isSync }) => {
|
|
4184
4137
|
const duplicateStream = getDuplicateStream({
|
|
4185
4138
|
stdioItem,
|
|
4186
4139
|
direction,
|
|
@@ -4193,18 +4146,17 @@ const addStreamProperties = ({ stdioItem, addProperties: addProperties$2, direct
|
|
|
4193
4146
|
};
|
|
4194
4147
|
return {
|
|
4195
4148
|
...stdioItem,
|
|
4196
|
-
...addProperties
|
|
4149
|
+
...addProperties[direction][stdioItem.type](stdioItem, options)
|
|
4197
4150
|
};
|
|
4198
4151
|
};
|
|
4199
4152
|
const cleanupCustomStreams = (fileDescriptors) => {
|
|
4200
4153
|
for (const { stdioItems } of fileDescriptors) for (const { stream } of stdioItems) if (stream !== void 0 && !isStandardStream(stream)) stream.destroy();
|
|
4201
4154
|
};
|
|
4202
4155
|
const forwardStdio = (stdioItems) => {
|
|
4203
|
-
if (stdioItems.length > 1) return stdioItems.some(({ value
|
|
4156
|
+
if (stdioItems.length > 1) return stdioItems.some(({ value }) => value === "overlapped") ? "overlapped" : "pipe";
|
|
4204
4157
|
const [{ type, value }] = stdioItems;
|
|
4205
4158
|
return type === "native" ? value : "pipe";
|
|
4206
4159
|
};
|
|
4207
|
-
|
|
4208
4160
|
//#endregion
|
|
4209
4161
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/handle-sync.js
|
|
4210
4162
|
const handleStdioSync = (options, verboseInfo) => handleStdio(addPropertiesSync, options, verboseInfo, true);
|
|
@@ -4251,12 +4203,10 @@ const addPropertiesSync = {
|
|
|
4251
4203
|
uint8Array: forbiddenIfSync
|
|
4252
4204
|
}
|
|
4253
4205
|
};
|
|
4254
|
-
|
|
4255
4206
|
//#endregion
|
|
4256
4207
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/strip-newline.js
|
|
4257
4208
|
const stripNewline = (value, { stripFinalNewline: stripFinalNewline$1 }, fdNumber) => getStripFinalNewline(stripFinalNewline$1, fdNumber) && value !== void 0 && !Array.isArray(value) ? stripFinalNewline(value) : value;
|
|
4258
|
-
const getStripFinalNewline = (stripFinalNewline
|
|
4259
|
-
|
|
4209
|
+
const getStripFinalNewline = (stripFinalNewline, fdNumber) => fdNumber === "all" ? stripFinalNewline[1] || stripFinalNewline[2] : stripFinalNewline[fdNumber];
|
|
4260
4210
|
//#endregion
|
|
4261
4211
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/split.js
|
|
4262
4212
|
const getSplitLinesGenerator = (binary, preserveNewlines, skipped, state) => binary || skipped ? void 0 : initializeSplitLines(preserveNewlines, state);
|
|
@@ -4302,8 +4252,8 @@ const linesFinal = function* ({ previousChunks }) {
|
|
|
4302
4252
|
};
|
|
4303
4253
|
const getAppendNewlineGenerator = ({ binary, preserveNewlines, readableObjectMode, state }) => binary || preserveNewlines || readableObjectMode ? void 0 : { transform: appendNewlineGenerator.bind(void 0, state) };
|
|
4304
4254
|
const appendNewlineGenerator = function* ({ isWindowsNewline = false }, chunk) {
|
|
4305
|
-
const { unixNewline, windowsNewline, LF
|
|
4306
|
-
if (chunk.at(-1) === LF
|
|
4255
|
+
const { unixNewline, windowsNewline, LF, concatBytes } = typeof chunk === "string" ? linesStringInfo : linesUint8ArrayInfo;
|
|
4256
|
+
if (chunk.at(-1) === LF) {
|
|
4307
4257
|
yield chunk;
|
|
4308
4258
|
return;
|
|
4309
4259
|
}
|
|
@@ -4328,7 +4278,6 @@ const linesUint8ArrayInfo = {
|
|
|
4328
4278
|
LF: 10,
|
|
4329
4279
|
concatBytes: concatUint8Array
|
|
4330
4280
|
};
|
|
4331
|
-
|
|
4332
4281
|
//#endregion
|
|
4333
4282
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/validate.js
|
|
4334
4283
|
const getValidateTransformInput = (writableObjectMode, optionName) => writableObjectMode ? void 0 : validateStringTransformInput.bind(void 0, optionName);
|
|
@@ -4351,7 +4300,6 @@ const validateEmptyReturn = (optionName, chunk) => {
|
|
|
4351
4300
|
Instead, \`yield\` should either be called with a value, or not be called at all. For example:
|
|
4352
4301
|
if (condition) { yield value; }`);
|
|
4353
4302
|
};
|
|
4354
|
-
|
|
4355
4303
|
//#endregion
|
|
4356
4304
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/encoding-transform.js
|
|
4357
4305
|
const getEncodingTransformGenerator = (binary, encoding, skipped) => {
|
|
@@ -4363,9 +4311,9 @@ const getEncodingTransformGenerator = (binary, encoding, skipped) => {
|
|
|
4363
4311
|
final: encodingStringFinal.bind(void 0, stringDecoder)
|
|
4364
4312
|
};
|
|
4365
4313
|
};
|
|
4366
|
-
const encodingUint8ArrayGenerator = function* (textEncoder
|
|
4314
|
+
const encodingUint8ArrayGenerator = function* (textEncoder, chunk) {
|
|
4367
4315
|
if (Buffer$1.isBuffer(chunk)) yield bufferToUint8Array(chunk);
|
|
4368
|
-
else if (typeof chunk === "string") yield textEncoder
|
|
4316
|
+
else if (typeof chunk === "string") yield textEncoder.encode(chunk);
|
|
4369
4317
|
else yield chunk;
|
|
4370
4318
|
};
|
|
4371
4319
|
const encodingStringGenerator = function* (stringDecoder, chunk) {
|
|
@@ -4375,7 +4323,6 @@ const encodingStringFinal = function* (stringDecoder) {
|
|
|
4375
4323
|
const lastChunk = stringDecoder.end();
|
|
4376
4324
|
if (lastChunk !== "") yield lastChunk;
|
|
4377
4325
|
};
|
|
4378
|
-
|
|
4379
4326
|
//#endregion
|
|
4380
4327
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/run-async.js
|
|
4381
4328
|
const pushChunks = callbackify(async (getChunks, state, getChunksArguments, transformStream) => {
|
|
@@ -4401,25 +4348,24 @@ const generatorFinalChunks = async function* (final, index, generators) {
|
|
|
4401
4348
|
if (final === void 0) return;
|
|
4402
4349
|
for await (const finalChunk of final()) yield* transformChunk(finalChunk, generators, index + 1);
|
|
4403
4350
|
};
|
|
4404
|
-
const destroyTransform = callbackify(async ({ currentIterable }, error
|
|
4351
|
+
const destroyTransform = callbackify(async ({ currentIterable }, error) => {
|
|
4405
4352
|
if (currentIterable !== void 0) {
|
|
4406
|
-
await (error
|
|
4353
|
+
await (error ? currentIterable.throw(error) : currentIterable.return());
|
|
4407
4354
|
return;
|
|
4408
4355
|
}
|
|
4409
|
-
if (error
|
|
4356
|
+
if (error) throw error;
|
|
4410
4357
|
});
|
|
4411
4358
|
const identityGenerator$1 = function* (chunk) {
|
|
4412
4359
|
yield chunk;
|
|
4413
4360
|
};
|
|
4414
|
-
|
|
4415
4361
|
//#endregion
|
|
4416
4362
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/run-sync.js
|
|
4417
4363
|
const pushChunksSync = (getChunksSync, getChunksArguments, transformStream, done) => {
|
|
4418
4364
|
try {
|
|
4419
4365
|
for (const chunk of getChunksSync(...getChunksArguments)) transformStream.push(chunk);
|
|
4420
4366
|
done();
|
|
4421
|
-
} catch (error
|
|
4422
|
-
done(error
|
|
4367
|
+
} catch (error) {
|
|
4368
|
+
done(error);
|
|
4423
4369
|
}
|
|
4424
4370
|
};
|
|
4425
4371
|
const runTransformSync = (generators, chunks) => [...chunks.flatMap((chunk) => [...transformChunkSync(chunk, generators, 0)]), ...finalChunksSync(generators)];
|
|
@@ -4441,7 +4387,6 @@ const generatorFinalChunksSync = function* (final, index, generators) {
|
|
|
4441
4387
|
const identityGenerator = function* (chunk) {
|
|
4442
4388
|
yield chunk;
|
|
4443
4389
|
};
|
|
4444
|
-
|
|
4445
4390
|
//#endregion
|
|
4446
4391
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/transform/generator.js
|
|
4447
4392
|
const generatorToStream = ({ value, value: { transform, final, writableObjectMode, readableObjectMode }, optionName }, { encoding }) => {
|
|
@@ -4457,7 +4402,7 @@ const generatorToStream = ({ value, value: { transform, final, writableObjectMod
|
|
|
4457
4402
|
writableHighWaterMark: getDefaultHighWaterMark(writableObjectMode),
|
|
4458
4403
|
readableObjectMode,
|
|
4459
4404
|
readableHighWaterMark: getDefaultHighWaterMark(readableObjectMode),
|
|
4460
|
-
transform(chunk, encoding
|
|
4405
|
+
transform(chunk, encoding, done) {
|
|
4461
4406
|
transformMethod([
|
|
4462
4407
|
chunk,
|
|
4463
4408
|
generators,
|
|
@@ -4495,7 +4440,6 @@ const addInternalGenerators = ({ transform, final, binary, writableObjectMode, r
|
|
|
4495
4440
|
})
|
|
4496
4441
|
].filter(Boolean);
|
|
4497
4442
|
};
|
|
4498
|
-
|
|
4499
4443
|
//#endregion
|
|
4500
4444
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/input-sync.js
|
|
4501
4445
|
const addInputOptionsSync = (fileDescriptors, options) => {
|
|
@@ -4521,7 +4465,6 @@ const validateSerializable = (newContents) => {
|
|
|
4521
4465
|
const invalidItem = newContents.find((item) => typeof item !== "string" && !isUint8Array(item));
|
|
4522
4466
|
if (invalidItem !== void 0) throw new TypeError(`The \`stdin\` option is invalid: when passing objects as input, a transform must be used to serialize them to strings or Uint8Arrays: ${invalidItem}.`);
|
|
4523
4467
|
};
|
|
4524
|
-
|
|
4525
4468
|
//#endregion
|
|
4526
4469
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/output.js
|
|
4527
4470
|
const shouldLogOutput = ({ stdioItems, encoding, verboseInfo, fdNumber }) => fdNumber !== "all" && isFullVerbose(verboseInfo, fdNumber) && !BINARY_ENCODINGS.has(encoding) && fdUsesVerbose(fdNumber) && (stdioItems.some(({ type, value }) => type === "native" && PIPED_STDIO_VALUES.has(value)) || stdioItems.every(({ type }) => TRANSFORM_TYPES.has(type)));
|
|
@@ -4542,7 +4485,6 @@ const logLine = (line, fdNumber, verboseInfo) => {
|
|
|
4542
4485
|
verboseInfo
|
|
4543
4486
|
});
|
|
4544
4487
|
};
|
|
4545
|
-
|
|
4546
4488
|
//#endregion
|
|
4547
4489
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/output-sync.js
|
|
4548
4490
|
const transformOutputSync = ({ fileDescriptors, syncResult: { output }, options, isMaxBuffer, verboseInfo }) => {
|
|
@@ -4562,7 +4504,7 @@ const transformOutputSync = ({ fileDescriptors, syncResult: { output }, options,
|
|
|
4562
4504
|
...state
|
|
4563
4505
|
};
|
|
4564
4506
|
};
|
|
4565
|
-
const transformOutputResultSync = ({ result, fileDescriptors, fdNumber, state, outputFiles, isMaxBuffer, verboseInfo }, { buffer, encoding, lines, stripFinalNewline
|
|
4507
|
+
const transformOutputResultSync = ({ result, fileDescriptors, fdNumber, state, outputFiles, isMaxBuffer, verboseInfo }, { buffer, encoding, lines, stripFinalNewline, maxBuffer }) => {
|
|
4566
4508
|
if (result === null) return;
|
|
4567
4509
|
const uint8ArrayResult = bufferToUint8Array(truncateMaxBufferSync(result, isMaxBuffer, maxBuffer));
|
|
4568
4510
|
const { stdioItems, objectMode } = fileDescriptors[fdNumber];
|
|
@@ -4571,7 +4513,7 @@ const transformOutputResultSync = ({ result, fileDescriptors, fdNumber, state, o
|
|
|
4571
4513
|
objectMode,
|
|
4572
4514
|
encoding,
|
|
4573
4515
|
lines,
|
|
4574
|
-
stripFinalNewline
|
|
4516
|
+
stripFinalNewline,
|
|
4575
4517
|
fdNumber
|
|
4576
4518
|
});
|
|
4577
4519
|
logOutputSync({
|
|
@@ -4587,26 +4529,26 @@ const transformOutputResultSync = ({ result, fileDescriptors, fdNumber, state, o
|
|
|
4587
4529
|
try {
|
|
4588
4530
|
if (state.error === void 0) writeToFiles(serializedResult, stdioItems, outputFiles);
|
|
4589
4531
|
return returnedResult;
|
|
4590
|
-
} catch (error
|
|
4591
|
-
state.error = error
|
|
4532
|
+
} catch (error) {
|
|
4533
|
+
state.error = error;
|
|
4592
4534
|
return returnedResult;
|
|
4593
4535
|
}
|
|
4594
4536
|
};
|
|
4595
4537
|
const runOutputGeneratorsSync = (chunks, stdioItems, encoding, state) => {
|
|
4596
4538
|
try {
|
|
4597
4539
|
return runGeneratorsSync(chunks, stdioItems, encoding, false);
|
|
4598
|
-
} catch (error
|
|
4599
|
-
state.error = error
|
|
4540
|
+
} catch (error) {
|
|
4541
|
+
state.error = error;
|
|
4600
4542
|
return chunks;
|
|
4601
4543
|
}
|
|
4602
4544
|
};
|
|
4603
|
-
const serializeChunks = ({ chunks, objectMode, encoding, lines, stripFinalNewline
|
|
4545
|
+
const serializeChunks = ({ chunks, objectMode, encoding, lines, stripFinalNewline, fdNumber }) => {
|
|
4604
4546
|
if (objectMode) return { serializedResult: chunks };
|
|
4605
4547
|
if (encoding === "buffer") return { serializedResult: joinToUint8Array(chunks) };
|
|
4606
4548
|
const serializedResult = joinToString(chunks, encoding);
|
|
4607
4549
|
if (lines[fdNumber]) return {
|
|
4608
4550
|
serializedResult,
|
|
4609
|
-
finalResult: splitLinesSync(serializedResult, !stripFinalNewline
|
|
4551
|
+
finalResult: splitLinesSync(serializedResult, !stripFinalNewline[fdNumber], objectMode)
|
|
4610
4552
|
};
|
|
4611
4553
|
return { serializedResult };
|
|
4612
4554
|
};
|
|
@@ -4620,21 +4562,20 @@ const logOutputSync = ({ serializedResult, fdNumber, state, verboseInfo, encodin
|
|
|
4620
4562
|
const linesArray = splitLinesSync(serializedResult, false, objectMode);
|
|
4621
4563
|
try {
|
|
4622
4564
|
logLinesSync(linesArray, fdNumber, verboseInfo);
|
|
4623
|
-
} catch (error
|
|
4624
|
-
state.error ??= error
|
|
4565
|
+
} catch (error) {
|
|
4566
|
+
state.error ??= error;
|
|
4625
4567
|
}
|
|
4626
4568
|
};
|
|
4627
4569
|
const writeToFiles = (serializedResult, stdioItems, outputFiles) => {
|
|
4628
|
-
for (const { path
|
|
4629
|
-
const pathString = typeof path
|
|
4630
|
-
if (append || outputFiles.has(pathString)) appendFileSync(path
|
|
4570
|
+
for (const { path, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
|
|
4571
|
+
const pathString = typeof path === "string" ? path : path.toString();
|
|
4572
|
+
if (append || outputFiles.has(pathString)) appendFileSync(path, serializedResult);
|
|
4631
4573
|
else {
|
|
4632
4574
|
outputFiles.add(pathString);
|
|
4633
|
-
writeFileSync(path
|
|
4575
|
+
writeFileSync(path, serializedResult);
|
|
4634
4576
|
}
|
|
4635
4577
|
}
|
|
4636
4578
|
};
|
|
4637
|
-
|
|
4638
4579
|
//#endregion
|
|
4639
4580
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/all-sync.js
|
|
4640
4581
|
const getAllSync = ([, stdout, stderr], options) => {
|
|
@@ -4646,7 +4587,6 @@ const getAllSync = ([, stdout, stderr], options) => {
|
|
|
4646
4587
|
if (isUint8Array(stdout) && isUint8Array(stderr)) return concatUint8Arrays([stdout, stderr]);
|
|
4647
4588
|
return `${stdout}${stderr}`;
|
|
4648
4589
|
};
|
|
4649
|
-
|
|
4650
4590
|
//#endregion
|
|
4651
4591
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/exit-async.js
|
|
4652
4592
|
const waitForExit = async (subprocess, context) => {
|
|
@@ -4673,11 +4613,10 @@ const waitForSuccessfulExit = async (exitPromise) => {
|
|
|
4673
4613
|
};
|
|
4674
4614
|
const isSubprocessErrorExit = (exitCode, signal) => exitCode === void 0 && signal === void 0;
|
|
4675
4615
|
const isFailedExit = (exitCode, signal) => exitCode !== 0 || signal !== null;
|
|
4676
|
-
|
|
4677
4616
|
//#endregion
|
|
4678
4617
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/exit-sync.js
|
|
4679
|
-
const getExitResultSync = ({ error
|
|
4680
|
-
const resultError = getResultError(error
|
|
4618
|
+
const getExitResultSync = ({ error, status: exitCode, signal, output }, { maxBuffer }) => {
|
|
4619
|
+
const resultError = getResultError(error, exitCode, signal);
|
|
4681
4620
|
return {
|
|
4682
4621
|
resultError,
|
|
4683
4622
|
exitCode,
|
|
@@ -4686,11 +4625,10 @@ const getExitResultSync = ({ error: error$1, status: exitCode, signal, output },
|
|
|
4686
4625
|
isMaxBuffer: isMaxBufferSync(resultError, output, maxBuffer)
|
|
4687
4626
|
};
|
|
4688
4627
|
};
|
|
4689
|
-
const getResultError = (error
|
|
4690
|
-
if (error
|
|
4628
|
+
const getResultError = (error, exitCode, signal) => {
|
|
4629
|
+
if (error !== void 0) return error;
|
|
4691
4630
|
return isFailedExit(exitCode, signal) ? new DiscardedError() : void 0;
|
|
4692
4631
|
};
|
|
4693
|
-
|
|
4694
4632
|
//#endregion
|
|
4695
4633
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/main-sync.js
|
|
4696
4634
|
const execaCoreSync = (rawFile, rawArguments, rawOptions) => {
|
|
@@ -4746,7 +4684,7 @@ const spawnSubprocessSync = ({ file, commandArguments, options, command, escaped
|
|
|
4746
4684
|
});
|
|
4747
4685
|
if (syncResult.failed) return syncResult;
|
|
4748
4686
|
const { resultError, exitCode, signal, timedOut, isMaxBuffer } = getExitResultSync(syncResult, options);
|
|
4749
|
-
const { output, error
|
|
4687
|
+
const { output, error = resultError } = transformOutputSync({
|
|
4750
4688
|
fileDescriptors,
|
|
4751
4689
|
syncResult,
|
|
4752
4690
|
options,
|
|
@@ -4754,7 +4692,7 @@ const spawnSubprocessSync = ({ file, commandArguments, options, command, escaped
|
|
|
4754
4692
|
verboseInfo
|
|
4755
4693
|
});
|
|
4756
4694
|
return getSyncResult({
|
|
4757
|
-
error
|
|
4695
|
+
error,
|
|
4758
4696
|
exitCode,
|
|
4759
4697
|
signal,
|
|
4760
4698
|
timedOut,
|
|
@@ -4771,9 +4709,9 @@ const runSubprocessSync = ({ file, commandArguments, options, command, escapedCo
|
|
|
4771
4709
|
try {
|
|
4772
4710
|
addInputOptionsSync(fileDescriptors, options);
|
|
4773
4711
|
return spawnSync(file, commandArguments, normalizeSpawnSyncOptions(options));
|
|
4774
|
-
} catch (error
|
|
4712
|
+
} catch (error) {
|
|
4775
4713
|
return makeEarlyError({
|
|
4776
|
-
error
|
|
4714
|
+
error,
|
|
4777
4715
|
command,
|
|
4778
4716
|
escapedCommand,
|
|
4779
4717
|
fileDescriptors,
|
|
@@ -4783,12 +4721,12 @@ const runSubprocessSync = ({ file, commandArguments, options, command, escapedCo
|
|
|
4783
4721
|
});
|
|
4784
4722
|
}
|
|
4785
4723
|
};
|
|
4786
|
-
const normalizeSpawnSyncOptions = ({ encoding, maxBuffer
|
|
4724
|
+
const normalizeSpawnSyncOptions = ({ encoding, maxBuffer, ...options }) => ({
|
|
4787
4725
|
...options,
|
|
4788
4726
|
encoding: "buffer",
|
|
4789
4727
|
maxBuffer: getMaxBufferSync(maxBuffer)
|
|
4790
4728
|
});
|
|
4791
|
-
const getSyncResult = ({ error
|
|
4729
|
+
const getSyncResult = ({ error, exitCode, signal, timedOut, isMaxBuffer, stdio, all, options, command, escapedCommand, startTime }) => error === void 0 ? makeSuccessResult({
|
|
4792
4730
|
command,
|
|
4793
4731
|
escapedCommand,
|
|
4794
4732
|
stdio,
|
|
@@ -4797,7 +4735,7 @@ const getSyncResult = ({ error: error$1, exitCode, signal, timedOut, isMaxBuffer
|
|
|
4797
4735
|
options,
|
|
4798
4736
|
startTime
|
|
4799
4737
|
}) : makeError({
|
|
4800
|
-
error
|
|
4738
|
+
error,
|
|
4801
4739
|
command,
|
|
4802
4740
|
escapedCommand,
|
|
4803
4741
|
timedOut,
|
|
@@ -4814,7 +4752,6 @@ const getSyncResult = ({ error: error$1, exitCode, signal, timedOut, isMaxBuffer
|
|
|
4814
4752
|
startTime,
|
|
4815
4753
|
isSync: true
|
|
4816
4754
|
});
|
|
4817
|
-
|
|
4818
4755
|
//#endregion
|
|
4819
4756
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/get-one.js
|
|
4820
4757
|
const getOneMessage$1 = ({ anyProcess, channel, isSubprocess, ipc }, { reference = true, filter } = {}) => {
|
|
@@ -4842,9 +4779,9 @@ const getOneMessageAsync = async ({ anyProcess, channel, isSubprocess, filter, r
|
|
|
4842
4779
|
throwOnDisconnect(ipcEmitter, isSubprocess, controller),
|
|
4843
4780
|
throwOnStrictError(ipcEmitter, isSubprocess, controller)
|
|
4844
4781
|
]);
|
|
4845
|
-
} catch (error
|
|
4782
|
+
} catch (error) {
|
|
4846
4783
|
disconnect(anyProcess);
|
|
4847
|
-
throw error
|
|
4784
|
+
throw error;
|
|
4848
4785
|
} finally {
|
|
4849
4786
|
controller.abort();
|
|
4850
4787
|
removeReference(channel, reference);
|
|
@@ -4862,10 +4799,9 @@ const throwOnDisconnect = async (ipcEmitter, isSubprocess, { signal }) => {
|
|
|
4862
4799
|
throwOnEarlyDisconnect(isSubprocess);
|
|
4863
4800
|
};
|
|
4864
4801
|
const throwOnStrictError = async (ipcEmitter, isSubprocess, { signal }) => {
|
|
4865
|
-
const [error
|
|
4866
|
-
throw getStrictResponseError(error
|
|
4802
|
+
const [error] = await once(ipcEmitter, "strict:error", { signal });
|
|
4803
|
+
throw getStrictResponseError(error, isSubprocess);
|
|
4867
4804
|
};
|
|
4868
|
-
|
|
4869
4805
|
//#endregion
|
|
4870
4806
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/get-each.js
|
|
4871
4807
|
const getEachMessage$1 = ({ anyProcess, channel, isSubprocess, ipc }, { reference = true } = {}) => loopOnMessages({
|
|
@@ -4913,8 +4849,8 @@ const stopOnDisconnect = async (anyProcess, ipcEmitter, controller) => {
|
|
|
4913
4849
|
};
|
|
4914
4850
|
const abortOnStrictError = async ({ ipcEmitter, isSubprocess, controller, state }) => {
|
|
4915
4851
|
try {
|
|
4916
|
-
const [error
|
|
4917
|
-
state.error = getStrictResponseError(error
|
|
4852
|
+
const [error] = await once(ipcEmitter, "strict:error", { signal: controller.signal });
|
|
4853
|
+
state.error = getStrictResponseError(error, isSubprocess);
|
|
4918
4854
|
controller.abort();
|
|
4919
4855
|
} catch {}
|
|
4920
4856
|
};
|
|
@@ -4933,10 +4869,9 @@ const iterateOnMessages = async function* ({ anyProcess, channel, ipcEmitter, is
|
|
|
4933
4869
|
if (shouldAwait) await anyProcess;
|
|
4934
4870
|
}
|
|
4935
4871
|
};
|
|
4936
|
-
const throwIfStrictError = ({ error
|
|
4937
|
-
if (error
|
|
4872
|
+
const throwIfStrictError = ({ error }) => {
|
|
4873
|
+
if (error) throw error;
|
|
4938
4874
|
};
|
|
4939
|
-
|
|
4940
4875
|
//#endregion
|
|
4941
4876
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/methods.js
|
|
4942
4877
|
const addIpcMethods = (subprocess, { ipc }) => {
|
|
@@ -4976,10 +4911,9 @@ const getIpcMethods = (anyProcess, isSubprocess, ipc) => ({
|
|
|
4976
4911
|
ipc
|
|
4977
4912
|
})
|
|
4978
4913
|
});
|
|
4979
|
-
|
|
4980
4914
|
//#endregion
|
|
4981
4915
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/return/early-error.js
|
|
4982
|
-
const handleEarlyError = ({ error
|
|
4916
|
+
const handleEarlyError = ({ error, command, escapedCommand, fileDescriptors, options, startTime, verboseInfo }) => {
|
|
4983
4917
|
cleanupCustomStreams(fileDescriptors);
|
|
4984
4918
|
const subprocess = new ChildProcess();
|
|
4985
4919
|
createDummyStreams(subprocess, fileDescriptors);
|
|
@@ -4991,7 +4925,7 @@ const handleEarlyError = ({ error: error$1, command, escapedCommand, fileDescrip
|
|
|
4991
4925
|
return {
|
|
4992
4926
|
subprocess,
|
|
4993
4927
|
promise: handleDummyPromise(makeEarlyError({
|
|
4994
|
-
error
|
|
4928
|
+
error,
|
|
4995
4929
|
command,
|
|
4996
4930
|
escapedCommand,
|
|
4997
4931
|
fileDescriptors,
|
|
@@ -5032,8 +4966,7 @@ const duplex = () => new Duplex({
|
|
|
5032
4966
|
read() {},
|
|
5033
4967
|
write() {}
|
|
5034
4968
|
});
|
|
5035
|
-
const handleDummyPromise = async (error
|
|
5036
|
-
|
|
4969
|
+
const handleDummyPromise = async (error, verboseInfo, options) => handleResult(error, verboseInfo, options);
|
|
5037
4970
|
//#endregion
|
|
5038
4971
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/stdio/handle-async.js
|
|
5039
4972
|
const handleStdioAsync = (options, verboseInfo) => handleStdio(addPropertiesAsync, options, verboseInfo, false);
|
|
@@ -5074,7 +5007,6 @@ const addPropertiesAsync = {
|
|
|
5074
5007
|
uint8Array: forbiddenIfAsync
|
|
5075
5008
|
}
|
|
5076
5009
|
};
|
|
5077
|
-
|
|
5078
5010
|
//#endregion
|
|
5079
5011
|
//#region ../../node_modules/.pnpm/@sindresorhus+merge-streams@4.0.0/node_modules/@sindresorhus/merge-streams/index.js
|
|
5080
5012
|
function mergeStreams(streams) {
|
|
@@ -5146,9 +5078,9 @@ const onMergedStreamEnd = async (passThroughStream, { signal }) => {
|
|
|
5146
5078
|
signal,
|
|
5147
5079
|
cleanup: true
|
|
5148
5080
|
});
|
|
5149
|
-
} catch (error
|
|
5150
|
-
errorOrAbortStream(passThroughStream, error
|
|
5151
|
-
throw error
|
|
5081
|
+
} catch (error) {
|
|
5082
|
+
errorOrAbortStream(passThroughStream, error);
|
|
5083
|
+
throw error;
|
|
5152
5084
|
}
|
|
5153
5085
|
};
|
|
5154
5086
|
const onInputStreamsUnpipe = async (passThroughStream, streams, unpipeEvent, { signal }) => {
|
|
@@ -5157,7 +5089,7 @@ const onInputStreamsUnpipe = async (passThroughStream, streams, unpipeEvent, { s
|
|
|
5157
5089
|
const validateStream = (stream) => {
|
|
5158
5090
|
if (typeof stream?.pipe !== "function") throw new TypeError(`Expected a readable stream, got: \`${typeof stream}\`.`);
|
|
5159
5091
|
};
|
|
5160
|
-
const endWhenStreamsDone = async ({ passThroughStream, stream, streams, ended, aborted
|
|
5092
|
+
const endWhenStreamsDone = async ({ passThroughStream, stream, streams, ended, aborted, onFinished, unpipeEvent }) => {
|
|
5161
5093
|
updateMaxListeners(passThroughStream, PASSTHROUGH_LISTENERS_PER_STREAM);
|
|
5162
5094
|
const controller = new AbortController();
|
|
5163
5095
|
try {
|
|
@@ -5168,14 +5100,14 @@ const endWhenStreamsDone = async ({ passThroughStream, stream, streams, ended, a
|
|
|
5168
5100
|
stream,
|
|
5169
5101
|
streams,
|
|
5170
5102
|
ended,
|
|
5171
|
-
aborted
|
|
5103
|
+
aborted,
|
|
5172
5104
|
controller
|
|
5173
5105
|
}),
|
|
5174
5106
|
onInputStreamUnpipe({
|
|
5175
5107
|
stream,
|
|
5176
5108
|
streams,
|
|
5177
5109
|
ended,
|
|
5178
|
-
aborted
|
|
5110
|
+
aborted,
|
|
5179
5111
|
unpipeEvent,
|
|
5180
5112
|
controller
|
|
5181
5113
|
})
|
|
@@ -5184,18 +5116,18 @@ const endWhenStreamsDone = async ({ passThroughStream, stream, streams, ended, a
|
|
|
5184
5116
|
controller.abort();
|
|
5185
5117
|
updateMaxListeners(passThroughStream, -PASSTHROUGH_LISTENERS_PER_STREAM);
|
|
5186
5118
|
}
|
|
5187
|
-
if (streams.size > 0 && streams.size === ended.size + aborted
|
|
5119
|
+
if (streams.size > 0 && streams.size === ended.size + aborted.size) if (ended.size === 0 && aborted.size > 0) abortStream(passThroughStream);
|
|
5188
5120
|
else endStream(passThroughStream);
|
|
5189
5121
|
};
|
|
5190
5122
|
const afterMergedStreamFinished = async (onFinished, stream, { signal }) => {
|
|
5191
5123
|
try {
|
|
5192
5124
|
await onFinished;
|
|
5193
5125
|
if (!signal.aborted) abortStream(stream);
|
|
5194
|
-
} catch (error
|
|
5195
|
-
if (!signal.aborted) errorOrAbortStream(stream, error
|
|
5126
|
+
} catch (error) {
|
|
5127
|
+
if (!signal.aborted) errorOrAbortStream(stream, error);
|
|
5196
5128
|
}
|
|
5197
5129
|
};
|
|
5198
|
-
const onInputStreamEnd = async ({ passThroughStream, stream, streams, ended, aborted
|
|
5130
|
+
const onInputStreamEnd = async ({ passThroughStream, stream, streams, ended, aborted, controller: { signal } }) => {
|
|
5199
5131
|
try {
|
|
5200
5132
|
await finished(stream, {
|
|
5201
5133
|
signal,
|
|
@@ -5204,44 +5136,43 @@ const onInputStreamEnd = async ({ passThroughStream, stream, streams, ended, abo
|
|
|
5204
5136
|
writable: false
|
|
5205
5137
|
});
|
|
5206
5138
|
if (streams.has(stream)) ended.add(stream);
|
|
5207
|
-
} catch (error
|
|
5139
|
+
} catch (error) {
|
|
5208
5140
|
if (signal.aborted || !streams.has(stream)) return;
|
|
5209
|
-
if (isAbortError(error
|
|
5210
|
-
else errorStream(passThroughStream, error
|
|
5141
|
+
if (isAbortError(error)) aborted.add(stream);
|
|
5142
|
+
else errorStream(passThroughStream, error);
|
|
5211
5143
|
}
|
|
5212
5144
|
};
|
|
5213
|
-
const onInputStreamUnpipe = async ({ stream, streams, ended, aborted
|
|
5145
|
+
const onInputStreamUnpipe = async ({ stream, streams, ended, aborted, unpipeEvent, controller: { signal } }) => {
|
|
5214
5146
|
await once(stream, unpipeEvent, { signal });
|
|
5215
5147
|
if (!stream.readable) return once(signal, "abort", { signal });
|
|
5216
5148
|
streams.delete(stream);
|
|
5217
5149
|
ended.delete(stream);
|
|
5218
|
-
aborted
|
|
5150
|
+
aborted.delete(stream);
|
|
5219
5151
|
};
|
|
5220
5152
|
const endStream = (stream) => {
|
|
5221
5153
|
if (stream.writable) stream.end();
|
|
5222
5154
|
};
|
|
5223
|
-
const errorOrAbortStream = (stream, error
|
|
5224
|
-
if (isAbortError(error
|
|
5225
|
-
else errorStream(stream, error
|
|
5155
|
+
const errorOrAbortStream = (stream, error) => {
|
|
5156
|
+
if (isAbortError(error)) abortStream(stream);
|
|
5157
|
+
else errorStream(stream, error);
|
|
5226
5158
|
};
|
|
5227
|
-
const isAbortError = (error
|
|
5159
|
+
const isAbortError = (error) => error?.code === "ERR_STREAM_PREMATURE_CLOSE";
|
|
5228
5160
|
const abortStream = (stream) => {
|
|
5229
5161
|
if (stream.readable || stream.writable) stream.destroy();
|
|
5230
5162
|
};
|
|
5231
|
-
const errorStream = (stream, error
|
|
5163
|
+
const errorStream = (stream, error) => {
|
|
5232
5164
|
if (!stream.destroyed) {
|
|
5233
5165
|
stream.once("error", noop);
|
|
5234
|
-
stream.destroy(error
|
|
5166
|
+
stream.destroy(error);
|
|
5235
5167
|
}
|
|
5236
5168
|
};
|
|
5237
5169
|
const noop = () => {};
|
|
5238
|
-
const updateMaxListeners = (passThroughStream, increment
|
|
5170
|
+
const updateMaxListeners = (passThroughStream, increment) => {
|
|
5239
5171
|
const maxListeners = passThroughStream.getMaxListeners();
|
|
5240
|
-
if (maxListeners !== 0 && maxListeners !== Number.POSITIVE_INFINITY) passThroughStream.setMaxListeners(maxListeners + increment
|
|
5172
|
+
if (maxListeners !== 0 && maxListeners !== Number.POSITIVE_INFINITY) passThroughStream.setMaxListeners(maxListeners + increment);
|
|
5241
5173
|
};
|
|
5242
5174
|
const PASSTHROUGH_LISTENERS_COUNT = 2;
|
|
5243
5175
|
const PASSTHROUGH_LISTENERS_PER_STREAM = 1;
|
|
5244
|
-
|
|
5245
5176
|
//#endregion
|
|
5246
5177
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/pipeline.js
|
|
5247
5178
|
const pipeStreams = (source, destination) => {
|
|
@@ -5277,7 +5208,6 @@ const onDestinationFinish = async (source, destination) => {
|
|
|
5277
5208
|
const abortSourceStream = (source) => {
|
|
5278
5209
|
if (source.readable) source.destroy();
|
|
5279
5210
|
};
|
|
5280
|
-
|
|
5281
5211
|
//#endregion
|
|
5282
5212
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/output-async.js
|
|
5283
5213
|
const pipeOutputAsync = (subprocess, fileDescriptors, controller) => {
|
|
@@ -5318,7 +5248,6 @@ const setStandardStreamMaxListeners = (stream, { signal }) => {
|
|
|
5318
5248
|
if (isStandardStream(stream)) incrementMaxListeners(stream, MAX_LISTENERS_INCREMENT, signal);
|
|
5319
5249
|
};
|
|
5320
5250
|
const MAX_LISTENERS_INCREMENT = 2;
|
|
5321
|
-
|
|
5322
5251
|
//#endregion
|
|
5323
5252
|
//#region ../../node_modules/.pnpm/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/signals.js
|
|
5324
5253
|
/**
|
|
@@ -5351,10 +5280,9 @@ const signals = [];
|
|
|
5351
5280
|
signals.push("SIGHUP", "SIGINT", "SIGTERM");
|
|
5352
5281
|
if (process.platform !== "win32") signals.push("SIGALRM", "SIGABRT", "SIGVTALRM", "SIGXCPU", "SIGXFSZ", "SIGUSR2", "SIGTRAP", "SIGSYS", "SIGQUIT", "SIGIOT");
|
|
5353
5282
|
if (process.platform === "linux") signals.push("SIGIO", "SIGPOLL", "SIGPWR", "SIGSTKFLT");
|
|
5354
|
-
|
|
5355
5283
|
//#endregion
|
|
5356
5284
|
//#region ../../node_modules/.pnpm/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/index.js
|
|
5357
|
-
const processOk = (process
|
|
5285
|
+
const processOk = (process) => !!process && typeof process === "object" && typeof process.removeListener === "function" && typeof process.emit === "function" && typeof process.reallyExit === "function" && typeof process.listeners === "function" && typeof process.kill === "function" && typeof process.pid === "number" && typeof process.on === "function";
|
|
5358
5286
|
const kExitEmitter = Symbol.for("signal-exit emitter");
|
|
5359
5287
|
const global$1 = globalThis;
|
|
5360
5288
|
const ObjectDefineProperty = Object.defineProperty.bind(Object);
|
|
@@ -5383,12 +5311,12 @@ var Emitter = class {
|
|
|
5383
5311
|
}
|
|
5384
5312
|
removeListener(ev, fn) {
|
|
5385
5313
|
const list = this.listeners[ev];
|
|
5386
|
-
const i
|
|
5314
|
+
const i = list.indexOf(fn);
|
|
5387
5315
|
/* c8 ignore start */
|
|
5388
|
-
if (i
|
|
5316
|
+
if (i === -1) return;
|
|
5389
5317
|
/* c8 ignore stop */
|
|
5390
|
-
if (i
|
|
5391
|
-
else list.splice(i
|
|
5318
|
+
if (i === 0 && list.length === 1) list.length = 0;
|
|
5319
|
+
else list.splice(i, 1);
|
|
5392
5320
|
}
|
|
5393
5321
|
emit(ev, code, signal) {
|
|
5394
5322
|
if (this.emitted[ev]) return false;
|
|
@@ -5430,27 +5358,27 @@ var SignalExit = class extends SignalExitBase {
|
|
|
5430
5358
|
#originalProcessReallyExit;
|
|
5431
5359
|
#sigListeners = {};
|
|
5432
5360
|
#loaded = false;
|
|
5433
|
-
constructor(process
|
|
5361
|
+
constructor(process) {
|
|
5434
5362
|
super();
|
|
5435
|
-
this.#process = process
|
|
5363
|
+
this.#process = process;
|
|
5436
5364
|
this.#sigListeners = {};
|
|
5437
5365
|
for (const sig of signals) this.#sigListeners[sig] = () => {
|
|
5438
5366
|
const listeners = this.#process.listeners(sig);
|
|
5439
|
-
let { count
|
|
5367
|
+
let { count } = this.#emitter;
|
|
5440
5368
|
/* c8 ignore start */
|
|
5441
|
-
const p = process
|
|
5442
|
-
if (typeof p.__signal_exit_emitter__ === "object" && typeof p.__signal_exit_emitter__.count === "number") count
|
|
5369
|
+
const p = process;
|
|
5370
|
+
if (typeof p.__signal_exit_emitter__ === "object" && typeof p.__signal_exit_emitter__.count === "number") count += p.__signal_exit_emitter__.count;
|
|
5443
5371
|
/* c8 ignore stop */
|
|
5444
|
-
if (listeners.length === count
|
|
5372
|
+
if (listeners.length === count) {
|
|
5445
5373
|
this.unload();
|
|
5446
5374
|
const ret = this.#emitter.emit("exit", null, sig);
|
|
5447
5375
|
/* c8 ignore start */
|
|
5448
5376
|
const s = sig === "SIGHUP" ? this.#hupSig : sig;
|
|
5449
|
-
if (!ret) process
|
|
5377
|
+
if (!ret) process.kill(process.pid, s);
|
|
5450
5378
|
}
|
|
5451
5379
|
};
|
|
5452
|
-
this.#originalProcessReallyExit = process
|
|
5453
|
-
this.#originalProcessEmit = process
|
|
5380
|
+
this.#originalProcessReallyExit = process.reallyExit;
|
|
5381
|
+
this.#originalProcessEmit = process.emit;
|
|
5454
5382
|
}
|
|
5455
5383
|
onExit(cb, opts) {
|
|
5456
5384
|
/* c8 ignore start */
|
|
@@ -5472,8 +5400,8 @@ var SignalExit = class extends SignalExitBase {
|
|
|
5472
5400
|
const fn = this.#sigListeners[sig];
|
|
5473
5401
|
if (fn) this.#process.on(sig, fn);
|
|
5474
5402
|
} catch (_) {}
|
|
5475
|
-
this.#process.emit = (ev, ...a
|
|
5476
|
-
return this.#processEmit(ev, ...a
|
|
5403
|
+
this.#process.emit = (ev, ...a) => {
|
|
5404
|
+
return this.#processEmit(ev, ...a);
|
|
5477
5405
|
};
|
|
5478
5406
|
this.#process.reallyExit = (code) => {
|
|
5479
5407
|
return this.#processReallyExit(code);
|
|
@@ -5519,7 +5447,6 @@ var SignalExit = class extends SignalExitBase {
|
|
|
5519
5447
|
};
|
|
5520
5448
|
const process$2 = globalThis.process;
|
|
5521
5449
|
const { onExit, load, unload } = signalExitWrap(processOk(process$2) ? new SignalExit(process$2) : new SignalExitFallback());
|
|
5522
|
-
|
|
5523
5450
|
//#endregion
|
|
5524
5451
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/terminate/cleanup.js
|
|
5525
5452
|
const cleanupOnExit = (subprocess, { cleanup, detached }, { signal }) => {
|
|
@@ -5531,7 +5458,6 @@ const cleanupOnExit = (subprocess, { cleanup, detached }, { signal }) => {
|
|
|
5531
5458
|
removeExitHandler();
|
|
5532
5459
|
});
|
|
5533
5460
|
};
|
|
5534
|
-
|
|
5535
5461
|
//#endregion
|
|
5536
5462
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/pipe/pipe-arguments.js
|
|
5537
5463
|
const normalizePipeArguments = ({ source, sourcePromise, boundOptions, createNested }, ...pipeArguments) => {
|
|
@@ -5561,8 +5487,8 @@ const getDestinationStream = (boundOptions, createNested, pipeArguments) => {
|
|
|
5561
5487
|
from,
|
|
5562
5488
|
unpipeSignal
|
|
5563
5489
|
};
|
|
5564
|
-
} catch (error
|
|
5565
|
-
return { destinationError: error
|
|
5490
|
+
} catch (error) {
|
|
5491
|
+
return { destinationError: error };
|
|
5566
5492
|
}
|
|
5567
5493
|
};
|
|
5568
5494
|
const getDestination = (boundOptions, createNested, firstArgument, ...pipeArguments) => {
|
|
@@ -5595,22 +5521,21 @@ const mapDestinationArguments = ({ options }) => ({ options: {
|
|
|
5595
5521
|
const getSourceStream = (source, from) => {
|
|
5596
5522
|
try {
|
|
5597
5523
|
return { sourceStream: getFromStream(source, from) };
|
|
5598
|
-
} catch (error
|
|
5599
|
-
return { sourceError: error
|
|
5524
|
+
} catch (error) {
|
|
5525
|
+
return { sourceError: error };
|
|
5600
5526
|
}
|
|
5601
5527
|
};
|
|
5602
|
-
|
|
5603
5528
|
//#endregion
|
|
5604
5529
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/pipe/throw.js
|
|
5605
5530
|
const handlePipeArgumentsError = ({ sourceStream, sourceError, destinationStream, destinationError, fileDescriptors, sourceOptions, startTime }) => {
|
|
5606
|
-
const error
|
|
5531
|
+
const error = getPipeArgumentsError({
|
|
5607
5532
|
sourceStream,
|
|
5608
5533
|
sourceError,
|
|
5609
5534
|
destinationStream,
|
|
5610
5535
|
destinationError
|
|
5611
5536
|
});
|
|
5612
|
-
if (error
|
|
5613
|
-
error
|
|
5537
|
+
if (error !== void 0) throw createNonCommandError({
|
|
5538
|
+
error,
|
|
5614
5539
|
fileDescriptors,
|
|
5615
5540
|
sourceOptions,
|
|
5616
5541
|
startTime
|
|
@@ -5627,8 +5552,8 @@ const getPipeArgumentsError = ({ sourceStream, sourceError, destinationStream, d
|
|
|
5627
5552
|
return sourceError;
|
|
5628
5553
|
}
|
|
5629
5554
|
};
|
|
5630
|
-
const createNonCommandError = ({ error
|
|
5631
|
-
error
|
|
5555
|
+
const createNonCommandError = ({ error, fileDescriptors, sourceOptions, startTime }) => makeEarlyError({
|
|
5556
|
+
error,
|
|
5632
5557
|
command: PIPE_COMMAND_MESSAGE,
|
|
5633
5558
|
escapedCommand: PIPE_COMMAND_MESSAGE,
|
|
5634
5559
|
fileDescriptors,
|
|
@@ -5637,7 +5562,6 @@ const createNonCommandError = ({ error: error$1, fileDescriptors, sourceOptions,
|
|
|
5637
5562
|
isSync: false
|
|
5638
5563
|
});
|
|
5639
5564
|
const PIPE_COMMAND_MESSAGE = "source.pipe(destination)";
|
|
5640
|
-
|
|
5641
5565
|
//#endregion
|
|
5642
5566
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/pipe/sequence.js
|
|
5643
5567
|
const waitForBothSubprocesses = async (subprocessPromises) => {
|
|
@@ -5647,7 +5571,6 @@ const waitForBothSubprocesses = async (subprocessPromises) => {
|
|
|
5647
5571
|
if (sourceStatus === "rejected") throw sourceResult;
|
|
5648
5572
|
return destinationResult;
|
|
5649
5573
|
};
|
|
5650
|
-
|
|
5651
5574
|
//#endregion
|
|
5652
5575
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/pipe/streaming.js
|
|
5653
5576
|
const pipeSubprocessStream = (sourceStream, destinationStream, maxListenersController) => {
|
|
@@ -5681,7 +5604,6 @@ const cleanupMergedStreamsMap = async (destinationStream) => {
|
|
|
5681
5604
|
const MERGED_STREAMS = /* @__PURE__ */ new WeakMap();
|
|
5682
5605
|
const SOURCE_LISTENERS_PER_PIPE = 2;
|
|
5683
5606
|
const DESTINATION_LISTENERS_PER_PIPE = 1;
|
|
5684
|
-
|
|
5685
5607
|
//#endregion
|
|
5686
5608
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/pipe/abort.js
|
|
5687
5609
|
const unpipeOnAbort = (unpipeSignal, unpipeContext) => unpipeSignal === void 0 ? [] : [unpipeOnSignalAbort(unpipeSignal, unpipeContext)];
|
|
@@ -5695,7 +5617,6 @@ const unpipeOnSignalAbort = async (unpipeSignal, { sourceStream, mergedStream, f
|
|
|
5695
5617
|
startTime
|
|
5696
5618
|
});
|
|
5697
5619
|
};
|
|
5698
|
-
|
|
5699
5620
|
//#endregion
|
|
5700
5621
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/pipe/setup.js
|
|
5701
5622
|
const pipeToSubprocess = (sourceInfo, ...pipeArguments) => {
|
|
@@ -5706,7 +5627,7 @@ const pipeToSubprocess = (sourceInfo, ...pipeArguments) => {
|
|
|
5706
5627
|
...pipeArguments[0]
|
|
5707
5628
|
}
|
|
5708
5629
|
});
|
|
5709
|
-
const { destination
|
|
5630
|
+
const { destination, ...normalizedInfo } = normalizePipeArguments(sourceInfo, ...pipeArguments);
|
|
5710
5631
|
const promise = handlePipePromise({
|
|
5711
5632
|
...normalizedInfo,
|
|
5712
5633
|
destination
|
|
@@ -5745,7 +5666,6 @@ const handlePipePromise = async ({ sourcePromise, sourceStream, sourceOptions, s
|
|
|
5745
5666
|
}
|
|
5746
5667
|
};
|
|
5747
5668
|
const getSubprocessPromises = (sourcePromise, destination) => Promise.allSettled([sourcePromise, destination]);
|
|
5748
|
-
|
|
5749
5669
|
//#endregion
|
|
5750
5670
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/iterate.js
|
|
5751
5671
|
const iterateOnSubprocessStream = ({ subprocessStdout, subprocess, binary, shouldEncode, encoding, preserveNewlines }) => {
|
|
@@ -5768,7 +5688,7 @@ const stopReadingOnExit = async (subprocess, controller) => {
|
|
|
5768
5688
|
controller.abort();
|
|
5769
5689
|
}
|
|
5770
5690
|
};
|
|
5771
|
-
const iterateForResult = ({ stream, onStreamEnd, lines, encoding, stripFinalNewline
|
|
5691
|
+
const iterateForResult = ({ stream, onStreamEnd, lines, encoding, stripFinalNewline, allMixed }) => {
|
|
5772
5692
|
const controller = new AbortController();
|
|
5773
5693
|
stopReadingOnStreamEnd(onStreamEnd, controller, stream);
|
|
5774
5694
|
const objectMode = stream.readableObjectMode && !allMixed;
|
|
@@ -5779,7 +5699,7 @@ const iterateForResult = ({ stream, onStreamEnd, lines, encoding, stripFinalNewl
|
|
|
5779
5699
|
shouldEncode: !objectMode,
|
|
5780
5700
|
encoding,
|
|
5781
5701
|
shouldSplit: !objectMode && lines,
|
|
5782
|
-
preserveNewlines: !stripFinalNewline
|
|
5702
|
+
preserveNewlines: !stripFinalNewline
|
|
5783
5703
|
});
|
|
5784
5704
|
};
|
|
5785
5705
|
const stopReadingOnStreamEnd = async (onStreamEnd, controller, stream) => {
|
|
@@ -5818,17 +5738,16 @@ const iterateOnData = async function* ({ onStdoutChunk, controller, binary, shou
|
|
|
5818
5738
|
});
|
|
5819
5739
|
try {
|
|
5820
5740
|
for await (const [chunk] of onStdoutChunk) yield* transformChunkSync(chunk, generators, 0);
|
|
5821
|
-
} catch (error
|
|
5822
|
-
if (!controller.signal.aborted) throw error
|
|
5741
|
+
} catch (error) {
|
|
5742
|
+
if (!controller.signal.aborted) throw error;
|
|
5823
5743
|
} finally {
|
|
5824
5744
|
yield* finalChunksSync(generators);
|
|
5825
5745
|
}
|
|
5826
5746
|
};
|
|
5827
5747
|
const getGenerators = ({ binary, shouldEncode, encoding, shouldSplit, preserveNewlines }) => [getEncodingTransformGenerator(binary, encoding, !shouldEncode), getSplitLinesGenerator(binary, preserveNewlines, !shouldSplit, {})].filter(Boolean);
|
|
5828
|
-
|
|
5829
5748
|
//#endregion
|
|
5830
5749
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/io/contents.js
|
|
5831
|
-
const getStreamOutput = async ({ stream, onStreamEnd, fdNumber, encoding, buffer, maxBuffer, lines, allMixed, stripFinalNewline
|
|
5750
|
+
const getStreamOutput = async ({ stream, onStreamEnd, fdNumber, encoding, buffer, maxBuffer, lines, allMixed, stripFinalNewline, verboseInfo, streamInfo }) => {
|
|
5832
5751
|
const logPromise = logOutputAsync({
|
|
5833
5752
|
stream,
|
|
5834
5753
|
onStreamEnd,
|
|
@@ -5847,7 +5766,7 @@ const getStreamOutput = async ({ stream, onStreamEnd, fdNumber, encoding, buffer
|
|
|
5847
5766
|
onStreamEnd,
|
|
5848
5767
|
lines,
|
|
5849
5768
|
encoding,
|
|
5850
|
-
stripFinalNewline: getStripFinalNewline(stripFinalNewline
|
|
5769
|
+
stripFinalNewline: getStripFinalNewline(stripFinalNewline, fdNumber),
|
|
5851
5770
|
allMixed
|
|
5852
5771
|
});
|
|
5853
5772
|
const [output] = await Promise.all([getStreamContents({
|
|
@@ -5885,9 +5804,9 @@ const getStreamContents = async ({ stream, stream: { readableObjectMode }, itera
|
|
|
5885
5804
|
if (readableObjectMode || lines) return await getStreamAsArray(iterable, { maxBuffer });
|
|
5886
5805
|
if (encoding === "buffer") return new Uint8Array(await getStreamAsArrayBuffer(iterable, { maxBuffer }));
|
|
5887
5806
|
return await getStreamAsString(iterable, { maxBuffer });
|
|
5888
|
-
} catch (error
|
|
5807
|
+
} catch (error) {
|
|
5889
5808
|
return handleBufferedData(handleMaxBuffer({
|
|
5890
|
-
error
|
|
5809
|
+
error,
|
|
5891
5810
|
stream,
|
|
5892
5811
|
readableObjectMode,
|
|
5893
5812
|
lines,
|
|
@@ -5899,12 +5818,11 @@ const getStreamContents = async ({ stream, stream: { readableObjectMode }, itera
|
|
|
5899
5818
|
const getBufferedData = async (streamPromise) => {
|
|
5900
5819
|
try {
|
|
5901
5820
|
return await streamPromise;
|
|
5902
|
-
} catch (error
|
|
5903
|
-
return handleBufferedData(error
|
|
5821
|
+
} catch (error) {
|
|
5822
|
+
return handleBufferedData(error);
|
|
5904
5823
|
}
|
|
5905
5824
|
};
|
|
5906
5825
|
const handleBufferedData = ({ bufferedData }) => isArrayBuffer(bufferedData) ? new Uint8Array(bufferedData) : bufferedData;
|
|
5907
|
-
|
|
5908
5826
|
//#endregion
|
|
5909
5827
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/wait-stream.js
|
|
5910
5828
|
const waitForStream = async (stream, fdNumber, streamInfo, { isSameDirection, stopOnExit = false } = {}) => {
|
|
@@ -5915,8 +5833,8 @@ const waitForStream = async (stream, fdNumber, streamInfo, { isSameDirection, st
|
|
|
5915
5833
|
cleanup: true,
|
|
5916
5834
|
signal: abortController.signal
|
|
5917
5835
|
})]);
|
|
5918
|
-
} catch (error
|
|
5919
|
-
if (!state.stdinCleanedUp) handleStreamError(error
|
|
5836
|
+
} catch (error) {
|
|
5837
|
+
if (!state.stdinCleanedUp) handleStreamError(error, fdNumber, streamInfo, isSameDirection);
|
|
5920
5838
|
} finally {
|
|
5921
5839
|
abortController.abort();
|
|
5922
5840
|
}
|
|
@@ -5936,21 +5854,20 @@ const spyOnStdinDestroy = (subprocessStdin, subprocess, state) => {
|
|
|
5936
5854
|
const setStdinCleanedUp = ({ exitCode, signalCode }, state) => {
|
|
5937
5855
|
if (exitCode !== null || signalCode !== null) state.stdinCleanedUp = true;
|
|
5938
5856
|
};
|
|
5939
|
-
const handleStreamError = (error
|
|
5940
|
-
if (!shouldIgnoreStreamError(error
|
|
5857
|
+
const handleStreamError = (error, fdNumber, streamInfo, isSameDirection) => {
|
|
5858
|
+
if (!shouldIgnoreStreamError(error, fdNumber, streamInfo, isSameDirection)) throw error;
|
|
5941
5859
|
};
|
|
5942
|
-
const shouldIgnoreStreamError = (error
|
|
5943
|
-
if (streamInfo.propagating) return isStreamEpipe(error
|
|
5860
|
+
const shouldIgnoreStreamError = (error, fdNumber, streamInfo, isSameDirection = true) => {
|
|
5861
|
+
if (streamInfo.propagating) return isStreamEpipe(error) || isStreamAbort(error);
|
|
5944
5862
|
streamInfo.propagating = true;
|
|
5945
|
-
return isInputFileDescriptor(streamInfo, fdNumber) === isSameDirection ? isStreamEpipe(error
|
|
5863
|
+
return isInputFileDescriptor(streamInfo, fdNumber) === isSameDirection ? isStreamEpipe(error) : isStreamAbort(error);
|
|
5946
5864
|
};
|
|
5947
5865
|
const isInputFileDescriptor = ({ fileDescriptors }, fdNumber) => fdNumber !== "all" && fileDescriptors[fdNumber].direction === "input";
|
|
5948
|
-
const isStreamAbort = (error
|
|
5949
|
-
const isStreamEpipe = (error
|
|
5950
|
-
|
|
5866
|
+
const isStreamAbort = (error) => error?.code === "ERR_STREAM_PREMATURE_CLOSE";
|
|
5867
|
+
const isStreamEpipe = (error) => error?.code === "EPIPE";
|
|
5951
5868
|
//#endregion
|
|
5952
5869
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/stdio.js
|
|
5953
|
-
const waitForStdioStreams = ({ subprocess, encoding, buffer, maxBuffer, lines, stripFinalNewline
|
|
5870
|
+
const waitForStdioStreams = ({ subprocess, encoding, buffer, maxBuffer, lines, stripFinalNewline, verboseInfo, streamInfo }) => subprocess.stdio.map((stream, fdNumber) => waitForSubprocessStream({
|
|
5954
5871
|
stream,
|
|
5955
5872
|
fdNumber,
|
|
5956
5873
|
encoding,
|
|
@@ -5958,11 +5875,11 @@ const waitForStdioStreams = ({ subprocess, encoding, buffer, maxBuffer, lines, s
|
|
|
5958
5875
|
maxBuffer: maxBuffer[fdNumber],
|
|
5959
5876
|
lines: lines[fdNumber],
|
|
5960
5877
|
allMixed: false,
|
|
5961
|
-
stripFinalNewline
|
|
5878
|
+
stripFinalNewline,
|
|
5962
5879
|
verboseInfo,
|
|
5963
5880
|
streamInfo
|
|
5964
5881
|
}));
|
|
5965
|
-
const waitForSubprocessStream = async ({ stream, fdNumber, encoding, buffer, maxBuffer, lines, allMixed, stripFinalNewline
|
|
5882
|
+
const waitForSubprocessStream = async ({ stream, fdNumber, encoding, buffer, maxBuffer, lines, allMixed, stripFinalNewline, verboseInfo, streamInfo }) => {
|
|
5966
5883
|
if (!stream) return;
|
|
5967
5884
|
const onStreamEnd = waitForStream(stream, fdNumber, streamInfo);
|
|
5968
5885
|
if (isInputFileDescriptor(streamInfo, fdNumber)) {
|
|
@@ -5978,24 +5895,23 @@ const waitForSubprocessStream = async ({ stream, fdNumber, encoding, buffer, max
|
|
|
5978
5895
|
maxBuffer,
|
|
5979
5896
|
lines,
|
|
5980
5897
|
allMixed,
|
|
5981
|
-
stripFinalNewline
|
|
5898
|
+
stripFinalNewline,
|
|
5982
5899
|
verboseInfo,
|
|
5983
5900
|
streamInfo
|
|
5984
5901
|
}), onStreamEnd]);
|
|
5985
5902
|
return output;
|
|
5986
5903
|
};
|
|
5987
|
-
|
|
5988
5904
|
//#endregion
|
|
5989
5905
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/all-async.js
|
|
5990
5906
|
const makeAllStream = ({ stdout, stderr }, { all }) => all && (stdout || stderr) ? mergeStreams([stdout, stderr].filter(Boolean)) : void 0;
|
|
5991
|
-
const waitForAllStream = ({ subprocess, encoding, buffer, maxBuffer, lines, stripFinalNewline
|
|
5907
|
+
const waitForAllStream = ({ subprocess, encoding, buffer, maxBuffer, lines, stripFinalNewline, verboseInfo, streamInfo }) => waitForSubprocessStream({
|
|
5992
5908
|
...getAllStream(subprocess, buffer),
|
|
5993
5909
|
fdNumber: "all",
|
|
5994
5910
|
encoding,
|
|
5995
5911
|
maxBuffer: maxBuffer[1] + maxBuffer[2],
|
|
5996
5912
|
lines: lines[1] || lines[2],
|
|
5997
5913
|
allMixed: getAllMixed(subprocess),
|
|
5998
|
-
stripFinalNewline
|
|
5914
|
+
stripFinalNewline,
|
|
5999
5915
|
verboseInfo,
|
|
6000
5916
|
streamInfo
|
|
6001
5917
|
});
|
|
@@ -6019,7 +5935,6 @@ const getAllStream = ({ stdout, stderr, all }, [, bufferStdout, bufferStderr]) =
|
|
|
6019
5935
|
};
|
|
6020
5936
|
};
|
|
6021
5937
|
const getAllMixed = ({ all, stdout, stderr }) => all && stdout && stderr && stdout.readableObjectMode !== stderr.readableObjectMode;
|
|
6022
|
-
|
|
6023
5938
|
//#endregion
|
|
6024
5939
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/verbose/ipc.js
|
|
6025
5940
|
const shouldLogIpc = (verboseInfo) => isFullVerbose(verboseInfo, "ipc");
|
|
@@ -6031,12 +5946,11 @@ const logIpcOutput = (message, verboseInfo) => {
|
|
|
6031
5946
|
verboseInfo
|
|
6032
5947
|
});
|
|
6033
5948
|
};
|
|
6034
|
-
|
|
6035
5949
|
//#endregion
|
|
6036
5950
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/ipc/buffer-messages.js
|
|
6037
5951
|
const waitForIpcOutput = async ({ subprocess, buffer: bufferArray, maxBuffer: maxBufferArray, ipc, ipcOutput, verboseInfo }) => {
|
|
6038
5952
|
if (!ipc) return ipcOutput;
|
|
6039
|
-
const isVerbose
|
|
5953
|
+
const isVerbose = shouldLogIpc(verboseInfo);
|
|
6040
5954
|
const buffer = getFdSpecificValue(bufferArray, "ipc");
|
|
6041
5955
|
const maxBuffer = getFdSpecificValue(maxBufferArray, "ipc");
|
|
6042
5956
|
for await (const message of loopOnMessages({
|
|
@@ -6051,7 +5965,7 @@ const waitForIpcOutput = async ({ subprocess, buffer: bufferArray, maxBuffer: ma
|
|
|
6051
5965
|
checkIpcMaxBuffer(subprocess, ipcOutput, maxBuffer);
|
|
6052
5966
|
ipcOutput.push(message);
|
|
6053
5967
|
}
|
|
6054
|
-
if (isVerbose
|
|
5968
|
+
if (isVerbose) logIpcOutput(message, verboseInfo);
|
|
6055
5969
|
}
|
|
6056
5970
|
return ipcOutput;
|
|
6057
5971
|
};
|
|
@@ -6059,10 +5973,9 @@ const getBufferedIpcOutput = async (ipcOutputPromise, ipcOutput) => {
|
|
|
6059
5973
|
await Promise.allSettled([ipcOutputPromise]);
|
|
6060
5974
|
return ipcOutput;
|
|
6061
5975
|
};
|
|
6062
|
-
|
|
6063
5976
|
//#endregion
|
|
6064
5977
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/resolve/wait-subprocess.js
|
|
6065
|
-
const waitForSubprocessResult = async ({ subprocess, options: { encoding, buffer, maxBuffer, lines, timeoutDuration: timeout, cancelSignal, gracefulCancel, forceKillAfterDelay, stripFinalNewline
|
|
5978
|
+
const waitForSubprocessResult = async ({ subprocess, options: { encoding, buffer, maxBuffer, lines, timeoutDuration: timeout, cancelSignal, gracefulCancel, forceKillAfterDelay, stripFinalNewline, ipc, ipcInput }, context, verboseInfo, fileDescriptors, originalStreams, onInternalError, controller }) => {
|
|
6066
5979
|
const exitPromise = waitForExit(subprocess, context);
|
|
6067
5980
|
const streamInfo = {
|
|
6068
5981
|
originalStreams,
|
|
@@ -6077,7 +5990,7 @@ const waitForSubprocessResult = async ({ subprocess, options: { encoding, buffer
|
|
|
6077
5990
|
buffer,
|
|
6078
5991
|
maxBuffer,
|
|
6079
5992
|
lines,
|
|
6080
|
-
stripFinalNewline
|
|
5993
|
+
stripFinalNewline,
|
|
6081
5994
|
verboseInfo,
|
|
6082
5995
|
streamInfo
|
|
6083
5996
|
});
|
|
@@ -6087,7 +6000,7 @@ const waitForSubprocessResult = async ({ subprocess, options: { encoding, buffer
|
|
|
6087
6000
|
buffer,
|
|
6088
6001
|
maxBuffer,
|
|
6089
6002
|
lines,
|
|
6090
|
-
stripFinalNewline
|
|
6003
|
+
stripFinalNewline,
|
|
6091
6004
|
verboseInfo,
|
|
6092
6005
|
streamInfo
|
|
6093
6006
|
});
|
|
@@ -6133,10 +6046,10 @@ const waitForSubprocessResult = async ({ subprocess, options: { encoding, buffer
|
|
|
6133
6046
|
controller
|
|
6134
6047
|
})
|
|
6135
6048
|
]);
|
|
6136
|
-
} catch (error
|
|
6049
|
+
} catch (error) {
|
|
6137
6050
|
context.terminationReason ??= "other";
|
|
6138
6051
|
return Promise.all([
|
|
6139
|
-
{ error
|
|
6052
|
+
{ error },
|
|
6140
6053
|
exitPromise,
|
|
6141
6054
|
Promise.all(stdioPromises.map((stdioPromise) => getBufferedData(stdioPromise))),
|
|
6142
6055
|
getBufferedData(allPromise),
|
|
@@ -6152,10 +6065,9 @@ const waitForCustomStreamsEnd = (fileDescriptors, streamInfo) => fileDescriptors
|
|
|
6152
6065
|
stopOnExit: type === "native"
|
|
6153
6066
|
})));
|
|
6154
6067
|
const throwOnSubprocessError = async (subprocess, { signal }) => {
|
|
6155
|
-
const [error
|
|
6156
|
-
throw error
|
|
6068
|
+
const [error] = await once(subprocess, "error", { signal });
|
|
6069
|
+
throw error;
|
|
6157
6070
|
};
|
|
6158
|
-
|
|
6159
6071
|
//#endregion
|
|
6160
6072
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/concurrent.js
|
|
6161
6073
|
const initializeConcurrentStreams = () => ({
|
|
@@ -6179,7 +6091,6 @@ const waitForConcurrentStreams = async ({ resolve, promises }, subprocess) => {
|
|
|
6179
6091
|
const [isSubprocessExit] = await Promise.race([Promise.allSettled([true, subprocess]), Promise.all([false, ...promises])]);
|
|
6180
6092
|
return !isSubprocessExit;
|
|
6181
6093
|
};
|
|
6182
|
-
|
|
6183
6094
|
//#endregion
|
|
6184
6095
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/shared.js
|
|
6185
6096
|
const safeWaitForSubprocessStdin = async (subprocessStdin) => {
|
|
@@ -6208,15 +6119,14 @@ const waitForSubprocessStdout = async (subprocessStdout) => {
|
|
|
6208
6119
|
writable: false
|
|
6209
6120
|
});
|
|
6210
6121
|
};
|
|
6211
|
-
const waitForSubprocess = async (subprocess, error
|
|
6122
|
+
const waitForSubprocess = async (subprocess, error) => {
|
|
6212
6123
|
await subprocess;
|
|
6213
|
-
if (error
|
|
6124
|
+
if (error) throw error;
|
|
6214
6125
|
};
|
|
6215
|
-
const destroyOtherStream = (stream, isOpen, error
|
|
6216
|
-
if (error
|
|
6126
|
+
const destroyOtherStream = (stream, isOpen, error) => {
|
|
6127
|
+
if (error && !isStreamAbort(error)) stream.destroy(error);
|
|
6217
6128
|
else if (isOpen) stream.destroy();
|
|
6218
6129
|
};
|
|
6219
|
-
|
|
6220
6130
|
//#endregion
|
|
6221
6131
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/readable.js
|
|
6222
6132
|
const createReadable = ({ subprocess, concurrentStreams, encoding }, { from, binary: binaryOption = true, preserveNewlines = true } = {}) => {
|
|
@@ -6230,7 +6140,7 @@ const createReadable = ({ subprocess, concurrentStreams, encoding }, { from, bin
|
|
|
6230
6140
|
encoding,
|
|
6231
6141
|
preserveNewlines
|
|
6232
6142
|
});
|
|
6233
|
-
const readable
|
|
6143
|
+
const readable = new Readable({
|
|
6234
6144
|
read,
|
|
6235
6145
|
destroy: callbackify(onReadableDestroy.bind(void 0, {
|
|
6236
6146
|
subprocessStdout,
|
|
@@ -6244,10 +6154,10 @@ const createReadable = ({ subprocess, concurrentStreams, encoding }, { from, bin
|
|
|
6244
6154
|
onStdoutFinished({
|
|
6245
6155
|
subprocessStdout,
|
|
6246
6156
|
onStdoutDataDone,
|
|
6247
|
-
readable
|
|
6157
|
+
readable,
|
|
6248
6158
|
subprocess
|
|
6249
6159
|
});
|
|
6250
|
-
return readable
|
|
6160
|
+
return readable;
|
|
6251
6161
|
};
|
|
6252
6162
|
const getSubprocessStdout = (subprocess, from, concurrentStreams) => {
|
|
6253
6163
|
const subprocessStdout = getFromStream(subprocess, from);
|
|
@@ -6282,40 +6192,39 @@ const getReadableMethods = ({ subprocessStdout, subprocess, binary, encoding, pr
|
|
|
6282
6192
|
onStdoutDataDone
|
|
6283
6193
|
};
|
|
6284
6194
|
};
|
|
6285
|
-
const onRead = async (readable
|
|
6195
|
+
const onRead = async (readable, onStdoutData, onStdoutDataDone) => {
|
|
6286
6196
|
try {
|
|
6287
6197
|
const { value, done } = await onStdoutData.next();
|
|
6288
6198
|
if (done) onStdoutDataDone.resolve();
|
|
6289
|
-
else readable
|
|
6199
|
+
else readable.push(value);
|
|
6290
6200
|
} catch {}
|
|
6291
6201
|
};
|
|
6292
|
-
const onStdoutFinished = async ({ subprocessStdout, onStdoutDataDone, readable
|
|
6202
|
+
const onStdoutFinished = async ({ subprocessStdout, onStdoutDataDone, readable, subprocess, subprocessStdin }) => {
|
|
6293
6203
|
try {
|
|
6294
6204
|
await waitForSubprocessStdout(subprocessStdout);
|
|
6295
6205
|
await subprocess;
|
|
6296
6206
|
await safeWaitForSubprocessStdin(subprocessStdin);
|
|
6297
6207
|
await onStdoutDataDone;
|
|
6298
|
-
if (readable
|
|
6299
|
-
} catch (error
|
|
6208
|
+
if (readable.readable) readable.push(null);
|
|
6209
|
+
} catch (error) {
|
|
6300
6210
|
await safeWaitForSubprocessStdin(subprocessStdin);
|
|
6301
|
-
destroyOtherReadable(readable
|
|
6211
|
+
destroyOtherReadable(readable, error);
|
|
6302
6212
|
}
|
|
6303
6213
|
};
|
|
6304
|
-
const onReadableDestroy = async ({ subprocessStdout, subprocess, waitReadableDestroy }, error
|
|
6214
|
+
const onReadableDestroy = async ({ subprocessStdout, subprocess, waitReadableDestroy }, error) => {
|
|
6305
6215
|
if (await waitForConcurrentStreams(waitReadableDestroy, subprocess)) {
|
|
6306
|
-
destroyOtherReadable(subprocessStdout, error
|
|
6307
|
-
await waitForSubprocess(subprocess, error
|
|
6216
|
+
destroyOtherReadable(subprocessStdout, error);
|
|
6217
|
+
await waitForSubprocess(subprocess, error);
|
|
6308
6218
|
}
|
|
6309
6219
|
};
|
|
6310
|
-
const destroyOtherReadable = (stream, error
|
|
6311
|
-
destroyOtherStream(stream, stream.readable, error
|
|
6220
|
+
const destroyOtherReadable = (stream, error) => {
|
|
6221
|
+
destroyOtherStream(stream, stream.readable, error);
|
|
6312
6222
|
};
|
|
6313
|
-
|
|
6314
6223
|
//#endregion
|
|
6315
6224
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/writable.js
|
|
6316
6225
|
const createWritable = ({ subprocess, concurrentStreams }, { to } = {}) => {
|
|
6317
6226
|
const { subprocessStdin, waitWritableFinal, waitWritableDestroy } = getSubprocessStdin(subprocess, to, concurrentStreams);
|
|
6318
|
-
const writable
|
|
6227
|
+
const writable = new Writable({
|
|
6319
6228
|
...getWritableMethods(subprocessStdin, subprocess, waitWritableFinal),
|
|
6320
6229
|
destroy: callbackify(onWritableDestroy.bind(void 0, {
|
|
6321
6230
|
subprocessStdin,
|
|
@@ -6326,8 +6235,8 @@ const createWritable = ({ subprocess, concurrentStreams }, { to } = {}) => {
|
|
|
6326
6235
|
highWaterMark: subprocessStdin.writableHighWaterMark,
|
|
6327
6236
|
objectMode: subprocessStdin.writableObjectMode
|
|
6328
6237
|
});
|
|
6329
|
-
onStdinFinished(subprocessStdin, writable
|
|
6330
|
-
return writable
|
|
6238
|
+
onStdinFinished(subprocessStdin, writable);
|
|
6239
|
+
return writable;
|
|
6331
6240
|
};
|
|
6332
6241
|
const getSubprocessStdin = (subprocess, to, concurrentStreams) => {
|
|
6333
6242
|
const subprocessStdin = getToStream(subprocess, to);
|
|
@@ -6351,26 +6260,25 @@ const onWritableFinal = async (subprocessStdin, subprocess, waitWritableFinal) =
|
|
|
6351
6260
|
await subprocess;
|
|
6352
6261
|
}
|
|
6353
6262
|
};
|
|
6354
|
-
const onStdinFinished = async (subprocessStdin, writable
|
|
6263
|
+
const onStdinFinished = async (subprocessStdin, writable, subprocessStdout) => {
|
|
6355
6264
|
try {
|
|
6356
6265
|
await waitForSubprocessStdin(subprocessStdin);
|
|
6357
|
-
if (writable
|
|
6358
|
-
} catch (error
|
|
6266
|
+
if (writable.writable) writable.end();
|
|
6267
|
+
} catch (error) {
|
|
6359
6268
|
await safeWaitForSubprocessStdout(subprocessStdout);
|
|
6360
|
-
destroyOtherWritable(writable
|
|
6269
|
+
destroyOtherWritable(writable, error);
|
|
6361
6270
|
}
|
|
6362
6271
|
};
|
|
6363
|
-
const onWritableDestroy = async ({ subprocessStdin, subprocess, waitWritableFinal, waitWritableDestroy }, error
|
|
6272
|
+
const onWritableDestroy = async ({ subprocessStdin, subprocess, waitWritableFinal, waitWritableDestroy }, error) => {
|
|
6364
6273
|
await waitForConcurrentStreams(waitWritableFinal, subprocess);
|
|
6365
6274
|
if (await waitForConcurrentStreams(waitWritableDestroy, subprocess)) {
|
|
6366
|
-
destroyOtherWritable(subprocessStdin, error
|
|
6367
|
-
await waitForSubprocess(subprocess, error
|
|
6275
|
+
destroyOtherWritable(subprocessStdin, error);
|
|
6276
|
+
await waitForSubprocess(subprocess, error);
|
|
6368
6277
|
}
|
|
6369
6278
|
};
|
|
6370
|
-
const destroyOtherWritable = (stream, error
|
|
6371
|
-
destroyOtherStream(stream, stream.writable, error
|
|
6279
|
+
const destroyOtherWritable = (stream, error) => {
|
|
6280
|
+
destroyOtherStream(stream, stream.writable, error);
|
|
6372
6281
|
};
|
|
6373
|
-
|
|
6374
6282
|
//#endregion
|
|
6375
6283
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/duplex.js
|
|
6376
6284
|
const createDuplex = ({ subprocess, concurrentStreams, encoding }, { from, to, binary: binaryOption = true, preserveNewlines = true } = {}) => {
|
|
@@ -6385,7 +6293,7 @@ const createDuplex = ({ subprocess, concurrentStreams, encoding }, { from, to, b
|
|
|
6385
6293
|
encoding,
|
|
6386
6294
|
preserveNewlines
|
|
6387
6295
|
});
|
|
6388
|
-
const duplex
|
|
6296
|
+
const duplex = new Duplex({
|
|
6389
6297
|
read,
|
|
6390
6298
|
...getWritableMethods(subprocessStdin, subprocess, waitWritableFinal),
|
|
6391
6299
|
destroy: callbackify(onDuplexDestroy.bind(void 0, {
|
|
@@ -6405,26 +6313,25 @@ const createDuplex = ({ subprocess, concurrentStreams, encoding }, { from, to, b
|
|
|
6405
6313
|
onStdoutFinished({
|
|
6406
6314
|
subprocessStdout,
|
|
6407
6315
|
onStdoutDataDone,
|
|
6408
|
-
readable: duplex
|
|
6316
|
+
readable: duplex,
|
|
6409
6317
|
subprocess,
|
|
6410
6318
|
subprocessStdin
|
|
6411
6319
|
});
|
|
6412
|
-
onStdinFinished(subprocessStdin, duplex
|
|
6413
|
-
return duplex
|
|
6320
|
+
onStdinFinished(subprocessStdin, duplex, subprocessStdout);
|
|
6321
|
+
return duplex;
|
|
6414
6322
|
};
|
|
6415
|
-
const onDuplexDestroy = async ({ subprocessStdout, subprocessStdin, subprocess, waitReadableDestroy, waitWritableFinal, waitWritableDestroy }, error
|
|
6323
|
+
const onDuplexDestroy = async ({ subprocessStdout, subprocessStdin, subprocess, waitReadableDestroy, waitWritableFinal, waitWritableDestroy }, error) => {
|
|
6416
6324
|
await Promise.all([onReadableDestroy({
|
|
6417
6325
|
subprocessStdout,
|
|
6418
6326
|
subprocess,
|
|
6419
6327
|
waitReadableDestroy
|
|
6420
|
-
}, error
|
|
6328
|
+
}, error), onWritableDestroy({
|
|
6421
6329
|
subprocessStdin,
|
|
6422
6330
|
subprocess,
|
|
6423
6331
|
waitWritableFinal,
|
|
6424
6332
|
waitWritableDestroy
|
|
6425
|
-
}, error
|
|
6333
|
+
}, error)]);
|
|
6426
6334
|
};
|
|
6427
|
-
|
|
6428
6335
|
//#endregion
|
|
6429
6336
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/iterable.js
|
|
6430
6337
|
const createIterable = (subprocess, encoding, { from, binary: binaryOption = false, preserveNewlines = false } = {}) => {
|
|
@@ -6447,7 +6354,6 @@ const iterateOnStdoutData = async function* (onStdoutData, subprocessStdout, sub
|
|
|
6447
6354
|
await subprocess;
|
|
6448
6355
|
}
|
|
6449
6356
|
};
|
|
6450
|
-
|
|
6451
6357
|
//#endregion
|
|
6452
6358
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/convert/add.js
|
|
6453
6359
|
const addConvertedStreams = (subprocess, { encoding }) => {
|
|
@@ -6469,7 +6375,6 @@ const addConvertedStreams = (subprocess, { encoding }) => {
|
|
|
6469
6375
|
subprocess.iterable = createIterable.bind(void 0, subprocess, encoding);
|
|
6470
6376
|
subprocess[Symbol.asyncIterator] = createIterable.bind(void 0, subprocess, encoding, {});
|
|
6471
6377
|
};
|
|
6472
|
-
|
|
6473
6378
|
//#endregion
|
|
6474
6379
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/promise.js
|
|
6475
6380
|
const mergePromise = (subprocess, promise) => {
|
|
@@ -6487,7 +6392,6 @@ const descriptors = [
|
|
|
6487
6392
|
"catch",
|
|
6488
6393
|
"finally"
|
|
6489
6394
|
].map((property) => [property, Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)]);
|
|
6490
|
-
|
|
6491
6395
|
//#endregion
|
|
6492
6396
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/main-async.js
|
|
6493
6397
|
const execaCoreAsync = (rawFile, rawArguments, rawOptions, createNested) => {
|
|
@@ -6530,7 +6434,7 @@ const handleAsyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
6530
6434
|
fileDescriptors: handleStdioAsync(options, verboseInfo)
|
|
6531
6435
|
};
|
|
6532
6436
|
};
|
|
6533
|
-
const handleAsyncOptions = ({ timeout, signal
|
|
6437
|
+
const handleAsyncOptions = ({ timeout, signal, ...options }) => {
|
|
6534
6438
|
if (signal !== void 0) throw new TypeError("The \"signal\" option has been renamed to \"cancelSignal\" instead.");
|
|
6535
6439
|
return {
|
|
6536
6440
|
...options,
|
|
@@ -6541,9 +6445,9 @@ const spawnSubprocessAsync = ({ file, commandArguments, options, startTime, verb
|
|
|
6541
6445
|
let subprocess;
|
|
6542
6446
|
try {
|
|
6543
6447
|
subprocess = spawn(file, commandArguments, options);
|
|
6544
|
-
} catch (error
|
|
6448
|
+
} catch (error) {
|
|
6545
6449
|
return handleEarlyError({
|
|
6546
|
-
error
|
|
6450
|
+
error,
|
|
6547
6451
|
command,
|
|
6548
6452
|
escapedCommand,
|
|
6549
6453
|
fileDescriptors,
|
|
@@ -6640,7 +6544,6 @@ const getAsyncResult = ({ errorInfo, exitCode, signal, stdio, all, ipcOutput, co
|
|
|
6640
6544
|
options,
|
|
6641
6545
|
startTime
|
|
6642
6546
|
});
|
|
6643
|
-
|
|
6644
6547
|
//#endregion
|
|
6645
6548
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/bind.js
|
|
6646
6549
|
const mergeOptions = (boundOptions, options) => {
|
|
@@ -6658,11 +6561,10 @@ const mergeOption = (optionName, boundOptionValue, optionValue) => {
|
|
|
6658
6561
|
return optionValue;
|
|
6659
6562
|
};
|
|
6660
6563
|
const DEEP_OPTIONS = new Set(["env", ...FD_SPECIFIC_OPTIONS]);
|
|
6661
|
-
|
|
6662
6564
|
//#endregion
|
|
6663
6565
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/create.js
|
|
6664
6566
|
const createExeca = (mapArguments, boundOptions, deepOptions, setBoundExeca) => {
|
|
6665
|
-
const createNested = (mapArguments
|
|
6567
|
+
const createNested = (mapArguments, boundOptions, setBoundExeca) => createExeca(mapArguments, boundOptions, deepOptions, setBoundExeca);
|
|
6666
6568
|
const boundExeca = (...execaArguments) => callBoundExeca({
|
|
6667
6569
|
mapArguments,
|
|
6668
6570
|
deepOptions,
|
|
@@ -6699,7 +6601,6 @@ const parseArguments = ({ mapArguments, firstArgument, nextArguments, deepOption
|
|
|
6699
6601
|
isSync
|
|
6700
6602
|
};
|
|
6701
6603
|
};
|
|
6702
|
-
|
|
6703
6604
|
//#endregion
|
|
6704
6605
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/command.js
|
|
6705
6606
|
const mapCommandAsync = ({ file, commandArguments }) => parseCommand(file, commandArguments);
|
|
@@ -6728,7 +6629,6 @@ const parseCommandString = (command) => {
|
|
|
6728
6629
|
return tokens;
|
|
6729
6630
|
};
|
|
6730
6631
|
const SPACES_REGEXP = / +/g;
|
|
6731
|
-
|
|
6732
6632
|
//#endregion
|
|
6733
6633
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/lib/methods/script.js
|
|
6734
6634
|
const setScriptSync = (boundExeca, createNested, boundOptions) => {
|
|
@@ -6746,21 +6646,19 @@ const getScriptOptions = (options) => ({ options: {
|
|
|
6746
6646
|
} });
|
|
6747
6647
|
const getScriptStdinOption = ({ input, inputFile, stdio }) => input === void 0 && inputFile === void 0 && stdio === void 0 ? { stdin: "inherit" } : {};
|
|
6748
6648
|
const deepScriptOptions = { preferLocal: true };
|
|
6749
|
-
|
|
6750
6649
|
//#endregion
|
|
6751
6650
|
//#region ../../node_modules/.pnpm/execa@9.5.2/node_modules/execa/index.js
|
|
6752
6651
|
const execa = createExeca(() => ({}));
|
|
6753
|
-
|
|
6754
|
-
|
|
6755
|
-
|
|
6756
|
-
|
|
6757
|
-
|
|
6652
|
+
createExeca(() => ({ isSync: true }));
|
|
6653
|
+
createExeca(mapCommandAsync);
|
|
6654
|
+
createExeca(mapCommandSync);
|
|
6655
|
+
createExeca(mapNode);
|
|
6656
|
+
createExeca(mapScriptAsync, {}, deepScriptOptions, setScriptSync);
|
|
6758
6657
|
const { sendMessage, getOneMessage, getEachMessage, getCancelSignal } = getIpcExport();
|
|
6759
|
-
|
|
6760
6658
|
//#endregion
|
|
6761
6659
|
//#region src/utils/createWrangler.ts
|
|
6762
6660
|
const createWrangler = ({ stdio, accountId, cloudflareApiToken, cwd }) => {
|
|
6763
|
-
const
|
|
6661
|
+
const $ = execa({
|
|
6764
6662
|
stdio,
|
|
6765
6663
|
extendsEnv: true,
|
|
6766
6664
|
shell: stdio === "inherit",
|
|
@@ -6770,9 +6668,8 @@ const createWrangler = ({ stdio, accountId, cloudflareApiToken, cwd }) => {
|
|
|
6770
6668
|
CLOUDFLARE_API_TOKEN: cloudflareApiToken
|
|
6771
6669
|
}
|
|
6772
6670
|
});
|
|
6773
|
-
return (...command) =>
|
|
6671
|
+
return (...command) => $("npx", ["wrangler", ...command]);
|
|
6774
6672
|
};
|
|
6775
|
-
|
|
6776
6673
|
//#endregion
|
|
6777
6674
|
//#region src/r2Storage.ts
|
|
6778
6675
|
/**
|
|
@@ -6825,9 +6722,9 @@ const r2Storage = createStoragePlugin({
|
|
|
6825
6722
|
try {
|
|
6826
6723
|
const { stderr, exitCode } = await wrangler("r2", "object", "put", [bucketName, Key].join("/"), "--file", filePath, "--content-type", contentType, "--remote");
|
|
6827
6724
|
if (exitCode !== 0 && stderr) throw new Error(stderr);
|
|
6828
|
-
} catch (error
|
|
6829
|
-
if (error
|
|
6830
|
-
throw error
|
|
6725
|
+
} catch (error) {
|
|
6726
|
+
if (error instanceof ExecaError) throw new Error(error.stderr || error.stdout);
|
|
6727
|
+
throw error;
|
|
6831
6728
|
}
|
|
6832
6729
|
return { storageUri: `r2://${bucketName}/${Key}` };
|
|
6833
6730
|
},
|
|
@@ -6837,6 +6734,5 @@ const r2Storage = createStoragePlugin({
|
|
|
6837
6734
|
};
|
|
6838
6735
|
}
|
|
6839
6736
|
});
|
|
6840
|
-
|
|
6841
6737
|
//#endregion
|
|
6842
|
-
export { d1Database, r2Storage };
|
|
6738
|
+
export { d1Database, r2Storage };
|