diff --git a/package.json b/package.json index 6f0cbd03e6..c5a6491839 100644 --- a/package.json +++ b/package.json @@ -200,8 +200,8 @@ "@hapi/call": "^8.0.1", "@hapi/subtext": "^7.0.3", "@kubernetes/client-node": "^0.16.1", - "@ogre-tools/injectable": "5.0.1", - "@ogre-tools/injectable-react": "5.0.1", + "@ogre-tools/injectable": "5.1.2", + "@ogre-tools/injectable-react": "5.1.2", "@sentry/electron": "^2.5.4", "@sentry/integrations": "^6.15.0", "@types/circular-dependency-plugin": "5.0.5", diff --git a/src/common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable.ts b/src/common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable.ts index 7ac1a21a1e..9c25407d4d 100644 --- a/src/common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable.ts +++ b/src/common/app-paths/directory-for-bundled-binaries/directory-for-bundled-binaries.injectable.ts @@ -2,13 +2,12 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { baseBinariesDir } from "../../vars"; const directoryForBundledBinariesInjectable = getInjectable({ id: "directory-for-bundled-binaries", instantiate: () => baseBinariesDir.get(), - lifecycle: lifecycleEnum.singleton, }); export default directoryForBundledBinariesInjectable; diff --git a/src/common/vars/context-dir.injectable.ts b/src/common/vars/context-dir.injectable.ts index 09484cc816..fdef6c2c71 100644 --- a/src/common/vars/context-dir.injectable.ts +++ b/src/common/vars/context-dir.injectable.ts @@ -2,13 +2,12 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { contextDir } from "../vars"; const contextDirInjectable = getInjectable({ id: "context-dir", instantiate: () => contextDir, - lifecycle: lifecycleEnum.singleton, }); export default contextDirInjectable; diff --git a/src/common/vars/is-development.injectable.ts b/src/common/vars/is-development.injectable.ts index c6adadd7e0..a731ae5a9f 100644 --- a/src/common/vars/is-development.injectable.ts +++ b/src/common/vars/is-development.injectable.ts @@ -2,13 +2,12 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { isDevelopment } from "../vars"; const isDevelopmentInjectable = getInjectable({ id: "is-development", instantiate: () => isDevelopment, - lifecycle: lifecycleEnum.singleton, }); export default isDevelopmentInjectable; diff --git a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api.ts b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api.ts index 72ab74cdcb..4ab374743c 100644 --- a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api.ts +++ b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api.ts @@ -2,29 +2,19 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { Injectable, TentativeTuple } from "@ogre-tools/injectable"; import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; +import type { Inject } from "@ogre-tools/injectable"; -type FactoryType = < - TInjectable extends Injectable, - TInstantiationParameter, - TInstance extends (...args: unknown[]) => any, - TFunction extends (...args: unknown[]) => any = Awaited< - ReturnType - >, ->( - injectableKey: TInjectable, - ...instantiationParameter: TentativeTuple -) => (...args: Parameters) => ReturnType; +export const asLegacyGlobalFunctionForExtensionApi = (( + injectableKey, + instantiationParameter, +) => + (...args: any[]) => { + const injected = getLegacyGlobalDiForExtensionApi().inject( + injectableKey, + instantiationParameter, + ) as unknown as (...args: any[]) => any; -export const asLegacyGlobalFunctionForExtensionApi: FactoryType = - (injectableKey, ...instantiationParameter) => - (...args) => { - const injected = getLegacyGlobalDiForExtensionApi().inject( - injectableKey, - ...instantiationParameter, - ); - - return injected(...args); - }; + return injected(...args); + }) as Inject; diff --git a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts new file mode 100644 index 0000000000..3e3cbb6ff1 --- /dev/null +++ b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.test.ts @@ -0,0 +1,80 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { + createContainer, + DiContainer, + getInjectable, + Injectable, +} from "@ogre-tools/injectable"; +import { setLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; +import { asLegacyGlobalObjectForExtensionApiWithModifications } from "./as-legacy-global-object-for-extension-api-with-modifications"; + +describe("asLegacyGlobalObjectForExtensionApiWithModifications", () => { + describe("given legacy global object", () => { + let di: DiContainer; + let someInjectable: Injectable<{ someProperty: string }, unknown, void>; + let actual: { someProperty: string } & { + someModificationProperty: string; + }; + + beforeEach(() => { + di = createContainer(); + + jest.spyOn(di, "inject"); + + setLegacyGlobalDiForExtensionApi(di); + + someInjectable = getInjectable({ + id: "some-injectable", + instantiate: () => ({ + someProperty: "some-property-value", + }), + }); + + di.register(someInjectable); + + actual = asLegacyGlobalObjectForExtensionApiWithModifications( + someInjectable, + { someModificationProperty: "some-modification-value" }, + ); + }); + + it("when not accessed, does not inject yet", () => { + expect(di.inject).not.toHaveBeenCalled(); + }); + + describe("when a property of global is accessed, ", () => { + let actualPropertyValue: string; + + beforeEach(() => { + actualPropertyValue = actual.someProperty; + }); + + it("injects the injectable for global", () => { + expect(di.inject).toHaveBeenCalledWith(someInjectable, undefined); + }); + + it("global has property of injectable", () => { + expect(actualPropertyValue).toBe("some-property-value"); + }); + }); + + describe("when a property of modification is accessed, ", () => { + let actualModificationValue: string; + + beforeEach(() => { + actualModificationValue = actual.someModificationProperty; + }); + + it("injects the injectable for global", () => { + expect(di.inject).toHaveBeenCalledWith(someInjectable, undefined); + }); + + it("global has property of modification", () => { + expect(actualModificationValue).toBe("some-modification-value"); + }); + }); + }); +}); diff --git a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts index 679dffb3b6..cc9b5917d6 100644 --- a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts +++ b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications.ts @@ -2,44 +2,18 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { Injectable, TentativeTuple } from "@ogre-tools/injectable"; -import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; - -type MapInjectables = { - [Key in keyof T]: T[Key] extends () => infer Res ? Res : never; -}; +import { asLegacyGlobalForExtensionApi } from "./as-legacy-global-object-for-extension-api"; +import type { Injectable } from "@ogre-tools/injectable"; export const asLegacyGlobalObjectForExtensionApiWithModifications = < - TInjectable extends Injectable, - TInstantiationParameter, - OtherFields extends Record any>, + InjectableInstance extends InjectionTokenInstance, + InjectionTokenInstance, + ModificationObject extends object, >( - injectableKey: TInjectable, - otherFields: OtherFields, - ...instantiationParameter: TentativeTuple + injectable: Injectable, + modificationObject: ModificationObject, ) => - new Proxy( - {}, - { - get(target, propertyName) { - if (propertyName === "$$typeof") { - return undefined; - } - - const instance: any = getLegacyGlobalDiForExtensionApi().inject( - injectableKey, - ...instantiationParameter, - ); - - const propertyValue = instance[propertyName] ?? otherFields[propertyName as any](); - - if (typeof propertyValue === "function") { - return function (...args: any[]) { - return propertyValue.apply(instance, args); - }; - } - - return propertyValue; - }, - }, - ) as ReturnType & MapInjectables; + Object.assign( + asLegacyGlobalForExtensionApi(injectable), + modificationObject, + ); diff --git a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api.ts b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api.ts index 4505f2bb5d..270bb6091e 100644 --- a/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api.ts +++ b/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api.ts @@ -2,30 +2,37 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { Injectable, TentativeTuple } from "@ogre-tools/injectable"; +import type { Inject } from "@ogre-tools/injectable"; import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api"; -export const asLegacyGlobalObjectForExtensionApi = < - TInjectable extends Injectable, - TInstantiationParameter, ->( - injectableKey: TInjectable, - ...instantiationParameter: TentativeTuple - ) => +export const asLegacyGlobalForExtensionApi = (( + injectable, + instantiationParameter, +) => new Proxy( {}, + { + apply(target: any, thisArg, argArray) { + const fn = getLegacyGlobalDiForExtensionApi().inject( + injectable, + instantiationParameter, + ) as unknown as (...args: any[]) => any; + + return fn(...argArray); + }, + get(target, propertyName) { if (propertyName === "$$typeof") { return undefined; } const instance: any = getLegacyGlobalDiForExtensionApi().inject( - injectableKey, - ...instantiationParameter, + injectable, + instantiationParameter, ); - const propertyValue = instance[propertyName]; + const propertyValue = instance[propertyName] ?? target[propertyName]; if (typeof propertyValue === "function") { return function (...args: any[]) { @@ -36,4 +43,4 @@ export const asLegacyGlobalObjectForExtensionApi = < return propertyValue; }, }, - ) as ReturnType; + )) as Inject; diff --git a/src/extensions/renderer-api/components.ts b/src/extensions/renderer-api/components.ts index 8e6df41fa1..62d97c490c 100644 --- a/src/extensions/renderer-api/components.ts +++ b/src/extensions/renderer-api/components.ts @@ -5,16 +5,16 @@ import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; import createTerminalTabInjectable from "../../renderer/components/dock/terminal/create-terminal-tab.injectable"; import terminalStoreInjectable from "../../renderer/components/dock/terminal/store.injectable"; -import { asLegacyGlobalObjectForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; +import { asLegacyGlobalForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; import logTabStoreInjectable from "../../renderer/components/dock/logs/tab-store.injectable"; import commandOverlayInjectable from "../../renderer/components/command-palette/command-overlay.injectable"; -import { asLegacyGlobalObjectForExtensionApiWithModifications } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications"; import createPodLogsTabInjectable from "../../renderer/components/dock/logs/create-pod-logs-tab.injectable"; import createWorkloadLogsTabInjectable from "../../renderer/components/dock/logs/create-workload-logs-tab.injectable"; import sendCommandInjectable from "../../renderer/components/dock/terminal/send-command.injectable"; import { podsStore } from "../../renderer/components/+workloads-pods/pods.store"; import renameTabInjectable from "../../renderer/components/dock/dock/rename-tab.injectable"; +import { asLegacyGlobalObjectForExtensionApiWithModifications } from "../as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api-with-modifications"; // layouts export * from "../../renderer/components/layout/main-layout"; @@ -33,7 +33,9 @@ export * from "../../renderer/components/switch"; export * from "../../renderer/components/input/input"; // command-overlay -export const CommandOverlay = asLegacyGlobalObjectForExtensionApi(commandOverlayInjectable); +export const CommandOverlay = asLegacyGlobalForExtensionApi( + commandOverlayInjectable, +); export type { CategoryColumnRegistration, @@ -74,30 +76,52 @@ export * from "../../renderer/components/+events/kube-event-details"; // specific exports export * from "../../renderer/components/status-brick"; -export const createTerminalTab = asLegacyGlobalFunctionForExtensionApi(createTerminalTabInjectable); -export const terminalStore = asLegacyGlobalObjectForExtensionApiWithModifications(terminalStoreInjectable, { - sendCommand: () => asLegacyGlobalFunctionForExtensionApi(sendCommandInjectable), -}); -export const logTabStore = asLegacyGlobalObjectForExtensionApiWithModifications(logTabStoreInjectable, { - createPodTab: () => asLegacyGlobalFunctionForExtensionApi(createPodLogsTabInjectable), - createWorkloadTab: () => asLegacyGlobalFunctionForExtensionApi(createWorkloadLogsTabInjectable), - renameTab: () => (tabId: string): void => { - const renameTab = asLegacyGlobalFunctionForExtensionApi(renameTabInjectable); - const tabData = logTabStore.getData(tabId); - const pod = podsStore.getById(tabData.selectedPodId); +export const createTerminalTab = asLegacyGlobalFunctionForExtensionApi( + createTerminalTabInjectable, +); - renameTab(tabId, `Pod ${pod.getName()}`); +export const terminalStore = + asLegacyGlobalObjectForExtensionApiWithModifications( + terminalStoreInjectable, + { + sendCommand: asLegacyGlobalFunctionForExtensionApi(sendCommandInjectable), + }, + ); + +export const logTabStore = asLegacyGlobalObjectForExtensionApiWithModifications( + logTabStoreInjectable, + { + createPodTab: asLegacyGlobalFunctionForExtensionApi( + createPodLogsTabInjectable, + ), + + createWorkloadTab: asLegacyGlobalFunctionForExtensionApi( + createWorkloadLogsTabInjectable, + ), + + renameTab: (tabId: string): void => { + const renameTab = + asLegacyGlobalFunctionForExtensionApi(renameTabInjectable); + + const tabData = logTabStore.getData(tabId); + const pod = podsStore.getById(tabData.selectedPodId); + + renameTab(tabId, `Pod ${pod.getName()}`); + }, + + tabs: undefined, }, - tabs: () => undefined, -}); +); export class TerminalStore { static getInstance() { return terminalStore; } + static createInstance() { return terminalStore; } + static resetInstance() { console.warn("TerminalStore.resetInstance() does nothing"); } diff --git a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts index d0c6e2c54b..c9d345c3b2 100644 --- a/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts +++ b/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable"; import { terminalShellEnvModify } from "./terminal-shell-env-modifiers"; @@ -14,8 +14,6 @@ const terminalShellEnvModifyInjectable = getInjectable({ terminalShellEnvModify({ extensions: di.inject(mainExtensionsInjectable), }), - - lifecycle: lifecycleEnum.singleton, }); export default terminalShellEnvModifyInjectable; diff --git a/src/renderer/components/+workloads-overview/detail-components.injectable.ts b/src/renderer/components/+workloads-overview/detail-components.injectable.ts index 53b0a8c344..cdb625a03c 100644 --- a/src/renderer/components/+workloads-overview/detail-components.injectable.ts +++ b/src/renderer/components/+workloads-overview/detail-components.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import { OverviewStatuses } from "./overview-statuses"; @@ -31,8 +31,6 @@ const detailComponentsInjectable = getInjectable({ ); }); }, - - lifecycle: lifecycleEnum.singleton, }); const coreRegistrations = [ diff --git a/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts b/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts index c75aa85236..2e5f302382 100644 --- a/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts +++ b/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; @@ -16,8 +16,6 @@ const statusRegistrationsInjectable = getInjectable({ extensions.get().flatMap((extension) => extension.kubeObjectStatusTexts), ); }, - - lifecycle: lifecycleEnum.singleton, }); export default statusRegistrationsInjectable; diff --git a/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx b/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx index 14c5f4af14..803e5b1800 100644 --- a/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx +++ b/src/renderer/components/status-bar/registered-status-bar-items.injectable.tsx @@ -3,9 +3,12 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import React from "react"; -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { computed, IComputedValue } from "mobx"; -import type { StatusBarItemProps, StatusBarRegistration } from "./status-bar-registration"; +import type { + StatusBarItemProps, + StatusBarRegistration, +} from "./status-bar-registration"; import statusBarItemsInjectable from "./status-bar-items.injectable"; export interface RegisteredStatusBarItems { @@ -69,7 +72,6 @@ const registeredStatusBarItemsInjectable = getInjectable({ registrations: di.inject(statusBarItemsInjectable), }), - lifecycle: lifecycleEnum.singleton, }); export default registeredStatusBarItemsInjectable; diff --git a/src/renderer/components/status-bar/status-bar-items.injectable.ts b/src/renderer/components/status-bar/status-bar-items.injectable.ts index 193ac027d8..05a22b86a7 100644 --- a/src/renderer/components/status-bar/status-bar-items.injectable.ts +++ b/src/renderer/components/status-bar/status-bar-items.injectable.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; @@ -12,12 +12,10 @@ const statusBarItemsInjectable = getInjectable({ instantiate: (di) => { const extensions = di.inject(rendererExtensionsInjectable); - return computed(() => ( - extensions.get() - .flatMap(ext => ext.statusBarItems) - )); + return computed(() => + extensions.get().flatMap((ext) => ext.statusBarItems), + ); }, - lifecycle: lifecycleEnum.singleton, }); export default statusBarItemsInjectable; diff --git a/yarn.lock b/yarn.lock index ad5b92c105..9af1a16e5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -956,28 +956,28 @@ "@nodelib/fs.scandir" "2.1.3" fastq "^1.6.0" -"@ogre-tools/fp@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-5.0.1.tgz#e9953a59b36a747f8248e2e738200b1584e2b40f" - integrity sha512-SmEvCVwBwjzgJ9/BporJ21oLq7cPurl0ECY3WFD1GhwVI8D4R6kZeZkWGKOOp/hG2WRcu9c13HM6JpkL+VUTVQ== +"@ogre-tools/fp@^5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-5.1.2.tgz#8648bcd2e942211b8e94882afbfdf00ae2d07310" + integrity sha512-xWXg51KKoRX5p1czSkhUnWoRvzzM83V9bThWGjZKg5opZMUPmZI/GZ3uSALq0484lDr1rQCK1DaEDy4VDB7tWg== dependencies: lodash "^4.17.21" -"@ogre-tools/injectable-react@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-5.0.1.tgz#fbab22b5779e30aef0007b0507e889434563f74b" - integrity sha512-34cSDwdU5DWiHNVfENJjF0k+baS0EBafYB+GjEmap5Au3QBSbej6P+h9b5QDRsFhzRxmEnIapsaQh00bpwHh2A== +"@ogre-tools/injectable-react@5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-5.1.2.tgz#95cf37881b026a18f3625fbfe896e987cb108f36" + integrity sha512-D/B4Tyh5KuEnPP73QTZpbErDtCHGDbYPp6KvOU4t+TnNUCX0fw2ImPSa09YmjtyLh3hr4DZVyf/QpamY6HEjMw== dependencies: - "@ogre-tools/fp" "^5.0.1" - "@ogre-tools/injectable" "^5.0.1" + "@ogre-tools/fp" "^5.1.2" + "@ogre-tools/injectable" "^5.1.2" lodash "^4.17.21" -"@ogre-tools/injectable@5.0.1", "@ogre-tools/injectable@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-5.0.1.tgz#5947877e928f381e89f64516a9beb69489fecd42" - integrity sha512-pNvHrMseHk4vwDDba92tVfNR6AXk7IblKwIP1nY2Ccs7WCY2GSiC3zBWlYmfTBW/whjJS/6Q4+L6XhfP8zYKyw== +"@ogre-tools/injectable@5.1.2", "@ogre-tools/injectable@^5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-5.1.2.tgz#7fa0673c447e493ea8bc0c6821cfe6e6a79ce8fe" + integrity sha512-dP4T/vHy6HlfAJPzXtzGRlgwMDx7SqnAJKvDuhDPpsMWqEGPxouVMMJIi7aF2lvZtnDj9xJK/VfAk7oXPcMXAA== dependencies: - "@ogre-tools/fp" "^5.0.1" + "@ogre-tools/fp" "^5.1.2" lodash "^4.17.21" "@panva/asn1.js@^1.0.0":