@wsxjs/wsx-core 0.0.21 → 0.0.22

package/dist/index.js

@@ -182,6 +182,10 @@ var CACHE_KEY_PROP = "__wsxCacheKey";
 function markElement(element, cacheKey) {
   element[CACHE_KEY_PROP] = cacheKey;
 }
+function getElementCacheKey(element) {
+  const key = element[CACHE_KEY_PROP];
+  return key !== void 0 ? String(key) : null;
+}
 function isCreatedByH(element) {
   if (!(element instanceof HTMLElement || element instanceof SVGElement)) {
     return false;
@@ -729,9 +733,18 @@ function updateProps(element, oldProps, newProps, tag) {
     if (oldValue === newValue) {
       continue;
     }
+    if (oldValue === void 0) {
+      applySingleProp2(element, key, newValue, tag, isSVG);
+      continue;
+    }
     if (typeof oldValue === "object" && oldValue !== null && typeof newValue === "object" && newValue !== null) {
-      if (JSON.stringify(oldValue) === JSON.stringify(newValue)) {
-        continue;
+      try {
+        const oldJson = JSON.stringify(oldValue);
+        const newJson = JSON.stringify(newValue);
+        if (oldJson === newJson) {
+          continue;
+        }
+      } catch {
       }
     }
     applySingleProp2(element, key, newValue, tag, isSVG);
@@ -741,68 +754,132 @@ function updateChildren(element, oldChildren, newChildren) {
   const flatOld = flattenChildren(oldChildren);
   const flatNew = flattenChildren(newChildren);
   const minLength = Math.min(flatOld.length, flatNew.length);
+  let domIndex = 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;
+              }
+            }
+          }
+        }
+      }
+    } 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++;
+        }
+      }
+    }
     if (typeof oldChild === "string" || typeof oldChild === "number") {
       if (typeof newChild === "string" || typeof newChild === "number") {
-        const textNode = element.childNodes[i];
-        if (textNode && textNode.nodeType === Node.TEXT_NODE) {
-          textNode.textContent = String(newChild);
+        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(String(newChild));
-          if (textNode) {
-            element.replaceChild(newTextNode, textNode);
+          const newTextNode = document.createTextNode(newText);
+          if (oldNode && !shouldPreserveElement(oldNode)) {
+            element.replaceChild(newTextNode, oldNode);
           } else {
-            element.appendChild(newTextNode);
+            element.insertBefore(newTextNode, oldNode || null);
           }
         }
       } else {
-        const textNode = element.childNodes[i];
-        if (textNode) {
-          if (!shouldPreserveElement(textNode)) {
-            element.removeChild(textNode);
-          }
+        if (oldNode && !shouldPreserveElement(oldNode)) {
+          element.removeChild(oldNode);
         }
-        if (typeof newChild === "string" || typeof newChild === "number") {
-          element.appendChild(document.createTextNode(String(newChild)));
-        } else if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
-          element.appendChild(newChild);
+        if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
+          if (newChild.parentNode !== element) {
+            element.insertBefore(newChild, oldNode || null);
+          }
         } else if (newChild instanceof DocumentFragment) {
-          element.appendChild(newChild);
+          element.insertBefore(newChild, oldNode || null);
         }
       }
     } else if (oldChild instanceof HTMLElement || oldChild instanceof SVGElement) {
+      if (oldNode && shouldPreserveElement(oldNode)) {
+        continue;
+      }
       if (newChild === oldChild) {
         continue;
       } else if (newChild instanceof HTMLElement || newChild instanceof SVGElement) {
-        const oldNode = element.childNodes[i];
+        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) {
-              element.replaceChild(newChild, oldNode);
+              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) {
-              element.appendChild(newChild);
+              if (newChild.parentNode) {
+                newChild.parentNode.removeChild(newChild);
+              }
+              element.insertBefore(newChild, oldNode.nextSibling);
             }
           }
         } else {
           if (newChild.parentNode !== element) {
+            if (newChild.parentNode) {
+              newChild.parentNode.removeChild(newChild);
+            }
             element.appendChild(newChild);
           }
         }
       } else {
-        const oldNode = element.childNodes[i];
-        if (oldNode) {
-          if (!shouldPreserveElement(oldNode)) {
-            element.removeChild(oldNode);
-          }
+        if (oldNode && !shouldPreserveElement(oldNode)) {
+          element.removeChild(oldNode);
         }
         if (typeof newChild === "string" || typeof newChild === "number") {
-          element.appendChild(document.createTextNode(String(newChild)));
+          const newTextNode = document.createTextNode(String(newChild));
+          element.insertBefore(newTextNode, oldNode?.nextSibling || null);
         } else if (newChild instanceof DocumentFragment) {
-          element.appendChild(newChild);
+          element.insertBefore(newChild, oldNode?.nextSibling || null);
         }
       }
     }
@@ -815,20 +892,85 @@ function updateChildren(element, oldChildren, newChildren) {
     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) {
-        element.appendChild(newChild);
+      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 = [];
-  for (let i = flatNew.length; i < element.childNodes.length; i++) {
+  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 (!shouldPreserveElement(child)) {
-      nodesToRemove.push(child);
+    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) {
@@ -840,12 +982,12 @@ function updateElement(element, newProps, newChildren, tag, cacheManager) {
   const oldMetadata = cacheManager.getMetadata(element);
   const oldProps = oldMetadata?.props || null;
   const oldChildren = oldMetadata?.children || [];
-  updateProps(element, oldProps, newProps, tag);
-  updateChildren(element, oldChildren, newChildren);
   cacheManager.setMetadata(element, {
     props: newProps || {},
     children: newChildren
   });
+  updateProps(element, oldProps, newProps, tag);
+  updateChildren(element, oldChildren, newChildren);
 }
 
 // src/jsx-factory.ts
@@ -859,7 +1001,36 @@ function h(tag, props = {}, ...children) {
   if (context && cacheManager) {
     return tryUseCacheOrCreate(tag, props, children, context, cacheManager);
   }
-  return createElementWithPropsAndChildren(tag, props, children);
+  try {
+    const nodeEnv = typeof globalThis.process !== "undefined" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    globalThis.process.env?.NODE_ENV;
+    if (nodeEnv === "development") {
+      if (!context) {
+        logger3.debug(
+          `h() called without render context. Tag: "${tag}", ComponentId: "${getComponentId()}"`,
+          {
+            tag,
+            props: props ? Object.keys(props) : [],
+            hasCacheManager: !!cacheManager
+          }
+        );
+      } else if (!cacheManager) {
+        logger3.debug(
+          `h() called with context but no cache manager. Tag: "${tag}", Component: "${context.constructor.name}"`,
+          {
+            tag,
+            component: context.constructor.name
+          }
+        );
+      }
+    }
+  } catch {
+  }
+  const element = createElementWithPropsAndChildren(tag, props, children);
+  const componentId = getComponentId();
+  const cacheKey = generateCacheKey(tag, props, componentId, context || void 0);
+  markElement(element, cacheKey);
+  return element;
 }
 function tryUseCacheOrCreate(tag, props, children, context, cacheManager) {
   try {
@@ -869,6 +1040,14 @@ function tryUseCacheOrCreate(tag, props, children, context, cacheManager) {
     if (cachedElement) {
       const element2 = cachedElement;
       updateElement(element2, props, children, tag, cacheManager);
+      const isCustomElement = tag.includes("-") && customElements.get(tag);
+      if (isCustomElement && element2.isConnected) {
+        const parent = element2.parentNode;
+        if (parent) {
+          parent.removeChild(element2);
+          parent.appendChild(element2);
+        }
+      }
       return element2;
     }
     const element = createElementWithPropsAndChildren(tag, props, children);
@@ -892,7 +1071,12 @@ function handleCacheError(error, tag, props, children) {
     }
   } catch {
   }
-  return createElementWithPropsAndChildren(tag, props, children);
+  const element = createElementWithPropsAndChildren(tag, props, children);
+  const context = RenderContext.getCurrentComponent();
+  const componentId = getComponentId();
+  const cacheKey = generateCacheKey(tag, props, componentId, context || void 0);
+  markElement(element, cacheKey);
+  return element;
 }
 function Fragment(_props, children) {
   const fragment = document.createDocumentFragment();
@@ -1703,7 +1887,7 @@ var WebComponent = class extends BaseComponent {
           const styleName = this.config.styleName || this.constructor.name;
           StyleManager.applyStyles(this.shadowRoot, styleName, stylesToApply);
         }
-        const content = this.render();
+        const content = RenderContext.runInContext(this, () => this.render());
         this.shadowRoot.appendChild(content);
       }
       this.initializeEventListeners();
@@ -1783,9 +1967,18 @@ var WebComponent = class extends BaseComponent {
       }
       requestAnimationFrame(() => {
         this.shadowRoot.appendChild(content);
-        const oldChildren = Array.from(this.shadowRoot.children).filter(
-          (child) => child !== content
-        );
+        const oldChildren = Array.from(this.shadowRoot.children).filter((child) => {
+          if (child === content) {
+            return false;
+          }
+          if (child instanceof HTMLStyleElement) {
+            return false;
+          }
+          if (shouldPreserveElement(child)) {
+            return false;
+          }
+          return true;
+        });
         oldChildren.forEach((child) => child.remove());
         requestAnimationFrame(() => {
           this.restoreFocusState(focusState);
@@ -1965,6 +2158,9 @@ var LightComponent = class extends BaseComponent {
           if (child instanceof HTMLElement && jsxChildren.includes(child)) {
             return false;
           }
+          if (shouldPreserveElement(child)) {
+            return false;
+          }
           return true;
         });
         oldChildren.forEach((child) => child.remove());

package/dist/index.mjs

@@ -2,8 +2,9 @@ import {
   Fragment,
   RenderContext,
   createLogger,
-  h
-} from "./chunk-AR3DIDLV.mjs";
+  h,
+  shouldPreserveElement
+} from "./chunk-OXFZ575O.mjs";
 
 // src/styles/style-manager.ts
 var StyleManager = class {
@@ -796,7 +797,7 @@ var WebComponent = class extends BaseComponent {
           const styleName = this.config.styleName || this.constructor.name;
           StyleManager.applyStyles(this.shadowRoot, styleName, stylesToApply);
         }
-        const content = this.render();
+        const content = RenderContext.runInContext(this, () => this.render());
         this.shadowRoot.appendChild(content);
       }
       this.initializeEventListeners();
@@ -876,9 +877,18 @@ var WebComponent = class extends BaseComponent {
       }
       requestAnimationFrame(() => {
         this.shadowRoot.appendChild(content);
-        const oldChildren = Array.from(this.shadowRoot.children).filter(
-          (child) => child !== content
-        );
+        const oldChildren = Array.from(this.shadowRoot.children).filter((child) => {
+          if (child === content) {
+            return false;
+          }
+          if (child instanceof HTMLStyleElement) {
+            return false;
+          }
+          if (shouldPreserveElement(child)) {
+            return false;
+          }
+          return true;
+        });
         oldChildren.forEach((child) => child.remove());
         requestAnimationFrame(() => {
           this.restoreFocusState(focusState);
@@ -1058,6 +1068,9 @@ var LightComponent = class extends BaseComponent {
           if (child instanceof HTMLElement && jsxChildren.includes(child)) {
             return false;
           }
+          if (shouldPreserveElement(child)) {
+            return false;
+          }
           return true;
         });
         oldChildren.forEach((child) => child.remove());