@dongmingzhixiu/vuexir-compiler 0.3.17 → 0.3.19

package/dist/codegen/compose.js

@@ -427,13 +427,56 @@ function kotlinStr(s) {
     return `"${s.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '${\'$\'}').replace(/\n/g, '\\n').replace(/\r/g, '\\r')}"`;
 }
 /** 条件表达式 → Kotlin（对位 iOS swiftCondExpr：=== / !== 归一 + 单引号字符串转双引号） */
-function kotlinCondExpr(expr) {
+/** R114：文本绑定里引用的标识符若既不是页面状态也不是循环变量 → 视为未支持，回退空串 */
+function safeBind(name, ctx, loop) {
+    const base = name.split('.')[0];
+    const isState = (ctx.states ?? []).some((st) => st.name === base);
+    const isLoop = loop && (loop.itemKey === base || loop.indexKey === base);
+    const isGlobal = ['true', 'false', 'Math', 'String', 'Number'].includes(base);
+    if (isState || isLoop || isGlobal)
+        return loopField(name, loop);
+    ctx.warnings?.push?.(`模板引用「${name}」在原生端没有对应状态 → 已回退空串（R114）`);
+    return '""';
+}
+function kotlinCondExpr(expr, ctx, loop) {
+    // R114：条件里引用了原生端不存在的标识符 → 回退为 true（保留内容）并告警，避免整页编译失败
+    {
+        const ids = [...expr.matchAll(/(?<![.\w$])([A-Za-z_$][\w$]*)/g)].map((m) => m[1]);
+        const known = new Set((ctx?.states ?? []).map((st) => st.name));
+        if (loop) {
+            known.add(loop.itemKey);
+            if (loop.indexKey)
+                known.add(loop.indexKey);
+        }
+        for (const k of ['true', 'false', 'Math', 'String', 'Number', 'stateStore'])
+            known.add(k);
+        const unknown = ids.filter((id) => !known.has(id));
+        if (unknown.length > 0 && ctx) {
+            ctx.warnings?.push?.(`条件「${expr.slice(0, 40)}」引用了原生端不存在的标识符（${unknown.join(', ')}）→ 按 true 处理（R114）`);
+            return 'true';
+        }
+    }
     // R78 续（G12）：对象字段条件 → 非空判断
     const f = expr.match(/^__vrnField__:(\w+):(\w+)$/);
     if (f)
         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)
@@ -446,7 +489,8 @@ function kotlinCondExpr(expr) {
 }
 /** 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()}`;
@@ -971,7 +1015,7 @@ function emitNode(node, ctx, depth, loop, useParamModifier = false, parentStretc
     const pad = '  '.repeat(depth);
     // v-if → Kotlin if 包裹（表达式为双端兼容子集 ==/!=/&&/||/!，=== / !== 由 kotlinCondExpr 归一）
     if (node.condition && node.type !== 'root') {
-        return (pad + 'if (' + kotlinCondExpr(node.condition) + ') {\n' +
+        return (pad + 'if (' + kotlinCondExpr(node.condition, ctx, loop) + ') {\n' +
             emitNodeInner(node, ctx, depth + 1, loop, useParamModifier, parentStretch) +
             '\n' + pad + '}\n');
     }
@@ -1122,7 +1166,7 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
                     if ('text' in seg)
                         return String(seg.text).replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '${\'$\'}').replace(/\n/g, '\\n');
                     if ('bind' in seg)
-                        return '${' + loopField(seg.bind, loop) + '}';
+                        return '${' + safeBind(seg.bind, ctx, loop) + '}';
                     if ('fieldOf' in seg)
                         return ('${vrnField(' +
                             seg.fieldOf.obj +
@@ -1153,7 +1197,7 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
                 textExpr = kotlinStringExpr(p.bindExpr);
             }
             else if (p.bind !== undefined) {
-                textExpr = '"${' + loopField(p.bind, loop) + '}"';
+                textExpr = '"${' + safeBind(String(p.bind), ctx, loop) + '}"';
             }
             else if (p.ref !== undefined) {
                 textExpr = '"${' + loopField(p.ref, loop) + '}"';
@@ -1196,7 +1240,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

@@ -502,13 +502,21 @@ function emitNode(node, ctx) {
     if (node.condition) {
         const L = ctx.level;
         const inner = emitNodeInner(node, ctx);
-        const swiftCond = swiftCondExpr(node.condition);
+        const known = ctx.stateNames ?? new Set();
+        const swiftCond = swiftCondExpr(node.condition, known);
         return `${indent(L)}if ${swiftCond} {\n${inner}\n${indent(L)}}`;
     }
     return emitNodeInner(node, ctx);
 }
 /** JS 条件表达式 → Swift 兼容：===/!== 为 JS 严格比较，Swift 用 ==/!=；字符串字面量单引号 → 双引号 */
-function swiftCondExpr(expr) {
+function swiftCondExpr(expr, known) {
+    // R114：条件引用原生端不存在的标识符 → true（保留内容），避免整页编译失败
+    if (known) {
+        const ids = [...expr.matchAll(/(?<![.\w$])([A-Za-z_$][\w$]*)/g)].map((m) => m[1]);
+        const unknown = ids.filter((id) => !known.has(id) && !['true', 'false', 'Math', 'String', 'Number'].includes(id));
+        if (unknown.length > 0)
+            return 'true';
+    }
     // R78 续（G12）：对象字段条件 → 非空判断
     const f = expr.match(/^__vrnField__:(\w+):(\w+)$/);
     if (f)
@@ -527,6 +535,17 @@ 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}))`;
@@ -601,6 +620,7 @@ function emitNodeInner(node, ctx) {
                     parentAxis: 'column',
                     level: L + 1,
                     definiteHeight: true, // root 撑满全屏 → 子项建议高度确定（R-H3 可分配）
+                    stateNames: ctx.stateNames,
                     warnings: ctx.warnings,
                     path: `${ctx.path}[${i}]`,
                     inheritGap: gapInheritFor(c, props.gap, node.children ?? []),
@@ -1104,6 +1124,7 @@ function navBarModifiers(screen, warnings) {
     return mods.join('\n');
 }
 export function generateScreenSource(screen, opts = {}) {
+    const __stateNames = new Set((screen.state ?? []).map((st) => st.name));
     const rt = opts.runtime ?? 'Runtime.shared';
     // R42：色板存在时颜色/字体走 Theme token；R43：frame 走 View 扩展短调用
     currentColorNames = opts.theme?.colorNames;
@@ -1118,6 +1139,7 @@ export function generateScreenSource(screen, opts = {}) {
     // R-PAGESCROLL：根容器始终为可滚动视口（见 emitNode root 分支），无需内容高度启发式
     const dataProps = [];
     const body = emitNode(screen.ui, {
+        stateNames: __stateNames,
         parentAxis: 'column',
         level: 1,
         definiteHeight: true, // root 撑满全屏（maxHeight:.infinity）→ 根容器高度确定

package/dist/transform/vue2ir.js

@@ -1413,6 +1413,10 @@ 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;

package/package.json

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