@dongmingzhixiu/vuexir-compiler 0.1.0 → 0.2.0

package/dist/codegen/compose.d.ts

@@ -1,7 +1,7 @@
 import type { IrNode } from '../ir/schema.js';
 declare const MANIFEST: (label: string) => string;
 declare const STYLES_XML = "<resources>\n    <!-- R-SYSTEMBAR\uFF1A\u56FA\u5B9A\u6DF1\u8272\u4E3B\u9898 \u2192 \u7CFB\u7EDF\u680F\u56FE\u6807\u56FA\u5B9A\u6D45\u8272\uFF08windowLightStatusBar=false\uFF09\uFF0C\u4E0D\u8DDF\u968F\u7CFB\u7EDF\u660E\u6697 -->\n    <style name=\"Theme.Vuexir\" parent=\"android:Theme.Material.NoActionBar\">\n        <item name=\"android:windowBackground\">#0A0F1E</item>\n        <item name=\"android:statusBarColor\">#0A0F1E</item>\n        <item name=\"android:navigationBarColor\">#0A0F1E</item>\n        <item name=\"android:windowLightStatusBar\">false</item>\n    </style>\n</resources>\n";
-declare const MAIN_ACTIVITY: (projectName: string) => string;
+declare const MAIN_ACTIVITY: (bundleId: string) => string;
 declare const THEME_KT: (bundleId: string) => string;
 declare const RUNTIME_KT: (bundleId: string) => string;
 declare const NAV_TEST_KT: (bundleId: string) => string;
@@ -40,12 +40,23 @@ declare function emitNode(node: IrNode, ctx: ComposeCtx, depth: number, loop?: {
     itemKey: string;
     indexKey?: string;
 }, useParamModifier?: boolean, parentStretch?: boolean): string;
-/** R40 组件表：页面同目录 + 向上逐级查找 components/*.vue（对位 gen-ios loadComponents，支持样例根共享组件）
- *  优先级：页面本地 components/ 覆盖祖先目录同名组件（先收集祖先、最后收集本地） */
 declare function loadComponents(pageFile: string): Record<string, string>;
 /** 组件 → 独立 Composable 文件（对位 iOS 组件独立 Swift 文件） */
 declare function emitComponentFile(name: string, ui: IrNode, bundleId: string): string;
-declare function parseRouter(src: string, dir: string): {
+/**
+ * 工程根推导（R75）：路由文件可能在 src/router/index.ts，`@/` 别名需要相对「工程根」解析。
+ * 自 startDir 向上找 含 package.json 或 src/ 的目录（最多 6 层）。
+ */
+export declare function findProjectRoot(startDir: string): string;
+/**
+ * R75 router 解析器 v2：支持真实 Vue 工程的路由写法
+ *  - 静态 import X from 'p' 与 动态 component: () => import('p')
+ *  - `@/` 别名（映射到 <appDir>/src/）与相对路径
+ *  - 多行路由对象（按 {} 配平扫描，不再依赖整行正则）
+ *  - 路径参数（/detail/:id）→ 原生侧降级为无参路径 + 警告（R15）
+ * 返回 tabs/details + warnings（由调用方打印）
+ */
+declare function parseRouter(src: string, dir: string, routerFile?: string): {
     tabs: {
         id: string;
         title: string;
@@ -59,6 +70,7 @@ declare function parseRouter(src: string, dir: string): {
         file: string;
         path: string;
     }[];
+    warnings: string[];
 };
 export interface RunTabsOptions {
     /** 产物根（默认 <repo>/compiler/generated/android 或 VRN_OUT_DIR） */
@@ -67,6 +79,8 @@ export interface RunTabsOptions {
     projectName?: string;
     /** bundle id（默认 com.vrn.<projectname 小写>） */
     bundleId?: string;
+    /** 显式路由文件（支持 src/router/index.ts 等非标准命名；默认 <appDir>/router.ts） */
+    routerFile?: string;
     /** P2：工程骨架模板由 @dongmingzhixiu/vuexir-templates 提供、CLI 注入（避免 compiler → templates 的依赖倒挂）
      *  回调式：runTabs 计算完 projectName/bundleId 后再渲染模板，避免调用方拿不到最终值 */
     renderGradle?: (projectName: string, bundleId: string) => string;

package/dist/codegen/compose.js

@@ -79,7 +79,7 @@ const STYLES_XML = `<resources>
     </style>
 </resources>
 `;
-const MAIN_ACTIVITY = (projectName) => `package com.vrn.${projectName.toLowerCase()}
+const MAIN_ACTIVITY = (bundleId) => `package ${bundleId}
 
 import android.graphics.Color
 import android.os.Bundle
@@ -91,6 +91,8 @@ import androidx.activity.enableEdgeToEdge
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Store.init(applicationContext)
+        VrnBridge.init(this)
         // R-SYSTEMBAR：应用固定深色主题（InkBg/InkBar），与系统明暗设置无关。
         // enableEdgeToEdge() 默认用 SystemBarStyle.auto(...)，会跟随系统明暗切换图标明暗——
         // 系统处于浅色模式时给出深色图标，落在深色顶栏/底栏上不可读（真机反馈：系统栏文字看不清）。
@@ -144,8 +146,127 @@ fun VuexirTheme(content: @Composable () -> Unit) {
 const RUNTIME_KT = (bundleId) => `package ${bundleId}
 
 // Vuexir Android 运行时桥（对位 iOS RUNTIME_SWIFT）
+/** R73 持久化桥：对位 iOS runtime 的 localStorage（UserDefaults）—— SharedPreferences 同步读写 */
+/** R78 对象字段取值：状态里存 JSON 字符串时按 key 取值 */
+// R85 点路径取值：path 支持 "a.b.c"，末段可为 length/size（数组/对象/字符串长度）
+fun vrnField(json: String, path: String, fallback: String = ""): String {
+    val raw = vrnFieldRaw(json, path)
+    return if (raw.isEmpty()) fallback else raw
+}
+
+fun vrnFieldRaw(json: String, path: String): String {
+    return try {
+        var cur: Any = org.json.JSONTokener(json).nextValue()
+        for (seg in path.split(".")) {
+            cur = when {
+                seg == "length" || seg == "size" -> when (cur) {
+                    is org.json.JSONArray -> cur.length()
+                    is org.json.JSONObject -> cur.length()
+                    is String -> cur.length
+                    else -> return ""
+                }
+                cur is org.json.JSONObject && cur.has(seg) -> cur.get(seg)
+                else -> return ""
+            }
+        }
+        when (cur) {
+            is String -> cur
+            is Boolean -> if (cur) "true" else "false"
+            is Double -> if (cur == Math.floor(cur) && !cur.isInfinite()) cur.toInt().toString() else cur.toString()
+            is Int, is Long -> cur.toString()
+            else -> cur.toString()
+        }
+    } catch (e: Throwable) {
+        ""
+    }
+}
+
+object Store {
+    private var prefs: android.content.SharedPreferences? = null
+    fun init(ctx: android.content.Context) {
+        if (prefs == null) prefs = ctx.getSharedPreferences("vrn", android.content.Context.MODE_PRIVATE)
+    }
+    fun get(key: String, def: String = ""): String = prefs?.getString(key, def) ?: def
+    fun set(key: String, value: String) { prefs?.edit()?.putString(key, value)?.apply() }
+    fun remove(key: String) { prefs?.edit()?.remove(key)?.apply() }
+}
+
+/**
+ * R81 原生桥（Android）——编译期注入；Vue 侧 bridge.toast(...) 由编译器翻译为 VrnBridge.toast(...)
+ * 与 @dongmingzhixiu/vuexir-templates 的 VRN_BRIDGE_KT 保持一致
+ */
+object VrnBridge {
+    private var appCtx: android.content.Context? = null
+    private var currentActivity: android.app.Activity? = null
+    fun init(ctx: android.content.Context) {
+        if (appCtx == null) appCtx = ctx.applicationContext
+        if (ctx is android.app.Activity) currentActivity = ctx
+    }
+
+    fun vibrate(milliseconds: Int = 18) {
+        val ctx = appCtx ?: return
+        try {
+            val v = ctx.getSystemService(android.content.Context.VIBRATOR_SERVICE) as? android.os.Vibrator
+            if (v == null || !v.hasVibrator()) return
+            if (android.os.Build.VERSION.SDK_INT >= 26) {
+                v.vibrate(android.os.VibrationEffect.createOneShot(milliseconds.toLong(), android.os.VibrationEffect.DEFAULT_AMPLITUDE))
+            } else {
+                @Suppress("DEPRECATION")
+                v.vibrate(milliseconds.toLong())
+            }
+        } catch (e: Throwable) {
+            // 无马达/无权限：静默忽略
+        }
+    }
+
+    fun copy(text: String) {
+        val ctx = appCtx ?: return
+        try {
+            val cm = ctx.getSystemService(android.content.Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+            cm.setPrimaryClip(android.content.ClipData.newPlainText("vrn", text))
+        } catch (e: Throwable) {
+            // 忽略
+        }
+    }
+
+    fun setStatusBar(style: String) {
+        val act = currentActivity ?: return
+        android.os.Handler(act.mainLooper).post {
+            val light = style != "dark"
+            val controller = androidx.core.view.WindowCompat.getInsetsController(act.window, act.window.decorView)
+            controller.isAppearanceLightStatusBars = !light
+            controller.isAppearanceLightNavigationBars = !light
+        }
+    }
+
+    fun keepScreenOn(on: Boolean) {
+        val act = currentActivity ?: return
+        android.os.Handler(act.mainLooper).post {
+            if (on) act.window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+            else act.window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+    }
+    fun toast(message: String) {
+        val ctx = appCtx ?: return
+        android.os.Handler(ctx.mainLooper).post { android.widget.Toast.makeText(ctx, message, android.widget.Toast.LENGTH_SHORT).show() }
+    }
+    fun openUrl(url: String) {
+        val ctx = appCtx ?: return
+        try {
+            val i = android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)).apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) }
+            ctx.startActivity(i)
+        } catch (e: Throwable) {
+            toast("无法打开链接")
+        }
+    }
+}
+
 object Runtime {
     var pushHandler: ((String) -> Unit)? = null
+    var backHandler: (() -> Unit)? = null
+    fun back() {
+        backHandler?.invoke()
+    }
     fun push(route: String) {
         pushHandler?.invoke(route)
     }
@@ -216,6 +337,10 @@ function kotlinStr(s) {
 }
 /** 条件表达式 → Kotlin（对位 iOS swiftCondExpr：=== / !== 归一 + 单引号字符串转双引号） */
 function kotlinCondExpr(expr) {
+    // 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, '\\"') + '"');
     return s;
@@ -377,17 +502,35 @@ function arrangementExpr(props, kind) {
     const parts = [];
     const horiz = kind === 'Row' ? 'horizontalArrangement' : 'verticalArrangement';
     const vert = kind === 'Row' ? 'verticalAlignment' : 'horizontalAlignment';
-    if (props.gap !== undefined)
-        parts.push(`${horiz} = Arrangement.spacedBy(${dp(props.gap)})`);
+    // R79：gap 与 justify-content 共用同一个排列参数 → 必须合并（否则 Kotlin 报 duplicate argument）
     const just = props.justifyContent;
-    if (just === 'center')
+    const justAlign = just === 'center'
+        ? kind === 'Row'
+            ? 'Alignment.CenterHorizontally'
+            : 'Alignment.CenterVertically'
+        : just === 'end'
+            ? kind === 'Row'
+                ? 'Alignment.End'
+                : 'Alignment.Bottom'
+            : '';
+    if (props.gap !== undefined && justAlign !== '') {
+        parts.push(`${horiz} = Arrangement.spacedBy(${dp(props.gap)}, ${justAlign})`);
+    }
+    else if (props.gap !== undefined) {
+        parts.push(`${horiz} = Arrangement.spacedBy(${dp(props.gap)})`);
+    }
+    else if (just === 'center') {
         parts.push(`${horiz} = Arrangement.Center`);
-    else if (just === 'end')
+    }
+    else if (just === 'end') {
         parts.push(`${horiz} = Arrangement.${kind === 'Row' ? 'End' : 'Bottom'}`);
-    else if (just === 'spaceBetween')
+    }
+    else if (just === 'spaceBetween') {
         parts.push(`${horiz} = Arrangement.SpaceBetween`);
-    else if (just === 'spaceAround')
+    }
+    else if (just === 'spaceAround') {
         parts.push(`${horiz} = Arrangement.SpaceAround`);
+    }
     const align = props.alignItems;
     if (align === 'center')
         parts.push(`${vert} = Alignment.${kind === 'Row' ? 'CenterVertically' : 'CenterHorizontally'}`);
@@ -422,7 +565,8 @@ function loopField(v, loop) {
 function inlineHandlerKotlin(fn) {
     if (fn.params && fn.params.trim() !== '')
         return null; // 带参 handler 不内联（A5 需数据桥）
-    if (/localStorage|window\.|document\.|fetch\(|setTimeout|alert\(|console\.|return\b|function/.test(fn.body))
+    // R73：localStorage / Number() 现已支持（见 jsExprToKotlin）；其余（window/document/fetch/setTimeout/return/嵌套函数）仍走协程或降级
+    if (/window\.|document\.|fetch\(|setTimeout|alert\(|console\.|return\b|function/.test(fn.body))
         return null;
     const out = [];
     for (const raw of fn.body.split(/[\n;]+/)) {
@@ -599,6 +743,39 @@ function asyncLineKotlin(line, ctx) {
             return null;
         return `if (${cond}) {`;
     }
+    // R81/R84 原生桥语句：bridge.toast('x') / bridge.vibrate(18) / bridge.copy('x') …
+    const bm = line.match(/^bridge\.(toast|openUrl|vibrate|copy|setStatusBar|keepScreenOn)\((.+)\);?$/);
+    if (bm) {
+        const arg = jsExprToKotlin(bm[2].trim());
+        return arg === null ? null : `VrnBridge.${bm[1]}(${arg})`;
+    }
+    // G15 router 语句：router.push('x') / router.back() → Runtime.push / Runtime.back
+    const rp = line.match(/^router\.push\((.+)\);?$/);
+    if (rp) {
+        const a = jsExprToKotlin(rp[1].trim());
+        return a === null ? null : `Runtime.push(${a})`;
+    }
+    if (/^router\.back\(\)\s*;?$/.test(line))
+        return 'Runtime.back()';
+    // R73 localStorage（语句形态）：setItem / removeItem
+    const lsSet = line.match(/^localStorage\.setItem\((.+),\s*(.+)\);?$/);
+    if (lsSet) {
+        const k = jsExprToKotlin(lsSet[1].trim());
+        const v = jsExprToKotlin(lsSet[2].trim());
+        if (k === null || v === null)
+            return null;
+        return `Store.set(${k}, ${v})`;
+    }
+    if (/^localStorage\.removeItem\(/.test(line)) {
+        const k = jsExprToKotlin(line.replace(/^localStorage\.removeItem\(/, '').replace(/\);?$/, ''));
+        return k === null ? null : `Store.remove(${k})`;
+    }
+    // 通用 `const x = <expr>` → `val x = <expr>`（置于 localStorage/fetch/JSON 专项之后）
+    const constAssign = line.match(/^const\s+([A-Za-z_$][\w$]*)\s*=\s*(.+?);?$/);
+    if (constAssign) {
+        const v = jsExprToKotlin(constAssign[2].trim());
+        return v === null ? null : `val ${constAssign[1]} = ${v}`;
+    }
     // console.log(x) → Log.d
     const logLine = line.match(/^console\.log\((.+)\);?$/);
     if (logLine) {
@@ -648,6 +825,17 @@ function jsExprToKotlin(expr) {
         return s;
     // .length → .length()（JSONArray）
     s = s.replace(/\.length\b(?!\()/g, '.length()');
+    // R73 localStorage → Store（函数式写法：getItem 直接用；setItem/removeItem 走语句分支）
+    s = s.replace(/localStorage\.getItem\((.+)\)$/g, (_m, k) => `Store.get(${k})`);
+    // R81 bridge.* → VrnBridge.*（表达式形态）
+    s = s.replace(/\bbridge\.(toast|openUrl|vibrate|copy|setStatusBar|keepScreenOn)\(/g, (_m, fn) => `VrnBridge.${fn}(`);
+    // JS 单引号字符串 → Kotlin 双引号（Kotlin 的单引号是 Char 字面量，'x' 编译不过）
+    s = s.replace(/'([^']*)'/g, (_m, inner) => `"${inner.replace(/"/g, '\\"')}"`);
+    // JS 类型转换 → Kotlin
+    s = s.replace(/Number\((.+)\)$/g, (_m, inner) => `${inner}.toInt()`);
+    s = s.replace(/String\((.+)\)$/g, (_m, inner) => `${inner}.toString()`);
+    // JSON.stringify(x) → x.toString()（Kotlin 无 JSON 全局对象；与 JS 侧动态列表协议一致）
+    s = s.replace(/JSON\.stringify\(([^()]*)\)/g, (_m, inner) => `${inner}.toString()`);
     // 成员访问 a.b（对象状态字段）
     s = s.replace(/\bstateStore\./g, '');
     // 严格等号 → Kotlin
@@ -711,8 +899,10 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
         if (typeof activeBg === 'string' && nd.active) {
             const when = kotlinCondExpr(nd.active.when);
             const active = colorExpr(activeBg);
-            const base = typeof props.background === 'string' ? colorExpr(props.background) : undefined;
-            return [`Modifier.background(${base ? `if (${when}) ${active} else ${base}` : active})`];
+            // 无基础背景时回退透明（对位 iOS `.background(when ? color : Color.clear)`）——
+            // 否则选中态会变成「所有行都高亮」（此前 bug）
+            const base = typeof props.background === 'string' ? colorExpr(props.background) : 'Color.Transparent';
+            return [`Modifier.background(if (${when}) ${active} else ${base})`];
         }
         return visualModifiers(props);
     };
@@ -824,11 +1014,29 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
                         return String(seg.text).replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '${\'$\'}').replace(/\n/g, '\\n');
                     if ('bind' in seg)
                         return '${' + loopField(seg.bind, loop) + '}';
+                    if ('fieldOf' in seg)
+                        return ('${vrnField(' +
+                            seg.fieldOf.obj +
+                            ', "' +
+                            seg.fieldOf.field +
+                            '"' +
+                            (seg.fieldOf.fallback !== undefined ? ', "' + seg.fieldOf.fallback.replace(/"/g, '\\"') + '"' : '') +
+                            ')}');
                     return '${' + loopField(seg.dynField.var, loop) + '["' + seg.dynField.field + '"] ?: ""}';
                 })
                     .join('');
                 textExpr = '"' + segs + '"';
             }
+            else if (p.fieldOf) {
+                textExpr =
+                    '"${vrnField(' +
+                        p.fieldOf.obj +
+                        ', "' +
+                        p.fieldOf.field +
+                        '"' +
+                        (p.fieldOf.fallback !== undefined ? ', "' + p.fieldOf.fallback.replace(/"/g, '\\"') + '"' : '') +
+                        ')}"';
+            }
             else if (p.dynField) {
                 textExpr = '"${' + loopField(p.dynField.var, loop) + '["' + p.dynField.field + '"] ?: ""}"';
             }
@@ -1028,6 +1236,26 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
 /* ================= Router 解析（对位 gen-ios.ts parseRouter） ================= */
 /** R40 组件表：页面同目录 + 向上逐级查找 components/*.vue（对位 gen-ios loadComponents，支持样例根共享组件）
  *  优先级：页面本地 components/ 覆盖祖先目录同名组件（先收集祖先、最后收集本地） */
+/** R86 扫描工程内的 Pinia store 源码（src/stores/*.ts），供编译器做状态折叠 */
+function loadStoreSources(anchor) {
+    const table = {};
+    let up = anchor;
+    for (let i = 0; i < 6 && up !== dirname(up); i++) {
+        for (const cand of [join(up, 'stores'), join(up, 'src', 'stores')]) {
+            if (existsSync(cand)) {
+                for (const f of readdirSync(cand)) {
+                    if (!/\.(ts|js|mts)$/.test(f))
+                        continue;
+                    table[f] = readFileSync(join(cand, f), 'utf-8');
+                }
+                if (Object.keys(table).length > 0)
+                    return table;
+            }
+        }
+        up = dirname(up);
+    }
+    return table;
+}
 function loadComponents(pageFile) {
     const dirs = [];
     let up = dirname(pageFile);
@@ -1101,51 +1329,139 @@ function tabLabel(title) {
     const t = title.replace(/\s+/g, '');
     return t.length > 2 ? t.match(/.{1,2}/g).join('\\n') : t;
 }
-function parseRouter(src, dir) {
+/**
+ * 工程根推导（R75）：路由文件可能在 src/router/index.ts，`@/` 别名需要相对「工程根」解析。
+ * 自 startDir 向上找 含 package.json 或 src/ 的目录（最多 6 层）。
+ */
+export function findProjectRoot(startDir) {
+    let d = startDir;
+    for (let i = 0; i < 6; i += 1) {
+        if (existsSync(join(d, 'package.json')) || existsSync(join(d, 'src')))
+            return d;
+        const parent = dirname(d);
+        if (parent === d)
+            break;
+        d = parent;
+    }
+    return startDir;
+}
+/**
+ * R75 router 解析器 v2：支持真实 Vue 工程的路由写法
+ *  - 静态 import X from 'p' 与 动态 component: () => import('p')
+ *  - `@/` 别名（映射到 <appDir>/src/）与相对路径
+ *  - 多行路由对象（按 {} 配平扫描，不再依赖整行正则）
+ *  - 路径参数（/detail/:id）→ 原生侧降级为无参路径 + 警告（R15）
+ * 返回 tabs/details + warnings（由调用方打印）
+ */
+function parseRouter(src, dir, routerFile) {
+    const warnings = [];
     const imports = {};
     for (const m of src.matchAll(/import\s+(\w+)\s+from\s+['"]([^'"]+)['"]/g))
         imports[m[1]] = m[2];
+    /** 别名/相对路径 → 磁盘路径（先找 @/ → src，再退回 appDir 根） */
+    const baseDir = routerFile ? dirname(routerFile) : dir;
+    const resolveFile = (spec) => {
+        const cands = [];
+        if (spec.startsWith('@/')) {
+            const rel = spec.slice(2);
+            cands.push(join(dir, 'src', rel), join(dir, rel));
+        }
+        else if (spec.startsWith('./') || spec.startsWith('../')) {
+            // 相对路径以「路由文件所在目录」为基准
+            cands.push(join(baseDir, spec), join(dir, spec));
+        }
+        else {
+            cands.push(join(dir, spec), join(dir, 'src', spec));
+        }
+        return cands.find((c) => existsSync(c)) ?? cands[0];
+    };
+    // 配平扫描所有「含 path:」的对象块
+    const blocks = [];
+    for (let i = 0; i < src.length; i += 1) {
+        if (src[i] !== '{')
+            continue;
+        let depth = 0;
+        let quote = '';
+        let j = i;
+        for (; j < src.length; j += 1) {
+            const ch = src[j];
+            if (quote) {
+                if (ch === quote)
+                    quote = '';
+                continue;
+            }
+            if (ch === '"' || ch === "'" || ch === '`') {
+                quote = ch;
+                continue;
+            }
+            if (ch === '{')
+                depth += 1;
+            else if (ch === '}') {
+                depth -= 1;
+                if (depth === 0)
+                    break;
+            }
+        }
+        const block = src.slice(i, j + 1);
+        if (/\bpath\s*:/.test(block))
+            blocks.push(block);
+        i = j;
+    }
     const routes = [];
-    for (const m of src.matchAll(/\{\s*path:\s*'([^']*)'\s*,\s*name:\s*'([^']*)'\s*,\s*component:\s*(\w+)(?:\s*,\s*meta:\s*\{([^}]*)\})?\s*\}/g)) {
+    for (const block of blocks) {
+        const pm = block.match(/\bpath\s*:\s*['"]([^'"]*)['"]/);
+        if (!pm)
+            continue;
+        const rawPath = pm[1];
+        const nm = block.match(/\bname\s*:\s*['"]([^'"]*)['"]/);
+        const cm = block.match(/\bcomponent\s*:\s*(?:\(\s*\)\s*=>\s*)?import\(\s*['"]([^'"]+)['"]\s*\)|\bcomponent\s*:\s*([A-Za-z_$][\w$]*)/);
+        const compSpec = cm?.[1];
+        const compIdent = cm?.[2];
+        const file = compSpec ? resolveFile(compSpec) : compIdent ? resolveFile(imports[compIdent] ?? '') : '';
+        // meta 解析（允许单行/多行）
         const meta = {};
-        const raw = m[4] ?? '';
-        for (const kv of raw.split(',')) {
-            const mm = kv.match(/^\s*(\w+):\s*(true|false|'([^']*)'|"([^"]*)"|\w+)\s*$/);
-            if (!mm)
-                continue;
-            meta[mm[1]] = mm[2] === 'true' ? 'true' : mm[2] === 'false' ? 'false' : mm[3] ?? mm[4] ?? mm[2];
+        const mm = block.match(/\bmeta\s*:\s*\{([\s\S]*?)\}/);
+        if (mm) {
+            for (const kv of mm[1].split(',')) {
+                const r = kv.match(/^\s*(\w+)\s*:\s*(true|false|'([^']*)'|"([^"]*)"|\w+)\s*$/);
+                if (!r)
+                    continue;
+                meta[r[1]] = r[2] === 'true' ? 'true' : r[2] === 'false' ? 'false' : r[3] ?? r[4] ?? r[2];
+            }
         }
-        routes.push({ path: m[1], name: m[2], component: m[3], meta });
+        const path = rawPath.replace(/\/:\w+\??/g, '');
+        if (path !== rawPath)
+            warnings.push(`路由「${rawPath}」含路径参数，原生侧降级为无参路径「${path || '/'}」（R15）`);
+        routes.push({
+            path: path === '' ? '/' : path,
+            name: nm?.[1] ?? (path.replace(/\//g, '-').replace(/^-|-$/g, '') || 'home'),
+            component: compIdent ?? '',
+            file,
+            meta,
+        });
     }
-    const tabs = routes
-        .filter((r) => r.meta.tab === 'true')
-        .filter((r) => {
-        const p = join(dir, imports[r.component] ?? '');
-        if (!existsSync(p))
+    const hasText = (file) => {
+        if (!file || !existsSync(file))
             return true;
-        const s = readFileSync(p, 'utf-8');
-        const tpl = s.match(/<template>([\s\S]*)<\/template>/)?.[1] ?? '';
-        const textOnly = tpl.replace(/<[^>]*>/g, ' ').replace(/\s+/g, ' ').trim();
-        return textOnly.length > 0;
-    })
+        const tpl = readFileSync(file, 'utf-8').match(/<template>([\s\S]*)<\/template>/)?.[1] ?? '';
+        return tpl.replace(/<[^>]*>/g, ' ').replace(/\s+/g, ' ').trim().length > 0;
+    };
+    const tabs = routes
+        .filter((r) => r.meta.tab === 'true' && hasText(r.file))
         .map((r, i) => ({
         id: r.name,
         title: r.meta.title ?? r.name,
-        file: join(dir, imports[r.component] ?? ''),
+        file: r.file,
         icon: r.meta.icon ?? TAB_ICONS[i % TAB_ICONS.length],
         path: r.path,
     }));
     const details = routes
         .filter((r) => r.meta.tab !== 'true')
-        .map((r) => ({
-        id: r.name,
-        title: r.meta.title ?? r.name,
-        file: join(dir, imports[r.component] ?? ''),
-        path: r.path,
-    }));
-    if (tabs.length === 0)
-        throw new Error('router.ts 未声明 tab 路由');
-    return { tabs, details };
+        .map((r) => ({ id: r.name, title: r.meta.title ?? r.name, file: r.file, path: r.path }));
+    if (tabs.length === 0) {
+        warnings.push('router 未解析到任何 tab 路由（routes 需含 meta: { tab: true }）');
+    }
+    return { tabs, details, warnings };
 }
 /* ================= 工程生成（对位 runTabs） ================= */
 /** Material Icons 映射（router meta.icon：iOS SF Symbols / 简写 → compose material icon） */
@@ -1169,8 +1485,10 @@ const ICON_MAP = {
     explore: 'Icons.Filled.Explore', work: 'Icons.Filled.Work', settings: 'Icons.Filled.Settings',
 };
 function runTabs(appDir, opts = {}) {
-    const routerSrc = readFileSync(join(appDir, 'router.ts'), 'utf-8');
-    const { tabs, details } = parseRouter(routerSrc, appDir);
+    const routerSrc = readFileSync(opts.routerFile ?? join(appDir, 'router.ts'), 'utf-8');
+    const { tabs, details, warnings: routerWarnings } = parseRouter(routerSrc, findProjectRoot(appDir), opts.routerFile ?? join(appDir, 'router.ts'));
+    for (const w of routerWarnings)
+        console.log(`[gen-android] 路由提示: ${w}`);
     console.log(`[gen-android] 多页模式: router.ts → ${tabs.length} 个 tab 页面` + (details.length ? ` + ${details.length} 个 push 页面` : ''));
     const projectName = opts.projectName ? toPascal(opts.projectName) : toPascal(basename(appDir));
     const bundleId = opts.bundleId ?? `com.vrn.${projectName.toLowerCase()}`;
@@ -1191,7 +1509,7 @@ function runTabs(appDir, opts = {}) {
     mkdirSync(resDir, { recursive: true });
     writeFileSync(join(resDir, 'styles.xml'), STYLES_XML);
     writeFileSync(join(pkgDir, 'Theme.kt'), THEME_KT(bundleId));
-    writeFileSync(join(pkgDir, 'MainActivity.kt'), MAIN_ACTIVITY(projectName));
+    writeFileSync(join(pkgDir, 'MainActivity.kt'), MAIN_ACTIVITY(bundleId));
     writeFileSync(join(pkgDir, 'Runtime.kt'), RUNTIME_KT(bundleId));
     // NavTest 断言绑定 vuexir-demo 文案：仅对参考样例生成，其他样例跳过（防无意义失败用例）
     if (projectName.toLowerCase() === 'vuexirdemo') {
@@ -1221,7 +1539,12 @@ function runTabs(appDir, opts = {}) {
         }
         const src = readFileSync(tab.file, 'utf-8');
         const pageId = toPascal(tab.id);
-        const r = vueToIr(src, { screenId: tab.id, title: tab.title, components: loadComponents(tab.file) });
+        const r = vueToIr(src, {
+            screenId: tab.id,
+            title: tab.title,
+            components: loadComponents(tab.file),
+            storeSources: loadStoreSources(tab.file),
+        });
         if (r.warnings.length > 0) {
             console.log(`[gen-android] 编译提示（${tab.id}，${r.warnings.length} 条）:`);
             for (const w of r.warnings)
@@ -1254,7 +1577,12 @@ function runTabs(appDir, opts = {}) {
     for (const d of details) {
         const src = readFileSync(d.file, 'utf-8');
         const pageId = toPascal(d.id);
-        const r = vueToIr(src, { screenId: d.id, title: d.title, components: loadComponents(d.file) });
+        const r = vueToIr(src, {
+            screenId: d.id,
+            title: d.title,
+            components: loadComponents(d.file),
+            storeSources: loadStoreSources(d.file),
+        });
         if (r.warnings.length > 0) {
             console.log(`[gen-android] 编译提示（${d.id}，${r.warnings.length} 条）:`);
             for (const w of r.warnings)

package/dist/codegen/swiftui.d.ts

@@ -36,6 +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 function generateThemeSource(palette: {
     colorNames: Map<string, string>;
     fontNames: Map<string, string>;