doc-detective 4.26.8 → 4.27.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/src/schemas/schemas.json +522 -64
- package/dist/common/src/types/generated/config_v3.d.ts +10 -2
- package/dist/common/src/types/generated/config_v3.d.ts.map +1 -1
- package/dist/common/src/types/generated/resolvedTests_v3.d.ts +10 -2
- package/dist/common/src/types/generated/resolvedTests_v3.d.ts.map +1 -1
- package/dist/common/src/types/generated/runShell_v3.d.ts +6 -2
- package/dist/common/src/types/generated/runShell_v3.d.ts.map +1 -1
- package/dist/common/src/types/generated/step_v3.d.ts +6 -2
- package/dist/common/src/types/generated/step_v3.d.ts.map +1 -1
- package/dist/common/src/types/generated/test_v3.d.ts +12 -4
- package/dist/common/src/types/generated/test_v3.d.ts.map +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +20 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/tests/processSurface.d.ts +1 -0
- package/dist/core/tests/processSurface.d.ts.map +1 -1
- package/dist/core/tests/processSurface.js +2 -0
- package/dist/core/tests/processSurface.js.map +1 -1
- package/dist/core/tests/runCode.d.ts.map +1 -1
- package/dist/core/tests/runCode.js +61 -14
- package/dist/core/tests/runCode.js.map +1 -1
- package/dist/core/tests/runShell.d.ts.map +1 -1
- package/dist/core/tests/runShell.js +20 -2
- package/dist/core/tests/runShell.js.map +1 -1
- package/dist/core/tests/startSurface.d.ts.map +1 -1
- package/dist/core/tests/startSurface.js +29 -14
- package/dist/core/tests/startSurface.js.map +1 -1
- package/dist/core/utils.d.ts +20 -1
- package/dist/core/utils.d.ts.map +1 -1
- package/dist/core/utils.js +169 -18
- package/dist/core/utils.js.map +1 -1
- package/dist/hints/context.d.ts +1 -0
- package/dist/hints/context.d.ts.map +1 -1
- package/dist/hints/context.js +11 -0
- package/dist/hints/context.js.map +1 -1
- package/dist/hints/hints.d.ts.map +1 -1
- package/dist/hints/hints.js +22 -0
- package/dist/hints/hints.js.map +1 -1
- package/dist/hints/types.d.ts +7 -0
- package/dist/hints/types.d.ts.map +1 -1
- package/dist/index.cjs +1570 -616
- package/dist/runtime/androidInstaller.d.ts.map +1 -1
- package/dist/runtime/androidInstaller.js +1 -62
- package/dist/runtime/androidInstaller.js.map +1 -1
- package/dist/runtime/archiveUtils.d.ts +3 -0
- package/dist/runtime/archiveUtils.d.ts.map +1 -0
- package/dist/runtime/archiveUtils.js +100 -0
- package/dist/runtime/archiveUtils.js.map +1 -0
- package/dist/runtime/cacheDir.d.ts +5 -0
- package/dist/runtime/cacheDir.d.ts.map +1 -1
- package/dist/runtime/cacheDir.js +3 -0
- package/dist/runtime/cacheDir.js.map +1 -1
- package/dist/runtime/inferRuntimeNeeds.d.ts +5 -1
- package/dist/runtime/inferRuntimeNeeds.d.ts.map +1 -1
- package/dist/runtime/inferRuntimeNeeds.js +38 -2
- package/dist/runtime/inferRuntimeNeeds.js.map +1 -1
- package/dist/runtime/installCommand.d.ts.map +1 -1
- package/dist/runtime/installCommand.js +32 -3
- package/dist/runtime/installCommand.js.map +1 -1
- package/dist/runtime/installer.d.ts +2 -2
- package/dist/runtime/installer.d.ts.map +1 -1
- package/dist/runtime/installer.js +42 -5
- package/dist/runtime/installer.js.map +1 -1
- package/dist/runtime/windowsBash.d.ts +41 -0
- package/dist/runtime/windowsBash.d.ts.map +1 -0
- package/dist/runtime/windowsBash.js +386 -0
- package/dist/runtime/windowsBash.js.map +1 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +17 -0
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
package/dist/core/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAuB,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,qBAAqB,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AAUzG;;;;;;;;GAQG;AACH,iBAAe,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG;;;;UASnD;AAGD,iBAAe,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,GAAE,GAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAuB,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,qBAAqB,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;AAUzG;;;;;;;;GAQG;AACH,iBAAe,qBAAqB,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG;;;;UASnD;AAGD,iBAAe,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,GAAE,GAAQ,gBAkOrD"}
|
package/dist/core/index.js
CHANGED
|
@@ -111,7 +111,9 @@ async function runTests(config, options = {}) {
|
|
|
111
111
|
try {
|
|
112
112
|
const { inferRuntimeNeeds } = await import("../runtime/inferRuntimeNeeds.js");
|
|
113
113
|
const { ensureRuntimeInstalled } = await import("../runtime/loader.js");
|
|
114
|
-
const needs = inferRuntimeNeeds(resolvedTests
|
|
114
|
+
const needs = inferRuntimeNeeds(resolvedTests, {
|
|
115
|
+
configShell: config.shell,
|
|
116
|
+
});
|
|
115
117
|
const ctx = { cacheDir: config.cacheDir };
|
|
116
118
|
// Bridge the runtime modules' logger contract to core/utils.ts:log()
|
|
117
119
|
// so config.logLevel filters npm install stdout/stderr (which the
|
|
@@ -184,6 +186,23 @@ async function runTests(config, options = {}) {
|
|
|
184
186
|
log(config, "debug", `Browser pre-flight check skipped: ${browserErr?.message ?? browserErr}`);
|
|
185
187
|
}
|
|
186
188
|
}
|
|
189
|
+
// Git Bash preflight: when shell-based steps resolve to `bash` on
|
|
190
|
+
// Windows, materialize Git Bash up front (existing Git for Windows, or a
|
|
191
|
+
// one-time MinGit download). Failure degrades to on-demand resolution —
|
|
192
|
+
// runShell retries the same resolver and FAILs the step with an
|
|
193
|
+
// actionable message if bash still can't be provisioned.
|
|
194
|
+
if (needs.windowsBash && process.platform === "win32") {
|
|
195
|
+
try {
|
|
196
|
+
const { resolveWindowsBash } = await import("../runtime/windowsBash.js");
|
|
197
|
+
await resolveWindowsBash({
|
|
198
|
+
cacheDir: config.cacheDir,
|
|
199
|
+
deps: { logger: preflightLogger },
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
catch (bashErr) {
|
|
203
|
+
log(config, "warning", `Git Bash pre-flight install hit an error: ${bashErr?.message ?? bashErr}. runShell steps using the bash shell will retry on demand.`);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
187
206
|
/* c8 ignore stop */
|
|
188
207
|
}
|
|
189
208
|
catch (err) {
|
package/dist/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processSurface.d.ts","sourceRoot":"","sources":["../../../src/core/tests/processSurface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,YAAY,EAEb,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAczC,UAAU,kBAAkB;IAC1B,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,yBAAyB,EAAE,OAAO,yBAAyB,CAAC;IAC5D,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,2BAA2B,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9E,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAiBD,UAAU,wBAAwB;IAEhC,OAAO,EAAE,MAAM,CAAC;IAGhB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,GAAG,CAAC,EAAE,OAAO,CAAC;IAGd,SAAS,CAAC,EAAE,GAAG,CAAC;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iBAAe,6BAA6B,CAAC,EAC3C,MAAM,EACN,UAAU,EACV,eAAe,EACf,MAAM,EACN,IAAI,GACL,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,wBAAwB,CAAC;IACrC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"processSurface.d.ts","sourceRoot":"","sources":["../../../src/core/tests/processSurface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,YAAY,EAEb,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,6BAA6B,EAAE,CAAC;AACzC,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAczC,UAAU,kBAAkB;IAC1B,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,yBAAyB,EAAE,OAAO,yBAAyB,CAAC;IAC5D,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,2BAA2B,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9E,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAiBD,UAAU,wBAAwB;IAEhC,OAAO,EAAE,MAAM,CAAC;IAGhB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,GAAG,CAAC,EAAE,OAAO,CAAC;IAGd,SAAS,CAAC,EAAE,GAAG,CAAC;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iBAAe,6BAA6B,CAAC,EAC3C,MAAM,EACN,UAAU,EACV,eAAe,EACf,MAAM,EACN,IAAI,GACL,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,wBAAwB,CAAC;IACrC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACpC,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,CA0JlE"}
|
|
@@ -56,6 +56,8 @@ async function startBackgroundProcessSurface({ config, descriptor, processRegist
|
|
|
56
56
|
const bgOptions = {};
|
|
57
57
|
if (descriptor.workingDirectory)
|
|
58
58
|
bgOptions.cwd = descriptor.workingDirectory;
|
|
59
|
+
if (descriptor.shell)
|
|
60
|
+
bgOptions.shell = descriptor.shell;
|
|
59
61
|
const args = descriptor.args ?? [];
|
|
60
62
|
const timeoutMs = descriptor.timeout ?? 60000;
|
|
61
63
|
// Kill a spawned handle so a half-started/crashed process doesn't leak.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processSurface.js","sourceRoot":"","sources":["../../../src/core/tests/processSurface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,YAAY,EACZ,2BAA2B,GAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AAGzC,2EAA2E;AAC3E,gFAAgF;AAChF,sEAAsE;AACtE,0DAA0D;AAC1D,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,6BAA6B,GAAG,GAAG,CAAC;AAgB1C,SAAS,yBAAyB;IAChC,OAAO;QACL,sBAAsB;QACtB,yBAAyB;QACzB,YAAY;QACZ,2BAA2B;QAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,KAAK,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KACzE,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"processSurface.js","sourceRoot":"","sources":["../../../src/core/tests/processSurface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EACzB,YAAY,EACZ,2BAA2B,GAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,CAAC;AAGzC,2EAA2E;AAC3E,gFAAgF;AAChF,sEAAsE;AACtE,0DAA0D;AAC1D,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,6BAA6B,GAAG,GAAG,CAAC;AAgB1C,SAAS,yBAAyB;IAChC,OAAO;QACL,sBAAsB;QACtB,yBAAyB;QACzB,YAAY;QACZ,2BAA2B;QAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,KAAK,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;KACzE,CAAC;AACJ,CAAC;AA2BD,KAAK,UAAU,6BAA6B,CAAC,EAC3C,MAAM,EACN,UAAU,EACV,eAAe,EACf,MAAM,EACN,IAAI,GAOL;IACC,MAAM,CAAC,GAAuB,EAAE,GAAG,yBAAyB,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC;IAC1E,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC7B,iEAAiE;IACjE,sEAAsE;IACtE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,wCAAwC;SACtD,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,yEAAyE;QACzE,kEAAkE;QAClE,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EACT,yFAAyF;SAC5F,CAAC;IACJ,CAAC;IACD,IAAI,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,+BAA+B,IAAI,uBAAuB;SACxE,CAAC;IACJ,CAAC;IACD,2EAA2E;IAC3E,sEAAsE;IACtE,sEAAsE;IACtE,yEAAyE;IACzE,iDAAiD;IACjD,IAAI,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACxD,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,4BAA4B,IAAI,6HAA6H;SAC3K,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAQ,EAAE,CAAC;IAC1B,IAAI,UAAU,CAAC,gBAAgB;QAAE,SAAS,CAAC,GAAG,GAAG,UAAU,CAAC,gBAAgB,CAAC;IAC7E,IAAI,UAAU,CAAC,KAAK;QAAE,SAAS,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IACzD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,IAAI,KAAK,CAAC;IAE9C,wEAAwE;IACxE,8EAA8E;IAC9E,6EAA6E;IAC7E,6CAA6C;IAC7C,KAAK,UAAU,QAAQ,CAAC,EAAO;QAC7B,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC;YACb,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAClB,CAAC;aAAM,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC;YACnB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAClC,IAAI,CAAC,EAAE,CAAC,GAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAC1C,CAAC;QACJ,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,0EAA0E;IAC1E,yEAAyE;IACzE,4EAA4E;IAC5E,8EAA8E;IAC9E,sEAAsE;IACtE,uEAAuE;IACvE,4EAA4E;IAC5E,mEAAmE;IACnE,MAAM,WAAW,GAAG,oBAAoB,GAAG,CAAC,CAAC;IAC7C,IAAI,cAAmB,CAAC;IACxB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,WAAW,EAAE,OAAO,EAAE,EAAE,CAAC;QACxD,6DAA6D;QAC7D,yEAAyE;QACzE,+DAA+D;QAC/D,IAAI,EAAO,CAAC;QACZ,IAAI,UAAU,CAAC,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,EAAE,GAAG,MAAM,CAAC,CAAC,yBAAyB,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE;oBAC/D,GAAG,SAAS;oBACZ,QAAQ,EAAE,MAAM,EAAE,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,uEAAuE;gBACvE,mEAAmE;gBACnE,sEAAsE;gBACtE,wEAAwE;gBACxE,IAAI,KAAK,EAAE,IAAI,KAAK,sBAAsB,EAAE,CAAC;oBAC3C,OAAO;wBACL,MAAM,EAAE,MAAM;wBACd,WAAW,EAAE,2CAA2C,IAAI,MAAM,KAAK,CAAC,OAAO,EAAE;qBAClF,CAAC;gBACJ,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,SAAS;oBACjB,WAAW,EAAE,wFAAwF,KAAK,CAAC,OAAO,EAAE;iBACrH,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,EAAE,GAAG,CAAC,CAAC,sBAAsB,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QACrE,CAAC;QAED,uEAAuE;QACvE,0CAA0C;QAC1C,MAAM,KAAK,GAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAChC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAEjC,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,UAAU,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAChE,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,cAAc,GAAG,KAAK,CAAC;YACvB,yEAAyE;YACzE,0EAA0E;YAC1E,0EAA0E;YAC1E,2EAA2E;YAC3E,kEAAkE;YAClE,0EAA0E;YAC1E,kEAAkE;YAClE,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrB,CAAC;YAAC,MAAM,CAAC;gBACP,yDAAyD;YAC3D,CAAC;oBAAS,CAAC;gBACT,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,wEAAwE;YACxE,qEAAqE;YACrE,IACE,OAAO,GAAG,WAAW;gBACrB,CAAC,CAAC,2BAA2B,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,EACzD,CAAC;gBACD,MAAM,CAAC,CAAC,KAAK,CAAC,6BAA6B,GAAG,OAAO,CAAC,CAAC;gBACvD,SAAS;YACX,CAAC;YACD,OAAO;gBACL,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,uBAAuB,IAAI,6BAA6B,KAAK,CAAC,OAAO,EAAE;aACrF,CAAC;QACJ,CAAC;QAED,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,+BAA+B,IAAI,IAAI;YACpD,OAAO,EAAE;gBACP,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC;gBACzB,IAAI;gBACJ,KAAK,EAAE,MAAM;aACd;SACF,CAAC;IACJ,CAAC;IAED,qEAAqE;IACrE,OAAO;QACL,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,uBAAuB,IAAI,6BAA6B,cAAc,EAAE,OAAO,EAAE;KAC/F,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCode.d.ts","sourceRoot":"","sources":["../../../src/core/tests/runCode.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,CAAC;AAwCnB,iBAAe,OAAO,CAAC,EACrB,MAAM,EACN,IAAI,EACJ,MAAM,EACN,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC,
|
|
1
|
+
{"version":3,"file":"runCode.d.ts","sourceRoot":"","sources":["../../../src/core/tests/runCode.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,CAAC;AAwCnB,iBAAe,OAAO,CAAC,EACrB,MAAM,EACN,IAAI,EACJ,MAAM,EACN,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC,gBAqMA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { validate } from "../../common/src/validate.js";
|
|
2
|
-
import { spawnCommand, log } from "../utils.js";
|
|
2
|
+
import { spawnCommand, log, resolveShellExecutable } from "../utils.js";
|
|
3
3
|
import { runShell } from "./runShell.js";
|
|
4
4
|
import fs from "node:fs";
|
|
5
5
|
import path from "node:path";
|
|
@@ -102,19 +102,56 @@ async function runCode({ config, step, driver, processRegistry, }) {
|
|
|
102
102
|
break;
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
-
|
|
106
|
-
//
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
//
|
|
105
|
+
let command = step.runCode.command;
|
|
106
|
+
// runCode's contract is "run this code with its interpreter" — the
|
|
107
|
+
// config-level `shell` default must not change how the interpreter is
|
|
108
|
+
// invoked, so the generated runShell step pins its shell explicitly:
|
|
109
|
+
// - bash scripts run THROUGH the bash shell (on Windows that resolves
|
|
110
|
+
// Git Bash and prepends its toolbox to PATH, so the script sees the
|
|
111
|
+
// same environment runShell's default gives it);
|
|
112
|
+
// - other interpreters (python/node) pin the platform-native shell on
|
|
113
|
+
// Windows so a Git-less host never pays a bash install for a step
|
|
114
|
+
// that doesn't need bash, and bash elsewhere (the runner default).
|
|
115
|
+
const wantsBash = command === "bash" || step.runCode.language?.toLowerCase() === "bash";
|
|
116
|
+
const interpreterShell = wantsBash ? "bash" : os.platform() === "win32" ? "cmd" : "bash";
|
|
117
|
+
// When the interpreter itself is bash on Windows, resolve the same Git
|
|
118
|
+
// Bash runShell's `bash` shell uses (never `System32\bash.exe` — the WSL
|
|
119
|
+
// launcher), lazily installing it when absent. The resolver verifies the
|
|
120
|
+
// binary by execution, so the generic `--version` probe below is
|
|
121
|
+
// redundant for this path.
|
|
122
|
+
let commandPreverified = false;
|
|
114
123
|
if (os.platform() === "win32" && command === "bash") {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
124
|
+
try {
|
|
125
|
+
command = await resolveShellExecutable("bash", {
|
|
126
|
+
cacheDir: config?.cacheDir,
|
|
127
|
+
});
|
|
128
|
+
commandPreverified = true;
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
result.status = "FAIL";
|
|
132
|
+
result.description = `Couldn't resolve bash on Windows: ${error.message}`;
|
|
133
|
+
return result;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
// The interpreter command travels through a bash command string on this
|
|
137
|
+
// branch (resolved above OR a user-supplied Windows path via
|
|
138
|
+
// `runCode.command`): bash strips unquoted backslashes, so hand it the
|
|
139
|
+
// separator every shell accepts, and quote paths containing spaces so
|
|
140
|
+
// `C:/Program Files/...` stays one token.
|
|
141
|
+
if (os.platform() === "win32" && interpreterShell === "bash") {
|
|
142
|
+
command = command.replace(/\\/g, "/");
|
|
143
|
+
if (/\s/.test(command) && !command.startsWith('"')) {
|
|
144
|
+
command = `"${command}"`;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
// Make sure the command is available
|
|
148
|
+
if (!commandPreverified) {
|
|
149
|
+
const commandExists = await spawnCommand(command, ["--version"]);
|
|
150
|
+
if (commandExists.exitCode !== 0) {
|
|
151
|
+
result.status = "FAIL";
|
|
152
|
+
result.description = `Command ${command} is unavailable. Make sure it's installed and in your PATH.`;
|
|
153
|
+
return result;
|
|
154
|
+
}
|
|
118
155
|
}
|
|
119
156
|
// Prepare shell command using the resolved command.
|
|
120
157
|
// BUG #1 FIX: previously only {command,args} were forwarded, so the
|
|
@@ -123,9 +160,19 @@ async function runCode({ config, step, driver, processRegistry, }) {
|
|
|
123
160
|
// no effect and the step FAILed on a non-zero exit). Forward every option
|
|
124
161
|
// runShell honors so they actually take effect. `directory` (runCode-only)
|
|
125
162
|
// is resolved into the single `path` runShell expects.
|
|
163
|
+
// The script path travels through a shell as part of the command string
|
|
164
|
+
// (runShell joins command + args with spaces): use the separator every
|
|
165
|
+
// shell accepts on Windows (bash strips unquoted backslashes), and quote
|
|
166
|
+
// it so a temp dir containing spaces stays one token.
|
|
167
|
+
let scriptArg = scriptPath;
|
|
168
|
+
if (os.platform() === "win32")
|
|
169
|
+
scriptArg = scriptArg.replace(/\\/g, "/");
|
|
170
|
+
if (/\s/.test(scriptArg))
|
|
171
|
+
scriptArg = `"${scriptArg}"`;
|
|
126
172
|
const runShellOptions = {
|
|
127
173
|
command,
|
|
128
|
-
args: [
|
|
174
|
+
args: [scriptArg, ...step.runCode.args],
|
|
175
|
+
shell: interpreterShell,
|
|
129
176
|
exitCodes: step.runCode.exitCodes,
|
|
130
177
|
workingDirectory: step.runCode.workingDirectory,
|
|
131
178
|
maxVariation: step.runCode.maxVariation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCode.js","sourceRoot":"","sources":["../../../src/core/tests/runCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"runCode.js","sourceRoot":"","sources":["../../../src/core/tests/runCode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runShell.d.ts","sourceRoot":"","sources":["../../../src/core/tests/runShell.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runShell.d.ts","sourceRoot":"","sources":["../../../src/core/tests/runShell.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,CAAC;AAOpB,iBAAe,QAAQ,CAAC,EACtB,MAAM,EACN,IAAI,EACJ,MAAM,EACN,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC,gBAwQA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { validate } from "../../common/src/validate.js";
|
|
2
|
-
import { spawnCommand, log, calculateFractionalDifference, } from "../utils.js";
|
|
2
|
+
import { spawnCommand, log, calculateFractionalDifference, resolveShellName, resolveShellExecutable, } from "../utils.js";
|
|
3
3
|
import { startBackgroundProcessSurface } from "./processSurface.js";
|
|
4
4
|
import { buildConditionContext, evaluateImplicitAssertions, } from "../routing.js";
|
|
5
5
|
import fs from "node:fs";
|
|
@@ -46,6 +46,23 @@ async function runShell({ config, step, driver, processRegistry, }) {
|
|
|
46
46
|
overwrite: step.runShell.overwrite || "aboveVariation",
|
|
47
47
|
timeout: step.runShell.timeout || 60000,
|
|
48
48
|
};
|
|
49
|
+
// Resolve which shell runs the command: step `shell` > config `shell` >
|
|
50
|
+
// `bash`. Resolution can fail — Windows-only shells off Windows, or Git
|
|
51
|
+
// Bash that can't be provisioned on Windows — and that's a FAILed step
|
|
52
|
+
// with the resolver's actionable message, not a throw.
|
|
53
|
+
const shellName = resolveShellName({ config, step });
|
|
54
|
+
let shellExecutable;
|
|
55
|
+
try {
|
|
56
|
+
shellExecutable = await resolveShellExecutable(shellName, {
|
|
57
|
+
cacheDir: config?.cacheDir,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
result.status = "FAIL";
|
|
62
|
+
result.description = error.message;
|
|
63
|
+
return result;
|
|
64
|
+
}
|
|
65
|
+
log(config, "debug", `runShell shell: ${shellName} (${shellExecutable})`);
|
|
49
66
|
// Background mode: start the process, register it, wait until ready, and
|
|
50
67
|
// return immediately. `exitCodes`, `stdio`, and output saving don't apply.
|
|
51
68
|
// `background` is an object holding `name` and (optional) `waitUntil`; its
|
|
@@ -62,6 +79,7 @@ async function runShell({ config, step, driver, processRegistry, }) {
|
|
|
62
79
|
name: background.name,
|
|
63
80
|
args: step.runShell.args,
|
|
64
81
|
workingDirectory: step.runShell.workingDirectory,
|
|
82
|
+
shell: shellExecutable,
|
|
65
83
|
tty: background.tty,
|
|
66
84
|
waitUntil: background.waitUntil,
|
|
67
85
|
timeout: step.runShell.timeout,
|
|
@@ -77,7 +95,7 @@ async function runShell({ config, step, driver, processRegistry, }) {
|
|
|
77
95
|
}
|
|
78
96
|
// Execute command
|
|
79
97
|
const timeout = step.runShell.timeout;
|
|
80
|
-
const options = {};
|
|
98
|
+
const options = { shell: shellExecutable };
|
|
81
99
|
if (step.runShell.workingDirectory)
|
|
82
100
|
options.cwd = step.runShell.workingDirectory;
|
|
83
101
|
const commandPromise = spawnCommand(step.runShell.command, step.runShell.args, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runShell.js","sourceRoot":"","sources":["../../../src/core/tests/runShell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,GAAG,EACH,6BAA6B,
|
|
1
|
+
{"version":3,"file":"runShell.js","sourceRoot":"","sources":["../../../src/core/tests/runShell.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startSurface.d.ts","sourceRoot":"","sources":["../../../src/core/tests/startSurface.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,IAAI,mBAAmB,EAEtC,KAAK,eAAe,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,IAAI,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"startSurface.d.ts","sourceRoot":"","sources":["../../../src/core/tests/startSurface.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,IAAI,mBAAmB,EAEtC,KAAK,eAAe,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,IAAI,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AASzG,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAyD5B,iBAAe,gBAAgB,CAAC,EAC9B,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,eAAe,EACf,UAAU,EACV,UAAU,EACV,IAAI,GACL,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,IAAI,CAAC,EAAE;QACL,eAAe,CAAC,EAAE,OAAO,mBAAmB,CAAC;QAC7C,6BAA6B,CAAC,EAAE,OAAO,iCAAiC,CAAC;KAC1E,CAAC;CACH,GAAG,OAAO,CAAC,GAAG,CAAC,CAkRf"}
|
|
@@ -2,6 +2,7 @@ import { validate } from "../../common/src/validate.js";
|
|
|
2
2
|
import { startSurfaceDescriptors } from "../../runtime/browserStepKeys.js";
|
|
3
3
|
import { startAppSurface as realStartAppSurface, defaultAppSurfaceName, } from "./appSurface.js";
|
|
4
4
|
import { startBackgroundProcessSurface as realStartBackgroundProcessSurface } from "./processSurface.js";
|
|
5
|
+
import { resolveShellName, resolveShellExecutable } from "../utils.js";
|
|
5
6
|
import { openSession, activateSession, normalizeEngine, } from "./browserSessions.js";
|
|
6
7
|
export { startSurfaceStep };
|
|
7
8
|
function descriptorKind(d) {
|
|
@@ -134,20 +135,34 @@ async function startSurfaceStep({ config, step, platform, driver, processRegistr
|
|
|
134
135
|
outputs: { name: opened.name, engine },
|
|
135
136
|
};
|
|
136
137
|
};
|
|
137
|
-
const runProcessDescriptor = async (d) =>
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
138
|
+
const runProcessDescriptor = async (d) => {
|
|
139
|
+
// startSurface process descriptors go through the same launcher as
|
|
140
|
+
// runShell's `background`, so they honor the same shell contract: the
|
|
141
|
+
// config-level `shell` default (bash when unset). Process descriptors
|
|
142
|
+
// have no per-step `shell` field, so only the config level applies.
|
|
143
|
+
let shellExecutable;
|
|
144
|
+
try {
|
|
145
|
+
shellExecutable = await resolveShellExecutable(resolveShellName({ config }), { cacheDir: config?.cacheDir });
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
return { status: "FAIL", description: error.message };
|
|
149
|
+
}
|
|
150
|
+
return startProcess({
|
|
151
|
+
config,
|
|
152
|
+
descriptor: {
|
|
153
|
+
command: d.process,
|
|
154
|
+
name: d.name,
|
|
155
|
+
args: d.args,
|
|
156
|
+
workingDirectory: d.workingDirectory,
|
|
157
|
+
shell: shellExecutable,
|
|
158
|
+
tty: d.tty,
|
|
159
|
+
waitUntil: d.waitUntil,
|
|
160
|
+
timeout: d.timeout,
|
|
161
|
+
},
|
|
162
|
+
processRegistry,
|
|
163
|
+
driver,
|
|
164
|
+
});
|
|
165
|
+
};
|
|
151
166
|
// --- Single-object form: dispatch directly; the app branch returns its
|
|
152
167
|
// handler result verbatim (byte-compatible with pre-Phase 6 behavior). ---
|
|
153
168
|
if (!isArrayForm) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startSurface.js","sourceRoot":"","sources":["../../../src/core/tests/startSurface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EACL,eAAe,IAAI,mBAAmB,EACtC,qBAAqB,GAEtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,IAAI,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACzG,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,GAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAkC5B,SAAS,cAAc,CAAC,CAAM;IAC5B,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC5C,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QACpD,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;IACtD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,CAAM,EAAE,IAAU;IACtC,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACtE,0EAA0E;IAC1E,yEAAyE;IACzE,uEAAuE;IACvE,sEAAsE;IACtE,8DAA8D;IAC9D,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACzE,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,2EAA2E;IAC3E,6CAA6C;IAC7C,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACxC,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,EAC9B,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,eAAe,EACf,UAAU,EACV,UAAU,EACV,IAAI,GAcL;IACC,MAAM,QAAQ,GAAG,IAAI,EAAE,eAAe,IAAI,mBAAmB,CAAC;IAC9D,MAAM,YAAY,GAChB,IAAI,EAAE,6BAA6B,IAAI,iCAAiC,CAAC;IAE3E,uEAAuE;IACvE,0EAA0E;IAC1E,0EAA0E;IAC1E,MAAM,WAAW,GAAG,QAAQ,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,4BAA4B,WAAW,CAAC,MAAM,EAAE;SAC9D,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC;IAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC;IACnC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAElD,sEAAsE;IACtE,MAAM,eAAe,GACnB,MAAM,EAAE,KAAK,EAAE,eAAe,CAAC;IAEjC,2EAA2E;IAC3E,uEAAuE;IACvE,wBAAwB;IACxB,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC;QACvC,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO;gBACL,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,qDAAqD,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK;qBACnG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;qBACpB,IAAI,CAAC,IAAI,CAAC,wCAAwC;aACtD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,8CAA8C;IAE9C,MAAM,gBAAgB,GAAG,KAAK,EAAE,CAAM,EAAgB,EAAE;QACtD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;gBACL,MAAM,EAAE,MAAM;gBACd,WAAW,EACT,6GAA6G;aAChH,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;YACd,MAAM;YACN,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE;YACzB,UAAU;YACV,QAAQ,EAAE,QAAQ,IAAI,EAAE;YACxB,UAAU,EAAE,UAAU,IAAI,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,KAAK,EAAE,CAAM,EAAgB,EAAE;QAC1D,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;gBACL,MAAM,EAAE,MAAM;gBACd,WAAW,EACT,+LAA+L;aAClM,CAAC;QACJ,CAAC;QACD,qEAAqE;QACrE,uEAAuE;QACvE,0EAA0E;QAC1E,sCAAsC;QACtC,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE;YAChD,MAAM;YACN,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,SAAS,EAAE;gBACT,GAAG,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7D,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC/D;SACF,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QACzD,CAAC;QACD,uEAAuE;QACvE,mEAAmE;QACnE,wEAAwE;QACxE,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC;gBACH,MAAM,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YACjD,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,OAAO;oBACL,MAAM,EAAE,MAAM;oBACd,WAAW,EAAE,2BAA2B,MAAM,CAAC,IAAI,sCAAsC,KAAK,EAAE,OAAO,IAAI,KAAK,EAAE;iBACnH,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,2BAA2B,MAAM,CAAC,IAAI,MAAM,MAAM,IAAI;YACnE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE;SACvC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,KAAK,EAAE,CAAM,EAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"startSurface.js","sourceRoot":"","sources":["../../../src/core/tests/startSurface.ts"],"names":[],"mappings":"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"}
|
package/dist/core/utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type ChildProcess } from "node:child_process";
|
|
2
|
-
export { outputResults, loadEnvs, log, timestamp, getOrInitRunTimestamp, getRunOutputDir, runArchivesArtifacts, replaceEnvs, spawnCommand, spawnBackgroundCommand, spawnPtyBackgroundCommand, waitForReady, waitForPort, waitForHttp, waitForStdio, waitForOutputMatch, inContainer, cleanTemp, calculateFractionalDifference, serializeBrowserResult, matchesExpectedOutput, fetchFile, isRelativeUrl, appendQueryParams, isDeviceWebContext, computeSettleCeiling, redactUrlForOutput, assertUrlHostIsPublic, sanitizeFilesystemName, compileFilter, isRetryableSessionError, isTransientProcessInitError, matchesFilter, selectSpecsForRun, findFreePort, runConcurrent, createResourceRegistry, runResourceAware, rollUpResults, rollUpAssertions, createAppiumPool, evaluateContextRequirements, };
|
|
2
|
+
export { outputResults, loadEnvs, log, timestamp, getOrInitRunTimestamp, getRunOutputDir, runArchivesArtifacts, replaceEnvs, spawnCommand, spawnBackgroundCommand, spawnPtyBackgroundCommand, resolveShellName, resolveShellExecutable, shellSpawnEnv, waitForReady, waitForPort, waitForHttp, waitForStdio, waitForOutputMatch, inContainer, cleanTemp, calculateFractionalDifference, serializeBrowserResult, matchesExpectedOutput, fetchFile, isRelativeUrl, appendQueryParams, isDeviceWebContext, computeSettleCeiling, redactUrlForOutput, assertUrlHostIsPublic, sanitizeFilesystemName, compileFilter, isRetryableSessionError, isTransientProcessInitError, matchesFilter, selectSpecsForRun, findFreePort, runConcurrent, createResourceRegistry, runResourceAware, rollUpResults, rollUpAssertions, createAppiumPool, evaluateContextRequirements, };
|
|
3
3
|
export type { BackgroundProcess };
|
|
4
4
|
declare function createAppiumPool(ports: number[]): {
|
|
5
5
|
acquire(): Promise<number>;
|
|
@@ -112,6 +112,25 @@ declare function getRunOutputDir(config: any, { create }?: {
|
|
|
112
112
|
create?: boolean;
|
|
113
113
|
}): string;
|
|
114
114
|
declare function runArchivesArtifacts(config?: any, specs?: any[]): boolean;
|
|
115
|
+
type ShellName = "bash" | "cmd" | "powershell";
|
|
116
|
+
declare function resolveShellName({ config, step, }?: {
|
|
117
|
+
config?: any;
|
|
118
|
+
step?: any;
|
|
119
|
+
}): ShellName;
|
|
120
|
+
interface ResolveShellDeps {
|
|
121
|
+
platform?: string;
|
|
122
|
+
env?: Record<string, string | undefined>;
|
|
123
|
+
cacheDir?: string;
|
|
124
|
+
resolveWindowsBash?: (options?: {
|
|
125
|
+
cacheDir?: string;
|
|
126
|
+
}) => Promise<string>;
|
|
127
|
+
probePosixBash?: () => Promise<boolean>;
|
|
128
|
+
}
|
|
129
|
+
declare function resolveShellExecutable(shellName: string, deps?: ResolveShellDeps): Promise<string>;
|
|
130
|
+
declare function shellSpawnEnv(shellExecutable: string | undefined, deps?: {
|
|
131
|
+
platform?: string;
|
|
132
|
+
env?: Record<string, string | undefined>;
|
|
133
|
+
}): Record<string, string | undefined> | undefined;
|
|
115
134
|
/**
|
|
116
135
|
* Executes a command in a child process using the `spawn` function from the `child_process` module.
|
|
117
136
|
* @param {string} cmd - The command to execute.
|
package/dist/core/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/core/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/core/utils.ts"],"names":[],"mappings":"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"}
|