Skip to content

fix(core): resolve symlinks to directories in file listing #39308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
notsobad wants to merge 2 commits into from
+24 −19
Closed

fix(core): resolve symlinks to directories in file listing #39308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c848a9f
fix(core): resolve symlinks to directories in file listing
notsobad Jul 28, 2026
2dbb770
Merge branch 'dev' into symlink-dir-listing
notsobad Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions packages/core/src/filesystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export * as FileSystem from "./filesystem"

import { makeLocationNode } from "./effect/app-node"
import path from "path"
import { Context, Effect, Layer, Schema } from "effect"
import { Context, Effect, Layer, Option, Schema } from "effect"
import { FSUtil } from "./fs-util"
import { Location } from "./location"
import { PositiveInt, RelativePath } from "./schema"
Expand Down Expand Up @@ -88,24 +88,29 @@ const baseLayer = Layer.effect(
const target = yield* resolve(input.path)
const info = yield* fs.stat(target.real).pipe(Effect.orDie)
if (info.type !== "Directory") return yield* Effect.die(new Error("Path is not a directory"))
return yield* fs.readDirectoryEntries(target.real).pipe(
Effect.orDie,
Effect.map((items) =>
items
.flatMap((item) => {
if (item.type !== "file" && item.type !== "directory") return []
const absolute = path.join(target.absolute, item.name)
const relative = path.relative(target.directory, absolute)
return [
Entry.make({
path: RelativePath.make(relative + (item.type === "directory" ? path.sep : "")),
type: item.type,
}),
]
})
.sort((a, b) => (a.type === b.type ? a.path.localeCompare(b.path) : a.type === "directory" ? -1 : 1)),
),
)
const entries = yield* fs.readDirectoryEntries(target.real).pipe(Effect.orDie)
const items: Array<Entry> = []
for (const entry of entries) {
if (entry.type === "file") {
const absolute = path.join(target.absolute, entry.name)
items.push(Entry.make({ path: RelativePath.make(path.relative(target.directory, absolute)), type: "file" }))
} else if (entry.type === "directory") {
const absolute = path.join(target.absolute, entry.name)
items.push(Entry.make({ path: RelativePath.make(path.relative(target.directory, absolute) + path.sep), type: "directory" }))
} else if (entry.type === "symlink") {
const resolved = path.resolve(target.absolute, entry.name)
const sym = yield* fs.stat(resolved).pipe(Effect.option)
if (Option.isSome(sym)) {
if (sym.value.type === "Directory") {
items.push(Entry.make({ path: RelativePath.make(path.relative(target.directory, resolved) + path.sep), type: "directory" }))
} else if (sym.value.type === "File") {
items.push(Entry.make({ path: RelativePath.make(path.relative(target.directory, resolved)), type: "file" }))
}
}
}
}
items.sort((a, b) => (a.type === b.type ? a.path.localeCompare(b.path) : a.type === "directory" ? -1 : 1))
return items
}),
})
}),
Expand Down
Loading