@radishland/runtime 0.4.1 → 0.4.2

package/client/index.js

@@ -165,6 +165,7 @@ var HandlerRegistry = class extends HTMLElement {
             target.setAttribute(attribute, `${ref}`);
           }
         });
+        target.removeAttribute("attr:" + attribute);
         e.stopPropagation();
       }
     }
@@ -177,6 +178,7 @@ var HandlerRegistry = class extends HTMLElement {
         this.effect(() => {
           target.toggleAttribute(attribute, ref.valueOf());
         });
+        target.removeAttribute("bool:" + attribute);
         e.stopPropagation();
       }
     }
@@ -184,8 +186,9 @@ var HandlerRegistry = class extends HTMLElement {
   #handleOn(e) {
     if (e instanceof CustomEvent) {
       const { identifier, type: type2, target } = e.detail;
-      if (identifier in this && typeof this.lookup(identifier) === "function") {
+      if (identifier in this && target instanceof HTMLElement && typeof this.lookup(identifier) === "function") {
         target.addEventListener(type2, this.lookup(identifier).bind(this));
+        target.removeAttribute("on:" + type2);
         e.stopPropagation();
       }
     }
@@ -193,21 +196,19 @@ var HandlerRegistry = class extends HTMLElement {
   #handleClass(e) {
     if (e instanceof CustomEvent) {
       const { identifier, target } = e.detail;
-      if (identifier in this) {
+      if (identifier in this && target instanceof HTMLElement) {
         this.effect(() => {
           const classList = this.lookup(identifier)?.valueOf();
-          if (classList && typeof classList === "object") {
+          if (target instanceof HTMLElement && classList && typeof classList === "object") {
             for (const [k, v] of Object.entries(classList)) {
               const force = !!v?.valueOf();
               for (const className of k.split(" ")) {
-                target.classList.toggle(
-                  className,
-                  force
-                );
+                target.classList.toggle(className, force);
               }
             }
           }
         });
+        target.removeAttribute("classList");
         e.stopPropagation();
       }
     }
@@ -215,11 +216,12 @@ var HandlerRegistry = class extends HTMLElement {
   #handleUse(e) {
     if (e instanceof CustomEvent) {
       const { identifier, target } = e.detail;
-      if (identifier in this && typeof this.lookup(identifier) === "function") {
+      if (identifier in this && typeof this.lookup(identifier) === "function" && target instanceof HTMLElement) {
         const cleanup = this.lookup(identifier).bind(this)(target);
         if (typeof cleanup === "function") {
           this.#cleanup.push(cleanup);
         }
+        target.removeAttribute("use:" + identifier);
         e.stopPropagation();
       }
     }
@@ -227,7 +229,7 @@ var HandlerRegistry = class extends HTMLElement {
   #handleProp(e) {
     if (e instanceof CustomEvent) {
       const { identifier, property, target } = e.detail;
-      if (identifier in this && property in target) {
+      if (identifier in this && property in target && target instanceof HTMLElement) {
         const ref = this.lookup(identifier);
         this.effect(() => {
           if (isState(target[property])) {
@@ -236,6 +238,7 @@ var HandlerRegistry = class extends HTMLElement {
             target[property] = ref.valueOf();
           }
         });
+        target.removeAttribute("prop:" + property);
         e.stopPropagation();
       }
     }
@@ -248,6 +251,7 @@ var HandlerRegistry = class extends HTMLElement {
         this.effect(() => {
           target.textContent = `${ref}`;
         });
+        target.removeAttribute("text");
         e.stopPropagation();
       }
     }
@@ -260,6 +264,7 @@ var HandlerRegistry = class extends HTMLElement {
         this.effect(() => {
           target.innerHTML = `${ref}`;
         });
+        target.removeAttribute("html");
         e.stopPropagation();
       }
     }
@@ -278,6 +283,7 @@ var HandlerRegistry = class extends HTMLElement {
             target[property] = state.value;
           });
         }
+        target.removeAttribute("bind:" + property);
         e.stopPropagation();
       }
     }
@@ -430,11 +436,11 @@ var HandlerRegistry = class extends HTMLElement {
         this.hydrate(node.shadowRoot);
         console.log("exiting shadow root");
       }
-      let child = node.firstElementChild;
-      while (child) {
-        this.hydrate(child);
-        child = child.nextElementSibling;
-      }
+    }
+    let child = node.firstChild;
+    while (child) {
+      this.hydrate(child);
+      child = child.nextSibling;
     }
   }
   connectedCallback() {
@@ -468,13 +474,13 @@ customElements?.whenDefined("handler-registry").then(() => {
       return node instanceof HandlerRegistry ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
     }
   );
-  let current = tw.currentNode;
-  while (current && !(current instanceof HandlerRegistry)) {
+  let current = tw.firstChild();
+  while (current) {
+    if (current instanceof HandlerRegistry) {
+      current.hydrate();
+    }
     current = tw.nextNode();
   }
-  if (current) {
-    current.hydrate();
-  }
 });
 
 export { HandlerRegistry, computed, effect, isState, reactive, signal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radishland/runtime",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "The Radish runtime",
   "author": "Frédéric Crozatier",