Skip to content

Commit 519de27

Browse files
committed
refactor(core): simplify worktree storage operations
1 parent f97d417 commit 519de27

1 file changed

Lines changed: 16 additions & 18 deletions

File tree

‎packages/core/src/worktree.ts‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ const layer = Layer.effect(
137137
if (update) yield* bus.publish(Event.Updated, { projectID })
138138
})
139139

140-
const inventory = (projectID: Project.ID) => ({
141-
list: Effect.fnUntraced(function* () {
140+
const ops = {
141+
list: Effect.fnUntraced(function* (projectID: Project.ID) {
142142
const rows = yield* db
143143
.select({ directory: WorktreeTable.directory, strategy: WorktreeTable.strategy })
144144
.from(WorktreeTable)
@@ -148,7 +148,7 @@ const layer = Layer.effect(
148148
.pipe(Effect.orDie)
149149
return rows.map((row) => ({ directory: row.directory, strategy: row.strategy ?? undefined }))
150150
}),
151-
find: Effect.fnUntraced(function* (directory: AbsolutePath) {
151+
find: Effect.fnUntraced(function* (projectID: Project.ID, directory: AbsolutePath) {
152152
const row = yield* db
153153
.select({ directory: WorktreeTable.directory, strategy: WorktreeTable.strategy })
154154
.from(WorktreeTable)
@@ -157,7 +157,7 @@ const layer = Layer.effect(
157157
.pipe(Effect.orDie)
158158
return row ? { directory: row.directory, strategy: row.strategy ?? undefined } : undefined
159159
}),
160-
create: (input: StoredInput, tx?: Transaction) =>
160+
create: (projectID: Project.ID, input: StoredInput, tx?: Transaction) =>
161161
(tx ?? db)
162162
.insert(WorktreeTable)
163163
.values({
@@ -179,7 +179,7 @@ const layer = Layer.effect(
179179
Effect.orDie,
180180
Effect.map((row) => row !== undefined),
181181
),
182-
remove: (directory: AbsolutePath, tx?: Transaction) =>
182+
remove: (projectID: Project.ID, directory: AbsolutePath, tx?: Transaction) =>
183183
(tx ?? db)
184184
.delete(WorktreeTable)
185185
.where(and(eq(WorktreeTable.project_id, projectID), eq(WorktreeTable.directory, directory)))
@@ -189,11 +189,11 @@ const layer = Layer.effect(
189189
Effect.orDie,
190190
Effect.map((row) => row !== undefined),
191191
),
192-
})
192+
}
193193

194194
const source = Effect.fnUntraced(function* (projectID: Project.ID, sourceDirectory: AbsolutePath) {
195195
const resolved = yield* canonical(fs, sourceDirectory)
196-
if ((yield* inventory(projectID).find(resolved)) === undefined)
196+
if ((yield* ops.find(projectID, resolved)) === undefined)
197197
return yield* new SourceDirectoryNotFoundError({ projectID, directory: resolved })
198198
return resolved
199199
})
@@ -233,7 +233,7 @@ const layer = Layer.effect(
233233
const result = { directory: yield* canonical(fs, created.directory) }
234234
yield* changed(
235235
input.projectID,
236-
yield* inventory(input.projectID).create({
236+
yield* ops.create(input.projectID, {
237237
directory: result.directory,
238238
strategy: selected.id,
239239
replace: true,
@@ -262,9 +262,8 @@ const layer = Layer.effect(
262262

263263
const remove = Effect.fn("Worktree.remove")(function* (input: RemoveInput, current?: WorktreeStrategies.Interface) {
264264
const row = yield* project(input.projectID)
265-
const ops = inventory(input.projectID)
266265
const worktreeDirectory = yield* canonical(fs, input.directory)
267-
const stored = yield* ops.find(worktreeDirectory)
266+
const stored = yield* ops.find(input.projectID, worktreeDirectory)
268267
if (!stored?.strategy) return yield* new InvalidDirectoryError({ directory: worktreeDirectory })
269268
const settings = yield* load(row.worktree, current)
270269
const strategy = yield* getStrategy(StrategyID.make(stored.strategy), settings.strategies)
@@ -274,7 +273,7 @@ const layer = Layer.effect(
274273
force: input.force,
275274
})
276275
.pipe(Effect.mapError((error) => operationError(strategy.id, "remove", error)))
277-
yield* changed(input.projectID, yield* ops.remove(worktreeDirectory))
276+
yield* changed(input.projectID, yield* ops.remove(input.projectID, worktreeDirectory))
278277
}, Effect.scoped)
279278

280279
const refresh = Effect.fn("Worktree.refresh")(function* (
@@ -283,8 +282,7 @@ const layer = Layer.effect(
283282
) {
284283
const row = yield* project(input.projectID)
285284
const settings = yield* load(row.worktree, current)
286-
const ops = inventory(input.projectID)
287-
const stored = yield* ops.list()
285+
const stored = yield* ops.list(input.projectID)
288286
const checked = yield* Effect.forEach(
289287
stored,
290288
(item) => fs.isDir(item.directory).pipe(Effect.map((exists) => ({ ...item, exists }))),
@@ -324,10 +322,10 @@ const layer = Layer.effect(
324322
const changes = yield* db
325323
.transaction((tx) =>
326324
Effect.all({
327-
updated: Effect.filter(Array.from(discovered.values()), (item) => ops.create(item, tx)).pipe(
328-
Effect.map((items) => items.map((item) => item.directory)),
329-
),
330-
removed: Effect.filter(removed, (directory) => ops.remove(directory, tx)),
325+
updated: Effect.filter(Array.from(discovered.values()), (item) =>
326+
ops.create(input.projectID, item, tx),
327+
).pipe(Effect.map((items) => items.map((item) => item.directory))),
328+
removed: Effect.filter(removed, (directory) => ops.remove(input.projectID, directory, tx)),
331329
}),
332330
)
333331
.pipe(Effect.orDie)
@@ -338,7 +336,7 @@ const layer = Layer.effect(
338336
return Service.of({
339337
list: Effect.fn("Worktree.list")(function* (input) {
340338
yield* project(input.projectID)
341-
return yield* inventory(input.projectID).list()
339+
return yield* ops.list(input.projectID)
342340
}),
343341
create,
344342
remove,

0 commit comments

Comments
 (0)