import path needed by some plugins

Shougo · Jul 8, 2023 · a088887 · a088887
1 parent 2cfb4ff
commit a088887
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 17 deletions.
diff --git a/denops/ddu/app.ts b/denops/ddu/app.ts
@@ -391,7 +391,7 @@ export function main(denops: Denops) {
         denops,
         filterName,
       );
-      return [filter ? filter.path : "", filterOptions, filterParams];
+      return [filter?.path ?? "", filterOptions, filterParams];
     },
     async uiVisible(
       arg1: unknown,

diff --git a/denops/ddu/base/filter.ts b/denops/ddu/base/filter.ts
@@ -38,6 +38,8 @@ export abstract class BaseFilter<Params extends BaseFilterParams> {
 
   apiVersion = 3;
 
+  path = "";
+
   async onInit(_args: OnInitArguments<Params>): Promise<void> {}
 
   async onRefreshItems(_args: OnRefreshItemsArguments<Params>): Promise<void> {}

diff --git a/denops/ddu/loader.ts b/denops/ddu/loader.ts
@@ -21,7 +21,10 @@ import { Denops, fn, Lock, op, parse, toFileUrl } from "./deps.ts";
 
 export class Loader {
   private extensions: Record<string, Extension> = {};
-  private mods: Record<DduExtType, Record<string, unknown>> = {
+  private mods: Record<
+    DduExtType,
+    Record<string, { mod: unknown; path: string }>
+  > = {
     ui: {},
     source: {},
     filter: {},
@@ -135,7 +138,9 @@ export class Loader {
 
     const mod = await import(toFileUrl(path).href);
 
-    this.mods[type][name] = mod;
+    const obj = { mod, path };
+
+    this.mods[type][name] = obj;
 
     // Check alias
     const aliases = this.getAliasNames(type).filter(
@@ -157,46 +162,63 @@ class Extension {
   private columns: Record<ColumnName, BaseColumn<BaseColumnParams>> = {};
 
   // deno-lint-ignore no-explicit-any
-  getUi(mod: any, name: string): BaseUi<BaseUiParams> {
+  getUi(mod: { mod: any; path: string }, name: string): BaseUi<BaseUiParams> {
     if (!this.uis[name]) {
-      const obj = new mod.Ui();
+      const obj = new mod.mod.Ui();
       obj.name = name;
+      obj.path = mod.path;
       this.uis[obj.name] = obj;
     }
     return this.uis[name];
   }
-  // deno-lint-ignore no-explicit-any
-  getSource(mod: any, name: string): BaseSource<BaseSourceParams> {
+  getSource(
+    // deno-lint-ignore no-explicit-any
+    mod: { mod: any; path: string },
+    name: string,
+  ): BaseSource<BaseSourceParams> {
     if (!this.sources[name]) {
-      const obj = new mod.Source();
+      const obj = new mod.mod.Source();
       obj.name = name;
+      obj.path = mod.path;
       this.sources[obj.name] = obj;
     }
     return this.sources[name];
   }
-  // deno-lint-ignore no-explicit-any
-  getFilter(mod: any, name: string): BaseFilter<BaseFilterParams> {
+  getFilter(
+    // deno-lint-ignore no-explicit-any
+    mod: { mod: any; path: string },
+    name: string,
+  ): BaseFilter<BaseFilterParams> {
     if (!this.filters[name]) {
-      const obj = new mod.Filter();
+      const obj = new mod.mod.Filter();
       obj.name = name;
+      obj.path = mod.path;
       this.filters[obj.name] = obj;
     }
     return this.filters[name];
   }
-  // deno-lint-ignore no-explicit-any
-  getKind(mod: any, name: string): BaseKind<BaseKindParams> {
+  getKind(
+    // deno-lint-ignore no-explicit-any
+    mod: { mod: any; path: string },
+    name: string,
+  ): BaseKind<BaseKindParams> {
     if (!this.kinds[name]) {
-      const obj = new mod.Kind();
+      const obj = new mod.mod.Kind();
       obj.name = name;
+      obj.path = mod.path;
       this.kinds[obj.name] = obj;
     }
     return this.kinds[name];
   }
-  // deno-lint-ignore no-explicit-any
-  getColumn(mod: any, name: string): BaseColumn<BaseColumnParams> {
+  getColumn(
+    // deno-lint-ignore no-explicit-any
+    mod: { mod: any; path: string },
+    name: string,
+  ): BaseColumn<BaseColumnParams> {
     if (!this.columns[name]) {
-      const obj = new mod.Column();
+      const obj = new mod.mod.Column();
       obj.name = name;
+      obj.path = mod.path;
       this.columns[obj.name] = obj;
     }
     return this.columns[name];