@dongmingzhixiu/vuexir 0.1.1 → 0.2.0

package/dist/cli.js

@@ -64,8 +64,8 @@ export async function generate(args, platform) {
     const explicit = args.input ? await resolveExplicitEntry(args.input, cfg) : undefined;
     const resolved = explicit ? { entry: explicit.entry, multiPage: explicit.multiPage } : resolveEntry(cfg);
     const { entry, multiPage } = resolved;
-    /** 传给生成器的入口目录（生成器约定：目录内含 router.ts / App.vue） */
-    const inputDir = explicit ? explicit.dir : dirname(entry);
+    /** 传给生成器的入口（约定：路由文件路径 / 含 router.ts 的目录 / 含 App.vue 的目录） */
+    const inputDir = explicit ? explicit.dir : multiPage ? entry : dirname(entry);
     const projectName = cfg.projectName ?? deriveProjectName(cfg, entry);
     const bundleId = cfg.bundleId ?? `com.vrn.${projectName.toLowerCase()}`;
     const outRoot = platformOutDir(cfg, platform, '').replace(/\/$/, '');

package/dist/config.js

@@ -63,9 +63,13 @@ export function resolveEntry(cfg) {
             return { entry: p, multiPage: p.endsWith('router.ts') || p.endsWith('router.js') };
         throw new Error(`vrn.config.entry 指向的文件不存在：${p}`);
     }
-    const router = join(cfg.projectRoot, 'src/router.ts');
-    const routerRoot = join(cfg.projectRoot, 'router.ts');
-    for (const r of [router, routerRoot]) {
+    const routerCandidates = [
+        join(cfg.projectRoot, 'src/router.ts'),
+        join(cfg.projectRoot, 'src/router/index.ts'),
+        join(cfg.projectRoot, 'src/router/index.js'),
+        join(cfg.projectRoot, 'router.ts'),
+    ];
+    for (const r of routerCandidates) {
         if (existsSync(r))
             return { entry: r, multiPage: true };
         candidates.push(r);

package/dist/gen-android.js

@@ -23,6 +23,10 @@ const SAMPLES_ROOT = process.env.VRN_SAMPLES_ROOT ?? join(ROOT, 'examples');
 /** 生成 Android（Compose）工程；返回产物目录 */
 export function generateAndroid(opts = {}) {
     const input = resolveInput(opts.input);
+    // 直接给路由文件（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 });
+    }
     if (!existsSync(join(input, 'router.ts'))) {
         throw new Error(`[vrn] ${input} 缺少 router.ts（多页模式需要 router.ts；单页请用 gen-ios 路径或补 router.ts）`);
     }

package/dist/gen-ios.js

@@ -15,9 +15,10 @@
 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 { TEMPLATE_VERSION, projectYml as PROJECT_YML, templateFiles } from '@dongmingzhixiu/vuexir-templates';
+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 } from '@dongmingzhixiu/vuexir-compiler';
+import { generateScreenSource, generateComponentSource, collectTheme, buildTheme, generateThemeSource, VRN_HELPERS_SWIFT } from '@dongmingzhixiu/vuexir-compiler';
 import { vueToIr, VueCompileError } from '@dongmingzhixiu/vuexir-compiler';
 // R-PKG：产物与样例根不再假设仓库布局（CLI 通过 VRN_OUT_DIR / VRN_SAMPLES_ROOT 注入）
 const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..', '..', '..');
@@ -159,6 +160,33 @@ const RUNTIME_SWIFT = `final class Runtime {
         }
         ctx.setObject(clearI, forKeyedSubscript: "__nativeClearInterval" as NSString)
 
+        // R81 原生桥宿主函数：bridge.toast / bridge.openUrl（编译期注入的 VrnBridge.swift 提供实现）
+        let nativeToast: @convention(block) (String) -> Void = { msg in
+            VrnBridge.toast(msg)
+        }
+        ctx.setObject(nativeToast, forKeyedSubscript: "__nativeToast" as NSString)
+        let nativeOpenUrl: @convention(block) (String) -> Void = { url in
+            VrnBridge.openUrl(url)
+        }
+        ctx.setObject(nativeOpenUrl, forKeyedSubscript: "__nativeOpenUrl" as NSString)
+        // R84 桥能力扩展：震动 / 剪贴板 / 状态栏 / 屏幕常亮
+        let nativeVibrate: @convention(block) (Double) -> Void = { ms in
+            VrnBridge.vibrate(Int(ms))
+        }
+        ctx.setObject(nativeVibrate, forKeyedSubscript: "__nativeVibrate" as NSString)
+        let nativeCopy: @convention(block) (String) -> Void = { text in
+            VrnBridge.copy(text)
+        }
+        ctx.setObject(nativeCopy, forKeyedSubscript: "__nativeCopy" as NSString)
+        let nativeSetStatusBar: @convention(block) (String) -> Void = { style in
+            VrnBridge.setStatusBar(style)
+        }
+        ctx.setObject(nativeSetStatusBar, forKeyedSubscript: "__nativeSetStatusBar" as NSString)
+        let nativeKeepScreenOn: @convention(block) (Bool) -> Void = { on in
+            VrnBridge.keepScreenOn(on)
+        }
+        ctx.setObject(nativeKeepScreenOn, forKeyedSubscript: "__nativeKeepScreenOn" as NSString)
+
         // M4b router 桥：router.push('/path') / router.back() → 容器导航（静态 handler 由 ContentView onAppear 注册）
         let routerPush: @convention(block) (String) -> Void = { path in
             DispatchQueue.main.async { Runtime.routerPushHandler?(path) }
@@ -322,6 +350,26 @@ function tabNavBarModifiers(tabs) {
 }
 /** R40 组件表：输入 .vue 同目录 components/*.vue → { PascalCase 名: SFC 源码 }
  *  R-VFOBJ：并向上查找样例根 components/（共享组件目录，如 vuexir-demo/components/VirRow.vue） */
+/** 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(input) {
     const dirs = new Set();
     const local = join(dirname(input), 'components');
@@ -381,6 +429,7 @@ function runOne(input) {
                 ? dirName
                 : fileName;
             const r = vueToIr(readFileSync(input, 'utf-8'), {
+                storeSources: loadStoreSources(input),
                 screenId: toIdentifier(idSource),
                 title: idSource,
                 // R41 组件表：同目录 components/*.vue（PascalCase 文件名 → SFC 源码）
@@ -454,6 +503,8 @@ function runOne(input) {
     }
     // R42 Theme token：颜色/字体抽离（去重常量，页面与组件共享引用）
     writeFileSync(join(srcDir, 'Theme.swift'), themeSrc);
+    writeFileSync(join(srcDir, 'VrnHelpers.swift'), VRN_HELPERS_SWIFT);
+    writeFileSync(join(srcDir, 'VrnBridge.swift'), VRN_BRIDGE_SWIFT);
     writeFileSync(join(outDir, 'project.yml'), PROJECT_YML(projectName, bundleId));
     writeManifest(outDir, 'ios', projectName, bundleId, ['ScreenView.swift', ...compFiles.map((f) => f.name), 'Theme.swift', 'App.swift', 'project.yml', 'runtime.js', 'recite.json']);
     console.log(`[gen-ios] 已生成工程: ${outDir}`);
@@ -596,58 +647,12 @@ function flatIndex(tabs, tabIdx, stateIdx) {
 const TAB_ICONS = ['house.fill', 'book.fill', 'gearshape.fill', 'person.fill', 'square.grid.2x2.fill'];
 /** 编译期解析 router.ts 子集：import 组件映射 + routes 表（path/name/component/meta.tab/title/icon）
  * M4b：非 tab 路由（无 meta.tab）→ details 列表（router.push → NavigationStack push） */
-function parseRouter(src, dir) {
-    const imports = {};
-    for (const m of src.matchAll(/import\s+(\w+)\s+from\s+['"]([^'"]+)['"]/g))
-        imports[m[1]] = m[2];
-    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)) {
-        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];
-        }
-        routes.push({ path: m[1], name: m[2], component: m[3], meta });
-    }
-    // R-VFOBJ-E：空 tab 自动隐藏——tab 页模板无任何文本内容（纯空壳/占位）时从 tab 栏移除；
-    // 有内容（row/line/标题/组件/任意文本）则保留。组合式 API 等文档型 tab 有内容即保留。
-    const tabs = routes
-        .filter((r) => r.meta.tab === 'true')
-        .filter((r) => {
-        const p = join(dir, imports[r.component] ?? '');
-        if (!existsSync(p))
-            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;
-    })
-        .map((r, i) => ({
-        id: r.name,
-        title: r.meta.title ?? r.name,
-        file: join(dir, imports[r.component] ?? ''),
-        icon: r.meta.icon ?? TAB_ICONS[i % TAB_ICONS.length],
-    }));
-    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 路由（routes 需含 meta: { tab: true }）');
-    }
-    return { tabs, details };
-}
 /** M4a 多页目录模式：samples/<name>/ 含 router.ts + pages/*.vue → TabView 工程 */
-function runTabs(appDir) {
-    const routerSrc = readFileSync(join(appDir, 'router.ts'), 'utf-8');
-    const { tabs, details } = parseRouter(routerSrc, appDir);
+function runTabs(appDir, opts = {}) {
+    const routerSrc = readFileSync(opts.routerFile ?? join(appDir, 'router.ts'), 'utf-8');
+    const { tabs, details, warnings: routerWarnings } = parseRouterV2(routerSrc, findProjectRoot(appDir), opts.routerFile ?? join(appDir, 'router.ts'));
+    for (const w of routerWarnings)
+        console.log(`[gen-ios] 路由提示: ${w}`);
     console.log(`[gen-ios] 多页模式: router.ts → ${tabs.length} 个 tab 页面` + (details.length ? ` + ${details.length} 个 push 页面` : ''));
     const projectName = FORCED_PROJECT_NAME ?? toIdentifier(basename(appDir));
     const bundleId = FORCED_BUNDLE_ID ?? `com.vrn.${projectName.toLowerCase()}`;
@@ -669,6 +674,7 @@ function runTabs(appDir) {
             screenId: pageId,
             title: tab.title,
             components: loadComponents(tab.file),
+            storeSources: loadStoreSources(tab.file),
         });
         if (r.warnings.length > 0) {
             console.log(`[gen-ios] 编译提示（${tab.id}，${r.warnings.length} 条）:`);
@@ -729,7 +735,12 @@ function runTabs(appDir) {
         // screenId 同步带 Detail → struct 名 = <Id>DetailView，与文件/view 引用一致（防 Swift 重复声明）
         const viewFile = `${pageId}DetailView.swift`;
         const viewName = `${pageId}DetailView`;
-        const r = vueToIr(src, { screenId: `${pageId}Detail`, title: d.title, components: loadComponents(d.file) });
+        const r = vueToIr(src, {
+            screenId: `${pageId}Detail`,
+            title: d.title,
+            components: loadComponents(d.file),
+            storeSources: loadStoreSources(d.file),
+        });
         for (const w of r.warnings)
             console.log(`[gen-ios] 编译提示（${d.id}，push 页）: ${w}`);
         const v = validateIr(r.screen);
@@ -769,6 +780,8 @@ function runTabs(appDir) {
     }
     const theme = buildThemeFromPieces(themePieces);
     writeFileSync(join(srcDir, 'Theme.swift'), generateThemeSource(theme));
+    writeFileSync(join(srcDir, 'VrnHelpers.swift'), VRN_HELPERS_SWIFT);
+    writeFileSync(join(srcDir, 'VrnBridge.swift'), VRN_BRIDGE_SWIFT);
     // R-VFOBJ：多页组件合并生成（各页组件表去重 → 独立 XxxView.swift；页面引用点已生成）
     const compSeen = new Set();
     for (const p of themePieces) {
@@ -868,6 +881,14 @@ function runMain(arg) {
     if (arg && existsSync(join(arg, 'router.ts'))) {
         return runTabs(join(arg));
     }
+    // 直接给路由文件（src/router/index.ts 等）：用其所在目录 + 显式 routerFile
+    if (arg && /\.(ts|js|mts)$/.test(arg) && existsSync(arg)) {
+        return runTabs(dirname(arg), { routerFile: arg });
+    }
+    // 单页工程：arg 为含 App.vue 的目录（Vite 常见结构 src/App.vue）
+    if (arg && existsSync(join(arg, 'App.vue'))) {
+        return runOne(join(arg, 'App.vue'));
+    }
     // M4a 多页目录模式：arg 指向含 router.ts 的目录（如 samples/tabs）
     if (arg && existsSync(join(process.cwd(), arg, 'router.ts'))) {
         return runTabs(join(process.cwd(), arg));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "vrn 命令行：build ios|android、preview、doctor",
   "type": "module",
   "license": "MIT",
@@ -21,8 +21,8 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@dongmingzhixiu/vuexir-compiler": "^0.1.0",
-    "@dongmingzhixiu/vuexir-templates": "^0.1.0"
+    "@dongmingzhixiu/vuexir-compiler": "^0.2.0",
+    "@dongmingzhixiu/vuexir-templates": "^0.2.0"
   },
   "engines": {
     "node": ">=18"
@@ -37,12 +37,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dongmingzhixiu/vue-render-native.git",
+    "url": "git+https://github.com/dongmingzhixiu/vuexir.git",
     "directory": "packages/cli"
   },
-  "homepage": "https://github.com/dongmingzhixiu/vue-render-native#readme",
+  "homepage": "https://github.com/dongmingzhixiu/vuexir#readme",
   "bugs": {
-    "url": "https://github.com/dongmingzhixiu/vue-render-native/issues"
+    "url": "https://github.com/dongmingzhixiu/vuexir/issues"
   },
   "author": "panvu"
 }