@dongmingzhixiu/vuexir-compiler 0.4.1 → 0.4.3

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) {
@@ -810,7 +814,7 @@ function emitNodeInner(node, ctx) {
             let line = isRef
                 ? pad(`Text(${props.ref})`)
                 : props.bindExpr !== undefined
-                    ? pad(`Text(${props.bindExpr})`)
+                    ? pad(`Text(${String(props.bindExpr).includes('.') ? '""' : props.bindExpr})`)
                     : props.fieldOf !== undefined
                         ? pad(`Text(vrnField(${props.fieldOf.obj}, "${props.fieldOf.field}"${props.fieldOf.fallback !== undefined ? `, "${swiftStringEscape(props.fieldOf.fallback)}"` : ''}))`)
                         : props.dynField !== undefined

package/dist/transform/vue2ir.js

@@ -41,6 +41,8 @@ function addJsExprState(expr) {
     jsExprStates.push({ name, init: '', computed: js });
     return name;
 }
+/** R125 当前生效的 v-for 作用域栈（绕开 loopScope 透传不一致的问题） */
+let activeLoops = [];
 /** R115 是否允许未注册组件降级（由 vueToIr 选项设置） */
 let allowUnknownComponentsFlag = false;
 /** R104 脚本里声明过的名字（const/let/function）——未登记为 state 时走运行时求值 */
@@ -979,6 +981,7 @@ export function vueToIr(source, opts = {}) {
     jsExprSeq = 0;
     jsExprStates = [];
     allowUnknownComponentsFlag = opts.allowUnknownComponents === true;
+    activeLoops = [];
     const warnings = [];
     const { descriptor, errors } = parse(source, { filename: 'Screen.vue' });
     if (errors.length > 0) {
@@ -1417,12 +1420,18 @@ function walk(node, classProps, comboRules, scopedRules, pseudoRules, warnings,
             if (tri)
                 return [{ type: 'text', props: { bindExpr: tri } }];
             // M2：v-for 循环变量（item/index）优先于状态表
-            const loopVar = loopScope.find((l) => l.itemKey === name || l.indexKey === name);
+            const loopVar = loopScope.find((l) => l.itemKey === name || l.indexKey === name) ??
+                [...activeLoops].reverse().find((l) => l.itemKey === name.split('.')[0] || l.indexKey === name.split('.')[0]);
             if (loopVar) {
-                // M4b 动态列表项属性访问 {{ item.field }} → dynField（Swift 侧 [String: Any] 字段取值）
+                // M4b 动态列表项属性访问 {{ item.field }} / item.a.b → dynField（点路径拍平键）
                 const dot = name.split('.');
-                if (dot.length === 2 && dot[0] === loopVar.itemKey && /^\w+$/.test(dot[1])) {
-                    return [{ type: 'text', props: { dynField: { var: dot[0], field: dot[1] } } }];
+                if (dot.length >= 2 && dot[0] === loopVar.itemKey && dot.slice(1).every((seg) => /^\w+$/.test(seg))) {
+                    return [{ type: 'text', props: { dynField: { var: dot[0], field: dot.slice(1).join('.') } } }];
+                }
+                // R126：循环体内出现复杂表达式（三元等）→ 原生端无法静态求值，置空避免非法代码
+                if (!/^[A-Za-z_$][\w$]*(\.[A-Za-z_$][\w$]*)*$/.test(name)) {
+                    warnings.push(`v-for 项内复杂表达式「${name.slice(0, 30)}」暂不支持 → 已置空（R126）`);
+                    return [{ type: 'text', props: { text: ' ' } }];
                 }
                 return [{ type: 'text', bind: { key: name } }];
             }
@@ -1707,10 +1716,12 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
                         ...node,
                         props: node.props.filter((p) => !(p.type === NodeTypes.DIRECTIVE && p.name === 'for')),
                     };
+                    activeLoops.push({ itemKey: vfSunk.itemKey, indexKey: vfSunk.indexKey });
                     const itemSunk = walkElement(innerNodeSunk, classProps, comboRules, scopedRules, pseudoRules, warnings, state, compTable, propRefs, [
                         ...loopScope,
                         { itemKey: vfSunk.itemKey, indexKey: vfSunk.indexKey },
                     ], ancestorClasses);
+                    activeLoops.pop();
                     return { type: 'for', vfor: vfSunk, children: [itemSunk] };
                 }
             }
@@ -1746,10 +1757,12 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
             throw new VueCompileError(`v-for 动态数据源「${vf.listState}」未在 <script setup> 中声明为 ref 数组（M4b）`);
         }
         const innerNode = { ...node, props: node.props.filter((p) => !(p.type === NodeTypes.DIRECTIVE && p.name === 'for')) };
+        activeLoops.push({ itemKey: vf.itemKey, indexKey: vf.indexKey });
         const item = walkElement(innerNode, classProps, comboRules, scopedRules, pseudoRules, warnings, state, compTable, propRefs, [
             ...loopScope,
             { itemKey: vf.itemKey, indexKey: vf.indexKey },
         ], ancestorClasses);
+        activeLoops.pop();
         return { type: 'for', vfor: vf, children: [item] };
     }
     // R76 Vue 内置容器组件（Transition/KeepAlive/Teleport/Suspense/Fragment）→ 透明展开：
@@ -1984,6 +1997,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;
@@ -2000,7 +2014,8 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
                 // 动态列表项属性 {{ item.field }}：基名（dot[0]）命中循环变量才成立
                 const dot = name.split('.');
                 const base = dot[0];
-                const loopVar = loopScope.find((l) => l.itemKey === base || l.indexKey === base);
+                const loopVar = loopScope.find((l) => l.itemKey === base || l.indexKey === base) ??
+                    [...activeLoops].reverse().find((l) => l.itemKey === base || l.indexKey === base);
                 const dyn = loopVar && dot.length >= 2 && dot[0] === loopVar.itemKey && dot.slice(1).every((seg) => /^\w+$/.test(seg));
                 if (!text && !parts.some((p) => 'bind' in p || 'dynField' in p || 'fieldOf' in p)) {
                     // M2 模板内三元（D1 小范围）：cond ? 'a' : 'b' → Swift 三元字符串表达式（Text(expr)）
@@ -2069,7 +2084,7 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
                 }
                 // 混合段：静态文本之后的插值
                 if (dyn)
-                    parts.push({ dynField: { var: dot[0], field: dot[1] } });
+                    parts.push({ dynField: { var: dot[0], field: dot.slice(1).join('.') } });
                 else if (/^\w+$/.test(name) && (loopVar || (state && state.states.some((s) => s.name === name))))
                     parts.push({ bind: name });
                 else if (propRefs)
@@ -2163,7 +2178,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 只对容器有意义）
@@ -2225,7 +2263,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.1",
+  "version": "0.4.3",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",