@wevu/compiler 6.20.1 → 6.20.2

package/dist/index.mjs

@@ -4030,14 +4030,14 @@ function normalizeWxmlExpression(exp) {
 				path.replaceWith(lowerOptionalChain(path.node));
 				path.skip();
 			} },
-			LogicalExpression(path) {
+			LogicalExpression: { exit(path) {
 				if (path.node.operator !== "??") return;
 				const left = path.node.left;
 				const right = path.node.right;
 				const test = t.binaryExpression("!=", t.cloneNode(left), t.nullLiteral());
 				path.replaceWith(t.conditionalExpression(test, t.cloneNode(left), t.cloneNode(right)));
 				path.skip();
-			},
+			} },
 			TemplateLiteral(path) {
 				if (t.isTaggedTemplateExpression(path.parent)) return;
 				path.replaceWith(templateLiteralToConcat(path.node));
@@ -6453,10 +6453,13 @@ function resolveHtmlTagToWxmlMap(value) {
 		...Object.fromEntries(Object.entries(value).map(([key, mapped]) => [key.toLowerCase(), mapped]))
 	};
 }
+function normalizeTemplateTagName(tag) {
+	return tag.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1-$2").toLowerCase();
+}
 function resolveTemplateTagName(tag, context) {
 	if (!tag) return tag;
 	const lowerTag = tag.toLowerCase();
-	if (tag !== lowerTag) return tag;
+	if (tag !== lowerTag) return normalizeTemplateTagName(tag);
 	return context.htmlTagToWxmlMap?.[lowerTag] ?? tag;
 }
 function resolveMappedHtmlTagClassName(tag, context, resolvedTag) {
@@ -9381,7 +9384,7 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 		if (children && defaultSlotChildren.length && !hasLegacySlotAttribute(defaultSlotChildren) && isWevuComponentTag(node, context)) pushSlotNamesAttr(attrs, [{ name: "'default'" }], context, { forInfo: options?.forInfo });
 		const mergedAttrs = [...extraAttrs, ...attrs];
 		const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
-		const { tag } = node;
+		const tag = resolveTemplateTagName(node.tag, context);
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}
 	const scopedSlotDeclarations = [];
@@ -9394,7 +9397,7 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	const ownerComponentName = context.componentNameMap?.[node.tag];
 	for (const decl of scopedSlotDeclarations) {
 		const slotKey = resolveSlotKey(context, decl.name);
-		const { componentName } = createScopedSlotComponent(context, slotKey, decl.props, decl.children, transformNode, { hostComponentName: node.tag });
+		const { componentName } = createScopedSlotComponent(context, slotKey, decl.props, decl.children, transformNode, { hostComponentName: resolveTemplateTagName(node.tag, context) });
 		slotNames.push({
 			name: stringifySlotName(decl.name, context),
 			condition: decl.condition
@@ -9423,7 +9426,7 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 		mergedAttrs.push(`${WEVU_SLOT_OWNER_ID_ATTR}="${renderMustache(ownerIdExp, context)}"`);
 	}
 	const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
-	const { tag } = node;
+	const tag = resolveTemplateTagName(node.tag, context);
 	const plainSlotContent = slotDirective ? plainSlotDeclarations.map((decl) => renderSlotFallback(decl, context, transformNode, {
 		component: node.tag,
 		componentName: ownerComponentName,
@@ -9486,7 +9489,7 @@ function transformComponentWithSlotsFallback(node, context, transformNode, optio
 		if (children && defaultSlotChildren.length && !hasLegacySlotAttribute(defaultSlotChildren) && isWevuComponentTag(node, context)) pushSlotNamesAttr(attrs, [{ name: "'default'" }], context, { forInfo: options?.forInfo });
 		const mergedAttrs = [...extraAttrs, ...attrs];
 		const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
-		const { tag } = node;
+		const tag = resolveTemplateTagName(node.tag, context);
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}
 	if (slotDeclarations.some((decl) => Object.keys(decl.props).length)) context.warnings.push("已禁用作用域插槽参数，插槽绑定将被忽略。");
@@ -9506,7 +9509,7 @@ function transformComponentWithSlotsFallback(node, context, transformNode, optio
 		condition: decl.condition
 	})), context, { forInfo: options?.forInfo });
 	const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
-	const { tag } = node;
+	const tag = resolveTemplateTagName(node.tag, context);
 	return renderedSlots ? `<${tag}${attrString}>${renderedSlots}</${tag}>` : `<${tag}${attrString} />`;
 }
 function transformComponentElement(node, context, transformNode) {
@@ -9958,9 +9961,6 @@ function isWevuSfcComponent(result) {
 function isVueSfcSource(source) {
 	return source.endsWith(".vue");
 }
-function pascalToKebab(name) {
-	return name.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1-$2").toLowerCase();
-}
 function kebabToCamel(name) {
 	return name.replace(/-([a-z0-9])/g, (_, character) => character.toUpperCase());
 }
@@ -10044,12 +10044,12 @@ async function resolveVueSfcStaticComponentMeta(resolvedId, options) {
 function registerComponentName(result, tag, componentName) {
 	if (!componentName) return;
 	result.componentNameMap[tag] = componentName;
-	result.componentNameMap[pascalToKebab(tag)] = componentName;
+	result.componentNameMap[normalizeTemplateTagName(tag)] = componentName;
 }
 function registerMiniProgramComponentTag(result, tag, isComponent) {
 	if (!isComponent) return;
 	result.miniProgramComponentTags.add(tag);
-	result.miniProgramComponentTags.add(pascalToKebab(tag));
+	result.miniProgramComponentTags.add(normalizeTemplateTagName(tag));
 }
 function createComponentSourceInfo() {
 	return {
@@ -10173,7 +10173,7 @@ async function collectScriptSetupUsingComponents(options) {
 			}
 			if (isVueSfcSource(importSource) || isWevuSfcComponent(resolved)) {
 				result.wevuComponentTags.add(localName);
-				result.wevuComponentTags.add(pascalToKebab(localName));
+				result.wevuComponentTags.add(normalizeTemplateTagName(localName));
 			}
 			registerComponentName(result, localName, componentMeta.componentName);
 			for (const tag of templateTags) registerComponentName(result, tag, componentMeta.componentName);
@@ -10348,6 +10348,13 @@ function collectTemplateAutoImportTags(template, filename, warn) {
 		shouldCollect: isAutoImportCandidateTag
 	});
 }
+function normalizeUsingComponents(config) {
+	const raw = config.usingComponents;
+	if (!raw || typeof raw !== "object" || Array.isArray(raw)) return;
+	const usingComponents = {};
+	for (const [name, from] of Object.entries(raw)) usingComponents[normalizeTemplateTagName(name)] = from;
+	config.usingComponents = usingComponents;
+}
 async function compileConfigPhase(params) {
 	const { descriptor, filename, autoUsingComponentsMap, autoImportTagsMap: precomputedAutoImportTagsMap, autoUsingComponents, autoImportTags, jsonDefaults, mergeJson, scriptSetupMacroConfig, result, warn } = params;
 	let configObj;
@@ -10375,14 +10382,17 @@ async function compileConfigPhase(params) {
 	}
 	if (Object.keys(autoUsingComponentsMap).length > 0 || Object.keys(autoImportTagsMap).length > 0) {
 		const existingRaw = configObj?.usingComponents;
-		const usingComponents = existingRaw && typeof existingRaw === "object" && !Array.isArray(existingRaw) ? existingRaw : {};
+		const usingComponents = {};
+		if (existingRaw && typeof existingRaw === "object" && !Array.isArray(existingRaw)) for (const [name, from] of Object.entries(existingRaw)) usingComponents[normalizeTemplateTagName(name)] = from;
 		for (const [name, from] of Object.entries(autoImportTagsMap)) {
-			if (Reflect.has(usingComponents, name) && usingComponents[name] !== from) autoImportTags?.warn?.(`[Vue 编译] usingComponents 冲突：${filename} 中 <json>.usingComponents['${name}']='${usingComponents[name]}' 将被模板标签自动引入覆盖为 '${from}'`);
-			usingComponents[name] = from;
+			const normalizedName = normalizeTemplateTagName(name);
+			if (Reflect.has(usingComponents, normalizedName) && usingComponents[normalizedName] !== from) autoImportTags?.warn?.(`[Vue 编译] usingComponents 冲突：${filename} 中 <json>.usingComponents['${normalizedName}']='${usingComponents[normalizedName]}' 将被模板标签自动引入覆盖为 '${from}'`);
+			usingComponents[normalizedName] = from;
 		}
 		for (const [name, from] of Object.entries(autoUsingComponentsMap)) {
-			if (Reflect.has(usingComponents, name) && usingComponents[name] !== from) autoUsingComponents?.warn?.(`[Vue 编译] usingComponents 冲突：${filename} 中 <json>.usingComponents['${name}']='${usingComponents[name]}' 将被 <script setup> 导入覆盖为 '${from}'`);
-			usingComponents[name] = from;
+			const normalizedName = normalizeTemplateTagName(name);
+			if (Reflect.has(usingComponents, normalizedName) && usingComponents[normalizedName] !== from) autoUsingComponents?.warn?.(`[Vue 编译] usingComponents 冲突：${filename} 中 <json>.usingComponents['${normalizedName}']='${usingComponents[normalizedName]}' 将被 <script setup> 导入覆盖为 '${from}'`);
+			usingComponents[normalizedName] = from;
 		}
 		configObj = mergeJson(configObj ?? {}, { usingComponents }, "auto-using-components");
 	}
@@ -10394,6 +10404,7 @@ async function compileConfigPhase(params) {
 	}
 	if (jsonDefaults && Object.keys(jsonDefaults).length > 0) configObj = mergeJson(configObj ?? {}, jsonDefaults, "defaults");
 	if (scriptSetupMacroConfig && Object.keys(scriptSetupMacroConfig).length > 0) configObj = mergeJson(configObj ?? {}, scriptSetupMacroConfig, "macro");
+	if (configObj) normalizeUsingComponents(configObj);
 	if (configObj && Object.keys(configObj).length > 0) result.config = JSON.stringify(configObj, null, 2);
 }
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.20.1",
+  "version": "6.20.2",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -47,16 +47,16 @@
     "@vue/compiler-dom": "^3.5.41",
     "comment-json": "^5.0.0",
     "lru-cache": "^11.5.2",
-    "magic-string": "^1.1.0",
+    "magic-string": "^1.2.0",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "postcss": "^8.5.26",
     "postcss-selector-parser": "^7.1.5",
     "vue": "^3.5.41",
     "@weapp-core/constants": "0.1.17",
-    "@weapp-core/shared": "3.1.0",
-    "@weapp-vite/ast": "6.20.1",
-    "rolldown-require": "2.0.24"
+    "@weapp-core/shared": "3.1.1",
+    "@weapp-vite/ast": "6.20.2",
+    "rolldown-require": "2.0.25"
   },
   "publishConfig": {
     "access": "public",