Make registrators not async for not being needed anymore

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/extensions/extension-loader/extension-loader.ts

@@ -25,7 +25,7 @@ const logModule = "[EXTENSIONS-LOADER]";
 interface Dependencies {
   updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void;
   createExtensionInstance: (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => LensExtension;
-  extensionRegistrators: ((extension: LensExtension, extensionInstallationCount: number) => Promise<void>)[];
+  extensionRegistrators: ((extension: LensExtension, extensionInstallationCount: number) => void)[];
   extensionInstallationCounter: Map<string, number>;
 }
 
@@ -297,8 +297,8 @@ export class ExtensionLoader {
     // 3. Call .enable for each extension
     // 4. Return ExtensionLoading[]
 
-    const extensionInstallationPromises = [...installedExtensions.entries()]
+    const extensions = [...installedExtensions.entries()]
-      .map(async ([extId, extension]) => {
+      .map(([extId, extension]) => {
         const alreadyInit = this.instances.has(extId) || this.nonInstancesByName.has(extension.manifest.name);
 
         if (extension.isCompatible && extension.isEnabled && !alreadyInit) {
@@ -320,10 +320,8 @@ export class ExtensionLoader {
 
             this.dependencies.extensionInstallationCounter.set(instance.sanitizedExtensionId, installationCount);
 
-            await Promise.all(
+            this.dependencies.extensionRegistrators.forEach((register) =>
-              this.dependencies.extensionRegistrators.map((register) =>
+              register(instance, installationCount),
-                register(instance, installationCount),
-              ),
             );
 
             this.instances.set(extId, instance);
@@ -341,11 +339,7 @@ export class ExtensionLoader {
         }
 
         return null;
-      });
+      }).filter(extension => Boolean(extension));
-
-    const extensionInstallations = (await Promise.all(extensionInstallationPromises));
-
-    const extensions = extensionInstallations.filter(extension => Boolean(extension));
 
     // We first need to wait until each extension's `onActivate` is resolved or rejected,
     // as this might register new catalog categories. Afterwards we can safely .enable the extension.

src/extensions/extension-loader/extension-registrator-injection-token.ts

@@ -6,7 +6,7 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import type { LensExtension } from "../lens-extension";
 
 export const extensionRegistratorInjectionToken = getInjectionToken<
-  (extension: LensExtension, extensionInstallationCount: number) => Promise<void>
+  (extension: LensExtension, extensionInstallationCount: number) => void
     >({
       id: "extension-registrator-token",
     });

src/renderer/components/+preferences/extension-preference-item-registrator.injectable.ts

@@ -14,7 +14,7 @@ const extensionPreferenceItemRegistratorInjectable = getInjectable({
 
   instantiate:
     (di) =>
-      async (extension: LensRendererExtension, extensionInstallationCount) => {
+      (extension: LensRendererExtension, extensionInstallationCount) => {
         const injectables = pipeline(
           extension.appPreferences,
 

src/renderer/components/+preferences/extension-telemetry-preference-item-registrator.injectable.ts

@@ -14,7 +14,7 @@ const extensionTelemetryPreferenceItemRegistratorInjectable = getInjectable({
 
   instantiate:
     (di) =>
-      async (extension: LensRendererExtension, extensionInstallationCount) => {
+      (extension: LensRendererExtension, extensionInstallationCount) => {
         const injectables = pipeline(
           extension.appPreferences,
 

src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx

@@ -19,7 +19,7 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({
 
   instantiate:
     (di: DiContainer) =>
-      async (
+      (
         extension: LensRendererExtension,
         extensionInstallationCount: number,
       ) => {
@@ -74,7 +74,6 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({
           },
         });
 
-        // TODO: Transactional register
         di.register(sidebarItemsForExtensionInjectable);
       },
 

src/renderer/routes/extension-route-registrator.injectable.tsx

@@ -25,7 +25,7 @@ const extensionRouteRegistratorInjectable = getInjectable({
   instantiate: (di: DiContainer) => {
     const observableHistory = di.inject(observableHistoryInjectable);
 
-    return async (
+    return (
       extension: LensRendererExtension,
       extensionInstallationCount: number,
     ) => {