@dongmingzhixiu/vuexir 0.5.7 → 0.7.0

package/README.md

@@ -8,7 +8,7 @@ npx vrn doctor           # 环境自检：Xcode / xcodegen / JDK / ANDROID_HOME
 npx vrn preview          # 多页预览器（P3 起由 @vrn/vite-plugin 承载）
 ```
 
-配置（`vrn.config.ts`，P1 落地）：
+配置（`vuexir.config.ts`，P1 落地）：
 
 ```ts
 export default {

package/dist/bundle.d.ts

@@ -23,3 +23,12 @@ export declare function bundlePageScript(pageFile: string, projectRoot: string):
     code: string;
     names: string[];
 } | null;
+export interface NativeNavigationBinding {
+    store: string;
+    tab: string;
+    overlay?: string;
+    pushActions: string[];
+    backActions?: string[];
+}
+/** 声明式 store 导航 → 原生导航桥；不修改项目的 store 实现。 */
+export declare function pageNavigationBridge(binding: NativeNavigationBinding | undefined, page: string, tabs: string[]): string;

package/dist/bundle.js

@@ -8,6 +8,7 @@
  * 策略：逐个文件尝试打包，**失败的（依赖 dexie / DOM / 浏览器 API）自动跳过**并返回告警，
  * 保证「能打的都打上，打不了的明确说明」，不静默。
  */
+import { babelParse } from '@vue/compiler-sfc';
 import { existsSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { buildSync } from 'esbuild';
@@ -47,6 +48,7 @@ export function bundleProjectUtils(projectRoot) {
                     globalName: `__vrnUtils_${included.length}`,
                     platform: 'neutral',
                     target: 'es2019',
+                    loader: { '.jpg': 'dataurl', '.jpeg': 'dataurl', '.png': 'dataurl', '.webp': 'dataurl', '.svg': 'dataurl', '.vue': 'empty' },
                     // 纯类型导入会被擦除；若确实依赖运行期外部包（dexie 等）则整包失败 → 跳过该文件
                     external: [],
                     logLevel: 'silent',
@@ -86,8 +88,29 @@ export function bundlePageScript(pageFile, projectRoot) {
     if (!m)
         return null;
     const body = m[1];
-    // 顶层绑定名（const/let/function）；导出的就是这些
-    const names = [...new Set([...body.matchAll(/(?:const|let|var|function)\s+([A-Za-z_$][\w$]*)/g)].map((x) => x[1]))];
+    const ast = babelParse(body, { sourceType: 'module', plugins: ['typescript'] });
+    const names = [];
+    const collect = (n) => {
+        if (!n)
+            return;
+        if (n.type === 'Identifier')
+            names.push(n.name);
+        else if (n.type === 'ObjectPattern')
+            n.properties.forEach((p) => collect(p.value ?? p.argument));
+        else if (n.type === 'ArrayPattern')
+            n.elements.forEach(collect);
+        else if (n.type === 'AssignmentPattern')
+            collect(n.left);
+    };
+    for (const n of ast.program.body) {
+        if (n.type === 'VariableDeclaration')
+            n.declarations.forEach((d) => collect(d.id));
+        else if (n.type === 'FunctionDeclaration')
+            collect(n.id);
+        else if (n.type === 'ImportDeclaration' && n.importKind !== 'type' && !/\.(vue|png|jpe?g|webp|gif)$/.test(String(n.source.value)))
+            n.specifiers.forEach((p) => { if (p.importKind !== 'type')
+                collect(p.local); });
+    }
     if (names.length === 0)
         return null;
     const shimDir = mkdtempSync(join(tmpdir(), 'vrn-page-'));
@@ -99,7 +122,7 @@ export function bundlePageScript(pageFile, projectRoot) {
     writeFileSync(dexieShim, DEXIE_SHIM_SOURCE);
     // 入口必须放在工程内，否则 vue/vue-router 等裸导入解析不到 node_modules
     const entry = join(projectRoot, 'src', `.vrn-page-${Date.now()}.ts`);
-    writeFileSync(entry, `${body}\nexport { ${names.join(', ')} };\n`);
+    writeFileSync(entry, `import { __vrnRunMounted as __vrnMountPage } from 'vue';\n${body}\nexport { __vrnMountPage, ${names.join(', ')} };\n`);
     const routerShim = join(shimDir, 'vue-router-shim.js');
     writeFileSync(routerShim, VUE_ROUTER_SHIM_SOURCE);
     try {
@@ -111,6 +134,7 @@ export function bundlePageScript(pageFile, projectRoot) {
             globalName: '__vrnPage',
             platform: 'neutral',
             target: 'es2019',
+            loader: { '.jpg': 'dataurl', '.jpeg': 'dataurl', '.png': 'dataurl', '.webp': 'dataurl', '.svg': 'dataurl', '.vue': 'empty' },
             logLevel: 'silent',
             alias: {
                 '@': join(projectRoot, 'src'),
@@ -124,7 +148,7 @@ export function bundlePageScript(pageFile, projectRoot) {
         // 页面导出提升为全局：Swift onTapGesture → Runtime.invoke("goDetail(...)") 裸调用
         // 需在全局作用域找到函数；__vrnPage 是 esbuild IIFE 的 globalName（模块导出对象）
         const promoted = code +
-            `\n;(function(){var m=__vrnPage;if(!m)return;for(var k in m){try{if(typeof globalThis[k]==='undefined'){if(m[k]&&m[k].__v_isRef){Object.defineProperty(globalThis,k,{get:function(){return m[k].value;},configurable:true});}else{globalThis[k]=m[k];}}}catch(e){}}})();`;
+            `\n;(function(){var m=__vrnPage;if(!m)return;Object.keys(m).forEach(function(k){try{if(typeof globalThis[k]==='undefined'){if(m[k]&&(m[k].__v_isRef||m[k].__vrnRef)){Object.defineProperty(globalThis,k,{get:function(){return m[k].value;},set:function(v){m[k].value=v;},configurable:true});}else{globalThis[k]=m[k];}}}catch(e){}});})();`;
         return promoted ? { code: promoted, names } : null;
     }
     catch (e) {
@@ -141,3 +165,17 @@ export function bundlePageScript(pageFile, projectRoot) {
         }
     }
 }
+/** 声明式 store 导航 → 原生导航桥；不修改项目的 store 实现。 */
+export function pageNavigationBridge(binding, page, tabs) {
+    if (!binding)
+        return '';
+    return `\n(function(){
+var spec=${JSON.stringify(binding)}, own=${JSON.stringify(page)}, tabs=${JSON.stringify(tabs)};
+var object=typeof __vrnPage!=='undefined' ? __vrnPage[spec.store] : null;if(!object)return;
+function route(){return (spec.overlay && object[spec.overlay]) || object[spec.tab];}
+function notify(back){if(back){if(typeof __routerBack==='function')__routerBack();}else if(typeof __routerPush==='function')__routerPush(String(route()));}
+(spec.pushActions||[]).forEach(function(key){var fn=object[key];if(typeof fn!=='function'||fn.__vrnNavigation)return;var wrapped=function(){var result=fn.apply(object,arguments);notify(false);return result;};wrapped.__vrnNavigation=true;object[key]=wrapped;});
+(spec.backActions||[]).forEach(function(key){var fn=object[key];if(typeof fn!=='function'||fn.__vrnNavigation)return;var wrapped=function(){var result=fn.apply(object,arguments);notify(true);return result;};wrapped.__vrnNavigation=true;object[key]=wrapped;});
+globalThis.__vrnSetNativeRoute=function(key){key=key||own;if(tabs.indexOf(key)>=0){object[spec.tab]=key;if(spec.overlay)object[spec.overlay]=null;}else if(spec.overlay)object[spec.overlay]=key;if(typeof __vrnSyncPage==='function')__vrnSyncPage();};
+})();\n`;
+}

package/dist/cli.js

@@ -1,3 +1,5 @@
+import { readFileSync as readTabBarFile } from 'node:fs';
+import { parseTabBar, loadProjectStyles } from '@dongmingzhixiu/vuexir-compiler';
 /**
  * @dongmingzhixiu/vuexir 命令实现（R-PKG：CLI 是唯一负责路径/IO/进程的层）
  *
@@ -5,7 +7,7 @@
  *   vrn build ios|android [--run]        # gen + （--run 时）调用 xcodegen/xcodebuild | gradle
  *   vrn doctor                           # 环境自检
  *
- * 配置来源见 config.ts（vrn.config.* + CLI 覆盖）。生成器在导入前设置 VRN_NO_AUTO_RUN=1，
+ * 配置来源见 config.ts（vuexir.config.* + CLI 覆盖）。生成器在导入前设置 VRN_NO_AUTO_RUN=1，
  * 避免模块加载时的自动执行。
  */
 import { existsSync } from 'node:fs';
@@ -89,13 +91,17 @@ export async function generate(args, platform) {
     process.env.VRN_NO_AUTO_RUN = '1';
     const { generateIos } = await import('./gen-ios.js');
     const { generateAndroid } = await import('./gen-android.js');
+    const tabBar = cfg.tabBarComponent ? parseTabBar(readTabBarFile(join(cfg.projectRoot, cfg.tabBarComponent), 'utf8'), loadProjectStyles(cfg.projectRoot)) : undefined;
     if (platform === 'android') {
         if (!multiPage) {
             throw new Error('[vrn] Android 生成目前要求多页入口 router.ts（单页 App.vue 请先补 router.ts）');
         }
-        return generateAndroid({ input: inputDir, outDirRoot: outRoot, projectName, bundleId, ...(routerFile ? { routerFile } : {}) });
+        return generateAndroid({ navigation: cfg.navigation, tabBar, nativeNavigationBar: cfg.nativeNavigationBar, input: routerFile ?? inputDir, outDirRoot: outRoot, projectName, bundleId, ...(routerFile ? { routerFile } : {}) });
     }
     const out = generateIos({
+        navigation: cfg.navigation,
+        tabBar,
+        nativeNavigationBar: cfg.nativeNavigationBar,
         input: inputDir,
         outDirRoot: outRoot,
         projectName,
@@ -197,7 +203,7 @@ export async function run(argv) {
   vrn build ios|android [入口] [--run]      # 生成后可选调用平台构建
   vrn doctor                                 # 环境自检
 
-配置：<projectRoot>/vrn.config.ts（entry / outDir / projectName / bundleId）
+配置：<projectRoot>/vuexir.config.ts（entry / outDir / projectName / bundleId）
 `);
         return 0;
     }

package/dist/config.d.ts

@@ -1,4 +1,9 @@
 export interface VrnConfig {
+    /** 页面已有自绘导航时关闭系统导航栏。 */
+    nativeNavigationBar?: boolean;
+    /** 自绘导航外观来源：静态 {key,label,icon} 数组的 Vue 组件。 */
+    tabBarComponent?: string;
+    navigation?: import('./bundle.js').NativeNavigationBinding;
     /** Vue 工程根（默认 cwd） */
     projectRoot: string;
     /** 入口：router.ts（多页）或单个 .vue（单页），相对 projectRoot */
@@ -20,7 +25,7 @@ export interface VrnConfig {
         };
     };
 }
-/** 读取 vrn.config（json 直接解析；ts/mjs 用动态 import，失败则忽略并提示） */
+/** 读取 vuexir.config（JSON 直接解析；ts/mjs 先用 esbuild 转译再 import） */
 export declare function loadConfig(projectRoot: string): Promise<Partial<VrnConfig>>;
 /** 合并默认值 + 配置文件 + CLI 覆盖 */
 export declare function resolveConfig(base: Partial<VrnConfig> & {

package/dist/config.js

@@ -1,9 +1,9 @@
 /**
- * @dongmingzhixiu/vuexir 配置解析（R-PKG：CLI 只认「项目根 + vrn.config」两个事实来源）
+ * @dongmingzhixiu/vuexir 配置解析（R-PKG：CLI 只认「项目根 + vuexir.config」两个事实来源）
  *
  * 解析顺序（后者覆盖前者）：
  *   1. 内置默认值（projectRoot = process.cwd()，outDir = <root>/native）
- *   2. vrn.config.ts / vrn.config.mts / vrn.config.js / vrn.config.mjs / vrn.config.json
+ *   2. vuexir.config.ts / .mts / .js / .mjs / .json（旧名 vuexir.config.* 仍兼容）
  *   3. 命令行参数（--out / --entry / --name / --bundle 等）
  *
  * 兼容期：未提供 vrn.config 时，若 <root>/router.ts 或 <root>/App.vue 存在，按「目录即项目」处理；
@@ -11,8 +11,8 @@
  */
 import { existsSync, readFileSync, statSync } from 'node:fs';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
-const CONFIG_FILES = ['vuexir.config.ts', 'vuexir.config.mts', 'vuexir.config.js', 'vuexir.config.mjs', 'vuexir.config.json', 'vrn.config.ts', 'vrn.config.mts', 'vrn.config.js', 'vrn.config.mjs', 'vrn.config.json'];
-/** 读取 vrn.config（json 直接解析；ts/mjs 用动态 import，失败则忽略并提示） */
+const CONFIG_FILES = ['vuexir.config.ts', 'vuexir.config.mts', 'vuexir.config.js', 'vuexir.config.mjs', 'vuexir.config.json', 'vuexir.config.ts', 'vrn.config.mts', 'vrn.config.js', 'vrn.config.mjs', 'vrn.config.json'];
+/** 读取 vuexir.config（JSON 直接解析；ts/mjs 先用 esbuild 转译再 import） */
 export async function loadConfig(projectRoot) {
     for (const file of CONFIG_FILES) {
         const p = join(projectRoot, file);
@@ -22,6 +22,14 @@ export async function loadConfig(projectRoot) {
             if (file.endsWith('.json')) {
                 return JSON.parse(readFileSync(p, 'utf-8'));
             }
+            // R144：配置文件是 TS 时，Node 无法直接 import → 先用 esbuild 转成 ESM 再加载
+            if (/\.m?ts$/.test(file)) {
+                const { transformSync } = await import('esbuild');
+                const js = transformSync(readFileSync(p, 'utf-8'), { loader: 'ts', format: 'esm', target: 'es2020' }).code;
+                const url = `data:text/javascript;base64,${Buffer.from(js, 'utf-8').toString('base64')}`;
+                const mod = (await import(url));
+                return mod.default ?? {};
+            }
             const mod = (await import(`file://${p}`));
             return mod.default ?? {};
         }
@@ -37,6 +45,9 @@ export function resolveConfig(base, overrides = {}) {
     const outDirRaw = overrides.outDir ?? base.outDir ?? 'native';
     return {
         projectRoot,
+        nativeNavigationBar: overrides.nativeNavigationBar ?? base.nativeNavigationBar,
+        tabBarComponent: overrides.tabBarComponent ?? base.tabBarComponent,
+        navigation: overrides.navigation ?? base.navigation,
         entry: overrides.entry ?? base.entry,
         outDir: isAbsolute(outDirRaw) ? outDirRaw : join(projectRoot, outDirRaw),
         projectName: overrides.projectName ?? base.projectName,
@@ -81,7 +92,7 @@ export function resolveEntry(cfg) {
         candidates.push(a);
     }
     throw new Error(`未找到入口（多页 src/router.ts 或单页 src/App.vue）。已尝试：\n  ${candidates.join('\n  ')}\n` +
-        `可在 vrn.config.ts 中用 entry 显式指定。`);
+        `可在 vuexir.config.ts 中用 entry 显式指定。`);
 }
 /** 平台输出目录：<outDir>/<platform>/<ProjectName> */
 export function platformOutDir(cfg, platform, projectName) {

package/dist/gen-android.d.ts

@@ -1,4 +1,9 @@
+import type { TabBarSpec } from '@dongmingzhixiu/vuexir-compiler';
+import { type NativeNavigationBinding } from './bundle.js';
 export interface GenerateOptions {
+    navigation?: NativeNavigationBinding;
+    tabBar?: TabBarSpec;
+    nativeNavigationBar?: boolean;
     /** 入口：样例名 / 目录 / 显式路径（默认 vuexir-demo） */
     input?: string;
     /** 产物根（默认 VRN_OUT_DIR 或仓库内 compiler/generated/android） */

package/dist/gen-android.js

@@ -13,7 +13,8 @@
 import { existsSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { runTabs, resolveInput } from '@dongmingzhixiu/vuexir-compiler';
+import { bundleProjectUtils, bundlePageScript, pageNavigationBridge } from './bundle.js';
+import { runTabs, resolveInput, findProjectRoot, RUNTIME_BOOTSTRAP_SOURCE } from '@dongmingzhixiu/vuexir-compiler';
 import { TEMPLATE_VERSION, buildGradle } from '@dongmingzhixiu/vuexir-templates';
 // R-PKG：产物根不再假设仓库布局——VRN_OUT_DIR 优先（CLI 注入），否则回退到仓库内 compiler/generated/android
 const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..');
@@ -23,9 +24,12 @@ const SAMPLES_ROOT = process.env.VRN_SAMPLES_ROOT ?? join(ROOT, 'examples');
 /** 生成 Android（Compose）工程；返回产物目录 */
 export function generateAndroid(opts = {}) {
     const input = resolveInput(opts.input);
+    const root = findProjectRoot(dirname(input));
+    const utils = bundleProjectUtils(root);
+    const buildPageRuntime = (pageFile, runtime, pageKey) => RUNTIME_BOOTSTRAP_SOURCE + '\n' + utils.code + '\n' + (bundlePageScript(pageFile, root)?.code ?? '') + '\n' + runtime + '\n' + pageNavigationBridge(opts.navigation, pageKey ?? 'home', opts.tabBar?.items.map((i) => i.id) ?? []);
     // 直接给路由文件（src/router/index.ts 等）→ 用其目录 + 显式 routerFile
     if (/\.(ts|js|mts)$/.test(input) && existsSync(input)) {
-        return runTabs(dirname(input), { routerFile: input, outDirRoot: opts.outDirRoot, projectName: opts.projectName, bundleId: opts.bundleId, renderGradle: (p, b) => buildGradle(b), templateVersion: TEMPLATE_VERSION });
+        return runTabs(dirname(input), { buildPageRuntime, tabBar: opts.tabBar, nativeNavigationBar: opts.nativeNavigationBar, routerFile: input, outDirRoot: opts.outDirRoot, projectName: opts.projectName, bundleId: opts.bundleId, renderGradle: (p, b) => buildGradle(b), templateVersion: TEMPLATE_VERSION });
     }
     // 目录入口：兼容 router.ts / index.ts（Vue 工程标准 src/router/index.ts）
     const routerFile = ['router.ts', 'router.js', 'index.ts', 'index.js'].find((f) => existsSync(join(input, f)));
@@ -33,6 +37,9 @@ export function generateAndroid(opts = {}) {
         throw new Error(`[vrn] ${input} 缺少 router.ts/index.ts（多页模式需要路由文件；单页请用 gen-ios 路径或补 router.ts）`);
     }
     return runTabs(input, {
+        buildPageRuntime,
+        tabBar: opts.tabBar,
+        nativeNavigationBar: opts.nativeNavigationBar,
         routerFile: join(input, routerFile),
         outDirRoot: opts.outDirRoot,
         projectName: opts.projectName,

package/dist/gen-ios.d.ts

@@ -1,18 +1,9 @@
-/**
- * gen-ios.ts —— iOS 工程生成脚本（P1-lite 主入口）
- *
- * 输入：Vue SFC（默认 compiler/samples/hello/Hello.vue）或 IR JSON（.json 后缀）
- * 管线：Vue SFC → (vueToIr) → IR → (validateIr) → SwiftUI 源码 + 独立 Xcode 工程
- *
- * 运行：
- *   npx vite-node compiler/scripts/gen-ios.ts                    # 默认 Hello.vue
- *   npx vite-node compiler/scripts/gen-ios.ts path/My.vue        # 指定 Vue 文件
- *   npx vite-node compiler/scripts/gen-ios.ts path/screen.ir.json  # 或手写 IR
- *
- * 产物：compiler/generated/ios/<ProjectName>/{App.swift, ScreenView.swift, recite.json, project.yml}
- * 后续：cd compiler/generated/ios/<ProjectName> && xcodegen generate && xcodebuild ...
- */
+import { type TabBarSpec } from '@dongmingzhixiu/vuexir-compiler';
+import { type NativeNavigationBinding } from './bundle.js';
 export interface GenerateIosOptions {
+    navigation?: NativeNavigationBinding;
+    tabBar?: TabBarSpec;
+    nativeNavigationBar?: boolean;
     /** 显式路由文件（src/router/index.ts 等非标准命名） */
     routerFile?: string;
     /** 样例名 / 目录 / 显式 .vue 或 .json 路径；'all' 批量；省略 = 默认 vuexir-demo */

package/dist/gen-ios.js

@@ -1,3 +1,4 @@
+import { swiftVector, swiftColorExpression, generateSwiftBoxModifiers } from '@dongmingzhixiu/vuexir-compiler';
 /**
  * gen-ios.ts —— iOS 工程生成脚本（P1-lite 主入口）
  *
@@ -15,12 +16,12 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, readdirSync, statSync, copyFileSync, rmSync } from 'node:fs';
 import { basename, dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { bundlePageScript, bundleProjectUtils } from './bundle.js';
+import { bundlePageScript, bundleProjectUtils, pageNavigationBridge } from './bundle.js';
 import { TEMPLATE_VERSION, VRN_BRIDGE_SWIFT, projectYml as PROJECT_YML, templateFiles } from '@dongmingzhixiu/vuexir-templates';
 import { parseRouter as parseRouterV2, findProjectRoot } from '@dongmingzhixiu/vuexir-compiler';
 import { validateIr } from '@dongmingzhixiu/vuexir-compiler';
 import { generateScreenSource, generateComponentSource, collectTheme, buildTheme, generateThemeSource, VRN_HELPERS_SWIFT } from '@dongmingzhixiu/vuexir-compiler';
-import { vueToIr, VueCompileError } from '@dongmingzhixiu/vuexir-compiler';
+import { vueToIr, VueCompileError, RUNTIME_BOOTSTRAP_SOURCE, extractCssVariables, loadProjectStyles, loadProjectAssets, materializeProjectAssets } from '@dongmingzhixiu/vuexir-compiler';
 // R-PKG：产物与样例根不再假设仓库布局（CLI 通过 VRN_OUT_DIR / VRN_SAMPLES_ROOT 注入）
 const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..');
 // 安装形态下 <pkg>/dist/../../.. 不是仓库根，样例根不可靠 → 存在才用，否则退回 cwd（显式入口优先）
@@ -35,7 +36,7 @@ const SAMPLES_ROOT = (() => {
 const TOOLCHAIN_VERSION = '0.1.0';
 /** 样例根（可写副本：generateIos 可用 opts.samplesRoot 覆盖） */
 let SAMPLES_ROOT_MUT = SAMPLES_ROOT;
-/** CLI 注入的工程名/包名覆盖（vrn.config 的 projectName/bundleId） */
+/** CLI 注入的工程名/包名覆盖（vuexir.config 的 projectName/bundleId） */
 let FORCED_PROJECT_NAME;
 let FORCED_BUNDLE_ID;
 const DEFAULT_INPUT = join(SAMPLES_ROOT_MUT, 'vuexir-demo'); // 多页目录模式默认样例
@@ -226,6 +227,11 @@ const RUNTIME_SWIFT = `final class Runtime {
         NSLog("[vrn] __nativeFetch value: %@", hfType)
     }
 
+    func evaluateTemplate(_ expression: String, _ bindings: [String: Any]) -> String {
+        guard let data = try? JSONSerialization.data(withJSONObject: bindings), let json = String(data: data, encoding: .utf8) else { return "" }
+        return ctx.objectForKeyedSubscript("__vrnEvalTemplate")?.call(withArguments: [expression, json])?.toString() ?? ""
+    }
+
     /// M3 注册 @State 绑定：JS stateStore.<name> 写回 → <setter>（onAppear 时由 View 注册）
     func bindState(_ name: String, _ setter: @escaping (Any) -> Void) {
         // R-THEME：ui_skin 变化 → ThemeColor.currentSkin + UserDefaults 同步 → 各视图 @AppStorage("vrn.skin") 自动重绘换肤
@@ -252,7 +258,7 @@ const RUNTIME_SWIFT = `final class Runtime {
         } else if let n = value as? Int { lit = String(n) }
         else if let b = value as? Bool { lit = b ? "true" : "false" }
         else { lit = "\\(value)" }
-        ctx.evaluateScript("__fromSwift = true; stateStore.\\(name) = \\(lit); __fromSwift = false")
+        ctx.evaluateScript("__fromSwift = true; __vrnWrite(\\\"\\(name)\\\", \\(lit)); __fromSwift = false; if(typeof __vrnRecompute==='function')__vrnRecompute(); if(typeof __vrnSyncPage==='function')__vrnSyncPage();")
     }
 
     /// 调用 <script> 里声明的 handler（@click="inc" → inc()；带参表达式如 inc(1) 原样执行）
@@ -465,6 +471,11 @@ function runOne(input) {
                 screenId: toIdentifier(idSource),
                 title: idSource,
                 // R41 组件表：同目录 components/*.vue（PascalCase 文件名 → SFC 源码）
+                inlineComponents: true,
+                liveStoreObjects: true,
+                pageScriptBundle: true,
+                assets: loadProjectAssets(input, findProjectRoot(dirname(input))),
+                globalStyles: loadProjectStyles(findProjectRoot(dirname(input))),
                 components: loadComponents(input),
             });
             screen = r.screen;
@@ -509,6 +520,7 @@ function runOne(input) {
     // 写前清空源目录（重生成不留旧组件/运行时文件）
     rmSync(srcDir, { recursive: true, force: true });
     mkdirSync(srcDir, { recursive: true });
+    materializeProjectAssets(screen.ui, srcDir, 'ios');
     const genWarnings = [];
     // R42：收集页面 + 组件全树颜色/字体 → Theme.swift token；codegen 引用 Theme.*
     const themeTokens = collectTheme(screen.ui, ...components.map((c) => c.ui));
@@ -560,7 +572,7 @@ function runOne(input) {
     return outDir;
 }
 /** M4a：TabView 多页 App.swift（router.ts 顶层 tab routes → 原生 TabView） */
-const TAB_APP_SWIFT = (projectName, tabs, details = [], rootBg = '#0a0f1e') => `import SwiftUI
+const TAB_APP_SWIFT = (projectName, tabs, details = [], rootBg = '#0a0f1e', tabBar) => `import SwiftUI
 import UIKit
 import JavaScriptCore
 
@@ -574,14 +586,14 @@ ${RUNTIME_SWIFT}
 /// 由容器（WindowGroup 直接子视图）onAppear 统一注册绑定 + 触发各页 onMounted。
 struct ContentView: View {
     @State private var selected = 0
-${details.length > 0 ? `    @State private var pushedRoute: String?` : ''}
+${details.length > 0 ? `    @State private var pushedRoutes: [String] = []` : ''}
 ${tabs
     .flatMap((t) => t.states.map((s) => ({ ...s, page: t.id })))
     .map((s, i) => `    @State private var p${i}_${s.name}: ${s.type === 'string' ? 'String' : s.type === 'boolean' ? 'Bool' : 'Int'} = ${s.type === 'string' ? `"${swiftStrEscape(String(s.init))}"` : s.type === 'boolean' ? (s.init ? 'true' : 'false') : typeof s.init === 'number' ? String(s.init) : '0'}`)
     .join('\n')}
 
     var body: some View {
-        NavigationStack {
+        NavigationStack${details.length ? "(path: $pushedRoutes)" : ""} {
             VStack(spacing: 0) {
             ZStack(alignment: .topLeading) {
 ${tabs
@@ -597,24 +609,23 @@ ${tabs
             HStack(spacing: 0) {
 ${tabs
     .map((t, i) => `                Button(action: { selected = ${i} }) {
-                    VStack(spacing: 2) {
-                        Image(systemName: "${t.icon}")
-                        Text("${t.title}").font(.system(size: 10))
+                    VStack(spacing: ${tabBar?.itemStyle.gap ?? 2}) {
+                        ${tabBar?.items.find((item) => item.id.toLowerCase() === t.id.toLowerCase()) ? `_vrnTabIcon${i}` : `Image(systemName: "${t.icon}")`}
+                        Text("${t.title}").font(.system(size: ${tabBar?.itemStyle.fontSize ?? 10}))
                     }
-                    .foregroundColor(selected == ${i} ? Color(red: 217/255.0, green: 179/255.0, blue: 108/255.0) : Color(red: 168/255.0, green: 174/255.0, blue: 194/255.0))
+                    .foregroundColor(selected == ${i} ? ${tabBar ? swiftColorExpression(tabBar.activeStyle.color ?? '#f3dca0') : 'Color(red: 217/255.0, green: 179/255.0, blue: 108/255.0)'} : ${tabBar ? swiftColorExpression(tabBar.itemStyle.color ?? '#5b647e') : 'Color(red: 168/255.0, green: 174/255.0, blue: 194/255.0)'})
                     .frame(maxWidth: .infinity)
+                    ${tabBar ? '.padding(.vertical, 6)' : ''}
                 }
                 .buttonStyle(.plain)`)
     .join('\n')}
             }
-            .frame(height: 56)
-            .background(ThemeColor.color("surface-2"))
-            .overlay(Divider(), alignment: .top)
+            ${tabBar ? `.padding(.vertical, 8).padding(.horizontal, 10) ${generateSwiftBoxModifiers(tabBar.style).join(' ')} .frame(maxWidth: ${tabBar.maxWidth ?? 10000}).padding(.horizontal, ${tabBar.widthInset / 2}).padding(.bottom, ${tabBar.bottom})` : '.frame(height: 56).background(ThemeColor.color("surface-2")).overlay(Divider(), alignment: .top)'}
             }
             // R68：容器背景兜底——页面内容不足或底部安全区不露白（R-THEME：默认深色 → ThemeColor 皮肤 bg）
             .background(${rootBg === '#0a0f1e' || rootBg === '#0a0F1E' || !rootBg ? 'ThemeColor.color("bg")' : swiftColorExpr(rootBg)})
 ${details.length > 0
-    ? `            .navigationDestination(item: $pushedRoute) { route in
+    ? `            .navigationDestination(for: String.self) { route in
                 Group {
 ${details
         .map((d) => `                    if route == "${d.path}" { ${d.view}() }`)
@@ -632,13 +643,25 @@ ${tabs
     .filter((t) => t.onMounted)
     .map((t) => `            Runtime.forPage("${t.id}").invoke("__onMounted")`)
     .join('\n')}
-${details.length > 0
-    ? `            Runtime.routerPushHandler = { path in pushedRoute = path }
-            Runtime.routerBackHandler = { pushedRoute = nil }`
-    : ''}
+            Runtime.routerPushHandler = { route in
+                switch route {
+${tabs.map((t, i) => `                case "${t.id.toLowerCase()}": selected = ${i}${details.length ? '; pushedRoutes = []' : ''}`).join('\n')}
+${details.map((d) => `                case "${d.id}", "${d.path}": if pushedRoutes.last != "${d.path}" { pushedRoutes.append("${d.path}") }`).join('\n')}
+                default: break
+                }
+            }
+${details.length ? '            Runtime.routerBackHandler = { if !pushedRoutes.isEmpty { pushedRoutes.removeLast() } }' : ''}
             }
         }
     }
+${tabs.map((t, i) => {
+    const item = tabBar?.items.find((item) => item.id.toLowerCase() === t.id.toLowerCase());
+    if (!item)
+        return '';
+    const tint = `selected == ${i} ? ThemeColor.color("gold-2") : ThemeColor.color("text-3")`;
+    const code = swiftVector({ vector: item.icon, color: '__vrnTabTint' }, (color) => color === '__vrnTabTint' ? tint : swiftColorExpr(color));
+    return `    private var _vrnTabIcon${i}: some View {\n        ${code.split('\n').join('\n        ')}.frame(width: 22, height: 22)\n    }`;
+}).join('\n')}
 }
 
 @main
@@ -686,14 +709,15 @@ const TAB_ICONS = ['house.fill', 'book.fill', 'gearshape.fill', 'person.fill', '
 /** 加载项目全局 CSS 变量（tokens.css 等 :root 定义）→ 供 parseColor 解析 var(--xxx) */
 function loadCssVars(appDir) {
     const root = findProjectRoot(appDir); // appDir 可能是 src/router 等子目录 → 回退到项目根
-    const map = new Map();
+    const map = new Map(Object.entries(extractCssVariables(loadProjectStyles(root))));
     const roots = [join(root, 'src/styles/tokens.css'), join(root, 'src/tokens.css'), join(root, 'styles/tokens.css'), join(root, 'src/styles/app.css')];
     for (const p of roots) {
         if (!existsSync(p))
             continue;
         const css = readFileSync(p, 'utf-8');
         for (const m of css.matchAll(/(--[\w-]+)\s*:\s*([^;{}]+);/g)) {
-            map.set(m[1], m[2].trim());
+            if (!map.has(m[1]))
+                map.set(m[1], m[2].trim());
         }
     }
     return map;
@@ -715,7 +739,7 @@ function injectSkinBridge(js) {
  */
 function loadSkinVars(appDir) {
     const root = findProjectRoot(appDir);
-    const skins = new Map();
+    const skins = new Map([['warm', new Map(Object.entries(extractCssVariables(loadProjectStyles(root))))]]);
     const roots = [join(root, 'src/styles/tokens.css'), join(root, 'src/tokens.css'), join(root, 'styles/tokens.css')];
     for (const p of roots) {
         if (!existsSync(p))
@@ -806,8 +830,10 @@ function buildThemeColorsSwift(skins) {
             if (c)
                 entries.push(`        "${k.slice(2)}": ${c}`);
         }
-        if (entries.length === 0)
+        if (entries.length === 0) {
+            lines.push(`    private static let ${skin === 'warm' ? 'warmMap' : `${skin}Map`}: [String: Color] = [:]`);
             continue;
+        }
         lines.push(`    private static let ${skin === 'warm' ? 'warmMap' : `${skin}Map`}: [String: Color] = [`);
         lines.push(entries.join(',\n'));
         lines.push('    ]');
@@ -854,10 +880,17 @@ function runTabs(appDir, opts = {}) {
         const r = vueToIr(src, {
             screenId: pageId,
             title: tab.title,
+            inlineComponents: true,
+            liveStoreObjects: true,
+            pageScriptBundle: true,
+            assets: loadProjectAssets(tab.file, findProjectRoot(dirname(tab.file))),
+            globalStyles: loadProjectStyles(findProjectRoot(dirname(tab.file))),
             components: loadComponents(tab.file),
             storeSources: loadStoreSources(tab.file),
             allowUnknownComponents: true,
         });
+        if (opts.nativeNavigationBar === false)
+            r.screen.navBar = { ...r.screen.navBar, hidden: true };
         if (r.warnings.length > 0) {
             console.log(`[gen-ios] 编译提示（${tab.id}，${r.warnings.length} 条）:`);
             for (const w of r.warnings)
@@ -870,6 +903,7 @@ function runTabs(appDir, opts = {}) {
                 console.error(`  ${i.path}: ${i.message}`);
             process.exit(1);
         }
+        materializeProjectAssets(r.screen.ui, srcDir, 'ios');
         themePieces.push({ ui: r.screen.ui, comps: r.components ?? [] });
         // 页面 View 源：运行时引用 per-page（JS 上下文隔离）
         // M4b：状态提升到容器（页面用 @Binding、无 onAppear；绑定+onMounted 由容器 onAppear 统一驱动——
@@ -891,7 +925,7 @@ function runTabs(appDir, opts = {}) {
         const pageBundle = bundlePageScript(tab.file, findProjectRoot(appDir));
         if (pageBundle)
             console.log(`[gen-ios] 页面脚本打包：${tab.id}（${pageBundle.names.length} 个绑定）`);
-        writeFileSync(join(srcDir, `runtime_${pageId}.js`), injectSkinBridge(utilsBundle.code + '\n' + (pageBundle?.code ?? '') + '\n' + (r.runtime ?? '')));
+        writeFileSync(join(srcDir, `runtime_${pageId}.js`), injectSkinBridge(RUNTIME_BOOTSTRAP_SOURCE + '\n' + utilsBundle.code + '\n' + (pageBundle?.code ?? '') + '\n' + (r.runtime ?? '') + '\n' + pageNavigationBridge(opts.navigation, tab.id, tabs.map((t) => t.id))));
         pageFiles.push(`${pageId}View.swift`);
         pageRuntimes.push({ id: pageId, src: r.runtime ?? '' });
         pageStates.push({
@@ -908,7 +942,7 @@ function runTabs(appDir, opts = {}) {
             })),
             onMounted: r.screen.onMounted !== undefined,
             navBar: r.screen.navBar,
-            rootBg: typeof r.screen.ui.props?.background === 'string' ? r.screen.ui.props.background : undefined,
+            rootBg: typeof r.screen.ui.props?.background === 'string' ? r.screen.ui.props.background : r.screen.ui.props?.gradient?.stops.at(-1)?.color,
         });
         console.log(`[gen-ios]   - ${pageId}View.swift (${swift.length} bytes) · tab「${tab.title}」`);
     }
@@ -926,10 +960,17 @@ function runTabs(appDir, opts = {}) {
         const r = vueToIr(src, {
             screenId: `${pageId}Detail`,
             title: d.title,
+            inlineComponents: true,
+            liveStoreObjects: true,
+            pageScriptBundle: true,
+            assets: loadProjectAssets(d.file, findProjectRoot(dirname(d.file))),
+            globalStyles: loadProjectStyles(findProjectRoot(dirname(d.file))),
             components: loadComponents(d.file),
             storeSources: loadStoreSources(d.file),
             allowUnknownComponents: true,
         });
+        if (opts.nativeNavigationBar === false)
+            r.screen.navBar = { ...r.screen.navBar, hidden: true };
         for (const w of r.warnings)
             console.log(`[gen-ios] 编译提示（${d.id}，push 页）: ${w}`);
         const v = validateIr(r.screen);
@@ -938,6 +979,7 @@ function runTabs(appDir, opts = {}) {
                 console.error(`  ${i.path}: ${i.message}`);
             process.exit(1);
         }
+        materializeProjectAssets(r.screen.ui, srcDir, 'ios');
         themePieces.push({ ui: r.screen.ui, comps: r.components ?? [] });
         const genWarnings = [];
         const swift = generateScreenSource(r.screen, {
@@ -951,7 +993,7 @@ function runTabs(appDir, opts = {}) {
         for (const w of genWarnings)
             console.log(`[gen-ios] 生成提示（${d.id}，push 页）: ${w}`);
         writeFileSync(join(srcDir, viewFile), swift.replace(/Text\("(_vrn[EAC][0-9]+)"\)/g, 'Text($1)'));
-        writeFileSync(join(srcDir, `runtime_${pageId}Detail.js`), injectSkinBridge(utilsBundle.code + '\n' + (r.runtime ?? '')));
+        writeFileSync(join(srcDir, `runtime_${pageId}Detail.js`), injectSkinBridge(RUNTIME_BOOTSTRAP_SOURCE + '\n' + utilsBundle.code + '\n' + (bundlePageScript(d.file, findProjectRoot(appDir))?.code ?? '') + '\n' + (r.runtime ?? '') + '\n' + pageNavigationBridge(opts.navigation, d.id, tabs.map((t) => t.id))));
         pageFiles.push(viewFile);
         pageRuntimes.push({ id: `${pageId}Detail`, src: r.runtime ?? '' });
         detailPages.push({ id: d.id, title: d.title, view: viewName, path: d.path });
@@ -985,7 +1027,7 @@ function runTabs(appDir, opts = {}) {
             console.log(`[gen-ios]   - ${comp.name}View.swift (${src.length} bytes) · R41 component view`);
         }
     }
-    writeFileSync(join(srcDir, 'App.swift'), TAB_APP_SWIFT(projectName, pageStates, detailPages, pageStates[0]?.rootBg ?? '#0a0f1e'));
+    writeFileSync(join(srcDir, 'App.swift'), TAB_APP_SWIFT(projectName, pageStates, detailPages, pageStates[0]?.rootBg ?? '#0a0f1e', opts.tabBar));
     writeFileSync(join(outDir, 'project.yml'), PROJECT_YML(projectName, bundleId));
     writeManifest(outDir, 'ios', projectName, bundleId, [
         ...pageFiles,
@@ -1028,7 +1070,7 @@ export function generateIos(opts = {}) {
     if (opts.bundleId)
         FORCED_BUNDLE_ID = opts.bundleId;
     if (opts.routerFile)
-        return runTabs(dirname(opts.routerFile), { routerFile: opts.routerFile });
+        return runTabs(dirname(opts.routerFile), { routerFile: opts.routerFile, nativeNavigationBar: opts.nativeNavigationBar, tabBar: opts.tabBar, navigation: opts.navigation });
     return runMain(opts.input);
 }
 /** P2：写 .vrn/manifest.json（工具链/模板版本 + 文件清单）并对齐陈旧文件 */

package/dist/shims.d.ts

@@ -16,12 +16,12 @@ export declare const DEXIE_SHIM_SOURCE = "\nfunction __vrnDbKey(db, table) { ret
  *   · onMounted   → 收集回调，由宿主在页面挂载后调用
  *   · watch       → 简单轮询式比较（同一个事件循环 tick 内触发）
  */
-export declare const VUE_SHIM_SOURCE = "\nvar __vrnMounted = [];\nexport function ref(v) {\n  return { __vrnRef: true, value: v };\n}\nexport function shallowRef(v) { return ref(v); }\nexport function reactive(obj) { return obj; }\nexport function readonly(obj) { return obj; }\nexport function computed(fn) {\n  // R120\uFF1A\u4E0D\u505A\u7F13\u5B58\u2014\u2014\u539F\u751F\u7AEF\u6CA1\u6709\u4F9D\u8D56\u8FFD\u8E2A\uFF0Cstore.init() \u662F\u5F02\u6B65\u7684\uFF0C\n  // \u9996\u6B21\u6C42\u503C\uFF08\u6570\u636E\u672A\u5230\uFF09\u4F1A\u88AB\u6C38\u4E45\u7F13\u5B58\u6210\u7A7A\u503C\u3002\u6BCF\u6B21\u8BFB\u90FD\u91CD\u7B97\uFF0C\u914D\u5408 tick \u540C\u6B65\u5373\u53EF\u3002\n  return {\n    __vrnComputed: true,\n    get value() {\n      try {\n        return fn();\n      } catch (e) {\n        return undefined;\n      }\n    },\n    set value(_v) {},\n  };\n}\nexport function onMounted(fn) { __vrnMounted.push(fn); }\nexport function onUnmounted() {}\nexport function onBeforeUnmount() {}\nexport function watch(source, cb) {\n  var last = typeof source === \"function\" ? source() : source && source.value;\n  return setInterval(function () {\n    var cur = typeof source === \"function\" ? source() : source && source.value;\n    if (cur !== last) { var prev = last; last = cur; cb(cur, prev); }\n  }, 16);\n}\nexport function nextTick(fn) { return Promise.resolve().then(fn); }\nexport function toRefs(obj) {\n  var out = {};\n  Object.keys(obj || {}).forEach(function (k) { out[k] = ref(obj[k]); });\n  return out;\n}\nexport function unref(v) { return v && v.__vrnRef ? v.value : v; }\nexport function isRef(v) { return !!(v && v.__vrnRef); }\nexport function __vrnRunMounted() {\n  var list = __vrnMounted.slice();\n  __vrnMounted.length = 0;\n  list.forEach(function (fn) { try { fn(); } catch (e) {} });\n}\nexport default {\n  ref: ref, shallowRef: shallowRef, reactive: reactive, readonly: readonly, computed: computed,\n  onMounted: onMounted, onUnmounted: onUnmounted, onBeforeUnmount: onBeforeUnmount,\n  watch: watch, nextTick: nextTick, toRefs: toRefs, unref: unref, isRef: isRef,\n};\n";
+export declare const VUE_SHIM_SOURCE = "\nvar __vrnMounted = [];\nexport function ref(v) {\n  return { __v_isRef: true, __vrnRef: true, value: v };\n}\nexport function shallowRef(v) { return ref(v); }\nexport function reactive(obj) { return obj; }\nexport function readonly(obj) { return obj; }\nexport function computed(fn) {\n  // R120\uFF1A\u4E0D\u505A\u7F13\u5B58\u2014\u2014\u539F\u751F\u7AEF\u6CA1\u6709\u4F9D\u8D56\u8FFD\u8E2A\uFF0Cstore.init() \u662F\u5F02\u6B65\u7684\uFF0C\n  // \u9996\u6B21\u6C42\u503C\uFF08\u6570\u636E\u672A\u5230\uFF09\u4F1A\u88AB\u6C38\u4E45\u7F13\u5B58\u6210\u7A7A\u503C\u3002\u6BCF\u6B21\u8BFB\u90FD\u91CD\u7B97\uFF0C\u914D\u5408 tick \u540C\u6B65\u5373\u53EF\u3002\n  return {\n    __v_isRef: true, __vrnRef: true, __vrnComputed: true,\n    get value() {\n      try {\n        return fn();\n      } catch (e) {\n        return undefined;\n      }\n    },\n    set value(_v) {},\n  };\n}\nexport function onMounted(fn) { __vrnMounted.push(fn); }\nexport function onUnmounted() {}\nexport function onBeforeUnmount() {}\nexport function watch(source, cb) {\n  var last = typeof source === \"function\" ? source() : source && source.value;\n  return setInterval(function () {\n    var cur = typeof source === \"function\" ? source() : source && source.value;\n    if (cur !== last) { var prev = last; last = cur; cb(cur, prev); }\n  }, 16);\n}\nexport function nextTick(fn) { return Promise.resolve().then(fn); }\nexport function toRefs(obj) {\n  var out = {};\n  Object.keys(obj || {}).forEach(function (k) { out[k] = ref(obj[k]); });\n  return out;\n}\nexport function unref(v) { return v && v.__vrnRef ? v.value : v; }\nexport function isRef(v) { return !!(v && v.__vrnRef); }\nexport function __vrnRunMounted() {\n  var list = __vrnMounted.slice();\n  __vrnMounted.length = 0;\n  list.forEach(function (fn) { try { fn(); } catch (e) {} });\n}\nexport default {\n  ref: ref, shallowRef: shallowRef, reactive: reactive, readonly: readonly, computed: computed,\n  onMounted: onMounted, onUnmounted: onUnmounted, onBeforeUnmount: onBeforeUnmount,\n  watch: watch, nextTick: nextTick, toRefs: toRefs, unref: unref, isRef: isRef,\n};\n";
 /**
  * R100 P4：`pinia` 的最小 shim —— 让 `stores/*.ts` 的 defineStore 能在运行时可加载。
  * 支持 options 写法（state/getters/actions）与 setup 写法（函数返回 state 与 action）。
  * 单例语义：同一 id 只创建一次（与 Pinia 一致），跨页面共享。
  */
-export declare const PINIA_SHIM_SOURCE = "\nvar __vrnStores = (typeof globalThis !== \"undefined\" && globalThis.__vrnStores) || (globalThis.__vrnStores = {});\nfunction __vrnBind(store, obj) {\n  Object.keys(obj || {}).forEach(function (k) {\n    var v = obj[k];\n    if (typeof v === \"function\") {\n      // R119\uFF1Aaction \u5185\u90E8\u5F02\u5E38\u5728\u539F\u751F\u7AEF\u5B8C\u5168\u4E0D\u53EF\u89C1 \u2192 \u8BB0\u5F55\u5230\u5168\u5C40\u9519\u8BEF\u8868\u5E76 toast \u51FA\u6765\n      store[k] = function () {\n        var self = this;\n        var rec = function (e) {\n          try {\n            var errs = (globalThis.__vrnErrs = globalThis.__vrnErrs || []);\n            errs.push(k + \": \" + String((e && e.message) || e));\n            if (typeof bridge !== \"undefined\" && bridge && bridge.toast) bridge.toast(\"E(\" + k + \"): \" + String((e && e.message) || e).slice(0, 40));\n          } catch (_) {}\n        };\n        try {\n          var r = v.apply(self, arguments);\n          if (r && typeof r.then === \"function\") r.then(null, rec);\n          return r;\n        } catch (e) {\n          rec(e);\n          throw e;\n        }\n      };\n    } else store[k] = v;\n  });\n}\nexport function defineStore(id, def) {\n  return function useStore() {\n    if (__vrnStores[id]) return __vrnStores[id];\n    var store = {};\n    if (typeof def === \"function\") {\n      var ret = def();\n      __vrnBind(store, ret);\n      Object.keys(ret || {}).forEach(function (k) {\n        if (ret[k] && ret[k].__vrnRef) store[k] = ret[k].value;\n      });\n    } else {\n      var state = typeof def.state === \"function\" ? def.state() : def.state || {};\n      Object.keys(state).forEach(function (k) { store[k] = state[k]; });\n      Object.keys(def.getters || {}).forEach(function (k) {\n        var g = def.getters[k];\n        Object.defineProperty(store, k, {\n          enumerable: true,\n          get: function () {\n            try {\n              return g.call(store, store);\n            } catch (e) {\n              // R124\uFF1Agetter \u5F02\u5E38\u5728\u539F\u751F\u7AEF\u4E0D\u53EF\u89C1 \u2192 \u8BB0\u5F55\u5E76 toast \u4E00\u6B21\n              try {\n                if (!globalThis.__vrnGetErr) {\n                  globalThis.__vrnGetErr = {};\n                }\n                if (!globalThis.__vrnGetErr[k]) {\n                  globalThis.__vrnGetErr[k] = 1;\n                  if (typeof bridge !== \"undefined\" && bridge && bridge.toast) {\n                    bridge.toast(\"G(\" + k + \"): \" + String((e && e.message) || e).slice(0, 36));\n                  }\n                }\n              } catch (_) {}\n              return undefined;\n            }\n          },\n        });\n      });\n      __vrnBind(store, def.actions);\n    }\n    __vrnStores[id] = store;\n    return store;\n  };\n}\nexport function createPinia() { return {}; }\nexport function storeToRefs(store) {\n  var out = {};\n  Object.keys(store || {}).forEach(function (k) {\n    var v = store[k];\n    if (typeof v !== \"function\") out[k] = { __vrnRef: true, get value() { return store[k]; }, set value(x) { store[k] = x; } };\n  });\n  return out;\n}\nexport default { defineStore: defineStore, createPinia: createPinia, storeToRefs: storeToRefs };\n";
+export declare const PINIA_SHIM_SOURCE = "\nvar __vrnStores = (typeof globalThis !== \"undefined\" && globalThis.__vrnStores) || (globalThis.__vrnStores = {});\nfunction __vrnBind(store, obj) {\n  Object.keys(obj || {}).forEach(function (k) {\n    var v = obj[k];\n    if (typeof v === \"function\") {\n      // R119\uFF1Aaction \u5185\u90E8\u5F02\u5E38\u5728\u539F\u751F\u7AEF\u5B8C\u5168\u4E0D\u53EF\u89C1 \u2192 \u8BB0\u5F55\u5230\u5168\u5C40\u9519\u8BEF\u8868\u5E76 toast \u51FA\u6765\n      store[k] = function () {\n        var self = this;\n        var rec = function (e) {\n          try {\n            var errs = (globalThis.__vrnErrs = globalThis.__vrnErrs || []);\n            errs.push(k + \": \" + String((e && e.message) || e));\n            if (typeof bridge !== \"undefined\" && bridge && bridge.toast) bridge.toast(\"E(\" + k + \"): \" + String((e && e.message) || e).slice(0, 40));\n          } catch (_) {}\n        };\n        try {\n          var r = v.apply(self, arguments);\n          if (r && typeof r.then === \"function\") r.then(null, rec);\n          return r;\n        } catch (e) {\n          rec(e);\n          throw e;\n        }\n      };\n    } else store[k] = v;\n  });\n}\nexport function defineStore(id, def) {\n  return function useStore() {\n    if (__vrnStores[id]) return __vrnStores[id];\n    var store = {};\n    if (typeof def === \"function\") {\n      var ret = def();\n      __vrnBind(store, ret);\n      Object.keys(ret || {}).forEach(function (k) {\n        if (ret[k] && (ret[k].__vrnRef || ret[k].__v_isRef)) Object.defineProperty(store, k, {\n          configurable:true, enumerable:true,\n          get:function(){return ret[k].value;}, set:function(v){ret[k].value=v;}\n        });\n      });\n    } else {\n      var state = typeof def.state === \"function\" ? def.state() : def.state || {};\n      Object.keys(state).forEach(function (k) { store[k] = state[k]; });\n      Object.keys(def.getters || {}).forEach(function (k) {\n        var g = def.getters[k];\n        Object.defineProperty(store, k, {\n          enumerable: true,\n          get: function () {\n            try {\n              return g.call(store, store);\n            } catch (e) {\n              // R124\uFF1Agetter \u5F02\u5E38\u5728\u539F\u751F\u7AEF\u4E0D\u53EF\u89C1 \u2192 \u8BB0\u5F55\u5E76 toast \u4E00\u6B21\n              try {\n                if (!globalThis.__vrnGetErr) {\n                  globalThis.__vrnGetErr = {};\n                }\n                if (!globalThis.__vrnGetErr[k]) {\n                  globalThis.__vrnGetErr[k] = 1;\n                  if (typeof bridge !== \"undefined\" && bridge && bridge.toast) {\n                    bridge.toast(\"G(\" + k + \"): \" + String((e && e.message) || e).slice(0, 36));\n                  }\n                }\n              } catch (_) {}\n              return undefined;\n            }\n          },\n        });\n      });\n      __vrnBind(store, def.actions);\n    }\n    __vrnStores[id] = store;\n    return store;\n  };\n}\nexport function createPinia() { return {}; }\nexport function storeToRefs(store) {\n  var out = {};\n  Object.keys(store || {}).forEach(function (k) {\n    var v = store[k];\n    if (typeof v !== \"function\") out[k] = { __vrnRef: true, get value() { return store[k]; }, set value(x) { store[k] = x; } };\n  });\n  return out;\n}\nexport default { defineStore: defineStore, createPinia: createPinia, storeToRefs: storeToRefs };\n";
 /** R118：vue-router 最小 shim（页面里的 useRoute/useRouter 在原生端由编译器接管导航） */
 export declare const VUE_ROUTER_SHIM_SOURCE = "\nexport function useRoute() {\n  return {\n    params: (typeof globalThis.__vrnRouteParams === \"object\" && globalThis.__vrnRouteParams) || {},\n    query: {},\n    path: (globalThis.__vrnRoutePath || \"/\"),\n    name: \"\",\n  };\n}\nexport function useRouter() {\n  return {\n    push: function (p) { try { if (typeof __routerPush === \"function\") __routerPush(typeof p === \"string\" ? p : (p && (p.name || p.path)) || \"\"); } catch (e) {} },\n    replace: function (p) { return this.push(p); },\n    back: function () { try { if (typeof __routerBack === \"function\") __routerBack(); } catch (e) {} },\n  };\n}\nexport function createRouter(o) { return { options: o, install: function () {} }; }\nexport function createWebHashHistory() { return {}; }\nexport function createWebHistory() { return {}; }\nexport default { useRoute: useRoute, useRouter: useRouter, createRouter: createRouter };\n";

package/dist/shims.js

@@ -91,7 +91,7 @@ export default class Dexie {
 export const VUE_SHIM_SOURCE = `
 var __vrnMounted = [];
 export function ref(v) {
-  return { __vrnRef: true, value: v };
+  return { __v_isRef: true, __vrnRef: true, value: v };
 }
 export function shallowRef(v) { return ref(v); }
 export function reactive(obj) { return obj; }
@@ -100,7 +100,7 @@ export function computed(fn) {
   // R120：不做缓存——原生端没有依赖追踪，store.init() 是异步的，
   // 首次求值（数据未到）会被永久缓存成空值。每次读都重算，配合 tick 同步即可。
   return {
-    __vrnComputed: true,
+    __v_isRef: true, __vrnRef: true, __vrnComputed: true,
     get value() {
       try {
         return fn();
@@ -181,7 +181,10 @@ export function defineStore(id, def) {
       var ret = def();
       __vrnBind(store, ret);
       Object.keys(ret || {}).forEach(function (k) {
-        if (ret[k] && ret[k].__vrnRef) store[k] = ret[k].value;
+        if (ret[k] && (ret[k].__vrnRef || ret[k].__v_isRef)) Object.defineProperty(store, k, {
+          configurable:true, enumerable:true,
+          get:function(){return ret[k].value;}, set:function(v){ret[k].value=v;}
+        });
       });
     } else {
       var state = typeof def.state === "function" ? def.state() : def.state || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir",
-  "version": "0.5.7",
+  "version": "0.7.0",
   "description": "vrn 命令行：build ios|android、preview、doctor",
   "type": "module",
   "license": "MIT",
@@ -21,8 +21,10 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@dongmingzhixiu/vuexir-compiler": "^0.5.4",
-    "@dongmingzhixiu/vuexir-templates": "^0.5.4"
+    "@dongmingzhixiu/vuexir-compiler": "^0.7.0",
+    "@dongmingzhixiu/vuexir-templates": "^0.7.0",
+    "@vue/compiler-sfc": "^3.5.43",
+    "esbuild": "^0.21.5"
   },
   "engines": {
     "node": ">=18"