@dongmingzhixiu/vuexir-compiler 0.7.6 → 0.7.8

package/dist/codegen/compose.d.ts

@@ -9,6 +9,7 @@ declare const NAV_TEST_KT: (bundleId: string) => string;
 interface ComposeCtx {
     parentAxis?: 'row' | 'column' | 'box';
     inVerticalScroll?: boolean;
+    parentColumnHeightBounded?: boolean;
     runtimeAsset?: string;
     warnings: string[];
     pageId: string;
@@ -108,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：文本绑定里引用的标识符若既不是页面状态也不是循环变量 → 视为未支持，回退空串 */
@@ -741,7 +751,10 @@ function borderModifiers(props) {
     return mods;
 }
 function flexModifier(props, ctx) {
-    if (ctx?.parentAxis === 'box' || (ctx?.inVerticalScroll && ctx.parentAxis !== 'row'))
+    if (ctx?.parentAxis === 'box')
+        return '';
+    if (ctx?.inVerticalScroll && ctx.parentAxis !== 'row' &&
+        (!ctx.parentColumnHeightBounded || (props.flex ?? 0) <= 0))
         return '';
     if (props.flex === undefined && props.minWidth === 0 && ctx?.parentAxis === 'row')
         return 'Modifier.weight(1f, fill = false)';
@@ -1216,6 +1229,10 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
             (nd.type === 'group' && stretchModifiers(parentStretch, nd).length > 0) ||
             (ctx.parentAxis === 'row' && p.flex !== undefined);
         const rowContentWidth = ctx.parentAxis === 'row' && p.width === undefined && p.flex === undefined;
+        // 普通列的固定高度或父列分配的完整权重重新提供有限的垂直空间。
+        const columnHeightBounded = kind === 'Column' && nd.type === 'group' &&
+            (typeof p.height === 'number' ||
+                (ctx.parentAxis === 'column' && ctx.parentColumnHeightBounded === true && (p.flex ?? 0) > 0));
         return nd.children
             .map((c) => {
             const cp = (c.props ?? {});
@@ -1249,7 +1266,11 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
                 : columnHasWidth && !hasDeclaredWidth(cp);
             const stretch = kind === 'Column' && (p.alignItems === undefined || p.alignItems === 'stretch') &&
                 autoWidth && cp.position !== 'absolute' && !cp.marginLeftAuto;
-            const childCtx = { ...ctx, parentAxis: kind === 'Row' ? 'row' : kind === 'Box' ? 'box' : 'column' };
+            const childCtx = {
+                ...ctx,
+                parentAxis: kind === 'Row' ? 'row' : kind === 'Box' ? 'box' : 'column',
+                parentColumnHeightBounded: columnHeightBounded,
+            };
             const result = emitNode(c, childCtx, d, loop, false, stretch);
             if (childCtx.needsScope)
                 ctx.needsScope = true;
@@ -1370,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)
@@ -1744,10 +1765,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，`@/` 别名需要相对「工程根」解析。
@@ -1867,14 +1888,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,
@@ -1883,7 +1910,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 }）');
@@ -2072,9 +2099,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');
@@ -2101,6 +2129,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) => {
@@ -2117,7 +2146,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) },
@@ -2130,7 +2159,7 @@ function buildNavHost(bundleId, tabs, details, options = {}) {
                             titleContentColor = Gold,
                         ),
                     )
-                },
+                },` : ''}
             ) { innerPadding ->
                 ${toPascal(d.id)}DetailContent(modifier = Modifier.padding(innerPadding))
             }
@@ -2141,8 +2170,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,
@@ -2206,7 +2235,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) },
@@ -2215,7 +2244,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 语义一致）
@@ -510,6 +510,16 @@ export function boxModifiers(props) {
         mods.push('.clipped()');
     return mods;
 }
+function columnStretchAlignment(node) {
+    const props = node.props;
+    // 将常规行放到拉伸区域的尾端，不插入会多占一份 gap 的 Spacer。
+    if (node.type === 'group' && props?.flexDirection === 'row' && props.justifyContent === 'end' &&
+        props.widthDynamic === undefined && props.widthFraction === undefined && props.widthFractionDynamic === undefined &&
+        !props.flexWrap && !props.gridColumns && !node.children?.some((child) => child.props?.position === 'absolute')) {
+        return '.trailing';
+    }
+    return props?.textAlign === 'center' ? '.center' : props?.textAlign === 'right' ? '.trailing' : '.leading';
+}
 function emitChildren(children, axis, ctx, alignRaw = 'stretch', stretchCross = false) {
     if (!children || children.length === 0)
         return '';
@@ -562,7 +572,7 @@ function emitChildren(children, axis, ctx, alignRaw = 'stretch', stretchCross =
             // column：仅默认 stretch 时子项填满父宽（div block 语义）；显式 start/center/end → 内容宽对齐
             const explicitCol = alignRaw === 'start' || alignRaw === 'center' || alignRaw === 'end';
             if (!explicitCol) {
-                return body + '\n' + indent(ctx.level) + frameExpr('fillW', c.props?.textAlign === 'center' ? '.center' : c.props?.textAlign === 'right' ? '.trailing' : '.leading');
+                return body + '\n' + indent(ctx.level) + frameExpr('fillW', columnStretchAlignment(c));
             }
             return body;
         }
@@ -697,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) {
@@ -713,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;
@@ -985,7 +999,7 @@ function emitNodeInner(node, ctx) {
                     // 显式 start/center/end → 子项按内容宽对齐（CSS 交叉轴对齐语义）
                     const explicitCol = (c.props?.alignSelf !== undefined && c.props.alignSelf !== 'stretch') || props.alignItems === 'start' || props.alignItems === 'center' || props.alignItems === 'end';
                     if (!explicitCol) {
-                        body.push(indent(L + 1) + frameExpr('fillW', c.props?.textAlign === 'center' ? '.center' : c.props?.textAlign === 'right' ? '.trailing' : '.leading'));
+                        body.push(indent(L + 1) + frameExpr('fillW', columnStretchAlignment(c)));
                     }
                 }
             });

package/package.json

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