Move updateChecker into InstalledExtension type

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

src/extensions/extension-discovery/extension-discovery.ts

@@ -24,6 +24,7 @@ import type { LensExtensionId, LensExtensionManifest } from "../lens-extension";
 import { isProduction } from "../../common/vars";
 import type { ExtensionInstallationStateStore } from "../extension-installation-state-store/extension-installation-state-store";
 import type { PackageJson } from "type-fest";
+import type { LensExtensionUpdateChecker } from "../lens-extension-update-checker";
 
 interface Dependencies {
   extensionLoader: ExtensionLoader;
@@ -57,6 +58,7 @@ export interface InstalledExtension {
     version: string;
     input: string;
   }
+  updateChecker?: LensExtensionUpdateChecker
 }
 
 const logModule = "[EXTENSION-DISCOVERY]";

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

@@ -8,12 +8,11 @@ import {
   LensExtensionDependencies,
   setLensExtensionDependencies,
 } from "../../lens-extension-set-dependencies";
-import type { LensExtensionUpdateChecker } from "../../lens-extension-update-checker";
 
 export const createExtensionInstance =
   (dependencies: LensExtensionDependencies) =>
-    (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension, updateChecker?: LensExtensionUpdateChecker) => {
-      const instance = new ExtensionClass(extension, updateChecker);
+    (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => {
+      const instance = new ExtensionClass(extension);
 
       instance[setLensExtensionDependencies](dependencies);
 

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

@@ -27,7 +27,7 @@ const logModule = "[EXTENSIONS-LOADER]";
 
 interface Dependencies {
   updateExtensionsState: (extensionsState: Record<LensExtensionId, LensExtensionState>) => void
-  createExtensionInstance: (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension, updateChecker: LensExtensionUpdateChecker) => LensExtension,
+  createExtensionInstance: (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => LensExtension,
 }
 
 export interface ExtensionLoading {
@@ -354,8 +354,10 @@ export class ExtensionLoader {
             // const instance = new LensExtensionClass(extension, this.extensionUpdateChecker);
             const instance = this.dependencies.createExtensionInstance(
               LensExtensionClass,
-              extension,
-              this.extensionUpdateChecker,
+              {
+                ...extension,
+                updateChecker: this.extensionUpdateChecker
+              }
             );
 
             this.instances.set(extId, instance);

src/extensions/lens-extension.ts

@@ -45,7 +45,7 @@ export class LensExtension {
 
   [Disposers] = disposer();
 
-  constructor({ id, manifest, manifestPath, isBundled }: InstalledExtension, updateChecker?: LensExtensionUpdateChecker) {
+  constructor({ id, manifest, manifestPath, isBundled, updateChecker }: InstalledExtension) {
     makeObservable(this);
     this.id = id;
     this.manifest = manifest;

src/renderer/components/+extensions/extension-updater/bundled-extensions-updater.ts

@@ -22,8 +22,6 @@ export class BundledExtensionsUpdater extends ExtensionUpdater {
     this.dependencies.ipcRenderer.on(UpdateBundledExtension, async (event, extensionId: string) => {
       const extension = this.dependencies.extensions.find(extension => extension.id == extensionId);
 
-      console.log({extension})
-
       if (extension?.isBundled && extension?.availableUpdate) {
         try {
           await this.update(extension);