introduce applicationInformationToken

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts

@@ -3,12 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "../../../vars/application-information.injectable";
+import applicationInformationToken from "../../../vars/application-information-token.injectable";
 
 const welcomeRouteConfigInjectable = getInjectable({
   id: "welcome-route-config",
 
-  instantiate: (di) => di.inject(applicationInformationInjectable).config.welcomeRoute,
+  instantiate: (di) => di.inject(applicationInformationToken).config.welcomeRoute,
 });
 
 export default welcomeRouteConfigInjectable;

src/common/library.ts

@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import applicationInformationToken from "./vars/application-information-token.injectable";
+
+export {
+  applicationInformationToken,
+};

src/common/vars/application-copyright.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const applicationCopyrightInjectable = getInjectable({
   id: "application-copyright",
-  instantiate: (di) => di.inject(applicationInformationInjectable).copyright,
+  instantiate: (di) => di.inject(applicationInformationToken).copyright,
 });
 
 export default applicationCopyrightInjectable;

src/common/vars/application-description.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const applicationDescriptionInjectable = getInjectable({
   id: "application-description",
-  instantiate: (di) => di.inject(applicationInformationInjectable).description,
+  instantiate: (di) => di.inject(applicationInformationToken).description,
 });
 
 export default applicationDescriptionInjectable;

src/common/vars/application-information-injectable.ts

@@ -4,14 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import packageJson from "../../../package.json";
-
-export type ApplicationInformation = Pick<typeof packageJson, "version" | "config" | "productName" | "copyright" | "description" | "name"> & {
-  build: Partial<typeof packageJson["build"]> & { publish?: unknown[] };
-};
+import applicationInformationToken from "./application-information-token.injectable";
 
 const applicationInformationInjectable = getInjectable({
   id: "application-information",
-  instantiate: (): ApplicationInformation => {
+  injectionToken: applicationInformationToken,
+  instantiate: () => {
     const { version, config, productName, build, copyright, description, name } = packageJson;
 
     return { version, config, productName, build, copyright, description, name };

src/common/vars/application-information-token.injectable.ts

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type packageJson from "../../../package.json";
+
+export type ApplicationInformation = Pick<typeof packageJson, "version" | "config" | "productName" | "copyright" | "description" | "name"> & {
+  build: { publish?: unknown[] };
+};
+
+const applicationInformationToken = getInjectionToken<ApplicationInformation>({
+  id: "application-information-token",
+});
+
+export default applicationInformationToken;

src/common/vars/application-information.global-override-for-injectable.ts

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { getGlobalOverride } from "../test-utils/get-global-override";
-import applicationInformationInjectable from "./application-information.injectable";
-
-export default getGlobalOverride(applicationInformationInjectable, () => ({
-  name: "some-product-name",
-  productName: "some-product-name",
-  version: "6.0.0",
-  build: {},
-  config: {
-    k8sProxyVersion: "0.2.1",
-    bundledKubectlVersion: "1.23.3",
-    bundledHelmVersion: "3.7.2",
-    sentryDsn: "",
-    contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:",
-    welcomeRoute: "/welcome",
-    extensions: [],
-  },
-  copyright: "some-copyright-information",
-  description: "some-descriptive-text",
-}));

src/common/vars/application-information.injectable-for-testing.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectable } from "@ogre-tools/injectable";
+import applicationInformationToken from "./application-information-token.injectable";
+
+const applicationInformationForTestingInjectable = getInjectable({
+  id: "application-information-for-testing",
+  injectionToken: applicationInformationToken,
+  instantiate: () => ({
+    name: "some-product-name",
+    productName: "some-product-name",
+    version: "6.0.0",
+    build: {},
+    config: {
+      k8sProxyVersion: "0.2.1",
+      bundledKubectlVersion: "1.23.3",
+      bundledHelmVersion: "3.7.2",
+      sentryDsn: "",
+      contentSecurityPolicy: "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:",
+      welcomeRoute: "/welcome",
+      extensions: [],
+    },
+    copyright: "some-copyright-information",
+    description: "some-descriptive-text",
+  }),
+  causesSideEffects: false,
+});
+
+export default applicationInformationForTestingInjectable;

src/common/vars/bundled-kubectl-version.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const bundledKubectlVersionInjectable = getInjectable({
   id: "bundled-kubectl-version",
-  instantiate: (di) => di.inject(applicationInformationInjectable).config.bundledKubectlVersion,
+  instantiate: (di) => di.inject(applicationInformationToken).config.bundledKubectlVersion,
 });
 
 export default bundledKubectlVersionInjectable;

src/common/vars/content-security-policy.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const contentSecurityPolicyInjectable = getInjectable({
   id: "content-security-policy",
-  instantiate: (di) => di.inject(applicationInformationInjectable).config.contentSecurityPolicy,
+  instantiate: (di) => di.inject(applicationInformationToken).config.contentSecurityPolicy,
 });
 
 export default contentSecurityPolicyInjectable;

src/common/vars/extension-api-version.injectable.ts

@@ -4,12 +4,12 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { SemVer } from "semver";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const extensionApiVersionInjectable = getInjectable({
   id: "extension-api-version",
   instantiate: (di) => {
-    const { major, minor, patch } = new SemVer(di.inject(applicationInformationInjectable).version);
+    const { major, minor, patch } = new SemVer(di.inject(applicationInformationToken).version);
 
     return `${major}.${minor}.${patch}`;
   },

src/common/vars/product-name.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const productNameInjectable = getInjectable({
   id: "product-name",
-  instantiate: (di) => di.inject(applicationInformationInjectable).productName,
+  instantiate: (di) => di.inject(applicationInformationToken).productName,
 });
 
 export default productNameInjectable;

src/common/vars/sentry-dsn-url.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const sentryDataSourceNameInjectable = getInjectable({
   id: "sentry-data-source-name",
-  instantiate: (di) => di.inject(applicationInformationInjectable).config.sentryDsn,
+  instantiate: (di) => di.inject(applicationInformationToken).config.sentryDsn,
 });
 
 export default sentryDataSourceNameInjectable;

src/common/vars/store-migration-version.injectable.ts

@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationInjectable from "./application-information.injectable";
+import applicationInformationToken from "./application-information-token.injectable";
 
 const storeMigrationVersionInjectable = getInjectable({
   id: "store-migration-version",
-  instantiate: (di) => di.inject(applicationInformationInjectable).version,
+  instantiate: (di) => di.inject(applicationInformationToken).version,
 });
 
 export default storeMigrationVersionInjectable;