fix: actually really make the config singleton

lib/components/ssi-transfer-proof.ts

@@ -1,12 +1,12 @@
 import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
-import { config } from "../main";
 import { GLOBAL_CSS } from "../styles/styles";
 import type {
   ConnectionInfoResponse,
   StartIssuingRequest,
   StartIssuingResponse,
 } from "../types";
+import { useConfig } from "../utils";
 
 import "./ssi-card";
 import "./ssi-qrcode";
@@ -24,6 +24,7 @@ export class SsiTransferProof extends LitElement {
   @state() isActive?: boolean;
 
   timer?: number;
+  config = useConfig();
 
   async firstUpdated(changedProperties: Map<string, unknown>) {
     if (changedProperties.has("token")) {
@@ -142,7 +143,7 @@ export class SsiTransferProof extends LitElement {
       const { active } = await fetch(
         new URL(
           `/v1/connectionInfo?transactionId=${this.currentConnection.transactionId}`,
-          config.baseUrl
+          this.config.baseUrl
         )
       ).then(async (res) =>
         res.ok
@@ -163,7 +164,7 @@ export class SsiTransferProof extends LitElement {
     } else {
       const body: StartIssuingRequest = { token: this.token };
       const connection = (await fetch(
-        new URL("/v1/startIssuing?credentialType=ACAPY", config.baseUrl),
+        new URL("/v1/startIssuing?credentialType=ACAPY", this.config.baseUrl),
         {
           method: "POST",
           body: JSON.stringify(body),

lib/main.ts

@@ -1,28 +1,9 @@
-class Config {
-  static instance: Config;
-
-  private _baseUrl = "";
-
-  constructor() {
-    if (Config.instance) {
-      return Config.instance;
-    }
-
-    Config.instance = this;
-  }
-
-  get baseUrl() {
-    if (!this._baseUrl) {
-      throw new Error(
-        "The base url has not been initialized. Execute `config.init()` before reading any config properties."
-      );
-    }
-    return this._baseUrl;
-  }
-
-  init({ baseUrl }: { baseUrl: string }) {
-    this._baseUrl = baseUrl;
-  }
-}
-
-export const config = new Config();
+import type { Config } from "./types";
+
+export const config: Config = {
+  baseUrl: "",
+  init({ baseUrl }) {
+    this.baseUrl = baseUrl;
+    window.ssiElementsConfig = this;
+  },
+};

lib/types/index.ts

@@ -1,3 +1,8 @@
+export type Config = {
+  baseUrl: string;
+  init: (props: { baseUrl: string }) => void;
+};
+
 export type StartIssuingRequest = { token: string };
 export type StartIssuingResponse = {
   transactionId: string;

lib/utils/index.ts

@@ -0,0 +1,16 @@
+import { Config } from "../types";
+
+export function useConfig() {
+  if (!window.ssiElementsConfig) {
+    throw new Error(
+      "The config has not been initialized. Execute `config.init()` before any properties are read."
+    );
+  }
+  return window.ssiElementsConfig;
+}
+
+declare global {
+  interface Window {
+    ssiElementsConfig: Config | undefined;
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubique-innovation/ssi-issuer-elements",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/UbiqueInnovation/ssi-issuer-elements.git"