diff --git a/denops/ddu/app.ts b/denops/ddu/app.ts index 062f18c..14ea3d3 100644 --- a/denops/ddu/app.ts +++ b/denops/ddu/app.ts @@ -7,7 +7,6 @@ import type { Action, ActionHistory, BaseActionParams, - BaseFilterParams, Clipboard, Context, DduAliasType, @@ -19,6 +18,7 @@ import type { FilterOptions, UserOptions, } from "./types.ts"; +import type { BaseFilterParams } from "./base/filter.ts"; import { Ddu } from "./ddu.ts"; import { ContextBuilder, diff --git a/denops/ddu/context.ts b/denops/ddu/context.ts index 2a908ab..efadda6 100644 --- a/denops/ddu/context.ts +++ b/denops/ddu/context.ts @@ -4,11 +4,6 @@ import * as fn from "jsr:@denops/std@~7.0.3/function"; import type { ActionOptions, BaseActionParams, - BaseColumnParams, - BaseFilterParams, - BaseKindParams, - BaseSourceParams, - BaseUiParams, ColumnOptions, Context, DduOptions, @@ -18,6 +13,11 @@ import type { UiOptions, UserOptions, } from "./types.ts"; +import type { BaseColumnParams } from "./base/column.ts"; +import type { BaseFilterParams } from "./base/filter.ts"; +import type { BaseKindParams } from "./base/kind.ts"; +import type { BaseSourceParams } from "./base/source.ts"; +import type { BaseUiParams } from "./base/ui.ts"; import { defaultSourceOptions } from "./base/source.ts"; import { printError } from "./utils.ts"; diff --git a/denops/ddu/ddu.ts b/denops/ddu/ddu.ts index c225c2c..e0a3caa 100644 --- a/denops/ddu/ddu.ts +++ b/denops/ddu/ddu.ts @@ -8,8 +8,6 @@ import { SEPARATOR as pathsep } from "jsr:@std/path@~1.0.2/constants"; import type { ActionHistory, BaseActionParams, - BaseSource, - BaseSourceParams, Clipboard, Context, DduEvent, @@ -32,6 +30,7 @@ import { mergeDduOptions, } from "./context.ts"; import { defaultSourceOptions } from "./base/source.ts"; +import type { BaseSource, BaseSourceParams } from "./base/source.ts"; import type { Loader } from "./loader.ts"; import { convertUserString, printError, treePath2Filename } from "./utils.ts"; import type { AvailableSourceInfo, GatherStateAbortable } from "./state.ts"; diff --git a/denops/ddu/ext.ts b/denops/ddu/ext.ts index e45ad82..89427f1 100644 --- a/denops/ddu/ext.ts +++ b/denops/ddu/ext.ts @@ -7,16 +7,6 @@ import type { ActionName, ActionOptions, BaseActionParams, - BaseColumn, - BaseColumnParams, - BaseFilter, - BaseFilterParams, - BaseKind, - BaseKindParams, - BaseSource, - BaseSourceParams, - BaseUi, - BaseUiParams, ColumnOptions, Context, DduItem, @@ -54,6 +44,11 @@ import { defaultFilterOptions } from "./base/filter.ts"; import { defaultColumnOptions } from "./base/column.ts"; import { defaultKindOptions } from "./base/kind.ts"; import { defaultActionOptions } from "./base/action.ts"; +import type { BaseColumn, BaseColumnParams } from "./base/column.ts"; +import type { BaseFilter, BaseFilterParams } from "./base/filter.ts"; +import type { BaseKind, BaseKindParams } from "./base/kind.ts"; +import type { BaseSource, BaseSourceParams } from "./base/source.ts"; +import type { BaseUi, BaseUiParams } from "./base/ui.ts"; import type { Loader } from "./loader.ts"; import { convertUserString, printError } from "./utils.ts"; diff --git a/denops/ddu/loader.ts b/denops/ddu/loader.ts index 6920ce5..6a18e35 100644 --- a/denops/ddu/loader.ts +++ b/denops/ddu/loader.ts @@ -1,14 +1,4 @@ import type { - BaseColumn, - BaseColumnParams, - BaseFilter, - BaseFilterParams, - BaseKind, - BaseKindParams, - BaseSource, - BaseSourceParams, - BaseUi, - BaseUiParams, ColumnName, DduAliasType, DduExtType, @@ -17,6 +7,11 @@ import type { SourceName, UiName, } from "./types.ts"; +import type { BaseColumn, BaseColumnParams } from "./base/column.ts"; +import type { BaseFilter, BaseFilterParams } from "./base/filter.ts"; +import type { BaseKind, BaseKindParams } from "./base/kind.ts"; +import type { BaseSource, BaseSourceParams } from "./base/source.ts"; +import type { BaseUi, BaseUiParams } from "./base/ui.ts"; import type { Denops } from "jsr:@denops/std@~7.0.3"; import { Lock } from "jsr:@core/asyncutil@~1.1.1/lock"; import { basename } from "jsr:@std/path@~1.0.2/basename"; diff --git a/denops/ddu/state.ts b/denops/ddu/state.ts index 89a0220..a6d6002 100644 --- a/denops/ddu/state.ts +++ b/denops/ddu/state.ts @@ -1,11 +1,7 @@ import { is } from "jsr:@core/unknownutil@~4.3.0/is"; import { maybe } from "jsr:@core/unknownutil@~4.3.0/maybe"; -import type { - BaseSource, - BaseSourceParams, - DduItem, - SourceOptions, -} from "./types.ts"; +import type { DduItem, SourceOptions } from "./types.ts"; +import type { BaseSource, BaseSourceParams } from "./base/source.ts"; export type AvailableSourceInfo< Params extends BaseSourceParams = BaseSourceParams, diff --git a/denops/ddu/types.ts b/denops/ddu/types.ts index 3d3d12d..72e850b 100644 --- a/denops/ddu/types.ts +++ b/denops/ddu/types.ts @@ -5,18 +5,6 @@ import type { BaseKindParams } from "./base/kind.ts"; import type { BaseColumnParams } from "./base/column.ts"; import type { Denops } from "jsr:@denops/std@~7.0.3"; -export { BaseConfig } from "./base/config.ts"; -export { BaseUi } from "./base/ui.ts"; -export type { BaseUiParams, UiActionArguments, UiActions } from "./base/ui.ts"; -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 { BaseKind } from "./base/kind.ts"; -export type { BaseKindParams } from "./base/kind.ts"; -export { BaseColumn } from "./base/column.ts"; -export type { BaseColumnParams } from "./base/column.ts"; - export { ContextBuilder } from "./context.ts"; export type { Ddu } from "./ddu.ts";