@wevu/compiler 6.16.12 → 6.16.13

package/dist/index.mjs

@@ -13,7 +13,7 @@ import os from "node:os";
 import process from "node:process";
 import { collectFeatureFlagsFromCode, collectJsxImportedComponentsAndDefaultExportFromBabelAst, collectJsxTemplateTagsFromBabelExpression, getRenderPropertyFromComponentOptions, parseJsLikeWithEngine, resolveRenderExpressionFromComponentOptions, toStaticObjectKey, unwrapTypeScriptExpression } from "@weapp-vite/ast";
 import { LRUCache } from "lru-cache";
-import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ATTR, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
+import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
 import { compileScript, parse } from "vue/compiler-sfc";
 import { fileURLToPath } from "node:url";
 import { parse as parse$1 } from "@vue/compiler-dom";
@@ -5623,7 +5623,7 @@ function normalizeJsExpressionWithContext(exp, context, options) {
 			const base = createThisMemberAccess(WEVU_SLOT_PROPS_DATA_KEY);
 			replacement = createUnrefCall(prop ? createMemberAccess(base, prop) : base);
 		} else if (name === WEVU_SLOT_OWNER_KEY || name === WEVU_SLOT_PROPS_DATA_KEY || name === WEVU_SLOT_PROPS_KEY || name === WEVU_SLOT_SCOPE_KEY) replacement = createUnrefCall(createThisMemberAccess(name));
-		else replacement = createUnrefCall(createMemberAccess(createThisMemberAccess(WEVU_SLOT_OWNER_KEY), name));
+		else replacement = createUnrefCall(createMemberAccess(createThisMemberAccess(WEVU_SLOT_OWNER_PROXY_KEY), name));
 		else replacement = createUnrefCall(createIdentifierAccessWithPropsFallback(name));
 		const parent = path.parentPath;
 		if (parent.isObjectProperty() && parent.node.shorthand && parent.node.key === path.node) {
@@ -6324,12 +6324,13 @@ function parseSlotPropsExpression(exp, context) {
 function collectSlotBindingExpression(node, context) {
 	let bindObjectExp = null;
 	const namedBindings = [];
+	const hasForDirective = node.props.some((prop) => prop.type === NodeTypes.DIRECTIVE && prop.name === "for");
 	for (const prop of node.props) {
 		if (prop.type === NodeTypes.ATTRIBUTE && prop.name === "name") continue;
 		if (prop.type === NodeTypes.DIRECTIVE && prop.name === "bind") {
 			if (prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION) {
 				const rawExpValue = getBindDirectiveExpression(prop);
-				if (prop.arg.content === "name") continue;
+				if (prop.arg.content === "name" || hasForDirective && prop.arg.content === "key") continue;
 				if (rawExpValue) namedBindings.push({
 					key: prop.arg.content,
 					value: normalizeWxmlExpressionWithContext(rawExpValue, context)
@@ -6552,13 +6553,13 @@ function transformSlotElement(node, context, transformNode) {
 		if (!slotPropsExp && slotPresentExp) slotTag = `${context.platform.wrapIf(slotPresentExp, slotTag, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
 		else if (!slotPropsExp) slotTag = `<slot${slotAttrString}>${fallbackContent}</slot>`;
 	}
-	if (!slotPropsExp && (context.scopedSlotsRequireProps || slotNameInfo.type !== "default")) return slotTag;
+	if (!slotPropsExp && (context.scopedSlotsRequireProps || slotNameInfo.type !== "default" && context.scopedSlotsCompiler !== "augmented")) return slotTag;
 	const genericKey = `scoped-slots-${resolveSlotKey(context, slotNameInfo)}`;
 	context.componentGenerics[genericKey] = true;
 	slotPropsExp = slotPropsExp ?? "[]";
 	const scopedAttrs = [
 		`${context.platform.directives.ifAttr}="${renderMustache(WEVU_SLOT_OWNER_ID_PROP, context)}"`,
-		`${WEVU_SLOT_OWNER_ATTR}="${renderMustache(WEVU_SLOT_OWNER_ID_PROP, context)}"`,
+		`${WEVU_SLOT_OWNER_ID_ATTR}="${renderMustache(WEVU_SLOT_OWNER_ID_PROP, context)}"`,
 		`${WEVU_SLOT_PROPS_ATTR}="${renderMustache(slotPropsExp, context)}"`
 	];
 	if (context.slotMultipleInstance) scopedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(WEVU_SLOT_SCOPE_KEY, context)}"`);
@@ -6613,11 +6614,12 @@ function hasDirectComponentSlotChild(children, context) {
 function isWevuComponentTag(node, context) {
 	return context.wevuComponentTags ? context.wevuComponentTags.has(node.tag) : /^[A-Z]/.test(node.tag);
 }
-function shouldAugmentPlainDefaultSlot(decl, context, ownerNode) {
-	if (context.scopedSlotsRequireProps || !decl.implicitDefault) return false;
-	if (context.scopedSlotsCompiler !== "augmented" && !isWevuComponentTag(ownerNode, context)) return false;
+function shouldAugmentPlainSlot(decl, context, ownerNode) {
+	if (context.scopedSlotsRequireProps) return false;
 	if (context.rewriteScopedSlot && !isWevuComponentTag(ownerNode, context)) return false;
 	if (context.scopedSlotsCompiler === "augmented") return true;
+	if (!decl.implicitDefault) return false;
+	if (!isWevuComponentTag(ownerNode, context)) return false;
 	return hasDirectComponentSlotChild(decl.children, context);
 }
 function resolveTemplateSlotCondition(node, context) {
@@ -6656,6 +6658,14 @@ function pushSlotNamesAttr(attrs, slotNames, context) {
 function shouldExposePlainSlotPresence(node) {
 	return node.tag === "component";
 }
+function renderPlainSlotContentInSourceOrder(renderItems, plainSlotDeclarations, implicitDefaultDeclaration, context, transformNode) {
+	const plainSlots = new Set(plainSlotDeclarations);
+	const shouldRenderImplicitDefault = implicitDefaultDeclaration ? plainSlots.has(implicitDefaultDeclaration) : false;
+	return renderItems.map((item) => {
+		if (item.type === "declaration") return plainSlots.has(item.declaration) ? renderSlotFallback(item.declaration, context, transformNode) : "";
+		return shouldRenderImplicitDefault ? transformNode(item.child, context) : "";
+	}).join("");
+}
 function shouldTransformAsComponentWithSlots(node, context, resolvedTag = resolveTemplateTagName(node.tag, context)) {
 	const slotDirective = findSlotDirective(node);
 	const templateSlotChildren = node.children.filter((child) => child.type === NodeTypes.ELEMENT && child.tag === "template" && findSlotDirective(child));
@@ -6669,25 +6679,41 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	const slotDeclarations = [];
 	const slotDirective = findSlotDirective(node);
 	const nonTemplateChildren = [];
+	const renderItems = [];
 	for (const child of node.children) {
 		if (child.type === NodeTypes.ELEMENT && child.tag === "template") {
 			const templateSlot = findSlotDirective(child);
 			if (templateSlot) {
-				const slotName = resolveSlotNameFromDirective(templateSlot);
-				slotDeclarations.push(buildSlotDeclaration(slotName, templateSlot.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? templateSlot.exp.content : void 0, child.children, context, { condition: resolveTemplateSlotCondition(child, context) }));
+				const declaration = buildSlotDeclaration(resolveSlotNameFromDirective(templateSlot), templateSlot.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? templateSlot.exp.content : void 0, child.children, context, { condition: resolveTemplateSlotCondition(child, context) });
+				slotDeclarations.push(declaration);
+				renderItems.push({
+					type: "declaration",
+					declaration
+				});
 				continue;
 			}
 		}
 		nonTemplateChildren.push(child);
+		if (isRenderableSlotChild(child)) renderItems.push({
+			type: "default-child",
+			child
+		});
 	}
 	const defaultSlotChildren = nonTemplateChildren.filter(isRenderableSlotChild);
+	let implicitDefaultDeclaration;
 	if (slotDirective) {
 		if (slotDeclarations.length) context.warnings.push("组件上的 v-slot 与 <template v-slot> 不能同时使用；仅使用组件上的 v-slot。");
 		slotDeclarations.length = 0;
 		slotDeclarations.push(buildSlotDeclaration(resolveSlotNameFromDirective(slotDirective), slotDirective.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? slotDirective.exp.content : void 0, node.children, context));
 	} else if (slotDeclarations.length && defaultSlotChildren.length) if (slotDeclarations.some((decl) => decl.name.type === "default" || decl.name.type === "static" && decl.name.value === "default")) context.warnings.push("存在显式的 v-slot:default，默认插槽内容将被忽略。");
-	else slotDeclarations.push(buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true }));
-	else if (!slotDeclarations.length && defaultSlotChildren.length && !context.scopedSlotsRequireProps && !hasLegacySlotAttribute(defaultSlotChildren)) slotDeclarations.push(buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true }));
+	else {
+		implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true });
+		slotDeclarations.push(implicitDefaultDeclaration);
+	}
+	else if (!slotDeclarations.length && defaultSlotChildren.length && !context.scopedSlotsRequireProps && !hasLegacySlotAttribute(defaultSlotChildren)) {
+		implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true });
+		slotDeclarations.push(implicitDefaultDeclaration);
+	}
 	if (!slotDeclarations.length) {
 		const { attrs, vTextExp } = collectElementAttributes(node, context, {
 			skipSlotDirective: true,
@@ -6704,7 +6730,7 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	}
 	const scopedSlotDeclarations = [];
 	const plainSlotDeclarations = [];
-	for (const decl of slotDeclarations) if (Object.keys(decl.props).length > 0 || shouldAugmentPlainDefaultSlot(decl, context, node)) scopedSlotDeclarations.push(decl);
+	for (const decl of slotDeclarations) if (Object.keys(decl.props).length > 0 || shouldAugmentPlainSlot(decl, context, node)) scopedSlotDeclarations.push(decl);
 	else plainSlotDeclarations.push(decl);
 	const slotNames = [];
 	const slotGenericAttrs = [];
@@ -6735,11 +6761,12 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	if (scopedSlotDeclarations.length) {
 		const scopePropsExp = buildScopePropsExpression(context);
 		if (scopePropsExp) mergedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(scopePropsExp, context)}"`);
-		mergedAttrs.push(`${WEVU_SLOT_OWNER_ID_ATTR}="${renderMustache(`${WEVU_SLOT_OWNER_ID_KEY} || ''`, context)}"`);
+		const ownerIdExp = context.rewriteScopedSlot ? `${WEVU_SLOT_OWNER_ID_PROP} || ${WEVU_SLOT_OWNER_ID_KEY} || ''` : `${WEVU_SLOT_OWNER_ID_KEY} || ''`;
+		mergedAttrs.push(`${WEVU_SLOT_OWNER_ID_ATTR}="${renderMustache(ownerIdExp, context)}"`);
 	}
 	const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
 	const { tag } = node;
-	const plainSlotContent = plainSlotDeclarations.map((decl) => renderSlotFallback(decl, context, transformNode)).join("");
+	const plainSlotContent = slotDirective ? plainSlotDeclarations.map((decl) => renderSlotFallback(decl, context, transformNode)).join("") : renderPlainSlotContentInSourceOrder(renderItems, plainSlotDeclarations, implicitDefaultDeclaration, context, transformNode);
 	return plainSlotContent ? `<${tag}${attrString}>${plainSlotContent}</${tag}>` : `<${tag}${attrString} />`;
 }
 function transformComponentWithSlotsFallback(node, context, transformNode, options) {
@@ -6747,24 +6774,37 @@ function transformComponentWithSlotsFallback(node, context, transformNode, optio
 	const slotDeclarations = [];
 	const slotDirective = findSlotDirective(node);
 	const nonTemplateChildren = [];
+	const renderItems = [];
 	for (const child of node.children) {
 		if (child.type === NodeTypes.ELEMENT && child.tag === "template") {
 			const templateSlot = findSlotDirective(child);
 			if (templateSlot) {
-				const slotName = resolveSlotNameFromDirective(templateSlot);
-				slotDeclarations.push(buildSlotDeclaration(slotName, templateSlot.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? templateSlot.exp.content : void 0, child.children, context, { condition: resolveTemplateSlotCondition(child, context) }));
+				const declaration = buildSlotDeclaration(resolveSlotNameFromDirective(templateSlot), templateSlot.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? templateSlot.exp.content : void 0, child.children, context, { condition: resolveTemplateSlotCondition(child, context) });
+				slotDeclarations.push(declaration);
+				renderItems.push({
+					type: "declaration",
+					declaration
+				});
 				continue;
 			}
 		}
 		nonTemplateChildren.push(child);
+		if (isRenderableSlotChild(child)) renderItems.push({
+			type: "default-child",
+			child
+		});
 	}
 	const defaultSlotChildren = nonTemplateChildren.filter(isRenderableSlotChild);
+	let implicitDefaultDeclaration;
 	if (slotDirective) {
 		if (slotDeclarations.length) context.warnings.push("组件上的 v-slot 与 <template v-slot> 不能同时使用；仅使用组件上的 v-slot。");
 		slotDeclarations.length = 0;
 		slotDeclarations.push(buildSlotDeclaration(resolveSlotNameFromDirective(slotDirective), slotDirective.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? slotDirective.exp.content : void 0, node.children, context));
 	} else if (slotDeclarations.length && defaultSlotChildren.length) if (slotDeclarations.some((decl) => decl.name.type === "default" || decl.name.type === "static" && decl.name.value === "default")) context.warnings.push("存在显式的 v-slot:default，默认插槽内容将被忽略。");
-	else slotDeclarations.push(buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context));
+	else {
+		implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context);
+		slotDeclarations.push(implicitDefaultDeclaration);
+	}
 	if (!slotDeclarations.length) {
 		const { attrs, vTextExp } = collectElementAttributes(node, context, {
 			skipSlotDirective: true,
@@ -6780,7 +6820,7 @@ function transformComponentWithSlotsFallback(node, context, transformNode, optio
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}
 	if (slotDeclarations.some((decl) => Object.keys(decl.props).length)) context.warnings.push("已禁用作用域插槽参数，插槽绑定将被忽略。");
-	const renderedSlots = slotDeclarations.map((decl) => renderSlotFallback(decl, context, transformNode)).join("");
+	const renderedSlots = slotDirective ? slotDeclarations.map((decl) => renderSlotFallback(decl, context, transformNode)).join("") : renderPlainSlotContentInSourceOrder(renderItems, slotDeclarations, implicitDefaultDeclaration, context, transformNode);
 	const { attrs } = collectElementAttributes(node, context, {
 		skipSlotDirective: true,
 		forInfo: options?.forInfo,
@@ -6849,6 +6889,9 @@ function transformNormalElement(node, context, transformNode) {
 //#region src/plugins/vue/compiler/template/elements/tag-structural.ts
 const REGEX_SPECIAL_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
 function resolveConditionExpression$1(rawExpValue, context, hint) {
+	return (context.rewriteScopedSlot || shouldFallbackToRuntimeBinding(rawExpValue) ? registerRuntimeBindingExpression(rawExpValue, context, { hint }) : null) ?? normalizeWxmlExpressionWithContext(rawExpValue, context);
+}
+function resolveListExpression(rawExpValue, context, hint) {
 	return (shouldFallbackToRuntimeBinding(rawExpValue) ? registerRuntimeBindingExpression(rawExpValue, context, { hint }) : null) ?? normalizeWxmlExpressionWithContext(rawExpValue, context);
 }
 function transformIfElement(node, context, transformNode) {
@@ -6892,7 +6935,7 @@ function transformForElement(node, context, transformNode) {
 		}
 	}
 	if (context.classStyleRuntime === "js" && !forInfo.index) forInfo.index = `__wv_index_${context.forIndexSeed++}`;
-	const listExp = forInfo.listExp ? resolveConditionExpression$1(forInfo.listExp, context, "v-for 列表") : void 0;
+	const listExp = forInfo.listExp ? resolveListExpression(forInfo.listExp, context, "v-for 列表") : void 0;
 	const listExpAst = forInfo.listExp ? normalizeJsExpressionWithContext(forInfo.listExp, context, { hint: "v-for 列表" }) : void 0;
 	const scopedForInfo = listExp ? {
 		...forInfo,
@@ -6915,6 +6958,16 @@ function transformForElement(node, context, transformNode) {
 			props: otherProps
 		};
 		const extraAttrs = listExp ? context.platform.forAttrs(listExp, renderTemplateMustache, forInfo.item, forInfo.index) : [];
+		if (elementWithoutFor.tag === "slot") {
+			const content = transformSlotElement({
+				...elementWithoutFor,
+				props: elementWithoutFor.props.filter((prop) => {
+					return !(prop.type === NodeTypes.DIRECTIVE && prop.name === "bind" && prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "key");
+				})
+			}, context, transformNode);
+			const attrString = extraAttrs.length ? ` ${extraAttrs.join(" ")}` : "";
+			return attrString ? `<block${attrString}>${content}</block>` : content;
+		}
 		const resolvedTag = resolveTemplateTagName(elementWithoutFor.tag, context);
 		if (shouldTransformAsComponentWithSlots(elementWithoutFor, context, resolvedTag)) return transformComponentWithSlots(elementWithoutFor, context, transformNode, {
 			extraAttrs,
@@ -6938,7 +6991,7 @@ function transformForElement(node, context, transformNode) {
 const TEMPLATE_OPEN_RE = /<template/g;
 const TEMPLATE_CLOSE_RE = /<\/template>/g;
 function resolveConditionExpression(rawExpValue, context, hint) {
-	return (shouldFallbackToRuntimeBinding(rawExpValue) ? registerRuntimeBindingExpression(rawExpValue, context, { hint }) : null) ?? normalizeWxmlExpressionWithContext(rawExpValue, context);
+	return (context.rewriteScopedSlot || shouldFallbackToRuntimeBinding(rawExpValue) ? registerRuntimeBindingExpression(rawExpValue, context, { hint }) : null) ?? normalizeWxmlExpressionWithContext(rawExpValue, context);
 }
 function transformTransitionElement(node, context, transformNode) {
 	context.warnings.push("<transition> 组件：过渡效果需要动画库或运行时支持，仅渲染子节点。");
@@ -7012,6 +7065,7 @@ function transformElement(node, context, transformNode) {
 	if (tag === "slot") {
 		const { type } = isStructuralDirective(node);
 		if (type === "if") return transformIfElement(node, context, transformNode);
+		if (type === "for") return transformForElement(node, context, transformNode);
 		return transformSlotElement(node, context, transformNode);
 	}
 	if (tag === "component") return transformComponentElement(node, context, transformNode);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.12",
+  "version": "6.16.13",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -50,9 +50,9 @@
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.34",
-    "@weapp-core/constants": "^0.1.6",
+    "@weapp-core/constants": "^0.1.7",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.12",
+    "@weapp-vite/ast": "6.16.13",
     "rolldown-require": "2.0.15"
   },
   "publishConfig": {