@geajs/vite-plugin 1.0.26 → 1.0.28

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
@@ -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;
 }
@@ -5682,13 +5678,15 @@ import { appendToBody, id as id3, js as js2, jsMethod } from "eszter";
 import { createRequire as createRequire6 } from "module";
 var require7 = createRequire6(import.meta.url);
 var traverse6 = require7("@babel/traverse").default;
-function rewriteItemVarInExpression(expr, fromVar, toVar) {
-  if (fromVar === toVar) return expr;
+function rewriteItemVarInExpression(expr, fromVar, toVar, renames) {
+  const renameMap = new Map(renames || []);
+  renameMap.set(fromVar, toVar);
   const cloned = t11.cloneNode(expr, true);
   traverse6(t11.program([t11.expressionStatement(cloned)]), {
     noScope: true,
     Identifier(path) {
-      if (path.node.name === fromVar) path.node.name = toVar;
+      const replacement = renameMap.get(path.node.name);
+      if (replacement) path.node.name = replacement;
     }
   });
   return cloned;
@@ -5766,20 +5764,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);
@@ -5790,7 +5830,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: [] };
@@ -5999,7 +6038,8 @@ function generatePatchItemMethod(arrayMap, templatePropNames, wholeParamName, te
       }
     }
   }
-  const rawItemIdExpr = arrayMap.keyExpression ? t11.cloneNode(rewriteItemVarInExpression(arrayMap.keyExpression, arrayMap.itemVariable, "item"), true) : itemIdProperty && itemIdProperty !== ITEM_IS_KEY ? t11.logicalExpression("??", buildOptionalMemberChain(t11.identifier("item"), itemIdProperty), t11.identifier("item")) : t11.identifier("item");
+  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))
@@ -6036,6 +6076,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)]));
@@ -6047,7 +6107,7 @@ 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);
@@ -6056,6 +6116,14 @@ function collectPatchEntries(arrayMap) {
   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) {
@@ -6344,10 +6412,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")));
@@ -6380,10 +6450,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 = [
@@ -6654,7 +6725,11 @@ function generateCreateItemMethod(arrayMap, templatePropNames, wholeParamName, t
       }
     }
   }
-  const rawPatchItemIdExpr = arrayMap.keyExpression ? t11.cloneNode(rewriteItemVarInExpression(arrayMap.keyExpression, arrayMap.itemVariable, "item"), true) : itemIdProperty && itemIdProperty !== ITEM_IS_KEY ? t11.logicalExpression("??", buildOptionalMemberChain(t11.identifier("item"), itemIdProperty), t11.identifier("item")) : t11.identifier("item");
+  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 patchItemIdExpr = t11.callExpression(t11.identifier("String"), [rawPatchItemIdExpr]);
   body.push(
     t11.expressionStatement(
@@ -6827,7 +6902,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;
@@ -7467,7 +7542,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"
@@ -7491,12 +7568,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(
       "===",
@@ -8163,7 +8254,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";
 
@@ -9262,10 +9353,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([
@@ -9751,6 +9839,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,
@@ -9931,7 +10020,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;
@@ -12382,7 +12471,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);
               }
@@ -12740,15 +12829,16 @@ function generateMapRegistration(arrayMap, unresolvedMap, templatePropNames, who
   if (unresolvedMap.keyExpression) {
     const keyExpr = t20.cloneNode(unresolvedMap.keyExpression, true);
     const itemVar = unresolvedMap.itemVariable;
+    const idxVar = unresolvedMap.indexVariable;
     traverse12(t20.program([t20.expressionStatement(keyExpr)]), {
       noScope: true,
       Identifier(path) {
         if (path.node.name === itemVar) path.node.name = "__k";
+        else if (idxVar && path.node.name === idxVar) path.node.name = "__ki";
       }
     });
-    registerArgs.push(
-      t20.arrowFunctionExpression([t20.identifier("__k")], t20.callExpression(t20.identifier("String"), [keyExpr]))
-    );
+    const keyFnParams = idxVar ? [t20.identifier("__k"), t20.identifier("__ki")] : [t20.identifier("__k")];
+    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));
   }
@@ -14519,7 +14609,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;
@@ -14755,6 +14845,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();
@@ -14814,6 +14911,10 @@ function geaPlugin() {
         componentModules.add(filePath);
         return true;
       }
+      if (looksLikeGeaFunctionalComponentSource(source)) {
+        componentModules.add(filePath);
+        return true;
+      }
       return false;
     } catch {
       return false;
@@ -14896,7 +14997,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;
@@ -15018,7 +15119,7 @@ ${entries.join(",\n")}
         if (!transformed) return null;
         ensureImport(ast, "@geajs/core", "__escapeHtml");
         ensureImport(ast, "@geajs/core", "__sanitizeAttr");
-        const output = generate3(ast, { sourceMaps: true, sourceFileName: cleanId }, code);
+        const output = generate4(ast, { sourceMaps: true, sourceFileName: cleanId }, code);
         return { code: output.code, map: output.map };
       } catch (error) {
         if (error?.__geaCompileError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geajs/vite-plugin",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Vite plugin for Gea framework - JSX/TSX transform, reactivity, HMR",
   "type": "module",
   "main": "./dist/index.js",