@wevu/compiler 6.14.2 → 6.15.0

package/dist/index.d.mts

@@ -250,6 +250,7 @@ interface ForParseResult {
  */
 interface TemplateCompileOptions {
   platform?: MiniProgramPlatform;
+  htmlTagToWxml?: boolean | Record<string, string>;
   scopedSlotsCompiler?: ScopedSlotsCompilerMode;
   scopedSlotsRequireProps?: boolean;
   slotMultipleInstance?: boolean;

package/dist/index.mjs

@@ -412,12 +412,14 @@ function rewriteJsLikeImportsForTempDir(source, fromDir, tempDir) {
 //#endregion
 //#region src/plugins/vue/transform/wevuTempDir.ts
 const PROJECT_WEVU_CONFIG_DIR = path.join(".weapp-vite", "wevu-config");
+/**
+* 优先把临时配置缓存放到项目内，避免宏求值时脱离项目根目录导致包名导入解析异常。
+*/
 function getWevuConfigCacheRoot() {
 	const env = process.env.WEAPP_VITE_WEVU_CONFIG_DIR?.trim();
 	if (env) return path.resolve(env);
-	const cwd = process.cwd();
-	const projectCacheDir = path.join(cwd, PROJECT_WEVU_CONFIG_DIR);
-	if (fs.existsSync(projectCacheDir)) return projectCacheDir;
+	const projectRoot = process.cwd();
+	if (fs.existsSync(projectRoot)) return path.join(projectRoot, PROJECT_WEVU_CONFIG_DIR);
 	return path.join(os.tmpdir(), "weapp-vite", "wevu-config");
 }
 function resolveWevuConfigTempDir(fromDir) {
@@ -2176,18 +2178,19 @@ function createMacroVisitors(program, state) {
 	const setupExposeVisitors = createSetupExposeVisitors(state);
 	const stripTypesVisitors = createStripTypesVisitors(state);
 	const pageMetaVisitors = createPageMetaVisitors(state);
-	return {
+	const mergedVisitors = {
 		...appSetupVisitors,
 		...setupExposeVisitors,
 		...stripTypesVisitors,
-		...pageMetaVisitors,
-		CallExpression(path) {
-			appSetupVisitors.CallExpression?.(path);
-			setupExposeVisitors.CallExpression?.(path);
-			stripTypesVisitors.CallExpression?.(path);
-			if (!path.removed) pageMetaVisitors.CallExpression?.(path);
-		}
+		...pageMetaVisitors
+	};
+	mergedVisitors.CallExpression = (path) => {
+		appSetupVisitors.CallExpression?.(path);
+		setupExposeVisitors.CallExpression?.(path);
+		stripTypesVisitors.CallExpression?.(path);
+		if (!path.removed) pageMetaVisitors.CallExpression?.(path);
 	};
+	return mergedVisitors;
 }
 //#endregion
 //#region src/plugins/vue/transform/classStyleComputedBuilders.ts
@@ -2953,6 +2956,16 @@ function transformScript(source, options) {
 	};
 }
 //#endregion
+//#region src/inlineDataset.ts
+const NON_ALNUM_RE = /[^a-z0-9]+/gi;
+const LEADING_TRAILING_DASH_RE = /^-+|-+$/g;
+function normalizeEventDatasetSuffix(eventName) {
+	return eventName.trim().replace(NON_ALNUM_RE, "-").replace(LEADING_TRAILING_DASH_RE, "").toLowerCase() || "event";
+}
+function createInlineExpressionId(seed) {
+	return `i${seed.toString(36)}`;
+}
+//#endregion
 //#region src/plugins/vue/compiler/template/expression/wxml.ts
 function templateLiteralToConcat(node) {
 	const segments = [];
@@ -3132,7 +3145,7 @@ function collectExpressionScopeBindings(exp, context) {
 }
 function registerInlineExpression$1(exp, context) {
 	const scopeKeys = collectExpressionScopeBindings(exp, context);
-	const id = `__wv_inline_${context.inlineExpressionSeed++}`;
+	const id = createInlineExpressionId(context.inlineExpressionSeed++);
 	context.inlineExpressions.push({
 		id,
 		expression: printExpression(exp),
@@ -3582,25 +3595,20 @@ function lowerEventName(name) {
 	if (!name) return name;
 	return name.replace(LEADING_UPPER_RE, (s) => s.toLowerCase()).replace(UPPER_CHAR_RE, (s) => s.toLowerCase());
 }
-function toEventBindingName(rawName, context) {
+function resolveMappedEventName(rawName, context) {
 	const resolveEvent = (name) => context.platform.mapEventName(lowerEventName(name));
-	if (CAPTURE_BIND_EVENT_RE.test(rawName)) {
-		const eventName = resolveEvent(rawName.slice(11));
-		return context.platform.eventBindingAttr(`capture-bind:${eventName}`);
-	}
-	if (CAPTURE_CATCH_EVENT_RE.test(rawName)) {
-		const eventName = resolveEvent(rawName.slice(12));
-		return context.platform.eventBindingAttr(`capture-catch:${eventName}`);
-	}
-	if (MUT_BIND_EVENT_RE.test(rawName)) {
-		const eventName = resolveEvent(rawName.slice(7));
-		return context.platform.eventBindingAttr(`mut-bind:${eventName}`);
-	}
-	if (CATCH_EVENT_RE.test(rawName)) {
-		const eventName = resolveEvent(rawName.slice(5));
-		return context.platform.eventBindingAttr(`catch:${eventName}`);
-	}
-	const eventName = resolveEvent(rawName.slice(2));
+	if (CAPTURE_BIND_EVENT_RE.test(rawName)) return resolveEvent(rawName.slice(11));
+	if (CAPTURE_CATCH_EVENT_RE.test(rawName)) return resolveEvent(rawName.slice(12));
+	if (MUT_BIND_EVENT_RE.test(rawName)) return resolveEvent(rawName.slice(7));
+	if (CATCH_EVENT_RE.test(rawName)) return resolveEvent(rawName.slice(5));
+	return resolveEvent(rawName.slice(2));
+}
+function toEventBindingName(rawName, context) {
+	const eventName = resolveMappedEventName(rawName, context);
+	if (CAPTURE_BIND_EVENT_RE.test(rawName)) return context.platform.eventBindingAttr(`capture-bind:${eventName}`);
+	if (CAPTURE_CATCH_EVENT_RE.test(rawName)) return context.platform.eventBindingAttr(`capture-catch:${eventName}`);
+	if (MUT_BIND_EVENT_RE.test(rawName)) return context.platform.eventBindingAttr(`mut-bind:${eventName}`);
+	if (CATCH_EVENT_RE.test(rawName)) return context.platform.eventBindingAttr(`catch:${eventName}`);
 	return context.platform.eventBindingAttr(`bind:${eventName}`);
 }
 function readJsxAttributeExpression(value) {
@@ -3623,13 +3631,14 @@ function extractJsxKeyExpression(node) {
 }
 function compileEventAttribute(name, value, context) {
 	const bindAttr = toEventBindingName(name, context);
+	const eventSuffix = normalizeEventDatasetSuffix(resolveMappedEventName(name, context));
 	const exp = readJsxAttributeExpression(value);
 	if (!exp) return [];
 	if (t.isStringLiteral(exp) && exp.value) return [`${bindAttr}="${escapeAttr(exp.value)}"`];
 	if (t.isIdentifier(exp)) return [`${bindAttr}="${escapeAttr(exp.name)}"`];
 	if (t.isMemberExpression(exp) && !exp.computed && t.isThisExpression(exp.object) && t.isIdentifier(exp.property)) return [`${bindAttr}="${escapeAttr(exp.property.name)}"`];
 	const inline = registerInlineExpression$1(exp, context);
-	const attrs = [`data-wv-inline-id="${inline.id}"`, `${bindAttr}="__weapp_vite_inline"`];
+	const attrs = [`data-wi-${eventSuffix}="${inline.id}"`, `${bindAttr}="__weapp_vite_inline"`];
 	inline.scopeKeys.forEach((scopeKey, index) => {
 		attrs.push(`data-wv-s${index}="${renderMustache$1(scopeKey, context)}"`);
 	});
@@ -4589,6 +4598,64 @@ function getClassStyleWxsSource(options = {}) {
 	].join("\n");
 }
 //#endregion
+//#region src/plugins/vue/compiler/template/htmlTagMapping.ts
+const DEFAULT_HTML_TO_WXML_TAG_MAP = {
+	a: "navigator",
+	article: "view",
+	aside: "view",
+	b: "text",
+	blockquote: "view",
+	button: "button",
+	code: "text",
+	dd: "view",
+	div: "view",
+	dl: "view",
+	dt: "view",
+	em: "text",
+	figcaption: "view",
+	figure: "view",
+	footer: "view",
+	form: "form",
+	h1: "view",
+	h2: "view",
+	h3: "view",
+	h4: "view",
+	h5: "view",
+	h6: "view",
+	header: "view",
+	i: "text",
+	img: "image",
+	input: "input",
+	label: "label",
+	li: "view",
+	main: "view",
+	nav: "view",
+	ol: "view",
+	p: "view",
+	pre: "view",
+	section: "view",
+	small: "text",
+	span: "text",
+	strong: "text",
+	textarea: "textarea",
+	u: "text",
+	ul: "view"
+};
+function resolveHtmlTagToWxmlMap(value) {
+	if (value === false) return;
+	if (value === true || value === void 0) return { ...DEFAULT_HTML_TO_WXML_TAG_MAP };
+	return {
+		...DEFAULT_HTML_TO_WXML_TAG_MAP,
+		...Object.fromEntries(Object.entries(value).map(([key, mapped]) => [key.toLowerCase(), mapped]))
+	};
+}
+function resolveTemplateTagName(tag, context) {
+	if (!tag) return tag;
+	const lowerTag = tag.toLowerCase();
+	if (tag !== lowerTag) return tag;
+	return context.htmlTagToWxmlMap?.[lowerTag] ?? tag;
+}
+//#endregion
 //#region src/plugins/vue/compiler/template/elements/forExpression.ts
 const IDENTIFIER_RE$4 = /^[A-Z_$][\w$]*$/i;
 const FOR_ITEM_ALIAS_PLACEHOLDER = "__wv_for_item__";
@@ -5283,7 +5350,7 @@ function registerInlineExpression(exp, context) {
 	const indexBindings = buildInlineIndexBindings(context);
 	const scopeResolvers = buildScopeResolvers(usedLocals, context, slotProps, indexBindings);
 	const asset = {
-		id: `__wv_inline_${context.inlineExpressionSeed++}`,
+		id: createInlineExpressionId(context.inlineExpressionSeed++),
 		expression: updatedExpression,
 		scopeKeys: usedLocals
 	};
@@ -5778,11 +5845,6 @@ const isSimpleHandler = (value) => SIMPLE_IDENTIFIER_RE.test(value);
 function shouldUseDetailPayload(options) {
 	return options?.isComponent === true;
 }
-const NON_ALNUM_RE = /[^a-z0-9]+/gi;
-const LEADING_TRAILING_DASH_RE = /^-+|-+$/g;
-function normalizeEventDatasetSuffix(eventName) {
-	return eventName.trim().replace(NON_ALNUM_RE, "-").replace(LEADING_TRAILING_DASH_RE, "").toLowerCase() || "event";
-}
 const QUOTE_RE = /"/g;
 function buildInlineScopeAttrs(scopeBindings, context) {
 	return scopeBindings.map((binding, index) => {
@@ -5819,14 +5881,14 @@ function transformOnDirective(node, context, options) {
 	const eventSuffix = normalizeEventDatasetSuffix(mappedEvent);
 	const eventPrefix = resolveEventPrefix(node.modifiers);
 	const bindAttr = context.platform.eventBindingAttr(`${eventPrefix}:${mappedEvent}`);
-	const detailAttr = useDetailPayload ? `data-wv-event-detail-${eventSuffix}="1"` : "";
+	const detailAttr = useDetailPayload ? `data-wd-${eventSuffix}="1"` : "";
 	if (context.rewriteScopedSlot) {
 		if (inlineExpression) {
 			const scopeAttrs = buildInlineScopeAttrs(inlineExpression.scopeBindings, context);
 			const indexAttrs = buildInlineIndexAttrs(inlineExpression.indexBindings, context);
 			return [
 				detailAttr,
-				`data-wv-inline-id-${eventSuffix}="${inlineExpression.id}"`,
+				`data-wi-${eventSuffix}="${inlineExpression.id}"`,
 				...scopeAttrs,
 				...indexAttrs,
 				`${bindAttr}="__weapp_vite_owner"`
@@ -5834,7 +5896,7 @@ function transformOnDirective(node, context, options) {
 		}
 		if (!isInlineExpression && rawExpValue) return [
 			detailAttr,
-			`data-wv-handler-${eventSuffix}="${rawExpValue}"`,
+			`data-wh-${eventSuffix}="${rawExpValue}"`,
 			`${bindAttr}="__weapp_vite_owner"`
 		].filter(Boolean).join(" ");
 		if (isInlineExpression) {
@@ -5848,7 +5910,7 @@ function transformOnDirective(node, context, options) {
 		const indexAttrs = buildInlineIndexAttrs(inlineExpression.indexBindings, context);
 		return [
 			detailAttr,
-			`data-wv-inline-id-${eventSuffix}="${inlineExpression.id}"`,
+			`data-wi-${eventSuffix}="${inlineExpression.id}"`,
 			...scopeAttrs,
 			...indexAttrs,
 			`${bindAttr}="__weapp_vite_inline"`
@@ -5895,7 +5957,8 @@ function isBuiltinTag(tag) {
 }
 function collectElementAttributes(node, context, options) {
 	const { props } = node;
-	const isComponentElement = options?.isComponent ?? !isBuiltinTag(node.tag);
+	const resolvedTag = options?.resolvedTag ?? resolveTemplateTagName(node.tag, context);
+	const isComponentElement = options?.isComponent ?? !isBuiltinTag(resolvedTag);
 	const attrs = options?.extraAttrs ? [...options.extraAttrs] : [];
 	let staticClass;
 	let staticId;
@@ -6399,11 +6462,11 @@ function transformComponentElement(node, context, transformNode) {
 //#endregion
 //#region src/plugins/vue/compiler/template/elements/tag-normal.ts
 function transformNormalElement(node, context, transformNode) {
-	const { tag } = node;
+	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));
 	if (slotDirective || templateSlotChildren.length > 0) return transformComponentWithSlots(node, context, transformNode);
-	const { attrs, vTextExp } = collectElementAttributes(node, context);
+	const { attrs, vTextExp } = collectElementAttributes(node, context, { resolvedTag: tag });
 	let children = "";
 	if (node.children.length > 0) children = node.children.map((child) => transformNode(child, context)).join("");
 	if (vTextExp !== void 0) children = renderMustache(vTextExp, context);
@@ -6488,12 +6551,13 @@ function transformForElement(node, context, transformNode) {
 		});
 		const { attrs, vTextExp } = collectElementAttributes(elementWithoutFor, context, {
 			forInfo,
-			extraAttrs
+			extraAttrs,
+			resolvedTag: resolveTemplateTagName(elementWithoutFor.tag, context)
 		});
 		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 } = elementWithoutFor;
+		const tag = resolveTemplateTagName(elementWithoutFor.tag, context);
 		const attrString = attrs.length ? ` ${attrs.join(" ")}` : "";
 		return children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`;
 	}));
@@ -6642,6 +6706,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 htmlTagToWxmlMap = resolveHtmlTagToWxmlMap(options?.htmlTagToWxml);
 	try {
 		const ast = parse$1(template, {
 			isVoidTag: (tag) => HTML_VOID_TAGS.has(tag),
@@ -6654,6 +6719,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			filename,
 			warnings,
 			platform: options?.platform ?? wechatPlatform,
+			htmlTagToWxmlMap,
 			scopedSlotsCompiler: options?.scopedSlotsCompiler ?? "auto",
 			scopedSlotsRequireProps,
 			slotMultipleInstance: options?.slotMultipleInstance ?? true,
@@ -7176,6 +7242,9 @@ async function inlineScriptSetupDefineOptionsArgs(content, filename, lang) {
 const SETUP_CALL_RE = /\bsetup\s*\(/;
 const DEFINE_OPTIONS_CALL_RE = /\bdefineOptions\s*\(/;
 const APP_VUE_FILE_RE = /[\\/]app\.vue$/;
+const TEMPLATE_BLOCK_RE = /<template\b[\s\S]*?<\/template>/g;
+const TEMPLATE_IMPORT_META_RE = /\bimport\.meta\b/g;
+const TEMPLATE_IMPORT_META_PLACEHOLDER = "__im_meta__";
 function resolveSfcScriptLangLabel(lang) {
 	return typeof lang === "string" && lang.length > 0 ? lang : "(default)";
 }
@@ -7203,14 +7272,37 @@ function extractDefineOptionsHash(content) {
 	if (!macroSources.length) return;
 	return createHash("sha256").update(macroSources.join("\n")).digest("hex").slice(0, 12);
 }
+function preprocessTemplateImportMeta(source) {
+	return source.replace(TEMPLATE_BLOCK_RE, (block) => block.replace(TEMPLATE_IMPORT_META_RE, TEMPLATE_IMPORT_META_PLACEHOLDER));
+}
+function restoreTemplateImportMeta(content) {
+	return content.replace(new RegExp(TEMPLATE_IMPORT_META_PLACEHOLDER, "g"), "import.meta");
+}
+function restoreTemplateImportMetaInDescriptor(descriptor) {
+	if (!descriptor.template?.content?.includes(TEMPLATE_IMPORT_META_PLACEHOLDER)) return descriptor;
+	return {
+		...descriptor,
+		template: {
+			...descriptor.template,
+			content: restoreTemplateImportMeta(descriptor.template.content)
+		}
+	};
+}
+function parseSfc(source, filename, ignoreEmpty) {
+	const parsed = parse(preprocessTemplateImportMeta(source), {
+		filename,
+		ignoreEmpty
+	});
+	return {
+		...parsed,
+		descriptor: restoreTemplateImportMetaInDescriptor(parsed.descriptor)
+	};
+}
 async function parseVueFile(source, filename, options) {
 	const normalizedInputSource = normalizeLineEndings(source);
 	const normalizedSource = preprocessScriptSrc(preprocessScriptSetupSrc(normalizedInputSource));
 	let descriptorForCompileSource = normalizedSource;
-	const { descriptor, errors } = parse(normalizedSource, {
-		filename,
-		ignoreEmpty: normalizedSource === normalizedInputSource
-	});
+	const { descriptor, errors } = parseSfc(normalizedSource, filename, normalizedSource === normalizedInputSource);
 	restoreScriptSetupSrc(descriptor);
 	restoreScriptSrc(descriptor);
 	if (errors.length > 0) {
@@ -7258,10 +7350,7 @@ async function parseVueFile(source, filename, options) {
 			const startOffset = setupLoc.start.offset;
 			const endOffset = setupLoc.end.offset;
 			const nextSource = descriptorForCompileSource.slice(0, startOffset) + extracted.stripped + descriptorForCompileSource.slice(endOffset);
-			const { descriptor: nextDescriptor, errors: nextErrors } = parse(nextSource, {
-				filename,
-				ignoreEmpty: false
-			});
+			const { descriptor: nextDescriptor, errors: nextErrors } = parseSfc(nextSource, filename, false);
 			restoreScriptSetupSrc(nextDescriptor);
 			restoreScriptSrc(nextDescriptor);
 			if (nextErrors.length > 0) {
@@ -7298,10 +7387,7 @@ async function parseVueFile(source, filename, options) {
 			const startOffset = setupLoc.start.offset;
 			const endOffset = setupLoc.end.offset;
 			const nextSource = descriptorForCompileSource.slice(0, startOffset) + inlined.code + descriptorForCompileSource.slice(endOffset);
-			const { descriptor: nextDescriptor, errors: nextErrors } = parse(nextSource, {
-				filename,
-				ignoreEmpty: false
-			});
+			const { descriptor: nextDescriptor, errors: nextErrors } = parseSfc(nextSource, filename, false);
 			restoreScriptSetupSrc(nextDescriptor);
 			restoreScriptSrc(nextDescriptor);
 			if (nextErrors.length > 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.14.2",
+  "version": "6.15.0",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -44,14 +44,14 @@
     "@vue/compiler-core": "^3.5.32",
     "@vue/compiler-dom": "^3.5.32",
     "comment-json": "^4.6.2",
-    "lru-cache": "^11.3.2",
+    "lru-cache": "^11.3.3",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.32",
     "@weapp-core/shared": "3.0.3",
-    "@weapp-vite/ast": "6.14.2",
-    "rolldown-require": "2.0.12"
+    "@weapp-vite/ast": "6.15.0",
+    "rolldown-require": "2.0.13"
   },
   "publishConfig": {
     "access": "public",