Skip to content

Commit 83d641e

Browse files
committed
fix(shared): keep cached spawn resolutions apart per resolver
1 parent c33b0ad commit 83d641e

2 files changed

Lines changed: 26 additions & 5 deletions

File tree

‎packages/shared/src/shell.test.ts‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
resolveSpawnCommand,
2525
resolveWindowsEnvironment,
2626
SpawnExecutableResolution,
27+
type SpawnExecutableResolver,
2728
WindowsShellEnvironment,
2829
type WindowsShellEnvironmentReader,
2930
} from "./shell.ts";
@@ -550,13 +551,14 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => {
550551
it.effect("scans PATH once per command until the search environment changes", () =>
551552
Effect.gen(function* () {
552553
const scans: Array<string> = [];
553-
const resolve = (command: string, path: string) =>
554+
const scan: SpawnExecutableResolver = (name, _platform, env) => {
555+
scans.push(`${name}@${env.PATH}`);
556+
return name === "missing" ? undefined : `${env.PATH}\\${name}.exe`;
557+
};
558+
const resolve = (command: string, path: string, resolver = scan) =>
554559
resolveSpawnCommand(command, [], { env: { PATH: path, PATHEXT: ".EXE" } }).pipe(
555560
Effect.provideService(HostProcessPlatform, "win32"),
556-
Effect.provideService(SpawnExecutableResolution, (name, _platform, env) => {
557-
scans.push(`${name}@${env.PATH}`);
558-
return name === "missing" ? undefined : `${env.PATH}\\${name}.exe`;
559-
}),
561+
Effect.provideService(SpawnExecutableResolution, resolver),
560562
);
561563

562564
expect((yield* resolve("git", "C:\\one")).command).toBe("C:\\one\\git.exe");
@@ -581,6 +583,12 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => {
581583
yield* TestClock.adjust("31 seconds");
582584
yield* resolve("git", "C:\\one");
583585
expect(scans).toHaveLength(7);
586+
587+
// Another resolver sharing the cache gets its own answer, not the cached one.
588+
const elsewhere = yield* resolve("git", "C:\\one", () => "D:\\elsewhere\\git.exe");
589+
expect(elsewhere.command).toBe("D:\\elsewhere\\git.exe");
590+
expect((yield* resolve("git", "C:\\one")).command).toBe("C:\\one\\git.exe");
591+
expect(scans).toHaveLength(7);
584592
}).pipe(Effect.provideService(CommandResolutionCache, new Map())),
585593
);
586594

‎packages/shared/src/shell.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,18 @@ export const CommandResolutionCache = Context.Reference<Map<string, CommandResol
511511
},
512512
);
513513

514+
// An injected resolver may answer differently for the same search, so its
515+
// entries are kept apart from every other resolver's.
516+
let spawnResolverCacheIdCount = 0;
517+
const spawnResolverCacheIds = new WeakMap<SpawnExecutableResolver, number>();
518+
function spawnResolverCacheId(resolver: SpawnExecutableResolver): number {
519+
const known = spawnResolverCacheIds.get(resolver);
520+
if (known !== undefined) return known;
521+
const id = spawnResolverCacheIdCount++;
522+
spawnResolverCacheIds.set(resolver, id);
523+
return id;
524+
}
525+
514526
function cacheCommandResolution(
515527
cache: Map<string, CommandResolutionCacheEntry>,
516528
cacheKey: string,
@@ -651,6 +663,7 @@ export const resolveSpawnCommand = Effect.fn("shell.resolveSpawnCommand")(functi
651663
const cache = yield* CommandResolutionCache;
652664
const cacheKey = [
653665
"spawn",
666+
String(spawnResolverCacheId(resolveExecutable)),
654667
platform,
655668
resolvePathEnvironmentVariable(env),
656669
resolveWindowsPathExtensions(env).join(";"),

0 commit comments

Comments
 (0)