refactor(core): convert config tests to nodes (#34474)

This commit is contained in:
James Long 2026-06-29 14:51:13 -04:00 committed by GitHub
commit be14739cce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,13 +1,14 @@
import { test, expect, describe, afterEach, beforeEach, spyOn } from "bun:test" import { test, expect, describe, afterEach, beforeEach, spyOn } from "bun:test"
import { ConfigV1 } from "@opencode-ai/core/v1/config/config" import { ConfigV1 } from "@opencode-ai/core/v1/config/config"
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
import { httpClient } from "@opencode-ai/core/effect/app-node-platform"
import { Cause, Effect, Exit, Layer, Option } from "effect" import { Cause, Effect, Exit, Layer, Option } from "effect"
import { NamedError } from "@opencode-ai/core/util/error" import { NamedError } from "@opencode-ai/core/util/error"
import { FetchHttpClient, HttpClient, HttpClientResponse } from "effect/unstable/http" import { FetchHttpClient, HttpClient, HttpClientResponse } from "effect/unstable/http"
import { NodeFileSystem, NodePath } from "@effect/platform-node"
import { Config } from "@/config/config" import { Config } from "@/config/config"
import { ConfigManaged } from "@/config/managed" import { ConfigManaged } from "@/config/managed"
import { ConfigParse } from "../../src/config/parse" import { ConfigParse } from "../../src/config/parse"
import { EffectFlock } from "@opencode-ai/core/util/effect-flock" import { Npm } from "@opencode-ai/core/npm"
import { InstanceRef } from "../../src/effect/instance-ref" import { InstanceRef } from "../../src/effect/instance-ref"
import type { InstanceContext } from "../../src/project/instance-context" import type { InstanceContext } from "../../src/project/instance-context"
@ -41,13 +42,6 @@ import { AccountTest } from "../fake/account"
import { AuthTest } from "../fake/auth" import { AuthTest } from "../fake/auth"
import { NpmTest } from "../fake/npm" import { NpmTest } from "../fake/npm"
/** Infra layer that provides FileSystem, Path, ChildProcessSpawner for test fixtures */
const infra = CrossSpawnSpawner.defaultLayer.pipe(
Layer.provideMerge(Layer.mergeAll(NodeFileSystem.layer, NodePath.layer)),
)
const testFlock = EffectFlock.defaultLayer
const unexpectedHttp = HttpClient.make((request) => const unexpectedHttp = HttpClient.make((request) =>
Effect.die(`unexpected http request: ${request.method} ${request.url}`), Effect.die(`unexpected http request: ${request.method} ${request.url}`),
) )
@ -104,15 +98,14 @@ const configLayer = (
client?: HttpClient.HttpClient client?: HttpClient.HttpClient
} = {}, } = {},
) => ) =>
Config.layer.pipe( LayerNode.compile(
Layer.provide(testFlock), LayerNode.group([Config.node, FSUtil.node, Env.node, CrossSpawnSpawner.node]),
Layer.provide(Env.defaultLayer), [
Layer.provide(options.auth ?? AuthTest.empty), [Auth.node, options.auth ?? AuthTest.empty],
Layer.provide(options.account ?? AccountTest.empty), [Account.node, options.account ?? AccountTest.empty],
Layer.provideMerge(infra), [Npm.node, NpmTest.noop],
Layer.provide(NpmTest.noop), [httpClient, Layer.succeed(HttpClient.HttpClient, options.client ?? unexpectedHttp)],
Layer.provide(Layer.succeed(HttpClient.HttpClient, options.client ?? unexpectedHttp)), ],
Layer.provideMerge(FSUtil.defaultLayer),
) )
const layer = configLayer() const layer = configLayer()
@ -171,7 +164,7 @@ const withInstanceDir = <A, E, R>(dir: string, effect: Effect.Effect<A, E, R>) =
Effect.provideService(TestInstance, { directory: dir }), Effect.provideService(TestInstance, { directory: dir }),
provideInstanceEffect(dir), provideInstanceEffect(dir),
Effect.provide(testInstanceStoreLayer), Effect.provide(testInstanceStoreLayer),
Effect.provide(CrossSpawnSpawner.defaultLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node)),
) )
const withGlobalConfigDir = <A, E, R>(dir: string, effect: Effect.Effect<A, E, R>) => const withGlobalConfigDir = <A, E, R>(dir: string, effect: Effect.Effect<A, E, R>) =>
@ -325,7 +318,7 @@ it.effect("creates global jsonc config with schema when no global configs exist"
const content = yield* FSUtil.use.readFileString(path.join(dir, "opencode.jsonc")) const content = yield* FSUtil.use.readFileString(path.join(dir, "opencode.jsonc"))
expect(content).toContain('"$schema": "https://opencode.ai/config.json"') expect(content).toContain('"$schema": "https://opencode.ai/config.json"')
}).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(CrossSpawnSpawner.defaultLayer)), }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
), ),
) )
@ -340,7 +333,7 @@ it.effect("does not create global config when OPENCODE_CONFIG_DIR is set", () =>
yield* Config.use.get().pipe(provideInstanceEffect(dir)) yield* Config.use.get().pipe(provideInstanceEffect(dir))
expect(yield* FSUtil.use.existsSafe(path.join(dir, "opencode.jsonc"))).toBe(false) expect(yield* FSUtil.use.existsSafe(path.join(dir, "opencode.jsonc"))).toBe(false)
}).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(CrossSpawnSpawner.defaultLayer)), }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
), ),
) )
}), }),
@ -930,7 +923,7 @@ it.effect("does not try to install dependencies in read-only OPENCODE_CONFIG_DIR
yield* Effect.addFinalizer(() => FSUtil.use.chmod(readonly, 0o755).pipe(Effect.ignore)) yield* Effect.addFinalizer(() => FSUtil.use.chmod(readonly, 0o755).pipe(Effect.ignore))
yield* withProcessEnv("OPENCODE_CONFIG_DIR", readonly, Config.use.get().pipe(provideInstanceEffect(dir))) yield* withProcessEnv("OPENCODE_CONFIG_DIR", readonly, Config.use.get().pipe(provideInstanceEffect(dir)))
}).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(CrossSpawnSpawner.defaultLayer)), }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
) )
it.effect("installs dependencies in writable OPENCODE_CONFIG_DIR", () => it.effect("installs dependencies in writable OPENCODE_CONFIG_DIR", () =>
@ -948,7 +941,7 @@ it.effect("installs dependencies in writable OPENCODE_CONFIG_DIR", () =>
) )
expect(yield* FSUtil.use.readFileString(path.join(configDir, ".gitignore"))).toContain("package-lock.json") expect(yield* FSUtil.use.readFileString(path.join(configDir, ".gitignore"))).toContain("package-lock.json")
}).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(CrossSpawnSpawner.defaultLayer)), }).pipe(Effect.provide(testInstanceStoreLayer), Effect.provide(LayerNode.compile(CrossSpawnSpawner.node))),
) )
// Note: deduplication and serialization of npm installs is now handled by the // Note: deduplication and serialization of npm installs is now handled by the
@ -1533,16 +1526,12 @@ test("remote well-known config can use FetchHttpClient layer", async () => {
Effect.scoped, Effect.scoped,
Effect.provide( Effect.provide(
Layer.mergeAll( Layer.mergeAll(
Config.layer.pipe( LayerNode.compile(LayerNode.group([Config.node, FSUtil.node, Env.node, CrossSpawnSpawner.node]), [
Layer.provide(testFlock), [Auth.node, wellKnownAuth(server.url.origin)],
Layer.provide(FSUtil.defaultLayer), [Account.node, AccountTest.empty],
Layer.provide(Env.defaultLayer), [Npm.node, NpmTest.noop],
Layer.provide(wellKnownAuth(server.url.origin)), [httpClient, FetchHttpClient.layer],
Layer.provide(AccountTest.empty), ]),
Layer.provideMerge(infra),
Layer.provide(NpmTest.noop),
Layer.provide(FetchHttpClient.layer),
),
testInstanceStoreLayer, testInstanceStoreLayer,
), ),
), ),