lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

refactor(core): consolidate filesystem services (#30447)

Browse Source
This commit is contained in:
Dax
2026-06-02 16:09:26 -04:00
committed by GitHub
parent b93963e462
commit 604a5f781f
153 changed files with 2553 additions and 4312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/opencode/test/project/vcs.test.ts
View File

@@ -1,5 +1,5 @@
import { afterEach, describe, expect } from "bun:test"
import { AppFileSystem } from "@opencode-ai/core/filesystem"
import { FSUtil } from "@opencode-ai/core/fs-util"
import { parsePatch } from "diff"
import { Deferred, Effect, Layer } from "effect"
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
@@ -13,7 +13,7 @@ import {
tmpdirScoped,
} from "../fixture/fixture"
import { EventV2Bridge } from "../../src/event-v2-bridge"
import { FileWatcher } from "../../src/file/watcher"
import { Watcher } from "@opencode-ai/core/filesystem/watcher"
import { Git } from "../../src/git"
import { Vcs } from "@/project/vcs"
import { testEffect } from "../lib/effect"
@@ -27,7 +27,7 @@ const weird = process.platform === "win32" ? "space file.txt" : "tab\tfile.txt"
const layer = Layer.mergeAll(
Vcs.layer.pipe(Layer.provideMerge(Git.defaultLayer), Layer.provideMerge(EventV2Bridge.defaultLayer)),
CrossSpawnSpawner.defaultLayer,
AppFileSystem.defaultLayer,
FSUtil.defaultLayer,
)
const it = testEffect(layer)
const worktreeIt = testEffect(Layer.mergeAll(layer, testInstanceStoreLayer))
@@ -38,11 +38,11 @@ const git = Effect.fn("VcsTest.git")(function* (cwd: string, args: string[]) {
})
const write = Effect.fn("VcsTest.write")(function* (file: string, content: string) {
yield* AppFileSystem.Service.use((fs) => fs.writeWithDirs(file, content))
yield* FSUtil.Service.use((fs) => fs.writeWithDirs(file, content))
})
const remove = Effect.fn("VcsTest.remove")(function* (file: string) {
yield* AppFileSystem.Service.use((fs) => fs.remove(file))
yield* FSUtil.Service.use((fs) => fs.remove(file))
})
const symlink = (target: string, file: string) => Effect.promise(() => fs.symlink(target, file))
@@ -73,7 +73,7 @@ const publishHeadChangeUntil = Effect.fn("VcsTest.publishHeadChangeUntil")(funct
) {
const events = yield* EventV2Bridge.Service
for (let i = 0; i < 50; i++) {
yield* events.publish(FileWatcher.Event.Updated, { file: head, event: "change" })
yield* events.publish(Watcher.Event.Updated, { file: head, event: "change" })
if (yield* Deferred.isDone(pending)) return
yield* Effect.sleep("10 millis")
}