@vue/compiler-sfc 3.6.0-rc.7 → 3.6.0-rc.8

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-rc.7
+  * @vue/compiler-sfc v3.6.0-rc.8
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -15943,7 +15943,7 @@ function compileScript(sfc, options) {
 		}
 		if (preamble) ctx.s.prepend(preamble);
 		if (helpers && (helpers.has(_vue_compiler_dom.UNREF) || helpers.has("unref"))) ctx.helperImports.delete("unref");
-		returned = code;
+		returned = vapor && !ssr && hasAwait ? `return () => {${code}}` : code;
 	} else returned = `() => {}`;
 	if (!inlineMode && true) ctx.s.appendRight(endOffset, `\nconst __returned__ = ${returned}\nObject.defineProperty(__returned__, '__isScriptSetup', { enumerable: false, value: true })\nreturn __returned__\n}\n\n`);
 	else ctx.s.appendRight(endOffset, `\n${vapor && !ssr ? `` : `return `}${returned}\n}\n\n`);
@@ -16121,7 +16121,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 }
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
-const version = "3.6.0-rc.7";
+const version = "3.6.0-rc.8";
 const parseCache = parseCache$1;
 const errorMessages = {
 	..._vue_compiler_dom.errorMessages,

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

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-rc.7
+  * @vue/compiler-sfc v3.6.0-rc.8
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -25070,6 +25070,9 @@ function isTeleportTag(tag) {
 	tag = tag.toLowerCase();
 	return tag === "teleport" || tag === "vaporteleport";
 }
+function isComponentTag(tag) {
+	return tag === "component" || tag === "Component";
+}
 function isBuiltInComponent(tag) {
 	if (isTeleportTag(tag)) return "VaporTeleport";
 	else if (tag === "Suspense" || tag === "suspense") return "Suspense";
@@ -25244,6 +25247,7 @@ var TransformContext = class TransformContext {
 			node,
 			parent: this,
 			index,
+			inVOnce: this.inVOnce && !isComponentNode(this.node),
 			template: "",
 			templateRoot: false,
 			childrenTemplate: [],
@@ -25418,8 +25422,18 @@ function getNextId(map, n) {
 	if (map && map.has(n)) return map.get(n);
 	return n;
 }
+function isComponentNode(node) {
+	return node.type === 1 && node.tagType === 1;
+}
 //#endregion
 //#region packages/compiler-vapor/src/generators/utils.ts
+/**
+* Run a helper call inside the once ambient: a helper that creates its own
+* effects at a v-once site has them run once like compiled ones do.
+*/
+function genOnce(call, context) {
+	return genCall(context.helper("withOnce"), ["() => ", ...call]);
+}
 const IMPORT_EXP_START = "__IMPORT_EXP_START__";
 const IMPORT_EXP_END = "__IMPORT_EXP_END__";
 const IMPORT_EXPR_RE = new RegExp(`${IMPORT_EXP_START}(.*?)${IMPORT_EXP_END}`, "g");
@@ -26835,11 +26849,11 @@ function genGetTextChild(oper, context) {
 //#region packages/compiler-vapor/src/generators/vShow.ts
 function genVShow(oper, context) {
 	const { element } = oper;
-	return [NEWLINE, ...genCall(context.helper("applyVShow"), `n${element}`, [
+	return genCall(context.helper("applyVShow"), `n${element}`, [
 		`() => (`,
 		...genExpression(oper.dir.exp, context),
 		`)`
-	])];
+	]);
 }
 //#endregion
 //#region packages/compiler-vapor/src/generators/modifier.ts
@@ -26857,11 +26871,11 @@ const helperMap = {
 };
 function genVModel(oper, context) {
 	const { modelType, element, dir: { exp, modifiers } } = oper;
-	return [NEWLINE, ...genCall(context.helper(helperMap[modelType]), `n${element}`, [
+	return genCall(context.helper(helperMap[modelType]), `n${element}`, [
 		`() => (`,
 		...genExpression(exp, context),
 		`)`
-	], genModelHandler(exp, context), modifiers.length ? `{ ${genDirectiveModifiers(modifiers.map((e) => e.content))} }` : void 0)];
+	], genModelHandler(exp, context), modifiers.length ? `{ ${genDirectiveModifiers(modifiers.map((e) => e.content))} }` : void 0);
 }
 function genModelHandler(exp, context) {
 	return [
@@ -26873,11 +26887,17 @@ function genModelHandler(exp, context) {
 //#endregion
 //#region packages/compiler-vapor/src/generators/directive.ts
 function genBuiltinDirective(oper, context) {
+	let call;
 	switch (oper.name) {
-		case "show": return genVShow(oper, context);
-		case "model": return genVModel(oper, context);
+		case "show":
+			call = genVShow(oper, context);
+			break;
+		case "model":
+			call = genVModel(oper, context);
+			break;
 		default: return [];
 	}
+	return [NEWLINE, ...oper.once ? genOnce(call, context) : call];
 }
 /**
 * user directives via `withVaporDirectives`
@@ -26891,7 +26911,8 @@ function genCustomDirectives(opers, context) {
 	const element = `n${opers[0].element}`;
 	const directiveItems = opers.map(genDirectiveItem);
 	const directives = genMulti(DELIMITERS_ARRAY, ...directiveItems);
-	return [NEWLINE, ...genCall(helper("withVaporDirectives"), element, directives)];
+	const call = genCall(helper("withVaporDirectives"), element, directives);
+	return [NEWLINE, ...opers[0].once ? genOnce(call, context) : call];
 	function genDirectiveItem({ dir, name, asset }) {
 		const directiveVar = asset ? toValidAssetId(name, "directive") : genExpression(extend(createSimpleExpression(name, false), { ast: null }), context);
 		const value = dir.exp && [
@@ -26925,7 +26946,8 @@ function genCreateComponent(operation, context) {
 	const tag = genTag();
 	const { root, props, slots, once, slotRoot } = operation;
 	const isRuntimeDynamicComponent = !!(operation.dynamic && !operation.dynamic.isStatic);
-	const dynamicComponentFlags = isRuntimeDynamicComponent ? genDynamicComponentFlags(root, once, slotRoot) : false;
+	const dynamicComponentFlags = isRuntimeDynamicComponent ? genDynamicComponentFlags(root, once, slotRoot, operation.ns) : false;
+	const nsArg = !isRuntimeDynamicComponent && (operation.useCreateElement || operation.asset || !!operation.dynamic) && operation.ns ? String(operation.ns) : false;
 	const rawSlots = genRawSlots(slots, context);
 	const [ids, handlers] = processInlineHandlers(props, context);
 	const rawProps = context.withId(() => genRawProps(props, context, true), ids);
@@ -26942,7 +26964,11 @@ function genCreateComponent(operation, context) {
 		NEWLINE,
 		...inlineHandlers,
 		`const n${operation.id} = `,
-		...genCall(isRuntimeDynamicComponent ? helper("createDynamicComponent") : operation.useCreateElement ? helper("createPlainElement") : useAssetComponentHelper ? helper("createAssetComponent") : operation.asset ? helper("createComponentWithFallback") : helper("createComponent"), tag, rawProps, rawSlots, isRuntimeDynamicComponent ? dynamicComponentFlags : root ? "true" : false, isRuntimeDynamicComponent ? false : once && "true", isRuntimeDynamicComponent ? false : maybeSelfReference && "true"),
+		...genCall(isRuntimeDynamicComponent ? helper("createDynamicComponent") : operation.useCreateElement ? helper("createPlainElement") : useAssetComponentHelper ? helper("createAssetComponent") : operation.asset ? helper("createComponentWithFallback") : helper("createComponent"), tag, rawProps, rawSlots, isRuntimeDynamicComponent ? dynamicComponentFlags : root ? "true" : false, isRuntimeDynamicComponent ? operation.key && [
+			"() => (",
+			...genExpression(operation.key, context),
+			")"
+		] : once && "true", useAssetComponentHelper ? maybeSelfReference && "true" : nsArg, useAssetComponentHelper && nsArg),
 		...genDirectivesForElement(operation.id, context)
 	];
 	function genTag() {
@@ -26969,7 +26995,7 @@ function genCreateComponent(operation, context) {
 		}
 	}
 }
-function genDynamicComponentFlags(root, once, slotRoot) {
+function genDynamicComponentFlags(root, once, slotRoot, ns) {
 	let flags = 0;
 	const names = [];
 	if (root) {
@@ -26984,6 +27010,13 @@ function genDynamicComponentFlags(root, once, slotRoot) {
 		flags |= 4;
 		names.push("SLOT_ROOT");
 	}
+	if (ns === 1) {
+		flags |= 8;
+		names.push("NS_SVG");
+	} else if (ns === 2) {
+		flags |= 16;
+		names.push("NS_MATHML");
+	}
 	if (!flags) return false;
 	return genFlags(flags, names);
 }
@@ -27524,7 +27557,8 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`, flush
 			continue;
 		}
 		const id = child.flags & 1 ? child.flags & 4 ? child.anchor : child.id : void 0;
-		if (id === void 0 && !child.hasDynamicChild) {
+		const ownsSubtree = child.operation !== void 0;
+		if (id === void 0 && (!child.hasDynamicChild || ownsSubtree)) {
 			flushBeforeDynamic && flushBeforeDynamic(child, push);
 			push(...genSelf(child, context, flushBeforeDynamic));
 			continue;
@@ -27561,7 +27595,7 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`, flush
 			variable = id === void 0 ? context.pName(context.block.tempId++) : `n${id}`;
 			pushBlock(NEWLINE, id === void 0 ? `let ${variable} = ` : `const ${variable} = `, ...accessPath);
 		}
-		if (id === child.anchor && !child.hasDynamicChild) {
+		if (id === child.anchor && (!child.hasDynamicChild || ownsSubtree)) {
 			flushBeforeDynamic && flushBeforeDynamic(child, push);
 			push(...genSelf(child, context, flushBeforeDynamic));
 		}
@@ -27571,7 +27605,7 @@ function genChildren(dynamic, context, pushBlock, from = `n${dynamic.id}`, flush
 			elementIndex,
 			id === void 0
 		];
-		push(...genChildren(child, context, pushBlock, variable, flushBeforeDynamic));
+		if (!ownsSubtree) push(...genChildren(child, context, pushBlock, variable, flushBeforeDynamic));
 	}
 	return frag;
 }
@@ -28100,6 +28134,37 @@ const transformVBind = (dir, node, context) => {
 	};
 };
 //#endregion
+//#region packages/compiler-vapor/src/transforms/transformKey.ts
+init_objectSpread2();
+const dynamicComponentKeys = /* @__PURE__ */ new WeakMap();
+const transformKey = (node, context) => {
+	if (node.type !== 1 || context.inVOnce || findDir(node, "for")) return;
+	const dir = findProp(node, "key", true, true);
+	if (!dir || dir.type === 6) return;
+	let value;
+	value = dir.exp || normalizeBindShorthand(dir.arg, context);
+	if (isStaticExpression(value, context.options.bindingMetadata)) return;
+	if (isComponentTag(node.tag) && findProp(node, "is", true, true)) {
+		dynamicComponentKeys.set(node, value);
+		return;
+	}
+	let id = context.reference();
+	context.dynamic.flags |= 6;
+	context.node = node = wrapTemplate(node, ["key"]);
+	const block = newBlock(node);
+	const exitBlock = context.enterBlock(block);
+	return () => {
+		exitBlock();
+		context.dynamic.operation = _objectSpread2(_objectSpread2({
+			type: 16,
+			id
+		}, context.effectBoundary()), {}, {
+			value,
+			block
+		});
+	};
+};
+//#endregion
 //#region packages/compiler-vapor/src/transforms/vHtml.ts
 function ignoreVHtmlChildren(node, context, clear) {
 	if (!node.children.length) return;
@@ -28191,6 +28256,8 @@ function transformComponentElement(node, propsResult, staticKey, singleRoot, con
 	let { tag } = node;
 	let asset = true;
 	if (!dynamicComponent && !useCreateElement) {
+		const isProp = findProp(node, "is");
+		if (isProp && isProp.type === 6 && isVueIsValue(isProp)) tag = isProp.value.content.slice(4);
 		const fromSetup = resolveSetupReference(tag, context);
 		if (fromSetup) {
 			tag = fromSetup;
@@ -28227,11 +28294,16 @@ function transformComponentElement(node, propsResult, staticKey, singleRoot, con
 		slots: [...context.slots],
 		once: context.inVOnce,
 		dynamic: dynamicComponent,
-		useCreateElement
+		useCreateElement,
+		ns: node.ns || void 0,
+		key: dynamicComponentKeys.get(node)
 	});
 	if (staticKey) context.registerOperation(createSetBlockKey(id, staticKey));
 	context.slots = [];
 }
+function isVueIsValue(prop) {
+	return !!prop.value && prop.value.content.startsWith("vue:");
+}
 function resolveDynamicComponent(node) {
 	const isProp = findProp(node, "is", false, true);
 	if (!isProp) return;
@@ -28491,7 +28563,7 @@ function buildProps(node, context, isComponent, isDynamicComponent, getEffectInd
 				continue;
 			}
 		}
-		if (isDynamicComponent && (prop.type === 6 && prop.name === "is" || prop.type === 7 && prop.name === "bind" && isStaticArgOf(prop.arg, "is"))) continue;
+		if (prop.type === 6 ? prop.name === "is" && (isDynamicComponent || isVueIsValue(prop)) : isDynamicComponent && prop.name === "bind" && isStaticArgOf(prop.arg, "is")) continue;
 		const result = transformProp(prop, node, context);
 		if (result) {
 			dynamicExpr.push(result.key, result.value);
@@ -28676,7 +28748,8 @@ function transformProp(prop, node, context) {
 			element: context.reference(),
 			dir: prop,
 			name,
-			asset: !fromSetup
+			asset: !fromSetup,
+			once: context.inVOnce
 		});
 	}
 }
@@ -28717,9 +28790,6 @@ function mergePropValues(existing, incoming) {
 	const newValues = incoming.values;
 	existing.values.push(...newValues);
 }
-function isComponentTag(tag) {
-	return tag === "component" || tag === "Component";
-}
 function shouldUseCreateElement(node, context) {
 	return context.options.isCustomElement(node.tag) || node.tagType === 0 && node.tag === "template";
 }
@@ -29100,7 +29170,8 @@ const transformVShow = (dir, node, context) => {
 		element: context.reference(),
 		dir,
 		name: "show",
-		builtin: true
+		builtin: true,
+		once: context.inVOnce
 	});
 };
 //#endregion
@@ -29184,7 +29255,8 @@ const transformVModel = (dir, node, context) => {
 		dir,
 		name: "model",
 		modelType,
-		builtin: true
+		builtin: true,
+		once: context.inVOnce
 	});
 	function checkDuplicatedValue() {
 		const value = findDir$1(node, "bind");
@@ -29627,32 +29699,6 @@ function hasMultipleChildren(node) {
 	return children.length !== 1;
 }
 //#endregion
-//#region packages/compiler-vapor/src/transforms/transformKey.ts
-init_objectSpread2();
-const transformKey = (node, context) => {
-	if (node.type !== 1 || context.inVOnce || findDir(node, "for")) return;
-	const dir = findProp(node, "key", true, true);
-	if (!dir || dir.type === 6) return;
-	let value;
-	value = dir.exp || normalizeBindShorthand(dir.arg, context);
-	if (isStaticExpression(value, context.options.bindingMetadata)) return;
-	let id = context.reference();
-	context.dynamic.flags |= 6;
-	context.node = node = wrapTemplate(node, ["key"]);
-	const block = newBlock(node);
-	const exitBlock = context.enterBlock(block);
-	return () => {
-		exitBlock();
-		context.dynamic.operation = _objectSpread2(_objectSpread2({
-			type: 16,
-			id
-		}, context.effectBoundary()), {}, {
-			value,
-			block
-		});
-	};
-};
-//#endregion
 //#region packages/compiler-vapor/src/compile.ts
 function compile$1(source, options = {}) {
 	const resolvedOptions = extend({}, options);
@@ -43247,7 +43293,7 @@ function compileScript(sfc, options) {
 		}
 		if (preamble) ctx.s.prepend(preamble);
 		if (helpers && (helpers.has(UNREF) || helpers.has("unref"))) ctx.helperImports.delete("unref");
-		returned = code;
+		returned = vapor && !ssr && hasAwait ? `return () => {${code}}` : code;
 	} else returned = `() => {}`;
 	if (!inlineMode && true) ctx.s.appendRight(endOffset, `\nconst __returned__ = ${returned}\nObject.defineProperty(__returned__, '__isScriptSetup', { enumerable: false, value: true })\nreturn __returned__\n}\n\n`);
 	else ctx.s.appendRight(endOffset, `\n${vapor && !ssr ? `` : `return `}${returned}\n}\n\n`);
@@ -43425,7 +43471,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
 init_objectSpread2();
-const version = "3.6.0-rc.7";
+const version = "3.6.0-rc.8";
 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-rc.7",
+  "version": "3.6.0-rc.8",
   "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.19",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-dom": "3.6.0-rc.7",
-    "@vue/compiler-core": "3.6.0-rc.7",
-    "@vue/compiler-vapor": "3.6.0-rc.7",
-    "@vue/shared": "3.6.0-rc.7",
-    "@vue/compiler-ssr": "3.6.0-rc.7"
+    "@vue/compiler-core": "3.6.0-rc.8",
+    "@vue/compiler-dom": "3.6.0-rc.8",
+    "@vue/compiler-vapor": "3.6.0-rc.8",
+    "@vue/shared": "3.6.0-rc.8",
+    "@vue/compiler-ssr": "3.6.0-rc.8"
   },
   "devDependencies": {
     "@babel/types": "^7.29.8",