@geajs/vite-plugin 1.0.27 → 1.1.0

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import babelGenerator2 from "@babel/generator";
+import babelGenerator3 from "@babel/generator";
 import babelTraverse2 from "@babel/traverse";
 
 // src/parse.ts
@@ -180,8 +180,8 @@ function collectStateReferences(ast, storeImports = /* @__PURE__ */ new Map()) {
     VariableDeclarator(path) {
       if (!path.node.init || !t.isIdentifier(path.node.id)) return;
       if (stateRefs.has(path.node.id.name)) return;
-      const classMethod9 = path.findParent((p) => t.isClassMethod(p.node));
-      if (!classMethod9) return;
+      const classMethod10 = path.findParent((p) => t.isClassMethod(p.node));
+      if (!classMethod10) return;
       candidates.set(path.node.id.name, t.cloneNode(path.node.init, true));
     }
   });
@@ -591,14 +591,14 @@ function replaceThisPropsRootWithValueParam(expr, propName) {
         visit(e.object),
         e.property,
         e.computed,
-        e.optional
+        e.optional ?? true
       );
     }
     if (t2.isOptionalCallExpression(e)) {
       return t2.optionalCallExpression(
         visit(e.callee),
         e.arguments.map((a) => t2.isExpression(a) ? visit(a) : a),
-        e.optional
+        e.optional ?? true
       );
     }
     if (t2.isCallExpression(e)) {
@@ -728,14 +728,14 @@ function optionalizeMemberChainsFromBindingRoot(expr, rootName) {
         visit(e.object),
         e.property,
         e.computed,
-        e.optional
+        e.optional ?? true
       );
     }
     if (t2.isOptionalCallExpression(e)) {
       return t2.optionalCallExpression(
         visit(e.callee),
         e.arguments.map((a) => t2.isExpression(a) ? visit(a) : a),
-        e.optional
+        e.optional ?? true
       );
     }
     if (t2.isCallExpression(e)) {
@@ -861,14 +861,14 @@ function optionalizeMemberChainsAfterComputedItemKey(expr, itemKeyName) {
         visit(e.object),
         e.property,
         e.computed,
-        e.optional
+        e.optional ?? true
       );
     }
     if (t2.isOptionalCallExpression(e)) {
       return t2.optionalCallExpression(
         visit(e.callee),
         e.arguments.map((a) => t2.isExpression(a) ? visit(a) : a),
-        e.optional
+        e.optional ?? true
       );
     }
     if (t2.isCallExpression(e)) {
@@ -1033,14 +1033,14 @@ function replacePropRefsInNode(node, propNames, wholeParamName, propDefaults) {
       r(node.object),
       node.property,
       node.computed,
-      node.optional
+      node.optional ?? true
     );
   }
   if (t2.isOptionalCallExpression(node)) {
     return t2.optionalCallExpression(
       r(node.callee),
       node.arguments.map((a) => t2.isExpression(a) ? r(a) : a),
-      node.optional
+      node.optional ?? true
     );
   }
   if (t2.isConditionalExpression(node)) {
@@ -1177,8 +1177,8 @@ function wrapEventsGetterWithCache(getter) {
   const returnStmt = body.find((s) => t2.isReturnStatement(s) && s.argument !== null);
   if (!returnStmt?.argument) return;
   const cachedProp = t2.memberExpression(t2.thisExpression(), t2.identifier("__evts"));
-  const elementProp = t2.memberExpression(t2.thisExpression(), t2.identifier("element_"));
-  const tmpId = t2.identifier("__geaEvtsResult");
+  const elementProp = t2.memberExpression(t2.thisExpression(), t2.identifier("GEA_ELEMENT"), true);
+  const tmpId = t2.identifier("geaEvtsResult");
   const objectExpr = returnStmt.argument;
   const returnIndex = body.indexOf(returnStmt);
   body.splice(
@@ -1559,9 +1559,7 @@ function replaceIdentifierWithClonedExpr(node, name, expr) {
 }
 function optimizeBoundValueAliasesInSequence(stmts) {
   const out = [...stmts];
-  let changed = true;
-  while (changed) {
-    changed = false;
+  while (true) {
     const idx = out.findIndex(
       (s) => t2.isVariableDeclaration(s) && s.declarations.length === 1 && t2.isIdentifier(s.declarations[0].id, { name: "__boundValue" })
     );
@@ -1576,7 +1574,6 @@ function optimizeBoundValueAliasesInSequence(stmts) {
       renameIdentifier(blk2, "__boundValue", aliasedName);
       out.length = 0;
       out.push(...blk2.body);
-      changed = true;
       continue;
     }
     if (!t2.isExpression(init) || !isPureExpression(init)) break;
@@ -1587,7 +1584,6 @@ function optimizeBoundValueAliasesInSequence(stmts) {
     replaceIdentifierWithClonedExpr(blk, "__boundValue", init);
     out.length = 0;
     out.push(...blk.body);
-    changed = true;
   }
   return out;
 }
@@ -1646,7 +1642,7 @@ function stmtUsesPropRefreshCall(stmt) {
 }
 function containsPropRefreshCall(node) {
   if (t2.isMemberExpression(node) && t2.isIdentifier(node.property)) {
-    if (node.property.name === "__geaUpdateProps" || node.property.name.startsWith("__refresh")) return true;
+    if (node.property.name === "GEA_UPDATE_PROPS" || node.property.name.startsWith("__refresh")) return true;
   }
   const keys = t2.VISITOR_KEYS[node.type];
   if (!keys) return false;
@@ -1713,6 +1709,70 @@ function loggingCatchClause(extra = []) {
     ])
   );
 }
+function buildThisGeaMember(symExportName) {
+  return t2.memberExpression(t2.thisExpression(), t2.identifier(symExportName), true);
+}
+function buildThisGeaCall(symExportName, args = []) {
+  return t2.callExpression(buildThisGeaMember(symExportName), args);
+}
+function buildExprGeaMember(expr, symExportName) {
+  return t2.memberExpression(expr, t2.identifier(symExportName), true);
+}
+var GEA_COMPILER_SYMBOL_IMPORTS = [
+  "GEA_RENDERED",
+  "GEA_PARENT_COMPONENT",
+  "GEA_ELEMENT",
+  "GEA_MAPS",
+  "GEA_CONDS",
+  "GEA_RESET_ELS",
+  "GEA_OBSERVE",
+  "GEA_OBSERVE_LIST",
+  "GEA_EL",
+  "GEA_UPDATE_TEXT",
+  "GEA_REQUEST_RENDER",
+  "GEA_UPDATE_PROPS",
+  "GEA_SYNC_MAP",
+  "GEA_REGISTER_MAP",
+  "GEA_PATCH_COND",
+  "GEA_PATCH_NODE",
+  "GEA_REGISTER_COND",
+  "GEA_REFRESH_LIST",
+  "GEA_RECONCILE_LIST",
+  "GEA_ENSURE_ARRAY_CONFIGS",
+  "GEA_APPLY_LIST_CHANGES",
+  "GEA_INSTANTIATE_CHILD_COMPONENTS",
+  "GEA_MOUNT_COMPILED_CHILD_COMPONENTS",
+  "GEA_SWAP_CHILD",
+  "GEA_SWAP_STATE_CHILDREN",
+  "GEA_CHILD",
+  "GEA_LIST_CONFIG_REFRESHING",
+  "GEA_DOM_KEY",
+  "GEA_DOM_ITEM",
+  "GEA_DOM_PROPS",
+  "GEA_HANDLE_ITEM_HANDLER",
+  "GEA_MAP_CONFIG_TPL",
+  "GEA_MAP_CONFIG_PREV",
+  "GEA_MAP_CONFIG_COUNT",
+  "geaCondPatchedSymbol",
+  "geaCondValueSymbol",
+  "geaObservePrevSymbol",
+  "geaPrevGuardSymbol",
+  "GEA_SETUP_LOCAL_STATE_OBSERVERS",
+  "GEA_CLONE_TEMPLATE",
+  "GEA_SETUP_REFS",
+  "GEA_ON_PROP_CHANGE",
+  "GEA_SELF_PROXY",
+  "GEA_STORE_ROOT",
+  "GEA_PROXY_RAW",
+  "GEA_PROXY_GET_TARGET",
+  "geaSanitizeAttr",
+  "geaEscapeHtml"
+];
+function ensureGeaCompilerSymbolImports(ast) {
+  for (const name of GEA_COMPILER_SYMBOL_IMPORTS) {
+    ensureImport(ast, "@geajs/core", name);
+  }
+}
 
 // src/hmr.ts
 import { createRequire as createRequire2 } from "module";
@@ -1755,9 +1815,9 @@ function injectHMR(ast, componentClassName, componentImports, componentImportsUs
     hmrStmts.push(...createAccepts(componentImports, proxyDep));
     hmrStmts.push(js`const __origCreated = ${id2(componentClassName)}.prototype.created;`);
     hmrStmts.push(
-      js`${id2(componentClassName)}.prototype.created = function(__geaProps) {
+      js`${id2(componentClassName)}.prototype.created = function(geaProps) {
         registerComponentInstance(this.constructor.name, this);
-        return __origCreated.call(this, __geaProps);
+        return __origCreated.call(this, geaProps);
       };`
     );
     hmrStmts.push(js`const __origDispose = ${id2(componentClassName)}.prototype.dispose;`);
@@ -1847,39 +1907,54 @@ import { dirname, resolve } from "path";
 var EVENT_NAMES = /* @__PURE__ */ new Set([
   "click",
   "dblclick",
+  "change",
+  "input",
+  "submit",
+  "reset",
+  "focus",
+  "blur",
+  "keydown",
+  "keyup",
+  "keypress",
   "mousedown",
   "mouseup",
   "mouseover",
   "mouseout",
+  "mouseenter",
+  "mouseleave",
   "mousemove",
-  "keydown",
-  "keyup",
-  "keypress",
-  "focus",
-  "blur",
-  "input",
-  "change",
-  "submit",
-  "scroll",
+  "contextmenu",
   "touchstart",
-  "touchmove",
   "touchend",
+  "touchmove",
+  "pointerdown",
+  "pointerup",
+  "pointermove",
+  "scroll",
+  "resize",
+  "drag",
+  "dragstart",
+  "dragend",
+  "dragover",
+  "dragleave",
+  "drop",
+  "animationstart",
+  "animationend",
+  "animationiteration",
+  "transitionstart",
+  "transitionend",
+  "transitionrun",
+  "transitioncancel",
   "tap",
   "longTap",
   "swipeRight",
   "swipeUp",
   "swipeLeft",
-  "swipeDown",
-  "dragstart",
-  "dragend",
-  "dragover",
-  "dragleave",
-  "drop"
+  "swipeDown"
 ]);
 function toGeaEventType(attrName) {
   if (attrName.startsWith("on") && attrName.length > 2) {
-    const rest = attrName.slice(2);
-    return rest.charAt(0).toLowerCase() + rest.slice(1);
+    return attrName.slice(2).toLowerCase();
   }
   return attrName;
 }
@@ -2751,7 +2826,7 @@ function buildComponentPropsExpression(jsxElement, imports, componentInstances,
     else if (t8.isJSXExpressionContainer(attr.value) && !t8.isJSXEmptyExpression(attr.value.expression)) {
       const expr = attr.value.expression;
       propValue = transformExpression(expr);
-      if (propValue && (/^on[A-Z]/.test(propName) || /^(click|input|change|submit|focus|blur|keydown|keyup|keypress|mousedown|mouseup|mouseover|mouseout|mouseenter|mouseleave|touchstart|touchend|touchmove|pointerdown|pointerup|pointermove|scroll|resize|drag|dragstart|dragend|dragover|drop|reset)$/.test(
+      if (propValue && (/^on[A-Z]/.test(propName) || /^(click|dblclick|input|change|submit|reset|focus|blur|keydown|keyup|keypress|mousedown|mouseup|mouseover|mouseout|mouseenter|mouseleave|mousemove|contextmenu|touchstart|touchend|touchmove|pointerdown|pointerup|pointermove|scroll|resize|drag|dragstart|dragend|dragover|dragleave|drop|tap|longTap|swipeRight|swipeUp|swipeLeft|swipeDown)$/.test(
         propName
       )) && t8.isMemberExpression(propValue)) {
         const argsId = t8.identifier("args");
@@ -3663,7 +3738,8 @@ function analyzeChildren(node, tagName, elementPath, bindings, propBindings, arr
           stateRefs,
           onUnresolvedMap,
           classBody2,
-          templateSetupContext
+          templateSetupContext,
+          conditionalSlots?.length
         );
       } else {
         const nestedMapCalls = collectNestedMapCalls(expr);
@@ -3803,7 +3879,7 @@ function collectImportedStoreGetterDependencies(expr, setupStatements, stateRefs
   }
   return Array.from(deps.values());
 }
-function handleArrayMap(expr, tagName, node, elementPath, index, arrayMaps, stateProps, stateRefs, onUnresolvedMap, classBody2, templateSetupContext) {
+function handleArrayMap(expr, tagName, node, elementPath, index, arrayMaps, stateProps, stateRefs, onUnresolvedMap, classBody2, templateSetupContext, afterCondSlotIndex) {
   const arrayExpr = expr.callee.object;
   const normalizedArrayExpr = resolveHelperCallExpression(arrayExpr, classBody2) || arrayExpr;
   if (t9.isArrowFunctionExpression(expr.arguments?.[0])) {
@@ -3861,7 +3937,8 @@ function handleArrayMap(expr, tagName, node, elementPath, index, arrayMaps, stat
         dependencies,
         containerElementPath: [...elementPath],
         ...cbBodyStmts2.length > 0 ? { callbackBodyStatements: cbBodyStmts2 } : {},
-        ...relationalClassBindings.length > 0 ? { relationalClassBindings } : {}
+        ...relationalClassBindings.length > 0 ? { relationalClassBindings } : {},
+        ...afterCondSlotIndex != null ? { afterCondSlotIndex } : {}
       });
     }
     return;
@@ -3971,9 +4048,41 @@ function handleArrayMap(expr, tagName, node, elementPath, index, arrayMaps, stat
     ...!itemIdProperty && isKeyed ? { keyExpression: t9.cloneNode(extractKeyExpression(itemTemplate), true) } : {},
     classToggleName,
     conditionalBindings,
-    ...cbBodyStmts.length > 0 ? { callbackBodyStatements: cbBodyStmts } : {}
+    ...cbBodyStmts.length > 0 ? { callbackBodyStatements: cbBodyStmts } : {},
+    ...afterCondSlotIndex != null ? { afterCondSlotIndex } : {}
   });
 }
+function expressionContainsComponentJSX(node) {
+  if (t9.isJSXElement(node)) {
+    const name = node.openingElement.name;
+    if (t9.isJSXIdentifier(name) && /^[A-Z]/.test(name.name)) return true;
+    if (t9.isJSXMemberExpression(name)) {
+      let cur = name;
+      while (t9.isJSXMemberExpression(cur)) cur = cur.object;
+      if (t9.isJSXIdentifier(cur) && /^[A-Z]/.test(cur.name)) return true;
+    }
+    for (const c of node.children) {
+      if (expressionContainsComponentJSX(c)) return true;
+    }
+    return false;
+  }
+  if (t9.isJSXExpressionContainer(node) && !t9.isJSXEmptyExpression(node.expression)) {
+    return expressionContainsComponentJSX(node.expression);
+  }
+  if (t9.isLogicalExpression(node)) {
+    return expressionContainsComponentJSX(node.left) || expressionContainsComponentJSX(node.right);
+  }
+  if (t9.isConditionalExpression(node)) {
+    return expressionContainsComponentJSX(node.consequent) || expressionContainsComponentJSX(node.alternate);
+  }
+  if (t9.isParenthesizedExpression(node)) {
+    return expressionContainsComponentJSX(node.expression);
+  }
+  if (t9.isJSXFragment(node)) {
+    return node.children.some((c) => expressionContainsComponentJSX(c));
+  }
+  return false;
+}
 function handleTextBinding(expr, node, tagName, elementPath, bindings, propBindings, stateProps, stateRefs, textTemplate, textExpressions, shouldBuildTextTemplate, propsParamName, destructuredPropNames, templateSetupContext, rerenderPropNames, rerenderConditions, conditionalSlots, _hasNestedMapCall = false, classBody2, conditionalSlotNodeMap, textNodeIndex, jsxInTextSiblingGroup = false) {
   const propName = resolvePropRef(expr, propsParamName, destructuredPropNames);
   if (propName) {
@@ -4094,6 +4203,7 @@ function handleTextBinding(expr, node, tagName, elementPath, bindings, propBindi
             conditionExpr: t9.cloneNode(conditionExpr, true),
             setupStatements: condSetupStatements.map((s) => t9.cloneNode(s, true)),
             htmlSetupStatements: fullSetupStatements.map((s) => t9.cloneNode(s, true)),
+            ...expressionContainsComponentJSX(expr) ? { hasCompiledChildren: true } : {},
             dependentPropNames: [...dependentProps],
             dependencies: dependencies.map((dep) => ({
               observeKey: dep.observeKey,
@@ -4104,6 +4214,7 @@ function handleTextBinding(expr, node, tagName, elementPath, bindings, propBindi
           });
           conditionalSlotNodeMap?.set(expr, slotId);
         }
+        return;
       }
     }
   }
@@ -4656,6 +4767,35 @@ function toHtmlAttrName(attrName, isComponent) {
   if (attrName === "className") return "class";
   return attrName;
 }
+function unwrapExpression(expr) {
+  let e = expr;
+  while (t10.isParenthesizedExpression(e)) {
+    e = e.expression;
+  }
+  return e;
+}
+function extractHtmlTemplatesFromRawConditional(rawExpr, ctx, slotId) {
+  const childCtx = { ...ctx, elementPathPrefix: "__cs_" + slotId };
+  const top = unwrapExpression(rawExpr);
+  if (t10.isLogicalExpression(top) && top.operator === "&&") {
+    return extractHtmlTemplatesFromRawConditional(top.right, ctx, slotId);
+  }
+  if (t10.isConditionalExpression(top)) {
+    const truthyHtmlExpr = transformJSXExpression(top.consequent, childCtx);
+    const alt = unwrapExpression(top.alternate);
+    if (t10.isConditionalExpression(alt)) {
+      return {
+        truthyHtmlExpr,
+        falsyHtmlExpr: transformJSXExpression(top.alternate, childCtx)
+      };
+    }
+    return {
+      truthyHtmlExpr,
+      falsyHtmlExpr: transformJSXExpression(top.alternate, childCtx)
+    };
+  }
+  return null;
+}
 function extractHtmlTemplatesFromConditional(expr) {
   const normalizeHtmlExpression = (value) => {
     if (t10.isCallExpression(value) && t10.isMemberExpression(value.callee) && t10.isIdentifier(value.callee.property) && value.callee.property.name === "map") {
@@ -4671,7 +4811,11 @@ function extractHtmlTemplatesFromConditional(expr) {
   }
   if (t10.isConditionalExpression(expr)) {
     const truthy = extractHtmlTemplatesFromConditional(expr.consequent).truthyHtmlExpr;
-    const falsy = extractHtmlTemplatesFromConditional(expr.alternate).truthyHtmlExpr;
+    const alt = unwrapExpression(expr.alternate);
+    if (t10.isConditionalExpression(alt)) {
+      return { truthyHtmlExpr: truthy, falsyHtmlExpr: normalizeHtmlExpression(alt) };
+    }
+    const falsy = extractHtmlTemplatesFromConditional(alt).truthyHtmlExpr;
     return { truthyHtmlExpr: truthy, falsyHtmlExpr: falsy };
   }
   if (t10.isParenthesizedExpression(expr)) {
@@ -4796,7 +4940,7 @@ function escapeHtml(str) {
 var URL_ATTRS = /* @__PURE__ */ new Set(["href", "src", "action", "formaction", "data", "cite", "poster", "background"]);
 function wrapWithSanitizeAttr(attrName, expr) {
   if (!URL_ATTRS.has(attrName)) return expr;
-  return t10.callExpression(t10.identifier("__sanitizeAttr"), [
+  return t10.callExpression(t10.identifier("geaSanitizeAttr"), [
     t10.stringLiteral(attrName),
     t10.callExpression(t10.identifier("String"), [expr])
   ]);
@@ -4850,24 +4994,48 @@ var EVENT_TYPES = /* @__PURE__ */ new Set([
   "dblclick",
   "change",
   "input",
+  "submit",
+  "reset",
+  "focus",
+  "blur",
   "keydown",
   "keyup",
-  "blur",
-  "focus",
+  "keypress",
   "mousedown",
   "mouseup",
-  "submit",
+  "mouseover",
+  "mouseout",
+  "mouseenter",
+  "mouseleave",
+  "mousemove",
+  "contextmenu",
+  "touchstart",
+  "touchend",
+  "touchmove",
+  "pointerdown",
+  "pointerup",
+  "pointermove",
+  "scroll",
+  "resize",
+  "drag",
+  "dragstart",
+  "dragend",
+  "dragover",
+  "dragleave",
+  "drop",
+  "animationstart",
+  "animationend",
+  "animationiteration",
+  "transitionstart",
+  "transitionend",
+  "transitionrun",
+  "transitioncancel",
   "tap",
   "longTap",
   "swipeRight",
   "swipeUp",
   "swipeLeft",
-  "swipeDown",
-  "dragstart",
-  "dragend",
-  "dragover",
-  "dragleave",
-  "drop"
+  "swipeDown"
 ]);
 function transformJSXToTemplate(el, ctx, elementPath = []) {
   const parts = jsxToTemplateParts(el, ctx, elementPath);
@@ -5555,8 +5723,9 @@ function processChildren(children, parts, ctx, elementPath, dcCursor, directChil
         });
         appendString(parts, `-->`);
         pushString(parts, "");
-        let condExpr = transformJSXExpression(rawExpr, { ...ctx, elementPathPrefix: "__cs_" + slot.slotId });
-        const extracted = extractHtmlTemplatesFromConditional(condExpr);
+        const slotCtx = { ...ctx, elementPathPrefix: "__cs_" + slot.slotId };
+        let condExpr = transformJSXExpression(rawExpr, slotCtx);
+        const extracted = extractHtmlTemplatesFromRawConditional(rawExpr, ctx, slot.slotId) ?? extractHtmlTemplatesFromConditional(condExpr);
         slot.truthyHtmlExpr = extracted.truthyHtmlExpr;
         slot.falsyHtmlExpr = extracted.falsyHtmlExpr;
         if (expressionMayBeFalsy(rawExpr)) {
@@ -5612,9 +5781,7 @@ function processChildren(children, parts, ctx, elementPath, dcCursor, directChil
           expr = t10.logicalExpression("||", expr, t10.stringLiteral(""));
         }
         const skipEscape = childCallInfo || isChildrenPropAccess(rawExpr) || expressionContainsJSX(rawExpr) || ctx.inMapCallback || callsJSXReturningProperty(rawExpr, ctx.classBody);
-        const safeExpr = skipEscape ? expr : t10.callExpression(t10.identifier("__escapeHtml"), [
-          t10.callExpression(t10.identifier("String"), [expr])
-        ]);
+        const safeExpr = skipEscape ? expr : t10.callExpression(t10.identifier("geaEscapeHtml"), [t10.callExpression(t10.identifier("String"), [expr])]);
         parts.push({ type: "expression", value: safeExpr });
       }
     }
@@ -5768,20 +5935,62 @@ function collectItemTemplatePropTree(template, itemVar) {
   });
   return tree;
 }
-function buildDummyFromTree(tree, keyPathParts) {
+function getCalleeMemberChainFromItem(callee, itemVar) {
+  const chain = [];
+  let node = callee;
+  while (t11.isMemberExpression(node) && !node.computed && t11.isIdentifier(node.property)) {
+    chain.unshift(node.property.name);
+    node = node.object;
+  }
+  if (!t11.isIdentifier(node, { name: itemVar }) || chain.length === 0) return null;
+  return chain;
+}
+function collectItemCalleePropertyPaths(template, itemVar) {
+  const paths = /* @__PURE__ */ new Set();
+  const program12 = t11.program([t11.expressionStatement(t11.cloneNode(template, true))]);
+  traverse6(program12, {
+    noScope: true,
+    CallExpression(path) {
+      const chain = getCalleeMemberChainFromItem(path.node.callee, itemVar);
+      if (chain) paths.add(chain.join("."));
+    }
+  });
+  return paths;
+}
+function buildDummyFromTree(tree, keyPathParts, calleePaths, pathPrefix = []) {
   const props = [];
   for (const [key, value] of Object.entries(tree)) {
+    const pathHere = [...pathPrefix, key];
+    const pathStr = pathHere.join(".");
     const matchesKeyPath = keyPathParts && keyPathParts.length > 0 && keyPathParts[0] === key;
     if (matchesKeyPath && keyPathParts.length === 1) {
       props.push(t11.objectProperty(t11.identifier(key), t11.numericLiteral(0)));
     } else if (matchesKeyPath) {
       props.push(
-        t11.objectProperty(t11.identifier(key), buildDummyFromTree(value === true ? {} : value, keyPathParts.slice(1)))
+        t11.objectProperty(
+          t11.identifier(key),
+          buildDummyFromTree(
+            value === true ? {} : value,
+            keyPathParts.slice(1),
+            calleePaths,
+            pathHere
+          )
+        )
       );
     } else if (value === true) {
-      props.push(t11.objectProperty(t11.identifier(key), t11.stringLiteral(" ")));
+      props.push(
+        t11.objectProperty(
+          t11.identifier(key),
+          calleePaths.has(pathStr) ? (
+            // Return empty string so `${item.content()}` in template init does not inject "null" / escaped markup.
+            t11.arrowFunctionExpression([], t11.stringLiteral(""), true)
+          ) : t11.stringLiteral(" ")
+        )
+      );
     } else {
-      props.push(t11.objectProperty(t11.identifier(key), buildDummyFromTree(value, null)));
+      props.push(
+        t11.objectProperty(t11.identifier(key), buildDummyFromTree(value, null, calleePaths, pathHere))
+      );
     }
   }
   return t11.objectExpression(props);
@@ -5792,7 +6001,6 @@ function generatePatchItemMethod(arrayMap, templatePropNames, wholeParamName, te
   const arrayName = arrayPath.replace(/\./g, "");
   const capName = arrayName.charAt(0).toUpperCase() + arrayName.slice(1);
   const methodName = `patch${capName}Item`;
-  const containerProp = `__${arrayPath.replace(/\./g, "_")}_container`;
   const itemIdProperty = arrayMap.itemIdProperty;
   const itemTemplateRootIsComponent = t11.isJSXElement(arrayMap.itemTemplate) && isComponentTag(getJSXTagName(arrayMap.itemTemplate.openingElement.name));
   if (itemTemplateRootIsComponent) return { method: null, privateFields: [] };
@@ -6004,9 +6212,7 @@ function generatePatchItemMethod(arrayMap, templatePropNames, wholeParamName, te
   const keyRenames = arrayMap.indexVariable ? /* @__PURE__ */ new Map([[arrayMap.indexVariable, "__idx"]]) : void 0;
   const rawItemIdExpr = arrayMap.keyExpression ? t11.cloneNode(rewriteItemVarInExpression(arrayMap.keyExpression, arrayMap.itemVariable, "item", keyRenames), true) : itemIdProperty && itemIdProperty !== ITEM_IS_KEY ? t11.logicalExpression("??", buildOptionalMemberChain(t11.identifier("item"), itemIdProperty), t11.identifier("item")) : t11.identifier("item");
   const itemIdExpr = t11.callExpression(t11.identifier("String"), [rawItemIdExpr]);
-  body.push(
-    t11.expressionStatement(t11.assignmentExpression("=", t11.memberExpression(elVar, t11.identifier("__geaKey")), itemIdExpr))
-  );
+  body.push(t11.expressionStatement(t11.assignmentExpression("=", buildExprGeaMember(elVar, "GEA_DOM_KEY"), itemIdExpr)));
   const rowElsProp = `__rowEls_${arrayMap.containerBindingId ?? "list"}`;
   const privateElsRef = t11.memberExpression(t11.thisExpression(), t11.privateName(t11.identifier(rowElsProp)));
   body.push(
@@ -6028,9 +6234,7 @@ function generatePatchItemMethod(arrayMap, templatePropNames, wholeParamName, te
   );
   const patchPrivateFields = [rowElsProp];
   body.push(
-    t11.expressionStatement(
-      t11.assignmentExpression("=", t11.memberExpression(elVar, t11.identifier("__geaItem")), t11.identifier("item"))
-    )
+    t11.expressionStatement(t11.assignmentExpression("=", buildExprGeaMember(elVar, "GEA_DOM_ITEM"), t11.identifier("item")))
   );
   const params = [t11.identifier("row"), t11.identifier("item"), t11.identifier("__prevItem")];
   if (arrayMap.indexVariable) params.push(t11.identifier("__idx"));
@@ -6039,6 +6243,26 @@ function generatePatchItemMethod(arrayMap, templatePropNames, wholeParamName, te
     privateFields: patchPrivateFields
   };
 }
+function textPatchHasItemMethodCall(expr, itemVar) {
+  const calleeIsItemMethod = (callee) => t11.isMemberExpression(callee) && !callee.computed && t11.isIdentifier(callee.object, { name: itemVar });
+  const visit = (e) => {
+    let found = false;
+    traverse6(t11.program([t11.expressionStatement(t11.cloneNode(e, true))]), {
+      noScope: true,
+      CallExpression(p) {
+        if (calleeIsItemMethod(p.node.callee)) {
+          found = true;
+          p.stop();
+        }
+      }
+    });
+    return found;
+  };
+  if (t11.isTemplateLiteral(expr)) {
+    return expr.expressions.some((ex) => visit(ex));
+  }
+  return visit(expr);
+}
 function collectPatchEntries(arrayMap) {
   const cloned = t11.cloneNode(arrayMap.itemTemplate, true);
   const tempFile = t11.file(t11.program([t11.expressionStatement(cloned)]));
@@ -6050,15 +6274,26 @@ function collectPatchEntries(arrayMap) {
   });
   const modified = tempFile.program.body[0].expression;
   const entries = [];
-  const requiresRerender = templateRequiresRerender(tempFile);
+  let requiresRerender = templateRequiresRerender(tempFile);
   if (t11.isJSXElement(modified)) {
     const rootTagName = getJSXTagName(modified.openingElement.name);
     const rootIsComponent = isComponentTag(rootTagName);
+    if (!rootIsComponent && !requiresRerender) {
+      requiresRerender = templateHasChildComponent(modified);
+    }
     walkJSXForPatch(modified, [], entries, rootIsComponent);
   }
   for (const ent of entries) {
     ent.expression = optionalizeMemberChainsAfterComputedItemKey(ent.expression, "item");
   }
+  if (!requiresRerender) {
+    for (const ent of entries) {
+      if (ent.type === "text" && textPatchHasItemMethodCall(ent.expression, "item")) {
+        requiresRerender = true;
+        break;
+      }
+    }
+  }
   return { entries, requiresRerender };
 }
 function walkJSXForPatch(node, path, entries, rootIsComponent = false) {
@@ -6130,7 +6365,9 @@ function walkJSXForPatch(node, path, entries, rootIsComponent = false) {
   let elementIndex = 0;
   for (const child of node.children) {
     if (t11.isJSXElement(child)) {
-      walkJSXForPatch(child, [...path, elementIndex], entries);
+      if (!isComponentTag(getJSXTagName(child.openingElement.name))) {
+        walkJSXForPatch(child, [...path, elementIndex], entries);
+      }
       elementIndex++;
     }
   }
@@ -6325,7 +6562,7 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
           t11.expressionStatement(
             t11.assignmentExpression(
               "=",
-              t11.memberExpression(t11.identifier("el"), t11.identifier("__geaProps")),
+              buildExprGeaMember(t11.identifier("el"), "GEA_DOM_PROPS"),
               t11.objectExpression(propsProperties)
             )
           )
@@ -6347,10 +6584,12 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
   }
   const propTree = collectItemTemplatePropTree(arrayMap.itemTemplate, arrayMap.itemVariable);
   const containerRef = t11.memberExpression(t11.thisExpression(), t11.identifier(containerProp));
-  const privateDcField = t11.memberExpression(t11.thisExpression(), t11.privateName(t11.identifier("__dc")));
+  const dcFieldSuffix = arrayMap.containerBindingId ?? arrayPath.replace(/\./g, "_");
+  const dcPrivateName = `__dc_${dcFieldSuffix}`;
+  const privateDcField = t11.memberExpression(t11.thisExpression(), t11.privateName(t11.identifier(dcPrivateName)));
   const cVar = t11.identifier("__c");
   const elVar = t11.identifier("el");
-  const privateFields = ["__dc"];
+  const privateFields = [dcPrivateName];
   const body = [];
   if (useRawStoreCache) {
     const privateRsField = t11.memberExpression(t11.thisExpression(), t11.privateName(t11.identifier("__rs")));
@@ -6364,7 +6603,7 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
             t11.assignmentExpression(
               "=",
               t11.cloneNode(privateRsField),
-              t11.memberExpression(t11.identifier(arrayMap.storeVar), t11.identifier("__raw"))
+              buildExprGeaMember(t11.identifier(arrayMap.storeVar), "GEA_PROXY_RAW")
             )
           )
         )
@@ -6383,10 +6622,11 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
       )
     ])
   );
-  const isPrimitiveKey = !itemIdProperty || itemIdProperty === ITEM_IS_KEY;
+  const isPrimitiveKey = (itemIdProperty === ITEM_IS_KEY || !itemIdProperty) && !arrayMap.keyExpression && Object.keys(propTree).length === 0;
+  const calleePaths = collectItemCalleePropertyPaths(arrayMap.itemTemplate, arrayMap.itemVariable);
   const dummyItem = isPrimitiveKey ? t11.stringLiteral("__dummy__") : (() => {
     if (itemIdProperty) ensureDummyTreePath(propTree, itemIdProperty);
-    return buildDummyFromTree(propTree, itemIdProperty ? normalizePathParts(itemIdProperty) : null);
+    return buildDummyFromTree(propTree, itemIdProperty ? normalizePathParts(itemIdProperty) : null, calleePaths);
   })();
   const hasRootClassNamePatch = patchedEntries.some((e) => e.type === "className" && e.childPath.length === 0);
   const tplInit = [
@@ -6411,7 +6651,7 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
     t11.expressionStatement(
       t11.assignmentExpression(
         "=",
-        t11.memberExpression(cVar, t11.identifier("__geaTpl")),
+        buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"),
         t11.memberExpression(
           t11.memberExpression(t11.identifier("__tw"), t11.identifier("content")),
           t11.identifier("firstElementChild")
@@ -6421,7 +6661,7 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
     t11.expressionStatement(
       t11.optionalCallExpression(
         t11.optionalMemberExpression(
-          t11.memberExpression(cVar, t11.identifier("__geaTpl")),
+          buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"),
           t11.identifier("removeAttribute"),
           false,
           true
@@ -6436,13 +6676,13 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
       t11.ifStatement(
         t11.logicalExpression(
           "&&",
-          t11.memberExpression(cVar, t11.identifier("__geaTpl")),
-          t11.memberExpression(t11.memberExpression(cVar, t11.identifier("__geaTpl")), t11.identifier("className"))
+          buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"),
+          t11.memberExpression(buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"), t11.identifier("className"))
         ),
         t11.expressionStatement(
           t11.assignmentExpression(
             "=",
-            t11.memberExpression(t11.memberExpression(cVar, t11.identifier("__geaTpl")), t11.identifier("className")),
+            t11.memberExpression(buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"), t11.identifier("className")),
             t11.stringLiteral("")
           )
         )
@@ -6451,19 +6691,19 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
   }
   body.push(
     t11.ifStatement(
-      t11.unaryExpression("!", t11.memberExpression(cVar, t11.identifier("__geaTpl"))),
+      t11.unaryExpression("!", buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL")),
       t11.blockStatement([t11.tryStatement(t11.blockStatement(tplInit), loggingCatchClause())])
     )
   );
   body.push(
     t11.ifStatement(
-      t11.memberExpression(cVar, t11.identifier("__geaTpl")),
+      buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"),
       t11.blockStatement([
         t11.variableDeclaration("var", [
           t11.variableDeclarator(
             elVar,
             t11.callExpression(
-              t11.memberExpression(t11.memberExpression(cVar, t11.identifier("__geaTpl")), t11.identifier("cloneNode")),
+              t11.memberExpression(buildExprGeaMember(cVar, "GEA_MAP_CONFIG_TPL"), t11.identifier("cloneNode")),
               [t11.booleanLiteral(true)]
             )
           )
@@ -6658,17 +6898,16 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
     }
   }
   const createKeyRenames = arrayMap.indexVariable ? /* @__PURE__ */ new Map([[arrayMap.indexVariable, "__idx"]]) : void 0;
-  const rawPatchItemIdExpr = arrayMap.keyExpression ? t11.cloneNode(rewriteItemVarInExpression(arrayMap.keyExpression, arrayMap.itemVariable, "item", createKeyRenames), true) : itemIdProperty && itemIdProperty !== ITEM_IS_KEY ? t11.logicalExpression("??", buildOptionalMemberChain(t11.identifier("item"), itemIdProperty), t11.identifier("item")) : t11.identifier("item");
+  const rawPatchItemIdExpr = arrayMap.keyExpression ? t11.cloneNode(
+    rewriteItemVarInExpression(arrayMap.keyExpression, arrayMap.itemVariable, "item", createKeyRenames),
+    true
+  ) : itemIdProperty && itemIdProperty !== ITEM_IS_KEY ? t11.logicalExpression("??", buildOptionalMemberChain(t11.identifier("item"), itemIdProperty), t11.identifier("item")) : t11.identifier("item");
   const patchItemIdExpr = t11.callExpression(t11.identifier("String"), [rawPatchItemIdExpr]);
   body.push(
-    t11.expressionStatement(
-      t11.assignmentExpression("=", t11.memberExpression(elVar, t11.identifier("__geaKey")), patchItemIdExpr)
-    )
+    t11.expressionStatement(t11.assignmentExpression("=", buildExprGeaMember(elVar, "GEA_DOM_KEY"), patchItemIdExpr))
   );
   body.push(
-    t11.expressionStatement(
-      t11.assignmentExpression("=", t11.memberExpression(elVar, t11.identifier("__geaItem")), t11.identifier("item"))
-    )
+    t11.expressionStatement(t11.assignmentExpression("=", buildExprGeaMember(elVar, "GEA_DOM_ITEM"), t11.identifier("item")))
   );
   if (itemTemplateRootIsComponent && t11.isJSXElement(arrayMap.itemTemplate)) {
     const propsProperties = [];
@@ -6699,11 +6938,7 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
     if (propsProperties.length > 0) {
       body.push(
         t11.expressionStatement(
-          t11.assignmentExpression(
-            "=",
-            t11.memberExpression(elVar, t11.identifier("__geaProps")),
-            t11.objectExpression(propsProperties)
-          )
+          t11.assignmentExpression("=", buildExprGeaMember(elVar, "GEA_DOM_PROPS"), t11.objectExpression(propsProperties))
         )
       );
     }
@@ -6752,6 +6987,14 @@ function branchContainsJSX(expr) {
   });
   return containsJSX;
 }
+function templateHasChildComponent(root) {
+  for (const child of root.children) {
+    if (!t11.isJSXElement(child)) continue;
+    if (isComponentTag(getJSXTagName(child.openingElement.name))) return true;
+    if (templateHasChildComponent(child)) return true;
+  }
+  return false;
+}
 
 // src/generate-clone.ts
 var EVENT_TYPES2 = /* @__PURE__ */ new Set([
@@ -6759,24 +7002,48 @@ var EVENT_TYPES2 = /* @__PURE__ */ new Set([
   "dblclick",
   "change",
   "input",
+  "submit",
+  "reset",
+  "focus",
+  "blur",
   "keydown",
   "keyup",
-  "blur",
-  "focus",
+  "keypress",
   "mousedown",
   "mouseup",
-  "submit",
+  "mouseover",
+  "mouseout",
+  "mouseenter",
+  "mouseleave",
+  "mousemove",
+  "contextmenu",
+  "touchstart",
+  "touchend",
+  "touchmove",
+  "pointerdown",
+  "pointerup",
+  "pointermove",
+  "scroll",
+  "resize",
+  "drag",
+  "dragstart",
+  "dragend",
+  "dragover",
+  "dragleave",
+  "drop",
+  "animationstart",
+  "animationend",
+  "animationiteration",
+  "transitionstart",
+  "transitionend",
+  "transitionrun",
+  "transitioncancel",
   "tap",
   "longTap",
   "swipeRight",
   "swipeUp",
   "swipeLeft",
-  "swipeDown",
-  "dragstart",
-  "dragend",
-  "dragover",
-  "dragleave",
-  "drop"
+  "swipeDown"
 ]);
 var VOID_ELEMENTS2 = /* @__PURE__ */ new Set([
   "area",
@@ -6831,7 +7098,7 @@ function buildEventIdExpr(suffix) {
     t12.stringLiteral("-" + suffix)
   );
 }
-function jsxToStaticHtml(node, refCounter, elementPath = [], isRoot = true) {
+function jsxToStaticHtml(node, refCounter, elementPath = [], _isRoot = true) {
   const tagName = getJSXTagName(node.openingElement.name);
   const isComp = Boolean(tagName && isComponentTag(tagName));
   if (isComp) return null;
@@ -7272,7 +7539,13 @@ function generateCloneMembers(root, analysis, templateParams, sourceFile, import
     true
   );
   const cloneMethodBody = buildCloneTemplateBody(identityPatches, contentPatches, cloneCtx);
-  const cloneMethod = t12.classMethod("method", t12.identifier("__cloneTemplate"), [], t12.blockStatement(cloneMethodBody));
+  const cloneMethod = t12.classMethod(
+    "method",
+    t12.identifier("GEA_CLONE_TEMPLATE"),
+    [],
+    t12.blockStatement(cloneMethodBody),
+    true
+  );
   return [staticField, cloneMethod];
 }
 function buildCloneTemplateBody(identityPatches, contentPatches, cloneCtx) {
@@ -7471,7 +7744,9 @@ function buildCloneTemplateBody(identityPatches, contentPatches, cloneCtx) {
 
 // src/generate-events.ts
 import * as t13 from "@babel/types";
+import babelGenerator from "@babel/generator";
 import { id as id4, jsBlockBody, jsMethod as jsMethod2 } from "eszter";
+var generate2 = typeof babelGenerator.default === "function" ? babelGenerator.default : babelGenerator;
 function getTemplateParamContext(classBody2) {
   const templateMethod = classBody2.body.find(
     (m) => t13.isClassMethod(m) && t13.isIdentifier(m.key) && m.key.name === "template"
@@ -7495,12 +7770,26 @@ function getTemplateParamContext(classBody2) {
 function getMapContextKey(ctx) {
   const store = ctx.storeVar || "store";
   const path = ctx.arrayPathParts.join("_");
-  return `${store}_${path}_${ctx.itemIdProperty}`;
+  const keyPart = ctx.keyExpression ? `expr:${generate2(ctx.keyExpression).code}` : ctx.itemIdProperty;
+  return `${store}_${path}_${keyPart}`;
 }
 function ensureMapItemHelper(classBody2, ctx, helperName) {
   if (classBody2.body.some((m) => t13.isClassMethod(m) && t13.isIdentifier(m.key) && m.key.name === helperName)) return;
   const itemsExpr = buildArrayItemsExpr(ctx);
-  const findPredicate = ctx.itemIdProperty && ctx.itemIdProperty !== ITEM_IS_KEY ? t13.arrowFunctionExpression(
+  const findPredicate = ctx.keyExpression ? t13.arrowFunctionExpression(
+    [t13.identifier("__candidate")],
+    t13.binaryExpression(
+      "===",
+      t13.callExpression(t13.identifier("String"), [
+        rewriteItemVarInExpression(
+          t13.cloneNode(ctx.keyExpression, true),
+          ctx.itemVariable,
+          "__candidate"
+        )
+      ]),
+      t13.identifier("__itemId")
+    )
+  ) : ctx.itemIdProperty && ctx.itemIdProperty !== ITEM_IS_KEY ? t13.arrowFunctionExpression(
     [t13.identifier("__candidate")],
     t13.binaryExpression(
       "===",
@@ -7529,18 +7818,34 @@ function ensureMapItemHelper(classBody2, ctx, helperName) {
     )
   );
   const method = jsMethod2`${id4(helperName)}(e) {}`;
-  method.body.body.push(
-    ...buildGeaItemDomWalk(),
-    ...jsBlockBody`
-      if (!__el) return null;
-      if (__el.__geaItem) return __el.__geaItem;
-      const __itemId = __el.__geaKey ?? (__el.getAttribute && __el.getAttribute('data-gea-item-id'));
-      if (__itemId == null) return null;
-      const __items = ${itemsExpr};
-      const __arr = Array.isArray(__items) ? __items : Array.isArray(__items?.__getTarget) ? __items.__getTarget : [];
-      return __arr.find(${findPredicate}) || __itemId;
-    `
-  );
+  if (!ctx.keyExpression && ctx.itemIdProperty && ctx.itemIdProperty !== ITEM_IS_KEY) {
+    method.body.body.push(
+      ...buildGeaItemDomWalk(),
+      ...jsBlockBody`
+        if (!__el) return null;
+        if (__el[GEA_DOM_ITEM]) return __el[GEA_DOM_ITEM];
+        const __itemId = __el[GEA_DOM_KEY] ?? (__el.getAttribute && __el.getAttribute('data-gea-item-id'));
+        if (__itemId == null) return null;
+        const __items = ${itemsExpr};
+        const __arr = Array.isArray(__items) ? __items : Array.isArray(__items?.[GEA_PROXY_GET_TARGET]) ? __items[GEA_PROXY_GET_TARGET] : [];
+        const __found = __arr.find(${findPredicate});
+        return __found != null ? __found : { ${ctx.itemIdProperty}: __itemId };
+      `
+    );
+  } else {
+    method.body.body.push(
+      ...buildGeaItemDomWalk(),
+      ...jsBlockBody`
+        if (!__el) return null;
+        if (__el[GEA_DOM_ITEM]) return __el[GEA_DOM_ITEM];
+        const __itemId = __el[GEA_DOM_KEY] ?? (__el.getAttribute && __el.getAttribute('data-gea-item-id'));
+        if (__itemId == null) return null;
+        const __items = ${itemsExpr};
+        const __arr = Array.isArray(__items) ? __items : Array.isArray(__items?.[GEA_PROXY_GET_TARGET]) ? __items[GEA_PROXY_GET_TARGET] : [];
+        return __arr.find(${findPredicate}) || __itemId;
+      `
+    );
+  }
   classBody2.body.unshift(method);
 }
 function getLocalFunctionInSetup(name, setupStatements) {
@@ -7552,12 +7857,17 @@ function getLocalFunctionInSetup(name, setupStatements) {
   }
   return null;
 }
-function appendCompiledEventMethods(classBody2, handlers, setupStatements = []) {
+function appendCompiledEventMethods(classBody2, handlers, setupStatements = [], fileAst) {
   if (handlers.length === 0) return false;
   const paramContext = getTemplateParamContext(classBody2);
   const mapHandlers = handlers.filter(
     (h) => Boolean(h.mapContext)
   );
+  if (mapHandlers.length > 0 && fileAst) {
+    ensureImport(fileAst, "@geajs/core", "GEA_MAPS");
+    ensureImport(fileAst, "@geajs/core", "GEA_DOM_KEY");
+    ensureImport(fileAst, "@geajs/core", "GEA_DOM_ITEM");
+  }
   const seenContexts = /* @__PURE__ */ new Set();
   for (const h of mapHandlers) {
     const key = getMapContextKey(h.mapContext);
@@ -7572,6 +7882,13 @@ function appendCompiledEventMethods(classBody2, handlers, setupStatements = [])
 function isDirectThisMethodRef(handler) {
   return !!handler.handlerExpression && t13.isMemberExpression(handler.handlerExpression) && t13.isThisExpression(handler.handlerExpression.object) && t13.isIdentifier(handler.handlerExpression.property) && !handler.delegatedPropName && !handler.mapContext;
 }
+function wrapEventsGetterHandlerRef(methodProperty) {
+  const callee = t13.memberExpression(t13.thisExpression(), methodProperty);
+  return t13.arrowFunctionExpression(
+    [t13.identifier("e"), t13.identifier("targetComponent")],
+    t13.callExpression(callee, [t13.identifier("e"), t13.identifier("targetComponent")])
+  );
+}
 function appendEventsGetterHandlers(classBody2, handlers, paramContext, setupStatements) {
   const getter = ensureEventsGetter(classBody2);
   const eventsObject = getEventsObject(getter);
@@ -7580,7 +7897,7 @@ function appendEventsGetterHandlers(classBody2, handlers, paramContext, setupSta
     let handlerRef;
     if (isDirectThisMethodRef(handler)) {
       const prop = handler.handlerExpression.property;
-      handlerRef = t13.memberExpression(t13.thisExpression(), t13.cloneNode(prop));
+      handlerRef = wrapEventsGetterHandlerRef(t13.cloneNode(prop));
     } else {
       let methodName = handler.methodName || `__event_${handler.eventType}_${index}`;
       let uniqueIndex = 1;
@@ -7591,7 +7908,7 @@ function appendEventsGetterHandlers(classBody2, handlers, paramContext, setupSta
       if (!findClassMethod(classBody2, methodName)) {
         classBody2.body.push(buildSelectorHandlerMethod(handler, methodName, paramContext, setupStatements));
       }
-      handlerRef = t13.memberExpression(t13.thisExpression(), t13.identifier(methodName));
+      handlerRef = wrapEventsGetterHandlerRef(t13.identifier(methodName));
     }
     const selectorExpr = handler.selectorExpression ? replacePropRefsInExpression(
       t13.cloneNode(handler.selectorExpression, true),
@@ -7725,7 +8042,7 @@ function replacePropsObjectRefsInNode(node, propsObjectName) {
       replacePropsObjectRefsInNode(node.object, propsObjectName),
       node.property,
       node.computed,
-      node.optional
+      node.optional ?? true
     );
   }
   if (t13.isOptionalCallExpression(node)) {
@@ -7734,7 +8051,7 @@ function replacePropsObjectRefsInNode(node, propsObjectName) {
       node.arguments.map(
         (a) => t13.isExpression(a) ? replacePropsObjectRefsInNode(a, propsObjectName) : a
       ),
-      node.optional
+      node.optional ?? true
     );
   }
   if (t13.isConditionalExpression(node)) {
@@ -7831,7 +8148,7 @@ function buildArrayItemsExpr(ctx, opts = {}) {
     return t13.callExpression(
       t13.memberExpression(
         t13.memberExpression(
-          t13.memberExpression(t13.thisExpression(), t13.identifier("__geaMaps")),
+          t13.memberExpression(t13.thisExpression(), t13.identifier("GEA_MAPS"), true),
           t13.numericLiteral(mapIdx),
           true
         ),
@@ -7840,7 +8157,7 @@ function buildArrayItemsExpr(ctx, opts = {}) {
       []
     );
   }
-  const base = ctx.isImportedState ? opts.raw ? t13.memberExpression(t13.identifier(ctx.storeVar || "store"), t13.identifier("__raw")) : t13.identifier(ctx.storeVar || "store") : t13.thisExpression();
+  const base = ctx.isImportedState ? opts.raw ? buildExprGeaMember(t13.identifier(ctx.storeVar || "store"), "GEA_PROXY_RAW") : t13.identifier(ctx.storeVar || "store") : t13.thisExpression();
   if (ctx.arrayPathParts.length === 0) return base;
   const [, ...rest] = ctx.arrayPathParts;
   const isIndex = /^\d+$/.test(first);
@@ -7850,7 +8167,7 @@ function buildArrayItemsExpr(ctx, opts = {}) {
 function buildGeaItemDomWalk() {
   return jsBlockBody`
     var __el = e.target;
-    while (__el && __el.__geaKey == null && (!__el.getAttribute || !__el.getAttribute('data-gea-item-id'))) __el = __el.parentElement;
+    while (__el && __el[GEA_DOM_KEY] == null && (!__el.getAttribute || !__el.getAttribute('data-gea-item-id'))) __el = __el.parentElement;
   `;
 }
 function buildMapEventBody(handler, paramContext) {
@@ -7868,8 +8185,8 @@ function buildMapEventBody(handler, paramContext) {
     const preamble2 = [
       ...buildGeaItemDomWalk(),
       ...jsBlockBody`
-        if (!__el || !__el.__geaItem) return;
-        const ${id4(ctx.indexVariable)} = ${rawArrayExpr}.indexOf(__el.__geaItem);
+        if (!__el || !__el[GEA_DOM_ITEM]) return;
+        const ${id4(ctx.indexVariable)} = ${rawArrayExpr}.indexOf(__el[GEA_DOM_ITEM]);
       `
     ];
     return [...preamble2, ...handlerBody];
@@ -7883,7 +8200,7 @@ function buildMapEventBody(handler, paramContext) {
     preamble.push(
       ...buildGeaItemDomWalk(),
       ...jsBlockBody`
-        const ${id4(ctx.indexVariable)} = __el ? ${rawArrayExpr}.indexOf(__el.__geaItem) : -1;
+        const ${id4(ctx.indexVariable)} = __el ? ${rawArrayExpr}.indexOf(__el[GEA_DOM_ITEM]) : -1;
       `
     );
   }
@@ -8008,10 +8325,7 @@ function injectChildComponents(ast, componentInstances, directForwardingChildren
                 t14.assignmentExpression(
                   "=",
                   t14.memberExpression(t14.thisExpression(), t14.identifier(backingField)),
-                  t14.callExpression(t14.memberExpression(t14.thisExpression(), t14.identifier("__child")), [
-                    t14.identifier(child.tagName),
-                    propsArg
-                  ])
+                  t14.callExpression(buildThisGeaMember("GEA_CHILD"), [t14.identifier(child.tagName), propsArg])
                 )
               )
             ),
@@ -8084,10 +8398,7 @@ function buildInstanceStatements(instances, directForwardingChildren) {
         t14.assignmentExpression(
           "=",
           t14.memberExpression(t14.thisExpression(), t14.identifier(child.instanceVar)),
-          t14.callExpression(t14.memberExpression(t14.thisExpression(), t14.identifier("__child")), [
-            t14.identifier(child.tagName),
-            propsArg
-          ])
+          t14.callExpression(buildThisGeaMember("GEA_CHILD"), [t14.identifier(child.tagName), propsArg])
         )
       )
     );
@@ -8167,7 +8478,7 @@ function buildPropsBuilderMethod(child) {
 }
 
 // src/apply-reactivity.ts
-import babelGenerator from "@babel/generator";
+import babelGenerator2 from "@babel/generator";
 import * as t20 from "@babel/types";
 import { appendToBody as appendToBody5, id as id11, js as js6, jsBlockBody as jsBlockBody4, jsExpr as jsExpr4, jsMethod as jsMethod8 } from "eszter";
 
@@ -8225,10 +8536,7 @@ function buildValueExpression(textExpr, stateRefs) {
     return rewriteStateRefs(t15.cloneNode(textExpr.expression, true), stateRefs);
   }
   if (textExpr.isImportedState && textExpr.storeVar) {
-    return buildMemberChainFromParts(
-      t15.memberExpression(t15.identifier(textExpr.storeVar), t15.identifier("__store")),
-      textExpr.pathParts
-    );
+    return buildMemberChainFromParts(t15.identifier(textExpr.storeVar), textExpr.pathParts);
   }
   return buildMemberChainFromParts(t15.thisExpression(), textExpr.pathParts);
 }
@@ -8248,19 +8556,15 @@ function rewriteStateRefs(expr, stateRefs) {
       } else if (ref.kind === "local") {
         path.replaceWith(t15.thisExpression());
       } else if ((ref.kind === "imported-destructured" || ref.kind === "store-alias") && ref.storeVar && ref.propName) {
-        path.replaceWith(
-          t15.memberExpression(
-            t15.memberExpression(t15.identifier(ref.storeVar), t15.identifier("__store")),
-            t15.identifier(ref.propName)
-          )
-        );
+        path.replaceWith(t15.memberExpression(t15.identifier(ref.storeVar), t15.identifier(ref.propName)));
         path.skip();
       } else if (ref.kind === "local-destructured" && ref.propName) {
         path.replaceWith(t15.memberExpression(t15.thisExpression(), t15.identifier(ref.propName)));
         path.skip();
-      } else {
-        path.replaceWith(t15.memberExpression(t15.identifier(path.node.name), t15.identifier("__store")));
+      } else if (ref.kind === "imported") {
         path.skip();
+      } else {
+        throw new Error(`rewriteStateRefs: unhandled state ref kind ${ref.kind}`);
       }
     }
   });
@@ -8304,7 +8608,7 @@ function buildSimpleUpdate(binding, param, stateRefs) {
   }
   if (target === "textContent" && binding.bindingId && binding.bindingId !== "" && !binding.userIdExpr) {
     const suffix = t15.stringLiteral(binding.bindingId);
-    return js3`${jsExpr2`this.__updateText(${suffix}, ${valueExpr})`};`;
+    return t15.expressionStatement(t15.callExpression(buildThisGeaMember("GEA_UPDATE_TEXT"), [suffix, valueExpr]));
   }
   return js3`if (${el}) { ${jsExpr2`${el}.${id6(target)}`} = ${valueExpr}; }`;
 }
@@ -8560,7 +8864,7 @@ function buildPropPatcherFunction(binding, propName) {
       t17.variableDeclaration("const", [
         t17.variableDeclarator(
           t17.identifier("__newAttr"),
-          URL_ATTRS2.has(attrName) ? t17.callExpression(t17.identifier("__sanitizeAttr"), [
+          URL_ATTRS2.has(attrName) ? t17.callExpression(t17.identifier("geaSanitizeAttr"), [
             t17.stringLiteral(attrName),
             t17.callExpression(t17.identifier("String"), [t17.identifier("__attrValue")])
           ]) : t17.callExpression(t17.identifier("String"), [t17.identifier("__attrValue")])
@@ -8934,7 +9238,9 @@ function generateEnsureArrayConfigsMethod(arrayMaps) {
       ])
     );
   });
-  return appendToBody3(jsMethod5`${id8("__ensureArrayConfigs")}() {}`, ...body);
+  const method = t17.classMethod("method", t17.identifier("GEA_ENSURE_ARRAY_CONFIGS"), [], t17.blockStatement([]), true);
+  method.body.body.push(...body);
+  return method;
 }
 function generateArrayRelationalObserver(path, arrayMap, bindings, methodName) {
   const arrayPath = pathPartsToString(getArrayPathParts(arrayMap));
@@ -9009,12 +9315,12 @@ function generateArrayConditionalPatchObserver(arrayMap, bindings, methodName) {
   const containerName = `__${arrayPath.replace(/\./g, "_")}_container`;
   const containerRef = t17.memberExpression(t17.thisExpression(), t17.identifier(containerName));
   const proxiedArr = arrayMap.isImportedState ? buildMemberChain(
-    t17.memberExpression(t17.identifier(arrayMap.storeVar || "store"), t17.identifier("__store")),
+    buildExprGeaMember(t17.identifier(arrayMap.storeVar || "store"), "GEA_STORE_ROOT"),
     arrayPath
   ) : buildMemberChain(t17.thisExpression(), arrayPath);
   const rawArrExpr = t17.logicalExpression(
     "||",
-    t17.memberExpression(t17.cloneNode(proxiedArr, true), t17.identifier("__getTarget")),
+    buildExprGeaMember(t17.cloneNode(proxiedArr, true), "GEA_PROXY_GET_TARGET"),
     t17.cloneNode(proxiedArr, true)
   );
   const loopBody = [
@@ -9067,12 +9373,12 @@ function generateArrayConditionalRerenderObserver(arrayMap, methodName) {
   const containerRef = t17.memberExpression(t17.thisExpression(), t17.identifier(containerName));
   const configRef = t17.memberExpression(t17.thisExpression(), t17.identifier(getArrayConfigPropName(arrayMap)));
   const proxiedArr = arrayMap.isImportedState ? buildMemberChain(
-    t17.memberExpression(t17.identifier(arrayMap.storeVar || "store"), t17.identifier("__store")),
+    buildExprGeaMember(t17.identifier(arrayMap.storeVar || "store"), "GEA_STORE_ROOT"),
     arrayPath
   ) : buildMemberChain(t17.thisExpression(), arrayPath);
   const rawArrExpr = t17.logicalExpression(
     "||",
-    t17.memberExpression(t17.cloneNode(proxiedArr, true), t17.identifier("__getTarget")),
+    buildExprGeaMember(t17.cloneNode(proxiedArr, true), "GEA_PROXY_GET_TARGET"),
     t17.cloneNode(proxiedArr, true)
   );
   return appendToBody3(
@@ -9150,9 +9456,7 @@ function generateArrayConditionalRerenderObserver(arrayMap, methodName) {
       t17.ifStatement(
         t17.unaryExpression("!", t17.identifier("__skipArrayConditionalRerender")),
         t17.blockStatement([
-          t17.expressionStatement(
-            t17.callExpression(t17.memberExpression(t17.thisExpression(), t17.identifier("__ensureArrayConfigs")), [])
-          ),
+          t17.expressionStatement(buildThisGeaCall("GEA_ENSURE_ARRAY_CONFIGS")),
           t17.variableDeclaration("const", [
             t17.variableDeclarator(
               t17.identifier("__arr"),
@@ -9164,7 +9468,7 @@ function generateArrayConditionalRerenderObserver(arrayMap, methodName) {
             )
           ]),
           t17.expressionStatement(
-            t17.callExpression(t17.memberExpression(t17.thisExpression(), t17.identifier("__applyListChanges")), [
+            buildThisGeaCall("GEA_APPLY_LIST_CHANGES", [
               containerRef,
               t17.identifier("__arr"),
               t17.nullLiteral(),
@@ -9266,10 +9570,7 @@ function buildElsLookup(elsRef, containerRef, idExpr, rowVar, containerBindingId
           t17.binaryExpression(
             "<",
             t17.identifier("__i"),
-            t17.memberExpression(
-              t17.memberExpression(ctrLocal, t17.identifier("children")),
-              t17.identifier("length")
-            )
+            t17.memberExpression(t17.memberExpression(ctrLocal, t17.identifier("children")), t17.identifier("length"))
           ),
           t17.updateExpression("++", t17.identifier("__i")),
           t17.blockStatement([
@@ -9288,16 +9589,12 @@ function buildElsLookup(elsRef, containerRef, idExpr, rowVar, containerBindingId
                 "||",
                 t17.binaryExpression(
                   "==",
-                  t17.memberExpression(t17.identifier("__ch"), t17.identifier("__geaKey")),
+                  buildExprGeaMember(t17.identifier("__ch"), "GEA_DOM_KEY"),
                   t17.cloneNode(idExpr, true)
                 ),
                 t17.logicalExpression(
                   "&&",
-                  t17.binaryExpression(
-                    "==",
-                    t17.memberExpression(t17.identifier("__ch"), t17.identifier("__geaKey")),
-                    t17.nullLiteral()
-                  ),
+                  t17.binaryExpression("==", buildExprGeaMember(t17.identifier("__ch"), "GEA_DOM_KEY"), t17.nullLiteral()),
                   t17.binaryExpression(
                     "==",
                     t17.optionalCallExpression(
@@ -9385,11 +9682,9 @@ function generateArrayHandlers(arrayMap, methodName) {
         t17.returnStatement()
       ])
     ),
+    t17.expressionStatement(buildThisGeaCall("GEA_ENSURE_ARRAY_CONFIGS")),
     t17.expressionStatement(
-      t17.callExpression(t17.memberExpression(t17.thisExpression(), t17.identifier("__ensureArrayConfigs")), [])
-    ),
-    t17.expressionStatement(
-      t17.callExpression(t17.memberExpression(t17.thisExpression(), t17.identifier("__applyListChanges")), [
+      buildThisGeaCall("GEA_APPLY_LIST_CHANGES", [
         containerRef,
         t17.identifier(paramName),
         t17.identifier("change"),
@@ -9727,7 +10022,7 @@ function generateRenderItemMethod(arrayMap, imports, eventHandlers, eventIdCount
             t18.assignmentExpression(
               "=",
               t18.cloneNode(privateRsField),
-              t18.memberExpression(t18.identifier(arrayMap.storeVar), t18.identifier("__raw"))
+              buildExprGeaMember(t18.identifier(arrayMap.storeVar), "GEA_PROXY_RAW")
             )
           )
         )
@@ -9743,11 +10038,33 @@ function generateRenderItemMethod(arrayMap, imports, eventHandlers, eventIdCount
     returnStmt
   );
   if (handlerPropsInMap.length > 0 && classBody2) {
-    const handleItemHandler = jsMethod6`__handleItemHandler(itemId, e) {
-    const fn = this.__itemHandlers_?.[itemId];
-    if (fn) fn(e);
-  }`;
-    if (!classBody2.body.some((m) => t18.isClassMethod(m) && t18.isIdentifier(m.key) && m.key.name === "__handleItemHandler")) {
+    const handleItemHandlerBody = t18.blockStatement([
+      t18.variableDeclaration("const", [
+        t18.variableDeclarator(
+          t18.identifier("fn"),
+          t18.optionalMemberExpression(
+            t18.memberExpression(t18.thisExpression(), t18.identifier("__itemHandlers_")),
+            t18.identifier("itemId"),
+            true,
+            true
+          )
+        )
+      ]),
+      t18.ifStatement(
+        t18.identifier("fn"),
+        t18.expressionStatement(t18.callExpression(t18.identifier("fn"), [t18.identifier("e")]))
+      )
+    ]);
+    const handleItemHandler = t18.classMethod(
+      "method",
+      t18.identifier("GEA_HANDLE_ITEM_HANDLER"),
+      [t18.identifier("itemId"), t18.identifier("e")],
+      handleItemHandlerBody,
+      true
+    );
+    if (!classBody2.body.some(
+      (m) => t18.isClassMethod(m) && m.computed === true && t18.isIdentifier(m.key) && m.key.name === "GEA_HANDLE_ITEM_HANDLER"
+    )) {
       classBody2.body.unshift(handleItemHandler);
     }
   }
@@ -9755,6 +10072,7 @@ function generateRenderItemMethod(arrayMap, imports, eventHandlers, eventIdCount
     h.mapContext = {
       arrayPathParts: arrayMap.arrayPathParts || normalizePathParts(arrayMap.arrayPath || ""),
       itemIdProperty: arrayMap.itemIdProperty || "id",
+      ...arrayMap.keyExpression ? { keyExpression: t18.cloneNode(arrayMap.keyExpression, true) } : {},
       itemVariable: arrayMap.itemVariable,
       indexVariable: arrayMap.indexVariable,
       isImportedState: arrayMap.isImportedState || false,
@@ -9785,7 +10103,16 @@ function getArrayCapName2(arrayPropName) {
   return arrayPropName.charAt(0).toUpperCase() + arrayPropName.slice(1);
 }
 function getComponentArrayItemsName(arrayPropName) {
-  return `_${arrayPropName}Items`;
+  const safe = arrayPropName.replace(/[^a-zA-Z0-9_$]/g, "_");
+  return `_gea_${safe}_items`;
+}
+function buildComponentArrayItemsSymbolDecl(arrayPropName, itemsBinding) {
+  return t19.variableDeclaration("const", [
+    t19.variableDeclarator(
+      t19.identifier(itemsBinding),
+      t19.callExpression(t19.identifier("geaListItemsSymbol"), [t19.stringLiteral(arrayPropName)])
+    )
+  ]);
 }
 function getComponentArrayRefreshMethodName(arrayPropName) {
   return `__refresh${getArrayCapName2(arrayPropName)}Items`;
@@ -9853,6 +10180,7 @@ function generateComponentArrayResult(um, arrayPropName, imports, propNames, _cl
     finalPropsExpr = cloned;
   }
   const itemsName = getComponentArrayItemsName(arrayPropName);
+  const symbolConstDecl = buildComponentArrayItemsSymbolDecl(arrayPropName, itemsName);
   let arrAccessExpr;
   let arrSetupStatements = [];
   if (storeArrayAccess) {
@@ -9895,7 +10223,7 @@ function generateComponentArrayResult(um, arrayPropName, imports, propNames, _cl
       if (!t19.isVariableDeclaration(stmt)) continue;
       for (const decl of stmt.declarations) {
         if (t19.isIdentifier(decl.init) && storeVarNames.has(decl.init.name)) {
-          decl.init = t19.memberExpression(t19.identifier(decl.init.name), t19.identifier("__raw"));
+          decl.init = buildExprGeaMember(t19.identifier(decl.init.name), "GEA_PROXY_RAW");
         }
       }
     }
@@ -9909,7 +10237,7 @@ function generateComponentArrayResult(um, arrayPropName, imports, propNames, _cl
   const keyExpr = itemIdProp && itemIdProp !== ITEM_IS_KEY ? t19.callExpression(t19.identifier("String"), [t19.memberExpression(t19.identifier("opt"), t19.identifier(itemIdProp))]) : itemIdProp === ITEM_IS_KEY ? t19.callExpression(t19.identifier("String"), [t19.identifier("opt")]) : t19.binaryExpression("+", t19.stringLiteral("__idx_"), t19.identifier("__k"));
   const mapParams = [t19.identifier("opt")];
   if (indexVar || !itemIdProp) mapParams.push(t19.identifier("__k"));
-  const childCall = t19.callExpression(t19.memberExpression(t19.thisExpression(), t19.identifier("__child")), [
+  const childCall = t19.callExpression(buildThisGeaMember("GEA_CHILD"), [
     t19.identifier(comp.componentTag),
     t19.cloneNode(itemPropsCall, true),
     t19.cloneNode(keyExpr, true)
@@ -9919,11 +10247,12 @@ function generateComponentArrayResult(um, arrayPropName, imports, propNames, _cl
   const parenthesized = t19.parenthesizedExpression ? t19.parenthesizedExpression(nullishCoalesce) : nullishCoalesce;
   const mapCallExpr = t19.callExpression(t19.memberExpression(parenthesized, t19.identifier("map")), [mapCallback]);
   const constructorInit = t19.expressionStatement(
-    t19.assignmentExpression("=", t19.memberExpression(t19.thisExpression(), t19.identifier(itemsName)), mapCallExpr)
+    t19.assignmentExpression("=", t19.memberExpression(t19.thisExpression(), t19.identifier(itemsName), true), mapCallExpr)
   );
   return {
     itemPropsMethod,
     constructorInit,
+    symbolConstDecl,
     componentTag: comp.componentTag,
     containerBindingId: um.containerBindingId,
     containerUserIdExpr: um.containerUserIdExpr,
@@ -9935,7 +10264,7 @@ function generateComponentArrayResult(um, arrayPropName, imports, propNames, _cl
 
 // src/apply-reactivity.ts
 import { createRequire as createRequire12 } from "module";
-var generate2 = "default" in babelGenerator ? babelGenerator.default : babelGenerator;
+var generate3 = "default" in babelGenerator2 ? babelGenerator2.default : babelGenerator2;
 var URL_ATTRS3 = /* @__PURE__ */ new Set(["href", "src", "action", "formaction", "data", "cite", "poster", "background"]);
 var require13 = createRequire12(import.meta.url);
 var traverse12 = require13("@babel/traverse").default;
@@ -9962,7 +10291,7 @@ function rewriteTemplateBodyForImportedState(_templateMethod, _stateRefs, _store
 function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = []) {
   const body = [];
   if (hasArrayConfigs) {
-    body.push(js6`this.__ensureArrayConfigs();`);
+    body.push(t20.expressionStatement(buildThisGeaCall("GEA_ENSURE_ARRAY_CONFIGS")));
   }
   const observeListPathKeys = /* @__PURE__ */ new Set();
   for (const config of observeListConfigs) {
@@ -9991,7 +10320,7 @@ function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = [])
       if (handlers.length === 1 && !handlers[0].isVia) {
         body.push(
           t20.expressionStatement(
-            t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__observe")), [
+            t20.callExpression(thisGea("GEA_OBSERVE"), [
               storeVarExpr,
               pathArray,
               t20.memberExpression(t20.thisExpression(), t20.identifier(handlers[0].methodName))
@@ -10022,10 +10351,10 @@ function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = [])
               ])
             );
             if (h.dynamicKeyExpr) {
-              const keyId = t20.identifier(`__geaKey${hi}`);
-              const changeId = t20.identifier(`__geaChange${hi}`);
-              const partsId = t20.identifier(`__geaParts${hi}`);
-              const prevRootId = t20.identifier(`__geaPrevRoot${hi}`);
+              const keyId = t20.identifier(`geaDynKey${hi}`);
+              const changeId = t20.identifier(`geaDynChange${hi}`);
+              const partsId = t20.identifier(`geaDynParts${hi}`);
+              const prevRootId = t20.identifier(`geaDynPrevRoot${hi}`);
               const prefixChecks = h.pathParts.map(
                 (part, idx) => t20.binaryExpression(
                   "===",
@@ -10103,7 +10432,7 @@ function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = [])
         }
         body.push(
           t20.expressionStatement(
-            t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__observe")), [
+            t20.callExpression(thisGea("GEA_OBSERVE"), [
               storeVarExpr,
               pathArray,
               t20.arrowFunctionExpression([vParam, cParam], t20.blockStatement(callStmts))
@@ -10117,17 +10446,15 @@ function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = [])
       const itemsName = getComponentArrayItemsName(config.arrayPropName);
       const itemPropsMethodName = `__itemProps_${config.arrayPropName}`;
       const configProps = [
-        t20.objectProperty(t20.identifier("items"), t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName))),
-        t20.objectProperty(t20.identifier("itemsKey"), t20.stringLiteral(itemsName)),
+        t20.objectProperty(t20.identifier("items"), t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName), true)),
+        t20.objectProperty(t20.identifier("itemsKey"), t20.identifier(itemsName)),
         t20.objectProperty(
           t20.identifier("container"),
           t20.arrowFunctionExpression(
             [],
             config.containerUserIdExpr ? t20.callExpression(t20.memberExpression(t20.identifier("document"), t20.identifier("getElementById")), [
               t20.cloneNode(config.containerUserIdExpr, true)
-            ]) : config.containerBindingId ? t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__el")), [
-              t20.stringLiteral(config.containerBindingId)
-            ]) : jsExpr4`this.$(":scope")`
+            ]) : config.containerBindingId ? t20.callExpression(thisGea("GEA_EL"), [t20.stringLiteral(config.containerBindingId)]) : jsExpr4`this.$(":scope")`
           )
         ),
         t20.objectProperty(t20.identifier("Ctor"), t20.identifier(config.componentTag)),
@@ -10156,6 +10483,11 @@ function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = [])
           )
         )
       ];
+      if (config.afterCondSlotIndex != null) {
+        configProps.push(
+          t20.objectProperty(t20.identifier("afterCondSlotIndex"), t20.numericLiteral(config.afterCondSlotIndex))
+        );
+      }
       const samePathHandlers = [];
       const pathKey = JSON.stringify(config.pathParts);
       for (const handler of store.observeHandlers) {
@@ -10181,11 +10513,7 @@ function generateCreatedHooks(stores, hasArrayConfigs, observeListConfigs = [])
       }
       body.push(
         t20.expressionStatement(
-          t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__observeList")), [
-            storeVarExpr,
-            pathArray,
-            t20.objectExpression(configProps)
-          ])
+          t20.callExpression(thisGea("GEA_OBSERVE_LIST"), [storeVarExpr, pathArray, t20.objectExpression(configProps)])
         )
       );
     }
@@ -10226,6 +10554,15 @@ function classMethodUsesParam(method, index) {
 function serializeAstNode(node) {
   return node ? JSON.stringify(node) : "";
 }
+var thisGea = buildThisGeaMember;
+function insertStmtBeforeClass(classPath, stmt) {
+  const parent = classPath.parentPath;
+  if (parent.isExportDefaultDeclaration()) {
+    parent.insertBefore(stmt);
+  } else {
+    classPath.insertBefore(stmt);
+  }
+}
 function expressionReferencesIdentifier(expr, name) {
   let found = false;
   const program12 = t20.program([t20.expressionStatement(t20.cloneNode(expr, true))]);
@@ -10241,16 +10578,16 @@ function expressionReferencesIdentifier(expr, name) {
   return found;
 }
 function generateLocalStateObserverSetup(observeHandlers, hasArrayConfigs) {
-  const localStore = t20.memberExpression(t20.thisExpression(), t20.identifier("__store"));
+  const localStore = buildThisGeaMember("GEA_STORE_ROOT");
   const body = [];
   if (hasArrayConfigs) {
-    body.push(js6`this.__ensureArrayConfigs();`);
+    body.push(t20.expressionStatement(buildThisGeaCall("GEA_ENSURE_ARRAY_CONFIGS")));
   }
   body.push(js6`if (!${localStore}) { return; }`);
   for (const observeHandler of observeHandlers) {
     body.push(
       t20.expressionStatement(
-        t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__observe")), [
+        t20.callExpression(thisGea("GEA_OBSERVE"), [
           t20.thisExpression(),
           t20.arrayExpression(observeHandler.pathParts.map((part) => t20.stringLiteral(part))),
           t20.memberExpression(t20.thisExpression(), t20.identifier(observeHandler.methodName))
@@ -10258,7 +10595,13 @@ function generateLocalStateObserverSetup(observeHandlers, hasArrayConfigs) {
       )
     );
   }
-  const method = jsMethod8`${id11("__setupLocalStateObservers")}() {}`;
+  const method = t20.classMethod(
+    "method",
+    t20.identifier("GEA_SETUP_LOCAL_STATE_OBSERVERS"),
+    [],
+    t20.blockStatement([]),
+    true
+  );
   method.body.body.push(...body);
   return method;
 }
@@ -10291,6 +10634,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
       traverse12(ast, {
         ClassDeclaration(classPath) {
           if (!t20.isIdentifier(classPath.node.id) || classPath.node.id.name !== className) return;
+          ensureGeaCompilerSymbolImports(ast);
           let originalClassBody;
           traverse12(originalAST, {
             noScope: true,
@@ -10386,7 +10730,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                 t20.memberExpression(t20.thisExpression(), t20.identifier("id")),
                 t20.stringLiteral("-" + pb.bindingId)
               )
-            ) : pb.selector === ":scope" ? t20.memberExpression(t20.thisExpression(), t20.identifier("element_")) : t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("$")), [
+            ) : pb.selector === ":scope" ? thisGea("GEA_ELEMENT") : t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("$")), [
               t20.stringLiteral(pb.selector)
             ]);
             const valueExpr = pb.expression && pb.setupStatements ? t20.identifier("__boundValue") : t20.identifier("value");
@@ -10460,31 +10804,163 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   t20.cloneNode(valueExpr, true)
                 )
               );
-              const consequent = isHtmlProducing ? t20.blockStatement([
-                assignStmt,
-                // After replacing innerHTML for children, re-initialize child
-                // components that were created from the new HTML string.
-                t20.expressionStatement(
-                  t20.callExpression(
-                    t20.memberExpression(t20.thisExpression(), t20.identifier("instantiateChildComponents_")),
-                    []
-                  )
-                ),
-                // Reconnect compiled children from the parent component whose
-                // DOM elements were replaced by the innerHTML update.
-                t20.ifStatement(
-                  t20.memberExpression(t20.thisExpression(), t20.identifier("parentComponent")),
+              let consequent;
+              if (isHtmlProducing) {
+                const __tpl = t20.identifier("__tpl");
+                const __nc = t20.identifier("__nc");
+                const __oc = t20.identifier("__oc");
+                const __structural = t20.identifier("__structural");
+                const __j = t20.identifier("__j");
+                const setupStmts = [
+                  t20.variableDeclaration("var", [
+                    t20.variableDeclarator(
+                      __tpl,
+                      t20.callExpression(t20.memberExpression(t20.identifier("document"), t20.identifier("createElement")), [
+                        t20.stringLiteral("template")
+                      ])
+                    )
+                  ]),
                   t20.expressionStatement(
-                    t20.callExpression(
+                    t20.assignmentExpression(
+                      "=",
+                      t20.memberExpression(__tpl, t20.identifier("innerHTML")),
+                      t20.cloneNode(valueExpr, true)
+                    )
+                  ),
+                  t20.variableDeclaration("var", [
+                    t20.variableDeclarator(
+                      __nc,
                       t20.memberExpression(
-                        t20.memberExpression(t20.thisExpression(), t20.identifier("parentComponent")),
-                        t20.identifier("mountCompiledChildComponents_")
+                        t20.memberExpression(__tpl, t20.identifier("content")),
+                        t20.identifier("childNodes")
+                      )
+                    )
+                  ]),
+                  t20.variableDeclaration("var", [
+                    t20.variableDeclarator(__oc, t20.memberExpression(t20.identifier("__el"), t20.identifier("childNodes")))
+                  ])
+                ];
+                const structuralDetect = [
+                  t20.variableDeclaration("var", [
+                    t20.variableDeclarator(
+                      __structural,
+                      t20.binaryExpression(
+                        "!==",
+                        t20.memberExpression(__nc, t20.identifier("length")),
+                        t20.memberExpression(__oc, t20.identifier("length"))
+                      )
+                    )
+                  ]),
+                  t20.ifStatement(
+                    t20.unaryExpression("!", __structural),
+                    t20.blockStatement([
+                      t20.forStatement(
+                        t20.variableDeclaration("var", [t20.variableDeclarator(__j, t20.numericLiteral(0))]),
+                        t20.binaryExpression("<", __j, t20.memberExpression(__nc, t20.identifier("length"))),
+                        t20.updateExpression("++", __j),
+                        t20.blockStatement([
+                          t20.ifStatement(
+                            t20.logicalExpression(
+                              "||",
+                              t20.binaryExpression(
+                                "!==",
+                                t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("nodeType")),
+                                t20.memberExpression(t20.memberExpression(__nc, __j, true), t20.identifier("nodeType"))
+                              ),
+                              t20.logicalExpression(
+                                "&&",
+                                t20.binaryExpression(
+                                  "===",
+                                  t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("nodeType")),
+                                  t20.numericLiteral(1)
+                                ),
+                                t20.binaryExpression(
+                                  "!==",
+                                  t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("tagName")),
+                                  t20.memberExpression(t20.memberExpression(__nc, __j, true), t20.identifier("tagName"))
+                                )
+                              )
+                            ),
+                            t20.blockStatement([
+                              t20.expressionStatement(t20.assignmentExpression("=", __structural, t20.booleanLiteral(true))),
+                              t20.breakStatement()
+                            ])
+                          )
+                        ])
+                      )
+                    ])
+                  )
+                ];
+                const patchNodeCall = t20.callExpression(
+                  t20.memberExpression(
+                    t20.memberExpression(t20.thisExpression(), t20.identifier("constructor")),
+                    t20.identifier("GEA_PATCH_NODE"),
+                    true
+                  ),
+                  [t20.memberExpression(__oc, __j, true), t20.memberExpression(__nc, __j, true), t20.booleanLiteral(true)]
+                );
+                const patchLoop = t20.forStatement(
+                  t20.variableDeclaration("var", [t20.variableDeclarator(__j, t20.numericLiteral(0))]),
+                  t20.binaryExpression("<", __j, t20.memberExpression(__nc, t20.identifier("length"))),
+                  t20.updateExpression("++", __j),
+                  t20.blockStatement([
+                    t20.ifStatement(
+                      t20.binaryExpression(
+                        "===",
+                        t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("nodeType")),
+                        t20.numericLiteral(3)
                       ),
-                      []
+                      t20.blockStatement([
+                        t20.ifStatement(
+                          t20.binaryExpression(
+                            "!==",
+                            t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("textContent")),
+                            t20.memberExpression(t20.memberExpression(__nc, __j, true), t20.identifier("textContent"))
+                          ),
+                          t20.expressionStatement(
+                            t20.assignmentExpression(
+                              "=",
+                              t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("textContent")),
+                              t20.memberExpression(t20.memberExpression(__nc, __j, true), t20.identifier("textContent"))
+                            )
+                          )
+                        )
+                      ]),
+                      t20.ifStatement(
+                        t20.binaryExpression(
+                          "===",
+                          t20.memberExpression(t20.memberExpression(__oc, __j, true), t20.identifier("nodeType")),
+                          t20.numericLiteral(1)
+                        ),
+                        t20.expressionStatement(patchNodeCall)
+                      )
+                    )
+                  ])
+                );
+                const fallbackBlock = t20.blockStatement([
+                  assignStmt,
+                  t20.expressionStatement(t20.callExpression(buildThisGeaMember("GEA_INSTANTIATE_CHILD_COMPONENTS"), [])),
+                  t20.ifStatement(
+                    buildThisGeaMember("GEA_PARENT_COMPONENT"),
+                    t20.expressionStatement(
+                      t20.callExpression(
+                        buildExprGeaMember(
+                          buildThisGeaMember("GEA_PARENT_COMPONENT"),
+                          "GEA_MOUNT_COMPILED_CHILD_COMPONENTS"
+                        ),
+                        []
+                      )
                     )
                   )
-                )
-              ]) : assignStmt;
+                ]);
+                consequent = t20.blockStatement([
+                  ...setupStmts,
+                  ...structuralDetect,
+                  t20.ifStatement(__structural, fallbackBlock, t20.blockStatement([patchLoop]))
+                ]);
+              } else {
+                consequent = assignStmt;
+              }
               updateStmt = t20.ifStatement(
                 t20.binaryExpression(
                   "!==",
@@ -10679,7 +11155,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   t20.binaryExpression("===", valueExpr, t20.nullLiteral()),
                   t20.binaryExpression("===", valueExpr, t20.identifier("undefined"))
                 );
-                const newAttrValueExpr = isBooleanAttr ? t20.stringLiteral("") : URL_ATTRS3.has(attrName) ? t20.callExpression(t20.identifier("__sanitizeAttr"), [
+                const newAttrValueExpr = isBooleanAttr ? t20.stringLiteral("") : URL_ATTRS3.has(attrName) ? t20.callExpression(t20.identifier("geaSanitizeAttr"), [
                   t20.stringLiteral(attrName),
                   t20.callExpression(t20.identifier("String"), [valueExpr])
                 ]) : t20.callExpression(t20.identifier("String"), [valueExpr]);
@@ -10885,8 +11361,35 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               const parsed = JSON.parse(entry.observeKey);
               const storeVarName = parsed.storeVar || void 0;
               const methodNameStr = getObserveMethodName(propPath, storeVarName);
-              const prevProp = `__geaPrev_guard_${methodNameStr}`;
-              const rerenderMethod = jsMethod8`${id11(methodNameStr)}(__v, __c) { if (!__v === !this.${id11(prevProp)}) return; this.${id11(prevProp)} = __v; this.__geaRequestRender(); }`;
+              const prevGuardMem = t20.memberExpression(
+                t20.thisExpression(),
+                t20.callExpression(t20.identifier("geaPrevGuardSymbol"), [t20.stringLiteral(methodNameStr)]),
+                true
+              );
+              const rerenderMethod = t20.classMethod(
+                "method",
+                t20.identifier(methodNameStr),
+                [t20.identifier("__v"), t20.identifier("__c")],
+                t20.blockStatement([
+                  // Skip only when we've seen a prior value and truthiness is unchanged.
+                  // If prev is undefined and __v is false, !__v and !prev are both true — without this
+                  // guard the first delivery after mount would skip rerender (auth early-return repro).
+                  t20.ifStatement(
+                    t20.logicalExpression(
+                      "&&",
+                      t20.binaryExpression("!==", prevGuardMem, t20.identifier("undefined")),
+                      t20.binaryExpression(
+                        "===",
+                        t20.unaryExpression("!", t20.identifier("__v")),
+                        t20.unaryExpression("!", prevGuardMem)
+                      )
+                    ),
+                    t20.returnStatement()
+                  ),
+                  t20.expressionStatement(t20.assignmentExpression("=", prevGuardMem, t20.identifier("__v"))),
+                  t20.expressionStatement(buildThisGeaCall("GEA_REQUEST_RENDER"))
+                ])
+              );
               mergeObserveMethod(entry.observeKey, rerenderMethod);
               if (!stateProps.has(entry.observeKey)) {
                 stateProps.set(entry.observeKey, entry.pathParts);
@@ -10951,9 +11454,11 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                     usesTargetComponent: true
                   }));
                   if (delegatedEvents.length > 0) {
-                    appendCompiledEventMethods(classPath.node.body, delegatedEvents);
+                    appendCompiledEventMethods(classPath.node.body, delegatedEvents, [], ast);
                   }
                 }
+                ensureImport(ast, "@geajs/core", "geaListItemsSymbol");
+                insertStmtBeforeClass(classPath, arrayResult.symbolConstDecl);
                 inlineIntoConstructor(classPath.node.body, [
                   ...arrayResult.arrSetupStatements.map((s) => t20.cloneNode(s, true)),
                   arrayResult.constructorInit
@@ -10966,7 +11471,8 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                     componentTag: arrayResult.componentTag,
                     containerBindingId: arrayResult.containerBindingId,
                     containerUserIdExpr: arrayResult.containerUserIdExpr,
-                    itemIdProperty: arrayResult.itemIdProperty
+                    itemIdProperty: arrayResult.itemIdProperty,
+                    afterCondSlotIndex: um.afterCondSlotIndex
                   });
                 } else {
                   const computedDeps = (um.dependencies || collectUnresolvedDependencies([um], stateRefs, classPath.node.body)).filter((dep) => dep.storeVar || dep.pathParts[0] !== "props");
@@ -10976,9 +11482,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   const containerSuffix = arrayResult.containerBindingId;
                   const containerExpr = arrayResult.containerUserIdExpr ? t20.callExpression(t20.memberExpression(t20.identifier("document"), t20.identifier("getElementById")), [
                     t20.cloneNode(arrayResult.containerUserIdExpr, true)
-                  ]) : containerSuffix ? t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__el")), [
-                    t20.stringLiteral(containerSuffix)
-                  ]) : jsExpr4`this.$(":scope")`;
+                  ]) : containerSuffix ? t20.callExpression(thisGea("GEA_EL"), [t20.stringLiteral(containerSuffix)]) : jsExpr4`this.$(":scope")`;
                   const itemIdProp = arrayResult.itemIdProperty;
                   const keyFn = itemIdProp && itemIdProp !== ITEM_IS_KEY ? t20.arrowFunctionExpression(
                     [t20.identifier("opt")],
@@ -11006,8 +11510,8 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                       t20.variableDeclaration("const", [
                         t20.variableDeclarator(
                           t20.identifier("__new"),
-                          t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__reconcileList")), [
-                            t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName)),
+                          t20.callExpression(thisGea("GEA_RECONCILE_LIST"), [
+                            t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName), true),
                             t20.identifier("__arr"),
                             t20.cloneNode(containerExpr, true),
                             t20.identifier(arrayResult.componentTag),
@@ -11026,7 +11530,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                         t20.assignmentExpression(
                           "=",
                           t20.memberExpression(
-                            t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName)),
+                            t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName), true),
                             t20.identifier("length")
                           ),
                           t20.numericLiteral(0)
@@ -11035,7 +11539,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                       t20.expressionStatement(
                         t20.callExpression(
                           t20.memberExpression(
-                            t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName)),
+                            t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName), true),
                             t20.identifier("push")
                           ),
                           [t20.spreadElement(t20.identifier("__new"))]
@@ -11222,11 +11726,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   t20.identifier(getObserveMethodName(dep.pathParts, dep.storeVar)),
                   [t20.identifier("value"), t20.identifier("change")],
                   t20.blockStatement([
-                    t20.expressionStatement(
-                      t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaSyncMap")), [
-                        t20.numericLiteral(mapIdx)
-                      ])
-                    )
+                    t20.expressionStatement(t20.callExpression(thisGea("GEA_SYNC_MAP"), [t20.numericLiteral(mapIdx)]))
                   ])
                 )
               );
@@ -11285,13 +11785,13 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
           );
           if (elRefFieldNames.length > 0) {
             const hasReset = classPath.node.body.body.some(
-              (m) => t20.isClassMethod(m) && t20.isIdentifier(m.key) && m.key.name === "__resetEls"
+              (m) => t20.isClassMethod(m) && m.computed === true && t20.isIdentifier(m.key) && m.key.name === "GEA_RESET_ELS"
             );
             if (!hasReset) {
               classPath.node.body.body.push(
                 t20.classMethod(
                   "method",
-                  t20.identifier("__resetEls"),
+                  t20.identifier("GEA_RESET_ELS"),
                   [],
                   t20.blockStatement(
                     elRefFieldNames.map(
@@ -11303,7 +11803,8 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                         )
                       )
                     )
-                  )
+                  ),
+                  true
                 )
               );
               applied = true;
@@ -11334,11 +11835,13 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               if (!dep.storeVar) continue;
               addCondSlotIndex(dep.observeKey, slotIndex);
             }
-            for (const htmlExpr of [slot.truthyHtmlExpr, slot.falsyHtmlExpr]) {
-              if (!htmlExpr) continue;
-              const contentDeps = collectExpressionDependencies(htmlExpr, stateRefs, slot.setupStatements);
-              for (const dep of contentDeps) {
-                addCondSlotIndex(dep.observeKey, slotIndex);
+            if (!slot.hasCompiledChildren) {
+              for (const htmlExpr of [slot.truthyHtmlExpr, slot.falsyHtmlExpr]) {
+                if (!htmlExpr) continue;
+                const contentDeps = collectExpressionDependencies(htmlExpr, stateRefs, slot.setupStatements);
+                for (const dep of contentDeps) {
+                  addCondSlotIndex(dep.observeKey, slotIndex);
+                }
               }
             }
           });
@@ -11348,9 +11851,10 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               stateProps.set(observeKey, parts);
             }
           }
-          const hasOnPropChange = classPath.node.body.body.some(
-            (member) => t20.isClassMethod(member) && t20.isIdentifier(member.key) && member.key.name === "__onPropChange"
-          );
+          const hasOnPropChange = classPath.node.body.body.some((member) => {
+            if (!t20.isClassMethod(member) || !t20.isIdentifier(member.key)) return false;
+            return member.computed && member.key.name === "GEA_ON_PROP_CHANGE";
+          });
           const childObserveGroups = /* @__PURE__ */ new Map();
           compiledChildren.forEach((child) => {
             if (childHasNoProps(child)) return;
@@ -11764,9 +12268,9 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               }).map((child) => {
                 const updateExpr = t20.expressionStatement(
                   t20.callExpression(
-                    t20.memberExpression(
+                    buildExprGeaMember(
                       t20.memberExpression(t20.thisExpression(), t20.identifier(child.instanceVar)),
-                      t20.identifier("__geaUpdateProps")
+                      "GEA_UPDATE_PROPS"
                     ),
                     [
                       t20.callExpression(
@@ -11806,7 +12310,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
           unresolvedBindings.forEach(({ info, binding }) => {
             const deps = info.dependencies || collectUnresolvedDependencies([info], stateRefs, classPath.node.body);
             const mapIdx = getMapIndex(binding.arrayPathParts);
-            const delegateName = `__geaSyncMapDelegate_${mapIdx}`;
+            const delegateName = `geaSyncMapDelegate_${mapIdx}`;
             const hasNonRelationalDeps = deps.some(
               (dep) => !(info.relationalClassBindings || []).find((rb) => rb.observeKey === dep.observeKey)
             );
@@ -11838,11 +12342,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   classPath.node.body.body.push(
                     appendToBody5(
                       jsMethod8`${id11(delegateName)}() {}`,
-                      t20.expressionStatement(
-                        t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaSyncMap")), [
-                          t20.numericLiteral(mapIdx)
-                        ])
-                      )
+                      t20.expressionStatement(t20.callExpression(thisGea("GEA_SYNC_MAP"), [t20.numericLiteral(mapIdx)]))
                     )
                   );
                   delegateEmitted = true;
@@ -11854,11 +12354,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                 });
               } else {
                 const syncBody = t20.blockStatement([
-                  t20.expressionStatement(
-                    t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaSyncMap")), [
-                      t20.numericLiteral(mapIdx)
-                    ])
-                  )
+                  t20.expressionStatement(t20.callExpression(thisGea("GEA_SYNC_MAP"), [t20.numericLiteral(mapIdx)]))
                 ]);
                 mergeObserveMethod(
                   dep.observeKey,
@@ -11950,9 +12446,11 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   usesTargetComponent: true
                 }));
                 if (delegatedEvents.length > 0) {
-                  appendCompiledEventMethods(classPath.node.body, delegatedEvents);
+                  appendCompiledEventMethods(classPath.node.body, delegatedEvents, [], ast);
                 }
               }
+              ensureImport(ast, "@geajs/core", "geaListItemsSymbol");
+              insertStmtBeforeClass(classPath, arrayResult.symbolConstDecl);
               inlineIntoConstructor(classPath.node.body, [
                 ...arrayResult.arrSetupStatements.map((s) => t20.cloneNode(s, true)),
                 arrayResult.constructorInit
@@ -11965,7 +12463,8 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                   componentTag: arrayResult.componentTag,
                   containerBindingId: arrayResult.containerBindingId,
                   containerUserIdExpr: arrayResult.containerUserIdExpr,
-                  itemIdProperty: arrayResult.itemIdProperty
+                  itemIdProperty: arrayResult.itemIdProperty,
+                  afterCondSlotIndex: arrayMap.afterCondSlotIndex
                 });
               }
               componentArrayDisposeTargets.push(getComponentArrayItemsName(arrayPropName));
@@ -11993,14 +12492,12 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               const depObserveKey = buildObserveKey(depPath, arrayMap.storeVar);
               const depMethodName = getObserveMethodName(depPath, arrayMap.storeVar);
               const refreshStmt = t20.expressionStatement(
-                t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__refreshList")), [
-                  t20.stringLiteral(pathKey)
-                ])
+                t20.callExpression(thisGea("GEA_REFRESH_LIST"), [t20.stringLiteral(pathKey)])
               );
               const existing = addedMethods.get(depObserveKey);
               if (existing && t20.isBlockStatement(existing.body)) {
                 const renderedGuardIdx = existing.body.body.findIndex(
-                  (s) => t20.isIfStatement(s) && t20.isMemberExpression(s.test) && t20.isIdentifier(s.test.property) && s.test.property.name === "rendered_"
+                  (s) => t20.isIfStatement(s) && t20.isMemberExpression(s.test) && s.test.computed === true && t20.isIdentifier(s.test.property) && s.test.property.name === "GEA_RENDERED"
                 );
                 if (renderedGuardIdx >= 0) {
                   existing.body.body.splice(renderedGuardIdx, 0, refreshStmt);
@@ -12046,7 +12543,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               MemberExpression(mePath) {
                 const resolved = resolvePath(mePath.node, stateRefs);
                 if (!resolved?.parts?.length || !resolved.isImportedState) return;
-                if (resolved.parts.some((p) => p === "__raw")) return;
+                if (resolved.parts.some((p) => p === "__raw" || p === "GEA_PROXY_RAW")) return;
                 const depKey = buildObserveKey(resolved.parts, resolved.storeVar);
                 if (!getterDepKeys.has(depKey) && !externalDeps.has(depKey)) {
                   externalDeps.set(depKey, { parts: [...resolved.parts], storeVar: resolved.storeVar });
@@ -12057,11 +12554,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               const depMethodName = getObserveMethodName(dep.parts, dep.storeVar);
               if (!stateProps.has(depKey)) stateProps.set(depKey, dep.parts);
               const delegateBody = t20.blockStatement([
-                t20.expressionStatement(
-                  t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__refreshList")), [
-                    t20.stringLiteral(pathKey)
-                  ])
-                )
+                t20.expressionStatement(t20.callExpression(thisGea("GEA_REFRESH_LIST"), [t20.stringLiteral(pathKey)]))
               ]);
               const delegateMethod = t20.classMethod(
                 "method",
@@ -12095,7 +12588,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               const strippedInTemplate = templateMethod && (analysis.conditionalSlots || []).length > 0 ? stripHtmlArrayMapJoinInTemplateMethod(templateMethod, arrayMap) : false;
               if (strippedInSlots || strippedInTemplate) {
                 const currentValueExpr = arrayMap.storeVar ? buildMemberChainFromParts(t20.identifier(arrayMap.storeVar), arrayMap.arrayPathParts) : buildMemberChainFromParts(t20.thisExpression(), arrayMap.arrayPathParts);
-                const initialArrayName = `__geaInitial_${arrayHandlerMethodName}`;
+                const initialArrayName = `geaInitial_${arrayHandlerMethodName}`;
                 initialHtmlArrayRefreshOnMount.push(
                   t20.variableDeclaration("const", [
                     t20.variableDeclarator(t20.identifier(initialArrayName), currentValueExpr)
@@ -12203,17 +12696,17 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
             }
           }
           if (renderEventHandlers.length > 0) {
-            applied = appendCompiledEventMethods(classPath.node.body, renderEventHandlers) || applied;
+            applied = appendCompiledEventMethods(classPath.node.body, renderEventHandlers, [], ast) || applied;
           }
           if (unresolvedEventHandlers.length > 0) {
-            applied = appendCompiledEventMethods(classPath.node.body, unresolvedEventHandlers) || applied;
+            applied = appendCompiledEventMethods(classPath.node.body, unresolvedEventHandlers, [], ast) || applied;
           }
           if (applied) {
             const importedStores = /* @__PURE__ */ new Map();
             const localObserveHandlers = /* @__PURE__ */ new Map();
             const ensureStoreGroup = (storeVar) => {
               if (!importedStores.has(storeVar)) {
-                const captureExpression = t20.memberExpression(t20.identifier(storeVar), t20.identifier("__store"));
+                const captureExpression = buildExprGeaMember(t20.identifier(storeVar), "GEA_STORE_ROOT");
                 importedStores.set(storeVar, {
                   captureExpression,
                   observeHandlers: /* @__PURE__ */ new Map()
@@ -12350,6 +12843,31 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
                     }
                   }
                 } else if (parts.length === 1) {
+                  const selfKey = buildObserveKey(parts, sv);
+                  if (guardStateKeys.has(selfKey) && t20.isBlockStatement(method.body)) {
+                    const storePropExpr = t20.memberExpression(t20.identifier(sv), t20.identifier(parts[0]));
+                    const observePrevMem = t20.memberExpression(
+                      t20.thisExpression(),
+                      t20.callExpression(t20.identifier("geaObservePrevSymbol"), [
+                        t20.stringLiteral(getObserveMethodName(parts, sv))
+                      ]),
+                      true
+                    );
+                    const guardBlock = t20.ifStatement(
+                      t20.binaryExpression("==", t20.cloneNode(storePropExpr), t20.nullLiteral()),
+                      t20.blockStatement([
+                        t20.expressionStatement(t20.assignmentExpression("=", observePrevMem, t20.cloneNode(storePropExpr))),
+                        t20.ifStatement(
+                          thisGea("GEA_RENDERED"),
+                          t20.blockStatement([
+                            t20.expressionStatement(t20.callExpression(thisGea("GEA_REQUEST_RENDER"), []))
+                          ])
+                        ),
+                        t20.returnStatement()
+                      ])
+                    );
+                    method.body.body.unshift(guardBlock);
+                  }
                   const storeRef = stateRefs.get(sv);
                   if (storeRef?.getterDeps) {
                     for (const [getterName, depPaths] of storeRef.getterDeps) {
@@ -12386,7 +12904,7 @@ function applyStaticReactivity(ast, originalAST, className, sourceFile, imports,
               const bodyGroups = /* @__PURE__ */ new Map();
               for (const entry of methodEntries) {
                 const { storeVar } = parseObserveKey(entry.observeKey);
-                const bodyCode = (storeVar || "") + ":" + generate2(t20.blockStatement(entry.method.body.body)).code;
+                const bodyCode = (storeVar || "") + ":" + generate3(t20.blockStatement(entry.method.body.body)).code;
                 if (!bodyGroups.has(bodyCode)) bodyGroups.set(bodyCode, []);
                 bodyGroups.get(bodyCode).push(entry);
               }
@@ -12633,7 +13151,7 @@ function generateUnresolvedRelationalObserver(arrayMap, unresolvedMap, relBindin
     )
   ]);
   const commonPreamble = [
-    js6`if (!this.rendered_) return;`,
+    t20.ifStatement(t20.unaryExpression("!", thisGea("GEA_RENDERED")), t20.blockStatement([t20.returnStatement()])),
     lazyInit2(containerName, containerLookup),
     ...jsBlockBody4`if (!${containerRef}) return;`,
     ...setupStatements,
@@ -12753,15 +13271,11 @@ function generateMapRegistration(arrayMap, unresolvedMap, templatePropNames, who
       }
     });
     const keyFnParams = idxVar ? [t20.identifier("__k"), t20.identifier("__ki")] : [t20.identifier("__k")];
-    registerArgs.push(
-      t20.arrowFunctionExpression(keyFnParams, t20.callExpression(t20.identifier("String"), [keyExpr]))
-    );
+    registerArgs.push(t20.arrowFunctionExpression(keyFnParams, t20.callExpression(t20.identifier("String"), [keyExpr])));
   } else if (arrayMap.itemIdProperty && arrayMap.itemIdProperty !== ITEM_IS_KEY) {
     registerArgs.push(t20.stringLiteral(arrayMap.itemIdProperty));
   }
-  return t20.expressionStatement(
-    t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaRegisterMap")), registerArgs)
-  );
+  return t20.expressionStatement(t20.callExpression(thisGea("GEA_REGISTER_MAP"), registerArgs));
 }
 function collectFreeIdentifiers(nodes) {
   const names = /* @__PURE__ */ new Set();
@@ -12856,7 +13370,10 @@ function replaceMapWithComponentArrayItems(templateMethod, arrayExpr, itemsName,
         toReplace = path.parentPath.parentPath;
       }
       const replacement = opts?.slotBranch ? t20.stringLiteral("") : t20.callExpression(
-        t20.memberExpression(t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName)), t20.identifier("join")),
+        t20.memberExpression(
+          t20.memberExpression(t20.thisExpression(), t20.identifier(itemsName), true),
+          t20.identifier("join")
+        ),
         [t20.stringLiteral("")]
       );
       toReplace.replaceWith(replacement);
@@ -12885,6 +13402,7 @@ function replaceMapWithComponentArrayItemsInConditionalSlots(slots, arrayExpr, i
     }
   }
 }
+var ctorInlineInsertOffset = /* @__PURE__ */ new WeakMap();
 function inlineIntoConstructor(classBody2, statements) {
   let ctor = classBody2.body.find(
     (member) => t20.isClassMethod(member) && t20.isIdentifier(member.key) && member.key.name === "constructor"
@@ -12896,13 +13414,42 @@ function inlineIntoConstructor(classBody2, statements) {
       ...statements
     );
     classBody2.body.unshift(ctor);
+    ctorInlineInsertOffset.set(ctor, statements.length);
     return;
   }
-  ctor.body.body.push(...statements);
+  const body = ctor.body.body;
+  const superIdx = body.findIndex(
+    (stmt) => t20.isExpressionStatement(stmt) && t20.isCallExpression(stmt.expression) && t20.isSuper(stmt.expression.callee)
+  );
+  const base = superIdx >= 0 ? superIdx + 1 : 0;
+  const prev = ctorInlineInsertOffset.get(ctor) ?? 0;
+  const insertAt = base + prev;
+  body.splice(insertAt, 0, ...statements);
+  ctorInlineInsertOffset.set(ctor, prev + statements.length);
 }
 function ensureDisposeCalls(classBody2, targets) {
   const disposeStatements = targets.map(
-    (target) => js6`this.${id11(target)}?.forEach?.(item => item?.dispose?.());`
+    (target) => t20.expressionStatement(
+      t20.optionalCallExpression(
+        t20.optionalMemberExpression(
+          t20.memberExpression(t20.thisExpression(), t20.identifier(target), true),
+          t20.identifier("forEach"),
+          false,
+          true
+        ),
+        [
+          t20.arrowFunctionExpression(
+            [t20.identifier("item")],
+            t20.optionalCallExpression(
+              t20.optionalMemberExpression(t20.identifier("item"), t20.identifier("dispose"), false, true),
+              [],
+              true
+            )
+          )
+        ],
+        true
+      )
+    )
   );
   const existingDispose = classBody2.body.find(
     (member) => t20.isClassMethod(member) && t20.isIdentifier(member.key) && member.key.name === "dispose"
@@ -12916,9 +13463,10 @@ function ensureDisposeCalls(classBody2, targets) {
   );
 }
 function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildren, arrayRefreshDeps, conditionalSlots = [], unresolvedMapPropRefreshDeps = []) {
-  const existing = classBody2.body.find(
-    (member) => t20.isClassMethod(member) && t20.isIdentifier(member.key) && member.key.name === "__onPropChange"
-  );
+  const existing = classBody2.body.find((member) => {
+    if (!t20.isClassMethod(member) || !t20.isIdentifier(member.key)) return false;
+    return member.computed && member.key.name === "GEA_ON_PROP_CHANGE";
+  });
   if (existing) return;
   const directForwardCalls = [];
   const nonDirectChildren = [];
@@ -12936,9 +13484,9 @@ function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildre
             guard,
             t20.expressionStatement(
               t20.callExpression(
-                t20.memberExpression(
+                buildExprGeaMember(
                   t20.memberExpression(t20.thisExpression(), t20.identifier(child.instanceVar)),
-                  t20.identifier("__geaUpdateProps")
+                  "GEA_UPDATE_PROPS"
                 ),
                 [t20.objectExpression([t20.objectProperty(t20.identifier("key"), t20.identifier("value"), true)])]
               )
@@ -12952,9 +13500,9 @@ function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildre
               t20.binaryExpression("===", t20.identifier("key"), t20.stringLiteral(m.parentPropName)),
               t20.expressionStatement(
                 t20.callExpression(
-                  t20.memberExpression(
+                  buildExprGeaMember(
                     t20.memberExpression(t20.thisExpression(), t20.identifier(child.instanceVar)),
-                    t20.identifier("__geaUpdateProps")
+                    "GEA_UPDATE_PROPS"
                   ),
                   [t20.objectExpression([t20.objectProperty(t20.identifier(m.childPropName), t20.identifier("value"))])]
                 )
@@ -12986,10 +13534,7 @@ function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildre
   const childRefreshCalls = childRefreshEntries.map(({ child, depProps }) => {
     const call = t20.expressionStatement(
       t20.callExpression(
-        t20.memberExpression(
-          t20.memberExpression(t20.thisExpression(), t20.identifier(child.instanceVar)),
-          t20.identifier("__geaUpdateProps")
-        ),
+        buildExprGeaMember(t20.memberExpression(t20.thisExpression(), t20.identifier(child.instanceVar)), "GEA_UPDATE_PROPS"),
         [
           t20.callExpression(
             t20.memberExpression(t20.thisExpression(), t20.identifier(`__buildProps_${child.instanceVar.replace(/^_/, "")}`)),
@@ -13024,9 +13569,7 @@ function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildre
   if (conditionalSlots.length > 0) {
     for (let i = 0; i < conditionalSlots.length; i++) {
       const slot = conditionalSlots[i];
-      const call = t20.expressionStatement(
-        t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaPatchCond")), [t20.numericLiteral(i)])
-      );
+      const call = t20.expressionStatement(t20.callExpression(thisGea("GEA_PATCH_COND"), [t20.numericLiteral(i)]));
       if (slot.dependentPropNames.length > 0) {
         const guard = slot.dependentPropNames.reduce((acc, prop) => {
           const test = t20.binaryExpression("===", t20.identifier("key"), t20.stringLiteral(prop));
@@ -13045,11 +13588,7 @@ function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildre
     )
   );
   const unresolvedMapRefreshCalls = unresolvedMapPropRefreshDeps.map((dep) => {
-    const call = t20.expressionStatement(
-      t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaSyncMap")), [
-        t20.numericLiteral(dep.mapIdx)
-      ])
-    );
+    const call = t20.expressionStatement(t20.callExpression(thisGea("GEA_SYNC_MAP"), [t20.numericLiteral(dep.mapIdx)]));
     if (dep.propNames.length > 0) {
       const guard = dep.propNames.reduce((acc, prop) => {
         const test = t20.binaryExpression("===", t20.identifier("key"), t20.stringLiteral(prop));
@@ -13068,7 +13607,18 @@ function ensureOnPropChangeMethod(classBody2, inlinePatchBodies, compiledChildre
   ];
   if (allKeyGuarded.length === 0) return;
   const merged = mergeKeyGuards(allKeyGuarded);
-  classBody2.body.push(appendToBody5(jsMethod8`${id11("__onPropChange")}(key, value) {}`, ...merged));
+  classBody2.body.push(
+    appendToBody5(
+      t20.classMethod(
+        "method",
+        t20.identifier("GEA_ON_PROP_CHANGE"),
+        [t20.identifier("key"), t20.identifier("value")],
+        t20.blockStatement([]),
+        true
+      ),
+      ...merged
+    )
+  );
 }
 function serializeKeyGuard(test) {
   if (t20.isBinaryExpression(test) && test.operator === "===" && t20.isIdentifier(test.left, { name: "key" }) && t20.isStringLiteral(test.right)) {
@@ -13229,7 +13779,11 @@ function generateConditionalPatchMethods(classBody2, slots, templatePropNames, w
       t20.expressionStatement(
         t20.assignmentExpression(
           "=",
-          t20.memberExpression(t20.thisExpression(), t20.identifier(`__geaCond_${i}`)),
+          t20.memberExpression(
+            t20.thisExpression(),
+            t20.callExpression(t20.identifier("geaCondValueSymbol"), [t20.numericLiteral(i)]),
+            true
+          ),
           t20.unaryExpression("!", t20.unaryExpression("!", rewrittenCondExprsSafe[i]))
         )
       )
@@ -13267,7 +13821,7 @@ function generateConditionalPatchMethods(classBody2, slots, templatePropNames, w
     };
     registerCondCalls.push(
       t20.expressionStatement(
-        t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaRegisterCond")), [
+        t20.callExpression(thisGea("GEA_REGISTER_COND"), [
           t20.numericLiteral(i),
           t20.stringLiteral(slot.slotId),
           t20.arrowFunctionExpression([], t20.blockStatement(getCondBody)),
@@ -13455,6 +14009,8 @@ function addJoinToUnresolvedMapCalls(templateMethod, _unresolvedMaps) {
       const alreadyHasJoin = path.parentPath?.isMemberExpression() && t20.isIdentifier(path.parentPath.node.property) && path.parentPath.node.property.name === "join" && path.parentPath.parentPath?.isCallExpression();
       if (alreadyHasJoin) {
         const joinCall = path.parentPath.parentPath;
+        const joinArg = joinCall.node.arguments[0];
+        if (t20.isStringLiteral(joinArg) && joinArg.value !== "") return;
         const replacement = t20.binaryExpression("+", t20.cloneNode(joinCall.node, true), t20.stringLiteral("<!---->"));
         joinCall.replaceWith(replacement);
         joinCall.skip();
@@ -13585,76 +14141,85 @@ function replaceMapInConditionalSlots(slots, arrayMap) {
 }
 function generateStoreInlinePatchObserver(pathParts, storeVar, patchStatements) {
   const method = jsMethod8`${id11(getObserveMethodName(pathParts, storeVar))}(value, change) {}`;
-  method.body.body.push(
-    t20.ifStatement(t20.memberExpression(t20.thisExpression(), t20.identifier("rendered_")), t20.blockStatement(patchStatements))
-  );
+  method.body.body.push(t20.ifStatement(thisGea("GEA_RENDERED"), t20.blockStatement(patchStatements)));
   return method;
 }
 function generateRerenderObserver(pathParts, storeVar, truthinessOnly) {
   const method = jsMethod8`${id11(getObserveMethodName(pathParts, storeVar))}(value, change) {}`;
   if (storeVar) {
-    const prevProp = `__geaPrev_${getObserveMethodName(pathParts, storeVar)}`;
+    const observePrevMem = t20.memberExpression(
+      t20.thisExpression(),
+      t20.callExpression(t20.identifier("geaObservePrevSymbol"), [
+        t20.stringLiteral(getObserveMethodName(pathParts, storeVar))
+      ]),
+      true
+    );
     if (truthinessOnly) {
       method.body.body.push(
-        ...jsBlockBody4`
-          if (!value === !this.${id11(prevProp)}) return;
-          this.${id11(prevProp)} = value;
-        `
+        t20.ifStatement(
+          t20.logicalExpression(
+            "&&",
+            t20.binaryExpression("!==", observePrevMem, t20.identifier("undefined")),
+            t20.binaryExpression(
+              "===",
+              t20.unaryExpression("!", t20.identifier("value")),
+              t20.unaryExpression("!", observePrevMem)
+            )
+          ),
+          t20.returnStatement()
+        ),
+        t20.expressionStatement(t20.assignmentExpression("=", observePrevMem, t20.identifier("value")))
       );
     } else {
       method.body.body.push(
-        ...jsBlockBody4`
-          if (value === this.${id11(prevProp)}) return;
-          this.${id11(prevProp)} = value;
-        `
+        t20.ifStatement(t20.binaryExpression("===", t20.identifier("value"), observePrevMem), t20.returnStatement()),
+        t20.expressionStatement(t20.assignmentExpression("=", observePrevMem, t20.identifier("value")))
       );
     }
   }
   method.body.body.push(
     t20.ifStatement(
-      t20.memberExpression(t20.thisExpression(), t20.identifier("rendered_")),
-      t20.blockStatement([
-        t20.expressionStatement(
-          t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaRequestRender")), [])
-        )
-      ])
+      thisGea("GEA_RENDERED"),
+      t20.blockStatement([t20.expressionStatement(t20.callExpression(thisGea("GEA_REQUEST_RENDER"), []))])
     )
   );
   return method;
 }
 function generateConditionalSlotObserveMethod(pathParts, storeVar, slotIndices, emitEarlyReturn = true) {
   const method = jsMethod8`${id11(getObserveMethodName(pathParts, storeVar))}(value, change) {}`;
-  const anyPatchedExpr = slotIndices.map((i) => t20.memberExpression(t20.thisExpression(), t20.identifier(`__geaCondPatched_${i}`))).reduce((acc, expr) => t20.logicalExpression("||", acc, expr));
+  const anyPatchedExpr = slotIndices.map(
+    (i) => t20.memberExpression(
+      t20.thisExpression(),
+      t20.callExpression(t20.identifier("geaCondPatchedSymbol"), [t20.numericLiteral(i)]),
+      true
+    )
+  ).reduce((acc, expr) => t20.logicalExpression("||", acc, expr));
   const patchStatements = [];
   if (slotIndices.length === 1) {
     patchStatements.push(t20.ifStatement(anyPatchedExpr, t20.returnStatement()));
   }
   slotIndices.forEach((slotIndex) => {
+    const patchedMem = t20.memberExpression(
+      t20.thisExpression(),
+      t20.callExpression(t20.identifier("geaCondPatchedSymbol"), [t20.numericLiteral(slotIndex)]),
+      true
+    );
     patchStatements.push(
       t20.expressionStatement(
         t20.assignmentExpression(
           "=",
-          t20.memberExpression(t20.thisExpression(), t20.identifier(`__geaCondPatched_${slotIndex}`)),
-          t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaPatchCond")), [
-            t20.numericLiteral(slotIndex)
-          ])
+          patchedMem,
+          t20.callExpression(thisGea("GEA_PATCH_COND"), [t20.numericLiteral(slotIndex)])
         )
       )
     );
     patchStatements.push(
       t20.ifStatement(
-        t20.memberExpression(t20.thisExpression(), t20.identifier(`__geaCondPatched_${slotIndex}`)),
+        patchedMem,
         t20.blockStatement([
           t20.expressionStatement(
             t20.callExpression(t20.identifier("queueMicrotask"), [
-              t20.arrowFunctionExpression(
-                [],
-                t20.assignmentExpression(
-                  "=",
-                  t20.memberExpression(t20.thisExpression(), t20.identifier(`__geaCondPatched_${slotIndex}`)),
-                  t20.booleanLiteral(false)
-                )
-              )
+              t20.arrowFunctionExpression([], t20.assignmentExpression("=", patchedMem, t20.booleanLiteral(false)))
             ])
           )
         ])
@@ -13664,28 +14229,22 @@ function generateConditionalSlotObserveMethod(pathParts, storeVar, slotIndices,
   if (emitEarlyReturn) {
     patchStatements.push(t20.ifStatement(anyPatchedExpr, t20.returnStatement()));
   }
-  method.body.body.push(
-    t20.ifStatement(t20.memberExpression(t20.thisExpression(), t20.identifier("rendered_")), t20.blockStatement(patchStatements))
-  );
+  method.body.body.push(t20.ifStatement(thisGea("GEA_RENDERED"), t20.blockStatement(patchStatements)));
   return method;
 }
 function generateStateChildSwapObserver(pathParts, storeVar) {
   const method = jsMethod8`${id11(getObserveMethodName(pathParts, storeVar))}(value, change) {}`;
   method.body.body.push(
     t20.ifStatement(
-      t20.memberExpression(t20.thisExpression(), t20.identifier("rendered_")),
-      t20.blockStatement([
-        t20.expressionStatement(
-          t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaSwapStateChildren")), [])
-        )
-      ])
+      thisGea("GEA_RENDERED"),
+      t20.blockStatement([t20.expressionStatement(t20.callExpression(thisGea("GEA_SWAP_STATE_CHILDREN"), []))])
     )
   );
   return method;
 }
 function generateStateChildSwapMethod(classBody2, stateChildSlots) {
   const existing = classBody2.body.find(
-    (member) => t20.isClassMethod(member) && t20.isIdentifier(member.key) && member.key.name === "__geaSwapStateChildren"
+    (member) => t20.isClassMethod(member) && member.computed && t20.isIdentifier(member.key) && member.key.name === "GEA_SWAP_STATE_CHILDREN"
   );
   if (existing) return;
   const templateMethod = classBody2.body.find(
@@ -13708,9 +14267,9 @@ function generateStateChildSwapMethod(classBody2, stateChildSlots) {
     if (!hasBuildProps) return null;
     return t20.expressionStatement(
       t20.callExpression(
-        t20.memberExpression(
+        buildExprGeaMember(
           t20.memberExpression(t20.thisExpression(), t20.identifier(slot.childInstanceVar)),
-          t20.identifier("__geaUpdateProps")
+          "GEA_UPDATE_PROPS"
         ),
         [t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier(buildPropsName)), [])]
       )
@@ -13719,7 +14278,7 @@ function generateStateChildSwapMethod(classBody2, stateChildSlots) {
   const swapCalls = stateChildSlots.map((slot) => {
     const guardClone = t20.cloneNode(slot.guardExpr, true);
     return t20.expressionStatement(
-      t20.callExpression(t20.memberExpression(t20.thisExpression(), t20.identifier("__geaSwapChild")), [
+      t20.callExpression(thisGea("GEA_SWAP_CHILD"), [
         t20.stringLiteral(slot.markerId),
         t20.logicalExpression(
           "&&",
@@ -13732,9 +14291,10 @@ function generateStateChildSwapMethod(classBody2, stateChildSlots) {
   const filteredSetup = pruneUnusedSetupDestructuring(setupStatements, [...propsUpdateCalls, ...swapCalls]);
   const method = t20.classMethod(
     "method",
-    t20.identifier("__geaSwapStateChildren"),
+    t20.identifier("GEA_SWAP_STATE_CHILDREN"),
     [],
-    t20.blockStatement([...filteredSetup, ...propsUpdateCalls, ...swapCalls])
+    t20.blockStatement([...filteredSetup, ...propsUpdateCalls, ...swapCalls]),
+    true
   );
   classBody2.body.push(method);
 }
@@ -13766,9 +14326,6 @@ function resolveImportPath2(importer, source) {
 }
 var getterDepsCache = /* @__PURE__ */ new Map();
 var storeFieldsCache = /* @__PURE__ */ new Map();
-function isPrivateName(name) {
-  return name.charCodeAt(0) === 95 || name.charCodeAt(name.length - 1) === 95;
-}
 function extractGetterStatePaths(method) {
   if (!t21.isBlockStatement(method.body)) return null;
   const paths = /* @__PURE__ */ new Map();
@@ -13781,7 +14338,6 @@ function extractGetterStatePaths(method) {
         return;
       }
       const propName = node.property.name;
-      if (isPrivateName(propName)) return;
       if (!paths.has(propName)) {
         paths.set(propName, [propName]);
       }
@@ -13791,7 +14347,6 @@ function extractGetterStatePaths(method) {
       for (const prop of path.node.id.properties) {
         if (!t21.isObjectProperty(prop) || !t21.isIdentifier(prop.key)) continue;
         const propName = prop.key.name;
-        if (isPrivateName(propName)) continue;
         if (!paths.has(propName)) {
           paths.set(propName, [propName]);
         }
@@ -14071,7 +14626,7 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
           (p) => t22.isClassDeclaration(p.node)
         );
         if (earlyClassPath) {
-          transformed = appendCompiledEventMethods(earlyClassPath.node.body, earlyReturnCtx.eventHandlers, []) || transformed;
+          transformed = appendCompiledEventMethods(earlyClassPath.node.body, earlyReturnCtx.eventHandlers, [], ast) || transformed;
         }
       }
       for (const info of conditionalSlotInfos) {
@@ -14102,6 +14657,7 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
           cloneCtxForPatches
         );
         if (cloneMembers) {
+          ensureImport(ast, "@geajs/core", "GEA_CLONE_TEMPLATE");
           classPath.node.body.body.push(...cloneMembers);
           transformed = true;
         }
@@ -14110,17 +14666,18 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
         const classPath2 = path.findParent((p) => t22.isClassDeclaration(p.node));
         if (classPath2) {
           const setupStatements = returnIndex >= 0 ? body.slice(0, returnIndex) : [];
-          transformed = appendCompiledEventMethods(classPath2.node.body, eventHandlers, setupStatements) || transformed;
+          transformed = appendCompiledEventMethods(classPath2.node.body, eventHandlers, setupStatements, ast) || transformed;
         }
       }
       if (refBindings.length > 0) {
         const classPath2 = path.findParent((p) => t22.isClassDeclaration(p.node));
         if (classPath2) {
+          ensureImport(ast, "@geajs/core", "GEA_ELEMENT");
           const refStatements = refBindings.flatMap((ref) => {
             const target = ref.targetExpr;
             const q = t22.callExpression(
               t22.memberExpression(
-                t22.memberExpression(t22.thisExpression(), t22.identifier("element_")),
+                t22.memberExpression(t22.thisExpression(), t22.identifier("GEA_ELEMENT"), true),
                 t22.identifier("querySelector")
               ),
               [t22.stringLiteral(`[data-gea-ref="${ref.refId}"]`)]
@@ -14130,14 +14687,16 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
               t22.expressionStatement(t22.assignmentExpression("=", target, q))
             ];
           });
-          const existingSetup = classPath2.node.body.body.find(
-            (m) => t22.isClassMethod(m) && t22.isIdentifier(m.key) && m.key.name === "__setupRefs"
-          );
+          ensureImport(ast, "@geajs/core", "GEA_SETUP_REFS");
+          const existingSetup = classPath2.node.body.body.find((m) => {
+            if (!t22.isClassMethod(m) || !t22.isIdentifier(m.key)) return false;
+            return m.computed && m.key.name === "GEA_SETUP_REFS";
+          });
           if (existingSetup && t22.isClassMethod(existingSetup)) {
             existingSetup.body.body.push(...refStatements);
           } else {
             classPath2.node.body.body.push(
-              t22.classMethod("method", t22.identifier("__setupRefs"), [], t22.blockStatement(refStatements))
+              t22.classMethod("method", t22.identifier("GEA_SETUP_REFS"), [], t22.blockStatement(refStatements), true)
             );
           }
           transformed = true;
@@ -14251,14 +14810,15 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
           if (!t22.isClassMethod(member) || member.kind === "constructor") continue;
           const name = t22.isIdentifier(member.key) ? member.key.name : null;
           if (!name) continue;
-          const isCompilerGenerated = name === "template" || name === "events" && member.kind === "get" || name.startsWith("__");
+          const isCompilerGenerated = name === "template" || name === "events" && member.kind === "get" || name.startsWith("__") || member.computed && name === "GEA_ON_PROP_CHANGE";
           if (isCompilerGenerated) {
             cacheThisIdInMethod(member);
           }
           if (name === "events" && member.kind === "get") {
+            ensureImport(ast, "@geajs/core", "GEA_ELEMENT");
             wrapEventsGetterWithCache(member);
           }
-          if (name === "__onPropChange") {
+          if (member.computed && name === "GEA_ON_PROP_CHANGE") {
             wrapSubpathCacheGuards(member, subpathPcCounter, path.node.body);
           }
         }
@@ -14266,6 +14826,9 @@ function transformComponentFile(ast, imports, storeImports, className, sourceFil
       }
     });
   }
+  if (transformed) {
+    ensureGeaCompilerSymbolImports(ast);
+  }
   return transformed;
 }
 function transformNonComponentJSX(ast, imports) {
@@ -14393,8 +14956,8 @@ function transformRemainingJSX(ast, imports) {
   traverse14(ast, {
     noScope: true,
     JSXElement(path) {
-      const classMethod9 = path.findParent((p) => t22.isClassMethod(p.node));
-      if (classMethod9 && t22.isClassMethod(classMethod9.node) && t22.isIdentifier(classMethod9.node.key) && classMethod9.node.key.name === "template")
+      const classMethod10 = path.findParent((p) => t22.isClassMethod(p.node));
+      if (classMethod10 && t22.isClassMethod(classMethod10.node) && t22.isIdentifier(classMethod10.node.key) && classMethod10.node.key.name === "template")
         return;
       try {
         path.replaceWith(transformJSXToTemplate(path.node, { imports }));
@@ -14403,8 +14966,8 @@ function transformRemainingJSX(ast, imports) {
       }
     },
     JSXFragment(path) {
-      const classMethod9 = path.findParent((p) => t22.isClassMethod(p.node));
-      if (classMethod9 && t22.isClassMethod(classMethod9.node) && t22.isIdentifier(classMethod9.node.key) && classMethod9.node.key.name === "template")
+      const classMethod10 = path.findParent((p) => t22.isClassMethod(p.node));
+      if (classMethod10 && t22.isClassMethod(classMethod10.node) && t22.isIdentifier(classMethod10.node.key) && classMethod10.node.key.name === "template")
         return;
       try {
         path.replaceWith(transformJSXFragmentToTemplate(path.node, { imports }));
@@ -14526,7 +15089,7 @@ function resolveDefault(mod) {
   throw new Error("resolveDefault: expected a function or module with default export");
 }
 var traverse16 = resolveDefault(babelTraverse2);
-var generate3 = resolveDefault(babelGenerator2);
+var generate4 = resolveDefault(babelGenerator3);
 function hasSSREnvironment(ctx) {
   if (!("environment" in ctx)) return false;
   const env = ctx.environment;
@@ -14539,8 +15102,9 @@ var RESOLVED_HMR_RUNTIME_ID = "\0" + HMR_RUNTIME_ID;
 var STORE_REGISTRY_ID = "virtual:gea-store-registry";
 var RESOLVED_STORE_REGISTRY_ID = "\0" + STORE_REGISTRY_ID;
 var RECONCILE_SOURCE = `
+import { GEA_DOM_ITEM } from '@geajs/core';
 function getKey(el) {
-  if (el.__geaItem) return String(el.__geaItem.id);
+  if (el[GEA_DOM_ITEM]) return String(el[GEA_DOM_ITEM].id);
   return el.getAttribute('key');
 }
 export function reconcile(oldC, newC) {
@@ -14678,41 +15242,42 @@ export function unregisterComponentInstance(className, instance) {
 }
 
 function reRenderComponent(instance) {
-  if (!instance || !instance.element_) return;
-  var parent = instance.element_.parentElement;
+  if (!instance || !instance[GEA_ELEMENT]) return;
+  var parent = instance[GEA_ELEMENT].parentElement;
   if (!parent) return;
-  var index = Array.prototype.indexOf.call(parent.children, instance.element_);
+  var index = Array.prototype.indexOf.call(parent.children, instance[GEA_ELEMENT]);
   var props = Object.assign({}, instance.props);
   var __stateSnapshot = {};
   var __ownKeys = Object.getOwnPropertyNames(instance);
   for (var __ki = 0; __ki < __ownKeys.length; __ki++) {
     var __k = __ownKeys[__ki];
-    if (__k.charAt(0) === '_' || __k === 'props' || __k === 'element_' || __k === 'rendered_' || __k === 'id') continue;
+    if (__k.charAt(0) === '_' || __k === 'props' || __k === 'id') continue;
     var __desc = Object.getOwnPropertyDescriptor(instance, __k);
     if (__desc && (__desc.get || __desc.set)) continue;
     try { __stateSnapshot[__k] = instance[__k]; } catch(e) {}
   }
-  instance.rendered_ = false;
-  if (instance.cleanupBindings_) instance.cleanupBindings_();
-  if (instance.teardownSelfListeners_) instance.teardownSelfListeners_();
+  instance[GEA_RENDERED] = false;
+  if (typeof instance[GEA_CLEANUP_BINDINGS] === 'function') instance[GEA_CLEANUP_BINDINGS]();
+  if (typeof instance[GEA_TEARDOWN_SELF_LISTENERS] === 'function') instance[GEA_TEARDOWN_SELF_LISTENERS]();
   if (instance.__cleanupCompiledDirectEvents) instance.__cleanupCompiledDirectEvents();
-  if (instance.__childComponents && instance.__childComponents.length) {
-    instance.__childComponents.forEach(function(child) { if (child && child.dispose) child.dispose(); });
-    instance.__childComponents = [];
+  var __cc = instance[GEA_CHILD_COMPONENTS];
+  if (__cc && __cc.length) {
+    __cc.forEach(function(child) { if (child && child.dispose) child.dispose(); });
+    instance[GEA_CHILD_COMPONENTS] = [];
   }
-  if (instance.element_ && instance.element_.parentNode) {
-    instance.element_.parentNode.removeChild(instance.element_);
+  if (instance[GEA_ELEMENT] && instance[GEA_ELEMENT].parentNode) {
+    instance[GEA_ELEMENT].parentNode.removeChild(instance[GEA_ELEMENT]);
   }
-  instance.element_ = null;
+  instance[GEA_ELEMENT] = null;
   instance.props = props;
   var __restoreKeys = Object.getOwnPropertyNames(__stateSnapshot);
   for (var __ri = 0; __ri < __restoreKeys.length; __ri++) {
     try { instance[__restoreKeys[__ri]] = __stateSnapshot[__restoreKeys[__ri]]; } catch(e) {}
   }
-  if (!instance.__bindings) instance.__bindings = [];
+  if (!instance[GEA_BINDINGS]) instance[GEA_BINDINGS] = [];
   if (!instance.__bindingRemovers) instance.__bindingRemovers = [];
-  if (!instance.__selfListeners) instance.__selfListeners = [];
-  if (!instance.__childComponents) instance.__childComponents = [];
+  if (!instance[GEA_SELF_LISTENERS]) instance[GEA_SELF_LISTENERS] = [];
+  if (!instance[GEA_CHILD_COMPONENTS]) instance[GEA_CHILD_COMPONENTS] = [];
   instance.render(parent, index);
   if (typeof instance.createdHooks === 'function') {
     instance.createdHooks(instance.props);
@@ -14762,6 +15327,13 @@ function isComponentImportSource(source) {
   if (source.startsWith("node:")) return false;
   return true;
 }
+function looksLikeGeaFunctionalComponentSource(source) {
+  if (!source.includes("<") || !source.includes(">")) return false;
+  if (/export\s+default\s+async\s+function\b/.test(source)) return true;
+  if (/export\s+default\s+function\b/.test(source)) return true;
+  if (/export\s+default\s*\([^)]*\)\s*=>\s*/.test(source)) return true;
+  return false;
+}
 function geaPlugin() {
   const storeModules = /* @__PURE__ */ new Set();
   const componentModules = /* @__PURE__ */ new Set();
@@ -14821,6 +15393,10 @@ function geaPlugin() {
         componentModules.add(filePath);
         return true;
       }
+      if (looksLikeGeaFunctionalComponentSource(source)) {
+        componentModules.add(filePath);
+        return true;
+      }
       return false;
     } catch {
       return false;
@@ -14903,7 +15479,7 @@ ${entries.join(",\n")}
           convertFunctionalToClass(ast, functionalComponentInfo, imports);
           componentClassName = functionalComponentInfo.name;
           componentClassNames = [functionalComponentInfo.name];
-          const freshCode = generate3(ast, { retainLines: true }).code;
+          const freshCode = generate4(ast, { retainLines: true }).code;
           const freshParsed = parseSource(freshCode);
           if (freshParsed) {
             ast = freshParsed.ast;
@@ -14990,7 +15566,13 @@ ${entries.join(",\n")}
                 noScope: true,
                 ClassDeclaration(path) {
                   if (!path.node.id || path.node.id.name !== cn) return;
-                  const prop = t24.classProperty(t24.identifier("__geaTagName"), t24.stringLiteral(kebab));
+                  const prop = t24.classProperty(
+                    t24.identifier("GEA_CTOR_TAG_NAME"),
+                    t24.stringLiteral(kebab),
+                    void 0,
+                    void 0,
+                    true
+                  );
                   prop.static = true;
                   path.node.body.body.unshift(prop);
                   path.stop();
@@ -14998,6 +15580,7 @@ ${entries.join(",\n")}
               });
               transformed = true;
             }
+            ensureImport(ast, "@geajs/core", "GEA_CTOR_TAG_NAME");
           } else {
             transformed = transformNonComponentJSX(ast, imports);
           }
@@ -15023,9 +15606,9 @@ ${entries.join(",\n")}
           if (hmrAdded) transformed = true;
         }
         if (!transformed) return null;
-        ensureImport(ast, "@geajs/core", "__escapeHtml");
-        ensureImport(ast, "@geajs/core", "__sanitizeAttr");
-        const output = generate3(ast, { sourceMaps: true, sourceFileName: cleanId }, code);
+        ensureImport(ast, "@geajs/core", "geaEscapeHtml");
+        ensureImport(ast, "@geajs/core", "geaSanitizeAttr");
+        const output = generate4(ast, { sourceMaps: true, sourceFileName: cleanId }, code);
         return { code: output.code, map: output.map };
       } catch (error) {
         if (error?.__geaCompileError) {