@dongmingzhixiu/vuexir-compiler 0.3.14 → 0.3.15

package/dist/codegen/compose.js

@@ -150,6 +150,8 @@ const RUNTIME_KT = (bundleId) => `package ${bundleId}
 /** R73 持久化桥：对位 iOS runtime 的 localStorage（UserDefaults）—— SharedPreferences 同步读写 */
 /** R78 对象字段取值：状态里存 JSON 字符串时按 key 取值 */
 // R85 点路径取值：path 支持 "a.b.c"，末段可为 length/size（数组/对象/字符串长度）
+fun vrnTruthy(v: String): Boolean = v.isNotEmpty() && v != "false" && v != "0" && v != "null" && v != "undefined"
+
 fun vrnField(json: String, path: String, fallback: String = ""): String {
     val raw = vrnFieldRaw(json, path)
     return if (raw.isEmpty()) fallback else raw
@@ -840,6 +842,10 @@ function asyncLineKotlin(line, ctx) {
         return arg === null ? null : `VrnBridge.${bm[1]}(${arg})`;
     }
     // G15 router 语句：router.push('x') / router.back() → Runtime.push / Runtime.back
+    // router.push({ name: 'x' }) → Runtime.push("x")（对象参数取 name/path）
+    const rpObj = line.match(/^router\.push\(\s*\{\s*(?:name|path)\s*:\s*'([^']+)'[^}]*\}\s*\);?$/);
+    if (rpObj)
+        return `Runtime.push("${rpObj[1]}")`;
     const rp = line.match(/^router\.push\((.+)\);?$/);
     if (rp) {
         const a = jsExprToKotlin(rp[1].trim());

package/dist/codegen/swiftui.d.ts

@@ -36,7 +36,7 @@ export declare function buildTheme(tokens: {
     fontNames: Map<string, string>;
 };
 /** R42 生成 Theme.swift（颜色/字体去重常量） */
-export declare const VRN_HELPERS_SWIFT = "import Foundation\n\n// vuexir \u8FD0\u884C\u65F6\u8F85\u52A9\uFF08R78 \u5BF9\u8C61\u5B57\u6BB5\u53D6\u503C\uFF09\n/// R78 \u5BF9\u8C61\u5B57\u6BB5\u53D6\u503C\uFF1A\u72B6\u6001\u91CC\u5B58 JSON \u5B57\u7B26\u4E32\u65F6\u6309 key \u53D6\u503C\uFF08\u975E JSON \u2192 \u8FD4\u56DE\u7A7A\u4E32\uFF09\n/// R85 \u70B9\u8DEF\u5F84\u53D6\u503C\uFF1Akey \u652F\u6301 \"a.b.c\" \u4E0E\u672B\u6BB5 \".length\"\uFF08\u6570\u7EC4/\u5B57\u5178/\u5B57\u7B26\u4E32\u957F\u5EA6\uFF09\nfunc vrnField(_ json: String, _ path: String, _ fallback: String = \"\") -> String {\n    let raw = vrnFieldRaw(json, path)\n    return raw.isEmpty ? fallback : raw\n}\n\n/// \u539F\u59CB\u53D6\u503C\uFF08\u4E0D\u5957\u515C\u5E95\uFF09\uFF1A\u70B9\u8DEF\u5F84\u4E0B\u94BB\uFF0C\u7F3A\u5931\u8FD4\u56DE\u7A7A\u4E32\nprivate func vrnFieldRaw(_ json: String, _ path: String) -> String {\n    guard let data = json.data(using: .utf8),\n          let root = try? JSONSerialization.jsonObject(with: data, options: [.fragmentsAllowed]) else { return \"\" }\n    var cur: Any = root\n    for seg in path.split(separator: \".\").map(String.init) {\n        if seg == \"length\" || seg == \"size\" {\n            if let a = cur as? [Any] { cur = a.count }\n            else if let d = cur as? [String: Any] { cur = d.count }\n            else if let s = cur as? String { cur = s.count }\n            else { return \"\" }\n            continue\n        }\n        if let d = cur as? [String: Any], let next = d[seg] { cur = next } else { return \"\" }\n    }\n    if let s = cur as? String { return s }\n    if let b = cur as? Bool { return b ? \"true\" : \"false\" }\n    if let n = cur as? NSNumber { return n.stringValue }\n    return String(describing: cur)\n}\n";
+export declare const VRN_HELPERS_SWIFT = "import Foundation\n\n// vuexir \u8FD0\u884C\u65F6\u8F85\u52A9\uFF08R78 \u5BF9\u8C61\u5B57\u6BB5\u53D6\u503C\uFF09\n/// R78 \u5BF9\u8C61\u5B57\u6BB5\u53D6\u503C\uFF1A\u72B6\u6001\u91CC\u5B58 JSON \u5B57\u7B26\u4E32\u65F6\u6309 key \u53D6\u503C\uFF08\u975E JSON \u2192 \u8FD4\u56DE\u7A7A\u4E32\uFF09\n/// R85 \u70B9\u8DEF\u5F84\u53D6\u503C\uFF1Akey \u652F\u6301 \"a.b.c\" \u4E0E\u672B\u6BB5 \".length\"\uFF08\u6570\u7EC4/\u5B57\u5178/\u5B57\u7B26\u4E32\u957F\u5EA6\uFF09\n/// R110 \u5224\u771F\uFF1AJS \u91CC\u7684 truthiness \u8FD1\u4F3C\uFF08\u7A7A\u4E32/\"false\"/\"0\"/\"null\" \u4E3A\u5047\uFF09\nfunc vrnTruthy(_ v: String) -> Bool {\n    if v.isEmpty { return false }\n    if v == \"false\" || v == \"0\" || v == \"null\" || v == \"undefined\" { return false }\n    return true\n}\n\nfunc vrnField(_ json: String, _ path: String, _ fallback: String = \"\") -> String {\n    let raw = vrnFieldRaw(json, path)\n    return raw.isEmpty ? fallback : raw\n}\n\n/// \u539F\u59CB\u53D6\u503C\uFF08\u4E0D\u5957\u515C\u5E95\uFF09\uFF1A\u70B9\u8DEF\u5F84\u4E0B\u94BB\uFF0C\u7F3A\u5931\u8FD4\u56DE\u7A7A\u4E32\nprivate func vrnFieldRaw(_ json: String, _ path: String) -> String {\n    guard let data = json.data(using: .utf8),\n          let root = try? JSONSerialization.jsonObject(with: data, options: [.fragmentsAllowed]) else { return \"\" }\n    var cur: Any = root\n    for seg in path.split(separator: \".\").map(String.init) {\n        if seg == \"length\" || seg == \"size\" {\n            if let a = cur as? [Any] { cur = a.count }\n            else if let d = cur as? [String: Any] { cur = d.count }\n            else if let s = cur as? String { cur = s.count }\n            else { return \"\" }\n            continue\n        }\n        if let d = cur as? [String: Any], let next = d[seg] { cur = next } else { return \"\" }\n    }\n    if let s = cur as? String { return s }\n    if let b = cur as? Bool { return b ? \"true\" : \"false\" }\n    if let n = cur as? NSNumber { return n.stringValue }\n    return String(describing: cur)\n}\n";
 export declare function generateThemeSource(palette: {
     colorNames: Map<string, string>;
     fontNames: Map<string, string>;

package/dist/codegen/swiftui.js

@@ -121,6 +121,13 @@ export const VRN_HELPERS_SWIFT = `import Foundation
 // vuexir 运行时辅助（R78 对象字段取值）
 /// R78 对象字段取值：状态里存 JSON 字符串时按 key 取值（非 JSON → 返回空串）
 /// R85 点路径取值：key 支持 "a.b.c" 与末段 ".length"（数组/字典/字符串长度）
+/// R110 判真：JS 里的 truthiness 近似（空串/"false"/"0"/"null" 为假）
+func vrnTruthy(_ v: String) -> Bool {
+    if v.isEmpty { return false }
+    if v == "false" || v == "0" || v == "null" || v == "undefined" { return false }
+    return true
+}
+
 func vrnField(_ json: String, _ path: String, _ fallback: String = "") -> String {
     let raw = vrnFieldRaw(json, path)
     return raw.isEmpty ? fallback : raw
@@ -507,7 +514,22 @@ function swiftCondExpr(expr) {
     if (f)
         return `!vrnField(${f[1]}, "${f[2]}").isEmpty`;
     let s = expr.replace(/!==/g, '!=').replace(/===/g, '==');
-    s = s.replace(/'(\\[^]|[^'\\])*'/g, (m) => '"' + m.slice(1, -1).replace(/"/g, '\\"') + '"');
+    s = s.replace(/'(\[^]|[^'\\])*'/g, (m) => '"' + m.slice(1, -1).replace(/"/g, '\\"') + '"');
+    // R110：`.length` → Swift `.count`
+    s = s.replace(/\.length\b/g, '.count');
+    // R110：非布尔条件（字符串/数量）→ 真值比较
+    if (/^[A-Za-z_$][\w$]*\.count$/.test(s))
+        return `${s} > 0`;
+    // R110：取反的长度条件 → == 0
+    const neg = s.match(/^!([A-Za-z_$][\w$]*)\.count$/);
+    if (neg)
+        return `${neg[1]}.count == 0`;
+    // R110：数值状态直接当条件（Swift 不接受 Int 当 Bool）
+    if (/^[A-Za-z_$][\w$]*$/.test(s))
+        return `vrnTruthy(String(${s}))`;
+    // R110：裸标识符条件（状态可能是字符串/对象/布尔）→ 统一走判真
+    if (/^[A-Za-z_$][\w$]*$/.test(s) && !['true', 'false'].includes(s))
+        return `vrnTruthy(String(${s}))`;
     return s;
 }
 function emitNodeInner(node, ctx) {

package/dist/transform/vue2ir.js

@@ -154,7 +154,7 @@ export function extractScreenState(script) {
     }
     // R85 对象态：const board = ref({ month: { label: '10 月' }, tags: '生日' })
     // init 存规范化 JSON 字符串（双端一致：Swift/Compose 交给 vrnField 点路径解析，JS 侧解析为对象）
-    for (const m of script.matchAll(/const\s+(\w+)\s*=\s*ref(?:<[^>]*>)?\(\s*\{/g)) {
+    for (const m of script.matchAll(/const\s+(\w+)\s*=\s*(?:ref|reactive)(?:<[^>]*>)?\(\s*\{/g)) {
         const start = (m.index ?? 0) + m[0].length - 1;
         let depth = 0;
         let end = -1;

package/package.json

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