@dongmingzhixiu/vuexir 0.5.4 → 0.5.5

package/dist/bundle.js

@@ -121,7 +121,11 @@ export function bundlePageScript(pageFile, projectRoot) {
             },
         });
         const code = out.outputFiles?.[0]?.text ?? '';
-        return code ? { code, names } : null;
+        // 页面导出提升为全局：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){}}})();`;
+        return promoted ? { code: promoted, names } : null;
     }
     catch (e) {
         if (process.env.VRN_DEBUG_BUNDLE)

package/dist/cli.js

@@ -65,7 +65,23 @@ export async function generate(args, platform) {
     const resolved = explicit ? { entry: explicit.entry, multiPage: explicit.multiPage } : resolveEntry(cfg);
     const { entry, multiPage } = resolved;
     /** 传给生成器的入口（约定：路由文件路径 / 含 router.ts 的目录 / 含 App.vue 的目录） */
-    const inputDir = explicit ? explicit.dir : multiPage ? entry : dirname(entry);
+    // R142：多页入口统一解析成「具体的路由文件」，避免目录里没有 router.ts 时退回样例模式
+    let routerFile;
+    if (multiPage) {
+        if (/\.(ts|js|mts|mjs)$/.test(entry) && existsSync(entry)) {
+            routerFile = entry;
+        }
+        else {
+            for (const cand of ['router.ts', 'index.ts', 'router/index.ts', 'router.js']) {
+                const full = join(entry, cand);
+                if (existsSync(full)) {
+                    routerFile = full;
+                    break;
+                }
+            }
+        }
+    }
+    const inputDir = routerFile ? dirname(routerFile) : 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(/\/$/, '');
@@ -77,14 +93,14 @@ export async function generate(args, platform) {
         if (!multiPage) {
             throw new Error('[vrn] Android 生成目前要求多页入口 router.ts（单页 App.vue 请先补 router.ts）');
         }
-        return generateAndroid({ input: inputDir, outDirRoot: outRoot, projectName, bundleId });
+        return generateAndroid({ input: inputDir, outDirRoot: outRoot, projectName, bundleId, ...(routerFile ? { routerFile } : {}) });
     }
     const out = generateIos({
         input: inputDir,
         outDirRoot: outRoot,
         projectName,
         bundleId,
-        ...(explicit && explicit.multiPage ? { routerFile: explicit.entry } : {}),
+        ...(routerFile ? { routerFile } : {}),
     });
     if (!out)
         throw new Error('[vrn] iOS 生成未返回产物目录');

package/dist/config.js

@@ -11,7 +11,7 @@
  */
 import { existsSync, readFileSync, statSync } from 'node:fs';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
-const CONFIG_FILES = ['vrn.config.ts', 'vrn.config.mts', 'vrn.config.js', 'vrn.config.mjs', 'vrn.config.json'];
+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，失败则忽略并提示） */
 export async function loadConfig(projectRoot) {
     for (const file of CONFIG_FILES) {
@@ -59,8 +59,9 @@ export function resolveEntry(cfg) {
                 return { entry: a, multiPage: false };
             throw new Error(`entry 目录内没有 router.ts / App.vue：${p}`);
         }
+        // R142：任何 .ts/.js 入口都按「路由表」处理（src/router/index.ts 这类命名很常见）
         if (existsSync(p))
-            return { entry: p, multiPage: p.endsWith('router.ts') || p.endsWith('router.js') };
+            return { entry: p, multiPage: /\.(ts|js|mts|mjs)$/.test(p) };
         throw new Error(`vrn.config.entry 指向的文件不存在：${p}`);
     }
     const routerCandidates = [

package/dist/gen-ios.js

@@ -254,6 +254,17 @@ const RUNTIME_SWIFT = `final class Runtime {
         if name.contains("(") { ctx.evaluateScript(name) }
         else { ctx.evaluateScript("\\(name)()") }
     }
+
+    /// R-LOOPITEM：v-for 项点击时把当前 item 注入 JS 全局 __vrnLoop，
+    /// invoke 表达式里的循环变量引用（goDetail(row.item.id)）才能求值
+    func setLoopItem(_ value: Any) {
+        guard let json = try? JSONSerialization.data(withJSONObject: value),
+              let s = String(data: json, encoding: .utf8) else { return }
+        let escaped = s.replacingOccurrences(of: "\\\\", with: "\\\\\\\\")
+            .replacingOccurrences(of: "\\"", with: "\\\\\\"")
+            .replacingOccurrences(of: "\\n", with: "\\\\n")
+        ctx.evaluateScript("__vrnLoop = JSON.parse(\\"\\(escaped)\\")")
+    }
 }
 `;
 const APP_SWIFT = (projectName, viewName, screenTitle) => `import SwiftUI
@@ -496,7 +507,8 @@ function runOne(input) {
     const themeTokens = collectTheme(screen.ui, ...components.map((c) => c.ui));
     const theme = buildTheme(themeTokens);
     const themeSrc = generateThemeSource(theme);
-    const swift = generateScreenSource(screen, { warnings: genWarnings, theme });
+    const cssVars = loadCssVars(input);
+    const swift = generateScreenSource(screen, { warnings: genWarnings, theme, cssVars });
     if (genWarnings.length > 0) {
         console.log(`[gen-ios] 布局降级提示（${genWarnings.length} 条，R-H3/H4/H5）:`);
         for (const w of genWarnings)
@@ -511,7 +523,7 @@ function runOne(input) {
     const compFiles = [];
     for (const comp of components) {
         const compWarnings = [];
-        const src = generateComponentSource(comp.name, comp.ui, { warnings: compWarnings, theme });
+        const src = generateComponentSource(comp.name, comp.ui, { warnings: compWarnings, theme, cssVars });
         writeFileSync(join(srcDir, `${comp.name}View.swift`), src);
         compFiles.push({ name: `${comp.name}View.swift`, bytes: src.length });
     }
@@ -662,12 +674,28 @@ const TAB_ICONS = ['house.fill', 'book.fill', 'gearshape.fill', 'person.fill', '
 /** 编译期解析 router.ts 子集：import 组件映射 + routes 表（path/name/component/meta.tab/title/icon）
  * M4b：非 tab 路由（无 meta.tab）→ details 列表（router.push → NavigationStack push） */
 /** M4a 多页目录模式：samples/<name>/ 含 router.ts + pages/*.vue → TabView 工程 */
+/** 加载项目全局 CSS 变量（tokens.css 等 :root 定义）→ 供 parseColor 解析 var(--xxx) */
+function loadCssVars(appDir) {
+    const root = findProjectRoot(appDir); // appDir 可能是 src/router 等子目录 → 回退到项目根
+    const map = new Map();
+    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());
+        }
+    }
+    return map;
+}
 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 cssVars = loadCssVars(appDir);
     const projectName = FORCED_PROJECT_NAME ?? toIdentifier(basename(appDir));
     const bundleId = FORCED_BUNDLE_ID ?? `com.vrn.${projectName.toLowerCase()}`;
     const outDir = join(OUT_ROOT, projectName);
@@ -720,6 +748,7 @@ function runTabs(appDir, opts = {}) {
         const swift = generateScreenSource(r.screen, {
             warnings: genWarnings,
             theme: undefined,
+            cssVars,
             // runtime 页键与 JS 资源名统一用标识符化 pageId（tab.id 可能含非法字符；也避免与 detail 撞名）
             runtime: `Runtime.forPage("${pageId}")`,
             bindingMode: 'external',
@@ -784,6 +813,7 @@ function runTabs(appDir, opts = {}) {
         const swift = generateScreenSource(r.screen, {
             warnings: genWarnings,
             theme: undefined,
+            cssVars,
             // runtime 页键与 tab 页同规则标识符化 + Detail 后缀——
             // tab/detail 同名时（R-VFOBJ-C）JS 资源文件与 forPage 键都独立，不会互相覆盖
             runtime: `Runtime.forPage("${pageId}Detail")`,
@@ -820,7 +850,7 @@ function runTabs(appDir, opts = {}) {
                 continue;
             compSeen.add(comp.name);
             const compWarnings = [];
-            const src = generateComponentSource(comp.name, comp.ui, { warnings: compWarnings, theme });
+            const src = generateComponentSource(comp.name, comp.ui, { warnings: compWarnings, theme, cssVars });
             writeFileSync(join(srcDir, `${comp.name}View.swift`), src);
             console.log(`[gen-ios]   - ${comp.name}View.swift (${src.length} bytes) · R41 component view`);
         }
@@ -858,8 +888,7 @@ function buildThemeFromPieces(pieces) {
  */
 export function generateIos(opts = {}) {
     // R141：直接给路由文件（src/router/index.ts）时，目录里并没有 router.ts
-    if (opts.routerFile)
-        return runTabs(dirname(opts.routerFile), { routerFile: opts.routerFile });
+    // 先注入全局（OUT_ROOT / 工程名 / bundleId），再按入口形态分派
     if (opts.outDirRoot)
         OUT_ROOT = opts.outDirRoot;
     if (opts.samplesRoot)
@@ -868,6 +897,8 @@ export function generateIos(opts = {}) {
         FORCED_PROJECT_NAME = opts.projectName;
     if (opts.bundleId)
         FORCED_BUNDLE_ID = opts.bundleId;
+    if (opts.routerFile)
+        return runTabs(dirname(opts.routerFile), { routerFile: opts.routerFile });
     return runMain(opts.input);
 }
 /** P2：写 .vrn/manifest.json（工具链/模板版本 + 文件清单）并对齐陈旧文件 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "vrn 命令行：build ios|android、preview、doctor",
   "type": "module",
   "license": "MIT",