@daz4126/helium 0.11.1 → 0.13.0

package/helium.js

@@ -3,68 +3,93 @@ 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] = [new Map(), new Map(), new WeakMap(), new WeakSet()];
   const $ = s => document.querySelector(s);
   const html = s => Object.assign(document.createElement("template"),{innerHTML:s.trim()}).content.firstChild
 
-const ajax=(u,m,o={},p={})=>{
-  console.log("ajax: ", u,m,o.target,p)
-  const fd=p instanceof FormData,t=document.querySelector('meta[name="csrf-token"]')?.content;
-  fetch(u,{method:m,headers:{
-    Accept:"text/vnd.turbo-stream.html,application/json,text/html",
-    ...(!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=>{
-    if(o.data)state[o.data]=d;
-    if(o.target){
-      const c=o.template?o.template(d):d;
-      o.action?o.target[o.action=="replace"?"replaceWith":o.action](html(c)):o.target.innerHTML=c;
-    }
-  }).catch(e=>{
-    console.error("AJAX:",e.message);
-   })
-}
+  const update = (data,target,action,template) => {
+    const element = target instanceof Node ? target : (refs.get(target) || $(target));
+    if(element){
+      const content = html(template ? template(data) : 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;
+    const fd = p instanceof FormData, t = document.querySelector('meta[name="csrf-token"]')?.content;
+    fetch(u,{method:m,headers:{
+      Accept:"text/vnd.turbo-stream.html,application/json,text/html",
+      ...(!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 => {
+        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}
+    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 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}
-  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)}
-  else el.setAttribute(prop,parseEx(r))
-}
+    const {el,prop,fn}=b;
+    const r=fn($,state,e,elCtx,html,...Object.values(data),...[...refs.values()]);
+    if(prop==="innerHTML"){
+      isUpdatingDOM=1;
+      const content = el.innerHTML=Array.isArray(r)?r.join``:r
+      typeof Idiomorph === "object" ? Idiomorph.morph(el, content,{morphStyle:'innerHTML'}) : el.innerHTML = content;
+      isUpdatingDOM=0
+    }
+    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)}
+    else el.setAttribute(prop,parseEx(r))
+  }
 
   const compile = (expr, withReturn = false) => {
     try {
-      return new Function("$", "$data", "$event", "$el", "$html","$get", "$post", "$put","$patch","$delete",...Object.keys(data), ...[...refs.keys()],
-        `with($data){${withReturn ? "return" : ""}(${expr.trim()})}`);
+      return new Function("$","$data","$event","$el","$html","$get","$post","$put","$patch","$delete",...Object.keys(data),...[...refs.keys()],
+        `with($data){${withReturn?"return":""}(${expr.trim()})}`);
     } 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 => {
-      listeners.get(e)?.forEach(({receiver, event, handler}) => receiver.removeEventListener(event, handler));
+    [el,...el.querySelectorAll('*')].forEach(e => {
+      listeners.get(e)?.forEach(({receiver,event,handler}) => receiver.removeEventListener(event,handler));
       listeners.delete(e);
     });
   };
@@ -72,8 +97,8 @@ const trackDependencies=fn=>{
   function processElements(element) {
     const newBindings = [];
     if (element.nodeType == 1) {
-      if (element.hasAttribute?.("data-he-p")) return newBindings;
-      element.setAttribute("data-he-p", "");
+      if (processed.has(element)) return newBindings;
+      processed.add(element);
     }
 
     const heElements=[element,...element.querySelectorAll("*")].filter(e=>[...e.attributes].some(a=>/^(@|:|data-he)/.test(a.name)))
@@ -95,6 +120,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";
@@ -128,7 +156,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(".");
@@ -151,14 +179,21 @@ const trackDependencies=fn=>{
             }         
               if (!mods.includes("outside") || !el.contains(e.target)) {
               if (isHttpMethod) {
-                const options = exFn(el.getAttribute('data-he-options') || el.getAttribute('options') || '{}');
-                let paramsAttr = el.getAttribute('data-he-params') || el.getAttribute('params') || '{}';              
+                const getAttr = name => el.getAttribute(`data-he-${name}`) || el.getAttribute(`@${name}`);
+                const [target, action] = (getAttr('target') || "").split(":");
+                const options = {
+                  ...exFn(getAttr('options') || '{}'),
+                  ...(target && { target }),
+                  ...(action && { action }),
+                  ...execFn(getAttr('template')) && { template: execFn(getAttr('template')) },
+                  ...getAttr('loading') && { loading: getAttr('loading') }
+                };
+                let paramsAttr = getAttr('params') || '{}';              
                 if (!paramsAttr.trim().startsWith("{") && paramsAttr.includes(":")) {
                   const props = paramsAttr.split(":").map(s => s.trim());
                   paramsAttr = props.reduceRight((acc, key, i) => `{ ${key}: ${i == 1 ? `'${el[acc]}'` : acc} }`);
                 }
                 const params = exFn(paramsAttr);
-                console.log("params: ",params)
                 ajax(value, eventName.toUpperCase(), options, params);
               } else {
                 exFn(value);
@@ -176,12 +211,13 @@ 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));
-  }
-}).observe(root,{childList:1,subtree:1});
+    if(isUpdatingDOM)return;
+    for(const m of ms){
+      m.removedNodes.forEach(n=>n.nodeType===1&&cleanup(n));
+      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.11.1",
+  "version": "0.13.0",
   "main": "helium.js",
   "type": "module",
   "scripts": {