wip fix

app/srv/core/main.js

@@ -129,7 +129,7 @@ ${l}`),c}}};var Gm=R(xm());var dr=async(e,t)=>{let A=(0,Gm.default)(e,"/"),i=awa
         ${cy(e,t.mode)}
         ${Tm(e,t.mode)}
         ${uy(e,t.mode)}
-      `,(t?.hover||t?.active)&&ly({item:e,hover:t?.hover,active:t?.active}),_m(e,t.mode)])}catch(A){console.log(A)}return cx([])};var Qy=R(Ie()),Is=(e,t,A,i)=>{let n=t.item,r={className:dy(n,{mode:e.mode})},o={},s=t.item.childs,I;return t.item.type==="text"?(I=null,r.dangerouslySetInnerHTML={__html:t.item.html||""}):I=Array.isArray(s)&&s?.map(a=>{if(!a)return null;let{id:c}=a,u=A?e.layout?.meta[c]:e.meta[c];return u?(0,Qy.jsx)(mr,{meta:u,is_layout:A,passprop:i},c):null}),r.children=I,t.item.adv?.js&&!t.item.adv.js.includes("children")&&(delete r.children,delete r.dangerouslySetInnerHTML),{props:r,text_props:o}};var Fy=R(Ye());var ja=R(Ye());var Za=R(Ye());var hy=R(Ye()),py=(e,t)=>A=>{if(t.item.script||(t.item.script={}),t.item.script.passprop||(t.item.script.passprop={}),t.item.script.passprop){let i=!1;for(let[n,r]of Object.entries(A))["children","key"].includes(n)||(i=!0,t.item.script.passprop[n]={end:0,start:0,value:r})}return dB(A,t.script?.scope)},dB=(e,t)=>{let A={};if(Array.isArray(e)?A.children=e:A=e,Array.isArray(A.children)){let i=[];for(let n of A.children)i.push(Cy(n,A,t));return i}return Cy(A.children,A,t)},Cy=(e,t,A)=>{if((0,hy.isValidElement)(e)){let i={...t};return delete i.children,{...e,props:{...e.props,passprop:{...A,...i}}}}return e};var Ey=(e,t,A)=>i=>{let{children:n}=i,r=e.script?.init_local_effect,o=t?e.layout?.meta:e.meta,I=(0,Za.useRef)(i.value).current;return I.render=A.render,Wa(e,A,A.script?.scope),i.hook&&i.hook(I),(0,Za.useEffect)(()=>{let a=A.item.id;if(A.parent?.instance_id&&o){let u=o[A.parent?.instance_id];if(u&&u.instances){for(let[l,g]of Object.entries(u.instances[A.parent.instance_id]))if(g===A.item.id){a=l;break}}}return!r[a]&&(typeof r=="object"&&(r[a]=!0),(async()=>i.effect&&await i.effect(I))()),()=>{}},[]),dB(n,{...A.script?.scope,[i.name]:I})};var QB=R(Ie()),my=(e,t,A,i)=>{let n=Is(e,t,A,i);e.visit&&e.visit(t,n),t.script?t.script.scope=i:t.script={scope:i,result:null,Local:Ey(e,A,t),PassProp:py(e,t)};let r=t.script,o=window.exports,s={useEffect:ja.useEffect,children:n.props.children,props:n.props,Local:r.Local,db:e.site.db,api:e.site.api,PassProp:r?.PassProp,ErrorBox:FA,newElement:()=>{},render:u=>{r.result=(0,QB.jsx)(ja.Suspense,{children:u})},params,...hr(e),...o,...i};if(typeof i=="object"){for(let[u,l]of Object.entries(i))if(typeof l=="object"&&l&&l._jsx){let g=l;s[u]=(0,QB.jsx)(fN,{fn:g.fn,passprop:i,meta:t})}}!fe.isEditor&&t.item.adv?.js&&qa(e,t.item.adv.js);let I=t.item.adv?.jsBuilt||"",a=hB(I,CB)||"";new Function(...Object.keys(s),`// ${t.item.name}: ${t.item.id} 
+      `,(t?.hover||t?.active)&&ly({item:e,hover:t?.hover,active:t?.active}),_m(e,t.mode)])}catch(A){console.log(A)}return cx([])};var Qy=R(Ie()),Is=(e,t,A,i)=>{let n=t.item,r={className:dy(n,{mode:e.mode})},o={},s=t.item.childs,I;return t.item.type==="text"?(I=null,r.dangerouslySetInnerHTML={__html:t.item.html||""}):I=Array.isArray(s)&&s?.map(a=>{if(!a)return null;let{id:c}=a,u=A?e.layout?.meta[c]:e.meta[c];return u?(0,Qy.jsx)(mr,{meta:u,is_layout:A,passprop:i},c):null}),r.children=I,t.item.adv?.js&&!t.item.adv.js.includes("children")&&(delete r.children,delete r.dangerouslySetInnerHTML),{props:r,text_props:o}};var Fy=R(Ye());var ja=R(Ye());var Za=R(Ye());var hy=R(Ye()),py=(e,t)=>A=>{if(t.item.script||(t.item.script={}),t.item.script.passprop||(t.item.script.passprop={}),t.item.script.passprop){let i=!1;for(let[n,r]of Object.entries(A))["children","key"].includes(n)||(i=!0,t.item.script.passprop[n]={end:0,start:0,value:r})}return dB(A,t.script?.scope)},dB=(e,t)=>{let A={};if(Array.isArray(e)?A.children=e:A=e,Array.isArray(A.children)){let i=[];for(let n of A.children)i.push(Cy(n,A,t));return i}return Cy(A.children,A,t)},Cy=(e,t,A)=>{if((0,hy.isValidElement)(e)){let i={...t};return delete i.children,{...e,props:{...e.props,passprop:{...A,...i}}}}return e};var Ey=(e,t,A)=>i=>{let{children:n}=i,r=e.script?.init_local_effect,o=t?e.layout?.meta:e.meta,I=(0,Za.useRef)(i.value).current;return I.render=A.render,Wa(e,A,A.script?.scope),i.hook&&i.hook(I),(0,Za.useEffect)(()=>{let a=A.item.id;if(A.parent?.instance_id&&o){let u=o[A.parent?.instance_id];if(u&&u.instances){for(let[l,g]of Object.entries(u.instances[A.parent.instance_id]))if(g===A.item.id){a=l;break}}}return!r[a]&&(typeof r=="object"&&(r[a]=!0),(async()=>i.effect&&await i.effect(I))()),()=>{}},[location.pathname]),dB(n,{...A.script?.scope,[i.name]:I})};var QB=R(Ie()),my=(e,t,A,i)=>{let n=Is(e,t,A,i);e.visit&&e.visit(t,n),t.script?t.script.scope=i:t.script={scope:i,result:null,Local:Ey(e,A,t),PassProp:py(e,t)};let r=t.script,o=window.exports,s={useEffect:ja.useEffect,children:n.props.children,props:n.props,Local:r.Local,db:e.site.db,api:e.site.api,PassProp:r?.PassProp,ErrorBox:FA,newElement:()=>{},render:u=>{r.result=(0,QB.jsx)(ja.Suspense,{children:u})},params,...hr(e),...o,...i};if(typeof i=="object"){for(let[u,l]of Object.entries(i))if(typeof l=="object"&&l&&l._jsx){let g=l;s[u]=(0,QB.jsx)(fN,{fn:g.fn,passprop:i,meta:t})}}!fe.isEditor&&t.item.adv?.js&&qa(e,t.item.adv.js);let I=t.item.adv?.jsBuilt||"",a=hB(I,CB)||"";new Function(...Object.keys(s),`// ${t.item.name}: ${t.item.id} 
 ${a}
   `)(...Object.values(s)),Wa(e,t,i)},fN=({fn:e,meta:t,passprop:A})=>e({passprop:A,meta:t}),CB={"stroke-width":"strokeWidth","fill-rule":"fillRule","clip-rule":"clipRule","stroke-linejoin":"strokeLinejoin","stroke-linecap":"strokeLinecap","clip-path":"clipPath"},hB=(e,t)=>{let A=e;for(let[i,n]of Object.entries(t))A=A.replaceAll(i,n);return A};var wy=R(Ie()),yy=(e,t,A,i)=>{if(t.item.component?.id){t.item.script||(t.item.script={});let r={...window.exports,db:e.site.db,api:e.site.api,...hr(e),...i,params};t.item.script.props={};let o=new Set;if(t.item.component.props)for(let[s,I]of Object.entries(t.item.component.props))try{if(I.meta?.type==="content-element"){let g={_jsx:!0,fn:B=>{let p=I.content?.id;if(p){let U=A?e.layout?.meta[p]:e.meta[p];if(!U)return null;let d=t.instances;if(!B.meta.item.originalId||!d||!d[t.item.id])return null;let Q=B.meta.item.originalId;if(U.mitem&&(I.jsxCalledBy&&(!I.jsxCalledBy.includes(Q)||I.jsxCalledBy.length!==2)||!I.jsxCalledBy)){let y=t.mitem?.get("component")?.get("props")?.get(s);if(y){let F=y.get("jsxCalledBy");!F||typeof F!="object"?y.set("jsxCalledBy",[t.item.id,Q]):(!F.includes(Q)||F.length!==2||F[0]!==t.item.id||F[1]!==Q)&&y.set("jsxCalledBy",[t.item.id,Q])}}return(0,wy.jsx)(mr,{meta:U,passprop:B.passprop,is_layout:A})}return null}};r[s]=g,i&&(i[s]=g);continue}I.value&&qa(e,I.value);let a=I.valueBuilt||"",c=hB(a,CB)||"",u=new Function(...Object.keys(r),`// [${t.item.name}] ${s}: ${t.item.id} 
   return ${c}

app/web/src/nova/vi/render/script/local.tsx

@@ -67,7 +67,7 @@ export const createViLocal = (
       }
 
       return () => {};
-    }, []);
+    }, [location.pathname]);
 
     return modifyChild(children, {
       ...meta.script?.scope,