@daz4126/helium 0.12.0 → 0.14.0

package/helium.js

@@ -3,9 +3,10 @@ const getEvent = el => ({form:"submit",input:"input",textarea:"input",select:"ch
 const debounce=(f,d)=>{let t;return(...a)=>(clearTimeout(t),t=setTimeout(f,d,...a))}
 
 export default function helium(data = {}) {
+  let initFn;
   const he = (n,...a) => a.map(b => `|@${b}|data-he-${b}|`).join``.includes(`|${n.split('.')[0]}|`);
   const root = document.querySelector("[\\@helium]") || document.querySelector("[data-helium]") || document.body;
-  const [bindings, refs, listeners] = [new Map(), new Map(), new WeakMap()];
+  const [bindings, refs, listeners, processed, parentKeys] = [new Map(), new Map(), new WeakMap(), new WeakSet(), new WeakMap()];
   const $ = s => document.querySelector(s);
   const html = s => Object.assign(document.createElement("template"),{innerHTML:s.trim()}).content.firstChild
 
@@ -16,8 +17,7 @@ export default function helium(data = {}) {
       action ? element[action=="replace"?"replaceWith":action](content) : element.innerHTML = content;
       return content
     } else state[target] = data
-  }
-  
+  }  
   
 const ajax = (u,m,o={},p={}) => {
     if(o.loading) o.target = update(o.loading,o.target,o.action) || o.target;
@@ -27,26 +27,87 @@ const ajax = (u,m,o={},p={}) => {
       ...(!fd&&m!=="GET"&&{"Content-Type":"application/json"}),
       ...(t&&{"X-CSRF-Token":t})
     },body:m==="GET"?null:(fd?p:JSON.stringify(p)),credentials:"same-origin"})
-    .then(r=>r.headers.get("content-type")?.includes("json")?r.json():r.text())
-    .then(d=>o.loading?update(d,o.target,"replace",o.template):update(d,o.target,o.action,o.template))
-    .catch(e=>console.error("AJAX:",e.message));
+      .then(r => {
+        const type = r.headers.get("content-type") || "";
+        return (type.includes("turbo-stream") ? r.text().then(d => ({ t: true, d })) :
+                type.includes("json")         ? r.json() :
+                                                r.text());
+      }).then(d =>
+        d.t && "Turbo"
+          ? Turbo.renderStreamMessage(d.d)
+          : update(d, o.target, o.loading ? "replace" : o.action, o.template)
+      ).catch(e => console.error("AJAX:", e.message));
   }
 
   const get = (u,t) => ajax(u,"GET",t);
   const [post, put, patch, del] = ["POST","PUT","PATCH","DELETE"].map(m => (u, d, t) => ajax(u, m, t, d));
   
-  const handler = {
-    get: (t,p,r) => {const v = Reflect.get(t,p,r); return typeof v==="object"&&v!==null ? new Proxy(v,handler) : v},
-    set: (t,p,v) => {const res = Reflect.set(t,p,v); bindings.get(p)?.forEach(applyBinding); return res}
-  };
+const handler = {
+    get: (t,p,r) => {
+      const v = Reflect.get(t,p,r); 
+      if (typeof v==="object" && v!==null) {
+        const proxy = new Proxy(v, handler);
+        parentKeys.set(v, p);
+        return proxy;
+      }
+      return v;
+    },
+    set: (t,p,v) => {
+      const res = Reflect.set(t,p,v);    
+      if (Array.isArray(t) && !isNaN(p)) {
+        const parentKey = parentKeys.get(t);
+        if (parentKey) bindings.get(parentKey)?.forEach(applyBinding);
+      }   
+      bindings.get(p)?.forEach(applyBinding); 
+      return res
+    }
+};
 
   const state = new Proxy(data, handler);
-  let isUpdatingDOM = false;
 
 function applyBinding(b,e={},elCtx=b.el){
     const {el,prop,fn}=b;
     const r=fn($,state,e,elCtx,html,...Object.values(data),...[...refs.values()]);
-    if(prop==="innerHTML"){isUpdatingDOM=1;el.innerHTML=Array.isArray(r)?r.join``:r;isUpdatingDOM=0}
+    if(prop==="innerHTML" && Array.isArray(r) && el.children.length > 0){
+  const temp = html(`<${el.tagName.toLowerCase()}>${r.join``}</${el.tagName.toLowerCase()}>`);
+  const newChildren = [...temp.children];
+  
+  const newItems = newChildren.map((child, idx) => ({
+    key: child.getAttribute("key") || child.dataset.key,
+    element: child,
+    index: idx
+  }));
+  
+  const existingItems = [...el.children].map((child, idx) => ({
+    key: child.getAttribute("key") || child.dataset.key,
+    element: child,
+    index: idx
+  }));
+  
+  for (let i = 0; i < Math.max(newItems.length, existingItems.length); i++) {
+    const existing = existingItems[i];
+    const newItem = newItems[i];
+    
+    if (!newItem && existing) {
+      cleanup(existing.element);
+      existing.element.remove();
+    } else if (newItem && !existing) {
+      el.appendChild(newItem.element);
+    } else if (newItem && existing) {
+      if (existing.element.outerHTML !== newItem.element.outerHTML) {
+        if(typeof Idiomorph === "object") {
+          Idiomorph.morph(existing.element, newItem.element.outerHTML);
+        } else {
+          cleanup(existing.element);
+          existing.element.replaceWith(newItem.element);
+        }
+      }
+    }
+  }    
+    } else if(prop==="innerHTML"){
+      const content = Array.isArray(r)?r.join``:r
+      typeof Idiomorph === "object" ? Idiomorph.morph(el, content,{morphStyle:'innerHTML'}) : el.innerHTML = content;
+    }
     else if(prop==="class"&&r&&typeof r==="object")for(const[k,v]of Object.entries(r))k.split(/\s+/).forEach(c=>el.classList.toggle(c,v));
     else if(prop==="style"&&r&&typeof r==="object")el.style=Object.entries(r).filter(([,v])=>v).map(([k,v])=>`${k}:${v}`).join(";")
     else if(prop in el){if(el.type==="radio")el.checked=el.value===r;else el[prop]=prop==="textContent"?r:parseEx(r)}
@@ -60,10 +121,19 @@ function applyBinding(b,e={},elCtx=b.el){
     } catch {return () => expr}
   };
 
-const trackDependencies = fn => {
-    const s=new Set(),p=new Proxy(state,{get:(t,k)=>{if(typeof k==="string")s.add(k);const v=t[k];return v&&typeof v==="object"?new Proxy(v,this):v}});
-    try{fn($,p,refs)}catch{};return[...s]
-  }
+const trackDependencies = (fn, el) => {
+    const accessed = new Set();
+    const trackProxy = new Proxy(data, {
+      get(target, prop) {
+        if (typeof prop == 'string') accessed.add(prop);
+        const val = target[prop];
+        return typeof val == "object" && val != null ? new Proxy(val, this) : val;
+      }
+    });
+    
+    try { fn.call(null, $, trackProxy, refs); } catch {}
+    return [...accessed];
+  };
 
   const cleanup = el => {
     [el,...el.querySelectorAll('*')].forEach(e => {
@@ -73,15 +143,14 @@ const trackDependencies = fn => {
   };
 
   function processElements(element) {
+    let count = 0
     const newBindings = [];
-    if (element.nodeType == 1) {
-      if (element.hasAttribute?.("data-he-p")) return newBindings;
-      element.setAttribute("data-he-p", "");
-    }
+    if (element.nodeType == 1 && processed.has(element)) return newBindings;
 
     const heElements=[element,...element.querySelectorAll("*")].filter(e=>[...e.attributes].some(a=>/^(@|:|data-he)/.test(a.name)))
 
     heElements.forEach(el => {
+      count++
       for (const {name, value} of el.attributes || []) {
         if (he(name,"text","html","bind")) {
           try {
@@ -98,6 +167,9 @@ const trackDependencies = fn => {
     };
 
     heElements.forEach(el => {
+      if (processed.has(el)) return;
+      processed.add(el);
+      
       const execFn = v => compile(v, true)($, state, {}, el, html,get,post, put,patch,del, ...Object.values(data), ...[...refs.values()]);
       const inputType = el.type?.toLowerCase();
       const isCheckbox = inputType == "checkbox", isRadio = inputType == "radio", isSelect = el.tagName == "SELECT";
@@ -131,7 +203,7 @@ const trackDependencies = fn => {
           trackDependencies(fn, el).forEach(dep => addBinding(dep, {el, prop: name.slice(1), fn}));
         }
         if (he(name,"init")) {
-          execFn(value);
+          initFn = compile(value,true);
         } else if (name.startsWith("@") || name.startsWith("data-he")) {
           const fullName = name.startsWith("@") ? name.slice(1) : name.slice(8);
           const [eventName, ...mods] = fullName.split(".");
@@ -186,12 +258,12 @@ const trackDependencies = fn => {
     return newBindings;
   }
   new MutationObserver(ms=>{
-    if(isUpdatingDOM)return;
     for(const m of ms){
       m.removedNodes.forEach(n=>n.nodeType===1&&cleanup(n));
-      m.addedNodes.forEach(n=>n.nodeType===1&&!n.hasAttribute("data-he-p")&&processElements(n).forEach(applyBinding));
+      m.addedNodes.forEach(n=>n.nodeType===1&&!processed.has(n)&&processElements(n).forEach(applyBinding));
     }
   }).observe(root,{childList:1,subtree:1});
   processElements(root);
   for (const [key, items] of bindings.entries()) items.forEach(applyBinding);
+  if(initFn) initFn($, state, {}, {}, html,get,post, put,patch,del, ...Object.values(data), ...[...refs.values()])
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/helium",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "main": "helium.js",
   "type": "module",
   "scripts": {