Compare commits

...
Sign in to create a new pull request.

2 commits

4 changed files with 215 additions and 217 deletions

View file

@ -1,6 +1,5 @@
import z from "zod" import z from "zod"
export namespace ConfigKeybinds {
export const Keybinds = z export const Keybinds = z
.object({ .object({
leader: z.string().optional().default("ctrl+x").describe("Leader key for keybind combinations"), leader: z.string().optional().default("ctrl+x").describe("Leader key for keybind combinations"),
@ -161,4 +160,4 @@ export namespace ConfigKeybinds {
.meta({ .meta({
ref: "KeybindsConfig", ref: "KeybindsConfig",
}) })
} export * as ConfigKeybinds from "./keybinds"

View file

@ -4,7 +4,6 @@ import { pathToFileURL } from "url"
import { isPathPluginSpec, parsePluginSpecifier, resolvePathPluginTarget } from "@/plugin/shared" import { isPathPluginSpec, parsePluginSpecifier, resolvePathPluginTarget } from "@/plugin/shared"
import path from "path" import path from "path"
export namespace ConfigPlugin {
const Options = z.record(z.string(), z.unknown()) const Options = z.record(z.string(), z.unknown())
export type Options = z.infer<typeof Options> export type Options = z.infer<typeof Options>
@ -20,7 +19,7 @@ export namespace ConfigPlugin {
} }
export async function load(dir: string) { export async function load(dir: string) {
const plugins: ConfigPlugin.Spec[] = [] const plugins: Spec[] = []
for (const item of await Glob.scan("{plugin,plugins}/*.{ts,js}", { for (const item of await Glob.scan("{plugin,plugins}/*.{ts,js}", {
cwd: dir, cwd: dir,
@ -33,7 +32,7 @@ export namespace ConfigPlugin {
return plugins return plugins
} }
export function pluginSpecifier(plugin: ConfigPlugin.Spec): string { export function pluginSpecifier(plugin: Spec): string {
return Array.isArray(plugin) ? plugin[0] : plugin return Array.isArray(plugin) ? plugin[0] : plugin
} }
@ -72,4 +71,4 @@ export namespace ConfigPlugin {
return list.toReversed() return list.toReversed()
} }
} export * as ConfigPlugin from "./plugin"

View file

@ -25,7 +25,7 @@ import { Global } from "../../src/global"
import { ProjectID } from "../../src/project/schema" import { ProjectID } from "../../src/project/schema"
import { Filesystem } from "../../src/util" import { Filesystem } from "../../src/util"
import * as Network from "../../src/util/network" import * as Network from "../../src/util/network"
import { ConfigPlugin } from "@/config/plugin" import { ConfigPlugin } from "../../src/config/plugin"
import { Npm } from "@opencode-ai/shared/npm" import { Npm } from "@opencode-ai/shared/npm"
const emptyAccount = Layer.mock(Account.Service)({ const emptyAccount = Layer.mock(Account.Service)({

View file

@ -10,7 +10,7 @@ import { Filesystem } from "../../src/util"
import { AppRuntime } from "../../src/effect/app-runtime" import { AppRuntime } from "../../src/effect/app-runtime"
import { Effect, Layer } from "effect" import { Effect, Layer } from "effect"
import { CurrentWorkingDirectory } from "@/cli/cmd/tui/config/cwd" import { CurrentWorkingDirectory } from "@/cli/cmd/tui/config/cwd"
import { ConfigPlugin } from "@/config/plugin" import { ConfigPlugin } from "../../src/config/plugin"
const wintest = process.platform === "win32" ? test : test.skip const wintest = process.platform === "win32" ? test : test.skip
const clear = (wait = false) => AppRuntime.runPromise(Config.Service.use((svc) => svc.invalidate(wait))) const clear = (wait = false) => AppRuntime.runPromise(Config.Service.use((svc) => svc.invalidate(wait)))