thunderous 2.0.6 → 2.0.8

package/dist/index.cjs

@@ -136,6 +136,14 @@ var createEffect = (fn) => {
 
 // src/utilities.ts
 var NOOP = () => void 0;
+var queryComment = (node, comment) => {
+  for (const child of node.childNodes) {
+    if (child.nodeType === Node.COMMENT_NODE && child.nodeValue === comment) {
+      return child;
+    }
+  }
+  return null;
+};
 
 // src/server-side.ts
 var isServer = typeof window === "undefined";
@@ -287,12 +295,12 @@ var logValueError = (value) => {
     value
   );
 };
-var arrayToDocumentFragment = (array, parent) => {
+var arrayToDocumentFragment = (array, parent, uniqueKey) => {
   const documentFragment = new DocumentFragment();
   let count = 0;
   const keys = /* @__PURE__ */ new Set();
   for (const item of array) {
-    const node = createNewNode(item, parent);
+    const node = createNewNode(item, parent, uniqueKey);
     if (node instanceof DocumentFragment) {
       const child = node.firstElementChild;
       if (node.children.length > 1) {
@@ -322,11 +330,13 @@ var arrayToDocumentFragment = (array, parent) => {
     }
     documentFragment.append(node);
   }
+  const comment = document.createComment(uniqueKey);
+  documentFragment.append(comment);
   return documentFragment;
 };
-var createNewNode = (value, parent) => {
+var createNewNode = (value, parent, uniqueKey) => {
   if (typeof value === "string") return new Text(value);
-  if (Array.isArray(value)) return arrayToDocumentFragment(value, parent);
+  if (Array.isArray(value)) return arrayToDocumentFragment(value, parent, uniqueKey);
   if (value instanceof DocumentFragment) return value;
   return new Text("");
 };
@@ -366,7 +376,8 @@ var evaluateBindings = (element, fragment) => {
         const uniqueKey = text.replace(/\{\{signal:(.+)\}\}/, "$1");
         const signal = uniqueKey !== text ? renderState.signalMap.get(uniqueKey) : void 0;
         const newValue = signal !== void 0 ? signal() : text;
-        const newNode = createNewNode(newValue, element);
+        const newNode = createNewNode(newValue, element, uniqueKey);
+        const clone = newNode.cloneNode(true);
         if (i === 0) {
           child.replaceWith(newNode);
         } else {
@@ -380,13 +391,12 @@ var evaluateBindings = (element, fragment) => {
           let init = false;
           createEffect(() => {
             const result = signal();
-            const nextNode = createNewNode(result, element);
+            const nextNode = createNewNode(result, element, uniqueKey);
             if (nextNode instanceof Text) {
               throw new TypeError(
                 "Signal mismatch: expected DocumentFragment or Array<DocumentFragment>, but got Text"
               );
             }
-            let lastSibling = element.lastChild;
             for (const child2 of element.children) {
               const key = child2.getAttribute("key");
               if (key === null) continue;
@@ -395,6 +405,7 @@ var evaluateBindings = (element, fragment) => {
                 child2.remove();
               }
             }
+            let anchor = queryComment(element, uniqueKey);
             for (const child2 of nextNode.children) {
               const key = child2.getAttribute("key");
               const matchingNode = element.querySelector(`[key="${key}"]`);
@@ -404,10 +415,12 @@ var evaluateBindings = (element, fragment) => {
                 matchingNode.setAttribute(attr.name, attr.value);
               }
               matchingNode.replaceChildren(...child2.childNodes);
-              lastSibling = matchingNode.nextSibling;
+              anchor = matchingNode.nextSibling;
               child2.replaceWith(matchingNode);
             }
-            element.insertBefore(nextNode, lastSibling);
+            const nextAnchor = queryComment(nextNode, uniqueKey);
+            nextAnchor?.remove();
+            element.insertBefore(nextNode, anchor);
             if (!init) init = true;
           });
         }
@@ -751,7 +764,7 @@ You must set an initial value before calling a property signal's getter.
     }
     constructor() {
       super();
-      if (Object.prototype.hasOwnProperty.call(this, "__customCallbackFns")) {
+      if (!Object.prototype.hasOwnProperty.call(this, "__customCallbackFns")) {
         this.__customCallbackFns = /* @__PURE__ */ new Map();
       }
       for (const [attrName, attr] of this.#attributesAsPropertiesMap) {

package/dist/index.js

@@ -101,6 +101,14 @@ var createEffect = (fn) => {
 
 // src/utilities.ts
 var NOOP = () => void 0;
+var queryComment = (node, comment) => {
+  for (const child of node.childNodes) {
+    if (child.nodeType === Node.COMMENT_NODE && child.nodeValue === comment) {
+      return child;
+    }
+  }
+  return null;
+};
 
 // src/server-side.ts
 var isServer = typeof window === "undefined";
@@ -252,12 +260,12 @@ var logValueError = (value) => {
     value
   );
 };
-var arrayToDocumentFragment = (array, parent) => {
+var arrayToDocumentFragment = (array, parent, uniqueKey) => {
   const documentFragment = new DocumentFragment();
   let count = 0;
   const keys = /* @__PURE__ */ new Set();
   for (const item of array) {
-    const node = createNewNode(item, parent);
+    const node = createNewNode(item, parent, uniqueKey);
     if (node instanceof DocumentFragment) {
       const child = node.firstElementChild;
       if (node.children.length > 1) {
@@ -287,11 +295,13 @@ var arrayToDocumentFragment = (array, parent) => {
     }
     documentFragment.append(node);
   }
+  const comment = document.createComment(uniqueKey);
+  documentFragment.append(comment);
   return documentFragment;
 };
-var createNewNode = (value, parent) => {
+var createNewNode = (value, parent, uniqueKey) => {
   if (typeof value === "string") return new Text(value);
-  if (Array.isArray(value)) return arrayToDocumentFragment(value, parent);
+  if (Array.isArray(value)) return arrayToDocumentFragment(value, parent, uniqueKey);
   if (value instanceof DocumentFragment) return value;
   return new Text("");
 };
@@ -331,7 +341,8 @@ var evaluateBindings = (element, fragment) => {
         const uniqueKey = text.replace(/\{\{signal:(.+)\}\}/, "$1");
         const signal = uniqueKey !== text ? renderState.signalMap.get(uniqueKey) : void 0;
         const newValue = signal !== void 0 ? signal() : text;
-        const newNode = createNewNode(newValue, element);
+        const newNode = createNewNode(newValue, element, uniqueKey);
+        const clone = newNode.cloneNode(true);
         if (i === 0) {
           child.replaceWith(newNode);
         } else {
@@ -345,13 +356,12 @@ var evaluateBindings = (element, fragment) => {
           let init = false;
           createEffect(() => {
             const result = signal();
-            const nextNode = createNewNode(result, element);
+            const nextNode = createNewNode(result, element, uniqueKey);
             if (nextNode instanceof Text) {
               throw new TypeError(
                 "Signal mismatch: expected DocumentFragment or Array<DocumentFragment>, but got Text"
               );
             }
-            let lastSibling = element.lastChild;
             for (const child2 of element.children) {
               const key = child2.getAttribute("key");
               if (key === null) continue;
@@ -360,6 +370,7 @@ var evaluateBindings = (element, fragment) => {
                 child2.remove();
               }
             }
+            let anchor = queryComment(element, uniqueKey);
             for (const child2 of nextNode.children) {
               const key = child2.getAttribute("key");
               const matchingNode = element.querySelector(`[key="${key}"]`);
@@ -369,10 +380,12 @@ var evaluateBindings = (element, fragment) => {
                 matchingNode.setAttribute(attr.name, attr.value);
               }
               matchingNode.replaceChildren(...child2.childNodes);
-              lastSibling = matchingNode.nextSibling;
+              anchor = matchingNode.nextSibling;
               child2.replaceWith(matchingNode);
             }
-            element.insertBefore(nextNode, lastSibling);
+            const nextAnchor = queryComment(nextNode, uniqueKey);
+            nextAnchor?.remove();
+            element.insertBefore(nextNode, anchor);
             if (!init) init = true;
           });
         }
@@ -716,7 +729,7 @@ You must set an initial value before calling a property signal's getter.
     }
     constructor() {
       super();
-      if (Object.prototype.hasOwnProperty.call(this, "__customCallbackFns")) {
+      if (!Object.prototype.hasOwnProperty.call(this, "__customCallbackFns")) {
         this.__customCallbackFns = /* @__PURE__ */ new Map();
       }
       for (const [attrName, attr] of this.#attributesAsPropertiesMap) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "thunderous",
-	"version": "2.0.6",
+	"version": "2.0.8",
 	"description": "",
 	"type": "module",
 	"main": "./dist/index.cjs",