refactor: Unify to BaseParams

Shougo · Aug 25, 2024 · f1e5a15 · f1e5a15
1 parent fd6152b
commit f1e5a15
Show file tree

Hide file tree

Showing 12 changed files with 147 additions and 165 deletions.
diff --git a/denops/ddu/app.ts b/denops/ddu/app.ts
@@ -6,7 +6,7 @@ import { toFileUrl } from "jsr:@std/path@~1.0.2/to-file-url";
 import type {
   Action,
   ActionHistory,
-  BaseActionParams,
+  BaseParams,
   Clipboard,
   Context,
   DduAliasType,
@@ -18,7 +18,6 @@ import type {
   FilterOptions,
   UserOptions,
 } from "./types.ts";
-import type { BaseFilterParams } from "./base/filter.ts";
 import { Ddu } from "./ddu.ts";
 import {
   ContextBuilder,
@@ -419,7 +418,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 !== "") {
@@ -435,7 +434,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(
@@ -451,7 +450,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;
@@ -493,7 +492,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,4 +1,5 @@
 import type {
+  BaseParams,
   ColumnOptions,
   Context,
   DduItem,
@@ -7,15 +8,13 @@ import type {
 } from "../types.ts";
 import type { Denops } from "jsr:@denops/std@~7.0.3";
 
-export type BaseColumnParams = Record<string, unknown>;
-
-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 +23,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 +32,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 +49,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/filter.ts b/denops/ddu/base/filter.ts
@@ -1,4 +1,5 @@
 import type {
+  BaseParams,
   Context,
   DduFilterItems,
   DduItem,
@@ -8,21 +9,19 @@ import type {
 } from "../types.ts";
 import type { Denops } from "jsr:@denops/std@~7.0.3";
 
-export type BaseFilterParams = Record<string, unknown>;
-
-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 +32,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,6 +1,7 @@
 import type {
   ActionOptions,
   Actions,
+  BaseParams,
   DduItem,
   DduOptions,
   KindOptions,
@@ -9,8 +10,6 @@ import type {
 } from "../types.ts";
 import type { Denops } from "jsr:@denops/std@~7.0.3";
 
-export type BaseKindParams = Record<string, unknown>;
-
 export type GetPreviewerArguments = {
   denops: Denops;
   options: DduOptions;
@@ -19,9 +18,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,5 +1,6 @@
 import type {
   Actions,
+  BaseParams,
   Context,
   DduEvent,
   DduItem,
@@ -10,23 +11,21 @@ import type {
 import type { Denops } from "jsr:@denops/std@~7.0.3";
 import type { Loader } from "../loader.ts";
 
-export type BaseSourceParams = Record<string, unknown>;
-
-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;
@@ -37,7 +36,7 @@ export type GatherArguments<Params extends BaseSourceParams> = {
   loader: Loader;
 };
 
-export type CheckUpdatedArguments<Params extends BaseSourceParams> = {
+export type CheckUpdatedArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -46,7 +45,7 @@ export type CheckUpdatedArguments<Params extends BaseSourceParams> = {
 };
 
 export abstract class BaseSource<
-  Params extends BaseSourceParams,
+  Params extends BaseParams,
   UserData extends unknown = unknown,
 > {
   apiVersion = 3;

diff --git a/denops/ddu/base/ui.ts b/denops/ddu/base/ui.ts
@@ -1,5 +1,5 @@
 import type {
-  BaseActionParams,
+  BaseParams,
   Context,
   Ddu,
   DduItem,
@@ -12,32 +12,30 @@ import type {
 } from "../types.ts";
 import type { Denops } from "jsr:@denops/std@~7.0.3";
 
-export type BaseUiParams = Record<string, unknown>;
-
-export type UiActions<Params extends BaseUiParams> = Record<
+export type UiActions<Params extends BaseParams> = Record<
   string,
   UiActionCallback<Params>
 >;
 
-export type OnInitArguments<Params extends BaseUiParams> = {
+export type OnInitArguments<Params extends BaseParams> = {
   denops: Denops;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type OnBeforeActionArguments<Params extends BaseUiParams> = {
+export type OnBeforeActionArguments<Params extends BaseParams> = {
   denops: Denops;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type OnAfterActionArguments<Params extends BaseUiParams> = {
+export type OnAfterActionArguments<Params extends BaseParams> = {
   denops: Denops;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type RefreshItemsArguments<Params extends BaseUiParams> = {
+export type RefreshItemsArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -47,7 +45,7 @@ export type RefreshItemsArguments<Params extends BaseUiParams> = {
   items: DduItem[];
 };
 
-export type CollapseItemArguments<Params extends BaseUiParams> = {
+export type CollapseItemArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -56,7 +54,7 @@ export type CollapseItemArguments<Params extends BaseUiParams> = {
   item: DduItem;
 };
 
-export type ExpandItemArguments<Params extends BaseUiParams> = {
+export type ExpandItemArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -67,7 +65,7 @@ export type ExpandItemArguments<Params extends BaseUiParams> = {
   isGrouped: boolean;
 };
 
-export type SearchItemArguments<Params extends BaseUiParams> = {
+export type SearchItemArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -76,23 +74,23 @@ export type SearchItemArguments<Params extends BaseUiParams> = {
   item: DduItem;
 };
 
-export type RedrawArguments<Params extends BaseUiParams> = {
+export type RedrawArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type QuitArguments<Params extends BaseUiParams> = {
+export type QuitArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type VisibleArguments<Params extends BaseUiParams> = {
+export type VisibleArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
@@ -101,23 +99,23 @@ export type VisibleArguments<Params extends BaseUiParams> = {
   tabNr: number;
 };
 
-export type WinidArguments<Params extends BaseUiParams> = {
+export type WinidArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type UpdateCursorArguments<Params extends BaseUiParams> = {
+export type UpdateCursorArguments<Params extends BaseParams> = {
   denops: Denops;
   context: Context;
   options: DduOptions;
   uiOptions: UiOptions;
   uiParams: Params;
 };
 
-export type UiActionArguments<Params extends BaseUiParams> = {
+export type UiActionArguments<Params extends BaseParams> = {
   denops: Denops;
   ddu: Ddu;
   context: Context;
@@ -128,14 +126,12 @@ export type UiActionArguments<Params extends BaseUiParams> = {
   getPreviewer?: (
     denops: Denops,
     item: DduItem,
-    actionParams: BaseActionParams,
+    actionParams: BaseParams,
     previewContext: PreviewContext,
   ) => Promise<Previewer | undefined>;
 };
 
-export abstract class BaseUi<
-  Params extends BaseUiParams,
-> {
+export abstract class BaseUi<Params extends BaseParams> {
   apiVersion = 2;
 
   name = "";