@dongmingzhixiu/vuexir-compiler 0.3.16 → 0.3.18

package/dist/codegen/compose.js

@@ -434,11 +434,35 @@ 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, '\\"') + '"');
+    // R113：对象字段条件 → vrnField 取值判空
+    const negField = s.match(/^!([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)$/);
+    if (negField)
+        return `vrnField(${negField[1]}, "${negField[2]}").isEmpty()`;
+    const posField = s.match(/^([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)$/);
+    if (posField)
+        return `vrnField(${posField[1]}, "${posField[2]}").isNotEmpty()`;
+    const cmpField = s.match(/^([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)\s*(==|!=)\s*(.+)$/);
+    if (cmpField)
+        return `vrnField(${cmpField[1]}, "${cmpField[2]}") ${cmpField[3]} ${cmpField[4]}`;
+    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('.')}").isNotEmpty()` : `${v}.toString().isNotEmpty()`;
+        return `${truthy(andExpr[1])} && ${truthy(andExpr[2])}`;
+    }
+    // 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；引号归一双引号） */
 function kotlinStringExpr(expr) {
-    let s = expr.replace(/'(\\[^]|[^'\\])*'/g, (m) => '"' + m.slice(1, -1).replace(/"/g, '\\"') + '"');
+    let s0 = expr.replace(/vrnTruthy\(String\(([A-Za-z_$][\w$]*)\)\)/g, (_m, id) => `vrnTruthy(${id}.toString())`);
+    let s = s0.replace(/'(\\[^]|[^'\\])*'/g, (m) => '"' + m.slice(1, -1).replace(/"/g, '\\"') + '"');
     const ternary = s.match(/^([^?]+)\?([^:]+):(.+)$/);
     if (ternary) {
         return `if (${ternary[1].trim()}) ${ternary[2].trim()} else ${ternary[3].trim()}`;
@@ -1034,10 +1058,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;
@@ -1188,7 +1212,7 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
         case 'button': {
             const chain = modChain([...stretchModifiers(parentStretch, node), ...sizeModifiers(p), ...absModifiers(p), ...clipModifiers(p), ...visualModifiers(p), ...borderModifiers(p), ...paddingModifiers(p), ...alphaArr, ...transformModifiers(p)], pad + '            ');
             // R108：动态按钮文案（props.bind）优先；Kotlin 里用字符串模板插值
-            const label = p.bind !== undefined ? '"${' + String(p.bind) + '}"' : (p.label ?? '');
+            const label = p.bind !== undefined ? String(p.bind) : (p.label ?? '');
             const click = kotlinClickAction(p, ctx, loop);
             const labelStyle = [];
             if (p.fontSize !== undefined)

package/dist/codegen/swiftui.js

@@ -527,9 +527,26 @@ function swiftCondExpr(expr) {
     // R110：数值状态直接当条件（Swift 不接受 Int 当 Bool）
     if (/^[A-Za-z_$][\w$]*$/.test(s))
         return `vrnTruthy(String(${s}))`;
+    // R113：对象字段条件（form.avatarData）→ 走 vrnField 取 JSON 字段
+    const negField = s.match(/^!([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)$/);
+    if (negField)
+        return `vrnField(${negField[1]}, "${negField[2]}").isEmpty`;
+    const posField = s.match(/^([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)$/);
+    if (posField)
+        return `!vrnField(${posField[1]}, "${posField[2]}").isEmpty`;
+    // R113：对象字段比较（form.calendar == "gregorian"）→ vrnField 取值后比较
+    const cmpField = s.match(/^([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)\s*(==|!=)\s*(.+)$/);
+    if (cmpField)
+        return `vrnField(${cmpField[1]}, "${cmpField[2]}") ${cmpField[3]} ${cmpField[4]}`;
     // 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

@@ -1413,12 +1413,20 @@ function matchFieldPath(name) {
 }
 function parseTernaryExpr(exp) {
     const t = exp.trim();
+    // R113：三元里出现对象字段访问（form.avatarData）时，静态翻译做不到 →
+    // 直接返回 null，交给表达式下沉在 JS 运行时求值（结果一致且两端都能用）
+    if (/[A-Za-z_$][\w$]*\.[A-Za-z_$][\w$]*/.test(t))
+        return null;
     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.16",
+  "version": "0.3.18",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",