@dongmingzhixiu/vuexir-compiler 0.7.7 → 0.7.9

package/dist/codegen/compose.d.ts

@@ -109,6 +109,7 @@ declare function buildNavHost(bundleId: string, tabs: {
     mode?: string;
 }[], options?: {
     tabBar?: TabBarSpec;
+    nativeNavigationBar?: boolean;
 }): string;
 /**
  * 输入解析（R-PKG）：CLI 通过 VRN_SAMPLES_ROOT 注入样例根（默认 <repo>/examples）。

package/dist/codegen/compose.js

@@ -11,6 +11,8 @@
 import { readFileSync, writeFileSync, mkdirSync, existsSync, readdirSync, rmSync } from 'node:fs';
 import { join, dirname, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { NodeTypes } from '@vue/compiler-core';
+import { parse } from '@vue/compiler-sfc';
 import { loadProjectAssets, materializeProjectAssets } from './project-assets.js';
 import { extractCssVariables } from '../transform/css.js';
 import { loadProjectStyles } from './project-styles.js';
@@ -476,8 +478,16 @@ function dp(n) {
 function sp(n) {
     return `${n}.sp`;
 }
+function kotlinStringContents(value) {
+    return value
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"')
+        .replace(/\$/g, () => '\\$')
+        .replace(/\n/g, '\\n')
+        .replace(/\r/g, '\\r');
+}
 function kotlinStr(s) {
-    return `"${s.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '${\'$\'}').replace(/\n/g, '\\n').replace(/\r/g, '\\r')}"`;
+    return `"${kotlinStringContents(s)}"`;
 }
 /** 条件表达式 → Kotlin（对位 iOS swiftCondExpr：=== / !== 归一 + 单引号字符串转双引号） */
 /** R114：文本绑定里引用的标识符若既不是页面状态也不是循环变量 → 视为未支持，回退空串 */
@@ -1381,7 +1391,7 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
                 const segs = p.bindParts
                     .map((seg) => {
                     if ('text' in seg)
-                        return String(seg.text).replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\$/g, '${\'$\'}').replace(/\n/g, '\\n');
+                        return kotlinStringContents(String(seg.text));
                     if ('bind' in seg)
                         return '${' + safeBind(seg.bind, ctx, loop) + '}';
                     if ('fieldOf' in seg)
@@ -1519,17 +1529,18 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
         }
         case 'image': {
             const source = p.src ?? '';
+            const contentScale = p.objectFit === 'fill' ? 'FillBounds' : p.objectFit === 'contain' ? 'Fit' : 'Crop';
             const chain = modChain([...sizeModifiers(p, ctx), ...absM(p), ...clipModifiers(p), ...visualModifiers(p), ...paddingModifiers(p), ...alphaArr], pad + '    ');
             if (source.startsWith('asset://')) {
                 const name = source.slice(8);
-                return pad + 'run { val imageContext = androidx.compose.ui.platform.LocalContext.current; val bitmap = remember { imageContext.assets.open(' + kotlinStr(name) + ').use { android.graphics.BitmapFactory.decodeStream(it) } }; if(bitmap != null) Image(bitmap = bitmap.asImageBitmap(), contentDescription = null, contentScale = androidx.compose.ui.layout.ContentScale.' + (p.objectFit === 'contain' ? 'Fit' : 'Crop') + ', modifier = Modifier' + chain + ') }';
+                return pad + 'run { val imageContext = androidx.compose.ui.platform.LocalContext.current; val bitmap = remember { imageContext.assets.open(' + kotlinStr(name) + ').use { android.graphics.BitmapFactory.decodeStream(it) } }; if(bitmap != null) Image(bitmap = bitmap.asImageBitmap(), contentDescription = null, contentScale = androidx.compose.ui.layout.ContentScale.' + contentScale + ', modifier = Modifier' + chain + ') }';
             }
             if (/^data:image\/[^;]+;base64,/.test(source)) {
                 const encoded = source.slice(source.indexOf(',') + 1);
                 return pad + 'run {\n' + pad + '    val imageBytes = remember { android.util.Base64.decode(' + kotlinStr(encoded) + ', android.util.Base64.DEFAULT) }\n' +
                     pad + '    val bitmap = remember { android.graphics.BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size) }\n' +
                     pad + '    if (bitmap != null) Image(bitmap = bitmap.asImageBitmap(), contentDescription = null, contentScale = androidx.compose.ui.layout.ContentScale.' +
-                    (p.objectFit === 'contain' ? 'Fit' : 'Crop') + ', modifier = Modifier' + chain + ')\n' + pad + '}';
+                    contentScale + ', modifier = Modifier' + chain + ')\n' + pad + '}';
             }
             ctx.warnings.push(`图片 ${source.slice(0, 80)} 需要 data URI 资源映射，Android 未生成图片内容`);
             return pad + 'Box(modifier = Modifier' + chain + ')';
@@ -1755,10 +1766,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 `;
 const TAB_ICONS = ['home.fill', 'book.fill', 'square.grid.2x2.fill', 'bell.fill', 'gearshape.fill', 'explore', 'work'];
-/** tab 文案拆 2 字一行（对位 iOS 窄 tab 自动换行视觉） */
+/** 纯汉字 tab 保持两字一行，其他标题由系统按可用宽度换行。 */
 function tabLabel(title) {
-    const t = title.replace(/\s+/g, '');
-    return t.length > 2 ? t.match(/.{1,2}/g).join('\\n') : t;
+    const compact = title.replace(/\s+/g, '');
+    return /^\p{Script=Han}+$/u.test(compact) ? compact.match(/.{1,2}/gu).join('\n') : title;
 }
 /**
  * 工程根推导（R75）：路由文件可能在 src/router/index.ts，`@/` 别名需要相对「工程根」解析。
@@ -1878,14 +1889,20 @@ function parseRouter(src, dir, routerFile) {
             meta,
         });
     }
-    const hasText = (file) => {
+    const hasRenderableNode = (node) => {
+        if (node.type === NodeTypes.ELEMENT) {
+            return node.tag !== 'template' || node.children.some(hasRenderableNode);
+        }
+        return node.type === NodeTypes.INTERPOLATION || (node.type === NodeTypes.TEXT && node.content.trim() !== '');
+    };
+    const hasRenderableTemplate = (file) => {
         if (!file || !existsSync(file))
             return false;
-        const tpl = readFileSync(file, 'utf-8').match(/<template>([\s\S]*)<\/template>/)?.[1] ?? '';
-        return tpl.replace(/<[^>]*>/g, ' ').replace(/\s+/g, ' ').trim().length > 0;
+        const { descriptor } = parse(readFileSync(file, 'utf-8'), { filename: file });
+        return descriptor.template?.ast?.children.some(hasRenderableNode) ?? false;
     };
     const tabs = routes
-        .filter((r) => r.meta.tab === 'true' && hasText(r.file))
+        .filter((r) => r.meta.tab === 'true' && hasRenderableTemplate(r.file))
         .map((r, i) => ({
         id: r.name,
         title: r.meta.title ?? r.name,
@@ -1894,7 +1911,7 @@ function parseRouter(src, dir, routerFile) {
         path: r.path,
     }));
     const details = routes
-        .filter((r) => r.meta.tab !== 'true' && hasText(r.file))
+        .filter((r) => r.meta.tab !== 'true' && hasRenderableTemplate(r.file))
         .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 }）');
@@ -2083,9 +2100,10 @@ function runTabs(appDir, opts = {}) {
         console.log(`[gen-android]   - ${pageId}DetailView.kt · push「${d.title}」`);
     }
     // 3) AppNavHost.kt（router.ts → NavHost + NavigationBar）
-    let navHost = buildNavHost(bundleId, tabs, detailViews, { tabBar: opts.tabBar });
-    if (opts.nativeNavigationBar === false)
-        navHost = navHost.replace(/        topBar = \{[\s\S]*?        \},\n        bottomBar =/, '        bottomBar =');
+    const navHost = buildNavHost(bundleId, tabs, detailViews, {
+        tabBar: opts.tabBar,
+        nativeNavigationBar: opts.nativeNavigationBar,
+    });
     writeFileSync(join(pkgDir, 'AppNavHost.kt'), navHost);
     // P2：写 .vrn/manifest.json（工具链/模板版本 + 文件清单），供 vrn doctor 校验与增量重生成
     const metaDir = join(outDir, '.vrn');
@@ -2112,6 +2130,7 @@ function buildNavHost(bundleId, tabs, details, options = {}) {
         .map((t) => `composable("${t.id}") { TabScaffold("${t.id}", onSelectTab) { p -> ${toPascal(t.id)}Content(modifier = Modifier.padding(p)) } }
         composable("${t.path}") { TabScaffold("${t.id}", onSelectTab) { p -> ${toPascal(t.id)}Content(modifier = Modifier.padding(p)) } }`)
         .join('\n        ');
+    const showNavigationBar = options.nativeNavigationBar !== false;
     // M7 对位 iOS NavigationStack：详情页内层 Scaffold + TopAppBar（标题 + 返回箭头/backText、mode=transparent 透明背景）
     const detailRoutes = details
         .map((d) => {
@@ -2128,7 +2147,7 @@ function buildNavHost(bundleId, tabs, details, options = {}) {
         const barColor = d.mode === 'transparent' ? 'Color.Transparent' : d.bg ? colorExpr(d.bg) : 'InkBar';
         return `composable("${d.path}") {
             Scaffold(
-                containerColor = InkBg,
+                containerColor = InkBg,${showNavigationBar ? `
                 topBar = {
                     TopAppBar(
                         title = { Text(${kotlinStr(d.title)}, fontSize = 17.sp, fontWeight = FontWeight.Medium) },
@@ -2141,7 +2160,7 @@ function buildNavHost(bundleId, tabs, details, options = {}) {
                             titleContentColor = Gold,
                         ),
                     )
-                },
+                },` : ''}
             ) { innerPadding ->
                 ${toPascal(d.id)}DetailContent(modifier = Modifier.padding(innerPadding))
             }
@@ -2152,8 +2171,8 @@ function buildNavHost(bundleId, tabs, details, options = {}) {
         .map((t) => `NavigationBarItem(
                 selected = currentTab == "${t.id}",
                 onClick = { onSelectTab("${t.id}") },
-                icon = { Icon(${ICON_MAP[t.icon] ?? 'Icons.Default.Home'}, contentDescription = "${t.title}") },
-                label = { Text("${tabLabel(t.title)}", fontSize = 10.sp, textAlign = TextAlign.Center) },
+                icon = { Icon(${ICON_MAP[t.icon] ?? 'Icons.Default.Home'}, contentDescription = ${kotlinStr(t.title)}) },
+                label = { Text(${kotlinStr(tabLabel(t.title))}, fontSize = 10.sp, textAlign = TextAlign.Center) },
                 colors = NavigationBarItemDefaults.colors(
                     selectedIconColor = Gold,
                     selectedTextColor = Gold,
@@ -2217,7 +2236,7 @@ import androidx.navigation.compose.*
 @Composable
 fun TabScaffold(currentTab: String, onSelectTab: (String) -> Unit, content: @Composable (PaddingValues) -> Unit) {
     Scaffold(
-        containerColor = InkBg,
+        containerColor = InkBg,${showNavigationBar ? `
         topBar = {
             TopAppBar(
                 title = { Text(${tabTitleExpr}, fontSize = 17.sp, fontWeight = FontWeight.Medium) },
@@ -2226,7 +2245,7 @@ fun TabScaffold(currentTab: String, onSelectTab: (String) -> Unit, content: @Com
                     titleContentColor = Gold,
                 ),
             )
-        },
+        },` : ''}
         bottomBar = {
             ${customBar || `NavigationBar(containerColor = InkBar) {\n                ${barItems}\n            }`}
         },

package/dist/codegen/swiftui.js

@@ -346,7 +346,7 @@ function gapInheritFor(child, parentGap, siblings) {
     return parentGap;
 }
 /* ============ 节点发射 ============ */
-function sizeModifiers(props, axis, ctx) {
+function sizeModifiers(props, axis, ctx, fixedFrameAlignment) {
     const mods = [];
     const { width, height, flex } = props;
     if (props.widthDynamic)
@@ -356,11 +356,11 @@ function sizeModifiers(props, axis, ctx) {
     if (width === 'fill')
         mods.push(frameExpr('fillW'));
     else if (typeof width === 'number')
-        mods.push(`.frame(width: ${width})`);
+        mods.push(`.frame(width: ${width}${fixedFrameAlignment})`);
     if (height === 'fill')
         mods.push('.frame(maxHeight: .infinity)');
     if (typeof height === 'number')
-        mods.push(`.frame(height: ${height})`);
+        mods.push(`.frame(height: ${height}${fixedFrameAlignment})`);
     if (flex !== undefined) {
         // R-H3：flex 沿父容器主轴拉伸占满剩余空间；但父容器高度不确定时（auto 链）无剩余空间可分配，
         // SwiftUI 的 .infinity 会沿祖先链漂移到屏幕高度 → 降级为内容高并告警（与 CSS flex-grow 语义一致）
@@ -707,10 +707,14 @@ function emitNodeInner(node, ctx) {
         return pad(`VrnFractionWidth(fraction: max(0,min(1,${fraction}))) {`) + `\n${inner}\n${pad('}')}`;
     }
     const axis = ctx.parentAxis ?? 'column';
+    // 绝对定位偏移以固定容器的左上角为原点。SwiftUI 默认会居中放置偏移前的 ZStack。
+    const fixedFrameAlignment = node.type === 'group' && !props.flexWrap && props.gridColumns === undefined &&
+        node.children?.length && node.children.every((child) => child.props?.position === 'absolute')
+        ? ', alignment: .topLeading' : '';
     // box-sizing:border-box（CSS 默认）：固定 height 应包含 padding。
     // 故 height 为数字且存在 padding 时，padding 置于 frame(height) 之前、
     // frame 限定总视觉高度（否则 padding 加在 frame 外 → 视觉高 = height + 2×padding）。
-    const size = sizeModifiers(props, axis, ctx);
+    const size = sizeModifiers(props, axis, ctx, fixedFrameAlignment);
     let padMods = paddingModifiers(props);
     let boxMods = boxModifiers(props);
     if (node.type === 'image' && props.objectFit === 'cover' && !props.clip) {
@@ -723,7 +727,7 @@ function emitNodeInner(node, ctx) {
         boxMods = boxMods.filter((m) => !m.startsWith('.background(') && !m.startsWith('.cornerRadius(') && !m.startsWith('.overlay('));
     }
     const box = typeof props.height === 'number' && (padMods.length > 0 || capsule !== undefined)
-        ? [...size.filter((m) => !m.startsWith('.frame(height: ')), ...(capsule !== undefined ? [capsule] : []), ...padMods, `.frame(height: ${props.height})`, ...boxMods]
+        ? [...size.filter((m) => !m.startsWith('.frame(height: ')), ...(capsule !== undefined ? [capsule] : []), ...padMods, `.frame(height: ${props.height}${fixedFrameAlignment})`, ...boxMods]
         : [...size, ...(capsule !== undefined ? [capsule] : []), ...padMods, ...boxMods];
     // M5 transform：scale / rotate / translate → 原生修饰符（视觉变换，不影响布局占位）
     const t = props.transform;
@@ -1288,7 +1292,9 @@ function emitNodeInner(node, ctx) {
             else {
                 image = `Image(uiImage: UIImage(named: "${swiftStringEscape(source.replace(/^bundle:\/\//, ''))}") ?? UIImage()).resizable()`;
             }
-            image += props.objectFit === 'contain' ? '.scaledToFit()' : '.scaledToFill()';
+            if (props.objectFit !== 'fill') {
+                image += props.objectFit === 'contain' ? '.scaledToFit()' : '.scaledToFill()';
+            }
             return pad(image) + box.map((m) => ' ' + m).join('');
         }
         case 'component': {

package/dist/ir/schema.d.ts

@@ -17,7 +17,7 @@ export type Justify = 'start' | 'center' | 'end' | 'spaceBetween' | 'spaceAround
 export type Align = 'start' | 'center' | 'end' | 'stretch';
 export type FontWeight = 'normal' | 'medium' | 'bold';
 export type TextAlign = 'left' | 'center' | 'right';
-export type ObjectFit = 'cover' | 'contain';
+export type ObjectFit = 'cover' | 'contain' | 'fill';
 export interface IrProps {
     /** 尺寸 */
     width?: Size;

package/dist/ir/schema.js

@@ -101,7 +101,7 @@ const PROPS_VALIDATORS = {
     lineHeight: (v) => typeof v === 'number' && v > 0,
     color: isColor,
     src: (v) => typeof v === 'string',
-    objectFit: (v) => v === 'cover' || v === 'contain',
+    objectFit: (v) => v === 'cover' || v === 'contain' || v === 'fill',
     label: (v) => typeof v === 'string',
     onClick: (v) => typeof v === 'string',
     showsIndicators: (v) => typeof v === 'boolean',

package/dist/transform/css.js

@@ -122,7 +122,7 @@ function mapDeclInner(prop, value, warnings) {
         return []; // 变量声明由 token 解析器处理，不是未支持的视觉属性。
     switch (prop) {
         case 'object-fit':
-            return v === 'contain' || v === 'cover' ? [['objectFit', v]] : null;
+            return v === 'contain' || v === 'cover' || v === 'fill' ? [['objectFit', v]] : null;
         case 'aspect-ratio': {
             const parts = v.split('/').map((part) => Number(part.trim()));
             const ratio = parts.length === 1 ? parts[0] : parts.length === 2 ? parts[0] / parts[1] : NaN;

package/dist/transform/vue2ir.js

@@ -2362,10 +2362,18 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
     const inlineTags = new Set(['span', 'b', 'strong', 'i', 'em', 'small', 'u', 'code', 'br']);
     const content = node.children.filter((c) => c.type !== NodeTypes.COMMENT && !(c.type === NodeTypes.TEXT && !c.content.trim()));
     const readable = (n) => n.type === NodeTypes.INTERPOLATION || (n.type === NodeTypes.TEXT && !!n.content.trim()) || (n.type === NodeTypes.ELEMENT && n.children.some(readable));
-    const inlineConditional = content.some((c) => c.type === NodeTypes.ELEMENT && c.props.some((p) => p.type === NodeTypes.DIRECTIVE && ['if', 'else-if', 'else', 'show'].includes(p.name)));
-    if (inlineComponentsFlag && mapping.type === 'group' && !inlineConditional && props.flexDirection === undefined && props.gridColumns === undefined && content.some(readable) && content.every((c) => c.type === NodeTypes.TEXT || c.type === NodeTypes.INTERPOLATION || (c.type === NodeTypes.ELEMENT && inlineTags.has(c.tag))))
+    // 行内分支或循环需要独立节点；合并为富文本会丢弃这些动态子树。
+    const hasInlineStructure = (child) => {
+        if (child.type !== NodeTypes.ELEMENT)
+            return false;
+        return child.props.some((p) => p.type === NodeTypes.DIRECTIVE &&
+            ['if', 'else-if', 'else', 'show', 'for'].includes(p.name)) ||
+            (inlineTags.has(child.tag) && child.children.some(hasInlineStructure));
+    };
+    const inlineStructure = content.some(hasInlineStructure);
+    if (inlineComponentsFlag && mapping.type === 'group' && !inlineStructure && props.flexDirection === undefined && props.gridColumns === undefined && content.some(readable) && content.every((c) => c.type === NodeTypes.TEXT || c.type === NodeTypes.INTERPOLATION || (c.type === NodeTypes.ELEMENT && inlineTags.has(c.tag))))
         mapping = { type: 'text' };
-    if (mapping.type === 'text' && inlineConditional)
+    if (mapping.type === 'text' && inlineStructure)
         mapping = { type: 'group' };
     if (mapping.type === 'text' && content.length === 0 && ['i', 'span', 'b'].includes(node.tag))
         mapping = { type: 'spacer' };
@@ -2680,7 +2688,13 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
         warnings.push(`<${node.tag}> 无子节点 → 降级为占位 spacer（R17/R77；可用 padding/height 表达留白）`);
         const keep = {};
         const src = props;
-        for (const k of ['width', 'height', 'widthFraction', 'widthFractionDynamic', 'flex', 'marginTop', 'background', 'gradient', 'radius', 'shadow', 'borderWidth', 'borderColor', 'padding', 'minHeight', 'minWidth', 'opacity']) {
+        // 空盒仍需脱离文档流并保持叠放顺序，避免占位改变父容器布局。
+        for (const k of [
+            'width', 'height', 'widthFraction', 'widthFractionDynamic', 'flex', 'marginTop',
+            'background', 'gradient', 'radius', 'shadow', 'borderWidth', 'borderColor',
+            'padding', 'minHeight', 'minWidth', 'opacity',
+            'position', 'absTop', 'absLeft', 'absRight', 'absBottom', 'zIndex',
+        ]) {
             if (src[k] !== undefined)
                 keep[k] = src[k];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir-compiler",
-  "version": "0.7.7",
+  "version": "0.7.9",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",