perf: remove unnecessary return await and cache import maps in denops/dpp

denops/dpp/app.ts

@@ -75,7 +75,7 @@ export const main: Entrypoint = (denops: Denops) => {
 
       const [context, options] = await contextBuilder.get(denops);
 
-      return await extAction(
+      return extAction(
         denops,
         loader,
         context,
@@ -154,7 +154,7 @@ export const main: Entrypoint = (denops: Denops) => {
       const extName = ensure(arg1, is.String);
       const [_, options] = await contextBuilder.get(denops);
 
-      return await dpp.getExt(
+      return dpp.getExt(
         denops,
         options,
         extName,
@@ -163,7 +163,7 @@ export const main: Entrypoint = (denops: Denops) => {
     async getProtocols(): Promise<Record<ProtocolName, Protocol>> {
       const [_, options] = await contextBuilder.get(denops);
 
-      return await dpp.getProtocols(
+      return dpp.getProtocols(
         denops,
         options,
       );

denops/dpp/dpp.ts

@@ -43,15 +43,15 @@ export class DppImpl implements Dpp {
     this.#loader = loader;
   }
 
-  async extAction(
+  extAction(
     denops: Denops,
     context: Context,
     options: DppOptions,
     extName: ExtName,
     actionName: ActionName,
     actionParams: BaseParams = {},
   ): Promise<unknown | undefined> {
-    return await extAction(
+    return extAction(
       denops,
       this.#loader,
       context,
@@ -62,7 +62,7 @@ export class DppImpl implements Dpp {
     );
   }
 
-  async getExt(
+  getExt(
     denops: Denops,
     options: DppOptions,
     extName: ExtName,
@@ -73,19 +73,19 @@ export class DppImpl implements Dpp {
       BaseParams,
     ]
   > {
-    return await getExt(
+    return getExt(
       denops,
       this.#loader,
       options,
       extName,
     );
   }
 
-  async getProtocols(
+  getProtocols(
     denops: Denops,
     options: DppOptions,
   ): Promise<Record<ProtocolName, Protocol>> {
-    return await getProtocols(denops, this.#loader, options);
+    return getProtocols(denops, this.#loader, options);
   }
 
   async makeState(
@@ -103,7 +103,7 @@ export class DppImpl implements Dpp {
     let multipleHooks = configReturn.multipleHooks ?? [];
 
     // Check plugin-option-if is enabled
-    const checkIf = async (plugin: Plugin) => {
+    const checkIf = (plugin: Plugin) => {
       if (!("if" in plugin)) {
         return true;
       }
@@ -113,7 +113,7 @@ export class DppImpl implements Dpp {
       }
 
       // Eval plugin-option-if string.
-      return await denops.call("eval", plugin.if) as boolean;
+      return denops.call("eval", plugin.if) as Promise<boolean>;
     };
 
     // Initialize plugins

denops/dpp/utils.ts

@@ -237,6 +237,9 @@
   }
 }
 
+const importMapCache = new Map<string, ImportMap | null>();
+const importerCache = new Map<string, ImportMapImporter>();
+
 export async function tryLoadImportMap(
   script: string,
 ): Promise<ImportMap | undefined> {
@@ -255,10 +258,17 @@
     ? fromFileUrl(new URL(script))
     : script;
   const parentDir = dirname(scriptPath);
+
+  if (importMapCache.has(parentDir)) {
+    return importMapCache.get(parentDir) ?? undefined;
+  }
+
   for (const pattern of PATTERNS) {
     const importMapPath = join(parentDir, pattern);
     try {
-      return await loadImportMap(importMapPath);
+      const importMap = await loadImportMap(importMapPath);
+      importMapCache.set(parentDir, importMap);
+      return importMap;
     } catch (err: unknown) {
       if (err instanceof Deno.errors.NotFound) {
         // Ignore NotFound errors and try the next pattern
@@ -267,6 +277,7 @@
       throw err; // Rethrow other errors
     }
   }
+  importMapCache.set(parentDir, null);
   return undefined;
 }
 
@@ -277,10 +288,15 @@
   const url = toFileUrl(path).href;
   const importMap = await tryLoadImportMap(path);
   if (importMap) {
-    const importer = new ImportMapImporter(importMap);
+    const parentDir = dirname(path);
+    let importer = importerCache.get(parentDir);
+    if (!importer) {
+      importer = new ImportMapImporter(importMap);
+      importerCache.set(parentDir, importer);
+    }
     return await importer.import(`${url}#${suffix}`);
   } else {
     return await import(`${url}#${suffix}`);
   }
 }