@3sln/dodo 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3sln/dodo",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "A minimal, configurable virtual DOM library.",
   "main": "index.js",
   "type": "module",

package/src/vdom.js

@@ -13,7 +13,7 @@ class VNode {
   }
 
   key(k) {
-    this.key = k;
+    this.k = k;
     return this;
   }
 
@@ -395,7 +395,8 @@ export default userSettings => {
       }
     } else {
       const oldHooks = state.vdom.hooks ?? EMPTY_MAP;
-      const hooksIterator = toIterator(mapIter(hooks));
+      const newHooks = hooks ?? EMPTY_MAP;
+      const hooksIterator = toIterator(mapIter(newHooks));
       let result;
       while (!(result = hooksIterator.next()).done) {
         const [name, listener] = result.value;
@@ -427,7 +428,7 @@ export default userSettings => {
       while (!(result = oldHooksIterator.next()).done) {
         const [name] = result.value;
         const hookName = convertHookName(name);
-        if (hookName[0] === '$' || mapGet(hooks, name) !== undefined) continue;
+        if (hookName[0] === '$' || mapGet(newHooks, name) !== undefined) continue;
         const oldListener = mapGet(oldHooks, name);
         if (typeof oldListener === 'function') {
           target.removeEventListener(hookName, oldListener);
@@ -462,7 +463,7 @@ export default userSettings => {
         const innerVdom = newVdom.tag.apply(undefined, newVdom.args);
         if (innerVdom === undefined || innerVdom === null) break;
         if (isSeq(innerVdom)) {
-          reconcileElementChildren(target, flattenSeq(innerVdom));
+          reconcileElementChildren(target, flattenSeq(innerVdom, true));
         } else {
           reconcileElementChildren(target, flattenVNodeChildren([innerVdom]));
         }
@@ -525,35 +526,33 @@ export default userSettings => {
 
   function cleanupTarget(target) {
     const state = target[NODE_STATE];
-    if (state) {
-      switch (state.vdom.type) {
-        case ELEMENT_NODE:
-          reconcileElementProps(target, {});
-          cleanupTargetChildren(target);
-          delete target[NODE_STATE];
-          break;
-        case OPAQUE_NODE:
-          reconcileElementProps(target, {});
-          delete target[NODE_STATE];
-          break;
-        case ALIAS_NODE:
-          cleanupTargetChildren(target);
-          delete target[NODE_STATE];
-          break;
-        case SPECIAL_NODE:
-          delete target[NODE_STATE];
-          try {
-            state.vdom.tag.detach?.(target);
-          } catch (err) {
-            console.error(err);
-          }
-          break;
-      }
-      try {
-        state.vdom.hooks?.$detach?.(target);
-      } catch (err) {
-        console.error(err);
+    if (!state) {
+      return;
+    }
+
+    const {vdom} = state;
+
+    if (vdom.hooks) {
+      reconcileListeners(target, EMPTY_MAP);
+    }
+
+    if (vdom.type === ELEMENT_NODE || vdom.type === OPAQUE_NODE) {
+      reconcileElementProps(target, EMPTY_MAP);
+    }
+
+    if (vdom.type === ELEMENT_NODE || vdom.type === ALIAS_NODE) {
+      cleanupTargetChildren(target);
+    }
+
+    delete target[NODE_STATE];
+
+    try {
+      if (vdom.type === SPECIAL_NODE) {
+        vdom.tag.detach?.(target);
       }
+      vdom.hooks?.$detach?.(target);
+    } catch (err) {
+      console.error(err);
     }
   }
 
@@ -581,17 +580,17 @@ export default userSettings => {
 
       let oldNodesPoolForTag = oldVNodeNodesPool.get(vdom.tag);
       if (!oldNodesPoolForTag) {
-        oldNodesPoolForTag = {nodesForKey: new Map(), nodesWithoutKey: []};
+        oldNodesPoolForTag = {nodesForKey: newMap({}), nodesWithoutKey: []};
         oldVNodeNodesPool.set(vdom.tag, oldNodesPoolForTag);
       }
 
-      if (vdom.key !== undefined) {
-        let oldNodesPoolForKey = oldNodesPoolForTag.nodesForKey.get(vdom.key);
+      if (vdom.k !== undefined) {
+        let oldNodesPoolForKey = mapGet(oldNodesPoolForTag.nodesForKey, vdom.k);
         if (oldNodesPoolForKey === undefined) {
           oldNodesPoolForKey = [];
-          oldNodesPoolForTag.nodesForKey.set(vdom.key, oldNodesPoolForKey);
         }
         oldNodesPoolForKey.push(oldChild);
+        oldNodesPoolForTag.nodesForKey = mapPut(oldNodesPoolForTag.nodesForKey, vdom.k, oldNodesPoolForKey);
       } else {
         oldNodesPoolForTag.nodesWithoutKey.push(oldChild);
       }
@@ -605,15 +604,15 @@ export default userSettings => {
         if (!oldNodesPoolForTag) {
           newDomNode = createNode(target, newVdom);
         } else {
-          const key = newVdom.key;
+          const key = newVdom.k;
           if (key !== undefined) {
-            const pool = oldNodesPoolForTag.nodesForKey.get(key);
+            const pool = mapGet(oldNodesPoolForTag.nodesForKey, key);
             if (pool && pool.length > 0) {
               newDomNode = pool.shift();
               const state = newDomNode[NODE_STATE];
               if (shouldUpdate(state.vdom.args, newVdom.args)) {
                 if (state.vdom.hooks || newVdom.hooks) {
-                  reconcileListeners(target, newVdom.hooks);
+                  reconcileListeners(newDomNode, newVdom.hooks);
                 }
                 state.newVdom = newVdom;
               }
@@ -627,7 +626,7 @@ export default userSettings => {
               const state = newDomNode[NODE_STATE];
               if (shouldUpdate(state.vdom.args, newVdom.args)) {
                 if (state.vdom.hooks || newVdom.hooks) {
-                  reconcileListeners(target, newVdom.hooks);
+                  reconcileListeners(newDomNode, newVdom.hooks);
                 }
                 state.newVdom = newVdom;
               }
@@ -653,6 +652,7 @@ export default userSettings => {
       target.removeChild(nodeToRemove);
     }
 
+    const window = userSettings?.window ?? target.ownerDocument.defaultView;
     const moveBefore = window.Element.prototype.moveBefore;
     const insertBefore = window.Element.prototype.insertBefore;
     if (target.isConnected) {
@@ -750,7 +750,7 @@ export default userSettings => {
     }
 
     if (isSeq(vdom)) {
-      reconcileElementChildren(target, flattenSeq(vdom));
+      reconcileElementChildren(target, flattenSeq(vdom, true));
       return;
     }