@wevu/compiler 6.16.7 → 6.16.9

package/dist/index.mjs

@@ -4756,10 +4756,10 @@ function resolveMappedHtmlTagClassName(tag, context, resolvedTag) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/elements/forExpression.ts
-const IDENTIFIER_RE$4 = /^[A-Z_$][\w$]*$/i;
+const IDENTIFIER_RE$5 = /^[A-Z_$][\w$]*$/i;
 const FOR_ITEM_ALIAS_PLACEHOLDER = "__wv_for_item__";
 function isIdentifier(value) {
-	return IDENTIFIER_RE$4.test(value);
+	return IDENTIFIER_RE$5.test(value);
 }
 function splitTopLevelByComma(input) {
 	const out = [];
@@ -5033,7 +5033,7 @@ function withSlotProps(context, mapping, fn) {
 		popSlotProps(context);
 	}
 }
-const IDENTIFIER_RE$3 = /^[A-Z_$][\w$]*$/i;
+const IDENTIFIER_RE$4 = /^[A-Z_$][\w$]*$/i;
 const BIND_SHORTHAND_ARG_RE = /^[A-Z_$][\w$]*(?:-[A-Z_$][\w$]*)*$/i;
 const BACKSLASH_RE$2 = /\\/g;
 const SINGLE_QUOTE_RE$2 = /'/g;
@@ -5054,7 +5054,7 @@ function collectScopePropMapping(context) {
 	const mapping = {};
 	if (!context.slotMultipleInstance) return mapping;
 	for (const scope of context.scopeStack) for (const name of scope) {
-		if (!IDENTIFIER_RE$3.test(name)) continue;
+		if (!IDENTIFIER_RE$4.test(name)) continue;
 		if (!hasOwn(mapping, name)) mapping[name] = name;
 	}
 	return mapping;
@@ -5143,7 +5143,7 @@ function replaceIdentifierWithExpression(path, replacement) {
 	}
 	path.replaceWith(replacement);
 }
-const IDENTIFIER_RE$2 = /^[A-Z_$][\w$]*$/i;
+const IDENTIFIER_RE$3 = /^[A-Z_$][\w$]*$/i;
 function rewriteScopedSlotExpression(exp, context) {
 	const normalized = normalizeWxmlExpression(exp);
 	const parsed = parseBabelExpressionFile(normalized);
@@ -5154,7 +5154,7 @@ function rewriteScopedSlotExpression(exp, context) {
 	const forAliases = collectForAliasMapping$2(context);
 	const createMemberAccess = (target, prop) => {
 		if (!prop) return t.identifier(target);
-		if (IDENTIFIER_RE$2.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
+		if (IDENTIFIER_RE$3.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
 		return t.memberExpression(t.identifier(target), t.stringLiteral(prop), true);
 	};
 	traverse(ast, { Identifier(path) {
@@ -5351,10 +5351,10 @@ const INLINE_GLOBALS = new Set([
 	"scope",
 	...getMiniProgramRuntimeGlobalKeys()
 ]);
-const IDENTIFIER_RE$1 = /^[A-Z_$][\w$]*$/i;
+const IDENTIFIER_RE$2 = /^[A-Z_$][\w$]*$/i;
 const SIMPLE_PATH_RE = /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*)*$/i;
 function createMemberAccess$1(target, prop) {
-	if (IDENTIFIER_RE$1.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
+	if (IDENTIFIER_RE$2.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
 	return t.memberExpression(t.identifier(target), t.stringLiteral(prop), true);
 }
 function resolveSlotPropBinding(slotProps, name) {
@@ -5880,7 +5880,7 @@ function transformBindDirective(node, context, forInfo) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/directives/custom.ts
-const IDENTIFIER_RE = /^[a-z_$][\w$]*$/i;
+const IDENTIFIER_RE$1 = /^[a-z_$][\w$]*$/i;
 function transformCustomDirective(name, exp, arg, context) {
 	if (new Set([
 		"bind",
@@ -5900,7 +5900,7 @@ function transformCustomDirective(name, exp, arg, context) {
 	const dataAttrName = `data-v-${name}`;
 	if (exp && exp.type === NodeTypes.SIMPLE_EXPRESSION) {
 		const expValue = normalizeWxmlExpressionWithContext(exp.content, context);
-		if (IDENTIFIER_RE.test(expValue)) return `${dataAttrName}="${renderMustache(expValue, context)}"`;
+		if (IDENTIFIER_RE$1.test(expValue)) return `${dataAttrName}="${renderMustache(expValue, context)}"`;
 		return `${dataAttrName}="${renderMustache(expValue, context)}"`;
 	}
 	if (arg && arg.type === NodeTypes.SIMPLE_EXPRESSION) return `${dataAttrName}="${arg.content}"`;
@@ -5917,6 +5917,28 @@ function getElementType(element) {
 	return "";
 }
 const QUOTE_RE$1 = /"/g;
+const CAMELIZE_RE = /-([a-z0-9])/gi;
+const IDENTIFIER_RE = /^[A-Z_$][\w$]*$/i;
+const NATIVE_MODEL_TAGS = new Set([
+	"input",
+	"textarea",
+	"select",
+	"switch",
+	"checkbox",
+	"slider",
+	"picker"
+]);
+function camelize(value) {
+	return value.replace(CAMELIZE_RE, (_, char) => char.toUpperCase());
+}
+function buildModelAssignmentExpression(rawExpValue) {
+	if (IDENTIFIER_RE.test(rawExpValue)) return `ctx.${rawExpValue} = $event`;
+	return `${rawExpValue} = $event`;
+}
+function isNativeModelElement(element) {
+	if (!element || element.tag !== element.tag.toLowerCase()) return false;
+	return NATIVE_MODEL_TAGS.has(element.tag);
+}
 function transformVModel(element, expValue, context) {
 	const escapedModel = expValue.replace(QUOTE_RE$1, """);
 	const bindModel = (event) => {
@@ -5942,9 +5964,48 @@ function transformVModel(element, expValue, context) {
 			return `value="${renderMustache(expValue, context)}" ${bindModel("input")}`;
 	}
 }
-function transformModelDirective(node, context, elementNode) {
+function transformComponentModelDirective(node, context) {
+	const rawExpValue = getBindDirectiveExpression(node).trim();
+	if (!rawExpValue) return null;
+	const rawModelName = node.arg?.type === NodeTypes.SIMPLE_EXPRESSION ? node.arg.content.trim() : "";
+	if (node.arg?.type === NodeTypes.SIMPLE_EXPRESSION && !node.arg.isStatic) {
+		context.warnings.push("暂不支持动态 v-model 参数，已忽略该 v-model。");
+		return null;
+	}
+	const modelProp = rawModelName || "modelValue";
+	if (!modelProp) return null;
+	const updateEvent = `update:${camelize(modelProp)}`;
+	const eventSuffix = normalizeEventDatasetSuffix(updateEvent);
+	const bindAttr = context.platform.eventBindingAttr(updateEvent);
+	const inlineExpression = registerInlineExpression(buildModelAssignmentExpression(rawExpValue), context);
+	if (!inlineExpression) {
+		context.warnings.push(`v-model="${rawExpValue}" 需要是可赋值的成员表达式。`);
+		return null;
+	}
+	const modelAttr = modelProp === "modelValue" ? `modelValue="${renderMustache(normalizeWxmlExpressionWithContext(rawExpValue, context), context)}"` : transformBindDirective(node, context);
+	const updateAttr = [
+		`data-wd-${eventSuffix}="1"`,
+		`data-wi-${eventSuffix}="${inlineExpression.id}"`,
+		`${bindAttr}="${WEVU_INLINE_HANDLER}"`
+	].filter(Boolean).join(" ");
+	const modifierNames = node.modifiers.map((modifier) => modifier.content.trim()).filter(Boolean);
+	const modifierProperties = modifierNames.map((name) => `${JSON.stringify(name)}:true`).join(",");
+	const modifiersProp = modelProp === "modelValue" ? "modelModifiers" : `${modelProp}Modifiers`;
+	const modifiersRef = modifierNames.length ? registerRuntimeBindingExpression(`{${modifierProperties}}`, context, { hint: "v-model modifiers" }) : null;
+	return [
+		modelAttr,
+		updateAttr,
+		modifiersRef ? `${modifiersProp}="${renderMustache(modifiersRef, context)}"` : null
+	].filter(Boolean).join(" ");
+}
+function transformModelDirective(node, context, elementNode, options) {
 	const { exp } = node;
 	if (!exp) return null;
+	if (options?.isComponent === true && !isNativeModelElement(elementNode)) return transformComponentModelDirective(node, context);
+	if (node.arg) {
+		context.warnings.push("原生小程序元素不支持 v-model 参数，已忽略该 v-model。");
+		return null;
+	}
 	return transformVModel(elementNode, normalizeWxmlExpressionWithContext(exp.type === NodeTypes.SIMPLE_EXPRESSION ? exp.content : "", context), context);
 }
 //#endregion
@@ -6045,7 +6106,7 @@ function transformDirective(node, context, elementNode, forInfo, options) {
 	const { name, exp, arg } = node;
 	if (name === "bind") return transformBindDirective(node, context, forInfo);
 	if (name === "on") return transformOnDirective(node, context, options);
-	if (name === "model") return transformModelDirective(node, context, elementNode);
+	if (name === "model") return transformModelDirective(node, context, elementNode, options);
 	if (name === "show") return transformShowDirective(node, context);
 	if (name === "html") {
 		context.warnings.push("小程序不支持 v-html，请使用 rich-text 组件替代。");
@@ -6406,24 +6467,59 @@ function injectAttributeIntoOpeningTag(source, attr) {
 	if (tagNameEnd <= 1) return null;
 	return `${source.slice(0, tagNameEnd)} ${attr}${source.slice(tagNameEnd)}`;
 }
+function createSlotAttributeNode(sourceNode, attr) {
+	const match = /^slot="([\s\S]*)"$/.exec(attr);
+	if (!match) return null;
+	return {
+		type: NodeTypes.ATTRIBUTE,
+		name: "slot",
+		nameLoc: sourceNode.loc,
+		value: {
+			type: NodeTypes.TEXT,
+			content: match[1],
+			loc: sourceNode.loc
+		},
+		loc: sourceNode.loc
+	};
+}
+function injectSlotAttributeIntoElementNode(child, slotAttr, transformNode, context) {
+	if (child.type !== NodeTypes.ELEMENT || child.tag === "template") return null;
+	const sourceNode = child;
+	const slotAttribute = createSlotAttributeNode(sourceNode, slotAttr);
+	if (!slotAttribute) return null;
+	return transformNode({
+		...sourceNode,
+		props: [slotAttribute, ...sourceNode.props]
+	}, context);
+}
+function isRenderableFallbackChild(child) {
+	if (child.type === NodeTypes.COMMENT) return false;
+	if (child.type === NodeTypes.TEXT) return child.content.trim().length > 0;
+	return true;
+}
 function renderSlotFallback(decl, context, transformNode) {
-	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");
 	const wrapCondition = (content) => {
 		return decl.condition ? context.platform.wrapIf(decl.condition, content, (exp) => renderMustache(exp, context)) : content;
 	};
-	if (!slotAttr) return wrapCondition(rawContent);
-	if (!context.slotSingleRootNoWrapper) return wrapCondition(`<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 (!slotAttr) {
+		const rawContent = decl.children.map((child) => transformNode(child, context)).join("");
+		if (!rawContent) return "";
+		return wrapCondition(rawContent);
+	}
+	const renderableChildren = decl.children.filter(isRenderableFallbackChild);
+	if (!renderableChildren.length) return "";
+	if (!context.slotSingleRootNoWrapper) {
+		const rawContent = decl.children.map((child) => transformNode(child, context)).join("");
+		if (!rawContent) return "";
+		return wrapCondition(`<view ${slotAttr}>${rawContent}</view>`);
+	}
+	if (renderableChildren.length === 1) {
+		const child = renderableChildren[0];
+		const projected = child.type === NodeTypes.ELEMENT && isStructuralDirective(child).type ? injectSlotAttributeIntoElementNode(child, slotAttr, transformNode, context) : injectAttributeIntoOpeningTag(transformNode(child, context), slotAttr);
 		if (projected) return wrapCondition(projected);
 	}
-	return wrapCondition(`<view ${slotAttr}>${content}</view>`);
+	return wrapCondition(`<view ${slotAttr}>${renderableChildren.map((child) => transformNode(child, context)).join("")}</view>`);
 }
 function transformSlotElement(node, context, transformNode) {
 	if (isScopedSlotsDisabled(context)) return transformSlotElementPlain(node, context, transformNode);
@@ -6535,6 +6631,13 @@ function shouldExposePlainSlotPresence(node) {
 function isWevuComponentTag(node, context) {
 	return context.wevuComponentTags ? context.wevuComponentTags.has(node.tag) : /^[A-Z]/.test(node.tag);
 }
+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));
+	const shouldUseAugmentedDefaultSlot = node.children.length > 0 && !context.scopedSlotsRequireProps && !isBuiltinTag(resolvedTag);
+	const shouldUseSlotPresenceMetadata = node.children.length > 0 && isWevuComponentTag(node, context);
+	return slotDirective || templateSlotChildren.length > 0 || shouldUseAugmentedDefaultSlot || shouldUseSlotPresenceMetadata;
+}
 function transformComponentWithSlots(node, context, transformNode, options) {
 	if (isScopedSlotsDisabled(context)) return transformComponentWithSlotsFallback(node, context, transformNode, options);
 	const extraAttrs = options?.extraAttrs ?? [];
@@ -6569,7 +6672,8 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 		let children = node.children.map((child) => transformNode(child, context)).join("");
 		if (vTextExp !== void 0) children = renderMustache(vTextExp, context);
 		if (children && defaultSlotChildren.length && !hasLegacySlotAttribute(defaultSlotChildren) && isWevuComponentTag(node, context)) pushSlotNamesAttr(attrs, [{ name: "'default'" }], context);
-		const attrString = attrs.length ? ` ${attrs.join(" ")}` : "";
+		const mergedAttrs = [...extraAttrs, ...attrs];
+		const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
 		const { tag } = node;
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}
@@ -6645,7 +6749,8 @@ function transformComponentWithSlotsFallback(node, context, transformNode, optio
 		let children = node.children.map((child) => transformNode(child, context)).join("");
 		if (vTextExp !== void 0) children = renderMustache(vTextExp, context);
 		if (children && defaultSlotChildren.length && !hasLegacySlotAttribute(defaultSlotChildren) && isWevuComponentTag(node, context)) pushSlotNamesAttr(attrs, [{ name: "'default'" }], context);
-		const attrString = attrs.length ? ` ${attrs.join(" ")}` : "";
+		const mergedAttrs = [...extraAttrs, ...attrs];
+		const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
 		const { tag } = node;
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}
@@ -6707,11 +6812,7 @@ function transformComponentElement(node, context, transformNode) {
 //#region src/plugins/vue/compiler/template/elements/tag-normal.ts
 function transformNormalElement(node, context, transformNode) {
 	const tag = resolveTemplateTagName(node.tag, context);
-	const slotDirective = findSlotDirective(node);
-	const templateSlotChildren = node.children.filter((child) => child.type === NodeTypes.ELEMENT && child.tag === "template" && findSlotDirective(child));
-	const shouldUseAugmentedDefaultSlot = node.children.length > 0 && !context.scopedSlotsRequireProps && !isBuiltinTag(tag);
-	const shouldUseSlotPresenceMetadata = node.children.length > 0 && (context.wevuComponentTags ? context.wevuComponentTags.has(node.tag) : /^[A-Z]/.test(node.tag));
-	if (slotDirective || templateSlotChildren.length > 0 || shouldUseAugmentedDefaultSlot || shouldUseSlotPresenceMetadata) return transformComponentWithSlots(node, context, transformNode);
+	if (shouldTransformAsComponentWithSlots(node, context, tag)) return transformComponentWithSlots(node, context, transformNode);
 	const { attrs, vTextExp } = collectElementAttributes(node, context, { resolvedTag: tag });
 	let children = "";
 	if (node.children.length > 0) children = node.children.map((child) => transformNode(child, context)).join("");
@@ -6789,21 +6890,20 @@ function transformForElement(node, context, transformNode) {
 			props: otherProps
 		};
 		const extraAttrs = listExp ? context.platform.forAttrs(listExp, renderTemplateMustache, forInfo.item, forInfo.index) : [];
-		const slotDirective = findSlotDirective(elementWithoutFor);
-		const templateSlotChildren = elementWithoutFor.children.filter((child) => child.type === NodeTypes.ELEMENT && child.tag === "template" && findSlotDirective(child));
-		if (slotDirective || templateSlotChildren.length > 0) return transformComponentWithSlots(elementWithoutFor, context, transformNode, {
+		const resolvedTag = resolveTemplateTagName(elementWithoutFor.tag, context);
+		if (shouldTransformAsComponentWithSlots(elementWithoutFor, context, resolvedTag)) return transformComponentWithSlots(elementWithoutFor, context, transformNode, {
 			extraAttrs,
 			forInfo
 		});
 		const { attrs, vTextExp } = collectElementAttributes(elementWithoutFor, context, {
 			forInfo,
 			extraAttrs,
-			resolvedTag: resolveTemplateTagName(elementWithoutFor.tag, context)
+			resolvedTag
 		});
 		let children = "";
 		if (elementWithoutFor.children.length > 0) children = elementWithoutFor.children.map((child) => transformNode(child, context)).join("");
 		if (vTextExp !== void 0) children = renderMustache(vTextExp, context);
-		const tag = resolveTemplateTagName(elementWithoutFor.tag, context);
+		const tag = resolvedTag;
 		const attrString = attrs.length ? ` ${attrs.join(" ")}` : "";
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}));
@@ -7936,11 +8036,15 @@ async function compileVueFile(source, filename, options) {
 		autoUsingComponents,
 		autoImportTags
 	});
-	const templateOptions = componentSourceInfo.wevuComponentTags.size ? {
+	const baseTemplateOptions = parsed.isAppFile ? {
 		...options?.template,
+		scopedSlotsRequireProps: true
+	} : options?.template;
+	const templateOptions = componentSourceInfo.wevuComponentTags.size ? {
+		...baseTemplateOptions,
 		wevuComponentTags: componentSourceInfo.wevuComponentTags
 	} : {
-		...options?.template,
+		...baseTemplateOptions,
 		wevuComponentTags: []
 	};
 	const templateCompiled = compileTemplatePhase(parsed.descriptor, filename, templateOptions, result);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.7",
+  "version": "6.16.9",
   "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.4",
+    "@weapp-core/constants": "^0.1.6",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.7",
+    "@weapp-vite/ast": "6.16.9",
     "rolldown-require": "2.0.15"
   },
   "publishConfig": {