@vue/compiler-sfc 3.6.0-beta.11 → 3.6.0-beta.12

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-beta.11
+  * @vue/compiler-sfc v3.6.0-beta.12
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -197,33 +197,33 @@ function genNormalScriptCssVarsCode(cssVars, bindings, id, isProd, defaultVar) {
 	return `\nimport { ${CSS_VARS_HELPER} as _${CSS_VARS_HELPER} } from 'vue'\nconst __injectCSSVars__ = () => {\n${genCssVarsCode(cssVars, bindings, id, isProd)}}\nconst __setup__ = ${defaultVar}.setup\n${defaultVar}.setup = __setup__\n  ? (props, ctx) => { __injectCSSVars__();return __setup__(props, ctx) }\n  : __injectCSSVars__\n`;
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/checkPrivateRedeclaration.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/checkPrivateRedeclaration.js
 function _checkPrivateRedeclaration(e, t) {
 	if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object");
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/classPrivateMethodInitSpec.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/classPrivateMethodInitSpec.js
 function _classPrivateMethodInitSpec(e, a) {
 	_checkPrivateRedeclaration(e, a), a.add(e);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/classPrivateFieldInitSpec.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/classPrivateFieldInitSpec.js
 function _classPrivateFieldInitSpec(e, t, a) {
 	_checkPrivateRedeclaration(e, t), t.set(e, a);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/assertClassBrand.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/assertClassBrand.js
 function _assertClassBrand(e, t, n) {
 	if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n;
 	throw new TypeError("Private element is not present on this object");
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/classPrivateFieldGet2.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/classPrivateFieldGet2.js
 function _classPrivateFieldGet2(s, a) {
 	return s.get(_assertClassBrand(s, a));
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/classPrivateFieldSet2.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/classPrivateFieldSet2.js
 function _classPrivateFieldSet2(s, a, r) {
 	return s.set(_assertClassBrand(s, a), r), r;
 }
@@ -15282,7 +15282,7 @@ function compileScript(sfc, options) {
 	if (emitsDecl) runtimeOptions += `\n  emits: ${emitsDecl},`;
 	if (vapor && !ssr && sfc.template && !sfc.template.src) {
 		var _options$templateOpti2;
-		runtimeOptions += `\n  __multiRoot: ${isMultiRoot(sfc.template.ast, (_options$templateOpti2 = options.templateOptions) === null || _options$templateOpti2 === void 0 ? void 0 : _options$templateOpti2.compilerOptions)},`;
+		if (isMultiRoot(sfc.template.ast, (_options$templateOpti2 = options.templateOptions) === null || _options$templateOpti2 === void 0 ? void 0 : _options$templateOpti2.compilerOptions)) runtimeOptions += `\n  __multiRoot: true,`;
 	}
 	let definedOptions = "";
 	if (ctx.optionsRuntimeDecl) definedOptions = scriptSetup.content.slice(ctx.optionsRuntimeDecl.start, ctx.optionsRuntimeDecl.end).trim();
@@ -15440,7 +15440,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 }
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
-const version = "3.6.0-beta.11";
+const version = "3.6.0-beta.12";
 const parseCache = parseCache$1;
 const errorMessages = {
 	..._vue_compiler_dom.errorMessages,

package/dist/compiler-sfc.d.ts

@@ -1,4 +1,4 @@
-import * as _babel_types0 from "@babel/types";
+import * as _$_babel_types0 from "@babel/types";
 import { CallExpression as CallExpression$1, Expression as Expression$1, Node as Node$1, ObjectPattern, Program as Program$1, Statement as Statement$1, TSCallSignatureDeclaration, TSFunctionType, TSMethodSignature, TSModuleDeclaration, TSPropertySignature, TSType } from "@babel/types";
 import { BaseCodegenResult, BindingMetadata, BindingMetadata as BindingMetadata$1, CompilerError, CompilerError as CompilerError$1, CompilerOptions as CompilerOptions$1, CompilerOptions as CompilerOptions$2, ParserOptions, RawSourceMap, RootNode, SourceLocation, extractIdentifiers, generateCodeFrame, isInDestructureAssignment, isStaticProperty, walkIdentifiers } from "@vue/compiler-core";
 import { ParserPlugin, parse as babelParse } from "@babel/parser";
@@ -185,8 +185,8 @@ export interface SFCScriptBlock extends SFCBlock {
   setup?: string | boolean;
   bindings?: BindingMetadata$1;
   imports?: Record<string, ImportBinding>;
-  scriptAst?: _babel_types0.Statement[];
-  scriptSetupAst?: _babel_types0.Statement[];
+  scriptAst?: _$_babel_types0.Statement[];
+  scriptSetupAst?: _$_babel_types0.Statement[];
   warnings?: string[];
   /**
   * Fully resolved dependency file paths (unix slashes) with imported types

package/dist/compiler-sfc.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-beta.11
+  * @vue/compiler-sfc v3.6.0-beta.12
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -41,7 +41,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 	throw Error("Calling `require` for \"" + x + "\" in an environment that doesn't expose the `require` function. See https://rolldown.rs/in-depth/bundling-cjs#require-external-modules for more details.");
 });
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -52,7 +52,7 @@ function _typeof(o) {
 }
 var init_typeof = __esmMin((() => {}));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -67,7 +67,7 @@ var init_toPrimitive = __esmMin((() => {
 	init_typeof();
 }));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
@@ -77,7 +77,7 @@ var init_toPropertyKey = __esmMin((() => {
 	init_toPrimitive();
 }));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -90,7 +90,7 @@ var init_defineProperty = __esmMin((() => {
 	init_toPropertyKey();
 }));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/objectSpread2.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/objectSpread2.js
 function ownKeys(e, r) {
 	var t = Object.keys(e);
 	if (Object.getOwnPropertySymbols) {
@@ -1069,6 +1069,12 @@ function write(buffer, value, offset, isLE, mLen, nBytes) {
 	for (; eLen > 0; buffer[offset + i] = e & 255, i += d, e /= 256, eLen -= 8);
 	buffer[offset + i - d] |= s * 128;
 }
+/*!
+* The buffer module from node.js, for the browser.
+*
+* @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+* @license  MIT
+*/
 function kMaxLength() {
 	return Buffer$1.TYPED_ARRAY_SUPPORT ? 2147483647 : 1073741823;
 }
@@ -16182,7 +16188,7 @@ var require_lib$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.parseExpression = parseExpression;
 }));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/asyncToGenerator.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/asyncToGenerator.js
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
 	try {
 		var i = n[a](c), u = i.value;
@@ -23365,6 +23371,7 @@ var init__polyfill_node_path = __esmMin((() => {
 }));
 //#endregion
 //#region \0polyfill-node.punycode.js
+/*! https://mths.be/punycode v1.4.1 by @mathias */
 /**
 * A generic error utility function.
 * @private
@@ -24910,7 +24917,8 @@ var TransformContext = class TransformContext {
 		this.operationIndex = this.block.operation.length;
 		this.isLastEffectiveChild = true;
 		this.isOnRightmostPath = true;
-		this.hasInlineAncestorNeedingClose = false;
+		this.templateCloseTags = void 0;
+		this.templateCloseBlocks = false;
 		this.globalId = 0;
 		this.nextIdMap = null;
 		this.ifIndex = 0;
@@ -25036,11 +25044,6 @@ var TransformContext = class TransformContext {
 		while (effectiveParent && effectiveParent.node.type === 1 && effectiveParent.node.tagType === 3) effectiveParent = effectiveParent.parent;
 		const isLastEffectiveChild = this.isEffectivelyLastChild(index);
 		const isOnRightmostPath = this.isOnRightmostPath && isLastEffectiveChild;
-		let hasInlineAncestorNeedingClose = this.hasInlineAncestorNeedingClose;
-		if (this.node.type === 1) {
-			if (this.node.tag === "template") hasInlineAncestorNeedingClose = false;
-			else if (!hasInlineAncestorNeedingClose && !this.isOnRightmostPath && isInlineTag(this.node.tag)) hasInlineAncestorNeedingClose = true;
-		}
 		return Object.assign(Object.create(TransformContext.prototype), this, {
 			node,
 			parent: this,
@@ -25055,7 +25058,8 @@ var TransformContext = class TransformContext {
 			effectiveParent,
 			isLastEffectiveChild,
 			isOnRightmostPath,
-			hasInlineAncestorNeedingClose
+			templateCloseTags: this.templateCloseTags,
+			templateCloseBlocks: this.templateCloseBlocks
 		});
 	}
 	shiftEffectBoundaries(index, dynamic = this.dynamic) {
@@ -25248,6 +25252,9 @@ function genCall(name, ...frags) {
 		hasPlaceholder ? name[1] : "null"
 	], ...frags)];
 }
+function getParserOptions(plugins) {
+	return { plugins: plugins ? plugins.some((plugin) => plugin === "typescript") ? plugins : [...plugins, "typescript"] : ["typescript"] };
+}
 function codeFragmentToString(code, context) {
 	const { options: { filename, sourceMap } } = context;
 	let map;
@@ -25630,9 +25637,7 @@ function escapeRegExp(string) {
 	return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function parseExp(context, content) {
-	const plugins = context.options.expressionPlugins;
-	const options = { plugins: plugins ? [...plugins, "typescript"] : ["typescript"] };
-	return (0, import_lib.parseExpression)(`(${content})`, options);
+	return (0, import_lib.parseExpression)(`(${content})`, getParserOptions(context.options.expressionPlugins));
 }
 function genVarName(exp) {
 	return `${exp.replace(/[^a-zA-Z0-9]/g, "_").replace(/_+/g, "_").replace(/_+$/, "")}`;
@@ -25810,16 +25815,12 @@ function genFor(oper, context) {
 		idMap[rawIndex] = `${indexVar}.value`;
 		idMap[indexVar] = null;
 	}
-	const { selectorPatterns, keyOnlyBindingPatterns } = matchPatterns(render, keyProp, idMap);
+	const { selectorPatterns, keyOnlyBindingPatterns } = matchPatterns(render, keyProp, idMap, context);
 	const selectorDeclarations = [];
-	const selectorSetup = [];
+	const selectorName = (i) => selectorPatterns.length > 1 ? `_selector${id}_${i}` : `_selector${id}`;
 	for (let i = 0; i < selectorPatterns.length; i++) {
 		const { selector } = selectorPatterns[i];
-		const selectorName = `_selector${id}_${i}`;
-		selectorDeclarations.push(`let ${selectorName}`, NEWLINE);
-		if (i === 0) selectorSetup.push(`({ createSelector }) => {`, INDENT_START);
-		selectorSetup.push(NEWLINE, `${selectorName} = `, ...genCall(`createSelector`, [`() => `, ...genExpression(selector, context)]));
-		if (i === selectorPatterns.length - 1) selectorSetup.push(INDENT_END, NEWLINE, "}");
+		selectorDeclarations.push(`const ${selectorName(i)} = `, ...genCall(helper("createSelector"), [`() => `, ...genExpression(selector, context)]), NEWLINE);
 	}
 	const blockFn = context.withId(() => {
 		const frag = [];
@@ -25828,7 +25829,7 @@ function genFor(oper, context) {
 			const patternFrag = [];
 			for (let i = 0; i < selectorPatterns.length; i++) {
 				const { effect } = selectorPatterns[i];
-				patternFrag.push(NEWLINE, `_selector${id}_${i}(() => {`, INDENT_START);
+				patternFrag.push(NEWLINE, `${selectorName(i)}(`, ...genExpression(keyProp, context), `, () => {`, INDENT_START);
 				for (const oper of effect.operations) patternFrag.push(...genOperation(oper, context));
 				patternFrag.push(INDENT_END, NEWLINE, `})`);
 			}
@@ -25844,11 +25845,14 @@ function genFor(oper, context) {
 	if (onlyChild) flags |= 1;
 	if (component) flags |= 2;
 	if (once) flags |= 4;
+	const onResetCalls = [];
+	for (let i = 0; i < selectorPatterns.length; i++) onResetCalls.push(NEWLINE, `n${id}.onReset(${selectorName(i)}.reset)`);
 	return [
 		NEWLINE,
 		...selectorDeclarations,
 		`const n${id} = `,
-		...genCall([helper("createFor"), "undefined"], sourceExpr, blockFn, genCallback(keyProp), flags ? String(flags) : void 0, selectorSetup.length ? selectorSetup : void 0)
+		...genCall([helper("createFor"), "undefined"], sourceExpr, blockFn, genCallback(keyProp), flags ? String(flags) : void 0),
+		...onResetCalls
 	];
 	function genCallback(expr) {
 		if (!expr) return false;
@@ -25934,19 +25938,19 @@ function buildDestructureIdMap(idToPathMap, baseAccessor, plugins) {
 			}
 			if (pathInfo.dynamic) {
 				const node = idMap[id] = createSimpleExpression(path);
-				node.ast = (0, import_lib.parseExpression)(`(${path})`, { plugins: plugins ? [...plugins, "typescript"] : ["typescript"] });
+				node.ast = (0, import_lib.parseExpression)(`(${path})`, getParserOptions(plugins));
 			} else idMap[id] = path;
 		} else idMap[id] = path;
 	});
 	return idMap;
 }
-function matchPatterns(render, keyProp, idMap) {
+function matchPatterns(render, keyProp, idMap, context) {
 	const selectorPatterns = [];
 	const keyOnlyBindingPatterns = [];
 	const removedEffectIndexes = [];
 	render.effect = render.effect.filter((effect, index) => {
 		if (keyProp !== void 0) {
-			const selector = matchSelectorPattern(effect, keyProp.content, idMap);
+			const selector = matchSelectorPattern(effect, keyProp.content, idMap, context);
 			if (selector) {
 				selectorPatterns.push(selector);
 				removedEffectIndexes.push(index);
@@ -25985,7 +25989,7 @@ function matchKeyOnlyBindingPattern(effect, key) {
 		}
 	}
 }
-function matchSelectorPattern(effect, key, idMap) {
+function matchSelectorPattern(effect, key, idMap, context) {
 	if (effect.expressions.length === 1) {
 		const { ast, content } = effect.expressions[0];
 		if (typeof ast === "object" && ast) {
@@ -26010,17 +26014,11 @@ function matchSelectorPattern(effect, key, idMap) {
 				}, false);
 				if (!hasExtraId) {
 					const name = content.slice(selector.start - 1, selector.end - 1);
+					const selectorExpression = createSimpleExpression(name, false, selector.loc);
+					selectorExpression.ast = (0, import_lib.parseExpression)(`(${name})`, getParserOptions(context.options.expressionPlugins));
 					return {
 						effect,
-						selector: {
-							content: name,
-							ast: extend({}, selector, {
-								start: 1,
-								end: name.length + 1
-							}),
-							loc: selector.loc,
-							isStatic: false
-						}
+						selector: selectorExpression
 					};
 				}
 			}
@@ -26082,6 +26080,7 @@ const helpers = {
 	setText: { name: "setText" },
 	setHtml: { name: "setHtml" },
 	setClass: { name: "setClass" },
+	setClassName: { name: "setClassName" },
 	setStyle: { name: "setStyle" },
 	setValue: { name: "setValue" },
 	setAttr: {
@@ -26101,9 +26100,132 @@ function genSetProp(oper, context) {
 	const { helper } = context;
 	const { prop: { key, values, modifier }, tag } = oper;
 	const resolvedHelper = getRuntimeHelper(tag, key.content, modifier);
+	if (key.content === "class" && !resolvedHelper.isSVG && resolvedHelper.name === "setClass") {
+		const className = genSetClassName(oper, context);
+		if (className) return className;
+	}
 	const propValue = genPropValue(values, context);
 	return [NEWLINE, ...genCall([helper(resolvedHelper.name), null], `n${oper.element}`, resolvedHelper.needKey ? genExpression(key, context) : false, propValue, resolvedHelper.isSVG && "true")];
 }
+const MAX_CLASS_NAME_ENTRIES = 31;
+function genSetClassName(oper, context) {
+	const info = resolveClassName(oper.prop.values, context);
+	if (!info) return;
+	const { helper } = context;
+	const flags = genClassFlags(info.entries, context);
+	const classFragments = info.entries.map((entry) => JSON.stringify(!info.prefix && info.entries.length === 1 ? entry.className : ` ${entry.className}`));
+	const fragments = classFragments.length === 1 ? classFragments[0] : genMulti(DELIMITERS_ARRAY, ...classFragments);
+	return [NEWLINE, ...genCall([helper("setClassName"), "\"\""], `n${oper.element}`, flags, fragments, info.prefix && JSON.stringify(info.prefix), info.suffix && JSON.stringify(info.suffix))];
+}
+function resolveClassName(values, context) {
+	let prefix = "";
+	let suffix = "";
+	const entries = [];
+	let sawDynamic = false;
+	let sawSuffix = false;
+	for (const value of values) {
+		const staticValue = getLiteralExpressionValue(value, true);
+		if (staticValue != null) {
+			const normalized = normalizeClass(staticValue);
+			if (normalized) if (sawSuffix) suffix = appendClass(suffix, normalized);
+			else if (sawDynamic) {
+				sawSuffix = true;
+				suffix = appendClass(suffix, normalized);
+			} else prefix = appendClass(prefix, normalized);
+			continue;
+		}
+		const ast = value.ast;
+		if (!ast || sawSuffix) return;
+		sawDynamic = true;
+		if (ast.type === "ObjectExpression") {
+			if (!resolveObjectClassName(value, ast, entries, context)) return;
+		} else if (ast.type === "ConditionalExpression") {
+			if (!resolveConditionalClassName(value, ast, entries, context)) return;
+		} else return;
+	}
+	return entries.length && entries.length <= MAX_CLASS_NAME_ENTRIES ? {
+		prefix,
+		suffix,
+		entries
+	} : void 0;
+}
+function resolveObjectClassName(source, ast, entries, context) {
+	for (const prop of ast.properties) {
+		if (prop.type !== "ObjectProperty" || prop.computed) return false;
+		const rawClassName = getObjectPropertyName(prop);
+		if (rawClassName == null) return false;
+		const className = normalizeClass(rawClassName);
+		if (!className) continue;
+		const value = getBooleanValue(prop.value);
+		entries.push({
+			className,
+			value,
+			condition: value == null ? createSubExpression(source, prop.value, context) : void 0
+		});
+	}
+	return true;
+}
+function resolveConditionalClassName(source, ast, entries, context) {
+	const consequent = getStringClassValue(ast.consequent);
+	const alternate = getStringClassValue(ast.alternate);
+	if (consequent && alternate === "") {
+		entries.push({
+			className: consequent,
+			condition: createSubExpression(source, ast.test, context)
+		});
+		return true;
+	} else if (alternate && consequent === "") {
+		entries.push({
+			className: alternate,
+			condition: createSubExpression(source, ast.test, context),
+			negate: true
+		});
+		return true;
+	}
+	return false;
+}
+function genClassFlags(entries, context) {
+	const values = [];
+	entries.forEach((entry, index) => {
+		if (index) values.push(" | ");
+		const bit = 1 << index;
+		if (entry.value != null) {
+			values.push(entry.value ? String(bit) : "0");
+			return;
+		}
+		values.push("(", ...genExpression(entry.condition, context), entry.negate ? ` ? 0 : ${bit}` : ` ? ${bit} : 0`, ")");
+	});
+	return values;
+}
+function appendClass(base, value) {
+	return base ? value ? `${base} ${value}` : base : value;
+}
+function getObjectPropertyName(prop) {
+	const key = prop.key;
+	if (key.type === "Identifier") return key.name;
+	else if (key.type === "StringLiteral") return key.value;
+	else if (key.type === "NumericLiteral") return String(key.value);
+}
+function getStringClassValue(node) {
+	if (node.type === "StringLiteral") return normalizeClass(node.value);
+	else if (node.type === "TemplateLiteral" && node.expressions.length === 0) return normalizeClass(node.quasis[0].value.cooked || "");
+	else if (node.type === "NullLiteral" || node.type === "BooleanLiteral" && !node.value) return "";
+}
+function getBooleanValue(node) {
+	if (node.type === "BooleanLiteral") return node.value;
+}
+function createSubExpression(source, node, context) {
+	const start = node.start == null ? 0 : node.start - 1;
+	const end = node.end == null ? source.content.length : node.end - 1;
+	const content = source.content.slice(start, end);
+	const expression = createSimpleExpression(content, false, {
+		start: advancePositionWithClone(source.loc.start, source.content, start),
+		end: advancePositionWithClone(source.loc.start, source.content, end),
+		source: content
+	});
+	expression.ast = isSimpleIdentifier(content) ? null : (0, import_lib.parseExpression)(`(${content})`, getParserOptions(context.options.expressionPlugins));
+	return expression;
+}
 function genDynamicProps$1(oper, context) {
 	const { helper } = context;
 	const isSVG = isSVGTag(oper.tag);
@@ -26513,11 +26635,23 @@ function genDynamicSlot(slot, context, withFunction = false) {
 			frag = genConditionalSlot(slot, context);
 			break;
 	}
-	return withFunction ? [
+	if (!withFunction) return frag;
+	return needsDynamicSlotSourceCtx(slot) ? [
+		`${context.helper("withVaporCtx")}(() => (`,
+		...frag,
+		"))"
+	] : [
 		"() => (",
 		...frag,
 		")"
-	] : frag;
+	];
+}
+function needsDynamicSlotSourceCtx(slot) {
+	switch (slot.slotType) {
+		case 1: return needsVaporCtx(slot.fn);
+		case 2: return needsVaporCtx(slot.fn);
+		case 3: return needsDynamicSlotSourceCtx(slot.positive) || (slot.negative ? needsDynamicSlotSourceCtx(slot.negative) : false);
+	}
 }
 function genBasicDynamicSlot(slot, context) {
 	const { name, fn } = slot;
@@ -27072,11 +27206,35 @@ function canOmitEndTag(node, context) {
 	const { block, parent } = context;
 	if (!parent) return false;
 	if (block !== parent.block) return true;
+	if (context.templateCloseTags && (context.templateCloseTags.has(node.tag) || isAlwaysCloseTag(node.tag) || isFormattingTag(node.tag)) || context.templateCloseBlocks && isBlockTag(node.tag)) return false;
 	if (isAlwaysCloseTag(node.tag) && !context.isOnRightmostPath) return false;
 	if (isFormattingTag(node.tag) || parent.node.type === 1 && node.tag === parent.node.tag) return context.isOnRightmostPath;
-	if (isBlockTag(node.tag) && context.hasInlineAncestorNeedingClose) return false;
 	return context.isLastEffectiveChild;
 }
+function getChildTemplateCloseState(context) {
+	const { node } = context;
+	if (node.type !== 1 || node.tagType !== 0 || shouldUseCreateElement(node, context)) return;
+	const inSameTemplateAsParent = isInSameTemplateAsParent(context);
+	const inheritedTags = inSameTemplateAsParent ? context.templateCloseTags : void 0;
+	const inheritedBlocks = inSameTemplateAsParent && context.templateCloseBlocks;
+	if (context.root === context.effectiveParent || canOmitEndTag(node, context) || isVoidTag(node.tag)) return inheritedTags || inheritedBlocks ? {
+		tags: inheritedTags,
+		blocks: inheritedBlocks
+	} : void 0;
+	const tags = new Set(inheritedTags);
+	tags.add(node.tag);
+	return {
+		tags,
+		blocks: inheritedBlocks || isInlineTag(node.tag)
+	};
+}
+function isInSameTemplateAsParent(context) {
+	const { parent, node, block } = context;
+	if (!parent || block !== parent.block) return false;
+	const parentNode = parent.node;
+	if (parentNode.type !== 1 || parentNode.tagType !== 0) return false;
+	return !shouldUseCreateElement(parentNode, parent) && isValidHTMLNesting(parentNode.tag, node.tag);
+}
 function isSingleRoot(context) {
 	if (context.inVFor) return false;
 	let { parent } = context;
@@ -27340,8 +27498,12 @@ const transformChildren = (node, context) => {
 	const isFragment = node.type === 0 || node.type === 1 && (node.tagType === 3 || node.tagType === 1);
 	if (!isFragment && node.type !== 1) return;
 	const useCreateElement = node.type === 1 && shouldUseCreateElement(node, context);
+	const childTemplateCloseState = !isFragment && !useCreateElement ? getChildTemplateCloseState(context) : void 0;
 	for (const [i, child] of node.children.entries()) {
 		const childContext = context.create(child, i);
+		const isInSameTemplate = childTemplateCloseState && child.type === 1 && child.tagType === 0 && isInSameTemplateAsParent(childContext);
+		childContext.templateCloseTags = isInSameTemplate ? childTemplateCloseState.tags : void 0;
+		childContext.templateCloseBlocks = isInSameTemplate ? childTemplateCloseState.blocks : false;
 		transformNode(childContext);
 		const childDynamic = childContext.dynamic;
 		if (isFragment) {
@@ -30400,7 +30562,7 @@ var require_document = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	Document.default = Document;
 }));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/objectWithoutPropertiesLoose.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/objectWithoutPropertiesLoose.js
 function _objectWithoutPropertiesLoose(r, e) {
 	if (null == r) return {};
 	var t = {};
@@ -30412,7 +30574,7 @@ function _objectWithoutPropertiesLoose(r, e) {
 }
 var init_objectWithoutPropertiesLoose = __esmMin((() => {}));
 //#endregion
-//#region \0@oxc-project+runtime@0.128.0/helpers/objectWithoutProperties.js
+//#region \0@oxc-project+runtime@0.129.0/helpers/objectWithoutProperties.js
 function _objectWithoutProperties(e, t) {
 	if (null == e) return {};
 	var o, r, i = _objectWithoutPropertiesLoose(e, t);
@@ -41151,7 +41313,7 @@ function compileScript(sfc, options) {
 	if (emitsDecl) runtimeOptions += `\n  emits: ${emitsDecl},`;
 	if (vapor && !ssr && sfc.template && !sfc.template.src) {
 		var _options$templateOpti2;
-		runtimeOptions += `\n  __multiRoot: ${isMultiRoot(sfc.template.ast, (_options$templateOpti2 = options.templateOptions) === null || _options$templateOpti2 === void 0 ? void 0 : _options$templateOpti2.compilerOptions)},`;
+		if (isMultiRoot(sfc.template.ast, (_options$templateOpti2 = options.templateOptions) === null || _options$templateOpti2 === void 0 ? void 0 : _options$templateOpti2.compilerOptions)) runtimeOptions += `\n  __multiRoot: true,`;
 	}
 	let definedOptions = "";
 	if (ctx.optionsRuntimeDecl) definedOptions = scriptSetup.content.slice(ctx.optionsRuntimeDecl.start, ctx.optionsRuntimeDecl.end).trim();
@@ -41309,7 +41471,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
 init_objectSpread2();
-const version = "3.6.0-beta.11";
+const version = "3.6.0-beta.12";
 const parseCache = parseCache$1;
 const errorMessages = _objectSpread2(_objectSpread2({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.6.0-beta.11",
+  "version": "3.6.0-beta.12",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -47,11 +47,11 @@
     "magic-string": "^0.30.21",
     "postcss": "^8.5.14",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-core": "3.6.0-beta.11",
-    "@vue/compiler-dom": "3.6.0-beta.11",
-    "@vue/compiler-vapor": "3.6.0-beta.11",
-    "@vue/compiler-ssr": "3.6.0-beta.11",
-    "@vue/shared": "3.6.0-beta.11"
+    "@vue/compiler-core": "3.6.0-beta.12",
+    "@vue/compiler-dom": "3.6.0-beta.12",
+    "@vue/compiler-ssr": "3.6.0-beta.12",
+    "@vue/shared": "3.6.0-beta.12",
+    "@vue/compiler-vapor": "3.6.0-beta.12"
   },
   "devDependencies": {
     "@babel/types": "^7.29.0",