@dongmingzhixiu/vuexir-compiler 0.7.8 → 0.7.9

package/dist/codegen/compose.js

@@ -1529,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 + ')';

package/dist/codegen/swiftui.js

@@ -1292,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.8",
+  "version": "0.7.9",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",