@vue/compiler-vapor 3.6.0-beta.14 → 3.6.0-beta.15

package/dist/compiler-vapor.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-vapor v3.6.0-beta.14
+  * @vue/compiler-vapor v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -193,6 +193,13 @@ function getLiteralExpressionValue(exp, excludeNumber) {
 	}
 	return exp.isStatic ? exp.content : null;
 }
+function isInTransition(context) {
+	const parentNode = context.parent && context.parent.node;
+	return !!(parentNode && isTransitionNode(parentNode));
+}
+function isTransitionNode(node) {
+	return node.type === 1 && isTransitionTag(node.tag);
+}
 function isTransitionTag(tag) {
 	tag = tag.toLowerCase();
 	return tag === "transition" || tag === "vaportransition";
@@ -424,6 +431,7 @@ const defaultOptions = {
 	bindingMetadata: _vue_shared.EMPTY_OBJ,
 	inline: false,
 	isTS: false,
+	eventDelegation: true,
 	onError: _vue_compiler_dom.defaultOnError,
 	onWarn: _vue_compiler_dom.defaultOnWarn
 };
@@ -2977,7 +2985,6 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 	let template = "";
 	template += `<${tag}`;
 	if (scopeId) template += ` ${scopeId}`;
-	const dynamicProps = [];
 	if (propsResult[0]) {
 		const [, dynamicArgs, expressions] = propsResult;
 		context.registerEffect(expressions, {
@@ -2998,54 +3005,24 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 		};
 		for (const prop of propsResult[1]) {
 			const { key, values } = prop;
+			let foldedValue;
 			if (context.imports.some((imported) => values[0].content.includes(imported.exp.content))) {
 				if (!prevWasQuoted) template += ` `;
 				template += `${key.content}="${IMPORT_EXP_START}${values[0].content}${IMPORT_EXP_END}"`;
 				prevWasQuoted = true;
-			} else if (key.isStatic && !prop.modifier && (0, _vue_shared.isBooleanAttr)(key.content)) if (values.length === 1 && (values[0].isStatic || values[0].content === "''") && !dynamicKeys.includes(key.content)) {
-				const value = values[0].content === "''" ? "" : values[0].content;
-				appendTemplateProp(key.content, value);
-			} else {
-				const include = foldBooleanAttrValue(values);
-				if (include != null) {
-					if (include) appendTemplateProp(key.content);
-				} else {
-					dynamicProps.push(key.content);
-					context.registerEffect(values, {
-						type: 3,
-						element: context.reference(),
-						prop,
-						tag
-					}, getEffectIndex);
-				}
-			}
-			else if (key.isStatic && !prop.modifier && hasBoundValue(values)) {
-				let foldedValue;
-				if (key.content === "class") foldedValue = foldClassValues(values);
-				else if (key.content === "style") foldedValue = foldStyleValues(values);
-				if (foldedValue != null) {
-					if (foldedValue) appendTemplateProp(key.content, foldedValue, true);
-				} else {
-					dynamicProps.push(key.content);
-					context.registerEffect(values, {
-						type: 3,
-						element: context.reference(),
-						prop,
-						tag
-					}, getEffectIndex);
-				}
 			} else if (key.isStatic && values.length === 1 && (values[0].isStatic || values[0].content === "''") && !dynamicKeys.includes(key.content)) {
 				const value = values[0].content === "''" ? "" : values[0].content;
 				appendTemplateProp(key.content, value);
-			} else {
-				dynamicProps.push(key.content);
-				context.registerEffect(values, {
-					type: 3,
-					element: context.reference(),
-					prop,
-					tag
-				}, getEffectIndex);
-			}
+			} else if (key.isStatic && !prop.modifier && (0, _vue_shared.isBooleanAttr)(key.content) && (foldedValue = foldBooleanAttrValue(values)) != null) {
+				if (foldedValue) appendTemplateProp(key.content);
+			} else if (key.isStatic && !prop.modifier && hasBoundValue(values) && (foldedValue = key.content === "class" ? foldClassValues(values) : key.content === "style" ? foldStyleValues(values) : void 0) != null) {
+				if (foldedValue) appendTemplateProp(key.content, foldedValue, true);
+			} else context.registerEffect(values, {
+				type: 3,
+				element: context.reference(),
+				prop,
+				tag
+			}, getEffectIndex);
 		}
 	}
 	template += `>` + context.childrenTemplate.join("");
@@ -3794,12 +3771,10 @@ const transformVOn = (dir, node, context) => {
 	const { keyModifiers, nonKeyModifiers, eventOptionModifiers } = (0, _vue_compiler_dom.resolveModifiers)(arg.isStatic ? `on${arg.content}` : arg, modifiers, null, loc);
 	let keyOverride;
 	const isStaticClick = arg.isStatic && arg.content.toLowerCase() === "click";
-	if (nonKeyModifiers.includes("middle")) {
-		if (keyOverride) {}
-		if (!isStaticClick && !arg.isStatic) keyOverride = ["click", "mouseup"];
-	}
 	if (nonKeyModifiers.includes("right")) {
 		if (!isStaticClick && !arg.isStatic) keyOverride = ["click", "contextmenu"];
+	} else if (nonKeyModifiers.includes("middle")) {
+		if (!isStaticClick && !arg.isStatic) keyOverride = ["click", "mouseup"];
 	}
 	arg = normalizeStaticEventArg(arg, nonKeyModifiers);
 	if (keyModifiers.length && (0, _vue_compiler_dom.isStaticExp)(arg) && !(0, _vue_compiler_dom.isKeyboardEvent)(`on${arg.content.toLowerCase()}`)) keyModifiers.length = 0;
@@ -3813,7 +3788,7 @@ const transformVOn = (dir, node, context) => {
 			options: eventOptionModifiers
 		}
 	};
-	const delegate = arg.isStatic && !eventOptionModifiers.length && !hasStopHandlerForStaticEvent(node, arg.content) && delegatedEvents(arg.content);
+	const delegate = context.options.eventDelegation && arg.isStatic && !eventOptionModifiers.length && !hasStopHandlerForStaticEvent(node, arg.content) && delegatedEvents(arg.content);
 	const operation = {
 		type: 6,
 		element: context.reference(),
@@ -3834,8 +3809,8 @@ function normalizeStaticEventArg(arg, nonKeyModifiers) {
 	if (!arg.isStatic) return arg;
 	let normalized = arg;
 	const isStaticClick = arg.content.toLowerCase() === "click";
-	if (nonKeyModifiers.includes("middle") && isStaticClick) normalized = (0, _vue_shared.extend)({}, normalized, { content: "mouseup" });
 	if (nonKeyModifiers.includes("right") && isStaticClick) normalized = (0, _vue_shared.extend)({}, normalized, { content: "contextmenu" });
+	else if (nonKeyModifiers.includes("middle") && isStaticClick) normalized = (0, _vue_shared.extend)({}, normalized, { content: "mouseup" });
 	return normalized;
 }
 function hasStopHandlerForStaticEvent(node, eventName) {
@@ -4035,11 +4010,14 @@ function processIf(node, dir, context) {
 		}
 		while (lastIfNode.negative && lastIfNode.negative.type === 15) lastIfNode = lastIfNode.negative;
 		if (dir.name === "else-if" && lastIfNode.negative) context.options.onError((0, _vue_compiler_dom.createCompilerError)(30, node.loc));
-		if (context.root.comment.length) {
-			node = wrapTemplate(node, ["else-if", "else"]);
-			context.node = node = (0, _vue_shared.extend)({}, node, { children: [...context.comment, ...node.children] });
+		const comments = context.comment;
+		if (comments.length) {
+			if (!isInTransition(context)) {
+				node = wrapTemplate(node, ["else-if", "else"]);
+				context.node = node = (0, _vue_shared.extend)({}, node, { children: [...comments, ...node.children] });
+			}
+			comments.length = 0;
 		}
-		context.root.comment = [];
 		const [branch, onExit] = createIfBranch(node, context);
 		if (dir.name === "else") lastIfNode.negative = branch;
 		else lastIfNode.negative = {

package/dist/compiler-vapor.d.ts

@@ -3072,7 +3072,7 @@ type AsyncComponentContext<T, C = ConcreteComponent> = {
   setPendingRequest: (request: Promise<C> | null) => void;
 };
 declare function createAsyncComponentContext<T, C = ConcreteComponent>(source: AsyncComponentLoader<T> | AsyncComponentOptions<T>): AsyncComponentContext<T, C>;
-declare const useAsyncComponentState: (delay: number | undefined, timeout: number | undefined, onError: (err: Error) => void) => {
+declare const useAsyncComponentState: (delay: number | undefined, timeout: number | undefined, onError: (err: Error) => void, instance?: GenericComponentInstance | null) => {
   loaded: Ref<boolean>;
   error: Ref<Error | undefined>;
   delayed: Ref<boolean>;
@@ -25301,12 +25301,16 @@ interface VaporKeepAliveContext {
 //#endregion
 //#region packages/runtime-vapor/src/fragment.d.ts
 declare class VaporFragment<T extends Block$1 = Block$1> implements TransitionOptions {
+  /**
+  * @internal marker for duck typing to avoid direct instanceof check
+  * which prevents tree-shaking of VaporFragment
+  */
+  readonly __vf = true;
   $key?: any;
   $transition?: VaporTransitionHooks | undefined;
   nodes: T;
   vnode?: VNode | null;
   anchor?: Node;
-  parentComponent?: GenericComponentInstance | null;
   validityPending?: boolean;
   isBlockValid?: () => boolean;
   insert?: (parent: ParentNode, anchor: Node | null, transitionHooks?: TransitionHooks) => void;
@@ -25330,6 +25334,11 @@ declare class ForFragment extends VaporFragment<Block$1[]> {
   onReset(fn: () => void): void;
 }
 declare class DynamicFragment extends VaporFragment {
+  /**
+  * @internal marker for duck typing to avoid direct instanceof check
+  * which prevents tree-shaking of DynamicFragment
+  */
+  readonly __df = true;
   anchor: Node;
   scope: EffectScope | undefined;
   current?: BlockFn;
@@ -25355,7 +25364,7 @@ interface SlotBoundaryContext {
   markDirty: () => void;
   redirected?: SlotBoundaryContext;
 }
-declare function isFragment(val: NonNullable<unknown>): val is VaporFragment;
+declare function isFragment(val: unknown): val is VaporFragment;
 //#endregion
 //#region packages/runtime-vapor/src/block.d.ts
 interface VaporTransitionHooks extends TransitionHooks {
@@ -26166,7 +26175,7 @@ interface ImportItem {
 //#region packages/compiler-core/src/transforms/transformElement.d.ts
 type PropsExpression = ObjectExpression | CallExpression | ExpressionNode;
 //#endregion
-//#region node_modules/.pnpm/@babel+types@7.29.0/node_modules/@babel/types/lib/index-legacy.d.ts
+//#region node_modules/.pnpm/@babel+types@7.29.7/node_modules/@babel/types/lib/index-legacy.d.ts
 // NOTE: This file is autogenerated. Do not modify.
 // See packages/babel-types/scripts/generators/typescript-legacy.ts for script used.
 interface BaseComment {

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-vapor v3.6.0-beta.14
+  * @vue/compiler-vapor v3.6.0-beta.15
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -16248,7 +16248,7 @@ const tokenizer = new Tokenizer(stack, {
 		}
 	},
 	oncdata(start, end) {
-		if (stack[0].ns !== 0) onText(getSlice(start, end), start, end);
+		if ((stack[0] ? stack[0].ns : currentOptions.ns) !== 0) onText(getSlice(start, end), start, end);
 		else emitError(1, start - 9);
 	},
 	onprocessinginstruction(start) {
@@ -19134,6 +19134,13 @@ function getLiteralExpressionValue(exp, excludeNumber) {
 	}
 	return exp.isStatic ? exp.content : null;
 }
+function isInTransition(context) {
+	const parentNode = context.parent && context.parent.node;
+	return !!(parentNode && isTransitionNode(parentNode));
+}
+function isTransitionNode(node) {
+	return node.type === 1 && isTransitionTag(node.tag);
+}
 function isTransitionTag(tag) {
 	tag = tag.toLowerCase();
 	return tag === "transition" || tag === "vaportransition";
@@ -19365,6 +19372,7 @@ const defaultOptions = {
 	bindingMetadata: EMPTY_OBJ,
 	inline: false,
 	isTS: false,
+	eventDelegation: true,
 	onError: defaultOnError,
 	onWarn: defaultOnWarn
 };
@@ -21977,7 +21985,6 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 	let template = "";
 	template += `<${tag}`;
 	if (scopeId) template += ` ${scopeId}`;
-	const dynamicProps = [];
 	if (propsResult[0]) {
 		const [, dynamicArgs, expressions] = propsResult;
 		context.registerEffect(expressions, {
@@ -21998,54 +22005,24 @@ function transformNativeElement(node, propsResult, staticKey, singleRoot, contex
 		};
 		for (const prop of propsResult[1]) {
 			const { key, values } = prop;
+			let foldedValue;
 			if (context.imports.some((imported) => values[0].content.includes(imported.exp.content))) {
 				if (!prevWasQuoted) template += ` `;
 				template += `${key.content}="${IMPORT_EXP_START}${values[0].content}${IMPORT_EXP_END}"`;
 				prevWasQuoted = true;
-			} else if (key.isStatic && !prop.modifier && isBooleanAttr(key.content)) if (values.length === 1 && (values[0].isStatic || values[0].content === "''") && !dynamicKeys.includes(key.content)) {
-				const value = values[0].content === "''" ? "" : values[0].content;
-				appendTemplateProp(key.content, value);
-			} else {
-				const include = foldBooleanAttrValue(values);
-				if (include != null) {
-					if (include) appendTemplateProp(key.content);
-				} else {
-					dynamicProps.push(key.content);
-					context.registerEffect(values, {
-						type: 3,
-						element: context.reference(),
-						prop,
-						tag
-					}, getEffectIndex);
-				}
-			}
-			else if (key.isStatic && !prop.modifier && hasBoundValue(values)) {
-				let foldedValue;
-				if (key.content === "class") foldedValue = foldClassValues(values);
-				else if (key.content === "style") foldedValue = foldStyleValues(values);
-				if (foldedValue != null) {
-					if (foldedValue) appendTemplateProp(key.content, foldedValue, true);
-				} else {
-					dynamicProps.push(key.content);
-					context.registerEffect(values, {
-						type: 3,
-						element: context.reference(),
-						prop,
-						tag
-					}, getEffectIndex);
-				}
 			} else if (key.isStatic && values.length === 1 && (values[0].isStatic || values[0].content === "''") && !dynamicKeys.includes(key.content)) {
 				const value = values[0].content === "''" ? "" : values[0].content;
 				appendTemplateProp(key.content, value);
-			} else {
-				dynamicProps.push(key.content);
-				context.registerEffect(values, {
-					type: 3,
-					element: context.reference(),
-					prop,
-					tag
-				}, getEffectIndex);
-			}
+			} else if (key.isStatic && !prop.modifier && isBooleanAttr(key.content) && (foldedValue = foldBooleanAttrValue(values)) != null) {
+				if (foldedValue) appendTemplateProp(key.content);
+			} else if (key.isStatic && !prop.modifier && hasBoundValue(values) && (foldedValue = key.content === "class" ? foldClassValues(values) : key.content === "style" ? foldStyleValues(values) : void 0) != null) {
+				if (foldedValue) appendTemplateProp(key.content, foldedValue, true);
+			} else context.registerEffect(values, {
+				type: 3,
+				element: context.reference(),
+				prop,
+				tag
+			}, getEffectIndex);
 		}
 	}
 	template += `>` + context.childrenTemplate.join("");
@@ -22774,12 +22751,10 @@ const transformVOn = (dir, node, context) => {
 	const { keyModifiers, nonKeyModifiers, eventOptionModifiers } = resolveModifiers(arg.isStatic ? `on${arg.content}` : arg, modifiers, null, loc);
 	let keyOverride;
 	const isStaticClick = arg.isStatic && arg.content.toLowerCase() === "click";
-	if (nonKeyModifiers.includes("middle")) {
-		if (keyOverride) {}
-		if (!isStaticClick && !arg.isStatic) keyOverride = ["click", "mouseup"];
-	}
 	if (nonKeyModifiers.includes("right")) {
 		if (!isStaticClick && !arg.isStatic) keyOverride = ["click", "contextmenu"];
+	} else if (nonKeyModifiers.includes("middle")) {
+		if (!isStaticClick && !arg.isStatic) keyOverride = ["click", "mouseup"];
 	}
 	arg = normalizeStaticEventArg(arg, nonKeyModifiers);
 	if (keyModifiers.length && isStaticExp(arg) && !isKeyboardEvent(`on${arg.content.toLowerCase()}`)) keyModifiers.length = 0;
@@ -22793,7 +22768,7 @@ const transformVOn = (dir, node, context) => {
 			options: eventOptionModifiers
 		}
 	};
-	const delegate = arg.isStatic && !eventOptionModifiers.length && !hasStopHandlerForStaticEvent(node, arg.content) && delegatedEvents(arg.content);
+	const delegate = context.options.eventDelegation && arg.isStatic && !eventOptionModifiers.length && !hasStopHandlerForStaticEvent(node, arg.content) && delegatedEvents(arg.content);
 	const operation = {
 		type: 6,
 		element: context.reference(),
@@ -22814,8 +22789,8 @@ function normalizeStaticEventArg(arg, nonKeyModifiers) {
 	if (!arg.isStatic) return arg;
 	let normalized = arg;
 	const isStaticClick = arg.content.toLowerCase() === "click";
-	if (nonKeyModifiers.includes("middle") && isStaticClick) normalized = extend({}, normalized, { content: "mouseup" });
 	if (nonKeyModifiers.includes("right") && isStaticClick) normalized = extend({}, normalized, { content: "contextmenu" });
+	else if (nonKeyModifiers.includes("middle") && isStaticClick) normalized = extend({}, normalized, { content: "mouseup" });
 	return normalized;
 }
 function hasStopHandlerForStaticEvent(node, eventName) {
@@ -23015,11 +22990,14 @@ function processIf(node, dir, context) {
 		}
 		while (lastIfNode.negative && lastIfNode.negative.type === 15) lastIfNode = lastIfNode.negative;
 		if (dir.name === "else-if" && lastIfNode.negative) context.options.onError(createCompilerError(30, node.loc));
-		if (context.root.comment.length) {
-			node = wrapTemplate(node, ["else-if", "else"]);
-			context.node = node = extend({}, node, { children: [...context.comment, ...node.children] });
+		const comments = context.comment;
+		if (comments.length) {
+			if (!isInTransition(context)) {
+				node = wrapTemplate(node, ["else-if", "else"]);
+				context.node = node = extend({}, node, { children: [...comments, ...node.children] });
+			}
+			comments.length = 0;
 		}
-		context.root.comment = [];
 		const [branch, onExit] = createIfBranch(node, context);
 		if (dir.name === "else") lastIfNode.negative = branch;
 		else lastIfNode.negative = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-vapor",
-  "version": "3.6.0-beta.14",
+  "version": "3.6.0-beta.15",
   "description": "@vue/compiler-vapor",
   "main": "dist/compiler-vapor.cjs.js",
   "module": "dist/compiler-vapor.esm-browser.js",
@@ -42,10 +42,10 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-vapor#readme",
   "dependencies": {
-    "@babel/parser": "^7.29.3",
+    "@babel/parser": "^7.29.7",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-dom": "3.6.0-beta.14",
-    "@vue/shared": "3.6.0-beta.14"
+    "@vue/shared": "3.6.0-beta.15",
+    "@vue/compiler-dom": "3.6.0-beta.15"
   }
 }