@vitarx/plugin-vite 1.0.9 → 1.0.10

package/dist/passes/components/switch.js

@@ -1,7 +1,8 @@
 import * as t from '@babel/types';
 import { isJSXElement, isJSXText } from '@babel/types';
 import { createError } from '../../error.js';
-import { createArrowFunction, createBranch, getJSXAttributeByName, getJSXElementName } from '../../utils/index.js';
+import { createArrowFunction, createBranch, filterEffectiveChildren, getJSXAttributeByName, getJSXElementName } from '../../utils/index.js';
+import { processChildren } from '../jsx/processChildren.js';
 import { getAttributeValue } from '../props/attribute.js';
 /**
  * 处理 Switch 组件
@@ -15,7 +16,7 @@ export function processSwitch(path, ctx) {
     // 收集 Match 子节点
     const matchNodes = collectMatchNodes(children);
     // 构建条件和分支
-    const { conditions, branches } = buildConditionsAndBranches(matchNodes);
+    const { conditions, branches } = buildConditionsAndBranches(matchNodes, ctx);
     // 添加 fallback 分支
     if (fallbackValue) {
         conditions.push(t.booleanLiteral(true)); // 添加一个总是为 true 的条件作为 fallback
@@ -85,9 +86,10 @@ function collectMatchNodes(children) {
  * 该函数接收一个 JSX 元素数组，提取每个元素的 when 属性作为条件，
  * 并将子元素内容转换为对应的分支函数
  * @param matchNodes - JSX 元素数组，每个元素代表一个条件分支
+ * @param ctx - 转换上下文
  * @returns 返回一个对象，包含 conditions 条件数组和 branches 分支数组
  */
-function buildConditionsAndBranches(matchNodes) {
+function buildConditionsAndBranches(matchNodes, ctx) {
     const conditions = []; // 存储提取的条件表达式
     const branches = []; // 存储转换后的分支函数
     // 遍历每个 JSX 元素，提取条件和分支
@@ -103,28 +105,19 @@ function buildConditionsAndBranches(matchNodes) {
             ? whenAttr.value.expression // 如果是表达式容器，取出表达式
             : whenAttr.value; // 否则直接使用值
         conditions.push(whenExpr); // 将条件添加到条件数组
-        // 提取分支内容，过滤掉空白文本节点
-        const matchChildren = matchNode.children.filter(c => !isJSXText(c) || c.value.trim());
-        // 检查是否有子元素
-        if (matchChildren.length === 0) {
-            throw createError('E013', matchNode); // 如果没有子元素，抛出错误
-        }
-        // 根据子元素数量创建不同的分支函数
-        if (matchChildren.length === 1) {
-            const child = matchChildren[0];
-            if (isJSXText(child)) {
-                // 如果是单个文本节点，创建返回字符串的函数
-                branches.push(createArrowFunction(t.stringLiteral(child.value.trim())));
-            }
-            else {
-                // 如果是单个表达式节点，直接使用该表达式
-                branches.push(createArrowFunction(child));
-            }
-        }
-        else {
-            // 如果有多个子元素，创建返回数组表达式的函数
-            branches.push(createArrowFunction(t.arrayExpression(matchChildren)));
+        const children = filterEffectiveChildren(matchNode);
+        if (children.length === 0)
+            throw createError('E013', matchNode);
+        // 单个纯文本分支保留原有的首尾去空白行为。
+        const first = children[0];
+        if (children.length === 1 && isJSXText(first)) {
+            branches.push(createArrowFunction(t.stringLiteral(first.value.trim())));
+            continue;
         }
+        // 复用 JSX 子节点转换，解开表达式容器并保留分支内容的响应式更新。
+        const expressions = processChildren(children, ctx);
+        const body = expressions.length === 1 ? expressions[0] : t.arrayExpression(expressions);
+        branches.push(createArrowFunction(body));
     }
     return { conditions, branches }; // 返回条件和分支数组
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitarx/plugin-vite",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "The official plugin for Vitarx support in Vite.",
   "author": "ZhuChongLin <8210856@qq.com>",
   "license": "MIT",
@@ -36,7 +36,7 @@
   },
   "peerDependencies": {
     "vitarx": "^4.0.0",
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+    "vite": "^8.3.3"
   },
   "dependencies": {
     "@babel/generator": "^7.29.1",
@@ -54,15 +54,15 @@
     "@types/babel__generator": "^7.27.0",
     "@types/babel__traverse": "^7.28.0",
     "@types/node": "^25.3.2",
-    "happy-dom": "^20.14.5",
+    "happy-dom": "21.0.4",
     "husky": "^9.1.7",
     "node": "^25.7.0",
     "prettier": "^3.8.1",
     "rimraf": "^6.1.3",
     "typescript": "^6.0.3",
     "vitarx": "^4.0.6",
-    "vite": "^8.0.5",
-    "vitest": "^4.0.18"
+    "vite": "8.3.3",
+    "vitest": "5.0.5"
   },
   "scripts": {
     "build": "vitest run && rimraf dist && tsc -p tsconfig.build.json",