@happier-dev/stack 0.2.0 → 0.2.1-preview.1775586714.26562
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/node_modules/@happier-dev/agents/dist/.tsbuildinfo +1 -1
- package/node_modules/@happier-dev/agents/dist/index.d.ts +1 -1
- package/node_modules/@happier-dev/agents/dist/index.d.ts.map +1 -1
- package/node_modules/@happier-dev/agents/dist/index.js.map +1 -1
- package/node_modules/@happier-dev/agents/dist/providerSettings/definitions/claudeRemote.d.ts +9 -9
- package/node_modules/@happier-dev/agents/dist/providerSettings/definitions/codex.d.ts +5 -5
- package/node_modules/@happier-dev/agents/dist/providers/providerCliRuntime.d.ts +14 -1
- package/node_modules/@happier-dev/agents/dist/providers/providerCliRuntime.d.ts.map +1 -1
- package/node_modules/@happier-dev/agents/dist/providers/providerCliRuntime.js +25 -12
- package/node_modules/@happier-dev/agents/dist/providers/providerCliRuntime.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/.tsbuildinfo +1 -1
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/buildCliBinaryArtifactPayload.js +1 -1
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/buildCliBinaryArtifactPayload.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/commands.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/commands.js +2 -1
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/commands.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/commands.test.js +22 -0
- package/node_modules/@happier-dev/cli-common/dist/componentArtifacts/commands.test.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/index.d.ts +2 -2
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/index.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/index.js +1 -1
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/index.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.d.ts +12 -0
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.js +18 -0
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.test.js +39 -0
- package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.test.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/index.d.ts +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/index.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/index.js +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/index.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.d.ts +1 -0
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.js +23 -5
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.test.d.ts +2 -0
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.test.d.ts.map +1 -0
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.test.js +64 -0
- package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.test.js.map +1 -0
- package/node_modules/@happier-dev/cli-common/dist/providers/index.d.ts +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/index.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/index.js +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/index.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/install.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/install.js +3 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/install.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/managedJavaScriptRuntime.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/managedJavaScriptRuntime.js +10 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/managedJavaScriptRuntime.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/managedJavaScriptRuntime.systemNodeFallback.test.js +58 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/managedJavaScriptRuntime.systemNodeFallback.test.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/resolution.d.ts +2 -0
- package/node_modules/@happier-dev/cli-common/dist/providers/resolution.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/resolution.js +120 -32
- package/node_modules/@happier-dev/cli-common/dist/providers/resolution.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/resolveHappyHomeDir.d.ts.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/resolveHappyHomeDir.js +10 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/resolveHappyHomeDir.js.map +1 -1
- package/node_modules/@happier-dev/cli-common/dist/providers/resolveHappyHomeDir.test.js +6 -0
- package/node_modules/@happier-dev/cli-common/dist/providers/resolveHappyHomeDir.test.js.map +1 -1
- package/node_modules/@happier-dev/protocol/dist/.tsbuildinfo +1 -1
- package/node_modules/@happier-dev/protocol/dist/e2e/providerSpec.d.ts +2 -2
- package/node_modules/@happier-dev/protocol/dist/features/decision.d.ts +2 -2
- package/node_modules/@happier-dev/protocol/dist/features/payload/capabilities/authCapabilities.d.ts +1 -1
- package/node_modules/@happier-dev/protocol/dist/features/payload/capabilities/capabilitiesSchema.d.ts +1 -1
- package/node_modules/@happier-dev/protocol/dist/features/payload/featuresResponseSchema.d.ts +1 -1
- package/node_modules/@happier-dev/protocol/dist/structuredMessages/reviewFindingsV1.d.ts +3 -3
- package/node_modules/@happier-dev/protocol/dist/structuredMessages/reviewFindingsV2.d.ts +1 -1
- package/node_modules/@happier-dev/release-runtime/dist/.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/scripts/doctor.mjs +10 -2
- package/scripts/env.mjs +2 -5
- package/scripts/env_cmd.test.mjs +32 -0
- package/scripts/ghops.mjs +7 -4
- package/scripts/ghops.test.mjs +42 -1
- package/scripts/happier.mjs +2 -2
- package/scripts/menubar.mjs +2 -2
- package/scripts/run.mjs +2 -2
- package/scripts/self_host_runtime.mjs +10 -7
- package/scripts/self_host_runtime.test.mjs +47 -0
- package/scripts/service.mjs +10 -3
- package/scripts/stack.mjs +3 -2
- package/scripts/tailscale.mjs +2 -2
- package/scripts/utils/env/config.mjs +2 -7
- package/scripts/utils/env/env.mjs +9 -5
- package/scripts/utils/env/env_local.mjs +2 -1
- package/scripts/utils/paths/canonical_home.mjs +11 -3
- package/scripts/utils/paths/canonical_home.test.mjs +11 -3
- package/scripts/utils/paths/paths.mjs +17 -5
- package/scripts/utils/paths/paths_home_env.test.mjs +43 -0
- package/scripts/utils/proc/pm.mjs +9 -4
- package/scripts/utils/proc/pm_stack_cache_env.test.mjs +28 -0
- package/scripts/utils/review/targets.mjs +2 -2
- package/scripts/utils/server/apply_server_light_env_defaults.mjs +4 -3
- package/scripts/utils/server/apply_server_light_env_defaults.test.mjs +25 -0
- package/scripts/utils/server/urls.mjs +3 -5
- package/scripts/utils/server/urls.test.mjs +22 -1
- package/scripts/utils/service/stack_autostart_resolution.mjs +6 -2
- package/scripts/utils/service/stack_autostart_resolution.test.mjs +13 -1
- package/scripts/utils/stack/context.mjs +2 -3
- package/scripts/utils/stack/context.test.mjs +18 -0
- package/scripts/utils/stack/dirs.mjs +4 -4
- package/scripts/utils/stack/dirs.test.mjs +33 -0
- package/scripts/utils/stack/stop.mjs +2 -2
- package/scripts/where.mjs +15 -4
- package/scripts/worktrees.mjs +2 -1
|
@@ -8,7 +8,7 @@ import { withCliDistBuildLock } from './withCliDistBuildLock.js';
|
|
|
8
8
|
import { ensureBundledWorkspacePackagesBuilt } from './ensureBundledWorkspacePackagesBuilt.js';
|
|
9
9
|
const CLI_RUNTIME_SIDECAR_ENTRIES = [
|
|
10
10
|
['childProcessOptions.cjs'],
|
|
11
|
-
['
|
|
11
|
+
['claude_launcher_runtime.cjs'],
|
|
12
12
|
['claude_local_launcher.cjs'],
|
|
13
13
|
['claude_remote_launcher.cjs'],
|
|
14
14
|
['session_hook_forwarder.cjs'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildCliBinaryArtifactPayload.js","sourceRoot":"","sources":["../../src/componentArtifacts/buildCliBinaryArtifactPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,qBAAqB,EAAqB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,kBAAkB,EAAmB,MAAM,eAAe,CAAC;AACvJ,OAAO,EACL,6CAA6C,EAC7C,uBAAuB,EACvB,sCAAsC,EACtC,uCAAuC,GACxC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AAE/F,MAAM,2BAA2B,GAAG;IAClC,CAAC,yBAAyB,CAAC;IAC3B,CAAC,
|
|
1
|
+
{"version":3,"file":"buildCliBinaryArtifactPayload.js","sourceRoot":"","sources":["../../src/componentArtifacts/buildCliBinaryArtifactPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,qBAAqB,EAAqB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,iBAAiB,EAAE,kBAAkB,EAAmB,MAAM,eAAe,CAAC;AACvJ,OAAO,EACL,6CAA6C,EAC7C,uBAAuB,EACvB,sCAAsC,EACtC,uCAAuC,GACxC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AAE/F,MAAM,2BAA2B,GAAG;IAClC,CAAC,yBAAyB,CAAC;IAC3B,CAAC,6BAA6B,CAAC;IAC/B,CAAC,2BAA2B,CAAC;IAC7B,CAAC,4BAA4B,CAAC;IAC9B,CAAC,4BAA4B,CAAC;IAC9B,CAAC,+BAA+B,CAAC;IACjC,CAAC,sBAAsB,CAAC;IACxB,CAAC,SAAS,CAAC;IACX,CAAC,OAAO,CAAC;CACD,CAAC;AAEX,MAAM,6BAA6B,GAAG;IACpC,2BAA2B;IAC3B,UAAU;IACV,yCAAyC;CACjC,CAAC;AAEX,KAAK,UAAU,sBAAsB,CAAC,QAAgB,EAAE,UAAkB;IACxE,KAAK,MAAM,QAAQ,IAAI,2BAA2B,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,0BAA0B,GAAG,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClE,KAAK,MAAM,WAAW,IAAI,6BAA6B,EAAE,CAAC;QACxD,6CAA6C,CAAC;YAC5C,WAAW;YACX,0BAA0B;YAC1B,kBAAkB,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC;SACrD,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,yBAAyB,CACtC,QAAgB,EAChB,UAAkB,EAClB,OAAe,EACf,MAGE;IAEF,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,gBAAgB,GAAG,sCAAsC,CAAC;QAC9D,QAAQ;QACR,cAAc,EAAE,MAAM;KACvB,CAAC,CAAC;IAEH,MAAM,mCAAmC,CAAC;QACxC,QAAQ;QACR,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;QACrF,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CAAC,CAAC;IAEH,MAAM,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,uCAAuC,CAAC;QACtC,kBAAkB,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;QAChD,cAAc,EAAE,UAAU;KAC3B,CAAC,CAAC;IACH,uBAAuB,CAAC;QACtB,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1D,WAAW;YACX,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACrE,CAAC,CAAC;KACJ,CAAC,CAAC;IACH,KAAK,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;QACvD,uCAAuC,CAAC;YACtC,kBAAkB,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;YAChD,cAAc,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC5E,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,MAAqD;IACrF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAC;IACjF,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC1C,eAAe,GAAG,IAAI,CAAC;QACvB,MAAM,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,eAAe,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9E,MAAM,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACxE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,EAClD,QAAQ,EACR,UAAU,EACV,MAAM,GAAG,0BAA0B,CAAC,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,CAAC,EAC7E,SAAS,GAAG,EAAE,EACd,UAAU,GAAG,WAAW,EACxB,YAAY,GAAG,aAAa,EAC5B,aAAa,GAAG,gBAAgB,GASjC;IACC,MAAM,UAAU,GAAG,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAC1E,MAAM,IAAI,GAAG,kBAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAClD,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAS,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9E,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACtD,MAAM,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QAED,+FAA+F;QAC/F,8FAA8F;QAC9F,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3B,OAAO,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,EAAE,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,MAAM,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5F,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;YACnC,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,EAAE,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,kBAAkB,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACpD,MAAM,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,OAAO,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEjB,MAAM,kBAAkB,GAAG,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAE9D,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7C,MAAM,cAAc,GAAG,qBAAqB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,6BAA6B,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAClJ,MAAM,aAAa,CAAC;YAClB,UAAU,EAAE,kBAAkB;YAC9B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC;YACzC,GAAG,EAAE,QAAQ;YACb,SAAS,EAAE,eAAe;YAC1B,UAAU;YACV,UAAU;SACX,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,MAAM,yBAAyB,CAAC,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7F,MAAM,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEnD,OAAO;YACL,cAAc;YACd,UAAU,EAAE,cAAc;SAC3B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/componentArtifacts/commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/componentArtifacts/commands.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE;IACR,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,KACE,IAAI,CAAC;AAEV,wBAAgB,WAAW,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,GAAmB,EAAE,GAAiB,EAAE,KAAiB,EAAE,KAAK,EAAE,GAAE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;CACX,GACL,IAAI,CAeN;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAElD;AAiBD,wBAAgB,iBAAiB,CAAC,EAChC,UAAwB,EACxB,YAA4B,EAC5B,QAA2B,GAC5B,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAC/B,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CACvB,GAAG,MAAM,GAAG,IAAI,CA2BrB;AAED,wBAAgB,kBAAkB,CAAC,EACjC,YAA4B,GAC7B,GAAE;IACD,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAIvC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlE;AAED,wBAAsB,gBAAgB,CAAC,EACrC,UAAU,EACV,SAAS,EACT,OAAO,EACP,GAAmB,EACnB,SAAc,EACd,UAAU,EACV,UAAwB,GACzB,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhB"}
|
|
@@ -3,6 +3,7 @@ import { join } from 'node:path';
|
|
|
3
3
|
import { stat } from 'node:fs/promises';
|
|
4
4
|
import { accessSync, constants as fsConstants } from 'node:fs';
|
|
5
5
|
import { commandExistsOnPath } from '../process/index.js';
|
|
6
|
+
import { expandHomeDirPath } from '../providers/resolution.js';
|
|
6
7
|
export function execOrThrow(cmd, args, { cwd = process.cwd(), env = process.env, stdio = 'inherit', input } = {}) {
|
|
7
8
|
const result = spawnSync(cmd, args, {
|
|
8
9
|
cwd,
|
|
@@ -38,7 +39,7 @@ function isRunnableExecutablePath(pathLike, platform = process.platform) {
|
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
41
|
export function resolveBunCommand({ processEnv = process.env, commandProbe = commandExists, platform = process.platform, } = {}) {
|
|
41
|
-
const explicit = String(processEnv.HAPPIER_BUN_PATH ?? '').trim();
|
|
42
|
+
const explicit = expandHomeDirPath(String(processEnv.HAPPIER_BUN_PATH ?? '').trim(), processEnv);
|
|
42
43
|
if (isRunnableExecutablePath(explicit, platform)) {
|
|
43
44
|
return explicit;
|
|
44
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/componentArtifacts/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/componentArtifacts/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,28 @@ import { tmpdir } from 'node:os';
|
|
|
4
4
|
import { describe, expect, it } from 'vitest';
|
|
5
5
|
import { resolveBunCommand } from './commands.js';
|
|
6
6
|
describe('resolveBunCommand', () => {
|
|
7
|
+
it('expands ~/ explicit bun overrides against HOME', () => {
|
|
8
|
+
const tempRoot = mkdtempSync(join(tmpdir(), 'cli-common-bun-override-'));
|
|
9
|
+
try {
|
|
10
|
+
const homeDir = join(tempRoot, 'home');
|
|
11
|
+
const bunPath = join(homeDir, 'custom-tools', 'bun', process.platform === 'win32' ? 'bun.exe' : 'bun');
|
|
12
|
+
mkdirSync(join(homeDir, 'custom-tools', 'bun'), { recursive: true });
|
|
13
|
+
writeFileSync(bunPath, process.platform === 'win32' ? '@echo off\r\n' : '#!/bin/sh\n', {
|
|
14
|
+
mode: 0o755,
|
|
15
|
+
});
|
|
16
|
+
expect(resolveBunCommand({
|
|
17
|
+
processEnv: {
|
|
18
|
+
HOME: homeDir,
|
|
19
|
+
USERPROFILE: homeDir,
|
|
20
|
+
HAPPIER_BUN_PATH: `~/custom-tools/bun/${process.platform === 'win32' ? 'bun.exe' : 'bun'}`,
|
|
21
|
+
},
|
|
22
|
+
commandProbe: () => false,
|
|
23
|
+
})).toBe(bunPath);
|
|
24
|
+
}
|
|
25
|
+
finally {
|
|
26
|
+
rmSync(tempRoot, { recursive: true, force: true });
|
|
27
|
+
}
|
|
28
|
+
});
|
|
7
29
|
it('resolves bun from BUN_INSTALL when bun is not on PATH', () => {
|
|
8
30
|
const tempRoot = mkdtempSync(join(tmpdir(), 'cli-common-bun-install-'));
|
|
9
31
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.test.js","sourceRoot":"","sources":["../../src/componentArtifacts/commands.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC;YACD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAClF,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,EAAE;gBACnF,IAAI,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,iBAAiB,CAAC;gBACrB,UAAU,EAAE;oBACR,WAAW,EAAE,aAAa;iBAC7B;gBACD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;aAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACP,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"commands.test.js","sourceRoot":"","sources":["../../src/componentArtifacts/commands.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACtD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,0BAA0B,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACvG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACrE,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,EAAE;gBACnF,IAAI,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,iBAAiB,CAAC;gBACrB,UAAU,EAAE;oBACR,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,OAAO;oBACpB,gBAAgB,EAAE,sBAAsB,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE;iBAC7F;gBACD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;aAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACP,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC7D,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC;YACD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAClF,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,EAAE;gBACnF,IAAI,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,iBAAiB,CAAC;gBACrB,UAAU,EAAE;oBACR,WAAW,EAAE,aAAa;iBAC7B;gBACD,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;aAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACP,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -23,8 +23,8 @@ export { rollbackVersionedPayload } from './rollbackVersionedPayload.js';
|
|
|
23
23
|
export type { FirstPartyRollbackResult } from './rollbackVersionedPayload.js';
|
|
24
24
|
export { syncInstalledFirstPartyShims } from './syncInstalledFirstPartyShims.js';
|
|
25
25
|
export type { SyncInstalledFirstPartyShimsResult } from './syncInstalledFirstPartyShims.js';
|
|
26
|
-
export { checkRelayRuntimeHealth, normalizeRelayRuntimeStatus, resolveRelayRuntimeDefaults, } from './relayRuntime.js';
|
|
27
|
-
export type { RelayRuntimeDefaults, RelayRuntimeHealthResult, RelayRuntimeNormalizedStatus, } from './relayRuntime.js';
|
|
26
|
+
export { checkRelayRuntimeHealth, resolveConfiguredRelayRuntimeBinaryOverride, resolveConfiguredRelayRuntimePaths, normalizeRelayRuntimeStatus, resolveRelayRuntimeDefaults, } from './relayRuntime.js';
|
|
27
|
+
export type { RelayRuntimeConfiguredPaths, RelayRuntimeDefaults, RelayRuntimeHealthResult, RelayRuntimeNormalizedStatus, } from './relayRuntime.js';
|
|
28
28
|
export { applyEnvOverridesToEnvText, parseEnvText, renderSelfHostServerEnvText, } from './selfHostServerEnv.js';
|
|
29
29
|
export { installOrUpdateRelayRuntimeLocal } from './relayRuntimeInstall.js';
|
|
30
30
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/firstPartyRuntime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,kCAAkC,EAClC,qCAAqC,EACrC,8CAA8C,GAC/C,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,+BAA+B,EAC/B,qBAAqB,EACrB,uCAAuC,GACxC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,YAAY,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,wCAAwC,EAAE,MAAM,qCAAqC,CAAC;AAC/F,YAAY,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EACL,kDAAkD,GACnD,MAAM,yDAAyD,CAAC;AACjE,YAAY,EACV,+BAA+B,EAC/B,kCAAkC,GACnC,MAAM,yDAAyD,CAAC;AACjE,OAAO,EACL,4CAA4C,GAC7C,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,YAAY,EACZ,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AAEjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,YAAY,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAErF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,YAAY,EAAE,qCAAqC,EAAE,MAAM,4BAA4B,CAAC;AAExF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAE9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,YAAY,EAAE,kCAAkC,EAAE,MAAM,mCAAmC,CAAC;AAC5F,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,oBAAoB,EACpB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,0BAA0B,EAC1B,YAAY,EACZ,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/firstPartyRuntime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,kCAAkC,EAClC,qCAAqC,EACrC,8CAA8C,GAC/C,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,+BAA+B,EAC/B,qBAAqB,EACrB,uCAAuC,GACxC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,YAAY,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,wCAAwC,EAAE,MAAM,qCAAqC,CAAC;AAC/F,YAAY,EAAE,iCAAiC,EAAE,MAAM,qCAAqC,CAAC;AAC7F,OAAO,EACL,kDAAkD,GACnD,MAAM,yDAAyD,CAAC;AACjE,YAAY,EACV,+BAA+B,EAC/B,kCAAkC,GACnC,MAAM,yDAAyD,CAAC;AACjE,OAAO,EACL,4CAA4C,GAC7C,MAAM,yBAAyB,CAAC;AACjC,YAAY,EACV,YAAY,EACZ,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AAEjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,YAAY,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAErF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,YAAY,EAAE,qCAAqC,EAAE,MAAM,4BAA4B,CAAC;AAExF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAE9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AACjF,YAAY,EAAE,kCAAkC,EAAE,MAAM,mCAAmC,CAAC;AAC5F,OAAO,EACL,uBAAuB,EACvB,2CAA2C,EAC3C,kCAAkC,EAClC,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,2BAA2B,EAC3B,oBAAoB,EACpB,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,0BAA0B,EAC1B,YAAY,EACZ,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -12,7 +12,7 @@ export { promoteVersionedPayload } from './promoteVersionedPayload.js';
|
|
|
12
12
|
export { pruneRetainedVersions } from './pruneRetainedVersions.js';
|
|
13
13
|
export { rollbackVersionedPayload } from './rollbackVersionedPayload.js';
|
|
14
14
|
export { syncInstalledFirstPartyShims } from './syncInstalledFirstPartyShims.js';
|
|
15
|
-
export { checkRelayRuntimeHealth, normalizeRelayRuntimeStatus, resolveRelayRuntimeDefaults, } from './relayRuntime.js';
|
|
15
|
+
export { checkRelayRuntimeHealth, resolveConfiguredRelayRuntimeBinaryOverride, resolveConfiguredRelayRuntimePaths, normalizeRelayRuntimeStatus, resolveRelayRuntimeDefaults, } from './relayRuntime.js';
|
|
16
16
|
export { applyEnvOverridesToEnvText, parseEnvText, renderSelfHostServerEnvText, } from './selfHostServerEnv.js';
|
|
17
17
|
export { installOrUpdateRelayRuntimeLocal } from './relayRuntimeInstall.js';
|
|
18
18
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/firstPartyRuntime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,kCAAkC,EAClC,qCAAqC,EACrC,8CAA8C,GAC/C,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAAE,wCAAwC,EAAE,MAAM,qCAAqC,CAAC;AAE/F,OAAO,EACL,kDAAkD,GACnD,MAAM,yDAAyD,CAAC;AAKjE,OAAO,EACL,4CAA4C,GAC7C,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AAEjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/firstPartyRuntime/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,kCAAkC,EAClC,qCAAqC,EACrC,8CAA8C,GAC/C,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,8BAA8B,EAC9B,mCAAmC,GACpC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAGjE,OAAO,EAAE,wCAAwC,EAAE,MAAM,qCAAqC,CAAC;AAE/F,OAAO,EACL,kDAAkD,GACnD,MAAM,yDAAyD,CAAC;AAKjE,OAAO,EACL,4CAA4C,GAC7C,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AAEjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAEjF,OAAO,EACL,uBAAuB,EACvB,2CAA2C,EAC3C,kCAAkC,EAClC,2BAA2B,EAC3B,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,EACL,0BAA0B,EAC1B,YAAY,EACZ,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -29,6 +29,13 @@ export type RelayRuntimeDefaults = Readonly<{
|
|
|
29
29
|
serverPort: number;
|
|
30
30
|
healthPath: string;
|
|
31
31
|
}>;
|
|
32
|
+
export type RelayRuntimeConfiguredPaths = Readonly<{
|
|
33
|
+
installRoot: string;
|
|
34
|
+
binDir: string;
|
|
35
|
+
configDir: string;
|
|
36
|
+
dataDir: string;
|
|
37
|
+
logDir: string;
|
|
38
|
+
}>;
|
|
32
39
|
export type RelayRuntimeNormalizedStatus = Readonly<{
|
|
33
40
|
installed: boolean;
|
|
34
41
|
version: string | null;
|
|
@@ -54,6 +61,11 @@ export type RelayRuntimeHealthResult = Readonly<{
|
|
|
54
61
|
statusCode: number | null;
|
|
55
62
|
version: string | null;
|
|
56
63
|
}>;
|
|
64
|
+
export declare function resolveConfiguredRelayRuntimePaths(params: Readonly<{
|
|
65
|
+
defaults: RelayRuntimeConfiguredPaths;
|
|
66
|
+
env?: NodeJS.ProcessEnv;
|
|
67
|
+
}>): RelayRuntimeConfiguredPaths;
|
|
68
|
+
export declare function resolveConfiguredRelayRuntimeBinaryOverride(env?: NodeJS.ProcessEnv): string;
|
|
57
69
|
export declare function resolveRelayRuntimeDefaults(params?: Readonly<{
|
|
58
70
|
platform?: RelayRuntimePlatform;
|
|
59
71
|
mode?: RelayRuntimeMode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayRuntime.d.ts","sourceRoot":"","sources":["../../src/firstPartyRuntime/relayRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"relayRuntime.d.ts","sourceRoot":"","sources":["../../src/firstPartyRuntime/relayRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { normalizePublicReleaseRingId } from '@happier-dev/release-runtime/releaseRings';
|
|
2
|
+
import { expandHomeDirPath } from '../providers/resolution.js';
|
|
2
3
|
function resolveChannelSuffix(channel) {
|
|
3
4
|
if (channel === 'stable')
|
|
4
5
|
return '';
|
|
@@ -19,6 +20,23 @@ function normalizeChannel(raw) {
|
|
|
19
20
|
? normalized
|
|
20
21
|
: 'stable';
|
|
21
22
|
}
|
|
23
|
+
function readExpandedOverride(env, key) {
|
|
24
|
+
const raw = typeof env[key] === 'string' ? env[key].trim() : '';
|
|
25
|
+
return expandHomeDirPath(raw, env);
|
|
26
|
+
}
|
|
27
|
+
export function resolveConfiguredRelayRuntimePaths(params) {
|
|
28
|
+
const env = params.env ?? process.env;
|
|
29
|
+
return {
|
|
30
|
+
installRoot: readExpandedOverride(env, 'HAPPIER_SELF_HOST_INSTALL_ROOT') || params.defaults.installRoot,
|
|
31
|
+
binDir: readExpandedOverride(env, 'HAPPIER_SELF_HOST_BIN_DIR') || params.defaults.binDir,
|
|
32
|
+
configDir: readExpandedOverride(env, 'HAPPIER_SELF_HOST_CONFIG_DIR') || params.defaults.configDir,
|
|
33
|
+
dataDir: readExpandedOverride(env, 'HAPPIER_SELF_HOST_DATA_DIR') || params.defaults.dataDir,
|
|
34
|
+
logDir: readExpandedOverride(env, 'HAPPIER_SELF_HOST_LOG_DIR') || params.defaults.logDir,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export function resolveConfiguredRelayRuntimeBinaryOverride(env = process.env) {
|
|
38
|
+
return readExpandedOverride(env, 'HAPPIER_SELF_HOST_SERVER_BINARY');
|
|
39
|
+
}
|
|
22
40
|
function buildRelayRuntimeUrl(params) {
|
|
23
41
|
const path = String(params.path ?? '').trim() || '/v1/version';
|
|
24
42
|
return `http://${params.host}:${params.port}${path.startsWith('/') ? path : `/${path}`}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayRuntime.js","sourceRoot":"","sources":["../../src/firstPartyRuntime/relayRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAA4B,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"relayRuntime.js","sourceRoot":"","sources":["../../src/firstPartyRuntime/relayRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,45 @@ describe('resolveRelayRuntimeDefaults', () => {
|
|
|
40
40
|
});
|
|
41
41
|
});
|
|
42
42
|
});
|
|
43
|
+
describe('resolveConfiguredRelayRuntimePaths', () => {
|
|
44
|
+
it('expands ~/ self-host path overrides against the provided HOME', async () => {
|
|
45
|
+
const mod = await import('./relayRuntime');
|
|
46
|
+
expect(typeof mod.resolveConfiguredRelayRuntimePaths).toBe('function');
|
|
47
|
+
const defaults = resolveRelayRuntimeDefaults({
|
|
48
|
+
platform: 'linux',
|
|
49
|
+
mode: 'user',
|
|
50
|
+
channel: 'stable',
|
|
51
|
+
homeDir: '/home/default',
|
|
52
|
+
});
|
|
53
|
+
expect(mod.resolveConfiguredRelayRuntimePaths({
|
|
54
|
+
defaults,
|
|
55
|
+
env: {
|
|
56
|
+
HOME: '/scoped/home',
|
|
57
|
+
USERPROFILE: '/scoped/home',
|
|
58
|
+
HAPPIER_SELF_HOST_INSTALL_ROOT: '~/relay/install',
|
|
59
|
+
HAPPIER_SELF_HOST_BIN_DIR: '~/relay/bin',
|
|
60
|
+
HAPPIER_SELF_HOST_CONFIG_DIR: '~/relay/config',
|
|
61
|
+
HAPPIER_SELF_HOST_DATA_DIR: '~/relay/data',
|
|
62
|
+
HAPPIER_SELF_HOST_LOG_DIR: '~/relay/logs',
|
|
63
|
+
},
|
|
64
|
+
})).toEqual({
|
|
65
|
+
installRoot: '/scoped/home/relay/install',
|
|
66
|
+
binDir: '/scoped/home/relay/bin',
|
|
67
|
+
configDir: '/scoped/home/relay/config',
|
|
68
|
+
dataDir: '/scoped/home/relay/data',
|
|
69
|
+
logDir: '/scoped/home/relay/logs',
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
it('expands ~/ self-host binary overrides against the provided HOME', async () => {
|
|
73
|
+
const mod = await import('./relayRuntime');
|
|
74
|
+
expect(typeof mod.resolveConfiguredRelayRuntimeBinaryOverride).toBe('function');
|
|
75
|
+
expect(mod.resolveConfiguredRelayRuntimeBinaryOverride({
|
|
76
|
+
HOME: '/scoped/home',
|
|
77
|
+
USERPROFILE: '/scoped/home',
|
|
78
|
+
HAPPIER_SELF_HOST_SERVER_BINARY: '~/bin/happier-server',
|
|
79
|
+
})).toBe('/scoped/home/bin/happier-server');
|
|
80
|
+
});
|
|
81
|
+
});
|
|
43
82
|
describe('normalizeRelayRuntimeStatus', () => {
|
|
44
83
|
it('normalizes platform-specific service reports into a stable status model', () => {
|
|
45
84
|
expect(normalizeRelayRuntimeStatus({
|
package/node_modules/@happier-dev/cli-common/dist/firstPartyRuntime/relayRuntime.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relayRuntime.test.js","sourceRoot":"","sources":["../../src/firstPartyRuntime/relayRuntime.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relayRuntime.test.js","sourceRoot":"","sources":["../../src/firstPartyRuntime/relayRuntime.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export type { CommandInvocation } from './windows/resolveWindowsCommandInvocation.js';
|
|
2
2
|
export { commandExistsOnPath } from './commandExists.js';
|
|
3
|
-
export { resolveWindowsCommandInvocation, resolveWindowsCommandOnPath } from './windows/resolveWindowsCommandInvocation.js';
|
|
3
|
+
export { resolveWindowsCommandInvocation, resolveWindowsCommandOnPath, resolveWindowsCommandPath } from './windows/resolveWindowsCommandInvocation.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/process/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/process/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { commandExistsOnPath } from './commandExists.js';
|
|
2
|
-
export { resolveWindowsCommandInvocation, resolveWindowsCommandOnPath } from './windows/resolveWindowsCommandInvocation.js';
|
|
2
|
+
export { resolveWindowsCommandInvocation, resolveWindowsCommandOnPath, resolveWindowsCommandPath } from './windows/resolveWindowsCommandInvocation.js';
|
|
3
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/process/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/process/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC"}
|
|
@@ -3,6 +3,7 @@ export type CommandInvocation = Readonly<{
|
|
|
3
3
|
args: string[];
|
|
4
4
|
windowsVerbatimArguments?: boolean;
|
|
5
5
|
}>;
|
|
6
|
+
export declare function resolveWindowsCommandPath(commandPath: string, env?: NodeJS.ProcessEnv): string | null;
|
|
6
7
|
export declare function resolveWindowsCommandOnPath(command: string, env?: NodeJS.ProcessEnv): string | null;
|
|
7
8
|
export declare function resolveWindowsCommandInvocation(params: Readonly<{
|
|
8
9
|
command: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveWindowsCommandInvocation.d.ts","sourceRoot":"","sources":["../../../src/process/windows/resolveWindowsCommandInvocation.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,wBAAwB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveWindowsCommandInvocation.d.ts","sourceRoot":"","sources":["../../../src/process/windows/resolveWindowsCommandInvocation.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,wBAAwB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AA4DlH,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,GAAG,IAAI,CAUlH;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,GAAG,IAAI,CAuBhH;AAiDD,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC,GAAG,iBAAiB,CAoBrB"}
|
package/node_modules/@happier-dev/cli-common/dist/process/windows/resolveWindowsCommandInvocation.js
CHANGED
|
@@ -45,6 +45,27 @@ function isCommandOnly(command) {
|
|
|
45
45
|
function isWindowsShellShimPath(pathLike) {
|
|
46
46
|
return /\.(cmd|bat)$/i.test(String(pathLike ?? '').trim());
|
|
47
47
|
}
|
|
48
|
+
function buildWindowsCommandCandidates(commandLike, env) {
|
|
49
|
+
const cmd = asNonEmptyString(commandLike);
|
|
50
|
+
if (!cmd)
|
|
51
|
+
return [];
|
|
52
|
+
const exts = expandPathextCaseVariants(normalizePathext(readEnvPathext(env)));
|
|
53
|
+
const lowered = cmd.toLowerCase();
|
|
54
|
+
const hasKnownExt = exts.some((ext) => lowered.endsWith(ext.toLowerCase()));
|
|
55
|
+
return hasKnownExt ? [cmd] : [...exts.map((ext) => `${cmd}${ext}`), cmd];
|
|
56
|
+
}
|
|
57
|
+
export function resolveWindowsCommandPath(commandPath, env = process.env) {
|
|
58
|
+
for (const candidate of buildWindowsCommandCandidates(commandPath, env)) {
|
|
59
|
+
try {
|
|
60
|
+
if (existsSync(candidate))
|
|
61
|
+
return candidate;
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
// ignore
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return null;
|
|
68
|
+
}
|
|
48
69
|
export function resolveWindowsCommandOnPath(command, env = process.env) {
|
|
49
70
|
const cmd = asNonEmptyString(command);
|
|
50
71
|
if (!cmd)
|
|
@@ -52,10 +73,7 @@ export function resolveWindowsCommandOnPath(command, env = process.env) {
|
|
|
52
73
|
const pathEnv = asNonEmptyString(readEnvPath(env));
|
|
53
74
|
if (!pathEnv)
|
|
54
75
|
return null;
|
|
55
|
-
const
|
|
56
|
-
const lowered = cmd.toLowerCase();
|
|
57
|
-
const hasKnownExt = exts.some((ext) => lowered.endsWith(ext.toLowerCase()));
|
|
58
|
-
const candidates = hasKnownExt ? [cmd] : [cmd, ...exts.map((ext) => `${cmd}${ext}`)];
|
|
76
|
+
const candidates = buildWindowsCommandCandidates(cmd, env);
|
|
59
77
|
for (const dir of pathEnv.split(pathDelimiter)) {
|
|
60
78
|
const trimmedDir = dir.trim();
|
|
61
79
|
if (!trimmedDir)
|
|
@@ -119,7 +137,7 @@ export function resolveWindowsCommandInvocation(params) {
|
|
|
119
137
|
const shouldResolveOnPath = params.resolveCommandOnPath !== false;
|
|
120
138
|
const resolvedCommand = shouldResolveOnPath && isCommandOnly(command)
|
|
121
139
|
? (resolveWindowsCommandOnPath(command, env) ?? command)
|
|
122
|
-
: command;
|
|
140
|
+
: (resolveWindowsCommandPath(command, env) ?? command);
|
|
123
141
|
if (!isWindowsShellShimPath(resolvedCommand)) {
|
|
124
142
|
return { command: resolvedCommand, args };
|
|
125
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveWindowsCommandInvocation.js","sourceRoot":"","sources":["../../../src/process/windows/resolveWindowsCommandInvocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,IAAI,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,WAAW,CAAC;AAIzF,SAAS,gBAAgB,CAAC,KAAc;IACtC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,SAAS,WAAW,CAAC,GAAsB;IACzC,yEAAyE;IACzE,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,IAAK,GAAW,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,cAAc,CAAC,GAAsB;IAC5C,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,IAAK,GAAW,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,qBAAqB,CAAC;IAC/D,OAAO,GAAG;SACP,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAc;IAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM,SAAS,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YACpE,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;gBAAE,SAAS;YAClC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAClE,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB;IAC9C,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"resolveWindowsCommandInvocation.js","sourceRoot":"","sources":["../../../src/process/windows/resolveWindowsCommandInvocation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveWindowsCommandInvocation.test.d.ts","sourceRoot":"","sources":["../../../src/process/windows/resolveWindowsCommandInvocation.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
|
|
2
|
+
import { tmpdir } from 'node:os';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
5
|
+
const originalPlatformDescriptor = Object.getOwnPropertyDescriptor(process, 'platform');
|
|
6
|
+
describe('resolveWindowsCommandInvocation', () => {
|
|
7
|
+
const tempDirs = new Set();
|
|
8
|
+
afterEach(() => {
|
|
9
|
+
if (originalPlatformDescriptor) {
|
|
10
|
+
Object.defineProperty(process, 'platform', originalPlatformDescriptor);
|
|
11
|
+
}
|
|
12
|
+
for (const dir of tempDirs) {
|
|
13
|
+
rmSync(dir, { recursive: true, force: true });
|
|
14
|
+
}
|
|
15
|
+
tempDirs.clear();
|
|
16
|
+
});
|
|
17
|
+
it('prefers PATHEXT-resolved commands over extensionless files when both exist on PATH', async () => {
|
|
18
|
+
if (!originalPlatformDescriptor) {
|
|
19
|
+
throw new Error('Expected process.platform to be configurable for this test');
|
|
20
|
+
}
|
|
21
|
+
Object.defineProperty(process, 'platform', { ...originalPlatformDescriptor, value: 'win32' });
|
|
22
|
+
const root = mkdtempSync(join(tmpdir(), 'happier-cli-common-win32-path-'));
|
|
23
|
+
tempDirs.add(root);
|
|
24
|
+
const binDir = join(root, 'bin');
|
|
25
|
+
mkdirSync(binDir, { recursive: true });
|
|
26
|
+
const extensionlessPath = join(binDir, 'codex');
|
|
27
|
+
const cmdShimPath = join(binDir, 'codex.cmd');
|
|
28
|
+
writeFileSync(extensionlessPath, '', 'utf8');
|
|
29
|
+
writeFileSync(cmdShimPath, '@echo off\r\necho ok\r\n', 'utf8');
|
|
30
|
+
const { resolveWindowsCommandOnPath } = await import('./resolveWindowsCommandInvocation.js');
|
|
31
|
+
expect(resolveWindowsCommandOnPath('codex', {
|
|
32
|
+
PATH: binDir,
|
|
33
|
+
PATHEXT: '.CMD;.EXE',
|
|
34
|
+
})?.toLowerCase()).toBe(cmdShimPath.toLowerCase());
|
|
35
|
+
});
|
|
36
|
+
it('normalizes full command paths without an extension to the matching .cmd shim', async () => {
|
|
37
|
+
if (!originalPlatformDescriptor) {
|
|
38
|
+
throw new Error('Expected process.platform to be configurable for this test');
|
|
39
|
+
}
|
|
40
|
+
Object.defineProperty(process, 'platform', { ...originalPlatformDescriptor, value: 'win32' });
|
|
41
|
+
const root = mkdtempSync(join(tmpdir(), 'happier-cli-common-win32-invocation-'));
|
|
42
|
+
tempDirs.add(root);
|
|
43
|
+
const binDir = join(root, 'bin');
|
|
44
|
+
mkdirSync(binDir, { recursive: true });
|
|
45
|
+
const extensionlessPath = join(binDir, 'codex');
|
|
46
|
+
const cmdShimPath = join(binDir, 'codex.cmd');
|
|
47
|
+
writeFileSync(extensionlessPath, '', 'utf8');
|
|
48
|
+
writeFileSync(cmdShimPath, '@echo off\r\necho ok\r\n', 'utf8');
|
|
49
|
+
const { resolveWindowsCommandInvocation } = await import('./resolveWindowsCommandInvocation.js');
|
|
50
|
+
const invocation = resolveWindowsCommandInvocation({
|
|
51
|
+
command: extensionlessPath,
|
|
52
|
+
args: ['app-server'],
|
|
53
|
+
env: {
|
|
54
|
+
PATH: binDir,
|
|
55
|
+
PATHEXT: '.CMD;.EXE',
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
expect(invocation.command).toBe('cmd.exe');
|
|
59
|
+
expect(invocation.args.slice(0, 3)).toEqual(['/d', '/s', '/c']);
|
|
60
|
+
expect(invocation.args[3]?.toLowerCase()).toContain(cmdShimPath.toLowerCase());
|
|
61
|
+
expect(invocation.windowsVerbatimArguments).toBe(true);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=resolveWindowsCommandInvocation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveWindowsCommandInvocation.test.js","sourceRoot":"","sources":["../../../src/process/windows/resolveWindowsCommandInvocation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzD,MAAM,0BAA0B,GAAG,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AAExF,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,0BAA0B,EAAE,CAAC;YAC7B,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,0BAA0B,CAAC,CAAC;QAC3E,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,QAAQ,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;QAChG,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,GAAG,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9F,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,gCAAgC,CAAC,CAAC,CAAC;QAC3E,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9C,aAAa,CAAC,iBAAiB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7C,aAAa,CAAC,WAAW,EAAE,0BAA0B,EAAE,MAAM,CAAC,CAAC;QAE/D,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;QAE7F,MAAM,CAAC,2BAA2B,CAAC,OAAO,EAAE;YACxC,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,WAAW;SACvB,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC1F,IAAI,CAAC,0BAA0B,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,GAAG,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9F,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,sCAAsC,CAAC,CAAC,CAAC;QACjF,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACjC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC9C,aAAa,CAAC,iBAAiB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QAC7C,aAAa,CAAC,WAAW,EAAE,0BAA0B,EAAE,MAAM,CAAC,CAAC;QAE/D,MAAM,EAAE,+BAA+B,EAAE,GAAG,MAAM,MAAM,CAAC,sCAAsC,CAAC,CAAC;QAEjG,MAAM,UAAU,GAAG,+BAA+B,CAAC;YAC/C,OAAO,EAAE,iBAAiB;YAC1B,IAAI,EAAE,CAAC,YAAY,CAAC;YACpB,GAAG,EAAE;gBACD,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACvB;SACJ,CAAC,CAAC;QAEH,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/E,MAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export type { InstallProviderCliResult, ProviderCliInstallCommand, ProviderCliInstallMode, ProviderCliInstallPlan, ProviderCliInstallPlanResult, } from './install.js';
|
|
2
2
|
export { installProviderCli, planProviderCliInstall, resolvePlatformFromNodePlatform } from './install.js';
|
|
3
3
|
export type { ProviderCliCommandResolution, ProviderCliResolutionSource, } from './resolution.js';
|
|
4
|
-
export { isProviderCliPathRunnable, providerCliPathRequiresJavaScriptRuntime, readBackendCliSourcePreference, readProviderCliOverride, resolveProviderCliCommand, resolveProviderCliManagedCommandPath, } from './resolution.js';
|
|
4
|
+
export { expandHomeDirPath, isProviderCliPathRunnable, providerCliPathRequiresJavaScriptRuntime, readBackendCliSourcePreference, readProviderCliOverride, resolveHomeDirFromEnvironment, resolveProviderCliCommand, resolveProviderCliManagedCommandPath, } from './resolution.js';
|
|
5
5
|
export { ensureManagedJavaScriptRuntimeCommand, managedJavaScriptRuntimeBinPath, managedJavaScriptRuntimeInstallDir, readExplicitJavaScriptRuntimeCommand, resolveJavaScriptRuntimePathEntries, resolveJavaScriptRuntimeCommand, resolveExplicitJavaScriptRuntimeCommand, resolveExistingManagedJavaScriptRuntimeCommand, } from './managedJavaScriptRuntime.js';
|
|
6
6
|
export { downloadGitHubReleaseAsset } from './downloadGitHubReleaseAsset.js';
|
|
7
7
|
export { extractGitHubReleaseAsset } from './extractGitHubReleaseAsset.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,wBAAwB,EACxB,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC3G,YAAY,EACV,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,yBAAyB,EACzB,wCAAwC,EACxC,8BAA8B,EAC9B,uBAAuB,EACvB,yBAAyB,EACzB,oCAAoC,GACrC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,qCAAqC,EACrC,+BAA+B,EAC/B,kCAAkC,EAClC,oCAAoC,EACpC,mCAAmC,EACnC,+BAA+B,EAC/B,uCAAuC,EACvC,8CAA8C,GAC/C,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kCAAkC,EAAE,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,wBAAwB,EACxB,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC3G,YAAY,EACV,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,wCAAwC,EACxC,8BAA8B,EAC9B,uBAAuB,EACvB,6BAA6B,EAC7B,yBAAyB,EACzB,oCAAoC,GACrC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,qCAAqC,EACrC,+BAA+B,EAC/B,kCAAkC,EAClC,oCAAoC,EACpC,mCAAmC,EACnC,+BAA+B,EAC/B,uCAAuC,EACvC,8CAA8C,GAC/C,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EACrB,0BAA0B,GAC3B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kCAAkC,EAAE,MAAM,0BAA0B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { installProviderCli, planProviderCliInstall, resolvePlatformFromNodePlatform } from './install.js';
|
|
2
|
-
export { isProviderCliPathRunnable, providerCliPathRequiresJavaScriptRuntime, readBackendCliSourcePreference, readProviderCliOverride, resolveProviderCliCommand, resolveProviderCliManagedCommandPath, } from './resolution.js';
|
|
2
|
+
export { expandHomeDirPath, isProviderCliPathRunnable, providerCliPathRequiresJavaScriptRuntime, readBackendCliSourcePreference, readProviderCliOverride, resolveHomeDirFromEnvironment, resolveProviderCliCommand, resolveProviderCliManagedCommandPath, } from './resolution.js';
|
|
3
3
|
export { ensureManagedJavaScriptRuntimeCommand, managedJavaScriptRuntimeBinPath, managedJavaScriptRuntimeInstallDir, readExplicitJavaScriptRuntimeCommand, resolveJavaScriptRuntimePathEntries, resolveJavaScriptRuntimeCommand, resolveExplicitJavaScriptRuntimeCommand, resolveExistingManagedJavaScriptRuntimeCommand, } from './managedJavaScriptRuntime.js';
|
|
4
4
|
export { downloadGitHubReleaseAsset } from './downloadGitHubReleaseAsset.js';
|
|
5
5
|
export { extractGitHubReleaseAsset } from './extractGitHubReleaseAsset.js';
|