@vitarx/plugin-vite 1.0.3 → 1.0.5

package/dist/utils/generate.js

@@ -1,3 +1,9 @@
+/**
+ * 名称生成工具模块
+ * 提供唯一别名和默认导出名称的生成功能
+ * @module utils/generate
+ */
+import { DEFAULT_EXPORT_BASE_NAME } from '../constants/index.js';
 /**
  * 生成唯一的别名
  * 从 $1 开始递增，直到找到不冲突的名称
@@ -13,3 +19,17 @@ export function generateUniqueAlias(baseName, existingNames) {
     }
     return `${baseName}$${index}`;
 }
+/**
+ * 生成唯一的默认导出组件名称
+ * 优先使用基础名称，若冲突则生成唯一别名
+ * @param existingNames - 已存在的名称集合
+ * @returns 唯一的默认导出名称
+ */
+export function generateUniqueDefaultName(existingNames) {
+    // 如果默认名称未被占用，直接返回
+    if (!existingNames.has(DEFAULT_EXPORT_BASE_NAME)) {
+        return DEFAULT_EXPORT_BASE_NAME;
+    }
+    // 否则生成唯一别名
+    return generateUniqueAlias(DEFAULT_EXPORT_BASE_NAME, existingNames);
+}

package/dist/utils/index.d.ts

@@ -1,8 +1,8 @@
-export { isWhitespaceJSXText } from './ast-guards.js';
-export { getJSXElementName, resolveJSXElementType, isPureCompileComponent, isComponent, isNativeElement, getJSXAttributeByName, hasDirective, getDirectiveValue, isVIfChain, isVIf, isVElseIf, isVElse, removeVDirectives, removeVIfChainDirectives, removeAttribute, filterWhitespaceChildren, hasEffectiveChildren, filterEffectiveChildren, validateNoDirectMatchChild } from './jsx-helpers.js';
+export { isWhitespaceJSXText, isJSXComment } from './ast-guards.js';
+export { getJSXElementName, resolveJSXElementType, isPureCompileComponent, isComponent, isNativeElement, getJSXAttributeByName, hasDirective, getDirectiveValue, isVIfChain, isVIf, isVElseIf, isVElse, removeVDirectives, removeVIfChainDirectives, removeAttribute, filterWhitespaceChildren, hasEffectiveChildren, filterEffectiveChildren } from './jsx-helpers.js';
 export { createUnrefCall, createAccessorCall, createExprCall, createBranchCall, createCreateViewCall, createWithDirectivesCall, createArrowFunction, createLocationObject, addPureComment, getAlias, getDevLocInfo } from './ast-builders.js';
 export { collectPatternBindings, collectObjectPatternBindings } from './pattern-helpers.js';
 export { createBranch, createBinaryBranch, buildNestedCondition, type BranchConfig } from './branch-factory.js';
 export { validateVIfChain, collectVIfChainInfo, collectFragmentVIfChains, type VIfChainInfo } from './vif-helpers.js';
 export { collectComponentFunctions, type ComponentInfo } from './component-collect.js';
-export { generateUniqueAlias } from './generate.js';
+export { generateUniqueAlias, generateUniqueDefaultName } from './generate.js';

package/dist/utils/index.js

@@ -1,7 +1,7 @@
 // 类型守卫
-export { isWhitespaceJSXText } from './ast-guards.js';
+export { isWhitespaceJSXText, isJSXComment } from './ast-guards.js';
 // JSX 辅助函数
-export { getJSXElementName, resolveJSXElementType, isPureCompileComponent, isComponent, isNativeElement, getJSXAttributeByName, hasDirective, getDirectiveValue, isVIfChain, isVIf, isVElseIf, isVElse, removeVDirectives, removeVIfChainDirectives, removeAttribute, filterWhitespaceChildren, hasEffectiveChildren, filterEffectiveChildren, validateNoDirectMatchChild } from './jsx-helpers.js';
+export { getJSXElementName, resolveJSXElementType, isPureCompileComponent, isComponent, isNativeElement, getJSXAttributeByName, hasDirective, getDirectiveValue, isVIfChain, isVIf, isVElseIf, isVElse, removeVDirectives, removeVIfChainDirectives, removeAttribute, filterWhitespaceChildren, hasEffectiveChildren, filterEffectiveChildren } from './jsx-helpers.js';
 // AST 构建函数
 export { createUnrefCall, createAccessorCall, createExprCall, createBranchCall, createCreateViewCall, createWithDirectivesCall, createArrowFunction, createLocationObject, addPureComment, getAlias, getDevLocInfo } from './ast-builders.js';
 // 模式处理辅助函数
@@ -13,4 +13,4 @@ export { validateVIfChain, collectVIfChainInfo, collectFragmentVIfChains } from
 // 组件收集
 export { collectComponentFunctions } from './component-collect.js';
 // 生成器
-export { generateUniqueAlias } from './generate.js';
+export { generateUniqueAlias, generateUniqueDefaultName } from './generate.js';

package/dist/utils/jsx-helpers.d.ts

@@ -101,8 +101,5 @@ export declare function hasEffectiveChildren(node: JSXElement): boolean;
  */
 export declare function filterEffectiveChildren(node: JSXElement): t.Node[];
 /**
- * 校验子节点中不能直接包含 Match 组件
- * Match 必须在 Switch 内使用，非 Switch 元素的子节点中不允许出现 Match
- * @param children - 子节点数组
+ * 过滤掉空白文本子节点
  */
-export declare function validateNoDirectMatchChild(children: t.Node[]): void;

package/dist/utils/jsx-helpers.js

@@ -4,9 +4,8 @@
  * @module utils/jsx-helpers
  */
 import * as t from '@babel/types';
-import { isJSXElement, isJSXText } from '@babel/types';
+import { isJSXText } from '@babel/types';
 import { DIRECTIVE_PREFIX, PURE_COMPILE_COMPONENTS, V_IF_CHAIN_DIRECTIVES } from '../constants/index.js';
-import { createError } from '../error.js';
 import { isWhitespaceJSXText } from './ast-guards.js';
 /**
  * 获取 JSX 元素的名称
@@ -253,17 +252,5 @@ export function filterEffectiveChildren(node) {
     return node.children.filter(isEffectiveChild);
 }
 /**
- * 校验子节点中不能直接包含 Match 组件
- * Match 必须在 Switch 内使用，非 Switch 元素的子节点中不允许出现 Match
- * @param children - 子节点数组
+ * 过滤掉空白文本子节点
  */
-export function validateNoDirectMatchChild(children) {
-    for (const child of children) {
-        if (isJSXElement(child)) {
-            const childName = getJSXElementName(child);
-            if (childName === 'Match') {
-                throw createError('E012', child);
-            }
-        }
-    }
-}

package/dist/utils/vif-helpers.js

@@ -6,7 +6,7 @@
 import * as t from '@babel/types';
 import { isJSXElement, isJSXText } from '@babel/types';
 import { createError } from '../error.js';
-import { isWhitespaceJSXText } from './ast-guards.js';
+import { isJSXComment, isWhitespaceJSXText } from './ast-guards.js';
 import { getDirectiveValue, hasDirective, isVElse, isVElseIf, isVIf, isVIfChain } from './jsx-helpers.js';
 /**
  * 验证 v-if 链的合法性
@@ -125,7 +125,9 @@ export function collectFragmentVIfChains(children) {
  */
 function collectSingleChainFromFragment(children, startIndex) {
     const nodes = [children[startIndex]];
-    const conditions = [getDirectiveValue(nodes[0], 'v-if')];
+    // v-if 指令值已由 validateVIfChain 保证存在，fallback 为 true（无表达式时）
+    const vIfValue = getDirectiveValue(nodes[0], 'v-if') ?? t.booleanLiteral(true);
+    const conditions = [vIfValue];
     let j = startIndex + 1;
     // 继续收集后续的 v-else-if 和 v-else
     while (j < children.length) {
@@ -135,6 +137,11 @@ function collectSingleChainFromFragment(children, startIndex) {
             j++;
             continue;
         }
+        // 跳过 JSX 注释节点（允许链元素间有注释，如 {/* comment *\/}）
+        if (isJSXComment(nextChild)) {
+            j++;
+            continue;
+        }
         // 遇到非 JSXElement，链结束
         if (!isJSXElement(nextChild))
             break;
@@ -142,9 +149,10 @@ function collectSingleChainFromFragment(children, startIndex) {
         if (!isVIfChain(nextChild))
             break;
         if (isVElseIf(nextChild)) {
-            // 收集 v-else-if
+            // 收集 v-else-if，值已由 validateVIfChain 保证存在
             nodes.push(nextChild);
-            conditions.push(getDirectiveValue(nextChild, 'v-else-if'));
+            const vElseIfValue = getDirectiveValue(nextChild, 'v-else-if') ?? t.booleanLiteral(true);
+            conditions.push(vElseIfValue);
             j++;
         }
         else if (isVElse(nextChild)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitarx/plugin-vite",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "The official plugin for Vitarx support in Vite.",
   "author": "ZhuChongLin <8210856@qq.com>",
   "license": "MIT",
@@ -61,7 +61,7 @@
     "rimraf": "^6.1.3",
     "vitest": "^4.0.18",
     "vite": "^8.0.5",
-    "vitarx": "^4.0.0"
+    "vitarx": "^4.0.6"
   },
   "scripts": {
     "build": "vitest run && rimraf dist && tsc -p tsconfig.build.json",