@countriesdb/widget 0.1.15 → 0.1.17

package/dist/index.js

@@ -1007,19 +1007,6 @@
      */
     // Global namespace to prevent double initialization
     const NS_KEY = '__CountriesWidgetNS__';
-    // Capture script URL immediately when module loads (while document.currentScript is available)
-    let capturedScriptUrl = null;
-    try {
-        if (typeof document !== 'undefined' && document.currentScript && document.currentScript instanceof HTMLScriptElement) {
-            const currentScript = document.currentScript;
-            if (currentScript.src) {
-                capturedScriptUrl = new URL(currentScript.src);
-            }
-        }
-    }
-    catch {
-        // Ignore errors
-    }
     /**
      * Main widget initialization function
      */
@@ -1111,30 +1098,19 @@
         // Try to get config from script URL (for backward compatibility with widget.blade.php)
         let scriptUrl = null;
         try {
-            // First, use the captured script URL (captured at module load time)
-            if (capturedScriptUrl) {
-                scriptUrl = capturedScriptUrl;
+            let loaderScript = null;
+            // First try document.currentScript (works during script execution)
+            if (document.currentScript && document.currentScript instanceof HTMLScriptElement) {
+                loaderScript = document.currentScript;
             }
             else {
-                // Fallback: try to find script tag
-                let loaderScript = null;
-                // Try document.currentScript (works during script execution)
-                if (document.currentScript && document.currentScript instanceof HTMLScriptElement) {
-                    loaderScript = document.currentScript;
-                }
-                else {
-                    // Fallback: find script tag with @countriesdb/widget in src
-                    const scripts = Array.from(document.getElementsByTagName('script'));
-                    loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
-                        s.src.includes('widget/dist/index.js'))) || null;
-                    // If still not found, try the last script with src
-                    if (!loaderScript) {
-                        loaderScript = scripts.filter((s) => s.src).pop() || null;
-                    }
-                }
-                if (loaderScript && loaderScript.src) {
-                    scriptUrl = new URL(loaderScript.src);
-                }
+                // Only consider script tags that loaded the widget bundle
+                const scripts = Array.from(document.getElementsByTagName('script'));
+                loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
+                    s.src.includes('widget/dist/index.js'))) || null;
+            }
+            if (loaderScript && loaderScript.src) {
+                scriptUrl = new URL(loaderScript.src);
             }
         }
         catch {
@@ -1196,30 +1172,19 @@
      */
     function getBackendUrlFromScript() {
         try {
-            // Use captured script URL first (captured at module load time)
-            let scriptUrl = capturedScriptUrl;
-            // If not captured, try to find script tag
-            if (!scriptUrl) {
-                let loaderScript = null;
-                // First try document.currentScript (works during script execution)
-                if (document.currentScript && document.currentScript instanceof HTMLScriptElement) {
-                    loaderScript = document.currentScript;
-                }
-                else {
-                    // Fallback: find script tag with @countriesdb/widget in src
-                    const scripts = Array.from(document.getElementsByTagName('script'));
-                    loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
-                        s.src.includes('widget/dist/index.js'))) || null;
-                    // If still not found, try the last script with src
-                    if (!loaderScript) {
-                        loaderScript = scripts.filter((s) => s.src).pop() || null;
-                    }
-                }
-                if (loaderScript && loaderScript.src) {
-                    scriptUrl = new URL(loaderScript.src);
-                }
+            let loaderScript = null;
+            // First try document.currentScript (works during script execution)
+            if (document.currentScript && document.currentScript instanceof HTMLScriptElement) {
+                loaderScript = document.currentScript;
             }
-            if (scriptUrl) {
+            else {
+                // Only consider script tags that loaded the widget bundle
+                const scripts = Array.from(document.getElementsByTagName('script'));
+                loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
+                    s.src.includes('widget/dist/index.js'))) || null;
+            }
+            if (loaderScript && loaderScript.src) {
+                const scriptUrl = new URL(loaderScript.src);
                 const hostname = scriptUrl.hostname;
                 // List of known CDN hostnames - if script is from a CDN, use default API
                 const cdnHostnames = [
@@ -1296,34 +1261,23 @@
                 document.addEventListener('DOMContentLoaded', checkAutoInit, { once: true });
                 return;
             }
+            // Find the script tag that loaded this widget
+            let loaderScript = null;
+            // First try document.currentScript (works during script execution)
+            if (document.currentScript && document.currentScript instanceof HTMLScriptElement) {
+                loaderScript = document.currentScript;
+            }
+            else {
+                // Fallback: find script tag with @countriesdb/widget in src
+                const scripts = Array.from(document.getElementsByTagName('script'));
+                loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
+                    s.src.includes('widget/dist/index.js'))) || null;
+            }
             // Default to auto-init = true (only disable if explicitly set to false)
             let shouldAutoInit = true;
-            // Use captured script URL first (captured at module load time)
-            let scriptUrl = capturedScriptUrl;
-            // If not captured, try to find script tag
-            if (!scriptUrl) {
-                let loaderScript = null;
-                // Try document.currentScript (works during script execution)
-                if (document.currentScript && document.currentScript instanceof HTMLScriptElement) {
-                    loaderScript = document.currentScript;
-                }
-                else {
-                    // Fallback: find script tag with @countriesdb/widget in src
-                    const scripts = Array.from(document.getElementsByTagName('script'));
-                    loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
-                        s.src.includes('widget/dist/index.js'))) || null;
-                }
-                if (loaderScript && loaderScript.src) {
-                    try {
-                        scriptUrl = new URL(loaderScript.src);
-                    }
-                    catch {
-                        // Ignore errors
-                    }
-                }
-            }
-            if (scriptUrl) {
+            if (loaderScript && loaderScript.src) {
                 try {
+                    const scriptUrl = new URL(loaderScript.src);
                     const autoInit = scriptUrl.searchParams.get('auto_init');
                     // Only disable if explicitly set to false/0
                     shouldAutoInit = autoInit === null || autoInit === 'true' || autoInit === '1';