@design.estate/dees-domtools 2.3.3 → 2.3.4

package/dist_bundle/bundle.js

@@ -42860,40 +42860,59 @@ var DomTools2 = class _DomTools {
     this.deesComms = new dist_ts_exports16.DeesComms();
     this.scroller = new Scroller(this);
     this.themeManager = new ThemeManager(this);
-    this.keyboard = new Keyboard(document.body);
+    this.keyboard = null;
+    // Initialized after DOM ready to avoid accessing document.body before it exists
     this.domToolsReady = dist_ts_exports.defer();
     this.domReady = dist_ts_exports.defer();
     this.globalStylesReady = dist_ts_exports.defer();
     this.runOnceTrackerStringMap = new lik.Stringmap();
     this.runOnceResultMap = new lik.FastMap();
+    this.runOnceErrorMap = new lik.FastMap();
+  }
+  static {
+    // ======
+    // STATIC
+    // ======
+    this.initializationPromise = null;
   }
-  // ======
-  // STATIC
-  // ======
   /**
    * setups domtools
    */
   static async setupDomTools(optionsArg = {}) {
-    let domToolsInstance;
-    if (!globalThis.deesDomTools && !optionsArg.ignoreGlobal) {
-      globalThis.deesDomTools = new _DomTools(optionsArg);
-      domToolsInstance = globalThis.deesDomTools;
-      const readyStateChangedFunc = () => {
-        if (document.readyState === "interactive" || document.readyState === "complete") {
-          domToolsInstance.elements.headElement = document.querySelector("head");
-          domToolsInstance.elements.bodyElement = document.querySelector("body");
-          domToolsInstance.domReady.resolve();
+    if (!optionsArg.ignoreGlobal && _DomTools.initializationPromise) {
+      return await _DomTools.initializationPromise;
+    }
+    if (!optionsArg.ignoreGlobal) {
+      _DomTools.initializationPromise = (async () => {
+        let domToolsInstance;
+        if (!globalThis.deesDomTools) {
+          globalThis.deesDomTools = new _DomTools(optionsArg);
+          domToolsInstance = globalThis.deesDomTools;
+          const readyStateChangedFunc = () => {
+            if (document.readyState === "interactive" || document.readyState === "complete") {
+              domToolsInstance.elements.headElement = document.querySelector("head");
+              domToolsInstance.elements.bodyElement = document.querySelector("body");
+              domToolsInstance.keyboard = new Keyboard(document.body);
+              domToolsInstance.domReady.resolve();
+            }
+          };
+          if (document.readyState === "interactive" || document.readyState === "complete") {
+            readyStateChangedFunc();
+          } else {
+            document.addEventListener("readystatechange", readyStateChangedFunc);
+          }
+          domToolsInstance.domToolsReady.resolve();
+        } else {
+          domToolsInstance = globalThis.deesDomTools;
         }
-      };
-      document.addEventListener("readystatechange", readyStateChangedFunc);
-      domToolsInstance.domToolsReady.resolve();
-    } else if (optionsArg.ignoreGlobal) {
-      domToolsInstance = new _DomTools(optionsArg);
+        await domToolsInstance.domToolsReady.promise;
+        return domToolsInstance;
+      })();
+      return await _DomTools.initializationPromise;
     } else {
-      domToolsInstance = globalThis.deesDomTools;
+      const domToolsInstance = new _DomTools(optionsArg);
+      return domToolsInstance;
     }
-    await domToolsInstance.domToolsReady.promise;
-    return domToolsInstance;
   }
   /**
    * if you can, use the static asysnc .setupDomTools() function instead since it is safer to use.
@@ -42915,15 +42934,24 @@ var DomTools2 = class _DomTools {
     if (!this.runOnceTrackerStringMap.checkString(identifierArg)) {
       this.runOnceTrackerStringMap.addString(identifierArg);
       this.runOnceTrackerStringMap.addString(runningId);
-      const result = await funcArg();
-      this.runOnceResultMap.addToMap(identifierArg, result);
-      this.runOnceTrackerStringMap.removeString(runningId);
+      try {
+        const result = await funcArg();
+        this.runOnceResultMap.addToMap(identifierArg, result);
+      } catch (error) {
+        this.runOnceErrorMap.addToMap(identifierArg, error);
+      } finally {
+        this.runOnceTrackerStringMap.removeString(runningId);
+      }
     }
     return await this.runOnceTrackerStringMap.registerUntilTrue(
       (stringMap) => {
         return !stringMap.includes(runningId);
       },
       () => {
+        const error = this.runOnceErrorMap.getByKey(identifierArg);
+        if (error) {
+          throw error;
+        }
         return this.runOnceResultMap.getByKey(identifierArg);
       }
     );