@dimina/compiler 1.0.16 → 1.1.0

package/dist/core/view-compiler.js

@@ -1,5 +1,5 @@
-import { _ as tagWhiteList, a as getContentByPath, d as resetStoreInfo, h as getAbsolutePath, i as getComponent, l as getTargetPath, m as collectAssets, n as getAppId, u as getWorkPath, v as transformRpx } from "../env-p9Az8lv5.js";
-import { t as checkTemplateCompatibility } from "../compatibility-C_zWVjYl.js";
+import { C as tagWhiteList, T as toMiniProgramModuleId, a as getComponent, b as getAbsolutePath, d as getTargetPath, f as getTemplateExts, g as resetStoreInfo, h as getWorkPath, m as getViewScriptTags, n as getAppId, o as getContentByPath, p as getViewScriptExts, w as transformRpx, y as collectAssets } from "../env-OH3--qg8.js";
+import { r as takeCompatibilityWarnings, t as checkTemplateCompatibility } from "../compatibility-DdxfVhcK.js";
 import path from "node:path";
 import { isMainThread, parentPort } from "node:worker_threads";
 import fs from "node:fs";
@@ -14,7 +14,7 @@ import * as htmlparser2 from "htmlparser2";
 /**
 * 表达式解析器 - 使用 Oxc AST 解析器提取依赖
 */
-var KEYWORDS = new Set([
+var KEYWORDS = /* @__PURE__ */ new Set([
 	"true",
 	"false",
 	"null",
@@ -123,7 +123,19 @@ function parseBindings(bindings) {
 }
 //#endregion
 //#region src/core/view-compiler.js
-var fileType = [".wxml", ".ddml"];
+/**
+* 根据扩展名列表生成匹配尾部扩展名的正则，如 ['.wxs', '.qds'] -> /(\.wxs|\.qds)$/
+*/
+function buildExtStripRegex(exts) {
+	const alt = exts.map((e) => e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+	return new RegExp(`(${alt})$`);
+}
+/**
+* 移除视图脚本文件路径末尾的扩展名，支持 .wxs 和自定义扩展名
+*/
+function stripViewScriptExt(p) {
+	return p.replace(buildExtStripRegex(getViewScriptExts()), "");
+}
 /**
 * 解析 JavaScript 代码
 * @param {string} code
@@ -241,7 +253,10 @@ if (!isMainThread) parentPort.on("message", async ({ pages, storeInfo }) => {
 		compileResCache.clear();
 		wxsModuleRegistry.clear();
 		wxsFilePathMap.clear();
-		parentPort.postMessage({ success: true });
+		parentPort.postMessage({
+			success: true,
+			compatibilityWarnings: takeCompatibilityWarnings()
+		});
 	} catch (error) {
 		compileResCache.clear();
 		wxsModuleRegistry.clear();
@@ -263,17 +278,26 @@ async function compileML(pages, root, progress) {
 	initWxsFilePathMap(getWorkPath());
 	for (const page of pages) {
 		const scriptRes = /* @__PURE__ */ new Map();
-		buildCompileView(page, false, scriptRes, [], /* @__PURE__ */ new Set());
+		buildCompileView(page, false, scriptRes, /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set());
 		let mergeRender = "";
 		for (const [key, value] of scriptRes.entries()) {
-			const { code: minifiedCode } = await transform(`modDefine('${key}', function(require, module, exports) {
+			const amdFormat = `modDefine('${key}', function(require, module, exports) {
 		${value}
-		});`, {
-				minify: true,
-				target: ["es2020"],
-				platform: "browser"
-			});
-			mergeRender += minifiedCode;
+		});`;
+			try {
+				const { code: minifiedCode } = await transform(amdFormat, {
+					minify: true,
+					target: ["es2020"],
+					platform: "browser"
+				});
+				mergeRender += minifiedCode;
+			} catch (error) {
+				const location = error.errors?.[0]?.location;
+				const sourceLines = amdFormat.split("\n");
+				const sourceHint = location?.line ? sourceLines.slice(Math.max(0, location.line - 3), location.line + 2).map((line, index) => `${Math.max(1, location.line - 2) + index}: ${line.trim()}`).join("\n") : "";
+				error.message = `视图模块 ${key} 转换失败: ${error.message}${sourceHint ? `\n${sourceHint}` : ""}`;
+				throw error;
+			}
 		}
 		scriptRes.clear();
 		const filename = `${page.path.replace(/\//g, "_")}`;
@@ -310,8 +334,8 @@ function scanWxsFiles(dir, workPath) {
 			const fullPath = path.join(dir, item);
 			const stat = fs.statSync(fullPath);
 			if (stat.isDirectory()) scanWxsFiles(fullPath, workPath);
-			else if (stat.isFile() && item.endsWith(".wxs")) {
-				const moduleName = fullPath.replace(workPath, "").replace(/\.wxs$/, "").replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
+			else if (stat.isFile() && getViewScriptExts().some((ext) => item.endsWith(ext))) {
+				const moduleName = stripViewScriptExt(fullPath.replace(workPath, "")).replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
 				wxsFilePathMap.set(moduleName, fullPath);
 			}
 		}
@@ -324,6 +348,17 @@ function scanWxsFiles(dir, workPath) {
 function registerWxsModule(modulePath) {
 	wxsModuleRegistry.add(modulePath);
 }
+function getTemplateCompilerOptions(scopeId) {
+	return {
+		prefixIdentifiers: true,
+		hoistStatic: false,
+		cacheHandlers: true,
+		scopeId,
+		mode: "function",
+		inline: true,
+		isCustomElement: (tag) => !tag.startsWith("dd-")
+	};
+}
 /**
 * 检查是否为已注册的 wxs 模块
 * @param {string} modulePath - 模块路径
@@ -332,17 +367,10 @@ function registerWxsModule(modulePath) {
 function isRegisteredWxsModule(modulePath) {
 	return wxsModuleRegistry.has(modulePath);
 }
-function buildCompileView(module, isComponent = false, scriptRes, depthChain = [], inheritedTemplatePaths = /* @__PURE__ */ new Set()) {
+function buildCompileView(module, isComponent = false, scriptRes, activePaths = /* @__PURE__ */ new Set(), inheritedTemplatePaths = /* @__PURE__ */ new Set()) {
 	const currentPath = module.path;
-	if (depthChain.includes(currentPath)) {
-		console.warn("[view]", `检测到循环依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-		return;
-	}
-	if (depthChain.length > 20) {
-		console.warn("[view]", `检测到深度依赖: ${[...depthChain, currentPath].join(" -> ")}`);
-		return;
-	}
-	depthChain = [...depthChain, currentPath];
+	if (activePaths.has(currentPath)) return;
+	activePaths.add(currentPath);
 	const allScriptModules = [];
 	const currentInstruction = compileModule(module, isComponent, scriptRes, { skipTemplatePaths: isComponent ? inheritedTemplatePaths : /* @__PURE__ */ new Set() });
 	if (currentInstruction && currentInstruction.scriptModule) allScriptModules.push(...currentInstruction.scriptModule);
@@ -351,11 +379,8 @@ function buildCompileView(module, isComponent = false, scriptRes, depthChain = [
 	if (module.usingComponents) for (const componentInfo of Object.values(module.usingComponents)) {
 		const componentModule = getComponent(componentInfo);
 		if (!componentModule) continue;
-		if (componentModule.path === module.path) {
-			console.warn("[view]", `检测到循环依赖，跳过处理: ${module.path}`);
-			continue;
-		}
-		const componentInstruction = buildCompileView(componentModule, true, scriptRes, depthChain, childInheritedTemplatePaths);
+		if (componentModule.path === module.path) continue;
+		const componentInstruction = buildCompileView(componentModule, true, scriptRes, activePaths, childInheritedTemplatePaths);
 		if (componentInstruction && componentInstruction.scriptModule) {
 			for (const sm of componentInstruction.scriptModule) if (!allScriptModules.find((existing) => existing.path === sm.path)) allScriptModules.push(sm);
 		}
@@ -364,6 +389,7 @@ function buildCompileView(module, isComponent = false, scriptRes, depthChain = [
 		for (const sm of allScriptModules) if (!scriptRes.has(sm.path)) scriptRes.set(sm.path, sm.code);
 		compileModuleWithAllWxs(module, scriptRes, allScriptModules);
 	}
+	activePaths.delete(currentPath);
 	return {
 		scriptModule: allScriptModules,
 		templateModule: currentInstruction?.templateModule || []
@@ -416,14 +442,7 @@ function compileModule(module, isComponent, scriptRes, options = {}) {
 		filename: module.path,
 		id: `data-v-${module.id}`,
 		scoped: true,
-		compilerOptions: {
-			prefixIdentifiers: true,
-			hoistStatic: false,
-			cacheHandlers: true,
-			scopeId: `data-v-${module.id}`,
-			mode: "function",
-			inline: true
-		}
+		compilerOptions: getTemplateCompilerOptions(`data-v-${module.id}`)
 	});
 	let tplComponents = "{";
 	for (const tm of compileInstruction.templateModule) {
@@ -432,14 +451,7 @@ function compileModule(module, isComponent, scriptRes, options = {}) {
 			filename: tm.path,
 			id: `data-v-${module.id}`,
 			scoped: true,
-			compilerOptions: {
-				prefixIdentifiers: true,
-				hoistStatic: false,
-				cacheHandlers: true,
-				scopeId: `data-v-${module.id}`,
-				mode: "function",
-				inline: true
-			}
+			compilerOptions: getTemplateCompilerOptions(`data-v-${module.id}`)
 		});
 		code = insertWxsToRenderCode(code, compileInstruction.scriptModule, scriptRes, tm.path);
 		tplComponents += `'${tm.path}':${code},`;
@@ -449,8 +461,12 @@ function compileModule(module, isComponent, scriptRes, options = {}) {
 	const code = `Module({
 		path: '${module.path}',
 		id: '${module.id}',
+		appStyleScopeId: ${JSON.stringify(module.appStyleScopeId || null)},
+		sharedStyleScopeIds: ${JSON.stringify(module.sharedStyleScopeIds || [])},
+		styleIsolation: ${JSON.stringify(module.styleIsolation || "isolated")},
 		render: ${transCode},
 		usingComponents: ${JSON.stringify(module.usingComponents)},
+		customTabBar: ${JSON.stringify(module.customTabBar || null)},
 		tplComponents: ${tplComponents},
 		});`;
 	const allWxsModules = collectAllWxsModules(scriptRes, /* @__PURE__ */ new Set(), compileInstruction.scriptModule || []);
@@ -523,7 +539,7 @@ function processWxsContent(wxsContent, wxsFilePath, scriptModule, workPath, file
 					if (filePath && filePath.includes("/miniprogram_npm/")) {
 						const currentWxsDir = path.dirname(wxsFilePath);
 						resolvedWxsPath = path.resolve(currentWxsDir, requirePath);
-						const moduleName = resolvedWxsPath.replace(workPath, "").replace(/\.wxs$/, "").replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
+						const moduleName = stripViewScriptExt(resolvedWxsPath.replace(workPath, "")).replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
 						processWxsDependency(resolvedWxsPath, moduleName, scriptModule, workPath, filePath);
 						replacements.push({
 							start: node.arguments[0].start,
@@ -533,7 +549,7 @@ function processWxsContent(wxsContent, wxsFilePath, scriptModule, workPath, file
 					} else {
 						const currentWxsDir = path.dirname(wxsFilePath);
 						resolvedWxsPath = path.resolve(currentWxsDir, requirePath);
-						const depModuleName = resolvedWxsPath.replace(workPath, "").replace(/\.wxs$/, "").replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
+						const depModuleName = stripViewScriptExt(resolvedWxsPath.replace(workPath, "")).replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
 						processWxsDependency(resolvedWxsPath, depModuleName, scriptModule, workPath, filePath);
 						replacements.push({
 							start: node.arguments[0].start,
@@ -601,14 +617,7 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
 		filename: module.path,
 		id: `data-v-${module.id}`,
 		scoped: true,
-		compilerOptions: {
-			prefixIdentifiers: true,
-			hoistStatic: false,
-			cacheHandlers: true,
-			scopeId: `data-v-${module.id}`,
-			mode: "function",
-			inline: true
-		}
+		compilerOptions: getTemplateCompilerOptions(`data-v-${module.id}`)
 	});
 	let tplComponents = "{";
 	for (const tm of mergedInstruction.templateModule) {
@@ -617,14 +626,7 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
 			filename: tm.path,
 			id: `data-v-${module.id}`,
 			scoped: true,
-			compilerOptions: {
-				prefixIdentifiers: true,
-				hoistStatic: false,
-				cacheHandlers: true,
-				scopeId: `data-v-${module.id}`,
-				mode: "function",
-				inline: true
-			}
+			compilerOptions: getTemplateCompilerOptions(`data-v-${module.id}`)
 		});
 		code = insertWxsToRenderCode(code, allScriptModules, scriptRes, tm.path);
 		tplComponents += `'${tm.path}':${code},`;
@@ -634,8 +636,12 @@ function compileModuleWithAllWxs(module, scriptRes, allScriptModules) {
 	const code = `Module({
 		path: '${module.path}',
 		id: '${module.id}',
+		appStyleScopeId: ${JSON.stringify(module.appStyleScopeId || null)},
+		sharedStyleScopeIds: ${JSON.stringify(module.sharedStyleScopeIds || [])},
+		styleIsolation: ${JSON.stringify(module.styleIsolation || "isolated")},
 		render: ${transCode},
 		usingComponents: ${JSON.stringify(module.usingComponents)},
+		customTabBar: ${JSON.stringify(module.customTabBar || null)},
 		tplComponents: ${tplComponents},
 		});`;
 	const cacheData = {
@@ -717,12 +723,13 @@ function toCompileTemplate(isComponent, path, components, componentPlaceholder,
 	const workPath = getWorkPath();
 	const fullPath = getViewPath(workPath, path);
 	if (!fullPath) return { tpl: void 0 };
+	const sourcePath = toMiniProgramModuleId(fullPath, workPath).replace(buildExtStripRegex(getTemplateExts()), "");
 	const diagnosticSource = fullPath.startsWith(workPath) ? fullPath.slice(workPath.length) : path;
 	let content = getContentByPath(fullPath).trim();
 	if (!content) content = "<block></block>";
 	else {
 		checkTemplateCompatibility(content, diagnosticSource, components);
-		if (isComponent) content = `<wrapper name="${path}">${content}</wrapper>`;
+		if (isComponent) content = `<component-host name="${path}">${content}</component-host>`;
 		else if (cheerio.load(content, {
 			xmlMode: true,
 			decodeEntities: false
@@ -740,8 +747,8 @@ function toCompileTemplate(isComponent, path, components, componentPlaceholder,
 	$("include").each((_, elem) => {
 		const src = $(elem).attr("src");
 		if (src) {
-			const includeFullPath = getAbsolutePath(workPath, path, src);
-			let includePath = includeFullPath.replace(workPath, "").replace(/\.(wxml|ddml)$/, "");
+			const includeFullPath = resolveTemplateDependencyPath(workPath, sourcePath, src);
+			let includePath = includeFullPath.replace(workPath, "").replace(buildExtStripRegex(getTemplateExts()), "");
 			const includeDiagnosticSource = includeFullPath.startsWith(workPath) ? includeFullPath.slice(workPath.length) : includePath;
 			if (!includePath.startsWith("/")) includePath = "/" + includePath;
 			const includeContent = getContentByPath(includeFullPath).trim();
@@ -755,21 +762,20 @@ function toCompileTemplate(isComponent, path, components, componentPlaceholder,
 				transTagWxs($includeContent, scriptModule, includePath);
 				processIncludedFileWxsDependencies(includeContent, includePath, scriptModule, components, processedPaths);
 				$includeContent("template").remove();
-				$includeContent("wxs").remove();
-				$includeContent("dds").remove();
+				$includeContent(getViewScriptTags().join(",")).remove();
 				const processedContent = processIncludeConditionalAttrs($, elem, $includeContent.html());
 				$(elem).replaceWith(processedContent);
 			} else $(elem).remove();
 		} else $(elem).remove();
 	});
-	transTagTemplate($, templateModule, path, components, componentPlaceholder);
-	transTagWxs($, scriptModule, path);
+	transTagTemplate($, templateModule, sourcePath, components, componentPlaceholder);
+	transTagWxs($, scriptModule, sourcePath);
 	const importNodes = $("import");
 	importNodes.each((_, elem) => {
 		const src = $(elem).attr("src");
 		if (src) {
-			const importFullPath = getAbsolutePath(workPath, path, src);
-			let importPath = importFullPath.replace(workPath, "").replace(/\.(wxml|ddml)$/, "");
+			const importFullPath = resolveTemplateDependencyPath(workPath, sourcePath, src);
+			let importPath = importFullPath.replace(workPath, "").replace(buildExtStripRegex(getTemplateExts()), "");
 			const importDiagnosticSource = importFullPath.startsWith(workPath) ? importFullPath.slice(workPath.length) : importPath;
 			if (!importPath.startsWith("/")) importPath = "/" + importPath;
 			const importContent = getContentByPath(importFullPath).trim();
@@ -779,14 +785,14 @@ function toCompileTemplate(isComponent, path, components, componentPlaceholder,
 					xmlMode: true,
 					decodeEntities: false
 				});
-				transTagTemplate($$, templateModule, path, components, componentPlaceholder);
+				transTagTemplate($$, templateModule, importPath, components, componentPlaceholder);
 				transTagWxs($$, scriptModule, importPath);
 				processIncludedFileWxsDependencies(importContent, importPath, scriptModule, components, processedPaths);
 			}
 		}
 	});
 	importNodes.remove();
-	transAsses($, $("image"), path);
+	transAsses($, $("image"), sourcePath);
 	const res = [];
 	transHtmlTag($.html(), res, components, componentPlaceholder);
 	return {
@@ -804,8 +810,7 @@ function transTagTemplate($, templateModule, path, components, componentPlacehol
 		const templateContent = $(elem);
 		templateContent.find("import").remove();
 		templateContent.find("include").remove();
-		templateContent.find("wxs").remove();
-		templateContent.find("dds").remove();
+		templateContent.find(getViewScriptTags().join(",")).remove();
 		transAsses($, templateContent.find("image"), path);
 		const res = [];
 		transHtmlTag(templateContent.html(), res, components, componentPlaceholder);
@@ -822,6 +827,72 @@ function transAsses($, imageNodes, path) {
 		if (!imgSrc.startsWith("{{")) $(elem).attr("src", collectAssets(getWorkPath(), path, imgSrc, getTargetPath(), getAppId()));
 	});
 }
+var DIMINA_SLOT_GROUP_TAG = "dimina-slot-group";
+var DIMINA_FOR_SCOPE_TAG = "dimina-for-scope";
+function getDirectiveAttributeNames(attrs, suffixes) {
+	return Object.keys(attrs || {}).filter((name) => suffixes.some((suffix) => name.endsWith(suffix)));
+}
+function hasForAndIf(attrs) {
+	return getDirectiveAttributeNames(attrs, [":for", ":for-items"]).length > 0 && getDirectiveAttributeNames(attrs, [":if"]).length > 0;
+}
+function groupDuplicateNamedSlots($, components) {
+	const slotHosts = $("*").toArray().filter((element) => {
+		const tag = element.tagName;
+		return tag === "component" || Boolean(components?.[tag]);
+	});
+	for (const host of slotHosts) {
+		const groups = /* @__PURE__ */ new Map();
+		for (const child of $(host).children().toArray()) {
+			const slotName = child.attribs?.slot;
+			if (!slotName) continue;
+			const group = groups.get(slotName) || [];
+			group.push(child);
+			groups.set(slotName, group);
+		}
+		for (const [slotName, nodes] of groups) {
+			if (nodes.length === 1 && !hasForAndIf(nodes[0].attribs)) continue;
+			const wrapper = $(`<${DIMINA_SLOT_GROUP_TAG}></${DIMINA_SLOT_GROUP_TAG}>`);
+			wrapper.attr("name", slotName);
+			$(nodes[0]).before(wrapper);
+			for (const node of nodes) {
+				$(node).removeAttr("slot");
+				wrapper.append(node);
+			}
+		}
+	}
+}
+function wrapForIfScopes($) {
+	const nodes = $("*").toArray();
+	for (const node of nodes) {
+		if (node.tagName === DIMINA_FOR_SCOPE_TAG || !hasForAndIf(node.attribs)) continue;
+		const attrsToMove = getDirectiveAttributeNames(node.attribs, [
+			":for",
+			":for-items",
+			":for-item",
+			":for-index",
+			":key"
+		]);
+		const wrapper = $(`<${DIMINA_FOR_SCOPE_TAG}></${DIMINA_FOR_SCOPE_TAG}>`);
+		for (const name of attrsToMove) {
+			wrapper.attr(name, node.attribs[name]);
+			$(node).removeAttr(name);
+		}
+		$(node).before(wrapper);
+		wrapper.append(node);
+	}
+}
+function normalizeTemplateSyntax(html, components) {
+	const $ = cheerio.load(html, {
+		xmlMode: true,
+		decodeEntities: false,
+		_useHtmlParser2: true,
+		lowerCaseTags: false,
+		lowerCaseAttributeNames: false
+	});
+	groupDuplicateNamedSlots($, components);
+	wrapForIfScopes($);
+	return $.html();
+}
 function transHtmlTag(html, res, components, componentPlaceholder) {
 	const attrsList = [];
 	const parser = new htmlparser2.Parser({
@@ -849,7 +920,7 @@ function transHtmlTag(html, res, components, componentPlaceholder) {
 			console.error(error);
 		}
 	}, { xmlMode: true });
-	parser.write(html);
+	parser.write(normalizeTemplateSyntax(html, components));
 	parser.end();
 }
 /**
@@ -859,11 +930,15 @@ function transHtmlTag(html, res, components, componentPlaceholder) {
 function transTag(opts) {
 	const { isStart, tag, attrs, components } = opts;
 	let res;
-	if (tag === "slot") res = tag;
+	if (tag === DIMINA_SLOT_GROUP_TAG) {
+		if (isStart) return `<template ${generateSlotDirective(attrs.name)}>`;
+		return "</template>";
+	} else if (tag === DIMINA_FOR_SCOPE_TAG) res = "template";
+	else if (tag === "slot") res = tag;
 	else if (components && components[tag]) res = `dd-${tag}`;
 	else if (tag === "component" || tag === "canvas") res = tag;
-	else if (!tagWhiteList.includes(tag)) res = "dd-text";
-	else res = `dd-${tag}`;
+	else if (tagWhiteList.includes(tag)) res = `dd-${tag}`;
+	else res = tag;
 	let tagRes;
 	const propsAry = isStart ? getProps(attrs, tag, components) : [];
 	const multipleSlots = attrs?.slot;
@@ -908,7 +983,17 @@ function generateSlotDirective(slotValue) {
 */
 function getProps(attrs, tag, components) {
 	const attrsList = [];
+	const isCustomComponent = Boolean(components && components[tag]);
 	const propBindings = {};
+	const hasEventBindings = Object.keys(attrs).some((name) => /^(?:capture-)?(?:bind|catch)(?::)?.+/.test(name));
+	if (tag === "page-meta") attrsList.push({
+		name: "dimina-rpx-unit",
+		value: "vw"
+	});
+	if (hasEventBindings) attrsList.push({
+		name: "v-c-event-node",
+		value: components && components[tag] ? "'component'" : "'node'"
+	});
 	Object.entries(attrs).forEach(([name, value]) => {
 		if (name.endsWith(":if")) attrsList.push({
 			name: "v-if",
@@ -932,11 +1017,20 @@ function getProps(attrs, tag, components) {
 				name: ":key",
 				value: tranValue
 			});
-		} else if (name === "style") attrsList.push({
-			name: "v-c-style",
-			value: transformRpx(parseSafeBraceExp(value))
-		});
-		else if (name === "class") {
+		} else if (name === "style") {
+			const parsedStyle = parseSafeBraceExp(value);
+			attrsList.push({
+				name: "v-c-style",
+				value: transformRpx(parsedStyle)
+			});
+			if (isCustomComponent) {
+				attrsList.push({
+					name: ":dimina-wxml-style",
+					value: parsedStyle
+				});
+				if (isWrappedByBraces(value) && parsedStyle) propBindings.style = parsedStyle;
+			}
+		} else if (name === "class") {
 			if (isWrappedByBraces(value)) attrsList.push({
 				name: ":class",
 				value: parseClassRules(value)
@@ -988,7 +1082,7 @@ function getProps(attrs, tag, components) {
 		});
 		else if (isWrappedByBraces(value)) {
 			const pVal = tag === "template" && name === "data" ? parseTemplateDataExp(value) : parseSafeBraceExp(value);
-			if (components && components[tag]) {
+			if (isCustomComponent) {
 				if (pVal && typeof pVal === "string") propBindings[name] = pVal;
 			}
 			attrsList.push({
@@ -1007,7 +1101,7 @@ function getProps(attrs, tag, components) {
 		else if (/\$\{[^}]*\}/.test(value)) propsRes.push(`:${name}="\`${value}\`"`);
 		else propsRes.push(`${name}="${escapeQuotes(value)}"`);
 	});
-	if (components && components[tag] && Object.keys(propBindings).length > 0) try {
+	if (isCustomComponent && Object.keys(propBindings).length > 0) try {
 		const validBindings = {};
 		for (const [key, value] of Object.entries(propBindings)) if (value !== void 0 && value !== null && typeof value === "string") validBindings[key] = value;
 		if (Object.keys(validBindings).length > 0) {
@@ -1071,7 +1165,7 @@ function parseKeyExpression(exp, itemName = "item", indexName = "index") {
 */
 function getViewPath(workPath, src) {
 	const aSrc = src.startsWith("/") ? src : `/${src}`;
-	for (const mlType of fileType) {
+	for (const mlType of getTemplateExts()) {
 		const mlFullPath = `${workPath}${aSrc}${mlType}`;
 		if (fs.existsSync(mlFullPath)) return mlFullPath;
 		const indexMlFullPath = `${workPath}${aSrc}/index${mlType}`;
@@ -1079,6 +1173,20 @@ function getViewPath(workPath, src) {
 	}
 }
 /**
+* 解析 import/include 的模板文件路径。
+* 微信允许省略 .wxml；显式扩展名保持原样，无扩展名时按当前模板类型优先级补全。
+*/
+function resolveTemplateDependencyPath(workPath, ownerPath, src) {
+	const resolvedPath = getAbsolutePath(workPath, ownerPath, src);
+	if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) return resolvedPath;
+	if (path.extname(resolvedPath)) return resolvedPath;
+	for (const ext of getTemplateExts()) {
+		const candidate = `${resolvedPath}${ext}`;
+		if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) return candidate;
+	}
+	return resolvedPath;
+}
+/**
 * 将字符串内部的双引号进行替换
 * @param {*} input
 */
@@ -1119,7 +1227,7 @@ function splitWithBraces(str) {
 function parseClassRules(cssRule) {
 	let list = splitWithBraces(cssRule);
 	list = list.map((item) => {
-		return parseBraceExp(item);
+		return parseSafeBraceExp(item);
 	});
 	if (list.length === 1) return list.pop();
 	return `[${list.join(",")}]`;
@@ -1147,11 +1255,16 @@ function getForIndexName(attrs) {
 * @param {*} attrs
 */
 function parseForExp(exp, attrs) {
-	return `(${getForItemName(attrs)}, ${getForIndexName(attrs)}) in ${parseBraceExp(exp)}`;
+	return `(${getForItemName(attrs)}, ${getForIndexName(attrs)}) in ${parseSafeBraceExp(exp)}`;
 }
 var braceRegex = /(\{\{(?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})*\}\})|([^{}]+)/g;
 var noBraceRegex = /\{\{((?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})*)\}\}/;
 var ternaryRegex = /[^?]+\?.+:.+/;
+var RESERVED_TEMPLATE_CONTEXT_ALIASES = /* @__PURE__ */ new Map([["class", "__dimina_reserved_class"]]);
+var RESERVED_TEMPLATE_CONTEXT_NAMES = new Map([...RESERVED_TEMPLATE_CONTEXT_ALIASES].map(([name, alias]) => [alias, name]));
+function encodeReservedTemplateContextIdentifier(expression) {
+	return RESERVED_TEMPLATE_CONTEXT_ALIASES.get(expression) || expression;
+}
 /**
 * 解析 {{}} 表达式的值
 * @param {*} exp
@@ -1163,7 +1276,7 @@ function parseBraceExp(exp) {
 		if (result[1]) {
 			const matchResult = result[1].match(noBraceRegex);
 			if (matchResult) {
-				const statement = matchResult[1].trim();
+				const statement = encodeReservedTemplateContextIdentifier(matchResult[1].trim());
 				if (ternaryRegex.test(statement)) group.push(`(${statement})`);
 				else group.push(statement);
 			}
@@ -1179,12 +1292,11 @@ function parseBraceExp(exp) {
 */
 function parseTemplateDataExp(exp) {
 	const matchResult = exp.trim().match(/^\{\{([\s\S]*)\}\}$/);
-	if (matchResult) return `{${matchResult[1].trim()}}`;
-	return `{${parseBraceExp(exp)}}`;
+	if (matchResult) return addOptionalChaining(`{${matchResult[1].trim()}}`);
+	return `{${parseSafeBraceExp(exp)}}`;
 }
 function transTagWxs($, scriptModule, filePath) {
-	let wxsNodes = $("wxs");
-	if (wxsNodes.length === 0) wxsNodes = $("dds");
+	const wxsNodes = $(getViewScriptTags().join(","));
 	wxsNodes.each((_, elem) => {
 		const smName = $(elem).attr("module");
 		if (smName) {
@@ -1200,7 +1312,7 @@ function transTagWxs($, scriptModule, filePath) {
 					wxsFilePath = path.resolve(componentFullPath, src);
 				} else wxsFilePath = getAbsolutePath(workPath, filePath, src);
 				if (wxsFilePath) {
-					uniqueModuleName = wxsFilePath.replace(workPath, "").replace(/\.wxs$/, "").replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
+					uniqueModuleName = stripViewScriptExt(wxsFilePath.replace(workPath, "")).replace(/[\/\\@\-]/g, "_").replace(/^_/, "");
 					cacheKey = wxsFilePath;
 				}
 			}
@@ -1248,7 +1360,7 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
 			});
 			const dependencies = extractWxsDependencies(moduleCode);
 			for (const depPath of dependencies) if (!collectedPaths.has(depPath)) if (scriptRes.has(depPath)) {
-				const depModules = collectAllWxsModules(new Map([[depPath, scriptRes.get(depPath)]]), collectedPaths, scriptModule);
+				const depModules = collectAllWxsModules(/* @__PURE__ */ new Map([[depPath, scriptRes.get(depPath)]]), collectedPaths, scriptModule);
 				allWxsModules.push(...depModules);
 			} else {
 				const loaded = loadWxsModule(depPath, workPath, scriptModule);
@@ -1256,7 +1368,7 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
 					scriptRes.set(depPath, loaded.code);
 					allWxsModules.push(loaded);
 					collectedPaths.add(depPath);
-					const depModules = collectAllWxsModules(new Map([[depPath, loaded.code]]), collectedPaths, scriptModule);
+					const depModules = collectAllWxsModules(/* @__PURE__ */ new Map([[depPath, loaded.code]]), collectedPaths, scriptModule);
 					allWxsModules.push(...depModules);
 				}
 			}
@@ -1272,12 +1384,8 @@ function collectAllWxsModules(scriptRes, collectedPaths = /* @__PURE__ */ new Se
 * @returns {Object|null} 加载的模块对象或 null
 */
 function loadWxsModule(modulePath, workPath, scriptModule) {
-	if (!modulePath.startsWith("miniprogram_npm__") || !modulePath.includes("_wxs_")) return null;
 	const wxsFilePath = wxsFilePathMap.get(modulePath);
-	if (!wxsFilePath) {
-		console.warn(`[view] 无法找到 wxs 模块文件: ${modulePath}`);
-		return null;
-	}
+	if (!wxsFilePath) return null;
 	try {
 		const wxsContent = getContentByPath(wxsFilePath).trim();
 		if (!wxsContent) return null;
@@ -1325,8 +1433,7 @@ function insertWxsToRenderCode(code, scriptModule, scriptRes, filename = "render
 		});
 		declarations.push(`const ${localIdentifier} = require(${JSON.stringify(requireModuleName)});`);
 	}
-	if (wxsBindings.length === 0) return getProgramCode(code, ast);
-	if (renderBody?.type === "BlockStatement") codeReplacements.push({
+	if (wxsBindings.length > 0 && renderBody?.type === "BlockStatement") codeReplacements.push({
 		type: "insert",
 		start: renderBody.start + 1,
 		end: renderBody.start + 1,
@@ -1334,6 +1441,15 @@ function insertWxsToRenderCode(code, scriptModule, scriptRes, filename = "render
 	});
 	walk(ast, { enter(node) {
 		if (node.type === "MemberExpression" && node.object?.type === "Identifier" && node.object.name === "_ctx" && !node.computed && node.property?.type === "Identifier") {
+			const reservedName = RESERVED_TEMPLATE_CONTEXT_NAMES.get(node.property.name);
+			if (reservedName) {
+				codeReplacements.push({
+					start: node.property.start,
+					end: node.property.end,
+					value: reservedName
+				});
+				return;
+			}
 			const replacement = wxsBindings.find((item) => item.templatePropertyName === node.property.name);
 			if (replacement) codeReplacements.push({
 				start: node.start,
@@ -1342,8 +1458,9 @@ function insertWxsToRenderCode(code, scriptModule, scriptRes, filename = "render
 			});
 		}
 	} });
+	if (codeReplacements.length === 0) return getProgramCode(code, ast);
 	const transformed = applyCodeReplacements(code, codeReplacements);
 	return getProgramCode(transformed, parseJs(transformed, filename));
 }
 //#endregion
-export { compileML, generateSlotDirective, generateVModelTemplate, parseBraceExp, parseClassRules, parseKeyExpression, parseTemplateDataExp, processIncludeConditionalAttrs, processWxsContent, splitWithBraces };
+export { compileML, generateSlotDirective, generateVModelTemplate, initWxsFilePathMap, loadWxsModule, normalizeTemplateSyntax, parseBraceExp, parseClassRules, parseKeyExpression, parseTemplateDataExp, processIncludeConditionalAttrs, processWxsContent, splitWithBraces };