@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.cjs
CHANGED
|
@@ -140,8 +140,7 @@ const parseTemplate = ({ templates, expressions, tokens, index, template }) => {
|
|
|
140
140
|
const newTokens = concatTokens(tokens, nextTokens, leadingWhitespaces);
|
|
141
141
|
if (index === expressions.length) return newTokens;
|
|
142
142
|
const expression = expressions[index];
|
|
143
|
-
|
|
144
|
-
return concatTokens(newTokens, expressionTokens, trailingWhitespaces);
|
|
143
|
+
return concatTokens(newTokens, Array.isArray(expression) ? expression.map((expression$1) => parseExpression(expression$1)) : [parseExpression(expression)], trailingWhitespaces);
|
|
145
144
|
};
|
|
146
145
|
const splitByWhitespaces = (template, rawTemplate) => {
|
|
147
146
|
if (rawTemplate.length === 0) return {
|
|
@@ -228,8 +227,7 @@ const normalizeFdSpecificOptions = (options) => {
|
|
|
228
227
|
};
|
|
229
228
|
const normalizeFdSpecificOption = (options, optionName) => {
|
|
230
229
|
const optionBaseArray = Array.from({ length: getStdioLength(options) + 1 });
|
|
231
|
-
|
|
232
|
-
return addDefaultValue$1(optionArray, optionName);
|
|
230
|
+
return addDefaultValue$1(normalizeFdSpecificValue(options[optionName], optionBaseArray, optionName), optionName);
|
|
233
231
|
};
|
|
234
232
|
const getStdioLength = ({ stdio }) => Array.isArray(stdio) ? Math.max(stdio.length, STANDARD_STREAMS_ALIASES.length) : STANDARD_STREAMS_ALIASES.length;
|
|
235
233
|
const normalizeFdSpecificValue = (optionValue, optionArray, optionName) => isPlainObject(optionValue) ? normalizeOptionObject(optionValue, optionArray, optionName) : optionArray.fill(optionValue);
|
|
@@ -296,11 +294,9 @@ const VERBOSE_VALUES = [
|
|
|
296
294
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/arguments/escape.js
|
|
297
295
|
const joinCommand = (filePath, rawArguments) => {
|
|
298
296
|
const fileAndArguments = [filePath, ...rawArguments];
|
|
299
|
-
const command = fileAndArguments.join(" ");
|
|
300
|
-
const escapedCommand = fileAndArguments.map((fileAndArgument) => quoteString(escapeControlCharacters(fileAndArgument))).join(" ");
|
|
301
297
|
return {
|
|
302
|
-
command,
|
|
303
|
-
escapedCommand
|
|
298
|
+
command: fileAndArguments.join(" "),
|
|
299
|
+
escapedCommand: fileAndArguments.map((fileAndArgument) => quoteString(escapeControlCharacters(fileAndArgument))).join(" ")
|
|
304
300
|
};
|
|
305
301
|
};
|
|
306
302
|
const escapeLines = (lines) => (0, node_util.stripVTControlCharacters)(lines).split("\n").map((line) => escapeControlCharacters(line)).join("\n");
|
|
@@ -742,13 +738,11 @@ const appendNewline = (printedLine) => printedLine.endsWith("\n") ? printedLine
|
|
|
742
738
|
//#endregion
|
|
743
739
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/verbose/log.js
|
|
744
740
|
const verboseLog = ({ type, verboseMessage, fdNumber, verboseInfo, result }) => {
|
|
745
|
-
const
|
|
741
|
+
const finalLines = applyVerboseOnLines(getPrintedLines(verboseMessage, getVerboseObject({
|
|
746
742
|
type,
|
|
747
743
|
result,
|
|
748
744
|
verboseInfo
|
|
749
|
-
});
|
|
750
|
-
const printedLines = getPrintedLines(verboseMessage, verboseObject);
|
|
751
|
-
const finalLines = applyVerboseOnLines(printedLines, verboseInfo, fdNumber);
|
|
745
|
+
})), verboseInfo, fdNumber);
|
|
752
746
|
if (finalLines !== "") console.warn(finalLines.slice(0, -1));
|
|
753
747
|
};
|
|
754
748
|
const getVerboseObject = ({ type, result, verboseInfo: { escapedCommand, commandId, rawOptions: { piped = false,...options } } }) => ({
|
|
@@ -771,8 +765,7 @@ const getPrintedLine = (verboseObject) => {
|
|
|
771
765
|
};
|
|
772
766
|
};
|
|
773
767
|
const serializeVerboseMessage = (message) => {
|
|
774
|
-
|
|
775
|
-
return escapeLines(messageString).replaceAll(" ", " ".repeat(TAB_SIZE));
|
|
768
|
+
return escapeLines(typeof message === "string" ? message : (0, node_util.inspect)(message)).replaceAll(" ", " ".repeat(TAB_SIZE));
|
|
776
769
|
};
|
|
777
770
|
const TAB_SIZE = 2;
|
|
778
771
|
|
|
@@ -791,11 +784,10 @@ const logCommand = (escapedCommand, verboseInfo) => {
|
|
|
791
784
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/verbose/info.js
|
|
792
785
|
const getVerboseInfo = (verbose, escapedCommand, rawOptions) => {
|
|
793
786
|
validateVerbose(verbose);
|
|
794
|
-
const commandId = getCommandId(verbose);
|
|
795
787
|
return {
|
|
796
788
|
verbose,
|
|
797
789
|
escapedCommand,
|
|
798
|
-
commandId,
|
|
790
|
+
commandId: getCommandId(verbose),
|
|
799
791
|
rawOptions
|
|
800
792
|
};
|
|
801
793
|
};
|
|
@@ -822,8 +814,7 @@ const getDurationMs = (startTime) => Number(node_process.hrtime.bigint() - start
|
|
|
822
814
|
const handleCommand = (filePath, rawArguments, rawOptions) => {
|
|
823
815
|
const startTime = getStartTime();
|
|
824
816
|
const { command, escapedCommand } = joinCommand(filePath, rawArguments);
|
|
825
|
-
const
|
|
826
|
-
const verboseInfo = getVerboseInfo(verbose, escapedCommand, { ...rawOptions });
|
|
817
|
+
const verboseInfo = getVerboseInfo(normalizeFdSpecificOption(rawOptions, "verbose"), escapedCommand, { ...rawOptions });
|
|
827
818
|
logCommand(escapedCommand, verboseInfo);
|
|
828
819
|
return {
|
|
829
820
|
command,
|
|
@@ -973,8 +964,7 @@ var require_which = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
973
964
|
const ppRaw = pathEnv[i$2];
|
|
974
965
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
975
966
|
const pCmd = path$15.join(pathPart, cmd);
|
|
976
|
-
|
|
977
|
-
resolve(subStep(p, i$2, 0));
|
|
967
|
+
resolve(subStep(!pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd, i$2, 0));
|
|
978
968
|
});
|
|
979
969
|
const subStep = (p, i$2, ii) => new Promise((resolve, reject) => {
|
|
980
970
|
if (ii === pathExt.length) return resolve(step(i$2 + 1));
|
|
@@ -1302,9 +1292,7 @@ const npmRunPathEnv = ({ env: env$1 = node_process.default.env,...options } = {}
|
|
|
1302
1292
|
//#endregion
|
|
1303
1293
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/return/final-error.js
|
|
1304
1294
|
const getFinalError = (originalError, message, isSync) => {
|
|
1305
|
-
|
|
1306
|
-
const options = originalError instanceof DiscardedError ? {} : { cause: originalError };
|
|
1307
|
-
return new ErrorClass(message, options);
|
|
1295
|
+
return new (isSync ? ExecaSyncError : ExecaError)(message, originalError instanceof DiscardedError ? {} : { cause: originalError });
|
|
1308
1296
|
};
|
|
1309
1297
|
var DiscardedError = class extends Error {};
|
|
1310
1298
|
const setErrorName = (ErrorClass, value) => {
|
|
@@ -2042,8 +2030,7 @@ const isConnected = (anyProcess) => {
|
|
|
2042
2030
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/ipc/strict.js
|
|
2043
2031
|
const handleSendStrict = ({ anyProcess, channel, isSubprocess, message, strict }) => {
|
|
2044
2032
|
if (!strict) return message;
|
|
2045
|
-
const
|
|
2046
|
-
const hasListeners = hasMessageListeners(anyProcess, ipcEmitter);
|
|
2033
|
+
const hasListeners = hasMessageListeners(anyProcess, getIpcEmitter(anyProcess, channel, isSubprocess));
|
|
2047
2034
|
return {
|
|
2048
2035
|
id: count++,
|
|
2049
2036
|
type: REQUEST_TYPE,
|
|
@@ -2116,11 +2103,9 @@ const RESPONSE_TYPE = "execa:ipc:response";
|
|
|
2116
2103
|
const startSendMessage = (anyProcess, wrappedMessage, strict) => {
|
|
2117
2104
|
if (!OUTGOING_MESSAGES.has(anyProcess)) OUTGOING_MESSAGES.set(anyProcess, /* @__PURE__ */ new Set());
|
|
2118
2105
|
const outgoingMessages = OUTGOING_MESSAGES.get(anyProcess);
|
|
2119
|
-
const onMessageSent = createDeferred();
|
|
2120
|
-
const id = strict ? wrappedMessage.id : void 0;
|
|
2121
2106
|
const outgoingMessage = {
|
|
2122
|
-
onMessageSent,
|
|
2123
|
-
id
|
|
2107
|
+
onMessageSent: createDeferred(),
|
|
2108
|
+
id: strict ? wrappedMessage.id : void 0
|
|
2124
2109
|
};
|
|
2125
2110
|
outgoingMessages.add(outgoingMessage);
|
|
2126
2111
|
return {
|
|
@@ -2281,8 +2266,7 @@ const throwOnGracefulCancel = ({ subprocess, cancelSignal, gracefulCancel, force
|
|
|
2281
2266
|
})] : [];
|
|
2282
2267
|
const sendOnAbort = async ({ subprocess, cancelSignal, forceKillAfterDelay, context, controller: { signal } }) => {
|
|
2283
2268
|
await onAbortedSignal(cancelSignal, signal);
|
|
2284
|
-
|
|
2285
|
-
await sendAbort(subprocess, reason);
|
|
2269
|
+
await sendAbort(subprocess, getReason(cancelSignal));
|
|
2286
2270
|
killOnTimeout({
|
|
2287
2271
|
kill: subprocess.kill,
|
|
2288
2272
|
forceKillAfterDelay,
|
|
@@ -2456,8 +2440,7 @@ const normalizeOptions = (filePath, rawArguments, rawOptions) => {
|
|
|
2456
2440
|
rawOptions.cwd = normalizeCwd(rawOptions.cwd);
|
|
2457
2441
|
const [processedFile, processedArguments, processedOptions] = handleNodeOption(filePath, rawArguments, rawOptions);
|
|
2458
2442
|
const { command: file, args: commandArguments, options: initialOptions } = import_cross_spawn.default._parse(processedFile, processedArguments, processedOptions);
|
|
2459
|
-
const
|
|
2460
|
-
const options = addDefaultOptions(fdOptions);
|
|
2443
|
+
const options = addDefaultOptions(normalizeFdSpecificOptions(initialOptions));
|
|
2461
2444
|
validateTimeout(options);
|
|
2462
2445
|
validateEncoding(options);
|
|
2463
2446
|
validateIpcInputOption(options);
|
|
@@ -2626,7 +2609,7 @@ const u = Object.create(a, {
|
|
|
2626
2609
|
}
|
|
2627
2610
|
});
|
|
2628
2611
|
function h({ preventCancel: r = !1 } = {}) {
|
|
2629
|
-
const
|
|
2612
|
+
const t = new c(this.getReader(), r), s = Object.create(u);
|
|
2630
2613
|
return s[n] = t, s;
|
|
2631
2614
|
}
|
|
2632
2615
|
|
|
@@ -2675,18 +2658,14 @@ const getStreamContents$1 = async (stream, { init, convertChunk, getSize, trunca
|
|
|
2675
2658
|
const state = init();
|
|
2676
2659
|
state.length = 0;
|
|
2677
2660
|
try {
|
|
2678
|
-
for await (const chunk of asyncIterable) {
|
|
2679
|
-
|
|
2680
|
-
|
|
2681
|
-
|
|
2682
|
-
|
|
2683
|
-
|
|
2684
|
-
|
|
2685
|
-
|
|
2686
|
-
addChunk,
|
|
2687
|
-
maxBuffer
|
|
2688
|
-
});
|
|
2689
|
-
}
|
|
2661
|
+
for await (const chunk of asyncIterable) appendChunk({
|
|
2662
|
+
convertedChunk: convertChunk[getChunkType(chunk)](chunk, state),
|
|
2663
|
+
state,
|
|
2664
|
+
getSize,
|
|
2665
|
+
truncateChunk,
|
|
2666
|
+
addChunk,
|
|
2667
|
+
maxBuffer
|
|
2668
|
+
});
|
|
2690
2669
|
appendFinalChunk({
|
|
2691
2670
|
state,
|
|
2692
2671
|
convertChunk,
|
|
@@ -2876,10 +2855,9 @@ const stringMethods = {
|
|
|
2876
2855
|
const handleMaxBuffer = ({ error, stream, readableObjectMode, lines, encoding, fdNumber }) => {
|
|
2877
2856
|
if (!(error instanceof MaxBufferError)) throw error;
|
|
2878
2857
|
if (fdNumber === "all") return error;
|
|
2879
|
-
const unit = getMaxBufferUnit(readableObjectMode, lines, encoding);
|
|
2880
2858
|
error.maxBufferInfo = {
|
|
2881
2859
|
fdNumber,
|
|
2882
|
-
unit
|
|
2860
|
+
unit: getMaxBufferUnit(readableObjectMode, lines, encoding)
|
|
2883
2861
|
};
|
|
2884
2862
|
stream.destroy();
|
|
2885
2863
|
throw error;
|
|
@@ -2949,19 +2927,16 @@ const createMessages = ({ stdio, all, ipcOutput, originalError, signal, signalDe
|
|
|
2949
2927
|
killSignal
|
|
2950
2928
|
});
|
|
2951
2929
|
const originalMessage = getOriginalMessage(originalError, cwd$1);
|
|
2952
|
-
const
|
|
2953
|
-
const shortMessage = `${prefix}: ${escapedCommand}${suffix}`;
|
|
2954
|
-
const messageStdio = all === void 0 ? [stdio[2], stdio[1]] : [all];
|
|
2955
|
-
const message = [
|
|
2956
|
-
shortMessage,
|
|
2957
|
-
...messageStdio,
|
|
2958
|
-
...stdio.slice(3),
|
|
2959
|
-
ipcOutput.map((ipcMessage) => serializeIpcMessage(ipcMessage)).join("\n")
|
|
2960
|
-
].map((messagePart) => escapeLines(stripFinalNewline(serializeMessagePart(messagePart)))).filter(Boolean).join("\n\n");
|
|
2930
|
+
const shortMessage = `${prefix}: ${escapedCommand}${originalMessage === void 0 ? "" : `\n${originalMessage}`}`;
|
|
2961
2931
|
return {
|
|
2962
2932
|
originalMessage,
|
|
2963
2933
|
shortMessage,
|
|
2964
|
-
message
|
|
2934
|
+
message: [
|
|
2935
|
+
shortMessage,
|
|
2936
|
+
...all === void 0 ? [stdio[2], stdio[1]] : [all],
|
|
2937
|
+
...stdio.slice(3),
|
|
2938
|
+
ipcOutput.map((ipcMessage) => serializeIpcMessage(ipcMessage)).join("\n")
|
|
2939
|
+
].map((messagePart) => escapeLines(stripFinalNewline(serializeMessagePart(messagePart)))).filter(Boolean).join("\n\n")
|
|
2965
2940
|
};
|
|
2966
2941
|
};
|
|
2967
2942
|
const getErrorPrefix = ({ originalError, timedOut, timeout, isMaxBuffer, maxBuffer, errorCode, signal, signalDescription, exitCode, isCanceled, isGracefullyCanceled, isForcefullyTerminated, forceKillAfterDelay, killSignal }) => {
|
|
@@ -2982,8 +2957,7 @@ const getErrorPrefix = ({ originalError, timedOut, timeout, isMaxBuffer, maxBuff
|
|
|
2982
2957
|
const getForcefulSuffix = (isForcefullyTerminated, forceKillAfterDelay) => isForcefullyTerminated ? ` and was forcefully terminated after ${forceKillAfterDelay} milliseconds` : "";
|
|
2983
2958
|
const getOriginalMessage = (originalError, cwd$1) => {
|
|
2984
2959
|
if (originalError instanceof DiscardedError) return;
|
|
2985
|
-
const
|
|
2986
|
-
const escapedOriginalMessage = escapeLines(fixCwdError(originalMessage, cwd$1));
|
|
2960
|
+
const escapedOriginalMessage = escapeLines(fixCwdError(isExecaError(originalError) ? originalError.originalMessage : String(originalError?.message ?? originalError), cwd$1));
|
|
2987
2961
|
return escapedOriginalMessage === "" ? void 0 : escapedOriginalMessage;
|
|
2988
2962
|
};
|
|
2989
2963
|
const serializeIpcMessage = (ipcMessage) => typeof ipcMessage === "string" ? ipcMessage : (0, node_util.inspect)(ipcMessage);
|
|
@@ -3105,11 +3079,10 @@ const omitUndefinedProperties = (result) => Object.fromEntries(Object.entries(re
|
|
|
3105
3079
|
const normalizeExitPayload = (rawExitCode, rawSignal) => {
|
|
3106
3080
|
const exitCode = rawExitCode === null ? void 0 : rawExitCode;
|
|
3107
3081
|
const signal = rawSignal === null ? void 0 : rawSignal;
|
|
3108
|
-
const signalDescription = signal === void 0 ? void 0 : getSignalDescription(rawSignal);
|
|
3109
3082
|
return {
|
|
3110
3083
|
exitCode,
|
|
3111
3084
|
signal,
|
|
3112
|
-
signalDescription
|
|
3085
|
+
signalDescription: signal === void 0 ? void 0 : getSignalDescription(rawSignal)
|
|
3113
3086
|
};
|
|
3114
3087
|
};
|
|
3115
3088
|
|
|
@@ -3215,9 +3188,7 @@ function prettyMilliseconds(milliseconds, options) {
|
|
|
3215
3188
|
add(Number.parseFloat(millisecondsString), "millisecond", "ms", millisecondsString);
|
|
3216
3189
|
}
|
|
3217
3190
|
} else {
|
|
3218
|
-
const
|
|
3219
|
-
const secondsDecimalDigits = typeof options.secondsDecimalDigits === "number" ? options.secondsDecimalDigits : 1;
|
|
3220
|
-
const secondsFixed = floorDecimals(seconds, secondsDecimalDigits);
|
|
3191
|
+
const secondsFixed = floorDecimals((isBigInt ? Number(milliseconds % ONE_DAY_IN_MILLISECONDS) : milliseconds) / 1e3 % 60, typeof options.secondsDecimalDigits === "number" ? options.secondsDecimalDigits : 1);
|
|
3221
3192
|
const secondsString = options.keepDecimalsOnWholeSeconds ? secondsFixed : secondsFixed.replace(/\.0+$/, "");
|
|
3222
3193
|
add(Number.parseFloat(secondsString), "second", "s", secondsString);
|
|
3223
3194
|
}
|
|
@@ -3246,10 +3217,9 @@ const logResult = (result, verboseInfo) => {
|
|
|
3246
3217
|
logDuration(result, verboseInfo);
|
|
3247
3218
|
};
|
|
3248
3219
|
const logDuration = (result, verboseInfo) => {
|
|
3249
|
-
const verboseMessage = `(done in ${prettyMilliseconds(result.durationMs)})`;
|
|
3250
3220
|
verboseLog({
|
|
3251
3221
|
type: "duration",
|
|
3252
|
-
verboseMessage
|
|
3222
|
+
verboseMessage: `(done in ${prettyMilliseconds(result.durationMs)})`,
|
|
3253
3223
|
verboseInfo,
|
|
3254
3224
|
result
|
|
3255
3225
|
});
|
|
@@ -3383,10 +3353,9 @@ const getOutputObjectModes = (objectMode, index, newTransforms) => {
|
|
|
3383
3353
|
};
|
|
3384
3354
|
const getInputObjectModes = (objectMode, index, newTransforms) => {
|
|
3385
3355
|
const writableObjectMode = index === 0 ? objectMode === true : newTransforms[index - 1].value.readableObjectMode;
|
|
3386
|
-
const readableObjectMode = index !== newTransforms.length - 1 && (objectMode ?? writableObjectMode);
|
|
3387
3356
|
return {
|
|
3388
3357
|
writableObjectMode,
|
|
3389
|
-
readableObjectMode
|
|
3358
|
+
readableObjectMode: index !== newTransforms.length - 1 && (objectMode ?? writableObjectMode)
|
|
3390
3359
|
};
|
|
3391
3360
|
};
|
|
3392
3361
|
const getFdObjectMode = (stdioItems, direction) => {
|
|
@@ -3695,8 +3664,7 @@ const validateDuplicateStreamSync = ({ otherStdioItems, type, value, optionName,
|
|
|
3695
3664
|
const getDuplicateStreamInstance = ({ otherStdioItems, type, value, optionName, direction }) => {
|
|
3696
3665
|
const duplicateStdioItems = otherStdioItems.filter((stdioItem) => hasSameValue(stdioItem, value));
|
|
3697
3666
|
if (duplicateStdioItems.length === 0) return;
|
|
3698
|
-
|
|
3699
|
-
throwOnDuplicateStream(differentStdioItem, optionName, type);
|
|
3667
|
+
throwOnDuplicateStream(duplicateStdioItems.find((stdioItem) => stdioItem.direction !== direction), optionName, type);
|
|
3700
3668
|
return direction === "output" ? duplicateStdioItems[0].stream : void 0;
|
|
3701
3669
|
};
|
|
3702
3670
|
const hasSameValue = ({ type, value }, secondValue) => {
|
|
@@ -3705,8 +3673,7 @@ const hasSameValue = ({ type, value }, secondValue) => {
|
|
|
3705
3673
|
return value === secondValue;
|
|
3706
3674
|
};
|
|
3707
3675
|
const validateDuplicateTransform = ({ otherStdioItems, type, value, optionName }) => {
|
|
3708
|
-
|
|
3709
|
-
throwOnDuplicateStream(duplicateStdioItem, optionName, type);
|
|
3676
|
+
throwOnDuplicateStream(otherStdioItems.find(({ value: { transform: transform$1 } }) => transform$1 === value.transform), optionName, type);
|
|
3710
3677
|
};
|
|
3711
3678
|
const throwOnDuplicateStream = (stdioItem, optionName, type) => {
|
|
3712
3679
|
if (stdioItem !== void 0) throw new TypeError(`The \`${stdioItem.optionName}\` and \`${optionName}\` options must not target ${TYPE_TO_MESSAGE[type]} that is the same.`);
|
|
@@ -3715,14 +3682,13 @@ const throwOnDuplicateStream = (stdioItem, optionName, type) => {
|
|
|
3715
3682
|
//#endregion
|
|
3716
3683
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/stdio/handle.js
|
|
3717
3684
|
const handleStdio = (addProperties$2, options, verboseInfo, isSync) => {
|
|
3718
|
-
const initialFileDescriptors = normalizeStdioOption(options, verboseInfo, isSync).map((stdioOption, fdNumber) => getFileDescriptor({
|
|
3719
|
-
stdioOption,
|
|
3720
|
-
fdNumber,
|
|
3721
|
-
options,
|
|
3722
|
-
isSync
|
|
3723
|
-
}));
|
|
3724
3685
|
const fileDescriptors = getFinalFileDescriptors({
|
|
3725
|
-
initialFileDescriptors,
|
|
3686
|
+
initialFileDescriptors: normalizeStdioOption(options, verboseInfo, isSync).map((stdioOption, fdNumber) => getFileDescriptor({
|
|
3687
|
+
stdioOption,
|
|
3688
|
+
fdNumber,
|
|
3689
|
+
options,
|
|
3690
|
+
isSync
|
|
3691
|
+
})),
|
|
3726
3692
|
addProperties: addProperties$2,
|
|
3727
3693
|
options,
|
|
3728
3694
|
isSync
|
|
@@ -3739,14 +3705,13 @@ const getFileDescriptor = ({ stdioOption, fdNumber, options, isSync }) => {
|
|
|
3739
3705
|
optionName
|
|
3740
3706
|
});
|
|
3741
3707
|
const direction = getStreamDirection(initialStdioItems, fdNumber, optionName);
|
|
3742
|
-
const
|
|
3708
|
+
const normalizedStdioItems = normalizeTransforms(initialStdioItems.map((stdioItem) => handleNativeStream({
|
|
3743
3709
|
stdioItem,
|
|
3744
3710
|
isStdioArray,
|
|
3745
3711
|
fdNumber,
|
|
3746
3712
|
direction,
|
|
3747
3713
|
isSync
|
|
3748
|
-
}));
|
|
3749
|
-
const normalizedStdioItems = normalizeTransforms(stdioItems, optionName, direction, options);
|
|
3714
|
+
})), optionName, direction, options);
|
|
3750
3715
|
const objectMode = getFdObjectMode(normalizedStdioItems, direction);
|
|
3751
3716
|
validateFileObjectMode(normalizedStdioItems, objectMode);
|
|
3752
3717
|
return {
|
|
@@ -3756,8 +3721,7 @@ const getFileDescriptor = ({ stdioOption, fdNumber, options, isSync }) => {
|
|
|
3756
3721
|
};
|
|
3757
3722
|
};
|
|
3758
3723
|
const initializeStdioItems = ({ stdioOption, fdNumber, options, optionName }) => {
|
|
3759
|
-
const
|
|
3760
|
-
const stdioItems = filterDuplicates(initialStdioItems);
|
|
3724
|
+
const stdioItems = filterDuplicates([...(Array.isArray(stdioOption) ? stdioOption : [stdioOption]).map((value) => initializeStdioItem(value, optionName)), ...handleInputOptions(options, fdNumber)]);
|
|
3761
3725
|
const isStdioArray = stdioItems.length > 1;
|
|
3762
3726
|
validateStdioArray(stdioItems, isStdioArray, optionName);
|
|
3763
3727
|
validateStreams(stdioItems);
|
|
@@ -3807,18 +3771,17 @@ const getFinalFileDescriptors = ({ initialFileDescriptors, addProperties: addPro
|
|
|
3807
3771
|
}
|
|
3808
3772
|
};
|
|
3809
3773
|
const getFinalFileDescriptor = ({ fileDescriptor: { direction, objectMode, stdioItems }, fileDescriptors, addProperties: addProperties$2, options, isSync }) => {
|
|
3810
|
-
const finalStdioItems = stdioItems.map((stdioItem) => addStreamProperties({
|
|
3811
|
-
stdioItem,
|
|
3812
|
-
addProperties: addProperties$2,
|
|
3813
|
-
direction,
|
|
3814
|
-
options,
|
|
3815
|
-
fileDescriptors,
|
|
3816
|
-
isSync
|
|
3817
|
-
}));
|
|
3818
3774
|
return {
|
|
3819
3775
|
direction,
|
|
3820
3776
|
objectMode,
|
|
3821
|
-
stdioItems:
|
|
3777
|
+
stdioItems: stdioItems.map((stdioItem) => addStreamProperties({
|
|
3778
|
+
stdioItem,
|
|
3779
|
+
addProperties: addProperties$2,
|
|
3780
|
+
direction,
|
|
3781
|
+
options,
|
|
3782
|
+
fileDescriptors,
|
|
3783
|
+
isSync
|
|
3784
|
+
}))
|
|
3822
3785
|
};
|
|
3823
3786
|
};
|
|
3824
3787
|
const addStreamProperties = ({ stdioItem, addProperties: addProperties$2, direction, options, fileDescriptors, isSync }) => {
|
|
@@ -4114,10 +4077,7 @@ const generatorToStream = ({ value, value: { transform: transform$1, final, writ
|
|
|
4114
4077
|
const runGeneratorsSync = (chunks, stdioItems, encoding, isInput) => {
|
|
4115
4078
|
const generators = stdioItems.filter(({ type }) => type === "generator");
|
|
4116
4079
|
const reversedGenerators = isInput ? generators.reverse() : generators;
|
|
4117
|
-
for (const { value, optionName } of reversedGenerators)
|
|
4118
|
-
const generators$1 = addInternalGenerators(value, encoding, optionName);
|
|
4119
|
-
chunks = runTransformSync(generators$1, chunks);
|
|
4120
|
-
}
|
|
4080
|
+
for (const { value, optionName } of reversedGenerators) chunks = runTransformSync(addInternalGenerators(value, encoding, optionName), chunks);
|
|
4121
4081
|
return chunks;
|
|
4122
4082
|
};
|
|
4123
4083
|
const addInternalGenerators = ({ transform: transform$1, final, binary, writableObjectMode, readableObjectMode, preserveNewlines }, encoding, optionName) => {
|
|
@@ -4154,8 +4114,7 @@ const addInputOptionSync = (fileDescriptors, fdNumber, options) => {
|
|
|
4154
4114
|
const [{ type, optionName }] = allStdioItems;
|
|
4155
4115
|
throw new TypeError(`Only the \`stdin\` option, not \`${optionName}\`, can be ${TYPE_TO_MESSAGE[type]} with synchronous methods.`);
|
|
4156
4116
|
}
|
|
4157
|
-
|
|
4158
|
-
options.input = joinToUint8Array(transformedContents);
|
|
4117
|
+
options.input = joinToUint8Array(allStdioItems.map(({ contents }) => contents).map((contents) => applySingleInputGeneratorsSync(contents, stdioItems)));
|
|
4159
4118
|
};
|
|
4160
4119
|
const applySingleInputGeneratorsSync = (contents, stdioItems) => {
|
|
4161
4120
|
const newContents = runGeneratorsSync(contents, stdioItems, "utf8", true);
|
|
@@ -4180,10 +4139,9 @@ const logLinesSync = (linesArray, fdNumber, verboseInfo) => {
|
|
|
4180
4139
|
};
|
|
4181
4140
|
const isPipingStream = (stream) => stream._readableState.pipes.length > 0;
|
|
4182
4141
|
const logLine = (line, fdNumber, verboseInfo) => {
|
|
4183
|
-
const verboseMessage = serializeVerboseMessage(line);
|
|
4184
4142
|
verboseLog({
|
|
4185
4143
|
type: "output",
|
|
4186
|
-
verboseMessage,
|
|
4144
|
+
verboseMessage: serializeVerboseMessage(line),
|
|
4187
4145
|
fdNumber,
|
|
4188
4146
|
verboseInfo
|
|
4189
4147
|
});
|
|
@@ -4210,12 +4168,10 @@ const transformOutputSync = ({ fileDescriptors, syncResult: { output }, options,
|
|
|
4210
4168
|
};
|
|
4211
4169
|
const transformOutputResultSync = ({ result, fileDescriptors, fdNumber, state, outputFiles, isMaxBuffer, verboseInfo }, { buffer, encoding, lines, stripFinalNewline: stripFinalNewline$1, maxBuffer }) => {
|
|
4212
4170
|
if (result === null) return;
|
|
4213
|
-
const
|
|
4214
|
-
const uint8ArrayResult = bufferToUint8Array(truncatedResult);
|
|
4171
|
+
const uint8ArrayResult = bufferToUint8Array(truncateMaxBufferSync(result, isMaxBuffer, maxBuffer));
|
|
4215
4172
|
const { stdioItems, objectMode } = fileDescriptors[fdNumber];
|
|
4216
|
-
const chunks = runOutputGeneratorsSync([uint8ArrayResult], stdioItems, encoding, state);
|
|
4217
4173
|
const { serializedResult, finalResult = serializedResult } = serializeChunks({
|
|
4218
|
-
chunks,
|
|
4174
|
+
chunks: runOutputGeneratorsSync([uint8ArrayResult], stdioItems, encoding, state),
|
|
4219
4175
|
objectMode,
|
|
4220
4176
|
encoding,
|
|
4221
4177
|
lines,
|
|
@@ -4326,14 +4282,12 @@ const isFailedExit = (exitCode, signal) => exitCode !== 0 || signal !== null;
|
|
|
4326
4282
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/resolve/exit-sync.js
|
|
4327
4283
|
const getExitResultSync = ({ error, status: exitCode, signal, output }, { maxBuffer }) => {
|
|
4328
4284
|
const resultError = getResultError(error, exitCode, signal);
|
|
4329
|
-
const timedOut = resultError?.code === "ETIMEDOUT";
|
|
4330
|
-
const isMaxBuffer = isMaxBufferSync(resultError, output, maxBuffer);
|
|
4331
4285
|
return {
|
|
4332
4286
|
resultError,
|
|
4333
4287
|
exitCode,
|
|
4334
4288
|
signal,
|
|
4335
|
-
timedOut,
|
|
4336
|
-
isMaxBuffer
|
|
4289
|
+
timedOut: resultError?.code === "ETIMEDOUT",
|
|
4290
|
+
isMaxBuffer: isMaxBufferSync(resultError, output, maxBuffer)
|
|
4337
4291
|
};
|
|
4338
4292
|
};
|
|
4339
4293
|
const getResultError = (error, exitCode, signal) => {
|
|
@@ -4345,7 +4299,7 @@ const getResultError = (error, exitCode, signal) => {
|
|
|
4345
4299
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/methods/main-sync.js
|
|
4346
4300
|
const execaCoreSync = (rawFile, rawArguments, rawOptions) => {
|
|
4347
4301
|
const { file, commandArguments, command, escapedCommand, startTime, verboseInfo, options, fileDescriptors } = handleSyncArguments(rawFile, rawArguments, rawOptions);
|
|
4348
|
-
|
|
4302
|
+
return handleResult(spawnSubprocessSync({
|
|
4349
4303
|
file,
|
|
4350
4304
|
commandArguments,
|
|
4351
4305
|
options,
|
|
@@ -4354,15 +4308,12 @@ const execaCoreSync = (rawFile, rawArguments, rawOptions) => {
|
|
|
4354
4308
|
verboseInfo,
|
|
4355
4309
|
fileDescriptors,
|
|
4356
4310
|
startTime
|
|
4357
|
-
});
|
|
4358
|
-
return handleResult(result, verboseInfo, options);
|
|
4311
|
+
}), verboseInfo, options);
|
|
4359
4312
|
};
|
|
4360
4313
|
const handleSyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
4361
4314
|
const { command, escapedCommand, startTime, verboseInfo } = handleCommand(rawFile, rawArguments, rawOptions);
|
|
4362
|
-
const
|
|
4363
|
-
const { file, commandArguments, options } = normalizeOptions(rawFile, rawArguments, syncOptions);
|
|
4315
|
+
const { file, commandArguments, options } = normalizeOptions(rawFile, rawArguments, normalizeSyncOptions(rawOptions));
|
|
4364
4316
|
validateSyncOptions(options);
|
|
4365
|
-
const fileDescriptors = handleStdioSync(options, verboseInfo);
|
|
4366
4317
|
return {
|
|
4367
4318
|
file,
|
|
4368
4319
|
commandArguments,
|
|
@@ -4371,7 +4322,7 @@ const handleSyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
4371
4322
|
startTime,
|
|
4372
4323
|
verboseInfo,
|
|
4373
4324
|
options,
|
|
4374
|
-
fileDescriptors
|
|
4325
|
+
fileDescriptors: handleStdioSync(options, verboseInfo)
|
|
4375
4326
|
};
|
|
4376
4327
|
};
|
|
4377
4328
|
const normalizeSyncOptions = (options) => options.node && !options.ipc ? {
|
|
@@ -4406,16 +4357,14 @@ const spawnSubprocessSync = ({ file, commandArguments, options, command, escaped
|
|
|
4406
4357
|
isMaxBuffer,
|
|
4407
4358
|
verboseInfo
|
|
4408
4359
|
});
|
|
4409
|
-
const stdio = output.map((stdioOutput, fdNumber) => stripNewline(stdioOutput, options, fdNumber));
|
|
4410
|
-
const all = stripNewline(getAllSync(output, options), options, "all");
|
|
4411
4360
|
return getSyncResult({
|
|
4412
4361
|
error,
|
|
4413
4362
|
exitCode,
|
|
4414
4363
|
signal,
|
|
4415
4364
|
timedOut,
|
|
4416
4365
|
isMaxBuffer,
|
|
4417
|
-
stdio,
|
|
4418
|
-
all,
|
|
4366
|
+
stdio: output.map((stdioOutput, fdNumber) => stripNewline(stdioOutput, options, fdNumber)),
|
|
4367
|
+
all: stripNewline(getAllSync(output, options), options, "all"),
|
|
4419
4368
|
options,
|
|
4420
4369
|
command,
|
|
4421
4370
|
escapedCommand,
|
|
@@ -4425,8 +4374,7 @@ const spawnSubprocessSync = ({ file, commandArguments, options, command, escaped
|
|
|
4425
4374
|
const runSubprocessSync = ({ file, commandArguments, options, command, escapedCommand, fileDescriptors, startTime }) => {
|
|
4426
4375
|
try {
|
|
4427
4376
|
addInputOptionsSync(fileDescriptors, options);
|
|
4428
|
-
|
|
4429
|
-
return (0, node_child_process.spawnSync)(...concatenateShell(file, commandArguments, normalizedOptions));
|
|
4377
|
+
return (0, node_child_process.spawnSync)(...concatenateShell(file, commandArguments, normalizeSpawnSyncOptions(options)));
|
|
4430
4378
|
} catch (error) {
|
|
4431
4379
|
return makeEarlyError({
|
|
4432
4380
|
error,
|
|
@@ -4644,19 +4592,17 @@ const handleEarlyError = ({ error, command, escapedCommand, fileDescriptors, opt
|
|
|
4644
4592
|
writable,
|
|
4645
4593
|
duplex
|
|
4646
4594
|
});
|
|
4647
|
-
const earlyError = makeEarlyError({
|
|
4648
|
-
error,
|
|
4649
|
-
command,
|
|
4650
|
-
escapedCommand,
|
|
4651
|
-
fileDescriptors,
|
|
4652
|
-
options,
|
|
4653
|
-
startTime,
|
|
4654
|
-
isSync: false
|
|
4655
|
-
});
|
|
4656
|
-
const promise = handleDummyPromise(earlyError, verboseInfo, options);
|
|
4657
4595
|
return {
|
|
4658
4596
|
subprocess,
|
|
4659
|
-
promise
|
|
4597
|
+
promise: handleDummyPromise(makeEarlyError({
|
|
4598
|
+
error,
|
|
4599
|
+
command,
|
|
4600
|
+
escapedCommand,
|
|
4601
|
+
fileDescriptors,
|
|
4602
|
+
options,
|
|
4603
|
+
startTime,
|
|
4604
|
+
isSync: false
|
|
4605
|
+
}), verboseInfo, options)
|
|
4660
4606
|
};
|
|
4661
4607
|
};
|
|
4662
4608
|
const createDummyStreams = (subprocess, fileDescriptors) => {
|
|
@@ -4951,10 +4897,7 @@ const pipeOutputAsync = (subprocess, fileDescriptors, controller) => {
|
|
|
4951
4897
|
controller
|
|
4952
4898
|
});
|
|
4953
4899
|
}
|
|
4954
|
-
for (const [outputStream, inputStreams] of pipeGroups.entries())
|
|
4955
|
-
const inputStream = inputStreams.length === 1 ? inputStreams[0] : mergeStreams(inputStreams);
|
|
4956
|
-
pipeStreams(inputStream, outputStream);
|
|
4957
|
-
}
|
|
4900
|
+
for (const [outputStream, inputStreams] of pipeGroups.entries()) pipeStreams(inputStreams.length === 1 ? inputStreams[0] : mergeStreams(inputStreams), outputStream);
|
|
4958
4901
|
};
|
|
4959
4902
|
const pipeTransform = (subprocess, stream, direction, fdNumber) => {
|
|
4960
4903
|
if (direction === "output") pipeStreams(subprocess.stdio[fdNumber], stream);
|
|
@@ -5216,10 +5159,9 @@ const normalizePipeArguments = ({ source, sourcePromise, boundOptions, createNes
|
|
|
5216
5159
|
const getDestinationStream = (boundOptions, createNested, pipeArguments) => {
|
|
5217
5160
|
try {
|
|
5218
5161
|
const { destination, pipeOptions: { from, to, unpipeSignal } = {} } = getDestination(boundOptions, createNested, ...pipeArguments);
|
|
5219
|
-
const destinationStream = getToStream(destination, to);
|
|
5220
5162
|
return {
|
|
5221
5163
|
destination,
|
|
5222
|
-
destinationStream,
|
|
5164
|
+
destinationStream: getToStream(destination, to),
|
|
5223
5165
|
from,
|
|
5224
5166
|
unpipeSignal
|
|
5225
5167
|
};
|
|
@@ -5454,13 +5396,12 @@ const stopReadingOnStreamEnd = async (onStreamEnd, controller, stream) => {
|
|
|
5454
5396
|
}
|
|
5455
5397
|
};
|
|
5456
5398
|
const iterateOnStream = ({ stream, controller, binary, shouldEncode, encoding, shouldSplit, preserveNewlines }) => {
|
|
5457
|
-
const onStdoutChunk = (0, node_events.on)(stream, "data", {
|
|
5458
|
-
signal: controller.signal,
|
|
5459
|
-
highWaterMark: HIGH_WATER_MARK,
|
|
5460
|
-
highWatermark: HIGH_WATER_MARK
|
|
5461
|
-
});
|
|
5462
5399
|
return iterateOnData({
|
|
5463
|
-
onStdoutChunk,
|
|
5400
|
+
onStdoutChunk: (0, node_events.on)(stream, "data", {
|
|
5401
|
+
signal: controller.signal,
|
|
5402
|
+
highWaterMark: HIGH_WATER_MARK,
|
|
5403
|
+
highWatermark: HIGH_WATER_MARK
|
|
5404
|
+
}),
|
|
5464
5405
|
controller,
|
|
5465
5406
|
binary,
|
|
5466
5407
|
shouldEncode,
|
|
@@ -5505,13 +5446,12 @@ const getStreamOutput = async ({ stream, onStreamEnd, fdNumber, encoding, buffer
|
|
|
5505
5446
|
await Promise.all([resumeStream(stream), logPromise]);
|
|
5506
5447
|
return;
|
|
5507
5448
|
}
|
|
5508
|
-
const stripFinalNewlineValue = getStripFinalNewline(stripFinalNewline$1, fdNumber);
|
|
5509
5449
|
const iterable = iterateForResult({
|
|
5510
5450
|
stream,
|
|
5511
5451
|
onStreamEnd,
|
|
5512
5452
|
lines,
|
|
5513
5453
|
encoding,
|
|
5514
|
-
stripFinalNewline:
|
|
5454
|
+
stripFinalNewline: getStripFinalNewline(stripFinalNewline$1, fdNumber),
|
|
5515
5455
|
allMixed
|
|
5516
5456
|
});
|
|
5517
5457
|
const [output] = await Promise.all([getStreamContents({
|
|
@@ -5531,15 +5471,14 @@ const logOutputAsync = async ({ stream, onStreamEnd, fdNumber, encoding, allMixe
|
|
|
5531
5471
|
verboseInfo,
|
|
5532
5472
|
fdNumber
|
|
5533
5473
|
})) return;
|
|
5534
|
-
|
|
5474
|
+
await logLines(iterateForResult({
|
|
5535
5475
|
stream,
|
|
5536
5476
|
onStreamEnd,
|
|
5537
5477
|
lines: true,
|
|
5538
5478
|
encoding,
|
|
5539
5479
|
stripFinalNewline: true,
|
|
5540
5480
|
allMixed
|
|
5541
|
-
});
|
|
5542
|
-
await logLines(linesIterable, stream, fdNumber, verboseInfo);
|
|
5481
|
+
}), stream, fdNumber, verboseInfo);
|
|
5543
5482
|
};
|
|
5544
5483
|
const resumeStream = async (stream) => {
|
|
5545
5484
|
await (0, node_timers_promises.setImmediate)();
|
|
@@ -5689,10 +5628,9 @@ const getAllMixed = ({ all, stdout, stderr }) => all && stdout && stderr && stdo
|
|
|
5689
5628
|
//#region ../../node_modules/.pnpm/execa@9.6.0/node_modules/execa/lib/verbose/ipc.js
|
|
5690
5629
|
const shouldLogIpc = (verboseInfo) => isFullVerbose(verboseInfo, "ipc");
|
|
5691
5630
|
const logIpcOutput = (message, verboseInfo) => {
|
|
5692
|
-
const verboseMessage = serializeVerboseMessage(message);
|
|
5693
5631
|
verboseLog({
|
|
5694
5632
|
type: "ipc",
|
|
5695
|
-
verboseMessage,
|
|
5633
|
+
verboseMessage: serializeVerboseMessage(message),
|
|
5696
5634
|
fdNumber: "ipc",
|
|
5697
5635
|
verboseInfo
|
|
5698
5636
|
});
|
|
@@ -5917,10 +5855,9 @@ const createReadable = ({ subprocess, concurrentStreams, encoding }, { from, bin
|
|
|
5917
5855
|
};
|
|
5918
5856
|
const getSubprocessStdout = (subprocess, from, concurrentStreams) => {
|
|
5919
5857
|
const subprocessStdout = getFromStream(subprocess, from);
|
|
5920
|
-
const waitReadableDestroy = addConcurrentStream(concurrentStreams, subprocessStdout, "readableDestroy");
|
|
5921
5858
|
return {
|
|
5922
5859
|
subprocessStdout,
|
|
5923
|
-
waitReadableDestroy
|
|
5860
|
+
waitReadableDestroy: addConcurrentStream(concurrentStreams, subprocessStdout, "readableDestroy")
|
|
5924
5861
|
};
|
|
5925
5862
|
};
|
|
5926
5863
|
const getReadableOptions = ({ readableEncoding, readableObjectMode, readableHighWaterMark }, binary) => binary ? {
|
|
@@ -5998,12 +5935,10 @@ const createWritable = ({ subprocess, concurrentStreams }, { to } = {}) => {
|
|
|
5998
5935
|
};
|
|
5999
5936
|
const getSubprocessStdin = (subprocess, to, concurrentStreams) => {
|
|
6000
5937
|
const subprocessStdin = getToStream(subprocess, to);
|
|
6001
|
-
const waitWritableFinal = addConcurrentStream(concurrentStreams, subprocessStdin, "writableFinal");
|
|
6002
|
-
const waitWritableDestroy = addConcurrentStream(concurrentStreams, subprocessStdin, "writableDestroy");
|
|
6003
5938
|
return {
|
|
6004
5939
|
subprocessStdin,
|
|
6005
|
-
waitWritableFinal,
|
|
6006
|
-
waitWritableDestroy
|
|
5940
|
+
waitWritableFinal: addConcurrentStream(concurrentStreams, subprocessStdin, "writableFinal"),
|
|
5941
|
+
waitWritableDestroy: addConcurrentStream(concurrentStreams, subprocessStdin, "writableDestroy")
|
|
6007
5942
|
};
|
|
6008
5943
|
};
|
|
6009
5944
|
const getWritableMethods = (subprocessStdin, subprocess, waitWritableFinal) => ({
|
|
@@ -6099,15 +6034,14 @@ const onDuplexDestroy = async ({ subprocessStdout, subprocessStdin, subprocess,
|
|
|
6099
6034
|
const createIterable = (subprocess, encoding, { from, binary: binaryOption = false, preserveNewlines = false } = {}) => {
|
|
6100
6035
|
const binary = binaryOption || BINARY_ENCODINGS.has(encoding);
|
|
6101
6036
|
const subprocessStdout = getFromStream(subprocess, from);
|
|
6102
|
-
|
|
6037
|
+
return iterateOnStdoutData(iterateOnSubprocessStream({
|
|
6103
6038
|
subprocessStdout,
|
|
6104
6039
|
subprocess,
|
|
6105
6040
|
binary,
|
|
6106
6041
|
shouldEncode: true,
|
|
6107
6042
|
encoding,
|
|
6108
6043
|
preserveNewlines
|
|
6109
|
-
});
|
|
6110
|
-
return iterateOnStdoutData(onStdoutData, subprocessStdout, subprocess);
|
|
6044
|
+
}), subprocessStdout, subprocess);
|
|
6111
6045
|
};
|
|
6112
6046
|
const iterateOnStdoutData = async function* (onStdoutData, subprocessStdout, subprocess) {
|
|
6113
6047
|
try {
|
|
@@ -6189,7 +6123,6 @@ const handleAsyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
6189
6123
|
const { command, escapedCommand, startTime, verboseInfo } = handleCommand(rawFile, rawArguments, rawOptions);
|
|
6190
6124
|
const { file, commandArguments, options: normalizedOptions } = normalizeOptions(rawFile, rawArguments, rawOptions);
|
|
6191
6125
|
const options = handleAsyncOptions(normalizedOptions);
|
|
6192
|
-
const fileDescriptors = handleStdioAsync(options, verboseInfo);
|
|
6193
6126
|
return {
|
|
6194
6127
|
file,
|
|
6195
6128
|
commandArguments,
|
|
@@ -6198,7 +6131,7 @@ const handleAsyncArguments = (rawFile, rawArguments, rawOptions) => {
|
|
|
6198
6131
|
startTime,
|
|
6199
6132
|
verboseInfo,
|
|
6200
6133
|
options,
|
|
6201
|
-
fileDescriptors
|
|
6134
|
+
fileDescriptors: handleStdioAsync(options, verboseInfo)
|
|
6202
6135
|
};
|
|
6203
6136
|
};
|
|
6204
6137
|
const handleAsyncOptions = ({ timeout, signal,...options }) => {
|
|
@@ -6271,22 +6204,19 @@ const handlePromise = async ({ subprocess, options, startTime, verboseInfo, file
|
|
|
6271
6204
|
});
|
|
6272
6205
|
controller.abort();
|
|
6273
6206
|
onInternalError.resolve();
|
|
6274
|
-
|
|
6275
|
-
const all = stripNewline(allResult, options, "all");
|
|
6276
|
-
const result = getAsyncResult({
|
|
6207
|
+
return handleResult(getAsyncResult({
|
|
6277
6208
|
errorInfo,
|
|
6278
6209
|
exitCode,
|
|
6279
6210
|
signal,
|
|
6280
|
-
stdio,
|
|
6281
|
-
all,
|
|
6211
|
+
stdio: stdioResults.map((stdioResult, fdNumber) => stripNewline(stdioResult, options, fdNumber)),
|
|
6212
|
+
all: stripNewline(allResult, options, "all"),
|
|
6282
6213
|
ipcOutput,
|
|
6283
6214
|
context,
|
|
6284
6215
|
options,
|
|
6285
6216
|
command,
|
|
6286
6217
|
escapedCommand,
|
|
6287
6218
|
startTime
|
|
6288
|
-
});
|
|
6289
|
-
return handleResult(result, verboseInfo, options);
|
|
6219
|
+
}), verboseInfo, options);
|
|
6290
6220
|
};
|
|
6291
6221
|
const getAsyncResult = ({ errorInfo, exitCode, signal, stdio, all, ipcOutput, context, options, command, escapedCommand, startTime }) => "error" in errorInfo ? makeError({
|
|
6292
6222
|
error: errorInfo.error,
|
|
@@ -6359,8 +6289,7 @@ const callBoundExeca = ({ mapArguments, deepOptions = {}, boundOptions = {}, set
|
|
|
6359
6289
|
return isSync ? execaCoreSync(file, commandArguments, options) : execaCoreAsync(file, commandArguments, options, createNested);
|
|
6360
6290
|
};
|
|
6361
6291
|
const parseArguments = ({ mapArguments, firstArgument, nextArguments, deepOptions, boundOptions }) => {
|
|
6362
|
-
const
|
|
6363
|
-
const [initialFile, initialArguments, initialOptions] = normalizeParameters(...callArguments);
|
|
6292
|
+
const [initialFile, initialArguments, initialOptions] = normalizeParameters(...isTemplateString(firstArgument) ? parseTemplates(firstArgument, nextArguments) : [firstArgument, ...nextArguments]);
|
|
6364
6293
|
const mergedOptions = mergeOptions(mergeOptions(deepOptions, boundOptions), initialOptions);
|
|
6365
6294
|
const { file = initialFile, commandArguments = initialArguments, options = mergedOptions, isSync = false } = mapArguments({
|
|
6366
6295
|
file: initialFile,
|
|
@@ -6448,11 +6377,11 @@ var require_p_limit = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
6448
6377
|
const pTry = require_p_try();
|
|
6449
6378
|
const pLimit$1 = (concurrency) => {
|
|
6450
6379
|
if (!((Number.isInteger(concurrency) || concurrency === Infinity) && concurrency > 0)) return Promise.reject(/* @__PURE__ */ new TypeError("Expected `concurrency` to be a number from 1 and up"));
|
|
6451
|
-
const queue
|
|
6380
|
+
const queue = [];
|
|
6452
6381
|
let activeCount = 0;
|
|
6453
6382
|
const next = () => {
|
|
6454
6383
|
activeCount--;
|
|
6455
|
-
if (queue
|
|
6384
|
+
if (queue.length > 0) queue.shift()();
|
|
6456
6385
|
};
|
|
6457
6386
|
const run = (fn, resolve, ...args) => {
|
|
6458
6387
|
activeCount++;
|
|
@@ -6462,14 +6391,14 @@ var require_p_limit = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
6462
6391
|
};
|
|
6463
6392
|
const enqueue$1 = (fn, resolve, ...args) => {
|
|
6464
6393
|
if (activeCount < concurrency) run(fn, resolve, ...args);
|
|
6465
|
-
else queue
|
|
6394
|
+
else queue.push(run.bind(null, fn, resolve, ...args));
|
|
6466
6395
|
};
|
|
6467
6396
|
const generator = (fn, ...args) => new Promise((resolve) => enqueue$1(fn, resolve, ...args));
|
|
6468
6397
|
Object.defineProperties(generator, {
|
|
6469
6398
|
activeCount: { get: () => activeCount },
|
|
6470
|
-
pendingCount: { get: () => queue
|
|
6399
|
+
pendingCount: { get: () => queue.length },
|
|
6471
6400
|
clearQueue: { value: () => {
|
|
6472
|
-
queue
|
|
6401
|
+
queue.length = 0;
|
|
6473
6402
|
} }
|
|
6474
6403
|
});
|
|
6475
6404
|
return generator;
|
|
@@ -7190,13 +7119,13 @@ var require_expand = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modu
|
|
|
7190
7119
|
const fill = require_fill_range();
|
|
7191
7120
|
const stringify$2 = require_stringify();
|
|
7192
7121
|
const utils$4 = require_utils$1();
|
|
7193
|
-
const append = (queue
|
|
7122
|
+
const append = (queue = "", stash = "", enclose = false) => {
|
|
7194
7123
|
const result = [];
|
|
7195
|
-
queue
|
|
7124
|
+
queue = [].concat(queue);
|
|
7196
7125
|
stash = [].concat(stash);
|
|
7197
|
-
if (!stash.length) return queue
|
|
7198
|
-
if (!queue
|
|
7199
|
-
for (const item of queue
|
|
7126
|
+
if (!stash.length) return queue;
|
|
7127
|
+
if (!queue.length) return enclose ? utils$4.flatten(stash).map((ele) => `{${ele}}`) : stash;
|
|
7128
|
+
for (const item of queue) if (Array.isArray(item)) for (const value of item) result.push(append(value, stash, enclose));
|
|
7200
7129
|
else for (let ele of stash) {
|
|
7201
7130
|
if (enclose === true && typeof ele === "string") ele = `{${ele}}`;
|
|
7202
7131
|
result.push(Array.isArray(ele) ? append(item, ele, enclose) : item + ele);
|
|
@@ -7231,30 +7160,30 @@ var require_expand = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modu
|
|
|
7231
7160
|
return;
|
|
7232
7161
|
}
|
|
7233
7162
|
const enclose = utils$4.encloseBrace(node);
|
|
7234
|
-
let queue
|
|
7163
|
+
let queue = node.queue;
|
|
7235
7164
|
let block = node;
|
|
7236
7165
|
while (block.type !== "brace" && block.type !== "root" && block.parent) {
|
|
7237
7166
|
block = block.parent;
|
|
7238
|
-
queue
|
|
7167
|
+
queue = block.queue;
|
|
7239
7168
|
}
|
|
7240
7169
|
for (let i$2 = 0; i$2 < node.nodes.length; i$2++) {
|
|
7241
7170
|
const child = node.nodes[i$2];
|
|
7242
7171
|
if (child.type === "comma" && node.type === "brace") {
|
|
7243
|
-
if (i$2 === 1) queue
|
|
7244
|
-
queue
|
|
7172
|
+
if (i$2 === 1) queue.push("");
|
|
7173
|
+
queue.push("");
|
|
7245
7174
|
continue;
|
|
7246
7175
|
}
|
|
7247
7176
|
if (child.type === "close") {
|
|
7248
|
-
q.push(append(q.pop(), queue
|
|
7177
|
+
q.push(append(q.pop(), queue, enclose));
|
|
7249
7178
|
continue;
|
|
7250
7179
|
}
|
|
7251
7180
|
if (child.value && child.type !== "open") {
|
|
7252
|
-
queue
|
|
7181
|
+
queue.push(append(queue.pop(), child.value));
|
|
7253
7182
|
continue;
|
|
7254
7183
|
}
|
|
7255
7184
|
if (child.nodes) walk(child, node);
|
|
7256
7185
|
}
|
|
7257
|
-
return queue
|
|
7186
|
+
return queue;
|
|
7258
7187
|
};
|
|
7259
7188
|
return utils$4.flatten(walk(ast));
|
|
7260
7189
|
};
|
|
@@ -7473,7 +7402,7 @@ var require_parse$1 = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
7473
7402
|
*/
|
|
7474
7403
|
if (value === CHAR_LEFT_CURLY_BRACE$1) {
|
|
7475
7404
|
depth$1++;
|
|
7476
|
-
|
|
7405
|
+
block = push({
|
|
7477
7406
|
type: "brace",
|
|
7478
7407
|
open: true,
|
|
7479
7408
|
close: false,
|
|
@@ -7482,8 +7411,7 @@ var require_parse$1 = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
7482
7411
|
commas: 0,
|
|
7483
7412
|
ranges: 0,
|
|
7484
7413
|
nodes: []
|
|
7485
|
-
};
|
|
7486
|
-
block = push(brace);
|
|
7414
|
+
});
|
|
7487
7415
|
stack.push(block);
|
|
7488
7416
|
push({
|
|
7489
7417
|
type: "open",
|
|
@@ -7747,12 +7675,6 @@ var require_constants = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_m
|
|
|
7747
7675
|
const END_ANCHOR = `(?:${SLASH_LITERAL}|$)`;
|
|
7748
7676
|
const START_ANCHOR = `(?:^|${SLASH_LITERAL})`;
|
|
7749
7677
|
const DOTS_SLASH = `${DOT_LITERAL}{1,2}${END_ANCHOR}`;
|
|
7750
|
-
const NO_DOT = `(?!${DOT_LITERAL})`;
|
|
7751
|
-
const NO_DOTS = `(?!${START_ANCHOR}${DOTS_SLASH})`;
|
|
7752
|
-
const NO_DOT_SLASH = `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`;
|
|
7753
|
-
const NO_DOTS_SLASH = `(?!${DOTS_SLASH})`;
|
|
7754
|
-
const QMARK_NO_DOT = `[^.${SLASH_LITERAL}]`;
|
|
7755
|
-
const STAR = `${QMARK}*?`;
|
|
7756
7678
|
const POSIX_CHARS = {
|
|
7757
7679
|
DOT_LITERAL,
|
|
7758
7680
|
PLUS_LITERAL,
|
|
@@ -7762,12 +7684,12 @@ var require_constants = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_m
|
|
|
7762
7684
|
QMARK,
|
|
7763
7685
|
END_ANCHOR,
|
|
7764
7686
|
DOTS_SLASH,
|
|
7765
|
-
NO_DOT
|
|
7766
|
-
NO_DOTS
|
|
7767
|
-
NO_DOT_SLASH,
|
|
7768
|
-
NO_DOTS_SLASH
|
|
7769
|
-
QMARK_NO_DOT
|
|
7770
|
-
STAR
|
|
7687
|
+
NO_DOT: `(?!${DOT_LITERAL})`,
|
|
7688
|
+
NO_DOTS: `(?!${START_ANCHOR}${DOTS_SLASH})`,
|
|
7689
|
+
NO_DOT_SLASH: `(?!${DOT_LITERAL}{0,1}${END_ANCHOR})`,
|
|
7690
|
+
NO_DOTS_SLASH: `(?!${DOTS_SLASH})`,
|
|
7691
|
+
QMARK_NO_DOT: `[^.${SLASH_LITERAL}]`,
|
|
7692
|
+
STAR: `${QMARK}*?`,
|
|
7771
7693
|
START_ANCHOR
|
|
7772
7694
|
};
|
|
7773
7695
|
/**
|
|
@@ -7939,9 +7861,7 @@ var require_utils = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
7939
7861
|
return output;
|
|
7940
7862
|
};
|
|
7941
7863
|
exports.wrapOutput = (input, state = {}, options = {}) => {
|
|
7942
|
-
|
|
7943
|
-
const append$1 = options.contains ? "" : "$";
|
|
7944
|
-
let output = `${prepend}(?:${input})${append$1}`;
|
|
7864
|
+
let output = `${options.contains ? "" : "^"}(?:${input})${options.contains ? "" : "$"}`;
|
|
7945
7865
|
if (state.negated === true) output = `(?:^(?!${output}).*$)`;
|
|
7946
7866
|
return output;
|
|
7947
7867
|
};
|
|
@@ -8287,13 +8207,13 @@ var require_parse = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
8287
8207
|
const win32$1 = utils$2.isWindows(options);
|
|
8288
8208
|
const PLATFORM_CHARS = constants$2.globChars(win32$1);
|
|
8289
8209
|
const EXTGLOB_CHARS = constants$2.extglobChars(PLATFORM_CHARS);
|
|
8290
|
-
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
|
|
8210
|
+
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;
|
|
8291
8211
|
const globstar = (opts$1) => {
|
|
8292
8212
|
return `(${capture}(?:(?!${START_ANCHOR$1}${opts$1.dot ? DOTS_SLASH$1 : DOT_LITERAL$1}).)*?)`;
|
|
8293
8213
|
};
|
|
8294
|
-
const nodot = opts.dot ? "" : NO_DOT
|
|
8295
|
-
const qmarkNoDot = opts.dot ? QMARK$1 : QMARK_NO_DOT
|
|
8296
|
-
let star = opts.bash === true ? globstar(opts) : STAR
|
|
8214
|
+
const nodot = opts.dot ? "" : NO_DOT;
|
|
8215
|
+
const qmarkNoDot = opts.dot ? QMARK$1 : QMARK_NO_DOT;
|
|
8216
|
+
let star = opts.bash === true ? globstar(opts) : STAR;
|
|
8297
8217
|
if (opts.capture) star = `(${star})`;
|
|
8298
8218
|
if (typeof opts.noext === "boolean") opts.noextglob = opts.noext;
|
|
8299
8219
|
const state = {
|
|
@@ -8513,8 +8433,7 @@ var require_parse = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
8513
8433
|
if (inner.includes(":")) {
|
|
8514
8434
|
const idx = prev.value.lastIndexOf("[");
|
|
8515
8435
|
const pre = prev.value.slice(0, idx);
|
|
8516
|
-
const
|
|
8517
|
-
const posix = POSIX_REGEX_SOURCE[rest$1];
|
|
8436
|
+
const posix = POSIX_REGEX_SOURCE[prev.value.slice(idx + 2)];
|
|
8518
8437
|
if (posix) {
|
|
8519
8438
|
prev.value = pre + posix;
|
|
8520
8439
|
state.backtrack = true;
|
|
@@ -8782,7 +8701,7 @@ var require_parse = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
8782
8701
|
push({
|
|
8783
8702
|
type: "qmark",
|
|
8784
8703
|
value,
|
|
8785
|
-
output: QMARK_NO_DOT
|
|
8704
|
+
output: QMARK_NO_DOT
|
|
8786
8705
|
});
|
|
8787
8706
|
continue;
|
|
8788
8707
|
}
|
|
@@ -9001,11 +8920,11 @@ var require_parse = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
9001
8920
|
}
|
|
9002
8921
|
if (state.index === state.start || prev.type === "slash" || prev.type === "dot") {
|
|
9003
8922
|
if (prev.type === "dot") {
|
|
9004
|
-
state.output += NO_DOT_SLASH
|
|
9005
|
-
prev.output += NO_DOT_SLASH
|
|
8923
|
+
state.output += NO_DOT_SLASH;
|
|
8924
|
+
prev.output += NO_DOT_SLASH;
|
|
9006
8925
|
} else if (opts.dot === true) {
|
|
9007
|
-
state.output += NO_DOTS_SLASH
|
|
9008
|
-
prev.output += NO_DOTS_SLASH
|
|
8926
|
+
state.output += NO_DOTS_SLASH;
|
|
8927
|
+
prev.output += NO_DOTS_SLASH;
|
|
9009
8928
|
} else {
|
|
9010
8929
|
state.output += nodot;
|
|
9011
8930
|
prev.output += nodot;
|
|
@@ -9058,15 +8977,15 @@ var require_parse = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
9058
8977
|
if (len > max) throw new SyntaxError(`Input length: ${len}, exceeds maximum allowed length: ${max}`);
|
|
9059
8978
|
input = REPLACEMENTS[input] || input;
|
|
9060
8979
|
const win32$1 = utils$2.isWindows(options);
|
|
9061
|
-
const { DOT_LITERAL: DOT_LITERAL$1, SLASH_LITERAL: SLASH_LITERAL$1, ONE_CHAR: ONE_CHAR$1, DOTS_SLASH: DOTS_SLASH$1, NO_DOT
|
|
9062
|
-
const nodot = opts.dot ? NO_DOTS
|
|
9063
|
-
const slashDot = opts.dot ? NO_DOTS_SLASH
|
|
8980
|
+
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$2.globChars(win32$1);
|
|
8981
|
+
const nodot = opts.dot ? NO_DOTS : NO_DOT;
|
|
8982
|
+
const slashDot = opts.dot ? NO_DOTS_SLASH : NO_DOT;
|
|
9064
8983
|
const capture = opts.capture ? "" : "?:";
|
|
9065
8984
|
const state = {
|
|
9066
8985
|
negated: false,
|
|
9067
8986
|
prefix: ""
|
|
9068
8987
|
};
|
|
9069
|
-
let star = opts.bash === true ? ".*?" : STAR
|
|
8988
|
+
let star = opts.bash === true ? ".*?" : STAR;
|
|
9070
8989
|
if (opts.capture) star = `(${star})`;
|
|
9071
8990
|
const globstar = (opts$1) => {
|
|
9072
8991
|
if (opts$1.noglobstar === true) return star;
|
|
@@ -9091,8 +9010,7 @@ var require_parse = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modul
|
|
|
9091
9010
|
}
|
|
9092
9011
|
}
|
|
9093
9012
|
};
|
|
9094
|
-
|
|
9095
|
-
let source = create(output);
|
|
9013
|
+
let source = create(utils$2.removePrefix(input, state));
|
|
9096
9014
|
if (source && opts.strictSlashes !== true) source += `${SLASH_LITERAL$1}?`;
|
|
9097
9015
|
return source;
|
|
9098
9016
|
};
|
|
@@ -9819,8 +9737,7 @@ var require_core$1 = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modu
|
|
|
9819
9737
|
let previous = null;
|
|
9820
9738
|
let current = initial;
|
|
9821
9739
|
do {
|
|
9822
|
-
|
|
9823
|
-
extractWorkspaces(manifest);
|
|
9740
|
+
extractWorkspaces(readPackageJSON(current));
|
|
9824
9741
|
let { done, found } = checkWorkspaces(current, initial);
|
|
9825
9742
|
if (done) return found;
|
|
9826
9743
|
previous = current;
|
|
@@ -9830,8 +9747,7 @@ var require_core$1 = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modu
|
|
|
9830
9747
|
}
|
|
9831
9748
|
exports.findWorkspaceRoot = findWorkspaceRoot;
|
|
9832
9749
|
function checkWorkspaces(current, initial) {
|
|
9833
|
-
const
|
|
9834
|
-
const workspaces = extractWorkspaces(manifest);
|
|
9750
|
+
const workspaces = extractWorkspaces(readPackageJSON(current));
|
|
9835
9751
|
let done = false;
|
|
9836
9752
|
let found;
|
|
9837
9753
|
let relativePath;
|
|
@@ -10259,9 +10175,9 @@ var require_graceful_fs = /* @__PURE__ */ require_chunk.__commonJS({ "../../node
|
|
|
10259
10175
|
previousSymbol = "___graceful-fs.previous";
|
|
10260
10176
|
}
|
|
10261
10177
|
function noop() {}
|
|
10262
|
-
function publishQueue(context, queue
|
|
10178
|
+
function publishQueue(context, queue) {
|
|
10263
10179
|
Object.defineProperty(context, gracefulQueue, { get: function() {
|
|
10264
|
-
return queue
|
|
10180
|
+
return queue;
|
|
10265
10181
|
} });
|
|
10266
10182
|
}
|
|
10267
10183
|
var debug = noop;
|
|
@@ -10272,8 +10188,7 @@ var require_graceful_fs = /* @__PURE__ */ require_chunk.__commonJS({ "../../node
|
|
|
10272
10188
|
console.error(m);
|
|
10273
10189
|
};
|
|
10274
10190
|
if (!fs$3[gracefulQueue]) {
|
|
10275
|
-
|
|
10276
|
-
publishQueue(fs$3, queue);
|
|
10191
|
+
publishQueue(fs$3, global[gracefulQueue] || []);
|
|
10277
10192
|
fs$3.close = (function(fs$close) {
|
|
10278
10193
|
function close(fd, cb) {
|
|
10279
10194
|
return fs$close.call(fs$3, fd, function(err) {
|
|
@@ -10588,8 +10503,7 @@ var require_graceful_fs = /* @__PURE__ */ require_chunk.__commonJS({ "../../node
|
|
|
10588
10503
|
} else {
|
|
10589
10504
|
var sinceAttempt = Date.now() - lastTime;
|
|
10590
10505
|
var sinceStart = Math.max(lastTime - startTime, 1);
|
|
10591
|
-
|
|
10592
|
-
if (sinceAttempt >= desiredDelay) {
|
|
10506
|
+
if (sinceAttempt >= Math.min(sinceStart * 1.2, 100)) {
|
|
10593
10507
|
debug("RETRY", fn.name, args);
|
|
10594
10508
|
fn.apply(null, args.concat([startTime]));
|
|
10595
10509
|
} else fs$3[gracefulQueue].push(elem);
|
|
@@ -12253,8 +12167,7 @@ var require_esprima = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
12253
12167
|
if (element.type === jsx_syntax_1.JSXSyntax.JSXClosingElement) {
|
|
12254
12168
|
el.closing = element;
|
|
12255
12169
|
var open_1 = getQualifiedElementName(el.opening.name);
|
|
12256
|
-
|
|
12257
|
-
if (open_1 !== close_1) this.tolerateError("Expected corresponding JSX closing tag for %0", open_1);
|
|
12170
|
+
if (open_1 !== getQualifiedElementName(el.closing.name)) this.tolerateError("Expected corresponding JSX closing tag for %0", open_1);
|
|
12258
12171
|
if (stack.length > 0) {
|
|
12259
12172
|
var child = this.finalize(el.node, new JSXNode.JSXElement(el.opening, el.children, el.closing));
|
|
12260
12173
|
el = stack[stack.length - 1];
|
|
@@ -13257,14 +13170,10 @@ var require_esprima = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
13257
13170
|
column: this.scanner.index - this.scanner.lineStart
|
|
13258
13171
|
}
|
|
13259
13172
|
};
|
|
13260
|
-
if (token.type === 9) {
|
|
13261
|
-
|
|
13262
|
-
|
|
13263
|
-
|
|
13264
|
-
pattern,
|
|
13265
|
-
flags
|
|
13266
|
-
};
|
|
13267
|
-
}
|
|
13173
|
+
if (token.type === 9) t.regex = {
|
|
13174
|
+
pattern: token.pattern,
|
|
13175
|
+
flags: token.flags
|
|
13176
|
+
};
|
|
13268
13177
|
return t;
|
|
13269
13178
|
};
|
|
13270
13179
|
Parser.prototype.nextToken = function() {
|
|
@@ -13806,10 +13715,9 @@ var require_esprima = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
13806
13715
|
if (!this.context.isBindingElement) this.throwUnexpectedToken(this.lookahead);
|
|
13807
13716
|
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]);
|
|
13808
13717
|
else this.reinterpretExpressionAsPattern(expr);
|
|
13809
|
-
var parameters = expr.type === syntax_1.Syntax.SequenceExpression ? expr.expressions : [expr];
|
|
13810
13718
|
expr = {
|
|
13811
13719
|
type: ArrowParameterPlaceHolder,
|
|
13812
|
-
params:
|
|
13720
|
+
params: expr.type === syntax_1.Syntax.SequenceExpression ? expr.expressions : [expr],
|
|
13813
13721
|
async: false
|
|
13814
13722
|
};
|
|
13815
13723
|
}
|
|
@@ -16391,13 +16299,12 @@ var require_esprima = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
16391
16299
|
var start = this.index;
|
|
16392
16300
|
var pattern = this.scanRegExpBody();
|
|
16393
16301
|
var flags = this.scanRegExpFlags();
|
|
16394
|
-
var value = this.testRegExp(pattern, flags);
|
|
16395
16302
|
return {
|
|
16396
16303
|
type: 9,
|
|
16397
16304
|
value: "",
|
|
16398
16305
|
pattern,
|
|
16399
16306
|
flags,
|
|
16400
|
-
regex:
|
|
16307
|
+
regex: this.testRegExp(pattern, flags),
|
|
16401
16308
|
lineNumber: this.lineNumber,
|
|
16402
16309
|
lineStart: this.lineStart,
|
|
16403
16310
|
start,
|
|
@@ -16856,14 +16763,10 @@ var require_esprima = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mod
|
|
|
16856
16763
|
};
|
|
16857
16764
|
entry.loc = loc;
|
|
16858
16765
|
}
|
|
16859
|
-
if (token.type === 9) {
|
|
16860
|
-
|
|
16861
|
-
|
|
16862
|
-
|
|
16863
|
-
pattern,
|
|
16864
|
-
flags
|
|
16865
|
-
};
|
|
16866
|
-
}
|
|
16766
|
+
if (token.type === 9) entry.regex = {
|
|
16767
|
+
pattern: token.pattern,
|
|
16768
|
+
flags: token.flags
|
|
16769
|
+
};
|
|
16867
16770
|
this.buffer.push(entry);
|
|
16868
16771
|
}
|
|
16869
16772
|
}
|
|
@@ -17948,8 +17851,7 @@ var require_dumper = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_modu
|
|
|
17948
17851
|
function blockHeader(string, indentPerLevel) {
|
|
17949
17852
|
var indentIndicator = needIndentIndicator(string) ? String(indentPerLevel) : "";
|
|
17950
17853
|
var clip = string[string.length - 1] === "\n";
|
|
17951
|
-
|
|
17952
|
-
return indentIndicator + chomp + "\n";
|
|
17854
|
+
return indentIndicator + (clip && (string[string.length - 2] === "\n" || string === "\n") ? "+" : clip ? "" : "-") + "\n";
|
|
17953
17855
|
}
|
|
17954
17856
|
function dropEndingNewline(string) {
|
|
17955
17857
|
return string[string.length - 1] === "\n" ? string.slice(0, -1) : string;
|
|
@@ -18232,8 +18134,7 @@ var require_which_pm = /* @__PURE__ */ require_chunk.__commonJS({ "../../node_mo
|
|
|
18232
18134
|
const modulesPath = path$1.join(pkgPath, "node_modules");
|
|
18233
18135
|
if (fs$1.existsSync(path$1.join(modulesPath, ".yarn-integrity"))) return { name: "yarn" };
|
|
18234
18136
|
try {
|
|
18235
|
-
|
|
18236
|
-
return toNameAndVersion(modules.packageManager);
|
|
18137
|
+
return toNameAndVersion((await loadYamlFile(path$1.join(modulesPath, ".modules.yaml"))).packageManager);
|
|
18237
18138
|
} catch (err) {
|
|
18238
18139
|
if (err.code !== "ENOENT") throw err;
|
|
18239
18140
|
}
|
|
@@ -18360,10 +18261,9 @@ var FireCommand = class extends __h3ravel_core.ConsoleCommand {
|
|
|
18360
18261
|
"error"
|
|
18361
18262
|
][Number(this.option("verbose", 0))]
|
|
18362
18263
|
};
|
|
18363
|
-
const silent = ENV_VARS.LOG_LEVEL === "silent" ? "--silent" : null;
|
|
18364
18264
|
await execa(pm, [
|
|
18365
18265
|
"tsdown",
|
|
18366
|
-
silent,
|
|
18266
|
+
ENV_VARS.LOG_LEVEL === "silent" ? "--silent" : null,
|
|
18367
18267
|
"--config-loader",
|
|
18368
18268
|
"unconfig",
|
|
18369
18269
|
"-c",
|
|
@@ -18414,6 +18314,7 @@ var HttpServiceProvider = class extends __h3ravel_core.ServiceProvider {
|
|
|
18414
18314
|
/** Register Musket Commands */
|
|
18415
18315
|
this.commands([FireCommand]);
|
|
18416
18316
|
}
|
|
18317
|
+
boot() {}
|
|
18417
18318
|
};
|
|
18418
18319
|
|
|
18419
18320
|
//#endregion
|