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

package/dist/compiler-vapor.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-vapor v3.6.0-beta.11
+  * @vue/compiler-vapor v3.6.0-beta.12
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -248,7 +248,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;
@@ -374,11 +375,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 && (0, _vue_shared.isInlineTag)(this.node.tag)) hasInlineAncestorNeedingClose = true;
-		}
 		return Object.assign(Object.create(TransformContext.prototype), this, {
 			node,
 			parent: this,
@@ -393,7 +389,8 @@ var TransformContext = class TransformContext {
 			effectiveParent,
 			isLastEffectiveChild,
 			isOnRightmostPath,
-			hasInlineAncestorNeedingClose
+			templateCloseTags: this.templateCloseTags,
+			templateCloseBlocks: this.templateCloseBlocks
 		});
 	}
 	shiftEffectBoundaries(index, dynamic = this.dynamic) {
@@ -586,6 +583,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;
@@ -968,9 +968,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, _babel_parser.parseExpression)(`(${content})`, options);
+	return (0, _babel_parser.parseExpression)(`(${content})`, getParserOptions(context.options.expressionPlugins));
 }
 function genVarName(exp) {
 	return `${exp.replace(/[^a-zA-Z0-9]/g, "_").replace(/_+/g, "_").replace(/_+$/, "")}`;
@@ -1148,16 +1146,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 = [];
@@ -1166,7 +1160,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, `})`);
 			}
@@ -1182,11 +1176,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;
@@ -1272,19 +1269,19 @@ function buildDestructureIdMap(idToPathMap, baseAccessor, plugins) {
 			}
 			if (pathInfo.dynamic) {
 				const node = idMap[id] = (0, _vue_compiler_dom.createSimpleExpression)(path);
-				node.ast = (0, _babel_parser.parseExpression)(`(${path})`, { plugins: plugins ? [...plugins, "typescript"] : ["typescript"] });
+				node.ast = (0, _babel_parser.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);
@@ -1323,7 +1320,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) {
@@ -1348,17 +1345,11 @@ function matchSelectorPattern(effect, key, idMap) {
 				}, false);
 				if (!hasExtraId) {
 					const name = content.slice(selector.start - 1, selector.end - 1);
+					const selectorExpression = (0, _vue_compiler_dom.createSimpleExpression)(name, false, selector.loc);
+					selectorExpression.ast = (0, _babel_parser.parseExpression)(`(${name})`, getParserOptions(context.options.expressionPlugins));
 					return {
 						effect,
-						selector: {
-							content: name,
-							ast: (0, _vue_shared.extend)({}, selector, {
-								start: 1,
-								end: name.length + 1
-							}),
-							loc: selector.loc,
-							isStatic: false
-						}
+						selector: selectorExpression
 					};
 				}
 			}
@@ -1420,6 +1411,7 @@ const helpers = {
 	setText: { name: "setText" },
 	setHtml: { name: "setHtml" },
 	setClass: { name: "setClass" },
+	setClassName: { name: "setClassName" },
 	setStyle: { name: "setStyle" },
 	setValue: { name: "setValue" },
 	setAttr: {
@@ -1439,9 +1431,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 = (0, _vue_shared.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 = (0, _vue_shared.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 (0, _vue_shared.normalizeClass)(node.value);
+	else if (node.type === "TemplateLiteral" && node.expressions.length === 0) return (0, _vue_shared.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 = (0, _vue_compiler_dom.createSimpleExpression)(content, false, {
+		start: (0, _vue_compiler_dom.advancePositionWithClone)(source.loc.start, source.content, start),
+		end: (0, _vue_compiler_dom.advancePositionWithClone)(source.loc.start, source.content, end),
+		source: content
+	});
+	expression.ast = (0, _vue_compiler_dom.isSimpleIdentifier)(content) ? null : (0, _babel_parser.parseExpression)(`(${content})`, getParserOptions(context.options.expressionPlugins));
+	return expression;
+}
 function genDynamicProps$1(oper, context) {
 	const { helper } = context;
 	const isSVG = (0, _vue_shared.isSVGTag)(oper.tag);
@@ -1851,11 +1966,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;
@@ -2409,11 +2536,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) || (0, _vue_shared.isAlwaysCloseTag)(node.tag) || (0, _vue_shared.isFormattingTag)(node.tag)) || context.templateCloseBlocks && (0, _vue_shared.isBlockTag)(node.tag)) return false;
 	if ((0, _vue_shared.isAlwaysCloseTag)(node.tag) && !context.isOnRightmostPath) return false;
 	if ((0, _vue_shared.isFormattingTag)(node.tag) || parent.node.type === 1 && node.tag === parent.node.tag) return context.isOnRightmostPath;
-	if ((0, _vue_shared.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) || (0, _vue_shared.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 || (0, _vue_shared.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) && (0, _vue_compiler_dom.isValidHTMLNesting)(parentNode.tag, node.tag);
+}
 function isSingleRoot(context) {
 	if (context.inVFor) return false;
 	let { parent } = context;
@@ -2677,8 +2828,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) {

package/dist/compiler-vapor.d.ts

@@ -25319,7 +25319,9 @@ declare class VaporFragment<T extends Block$1 = Block$1> implements TransitionOp
   protected runWithRenderCtx<R>(fn: () => R, scope?: EffectScope): R;
 }
 declare class ForFragment extends VaporFragment<Block$1[]> {
+  resetListeners?: (() => void)[];
   constructor(nodes: Block$1[]);
+  onReset(fn: () => void): void;
 }
 declare class DynamicFragment extends VaporFragment {
   anchor: Node;
@@ -25341,8 +25343,10 @@ declare class DynamicFragment extends VaporFragment {
 }
 interface SlotBoundaryContext {
   parent: SlotBoundaryContext | null;
-  getLocalFallback: () => BlockFn | undefined;
+  getFallback: () => BlockFn | undefined;
+  run<R>(fn: () => R, scope?: EffectScope): R;
   markDirty: () => void;
+  redirected?: SlotBoundaryContext;
 }
 declare function isFragment(val: NonNullable<unknown>): val is VaporFragment;
 //#endregion
@@ -25366,9 +25370,8 @@ declare function insert$1(block: Block$1, parent: ParentNode & {
 declare function prepend(parent: ParentNode, ...blocks: Block$1[]): void;
 declare function remove(block: Block$1, parent?: ParentNode): void;
 //#endregion
-//#region packages/runtime-vapor/src/vdomInterop.d.ts
+//#region packages/runtime-vapor/src/vdomInteropState.d.ts
 declare const interopKey: unique symbol;
-declare const vaporInteropPlugin: Plugin;
 //#endregion
 //#region packages/runtime-vapor/src/componentProps.d.ts
 type RawProps = Record<string, () => unknown> & {
@@ -25648,6 +25651,9 @@ declare const createVaporSSRApp: CreateAppFunction<ParentNode, VaporComponent>;
 //#region packages/runtime-vapor/src/apiDefineAsyncComponent.d.ts
 declare function defineVaporAsyncComponent<T extends VaporComponent>(source: AsyncComponentLoader<T> | AsyncComponentOptions<T>): T;
 //#endregion
+//#region packages/runtime-vapor/src/vdomInterop.d.ts
+declare const vaporInteropPlugin: Plugin;
+//#endregion
 //#region packages/runtime-vapor/src/directives/custom.d.ts
 type VaporDirective = (node: Element | VaporComponentInstance, value?: () => any, argument?: string, modifiers?: DirectiveModifiers) => (() => void) | void;
 type VaporDirectiveArguments = Array<[VaporDirective | undefined] | [VaporDirective | undefined, () => any] | [VaporDirective | undefined, (() => any) | undefined, argument: string] | [VaporDirective | undefined, value: (() => any) | undefined, argument: string | undefined, modifiers: DirectiveModifiers]>;
@@ -25742,6 +25748,7 @@ type TargetElement = Element & {
   $root?: true;
   $html?: string;
   $cls?: string;
+  $clsFlags?: number;
   $sty?: NormalizedStyle | string | undefined;
   value?: string;
   _value?: any;
@@ -25749,7 +25756,8 @@ type TargetElement = Element & {
 declare function setProp(el: any, key: string, value: any): void;
 declare function setAttr(el: any, key: string, value: any, isSVG?: boolean): void;
 declare function setDOMProp(el: any, key: string, value: any, forceHydrate?: boolean, attrName?: string): void;
-declare function setClass(el: TargetElement, value: any, isSVG?: boolean): void;
+declare function setClass(el: TargetElement, value: any, isSVG?: boolean, isNormalized?: boolean): void;
+declare function setClassName(el: TargetElement, flags: number, cls: string | string[], prefix?: string, suffix?: string): void;
 declare function setStyle(el: TargetElement, value: any): void;
 declare function setValue(el: TargetElement, value: any, forceHydrate?: boolean): void;
 /**
@@ -25802,9 +25810,29 @@ declare function createKeyedFragment(key: () => any, render: BlockFn): Block$1;
 //#endregion
 //#region packages/runtime-vapor/src/apiCreateFor.d.ts
 type Source = any[] | Record<any, any> | number | Set<any> | Map<any, any>;
-declare const createFor: (src: () => Source, renderItem: (item: ShallowRef<any>, key: ShallowRef<any>, index: ShallowRef<number | undefined>) => Block$1, getKey?: (item: any, key: any, index?: number) => any, flags?: number, setup?: (_: {
-  createSelector: (source: () => any) => (cb: () => void) => void;
-}) => void) => ForFragment;
+declare const createFor: (src: () => Source, renderItem: (item: ShallowRef<any>, key: ShallowRef<any>, index: ShallowRef<number | undefined>) => Block$1, getKey?: (item: any, key: any, index?: number) => any, flags?: number) => ForFragment;
+interface ForSelector {
+  (key: any, oper: () => void): void;
+  /**
+  * Bulk-reset the selector's internal state. Hook into a v-for's fast-reset
+  * paths via `forFragment.onReset(selector.reset)` so the lazy per-item
+  * `onScopeDispose` teardowns short-circuit instead of doing N individual
+  * Map.delete() calls.
+  */
+  reset(): void;
+}
+/**
+* Builds a key-indexed selector that activates only the opers registered with
+* the key matching the current source value. Compared to letting each item
+* subscribe directly, this keeps re-renders on source change O(2) instead of
+* O(N) (only previous and new active item re-run).
+*
+* Selector cleanup follows the current scope. Per-item teardown is auto-wired
+* via `onScopeDispose` so callers (typically v-for item scopes) don't need
+* explicit deregistration. For bulk-reset hot paths, attach the selector to
+* the v-for via `frag.onReset(selector.reset)` to skip the per-item Map ops.
+*/
+declare function createSelector(source: () => any): ForSelector;
 declare function createForSlots(rawSource: Source, getSlot: (item: any, key: any, index?: number) => DynamicSlot): DynamicSlot[];
 declare function getRestElement(val: any, keys: string[]): any;
 declare function getDefaultValue(val: any, defaultVal: any): any;
@@ -25840,7 +25868,7 @@ declare const VaporTransition: FunctionalVaporComponent<TransitionProps>;
 //#region packages/runtime-vapor/src/components/TransitionGroup.d.ts
 declare const VaporTransitionGroup: DefineVaporComponent<{}, string, TransitionGroupProps>;
 declare namespace index_d_exports {
-  export { Block$1 as Block, DefineVaporComponent, DynamicFragment, FunctionalVaporComponent, VaporComponent, VaporComponentInstance, VaporComponentOptions, VaporDirective, VaporElement, VaporElementConstructor, VaporFragment, VaporKeepAlive, VaporKeepAliveContext, VaporPublicProps, VaporRenderResult, VaporSlot, VaporTeleport, VaporTransition, VaporTransitionGroup, VaporTransitionHooks, applyCheckboxModel, applyDynamicModel, applyRadioModel, applySelectModel, applyTextModel, applyVShow, child, createComponent, createComponentWithFallback, createDynamicComponent, createFor, createForSlots, createIf, createInvoker, createKeyedFragment, createPlainElement, createSlot, createTemplateRefSetter, createTextNode, createVaporApp, createVaporSSRApp, defineVaporAsyncComponent, defineVaporComponent, defineVaporCustomElement, defineVaporSSRCustomElement, delegate, delegateEvents, getDefaultValue, getRestElement, insert$1 as insert, isFragment, isVaporComponent, next, nthChild, on, prepend, remove, renderEffect, setAttr, setBlockHtml, setBlockKey, setBlockText, setClass, setDOMProp, setDynamicEvents, setDynamicProps, setElementText, setHtml, setInsertionState, setProp, setStyle, setText, setValue, template, txt, useVaporCssVars, vaporInteropPlugin, withAsyncContext, withVaporCtx, withVaporDirectives };
+  export { Block$1 as Block, DefineVaporComponent, DynamicFragment, FunctionalVaporComponent, VaporComponent, VaporComponentInstance, VaporComponentOptions, VaporDirective, VaporElement, VaporElementConstructor, VaporFragment, VaporKeepAlive, VaporKeepAliveContext, VaporPublicProps, VaporRenderResult, VaporSlot, VaporTeleport, VaporTransition, VaporTransitionGroup, VaporTransitionHooks, applyCheckboxModel, applyDynamicModel, applyRadioModel, applySelectModel, applyTextModel, applyVShow, child, createComponent, createComponentWithFallback, createDynamicComponent, createFor, createForSlots, createIf, createInvoker, createKeyedFragment, createPlainElement, createSelector, createSlot, createTemplateRefSetter, createTextNode, createVaporApp, createVaporSSRApp, defineVaporAsyncComponent, defineVaporComponent, defineVaporCustomElement, defineVaporSSRCustomElement, delegate, delegateEvents, getDefaultValue, getRestElement, insert$1 as insert, isFragment, isVaporComponent, next, nthChild, on, prepend, remove, renderEffect, setAttr, setBlockHtml, setBlockKey, setBlockText, setClass, setClassName, setDOMProp, setDynamicEvents, setDynamicProps, setElementText, setHtml, setInsertionState, setProp, setStyle, setText, setValue, template, txt, useVaporCssVars, vaporInteropPlugin, withAsyncContext, withVaporCtx, withVaporDirectives };
 }
 //#endregion
 //#region temp/packages/compiler-vapor/src/ir/component.d.ts
@@ -28077,7 +28105,8 @@ export declare class TransformContext<T extends AllNode = AllNode> {
   operationIndex: number;
   isLastEffectiveChild: boolean;
   isOnRightmostPath: boolean;
-  hasInlineAncestorNeedingClose: boolean;
+  templateCloseTags: Set<string> | undefined;
+  templateCloseBlocks: boolean;
   private globalId;
   private nextIdMap;
   private ifIndex;

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-vapor v3.6.0-beta.11
+  * @vue/compiler-vapor v3.6.0-beta.12
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -39,6 +39,7 @@ const remove = (arr, el) => {
 };
 const isArray$1 = Array.isArray;
 const isString = (val) => typeof val === "string";
+const isObject = (val) => val !== null && typeof val === "object";
 const isBuiltInDirective = /* @__PURE__ */ makeMap("bind,cloak,else-if,else,for,html,if,model,on,once,pre,show,slot,text,memo");
 const cacheStringFunction = (fn) => {
 	const cache = Object.create(null);
@@ -82,6 +83,20 @@ function canSetValueDirectly(tagName) {
 }
 const isGloballyAllowed = /* @__PURE__ */ makeMap("Infinity,undefined,NaN,isFinite,isNaN,parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,BigInt,console,Error,Symbol");
 //#endregion
+//#region packages/shared/src/normalizeProp.ts
+function normalizeClass(value) {
+	let res = "";
+	if (isString(value)) res = value;
+	else if (isArray$1(value)) for (let i = 0; i < value.length; i++) {
+		const normalized = normalizeClass(value[i]);
+		if (normalized) res += normalized + " ";
+	}
+	else if (isObject(value)) {
+		for (const name in value) if (value[name]) res += name + " ";
+	}
+	return res.trim();
+}
+//#endregion
 //#region packages/shared/src/domTagConfig.ts
 const HTML_TAGS = "html,body,base,head,link,meta,style,title,address,article,aside,footer,header,hgroup,h1,h2,h3,h4,h5,h6,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,summary,template,blockquote,iframe,tfoot";
 const SVG_TAGS = "svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,feDistantLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,text,textPath,title,tspan,unknown,use,view";
@@ -515,6 +530,12 @@ var toString = {}.toString;
 var isArray = Array.isArray || function(arr) {
 	return toString.call(arr) == "[object Array]";
 };
+/*!
+* The buffer module from node.js, for the browser.
+*
+* @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+* @license  MIT
+*/
 /**
 * If `Buffer.TYPED_ARRAY_SUPPORT`:
 *   === true    Use Uint8Array implementation (fastest)
@@ -19114,7 +19135,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;
@@ -19240,11 +19262,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,
@@ -19259,7 +19276,8 @@ var TransformContext = class TransformContext {
 			effectiveParent,
 			isLastEffectiveChild,
 			isOnRightmostPath,
-			hasInlineAncestorNeedingClose
+			templateCloseTags: this.templateCloseTags,
+			templateCloseBlocks: this.templateCloseBlocks
 		});
 	}
 	shiftEffectBoundaries(index, dynamic = this.dynamic) {
@@ -19453,6 +19471,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;
@@ -19835,9 +19856,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(/_+$/, "")}`;
@@ -20015,16 +20034,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 = [];
@@ -20033,7 +20048,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, `})`);
 			}
@@ -20049,11 +20064,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;
@@ -20139,19 +20157,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);
@@ -20190,7 +20208,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) {
@@ -20215,17 +20233,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
 					};
 				}
 			}
@@ -20287,6 +20299,7 @@ const helpers = {
 	setText: { name: "setText" },
 	setHtml: { name: "setHtml" },
 	setClass: { name: "setClass" },
+	setClassName: { name: "setClassName" },
 	setStyle: { name: "setStyle" },
 	setValue: { name: "setValue" },
 	setAttr: {
@@ -20306,9 +20319,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);
@@ -20718,11 +20854,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;
@@ -21248,7 +21396,7 @@ const transformVBind = (dir, node, context) => {
 	};
 };
 //#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) {
@@ -21258,7 +21406,7 @@ function _typeof(o) {
 	}, _typeof(o);
 }
 //#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];
@@ -21270,13 +21418,13 @@ function toPrimitive(t, r) {
 	return ("string" === r ? String : Number)(t);
 }
 //#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 + "";
 }
 //#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,
@@ -21286,7 +21434,7 @@ function _defineProperty(e, r, t) {
 	}) : e[r] = t, e;
 }
 //#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) {
@@ -21337,11 +21485,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;
@@ -21605,8 +21777,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) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@vue/compiler-vapor",
-  "version": "3.6.0-beta.11",
+  "version": "3.6.0-beta.12",
   "description": "@vue/compiler-vapor",
   "main": "dist/compiler-vapor.cjs.js",
-  "module": "dist/compiler-vapor.esm-bundler.js",
+  "module": "dist/compiler-vapor.esm-browser.js",
   "types": "dist/compiler-vapor.d.ts",
   "files": [
     "dist"
@@ -45,7 +45,7 @@
     "@babel/parser": "^7.29.3",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-dom": "3.6.0-beta.11",
-    "@vue/shared": "3.6.0-beta.11"
+    "@vue/compiler-dom": "3.6.0-beta.12",
+    "@vue/shared": "3.6.0-beta.12"
   }
 }