@wevu/compiler 6.16.8 → 6.16.9

package/dist/index.d.mts

@@ -217,8 +217,6 @@ interface ScopedSlotComponentAsset {
   classStyleBindings?: ClassStyleBinding[];
   classStyleWxs?: boolean;
   inlineExpressions?: InlineExpressionAsset[];
-  ownerKeys?: string[];
-  ownerPropsExpression?: string;
 }
 /**
  * 内联表达式资源描述。

package/dist/index.mjs

@@ -13,7 +13,7 @@ import os from "node:os";
 import process from "node:process";
 import { collectFeatureFlagsFromCode, collectJsxImportedComponentsAndDefaultExportFromBabelAst, collectJsxTemplateTagsFromBabelExpression, getRenderPropertyFromComponentOptions, parseJsLikeWithEngine, resolveRenderExpressionFromComponentOptions, toStaticObjectKey, unwrapTypeScriptExpression } from "@weapp-vite/ast";
 import { LRUCache } from "lru-cache";
-import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_GENERIC_SLOT_OWNER_DATA_KEY, WEVU_GENERIC_SLOT_OWNER_ID_ATTR, WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR, WEVU_GENERIC_SLOT_PROPS_ATTR, WEVU_GENERIC_SLOT_PROPS_DATA_ATTR, WEVU_GENERIC_SLOT_PROPS_DATA_KEY, WEVU_GENERIC_SLOT_SCOPE_ATTR, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_KEY, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
+import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ATTR, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
 import { compileScript, parse } from "vue/compiler-sfc";
 import { fileURLToPath } from "node:url";
 import { parse as parse$1 } from "@vue/compiler-dom";
@@ -3145,11 +3145,11 @@ function normalizeJsxText(value) {
 function printExpression(exp) {
 	return generate(exp).code;
 }
-function unwrapTsExpression$3(exp) {
+function unwrapTsExpression$2(exp) {
 	return unwrapTypeScriptExpression(exp);
 }
 function normalizeInterpolationExpression(exp) {
-	return normalizeWxmlExpression(printExpression(unwrapTsExpression$3(exp)));
+	return normalizeWxmlExpression(printExpression(unwrapTsExpression$2(exp)));
 }
 function renderMustache$1(expression, context) {
 	return context.mustacheInterpolation === "spaced" ? `{{ ${expression} }}` : `{{${expression}}}`;
@@ -3701,7 +3701,7 @@ function readJsxAttributeExpression(value) {
 	if (t.isStringLiteral(value)) return value;
 	if (!t.isJSXExpressionContainer(value)) return null;
 	if (t.isJSXEmptyExpression(value.expression)) return null;
-	return unwrapTsExpression$3(value.expression);
+	return unwrapTsExpression$2(value.expression);
 }
 function extractJsxKeyExpression(node) {
 	for (const attr of node.openingElement.attributes) {
@@ -3783,10 +3783,10 @@ function compileMapExpression(exp, context) {
 	let bodyExp = null;
 	if (t.isBlockStatement(callback.body)) {
 		for (const statement of callback.body.body) if (t.isReturnStatement(statement) && statement.argument) {
-			bodyExp = unwrapTsExpression$3(statement.argument);
+			bodyExp = unwrapTsExpression$2(statement.argument);
 			break;
 		}
-	} else bodyExp = unwrapTsExpression$3(callback.body);
+	} else bodyExp = unwrapTsExpression$2(callback.body);
 	const body = bodyExp ? compileRenderableExpression(bodyExp, context) : "";
 	popScope$1(context, addedScope.length);
 	if (!body) return "";
@@ -3821,7 +3821,7 @@ function compileLogicalExpression(exp, context) {
 	return renderMustache$1(normalizeInterpolationExpression(exp), context);
 }
 function compileRenderableExpression(exp, context) {
-	const node = unwrapTsExpression$3(exp);
+	const node = unwrapTsExpression$2(exp);
 	if (t.isJSXElement(node)) return compileJsxElement(node, context);
 	if (t.isJSXFragment(node)) return compileJsxFragment(node, context);
 	if (t.isConditionalExpression(node)) return compileConditionalExpression(node, context);
@@ -5112,10 +5112,8 @@ const SCOPED_SLOT_GLOBALS = new Set([
 	"require",
 	"arguments",
 	WEVU_SLOT_OWNER_KEY,
-	WEVU_GENERIC_SLOT_OWNER_DATA_KEY,
 	WEVU_SLOT_PROPS_KEY,
 	WEVU_SLOT_PROPS_DATA_KEY,
-	WEVU_GENERIC_SLOT_PROPS_DATA_KEY,
 	WEVU_CLASS_STYLE_RUNTIME_MODULE
 ]);
 function collectScopedSlotLocals(context) {
@@ -5146,10 +5144,6 @@ function replaceIdentifierWithExpression(path, replacement) {
 	path.replaceWith(replacement);
 }
 const IDENTIFIER_RE$3 = /^[A-Z_$][\w$]*$/i;
-function unwrapTsExpression$2(node) {
-	if (t.isTSAsExpression(node) || t.isTSNonNullExpression(node) || t.isTSTypeAssertion(node) || t.isTSSatisfiesExpression(node)) return unwrapTsExpression$2(node.expression);
-	return node;
-}
 function rewriteScopedSlotExpression(exp, context) {
 	const normalized = normalizeWxmlExpression(exp);
 	const parsed = parseBabelExpressionFile(normalized);
@@ -5163,40 +5157,25 @@ function rewriteScopedSlotExpression(exp, context) {
 		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, {
-		TSAsExpression(path) {
-			path.replaceWith(unwrapTsExpression$2(path.node));
-		},
-		TSSatisfiesExpression(path) {
-			path.replaceWith(unwrapTsExpression$2(path.node));
-		},
-		TSTypeAssertion(path) {
-			path.replaceWith(unwrapTsExpression$2(path.node));
-		},
-		TSNonNullExpression(path) {
-			path.replaceWith(unwrapTsExpression$2(path.node));
-		},
-		Identifier(path) {
-			if (!path.isReferencedIdentifier()) return;
-			const name = path.node.name;
-			if (SCOPED_SLOT_GLOBALS.has(name)) return;
-			if (path.scope.hasBinding(name)) return;
-			if (hasOwn(forAliases, name)) {
-				const aliasExp = parseBabelExpression(forAliases[name]);
-				if (aliasExp) {
-					replaceIdentifierWithExpression(path, t.cloneNode(aliasExp, true));
-					return;
-				}
-			}
-			if (locals.has(name)) return;
-			if (hasOwn(slotProps, name)) {
-				const prop = slotProps[name];
-				replaceIdentifierWithExpression(path, createMemberAccess(WEVU_GENERIC_SLOT_PROPS_DATA_KEY, prop));
+	traverse(ast, { Identifier(path) {
+		if (!path.isReferencedIdentifier()) return;
+		const name = path.node.name;
+		if (SCOPED_SLOT_GLOBALS.has(name)) return;
+		if (path.scope.hasBinding(name)) return;
+		if (hasOwn(forAliases, name)) {
+			const aliasExp = parseBabelExpression(forAliases[name]);
+			if (aliasExp) {
+				replaceIdentifierWithExpression(path, t.cloneNode(aliasExp, true));
 				return;
 			}
-			replaceIdentifierWithExpression(path, createMemberAccess(WEVU_GENERIC_SLOT_PROPS_DATA_KEY, name));
 		}
-	});
+		if (locals.has(name)) return;
+		if (hasOwn(slotProps, name)) {
+			replaceIdentifierWithExpression(path, createMemberAccess(WEVU_SLOT_PROPS_DATA_KEY, slotProps[name]));
+			return;
+		}
+		replaceIdentifierWithExpression(path, createMemberAccess(WEVU_SLOT_OWNER_KEY, name));
+	} });
 	const stmt = ast.program.body[0];
 	const updatedExpression = stmt && "expression" in stmt ? stmt.expression : null;
 	return updatedExpression ? generateExpression(updatedExpression) : normalized;
@@ -5557,22 +5536,9 @@ function createMemberAccess(target, prop) {
 function createThisMemberAccess(prop) {
 	return createMemberAccess(t.thisExpression(), prop);
 }
-function createScopedSlotOwnerRuntimeAccess() {
-	return t.logicalExpression("||", createThisMemberAccess(WEVU_SLOT_OWNER_PROXY_KEY), createThisMemberAccess(WEVU_SLOT_OWNER_KEY));
-}
 function createUnrefCall(exp) {
 	return t.callExpression(t.identifier("__wevuUnref"), [exp]);
 }
-function isCallCalleeIdentifier(path) {
-	const parent = path.parentPath;
-	if (parent.isCallExpression() && parent.node.callee === path.node) return true;
-	if (parent.isOptionalCallExpression() && parent.node.callee === path.node) return true;
-	if (!parent.isMemberExpression()) return false;
-	const grandParent = parent.parentPath;
-	if (grandParent.isCallExpression() && grandParent.node.callee === parent.node) return true;
-	if (grandParent.isOptionalCallExpression() && grandParent.node.callee === parent.node) return true;
-	return false;
-}
 function createHasOwnPropertyCall(target, key) {
 	return t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.identifier("Object"), t.identifier("prototype")), t.identifier("hasOwnProperty")), t.identifier("call")), [target, t.stringLiteral(key)]);
 }
@@ -5643,10 +5609,7 @@ function normalizeJsExpressionWithContext(exp, context, options) {
 			const base = createThisMemberAccess(WEVU_SLOT_PROPS_DATA_KEY);
 			replacement = createUnrefCall(prop ? createMemberAccess(base, prop) : base);
 		} else if (name === WEVU_SLOT_OWNER_KEY || name === WEVU_SLOT_PROPS_DATA_KEY || name === WEVU_SLOT_PROPS_KEY || name === WEVU_SLOT_SCOPE_KEY) replacement = createUnrefCall(createThisMemberAccess(name));
-		else {
-			const ownerAccess = createMemberAccess(createScopedSlotOwnerRuntimeAccess(), name);
-			replacement = isCallCalleeIdentifier(path) ? ownerAccess : createUnrefCall(ownerAccess);
-		}
+		else replacement = createUnrefCall(createMemberAccess(createThisMemberAccess(WEVU_SLOT_OWNER_KEY), name));
 		else replacement = createUnrefCall(createIdentifierAccessWithPropsFallback(name));
 		const parent = path.parentPath;
 		if (parent.isObjectProperty() && parent.node.shorthand && parent.node.key === path.node) {
@@ -5690,26 +5653,17 @@ function shouldFallbackToRuntimeBinding(exp) {
 * 将复杂表达式注册为 JS 运行时计算绑定，返回可用于模板 mustache 的绑定引用。
 */
 function registerRuntimeBindingExpression(exp, context, options) {
-	const forIndexAccess = buildForIndexAccess$1(context);
-	const bindingContext = context.rewriteScopedSlot && context.scopedSlotOwnerRuntimeBindingTarget ? context.scopedSlotOwnerRuntimeBindingTarget : context;
-	const cacheKey = context.rewriteScopedSlot && !forIndexAccess ? `${options?.prefix ?? ""}:${exp.trim()}` : void 0;
-	if (cacheKey) {
-		const cached = context.runtimeBindingCache?.get(cacheKey);
-		if (cached) return cached;
-	}
-	const expAst = normalizeJsExpressionWithContext(exp, bindingContext, options);
+	const expAst = normalizeJsExpressionWithContext(exp, context, options);
 	if (!expAst) return null;
 	const binding = {
-		name: `${options?.prefix ?? context.runtimeBindingPrefix ?? "__wv_bind_"}${bindingContext.classStyleBindings.filter((item) => item.type === "bind").length}`,
+		name: `__wv_bind_${context.classStyleBindings.filter((item) => item.type === "bind").length}`,
 		type: "bind",
 		exp,
 		expAst,
-		forStack: bindingContext.forStack.map((info) => ({ ...info }))
+		forStack: context.forStack.map((info) => ({ ...info }))
 	};
-	bindingContext.classStyleBindings.push(binding);
-	const bindingRef = context.rewriteScopedSlot ? `${WEVU_GENERIC_SLOT_PROPS_DATA_KEY}.${binding.name}${forIndexAccess}` : `${binding.name}${forIndexAccess}`;
-	if (cacheKey) context.runtimeBindingCache?.set(cacheKey, bindingRef);
-	return bindingRef;
+	context.classStyleBindings.push(binding);
+	return `${binding.name}${buildForIndexAccess$1(context)}`;
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/mustache.ts
@@ -6254,17 +6208,6 @@ function collectElementAttributes(node, context, options) {
 			}
 			if (prop.name === "text" && prop.exp?.type === NodeTypes.SIMPLE_EXPRESSION) {
 				const rawExp = prop.exp.content;
-				if (context.nativeSlotScopeRuntime) {
-					const runtimeExp = registerRuntimeBindingExpression(rawExp, context.nativeSlotScopeRuntime.owner, {
-						hint: "v-text",
-						prefix: context.nativeSlotScopeRuntime.runtimeBindingPrefix
-					});
-					if (runtimeExp) {
-						context.nativeSlotScopeRuntime.bindings.set(runtimeExp, runtimeExp);
-						vTextExp = runtimeExp;
-						continue;
-					}
-				}
 				vTextExp = (shouldFallbackToRuntimeBinding(rawExp) ? registerRuntimeBindingExpression(rawExp, context, { hint: "v-text" }) : null) ?? normalizeWxmlExpressionWithContext(rawExp, context);
 				continue;
 			}
@@ -6364,10 +6307,7 @@ function parseSlotPropsExpression(exp, context) {
 	}
 	return {};
 }
-function renderObjectBindingKey(key) {
-	return /^[A-Z_$][\w$]*$/i.test(key) ? key : toWxmlStringLiteral$1(key);
-}
-function collectSlotBindingExpressions(node, context) {
+function collectSlotBindingExpression(node, context) {
 	let bindObjectExp = null;
 	const namedBindings = [];
 	for (const prop of node.props) {
@@ -6399,18 +6339,9 @@ function collectSlotBindingExpressions(node, context) {
 		context.warnings.push("作用域插槽参数使用 v-bind 对象时，将忽略额外的命名绑定。");
 		namedBindings.length = 0;
 	}
-	if (bindObjectExp) return {
-		data: bindObjectExp,
-		props: bindObjectExp
-	};
-	if (!namedBindings.length) return {
-		data: null,
-		props: null
-	};
-	return {
-		data: `{${namedBindings.map((entry) => `${renderObjectBindingKey(entry.key)}:${entry.value}`).join(",")}}`,
-		props: `[${namedBindings.map((entry) => `${toWxmlStringLiteral$1(entry.key)},${entry.value}`).join(",")}]`
-	};
+	if (bindObjectExp) return bindObjectExp;
+	if (!namedBindings.length) return null;
+	return `[${namedBindings.map((entry) => `${toWxmlStringLiteral$1(entry.key)},${entry.value}`).join(",")}]`;
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/elements/tag-slot.ts
@@ -6468,12 +6399,6 @@ function resolveSlotStaticName(info) {
 	if (info.type === "static") return info.value || "default";
 }
 const SLOT_PRESENCE_IDENTIFIER_RE = /^[A-Z_$][\w$]*$/i;
-const SLOT_OWNER_KEY_RE = /\bwvslotowner(?:\.([A-Z_$][\w$]*)|\[['"]([^'"]+)['"]\])/gi;
-const SLOT_OWNER_PROP_PREFIX_RE = /\bwvslotownerprop([A-Z_$][\w$]*)\b/gi;
-const SLOT_PROPS_DATA_KEY_RE = /\bwvslotpropsdata(?:\.([A-Z_$][\w$]*)|\[['"]([^'"]+)['"]\])/gi;
-function renderOwnerPropSourceExpression(key) {
-	return SLOT_PRESENCE_IDENTIFIER_RE.test(key) ? key : `${WEVU_SLOT_OWNER_ID_KEY}['${key.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}']`;
-}
 function createSlotPresenceExpression(info) {
 	const slotName = resolveSlotStaticName(info);
 	if (!slotName) return;
@@ -6488,66 +6413,6 @@ function buildSlotDeclaration(name, propsExp, children, context, options) {
 		condition: options?.condition
 	};
 }
-function collectOwnerMemberKey(node, ownerKeys, slotPropKeys) {
-	const object = node.object;
-	if (object.type !== "Identifier" || object.name !== "wvslotowner" && object.name !== "wvslotpropsdata") return;
-	const property = node.property;
-	if (!node.computed && property.type === "Identifier") {
-		if (object.name === "wvslotpropsdata" && slotPropKeys.has(property.name)) return;
-		ownerKeys.add(property.name);
-	} else if (node.computed && property.type === "StringLiteral") {
-		if (object.name === "wvslotpropsdata" && slotPropKeys.has(property.value)) return;
-		ownerKeys.add(property.value);
-	}
-}
-function collectScopedSlotOwnerKeys(template, slotPropKeys) {
-	const ownerKeys = /* @__PURE__ */ new Set();
-	let match = SLOT_OWNER_KEY_RE.exec(template);
-	while (match) {
-		const key = match[1] ?? match[2];
-		if (key) ownerKeys.add(key);
-		match = SLOT_OWNER_KEY_RE.exec(template);
-	}
-	SLOT_OWNER_KEY_RE.lastIndex = 0;
-	match = SLOT_OWNER_PROP_PREFIX_RE.exec(template);
-	while (match) {
-		const key = match[1];
-		if (key) ownerKeys.add(key);
-		match = SLOT_OWNER_PROP_PREFIX_RE.exec(template);
-	}
-	SLOT_OWNER_PROP_PREFIX_RE.lastIndex = 0;
-	const computedExpressions = template.match(/\{\{([\s\S]*?)\}\}/g) ?? [];
-	for (const raw of computedExpressions) {
-		const parsed = parseBabelExpressionFile(raw.slice(2, -2).trim());
-		if (!parsed) continue;
-		traverse(parsed.ast, {
-			MemberExpression(path) {
-				collectOwnerMemberKey(path.node, ownerKeys, slotPropKeys);
-			},
-			OptionalMemberExpression(path) {
-				collectOwnerMemberKey(path.node, ownerKeys, slotPropKeys);
-			}
-		});
-	}
-	return ownerKeys.size ? [...ownerKeys].sort((a, b) => a.localeCompare(b)) : void 0;
-}
-function collectScopedSlotPropsDataKeys(template) {
-	const keys = /* @__PURE__ */ new Set();
-	let match = SLOT_PROPS_DATA_KEY_RE.exec(template);
-	while (match) {
-		const key = match[1] ?? match[2];
-		if (key) keys.add(key);
-		match = SLOT_PROPS_DATA_KEY_RE.exec(template);
-	}
-	SLOT_PROPS_DATA_KEY_RE.lastIndex = 0;
-	return [...keys].sort((a, b) => a.localeCompare(b));
-}
-function renderScopedSlotPropsDataReadyGuard(keys) {
-	if (!keys.length) return;
-	return keys.map((key) => {
-		return `${SLOT_PRESENCE_IDENTIFIER_RE.test(key) ? `${WEVU_GENERIC_SLOT_PROPS_DATA_KEY}.${key}` : `${WEVU_GENERIC_SLOT_PROPS_DATA_KEY}[${toWxmlStringLiteral$1(key)}]`}!==undefined`;
-	}).join("&&");
-}
 function createScopedSlotComponent(context, slotKey, props, children, transformNode) {
 	const ownerHash = hashString(context.filename);
 	const index = context.scopedSlotComponents.length;
@@ -6568,36 +6433,27 @@ function createScopedSlotComponent(context, slotKey, props, children, transformN
 		slotPropStack: [],
 		rewriteScopedSlot: true,
 		classStyleBindings: [],
-		runtimeBindingCache: /* @__PURE__ */ new Map(),
-		runtimeBindingPrefix: "wvslotbind",
 		classStyleWxs: false,
 		forStack: [],
 		forIndexSeed: 0,
 		inlineExpressions: [],
-		inlineExpressionSeed: 0,
-		scopedSlotOwnerRuntimeBindingTarget: context
+		inlineExpressionSeed: 0
 	};
-	const slotMapping = {
+	let template = withSlotProps(scopedContext, {
 		...collectScopePropMapping(context),
 		...props
-	};
-	let template = withSlotProps(scopedContext, slotMapping, () => {
+	}, () => {
 		return children.map((child) => transformNode(child, scopedContext)).join("");
 	});
-	const slotPropsDataReadyGuard = renderScopedSlotPropsDataReadyGuard(collectScopedSlotPropsDataKeys(template));
-	if (slotPropsDataReadyGuard) template = scopedContext.platform.wrapIf(slotPropsDataReadyGuard, template, (exp) => renderMustache(exp, scopedContext));
 	if (scopedContext.classStyleWxs) template = `${buildClassStyleWxsTag(scopedContext.classStyleWxsExtension || "wxs", scopedContext.classStyleWxsSrc)}\n${template}`;
 	asset.template = template;
 	asset.componentGenerics = Object.keys(scopedContext.componentGenerics).length ? scopedContext.componentGenerics : void 0;
 	asset.classStyleBindings = scopedContext.classStyleBindings.length ? scopedContext.classStyleBindings : void 0;
 	asset.classStyleWxs = scopedContext.classStyleWxs || void 0;
 	asset.inlineExpressions = scopedContext.inlineExpressions.length ? scopedContext.inlineExpressions : void 0;
-	asset.ownerKeys = collectScopedSlotOwnerKeys(template, new Set(Object.values(slotMapping)));
-	if (asset.ownerKeys?.length) asset.ownerPropsExpression = `[${asset.ownerKeys.map((key) => `'${key}',${renderOwnerPropSourceExpression(key)}`).join(",")}]`;
 	return {
 		componentName,
-		slotKey,
-		asset
+		slotKey
 	};
 }
 function injectAttributeIntoOpeningTag(source, attr) {
@@ -6626,25 +6482,15 @@ function createSlotAttributeNode(sourceNode, attr) {
 		loc: sourceNode.loc
 	};
 }
-function injectSlotAttributeIntoStructuralElementNode(child, slotAttr, transformNode, context) {
+function injectSlotAttributeIntoElementNode(child, slotAttr, transformNode, context) {
 	if (child.type !== NodeTypes.ELEMENT || child.tag === "template") return null;
 	const sourceNode = child;
-	const structural = isStructuralDirective(sourceNode);
-	if (structural.type !== "if" || structural.directive?.name !== "if" || !structural.directive.exp) return null;
 	const slotAttribute = createSlotAttributeNode(sourceNode, slotAttr);
 	if (!slotAttribute) return null;
-	const elementWithoutIf = {
+	return transformNode({
 		...sourceNode,
-		props: [slotAttribute, ...sourceNode.props.filter((prop) => prop !== structural.directive)]
-	};
-	const expValue = normalizeWxmlExpressionWithContext(structural.directive.exp.type === NodeTypes.SIMPLE_EXPRESSION ? structural.directive.exp.content : "", context);
-	const tag = sourceNode.tag;
-	const { attrs, vTextExp } = collectElementAttributes(elementWithoutIf, context, { skipSlotDirective: true });
-	let children = "";
-	if (sourceNode.children.length > 0) children = sourceNode.children.map((childNode) => transformNode(childNode, context)).join("");
-	if (vTextExp !== void 0) children = renderMustache(vTextExp, context);
-	const attrString = attrs.length ? ` ${attrs.join(" ")}` : "";
-	return (children ? `<${tag}${attrString}>${children}</${tag}>` : `<${tag}${attrString} />`).replace(/^<([^\s>/]+)/, `<$1 ${context.platform.directives.ifAttr}="${renderMustache(expValue, context)}"`);
+		props: [slotAttribute, ...sourceNode.props]
+	}, context);
 }
 function isRenderableFallbackChild(child) {
 	if (child.type === NodeTypes.COMMENT) return false;
@@ -6670,11 +6516,7 @@ function renderSlotFallback(decl, context, transformNode) {
 	}
 	if (renderableChildren.length === 1) {
 		const child = renderableChildren[0];
-		if (child.type === NodeTypes.ELEMENT && isStructuralDirective(child).type) {
-			const projected = injectSlotAttributeIntoStructuralElementNode(child, slotAttr, transformNode, context);
-			if (projected) return wrapCondition(projected);
-		}
-		const projected = injectAttributeIntoOpeningTag(transformNode(child, context), slotAttr);
+		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}>${renderableChildren.map((child) => transformNode(child, context)).join("")}</view>`);
@@ -6682,8 +6524,7 @@ function renderSlotFallback(decl, context, transformNode) {
 function transformSlotElement(node, context, transformNode) {
 	if (isScopedSlotsDisabled(context)) return transformSlotElementPlain(node, context, transformNode);
 	const slotNameInfo = resolveSlotNameFromSlotElement(node);
-	const slotBindingExps = collectSlotBindingExpressions(node, context);
-	const slotPropsExp = slotBindingExps.props;
+	let slotPropsExp = collectSlotBindingExpression(node, context);
 	let fallbackContent = "";
 	if (node.children.length > 0) fallbackContent = node.children.map((child) => transformNode(child, context)).join("");
 	const slotAttrs = [];
@@ -6692,28 +6533,22 @@ function transformSlotElement(node, context, transformNode) {
 	const slotAttrString = slotAttrs.length ? ` ${slotAttrs.join(" ")}` : "";
 	let slotTag = `<slot${slotAttrString} />`;
 	const slotPresentExp = fallbackContent ? createSlotPresenceExpression(slotNameInfo) : void 0;
-	if (fallbackContent && !slotPropsExp && !slotPresentExp) slotTag = `<slot${slotAttrString}>${fallbackContent}</slot>`;
-	if (!slotPropsExp && context.scopedSlotsRequireProps) {
-		if (fallbackContent && slotPresentExp) return `${context.platform.wrapIf(slotPresentExp, slotTag, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
-		return slotTag;
+	if (fallbackContent) {
+		if (!slotPropsExp && slotPresentExp) slotTag = `${context.platform.wrapIf(slotPresentExp, slotTag, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
+		else if (!slotPropsExp) slotTag = `<slot${slotAttrString}>${fallbackContent}</slot>`;
 	}
+	if (!slotPropsExp && (context.scopedSlotsRequireProps || slotNameInfo.type !== "default")) return slotTag;
 	const genericKey = `scoped-slots-${resolveSlotKey(context, slotNameInfo)}`;
 	context.componentGenerics[genericKey] = true;
-	const slotPropsFallbackExp = slotPropsExp ?? WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR;
-	const slotPropsDataExp = slotPropsExp && slotBindingExps.data ? registerRuntimeBindingExpression(slotBindingExps.data, context, {
-		hint: "scoped slot props data",
-		prefix: `${WEVU_GENERIC_SLOT_PROPS_DATA_ATTR}_`
-	}) ?? slotPropsFallbackExp : WEVU_GENERIC_SLOT_PROPS_DATA_KEY;
+	slotPropsExp = slotPropsExp ?? "[]";
 	const scopedAttrs = [
-		`${WEVU_GENERIC_SLOT_OWNER_ID_ATTR}="${renderMustache(WEVU_GENERIC_SLOT_OWNER_ID_ATTR, context)}"`,
-		`${WEVU_GENERIC_SLOT_PROPS_ATTR}="${renderMustache(slotPropsFallbackExp, context)}"`,
-		`${WEVU_GENERIC_SLOT_PROPS_DATA_ATTR}="${renderMustache(slotPropsDataExp, context)}"`
+		`${context.platform.directives.ifAttr}="${renderMustache(WEVU_SLOT_OWNER_ID_PROP, context)}"`,
+		`${WEVU_SLOT_OWNER_ATTR}="${renderMustache(WEVU_SLOT_OWNER_ID_PROP, context)}"`,
+		`${WEVU_SLOT_PROPS_ATTR}="${renderMustache(slotPropsExp, context)}"`
 	];
-	if (context.slotMultipleInstance) scopedAttrs.push(`${WEVU_GENERIC_SLOT_SCOPE_ATTR}="${renderMustache(WEVU_SLOT_SCOPE_KEY, context)}"`);
-	scopedAttrs.push(`${WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR}="${renderMustache(WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR, context)}"`);
-	const scopedAttrString = scopedAttrs.length ? ` ${scopedAttrs.join(" ")}` : "";
-	const scopedTag = context.platform.wrapIf(WEVU_GENERIC_SLOT_OWNER_ID_ATTR, `<${genericKey}${scopedAttrString} />`, (exp) => renderMustache(exp, context));
-	const projectedContent = slotPropsExp ? scopedTag : `${slotTag}${scopedTag}`;
+	if (context.slotMultipleInstance) scopedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(WEVU_SLOT_SCOPE_KEY, context)}"`);
+	const scopedTag = `<${genericKey}${scopedAttrs.length ? ` ${scopedAttrs.join(" ")}` : ""} />`;
+	const projectedContent = `${slotTag}${scopedTag}`;
 	if (fallbackContent && slotPresentExp) return `${context.platform.wrapIf(slotPresentExp, projectedContent, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
 	return projectedContent;
 }
@@ -6732,18 +6567,6 @@ function transformSlotElementPlain(node, context, transformNode) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/elements/tag-component.ts
-function createNativeSlotContext(context) {
-	return {
-		...context,
-		classStyleBindings: context.classStyleBindings,
-		runtimeBindingCache: context.runtimeBindingCache,
-		nativeSlotScopeRuntime: {
-			owner: context,
-			bindings: /* @__PURE__ */ new Map(),
-			runtimeBindingPrefix: "wvslotbind"
-		}
-	};
-}
 function hasLegacySlotAttribute(children) {
 	return children.some((child) => {
 		if (child.type !== NodeTypes.ELEMENT) return false;
@@ -6764,52 +6587,10 @@ function hasDirectComponentSlotChild(children, context) {
 		return /^[A-Z]/.test(child.tag);
 	});
 }
-function hasComponentSlotDescendant(children, context) {
-	return children.some((child) => {
-		if (child.type !== NodeTypes.ELEMENT) return false;
-		if (child.tag === "template") return false;
-		if (child.tag === "component") return true;
-		return !isBuiltinTag(resolveTemplateTagName(child.tag, context)) || /^[A-Z]/.test(child.tag) || hasComponentSlotDescendant(child.children, context);
-	});
-}
-function hasStructuralSlotRoot(children) {
-	return children.some((child) => {
-		if (child.type !== NodeTypes.ELEMENT) return false;
-		return Boolean(isStructuralDirective(child).type);
-	});
-}
-function hasParentExpressionSlotContent(children) {
-	return children.some((child) => {
-		if (child.type === NodeTypes.INTERPOLATION) return true;
-		if (child.type !== NodeTypes.ELEMENT) return false;
-		const element = child;
-		if (element.props.some((prop) => prop.type === NodeTypes.DIRECTIVE && prop.name !== "slot")) return true;
-		return hasParentExpressionSlotContent(element.children);
-	});
-}
-function hasRuntimeOnlySlotExpression(children) {
-	return children.some((child) => {
-		if (child.type === NodeTypes.INTERPOLATION) {
-			const content = child.content;
-			return shouldFallbackToRuntimeBinding(content?.type === NodeTypes.SIMPLE_EXPRESSION ? content.content : "");
-		}
-		if (child.type !== NodeTypes.ELEMENT) return false;
-		const element = child;
-		if (element.props.some((prop) => {
-			if (prop.type !== NodeTypes.DIRECTIVE || prop.name === "slot") return false;
-			return shouldFallbackToRuntimeBinding(prop.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? prop.exp.content : "");
-		})) return true;
-		return hasRuntimeOnlySlotExpression(element.children);
-	});
-}
-function shouldAugmentPlainSlot(decl, context) {
-	if (context.scopedSlotsRequireProps) return false;
-	if (hasParentExpressionSlotContent(decl.children)) return hasComponentSlotDescendant(decl.children, context) || context.scopedSlotsCompiler === "augmented" && (hasStructuralSlotRoot(decl.children) || hasRuntimeOnlySlotExpression(decl.children));
-	if (context.scopedSlotsCompiler === "augmented" && !decl.implicitDefault && (!context.slotSingleRootNoWrapper || hasStructuralSlotRoot(decl.children))) return true;
-	if (context.scopedSlotsCompiler === "augmented" && decl.implicitDefault && hasComponentSlotDescendant(decl.children, context)) return true;
-	if (hasDirectComponentSlotChild(decl.children, context)) return true;
-	if (!decl.implicitDefault) return false;
-	return context.scopedSlotsCompiler === "augmented" && (hasStructuralSlotRoot(decl.children) || hasRuntimeOnlySlotExpression(decl.children));
+function shouldAugmentPlainDefaultSlot(decl, context) {
+	if (context.scopedSlotsRequireProps || !decl.implicitDefault) return false;
+	if (context.scopedSlotsCompiler === "augmented") return true;
+	return hasDirectComponentSlotChild(decl.children, context);
 }
 function resolveTemplateSlotCondition(node, context) {
 	const ifDirective = node.props.find((prop) => prop.type === NodeTypes.DIRECTIVE && prop.name === "if" && prop.exp?.type === NodeTypes.SIMPLE_EXPRESSION);
@@ -6850,9 +6631,6 @@ function shouldExposePlainSlotPresence(node) {
 function isWevuComponentTag(node, context) {
 	return context.wevuComponentTags ? context.wevuComponentTags.has(node.tag) : /^[A-Z]/.test(node.tag);
 }
-function buildScopedSlotOwnerIdExpression(context) {
-	return context.rewriteScopedSlot ? `${WEVU_GENERIC_SLOT_OWNER_ID_ATTR} || ${WEVU_SLOT_OWNER_ID_KEY} || ''` : `${WEVU_SLOT_OWNER_ID_KEY} || ''`;
-}
 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));
@@ -6862,7 +6640,6 @@ function shouldTransformAsComponentWithSlots(node, context, resolvedTag = resolv
 }
 function transformComponentWithSlots(node, context, transformNode, options) {
 	if (isScopedSlotsDisabled(context)) return transformComponentWithSlotsFallback(node, context, transformNode, options);
-	if (node.tag !== "component" && context.wevuComponentTags && !isWevuComponentTag(node, context)) return transformComponentWithSlotsFallback(node, context, transformNode, options);
 	const extraAttrs = options?.extraAttrs ?? [];
 	const slotDeclarations = [];
 	const slotDirective = findSlotDirective(node);
@@ -6902,25 +6679,18 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	}
 	const scopedSlotDeclarations = [];
 	const plainSlotDeclarations = [];
-	for (const decl of slotDeclarations) if (Object.keys(decl.props).length > 0 || shouldAugmentPlainSlot(decl, context)) scopedSlotDeclarations.push(decl);
+	for (const decl of slotDeclarations) if (Object.keys(decl.props).length > 0 || shouldAugmentPlainDefaultSlot(decl, context)) scopedSlotDeclarations.push(decl);
 	else plainSlotDeclarations.push(decl);
 	const slotNames = [];
 	const slotGenericAttrs = [];
 	for (const decl of scopedSlotDeclarations) {
 		const slotKey = resolveSlotKey(context, decl.name);
-		const { componentName, asset } = createScopedSlotComponent(context, slotKey, decl.props, decl.children, transformNode);
+		const { componentName } = createScopedSlotComponent(context, slotKey, decl.props, decl.children, transformNode);
 		slotNames.push({
 			name: stringifySlotName(decl.name, context),
 			condition: decl.condition
 		});
 		slotGenericAttrs.push(`generic:scoped-slots-${slotKey}="${componentName}"`);
-		if (asset.ownerPropsExpression) {
-			const ownerPropsRef = registerRuntimeBindingExpression(asset.ownerPropsExpression, context, {
-				hint: "scoped slot owner props",
-				prefix: "wvslotownerprops"
-			});
-			slotGenericAttrs.push(`${WEVU_GENERIC_SLOT_OWNER_PROPS_ATTR}="${renderMustache(ownerPropsRef ?? asset.ownerPropsExpression, context)}"`);
-		}
 	}
 	if (shouldExposePlainSlotPresence(node) || isWevuComponentTag(node, context)) for (const decl of plainSlotDeclarations) slotNames.push({
 		name: stringifySlotName(decl.name, context),
@@ -6939,22 +6709,12 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	pushSlotNamesAttr(mergedAttrs, slotNames, context);
 	if (scopedSlotDeclarations.length) {
 		const scopePropsExp = buildScopePropsExpression(context);
-		if (scopePropsExp) mergedAttrs.push(`${WEVU_GENERIC_SLOT_SCOPE_ATTR}="${renderMustache(scopePropsExp, context)}"`);
-		const ownerIdExp = renderMustache(buildScopedSlotOwnerIdExpression(context), context);
-		mergedAttrs.push(`${WEVU_GENERIC_SLOT_OWNER_ID_ATTR}="${ownerIdExp}"`);
-	}
-	const { tag } = node;
-	const nativeSlotContext = plainSlotDeclarations.length ? createNativeSlotContext(context) : context;
-	const plainSlotContent = plainSlotDeclarations.map((decl) => renderSlotFallback(decl, nativeSlotContext, transformNode)).join("");
-	const nativeSlotBindings = nativeSlotContext.nativeSlotScopeRuntime?.bindings;
-	if (nativeSlotBindings?.size) {
-		const bindingEntries = Array.from(nativeSlotBindings);
-		const scopeExp = `[${bindingEntries.map(([key, value]) => `'${key}',${value}`).join(",")}]`;
-		mergedAttrs.push(`${WEVU_GENERIC_SLOT_SCOPE_ATTR}="${renderMustache(scopeExp, context)}"`);
-		const readyExp = bindingEntries.map(([key]) => `${key}!==undefined`).join("&&");
-		if (readyExp) mergedAttrs.push(`${context.platform.directives.ifAttr}="${renderMustache(readyExp, context)}"`);
+		if (scopePropsExp) mergedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(scopePropsExp, context)}"`);
+		mergedAttrs.push(`${WEVU_SLOT_OWNER_ID_ATTR}="${renderMustache(`${WEVU_SLOT_OWNER_ID_KEY} || ''`, context)}"`);
 	}
 	const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
+	const { tag } = node;
+	const plainSlotContent = plainSlotDeclarations.map((decl) => renderSlotFallback(decl, context, transformNode)).join("");
 	return plainSlotContent ? `<${tag}${attrString}>${plainSlotContent}</${tag}>` : `<${tag}${attrString} />`;
 }
 function transformComponentWithSlotsFallback(node, context, transformNode, options) {
@@ -7064,16 +6824,6 @@ function transformNormalElement(node, context, transformNode) {
 //#region src/plugins/vue/compiler/template/elements/tag-structural.ts
 const REGEX_SPECIAL_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
 function resolveConditionExpression$1(rawExpValue, context, hint) {
-	if (context.nativeSlotScopeRuntime) {
-		const runtimeExp = registerRuntimeBindingExpression(rawExpValue, context.nativeSlotScopeRuntime.owner, {
-			hint,
-			prefix: context.nativeSlotScopeRuntime.runtimeBindingPrefix
-		});
-		if (runtimeExp) {
-			context.nativeSlotScopeRuntime.bindings.set(runtimeExp, runtimeExp);
-			return runtimeExp;
-		}
-	}
 	return (shouldFallbackToRuntimeBinding(rawExpValue) ? registerRuntimeBindingExpression(rawExpValue, context, { hint }) : null) ?? normalizeWxmlExpressionWithContext(rawExpValue, context);
 }
 function transformIfElement(node, context, transformNode) {
@@ -7263,16 +7013,6 @@ function transformInterpolation(node, context) {
 	const { content } = node;
 	if (content.type === NodeTypes.SIMPLE_EXPRESSION) {
 		const rawExpValue = content.content;
-		if (context.nativeSlotScopeRuntime) {
-			const runtimeExp = registerRuntimeBindingExpression(rawExpValue, context.nativeSlotScopeRuntime.owner, {
-				hint: "插值表达式",
-				prefix: context.nativeSlotScopeRuntime.runtimeBindingPrefix
-			});
-			if (runtimeExp) {
-				context.nativeSlotScopeRuntime.bindings.set(runtimeExp, runtimeExp);
-				return renderMustache(runtimeExp, context);
-			}
-		}
 		return renderMustache((shouldFallbackToRuntimeBinding(rawExpValue) ? registerRuntimeBindingExpression(rawExpValue, context, { hint: "插值表达式" }) : null) ?? normalizeWxmlExpressionWithContext(rawExpValue, context), context);
 	}
 	/* istanbul ignore next */
@@ -7345,8 +7085,6 @@ function compileVueTemplateToWxml(template, filename, options) {
 			objectLiteralBindMode: options?.objectLiteralBindMode ?? "runtime",
 			mustacheInterpolation: options?.mustacheInterpolation ?? "compact",
 			classStyleBindings: [],
-			runtimeBindingCache: /* @__PURE__ */ new Map(),
-			runtimeBindingPrefix: "__wv_bind_",
 			classStyleWxs: false,
 			classStyleWxsExtension: wxsExtension,
 			classStyleWxsSrc: options?.classStyleWxsSrc,
@@ -8298,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.8",
+  "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.5",
+    "@weapp-core/constants": "^0.1.6",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.8",
+    "@weapp-vite/ast": "6.16.9",
     "rolldown-require": "2.0.15"
   },
   "publishConfig": {