diff --git a/denops/@ddu-sources/ddc.ts b/denops/@ddu-sources/ddc.ts index 7b435f5..95ea4b7 100644 --- a/denops/@ddu-sources/ddc.ts +++ b/denops/@ddu-sources/ddc.ts @@ -1,7 +1,8 @@ import type { Context, Denops, Item } from "jsr:@shougo/ddu-vim@5.0.0/types"; import { BaseSource } from "jsr:@shougo/ddu-vim@5.0.0/source"; import type { DdcItem } from "../ddc/types.ts"; -import { vars } from "../ddc/deps.ts"; + +import * as vars from "jsr:@denops/std@~7.1.0/variable"; type Params = Record; diff --git a/denops/ddc/app.ts b/denops/ddc/app.ts index 8996d1a..eb7e1ba 100644 --- a/denops/ddc/app.ts +++ b/denops/ddc/app.ts @@ -10,20 +10,19 @@ import type { Previewer, UserOptions, } from "./types.ts"; -import { - type Denops, - ensure, - type Entrypoint, - is, - Lock, - toFileUrl, - vars, -} from "./deps.ts"; import { Loader } from "./loader.ts"; import { isDenoCacheIssueError } from "./utils.ts"; import { createCallbackContext } from "./callback.ts"; import { getPreviewer, onCompleteDone, onEvent } from "./ext.ts"; +import type { Denops, Entrypoint } from "jsr:@denops/std@~7.1.0"; +import * as vars from "jsr:@denops/std@~7.1.0/variable"; + +import { ensure } from "jsr:@core/unknownutil@~4.3.0/ensure"; +import { is } from "jsr:@core/unknownutil@~4.3.0/is"; +import { Lock } from "jsr:@core/asyncutil@~1.1.1/lock"; +import { toFileUrl } from "jsr:@std/path@~1.0.2/to-file-url"; + export const main: Entrypoint = (denops: Denops) => { const loader = new Loader(); const ddc = new Ddc(loader); diff --git a/denops/ddc/base/config.ts b/denops/ddc/base/config.ts index 913d766..455b8e0 100644 --- a/denops/ddc/base/config.ts +++ b/denops/ddc/base/config.ts @@ -1,6 +1,7 @@ import type { ContextBuilder } from "../context.ts"; import type { DdcExtType } from "../types.ts"; -import type { Denops } from "../deps.ts"; + +import type { Denops } from "jsr:@denops/std@~7.1.0"; export type ConfigArguments = { denops: Denops; diff --git a/denops/ddc/base/filter.ts b/denops/ddc/base/filter.ts index 55d972d..4c07aba 100644 --- a/denops/ddc/base/filter.ts +++ b/denops/ddc/base/filter.ts @@ -7,7 +7,8 @@ import type { OnCallback, SourceOptions, } from "../types.ts"; -import type { Denops } from "../deps.ts"; + +import type { Denops } from "jsr:@denops/std@~7.1.0"; export type BaseFilterParams = Record; diff --git a/denops/ddc/base/source.ts b/denops/ddc/base/source.ts index 78efc12..aa19f2f 100644 --- a/denops/ddc/base/source.ts +++ b/denops/ddc/base/source.ts @@ -9,10 +9,11 @@ import type { Previewer, SourceOptions, } from "../types.ts"; -import type { Denops } from "../deps.ts"; import { convertKeywordPattern } from "../utils.ts"; import type { Loader } from "../loader.ts"; +import type { Denops } from "jsr:@denops/std@~7.1.0"; + export type BaseSourceParams = Record; export type OnInitArguments = { diff --git a/denops/ddc/base/ui.ts b/denops/ddc/base/ui.ts index 3a416cc..eb88aa3 100644 --- a/denops/ddc/base/ui.ts +++ b/denops/ddc/base/ui.ts @@ -1,5 +1,6 @@ import type { Context, DdcItem, DdcOptions, UiOptions } from "../types.ts"; -import type { Denops } from "../deps.ts"; + +import type { Denops } from "jsr:@denops/std@~7.1.0"; export type BaseUiParams = Record; diff --git a/denops/ddc/callback.ts b/denops/ddc/callback.ts index be50759..5ace943 100644 --- a/denops/ddc/callback.ts +++ b/denops/ddc/callback.ts @@ -1,6 +1,8 @@ -import { assertEquals, spy } from "./deps.ts"; import type { CallbackContext } from "./types.ts"; +import { assertEquals } from "jsr:@std/assert@~1.0.2/equals"; +import { spy } from "jsr:@std/testing@~1.0.0/mock"; + class DdcCallbackCancelError extends Error { constructor(message?: string) { super(message); diff --git a/denops/ddc/context.ts b/denops/ddc/context.ts index fe0a695..252b8ef 100644 --- a/denops/ddc/context.ts +++ b/denops/ddc/context.ts @@ -1,14 +1,3 @@ -import { - assertEquals, - collect, - type Denops, - ensure, - fn, - is, - op, - vars, - vimOp, -} from "./deps.ts"; import type { BaseFilterParams, BaseSourceParams, @@ -24,6 +13,17 @@ import type { import { defaultSourceOptions } from "./base/source.ts"; import { printError } from "./utils.ts"; +import type { Denops } from "jsr:@denops/std@~7.1.0"; +import * as op from "jsr:@denops/std@~7.1.0/option"; +import * as vimOp from "jsr:@denops/std@~7.1.0/option/vim"; +import * as fn from "jsr:@denops/std@~7.1.0/function"; +import * as vars from "jsr:@denops/std@~7.1.0/variable"; +import { collect } from "jsr:@denops/std@~7.1.0/batch"; +import { ensure } from "jsr:@core/unknownutil@~4.3.0/ensure"; +import { is } from "jsr:@core/unknownutil@~4.3.0/is"; + +import { assertEquals } from "jsr:@std/assert@~1.0.2/equals"; + // where // T: Object // partialMerge: PartialMerge diff --git a/denops/ddc/ddc.ts b/denops/ddc/ddc.ts index dbf8d85..dab5c4b 100644 --- a/denops/ddc/ddc.ts +++ b/denops/ddc/ddc.ts @@ -1,13 +1,3 @@ -import { - assertEquals, - autocmd, - batch, - type Denops, - equal, - fn, - op, - vars, -} from "./deps.ts"; import type { BaseUi, BaseUiParams, @@ -36,6 +26,16 @@ import { getUi, } from "./ext.ts"; +import type { Denops } from "jsr:@denops/std@~7.1.0"; +import * as autocmd from "jsr:@denops/std@~7.1.0/autocmd"; +import * as op from "jsr:@denops/std@~7.1.0/option"; +import * as fn from "jsr:@denops/std@~7.1.0/function"; +import * as vars from "jsr:@denops/std@~7.1.0/variable"; +import { batch } from "jsr:@denops/std@~7.1.0/batch"; + +import { assertEquals } from "jsr:@std/assert@~1.0.2/equals"; +import { equal } from "jsr:@std/assert@~1.0.2/equal"; + type DdcResult = { items: Item[]; completePos: number; diff --git a/denops/ddc/deps.ts b/denops/ddc/deps.ts index 2e96ae3..e69de29 100644 --- a/denops/ddc/deps.ts +++ b/denops/ddc/deps.ts @@ -1,17 +0,0 @@ -export type { Denops, Entrypoint } from "jsr:@denops/std@~7.1.0"; -export { echo, execute } from "jsr:@denops/std@~7.1.0/helper"; -export { batch, collect } from "jsr:@denops/std@~7.1.0/batch"; -export * as op from "jsr:@denops/std@~7.1.0/option"; -export * as vimOp from "jsr:@denops/std@~7.1.0/option/vim"; -export * as fn from "jsr:@denops/std@~7.1.0/function"; -export * as vars from "jsr:@denops/std@~7.1.0/variable"; -export * as autocmd from "jsr:@denops/std@~7.1.0/autocmd"; - -export * from "jsr:@std/encoding@~1.0.1/base64"; -export { assertEquals, equal } from "jsr:@std/assert@~1.0.1"; -export { basename, parse, toFileUrl } from "jsr:@std/path@~1.0.2"; -export { deadline } from "jsr:@std/async@~1.0.1"; -export { spy } from "jsr:@std/testing@~1.0.0/mock"; - -export { ensure, is } from "jsr:@core/unknownutil@~4.3.0"; -export { Lock } from "jsr:@lambdalisue/async@~2.1.1"; diff --git a/denops/ddc/ext.ts b/denops/ddc/ext.ts index cb1843f..19bce66 100644 --- a/denops/ddc/ext.ts +++ b/denops/ddc/ext.ts @@ -1,4 +1,3 @@ -import { deadline, type Denops } from "./deps.ts"; import type { BaseFilter, BaseFilterParams, @@ -40,6 +39,10 @@ import { defaultSourceOptions } from "./base/source.ts"; import { defaultFilterOptions } from "./base/filter.ts"; import { printError } from "./utils.ts"; +import type { Denops } from "jsr:@denops/std@~7.1.0"; + +import { deadline } from "jsr:@std/async@~1.0.1/deadline"; + export async function getUi( denops: Denops, loader: Loader, diff --git a/denops/ddc/loader.ts b/denops/ddc/loader.ts index bda76ca..d12c071 100644 --- a/denops/ddc/loader.ts +++ b/denops/ddc/loader.ts @@ -10,19 +10,19 @@ import type { SourceName, UiName, } from "./types.ts"; -import { - basename, - type Denops, - fn, - is, - Lock, - op, - parse, - toFileUrl, -} from "./deps.ts"; import { isDenoCacheIssueError } from "./utils.ts"; import { mods } from "./_mods.js"; +import type { Denops } from "jsr:@denops/std@~7.1.0"; +import * as op from "jsr:@denops/std@~7.1.0/option"; +import * as fn from "jsr:@denops/std@~7.1.0/function"; +import { basename } from "jsr:@std/path@~1.0.2/basename"; +import { parse } from "jsr:@std/path@~1.0.2/parse"; +import { is } from "jsr:@core/unknownutil@~4.3.0/is"; + +import { Lock } from "jsr:@core/asyncutil@~1.1.1/lock"; +import { toFileUrl } from "jsr:@std/path@~1.0.2/to-file-url"; + export class Loader { #uis: Record> = {}; #sources: Record> = {}; diff --git a/denops/ddc/types.ts b/denops/ddc/types.ts index a75aa66..5e57d05 100644 --- a/denops/ddc/types.ts +++ b/denops/ddc/types.ts @@ -1,4 +1,4 @@ -import type { autocmd } from "./deps.ts"; +import type { AutocmdEvent } from "jsr:@denops/std@~7.1.0/autocmd"; import type { BaseUiParams } from "./base/ui.ts"; import type { BaseSourceParams } from "./base/source.ts"; import type { BaseFilterParams } from "./base/filter.ts"; @@ -10,14 +10,14 @@ export { BaseSource } from "./base/source.ts"; export type { BaseSourceParams } from "./base/source.ts"; export { BaseFilter } from "./base/filter.ts"; export type { BaseFilterParams } from "./base/filter.ts"; -export type { Denops } from "./deps.ts"; +export type { Denops } from "jsr:@denops/std@~7.1.0"; export { ContextBuilder } from "./context.ts"; export type DdcExtType = "ui" | "source" | "filter"; export type DdcEvent = - | autocmd.AutocmdEvent + | AutocmdEvent | "Initialize" | "Manual" | "Update"; diff --git a/denops/ddc/utils.ts b/denops/ddc/utils.ts index 6281ec0..6d8de50 100644 --- a/denops/ddc/utils.ts +++ b/denops/ddc/utils.ts @@ -1,4 +1,7 @@ -import { assertEquals, type Denops, op } from "./deps.ts"; +import type { Denops } from "jsr:@denops/std@~7.1.0"; +import * as op from "jsr:@denops/std@~7.1.0/option"; + +import { assertEquals } from "jsr:@std/assert@~1.0.2/equals"; export async function convertKeywordPattern( denops: Denops,