From a1f651c28736966cba1e455e5c4e19616d62ea61 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 2 Mar 2023 10:36:43 -0500 Subject: [PATCH] Use new @k8slens/run-many package in core Signed-off-by: Sebastian Malton --- package-lock.json | 16 +---------- packages/core/package.json | 2 +- ...ables-after-window-is-opened.injectable.ts | 2 +- ...efore-closing-of-application.injectable.ts | 2 +- .../runnable-tokens/phases.ts | 2 +- .../channel-listener.injectable.ts | 2 +- .../renderer/before-frame-starts/tokens.ts | 2 +- .../start-frame/start-frame.injectable.ts | 2 +- packages/open-lens/package.json | 1 - .../application/agnostic/index.ts | 4 +-- .../application/agnostic/package.json | 1 - .../start-application.injectable.ts | 21 ++++---------- .../starting-of-application.test.ts | 10 +++---- .../src/start-application/time-slots.ts | 14 ++++++++++ ...r-application-is-loaded-injection-token.ts | 7 ----- ...-application-is-loading-injection-token.ts | 7 ----- .../on-load-of-application-injection-token.ts | 6 ---- .../application/electron-main/index.ts | 3 +- .../application/electron-main/package.json | 1 - .../start-electron-application.injectable.ts | 28 ++++++------------- .../src/start-application/time-slots.ts | 10 +++++++ .../before-anything-injection-token.ts | 6 ---- ...efore-electron-is-ready-injection-token.ts | 6 ---- .../when-app-is-ready.test.ts | 6 ++-- ...rting-of-electron-main-application.test.ts | 3 +- packages/utility-features/run-many/index.ts | 2 ++ 26 files changed, 58 insertions(+), 108 deletions(-) create mode 100644 packages/technical-features/application/agnostic/src/start-application/time-slots.ts delete mode 100644 packages/technical-features/application/agnostic/src/start-application/timeslots/after-application-is-loaded-injection-token.ts delete mode 100644 packages/technical-features/application/agnostic/src/start-application/timeslots/before-application-is-loading-injection-token.ts delete mode 100644 packages/technical-features/application/agnostic/src/start-application/timeslots/on-load-of-application-injection-token.ts create mode 100644 packages/technical-features/application/electron-main/src/start-application/time-slots.ts delete mode 100644 packages/technical-features/application/electron-main/src/start-application/timeslots/before-anything-injection-token.ts delete mode 100644 packages/technical-features/application/electron-main/src/start-application/timeslots/before-electron-is-ready-injection-token.ts rename packages/technical-features/application/electron-main/src/start-application/{when-app-is-ready => }/when-app-is-ready.test.ts (85%) diff --git a/package-lock.json b/package-lock.json index a54a1a422e..c5290a8eee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4685,16 +4685,6 @@ "react-dom": "^17 || ^18" } }, - "node_modules/@ogre-tools/injectable-utils": { - "version": "15.1.2", - "resolved": "https://registry.npmjs.org/@ogre-tools/injectable-utils/-/injectable-utils-15.1.2.tgz", - "integrity": "sha512-2MjkmA2HRFQ6Czz8BWtujosFDgPO6OXnzkbWYvDFYT7W8zLJHmeXzt4mWjw90+vIfwAPOQWOlBP6T4yau9tSug==", - "peerDependencies": { - "@ogre-tools/fp": "*", - "@ogre-tools/injectable": "*", - "lodash": "^4.17.21" - } - }, "node_modules/@ogre-tools/test-utils": { "version": "15.1.2", "resolved": "https://registry.npmjs.org/@ogre-tools/test-utils/-/test-utils-15.1.2.tgz", @@ -32353,7 +32343,6 @@ "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", "@ogre-tools/injectable-extension-for-mobx": "^15.1.2", "@ogre-tools/injectable-react": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "@sentry/electron": "^3.0.8", "@sentry/integrations": "^6.19.3", "@side/jest-runtime": "^1.1.0", @@ -32553,6 +32542,7 @@ "peerDependencies": { "@k8slens/application": "^6.5.0-alpha.0", "@k8slens/application-for-electron-main": "^6.5.0-alpha.0", + "@k8slens/run-many": "^1.0.0", "@k8slens/test-utils": "^1.0.0", "@k8slens/utilities": "^1.0.0", "@types/byline": "^4.2.33", @@ -34401,7 +34391,6 @@ "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", "@ogre-tools/injectable-extension-for-mobx": "^15.1.2", "@ogre-tools/injectable-react": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "mobx": "^6.8.0", "rimraf": "^4.1.2" }, @@ -34914,7 +34903,6 @@ "@ogre-tools/fp": "^15.1.1", "@ogre-tools/injectable": "^15.1.1", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.1", - "@ogre-tools/injectable-utils": "^15.1.1", "lodash": "^4.17.15" } }, @@ -34930,7 +34918,6 @@ "@ogre-tools/fp": "^15.1.2", "@ogre-tools/injectable": "^15.1.2", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "lodash": "^4.17.15" } }, @@ -34947,7 +34934,6 @@ "@k8slens/feature-core": "^6.5.0-alpha.0", "@ogre-tools/injectable": "^15.1.2", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "electron": "^19.1.9" } }, diff --git a/packages/core/package.json b/packages/core/package.json index 91c3605479..04ca0224c3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -135,7 +135,6 @@ "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", "@ogre-tools/injectable-extension-for-mobx": "^15.1.2", "@ogre-tools/injectable-react": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "@sentry/electron": "^3.0.8", "@sentry/integrations": "^6.19.3", "@side/jest-runtime": "^1.1.0", @@ -332,6 +331,7 @@ "peerDependencies": { "@k8slens/application": "^6.5.0-alpha.0", "@k8slens/application-for-electron-main": "^6.5.0-alpha.0", + "@k8slens/run-many": "^1.0.0", "@k8slens/test-utils": "^1.0.0", "@k8slens/utilities": "^1.0.0", "@types/byline": "^4.2.33", diff --git a/packages/core/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts index 104e65dec7..5370c0e303 100644 --- a/packages/core/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { beforeElectronIsReadyInjectionToken } from "@k8slens/application-for-electron-main"; import { afterWindowIsOpenedInjectionToken } from "../../start-main-application/runnable-tokens/phases"; import electronAppInjectable from "../electron-app.injectable"; -import { runManyFor } from "../../../common/runnable/run-many-for"; +import { runManyFor } from "@k8slens/run-many"; const setupRunnablesAfterWindowIsOpenedInjectable = getInjectable({ id: "setup-runnables-after-window-is-opened", diff --git a/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts b/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts index 7ed42e58ee..0ba1b68137 100644 --- a/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts +++ b/packages/core/src/main/electron-app/runnables/setup-runnables-before-closing-of-application.injectable.ts @@ -8,7 +8,7 @@ import { beforeQuitOfFrontEndInjectionToken, beforeQuitOfBackEndInjectionToken } import electronAppInjectable from "../electron-app.injectable"; import isIntegrationTestingInjectable from "../../../common/vars/is-integration-testing.injectable"; import autoUpdaterInjectable from "../features/auto-updater.injectable"; -import { runManySyncFor } from "../../../common/runnable/run-many-sync-for"; +import { runManySyncFor } from "@k8slens/run-many"; const setupRunnablesBeforeClosingOfApplicationInjectable = getInjectable({ id: "setup-closing-of-application", diff --git a/packages/core/src/main/start-main-application/runnable-tokens/phases.ts b/packages/core/src/main/start-main-application/runnable-tokens/phases.ts index fbae69c1f7..5808062fb2 100644 --- a/packages/core/src/main/start-main-application/runnable-tokens/phases.ts +++ b/packages/core/src/main/start-main-application/runnable-tokens/phases.ts @@ -4,7 +4,7 @@ */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable, RunnableSync } from "../../../common/runnable/types"; +import type { Runnable, RunnableSync } from "@k8slens/run-many"; export const beforeQuitOfFrontEndInjectionToken = getInjectionToken({ id: "before-quit-of-front-end", diff --git a/packages/core/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts b/packages/core/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts index bef7b5a490..8b906c79e9 100644 --- a/packages/core/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts +++ b/packages/core/src/main/start-main-application/runnables/root-frame-has-rendered/channel-listener.injectable.ts @@ -4,7 +4,7 @@ */ import { getMessageChannelListenerInjectable } from "../../../../common/utils/channel/message-channel-listener-injection-token"; import { rootFrameHasRenderedChannel } from "../../../../common/root-frame/root-frame-rendered-channel"; -import { runManyFor } from "../../../../common/runnable/run-many-for"; +import { runManyFor } from "@k8slens/run-many"; import { afterRootFrameIsReadyInjectionToken } from "../../runnable-tokens/phases"; const rootFrameRenderedChannelListenerInjectable = getMessageChannelListenerInjectable({ diff --git a/packages/core/src/renderer/before-frame-starts/tokens.ts b/packages/core/src/renderer/before-frame-starts/tokens.ts index b73ca3d5df..26cbce9133 100644 --- a/packages/core/src/renderer/before-frame-starts/tokens.ts +++ b/packages/core/src/renderer/before-frame-starts/tokens.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "../../common/runnable/types"; +import type { Runnable } from "@k8slens/run-many"; // NOTE: these are run before any other token, mostly to set up things that all other runnables need export const beforeFrameStartsFirstInjectionToken = getInjectionToken({ diff --git a/packages/core/src/renderer/start-frame/start-frame.injectable.ts b/packages/core/src/renderer/start-frame/start-frame.injectable.ts index e7311455c0..b4bddc9c30 100644 --- a/packages/core/src/renderer/start-frame/start-frame.injectable.ts +++ b/packages/core/src/renderer/start-frame/start-frame.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { runManyFor } from "../../common/runnable/run-many-for"; +import { runManyFor } from "@k8slens/run-many"; import * as tokens from "../before-frame-starts/tokens"; import currentlyInClusterFrameInjectable from "../routes/currently-in-cluster-frame.injectable"; import { diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index b7bfb55244..2ea43cab05 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -206,7 +206,6 @@ "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", "@ogre-tools/injectable-extension-for-mobx": "^15.1.2", "@ogre-tools/injectable-react": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "mobx": "^6.8.0", "rimraf": "^4.1.2" }, diff --git a/packages/technical-features/application/agnostic/index.ts b/packages/technical-features/application/agnostic/index.ts index 559a91582b..239e938cd2 100644 --- a/packages/technical-features/application/agnostic/index.ts +++ b/packages/technical-features/application/agnostic/index.ts @@ -1,8 +1,6 @@ export { applicationFeature } from "./src/feature"; -export { onLoadOfApplicationInjectionToken } from "./src/start-application/timeslots/on-load-of-application-injection-token"; -export { beforeApplicationIsLoadingInjectionToken } from "./src/start-application/timeslots/before-application-is-loading-injection-token"; -export { afterApplicationIsLoadedInjectionToken } from "./src/start-application/timeslots/after-application-is-loaded-injection-token"; +export * from "./src/start-application/time-slots"; export type { StartApplication } from "./src/start-application/start-application.injectable"; export { startApplicationInjectionToken } from "./src/start-application/start-application.injectable"; diff --git a/packages/technical-features/application/agnostic/package.json b/packages/technical-features/application/agnostic/package.json index 35b555ac2e..fc9318e286 100644 --- a/packages/technical-features/application/agnostic/package.json +++ b/packages/technical-features/application/agnostic/package.json @@ -33,7 +33,6 @@ "@ogre-tools/fp": "^15.1.2", "@ogre-tools/injectable": "^15.1.2", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "lodash": "^4.17.15" }, diff --git a/packages/technical-features/application/agnostic/src/start-application/start-application.injectable.ts b/packages/technical-features/application/agnostic/src/start-application/start-application.injectable.ts index 4d9d8c9da2..895462f08e 100644 --- a/packages/technical-features/application/agnostic/src/start-application/start-application.injectable.ts +++ b/packages/technical-features/application/agnostic/src/start-application/start-application.injectable.ts @@ -1,8 +1,6 @@ import { getInjectable, getInjectionToken } from "@ogre-tools/injectable"; -import { runManyFor } from "@ogre-tools/injectable-utils"; -import { beforeApplicationIsLoadingInjectionToken } from "./timeslots/before-application-is-loading-injection-token"; -import { onLoadOfApplicationInjectionToken } from "./timeslots/on-load-of-application-injection-token"; -import { afterApplicationIsLoadedInjectionToken } from "./timeslots/after-application-is-loaded-injection-token"; +import { runManyFor } from "@k8slens/run-many"; +import * as timeSlots from "./time-slots"; export type StartApplication = () => Promise; @@ -16,22 +14,13 @@ const startApplicationInjectable = getInjectable({ instantiate: (di): StartApplication => { const runManyAsync = runManyFor(di) - - const beforeApplicationIsLoading = runManyAsync( - beforeApplicationIsLoadingInjectionToken - ); - - const onLoadOfApplication = runManyAsync(onLoadOfApplicationInjectionToken); - - const afterApplicationIsLoaded = runManyAsync( - afterApplicationIsLoadedInjectionToken - ); + const beforeApplicationIsLoading = runManyAsync(timeSlots.beforeApplicationIsLoadingInjectionToken); + const onLoadOfApplication = runManyAsync(timeSlots.onLoadOfApplicationInjectionToken); + const afterApplicationIsLoaded = runManyAsync(timeSlots.afterApplicationIsLoadedInjectionToken); return async () => { await beforeApplicationIsLoading(); - await onLoadOfApplication(); - await afterApplicationIsLoaded(); }; }, diff --git a/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts b/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts index 37453d4ba3..3593eb188a 100644 --- a/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts +++ b/packages/technical-features/application/agnostic/src/start-application/starting-of-application.test.ts @@ -6,10 +6,8 @@ import { import { registerFeature } from "@k8slens/feature-core"; import { applicationFeature } from "../feature"; import { startApplicationInjectionToken } from "./start-application.injectable"; -import { beforeApplicationIsLoadingInjectionToken } from "./timeslots/before-application-is-loading-injection-token"; +import * as timeSlots from "./time-slots"; import asyncFn, { AsyncFnMock } from "@async-fn/jest"; -import { onLoadOfApplicationInjectionToken } from "./timeslots/on-load-of-application-injection-token"; -import { afterApplicationIsLoadedInjectionToken } from "./timeslots/after-application-is-loaded-injection-token"; describe("starting-of-application", () => { let di: DiContainer; @@ -30,19 +28,19 @@ describe("starting-of-application", () => { const beforeApplicationIsLoadingInjectable = getInjectable({ id: "before-application-is-loading", instantiate: () => ({ run: beforeApplicationIsLoadingMock }), - injectionToken: beforeApplicationIsLoadingInjectionToken, + injectionToken: timeSlots.beforeApplicationIsLoadingInjectionToken, }); const onLoadOfApplicationInjectable = getInjectable({ id: "on-load-of-application", instantiate: () => ({ run: onLoadOfApplicationMock }), - injectionToken: onLoadOfApplicationInjectionToken, + injectionToken: timeSlots.onLoadOfApplicationInjectionToken, }); const afterApplicationIsLoadedInjectable = getInjectable({ id: "after-application-is-loaded", instantiate: () => ({ run: afterApplicationIsLoadedMock }), - injectionToken: afterApplicationIsLoadedInjectionToken, + injectionToken: timeSlots.afterApplicationIsLoadedInjectionToken, }); di.register( diff --git a/packages/technical-features/application/agnostic/src/start-application/time-slots.ts b/packages/technical-features/application/agnostic/src/start-application/time-slots.ts new file mode 100644 index 0000000000..8a8aae65a0 --- /dev/null +++ b/packages/technical-features/application/agnostic/src/start-application/time-slots.ts @@ -0,0 +1,14 @@ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { Runnable } from "@k8slens/run-many"; + +export const beforeApplicationIsLoadingInjectionToken = getInjectionToken({ + id: "before-application-is-loading-injection-token", +}); + +export const onLoadOfApplicationInjectionToken = getInjectionToken({ + id: "on-load-of-application", +}); + +export const afterApplicationIsLoadedInjectionToken = getInjectionToken({ + id: "after-application-is-loaded-injection-token", +}); diff --git a/packages/technical-features/application/agnostic/src/start-application/timeslots/after-application-is-loaded-injection-token.ts b/packages/technical-features/application/agnostic/src/start-application/timeslots/after-application-is-loaded-injection-token.ts deleted file mode 100644 index 6e04840f6e..0000000000 --- a/packages/technical-features/application/agnostic/src/start-application/timeslots/after-application-is-loaded-injection-token.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "@ogre-tools/injectable-utils"; - -export const afterApplicationIsLoadedInjectionToken = - getInjectionToken({ - id: "after-application-is-loaded-injection-token", - }); diff --git a/packages/technical-features/application/agnostic/src/start-application/timeslots/before-application-is-loading-injection-token.ts b/packages/technical-features/application/agnostic/src/start-application/timeslots/before-application-is-loading-injection-token.ts deleted file mode 100644 index 54bff82be5..0000000000 --- a/packages/technical-features/application/agnostic/src/start-application/timeslots/before-application-is-loading-injection-token.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "@ogre-tools/injectable-utils"; - -export const beforeApplicationIsLoadingInjectionToken = - getInjectionToken({ - id: "before-application-is-loading-injection-token", - }); diff --git a/packages/technical-features/application/agnostic/src/start-application/timeslots/on-load-of-application-injection-token.ts b/packages/technical-features/application/agnostic/src/start-application/timeslots/on-load-of-application-injection-token.ts deleted file mode 100644 index c732329e29..0000000000 --- a/packages/technical-features/application/agnostic/src/start-application/timeslots/on-load-of-application-injection-token.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "@ogre-tools/injectable-utils"; - -export const onLoadOfApplicationInjectionToken = getInjectionToken({ - id: "on-load-of-application", -}); diff --git a/packages/technical-features/application/electron-main/index.ts b/packages/technical-features/application/electron-main/index.ts index d3d92e0aa3..8d853ee1e3 100644 --- a/packages/technical-features/application/electron-main/index.ts +++ b/packages/technical-features/application/electron-main/index.ts @@ -1,7 +1,6 @@ import { overrideSideEffectsWithFakes } from "./src/override-side-effects-with-fakes"; -export { beforeElectronIsReadyInjectionToken } from "./src/start-application/timeslots/before-electron-is-ready-injection-token"; -export { beforeAnythingInjectionToken } from "./src/start-application/timeslots/before-anything-injection-token"; +export * from "./src/start-application/time-slots"; export { applicationFeatureForElectronMain } from "./src/feature"; diff --git a/packages/technical-features/application/electron-main/package.json b/packages/technical-features/application/electron-main/package.json index eb1b42c2c8..f68cc3edd8 100644 --- a/packages/technical-features/application/electron-main/package.json +++ b/packages/technical-features/application/electron-main/package.json @@ -33,7 +33,6 @@ "@k8slens/application": "^6.5.0-alpha.0", "@ogre-tools/injectable": "^15.1.2", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", - "@ogre-tools/injectable-utils": "^15.1.2", "electron": "^19.1.9" }, diff --git a/packages/technical-features/application/electron-main/src/start-application/start-electron-application.injectable.ts b/packages/technical-features/application/electron-main/src/start-application/start-electron-application.injectable.ts index 5d5944fbaf..f107ada913 100644 --- a/packages/technical-features/application/electron-main/src/start-application/start-electron-application.injectable.ts +++ b/packages/technical-features/application/electron-main/src/start-application/start-electron-application.injectable.ts @@ -6,32 +6,22 @@ import { } from "@ogre-tools/injectable"; import { startApplicationInjectionToken } from "@k8slens/application"; import whenAppIsReadyInjectable from "./when-app-is-ready.injectable"; -import { beforeAnythingInjectionToken } from "./timeslots/before-anything-injection-token"; -import { beforeElectronIsReadyInjectionToken } from "./timeslots/before-electron-is-ready-injection-token"; -import { runManySyncFor } from "@ogre-tools/injectable-utils"; +import { beforeAnythingInjectionToken, beforeElectronIsReadyInjectionToken } from "./time-slots"; +import { runManySyncFor } from "@k8slens/run-many"; + +type ToBeDecorated = (di: DiContainer, ...args: unknown[]) => (...args: unknown[]) => unknown; const startElectronApplicationInjectable = getInjectable({ id: "start-electron-application", instantiate: () => ({ - decorate: - (toBeDecorated: unknown) => + decorate: (toBeDecorated: unknown) => ( (di: DiContainer, ...args: unknown[]) => { const whenAppIsReady = di.inject(whenAppIsReadyInjectable); const runManySync = runManySyncFor(di); const beforeAnything = runManySync(beforeAnythingInjectionToken); - const beforeElectronIsReady = runManySync( - beforeElectronIsReadyInjectionToken - ); - - const typedToBeDecorated = toBeDecorated as ( - di: DiContainer, - ...args: unknown[] - ) => unknown; - - const startApplication = typedToBeDecorated(di, ...args) as ( - ...args: unknown[] - ) => unknown; + const beforeElectronIsReady = runManySync(beforeElectronIsReadyInjectionToken); + const startApplication = (toBeDecorated as ToBeDecorated)(di, ...args); return (...startApplicationArgs: unknown[]) => { beforeAnything(); @@ -43,8 +33,8 @@ const startElectronApplicationInjectable = getInjectable({ return startApplication(...startApplicationArgs); })() }; - }, - + } + ), target: startApplicationInjectionToken, }), diff --git a/packages/technical-features/application/electron-main/src/start-application/time-slots.ts b/packages/technical-features/application/electron-main/src/start-application/time-slots.ts new file mode 100644 index 0000000000..58673517ae --- /dev/null +++ b/packages/technical-features/application/electron-main/src/start-application/time-slots.ts @@ -0,0 +1,10 @@ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { RunnableSync } from "@k8slens/run-many"; + +export const beforeAnythingInjectionToken = getInjectionToken({ + id: "before-anything", +}); + +export const beforeElectronIsReadyInjectionToken = getInjectionToken({ + id: "before-electron-is-ready-injection-token", +}); diff --git a/packages/technical-features/application/electron-main/src/start-application/timeslots/before-anything-injection-token.ts b/packages/technical-features/application/electron-main/src/start-application/timeslots/before-anything-injection-token.ts deleted file mode 100644 index f8d2ef9203..0000000000 --- a/packages/technical-features/application/electron-main/src/start-application/timeslots/before-anything-injection-token.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "@ogre-tools/injectable-utils"; - -export const beforeAnythingInjectionToken = getInjectionToken({ - id: "before-anything", -}); diff --git a/packages/technical-features/application/electron-main/src/start-application/timeslots/before-electron-is-ready-injection-token.ts b/packages/technical-features/application/electron-main/src/start-application/timeslots/before-electron-is-ready-injection-token.ts deleted file mode 100644 index c8c88bddae..0000000000 --- a/packages/technical-features/application/electron-main/src/start-application/timeslots/before-electron-is-ready-injection-token.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Runnable } from "@ogre-tools/injectable-utils"; - -export const beforeElectronIsReadyInjectionToken = getInjectionToken({ - id: "before-electron-is-ready-injection-token", -}); diff --git a/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts b/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready.test.ts similarity index 85% rename from packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts rename to packages/technical-features/application/electron-main/src/start-application/when-app-is-ready.test.ts index 3e3fe40a52..f0dc073c59 100644 --- a/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready/when-app-is-ready.test.ts +++ b/packages/technical-features/application/electron-main/src/start-application/when-app-is-ready.test.ts @@ -1,9 +1,9 @@ import { createContainer, DiContainer } from "@ogre-tools/injectable"; -import { applicationFeatureForElectronMain } from "../../feature"; +import { applicationFeatureForElectronMain } from "../feature"; import { registerFeature } from "@k8slens/feature-core"; -import whenAppIsReadyInjectable from "../when-app-is-ready.injectable"; +import whenAppIsReadyInjectable from "./when-app-is-ready.injectable"; import { getPromiseStatus } from "@ogre-tools/test-utils"; -import electronAppInjectable from "../../electron/electron-app.injectable"; +import electronAppInjectable from "../electron/electron-app.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; diff --git a/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts b/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts index fb344a193b..f5e067f9ae 100644 --- a/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts +++ b/packages/technical-features/application/electron-main/src/starting-of-electron-main-application.test.ts @@ -11,8 +11,7 @@ import { } from "@k8slens/application"; import asyncFn, { AsyncFnMock } from "@async-fn/jest"; import whenAppIsReadyInjectable from "./start-application/when-app-is-ready.injectable"; -import { beforeAnythingInjectionToken } from "./start-application/timeslots/before-anything-injection-token"; -import { beforeElectronIsReadyInjectionToken } from "./start-application/timeslots/before-electron-is-ready-injection-token"; +import { beforeAnythingInjectionToken, beforeElectronIsReadyInjectionToken } from "./start-application/time-slots"; describe("starting-of-electron-main-application", () => { let di: DiContainer; diff --git a/packages/utility-features/run-many/index.ts b/packages/utility-features/run-many/index.ts index 7944895d01..30f67f43d9 100644 --- a/packages/utility-features/run-many/index.ts +++ b/packages/utility-features/run-many/index.ts @@ -1,2 +1,4 @@ export * from "./src/run-many-for"; export * from "./src/run-many-sync-for"; + +export type { Runnable, RunnableSync, Run, RunSync } from "./src/types";