@geajs/vite-plugin 1.1.0 → 1.1.2

package/dist/index.js

@@ -3773,6 +3773,16 @@ function analyzeChildren(node, tagName, elementPath, bindings, propBindings, arr
         );
         const slotCountAfter = conditionalSlots?.length ?? 0;
         const slotId = slotCountAfter > slotCountBefore ? conditionalSlots[slotCountAfter - 1].slotId : void 0;
+        if (slotCountAfter > slotCountBefore && conditionalSlots && conditionalSlotNodeMap && templateSetupContext) {
+          registerNestedConditionalsInBranches(
+            expr,
+            stateRefs,
+            templateSetupContext,
+            conditionalSlots,
+            conditionalSlotNodeMap,
+            classBody2
+          );
+        }
         nestedMapCalls.forEach(({ mapExpr, parentElement, containerPath }) => {
           let mapNode = node;
           let mapElementPath = elementPath;
@@ -4320,6 +4330,59 @@ function extractConditionalControlExpression(expr) {
   }
   return null;
 }
+function registerNestedConditionalsInBranches(expr, stateRefs, templateSetupContext, conditionalSlots, conditionalSlotNodeMap, classBody2) {
+  function visitChildren(children) {
+    for (const child of children) {
+      if (t9.isJSXElement(child)) visitChildren(child.children);
+      else if (t9.isJSXFragment(child)) visitChildren(child.children);
+      else if (t9.isJSXExpressionContainer(child) && !t9.isJSXEmptyExpression(child.expression)) {
+        const innerExpr = child.expression;
+        if (!expressionMayProduceJSX(innerExpr)) continue;
+        const conditionExpr = extractConditionalControlExpression(innerExpr);
+        if (!conditionExpr) continue;
+        const condSetupStatements = collectTemplateSetupStatements(conditionExpr, templateSetupContext);
+        const fullSetupStatements = collectTemplateSetupStatements(innerExpr, templateSetupContext);
+        const allDeps = collectExpressionDependencies(conditionExpr, stateRefs, condSetupStatements);
+        if (allDeps.length === 0) continue;
+        const slotId = `c${conditionalSlots.length}`;
+        conditionalSlots.push({
+          slotId,
+          conditionExpr: t9.cloneNode(conditionExpr, true),
+          setupStatements: condSetupStatements.map((s) => t9.cloneNode(s, true)),
+          htmlSetupStatements: fullSetupStatements.map((s) => t9.cloneNode(s, true)),
+          ...expressionContainsComponentJSX(innerExpr) ? { hasCompiledChildren: true } : {},
+          dependentPropNames: [],
+          dependencies: allDeps.map((dep) => ({
+            observeKey: dep.observeKey,
+            pathParts: [...dep.pathParts],
+            ...dep.storeVar ? { storeVar: dep.storeVar } : {}
+          })),
+          originalExpr: t9.cloneNode(innerExpr, true)
+        });
+        conditionalSlotNodeMap.set(innerExpr, slotId);
+        registerNestedConditionalsInBranches(
+          innerExpr,
+          stateRefs,
+          templateSetupContext,
+          conditionalSlots,
+          conditionalSlotNodeMap,
+          classBody2
+        );
+      }
+    }
+  }
+  function visitBranch(node) {
+    if (t9.isJSXElement(node)) visitChildren(node.children);
+    else if (t9.isJSXFragment(node)) visitChildren(node.children);
+    else if (t9.isParenthesizedExpression(node)) visitBranch(node.expression);
+  }
+  if (t9.isConditionalExpression(expr)) {
+    visitBranch(expr.consequent);
+    visitBranch(expr.alternate);
+  } else if (t9.isLogicalExpression(expr) && expr.operator === "&&") {
+    visitBranch(expr.right);
+  }
+}
 function buildDerivedPropBindings(expr, type, attributeName, elementPath, propsParamName, destructuredPropNames, templateSetupContext, classBody2) {
   if (t9.isJSXEmptyExpression(expr) || !templateSetupContext) return [];
   const setupStatements = collectTemplateSetupStatements(expr, templateSetupContext);
@@ -5724,8 +5787,15 @@ function processChildren(children, parts, ctx, elementPath, dcCursor, directChil
         appendString(parts, `-->`);
         pushString(parts, "");
         const slotCtx = { ...ctx, elementPathPrefix: "__cs_" + slot.slotId };
+        const eventIdBefore = ctx.eventIdCounter?.value ?? 0;
         let condExpr = transformJSXExpression(rawExpr, slotCtx);
-        const extracted = extractHtmlTemplatesFromRawConditional(rawExpr, ctx, slot.slotId) ?? extractHtmlTemplatesFromConditional(condExpr);
+        const extractCtx = {
+          ...ctx,
+          isRoot: false,
+          eventHandlers: ctx.eventHandlers ? [] : void 0,
+          eventIdCounter: ctx.eventIdCounter ? { value: eventIdBefore } : void 0
+        };
+        const extracted = extractHtmlTemplatesFromRawConditional(rawExpr, extractCtx, slot.slotId) ?? extractHtmlTemplatesFromConditional(condExpr);
         slot.truthyHtmlExpr = extracted.truthyHtmlExpr;
         slot.falsyHtmlExpr = extracted.falsyHtmlExpr;
         if (expressionMayBeFalsy(rawExpr)) {
@@ -7923,7 +7993,13 @@ function appendEventsGetterHandlers(classBody2, handlers, paramContext, setupSta
       eventsObject.properties.push(eventTypeProp);
     }
     const selectorMap = eventTypeProp.value;
-    selectorMap.properties.push(t13.objectProperty(selectorExpr, handlerRef, !handler.selector));
+    const selectorCode = generate2(selectorExpr).code;
+    const isDuplicate = selectorMap.properties.some(
+      (prop) => t13.isObjectProperty(prop) && generate2(prop.key).code === selectorCode
+    );
+    if (!isDuplicate) {
+      selectorMap.properties.push(t13.objectProperty(selectorExpr, handlerRef, !handler.selector));
+    }
   });
 }
 function buildSelectorHandlerMethod(handler, methodName, paramContext, setupStatements) {

package/package.json

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