@wsxjs/wsx-core 0.0.22 → 0.0.23

package/dist/jsx-runtime.js

@@ -622,6 +622,185 @@ function createElementWithPropsAndChildren(tag, props, children) {
   return element;
 }
 
+// src/utils/update-children-helpers.ts
+function collectPreservedElements(element) {
+  const preserved = [];
+  for (let i = 0; i < element.childNodes.length; i++) {
+    const child = element.childNodes[i];
+    if (shouldPreserveElement(child)) {
+      preserved.push(child);
+    }
+  }
+  return preserved;
+}
+function findDOMNodeByReference(oldChild, parent) {
+  if (oldChild.parentNode === parent && !shouldPreserveElement(oldChild)) {
+    return oldChild;
+  }
+  return null;
+}
+function findDOMNodeByCacheKey(cacheKey, parent) {
+  for (let i = 0; i < parent.childNodes.length; i++) {
+    const child = parent.childNodes[i];
+    if (child instanceof HTMLElement || child instanceof SVGElement) {
+      if (shouldPreserveElement(child)) continue;
+      if (getElementCacheKey(child) === cacheKey) {
+        return child;
+      }
+    }
+  }
+  return null;
+}
+function findElementNode(oldChild, parent) {
+  const byRef = findDOMNodeByReference(oldChild, parent);
+  if (byRef) return byRef;
+  const cacheKey = getElementCacheKey(oldChild);
+  if (cacheKey) {
+    return findDOMNodeByCacheKey(cacheKey, parent);
+  }
+  return null;
+}
+function findTextNode(parent, domIndex) {
+  while (domIndex.value < parent.childNodes.length) {
+    const node = parent.childNodes[domIndex.value];
+    if (node.nodeType === Node.TEXT_NODE) {
+      const textNode = node;
+      domIndex.value++;
+      return textNode;
+    }
+    domIndex.value++;
+  }
+  return null;
+}
+function updateOrCreateTextNode(parent, oldNode, newText) {
+  if (oldNode && oldNode.nodeType === Node.TEXT_NODE) {
+    if (oldNode.textContent !== newText) {
+      oldNode.textContent = newText;
+    }
+  } else {
+    const newTextNode = document.createTextNode(newText);
+    if (oldNode && !shouldPreserveElement(oldNode)) {
+      parent.replaceChild(newTextNode, oldNode);
+    } else {
+      parent.insertBefore(newTextNode, oldNode || null);
+    }
+  }
+}
+function removeNodeIfNotPreserved(parent, node) {
+  if (node && !shouldPreserveElement(node) && node.parentNode === parent) {
+    parent.removeChild(node);
+  }
+}
+function replaceOrInsertElement(parent, newChild, oldNode) {
+  if (newChild.parentNode && newChild.parentNode !== parent) {
+    newChild.parentNode.removeChild(newChild);
+  }
+  if (oldNode && !shouldPreserveElement(oldNode)) {
+    if (oldNode !== newChild) {
+      parent.replaceChild(newChild, oldNode);
+    }
+  } else if (newChild.parentNode !== parent) {
+    parent.insertBefore(newChild, oldNode || null);
+  }
+}
+function appendNewChild(parent, child) {
+  if (child === null || child === void 0 || child === false) {
+    return;
+  }
+  if (typeof child === "string" || typeof child === "number") {
+    parent.appendChild(document.createTextNode(String(child)));
+  } else if (child instanceof HTMLElement || child instanceof SVGElement) {
+    if (child.parentNode && child.parentNode !== parent) {
+      child.parentNode.removeChild(child);
+    }
+    if (child.parentNode !== parent) {
+      parent.appendChild(child);
+    }
+  } else if (child instanceof DocumentFragment) {
+    parent.appendChild(child);
+  }
+}
+function buildNewChildrenMaps(flatNew) {
+  const elementSet = /* @__PURE__ */ new Set();
+  const cacheKeyMap = /* @__PURE__ */ new Map();
+  for (const child of flatNew) {
+    if (child instanceof HTMLElement || child instanceof SVGElement || child instanceof DocumentFragment) {
+      elementSet.add(child);
+      if (child instanceof HTMLElement || child instanceof SVGElement) {
+        const cacheKey = getElementCacheKey(child);
+        if (cacheKey) {
+          cacheKeyMap.set(cacheKey, child);
+        }
+      }
+    }
+  }
+  return { elementSet, cacheKeyMap };
+}
+function shouldRemoveNode(node, elementSet, cacheKeyMap) {
+  if (shouldPreserveElement(node)) {
+    return false;
+  }
+  if (node instanceof HTMLElement || node instanceof SVGElement || node instanceof DocumentFragment) {
+    if (elementSet.has(node)) {
+      return false;
+    }
+    if (node instanceof HTMLElement || node instanceof SVGElement) {
+      const cacheKey = getElementCacheKey(node);
+      if (cacheKey && cacheKeyMap.has(cacheKey)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+function deduplicateCacheKeys(parent, cacheKeyMap) {
+  const processedCacheKeys = /* @__PURE__ */ new Set();
+  for (let i = parent.childNodes.length - 1; i >= 0; i--) {
+    const child = parent.childNodes[i];
+    if (child instanceof HTMLElement || child instanceof SVGElement) {
+      if (shouldPreserveElement(child)) {
+        continue;
+      }
+      const cacheKey = getElementCacheKey(child);
+      if (cacheKey && cacheKeyMap.has(cacheKey) && !processedCacheKeys.has(cacheKey)) {
+        processedCacheKeys.add(cacheKey);
+        const newChild = cacheKeyMap.get(cacheKey);
+        if (child !== newChild) {
+          parent.replaceChild(newChild, child);
+        }
+      }
+    }
+  }
+}
+function collectNodesToRemove(parent, elementSet, cacheKeyMap) {
+  const nodesToRemove = [];
+  for (let i = 0; i < parent.childNodes.length; i++) {
+    const node = parent.childNodes[i];
+    if (shouldRemoveNode(node, elementSet, cacheKeyMap)) {
+      nodesToRemove.push(node);
+    }
+  }
+  return nodesToRemove;
+}
+function removeNodes(parent, nodes) {
+  for (let i = nodes.length - 1; i >= 0; i--) {
+    const node = nodes[i];
+    if (node.parentNode === parent) {
+      parent.removeChild(node);
+    }
+  }
+}
+function reinsertPreservedElements(parent, preservedElements) {
+  for (const element of preservedElements) {
+    if (element.parentNode !== parent) {
+      parent.appendChild(element);
+    }
+  }
+}
+function flattenChildrenSafe(children) {
+  return flattenChildren(children);
+}
+
 // src/utils/element-update.ts
 function removeProp(element, key, oldValue, tag) {
   const isSVG = shouldUseSVGNamespace(tag);
@@ -739,49 +918,34 @@ function updateProps(element, oldProps, newProps, tag) {
     applySingleProp2(element, key, newValue, tag, isSVG);
   }
 }
-function updateChildren(element, oldChildren, newChildren) {
-  const flatOld = flattenChildren(oldChildren);
-  const flatNew = flattenChildren(newChildren);
+function updateChildren(element, oldChildren, newChildren, cacheManager) {
+  const flatOld = flattenChildrenSafe(oldChildren);
+  const flatNew = flattenChildrenSafe(newChildren);
+  const preservedElements = collectPreservedElements(element);
   const minLength = Math.min(flatOld.length, flatNew.length);
-  let domIndex = 0;
+  const domIndex = { value: 0 };
   for (let i = 0; i < minLength; i++) {
     const oldChild = flatOld[i];
     const newChild = flatNew[i];
     let oldNode = null;
     if (oldChild instanceof HTMLElement || oldChild instanceof SVGElement) {
-      if (oldChild.parentNode === element) {
-        if (!shouldPreserveElement(oldChild)) {
-          oldNode = oldChild;
-        }
-      } else {
-        const oldCacheKey = getElementCacheKey(oldChild);
-        if (oldCacheKey) {
-          for (let j = 0; j < element.childNodes.length; j++) {
-            const domChild = element.childNodes[j];
-            if (domChild instanceof HTMLElement || domChild instanceof SVGElement) {
-              if (shouldPreserveElement(domChild)) {
-                continue;
-              }
-              const domCacheKey = getElementCacheKey(domChild);
-              if (domCacheKey === oldCacheKey) {
-                oldNode = domChild;
-                break;
-              }
-            }
-          }
+      oldNode = findElementNode(oldChild, element);
+      if (oldNode && oldNode.parentNode === element) {
+        const nodeIndex = Array.from(element.childNodes).indexOf(oldNode);
+        if (nodeIndex !== -1 && nodeIndex >= domIndex.value) {
+          domIndex.value = nodeIndex + 1;
         }
       }
     } else if (typeof oldChild === "string" || typeof oldChild === "number") {
-      while (domIndex < element.childNodes.length) {
-        const node = element.childNodes[domIndex];
-        if (node.nodeType === Node.TEXT_NODE) {
-          oldNode = node;
-          domIndex++;
-          break;
-        } else if (node.nodeType === Node.ELEMENT_NODE) {
-          domIndex++;
-        } else {
-          domIndex++;
+      oldNode = findTextNode(element, domIndex);
+      if (!oldNode && element.childNodes.length > 0) {
+        for (let j = domIndex.value; j < element.childNodes.length; j++) {
+          const node = element.childNodes[j];
+          if (node.nodeType === Node.TEXT_NODE) {
+            oldNode = node;
+            domIndex.value = j + 1;
+            break;
+          }
         }
       }
     }
@@ -790,27 +954,13 @@ function updateChildren(element, oldChildren, newChildren) {
         const oldText = String(oldChild);
         const newText = String(newChild);
         const needsUpdate = oldText !== newText || oldNode && oldNode.nodeType === Node.TEXT_NODE && oldNode.textContent !== newText;
-        if (!needsUpdate) {
-          continue;
-        }
-        if (oldNode && oldNode.nodeType === Node.TEXT_NODE) {
-          oldNode.textContent = newText;
-        } else {
-          const newTextNode = document.createTextNode(newText);
-          if (oldNode && !shouldPreserveElement(oldNode)) {
-            element.replaceChild(newTextNode, oldNode);
-          } else {
-            element.insertBefore(newTextNode, oldNode || null);
-          }
+        if (needsUpdate) {
+          updateOrCreateTextNode(element, oldNode, newText);
         }
       } else {
-        if (oldNode && !shouldPreserveElement(oldNode)) {
-          element.removeChild(oldNode);
-        }
+        removeNodeIfNotPreserved(element, oldNode);
         if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
-          if (newChild.parentNode !== element) {
-            element.insertBefore(newChild, oldNode || null);
-          }
+          replaceOrInsertElement(element, newChild, oldNode);
         } else if (newChild instanceof DocumentFragment) {
           element.insertBefore(newChild, oldNode || null);
         }
@@ -819,51 +969,27 @@ function updateChildren(element, oldChildren, newChildren) {
       if (oldNode && shouldPreserveElement(oldNode)) {
         continue;
       }
-      if (newChild === oldChild) {
-        continue;
-      } else if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
-        const oldCacheKey = oldNode && (oldNode instanceof HTMLElement || oldNode instanceof SVGElement) ? getElementCacheKey(oldNode) : null;
-        const newCacheKey = getElementCacheKey(newChild);
-        const hasSameCacheKey = oldCacheKey && newCacheKey && oldCacheKey === newCacheKey;
-        if (oldNode) {
-          if (!shouldPreserveElement(oldNode)) {
-            if (oldNode !== newChild) {
-              if (newChild.parentNode === element) {
-                if (hasSameCacheKey) {
-                  if (newChild !== oldNode) {
-                    element.replaceChild(newChild, oldNode);
-                  }
-                } else {
-                  element.removeChild(newChild);
-                  element.replaceChild(newChild, oldNode);
-                }
-              } else if (newChild.parentNode) {
-                newChild.parentNode.removeChild(newChild);
-                element.replaceChild(newChild, oldNode);
-              } else {
-                element.replaceChild(newChild, oldNode);
-              }
-            }
-          } else {
-            if (newChild.parentNode !== element) {
-              if (newChild.parentNode) {
-                newChild.parentNode.removeChild(newChild);
-              }
-              element.insertBefore(newChild, oldNode.nextSibling);
+      if (newChild === oldChild && (newChild instanceof HTMLElement || newChild instanceof SVGElement)) {
+        if (cacheManager) {
+          const childMetadata = cacheManager.getMetadata(newChild);
+          if (childMetadata) {
+            if (oldNode === newChild && newChild.parentNode === element) {
+              continue;
             }
           }
         } else {
-          if (newChild.parentNode !== element) {
-            if (newChild.parentNode) {
-              newChild.parentNode.removeChild(newChild);
-            }
-            element.appendChild(newChild);
+          if (oldNode === newChild && newChild.parentNode === element) {
+            continue;
           }
         }
-      } else {
-        if (oldNode && !shouldPreserveElement(oldNode)) {
-          element.removeChild(oldNode);
+      }
+      if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
+        if (newChild.parentNode === element && oldNode === newChild) {
+          continue;
         }
+        replaceOrInsertElement(element, newChild, oldNode);
+      } else {
+        removeNodeIfNotPreserved(element, oldNode);
         if (typeof newChild === "string" || typeof newChild === "number") {
           const newTextNode = document.createTextNode(String(newChild));
           element.insertBefore(newTextNode, oldNode?.nextSibling || null);
@@ -874,98 +1000,13 @@ function updateChildren(element, oldChildren, newChildren) {
     }
   }
   for (let i = minLength; i < flatNew.length; i++) {
-    const newChild = flatNew[i];
-    if (newChild === null || newChild === void 0 || newChild === false) {
-      continue;
-    }
-    if (typeof newChild === "string" || typeof newChild === "number") {
-      element.appendChild(document.createTextNode(String(newChild)));
-    } else if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
-      if (newChild.parentNode === element) {
-        const currentIndex = Array.from(element.childNodes).indexOf(newChild);
-        const expectedIndex = element.childNodes.length - 1;
-        if (currentIndex !== expectedIndex) {
-          element.removeChild(newChild);
-          element.appendChild(newChild);
-        }
-        continue;
-      } else if (newChild.parentNode) {
-        newChild.parentNode.removeChild(newChild);
-      }
-      element.appendChild(newChild);
-    } else if (newChild instanceof DocumentFragment) {
-      element.appendChild(newChild);
-    }
-  }
-  const nodesToRemove = [];
-  const newChildSet = /* @__PURE__ */ new Set();
-  const newChildCacheKeyMap = /* @__PURE__ */ new Map();
-  for (const child of flatNew) {
-    if (child instanceof HTMLElement || child instanceof SVGElement || child instanceof DocumentFragment) {
-      newChildSet.add(child);
-      if (child instanceof HTMLElement || child instanceof SVGElement) {
-        const cacheKey = getElementCacheKey(child);
-        if (cacheKey) {
-          newChildCacheKeyMap.set(cacheKey, child);
-        }
-      }
-    }
-  }
-  const processedCacheKeys = /* @__PURE__ */ new Set();
-  const newChildToIndexMap = /* @__PURE__ */ new Map();
-  for (let i = 0; i < flatNew.length; i++) {
-    const child = flatNew[i];
-    if (child instanceof HTMLElement || child instanceof SVGElement) {
-      newChildToIndexMap.set(child, i);
-    }
-  }
-  for (let i = element.childNodes.length - 1; i >= 0; i--) {
-    const child = element.childNodes[i];
-    if (child instanceof HTMLElement || child instanceof SVGElement) {
-      if (shouldPreserveElement(child)) {
-        continue;
-      }
-      const cacheKey = getElementCacheKey(child);
-      if (cacheKey && newChildCacheKeyMap.has(cacheKey) && !processedCacheKeys.has(cacheKey)) {
-        processedCacheKeys.add(cacheKey);
-        const newChild = newChildCacheKeyMap.get(cacheKey);
-        if (child !== newChild) {
-          if (newChild.parentNode === element) {
-            element.replaceChild(newChild, child);
-          } else {
-            element.replaceChild(newChild, child);
-          }
-        } else {
-        }
-      }
-    }
-  }
-  for (let i = 0; i < element.childNodes.length; i++) {
-    const child = element.childNodes[i];
-    if (shouldPreserveElement(child)) {
-      continue;
-    }
-    if (child instanceof HTMLElement || child instanceof SVGElement) {
-      if (newChildSet.has(child)) {
-        continue;
-      }
-      const cacheKey = getElementCacheKey(child);
-      if (cacheKey && newChildCacheKeyMap.has(cacheKey)) {
-        continue;
-      }
-    } else if (child instanceof DocumentFragment) {
-      if (newChildSet.has(child)) {
-        continue;
-      }
-    }
-    nodesToRemove.push(child);
-  }
-  for (let i = nodesToRemove.length - 1; i >= 0; i--) {
-    const node = nodesToRemove[i];
-    if (node.parentNode === element) {
-      element.removeChild(node);
-    }
+    appendNewChild(element, flatNew[i]);
   }
+  const { elementSet, cacheKeyMap } = buildNewChildrenMaps(flatNew);
+  deduplicateCacheKeys(element, cacheKeyMap);
+  const nodesToRemove = collectNodesToRemove(element, elementSet, cacheKeyMap);
+  removeNodes(element, nodesToRemove);
+  reinsertPreservedElements(element, preservedElements);
 }
 function updateElement(element, newProps, newChildren, tag, cacheManager) {
   const oldMetadata = cacheManager.getMetadata(element);
@@ -976,7 +1017,7 @@ function updateElement(element, newProps, newChildren, tag, cacheManager) {
     children: newChildren
   });
   updateProps(element, oldProps, newProps, tag);
-  updateChildren(element, oldChildren, newChildren);
+  updateChildren(element, oldChildren, newChildren, cacheManager);
 }
 
 // src/jsx-factory.ts

package/dist/jsx-runtime.mjs

@@ -2,7 +2,7 @@ import {
   Fragment,
   jsx,
   jsxs
-} from "./chunk-OXFZ575O.mjs";
+} from "./chunk-ESZYREJK.mjs";
 export {
   Fragment,
   jsx,