ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test(core): simplify location layer wiring

Browse source
This commit is contained in:
James Long 2026-06-20 22:00:43 -04:00
commit ed3b2a0d79
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/core/src/credential.ts
View file

@ -7,6 +7,7 @@ import { IntegrationSchema } from "./integration/schema"
import { NonNegativeInt, withStatics } from "./schema" import { NonNegativeInt, withStatics } from "./schema"
import { Identifier } from "./util/identifier" import { Identifier } from "./util/identifier"
import { CredentialTable } from "./credential/sql" import { CredentialTable } from "./credential/sql"
import { LayerNode } from "./effect/layer-node"
export const ID = Schema.String.pipe( export const ID = Schema.String.pipe(
Schema.brand("Credential.ID"), Schema.brand("Credential.ID"),
@ -150,3 +151,4 @@ export const layer = Layer.effect(
) )
export const defaultLayer = layer.pipe(Layer.provide(Database.defaultLayer)) export const defaultLayer = layer.pipe(Layer.provide(Database.defaultLayer))
export const node = LayerNode.make(layer, [Database.node])

3
packages/core/src/tool/application-tools.ts
View file

@ -4,6 +4,7 @@ import { Context, Effect, Layer, Scope } from "effect"
import { enableMapSet } from "immer" import { enableMapSet } from "immer"
import { State } from "../state" import { State } from "../state"
import { Tool } from "./tool" import { Tool } from "./tool"
import { LayerNode } from "../effect/layer-node"
type Data = { type Data = {
readonly entries: Map<string, Entry> readonly entries: Map<string, Entry>
@ -56,3 +57,5 @@ export const layer = Layer.effect(
}) })
}), }),
) )
export const node = LayerNode.make(layer, [])

33
packages/core/test/location-layer.test.ts
View file

@ -4,6 +4,7 @@ import { describe, expect } from "bun:test"
import { Effect, Equal, Hash, Layer, Schema } from "effect" import { Effect, Equal, Hash, Layer, Schema } from "effect"
import { Tool } from "@opencode-ai/core/public" import { Tool } from "@opencode-ai/core/public"
import { Catalog } from "@opencode-ai/core/catalog" import { Catalog } from "@opencode-ai/core/catalog"
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
import { LocationServiceMap } from "@opencode-ai/core/location-layer" import { LocationServiceMap } from "@opencode-ai/core/location-layer"
import { Location } from "@opencode-ai/core/location" import { Location } from "@opencode-ai/core/location"
import { PluginBoot } from "@opencode-ai/core/plugin/boot" import { PluginBoot } from "@opencode-ai/core/plugin/boot"
@ -24,26 +25,20 @@ import { Reference } from "../src/reference"
import { ToolRegistry } from "../src/tool/registry" import { ToolRegistry } from "../src/tool/registry"
import { ApplicationTools } from "../src/tool/application-tools" import { ApplicationTools } from "../src/tool/application-tools"
const applicationTools = ApplicationTools.layer const locationServices = LayerNode.make(LocationServiceMap.layer, [
ApplicationTools.node,
Project.node,
EventV2.node,
Credential.node,
Npm.node,
ModelsDev.node,
FSUtil.node,
Global.node,
])
const it = testEffect( const it = testEffect(
Layer.merge( LayerNode.buildLayer(LayerNode.group([ApplicationTools.node, Database.node, EventV2.node, locationServices]), {
Layer.mergeAll(applicationTools, Database.defaultLayer, EventV2.defaultLayer), replacements: [LayerNode.replace(Database.node, Database.layerFromPath(":memory:").pipe(Layer.fresh))],
LocationServiceMap.layer.pipe( }),
Layer.provide(applicationTools),
Layer.provide(
Layer.mergeAll(
Project.defaultLayer,
EventV2.defaultLayer,
Credential.defaultLayer,
Credential.layer.pipe(Layer.provide(Database.layerFromPath(":memory:").pipe(Layer.fresh))),
Npm.defaultLayer,
ModelsDev.defaultLayer,
FSUtil.defaultLayer,
Global.defaultLayer,
),
),
),
),
) )
describe("LocationServiceMap", () => { describe("LocationServiceMap", () => {