Skip to content

fix(opencode): preserve valid empty JSON config #36468

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

Open
aditya-vithaldas wants to merge 1 commit into
base: dev
Choose a base branch
from
+15 −1
Open

fix(opencode): preserve valid empty JSON config #36468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/opencode/src/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ const layer = Layer.effect(
yield* Effect.promise(() => resolveLoadedPlugins(data, options.path))
if (!data.$schema) {
data.$schema = "https://opencode.ai/config.json"
const updated = text.replace(/^\s*\{/, '{\n "$schema": "https://opencode.ai/config.json",')
const comma = Object.keys(parsed).length ? "," : ""
const updated = text.replace(/^\s*\{/, `{\n "$schema": "https://opencode.ai/config.json"${comma}`)
yield* fs.writeFileString(options.path, updated).pipe(Effect.catch(() => Effect.void))
}
return data
Expand Down
13 changes: 13 additions & 0 deletions packages/opencode/test/config/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,19 @@ it.instance("preserves env variables when adding $schema to config", () =>
),
)

it.instance("adds $schema to an empty JSON config without a trailing comma", () =>
Effect.gen(function* () {
const test = yield* TestInstance
const file = path.join(test.directory, "opencode.json")
yield* FSUtil.use.writeWithDirs(file, "{}")

yield* Config.use.get()

const content = yield* FSUtil.use.readFileString(file)
expect(JSON.parse(content)).toEqual({ $schema: "https://opencode.ai/config.json" })
}),
)

it.instance("handles file inclusion substitution", () =>
Effect.gen(function* () {
const test = yield* TestInstance
Expand Down
Loading