@wevu/compiler 6.16.2 → 6.16.4

package/dist/index.mjs

@@ -5981,7 +5981,7 @@ function transformOnDirective(node, context, options) {
 	const inlineSource = useDetailPayload && isSimpleHandler(rawExpValue) ? `${rawExpValue}($event)` : rawExpValue;
 	const isInlineExpression = inlineSource && !isSimpleHandler(inlineSource);
 	const inlineExpression = isInlineExpression ? registerInlineExpression(inlineSource, context) : null;
-	const mappedEvent = context.platform.mapEventName(argValue);
+	const mappedEvent = options?.isComponent === true ? argValue : context.platform.mapEventName(argValue);
 	const eventSuffix = normalizeEventDatasetSuffix(mappedEvent);
 	const eventPrefix = resolveEventPrefix(node.modifiers);
 	const bindAttr = context.platform.eventBindingAttr(`${eventPrefix}:${mappedEvent}`);
@@ -6423,19 +6423,15 @@ function transformSlotElement(node, context, transformNode) {
 	let slotPropsExp = collectSlotBindingExpression(node, context);
 	let fallbackContent = "";
 	if (node.children.length > 0) fallbackContent = node.children.map((child) => transformNode(child, context)).join("");
-	if (slotPropsExp && fallbackContent) {
-		context.warnings.push("不支持作用域插槽的兜底内容，已忽略。");
-		fallbackContent = "";
-	}
 	const slotAttrs = [];
 	const nameAttr = renderSlotNameAttribute(slotNameInfo, context, "name");
 	if (nameAttr) slotAttrs.push(nameAttr);
 	const slotAttrString = slotAttrs.length ? ` ${slotAttrs.join(" ")}` : "";
 	let slotTag = `<slot${slotAttrString} />`;
+	const slotPresentExp = fallbackContent ? createSlotPresenceExpression(slotNameInfo) : void 0;
 	if (fallbackContent) {
-		const slotPresentExp = createSlotPresenceExpression(slotNameInfo);
 		if (!slotPropsExp && slotPresentExp) slotTag = `${context.platform.wrapIf(slotPresentExp, slotTag, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
-		else slotTag = `<slot${slotAttrString}>${fallbackContent}</slot>`;
+		else if (!slotPropsExp) slotTag = `<slot${slotAttrString}>${fallbackContent}</slot>`;
 	}
 	if (!slotPropsExp && (context.scopedSlotsRequireProps || slotNameInfo.type !== "default")) return slotTag;
 	const genericKey = `scoped-slots-${resolveSlotKey(context, slotNameInfo)}`;
@@ -6448,7 +6444,9 @@ function transformSlotElement(node, context, transformNode) {
 	];
 	if (context.slotMultipleInstance) scopedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(WEVU_SLOT_SCOPE_KEY, context)}"`);
 	const scopedTag = `<${genericKey}${scopedAttrs.length ? ` ${scopedAttrs.join(" ")}` : ""} />`;
-	return `${slotTag}${scopedTag}`;
+	const projectedContent = `${slotTag}${scopedTag}`;
+	if (fallbackContent && slotPresentExp) return `${context.platform.wrapIf(slotPresentExp, projectedContent, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
+	return projectedContent;
 }
 function transformSlotElementPlain(node, context, transformNode) {
 	const slotNameInfo = resolveSlotNameFromSlotElement(node);
@@ -6485,6 +6483,11 @@ function hasDirectComponentSlotChild(children, context) {
 		return /^[A-Z]/.test(child.tag);
 	});
 }
+function shouldAugmentPlainDefaultSlot(decl, context) {
+	if (context.scopedSlotsRequireProps || !decl.implicitDefault) return false;
+	if (context.scopedSlotsCompiler === "augmented") return true;
+	return hasDirectComponentSlotChild(decl.children, context);
+}
 function resolveTemplateSlotCondition(node, context) {
 	const ifDirective = node.props.find((prop) => prop.type === NodeTypes.DIRECTIVE && prop.name === "if" && prop.exp?.type === NodeTypes.SIMPLE_EXPRESSION);
 	const rawExp = ifDirective?.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? ifDirective.exp.content : "";
@@ -6564,7 +6567,7 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	}
 	const scopedSlotDeclarations = [];
 	const plainSlotDeclarations = [];
-	for (const decl of slotDeclarations) if (Object.keys(decl.props).length > 0 || !context.scopedSlotsRequireProps && decl.implicitDefault && hasDirectComponentSlotChild(decl.children, context)) scopedSlotDeclarations.push(decl);
+	for (const decl of slotDeclarations) if (Object.keys(decl.props).length > 0 || shouldAugmentPlainDefaultSlot(decl, context)) scopedSlotDeclarations.push(decl);
 	else plainSlotDeclarations.push(decl);
 	const slotNames = [];
 	const slotGenericAttrs = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.2",
+  "version": "6.16.4",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -45,14 +45,14 @@
     "@vue/compiler-core": "^3.5.33",
     "@vue/compiler-dom": "^3.5.33",
     "comment-json": "^5.0.0",
-    "lru-cache": "^11.3.5",
+    "lru-cache": "^11.3.6",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.33",
     "@weapp-core/constants": "^0.1.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.2",
+    "@weapp-vite/ast": "6.16.4",
     "rolldown-require": "2.0.15"
   },
   "publishConfig": {