@dongmingzhixiu/vuexir-compiler 0.3.15 → 0.3.17

package/dist/codegen/compose.js

@@ -434,6 +434,14 @@ function kotlinCondExpr(expr) {
         return `vrnField(${f[1]}, "${f[2]}").isNotEmpty()`;
     let s = expr.replace(/!==/g, '!=').replace(/===/g, '==');
     s = s.replace(/'(\\[^]|[^'\\])*'/g, (m) => '"' + m.slice(1, -1).replace(/"/g, '\\"') + '"');
+    // R111：Kotlin 不接受 String/Int 当条件 → 统一判真
+    const neg = s.match(/^!([A-Za-z_$][\w$]*)(?:\.length)?$/);
+    if (neg)
+        return `vrnTruthy(${neg[1]}.toString()).not()`;
+    if (/^[A-Za-z_$][\w$]*\.length$/.test(s))
+        return `${s} > 0`;
+    if (/^[A-Za-z_$][\w$]*$/.test(s) && !['true', 'false'].includes(s))
+        return `vrnTruthy(${s}.toString())`;
     return s;
 }
 /** Swift 风格字符串表达式 → Kotlin（三元 c ? a : b → if (c) a else b；引号归一双引号） */
@@ -701,7 +709,12 @@ function kotlinClickAction(p, ctx, loop) {
             return dec[1] + ' = ' + dec[1] + ' - 1';
         const push = h.match(/router(?:\.push|Push)?\(\s*(.+?)\s*\)/);
         if (push) {
-            const arg = push[1].trim();
+            const arg0 = push[1].trim();
+            // R111：router.push({ name: 'x' }) / { path: 'x' } → 只取目标值（Kotlin 里对象字面量会被当 lambda）
+            const objM = arg0.match(/^\{[^}]*?(?:name|path)\s*:\s*['"]([^'"]+)['"]/);
+            if (objM)
+                return 'Runtime.push("' + objM[1] + '")';
+            const arg = arg0;
             const isLit = (arg.startsWith("'") && arg.endsWith("'")) || (arg.startsWith('"') && arg.endsWith('"'));
             if (isLit)
                 return 'Runtime.push(' + kotlinStr(arg.slice(1, -1)) + ')';
@@ -960,7 +973,7 @@ function emitNode(node, ctx, depth, loop, useParamModifier = false, parentStretc
     if (node.condition && node.type !== 'root') {
         return (pad + 'if (' + kotlinCondExpr(node.condition) + ') {\n' +
             emitNodeInner(node, ctx, depth + 1, loop, useParamModifier, parentStretch) +
-            '\n' + pad + '}');
+            '\n' + pad + '}\n');
     }
     return emitNodeInner(node, ctx, depth, loop, useParamModifier, parentStretch);
 }
@@ -1029,10 +1042,10 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
                 pre += cpad + 'Spacer(\n' + cpad + '    modifier = Modifier.width(' + dp(cp.marginLeft) + '),\n' + cpad + ')\n';
             }
             if (kind === 'Row' && cp.marginRight !== undefined) {
-                post = post + cpad + 'Spacer(\n' + cpad + '    modifier = Modifier.width(' + dp(cp.marginRight) + '),\n' + cpad + ')\n';
+                post = post + '\n' + cpad + 'Spacer(\n' + cpad + '    modifier = Modifier.width(' + dp(cp.marginRight) + '),\n' + cpad + ')\n';
             }
             if (kind === 'Column' && cp.marginBottom !== undefined) {
-                post = post + cpad + 'Spacer(\n' + cpad + '    modifier = Modifier.height(' + dp(cp.marginBottom) + '),\n' + cpad + ')\n';
+                post = post + '\n' + cpad + 'Spacer(\n' + cpad + '    modifier = Modifier.height(' + dp(cp.marginBottom) + '),\n' + cpad + ')\n';
             }
             const stretch = kind === 'Column' && cp.width === undefined && cp.flex === undefined && cp.position !== 'absolute' && !cp.marginLeftAuto;
             return pre + emitNode(c, ctx, d, undefined, false, stretch) + post;

package/dist/codegen/swiftui.js

@@ -530,6 +530,12 @@ function swiftCondExpr(expr) {
     // R110：裸标识符条件（状态可能是字符串/对象/布尔）→ 统一走判真
     if (/^[A-Za-z_$][\w$]*$/.test(s) && !['true', 'false'].includes(s))
         return `vrnTruthy(String(${s}))`;
+    // R112：循环项字段的 && 组合（item && item.cd）→ 判真
+    const andExpr = s.match(/^([A-Za-z_$][\w$.]*)\s*&&\s*([A-Za-z_$][\w$.]*)$/);
+    if (andExpr) {
+        const truthy = (v) => (v.includes('.') ? `!vrnField(${v.split('.')[0]}, "${v.split('.').slice(1).join('.')}").isEmpty` : `vrnTruthy(String(${v}))`);
+        return `${truthy(andExpr[1])} && ${truthy(andExpr[2])}`;
+    }
     return s;
 }
 function emitNodeInner(node, ctx) {

package/dist/transform/vue2ir.js

@@ -1416,9 +1416,13 @@ function parseTernaryExpr(exp) {
     const m = t.match(/^(.+?)\s*\?\s*'([^']+)'\s*:\s*'([^']+)'$/);
     if (!m)
         return null;
-    const cond = swiftExpr(m[1]);
+    let cond = swiftExpr(m[1]);
     if (cond === null)
         return null;
+    // R112：三元条件里的字符串/数字状态要判真（Swift/Kotlin 不接受非 Bool 条件）
+    if (/^[A-Za-z_$][\w$]*$/.test(cond) && !['true', 'false'].includes(cond)) {
+        cond = `vrnTruthy(String(${cond}))`;
+    }
     return `${cond} ? "${m[2]}" : "${m[3]}"`;
 }
 /**

package/package.json

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