@dongmingzhixiu/vuexir-compiler 0.1.0 → 0.1.1

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;

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,7 @@ import androidx.activity.enableEdgeToEdge
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Store.init(applicationContext)
         // R-SYSTEMBAR：应用固定深色主题（InkBg/InkBar），与系统明暗设置无关。
         // enableEdgeToEdge() 默认用 SystemBarStyle.auto(...)，会跟随系统明暗切换图标明暗——
         // 系统处于浅色模式时给出深色图标，落在深色顶栏/底栏上不可读（真机反馈：系统栏文字看不清）。
@@ -144,6 +145,17 @@ fun VuexirTheme(content: @Composable () -> Unit) {
 const RUNTIME_KT = (bundleId) => `package ${bundleId}
 
 // Vuexir Android 运行时桥（对位 iOS RUNTIME_SWIFT）
+/** R73 持久化桥：对位 iOS runtime 的 localStorage（UserDefaults）—— SharedPreferences 同步读写 */
+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() }
+}
+
 object Runtime {
     var pushHandler: ((String) -> Unit)? = null
     fun push(route: String) {
@@ -422,7 +434,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 +612,25 @@ function asyncLineKotlin(line, ctx) {
             return null;
         return `if (${cond}) {`;
     }
+    // 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 +680,15 @@ 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})`);
+    // 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 +752,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);
     };
@@ -1191,7 +1234,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') {

package/dist/transform/vue2ir.js

@@ -706,6 +706,15 @@ export function vueToIr(source, opts = {}) {
                 warnings.push(`handler「${h.name}」函数体疑似含 TS 类型标注（如 const x: number = 1），runtime.js 将解析失败——请移除类型标注（R13 仅支持 JS 子集）`);
             }
         }
+        // R74：状态名撞原生保留成员（SwiftUI `body`、Kotlin 关键字等）会导致生成代码编译失败 → 必须提前警告
+        {
+            const RESERVED = ['body', 'self', 'init', 'class', 'object', 'fun', 'val', 'var', 'when', 'is', 'in'];
+            for (const st of stateInfo?.states ?? []) {
+                if (RESERVED.includes(st.name)) {
+                    warnings.push(`状态名「${st.name}」与原生保留成员冲突（SwiftUI body / Kotlin 关键字）——请改名（如 ${st.name}Text / ${st.name}Value），否则生成的 iOS/Android 代码无法编译`);
+                }
+            }
+        }
         navBarConfig = extractScreenNavBar(src, warnings);
         vforConsts = extractScreenConstArrays(src);
         onMountedBody = extractOnMounted(src);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir-compiler",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",
@@ -45,12 +45,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dongmingzhixiu/vue-render-native.git",
+    "url": "git+https://github.com/dongmingzhixiu/vuexir.git",
     "directory": "packages/compiler"
   },
-  "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"
 }