Adapt to changes in injectable

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/renderer/protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable.ts

@@ -18,24 +18,18 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-import type { Injectable } from "@ogre-tools/injectable";
-import { lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import attemptInstallByInfoInjectable from "../../components/+extensions/attempt-install-by-info/attempt-install-by-info.injectable";
-import {
-  bindProtocolAddRouteHandlers,
-  Dependencies,
-} from "./bind-protocol-add-route-handlers";
-import lensProtocolRouterRendererInjectable
-  from "../lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
+import { bindProtocolAddRouteHandlers } from "./bind-protocol-add-route-handlers";
+import lensProtocolRouterRendererInjectable from "../lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
 
-const bindProtocolAddRouteHandlersInjectable: Injectable<() => void, Dependencies> = {
-  getDependencies: di => ({
+const bindProtocolAddRouteHandlersInjectable = getInjectable({
+  instantiate: di=> bindProtocolAddRouteHandlers({
     attemptInstallByInfo: di.inject(attemptInstallByInfoInjectable),
     lensProtocolRouterRenderer: di.inject(lensProtocolRouterRendererInjectable),
   }),
 
-  instantiate: bindProtocolAddRouteHandlers,
   lifecycle: lifecycleEnum.singleton,
-};
+});
 
 export default bindProtocolAddRouteHandlersInjectable;

src/renderer/protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable.ts

@@ -18,23 +18,17 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-import type { Injectable } from "@ogre-tools/injectable";
-import { lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import extensionLoaderInjectable from "../../../extensions/extension-loader/extension-loader.injectable";
-import type { Dependencies } from "./lens-protocol-router-renderer";
 import { LensProtocolRouterRenderer } from "./lens-protocol-router-renderer";
 
-const lensProtocolRouterRendererInjectable: Injectable<
-  LensProtocolRouterRenderer,
-  Dependencies
-> = {
-  getDependencies: di => ({
-    extensionLoader: di.inject(extensionLoaderInjectable),
-  }),
-
-  instantiate: dependencies => new LensProtocolRouterRenderer(dependencies),
+const lensProtocolRouterRendererInjectable = getInjectable({
+  instantiate: (di) =>
+    new LensProtocolRouterRenderer({
+      extensionLoader: di.inject(extensionLoaderInjectable),
+    }),
 
   lifecycle: lifecycleEnum.singleton,
-};
+});
 
 export default lensProtocolRouterRendererInjectable;