@h3ravel/http 11.3.2 → 11.3.3
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/index.cjs +164 -263
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +164 -263
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
package/dist/index.js
CHANGED
|
@@ -121,8 +121,7 @@ const parseTemplate = ({ templates, expressions, tokens, index, template }) => {
|
|
|
121
121
|
const newTokens = concatTokens(tokens, nextTokens, leadingWhitespaces);
|
|
122
122
|
if (index === expressions.length) return newTokens;
|
|
123
123
|
const expression = expressions[index];
|
|
124
|
-
|
|
125
|
-
return concatTokens(newTokens, expressionTokens, trailingWhitespaces);
|
|
124
|
+
return concatTokens(newTokens, Array.isArray(expression) ? expression.map((expression$1) => parseExpression(expression$1)) : [parseExpression(expression)], trailingWhitespaces);
|
|
126
125
|
};
|
|
127
126
|
const splitByWhitespaces = (template, rawTemplate) => {
|
|
128
127
|
if (rawTemplate.length === 0) return {
|
|
@@ -209,8 +208,7 @@ const normalizeFdSpecificOptions = (options) => {
|
|
|
209
208
|
};
|
|
210
209
|
const normalizeFdSpecificOption = (options, optionName) => {
|
|
211
210
|
const optionBaseArray = Array.from({ length: getStdioLength(options) + 1 });
|
|
212
|
-
|
|
213
|
-
return addDefaultValue$1(optionArray, optionName);
|
|
211
|
+
return addDefaultValue$1(normalizeFdSpecificValue(options[optionName], optionBaseArray, optionName), optionName);
|
|
214
212
|
};
|
|
215
213
|
const getStdioLength = ({ stdio }) => Array.isArray(stdio) ? Math.max(stdio.length, STANDARD_STREAMS_ALIASES.length) : STANDARD_STREAMS_ALIASES.length;
|
|
216
214
|
const normalizeFdSpecificValue = (optionValue, optionArray, optionName) => isPlainObject(optionValue) ? normalizeOptionObject(optionValue, optionArray, optionName) : optionArray.fill(optionValue);
|
|
@@ -277,11 +275,9 @@ const VERBOSE_VALUES = [
|
|
|
277
275
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/arguments/escape.js
|
|
278
276
|
const joinCommand = (filePath, rawArguments) => {
|
|
279
277
|
const fileAndArguments = [filePath, ...rawArguments];
|
|
280
|
-
const command = fileAndArguments.join(" ");
|
|
281
|
-
const escapedCommand = fileAndArguments.map((fileAndArgument) => quoteString(escapeControlCharacters(fileAndArgument))).join(" ");
|
|
282
278
|
return {
|
|
283
|
-
command,
|
|
284
|
-
escapedCommand
|
|
279
|
+
command: fileAndArguments.join(" "),
|
|
280
|
+
escapedCommand: fileAndArguments.map((fileAndArgument) => quoteString(escapeControlCharacters(fileAndArgument))).join(" ")
|
|
285
281
|
};
|
|
286
282
|
};
|
|
287
283
|
const escapeLines = (lines) => stripVTControlCharacters(lines).split("\n").map((line) => escapeControlCharacters(line)).join("\n");
|
|
@@ -723,13 +719,11 @@ const appendNewline = (printedLine) => printedLine.endsWith("\n") ? printedLine
|
|
|
723
719
|
//#endregion
|
|
724
720
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/verbose/log.js
|
|
725
721
|
const verboseLog = ({ type, verboseMessage, fdNumber, verboseInfo, result }) => {
|
|
726
|
-
const
|
|
722
|
+
const finalLines = applyVerboseOnLines(getPrintedLines(verboseMessage, getVerboseObject({
|
|
727
723
|
type,
|
|
728
724
|
result,
|
|
729
725
|
verboseInfo
|
|
730
|
-
});
|
|
731
|
-
const printedLines = getPrintedLines(verboseMessage, verboseObject);
|
|
732
|
-
const finalLines = applyVerboseOnLines(printedLines, verboseInfo, fdNumber);
|
|
726
|
+
})), verboseInfo, fdNumber);
|
|
733
727
|
if (finalLines !== "") console.warn(finalLines.slice(0, -1));
|
|
734
728
|
};
|
|
735
729
|
const getVerboseObject = ({ type, result, verboseInfo: { escapedCommand, commandId, rawOptions: { piped = false,...options } } }) => ({
|
|
@@ -752,8 +746,7 @@ const getPrintedLine = (verboseObject) => {
|
|
|
752
746
|
};
|
|
753
747
|
};
|
|
754
748
|
const serializeVerboseMessage = (message) => {
|
|
755
|
-
|
|
756
|
-
return escapeLines(messageString).replaceAll(" ", " ".repeat(TAB_SIZE));
|
|
749
|
+
return escapeLines(typeof message === "string" ? message : inspect(message)).replaceAll(" ", " ".repeat(TAB_SIZE));
|
|
757
750
|
};
|
|
758
751
|
const TAB_SIZE = 2;
|
|
759
752
|
|
|
@@ -772,11 +765,10 @@ const logCommand = (escapedCommand, verboseInfo) => {
|
|
|
772
765
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/verbose/info.js
|
|
773
766
|
const getVerboseInfo = (verbose, escapedCommand, rawOptions) => {
|
|
774
767
|
validateVerbose(verbose);
|
|
775
|
-
const commandId = getCommandId(verbose);
|
|
776
768
|
return {
|
|
777
769
|
verbose,
|
|
778
770
|
escapedCommand,
|
|
779
|
-
commandId,
|
|
771
|
+
commandId: getCommandId(verbose),
|
|
780
772
|
rawOptions
|
|
781
773
|
};
|
|
782
774
|
};
|
|
@@ -803,8 +795,7 @@ const getDurationMs = (startTime) => Number(hrtime.bigint() - startTime) / 1e6;
|
|
|
803
795
|
const handleCommand = (filePath, rawArguments, rawOptions) => {
|
|
804
796
|
const startTime = getStartTime();
|
|
805
797
|
const { command, escapedCommand } = joinCommand(filePath, rawArguments);
|
|
806
|
-
const
|
|
807
|
-
const verboseInfo = getVerboseInfo(verbose, escapedCommand, { ...rawOptions });
|
|
798
|
+
const verboseInfo = getVerboseInfo(normalizeFdSpecificOption(rawOptions, "verbose"), escapedCommand, { ...rawOptions });
|
|
808
799
|
logCommand(escapedCommand, verboseInfo);
|
|
809
800
|
return {
|
|
810
801
|
command,
|
|
@@ -954,8 +945,7 @@ var require_which = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/which
|
|
|
954
945
|
const ppRaw = pathEnv[i$2];
|
|
955
946
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
956
947
|
const pCmd = path$11.join(pathPart, cmd);
|
|
957
|
-
|
|
958
|
-
resolve(subStep(p, i$2, 0));
|
|
948
|
+
resolve(subStep(!pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd, i$2, 0));
|
|
959
949
|
});
|
|
960
950
|
const subStep = (p, i$2, ii) => new Promise((resolve, reject) => {
|
|
961
951
|
if (ii === pathExt.length) return resolve(step(i$2 + 1));
|
|
@@ -1283,9 +1273,7 @@ const npmRunPathEnv = ({ env: env$1 = process$1.env,...options } = {}) => {
|
|
|
1283
1273
|
//#endregion
|
|
1284
1274
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/return/final-error.js
|
|
1285
1275
|
const getFinalError = (originalError, message, isSync) => {
|
|
1286
|
-
|
|
1287
|
-
const options = originalError instanceof DiscardedError ? {} : { cause: originalError };
|
|
1288
|
-
return new ErrorClass(message, options);
|
|
1276
|
+
return new (isSync ? ExecaSyncError : ExecaError)(message, originalError instanceof DiscardedError ? {} : { cause: originalError });
|
|
1289
1277
|
};
|
|
1290
1278
|
var DiscardedError = class extends Error {};
|
|
1291
1279
|
const setErrorName = (ErrorClass, value) => {
|
|
@@ -2023,8 +2011,7 @@ const isConnected = (anyProcess) => {
|
|
|
2023
2011
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/ipc/strict.js
|
|
2024
2012
|
const handleSendStrict = ({ anyProcess, channel, isSubprocess, message, strict }) => {
|
|
2025
2013
|
if (!strict) return message;
|
|
2026
|
-
const
|
|
2027
|
-
const hasListeners = hasMessageListeners(anyProcess, ipcEmitter);
|
|
2014
|
+
const hasListeners = hasMessageListeners(anyProcess, getIpcEmitter(anyProcess, channel, isSubprocess));
|
|
2028
2015
|
return {
|
|
2029
2016
|
id: count++,
|
|
2030
2017
|
type: REQUEST_TYPE,
|
|
@@ -2097,11 +2084,9 @@ const RESPONSE_TYPE = "execa:ipc:response";
|
|
|
2097
2084
|
const startSendMessage = (anyProcess, wrappedMessage, strict) => {
|
|
2098
2085
|
if (!OUTGOING_MESSAGES.has(anyProcess)) OUTGOING_MESSAGES.set(anyProcess, /* @__PURE__ */ new Set());
|
|
2099
2086
|
const outgoingMessages = OUTGOING_MESSAGES.get(anyProcess);
|
|
2100
|
-
const onMessageSent = createDeferred();
|
|
2101
|
-
const id = strict ? wrappedMessage.id : void 0;
|
|
2102
2087
|
const outgoingMessage = {
|
|
2103
|
-
onMessageSent,
|
|
2104
|
-
id
|
|
2088
|
+
onMessageSent: createDeferred(),
|
|
2089
|
+
id: strict ? wrappedMessage.id : void 0
|
|
2105
2090
|
};
|
|
2106
2091
|
outgoingMessages.add(outgoingMessage);
|
|
2107
2092
|
return {
|
|
@@ -2262,8 +2247,7 @@ const throwOnGracefulCancel = ({ subprocess, cancelSignal, gracefulCancel, force
|
|
|
2262
2247
|
})] : [];
|
|
2263
2248
|
const sendOnAbort = async ({ subprocess, cancelSignal, forceKillAfterDelay, context, controller: { signal } }) => {
|
|
2264
2249
|
await onAbortedSignal(cancelSignal, signal);
|
|
2265
|
-
|
|
2266
|
-
await sendAbort(subprocess, reason);
|
|
2250
|
+
await sendAbort(subprocess, getReason(cancelSignal));
|
|
2267
2251
|
killOnTimeout({
|
|
2268
2252
|
kill: subprocess.kill,
|
|
2269
2253
|
forceKillAfterDelay,
|
|
@@ -2437,8 +2421,7 @@ const normalizeOptions = (filePath, rawArguments, rawOptions) => {
|
|
|
2437
2421
|
rawOptions.cwd = normalizeCwd(rawOptions.cwd);
|
|
2438
2422
|
const [processedFile, processedArguments, processedOptions] = handleNodeOption(filePath, rawArguments, rawOptions);
|
|
2439
2423
|
const { command: file, args: commandArguments, options: initialOptions } = import_cross_spawn.default._parse(processedFile, processedArguments, processedOptions);
|
|
2440
|
-
const
|
|
2441
|
-
const options = addDefaultOptions(fdOptions);
|
|
2424
|
+
const options = addDefaultOptions(normalizeFdSpecificOptions(initialOptions));
|
|
2442
2425
|
validateTimeout(options);
|
|
2443
2426
|
validateEncoding(options);
|
|
2444
2427
|
validateIpcInputOption(options);
|
|
@@ -2607,7 +2590,7 @@ const u = Object.create(a, {
|
|
|
2607
2590
|
}
|
|
2608
2591
|
});
|
|
2609
2592
|
function h({ preventCancel: r = !1 } = {}) {
|
|
2610
|
-
const
|
|
2593
|
+
const t = new c(this.getReader(), r), s = Object.create(u);
|
|
2611
2594
|
return s[n] = t, s;
|
|
2612
2595
|
}
|
|
2613
2596
|
|
|
@@ -2656,18 +2639,14 @@ const getStreamContents$1 = async (stream, { init, convertChunk, getSize, trunca
|
|
|
2656
2639
|
const state = init();
|
|
2657
2640
|
state.length = 0;
|
|
2658
2641
|
try {
|
|
2659
|
-
for await (const chunk of asyncIterable) {
|
|
2660
|
-
|
|
2661
|
-
|
|
2662
|
-
|
|
2663
|
-
|
|
2664
|
-
|
|
2665
|
-
|
|
2666
|
-
|
|
2667
|
-
addChunk,
|
|
2668
|
-
maxBuffer
|
|
2669
|
-
});
|
|
2670
|
-
}
|
|
2642
|
+
for await (const chunk of asyncIterable) appendChunk({
|
|
2643
|
+
convertedChunk: convertChunk[getChunkType(chunk)](chunk, state),
|
|
2644
|
+
state,
|
|
2645
|
+
getSize,
|
|
2646
|
+
truncateChunk,
|
|
2647
|
+
addChunk,
|
|
2648
|
+
maxBuffer
|
|
2649
|
+
});
|
|
2671
2650
|
appendFinalChunk({
|
|
2672
2651
|
state,
|
|
2673
2652
|
convertChunk,
|
|
@@ -2857,10 +2836,9 @@ const stringMethods = {
|
|
|
2857
2836
|
const handleMaxBuffer = ({ error, stream, readableObjectMode, lines, encoding, fdNumber }) => {
|
|
2858
2837
|
if (!(error instanceof MaxBufferError)) throw error;
|
|
2859
2838
|
if (fdNumber === "all") return error;
|
|
2860
|
-
const unit = getMaxBufferUnit(readableObjectMode, lines, encoding);
|
|
2861
2839
|
error.maxBufferInfo = {
|
|
2862
2840
|
fdNumber,
|
|
2863
|
-
unit
|
|
2841
|
+
unit: getMaxBufferUnit(readableObjectMode, lines, encoding)
|
|
2864
2842
|
};
|
|
2865
2843
|
stream.destroy();
|
|
2866
2844
|
throw error;
|
|
@@ -2930,19 +2908,16 @@ const createMessages = ({ stdio, all, ipcOutput, originalError, signal, signalDe
|
|
|
2930
2908
|
killSignal
|
|
2931
2909
|
});
|
|
2932
2910
|
const originalMessage = getOriginalMessage(originalError, cwd$1);
|
|
2933
|
-
const
|
|
2934
|
-
const shortMessage = `${prefix}: ${escapedCommand}${suffix}`;
|
|
2935
|
-
const messageStdio = all === void 0 ? [stdio[2], stdio[1]] : [all];
|
|
2936
|
-
const message = [
|
|
2937
|
-
shortMessage,
|
|
2938
|
-
...messageStdio,
|
|
2939
|
-
...stdio.slice(3),
|
|
2940
|
-
ipcOutput.map((ipcMessage) => serializeIpcMessage(ipcMessage)).join("\n")
|
|
2941
|
-
].map((messagePart) => escapeLines(stripFinalNewline(serializeMessagePart(messagePart)))).filter(Boolean).join("\n\n");
|
|
2911
|
+
const shortMessage = `${prefix}: ${escapedCommand}${originalMessage === void 0 ? "" : `\n${originalMessage}`}`;
|
|
2942
2912
|
return {
|
|
2943
2913
|
originalMessage,
|
|
2944
2914
|
shortMessage,
|
|
2945
|
-
message
|
|
2915
|
+
message: [
|
|
2916
|
+
shortMessage,
|
|
2917
|
+
...all === void 0 ? [stdio[2], stdio[1]] : [all],
|
|
2918
|
+
...stdio.slice(3),
|
|
2919
|
+
ipcOutput.map((ipcMessage) => serializeIpcMessage(ipcMessage)).join("\n")
|
|
2920
|
+
].map((messagePart) => escapeLines(stripFinalNewline(serializeMessagePart(messagePart)))).filter(Boolean).join("\n\n")
|
|
2946
2921
|
};
|
|
2947
2922
|
};
|
|
2948
2923
|
const getErrorPrefix = ({ originalError, timedOut, timeout, isMaxBuffer, maxBuffer, errorCode, signal, signalDescription, exitCode, isCanceled, isGracefullyCanceled, isForcefullyTerminated, forceKillAfterDelay, killSignal }) => {
|
|
@@ -2963,8 +2938,7 @@ const getErrorPrefix = ({ originalError, timedOut, timeout, isMaxBuffer, maxBuff
|
|
|
2963
2938
|
const getForcefulSuffix = (isForcefullyTerminated, forceKillAfterDelay) => isForcefullyTerminated ? ` and was forcefully terminated after ${forceKillAfterDelay} milliseconds` : "";
|
|
2964
2939
|
const getOriginalMessage = (originalError, cwd$1) => {
|
|
2965
2940
|
if (originalError instanceof DiscardedError) return;
|
|
2966
|
-
const
|
|
2967
|
-
const escapedOriginalMessage = escapeLines(fixCwdError(originalMessage, cwd$1));
|
|
2941
|
+
const escapedOriginalMessage = escapeLines(fixCwdError(isExecaError(originalError) ? originalError.originalMessage : String(originalError?.message ?? originalError), cwd$1));
|
|
2968
2942
|
return escapedOriginalMessage === "" ? void 0 : escapedOriginalMessage;
|
|
2969
2943
|
};
|
|
2970
2944
|
const serializeIpcMessage = (ipcMessage) => typeof ipcMessage === "string" ? ipcMessage : inspect(ipcMessage);
|
|
@@ -3086,11 +3060,10 @@ const omitUndefinedProperties = (result) => Object.fromEntries(Object.entries(re
|
|
|
3086
3060
|
const normalizeExitPayload = (rawExitCode, rawSignal) => {
|
|
3087
3061
|
const exitCode = rawExitCode === null ? void 0 : rawExitCode;
|
|
3088
3062
|
const signal = rawSignal === null ? void 0 : rawSignal;
|
|
3089
|
-
const signalDescription = signal === void 0 ? void 0 : getSignalDescription(rawSignal);
|
|
3090
3063
|
return {
|
|
3091
3064
|
exitCode,
|
|
3092
3065
|
signal,
|
|
3093
|
-
signalDescription
|
|
3066
|
+
signalDescription: signal === void 0 ? void 0 : getSignalDescription(rawSignal)
|
|
3094
3067
|
};
|
|
3095
3068
|
};
|
|
3096
3069
|
|
|
@@ -3196,9 +3169,7 @@ function prettyMilliseconds(milliseconds, options) {
|
|
|
3196
3169
|
add(Number.parseFloat(millisecondsString), "millisecond", "ms", millisecondsString);
|
|
3197
3170
|
}
|
|
3198
3171
|
} else {
|
|
3199
|
-
const
|
|
3200
|
-
const secondsDecimalDigits = typeof options.secondsDecimalDigits === "number" ? options.secondsDecimalDigits : 1;
|
|
3201
|
-
const secondsFixed = floorDecimals(seconds, secondsDecimalDigits);
|
|
3172
|
+
const secondsFixed = floorDecimals((isBigInt ? Number(milliseconds % ONE_DAY_IN_MILLISECONDS) : milliseconds) / 1e3 % 60, typeof options.secondsDecimalDigits === "number" ? options.secondsDecimalDigits : 1);
|
|
3202
3173
|
const secondsString = options.keepDecimalsOnWholeSeconds ? secondsFixed : secondsFixed.replace(/\.0+$/, "");
|
|
3203
3174
|
add(Number.parseFloat(secondsString), "second", "s", secondsString);
|
|
3204
3175
|
}
|
|
@@ -3227,10 +3198,9 @@ const logResult = (result, verboseInfo) => {
|
|
|
3227
3198
|
logDuration(result, verboseInfo);
|
|
3228
3199
|
};
|
|
3229
3200
|
const logDuration = (result, verboseInfo) => {
|
|
3230
|
-
const verboseMessage = `(done in ${prettyMilliseconds(result.durationMs)})`;
|
|
3231
3201
|
verboseLog({
|
|
3232
3202
|
type: "duration",
|
|
3233
|
-
verboseMessage
|
|
3203
|
+
verboseMessage: `(done in ${prettyMilliseconds(result.durationMs)})`,
|
|
3234
3204
|
verboseInfo,
|
|
3235
3205
|
result
|
|
3236
3206
|
});
|
|
@@ -3364,10 +3334,9 @@ const getOutputObjectModes = (objectMode, index, newTransforms) => {
|
|
|
3364
3334
|
};
|
|
3365
3335
|
const getInputObjectModes = (objectMode, index, newTransforms) => {
|
|
3366
3336
|
const writableObjectMode = index === 0 ? objectMode === true : newTransforms[index - 1].value.readableObjectMode;
|
|
3367
|
-
const readableObjectMode = index !== newTransforms.length - 1 && (objectMode ?? writableObjectMode);
|
|
3368
3337
|
return {
|
|
3369
3338
|
writableObjectMode,
|
|
3370
|
-
readableObjectMode
|
|
3339
|
+
readableObjectMode: index !== newTransforms.length - 1 && (objectMode ?? writableObjectMode)
|
|
3371
3340
|
};
|
|
3372
3341
|
};
|
|
3373
3342
|
const getFdObjectMode = (stdioItems, direction) => {
|
|
@@ -3676,8 +3645,7 @@ const validateDuplicateStreamSync = ({ otherStdioItems, type, value, optionName,
|
|
|
3676
3645
|
const getDuplicateStreamInstance = ({ otherStdioItems, type, value, optionName, direction }) => {
|
|
3677
3646
|
const duplicateStdioItems = otherStdioItems.filter((stdioItem) => hasSameValue(stdioItem, value));
|
|
3678
3647
|
if (duplicateStdioItems.length === 0) return;
|
|
3679
|
-
|
|
3680
|
-
throwOnDuplicateStream(differentStdioItem, optionName, type);
|
|
3648
|
+
throwOnDuplicateStream(duplicateStdioItems.find((stdioItem) => stdioItem.direction !== direction), optionName, type);
|
|
3681
3649
|
return direction === "output" ? duplicateStdioItems[0].stream : void 0;
|
|
3682
3650
|
};
|
|
3683
3651
|
const hasSameValue = ({ type, value }, secondValue) => {
|
|
@@ -3686,8 +3654,7 @@ const hasSameValue = ({ type, value }, secondValue) => {
|
|
|
3686
3654
|
return value === secondValue;
|
|
3687
3655
|
};
|
|
3688
3656
|
const validateDuplicateTransform = ({ otherStdioItems, type, value, optionName }) => {
|
|
3689
|
-
|
|
3690
|
-
throwOnDuplicateStream(duplicateStdioItem, optionName, type);
|
|
3657
|
+
throwOnDuplicateStream(otherStdioItems.find(({ value: { transform: transform$1 } }) => transform$1 === value.transform), optionName, type);
|
|
3691
3658
|
};
|
|
3692
3659
|
const throwOnDuplicateStream = (stdioItem, optionName, type) => {
|
|
3693
3660
|
if (stdioItem !== void 0) throw new TypeError(`The \`${stdioItem.optionName}\` and \`${optionName}\` options must not target ${TYPE_TO_MESSAGE[type]} that is the same.`);
|
|
@@ -3696,14 +3663,13 @@ const throwOnDuplicateStream = (stdioItem, optionName, type) => {
|
|
|
3696
3663
|
//#endregion
|
|
3697
3664
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/stdio/handle.js
|
|
3698
3665
|
const handleStdio = (addProperties$2, options, verboseInfo, isSync) => {
|
|
3699
|
-
const initialFileDescriptors = normalizeStdioOption(options, verboseInfo, isSync).map((stdioOption, fdNumber) => getFileDescriptor({
|
|
3700
|
-
stdioOption,
|
|
3701
|
-
fdNumber,
|
|
3702
|
-
options,
|
|
3703
|
-
isSync
|
|
3704
|
-
}));
|
|
3705
3666
|
const fileDescriptors = getFinalFileDescriptors({
|
|
3706
|
-
initialFileDescriptors,
|
|
3667
|
+
initialFileDescriptors: normalizeStdioOption(options, verboseInfo, isSync).map((stdioOption, fdNumber) => getFileDescriptor({
|
|
3668
|
+
stdioOption,
|
|
3669
|
+
fdNumber,
|
|
3670
|
+
options,
|
|
3671
|
+
isSync
|
|
3672
|
+
})),
|
|
3707
3673
|
addProperties: addProperties$2,
|
|
3708
3674
|
options,
|
|
3709
3675
|
isSync
|
|
@@ -3720,14 +3686,13 @@ const getFileDescriptor = ({ stdioOption, fdNumber, options, isSync }) => {
|
|
|
3720
3686
|
optionName
|
|
3721
3687
|
});
|
|
3722
3688
|
const direction = getStreamDirection(initialStdioItems, fdNumber, optionName);
|
|
3723
|
-
const
|
|
3689
|
+
const normalizedStdioItems = normalizeTransforms(initialStdioItems.map((stdioItem) => handleNativeStream({
|
|
3724
3690
|
stdioItem,
|
|
3725
3691
|
isStdioArray,
|
|
3726
3692
|
fdNumber,
|
|
3727
3693
|
direction,
|
|
3728
3694
|
isSync
|
|
3729
|
-
}));
|
|
3730
|
-
const normalizedStdioItems = normalizeTransforms(stdioItems, optionName, direction, options);
|
|
3695
|
+
})), optionName, direction, options);
|
|
3731
3696
|
const objectMode = getFdObjectMode(normalizedStdioItems, direction);
|
|
3732
3697
|
validateFileObjectMode(normalizedStdioItems, objectMode);
|
|
3733
3698
|
return {
|
|
@@ -3737,8 +3702,7 @@ const getFileDescriptor = ({ stdioOption, fdNumber, options, isSync }) => {
|
|
|
3737
3702
|
};
|
|
3738
3703
|
};
|
|
3739
3704
|
const initializeStdioItems = ({ stdioOption, fdNumber, options, optionName }) => {
|
|
3740
|
-
const
|
|
3741
|
-
const stdioItems = filterDuplicates(initialStdioItems);
|
|
3705
|
+
const stdioItems = filterDuplicates([...(Array.isArray(stdioOption) ? stdioOption : [stdioOption]).map((value) => initializeStdioItem(value, optionName)), ...handleInputOptions(options, fdNumber)]);
|
|
3742
3706
|
const isStdioArray = stdioItems.length > 1;
|
|
3743
3707
|
validateStdioArray(stdioItems, isStdioArray, optionName);
|
|
3744
3708
|
validateStreams(stdioItems);
|
|
@@ -3788,18 +3752,17 @@ const getFinalFileDescriptors = ({ initialFileDescriptors, addProperties: addPro
|
|
|
3788
3752
|
}
|
|
3789
3753
|
};
|
|
3790
3754
|
const getFinalFileDescriptor = ({ fileDescriptor: { direction, objectMode, stdioItems }, fileDescriptors, addProperties: addProperties$2, options, isSync }) => {
|
|
3791
|
-
const finalStdioItems = stdioItems.map((stdioItem) => addStreamProperties({
|
|
3792
|
-
stdioItem,
|
|
3793
|
-
addProperties: addProperties$2,
|
|
3794
|
-
direction,
|
|
3795
|
-
options,
|
|
3796
|
-
fileDescriptors,
|
|
3797
|
-
isSync
|
|
3798
|
-
}));
|
|
3799
3755
|
return {
|
|
3800
3756
|
direction,
|
|
3801
3757
|
objectMode,
|
|
3802
|
-
stdioItems:
|
|
3758
|
+
stdioItems: stdioItems.map((stdioItem) => addStreamProperties({
|
|
3759
|
+
stdioItem,
|
|
3760
|
+
addProperties: addProperties$2,
|
|
3761
|
+
direction,
|
|
3762
|
+
options,
|
|
3763
|
+
fileDescriptors,
|
|
3764
|
+
isSync
|
|
3765
|
+
}))
|
|
3803
3766
|
};
|
|
3804
3767
|
};
|
|
3805
3768
|
const addStreamProperties = ({ stdioItem, addProperties: addProperties$2, direction, options, fileDescriptors, isSync }) => {
|
|
@@ -4095,10 +4058,7 @@ const generatorToStream = ({ value, value: { transform: transform$1, final, writ
|
|
|
4095
4058
|
const runGeneratorsSync = (chunks, stdioItems, encoding, isInput) => {
|
|
4096
4059
|
const generators = stdioItems.filter(({ type }) => type === "generator");
|
|
4097
4060
|
const reversedGenerators = isInput ? generators.reverse() : generators;
|
|
4098
|
-
for (const { value, optionName } of reversedGenerators)
|
|
4099
|
-
const generators$1 = addInternalGenerators(value, encoding, optionName);
|
|
4100
|
-
chunks = runTransformSync(generators$1, chunks);
|
|
4101
|
-
}
|
|
4061
|
+
for (const { value, optionName } of reversedGenerators) chunks = runTransformSync(addInternalGenerators(value, encoding, optionName), chunks);
|
|
4102
4062
|
return chunks;
|
|
4103
4063
|
};
|
|
4104
4064
|
const addInternalGenerators = ({ transform: transform$1, final, binary, writableObjectMode, readableObjectMode, preserveNewlines }, encoding, optionName) => {
|
|
@@ -4135,8 +4095,7 @@ const addInputOptionSync = (fileDescriptors, fdNumber, options) => {
|
|
|
4135
4095
|
const [{ type, optionName }] = allStdioItems;
|
|
4136
4096
|
throw new TypeError(`Only the \`stdin\` option, not \`${optionName}\`, can be ${TYPE_TO_MESSAGE[type]} with synchronous methods.`);
|
|
4137
4097
|
}
|
|
4138
|
-
|
|
4139
|
-
options.input = joinToUint8Array(transformedContents);
|
|
4098
|
+
options.input = joinToUint8Array(allStdioItems.map(({ contents }) => contents).map((contents) => applySingleInputGeneratorsSync(contents, stdioItems)));
|
|
4140
4099
|
};
|
|
4141
4100
|
const applySingleInputGeneratorsSync = (contents, stdioItems) => {
|
|
4142
4101
|
const newContents = runGeneratorsSync(contents, stdioItems, "utf8", true);
|
|
@@ -4161,10 +4120,9 @@ const logLinesSync = (linesArray, fdNumber, verboseInfo) => {
|
|
|
4161
4120
|
};
|
|
4162
4121
|
const isPipingStream = (stream) => stream._readableState.pipes.length > 0;
|
|
4163
4122
|
const logLine = (line, fdNumber, verboseInfo) => {
|
|
4164
|
-
const verboseMessage = serializeVerboseMessage(line);
|
|
4165
4123
|
verboseLog({
|
|
4166
4124
|
type: "output",
|
|
4167
|
-
verboseMessage,
|
|
4125
|
+
verboseMessage: serializeVerboseMessage(line),
|
|
4168
4126
|
fdNumber,
|
|
4169
4127
|
verboseInfo
|
|
4170
4128
|
});
|
|
@@ -4191,12 +4149,10 @@ const transformOutputSync = ({ fileDescriptors, syncResult: { output }, options,
|
|
|
4191
4149
|
};
|
|
4192
4150
|
const transformOutputResultSync = ({ result, fileDescriptors, fdNumber, state, outputFiles, isMaxBuffer, verboseInfo }, { buffer, encoding, lines, stripFinalNewline: stripFinalNewline$1, maxBuffer }) => {
|
|
4193
4151
|
if (result === null) return;
|
|
4194
|
-
const
|
|
4195
|
-
const uint8ArrayResult = bufferToUint8Array(truncatedResult);
|
|
4152
|
+
const uint8ArrayResult = bufferToUint8Array(truncateMaxBufferSync(result, isMaxBuffer, maxBuffer));
|
|
4196
4153
|
const { stdioItems, objectMode } = fileDescriptors[fdNumber];
|
|
4197
|
-
const chunks = runOutputGeneratorsSync([uint8ArrayResult], stdioItems, encoding, state);
|
|
4198
4154
|
const { serializedResult, finalResult = serializedResult } = serializeChunks({
|
|
4199
|
-
chunks,
|
|
4155
|
+
chunks: runOutputGeneratorsSync([uint8ArrayResult], stdioItems, encoding, state),
|
|
4200
4156
|
objectMode,
|
|
4201
4157
|
encoding,
|
|
4202
4158
|
lines,
|
|
@@ -4307,14 +4263,12 @@ const isFailedExit = (exitCode, signal) => exitCode !== 0 || signal !== null;
|
|
|
4307
4263
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/resolve/exit-sync.js
|
|
4308
4264
|
const getExitResultSync = ({ error, status: exitCode, signal, output }, { maxBuffer }) => {
|
|
4309
4265
|
const resultError = getResultError(error, exitCode, signal);
|
|
4310
|
-
const timedOut = resultError?.code === "ETIMEDOUT";
|
|
4311
|
-
const isMaxBuffer = isMaxBufferSync(resultError, output, maxBuffer);
|
|
4312
4266
|
return {
|
|
4313
4267
|
resultError,
|
|
4314
4268
|
exitCode,
|
|
4315
4269
|
signal,
|
|
4316
|
-
timedOut,
|
|
4317
|
-
isMaxBuffer
|
|
4270
|
+
timedOut: resultError?.code === "ETIMEDOUT",
|
|
4271
|
+
isMaxBuffer: isMaxBufferSync(resultError, output, maxBuffer)
|
|
4318
4272
|
};
|
|
4319
4273
|
};
|
|
4320
4274
|
const getResultError = (error, exitCode, signal) => {
|
|
@@ -4326,7 +4280,7 @@ const getResultError = (error, exitCode, signal) => {
|
|
|
4326
4280
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/methods/main-sync.js
|
|
4327
4281
|
const execaCoreSync = (rawFile, rawArguments, rawOptions) => {
|
|
4328
4282
|
const { file, commandArguments, command, escapedCommand, startTime, verboseInfo, options, fileDescriptors } = handleSyncArguments(rawFile, rawArguments, rawOptions);
|
|
4329
|
-
|
|
4283
|
+
return handleResult(spawnSubprocessSync({
|
|
4330
4284
|
file,
|
|
4331
4285
|
commandArguments,
|
|
4332
4286
|
options,
|
|
@@ -4335,15 +4289,12 @@ const execaCoreSync = (rawFile, rawArguments, rawOptions) => {
|
|
|
4335
4289
|
verboseInfo,
|
|
4336
4290
|
fileDescriptors,
|
|
4337
4291
|
startTime
|
|
4338
|
-
});
|
|
4339
|
-
return handleResult(result, verboseInfo, options);
|
|
4292
|
+
}), verboseInfo, options);
|
|
4340
4293
|
};
|
|
4341
4294
|
const handleSyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
4342
4295
|
const { command, escapedCommand, startTime, verboseInfo } = handleCommand(rawFile, rawArguments, rawOptions);
|
|
4343
|
-
const
|
|
4344
|
-
const { file, commandArguments, options } = normalizeOptions(rawFile, rawArguments, syncOptions);
|
|
4296
|
+
const { file, commandArguments, options } = normalizeOptions(rawFile, rawArguments, normalizeSyncOptions(rawOptions));
|
|
4345
4297
|
validateSyncOptions(options);
|
|
4346
|
-
const fileDescriptors = handleStdioSync(options, verboseInfo);
|
|
4347
4298
|
return {
|
|
4348
4299
|
file,
|
|
4349
4300
|
commandArguments,
|
|
@@ -4352,7 +4303,7 @@ const handleSyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
4352
4303
|
startTime,
|
|
4353
4304
|
verboseInfo,
|
|
4354
4305
|
options,
|
|
4355
|
-
fileDescriptors
|
|
4306
|
+
fileDescriptors: handleStdioSync(options, verboseInfo)
|
|
4356
4307
|
};
|
|
4357
4308
|
};
|
|
4358
4309
|
const normalizeSyncOptions = (options) => options.node && !options.ipc ? {
|
|
@@ -4387,16 +4338,14 @@ const spawnSubprocessSync = ({ file, commandArguments, options, command, escaped
|
|
|
4387
4338
|
isMaxBuffer,
|
|
4388
4339
|
verboseInfo
|
|
4389
4340
|
});
|
|
4390
|
-
const stdio = output.map((stdioOutput, fdNumber) => stripNewline(stdioOutput, options, fdNumber));
|
|
4391
|
-
const all = stripNewline(getAllSync(output, options), options, "all");
|
|
4392
4341
|
return getSyncResult({
|
|
4393
4342
|
error,
|
|
4394
4343
|
exitCode,
|
|
4395
4344
|
signal,
|
|
4396
4345
|
timedOut,
|
|
4397
4346
|
isMaxBuffer,
|
|
4398
|
-
stdio,
|
|
4399
|
-
all,
|
|
4347
|
+
stdio: output.map((stdioOutput, fdNumber) => stripNewline(stdioOutput, options, fdNumber)),
|
|
4348
|
+
all: stripNewline(getAllSync(output, options), options, "all"),
|
|
4400
4349
|
options,
|
|
4401
4350
|
command,
|
|
4402
4351
|
escapedCommand,
|
|
@@ -4406,8 +4355,7 @@ const spawnSubprocessSync = ({ file, commandArguments, options, command, escaped
|
|
|
4406
4355
|
const runSubprocessSync = ({ file, commandArguments, options, command, escapedCommand, fileDescriptors, startTime }) => {
|
|
4407
4356
|
try {
|
|
4408
4357
|
addInputOptionsSync(fileDescriptors, options);
|
|
4409
|
-
|
|
4410
|
-
return spawnSync(...concatenateShell(file, commandArguments, normalizedOptions));
|
|
4358
|
+
return spawnSync(...concatenateShell(file, commandArguments, normalizeSpawnSyncOptions(options)));
|
|
4411
4359
|
} catch (error) {
|
|
4412
4360
|
return makeEarlyError({
|
|
4413
4361
|
error,
|
|
@@ -4625,19 +4573,17 @@ const handleEarlyError = ({ error, command, escapedCommand, fileDescriptors, opt
|
|
|
4625
4573
|
writable,
|
|
4626
4574
|
duplex
|
|
4627
4575
|
});
|
|
4628
|
-
const earlyError = makeEarlyError({
|
|
4629
|
-
error,
|
|
4630
|
-
command,
|
|
4631
|
-
escapedCommand,
|
|
4632
|
-
fileDescriptors,
|
|
4633
|
-
options,
|
|
4634
|
-
startTime,
|
|
4635
|
-
isSync: false
|
|
4636
|
-
});
|
|
4637
|
-
const promise = handleDummyPromise(earlyError, verboseInfo, options);
|
|
4638
4576
|
return {
|
|
4639
4577
|
subprocess,
|
|
4640
|
-
promise
|
|
4578
|
+
promise: handleDummyPromise(makeEarlyError({
|
|
4579
|
+
error,
|
|
4580
|
+
command,
|
|
4581
|
+
escapedCommand,
|
|
4582
|
+
fileDescriptors,
|
|
4583
|
+
options,
|
|
4584
|
+
startTime,
|
|
4585
|
+
isSync: false
|
|
4586
|
+
}), verboseInfo, options)
|
|
4641
4587
|
};
|
|
4642
4588
|
};
|
|
4643
4589
|
const createDummyStreams = (subprocess, fileDescriptors) => {
|
|
@@ -4932,10 +4878,7 @@ const pipeOutputAsync = (subprocess, fileDescriptors, controller) => {
|
|
|
4932
4878
|
controller
|
|
4933
4879
|
});
|
|
4934
4880
|
}
|
|
4935
|
-
for (const [outputStream, inputStreams] of pipeGroups.entries())
|
|
4936
|
-
const inputStream = inputStreams.length === 1 ? inputStreams[0] : mergeStreams(inputStreams);
|
|
4937
|
-
pipeStreams(inputStream, outputStream);
|
|
4938
|
-
}
|
|
4881
|
+
for (const [outputStream, inputStreams] of pipeGroups.entries()) pipeStreams(inputStreams.length === 1 ? inputStreams[0] : mergeStreams(inputStreams), outputStream);
|
|
4939
4882
|
};
|
|
4940
4883
|
const pipeTransform = (subprocess, stream, direction, fdNumber) => {
|
|
4941
4884
|
if (direction === "output") pipeStreams(subprocess.stdio[fdNumber], stream);
|
|
@@ -5197,10 +5140,9 @@ const normalizePipeArguments = ({ source, sourcePromise, boundOptions, createNes
|
|
|
5197
5140
|
const getDestinationStream = (boundOptions, createNested, pipeArguments) => {
|
|
5198
5141
|
try {
|
|
5199
5142
|
const { destination, pipeOptions: { from, to, unpipeSignal } = {} } = getDestination(boundOptions, createNested, ...pipeArguments);
|
|
5200
|
-
const destinationStream = getToStream(destination, to);
|
|
5201
5143
|
return {
|
|
5202
5144
|
destination,
|
|
5203
|
-
destinationStream,
|
|
5145
|
+
destinationStream: getToStream(destination, to),
|
|
5204
5146
|
from,
|
|
5205
5147
|
unpipeSignal
|
|
5206
5148
|
};
|
|
@@ -5435,13 +5377,12 @@ const stopReadingOnStreamEnd = async (onStreamEnd, controller, stream) => {
|
|
|
5435
5377
|
}
|
|
5436
5378
|
};
|
|
5437
5379
|
const iterateOnStream = ({ stream, controller, binary, shouldEncode, encoding, shouldSplit, preserveNewlines }) => {
|
|
5438
|
-
const onStdoutChunk = on(stream, "data", {
|
|
5439
|
-
signal: controller.signal,
|
|
5440
|
-
highWaterMark: HIGH_WATER_MARK,
|
|
5441
|
-
highWatermark: HIGH_WATER_MARK
|
|
5442
|
-
});
|
|
5443
5380
|
return iterateOnData({
|
|
5444
|
-
onStdoutChunk,
|
|
5381
|
+
onStdoutChunk: on(stream, "data", {
|
|
5382
|
+
signal: controller.signal,
|
|
5383
|
+
highWaterMark: HIGH_WATER_MARK,
|
|
5384
|
+
highWatermark: HIGH_WATER_MARK
|
|
5385
|
+
}),
|
|
5445
5386
|
controller,
|
|
5446
5387
|
binary,
|
|
5447
5388
|
shouldEncode,
|
|
@@ -5486,13 +5427,12 @@ const getStreamOutput = async ({ stream, onStreamEnd, fdNumber, encoding, buffer
|
|
|
5486
5427
|
await Promise.all([resumeStream(stream), logPromise]);
|
|
5487
5428
|
return;
|
|
5488
5429
|
}
|
|
5489
|
-
const stripFinalNewlineValue = getStripFinalNewline(stripFinalNewline$1, fdNumber);
|
|
5490
5430
|
const iterable = iterateForResult({
|
|
5491
5431
|
stream,
|
|
5492
5432
|
onStreamEnd,
|
|
5493
5433
|
lines,
|
|
5494
5434
|
encoding,
|
|
5495
|
-
stripFinalNewline:
|
|
5435
|
+
stripFinalNewline: getStripFinalNewline(stripFinalNewline$1, fdNumber),
|
|
5496
5436
|
allMixed
|
|
5497
5437
|
});
|
|
5498
5438
|
const [output] = await Promise.all([getStreamContents({
|
|
@@ -5512,15 +5452,14 @@ const logOutputAsync = async ({ stream, onStreamEnd, fdNumber, encoding, allMixe
|
|
|
5512
5452
|
verboseInfo,
|
|
5513
5453
|
fdNumber
|
|
5514
5454
|
})) return;
|
|
5515
|
-
|
|
5455
|
+
await logLines(iterateForResult({
|
|
5516
5456
|
stream,
|
|
5517
5457
|
onStreamEnd,
|
|
5518
5458
|
lines: true,
|
|
5519
5459
|
encoding,
|
|
5520
5460
|
stripFinalNewline: true,
|
|
5521
5461
|
allMixed
|
|
5522
|
-
});
|
|
5523
|
-
await logLines(linesIterable, stream, fdNumber, verboseInfo);
|
|
5462
|
+
}), stream, fdNumber, verboseInfo);
|
|
5524
5463
|
};
|
|
5525
5464
|
const resumeStream = async (stream) => {
|
|
5526
5465
|
await setImmediate$1();
|
|
@@ -5670,10 +5609,9 @@ const getAllMixed = ({ all, stdout, stderr }) => all && stdout && stderr && stdo
|
|
|
5670
5609
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/verbose/ipc.js
|
|
5671
5610
|
const shouldLogIpc = (verboseInfo) => isFullVerbose(verboseInfo, "ipc");
|
|
5672
5611
|
const logIpcOutput = (message, verboseInfo) => {
|
|
5673
|
-
const verboseMessage = serializeVerboseMessage(message);
|
|
5674
5612
|
verboseLog({
|
|
5675
5613
|
type: "ipc",
|
|
5676
|
-
verboseMessage,
|
|
5614
|
+
verboseMessage: serializeVerboseMessage(message),
|
|
5677
5615
|
fdNumber: "ipc",
|
|
5678
5616
|
verboseInfo
|
|
5679
5617
|
});
|
|
@@ -5898,10 +5836,9 @@ const createReadable = ({ subprocess, concurrentStreams, encoding }, { from, bin
|
|
|
5898
5836
|
};
|
|
5899
5837
|
const getSubprocessStdout = (subprocess, from, concurrentStreams) => {
|
|
5900
5838
|
const subprocessStdout = getFromStream(subprocess, from);
|
|
5901
|
-
const waitReadableDestroy = addConcurrentStream(concurrentStreams, subprocessStdout, "readableDestroy");
|
|
5902
5839
|
return {
|
|
5903
5840
|
subprocessStdout,
|
|
5904
|
-
waitReadableDestroy
|
|
5841
|
+
waitReadableDestroy: addConcurrentStream(concurrentStreams, subprocessStdout, "readableDestroy")
|
|
5905
5842
|
};
|
|
5906
5843
|
};
|
|
5907
5844
|
const getReadableOptions = ({ readableEncoding, readableObjectMode, readableHighWaterMark }, binary) => binary ? {
|
|
@@ -5979,12 +5916,10 @@ const createWritable = ({ subprocess, concurrentStreams }, { to } = {}) => {
|
|
|
5979
5916
|
};
|
|
5980
5917
|
const getSubprocessStdin = (subprocess, to, concurrentStreams) => {
|
|
5981
5918
|
const subprocessStdin = getToStream(subprocess, to);
|
|
5982
|
-
const waitWritableFinal = addConcurrentStream(concurrentStreams, subprocessStdin, "writableFinal");
|
|
5983
|
-
const waitWritableDestroy = addConcurrentStream(concurrentStreams, subprocessStdin, "writableDestroy");
|
|
5984
5919
|
return {
|
|
5985
5920
|
subprocessStdin,
|
|
5986
|
-
waitWritableFinal,
|
|
5987
|
-
waitWritableDestroy
|
|
5921
|
+
waitWritableFinal: addConcurrentStream(concurrentStreams, subprocessStdin, "writableFinal"),
|
|
5922
|
+
waitWritableDestroy: addConcurrentStream(concurrentStreams, subprocessStdin, "writableDestroy")
|
|
5988
5923
|
};
|
|
5989
5924
|
};
|
|
5990
5925
|
const getWritableMethods = (subprocessStdin, subprocess, waitWritableFinal) => ({
|
|
@@ -6080,15 +6015,14 @@ const onDuplexDestroy = async ({ subprocessStdout, subprocessStdin, subprocess,
|
|
|
6080
6015
|
const createIterable = (subprocess, encoding, { from, binary: binaryOption = false, preserveNewlines = false } = {}) => {
|
|
6081
6016
|
const binary = binaryOption || BINARY_ENCODINGS.has(encoding);
|
|
6082
6017
|
const subprocessStdout = getFromStream(subprocess, from);
|
|
6083
|
-
|
|
6018
|
+
return iterateOnStdoutData(iterateOnSubprocessStream({
|
|
6084
6019
|
subprocessStdout,
|
|
6085
6020
|
subprocess,
|
|
6086
6021
|
binary,
|
|
6087
6022
|
shouldEncode: true,
|
|
6088
6023
|
encoding,
|
|
6089
6024
|
preserveNewlines
|
|
6090
|
-
});
|
|
6091
|
-
return iterateOnStdoutData(onStdoutData, subprocessStdout, subprocess);
|
|
6025
|
+
}), subprocessStdout, subprocess);
|
|
6092
6026
|
};
|
|
6093
6027
|
const iterateOnStdoutData = async function* (onStdoutData, subprocessStdout, subprocess) {
|
|
6094
6028
|
try {
|
|
@@ -6170,7 +6104,6 @@ const handleAsyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
6170
6104
|
const { command, escapedCommand, startTime, verboseInfo } = handleCommand(rawFile, rawArguments, rawOptions);
|
|
6171
6105
|
const { file, commandArguments, options: normalizedOptions } = normalizeOptions(rawFile, rawArguments, rawOptions);
|
|
6172
6106
|
const options = handleAsyncOptions(normalizedOptions);
|
|
6173
|
-
const fileDescriptors = handleStdioAsync(options, verboseInfo);
|
|
6174
6107
|
return {
|
|
6175
6108
|
file,
|
|
6176
6109
|
commandArguments,
|
|
@@ -6179,7 +6112,7 @@ const handleAsyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
6179
6112
|
startTime,
|
|
6180
6113
|
verboseInfo,
|
|
6181
6114
|
options,
|
|
6182
|
-
fileDescriptors
|
|
6115
|
+
fileDescriptors: handleStdioAsync(options, verboseInfo)
|
|
6183
6116
|
};
|
|
6184
6117
|
};
|
|
6185
6118
|
const handleAsyncOptions = ({ timeout, signal,...options }) => {
|
|
@@ -6252,22 +6185,19 @@ const handlePromise = async ({ subprocess, options, startTime, verboseInfo, file
|
|
|
6252
6185
|
});
|
|
6253
6186
|
controller.abort();
|
|
6254
6187
|
onInternalError.resolve();
|
|
6255
|
-
|
|
6256
|
-
const all = stripNewline(allResult, options, "all");
|
|
6257
|
-
const result = getAsyncResult({
|
|
6188
|
+
return handleResult(getAsyncResult({
|
|
6258
6189
|
errorInfo,
|
|
6259
6190
|
exitCode,
|
|
6260
6191
|
signal,
|
|
6261
|
-
stdio,
|
|
6262
|
-
all,
|
|
6192
|
+
stdio: stdioResults.map((stdioResult, fdNumber) => stripNewline(stdioResult, options, fdNumber)),
|
|
6193
|
+
all: stripNewline(allResult, options, "all"),
|
|
6263
6194
|
ipcOutput,
|
|
6264
6195
|
context,
|
|
6265
6196
|
options,
|
|
6266
6197
|
command,
|
|
6267
6198
|
escapedCommand,
|
|
6268
6199
|
startTime
|
|
6269
|
-
});
|
|
6270
|
-
return handleResult(result, verboseInfo, options);
|
|
6200
|
+
}), verboseInfo, options);
|
|
6271
6201
|
};
|
|
6272
6202
|
const getAsyncResult = ({ errorInfo, exitCode, signal, stdio, all, ipcOutput, context, options, command, escapedCommand, startTime }) => "error" in errorInfo ? makeError({
|
|
6273
6203
|
error: errorInfo.error,
|
|
@@ -6340,8 +6270,7 @@ const callBoundExeca = ({ mapArguments, deepOptions = {}, boundOptions = {}, set
|
|
|
6340
6270
|
return isSync ? execaCoreSync(file, commandArguments, options) : execaCoreAsync(file, commandArguments, options, createNested);
|
|
6341
6271
|
};
|
|
6342
6272
|
const parseArguments = ({ mapArguments, firstArgument, nextArguments, deepOptions, boundOptions }) => {
|
|
6343
|
-
const
|
|
6344
|
-
const [initialFile, initialArguments, initialOptions] = normalizeParameters(...callArguments);
|
|
6273
|
+
const [initialFile, initialArguments, initialOptions] = normalizeParameters(...isTemplateString(firstArgument) ? parseTemplates(firstArgument, nextArguments) : [firstArgument, ...nextArguments]);
|
|
6345
6274
|
const mergedOptions = mergeOptions(mergeOptions(deepOptions, boundOptions), initialOptions);
|
|
6346
6275
|
const { file = initialFile, commandArguments = initialArguments, options = mergedOptions, isSync = false } = mapArguments({
|
|
6347
6276
|
file: initialFile,
|
|
@@ -6429,11 +6358,11 @@ var require_p_limit = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/p-l
|
|
|
6429
6358
|
const pTry = require_p_try();
|
|
6430
6359
|
const pLimit$1 = (concurrency) => {
|
|
6431
6360
|
if (!((Number.isInteger(concurrency) || concurrency === Infinity) && concurrency > 0)) return Promise.reject(/* @__PURE__ */ new TypeError("Expected `concurrency` to be a number from 1 and up"));
|
|
6432
|
-
const queue
|
|
6361
|
+
const queue = [];
|
|
6433
6362
|
let activeCount = 0;
|
|
6434
6363
|
const next = () => {
|
|
6435
6364
|
activeCount--;
|
|
6436
|
-
if (queue
|
|
6365
|
+
if (queue.length > 0) queue.shift()();
|
|
6437
6366
|
};
|
|
6438
6367
|
const run = (fn, resolve, ...args) => {
|
|
6439
6368
|
activeCount++;
|
|
@@ -6443,14 +6372,14 @@ var require_p_limit = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/p-l
|
|
|
6443
6372
|
};
|
|
6444
6373
|
const enqueue$1 = (fn, resolve, ...args) => {
|
|
6445
6374
|
if (activeCount < concurrency) run(fn, resolve, ...args);
|
|
6446
|
-
else queue
|
|
6375
|
+
else queue.push(run.bind(null, fn, resolve, ...args));
|
|
6447
6376
|
};
|
|
6448
6377
|
const generator = (fn, ...args) => new Promise((resolve) => enqueue$1(fn, resolve, ...args));
|
|
6449
6378
|
Object.defineProperties(generator, {
|
|
6450
6379
|
activeCount: { get: () => activeCount },
|
|
6451
|
-
pendingCount: { get: () => queue
|
|
6380
|
+
pendingCount: { get: () => queue.length },
|
|
6452
6381
|
clearQueue: { value: () => {
|
|
6453
|
-
queue
|
|
6382
|
+
queue.length = 0;
|
|
6454
6383
|
} }
|
|
6455
6384
|
});
|
|
6456
6385
|
return generator;
|
|
@@ -7171,13 +7100,13 @@ var require_expand = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/brac
|
|
|
7171
7100
|
const fill = require_fill_range();
|
|
7172
7101
|
const stringify$2 = require_stringify();
|
|
7173
7102
|
const utils$4 = require_utils$1();
|
|
7174
|
-
const append = (queue
|
|
7103
|
+
const append = (queue = "", stash = "", enclose = false) => {
|
|
7175
7104
|
const result = [];
|
|
7176
|
-
queue
|
|
7105
|
+
queue = [].concat(queue);
|
|
7177
7106
|
stash = [].concat(stash);
|
|
7178
|
-
if (!stash.length) return queue
|
|
7179
|
-
if (!queue
|
|
7180
|
-
for (const item of queue
|
|
7107
|
+
if (!stash.length) return queue;
|
|
7108
|
+
if (!queue.length) return enclose ? utils$4.flatten(stash).map((ele) => `{${ele}}`) : stash;
|
|
7109
|
+
for (const item of queue) if (Array.isArray(item)) for (const value of item) result.push(append(value, stash, enclose));
|
|
7181
7110
|
else for (let ele of stash) {
|
|
7182
7111
|
if (enclose === true && typeof ele === "string") ele = `{${ele}}`;
|
|
7183
7112
|
result.push(Array.isArray(ele) ? append(item, ele, enclose) : item + ele);
|
|
@@ -7212,30 +7141,30 @@ var require_expand = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/brac
|
|
|
7212
7141
|
return;
|
|
7213
7142
|
}
|
|
7214
7143
|
const enclose = utils$4.encloseBrace(node);
|
|
7215
|
-
let queue
|
|
7144
|
+
let queue = node.queue;
|
|
7216
7145
|
let block = node;
|
|
7217
7146
|
while (block.type !== "brace" && block.type !== "root" && block.parent) {
|
|
7218
7147
|
block = block.parent;
|
|
7219
|
-
queue
|
|
7148
|
+
queue = block.queue;
|
|
7220
7149
|
}
|
|
7221
7150
|
for (let i$2 = 0; i$2 < node.nodes.length; i$2++) {
|
|
7222
7151
|
const child = node.nodes[i$2];
|
|
7223
7152
|
if (child.type === "comma" && node.type === "brace") {
|
|
7224
|
-
if (i$2 === 1) queue
|
|
7225
|
-
queue
|
|
7153
|
+
if (i$2 === 1) queue.push("");
|
|
7154
|
+
queue.push("");
|
|
7226
7155
|
continue;
|
|
7227
7156
|
}
|
|
7228
7157
|
if (child.type === "close") {
|
|
7229
|
-
q.push(append(q.pop(), queue
|
|
7158
|
+
q.push(append(q.pop(), queue, enclose));
|
|
7230
7159
|
continue;
|
|
7231
7160
|
}
|
|
7232
7161
|
if (child.value && child.type !== "open") {
|
|
7233
|
-
queue
|
|
7162
|
+
queue.push(append(queue.pop(), child.value));
|
|
7234
7163
|
continue;
|
|
7235
7164
|
}
|
|
7236
7165
|
if (child.nodes) walk(child, node);
|
|
7237
7166
|
}
|
|
7238
|
-
return queue
|
|
7167
|
+
return queue;
|
|
7239
7168
|
};
|
|
7240
7169
|
return utils$4.flatten(walk(ast));
|
|
7241
7170
|
};
|
|
@@ -7454,7 +7383,7 @@ var require_parse$1 = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/bra
|
|
|
7454
7383
|
*/
|
|
7455
7384
|
if (value === CHAR_LEFT_CURLY_BRACE$1) {
|
|
7456
7385
|
depth$1++;
|
|
7457
|
-
|
|
7386
|
+
block = push({
|
|
7458
7387
|
type: "brace",
|
|
7459
7388
|
open: true,
|
|
7460
7389
|
close: false,
|
|
@@ -7463,8 +7392,7 @@ var require_parse$1 = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/bra
|
|
|
7463
7392
|
commas: 0,
|
|
7464
7393
|
ranges: 0,
|
|
7465
7394
|
nodes: []
|
|
7466
|
-
};
|
|
7467
|
-
block = push(brace);
|
|
7395
|
+
});
|
|
7468
7396
|
stack.push(block);
|
|
7469
7397
|
push({
|
|
7470
7398
|
type: "open",
|
|
@@ -7728,12 +7656,6 @@ var require_constants = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/p
|
|
|
7728
7656
|
const END_ANCHOR = `(?:${SLASH_LITERAL}|$)`;
|
|
7729
7657
|
const START_ANCHOR = `(?:^|${SLASH_LITERAL})`;
|
|
7730
7658
|
const DOTS_SLASH = `${DOT_LITERAL}{1,2}${END_ANCHOR}`;
|
|
7731
|
-
const NO_DOT = `(?!${DOT_LITERAL})`;
|
|
7732
|
-
const NO_DOTS = `(?!${START_ANCHOR}${DOTS_SLASH})`;
|
|
7733
|
-
const NO_DOT_SLASH = `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`;
|
|
7734
|
-
const NO_DOTS_SLASH = `(?!${DOTS_SLASH})`;
|
|
7735
|
-
const QMARK_NO_DOT = `[^.${SLASH_LITERAL}]`;
|
|
7736
|
-
const STAR = `${QMARK}*?`;
|
|
7737
7659
|
const POSIX_CHARS = {
|
|
7738
7660
|
DOT_LITERAL,
|
|
7739
7661
|
PLUS_LITERAL,
|
|
@@ -7743,12 +7665,12 @@ var require_constants = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/p
|
|
|
7743
7665
|
QMARK,
|
|
7744
7666
|
END_ANCHOR,
|
|
7745
7667
|
DOTS_SLASH,
|
|
7746
|
-
NO_DOT
|
|
7747
|
-
NO_DOTS
|
|
7748
|
-
NO_DOT_SLASH,
|
|
7749
|
-
NO_DOTS_SLASH
|
|
7750
|
-
QMARK_NO_DOT
|
|
7751
|
-
STAR
|
|
7668
|
+
NO_DOT: `(?!${DOT_LITERAL})`,
|
|
7669
|
+
NO_DOTS: `(?!${START_ANCHOR}${DOTS_SLASH})`,
|
|
7670
|
+
NO_DOT_SLASH: `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`,
|
|
7671
|
+
NO_DOTS_SLASH: `(?!${DOTS_SLASH})`,
|
|
7672
|
+
QMARK_NO_DOT: `[^.${SLASH_LITERAL}]`,
|
|
7673
|
+
STAR: `${QMARK}*?`,
|
|
7752
7674
|
START_ANCHOR
|
|
7753
7675
|
};
|
|
7754
7676
|
/**
|
|
@@ -7920,9 +7842,7 @@ var require_utils = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
7920
7842
|
return output;
|
|
7921
7843
|
};
|
|
7922
7844
|
exports.wrapOutput = (input, state = {}, options = {}) => {
|
|
7923
|
-
|
|
7924
|
-
const append$1 = options.contains ? "" : "$";
|
|
7925
|
-
let output = `${prepend}(?:${input})${append$1}`;
|
|
7845
|
+
let output = `${options.contains ? "" : "^"}(?:${input})${options.contains ? "" : "$"}`;
|
|
7926
7846
|
if (state.negated === true) output = `(?:^(?!${output}).*$)`;
|
|
7927
7847
|
return output;
|
|
7928
7848
|
};
|
|
@@ -8268,13 +8188,13 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
8268
8188
|
const win32$1 = utils$2.isWindows(options);
|
|
8269
8189
|
const PLATFORM_CHARS = constants$3.globChars(win32$1);
|
|
8270
8190
|
const EXTGLOB_CHARS = constants$3.extglobChars(PLATFORM_CHARS);
|
|
8271
|
-
const { DOT_LITERAL: DOT_LITERAL$1, PLUS_LITERAL: PLUS_LITERAL$1, SLASH_LITERAL: SLASH_LITERAL$1, ONE_CHAR: ONE_CHAR$1, DOTS_SLASH: DOTS_SLASH$1, NO_DOT
|
|
8191
|
+
const { DOT_LITERAL: DOT_LITERAL$1, PLUS_LITERAL: PLUS_LITERAL$1, SLASH_LITERAL: SLASH_LITERAL$1, ONE_CHAR: ONE_CHAR$1, DOTS_SLASH: DOTS_SLASH$1, NO_DOT, NO_DOT_SLASH, NO_DOTS_SLASH, QMARK: QMARK$1, QMARK_NO_DOT, STAR, START_ANCHOR: START_ANCHOR$1 } = PLATFORM_CHARS;
|
|
8272
8192
|
const globstar = (opts$1) => {
|
|
8273
8193
|
return `(${capture}(?:(?!${START_ANCHOR$1}${opts$1.dot ? DOTS_SLASH$1 : DOT_LITERAL$1}).)*?)`;
|
|
8274
8194
|
};
|
|
8275
|
-
const nodot = opts.dot ? "" : NO_DOT
|
|
8276
|
-
const qmarkNoDot = opts.dot ? QMARK$1 : QMARK_NO_DOT
|
|
8277
|
-
let star = opts.bash === true ? globstar(opts) : STAR
|
|
8195
|
+
const nodot = opts.dot ? "" : NO_DOT;
|
|
8196
|
+
const qmarkNoDot = opts.dot ? QMARK$1 : QMARK_NO_DOT;
|
|
8197
|
+
let star = opts.bash === true ? globstar(opts) : STAR;
|
|
8278
8198
|
if (opts.capture) star = `(${star})`;
|
|
8279
8199
|
if (typeof opts.noext === "boolean") opts.noextglob = opts.noext;
|
|
8280
8200
|
const state = {
|
|
@@ -8494,8 +8414,7 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
8494
8414
|
if (inner.includes(":")) {
|
|
8495
8415
|
const idx = prev.value.lastIndexOf("[");
|
|
8496
8416
|
const pre = prev.value.slice(0, idx);
|
|
8497
|
-
const
|
|
8498
|
-
const posix = POSIX_REGEX_SOURCE[rest$1];
|
|
8417
|
+
const posix = POSIX_REGEX_SOURCE[prev.value.slice(idx + 2)];
|
|
8499
8418
|
if (posix) {
|
|
8500
8419
|
prev.value = pre + posix;
|
|
8501
8420
|
state.backtrack = true;
|
|
@@ -8763,7 +8682,7 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
8763
8682
|
push({
|
|
8764
8683
|
type: "qmark",
|
|
8765
8684
|
value,
|
|
8766
|
-
output: QMARK_NO_DOT
|
|
8685
|
+
output: QMARK_NO_DOT
|
|
8767
8686
|
});
|
|
8768
8687
|
continue;
|
|
8769
8688
|
}
|
|
@@ -8982,11 +8901,11 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
8982
8901
|
}
|
|
8983
8902
|
if (state.index === state.start || prev.type === "slash" || prev.type === "dot") {
|
|
8984
8903
|
if (prev.type === "dot") {
|
|
8985
|
-
state.output += NO_DOT_SLASH
|
|
8986
|
-
prev.output += NO_DOT_SLASH
|
|
8904
|
+
state.output += NO_DOT_SLASH;
|
|
8905
|
+
prev.output += NO_DOT_SLASH;
|
|
8987
8906
|
} else if (opts.dot === true) {
|
|
8988
|
-
state.output += NO_DOTS_SLASH
|
|
8989
|
-
prev.output += NO_DOTS_SLASH
|
|
8907
|
+
state.output += NO_DOTS_SLASH;
|
|
8908
|
+
prev.output += NO_DOTS_SLASH;
|
|
8990
8909
|
} else {
|
|
8991
8910
|
state.output += nodot;
|
|
8992
8911
|
prev.output += nodot;
|
|
@@ -9039,15 +8958,15 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
9039
8958
|
if (len > max) throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
|
|
9040
8959
|
input = REPLACEMENTS[input] || input;
|
|
9041
8960
|
const win32$1 = utils$2.isWindows(options);
|
|
9042
|
-
const { DOT_LITERAL: DOT_LITERAL$1, SLASH_LITERAL: SLASH_LITERAL$1, ONE_CHAR: ONE_CHAR$1, DOTS_SLASH: DOTS_SLASH$1, NO_DOT
|
|
9043
|
-
const nodot = opts.dot ? NO_DOTS
|
|
9044
|
-
const slashDot = opts.dot ? NO_DOTS_SLASH
|
|
8961
|
+
const { DOT_LITERAL: DOT_LITERAL$1, SLASH_LITERAL: SLASH_LITERAL$1, ONE_CHAR: ONE_CHAR$1, DOTS_SLASH: DOTS_SLASH$1, NO_DOT, NO_DOTS, NO_DOTS_SLASH, STAR, START_ANCHOR: START_ANCHOR$1 } = constants$3.globChars(win32$1);
|
|
8962
|
+
const nodot = opts.dot ? NO_DOTS : NO_DOT;
|
|
8963
|
+
const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
|
|
9045
8964
|
const capture = opts.capture ? "" : "?:";
|
|
9046
8965
|
const state = {
|
|
9047
8966
|
negated: false,
|
|
9048
8967
|
prefix: ""
|
|
9049
8968
|
};
|
|
9050
|
-
let star = opts.bash === true ? ".*?" : STAR
|
|
8969
|
+
let star = opts.bash === true ? ".*?" : STAR;
|
|
9051
8970
|
if (opts.capture) star = `(${star})`;
|
|
9052
8971
|
const globstar = (opts$1) => {
|
|
9053
8972
|
if (opts$1.noglobstar === true) return star;
|
|
@@ -9072,8 +8991,7 @@ var require_parse = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/picom
|
|
|
9072
8991
|
}
|
|
9073
8992
|
}
|
|
9074
8993
|
};
|
|
9075
|
-
|
|
9076
|
-
let source = create(output);
|
|
8994
|
+
let source = create(utils$2.removePrefix(input, state));
|
|
9077
8995
|
if (source && opts.strictSlashes !== true) source += `${SLASH_LITERAL$1}?`;
|
|
9078
8996
|
return source;
|
|
9079
8997
|
};
|
|
@@ -9800,8 +9718,7 @@ var require_core$1 = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/find
|
|
|
9800
9718
|
let previous = null;
|
|
9801
9719
|
let current = initial;
|
|
9802
9720
|
do {
|
|
9803
|
-
|
|
9804
|
-
extractWorkspaces(manifest);
|
|
9721
|
+
extractWorkspaces(readPackageJSON(current));
|
|
9805
9722
|
let { done, found } = checkWorkspaces(current, initial);
|
|
9806
9723
|
if (done) return found;
|
|
9807
9724
|
previous = current;
|
|
@@ -9811,8 +9728,7 @@ var require_core$1 = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/find
|
|
|
9811
9728
|
}
|
|
9812
9729
|
exports.findWorkspaceRoot = findWorkspaceRoot;
|
|
9813
9730
|
function checkWorkspaces(current, initial) {
|
|
9814
|
-
const
|
|
9815
|
-
const workspaces = extractWorkspaces(manifest);
|
|
9731
|
+
const workspaces = extractWorkspaces(readPackageJSON(current));
|
|
9816
9732
|
let done = false;
|
|
9817
9733
|
let found;
|
|
9818
9734
|
let relativePath;
|
|
@@ -10240,9 +10156,9 @@ var require_graceful_fs = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm
|
|
|
10240
10156
|
previousSymbol = "___graceful-fs.previous";
|
|
10241
10157
|
}
|
|
10242
10158
|
function noop() {}
|
|
10243
|
-
function publishQueue(context, queue
|
|
10159
|
+
function publishQueue(context, queue) {
|
|
10244
10160
|
Object.defineProperty(context, gracefulQueue, { get: function() {
|
|
10245
|
-
return queue
|
|
10161
|
+
return queue;
|
|
10246
10162
|
} });
|
|
10247
10163
|
}
|
|
10248
10164
|
var debug = noop;
|
|
@@ -10253,8 +10169,7 @@ var require_graceful_fs = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm
|
|
|
10253
10169
|
console.error(m);
|
|
10254
10170
|
};
|
|
10255
10171
|
if (!fs$3[gracefulQueue]) {
|
|
10256
|
-
|
|
10257
|
-
publishQueue(fs$3, queue);
|
|
10172
|
+
publishQueue(fs$3, global[gracefulQueue] || []);
|
|
10258
10173
|
fs$3.close = (function(fs$close) {
|
|
10259
10174
|
function close(fd, cb) {
|
|
10260
10175
|
return fs$close.call(fs$3, fd, function(err) {
|
|
@@ -10569,8 +10484,7 @@ var require_graceful_fs = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm
|
|
|
10569
10484
|
} else {
|
|
10570
10485
|
var sinceAttempt = Date.now() - lastTime;
|
|
10571
10486
|
var sinceStart = Math.max(lastTime - startTime, 1);
|
|
10572
|
-
|
|
10573
|
-
if (sinceAttempt >= desiredDelay) {
|
|
10487
|
+
if (sinceAttempt >= Math.min(sinceStart * 1.2, 100)) {
|
|
10574
10488
|
debug("RETRY", fn.name, args);
|
|
10575
10489
|
fn.apply(null, args.concat([startTime]));
|
|
10576
10490
|
} else fs$3[gracefulQueue].push(elem);
|
|
@@ -12234,8 +12148,7 @@ var require_esprima = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/esp
|
|
|
12234
12148
|
if (element.type === jsx_syntax_1.JSXSyntax.JSXClosingElement) {
|
|
12235
12149
|
el.closing = element;
|
|
12236
12150
|
var open_1 = getQualifiedElementName(el.opening.name);
|
|
12237
|
-
|
|
12238
|
-
if (open_1 !== close_1) this.tolerateError("Expected corresponding JSX closing tag for %0", open_1);
|
|
12151
|
+
if (open_1 !== getQualifiedElementName(el.closing.name)) this.tolerateError("Expected corresponding JSX closing tag for %0", open_1);
|
|
12239
12152
|
if (stack.length > 0) {
|
|
12240
12153
|
var child = this.finalize(el.node, new JSXNode.JSXElement(el.opening, el.children, el.closing));
|
|
12241
12154
|
el = stack[stack.length - 1];
|
|
@@ -13238,14 +13151,10 @@ var require_esprima = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/esp
|
|
|
13238
13151
|
column: this.scanner.index - this.scanner.lineStart
|
|
13239
13152
|
}
|
|
13240
13153
|
};
|
|
13241
|
-
if (token.type === 9) {
|
|
13242
|
-
|
|
13243
|
-
|
|
13244
|
-
|
|
13245
|
-
pattern,
|
|
13246
|
-
flags
|
|
13247
|
-
};
|
|
13248
|
-
}
|
|
13154
|
+
if (token.type === 9) t.regex = {
|
|
13155
|
+
pattern: token.pattern,
|
|
13156
|
+
flags: token.flags
|
|
13157
|
+
};
|
|
13249
13158
|
return t;
|
|
13250
13159
|
};
|
|
13251
13160
|
Parser.prototype.nextToken = function() {
|
|
@@ -13787,10 +13696,9 @@ var require_esprima = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/esp
|
|
|
13787
13696
|
if (!this.context.isBindingElement) this.throwUnexpectedToken(this.lookahead);
|
|
13788
13697
|
if (expr.type === syntax_1.Syntax.SequenceExpression) for (var i$2 = 0; i$2 < expr.expressions.length; i$2++) this.reinterpretExpressionAsPattern(expr.expressions[i$2]);
|
|
13789
13698
|
else this.reinterpretExpressionAsPattern(expr);
|
|
13790
|
-
var parameters = expr.type === syntax_1.Syntax.SequenceExpression ? expr.expressions : [expr];
|
|
13791
13699
|
expr = {
|
|
13792
13700
|
type: ArrowParameterPlaceHolder,
|
|
13793
|
-
params:
|
|
13701
|
+
params: expr.type === syntax_1.Syntax.SequenceExpression ? expr.expressions : [expr],
|
|
13794
13702
|
async: false
|
|
13795
13703
|
};
|
|
13796
13704
|
}
|
|
@@ -16372,13 +16280,12 @@ var require_esprima = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/esp
|
|
|
16372
16280
|
var start = this.index;
|
|
16373
16281
|
var pattern = this.scanRegExpBody();
|
|
16374
16282
|
var flags = this.scanRegExpFlags();
|
|
16375
|
-
var value = this.testRegExp(pattern, flags);
|
|
16376
16283
|
return {
|
|
16377
16284
|
type: 9,
|
|
16378
16285
|
value: "",
|
|
16379
16286
|
pattern,
|
|
16380
16287
|
flags,
|
|
16381
|
-
regex:
|
|
16288
|
+
regex: this.testRegExp(pattern, flags),
|
|
16382
16289
|
lineNumber: this.lineNumber,
|
|
16383
16290
|
lineStart: this.lineStart,
|
|
16384
16291
|
start,
|
|
@@ -16837,14 +16744,10 @@ var require_esprima = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/esp
|
|
|
16837
16744
|
};
|
|
16838
16745
|
entry.loc = loc;
|
|
16839
16746
|
}
|
|
16840
|
-
if (token.type === 9) {
|
|
16841
|
-
|
|
16842
|
-
|
|
16843
|
-
|
|
16844
|
-
pattern,
|
|
16845
|
-
flags
|
|
16846
|
-
};
|
|
16847
|
-
}
|
|
16747
|
+
if (token.type === 9) entry.regex = {
|
|
16748
|
+
pattern: token.pattern,
|
|
16749
|
+
flags: token.flags
|
|
16750
|
+
};
|
|
16848
16751
|
this.buffer.push(entry);
|
|
16849
16752
|
}
|
|
16850
16753
|
}
|
|
@@ -17929,8 +17832,7 @@ var require_dumper = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/js-y
|
|
|
17929
17832
|
function blockHeader(string, indentPerLevel) {
|
|
17930
17833
|
var indentIndicator = needIndentIndicator(string) ? String(indentPerLevel) : "";
|
|
17931
17834
|
var clip = string[string.length - 1] === "\n";
|
|
17932
|
-
|
|
17933
|
-
return indentIndicator + chomp + "\n";
|
|
17835
|
+
return indentIndicator + (clip && (string[string.length - 2] === "\n" || string === "\n") ? "+" : clip ? "" : "-") + "\n";
|
|
17934
17836
|
}
|
|
17935
17837
|
function dropEndingNewline(string) {
|
|
17936
17838
|
return string[string.length - 1] === "\n" ? string.slice(0, -1) : string;
|
|
@@ -18213,8 +18115,7 @@ var require_which_pm = /* @__PURE__ */ __commonJS({ "../../node_modules/.pnpm/wh
|
|
|
18213
18115
|
const modulesPath = path$2.join(pkgPath, "node_modules");
|
|
18214
18116
|
if (fs$1.existsSync(path$2.join(modulesPath, ".yarn-integrity"))) return { name: "yarn" };
|
|
18215
18117
|
try {
|
|
18216
|
-
|
|
18217
|
-
return toNameAndVersion(modules.packageManager);
|
|
18118
|
+
return toNameAndVersion((await loadYamlFile(path$2.join(modulesPath, ".modules.yaml"))).packageManager);
|
|
18218
18119
|
} catch (err) {
|
|
18219
18120
|
if (err.code !== "ENOENT") throw err;
|
|
18220
18121
|
}
|
|
@@ -18341,10 +18242,9 @@ var FireCommand = class extends ConsoleCommand {
|
|
|
18341
18242
|
"error"
|
|
18342
18243
|
][Number(this.option("verbose", 0))]
|
|
18343
18244
|
};
|
|
18344
|
-
const silent = ENV_VARS.LOG_LEVEL === "silent" ? "--silent" : null;
|
|
18345
18245
|
await execa(pm, [
|
|
18346
18246
|
"tsdown",
|
|
18347
|
-
silent,
|
|
18247
|
+
ENV_VARS.LOG_LEVEL === "silent" ? "--silent" : null,
|
|
18348
18248
|
"--config-loader",
|
|
18349
18249
|
"unconfig",
|
|
18350
18250
|
"-c",
|
|
@@ -18395,6 +18295,7 @@ var HttpServiceProvider = class extends ServiceProvider {
|
|
|
18395
18295
|
/** Register Musket Commands */
|
|
18396
18296
|
this.commands([FireCommand]);
|
|
18397
18297
|
}
|
|
18298
|
+
boot() {}
|
|
18398
18299
|
};
|
|
18399
18300
|
|
|
18400
18301
|
//#endregion
|