Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 49 additions & 0 deletions packages/sdk/js/script/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,55 @@ process.chdir(dir)

import { $ } from "bun"
import path from "path"
import fs from "fs/promises"

import { createClient } from "@hey-api/openapi-ts"

const patchClient = async (filepath: string, options?: { required?: boolean }) => {
const required = options?.required ?? true
const content = await fs.readFile(filepath, "utf8").catch(() => "")
if (!content) {
if (required) throw new Error(`patch target missing: ${filepath}`)
return
}

const oldLines = [
' case "formData":',
' case "json":',
' case "text":',
" data = await response[parseAs]()",
" break",
]
const newLines = [
' case "formData":',
' case "text":',
" data = await response[parseAs]()",
" break",
' case "json": {',
" const text = await response.text()",
" if (!text.trim()) {",
" data = {}",
" } else {",
" data = JSON.parse(text)",
" }",
" break",
" }",
]

const newline = content.includes("\r\n") ? "\r\n" : "\n"
const oldBlock = oldLines.join(newline) + newline
const newBlock = newLines.join(newline) + newline

if (!content.includes(oldBlock)) {
if (required) {
throw new Error(`patch pattern not found in ${filepath}`)
}
return
}

await fs.writeFile(filepath, content.replace(oldBlock, newBlock), "utf8")
}

await $`bun dev generate > ${dir}/openapi.json`.cwd(path.resolve(dir, "../../opencode"))

await createClient({
Expand Down Expand Up @@ -37,6 +83,9 @@ await createClient({
],
})

await patchClient(path.join(dir, "src/v2/gen/client/client.gen.ts"))
await patchClient(path.join(dir, "src/gen/client/client.gen.ts"), { required: false })

await $`bun prettier --write src/gen`
await $`bun prettier --write src/v2`
await $`rm -rf dist`
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/js/src/gen/client/client.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,18 @@ export const createClient = (config: Config = {}): Client => {
case "arrayBuffer":
case "blob":
case "formData":
case "json":
case "text":
data = await response[parseAs]()
break
case "json": {
const text = await response.text()
if (!text.trim()) {
data = {}
} else {
data = JSON.parse(text)
}
break
}
case "stream":
return opts.responseStyle === "data"
? response.body
Expand Down
10 changes: 9 additions & 1 deletion packages/sdk/js/src/v2/gen/client/client.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,18 @@ export const createClient = (config: Config = {}): Client => {
case "arrayBuffer":
case "blob":
case "formData":
case "json":
case "text":
data = await response[parseAs]()
break
case "json": {
const text = await response.text()
if (!text.trim()) {
data = {}
} else {
data = JSON.parse(text)
}
break
}
case "stream":
return opts.responseStyle === "data"
? response.body
Expand Down