@vue/compiler-sfc 3.6.0-rc.3 → 3.6.0-rc.5

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-sfc v3.6.0-rc.3
+  * @vue/compiler-sfc v3.6.0-rc.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -15879,7 +15879,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 }
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
-const version = "3.6.0-rc.3";
+const version = "3.6.0-rc.5";
 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.3
+  * @vue/compiler-sfc v3.6.0-rc.5
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -25185,7 +25185,7 @@ var TransformContext = class TransformContext {
 	isSingleRootChild(childInfo) {
 		if (this.inVFor || !childInfo.hasSingleRootChild) return false;
 		if (this.node.type === 0) return true;
-		return this.node.type === 1 && this.node.tagType === 3 && !!this.parent && this.isSingleRoot;
+		return this.node.type === 1 && (this.node.tagType === 3 || isTransitionNode(this.node)) && !!this.parent && this.isSingleRoot;
 	}
 };
 function hasSingleRootChild(children) {
@@ -26668,7 +26668,7 @@ function getSpecialHelper(keyName, tagName, isSVG) {
 const setTemplateRefIdent = `_setTemplateRef`;
 function genSetTemplateRef(oper, context) {
 	const [refValue, refKey] = genRefValue(oper.value, context);
-	if (context.staticTemplateRefHelperCandidate === oper) return genSetStaticTemplateRef(oper, refValue, refKey, context);
+	if (!oper.effect && !oper.refFor && oper.value.isStatic) return genSetStaticTemplateRef(oper, refValue, refKey, context);
 	context.needsTemplateRefSetter = true;
 	return [NEWLINE, ...genCall(setTemplateRefIdent, `n${oper.element}`, refValue, oper.refFor && "true", refKey)];
 }
@@ -26677,13 +26677,7 @@ function genSetStaticTemplateRef(oper, refValue, refKey, context) {
 }
 function genSetTemplateRefBinding(oper, context) {
 	const [refValue, refKey] = genRefValue(oper.value, context);
-	const setter = context.inSlotBlock && setTemplateRefIdent;
-	if (context.inSlotBlock) context.needsTemplateRefSetter = true;
-	return [NEWLINE, ...genCall([context.helper("setTemplateRefBinding"), "undefined"], `n${oper.element}`, ["() => ", ...refValue], ...setter || oper.refFor || refKey ? [
-		setter,
-		oper.refFor && "true",
-		refKey
-	] : [])];
+	return [NEWLINE, ...genCall([context.helper("setTemplateRefBinding"), "undefined"], `n${oper.element}`, ["() => ", ...refValue], ...oper.refFor || refKey ? [oper.refFor && "true", refKey] : [])];
 }
 function genRefValue(value, context) {
 	if (value && context.options.inline) {
@@ -27100,7 +27094,7 @@ function genStaticSlots({ slots }, context, dynamicSlots) {
 	return genMulti(DELIMITERS_OBJECT_NEWLINE, ...args);
 }
 function genDynamicSlots(slots, context) {
-	return genMulti(DELIMITERS_ARRAY_NEWLINE, ...slots.map((slot) => slot.slotType === 0 ? genStaticSlots(slot, context) : slot.slotType === 4 ? slot.slots.content : genDynamicSlot(slot, context, true)));
+	return genMulti(DELIMITERS_ARRAY_NEWLINE, ...slots.map((slot) => slot.slotType === 0 ? genStaticSlots(slot, context) : slot.slotType === 4 ? slot.slots.content : genDynamicSlot(slot, context, slot.slotType !== 2)));
 }
 function genDynamicSlot(slot, context, withFunction = false) {
 	let frag;
@@ -27127,26 +27121,65 @@ function genBasicDynamicSlot(slot, context) {
 	return genMulti(DELIMITERS_OBJECT_NEWLINE, ["name: ", ...genExpression(name, context)], ["fn: ", ...genSlotBlockWithProps(fn, context, false)]);
 }
 function genLoopSlot(slot, context) {
-	const { name, fn, loop } = slot;
+	const { name, fn, loop, keyProp } = slot;
 	const { value, key, index, source } = loop;
 	const rawValue = value && value.content;
 	const rawKey = key && key.content;
 	const rawIndex = index && index.content;
-	const idMap = {};
-	if (rawValue) idMap[rawValue] = rawValue;
-	if (rawKey) idMap[rawKey] = rawKey;
-	if (rawIndex) idMap[rawIndex] = rawIndex;
-	const slotExpr = genMulti(DELIMITERS_OBJECT_NEWLINE, ["name: ", ...context.withId(() => genExpression(name, context), idMap)], ["fn: ", ...context.withId(() => genSlotBlockWithProps(fn, context, false), idMap)]);
-	return [...genCall(context.helper("createForSlots"), genExpression(source, context), [
+	const idToPathMap = parseValueDestructure(value, context);
+	const [depth, exitScope] = context.enterScope();
+	const itemVar = `_for_item${depth}`;
+	const idMap = buildDestructureIdMap(idToPathMap, `${itemVar}.value`, context.options.expressionPlugins);
+	idMap[itemVar] = null;
+	const args = [itemVar];
+	if (rawKey) {
+		const keyVar = `_for_key${depth}`;
+		args.push(keyVar);
+		idMap[rawKey] = `${keyVar}.value`;
+		idMap[keyVar] = null;
+	} else if (rawIndex) args.push("_");
+	if (rawIndex) {
+		const indexVar = `_for_index${depth}`;
+		args.push(indexVar);
+		idMap[rawIndex] = `${indexVar}.value`;
+		idMap[indexVar] = null;
+	}
+	const renderSlot = [
 		...genMulti([
 			"(",
 			")",
 			", "
-		], rawValue ? rawValue : rawKey || rawIndex ? "_" : void 0, rawKey ? rawKey : rawIndex ? "__" : void 0, rawIndex),
+		], ...args),
+		" => ",
+		...context.withId(() => genSlotBlockWithProps(fn, context, false), idMap)
+	];
+	exitScope();
+	const rawIdMap = {};
+	if (rawKey) rawIdMap[rawKey] = null;
+	if (rawIndex) rawIdMap[rawIndex] = null;
+	idToPathMap.forEach((_, id) => rawIdMap[id] = null);
+	const rawParams = genMulti([
+		"(",
+		")",
+		", "
+	], rawValue ? rawValue : rawKey || rawIndex ? "_" : void 0, rawKey ? rawKey : rawIndex ? "__" : void 0, rawIndex);
+	const getName = [
+		...rawParams,
 		" => (",
-		...slotExpr,
+		...context.withId(() => genExpression(name, context), rawIdMap),
 		")"
-	])];
+	];
+	const getKey = keyProp && [
+		...rawParams,
+		" => (",
+		...context.withId(() => genExpression(keyProp, context), rawIdMap),
+		")"
+	];
+	return [...genCall(context.helper("createForSlots"), [
+		"() => (",
+		...genExpression(source, context),
+		")"
+	], renderSlot, getName, getKey)];
 }
 function genConditionalSlot(slot, context) {
 	const { condition, positive, negative } = slot;
@@ -27858,7 +27891,6 @@ var CodegenContext = class {
 		this.block = ir.block;
 		this.bindingNames = new Set(this.options.bindingMetadata ? Object.keys(this.options.bindingMetadata) : []);
 		this.initNextIdMap();
-		this.staticTemplateRefHelperCandidate = getStaticTemplateRefHelperCandidate(ir.block);
 	}
 };
 function generate(ir, options = {}) {
@@ -27910,11 +27942,6 @@ function genAssetImports({ ir }) {
 	}
 	return imports;
 }
-function getStaticTemplateRefHelperCandidate(block) {
-	if (block.operation.length !== 1) return;
-	const operation = block.operation[0];
-	if (operation.type === 9 && !operation.effect && !operation.refFor && operation.value.isStatic) return operation;
-}
 //#endregion
 //#region packages/compiler-vapor/src/transforms/vBind.ts
 function normalizeBindShorthand(arg, context) {
@@ -28542,7 +28569,8 @@ function dedupeProperties(results) {
 		const name = prop.key.content;
 		const existing = knownProps.get(name);
 		if (existing && existing.handler === prop.handler) {
-			if (name === "style" || name === "class" || prop.handler) mergePropValues(existing, prop);
+			if (prop.handler) deduped.push(prop);
+			else if (name === "style" || name === "class") mergePropValues(existing, prop);
 		} else {
 			knownProps.set(name, prop);
 			deduped.push(prop);
@@ -29396,13 +29424,16 @@ function transformTemplateSlot(node, dir, context) {
 			};
 			ifNode.negative = negative;
 		} else context.options.onError(createCompilerError(30, vElse.loc));
-	} else if (vFor) if (vFor.forParseResult) registerDynamicSlot(slots, {
-		slotType: 2,
-		name: arg,
-		fn: block,
-		loop: vFor.forParseResult
-	});
-	else context.options.onError(createCompilerError(32, vFor.loc));
+	} else if (vFor) if (vFor.forParseResult) {
+		const keyProp = findProp(node, "key");
+		registerDynamicSlot(slots, {
+			slotType: 2,
+			name: arg,
+			fn: block,
+			loop: vFor.forParseResult,
+			keyProp: keyProp && propToExpression(keyProp)
+		});
+	} else context.options.onError(createCompilerError(32, vFor.loc));
 	return onExit;
 }
 function ensureStaticSlots(slots) {
@@ -43202,7 +43233,7 @@ function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
 //#endregion
 //#region packages/compiler-sfc/src/index.ts
 init_objectSpread2();
-const version = "3.6.0-rc.3";
+const version = "3.6.0-rc.5";
 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.3",
+  "version": "3.6.0-rc.5",
   "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-core": "3.6.0-rc.3",
-    "@vue/compiler-ssr": "3.6.0-rc.3",
-    "@vue/compiler-dom": "3.6.0-rc.3",
-    "@vue/compiler-vapor": "3.6.0-rc.3",
-    "@vue/shared": "3.6.0-rc.3"
+    "@vue/compiler-core": "3.6.0-rc.5",
+    "@vue/compiler-dom": "3.6.0-rc.5",
+    "@vue/compiler-ssr": "3.6.0-rc.5",
+    "@vue/compiler-vapor": "3.6.0-rc.5",
+    "@vue/shared": "3.6.0-rc.5"
   },
   "devDependencies": {
     "@babel/types": "^7.29.8",