@wevu/compiler 6.15.13 → 6.15.15

package/dist/index.d.mts

@@ -276,6 +276,7 @@ interface TemplateCompileOptions {
   htmlTagToWxmlTagClass?: boolean;
   scopedSlotsCompiler?: ScopedSlotsCompilerMode;
   scopedSlotsRequireProps?: boolean;
+  slotSingleRootNoWrapper?: boolean;
   slotMultipleInstance?: boolean;
   classStyleRuntime?: ClassStyleRuntime | 'auto';
   objectLiteralBindMode?: ObjectLiteralBindMode;
@@ -402,6 +403,7 @@ interface VueTransformResult {
     jsonMacroHash?: string;
     defineOptionsHash?: string;
     sfcSrcDeps?: string[];
+    styleBlocks?: SFCStyleBlock[];
   };
 }
 /**

package/dist/index.mjs

@@ -6366,11 +6366,31 @@ function createScopedSlotComponent(context, slotKey, props, children, transformN
 		slotKey
 	};
 }
+function injectAttributeIntoOpeningTag(source, attr) {
+	if (!source.startsWith("<") || source.startsWith("</") || source.startsWith("<!--")) return null;
+	let tagNameEnd = 1;
+	while (tagNameEnd < source.length) {
+		const char = source[tagNameEnd];
+		if (char === " " || char === "\n" || char === "\r" || char === "	" || char === "/" || char === ">") break;
+		tagNameEnd += 1;
+	}
+	if (tagNameEnd <= 1) return null;
+	return `${source.slice(0, tagNameEnd)} ${attr}${source.slice(tagNameEnd)}`;
+}
 function renderSlotFallback(decl, context, transformNode) {
-	const content = decl.children.map((child) => transformNode(child, context)).join("");
-	if (!content) return "";
+	const rawRenderedChildren = decl.children.map((child) => ({ code: transformNode(child, context) }));
+	const rawContent = rawRenderedChildren.map((item) => item.code).join("");
+	if (!rawContent) return "";
 	const slotAttr = renderSlotNameAttribute(decl.name, context, "slot");
-	if (!slotAttr) return content;
+	if (!slotAttr) return rawContent;
+	if (!context.slotSingleRootNoWrapper) return `<view ${slotAttr}>${rawContent}</view>`;
+	const renderedChildren = rawRenderedChildren.filter((item) => item.code.trim().length > 0);
+	if (!renderedChildren.length) return "";
+	const content = renderedChildren.map((item) => item.code).join("");
+	if (renderedChildren.length === 1) {
+		const projected = injectAttributeIntoOpeningTag(renderedChildren[0].code, slotAttr);
+		if (projected) return projected;
+	}
 	return `<view ${slotAttr}>${content}</view>`;
 }
 function transformSlotElement(node, context, transformNode) {
@@ -6598,7 +6618,7 @@ function transformIfElement(node, context, transformNode) {
 	};
 	const slotDirective = findSlotDirective(elementWithoutIf);
 	const templateSlotChildren = elementWithoutIf.children.filter((child) => child.type === NodeTypes.ELEMENT && child.tag === "template" && findSlotDirective(child));
-	const content = slotDirective || templateSlotChildren.length > 0 ? transformComponentWithSlots(elementWithoutIf, context, transformNode) : transformNormalElement(elementWithoutIf, context, transformNode);
+	const content = elementWithoutIf.tag === "slot" ? transformSlotElement(elementWithoutIf, context, transformNode) : slotDirective || templateSlotChildren.length > 0 ? transformComponentWithSlots(elementWithoutIf, context, transformNode) : transformNormalElement(elementWithoutIf, context, transformNode);
 	const dir = ifDirective;
 	if (dir.name === "if" && dir.exp) {
 		const expValue = resolveConditionExpression$1(dir.exp.type === NodeTypes.SIMPLE_EXPRESSION ? dir.exp.content : "", context, "v-if");
@@ -6744,7 +6764,11 @@ function transformTemplateElement(node, context, transformNode) {
 function transformElement(node, context, transformNode) {
 	const { tag } = node;
 	if (tag === "template") return transformTemplateElement(node, context, transformNode);
-	if (tag === "slot") return transformSlotElement(node, context, transformNode);
+	if (tag === "slot") {
+		const { type } = isStructuralDirective(node);
+		if (type === "if") return transformIfElement(node, context, transformNode);
+		return transformSlotElement(node, context, transformNode);
+	}
 	if (tag === "component") return transformComponentElement(node, context, transformNode);
 	if (tag === "transition") return transformTransitionElement(node, context, transformNode);
 	if (tag === "keep-alive") return transformKeepAliveElement(node, context, transformNode);
@@ -6812,6 +6836,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 	const resolvedRuntime = runtimeMode === "auto" ? options?.wxsExtension ? "wxs" : "js" : runtimeMode === "wxs" && !options?.wxsExtension ? "js" : runtimeMode;
 	const wxsExtension = options?.wxsExtension;
 	const scopedSlotsRequireProps = options?.scopedSlotsRequireProps ?? options?.scopedSlotsCompiler !== "augmented";
+	const slotSingleRootNoWrapper = options?.slotSingleRootNoWrapper ?? false;
 	const htmlTagToWxmlMap = resolveHtmlTagToWxmlMap(options?.htmlTagToWxml);
 	try {
 		const ast = parse$1(template, {
@@ -6829,6 +6854,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			htmlTagToWxmlTagClass: options?.htmlTagToWxmlTagClass ?? true,
 			scopedSlotsCompiler: options?.scopedSlotsCompiler ?? "auto",
 			scopedSlotsRequireProps,
+			slotSingleRootNoWrapper,
 			slotMultipleInstance: options?.slotMultipleInstance ?? true,
 			scopedSlotComponents: [],
 			componentGenerics: {},
@@ -7696,7 +7722,10 @@ function compileTemplatePhase(descriptor, filename, options, result) {
 */
 async function compileVueFile(source, filename, options) {
 	const parsed = await parseVueFile(source, filename, options);
-	const result = { meta: { ...parsed.meta } };
+	const result = { meta: {
+		...parsed.meta,
+		styleBlocks: parsed.descriptor.styles
+	} };
 	const autoUsingComponents = options?.autoUsingComponents?.enabled && parsed.descriptor.scriptSetup && parsed.descriptor.template && options.autoUsingComponents.resolveUsingComponentPath ? options.autoUsingComponents : void 0;
 	const autoImportTags = options?.autoImportTags?.enabled && parsed.descriptor.template && options.autoImportTags.resolveUsingComponent ? options.autoImportTags : void 0;
 	const templateCompiled = compileTemplatePhase(parsed.descriptor, filename, options?.template, result);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.15.13",
+  "version": "6.15.15",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,18 +42,18 @@
   ],
   "dependencies": {
     "@jridgewell/remapping": "^2.3.5",
-    "@vue/compiler-core": "^3.5.32",
-    "@vue/compiler-dom": "^3.5.32",
+    "@vue/compiler-core": "^3.5.33",
+    "@vue/compiler-dom": "^3.5.33",
     "comment-json": "^5.0.0",
     "lru-cache": "^11.3.5",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
-    "vue": "^3.5.32",
-    "@weapp-core/constants": "^0.1.1",
+    "vue": "^3.5.33",
+    "@weapp-core/constants": "^0.1.2",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.15.13",
-    "rolldown-require": "2.0.14"
+    "@weapp-vite/ast": "6.15.15",
+    "rolldown-require": "2.0.15"
   },
   "publishConfig": {
     "access": "public",