mount-observer 0.1.38 → 0.1.40

package/Synthesizer.js

@@ -216,19 +216,30 @@ export class Synthesizer extends HTMLElement {
         try {
             // Check if export property exists
             let exportValue = scriptElement.export;
-            if (!exportValue) {
-                // Determine which event to wait for based on script type
-                const scriptType = scriptElement.getAttribute('type');
-                const eventName = scriptType === 'emc-parser' ? 'parser-registered' : 'resolved';
-                // Wait for appropriate event with timeout
-                const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout waiting for ${eventName} event`)), 5000));
-                const eventPromise = waitForEvent(scriptElement, eventName);
-                const event = await Promise.race([eventPromise, timeoutPromise]);
-                // For parser scripts, we don't need an export value
-                // For other scripts, get the export from the event
-                if (scriptType !== 'emc-parser') {
-                    exportValue = event.export;
-                }
+            const scriptType = scriptElement.getAttribute('type');
+            if (!exportValue && scriptType !== 'emc-parser') {
+                // Wait for the export to become available via the 'resolved' event.
+                // Use a polling check as a fallback in case the event already fired.
+                exportValue = await new Promise((resolve) => {
+                    // Check immediately in case it was set between our first check and now
+                    if (scriptElement.export) {
+                        resolve(scriptElement.export);
+                        return;
+                    }
+                    const onResolved = (e) => {
+                        clearInterval(poll);
+                        resolve(e.export || scriptElement.export);
+                    };
+                    scriptElement.addEventListener('resolved', onResolved, {once: true});
+                    // Poll as safety net in case event already fired
+                    const poll = setInterval(() => {
+                        if (scriptElement.export) {
+                            scriptElement.removeEventListener('resolved', onResolved);
+                            clearInterval(poll);
+                            resolve(scriptElement.export);
+                        }
+                    }, 50);
+                });
             }
             // Clone the script element
             const clonedScript = scriptElement.cloneNode(true);

package/Synthesizer.ts

@@ -244,25 +244,31 @@ export abstract class Synthesizer extends HTMLElement {
             // Check if export property exists
             let exportValue = (scriptElement as any).export;
             
-            if (!exportValue) {
-                // Determine which event to wait for based on script type
-                const scriptType = scriptElement.getAttribute('type');
-                const eventName = scriptType === 'emc-parser' ? 'parser-registered' : 'resolved';
-                
-                // Wait for appropriate event with timeout
-                const timeoutPromise = new Promise((_, reject) => 
-                    setTimeout(() => reject(new Error(`Timeout waiting for ${eventName} event`)), 5000)
-                );
-                
-                const eventPromise = waitForEvent(scriptElement, eventName);
-                
-                const event = await Promise.race([eventPromise, timeoutPromise]);
-                
-                // For parser scripts, we don't need an export value
-                // For other scripts, get the export from the event
-                if (scriptType !== 'emc-parser') {
-                    exportValue = (event as any).export;
-                }
+            const scriptType = scriptElement.getAttribute('type');
+            
+            if (!exportValue && scriptType !== 'emc-parser') {
+                // Wait for the export to become available via the 'resolved' event.
+                // Use a polling check as a fallback in case the event already fired.
+                exportValue = await new Promise<any>((resolve) => {
+                    // Check immediately in case it was set between our first check and now
+                    if ((scriptElement as any).export) {
+                        resolve((scriptElement as any).export);
+                        return;
+                    }
+                    const onResolved = (e: any) => {
+                        clearInterval(poll);
+                        resolve(e.export || (scriptElement as any).export);
+                    };
+                    scriptElement.addEventListener('resolved', onResolved, {once: true});
+                    // Poll as safety net in case event already fired
+                    const poll = setInterval(() => {
+                        if ((scriptElement as any).export) {
+                            scriptElement.removeEventListener('resolved', onResolved);
+                            clearInterval(poll);
+                            resolve((scriptElement as any).export);
+                        }
+                    }, 50);
+                });
             }
             
             // Clone the script element

package/index.js

@@ -19,7 +19,7 @@ export { mountEventName, dismountEventName, disconnectEventName, loadEventName,
 import './EvtRt.js';
 import './handlers/DefineCustomElement.js';
 import './handlers/EnhanceMountedElement.js';
-import './handlers/GenIds.js'; // Temporarily disabled due to missing dependency
+import './handlers/GenIds.js';
 import './handlers/ScriptExport.js';
 import './handlers/MountObserverScript.js';
 import './handlers/EMCScript.js';

package/index.ts

@@ -39,7 +39,7 @@ export {
 import './EvtRt.js';
 import './handlers/DefineCustomElement.js';
 import './handlers/EnhanceMountedElement.js';
-import './handlers/GenIds.js'; // Temporarily disabled due to missing dependency
+import './handlers/GenIds.js';
 import './handlers/ScriptExport.js';
 import './handlers/MountObserverScript.js';
 import './handlers/EMCScript.js';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "mount-observer",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "description": "Observe and act on css matches.",
   "main": "MountObserver.js",
   "module": "MountObserver.js",
   "dependencies": {
     "assign-gingerly": "0.0.51",
-    "id-generation": "0.0.4"
+    "id-generation": "0.0.5"
   },
   "devDependencies": {
     "@playwright/test": "1.60.0",