diff --git a/README.md b/README.md
index ef3afa7..2861669 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,15 @@
 
 指令语法：`$attribute="code"`。作用域默认为全局，组件内优先访问 `node.state`。
 
-### 结构化映射
-| 指令 | 触发逻辑 | DOM 行为 |
-| :--- | :--- | :--- |
-| **`$if`** | `Boolean(result)` | `true`: 挂载节点; `false`: 移除节点。建议配合 `<template>`。 |
-| **`$each`** | `Iterable` | 基于 `key` 属性执行节点复用。无 `key` 时按索引重建。支持 `as`, `index` 定义局部变量。 |
+### 结构化映射 (AI 强制规范)
+| 指令 | 触发逻辑 | DOM 行为 | 运行约束 |
+| :--- | :--- | :--- | :--- |
+| **`$if`** | `Boolean(result)` | `true`: 挂载节点; `false`: 移除节点。 | **必须** 作用于 `<template>`。 |
+| **`$each`** | `Iterable` | 基于 `key` 属性执行节点复用。无 `key` 时按索引重建。支持 `as`, `index` 定义局部变量。 | **必须** 作用于 `<template>`。 |
+
+**结构化指令铁律**：
+1.  **标签约束**：严禁在非 `<template>` 标签上使用 `$if` 或 `$each`。
+2.  **互斥约束**：严禁在同一个 `<template>` 上同时使用 `$if` 和 `$each`。若需组合，必须嵌套（如：`$if` 模版包裹 `$each` 模版）。
 
 ### 数据双向绑定 (`$bind`)
 AI 必须根据不同的元素类型执行以下逻辑：
@@ -37,11 +41,11 @@ AI 必须根据不同的元素类型执行以下逻辑：
 - **`[contenteditable]`**: 监听 `input`，同步 `innerHTML`。
 - **`input[type=file]`**: 同步 `files` 对象。
 
-### 属性操作映射
+### 属性与 Property 绑定
 - **`$text`**: 映射至 `textContent`。
 - **`$html`**: 映射至 `innerHTML`。
 - **`$class`**: **严格要求使用模板字符串**。范式：`class="static-name ${condition ? 'dynamic-name' : ''}"`。严禁覆盖原有类名。
-- **`.path.to.prop`**: 直接映射至 DOM 对象原生属性。例如：`.style.color="'red'"` 映射为 `el.style.color = 'red'`。
+- **`$.path.to.prop`**: 直接映射至 DOM 对象或组件的 Property。初始化 Property 绑定必须带 `.` 前缀。
 - **`$src`**: 增强逻辑。若值以 `.svg` 结尾，异步 Fetch 并替换为内联 `<svg>` 节点。
 - **`$$attr`**: 二级求值。`eval(eval(expr))` 逻辑，用于动态生成指令代码。
 
@@ -49,11 +53,11 @@ AI 必须根据不同的元素类型执行以下逻辑：
 
 ## 3. 生命周期与事件逻辑
 
-- **`$on[event]`**: 映射为 `addEventListener`。注入 `event`, `thisNode`, `this`。
+- **`$on[event]`**: 映射为 `addEventListener`。注入 `event`, `thisNode`, `State`, `LocalStorage`, `Hash`。
 - **生命周期**：
-    - **`$onload`**: `DOMNodeInserted` 且指令解析完成后触发。
-    - **`$onunload`**: `DOMNodeRemoved` 前触发，必须用于清理定时器或外部监听。
-    - **`$onupdate`**: 属性 setter 触发且渲染微任务完成后执行。
+    - **`$onload`**: 节点进入 DOM 且指令解析完成后触发。
+    - **`$onunload`**: 节点从 DOM 移除前触发。
+    - **`$onupdate`**: 绑定的数据变更且渲染任务完成后执行。
 
 ---
 
diff --git a/dist/state.js b/dist/state.js
index e8629da..8b30689 100644
--- a/dist/state.js
+++ b/dist/state.js
@@ -111,7 +111,9 @@
       });
     }
     to.classList.add(...from.classList);
-    Array.from(from.childNodes).forEach((child) => to.appendChild(child));
+    const target = to.tagName === "TEMPLATE" ? to.content : to;
+    const sourceNodes = from.tagName === "TEMPLATE" ? from.content.childNodes : from.childNodes;
+    Array.from(sourceNodes).forEach((child) => target.appendChild(child));
     if (from.tagName && Component.exists(from.tagName)) _makeComponent(from.tagName, to, scanObj, exists);
   }
   function _makeComponent(name, node, scanObj, exists = {}) {
@@ -440,6 +442,13 @@
     if (node._thisObj) scanObj.thisObj = node._thisObj;
   };
   const _scanTree = (node, scanObj = {}) => {
+    if (node.nodeType === 3) {
+      if (node._stTranslated) return;
+      const translated = _translate(node.textContent);
+      if (translated !== node.textContent) node.textContent = translated;
+      node._stTranslated = true;
+      return;
+    }
     if (node.nodeType !== 1) return;
     if (!node._stTranslated) {
       Array.from(node.attributes).forEach((attr) => {
@@ -460,7 +469,6 @@
       node.parentNode.insertBefore(template, node);
       template.content.appendChild(node);
       template._ref = node._ref;
-      _scanTree(template, scanObj);
       return;
     }
     if (node.tagName === "TEMPLATE" && (node.hasAttribute("$if") || node.hasAttribute("st-if")) && (node.hasAttribute("$each") || node.hasAttribute("st-each"))) {
@@ -624,6 +632,8 @@
     LocalStorage,
     State
   };
+  globalThis.$ = $;
+  globalThis.$$ = $$;
   if (typeof window !== "undefined") {
     window.ApigoState = ApigoState;
   }
diff --git a/dist/state.min.js b/dist/state.min.js
index b665339..2538b8c 100644
--- a/dist/state.min.js
+++ b/dist/state.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).ApigoState={})}(this,function(e){"use strict";var t;let n=null,s=null;const a=e=>n=e,r=e=>s=e,o=new Set;function i(e={},t=null,a=null){const r={},i=new Map,l=new Map,d=(e,t)=>(l.has(e)||l.set(e,new Set),t?l.get(e).add(t):l.get(e).clear(),()=>l.get(e).delete(t)),c=(e,t)=>{l.has(e)&&l.set(e,new Set),l.get(e).delete(t)},h=t||(e=>r[e]),u=a||((e,t)=>r[e]=t);return Object.assign(r,e),new Proxy(r,{get:(e,t)=>"__watch"===t?d:"__unwatch"===t?c:"__isProxy"===t||(n&&(i.has(t)||i.set(t,new Set),i.get(t).add(n),n.node._states||(n.node._states=new Set),n.node._states.add(i)),h(t)),set(e,t,n){if(h(t)!==n&&u(t,n),l.has(t)&&l.get(t).forEach(s=>{const a=s(n);void 0!==a&&(n=a,e[t]=n)}),l.has(null)&&l.get(null).forEach(e=>e(n)),i.has(t)){const e=i.get(t);for(const t of e)t.node.isConnected?s!==t.node&&o.forEach(e=>e(t)):e.delete(t)}return!0}})}const l=(e,t)=>t?e.querySelector(t):document.querySelector(e),d=(e,t)=>t?e.querySelectorAll(t):document.querySelectorAll(e),c=new Map,h=[],u={getTemplate:e=>document.querySelector(`template[component="${e.toUpperCase()}"]`),register:(e,t,n=null,...s)=>{console.log("Component.register:",e.toUpperCase()),c.set(e.toUpperCase(),t),"loading"!==document.readyState?u._addTemplate(e,n,s):h.push([e,n,s])},exists:e=>c.has(e.toUpperCase()),getSetupFunction:e=>c.get(e.toUpperCase()),_addTemplate:(e,t,n)=>{if(t){const n=document.createElement("TEMPLATE");n.setAttribute("component",e.toUpperCase()),n.content.appendChild(t),document.body.appendChild(n)}n&&n.forEach(e=>document.body.appendChild(e))},_initPending:()=>{h.forEach(([e,t,n])=>u._addTemplate(e,t,n)),h.length=0}};function f(e,t,n,s={}){e.attributes&&Array.from(e.attributes).forEach(e=>{"class"!==e.name&&("style"===e.name?t.hasAttribute("style")?t.setAttribute("style",`${e.value}; ${t.getAttribute("style")}`):t.setAttribute("style",e.value):t.hasAttribute(e.name)||t.setAttribute(e.name,e.value))}),t.classList.add(...e.classList),Array.from(e.childNodes).forEach(e=>t.appendChild(e)),e.tagName&&u.exists(e.tagName)&&b(e.tagName,t,n,s)}function b(e,t,n,s={}){if(s[e])return;s[e]=!0,n.thisObj&&Array.from(t.attributes).forEach(e=>{(e.name.startsWith("$")||e.name.startsWith("st-"))&&e.value.includes("this.")&&(e.value=e.value.replace(/\bthis\./g,"this.parent."))});const a=u.getSetupFunction(e),r={};Array.from(t.childNodes).forEach(e=>{e.nodeType===Node.ELEMENT_NODE&&e.hasAttribute("slot")&&(r[e.getAttribute("slot")]=e,e.removeAttribute("slot"))}),t.innerHTML="",t.state=i(t.state||{});const o=u.getTemplate(e);if(o){const e=o.content.cloneNode(!0);if(e.childNodes.length){const a=e.children[0];a&&f(a,t,n,s),d(t,"[slot-id]").forEach(e=>{const t=e.getAttribute("slot-id");r[t]&&(e.removeAttribute("slot-id"),e.innerHTML="",f(r[t],e,n,s))})}}a&&a(t)}let p=!1;function m(e){p=e}const g=new Map;function _(e,t,n,s){const a={...s||{},...t||{}},r=Object.keys(a),o=Object.values(a),i=e+r.join(",");try{let t=g.get(i);return t||(t=new Function("Hash","LocalStorage","State",...r,e),g.set(i,t)),t.apply(n,[globalThis.Hash,globalThis.LocalStorage,globalThis.State,...o])}catch(a){return p||console.error(a,s,[e,s,t,n]),null}}function y(e,t,n,s){return e.includes("${")?_("return `"+e+"`",t,n,s):_("return "+e,t,n,s)}let A=(e,t)=>e&&"string"==typeof e?e.replace(/\{(.+?)\}/g,(e,n)=>t.hasOwnProperty(n)?t[n]:e):e;const v=e=>A=e,E=e=>e&&"string"==typeof e&&e.includes("{#")?e.replace(/\{#(.+?)#\}/g,(e,t)=>{const n=t.split("||").map(e=>e.trim()),s={};if(n.length>1){const e=n[0].match(/\{(.+?)\}/g);e&&e.forEach((e,t)=>s[e.substring(1,e.length-1)]=n[t+1]||"")}return A(n[0],s)}):e;if("undefined"!=typeof document)try{document.createElement("div").setAttribute("$t","1")}catch(e){const t=Element.prototype.setAttribute;Element.prototype.setAttribute=function(e,n){return e.startsWith("$")?t.call(this,"st-"+e.substring(1),n):t.call(this,e,n)}}var N;function O(e){e._renderedNodes&&e._renderedNodes.forEach(e=>e.forEach(e=>{e.remove(),e._renderedNodes&&O(e)}))}function S(e){const t=e.node;if(!t.isConnected&&"TEMPLATE"!==t.tagName)return;a(e);let n=e.exp?e.tpl?y(e.tpl,{thisNode:t},t._thisObj||t,t._ref||null):null:e.tpl;if(2===e.exp&&"string"==typeof n)try{n=y(n,{thisNode:t},t._thisObj||t,t._ref||null)}catch(e){}if(a(null),e.prop){const s=e.prop;let a=t;for(let e=0;e<s.length-1&&(!s[e]||(null==a[s[e]]&&(a[s[e]]={}),a=a[s[e]],"object"==typeof a));e++);if("object"==typeof a&&null!==a){const e=s[s.length-1];if(e){"object"!=typeof n||null==n||Array.isArray(n)||null!=a[e]||(a[e]={});const t=a[e];"object"==typeof t&&null!=t&&t.__watch?Object.assign(t,n):a[e]!==n&&(a[e]=n)}else"object"!=typeof n||null==n||Array.isArray(n)||Object.assign(a,n)}}else if(e.attr){const s=e.attr;if("if"===s)n?t._renderedNodes&&0!==t._renderedNodes.length||(t._children.forEach(e=>{t.parentNode.insertBefore(e,t),e._ref={...t._ref},e._thisObj=t._thisObj}),t._renderedNodes=[t._children]):(O(t),t._renderedNodes=[]);else if("each"===s)if(n&&"object"==typeof n){const e=t.getAttribute("as")||"item",s=t.getAttribute("index")||"index",a=t.getAttribute("key");let r,o;if(n instanceof Map)r=Array.from(n.keys()),o=e=>n.get(e);else if("function"==typeof n[Symbol.iterator]){const e=Array.isArray(n)?n:Array.from(n);r=new Array(e.length);for(let t=0;t<e.length;t++)r[t]=t;o=t=>e[t]}else r=Object.keys(n),o=e=>n[e];t._keyedNodes||(t._keyedNodes=new Map);const i=new Map,l=[];r.forEach((n,r)=>{const d=o(n),c=a?d&&"object"==typeof d?d[a]:d:n,h=null==c||i.has(c)?`st_key_${r}`:c;let u=t._keyedNodes.get(h);u?(t._keyedNodes.delete(h),u.forEach(t=>{t._ref[s]=n,t._ref[e]=d,w(t)})):(u=[],t._children.forEach(a=>{const r=a.cloneNode(!0);r._ref={...t._ref,[s]:n,[e]:d},r._thisObj=t._thisObj,t.parentNode.insertBefore(r,t),u.push(r)})),i.set(h,u),l.push(u)}),t._keyedNodes.forEach(e=>e.forEach(e=>{O(e),e.remove()})),t._keyedNodes=i,t._renderedNodes=l}else O(t),t._renderedNodes=[];else if("bind"===s){if(["INPUT","SELECT","TEXTAREA"].includes(t.tagName)&&!t.hasAttribute("autocomplete")&&t.setAttribute("autocomplete","off"),"checkbox"===t.type){"on"===t.value||n||(_(`${e.tpl} = []`,{thisNode:t},t._thisObj||t,t._ref||{}),n=[]),t._checkboxMultiMode=n instanceof Array;const s=n instanceof Array?n.includes(t.value):!!n;t.checked!==s&&(t.checked=s)}else"radio"===t.type?t.checked!==(t.value===String(n??""))&&(t.checked=t.value===String(n??"")):"value"in t&&"file"!==t.type?Promise.resolve().then(()=>{t.value!==String(n??"")&&(t.value=n)}):t.isContentEditable&&t.innerHTML!==String(n??"")&&(t.innerHTML=n);t.dispatchEvent(new CustomEvent("bind",{bubbles:!1,detail:n}))}else["checked","disabled","readonly"].includes(s)&&(n=!!n),"boolean"==typeof n?n?t.setAttribute(s,""):t.removeAttribute(s):void 0!==n&&("string"!=typeof n&&(n=JSON.stringify(n)),"text"===s?t.textContent=n??"":"html"===s?t.innerHTML=n??"":"IMG"===t.tagName&&"src"===s&&n.includes(".svg")?t.setAttribute("_src",n??""):t.setAttribute(s,n??""))}}N=e=>S(e),o.add(N);const T=e=>{e.node._bindings||(e.node._bindings=[]),e.node._bindings.push({attr:e.attr,prop:e.prop,tpl:e.tpl,exp:e.exp}),S(e)},w=(e,t={})=>{if(1!==e.nodeType)return;if(e._stTranslated||(Array.from(e.attributes).forEach(e=>{if(!e.name.startsWith("$")&&!e.name.startsWith("st-")&&!e.name.startsWith(".")){const t=E(e.value);t!==e.value&&(e.value=t)}}),e._stTranslated=!0),"TEMPLATE"!==e.tagName&&(e.hasAttribute("$if")||e.hasAttribute("$each")||e.hasAttribute("st-if")||e.hasAttribute("st-each"))){const n=document.createElement("TEMPLATE");return Array.from(e.attributes).filter(t=>["$if","$each","st-if","st-each"].includes(t.name)||(e.hasAttribute("$each")||e.hasAttribute("st-each"))&&["as","index"].includes(t.name)).forEach(t=>{n.setAttribute(t.name,t.value),e.removeAttribute(t.name)}),e.parentNode.insertBefore(n,e),n.content.appendChild(e),n._ref=e._ref,void w(n,t)}if("TEMPLATE"===e.tagName&&(e.hasAttribute("$if")||e.hasAttribute("st-if"))&&(e.hasAttribute("$each")||e.hasAttribute("st-each"))){const t=document.createElement("TEMPLATE"),n=Array.from(e.attributes).filter(e=>["$if","$each","st-if","st-each"].includes(e.name)),s=n[n.length-1];t.setAttribute(s.name,s.value),e.removeAttribute(s.name),"$each"!==s.name&&"st-each"!==s.name||Array.from(e.attributes).filter(e=>["as","index"].includes(e.name)).forEach(n=>{t.setAttribute(n.name,n.value),e.removeAttribute(n.name)}),Array.from(e.content.childNodes).forEach(e=>t.content.appendChild(e)),e.content.appendChild(t),t._ref=e._ref}if("IMG"===e.tagName&&(e.hasAttribute("src")||e.hasAttribute("_src")||e.hasAttribute("$src"))){const t=e;Promise.resolve().then(()=>{const e=t.getAttribute("_src")||t.getAttribute("src");e&&fetch(e,{cache:"force-cache"}).then(e=>e.text()).then(e=>{const n=(new DOMParser).parseFromString(e,"image/svg+xml").querySelector("svg");n&&(Array.from(t.attributes).forEach(e=>n.setAttribute(e.name,e.value)),t.replaceWith(n))})})}if(void 0!==e._thisObj)t.thisObj=e._thisObj||null;else{let n=e;for(;n&&void 0===n._thisObj;)n=n.parentNode;t.thisObj=n?n._thisObj:null}if(void 0===e._ref){let t=e;for(;t&&void 0===t._ref;)t=t.parentNode;e._ref=t?{...t._ref}:{}}t.extendVars&&Object.assign(e._ref,t.extendVars),((e,t)=>{if(e._bindings)return e._states=new Set,e._bindings.forEach(t=>S({node:e,...t})),void(e._hasOnUpdate&&e.dispatchEvent(new Event("update",{bubbles:!1})));u.exists(e.tagName)&&!e._componentInitialized&&(Array.from(e.attributes).forEach(n=>{var s;if(n.name.startsWith("$.")){const a=n.name.slice(2);let r=E(n.value);r.includes("this.")&&(r=r.replace(/\bthis\./g,"this.parent."));const o=y(r,{thisNode:e},{parent:t.thisObj||e},e._ref||{});let i=e;const l=a.split(".");for(let e=0;e<l.length-1;e++)l[e]&&(i=i[s=l[e]]??(i[s]={}));i[l[l.length-1]]=o,e.removeAttribute(n.name)}}),b(e.tagName,e,t),d(e,"[slot-id]").forEach(e=>e.removeAttribute("slot-id")),e._componentInitialized=!0,e._thisObj||(e._thisObj=e)),"TEMPLATE"===e.tagName&&(e._children=[...e.content.childNodes],e._renderedNodes||(e._renderedNodes=[]));let n=[];"TEMPLATE"===e.tagName?["$if","$each","st-if","st-each"].forEach(t=>e.hasAttribute(t)&&n.push(e.getAttributeNode(t))):n=Array.from(e.attributes).filter(e=>(e.name.startsWith("$")||e.name.startsWith("st-"))&&!["$if","$each","st-if","st-each"].includes(e.name)||e.name.includes(".")),e._thisObj&&t.thisObj&&(e._thisObj.parent=t.thisObj),e._thisObj||(e._thisObj=t.thisObj||null),e._ref||(e._ref=t.extendVars||{}),e._states=new Set,n.forEach(n=>{let s=0;n.name.startsWith("$$")||n.name.startsWith("st-st-")?s=2:(n.name.startsWith("$")||n.name.startsWith("st-"))&&(s=1);const a=2===s?n.name.startsWith("$$")?n.name.slice(2):n.name.slice(6):1===s?n.name.startsWith("$")?n.name.slice(1):n.name.slice(3):n.name;let o=n.value;if(e.removeAttribute(n.name),a.startsWith("."))T({node:e,prop:a.split("."),tpl:o,exp:s});else if(a.startsWith("on")){const n=a.slice(2);"update"===n&&(e._hasOnUpdate=!0),"load"!==n||["BODY","IMG","IFRAME"].includes(e.tagName)||(e._hasOnLoad=!0),"unload"!==n||["BODY","IMG","IFRAME"].includes(e.tagName)||(e._hasOnUnload=!0),e.addEventListener(n,n=>_(o,{event:n,thisNode:e,...n.detail||{}},t.thisObj||e,e._ref||{}))}else"bind"===a?e.addEventListener(["textarea","text","password"].includes(e.type||"text")||e.isContentEditable?"input":"change",n=>{let s=e.isContentEditable?n.target.innerHTML:"checkbox"===e.type?n.target.checked:n.target.files||n.target.value||n.detail;r(e),m(!0),"checkbox"===e.type&&e._checkboxMultiMode?_(`!!checked ? (!${o}.includes(val) && ${o}.push(val)) : (index = ${o}.indexOf(val), index > -1 && ${o}.splice(index, 1))`,{val:e.value,checked:s,thisNode:e},t.thisObj||e,e._ref||{}):_(`${o} = val`,{val:s,thisNode:e},t.thisObj||e,e._ref||{}),m(!1),r(null)}):"text"!==a||o||(o=e.textContent,e.textContent=""),o&&(o=E(o),T({node:e,attr:a,tpl:o,exp:s}))}),(e._hasOnLoad||e._componentInitialized)&&Promise.resolve().then(()=>e.dispatchEvent(new Event("load",{bubbles:!1}))),e._hasOnUpdate&&e.dispatchEvent(new Event("update",{bubbles:!1})),e._thisObj&&(t.thisObj=e._thisObj)})(e,{...t});[...e.childNodes||[]].forEach(n=>w(n,{thisObj:t.thisObj,extendVars:{...e._ref}}))},j=e=>{1===e.nodeType&&(e._hasOnUnload&&e.dispatchEvent(new Event("unload",{bubbles:!1})),e._states&&e._states.forEach(t=>{for(const[n,s]of t)for(const t of s)t.node===e&&s.delete(t)}),e.childNodes&&e.childNodes.forEach(e=>j(e)))},x=w,$={clone:window.structuredClone||(e=>JSON.parse(JSON.stringify(e))),base64:e=>btoa(String.fromCharCode(...(new TextEncoder).encode(e))),unbase64:e=>(new TextDecoder).decode(Uint8Array.from(atob(e),e=>e.charCodeAt(0))),urlbase64:e=>$.base64(e).replace(/[+/=]/g,e=>({"+":"-","/":"","=":""}[e])),unurlbase64:e=>$.unbase64(e.replace(/[-_.]/g,e=>({"-":"+",_:"/",".":"="}[e])).padEnd(4*Math.ceil(e.length/4),"=")),safeJson:e=>{try{return JSON.parse(e)}catch{return null}},updateDefaults:(e,t)=>{for(const n in t)void 0===e[n]&&(e[n]=t[n])},copyFunction:(e,t,...n)=>{n.forEach(n=>e[n]=t[n].bind(t))},getFunctionBody:e=>{const t=e.toString();return t.slice(t.indexOf("{")+1,t.lastIndexOf("}")).trim()},makeDom:e=>{e.includes(">\n")&&(e=e.replace(/>\s+</g,"><").trim());const t=document.createElement("div");return t.innerHTML=e,t.children[0]},newAvg:()=>{let e=0,t=0,n=0;return{add:s=>(e+=s,t++,n=e/t),get:()=>n,clear:()=>{e=0,t=0,n=0}}},newTimeCount:()=>{let e=0,t=0,n=0;return{start:()=>e=(new Date).getTime(),end:()=>{const s=(new Date).getTime(),a=s-e;return e=s,t+=a,n++,a},avg:()=>t/n}}};globalThis.Util=$;let M=new URLSearchParams((null==(t=window.location.hash)?void 0:t.substring(1))||"");const L=i({},e=>$.safeJson(M.get(e)),(e,t)=>{const n=M.get(e),s=void 0===t?void 0:JSON.stringify(t);n===s||null===n&&void 0===s||(void 0===t?M.delete(e):M.set(e,s),window.location.hash="#"+M.toString())});"undefined"!=typeof window&&window.addEventListener("hashchange",()=>{var e;const t=new URLSearchParams((null==(e=window.location.hash)?void 0:e.substring(1))||""),n=new Set([...M.keys(),...t.keys()]);M=t,n.forEach(e=>L[e]=L[e])});const C=i({},e=>$.safeJson(localStorage.getItem(e)),(e,t)=>{const n=localStorage.getItem(e),s=void 0===t?void 0:JSON.stringify(t);n===s||null===n&&void 0===s||(void 0===t?localStorage.removeItem(e):localStorage.setItem(e,s))}),k=i({exitBlocks:0});globalThis.Hash=L,globalThis.LocalStorage=C,globalThis.State=k;const P={NewState:i,Component:u,$:l,$$:d,RefreshState:x,SetTranslator:v,_scanTree:w,_unbindTree:j,Util:$,Hash:L,LocalStorage:C,State:k};if("undefined"!=typeof window&&(window.ApigoState=P),"undefined"!=typeof document){const e=()=>{u._initPending();const e=document.documentElement;e.hasAttribute("$data-bs-theme")||e.hasAttribute("data-bs-theme")||e.setAttribute("$data-bs-theme","LocalStorage.darkMode?'dark':'light'"),new MutationObserver(e=>{e.forEach(e=>{e.addedNodes.forEach(e=>{e.isConnected&&w(e)}),e.removedNodes.forEach(e=>j(e))})}).observe(document.documentElement,{childList:!0,subtree:!0}),w(document.documentElement)};"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",e,!0)}e.$=l,e.$$=d,e.Component=u,e.Hash=L,e.LocalStorage=C,e.NewState=i,e.RefreshState=x,e.SetTranslator=v,e.State=k,e.Util=$,e._scanTree=w,e._unbindTree=j,Object.defineProperty(e,Symbol.toStringTag,{value:"Module"})});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).ApigoState={})}(this,function(e){"use strict";var t;let n=null,a=null;const s=e=>n=e,r=e=>a=e,o=new Set;function i(e={},t=null,s=null){const r={},i=new Map,l=new Map,d=(e,t)=>(l.has(e)||l.set(e,new Set),t?l.get(e).add(t):l.get(e).clear(),()=>l.get(e).delete(t)),c=(e,t)=>{l.has(e)&&l.set(e,new Set),l.get(e).delete(t)},h=t||(e=>r[e]),u=s||((e,t)=>r[e]=t);return Object.assign(r,e),new Proxy(r,{get:(e,t)=>"__watch"===t?d:"__unwatch"===t?c:"__isProxy"===t||(n&&(i.has(t)||i.set(t,new Set),i.get(t).add(n),n.node._states||(n.node._states=new Set),n.node._states.add(i)),h(t)),set(e,t,n){if(h(t)!==n&&u(t,n),l.has(t)&&l.get(t).forEach(a=>{const s=a(n);void 0!==s&&(n=s,e[t]=n)}),l.has(null)&&l.get(null).forEach(e=>e(n)),i.has(t)){const e=i.get(t);for(const t of e)t.node.isConnected?a!==t.node&&o.forEach(e=>e(t)):e.delete(t)}return!0}})}const l=(e,t)=>t?e.querySelector(t):document.querySelector(e),d=(e,t)=>t?e.querySelectorAll(t):document.querySelectorAll(e),c=new Map,h=[],u={getTemplate:e=>document.querySelector(`template[component="${e.toUpperCase()}"]`),register:(e,t,n=null,...a)=>{console.log("Component.register:",e.toUpperCase()),c.set(e.toUpperCase(),t),"loading"!==document.readyState?u._addTemplate(e,n,a):h.push([e,n,a])},exists:e=>c.has(e.toUpperCase()),getSetupFunction:e=>c.get(e.toUpperCase()),_addTemplate:(e,t,n)=>{if(t){const n=document.createElement("TEMPLATE");n.setAttribute("component",e.toUpperCase()),n.content.appendChild(t),document.body.appendChild(n)}n&&n.forEach(e=>document.body.appendChild(e))},_initPending:()=>{h.forEach(([e,t,n])=>u._addTemplate(e,t,n)),h.length=0}};function f(e,t,n,a={}){e.attributes&&Array.from(e.attributes).forEach(e=>{"class"!==e.name&&("style"===e.name?t.hasAttribute("style")?t.setAttribute("style",`${e.value}; ${t.getAttribute("style")}`):t.setAttribute("style",e.value):t.hasAttribute(e.name)||t.setAttribute(e.name,e.value))}),t.classList.add(...e.classList);const s="TEMPLATE"===t.tagName?t.content:t,r="TEMPLATE"===e.tagName?e.content.childNodes:e.childNodes;Array.from(r).forEach(e=>s.appendChild(e)),e.tagName&&u.exists(e.tagName)&&b(e.tagName,t,n,a)}function b(e,t,n,a={}){if(a[e])return;a[e]=!0,n.thisObj&&Array.from(t.attributes).forEach(e=>{(e.name.startsWith("$")||e.name.startsWith("st-"))&&e.value.includes("this.")&&(e.value=e.value.replace(/\bthis\./g,"this.parent."))});const s=u.getSetupFunction(e),r={};Array.from(t.childNodes).forEach(e=>{e.nodeType===Node.ELEMENT_NODE&&e.hasAttribute("slot")&&(r[e.getAttribute("slot")]=e,e.removeAttribute("slot"))}),t.innerHTML="",t.state=i(t.state||{});const o=u.getTemplate(e);if(o){const e=o.content.cloneNode(!0);if(e.childNodes.length){const s=e.children[0];s&&f(s,t,n,a),d(t,"[slot-id]").forEach(e=>{const t=e.getAttribute("slot-id");r[t]&&(e.removeAttribute("slot-id"),e.innerHTML="",f(r[t],e,n,a))})}}s&&s(t)}let m=!1;function p(e){m=e}const g=new Map;function _(e,t,n,a){const s={...a||{},...t||{}},r=Object.keys(s),o=Object.values(s),i=e+r.join(",");try{let t=g.get(i);return t||(t=new Function("Hash","LocalStorage","State",...r,e),g.set(i,t)),t.apply(n,[globalThis.Hash,globalThis.LocalStorage,globalThis.State,...o])}catch(s){return m||console.error(s,a,[e,a,t,n]),null}}function y(e,t,n,a){return e.includes("${")?_("return `"+e+"`",t,n,a):_("return "+e,t,n,a)}let A=(e,t)=>e&&"string"==typeof e?e.replace(/\{(.+?)\}/g,(e,n)=>t.hasOwnProperty(n)?t[n]:e):e;const v=e=>A=e,E=e=>e&&"string"==typeof e&&e.includes("{#")?e.replace(/\{#(.+?)#\}/g,(e,t)=>{const n=t.split("||").map(e=>e.trim()),a={};if(n.length>1){const e=n[0].match(/\{(.+?)\}/g);e&&e.forEach((e,t)=>a[e.substring(1,e.length-1)]=n[t+1]||"")}return A(n[0],a)}):e;if("undefined"!=typeof document)try{document.createElement("div").setAttribute("$t","1")}catch(e){const t=Element.prototype.setAttribute;Element.prototype.setAttribute=function(e,n){return e.startsWith("$")?t.call(this,"st-"+e.substring(1),n):t.call(this,e,n)}}var N;function T(e){e._renderedNodes&&e._renderedNodes.forEach(e=>e.forEach(e=>{e.remove(),e._renderedNodes&&T(e)}))}function O(e){const t=e.node;if(!t.isConnected&&"TEMPLATE"!==t.tagName)return;s(e);let n=e.exp?e.tpl?y(e.tpl,{thisNode:t},t._thisObj||t,t._ref||null):null:e.tpl;if(2===e.exp&&"string"==typeof n)try{n=y(n,{thisNode:t},t._thisObj||t,t._ref||null)}catch(e){}if(s(null),e.prop){const a=e.prop;let s=t;for(let e=0;e<a.length-1&&(!a[e]||(null==s[a[e]]&&(s[a[e]]={}),s=s[a[e]],"object"==typeof s));e++);if("object"==typeof s&&null!==s){const e=a[a.length-1];if(e){"object"!=typeof n||null==n||Array.isArray(n)||null!=s[e]||(s[e]={});const t=s[e];"object"==typeof t&&null!=t&&t.__watch?Object.assign(t,n):s[e]!==n&&(s[e]=n)}else"object"!=typeof n||null==n||Array.isArray(n)||Object.assign(s,n)}}else if(e.attr){const a=e.attr;if("if"===a)n?t._renderedNodes&&0!==t._renderedNodes.length||(t._children.forEach(e=>{t.parentNode.insertBefore(e,t),e._ref={...t._ref},e._thisObj=t._thisObj}),t._renderedNodes=[t._children]):(T(t),t._renderedNodes=[]);else if("each"===a)if(n&&"object"==typeof n){const e=t.getAttribute("as")||"item",a=t.getAttribute("index")||"index",s=t.getAttribute("key");let r,o;if(n instanceof Map)r=Array.from(n.keys()),o=e=>n.get(e);else if("function"==typeof n[Symbol.iterator]){const e=Array.isArray(n)?n:Array.from(n);r=new Array(e.length);for(let t=0;t<e.length;t++)r[t]=t;o=t=>e[t]}else r=Object.keys(n),o=e=>n[e];t._keyedNodes||(t._keyedNodes=new Map);const i=new Map,l=[];r.forEach((n,r)=>{const d=o(n),c=s?d&&"object"==typeof d?d[s]:d:n,h=null==c||i.has(c)?`st_key_${r}`:c;let u=t._keyedNodes.get(h);u?(t._keyedNodes.delete(h),u.forEach(t=>{t._ref[a]=n,t._ref[e]=d,w(t)})):(u=[],t._children.forEach(s=>{const r=s.cloneNode(!0);r._ref={...t._ref,[a]:n,[e]:d},r._thisObj=t._thisObj,t.parentNode.insertBefore(r,t),u.push(r)})),i.set(h,u),l.push(u)}),t._keyedNodes.forEach(e=>e.forEach(e=>{T(e),e.remove()})),t._keyedNodes=i,t._renderedNodes=l}else T(t),t._renderedNodes=[];else if("bind"===a){if(["INPUT","SELECT","TEXTAREA"].includes(t.tagName)&&!t.hasAttribute("autocomplete")&&t.setAttribute("autocomplete","off"),"checkbox"===t.type){"on"===t.value||n||(_(`${e.tpl} = []`,{thisNode:t},t._thisObj||t,t._ref||{}),n=[]),t._checkboxMultiMode=n instanceof Array;const a=n instanceof Array?n.includes(t.value):!!n;t.checked!==a&&(t.checked=a)}else"radio"===t.type?t.checked!==(t.value===String(n??""))&&(t.checked=t.value===String(n??"")):"value"in t&&"file"!==t.type?Promise.resolve().then(()=>{t.value!==String(n??"")&&(t.value=n)}):t.isContentEditable&&t.innerHTML!==String(n??"")&&(t.innerHTML=n);t.dispatchEvent(new CustomEvent("bind",{bubbles:!1,detail:n}))}else["checked","disabled","readonly"].includes(a)&&(n=!!n),"boolean"==typeof n?n?t.setAttribute(a,""):t.removeAttribute(a):void 0!==n&&("string"!=typeof n&&(n=JSON.stringify(n)),"text"===a?t.textContent=n??"":"html"===a?t.innerHTML=n??"":"IMG"===t.tagName&&"src"===a&&n.includes(".svg")?t.setAttribute("_src",n??""):t.setAttribute(a,n??""))}}N=e=>O(e),o.add(N);const S=e=>{e.node._bindings||(e.node._bindings=[]),e.node._bindings.push({attr:e.attr,prop:e.prop,tpl:e.tpl,exp:e.exp}),O(e)},w=(e,t={})=>{if(3===e.nodeType){if(e._stTranslated)return;const t=E(e.textContent);return t!==e.textContent&&(e.textContent=t),void(e._stTranslated=!0)}if(1!==e.nodeType)return;if(e._stTranslated||(Array.from(e.attributes).forEach(e=>{if(!e.name.startsWith("$")&&!e.name.startsWith("st-")&&!e.name.startsWith(".")){const t=E(e.value);t!==e.value&&(e.value=t)}}),e._stTranslated=!0),"TEMPLATE"!==e.tagName&&(e.hasAttribute("$if")||e.hasAttribute("$each")||e.hasAttribute("st-if")||e.hasAttribute("st-each"))){const t=document.createElement("TEMPLATE");return Array.from(e.attributes).filter(t=>["$if","$each","st-if","st-each"].includes(t.name)||(e.hasAttribute("$each")||e.hasAttribute("st-each"))&&["as","index"].includes(t.name)).forEach(n=>{t.setAttribute(n.name,n.value),e.removeAttribute(n.name)}),e.parentNode.insertBefore(t,e),t.content.appendChild(e),void(t._ref=e._ref)}if("TEMPLATE"===e.tagName&&(e.hasAttribute("$if")||e.hasAttribute("st-if"))&&(e.hasAttribute("$each")||e.hasAttribute("st-each"))){const t=document.createElement("TEMPLATE"),n=Array.from(e.attributes).filter(e=>["$if","$each","st-if","st-each"].includes(e.name)),a=n[n.length-1];t.setAttribute(a.name,a.value),e.removeAttribute(a.name),"$each"!==a.name&&"st-each"!==a.name||Array.from(e.attributes).filter(e=>["as","index"].includes(e.name)).forEach(n=>{t.setAttribute(n.name,n.value),e.removeAttribute(n.name)}),Array.from(e.content.childNodes).forEach(e=>t.content.appendChild(e)),e.content.appendChild(t),t._ref=e._ref}if("IMG"===e.tagName&&(e.hasAttribute("src")||e.hasAttribute("_src")||e.hasAttribute("$src"))){const t=e;Promise.resolve().then(()=>{const e=t.getAttribute("_src")||t.getAttribute("src");e&&fetch(e,{cache:"force-cache"}).then(e=>e.text()).then(e=>{const n=(new DOMParser).parseFromString(e,"image/svg+xml").querySelector("svg");n&&(Array.from(t.attributes).forEach(e=>n.setAttribute(e.name,e.value)),t.replaceWith(n))})})}if(void 0!==e._thisObj)t.thisObj=e._thisObj||null;else{let n=e;for(;n&&void 0===n._thisObj;)n=n.parentNode;t.thisObj=n?n._thisObj:null}if(void 0===e._ref){let t=e;for(;t&&void 0===t._ref;)t=t.parentNode;e._ref=t?{...t._ref}:{}}t.extendVars&&Object.assign(e._ref,t.extendVars),((e,t)=>{if(e._bindings)return e._states=new Set,e._bindings.forEach(t=>O({node:e,...t})),void(e._hasOnUpdate&&e.dispatchEvent(new Event("update",{bubbles:!1})));u.exists(e.tagName)&&!e._componentInitialized&&(Array.from(e.attributes).forEach(n=>{var a;if(n.name.startsWith("$.")){const s=n.name.slice(2);let r=E(n.value);r.includes("this.")&&(r=r.replace(/\bthis\./g,"this.parent."));const o=y(r,{thisNode:e},{parent:t.thisObj||e},e._ref||{});let i=e;const l=s.split(".");for(let e=0;e<l.length-1;e++)l[e]&&(i=i[a=l[e]]??(i[a]={}));i[l[l.length-1]]=o,e.removeAttribute(n.name)}}),b(e.tagName,e,t),d(e,"[slot-id]").forEach(e=>e.removeAttribute("slot-id")),e._componentInitialized=!0,e._thisObj||(e._thisObj=e)),"TEMPLATE"===e.tagName&&(e._children=[...e.content.childNodes],e._renderedNodes||(e._renderedNodes=[]));let n=[];"TEMPLATE"===e.tagName?["$if","$each","st-if","st-each"].forEach(t=>e.hasAttribute(t)&&n.push(e.getAttributeNode(t))):n=Array.from(e.attributes).filter(e=>(e.name.startsWith("$")||e.name.startsWith("st-"))&&!["$if","$each","st-if","st-each"].includes(e.name)||e.name.includes(".")),e._thisObj&&t.thisObj&&(e._thisObj.parent=t.thisObj),e._thisObj||(e._thisObj=t.thisObj||null),e._ref||(e._ref=t.extendVars||{}),e._states=new Set,n.forEach(n=>{let a=0;n.name.startsWith("$$")||n.name.startsWith("st-st-")?a=2:(n.name.startsWith("$")||n.name.startsWith("st-"))&&(a=1);const s=2===a?n.name.startsWith("$$")?n.name.slice(2):n.name.slice(6):1===a?n.name.startsWith("$")?n.name.slice(1):n.name.slice(3):n.name;let o=n.value;if(e.removeAttribute(n.name),s.startsWith("."))S({node:e,prop:s.split("."),tpl:o,exp:a});else if(s.startsWith("on")){const n=s.slice(2);"update"===n&&(e._hasOnUpdate=!0),"load"!==n||["BODY","IMG","IFRAME"].includes(e.tagName)||(e._hasOnLoad=!0),"unload"!==n||["BODY","IMG","IFRAME"].includes(e.tagName)||(e._hasOnUnload=!0),e.addEventListener(n,n=>_(o,{event:n,thisNode:e,...n.detail||{}},t.thisObj||e,e._ref||{}))}else"bind"===s?e.addEventListener(["textarea","text","password"].includes(e.type||"text")||e.isContentEditable?"input":"change",n=>{let a=e.isContentEditable?n.target.innerHTML:"checkbox"===e.type?n.target.checked:n.target.files||n.target.value||n.detail;r(e),p(!0),"checkbox"===e.type&&e._checkboxMultiMode?_(`!!checked ? (!${o}.includes(val) && ${o}.push(val)) : (index = ${o}.indexOf(val), index > -1 && ${o}.splice(index, 1))`,{val:e.value,checked:a,thisNode:e},t.thisObj||e,e._ref||{}):_(`${o} = val`,{val:a,thisNode:e},t.thisObj||e,e._ref||{}),p(!1),r(null)}):"text"!==s||o||(o=e.textContent,e.textContent=""),o&&(o=E(o),S({node:e,attr:s,tpl:o,exp:a}))}),(e._hasOnLoad||e._componentInitialized)&&Promise.resolve().then(()=>e.dispatchEvent(new Event("load",{bubbles:!1}))),e._hasOnUpdate&&e.dispatchEvent(new Event("update",{bubbles:!1})),e._thisObj&&(t.thisObj=e._thisObj)})(e,{...t});[...e.childNodes||[]].forEach(n=>w(n,{thisObj:t.thisObj,extendVars:{...e._ref}}))},j=e=>{1===e.nodeType&&(e._hasOnUnload&&e.dispatchEvent(new Event("unload",{bubbles:!1})),e._states&&e._states.forEach(t=>{for(const[n,a]of t)for(const t of a)t.node===e&&a.delete(t)}),e.childNodes&&e.childNodes.forEach(e=>j(e)))},x=w,$={clone:window.structuredClone||(e=>JSON.parse(JSON.stringify(e))),base64:e=>btoa(String.fromCharCode(...(new TextEncoder).encode(e))),unbase64:e=>(new TextDecoder).decode(Uint8Array.from(atob(e),e=>e.charCodeAt(0))),urlbase64:e=>$.base64(e).replace(/[+/=]/g,e=>({"+":"-","/":"","=":""}[e])),unurlbase64:e=>$.unbase64(e.replace(/[-_.]/g,e=>({"-":"+",_:"/",".":"="}[e])).padEnd(4*Math.ceil(e.length/4),"=")),safeJson:e=>{try{return JSON.parse(e)}catch{return null}},updateDefaults:(e,t)=>{for(const n in t)void 0===e[n]&&(e[n]=t[n])},copyFunction:(e,t,...n)=>{n.forEach(n=>e[n]=t[n].bind(t))},getFunctionBody:e=>{const t=e.toString();return t.slice(t.indexOf("{")+1,t.lastIndexOf("}")).trim()},makeDom:e=>{e.includes(">\n")&&(e=e.replace(/>\s+</g,"><").trim());const t=document.createElement("div");return t.innerHTML=e,t.children[0]},newAvg:()=>{let e=0,t=0,n=0;return{add:a=>(e+=a,t++,n=e/t),get:()=>n,clear:()=>{e=0,t=0,n=0}}},newTimeCount:()=>{let e=0,t=0,n=0;return{start:()=>e=(new Date).getTime(),end:()=>{const a=(new Date).getTime(),s=a-e;return e=a,t+=s,n++,s},avg:()=>t/n}}};globalThis.Util=$;let M=new URLSearchParams((null==(t=window.location.hash)?void 0:t.substring(1))||"");const L=i({},e=>$.safeJson(M.get(e)),(e,t)=>{const n=M.get(e),a=void 0===t?void 0:JSON.stringify(t);n===a||null===n&&void 0===a||(void 0===t?M.delete(e):M.set(e,a),window.location.hash="#"+M.toString())});"undefined"!=typeof window&&window.addEventListener("hashchange",()=>{var e;const t=new URLSearchParams((null==(e=window.location.hash)?void 0:e.substring(1))||""),n=new Set([...M.keys(),...t.keys()]);M=t,n.forEach(e=>L[e]=L[e])});const C=i({},e=>$.safeJson(localStorage.getItem(e)),(e,t)=>{const n=localStorage.getItem(e),a=void 0===t?void 0:JSON.stringify(t);n===a||null===n&&void 0===a||(void 0===t?localStorage.removeItem(e):localStorage.setItem(e,a))}),k=i({exitBlocks:0});globalThis.Hash=L,globalThis.LocalStorage=C,globalThis.State=k;const P={NewState:i,Component:u,$:l,$$:d,RefreshState:x,SetTranslator:v,_scanTree:w,_unbindTree:j,Util:$,Hash:L,LocalStorage:C,State:k};if(globalThis.$=l,globalThis.$$=d,"undefined"!=typeof window&&(window.ApigoState=P),"undefined"!=typeof document){const e=()=>{u._initPending();const e=document.documentElement;e.hasAttribute("$data-bs-theme")||e.hasAttribute("data-bs-theme")||e.setAttribute("$data-bs-theme","LocalStorage.darkMode?'dark':'light'"),new MutationObserver(e=>{e.forEach(e=>{e.addedNodes.forEach(e=>{e.isConnected&&w(e)}),e.removedNodes.forEach(e=>j(e))})}).observe(document.documentElement,{childList:!0,subtree:!0}),w(document.documentElement)};"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",e,!0)}e.$=l,e.$$=d,e.Component=u,e.Hash=L,e.LocalStorage=C,e.NewState=i,e.RefreshState=x,e.SetTranslator=v,e.State=k,e.Util=$,e._scanTree=w,e._unbindTree=j,Object.defineProperty(e,Symbol.toStringTag,{value:"Module"})});
diff --git a/dist/state.min.mjs b/dist/state.min.mjs
deleted file mode 100644
index 5899f9a..0000000
--- a/dist/state.min.mjs
+++ /dev/null
@@ -1 +0,0 @@
-var e;let t=null,n=null;const s=e=>t=e,a=e=>n=e,r=new Set;function o(e={},s=null,a=null){const o={},i=new Map,l=new Map,d=(e,t)=>(l.has(e)||l.set(e,new Set),t?l.get(e).add(t):l.get(e).clear(),()=>l.get(e).delete(t)),c=(e,t)=>{l.has(e)&&l.set(e,new Set),l.get(e).delete(t)},h=s||(e=>o[e]),u=a||((e,t)=>o[e]=t);return Object.assign(o,e),new Proxy(o,{get:(e,n)=>"__watch"===n?d:"__unwatch"===n?c:"__isProxy"===n||(t&&(i.has(n)||i.set(n,new Set),i.get(n).add(t),t.node._states||(t.node._states=new Set),t.node._states.add(i)),h(n)),set(e,t,s){if(h(t)!==s&&u(t,s),l.has(t)&&l.get(t).forEach(n=>{const a=n(s);void 0!==a&&(s=a,e[t]=s)}),l.has(null)&&l.get(null).forEach(e=>e(s)),i.has(t)){const e=i.get(t);for(const t of e)t.node.isConnected?n!==t.node&&r.forEach(e=>e(t)):e.delete(t)}return!0}})}const i=(e,t)=>t?e.querySelector(t):document.querySelector(e),l=(e,t)=>t?e.querySelectorAll(t):document.querySelectorAll(e),d=new Map,c=[],h={getTemplate:e=>document.querySelector(`template[component="${e.toUpperCase()}"]`),register:(e,t,n=null,...s)=>{console.log("Component.register:",e.toUpperCase()),d.set(e.toUpperCase(),t),"loading"!==document.readyState?h._addTemplate(e,n,s):c.push([e,n,s])},exists:e=>d.has(e.toUpperCase()),getSetupFunction:e=>d.get(e.toUpperCase()),_addTemplate:(e,t,n)=>{if(t){const n=document.createElement("TEMPLATE");n.setAttribute("component",e.toUpperCase()),n.content.appendChild(t),document.body.appendChild(n)}n&&n.forEach(e=>document.body.appendChild(e))},_initPending:()=>{c.forEach(([e,t,n])=>h._addTemplate(e,t,n)),c.length=0}};function u(e,t,n,s={}){e.attributes&&Array.from(e.attributes).forEach(e=>{"class"!==e.name&&("style"===e.name?t.hasAttribute("style")?t.setAttribute("style",`${e.value}; ${t.getAttribute("style")}`):t.setAttribute("style",e.value):t.hasAttribute(e.name)||t.setAttribute(e.name,e.value))}),t.classList.add(...e.classList),Array.from(e.childNodes).forEach(e=>t.appendChild(e)),e.tagName&&h.exists(e.tagName)&&f(e.tagName,t,n,s)}function f(e,t,n,s={}){if(s[e])return;s[e]=!0,n.thisObj&&Array.from(t.attributes).forEach(e=>{(e.name.startsWith("$")||e.name.startsWith("st-"))&&e.value.includes("this.")&&(e.value=e.value.replace(/\bthis\./g,"this.parent."))});const a=h.getSetupFunction(e),r={};Array.from(t.childNodes).forEach(e=>{e.nodeType===Node.ELEMENT_NODE&&e.hasAttribute("slot")&&(r[e.getAttribute("slot")]=e,e.removeAttribute("slot"))}),t.innerHTML="",t.state=o(t.state||{});const i=h.getTemplate(e);if(i){const e=i.content.cloneNode(!0);if(e.childNodes.length){const a=e.children[0];a&&u(a,t,n,s),l(t,"[slot-id]").forEach(e=>{const t=e.getAttribute("slot-id");r[t]&&(e.removeAttribute("slot-id"),e.innerHTML="",u(r[t],e,n,s))})}}a&&a(t)}let b=!1;function m(e){b=e}const p=new Map;function g(e,t,n,s){const a={...s||{},...t||{}},r=Object.keys(a),o=Object.values(a),i=e+r.join(",");try{let t=p.get(i);return t||(t=new Function("Hash","LocalStorage","State",...r,e),p.set(i,t)),t.apply(n,[globalThis.Hash,globalThis.LocalStorage,globalThis.State,...o])}catch(a){return b||console.error(a,s,[e,s,t,n]),null}}function _(e,t,n,s){return e.includes("${")?g("return `"+e+"`",t,n,s):g("return "+e,t,n,s)}let y=(e,t)=>e&&"string"==typeof e?e.replace(/\{(.+?)\}/g,(e,n)=>t.hasOwnProperty(n)?t[n]:e):e;const A=e=>y=e,v=e=>e&&"string"==typeof e&&e.includes("{#")?e.replace(/\{#(.+?)#\}/g,(e,t)=>{const n=t.split("||").map(e=>e.trim()),s={};if(n.length>1){const e=n[0].match(/\{(.+?)\}/g);e&&e.forEach((e,t)=>s[e.substring(1,e.length-1)]=n[t+1]||"")}return y(n[0],s)}):e;if("undefined"!=typeof document)try{document.createElement("div").setAttribute("$t","1")}catch(e){const t=Element.prototype.setAttribute;Element.prototype.setAttribute=function(e,n){return e.startsWith("$")?t.call(this,"st-"+e.substring(1),n):t.call(this,e,n)}}var E;function N(e){e._renderedNodes&&e._renderedNodes.forEach(e=>e.forEach(e=>{e.remove(),e._renderedNodes&&N(e)}))}function O(e){const t=e.node;if(!t.isConnected&&"TEMPLATE"!==t.tagName)return;s(e);let n=e.exp?e.tpl?_(e.tpl,{thisNode:t},t._thisObj||t,t._ref||null):null:e.tpl;if(2===e.exp&&"string"==typeof n)try{n=_(n,{thisNode:t},t._thisObj||t,t._ref||null)}catch(e){}if(s(null),e.prop){const s=e.prop;let a=t;for(let e=0;e<s.length-1&&(!s[e]||(null==a[s[e]]&&(a[s[e]]={}),a=a[s[e]],"object"==typeof a));e++);if("object"==typeof a&&null!==a){const e=s[s.length-1];if(e){"object"!=typeof n||null==n||Array.isArray(n)||null!=a[e]||(a[e]={});const t=a[e];"object"==typeof t&&null!=t&&t.__watch?Object.assign(t,n):a[e]!==n&&(a[e]=n)}else"object"!=typeof n||null==n||Array.isArray(n)||Object.assign(a,n)}}else if(e.attr){const s=e.attr;if("if"===s)n?t._renderedNodes&&0!==t._renderedNodes.length||(t._children.forEach(e=>{t.parentNode.insertBefore(e,t),e._ref={...t._ref},e._thisObj=t._thisObj}),t._renderedNodes=[t._children]):(N(t),t._renderedNodes=[]);else if("each"===s)if(n&&"object"==typeof n){const e=t.getAttribute("as")||"item",s=t.getAttribute("index")||"index",a=t.getAttribute("key");let r,o;if(n instanceof Map)r=Array.from(n.keys()),o=e=>n.get(e);else if("function"==typeof n[Symbol.iterator]){const e=Array.isArray(n)?n:Array.from(n);r=new Array(e.length);for(let t=0;t<e.length;t++)r[t]=t;o=t=>e[t]}else r=Object.keys(n),o=e=>n[e];t._keyedNodes||(t._keyedNodes=new Map);const i=new Map,l=[];r.forEach((n,r)=>{const d=o(n),c=a?d&&"object"==typeof d?d[a]:d:n,h=null==c||i.has(c)?`st_key_${r}`:c;let u=t._keyedNodes.get(h);u?(t._keyedNodes.delete(h),u.forEach(t=>{t._ref[s]=n,t._ref[e]=d,S(t)})):(u=[],t._children.forEach(a=>{const r=a.cloneNode(!0);r._ref={...t._ref,[s]:n,[e]:d},r._thisObj=t._thisObj,t.parentNode.insertBefore(r,t),u.push(r)})),i.set(h,u),l.push(u)}),t._keyedNodes.forEach(e=>e.forEach(e=>{N(e),e.remove()})),t._keyedNodes=i,t._renderedNodes=l}else N(t),t._renderedNodes=[];else if("bind"===s){if(["INPUT","SELECT","TEXTAREA"].includes(t.tagName)&&!t.hasAttribute("autocomplete")&&t.setAttribute("autocomplete","off"),"checkbox"===t.type){"on"===t.value||n||(g(`${e.tpl} = []`,{thisNode:t},t._thisObj||t,t._ref||{}),n=[]),t._checkboxMultiMode=n instanceof Array;const s=n instanceof Array?n.includes(t.value):!!n;t.checked!==s&&(t.checked=s)}else"radio"===t.type?t.checked!==(t.value===String(n??""))&&(t.checked=t.value===String(n??"")):"value"in t&&"file"!==t.type?Promise.resolve().then(()=>{t.value!==String(n??"")&&(t.value=n)}):t.isContentEditable&&t.innerHTML!==String(n??"")&&(t.innerHTML=n);t.dispatchEvent(new CustomEvent("bind",{bubbles:!1,detail:n}))}else["checked","disabled","readonly"].includes(s)&&(n=!!n),"boolean"==typeof n?n?t.setAttribute(s,""):t.removeAttribute(s):void 0!==n&&("string"!=typeof n&&(n=JSON.stringify(n)),"text"===s?t.textContent=n??"":"html"===s?t.innerHTML=n??"":"IMG"===t.tagName&&"src"===s&&n.includes(".svg")?t.setAttribute("_src",n??""):t.setAttribute(s,n??""))}}E=e=>O(e),r.add(E);const w=e=>{e.node._bindings||(e.node._bindings=[]),e.node._bindings.push({attr:e.attr,prop:e.prop,tpl:e.tpl,exp:e.exp}),O(e)},S=(e,t={})=>{if(1!==e.nodeType)return;if(e._stTranslated||(Array.from(e.attributes).forEach(e=>{if(!e.name.startsWith("$")&&!e.name.startsWith("st-")&&!e.name.startsWith(".")){const t=v(e.value);t!==e.value&&(e.value=t)}}),e._stTranslated=!0),"TEMPLATE"!==e.tagName&&(e.hasAttribute("$if")||e.hasAttribute("$each")||e.hasAttribute("st-if")||e.hasAttribute("st-each"))){const n=document.createElement("TEMPLATE");return Array.from(e.attributes).filter(t=>["$if","$each","st-if","st-each"].includes(t.name)||(e.hasAttribute("$each")||e.hasAttribute("st-each"))&&["as","index"].includes(t.name)).forEach(t=>{n.setAttribute(t.name,t.value),e.removeAttribute(t.name)}),e.parentNode.insertBefore(n,e),n.content.appendChild(e),n._ref=e._ref,void S(n,t)}if("TEMPLATE"===e.tagName&&(e.hasAttribute("$if")||e.hasAttribute("st-if"))&&(e.hasAttribute("$each")||e.hasAttribute("st-each"))){const t=document.createElement("TEMPLATE"),n=Array.from(e.attributes).filter(e=>["$if","$each","st-if","st-each"].includes(e.name)),s=n[n.length-1];t.setAttribute(s.name,s.value),e.removeAttribute(s.name),"$each"!==s.name&&"st-each"!==s.name||Array.from(e.attributes).filter(e=>["as","index"].includes(e.name)).forEach(n=>{t.setAttribute(n.name,n.value),e.removeAttribute(n.name)}),Array.from(e.content.childNodes).forEach(e=>t.content.appendChild(e)),e.content.appendChild(t),t._ref=e._ref}if("IMG"===e.tagName&&(e.hasAttribute("src")||e.hasAttribute("_src")||e.hasAttribute("$src"))){const t=e;Promise.resolve().then(()=>{const e=t.getAttribute("_src")||t.getAttribute("src");e&&fetch(e,{cache:"force-cache"}).then(e=>e.text()).then(e=>{const n=(new DOMParser).parseFromString(e,"image/svg+xml").querySelector("svg");n&&(Array.from(t.attributes).forEach(e=>n.setAttribute(e.name,e.value)),t.replaceWith(n))})})}if(void 0!==e._thisObj)t.thisObj=e._thisObj||null;else{let n=e;for(;n&&void 0===n._thisObj;)n=n.parentNode;t.thisObj=n?n._thisObj:null}if(void 0===e._ref){let t=e;for(;t&&void 0===t._ref;)t=t.parentNode;e._ref=t?{...t._ref}:{}}t.extendVars&&Object.assign(e._ref,t.extendVars),((e,t)=>{if(e._bindings)return e._states=new Set,e._bindings.forEach(t=>O({node:e,...t})),void(e._hasOnUpdate&&e.dispatchEvent(new Event("update",{bubbles:!1})));h.exists(e.tagName)&&!e._componentInitialized&&(Array.from(e.attributes).forEach(n=>{var s;if(n.name.startsWith("$.")){const a=n.name.slice(2);let r=v(n.value);r.includes("this.")&&(r=r.replace(/\bthis\./g,"this.parent."));const o=_(r,{thisNode:e},{parent:t.thisObj||e},e._ref||{});let i=e;const l=a.split(".");for(let e=0;e<l.length-1;e++)l[e]&&(i=i[s=l[e]]??(i[s]={}));i[l[l.length-1]]=o,e.removeAttribute(n.name)}}),f(e.tagName,e,t),l(e,"[slot-id]").forEach(e=>e.removeAttribute("slot-id")),e._componentInitialized=!0,e._thisObj||(e._thisObj=e)),"TEMPLATE"===e.tagName&&(e._children=[...e.content.childNodes],e._renderedNodes||(e._renderedNodes=[]));let n=[];"TEMPLATE"===e.tagName?["$if","$each","st-if","st-each"].forEach(t=>e.hasAttribute(t)&&n.push(e.getAttributeNode(t))):n=Array.from(e.attributes).filter(e=>(e.name.startsWith("$")||e.name.startsWith("st-"))&&!["$if","$each","st-if","st-each"].includes(e.name)||e.name.includes(".")),e._thisObj&&t.thisObj&&(e._thisObj.parent=t.thisObj),e._thisObj||(e._thisObj=t.thisObj||null),e._ref||(e._ref=t.extendVars||{}),e._states=new Set,n.forEach(n=>{let s=0;n.name.startsWith("$$")||n.name.startsWith("st-st-")?s=2:(n.name.startsWith("$")||n.name.startsWith("st-"))&&(s=1);const r=2===s?n.name.startsWith("$$")?n.name.slice(2):n.name.slice(6):1===s?n.name.startsWith("$")?n.name.slice(1):n.name.slice(3):n.name;let o=n.value;if(e.removeAttribute(n.name),r.startsWith("."))w({node:e,prop:r.split("."),tpl:o,exp:s});else if(r.startsWith("on")){const n=r.slice(2);"update"===n&&(e._hasOnUpdate=!0),"load"!==n||["BODY","IMG","IFRAME"].includes(e.tagName)||(e._hasOnLoad=!0),"unload"!==n||["BODY","IMG","IFRAME"].includes(e.tagName)||(e._hasOnUnload=!0),e.addEventListener(n,n=>g(o,{event:n,thisNode:e,...n.detail||{}},t.thisObj||e,e._ref||{}))}else"bind"===r?e.addEventListener(["textarea","text","password"].includes(e.type||"text")||e.isContentEditable?"input":"change",n=>{let s=e.isContentEditable?n.target.innerHTML:"checkbox"===e.type?n.target.checked:n.target.files||n.target.value||n.detail;a(e),m(!0),"checkbox"===e.type&&e._checkboxMultiMode?g(`!!checked ? (!${o}.includes(val) && ${o}.push(val)) : (index = ${o}.indexOf(val), index > -1 && ${o}.splice(index, 1))`,{val:e.value,checked:s,thisNode:e},t.thisObj||e,e._ref||{}):g(`${o} = val`,{val:s,thisNode:e},t.thisObj||e,e._ref||{}),m(!1),a(null)}):"text"!==r||o||(o=e.textContent,e.textContent=""),o&&(o=v(o),w({node:e,attr:r,tpl:o,exp:s}))}),(e._hasOnLoad||e._componentInitialized)&&Promise.resolve().then(()=>e.dispatchEvent(new Event("load",{bubbles:!1}))),e._hasOnUpdate&&e.dispatchEvent(new Event("update",{bubbles:!1})),e._thisObj&&(t.thisObj=e._thisObj)})(e,{...t});[...e.childNodes||[]].forEach(n=>S(n,{thisObj:t.thisObj,extendVars:{...e._ref}}))},T=e=>{1===e.nodeType&&(e._hasOnUnload&&e.dispatchEvent(new Event("unload",{bubbles:!1})),e._states&&e._states.forEach(t=>{for(const[n,s]of t)for(const t of s)t.node===e&&s.delete(t)}),e.childNodes&&e.childNodes.forEach(e=>T(e)))},j=S,x={clone:window.structuredClone||(e=>JSON.parse(JSON.stringify(e))),base64:e=>btoa(String.fromCharCode(...(new TextEncoder).encode(e))),unbase64:e=>(new TextDecoder).decode(Uint8Array.from(atob(e),e=>e.charCodeAt(0))),urlbase64:e=>x.base64(e).replace(/[+/=]/g,e=>({"+":"-","/":"","=":""}[e])),unurlbase64:e=>x.unbase64(e.replace(/[-_.]/g,e=>({"-":"+",_:"/",".":"="}[e])).padEnd(4*Math.ceil(e.length/4),"=")),safeJson:e=>{try{return JSON.parse(e)}catch{return null}},updateDefaults:(e,t)=>{for(const n in t)void 0===e[n]&&(e[n]=t[n])},copyFunction:(e,t,...n)=>{n.forEach(n=>e[n]=t[n].bind(t))},getFunctionBody:e=>{const t=e.toString();return t.slice(t.indexOf("{")+1,t.lastIndexOf("}")).trim()},makeDom:e=>{e.includes(">\n")&&(e=e.replace(/>\s+</g,"><").trim());const t=document.createElement("div");return t.innerHTML=e,t.children[0]},newAvg:()=>{let e=0,t=0,n=0;return{add:s=>(e+=s,t++,n=e/t),get:()=>n,clear:()=>{e=0,t=0,n=0}}},newTimeCount:()=>{let e=0,t=0,n=0;return{start:()=>e=(new Date).getTime(),end:()=>{const s=(new Date).getTime(),a=s-e;return e=s,t+=a,n++,a},avg:()=>t/n}}};globalThis.Util=x;let $=new URLSearchParams((null==(e=window.location.hash)?void 0:e.substring(1))||"");const M=o({},e=>x.safeJson($.get(e)),(e,t)=>{const n=$.get(e),s=void 0===t?void 0:JSON.stringify(t);n===s||null===n&&void 0===s||(void 0===t?$.delete(e):$.set(e,s),window.location.hash="#"+$.toString())});"undefined"!=typeof window&&window.addEventListener("hashchange",()=>{var e;const t=new URLSearchParams((null==(e=window.location.hash)?void 0:e.substring(1))||""),n=new Set([...$.keys(),...t.keys()]);$=t,n.forEach(e=>M[e]=M[e])});const L=o({},e=>x.safeJson(localStorage.getItem(e)),(e,t)=>{const n=localStorage.getItem(e),s=void 0===t?void 0:JSON.stringify(t);n===s||null===n&&void 0===s||(void 0===t?localStorage.removeItem(e):localStorage.setItem(e,s))}),C=o({exitBlocks:0});globalThis.Hash=M,globalThis.LocalStorage=L,globalThis.State=C;const k={NewState:o,Component:h,$:i,$$:l,RefreshState:j,SetTranslator:A,_scanTree:S,_unbindTree:T,Util:x,Hash:M,LocalStorage:L,State:C};if("undefined"!=typeof window&&(window.ApigoState=k),"undefined"!=typeof document){const e=()=>{h._initPending();const e=document.documentElement;e.hasAttribute("$data-bs-theme")||e.hasAttribute("data-bs-theme")||e.setAttribute("$data-bs-theme","LocalStorage.darkMode?'dark':'light'"),new MutationObserver(e=>{e.forEach(e=>{e.addedNodes.forEach(e=>{e.isConnected&&S(e)}),e.removedNodes.forEach(e=>T(e))})}).observe(document.documentElement,{childList:!0,subtree:!0}),S(document.documentElement)};"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",e,!0)}export{i as $,l as $$,h as Component,M as Hash,L as LocalStorage,o as NewState,j as RefreshState,A as SetTranslator,C as State,x as Util,S as _scanTree,T as _unbindTree};
diff --git a/dist/state.mjs b/dist/state.mjs
deleted file mode 100644
index 1b0d500..0000000
--- a/dist/state.mjs
+++ /dev/null
@@ -1,659 +0,0 @@
-var _a;
-let __activeBinding = null;
-let __noWriteBack = null;
-const _setActiveBinding = (val) => __activeBinding = val;
-const _setNoWriteBack = (val) => __noWriteBack = val;
-const _notifiers = /* @__PURE__ */ new Set();
-const _onNotifyUpdate = (fn) => _notifiers.add(fn);
-function NewState(defaults = {}, getter = null, setter = null) {
-  const _defaults = {};
-  const _stateMappings = /* @__PURE__ */ new Map();
-  const _watchers = /* @__PURE__ */ new Map();
-  const _watchFunc = (k, cb) => {
-    if (!_watchers.has(k)) _watchers.set(k, /* @__PURE__ */ new Set());
-    !cb ? _watchers.get(k).clear() : _watchers.get(k).add(cb);
-    return () => _watchers.get(k).delete(cb);
-  };
-  const _unwatchFunc = (k, cb) => {
-    if (_watchers.has(k)) _watchers.set(k, /* @__PURE__ */ new Set());
-    _watchers.get(k).delete(cb);
-  };
-  const __getter = getter || ((k) => _defaults[k]);
-  const __setter = setter || ((k, v) => _defaults[k] = v);
-  Object.assign(_defaults, defaults);
-  return new Proxy(_defaults, {
-    get(target, key) {
-      if (key === "__watch") return _watchFunc;
-      if (key === "__unwatch") return _unwatchFunc;
-      if (key === "__isProxy") return true;
-      if (__activeBinding) {
-        if (!_stateMappings.has(key)) _stateMappings.set(key, /* @__PURE__ */ new Set());
-        _stateMappings.get(key).add(__activeBinding);
-        if (!__activeBinding.node._states) __activeBinding.node._states = /* @__PURE__ */ new Set();
-        __activeBinding.node._states.add(_stateMappings);
-      }
-      return __getter(key);
-    },
-    set(target, key, value) {
-      if (__getter(key) !== value) {
-        __setter(key, value);
-      }
-      if (_watchers.has(key)) {
-        _watchers.get(key).forEach((cb) => {
-          const r = cb(value);
-          if (r !== void 0) {
-            value = r;
-            target[key] = value;
-          }
-        });
-      }
-      if (_watchers.has(null)) {
-        _watchers.get(null).forEach((cb) => cb(value));
-      }
-      if (_stateMappings.has(key)) {
-        const bindings = _stateMappings.get(key);
-        for (const binding of bindings) {
-          if (!binding.node.isConnected) {
-            bindings.delete(binding);
-            continue;
-          }
-          if (__noWriteBack !== binding.node) {
-            _notifiers.forEach((fn) => fn(binding));
-          }
-        }
-      }
-      return true;
-    }
-  });
-}
-const $ = (a, b) => b ? a.querySelector(b) : document.querySelector(a);
-const $$ = (a, b) => b ? a.querySelectorAll(b) : document.querySelectorAll(a);
-const _components = /* @__PURE__ */ new Map();
-const _pendingTemplates = [];
-const Component = {
-  getTemplate: (name) => document.querySelector(`template[component="${name.toUpperCase()}"]`),
-  register: (name, setupFunc, templateNode = null, ...globalNodes) => {
-    console.log("Component.register:", name.toUpperCase());
-    _components.set(name.toUpperCase(), setupFunc);
-    if (document.readyState !== "loading") Component._addTemplate(name, templateNode, globalNodes);
-    else _pendingTemplates.push([name, templateNode, globalNodes]);
-  },
-  exists: (name) => _components.has(name.toUpperCase()),
-  getSetupFunction: (name) => _components.get(name.toUpperCase()),
-  _addTemplate: (name, templateNode, globalNodes) => {
-    if (templateNode) {
-      const template = document.createElement("TEMPLATE");
-      template.setAttribute("component", name.toUpperCase());
-      template.content.appendChild(templateNode);
-      document.body.appendChild(template);
-    }
-    if (globalNodes) globalNodes.forEach((node) => document.body.appendChild(node));
-  },
-  _initPending: () => {
-    _pendingTemplates.forEach(([name, templateNode, globalNodes]) => Component._addTemplate(name, templateNode, globalNodes));
-    _pendingTemplates.length = 0;
-  }
-};
-function _mergeNode(from, to, scanObj, exists = {}) {
-  if (from.attributes) {
-    Array.from(from.attributes).forEach((attr) => {
-      if (attr.name === "class") return;
-      if (attr.name === "style") {
-        if (to.hasAttribute("style")) to.setAttribute("style", `${attr.value}; ${to.getAttribute("style")}`);
-        else to.setAttribute("style", attr.value);
-      } else if (!to.hasAttribute(attr.name)) {
-        to.setAttribute(attr.name, attr.value);
-      }
-    });
-  }
-  to.classList.add(...from.classList);
-  Array.from(from.childNodes).forEach((child) => to.appendChild(child));
-  if (from.tagName && Component.exists(from.tagName)) _makeComponent(from.tagName, to, scanObj, exists);
-}
-function _makeComponent(name, node, scanObj, exists = {}) {
-  if (exists[name]) return;
-  exists[name] = true;
-  if (scanObj.thisObj) {
-    Array.from(node.attributes).forEach((attr) => {
-      if ((attr.name.startsWith("$") || attr.name.startsWith("st-")) && attr.value.includes("this.")) {
-        attr.value = attr.value.replace(/\bthis\./g, "this.parent.");
-      }
-    });
-  }
-  const componentFunc = Component.getSetupFunction(name);
-  const slots = {};
-  Array.from(node.childNodes).forEach((child) => {
-    if (child.nodeType === Node.ELEMENT_NODE && child.hasAttribute("slot")) {
-      slots[child.getAttribute("slot")] = child;
-      child.removeAttribute("slot");
-    }
-  });
-  node.innerHTML = "";
-  node.state = NewState(node.state || {});
-  const template = Component.getTemplate(name);
-  if (template) {
-    const tplnode = template.content.cloneNode(true);
-    if (tplnode.childNodes.length) {
-      const rootNode = tplnode.children[0];
-      if (rootNode) _mergeNode(rootNode, node, scanObj, exists);
-      $$(node, "[slot-id]").forEach((placeholder) => {
-        const slotName = placeholder.getAttribute("slot-id");
-        if (slots[slotName]) {
-          placeholder.removeAttribute("slot-id");
-          placeholder.innerHTML = "";
-          _mergeNode(slots[slotName], placeholder, scanObj, exists);
-        }
-      });
-    }
-  }
-  if (componentFunc) componentFunc(node);
-}
-let _disableRunCodeError = false;
-function setDisableRunCodeError(value) {
-  _disableRunCodeError = value;
-}
-const _fnCache = /* @__PURE__ */ new Map();
-function _runCode(code, vars, thisObj, extendVars) {
-  const allVars = { ...extendVars || {}, ...vars || {} };
-  const argKeys = Object.keys(allVars);
-  const argValues = Object.values(allVars);
-  const cacheKey = code + argKeys.join(",");
-  try {
-    let fn = _fnCache.get(cacheKey);
-    if (!fn) {
-      fn = new Function("Hash", "LocalStorage", "State", ...argKeys, code);
-      _fnCache.set(cacheKey, fn);
-    }
-    return fn.apply(thisObj, [globalThis.Hash, globalThis.LocalStorage, globalThis.State, ...argValues]);
-  } catch (e) {
-    if (!_disableRunCodeError) console.error(e, extendVars, [code, extendVars, vars, thisObj]);
-    return null;
-  }
-}
-function _returnCode(code, vars, thisObj, extendVars) {
-  if (code.includes("${")) return _runCode("return `" + code + "`", vars, thisObj, extendVars);
-  else return _runCode("return " + code, vars, thisObj, extendVars);
-}
-let _translator = (text, args) => {
-  if (!text || typeof text !== "string") return text;
-  return text.replace(/\{(.+?)\}/g, (match, key) => args.hasOwnProperty(key) ? args[key] : match);
-};
-const SetTranslator = (fn) => _translator = fn;
-const _translate = (text) => {
-  if (!text || typeof text !== "string" || !text.includes("{#")) return text;
-  return text.replace(/\{#(.+?)#\}/g, (m, content) => {
-    const parts = content.split("||").map((s) => s.trim());
-    const args = {};
-    if (parts.length > 1) {
-      const matches = parts[0].match(/\{(.+?)\}/g);
-      if (matches) matches.forEach((match, i) => args[match.substring(1, match.length - 1)] = parts[i + 1] || "");
-    }
-    return _translator(parts[0], args);
-  });
-};
-if (typeof document !== "undefined") {
-  try {
-    document.createElement("div").setAttribute("$t", "1");
-  } catch (e) {
-    const originalSetAttribute = Element.prototype.setAttribute;
-    Element.prototype.setAttribute = function(name, value) {
-      if (!name.startsWith("$")) return originalSetAttribute.call(this, name, value);
-      return originalSetAttribute.call(this, "st-" + name.substring(1), value);
-    };
-  }
-}
-_onNotifyUpdate((binding) => _updateBinding(binding));
-function _clearRenderedNodes(node) {
-  if (node._renderedNodes) node._renderedNodes.forEach((nodes) => nodes.forEach((child) => {
-    child.remove();
-    if (child._renderedNodes) _clearRenderedNodes(child);
-  }));
-}
-function _updateBinding(binding) {
-  const node = binding.node;
-  if (!node.isConnected && node.tagName !== "TEMPLATE") return;
-  _setActiveBinding(binding);
-  let result = binding.exp ? binding.tpl ? _returnCode(binding.tpl, { thisNode: node }, node._thisObj || node, node._ref || null) : null : binding.tpl;
-  if (binding.exp === 2 && typeof result === "string") {
-    try {
-      result = _returnCode(result, { thisNode: node }, node._thisObj || node, node._ref || null);
-    } catch (e) {
-    }
-  }
-  _setActiveBinding(null);
-  if (binding.prop) {
-    const prop = binding.prop;
-    let o = node;
-    for (let i = 0; i < prop.length - 1; i++) {
-      if (!prop[i]) continue;
-      if (o[prop[i]] == null) o[prop[i]] = {};
-      o = o[prop[i]];
-      if (typeof o !== "object") break;
-    }
-    if (typeof o === "object" && o !== null) {
-      const lk = prop[prop.length - 1];
-      if (lk) {
-        if (typeof result === "object" && result != null && !Array.isArray(result) && o[lk] == null) o[lk] = {};
-        const lo = o[lk];
-        if (typeof lo === "object" && lo != null && lo.__watch) Object.assign(lo, result);
-        else {
-          if (o[lk] !== result) o[lk] = result;
-        }
-      } else if (typeof result === "object" && result != null && !Array.isArray(result)) {
-        Object.assign(o, result);
-      }
-    }
-  } else if (binding.attr) {
-    const attr = binding.attr;
-    if (attr === "if") {
-      if (result) {
-        if (!node._renderedNodes || node._renderedNodes.length === 0) {
-          node._children.forEach((child) => {
-            node.parentNode.insertBefore(child, node);
-            child._ref = { ...node._ref };
-            child._thisObj = node._thisObj;
-          });
-          node._renderedNodes = [node._children];
-        }
-      } else {
-        _clearRenderedNodes(node);
-        node._renderedNodes = [];
-      }
-    } else if (attr === "each") {
-      if (result && typeof result === "object") {
-        const asName = node.getAttribute("as") || "item";
-        const indexName = node.getAttribute("index") || "index";
-        const keyName = node.getAttribute("key");
-        let keys, getVal;
-        if (result instanceof Map) {
-          keys = Array.from(result.keys());
-          getVal = (k) => result.get(k);
-        } else if (typeof result[Symbol.iterator] === "function") {
-          const arr = Array.isArray(result) ? result : Array.from(result);
-          keys = new Array(arr.length);
-          for (let i = 0; i < arr.length; i++) keys[i] = i;
-          getVal = (k) => arr[k];
-        } else {
-          keys = Object.keys(result);
-          getVal = (k) => result[k];
-        }
-        if (!node._keyedNodes) node._keyedNodes = /* @__PURE__ */ new Map();
-        const newKeyedNodes = /* @__PURE__ */ new Map();
-        const currentRenderedNodes = [];
-        keys.forEach((k, i) => {
-          const item = getVal(k);
-          const rawKey = keyName ? item && typeof item === "object" ? item[keyName] : item : k;
-          const keyVal = rawKey === void 0 || rawKey === null || newKeyedNodes.has(rawKey) ? `st_key_${i}` : rawKey;
-          let existingNodes = node._keyedNodes.get(keyVal);
-          if (existingNodes) {
-            node._keyedNodes.delete(keyVal);
-            existingNodes.forEach((child) => {
-              child._ref[indexName] = k;
-              child._ref[asName] = item;
-              _scanTree(child);
-            });
-          } else {
-            existingNodes = [];
-            node._children.forEach((child) => {
-              const cloned = child.cloneNode(true);
-              cloned._ref = { ...node._ref, [indexName]: k, [asName]: item };
-              cloned._thisObj = node._thisObj;
-              node.parentNode.insertBefore(cloned, node);
-              existingNodes.push(cloned);
-            });
-          }
-          newKeyedNodes.set(keyVal, existingNodes);
-          currentRenderedNodes.push(existingNodes);
-        });
-        node._keyedNodes.forEach((nodes) => nodes.forEach((child) => {
-          _clearRenderedNodes(child);
-          child.remove();
-        }));
-        node._keyedNodes = newKeyedNodes;
-        node._renderedNodes = currentRenderedNodes;
-      } else {
-        _clearRenderedNodes(node);
-        node._renderedNodes = [];
-      }
-    } else if (attr === "bind") {
-      if (["INPUT", "SELECT", "TEXTAREA"].includes(node.tagName) && !node.hasAttribute("autocomplete")) node.setAttribute("autocomplete", "off");
-      if (node.type === "checkbox") {
-        if (node.value !== "on" && !result) {
-          _runCode(`${binding.tpl} = []`, { thisNode: node }, node._thisObj || node, node._ref || {});
-          result = [];
-        }
-        node._checkboxMultiMode = result instanceof Array;
-        const isChecked = result instanceof Array ? result.includes(node.value) : !!result;
-        if (node.checked !== isChecked) node.checked = isChecked;
-      } else if (node.type === "radio") {
-        if (node.checked !== (node.value === String(result ?? ""))) node.checked = node.value === String(result ?? "");
-      } else if ("value" in node && node.type !== "file") {
-        Promise.resolve().then(() => {
-          if (node.value !== String(result ?? "")) node.value = result;
-        });
-      } else if (node.isContentEditable) {
-        if (node.innerHTML !== String(result ?? "")) node.innerHTML = result;
-      }
-      node.dispatchEvent(new CustomEvent("bind", { bubbles: false, detail: result }));
-    } else {
-      if (["checked", "disabled", "readonly"].includes(attr)) result = !!result;
-      if (typeof result === "boolean") result ? node.setAttribute(attr, "") : node.removeAttribute(attr);
-      else if (result !== void 0) {
-        if (typeof result !== "string") result = JSON.stringify(result);
-        if (attr === "text") node.textContent = result ?? "";
-        else if (attr === "html") node.innerHTML = result ?? "";
-        else if (node.tagName === "IMG" && attr === "src" && result.includes(".svg")) node.setAttribute("_src", result ?? "");
-        else node.setAttribute(attr, result ?? "");
-      }
-    }
-  }
-}
-const _initBinding = (binding) => {
-  if (!binding.node._bindings) binding.node._bindings = [];
-  binding.node._bindings.push({ attr: binding.attr, prop: binding.prop, tpl: binding.tpl, exp: binding.exp });
-  _updateBinding(binding);
-};
-const _parseNode = (node, scanObj) => {
-  if (node._bindings) {
-    node._states = /* @__PURE__ */ new Set();
-    node._bindings.forEach((b) => _updateBinding({ node, ...b }));
-    if (node._hasOnUpdate) node.dispatchEvent(new Event("update", { bubbles: false }));
-    return;
-  }
-  if (Component.exists(node.tagName) && !node._componentInitialized) {
-    Array.from(node.attributes).forEach((attr) => {
-      var _a2;
-      if (attr.name.startsWith("$.")) {
-        const realAttrName = attr.name.slice(2);
-        let tpl = _translate(attr.value);
-        if (tpl.includes("this.")) tpl = tpl.replace(/\bthis\./g, "this.parent.");
-        const result = _returnCode(tpl, { thisNode: node }, { parent: scanObj.thisObj || node }, node._ref || {});
-        let o = node;
-        const prop = realAttrName.split(".");
-        for (let i = 0; i < prop.length - 1; i++) {
-          if (prop[i]) o = o[_a2 = prop[i]] ?? (o[_a2] = {});
-        }
-        o[prop[prop.length - 1]] = result;
-        node.removeAttribute(attr.name);
-      }
-    });
-    _makeComponent(node.tagName, node, scanObj);
-    $$(node, "[slot-id]").forEach((p) => p.removeAttribute("slot-id"));
-    node._componentInitialized = true;
-    if (!node._thisObj) node._thisObj = node;
-  }
-  if (node.tagName === "TEMPLATE") {
-    node._children = [...node.content.childNodes];
-    if (!node._renderedNodes) node._renderedNodes = [];
-  }
-  let attrs = [];
-  if (node.tagName === "TEMPLATE") {
-    ["$if", "$each", "st-if", "st-each"].forEach((n) => node.hasAttribute(n) && attrs.push(node.getAttributeNode(n)));
-  } else {
-    attrs = Array.from(node.attributes).filter((a) => (a.name.startsWith("$") || a.name.startsWith("st-")) && !["$if", "$each", "st-if", "st-each"].includes(a.name) || a.name.includes("."));
-  }
-  if (node._thisObj && scanObj.thisObj) node._thisObj.parent = scanObj.thisObj;
-  if (!node._thisObj) node._thisObj = scanObj.thisObj || null;
-  if (!node._ref) node._ref = scanObj.extendVars || {};
-  node._states = /* @__PURE__ */ new Set();
-  attrs.forEach((attr) => {
-    let exp = 0;
-    if (attr.name.startsWith("$$") || attr.name.startsWith("st-st-")) exp = 2;
-    else if (attr.name.startsWith("$") || attr.name.startsWith("st-")) exp = 1;
-    const realAttrName = exp === 2 ? attr.name.startsWith("$$") ? attr.name.slice(2) : attr.name.slice(6) : exp === 1 ? attr.name.startsWith("$") ? attr.name.slice(1) : attr.name.slice(3) : attr.name;
-    let tpl = attr.value;
-    node.removeAttribute(attr.name);
-    if (realAttrName.startsWith(".")) _initBinding({ node, prop: realAttrName.split("."), tpl, exp });
-    else if (realAttrName.startsWith("on")) {
-      const eventName = realAttrName.slice(2);
-      if (eventName === "update") node._hasOnUpdate = true;
-      if (eventName === "load" && !["BODY", "IMG", "IFRAME"].includes(node.tagName)) node._hasOnLoad = true;
-      if (eventName === "unload" && !["BODY", "IMG", "IFRAME"].includes(node.tagName)) node._hasOnUnload = true;
-      node.addEventListener(eventName, (e) => _runCode(tpl, { event: e, thisNode: node, ...e.detail || {} }, scanObj.thisObj || node, node._ref || {}));
-    } else {
-      if (realAttrName === "bind") {
-        node.addEventListener(["textarea", "text", "password"].includes(node.type || "text") || node.isContentEditable ? "input" : "change", (e) => {
-          let newVal = node.isContentEditable ? e.target.innerHTML : node.type === "checkbox" ? e.target.checked : e.target.files || e.target.value || e.detail;
-          _setNoWriteBack(node);
-          setDisableRunCodeError(true);
-          if (node.type === "checkbox" && node._checkboxMultiMode) _runCode(`!!checked ? (!${tpl}.includes(val) && ${tpl}.push(val)) : (index = ${tpl}.indexOf(val), index > -1 && ${tpl}.splice(index, 1))`, { val: node.value, checked: newVal, thisNode: node }, scanObj.thisObj || node, node._ref || {});
-          else _runCode(`${tpl} = val`, { val: newVal, thisNode: node }, scanObj.thisObj || node, node._ref || {});
-          setDisableRunCodeError(false);
-          _setNoWriteBack(null);
-        });
-      } else if (realAttrName === "text" && !tpl) {
-        tpl = node.textContent;
-        node.textContent = "";
-      }
-      if (tpl) {
-        tpl = _translate(tpl);
-        _initBinding({ node, attr: realAttrName, tpl, exp });
-      }
-    }
-  });
-  if (node._hasOnLoad || node._componentInitialized) Promise.resolve().then(() => node.dispatchEvent(new Event("load", { bubbles: false })));
-  if (node._hasOnUpdate) node.dispatchEvent(new Event("update", { bubbles: false }));
-  if (node._thisObj) scanObj.thisObj = node._thisObj;
-};
-const _scanTree = (node, scanObj = {}) => {
-  if (node.nodeType !== 1) return;
-  if (!node._stTranslated) {
-    Array.from(node.attributes).forEach((attr) => {
-      if (!attr.name.startsWith("$") && !attr.name.startsWith("st-") && !attr.name.startsWith(".")) {
-        const translated = _translate(attr.value);
-        if (translated !== attr.value) attr.value = translated;
-      }
-    });
-    node._stTranslated = true;
-  }
-  if (node.tagName !== "TEMPLATE" && (node.hasAttribute("$if") || node.hasAttribute("$each") || node.hasAttribute("st-if") || node.hasAttribute("st-each"))) {
-    const template = document.createElement("TEMPLATE");
-    const attrs = Array.from(node.attributes).filter((attr) => ["$if", "$each", "st-if", "st-each"].includes(attr.name) || (node.hasAttribute("$each") || node.hasAttribute("st-each")) && ["as", "index"].includes(attr.name));
-    attrs.forEach((attr) => {
-      template.setAttribute(attr.name, attr.value);
-      node.removeAttribute(attr.name);
-    });
-    node.parentNode.insertBefore(template, node);
-    template.content.appendChild(node);
-    template._ref = node._ref;
-    _scanTree(template, scanObj);
-    return;
-  }
-  if (node.tagName === "TEMPLATE" && (node.hasAttribute("$if") || node.hasAttribute("st-if")) && (node.hasAttribute("$each") || node.hasAttribute("st-each"))) {
-    const template = document.createElement("TEMPLATE");
-    const attrs = Array.from(node.attributes).filter((attr2) => ["$if", "$each", "st-if", "st-each"].includes(attr2.name));
-    const attr = attrs[attrs.length - 1];
-    template.setAttribute(attr.name, attr.value);
-    node.removeAttribute(attr.name);
-    if (attr.name === "$each" || attr.name === "st-each") {
-      Array.from(node.attributes).filter((attr2) => ["as", "index"].includes(attr2.name)).forEach((attr2) => {
-        template.setAttribute(attr2.name, attr2.value);
-        node.removeAttribute(attr2.name);
-      });
-    }
-    Array.from(node.content.childNodes).forEach((child) => template.content.appendChild(child));
-    node.content.appendChild(template);
-    template._ref = node._ref;
-  }
-  if (node.tagName === "IMG" && (node.hasAttribute("src") || node.hasAttribute("_src") || node.hasAttribute("$src"))) {
-    const imgNode = node;
-    Promise.resolve().then(() => {
-      const url = imgNode.getAttribute("_src") || imgNode.getAttribute("src");
-      if (url) fetch(url, { cache: "force-cache" }).then((r) => r.text()).then((svgText) => {
-        const realSvg = new DOMParser().parseFromString(svgText, "image/svg+xml").querySelector("svg");
-        if (realSvg) {
-          Array.from(imgNode.attributes).forEach((attr) => realSvg.setAttribute(attr.name, attr.value));
-          imgNode.replaceWith(realSvg);
-        }
-      });
-    });
-  }
-  if (node._thisObj !== void 0) scanObj.thisObj = node._thisObj || null;
-  else {
-    let curr = node;
-    while (curr && curr._thisObj === void 0) curr = curr.parentNode;
-    scanObj.thisObj = curr ? curr._thisObj : null;
-  }
-  if (node._ref === void 0) {
-    let curr = node;
-    while (curr && curr._ref === void 0) curr = curr.parentNode;
-    node._ref = curr ? { ...curr._ref } : {};
-  }
-  if (scanObj.extendVars) Object.assign(node._ref, scanObj.extendVars);
-  _parseNode(node, { ...scanObj });
-  const nodes = [...node.childNodes || []];
-  nodes.forEach((child) => _scanTree(child, { thisObj: scanObj.thisObj, extendVars: { ...node._ref } }));
-};
-const _unbindTree = (node) => {
-  if (node.nodeType !== 1) return;
-  if (node._hasOnUnload) node.dispatchEvent(new Event("unload", { bubbles: false }));
-  if (node._states) node._states.forEach((mappings) => {
-    for (const [key, bindingSet] of mappings) {
-      for (const binding of bindingSet) {
-        if (binding.node === node) bindingSet.delete(binding);
-      }
-    }
-  });
-  node.childNodes && node.childNodes.forEach((child) => _unbindTree(child));
-};
-const _unsafeRefreshState = _scanTree;
-const Util = {
-  clone: window.structuredClone || ((obj) => JSON.parse(JSON.stringify(obj))),
-  base64: (str) => btoa(String.fromCharCode(...new TextEncoder().encode(str))),
-  unbase64: (str) => new TextDecoder().decode(Uint8Array.from(atob(str), (c) => c.charCodeAt(0))),
-  urlbase64: (str) => Util.base64(str).replace(/[+/=]/g, (m) => ({ "+": "-", "/": "", "=": "" })[m]),
-  unurlbase64: (str) => Util.unbase64(str.replace(/[-_.]/g, (m) => ({ "-": "+", "_": "/", ".": "=" })[m]).padEnd(Math.ceil(str.length / 4) * 4, "=")),
-  safeJson: (str) => {
-    try {
-      return JSON.parse(str);
-    } catch {
-      return null;
-    }
-  },
-  updateDefaults: (obj, defaults) => {
-    for (const k in defaults) if (obj[k] === void 0) obj[k] = defaults[k];
-  },
-  copyFunction: (toObj, fromObj, ...funcNames) => {
-    funcNames.forEach((name) => toObj[name] = fromObj[name].bind(fromObj));
-  },
-  getFunctionBody: (fn) => {
-    const code = fn.toString();
-    return code.slice(code.indexOf("{") + 1, code.lastIndexOf("}")).trim();
-  },
-  makeDom: (html) => {
-    if (html.includes(">\n")) html = html.replace(/>\s+</g, "><").trim();
-    const node = document.createElement("div");
-    node.innerHTML = html;
-    return node.children[0];
-  },
-  newAvg: () => {
-    let total = 0, count = 0, avg = 0;
-    return {
-      add: (v) => {
-        total += v;
-        count++;
-        return avg = total / count;
-      },
-      get: () => avg,
-      clear: () => {
-        total = 0, count = 0, avg = 0;
-      }
-    };
-  },
-  newTimeCount: () => {
-    let startTime = 0, total = 0, count = 0;
-    return {
-      start: () => startTime = (/* @__PURE__ */ new Date()).getTime(),
-      end: () => {
-        const endTime = (/* @__PURE__ */ new Date()).getTime();
-        const left = endTime - startTime;
-        startTime = endTime;
-        total += left;
-        count++;
-        return left;
-      },
-      avg: () => total / count
-    };
-  }
-};
-globalThis.Util = Util;
-let _hashParams = new URLSearchParams(((_a = window.location.hash) == null ? void 0 : _a.substring(1)) || "");
-const Hash = NewState({}, (k) => Util.safeJson(_hashParams.get(k)), (k, v) => {
-  const oldStr = _hashParams.get(k);
-  const newStr = v === void 0 ? void 0 : JSON.stringify(v);
-  if (oldStr === newStr || oldStr === null && newStr === void 0) return;
-  v === void 0 ? _hashParams.delete(k) : _hashParams.set(k, newStr);
-  window.location.hash = "#" + _hashParams.toString();
-});
-if (typeof window !== "undefined") {
-  window.addEventListener("hashchange", () => {
-    var _a2;
-    const newParams = new URLSearchParams(((_a2 = window.location.hash) == null ? void 0 : _a2.substring(1)) || "");
-    const keys = /* @__PURE__ */ new Set([..._hashParams.keys(), ...newParams.keys()]);
-    _hashParams = newParams;
-    keys.forEach((k) => Hash[k] = Hash[k]);
-  });
-}
-const LocalStorage = NewState({}, (k) => Util.safeJson(localStorage.getItem(k)), (k, v) => {
-  const oldStr = localStorage.getItem(k);
-  const newStr = v === void 0 ? void 0 : JSON.stringify(v);
-  if (oldStr === newStr || oldStr === null && newStr === void 0) return;
-  v === void 0 ? localStorage.removeItem(k) : localStorage.setItem(k, newStr);
-});
-const State = NewState({
-  exitBlocks: 0
-});
-globalThis.Hash = Hash;
-globalThis.LocalStorage = LocalStorage;
-globalThis.State = State;
-const ApigoState = {
-  NewState,
-  Component,
-  $,
-  $$,
-  RefreshState: _unsafeRefreshState,
-  SetTranslator,
-  _scanTree,
-  _unbindTree,
-  Util,
-  Hash,
-  LocalStorage,
-  State
-};
-if (typeof window !== "undefined") {
-  window.ApigoState = ApigoState;
-}
-if (typeof document !== "undefined") {
-  const init = () => {
-    Component._initPending();
-    const htmlNode = document.documentElement;
-    if (!htmlNode.hasAttribute("$data-bs-theme") && !htmlNode.hasAttribute("data-bs-theme")) {
-      htmlNode.setAttribute("$data-bs-theme", "LocalStorage.darkMode?'dark':'light'");
-    }
-    new MutationObserver((mutations) => {
-      mutations.forEach((mutation) => {
-        mutation.addedNodes.forEach((newNode) => {
-          if (newNode.isConnected) _scanTree(newNode);
-        });
-        mutation.removedNodes.forEach((oldNode) => _unbindTree(oldNode));
-      });
-    }).observe(document.documentElement, { childList: true, subtree: true });
-    _scanTree(document.documentElement);
-  };
-  if (document.readyState !== "loading") init();
-  else document.addEventListener("DOMContentLoaded", init, true);
-}
-export {
-  $,
-  $$,
-  Component,
-  Hash,
-  LocalStorage,
-  NewState,
-  _unsafeRefreshState as RefreshState,
-  SetTranslator,
-  State,
-  Util,
-  _scanTree,
-  _unbindTree
-};
diff --git a/package.json b/package.json
index 86d0ee0..a0485a9 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,8 @@
 {
   "name": "@apigo.cc/state",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "type": "module",
   "main": "dist/state.js",
-  "module": "dist/state.js",
   "files": [
     "dist"
   ],
diff --git a/src/component.js b/src/component.js
index 2ea49fb..f706369 100644
--- a/src/component.js
+++ b/src/component.js
@@ -43,7 +43,9 @@ export function _mergeNode(from, to, scanObj, exists = {}) {
         });
     }
     to.classList.add(...from.classList);
-    Array.from(from.childNodes).forEach(child => to.appendChild(child));
+    const target = (to.tagName === 'TEMPLATE') ? to.content : to;
+    const sourceNodes = (from.tagName === 'TEMPLATE') ? from.content.childNodes : from.childNodes;
+    Array.from(sourceNodes).forEach(child => target.appendChild(child));
     if (from.tagName && Component.exists(from.tagName)) _makeComponent(from.tagName, to, scanObj, exists);
 }
 
diff --git a/src/dom.js b/src/dom.js
index ecc10e8..cc4685e 100644
--- a/src/dom.js
+++ b/src/dom.js
@@ -50,7 +50,7 @@ export function _updateBinding(binding) {
 
 	_setActiveBinding(binding);
 	let result = binding.exp ? (binding.tpl ? _returnCode(binding.tpl, { thisNode: node }, node._thisObj || node, node._ref || null) : null) : binding.tpl;
-	
+
 	if (binding.exp === 2 && typeof result === 'string') {
 		try { result = _returnCode(result, { thisNode: node }, node._thisObj || node, node._ref || null); } catch (e) { }
 	}
@@ -96,7 +96,7 @@ export function _updateBinding(binding) {
 			if (result && typeof result === 'object') {
 				const asName = node.getAttribute('as') || 'item';
 				const indexName = node.getAttribute('index') || 'index';
-				const keyName = node.getAttribute('key'); 
+				const keyName = node.getAttribute('key');
 				let keys, getVal;
 				if (result instanceof Map) {
 					keys = Array.from(result.keys()); getVal = k => result.get(k);
@@ -263,6 +263,12 @@ export const _parseNode = (node, scanObj) => {
 };
 
 export const _scanTree = (node, scanObj = {}) => {
+	if (node.nodeType === 3) {
+		if (node._stTranslated) return;
+		const translated = _translate(node.textContent);
+		if (translated !== node.textContent) node.textContent = translated;
+		node._stTranslated = true; return;
+	}
 	if (node.nodeType !== 1) return;
 
 	if (!node._stTranslated) {
@@ -275,7 +281,7 @@ export const _scanTree = (node, scanObj = {}) => {
 		node._stTranslated = true;
 	}
 
-	// 还原原始逻辑：自动为非模板节点的 $if 和 $each 指令创建模版节点
+	// 自动为非模板节点的 $if 和 $each 指令创建模版节点
 	if (node.tagName !== 'TEMPLATE' && (node.hasAttribute('$if') || node.hasAttribute('$each') || node.hasAttribute('st-if') || node.hasAttribute('st-each'))) {
 		const template = document.createElement('TEMPLATE');
 		const attrs = Array.from(node.attributes).filter(attr => ['$if', '$each', 'st-if', 'st-each'].includes(attr.name) || ((node.hasAttribute('$each') || node.hasAttribute('st-each')) && ['as', 'index'].includes(attr.name)));
@@ -286,8 +292,6 @@ export const _scanTree = (node, scanObj = {}) => {
 		node.parentNode.insertBefore(template, node);
 		template.content.appendChild(node);
 		template._ref = node._ref;
-		// 修正原始版本可能存在的漏扫：转换后立即对新生成的 TEMPLATE 发起递归扫描
-		_scanTree(template, scanObj);
 		return;
 	}
 
diff --git a/src/index.js b/src/index.js
index 99f018c..7bf1a27 100644
--- a/src/index.js
+++ b/src/index.js
@@ -16,6 +16,9 @@ const ApigoState = {
     NewState, Component, $, $$, RefreshState: _unsafeRefreshState, SetTranslator, _scanTree, _unbindTree, Util, Hash, LocalStorage, State
 };
 
+globalThis.$ = $;
+globalThis.$$ = $$;
+
 if (typeof window !== 'undefined') {
     window.ApigoState = ApigoState;
 }
diff --git a/test-results/all-modular-unit-tests-and-benchmark/error-context.md b/test-results/all-modular-unit-tests-and-benchmark/error-context.md
index c8cb2ae..32dd5d2 100644
--- a/test-results/all-modular-unit-tests-and-benchmark/error-context.md
+++ b/test-results/all-modular-unit-tests-and-benchmark/error-context.md
@@ -18,6 +18,12 @@ Expected: "passed"
 Received: "failed"
 ```
 
+# Page snapshot
+
+```yaml
+- 'heading "Tests Failed: ___unsafeRefreshState is not a function" [level=1] [ref=e3]'
+```
+
 # Test source
 
 ```ts
@@ -56,8 +62,8 @@ Received: "failed"
   32 |         const items = [];
   33 |         for(let i=0; i<1000; i++) items.push({val: 'item ' + i});
   34 |         window.state.benchItems = items;
-  35 |         const { _unsafeRefreshState } = await import('@apigo.cc/state');
-  36 |         _unsafeRefreshState(document.documentElement);
+  35 |         const { ___unsafeRefreshState } = await import('@apigo.cc/state');
+  36 |         ___unsafeRefreshState(document.documentElement);
   37 |         return performance.now() - start;
   38 |     });
   39 |     console.log(`BENCHMARK: 1000 items initial render: ${renderTime.toFixed(2)}ms`);
@@ -75,10 +81,10 @@ Received: "failed"
   51 | 
   52 |     // Extreme Data Test
   53 |     await page.evaluate(async () => {
-  54 |         const { _unsafeRefreshState } = await import('@apigo.cc/state');
+  54 |         const { ___unsafeRefreshState } = await import('@apigo.cc/state');
   55 |         document.body.innerHTML = '<div id="extreme" $each="state.extreme"></div>';
   56 |         window.state.extreme = null;
-  57 |         _unsafeRefreshState(document.getElementById('extreme'));
+  57 |         ___unsafeRefreshState(document.getElementById('extreme'));
   58 |         window.state.extreme = undefined;
   59 |         window.state.extreme = { a: 1 };
   60 |         window.state.extreme = [1, 2];
diff --git a/test/component.test.js b/test/component.test.js
index f0d6c36..00a681e 100644
--- a/test/component.test.js
+++ b/test/component.test.js
@@ -9,7 +9,9 @@ window.testComponent = async function() {
     }, document.createRange().createContextualFragment('<div id="comp-inner" $text="this.state.msg"></div>').firstChild);
     
     // 2. Render component
-    document.body.innerHTML = '<TestComp id="comp-inst"></TestComp>';
+    const comp = document.createElement('TestComp');
+    comp.id = 'comp-inst';
+    document.body.appendChild(comp);
     ___unsafeRefreshState(document.documentElement);
     
     const instance = $('#comp-inst');
diff --git a/vite.config.js b/vite.config.js
index cc64563..13363be 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,7 +7,7 @@ export default defineConfig({
     lib: {
       entry: resolve(__dirname, 'src/index.js'),
       name: 'ApigoState', // UMD 内部名称，逻辑主要靠 globalThis 挂载
-      formats: ['umd', 'es']
+      formats: ['umd']
     },
     rollupOptions: {
       output: [
@@ -21,15 +21,6 @@ export default defineConfig({
           name: 'ApigoState',
           entryFileNames: 'state.min.js',
           plugins: [terser()]
-        },
-        {
-          format: 'es',
-          entryFileNames: 'state.mjs'
-        },
-        {
-          format: 'es',
-          entryFileNames: 'state.min.mjs',
-          plugins: [terser()]
         }
       ]
     },