Merge pull request #122 from Shougo/better-dependencies

Better dependencies
Shougo · Aug 29, 2024 · 7e3c0e8 · 7e3c0e8
2 parents aebdc35 + 548631b
commit 7e3c0e8
Show file tree

Hide file tree

Showing 15 changed files with 207 additions and 261 deletions.
diff --git a/denops/ddu/app.ts b/denops/ddu/app.ts
@@ -1,11 +1,7 @@
-import type { Denops, Entrypoint } from "./deps.ts";
-import { Lock } from "./deps.ts";
-import { ensure, is, toFileUrl } from "./deps.ts";
 import type {
   Action,
   ActionHistory,
-  BaseActionParams,
-  BaseFilterParams,
+  BaseParams,
   Clipboard,
   Context,
   DduAliasType,
@@ -39,6 +35,13 @@ import { defaultColumnOptions } from "./base/column.ts";
 import { defaultKindOptions } from "./base/kind.ts";
 import { defaultActionOptions } from "./base/action.ts";
 
+import type { Denops, Entrypoint } from "jsr:@denops/std@~7.1.0";
+
+import { toFileUrl } from "jsr:@std/path@~1.0.2/to-file-url";
+import { Lock } from "jsr:@core/asyncutil@~1.1.1/lock";
+import { is } from "jsr:@core/unknownutil@~4.3.0/is";
+import { ensure } from "jsr:@core/unknownutil@~4.3.0/ensure";
+
 export const main: Entrypoint = (denops: Denops) => {
   type RedrawTreeMode = "collapse" | "expand";
   type RedrawOption = {
@@ -417,7 +420,7 @@ export const main: Entrypoint = (denops: Denops) => {
     ): Promise<void> {
       const name = ensure(arg1, is.String) as string;
       const actionName = ensure(arg2, is.String) as string;
-      const params = ensure(arg3, is.Record) as BaseActionParams;
+      const params = ensure(arg3, is.Record) as BaseParams;
 
       const ddu = getDdu(name);
       if (ddu.getOptions().ui !== "") {
@@ -433,7 +436,7 @@ export const main: Entrypoint = (denops: Denops) => {
       const name = ensure(arg1, is.String) as string;
       const actionName = ensure(arg2, is.String) as string;
       const items = ensure(arg3, is.Array) as DduItem[];
-      const params = ensure(arg4, is.Record) as BaseActionParams;
+      const params = ensure(arg4, is.Record) as BaseParams;
 
       const ddu = getDdu(name);
       await ddu.itemAction(
@@ -449,7 +452,7 @@ export const main: Entrypoint = (denops: Denops) => {
       arg1: unknown,
       arg2: unknown,
       arg3: unknown,
-    ): Promise<string | Action<BaseActionParams> | undefined> {
+    ): Promise<string | Action<BaseParams> | undefined> {
       const name = ensure(arg1, is.String) as string;
       const items = ensure(arg2, is.Array) as DduItem[];
       const action = ensure(arg3, is.String) as string;
@@ -491,7 +494,7 @@ export const main: Entrypoint = (denops: Denops) => {
       [
         string,
         FilterOptions,
-        BaseFilterParams,
+        BaseParams,
       ]
     > {
       const name = ensure(arg1, is.String) as string;

diff --git a/denops/ddu/base/column.ts b/denops/ddu/base/column.ts
@@ -1,21 +1,21 @@
 import type {
+  BaseParams,
   ColumnOptions,
   Context,
   DduItem,
   DduOptions,
   ItemHighlight,
 } from "../types.ts";
-import type { Denops } from "../deps.ts";
 
-export type BaseColumnParams = Record<string, unknown>;
+import type { Denops } from "jsr:@denops/std@~7.1.0";
 
-export type OnInitArguments<Params extends BaseColumnParams> = {
+export type OnInitArguments<Params extends BaseParams> = {
   denops: Denops;
   columnOptions: ColumnOptions;
   columnParams: Params;
 };
 
-export type GetBaseTextArguments<Params extends BaseColumnParams> = {
+export type GetBaseTextArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -24,7 +24,7 @@ export type GetBaseTextArguments<Params extends BaseColumnParams> = {
   item: DduItem;
 };
 
-export type GetLengthArguments<Params extends BaseColumnParams> = {
+export type GetLengthArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -33,7 +33,7 @@ export type GetLengthArguments<Params extends BaseColumnParams> = {
   items: DduItem[];
 };
 
-export type GetTextArguments<Params extends BaseColumnParams> = {
+export type GetTextArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -50,7 +50,7 @@ export type GetTextResult = {
   highlights?: ItemHighlight[];
 };
 
-export abstract class BaseColumn<Params extends BaseColumnParams> {
+export abstract class BaseColumn<Params extends BaseParams> {
   apiVersion = 2;
 
   name = "";

diff --git a/denops/ddu/base/config.ts b/denops/ddu/base/config.ts
@@ -1,6 +1,6 @@
 import type { ContextBuilder } from "../context.ts";
 import type { DduAliasType } 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/ddu/base/filter.ts b/denops/ddu/base/filter.ts
@@ -1,28 +1,28 @@
 import type {
+  BaseParams,
   Context,
   DduFilterItems,
   DduItem,
   DduOptions,
   FilterOptions,
   SourceOptions,
 } from "../types.ts";
-import type { Denops } from "../deps.ts";
 
-export type BaseFilterParams = Record<string, unknown>;
+import type { Denops } from "jsr:@denops/std@~7.1.0";
 
-export type OnInitArguments<Params extends BaseFilterParams> = {
+export type OnInitArguments<Params extends BaseParams> = {
   denops: Denops;
   filterOptions: FilterOptions;
   filterParams: Params;
 };
 
-export type OnRefreshItemsArguments<Params extends BaseFilterParams> = {
+export type OnRefreshItemsArguments<Params extends BaseParams> = {
   denops: Denops;
   filterOptions: FilterOptions;
   filterParams: Params;
 };
 
-export type FilterArguments<Params extends BaseFilterParams> = {
+export type FilterArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -33,7 +33,7 @@ export type FilterArguments<Params extends BaseFilterParams> = {
   items: DduItem[];
 };
 
-export abstract class BaseFilter<Params extends BaseFilterParams> {
+export abstract class BaseFilter<Params extends BaseParams> {
   apiVersion = 3;
 
   name = "";

diff --git a/denops/ddu/base/kind.ts b/denops/ddu/base/kind.ts
@@ -1,15 +1,15 @@
 import type {
   ActionOptions,
   Actions,
+  BaseParams,
   DduItem,
   DduOptions,
   KindOptions,
   PreviewContext,
   Previewer,
 } from "../types.ts";
-import type { Denops } from "../deps.ts";
 
-export type BaseKindParams = Record<string, unknown>;
+import type { Denops } from "jsr:@denops/std@~7.1.0";
 
 export type GetPreviewerArguments = {
   denops: Denops;
@@ -19,9 +19,7 @@ export type GetPreviewerArguments = {
   item: DduItem;
 };
 
-export abstract class BaseKind<
-  Params extends BaseKindParams,
-> {
+export abstract class BaseKind<Params extends BaseParams> {
   apiVersion = 2;
 
   name = "";

diff --git a/denops/ddu/base/source.ts b/denops/ddu/base/source.ts
@@ -1,43 +1,40 @@
 import type {
   Actions,
+  BaseParams,
   Context,
   DduEvent,
   DduItem,
   DduOptions,
   Item,
   SourceOptions,
 } from "../types.ts";
-import type { Denops } from "../deps.ts";
-import type { Loader } from "../loader.ts";
 
-export type BaseSourceParams = Record<string, unknown>;
+import type { Denops } from "jsr:@denops/std@~7.1.0";
 
-export type OnInitArguments<Params extends BaseSourceParams> = {
+export type OnInitArguments<Params extends BaseParams> = {
   denops: Denops;
   sourceOptions: SourceOptions;
   sourceParams: Params;
-  loader: Loader;
 };
 
-export type OnEventArguments<Params extends BaseSourceParams> = {
+export type OnEventArguments<Params extends BaseParams> = {
   denops: Denops;
   sourceOptions: SourceOptions;
   sourceParams: Params;
   event: DduEvent;
 };
 
-export type GatherArguments<Params extends BaseSourceParams> = {
+export type GatherArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
   sourceOptions: SourceOptions;
   sourceParams: Params;
   input: string;
   parent?: DduItem;
-  loader: Loader;
 };
 
-export type CheckUpdatedArguments<Params extends BaseSourceParams> = {
+export type CheckUpdatedArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -46,7 +43,7 @@ export type CheckUpdatedArguments<Params extends BaseSourceParams> = {
 };
 
 export abstract class BaseSource<
-  Params extends BaseSourceParams,
+  Params extends BaseParams,
   UserData extends unknown = unknown,
 > {
   apiVersion = 3;