diff --git a/denops/@ddc-sources/denippet.ts b/denops/@ddc-sources/denippet.ts index df7f838..88d4bde 100644 --- a/denops/@ddc-sources/denippet.ts +++ b/denops/@ddc-sources/denippet.ts @@ -3,12 +3,12 @@ import { DdcGatherItems, Item, Previewer, -} from "https://deno.land/x/ddc_vim@v4.3.1/types.ts"; +} from "https://deno.land/x/ddc_vim@v5.0.1/types.ts"; import { GatherArguments, GetPreviewerArguments, OnCompleteDoneArguments, -} from "https://deno.land/x/ddc_vim@v4.3.1/base/source.ts"; +} from "https://deno.land/x/ddc_vim@v5.0.1/base/source.ts"; import { Denops, op } from "../denippet/deps/denops.ts"; import { splitLines } from "../denippet/util.ts"; import { lsputil } from "../denippet/deps/lsp.ts"; diff --git a/denops/denippet/deps/denops.ts b/denops/denippet/deps/denops.ts index 8b2fd73..d971f27 100644 --- a/denops/denippet/deps/denops.ts +++ b/denops/denippet/deps/denops.ts @@ -1,11 +1,11 @@ -export type { Denops } from "https://deno.land/x/denops_std@v6.3.0/mod.ts"; -export * as fn from "https://deno.land/x/denops_std@v6.3.0/function/mod.ts"; -export * as api from "https://deno.land/x/denops_std@v6.3.0/function/nvim/mod.ts"; -export * as vim from "https://deno.land/x/denops_std@v6.3.0/function/vim/mod.ts"; -export * as op from "https://deno.land/x/denops_std@v6.3.0/option/mod.ts"; -export { b, g } from "https://deno.land/x/denops_std@v6.3.0/variable/variable.ts"; -export * as au from "https://deno.land/x/denops_std@v6.3.0/autocmd/mod.ts"; -export * as lambda from "https://deno.land/x/denops_std@v6.3.0/lambda/mod.ts"; -export { batch } from "https://deno.land/x/denops_std@v6.3.0/batch/mod.ts"; +export type { Denops } from "https://deno.land/x/denops_std@v6.5.0/mod.ts"; +export * as fn from "https://deno.land/x/denops_std@v6.5.0/function/mod.ts"; +export * as api from "https://deno.land/x/denops_std@v6.5.0/function/nvim/mod.ts"; +export * as vim from "https://deno.land/x/denops_std@v6.5.0/function/vim/mod.ts"; +export * as op from "https://deno.land/x/denops_std@v6.5.0/option/mod.ts"; +export { b, g } from "https://deno.land/x/denops_std@v6.5.0/variable/variable.ts"; +export * as au from "https://deno.land/x/denops_std@v6.5.0/autocmd/mod.ts"; +export * as lambda from "https://deno.land/x/denops_std@v6.5.0/lambda/mod.ts"; +export { batch } from "https://deno.land/x/denops_std@v6.5.0/batch/mod.ts"; -export { test } from "https://deno.land/x/denops_test@v1.6.2/mod.ts"; +export { test } from "jsr:@denops/test"; diff --git a/denops/denippet/deps/std.ts b/denops/denippet/deps/std.ts index dc70a52..02b1a0c 100644 --- a/denops/denippet/deps/std.ts +++ b/denops/denippet/deps/std.ts @@ -1,4 +1,4 @@ -export * as TOML from "https://deno.land/std@0.218.2/toml/mod.ts"; -export * as YAML from "https://deno.land/std@0.218.2/yaml/mod.ts"; -export * as path from "https://deno.land/std@0.218.2/path/mod.ts"; -export { assert, assertEquals } from "https://deno.land/std@0.218.2/assert/mod.ts"; +export * as TOML from "jsr:@std/toml"; +export * as YAML from "jsr:@std/yaml"; +export * as path from "jsr:@std/path"; +export { assert, assertEquals } from "jsr:@std/assert"; diff --git a/denops/denippet/deps/unknownutil.ts b/denops/denippet/deps/unknownutil.ts index f6c6a14..ea10593 100644 --- a/denops/denippet/deps/unknownutil.ts +++ b/denops/denippet/deps/unknownutil.ts @@ -1,2 +1,2 @@ -export * as u from "https://deno.land/x/unknownutil@v3.17.0/mod.ts"; -export { is } from "https://deno.land/x/unknownutil@v3.17.0/mod.ts"; +export * as u from "jsr:@core/unknownutil"; +export { is } from "jsr:@core/unknownutil"; diff --git a/denops/denippet/main.ts b/denops/denippet/main.ts index 234397a..dcbe5df 100644 --- a/denops/denippet/main.ts +++ b/denops/denippet/main.ts @@ -95,7 +95,7 @@ export function main(denops: Denops): void { const filepath = u.ensure(filepathU, is.String); const filetype = u.ensure( filetypeU, - is.OneOf([is.String, is.ArrayOf(is.String)]), + is.UnionOf([is.String, is.ArrayOf(is.String)]), ); try { await loader.load(filepath, filetype); @@ -135,7 +135,9 @@ export function main(denops: Denops): void { }, async anonymous(bodyU: unknown, prefixU: unknown): Promise { - const body = normalizeNewline(u.ensure(bodyU, is.OneOf([is.String, is.ArrayOf(is.String)]))); + const body = normalizeNewline( + u.ensure(bodyU, is.UnionOf([is.String, is.ArrayOf(is.String)])), + ); const prefix = u.ensure(prefixU, is.OptionalOf(is.String)); if (await session.expand(body, prefix)) { const syncDelay = Number(await g.get(denops, "denippet_sync_delay"));