@wevu/compiler 6.11.1 → 6.11.4

package/dist/index.d.mts

@@ -231,6 +231,7 @@ interface TemplateCompileResult {
   classStyleBindings?: ClassStyleBinding[];
   classStyleWxs?: boolean;
   templateRefs?: TemplateRefBinding[];
+  layoutHosts?: LayoutHostBinding[];
   inlineExpressions?: InlineExpressionAsset[];
 }
 /**
@@ -295,6 +296,15 @@ interface TemplateRefBinding {
   expAst?: Expression;
   kind?: 'component' | 'element';
 }
+/**
+ * layout 宿主绑定信息。
+ */
+interface LayoutHostBinding {
+  key: string;
+  refName?: string;
+  selector: string;
+  kind?: 'component';
+}
 //#endregion
 //#region src/types/platform.d.ts
 /**
@@ -621,6 +631,10 @@ interface TransformScriptOptions {
    * template ref 元数据（用于运行时绑定）
    */
   templateRefs?: TemplateRefBinding[];
+  /**
+   * layout host 元数据（用于运行时绑定）
+   */
+  layoutHosts?: LayoutHostBinding[];
   /**
    * 内联表达式元数据（用于事件处理）
    */

package/dist/index.mjs

@@ -385,8 +385,8 @@ function getWevuConfigCacheRoot() {
 	const env = process.env.WEAPP_VITE_WEVU_CONFIG_DIR?.trim();
 	if (env) return path.resolve(env);
 	const cwd = process.cwd();
-	const nodeModulesDir = path.join(cwd, "node_modules");
-	if (fs$1.existsSync(nodeModulesDir)) return path.join(nodeModulesDir, ".cache", "weapp-vite", "wevu-config");
+	const projectCacheDir = path.join(cwd, ".wevu-config");
+	if (fs$1.existsSync(cwd)) return projectCacheDir;
 	return path.join(os.tmpdir(), "weapp-vite", "wevu-config");
 }
 function resolveWevuConfigTempDir(fromDir) {
@@ -414,7 +414,10 @@ async function evaluateScriptSetupJsonMacro(params) {
 	const { originalContent, filename, lang, macroName, macroStatements, bodyPaths, keptStatementPaths, options } = params;
 	const ms = new MagicString(originalContent);
 	const dir = path.dirname(filename);
-	const tempDir = resolveWevuConfigTempDir(dir);
+	const tempRoot = resolveWevuConfigTempDir(dir);
+	const basename = path.basename(filename, path.extname(filename));
+	const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
+	const tempDir = path.join(tempRoot, `${basename}.json-macro.${unique}`);
 	for (const statementPath of keptStatementPaths) {
 		if (!statementPath.isImportDeclaration()) continue;
 		const sourceNode = statementPath.node.source;
@@ -444,10 +447,8 @@ const __weapp_defineSitemapJson = (config) => (__weapp_json_macro_values.push(co
 const __weapp_defineThemeJson = (config) => (__weapp_json_macro_values.push(config), config)
 `.trimStart() + ms.toString() + `\nexport default __weapp_json_macro_values\n`;
 	const extension = resolveScriptSetupExtension$1(lang);
-	return await withTempDirLock(tempDir, async () => {
+	return await withTempDirLock(tempRoot, async () => {
 		await fs.ensureDir(tempDir);
-		const basename = path.basename(filename, path.extname(filename));
-		const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
 		const tempFile = path.join(tempDir, `${basename}.json-macro.${unique}.${extension}`);
 		await fs.writeFile(tempFile, evalSource, "utf8");
 		try {
@@ -477,10 +478,7 @@ const __weapp_defineThemeJson = (config) => (__weapp_json_macro_values.push(conf
 			};
 		} finally {
 			try {
-				await fs.remove(tempFile);
-			} catch {}
-			try {
-				if ((await fs.readdir(tempDir)).length === 0) await fs.remove(tempDir);
+				await fs.remove(tempDir);
 			} catch {}
 		}
 	});
@@ -2555,6 +2553,37 @@ function injectInlineExpressions(componentExpr, inlineExpressions) {
 	return false;
 }
 //#endregion
+//#region src/plugins/vue/transform/transformScript/rewrite/layoutHosts.ts
+function buildLayoutHostEntry(binding) {
+	const props = [t.objectProperty(t.identifier("key"), t.stringLiteral(binding.key))];
+	if (binding.refName) props.push(t.objectProperty(t.identifier("refName"), t.stringLiteral(binding.refName)));
+	props.push(t.objectProperty(t.identifier("selector"), t.stringLiteral(binding.selector)));
+	if (binding.kind) props.push(t.objectProperty(t.identifier("kind"), t.stringLiteral(binding.kind)));
+	return t.objectExpression(props);
+}
+function injectLayoutHosts(optionsObject, bindings, warn) {
+	if (!bindings.length) return false;
+	const warnHandler = resolveWarnHandler(warn);
+	const entries = bindings.map((binding) => buildLayoutHostEntry(binding));
+	const hostsArray = t.arrayExpression(entries);
+	const key = createStaticObjectKey$1("__wevuLayoutHosts");
+	const existing = getObjectPropertyByKey$1(optionsObject, "__wevuLayoutHosts");
+	if (!existing) {
+		optionsObject.properties.push(t.objectProperty(key, hostsArray));
+		return true;
+	}
+	if (t.isArrayExpression(existing.value)) {
+		existing.value.elements.push(...entries);
+		return true;
+	}
+	if (t.isIdentifier(existing.value) || t.isMemberExpression(existing.value)) {
+		existing.value = t.arrayExpression([...entries, t.spreadElement(t.cloneNode(existing.value, true))]);
+		return true;
+	}
+	warnHandler("无法自动注入 layout host 元数据，请手动合并 __wevuLayoutHosts。");
+	return false;
+}
+//#endregion
 //#region src/plugins/vue/transform/transformScript/rewrite/setupInitialData.ts
 function unwrapExpression(node) {
 	if (t.isTSAsExpression(node) || t.isTSSatisfiesExpression(node) || t.isTSNonNullExpression(node) || t.isTypeCastExpression(node) || t.isParenthesizedExpression(node)) return unwrapExpression(node.expression);
@@ -2817,6 +2846,9 @@ function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializ
 	const templateRefs = options?.templateRefs ?? [];
 	if (templateRefs.length) if (componentOptionsObject) transformed = injectTemplateRefs(componentOptionsObject, templateRefs, warn) || transformed;
 	else warn("无法自动注入 template ref 元数据：组件选项不是对象字面量。");
+	const layoutHosts = options?.layoutHosts ?? [];
+	if (layoutHosts.length) if (componentOptionsObject) transformed = injectLayoutHosts(componentOptionsObject, layoutHosts, warn) || transformed;
+	else warn("无法自动注入 layout host 元数据：组件选项不是对象字面量。");
 	const inlineExpressions = options?.inlineExpressions ?? [];
 	if (inlineExpressions.length) if (componentOptionsObject) {
 		const injected = injectInlineExpressions(componentOptionsObject, inlineExpressions);
@@ -5811,15 +5843,25 @@ function collectElementAttributes(node, context, options) {
 	const isComponentElement = options?.isComponent ?? !isBuiltinTag(node.tag);
 	const attrs = options?.extraAttrs ? [...options.extraAttrs] : [];
 	let staticClass;
+	let staticId;
 	let dynamicClassExp;
 	let staticStyle;
 	let dynamicStyleExp;
 	let vShowExp;
 	let vTextExp;
 	let templateRef;
+	let layoutHostKey;
+	let hasDynamicIdBinding = false;
 	const inFor = Boolean(options?.forInfo || context.forStack.length);
 	for (const prop of props) {
 		if (prop.type === NodeTypes.ATTRIBUTE) {
+			if (prop.name === "layout-host") {
+				const rawKey = prop.value?.type === NodeTypes.TEXT ? prop.value.content.trim() : "";
+				if (!isComponentElement) context.warnings.push("layout-host 仅支持声明在组件节点上，当前节点已忽略。");
+				else if (!rawKey) context.warnings.push("layout-host 需要提供非空字符串 key。");
+				else layoutHostKey = rawKey;
+				continue;
+			}
 			if (prop.name === "ref") {
 				if (prop.value?.type === NodeTypes.TEXT) {
 					const name = prop.value.content.trim();
@@ -5831,6 +5873,10 @@ function collectElementAttributes(node, context, options) {
 				staticClass = prop.value.content;
 				continue;
 			}
+			if (prop.name === "id" && prop.value?.type === NodeTypes.TEXT) {
+				staticId = prop.value.content.trim();
+				continue;
+			}
 			if (prop.name === "style" && prop.value?.type === NodeTypes.TEXT) {
 				staticStyle = prop.value.content;
 				continue;
@@ -5849,6 +5895,11 @@ function collectElementAttributes(node, context, options) {
 				}
 				continue;
 			}
+			if (prop.name === "bind" && prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "id") hasDynamicIdBinding = true;
+			if (prop.name === "bind" && prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "layout-host") {
+				context.warnings.push("暂不支持动态 layout-host，已忽略该绑定。");
+				continue;
+			}
 			if (prop.name === "bind" && prop.arg?.type === NodeTypes.SIMPLE_EXPRESSION && prop.arg.content === "class" && prop.exp?.type === NodeTypes.SIMPLE_EXPRESSION) {
 				dynamicClassExp = prop.exp.content;
 				continue;
@@ -5881,6 +5932,26 @@ function collectElementAttributes(node, context, options) {
 			kind: isComponentElement ? "component" : "element"
 		});
 	}
+	if (layoutHostKey) if (!staticId && hasDynamicIdBinding) context.warnings.push("layout-host 暂不支持与动态 id 同时使用，当前节点已忽略。");
+	else {
+		const hostIndex = context.layoutHostIndexSeed++;
+		const hostId = staticId || `__wv-layout-host-${hostIndex}`;
+		const hostRefName = `__wevu_layout_host_${hostIndex}`;
+		staticId = hostId;
+		context.templateRefs.push({
+			selector: `#${hostId}`,
+			inFor: false,
+			name: hostRefName,
+			kind: "component"
+		});
+		context.layoutHosts.push({
+			key: layoutHostKey,
+			refName: hostRefName,
+			selector: `#${hostId}`,
+			kind: "component"
+		});
+	}
+	if (staticId) attrs.unshift(`id="${staticId}"`);
 	const classAttr = renderClassAttribute(staticClass, dynamicClassExp, context);
 	if (classAttr) attrs.unshift(classAttr);
 	const styleAttr = renderStyleAttribute(staticStyle, dynamicStyleExp, vShowExp, context);
@@ -6547,6 +6618,8 @@ function compileVueTemplateToWxml(template, filename, options) {
 			forIndexSeed: 0,
 			templateRefs: [],
 			templateRefIndexSeed: 0,
+			layoutHosts: [],
+			layoutHostIndexSeed: 0,
 			inlineExpressions: [],
 			inlineExpressionSeed: 0
 		};
@@ -6564,6 +6637,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			result.classStyleRuntime = context.classStyleRuntime;
 		}
 		if (context.templateRefs.length) result.templateRefs = context.templateRefs;
+		if (context.layoutHosts.length) result.layoutHosts = context.layoutHosts;
 		if (context.inlineExpressions.length) result.inlineExpressions = context.inlineExpressions;
 		return result;
 	} catch (error) {
@@ -6604,11 +6678,12 @@ function resolveJsLikeLang(lang) {
 async function evaluateJsLikeConfig(source, filename, lang) {
 	const dir = path.dirname(filename);
 	const extension = resolveJsLikeLang(lang) === "ts" ? "ts" : "js";
-	const tempDir = resolveWevuConfigTempDir(dir);
-	return await withTempDirLock(tempDir, async () => {
+	const tempRoot = resolveWevuConfigTempDir(dir);
+	const basename = path.basename(filename, path.extname(filename));
+	const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
+	const tempDir = path.join(tempRoot, `${basename}.config.${unique}`);
+	return await withTempDirLock(tempRoot, async () => {
 		await fs.ensureDir(tempDir);
-		const basename = path.basename(filename, path.extname(filename));
-		const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
 		const tempFile = path.join(tempDir, `${basename}.${unique}.${extension}`);
 		const rewritten = rewriteJsLikeImportsForTempDir(source, dir, tempDir);
 		await fs.writeFile(tempFile, rewritten, "utf8");
@@ -6624,10 +6699,7 @@ async function evaluateJsLikeConfig(source, filename, lang) {
 			throw new Error("配置块必须导出对象或返回对象的函数。");
 		} finally {
 			try {
-				await fs.remove(tempFile);
-			} catch {}
-			try {
-				if ((await fs.readdir(tempDir)).length === 0) await fs.remove(tempDir);
+				await fs.remove(tempDir);
 			} catch {}
 		}
 	});
@@ -6929,7 +7001,10 @@ async function evaluateDefineOptionsValues(params) {
 	const { content, filename, lang, statements } = params;
 	const ms = new MagicString(content);
 	const dir = path.dirname(filename);
-	const tempDir = resolveWevuConfigTempDir(dir);
+	const tempRoot = resolveWevuConfigTempDir(dir);
+	const basename = path.basename(filename, path.extname(filename));
+	const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
+	const tempDir = path.join(tempRoot, `${basename}.define-options.${unique}`);
 	const programPath = statements[0]?.statementPath.parentPath;
 	if (!programPath) return {
 		values: [],
@@ -6969,10 +7044,8 @@ const __weapp_defineOptions = (value) => (__weapp_define_options_values.push(val
 	const evalSource = `${header + ms.toString() + (scopeFooter ? `\n${scopeFooter}\n` : "\n")}export const __weapp_define_scope = __weapp_define_scope_values\n
 export const __weapp_define_options = __weapp_define_options_values
 `;
-	return await withTempDirLock(tempDir, async () => {
+	return await withTempDirLock(tempRoot, async () => {
 		await fs.ensureDir(tempDir);
-		const basename = path.basename(filename, path.extname(filename));
-		const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
 		const tempFile = path.join(tempDir, `${basename}.define-options.${unique}.${extension}`);
 		await fs.writeFile(tempFile, evalSource, "utf8");
 		try {
@@ -6988,10 +7061,7 @@ export const __weapp_define_options = __weapp_define_options_values
 			};
 		} finally {
 			try {
-				await fs.remove(tempFile);
-			} catch {}
-			try {
-				if ((await fs.readdir(tempDir)).length === 0) await fs.remove(tempDir);
+				await fs.remove(tempDir);
 			} catch {}
 		}
 	});
@@ -7278,6 +7348,7 @@ async function compileScriptPhase(descriptor, descriptorForCompile, filename, op
 			classStyleRuntime: templateCompiled?.classStyleRuntime,
 			classStyleBindings: templateCompiled?.classStyleBindings,
 			templateRefs: templateCompiled?.templateRefs,
+			layoutHosts: templateCompiled?.layoutHosts,
 			inlineExpressions: templateCompiled?.inlineExpressions,
 			relaxStructuredTypeOnlyProps
 		}).code,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.11.1",
+  "version": "6.11.4",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -50,8 +50,8 @@
     "pathe": "^2.0.3",
     "vue": "^3.5.30",
     "@weapp-core/shared": "3.0.2",
-    "@weapp-vite/ast": "6.11.1",
-    "rolldown-require": "2.0.8"
+    "@weapp-vite/ast": "6.11.4",
+    "rolldown-require": "2.0.9"
   },
   "publishConfig": {
     "access": "public",