@geajs/vite-plugin 1.0.26 → 1.0.27

package/dist/index.js

@@ -5682,13 +5682,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;
@@ -5999,7 +6001,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))
@@ -6654,7 +6657,8 @@ 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(
@@ -12740,14 +12744,17 @@ 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";
       }
     });
+    const keyFnParams = idxVar ? [t20.identifier("__k"), t20.identifier("__ki")] : [t20.identifier("__k")];
     registerArgs.push(
-      t20.arrowFunctionExpression([t20.identifier("__k")], t20.callExpression(t20.identifier("String"), [keyExpr]))
+      t20.arrowFunctionExpression(keyFnParams, t20.callExpression(t20.identifier("String"), [keyExpr]))
     );
   } else if (arrayMap.itemIdProperty && arrayMap.itemIdProperty !== ITEM_IS_KEY) {
     registerArgs.push(t20.stringLiteral(arrayMap.itemIdProperty));

package/package.json

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