mount-observer 0.0.46 → 0.0.47

package/MountObserver.js

@@ -418,9 +418,11 @@ export class MountObserver extends EventTarget {
             if (elToMount.matches(inclTemplQry)) {
                 await this.#compose(elToMount, 0);
             }
-            if (elToMount.matches(itemscopeQry)) {
+        }
+        for (const el of els) {
+            if (el.matches(itemscopeQry)) {
                 const { Newish } = await import('./Newish.js');
-                new Newish(elToMount, elToMount.getAttribute('itemscope'), assigner);
+                new Newish(el, el.getAttribute('itemscope'), assigner);
             }
         }
         this.#mount(elsToMount, initializing);
@@ -433,7 +435,7 @@ export class MountObserver extends EventTarget {
 }
 const refCountErr = 'mount-observer ref count mismatch';
 export const inclTemplQry = 'template[src^="#"]:not([hidden])';
-export const itemscopeQry = '[itemscope~="-"]';
+export const itemscopeQry = '[itemscope*="-"]';
 // https://github.com/webcomponents-cg/community-protocols/issues/12#issuecomment-872415080
 /**
  * The `mutation-event` event represents something that happened.

package/MountObserver.ts

@@ -433,9 +433,12 @@ export class MountObserver extends EventTarget implements IMountObserver{
             if(elToMount.matches(inclTemplQry)){
                 await this.#compose(elToMount as HTMLTemplateElement, 0)
             }
-            if(elToMount.matches(itemscopeQry)){
+            
+        }
+        for(const el of els){
+            if(el.matches(itemscopeQry)){
                 const {Newish} = await import('./Newish.js');
-                new Newish(elToMount, elToMount.getAttribute('itemscope')!, assigner);
+                new Newish(el, el.getAttribute('itemscope')!, assigner);
             }
         }
         this.#mount(elsToMount, initializing);
@@ -453,7 +456,7 @@ export class MountObserver extends EventTarget implements IMountObserver{
 
 const refCountErr = 'mount-observer ref count mismatch';
 export const inclTemplQry = 'template[src^="#"]:not([hidden])';
-export const itemscopeQry = '[itemscope~="-"]';
+export const itemscopeQry = '[itemscope*="-"]';
 export interface MountObserver extends IMountObserver{}
 
 // https://github.com/webcomponents-cg/community-protocols/issues/12#issuecomment-872415080

package/Newish.js

@@ -1,11 +1,10 @@
 export { waitForEvent } from './waitForEvent.js';
-export class Newish extends EventTarget {
+export class Newish {
     queue = [];
     isResolved = false;
     #ce;
     #assigner = undefined;
     constructor(enhancedElement, itemscope, assigner) {
-        super();
         this.#assigner = assigner;
         this.#do(enhancedElement, itemscope);
     }
@@ -43,7 +42,7 @@ export class Newish extends EventTarget {
             this.#assignGingerly();
         }
         this.isResolved = true;
-        this.dispatchEvent(new Event('resolved'));
+        enhancedElement.dispatchEvent(new Event('ishAttached'));
     }
     async #assignGingerly() {
         let ce = this.#ce;

package/Newish.ts

@@ -1,5 +1,5 @@
 export {waitForEvent} from './waitForEvent.js';
-export class Newish extends EventTarget{
+export class Newish{
     queue: Array<any> = [];
     isResolved = false;
     #ce: HTMLElement | undefined;
@@ -7,7 +7,6 @@ export class Newish extends EventTarget{
     #assigner: undefined | ((target: any, source: any) => Promise<void>) = undefined;
 
     constructor(enhancedElement: Element, itemscope: string, assigner?: (target: any, source: any) => Promise<void>){
-        super();
         this.#assigner = assigner;
         this.#do(enhancedElement, itemscope);
     }
@@ -46,7 +45,7 @@ export class Newish extends EventTarget{
         }
         
         this.isResolved = true;
-        this.dispatchEvent(new Event('resolved'));
+        enhancedElement.dispatchEvent(new Event('ishAttached'));
     }
 
     async #assignGingerly(){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mount-observer",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "description": "Observe and act on css matches.",
   "main": "MountObserver.js",
   "module": "MountObserver.js",
@@ -32,6 +32,10 @@
     "./waitForEvent.js": {
       "default": "./waitForEvent.js",
       "types": "./waitForEvent.ts"
+    },
+    "./waitForIsh.js": {
+      "default": "./waitForIsh.js",
+      "types": "./waitForIsh.ts"
     }
   },
   "files": [

package/waitForEvent.ts

@@ -9,5 +9,5 @@ export function waitForEvent<TEvent extends Event = Event>(et: EventTarget, even
             },  {once: true});
         }
 
-    })
+    });
 }

package/waitForIsh.js

@@ -0,0 +1,20 @@
+export function waitForIsh(el) {
+    return new Promise((resolve, reject) => {
+        const ish = el['ish'];
+        if (ish) {
+            resolve(ish);
+        }
+        else {
+            // If the element is not yet defined, wait for it to be defined
+            el.addEventListener('ishAttached', () => {
+                const ish = el['ish'];
+                if (ish) {
+                    resolve(ish);
+                }
+                else {
+                    reject(new Error('ish not found'));
+                }
+            }, { once: true });
+        }
+    });
+}

package/waitForIsh.ts

@@ -0,0 +1,19 @@
+export function waitForIsh(el: Element){
+    return new Promise((resolve, reject) => {
+        const ish = (<any>el)['ish'];
+        if (ish) {
+            resolve(ish);
+        } else {
+            // If the element is not yet defined, wait for it to be defined
+            el.addEventListener('ishAttached', () => {
+                const ish = (<any>el)['ish'];
+                if (ish) {
+                    resolve(ish);
+                } else {
+                    reject(new Error('ish not found'));
+                }
+            }, { once: true });
+            
+        }
+    });
+}