Skip to content

Commit 8e03b85

Browse files
opencode-agent[bot]vaur94
authored andcommitted
chore: generate
(cherry picked from commit 353532b)
1 parent 82be30a commit 8e03b85

3 files changed

Lines changed: 25 additions & 22 deletions

File tree

packages/opencode/src/installation/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ export const layer: Layer.Layer<Service, never, HttpClient.HttpClient | ChildPro
136136
const args = method === "bun" ? ["pm", "view", spec, "version", "--json"] : ["view", spec, "version", "--json"]
137137
const result = yield* run([method, ...args])
138138
if (result.code !== 0 || !result.stdout.trim()) {
139-
return yield* new UpgradeFailedError({ stderr: result.stderr || result.stdout || `Failed to resolve ${spec}` })
139+
return yield* new UpgradeFailedError({
140+
stderr: result.stderr || result.stdout || `Failed to resolve ${spec}`,
141+
})
140142
}
141143
return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.String))(result.stdout)
142144
})

packages/opencode/src/npm/index.ts

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -110,25 +110,22 @@ export const layer = Layer.effect(
110110
const flock = yield* EffectFlock.Service
111111
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner
112112
const directory = (pkg: string) => path.join(global.cache, "packages", sanitize(pkg))
113-
const runView = Effect.fnUntraced(
114-
function* (cmd: string[]) {
115-
const handle = yield* spawner.spawn(
116-
ChildProcess.make(cmd[0], cmd.slice(1), {
117-
extendEnv: true,
118-
}),
119-
)
120-
const [stdout, stderr] = yield* Effect.all(
121-
[Stream.mkString(Stream.decodeText(handle.stdout)), Stream.mkString(Stream.decodeText(handle.stderr))],
122-
{ concurrency: 2 },
123-
)
124-
const code = yield* handle.exitCode
125-
if (code !== 0 || !stdout.trim()) {
126-
return yield* Effect.fail(stderr || stdout || `Failed to run ${cmd.join(" ")}`)
127-
}
128-
return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.String))(stdout)
129-
},
130-
Effect.scoped,
131-
)
113+
const runView = Effect.fnUntraced(function* (cmd: string[]) {
114+
const handle = yield* spawner.spawn(
115+
ChildProcess.make(cmd[0], cmd.slice(1), {
116+
extendEnv: true,
117+
}),
118+
)
119+
const [stdout, stderr] = yield* Effect.all(
120+
[Stream.mkString(Stream.decodeText(handle.stdout)), Stream.mkString(Stream.decodeText(handle.stderr))],
121+
{ concurrency: 2 },
122+
)
123+
const code = yield* handle.exitCode
124+
if (code !== 0 || !stdout.trim()) {
125+
return yield* Effect.fail(stderr || stdout || `Failed to run ${cmd.join(" ")}`)
126+
}
127+
return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Schema.String))(stdout)
128+
}, Effect.scoped)
132129
const viewLatestVersion = Effect.fnUntraced(function* (pkg: string) {
133130
return yield* runView(["npm", "view", pkg, "dist-tags.latest", "--json"]).pipe(
134131
Effect.catch(() =>

packages/opencode/test/npm.test.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ describe("Npm.outdated", () => {
103103
return ""
104104
})
105105

106-
const result = await Effect.runPromise(Npm.Service.use((svc) => svc.outdated("example", "1.0.0")).pipe(Effect.provide(layer)))
106+
const result = await Effect.runPromise(
107+
Npm.Service.use((svc) => svc.outdated("example", "1.0.0")).pipe(Effect.provide(layer)),
108+
)
107109

108110
expect(result).toBe(true)
109111
expect(calls).toContainEqual(["npm", "view", "example", "dist-tags.latest", "--json"])
@@ -130,7 +132,9 @@ describe("Npm.outdated", () => {
130132
return ""
131133
})
132134

133-
const result = await Effect.runPromise(Npm.Service.use((svc) => svc.outdated("example", "1.0.0")).pipe(Effect.provide(layer)))
135+
const result = await Effect.runPromise(
136+
Npm.Service.use((svc) => svc.outdated("example", "1.0.0")).pipe(Effect.provide(layer)),
137+
)
134138

135139
expect(result).toBe(true)
136140
expect(calls).toContainEqual(["npm", "view", "example", "dist-tags.latest", "--json"])

0 commit comments

Comments
 (0)