diff --git a/denops/skkeleton/deps/dictionary.ts b/denops/skkeleton/deps/dictionary.ts index 66007c9..3dcbcbc 100644 --- a/denops/skkeleton/deps/dictionary.ts +++ b/denops/skkeleton/deps/dictionary.ts @@ -1,4 +1,2 @@ -export * as yaml from "jsr:@std/yaml@~1.0.5"; -export * as msgpack from "npm:@msgpack/msgpack@3.0.0-beta2"; export { default as jsonschema } from "npm:jsonschema@1.4.1"; export { default as jisyoschema } from "https://cdn.jsdelivr.net/gh/skk-dict/jisyo/schema/jisyo.schema.v0.0.0.json" with { type: "json" }; diff --git a/denops/skkeleton/sources/deno_kv.ts b/denops/skkeleton/sources/deno_kv.ts index ca4f92f..9c2e466 100644 --- a/denops/skkeleton/sources/deno_kv.ts +++ b/denops/skkeleton/sources/deno_kv.ts @@ -10,7 +10,10 @@ import { Source as BaseSource, wrapDictionary, } from "../dictionary.ts"; -import { jisyoschema, jsonschema, msgpack, yaml } from "../deps/dictionary.ts"; +import { jisyoschema, jsonschema } from "../deps/dictionary.ts"; + +import { decode as msgpackDecode } from "jsr:@std/msgpack@~1.0.2/decode"; +import { parse as yamlParse } from "jsr:@std/yaml@~1.0.5/parse"; interface Jisyo { okuri_ari: Record; @@ -217,7 +220,7 @@ export class Dictionary implements BaseDictionary { private async loadYaml() { const data = await Deno.readTextFile(this.#path); - const jisyo = yaml.parse(data) as Jisyo; + const jisyo = yamlParse(data) as Jisyo; const validator = new jsonschema.Validator(); const result = validator.validate(jisyo, jisyoschema); if (!result.valid) { @@ -235,7 +238,7 @@ export class Dictionary implements BaseDictionary { private async loadMsgpack() { const data = await Deno.readFile(this.#path); - const jisyo = msgpack.decode(data) as Jisyo; + const jisyo = msgpackDecode(data) as unknown as Jisyo; const validator = new jsonschema.Validator(); const result = validator.validate(jisyo, jisyoschema); if (!result.valid) { diff --git a/denops/skkeleton/sources/skk_dictionary.ts b/denops/skkeleton/sources/skk_dictionary.ts index 557dcae..c9ac181 100644 --- a/denops/skkeleton/sources/skk_dictionary.ts +++ b/denops/skkeleton/sources/skk_dictionary.ts @@ -10,7 +10,10 @@ import { Source as BaseSource, wrapDictionary, } from "../dictionary.ts"; -import { jisyoschema, jsonschema, msgpack, yaml } from "../deps/dictionary.ts"; +import { jisyoschema, jsonschema } from "../deps/dictionary.ts"; + +import { decode as msgpackDecode } from "jsr:@std/msgpack@~1.0.2/decode"; +import { parse as yamlParse } from "jsr:@std/yaml@~1.0.5/parse"; interface Jisyo { okuri_ari: Record; @@ -142,7 +145,7 @@ export class Dictionary implements BaseDictionary { } private loadYaml(data: string) { - const jisyo = yaml.parse(data) as Jisyo; + const jisyo = yamlParse(data) as Jisyo; const validator = new jsonschema.Validator(); const result = validator.validate(jisyo, jisyoschema); if (!result.valid) { @@ -155,7 +158,7 @@ export class Dictionary implements BaseDictionary { } private loadMsgpack(data: Uint8Array) { - const jisyo = msgpack.decode(data) as Jisyo; + const jisyo = msgpackDecode(data) as unknown as Jisyo; const validator = new jsonschema.Validator(); const result = validator.validate(jisyo, jisyoschema); if (!result.valid) {