@dongmingzhixiu/vuexir-compiler 0.4.2 → 0.4.4

package/dist/codegen/compose.js

@@ -439,6 +439,10 @@ function safeBind(name, ctx, loop) {
     return '""';
 }
 function kotlinCondExpr(expr, ctx, loop) {
+    // R128：下沉的条件状态 → 判真
+    const sunk = expr.match(/^__vrnCond:(\w+)$/);
+    if (sunk)
+        return `vrnTruthy(${sunk[1]}.toString())`;
     // R114：条件里引用了原生端不存在的标识符 → 回退为 true（保留内容）并告警，避免整页编译失败
     {
         // 先剥掉字符串字面量，避免把 "success" 之类当成标识符

package/dist/codegen/swiftui.js

@@ -511,6 +511,10 @@ function emitNode(node, ctx) {
 }
 /** JS 条件表达式 → Swift 兼容：===/!== 为 JS 严格比较，Swift 用 ==/!=；字符串字面量单引号 → 双引号 */
 function swiftCondExpr(expr, known) {
+    // R128：下沉的条件状态 → 判真
+    const sunk = expr.match(/^__vrnCond:(\w+)$/);
+    if (sunk)
+        return `vrnTruthy(${sunk[1]})`;
     // R114：条件引用原生端不存在的标识符 → true（保留内容），避免整页编译失败
     const knownSet = known && known.size > 0 ? known : currentStateNames;
     if (knownSet && knownSet.size > 0) {

package/dist/transform/vue2ir.js

@@ -499,6 +499,12 @@ function __vrnSyncPage() {
   try {
     var page = typeof __vrnPage !== "undefined" ? __vrnPage : (typeof globalThis !== "undefined" ? globalThis.__vrnPage : undefined);
     if (!page) return;
+    // R129：页面脚本的函数/常量也提到全局，模板里的 {{ greet() }} 类表达式才能求值
+    for (var fk in page) {
+      try {
+        if (typeof globalThis[fk] === "undefined" && typeof page[fk] === "function") globalThis[fk] = page[fk];
+      } catch (e) {}
+    }
     for (var k in page) {
       try {
         var v = page[k];
@@ -1997,6 +2003,7 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
     //    组件 View 内 {{ prop }}（propRefs）→ 单插值时可整体作为 text ref（Text(prop)）
     //  - 其余（group/image）：递归 walk
     const children = [];
+    let prevCondExpr;
     if (mapping.type === 'text') {
         let text = '';
         let refOnly;
@@ -2177,7 +2184,30 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
                 }
                 continue;
             }
-            children.push(...walk(child, classProps, comboRules, scopedRules, pseudoRules, warnings, state, compTable, propRefs, loopScope, [...ancestorClasses, ...elementClasses]));
+            // R128：v-else / v-else-if 与前一兄弟互补（此前无条件渲染，空状态块常显）
+            const __kids = walk(child, classProps, comboRules, scopedRules, pseudoRules, warnings, state, compTable, propRefs, loopScope, [
+                ...ancestorClasses,
+                ...elementClasses,
+            ]);
+            if (child.type === NodeTypes.ELEMENT) {
+                const dirs = child.props.filter((p2) => p2.type === NodeTypes.DIRECTIVE);
+                const isElse = dirs.some((d) => d.name === 'else');
+                const elseIf = dirs.find((d) => d.name === 'else-if');
+                if (isElse || elseIf) {
+                    const prev = prevCondExpr;
+                    const own = elseIf?.exp?.content?.trim();
+                    if (prev) {
+                        const condExpr = own ? `(${prev}) && (${own})` : `!(${prev})`;
+                        const stName = addJsExprState(`String(${condExpr})`);
+                        for (const k of __kids)
+                            k.condition = `__vrnCond:${stName}`;
+                    }
+                }
+                const ifDir = dirs.find((d) => d.name === 'if');
+                if (ifDir?.exp?.content)
+                    prevCondExpr = ifDir.exp.content.trim();
+            }
+            children.push(...__kids);
         }
     }
     // R108：文本节点丢弃布局类属性（原生端 width/height/flexDirection 只对容器有意义）
@@ -2239,7 +2269,19 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
         const mCond = nc.match(/^([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)$/);
         const ownerKnown = mCond !== null &&
             ((state?.states ?? []).some((st) => st.name === mCond[1]) || (propRefs?.has(mCond[1]) ?? false));
-        irNode.condition = ownerKnown && mCond ? `__vrnField__:${mCond[1]}:${mCond[2]}` : nc;
+        // R128：条件里的复杂表达式（含 || && 比较、对象字段组合）统一下沉给 JS 运行时求值，
+        // 生成 `__vrnCond:<state>`，两端只判真——不再往条件翻译器里堆规则
+        const simpleCond = /^[A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*)?$/.test(nc) ||
+            /^![A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*)?$/.test(nc) ||
+            /^[A-Za-z_$][\w$]*(\.length)?\s*(==|!=|>|<|>=|<=)\s*('.*'|".*"|-?\d+)$/.test(nc);
+        const usesLoopVar = activeLoops.some((l) => new RegExp(`\\b${l.itemKey}\\b`).test(nc));
+        if (!simpleCond && !usesLoopVar) {
+            const stName = addJsExprState(`String(${nc})`);
+            irNode.condition = `__vrnCond:${stName}`;
+        }
+        else {
+            irNode.condition = ownerKnown && mCond ? `__vrnField__:${mCond[1]}:${mCond[2]}` : nc;
+        }
     }
     if (activeWhen && activeProps) {
         irNode.active = { when: activeWhen, props: activeProps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir-compiler",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",