mount-observer 0.0.17 → 0.0.18

package/MountObserver.js

@@ -190,7 +190,6 @@ export class MountObserver extends EventTarget {
         const alreadyMounted = await this.#filterAndDismount();
         const mount = this.#mountInit.do?.mount;
         const { import: imp } = this.#mountInit;
-        const fullListOfAttrs = this.#fullListOfAttrs;
         for (const match of matching) {
             if (alreadyMounted.has(match))
                 continue;
@@ -220,25 +219,36 @@ export class MountObserver extends EventTarget {
                 });
             }
             this.dispatchEvent(new MountEvent(match, initializing));
-            if (fullListOfAttrs !== undefined) {
-                const attrParts = this.#attrParts;
-                const attrChangeInfos = [];
-                for (let idx = 0, ii = fullListOfAttrs.length; idx < ii; idx++) {
-                    const name = fullListOfAttrs[idx];
-                    const oldValue = null;
-                    const newValue = match.getAttribute(name);
-                    const parts = attrParts[idx];
-                    attrChangeInfos.push({
-                        idx,
-                        newValue,
-                        oldValue,
-                        parts
-                    });
+            //should we automatically call readAttrs?
+            //the thinking is it might make more sense to call that after mounting
+            this.#mountedList?.push(new WeakRef(match));
+        }
+    }
+    readAttrs(match, branchIndexes) {
+        const fullListOfAttrs = this.#fullListOfAttrs;
+        const attrChangeInfos = [];
+        if (fullListOfAttrs !== undefined) {
+            const attrParts = this.#attrParts;
+            for (let idx = 0, ii = fullListOfAttrs.length; idx < ii; idx++) {
+                const parts = attrParts[idx];
+                const { branchIdx } = parts;
+                if (branchIndexes !== undefined) {
+                    if (!branchIndexes.has(branchIdx))
+                        continue;
                 }
-                this.dispatchEvent(new AttrChangeEvent(match, attrChangeInfos));
+                const name = fullListOfAttrs[idx];
+                const oldValue = null;
+                const newValue = match.getAttribute(name);
+                attrChangeInfos.push({
+                    idx,
+                    newValue,
+                    oldValue,
+                    parts
+                });
             }
-            this.#mountedList?.push(new WeakRef(match));
+            //this.dispatchEvent(new AttrChangeEvent(match, attrChangeInfos));
         }
+        return attrChangeInfos;
     }
     async #dismount(unmatching) {
         const onDismount = this.#mountInit.do?.dismount;

package/getWhereAttrSelector.js

@@ -23,7 +23,7 @@ export function getWhereAttrSelector(whereAttr, withoutAttrs) {
         prefixLessMatches = branches.map(x => ({
             rootToBaseDelimiter,
             base: baseSelector,
-            baseToBranchDelimiter,
+            baseToBranchDelimiter: x ? baseToBranchDelimiter : '',
             branch: x
         }));
     }
@@ -37,10 +37,13 @@ export function getWhereAttrSelector(whereAttr, withoutAttrs) {
         const { start } = rootCnfg;
         for (const match of prefixLessMatches) {
             const { base, baseToBranchDelimiter, branch, rootToBaseDelimiter } = match;
+            let branchIdx = 0;
             for (const prefixLessMatch of prefixLessMatches) {
                 const { base, baseToBranchDelimiter, branch } = prefixLessMatch;
                 const startAndRootToBaseDelimiter = start ? `${start}${rootToBaseDelimiter}` : '';
+                //TODO:  could probably reduce the size of the code below
                 if (branch) {
+                    //will always have branch?
                     const name = `${startAndRootToBaseDelimiter}${base}${baseToBranchDelimiter}${branch}`;
                     fullListOfAttrs.push(name);
                     partitionedAttrs.push({
@@ -48,6 +51,7 @@ export function getWhereAttrSelector(whereAttr, withoutAttrs) {
                         name,
                         base,
                         branch,
+                        branchIdx,
                         rootCnfg
                     });
                 }
@@ -58,9 +62,11 @@ export function getWhereAttrSelector(whereAttr, withoutAttrs) {
                         root: start,
                         name,
                         base,
-                        rootCnfg
+                        rootCnfg,
+                        branchIdx
                     });
                 }
+                branchIdx++;
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mount-observer",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Observe and act on css matches.",
   "main": "MountObserver.js",
   "module": "MountObserver.js",

package/types.d.ts

@@ -80,7 +80,9 @@ interface AttrParts{
     root?: string,
     base?: string,
     branch?: string,
+    branchIdx: number,
     leaf?: string, //TODO
+    leafIdx?: number, //TODO
     rootCnfg?: RootCnfg
 }