@dcloudio/uni-cli-shared 3.0.0-alpha-5000720260416001 → 3.0.0-alpha-5000820260420001

package/lib/dom2/app/@vue/compiler-vapor/dist/compiler-vapor.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-  * @vue/compiler-vapor v3.6.0-beta.5
+  * @vue/compiler-vapor v3.6.0-beta.7
   * (c) 2018-present Yuxi (Evan) You and Vue contributors
   * @license MIT
   **/
@@ -18989,7 +18989,7 @@ function wrapTemplate(node, dirs) {
 	const reserved = [];
 	const pass = [];
 	node.props.forEach((prop) => {
-		if (prop.type === 7 && dirs.includes(prop.name)) reserved.push(prop);
+		if (prop.type === 7 && (dirs.includes(prop.name) || prop.name === "bind" && prop.arg && prop.arg.type === 4 && prop.arg.content === "key" && dirs.includes("key"))) reserved.push(prop);
 		else pass.push(prop);
 	});
 	return extend({}, node, {
@@ -19049,13 +19049,6 @@ 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";
@@ -19523,12 +19516,14 @@ const IRNodeTypes = {
 	"14": "IF",
 	"FOR": 15,
 	"15": "FOR",
-	"GET_TEXT_CHILD": 16,
-	"16": "GET_TEXT_CHILD",
-	"GET_INSERTION_PARENT": 17,
-	"17": "GET_INSERTION_PARENT",
-	"SET_CHANGE_PROP": 18,
-	"18": "SET_CHANGE_PROP"
+	"KEY": 16,
+	"16": "KEY",
+	"GET_TEXT_CHILD": 17,
+	"17": "GET_TEXT_CHILD",
+	"GET_INSERTION_PARENT": 18,
+	"18": "GET_INSERTION_PARENT",
+	"SET_CHANGE_PROP": 19,
+	"19": "SET_CHANGE_PROP"
 };
 const DynamicFlag = {
 	"NONE": 0,
@@ -19542,7 +19537,7 @@ const DynamicFlag = {
 };
 function isBlockOperation(op) {
 	const type = op.type;
-	return type === 11 || type === 12 || type === 14 || type === 15;
+	return type === 11 || type === 12 || type === 14 || type === 16 || type === 15;
 }
 
 //#endregion
@@ -20800,7 +20795,7 @@ function genSlotBlockWithProps(oper, context) {
 	let propsName;
 	let exitScope;
 	let depth;
-	const { props, key, node } = oper;
+	const { props, node } = oper;
 	const idToPathMap = props ? parseValueDestructure(props, context) : /* @__PURE__ */ new Map();
 	if (props) if (props.ast) {
 		[depth, exitScope] = context.enterScope();
@@ -20810,16 +20805,6 @@ function genSlotBlockWithProps(oper, context) {
 	if (propsName) idMap[propsName] = null;
 	let blockFn = context.withId(() => genBlock(oper, context, propsName ? [propsName] : []), idMap);
 	exitScope && exitScope();
-	if (key) blockFn = [
-		`() => {`,
-		INDENT_START,
-		NEWLINE,
-		`return `,
-		...genCall(context.helper("createKeyedFragment"), [`() => `, ...genExpression(key, context)], blockFn),
-		INDENT_END,
-		NEWLINE,
-		`}`
-	];
 	if (node.type === 1) {
 		if (needsVaporCtx(oper)) blockFn = [
 			`${context.helper("withVaporCtx")}(`,
@@ -20893,6 +20878,20 @@ function genSlotOutlet(oper, context) {
 	return frag;
 }
 
+//#endregion
+//#region packages/compiler-vapor/src/generators/key.ts
+function genKey(oper, context) {
+	const { id, value, block } = oper;
+	const [frag, push] = buildCodeFragment();
+	const blockFn = genBlock(block, context);
+	push(NEWLINE, `const n${id} = `, ...genCall(context.helper("createKeyedFragment"), [
+		`() => (`,
+		...genExpression(value, context),
+		")"
+	], blockFn));
+	return frag;
+}
+
 //#endregion
 //#region packages/compiler-vapor/src/generators/operation.ts
 function genOperations(opers, context) {
@@ -20919,12 +20918,13 @@ function genOperation(oper, context) {
 		case 10: return genPrependNode(oper, context);
 		case 14: return genIf(oper, context);
 		case 15: return genFor(oper, context);
+		case 16: return genKey(oper, context);
 		case 11: return genCreateComponent(oper, context);
 		case 12: return genSlotOutlet(oper, context);
 		case 13: return genBuiltinDirective(oper, context);
-		case 16: return genGetTextChild(oper, context);
-		case 17: return [];
+		case 17: return genGetTextChild(oper, context);
 		case 18: return [];
+		case 19: return [];
 		default:
 			const exhaustiveCheck = oper;
 			throw new Error(`Unhandled operation type in genOperation: ${exhaustiveCheck}`);
@@ -21412,11 +21412,13 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
 	let template = "";
 	template += `<${tag}`;
 	if (scopeId) template += ` ${scopeId}`;
-	if (isDom2 && singleRoot) {
-		template += ` gen-flag-flatten=""`;
-		const rootElementTagName = context.options.rootElementTagName;
-		if (rootElementTagName || context.options.genVueId) template += ` gen-vue-id=""`;
-		if (rootElementTagName) template += ` custom-tag-name="${rootElementTagName}"`;
+	if (isDom2) {
+		if (context.effectiveParent === context.root) template += ` gen-vue-id=""`;
+		if (singleRoot) {
+			template += ` gen-flag-flatten=""`;
+			const rootElementTagName = context.options.rootElementTagName;
+			if (rootElementTagName) template += ` custom-tag-name="${rootElementTagName}"`;
+		}
 	}
 	const dynamicProps = [];
 	if (propsResult[0]) {
@@ -21462,7 +21464,7 @@ function transformNativeElement(node, propsResult, singleRoot, context, getEffec
 					dynamicProps.push(key.content);
 					values[0].isStatic = false;
 					context.registerEffect(values, {
-						type: 18,
+						type: 19,
 						node,
 						prop
 					}, getEffectIndex);
@@ -21684,7 +21686,7 @@ const transformVText = (dir, node, context) => {
 		context.childrenTemplate = [context.options.platform ? TEXT_PLACEHOLDER : " "];
 		const isComponent = node.tagType === 1;
 		if (!isComponent) context.registerOperation({
-			type: 16,
+			type: 17,
 			node,
 			parent: context.reference()
 		});
@@ -21919,7 +21921,7 @@ function processTextContainer(children, context) {
 	else {
 		context.childrenTemplate = [context.options.platform ? TEXT_PLACEHOLDER : " "];
 		context.registerOperation({
-			type: 16,
+			type: 17,
 			node: context.node,
 			parent: context.reference()
 		});
@@ -22064,7 +22066,7 @@ function processIf(node, dir, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				index: isInTransition(context) ? context.root.nextIfIndex() : void 0,
+				index: context.root.nextIfIndex(),
 				once: context.inVOnce || isStaticExpression(dir.exp, context.options.bindingMetadata)
 			};
 		};
@@ -22098,7 +22100,7 @@ function processIf(node, dir, context) {
 			id: -1,
 			condition: dir.exp,
 			positive: branch,
-			index: isInTransition(context) ? context.root.nextIfIndex() : void 0,
+			index: context.root.nextIfIndex(),
 			once: context.inVOnce || isStaticExpression(dir.exp, context.options.bindingMetadata)
 		};
 		return () => onExit();
@@ -22135,7 +22137,7 @@ function processFor(node, dir, context) {
 	const typeProp = findProp(node, "type");
 	const typeProperty = typeProp && propToExpression(typeProp);
 	const isComponent = node.tagType === 1 || isTemplateWithSingleComponent(node);
-	context.node = node = wrapTemplate(node, ["for"]);
+	context.node = node = wrapTemplate(node, ["for", "key"]);
 	context.dynamic.flags |= 6;
 	const id = context.reference();
 	const render = newBlock(node);
@@ -22252,13 +22254,6 @@ function transformComponentSlot(node, dir, context) {
 		markNonTemplate(n, context);
 	});
 	const [block, onExit] = createSlotBlock(node, dir, context);
-	if (isTransitionNode(node) && nonSlotTemplateChildren.length) {
-		const nonCommentChild = nonSlotTemplateChildren.find((n) => !isCommentOrWhitespace(n));
-		if (nonCommentChild) {
-			const keyProp = findProp(nonCommentChild, "key");
-			if (keyProp) block.key = keyProp.exp;
-		}
-	}
 	const { slots } = context;
 	return () => {
 		onExit();
@@ -22377,6 +22372,32 @@ function hasMultipleChildren(node) {
 	return children.length > 1;
 }
 
+//#endregion
+//#region packages/compiler-vapor/src/transforms/transformKey.ts
+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 = {
+			type: 16,
+			node,
+			id,
+			value,
+			block
+		};
+	};
+};
+
 //#endregion
 //#region packages/compiler-vapor/src/compile.ts
 function compile(source, options = {}) {
@@ -22401,6 +22422,7 @@ function getBaseTransformPreset() {
 		transformVOnce,
 		transformVIf,
 		transformVFor,
+		transformKey,
 		transformSlotOutlet,
 		transformTemplateRef,
 		transformElement,
@@ -22435,4 +22457,4 @@ const VaporErrorMessages = {
 };
 
 //#endregion
-export { CodegenContext, DELIMITERS_ARRAY, DELIMITERS_ARRAY_NEWLINE, DELIMITERS_OBJECT, DELIMITERS_OBJECT_NEWLINE, DynamicFlag, IMPORT_EXPR_RE, IMPORT_EXP_END, IMPORT_EXP_START, INDENT_END, INDENT_START, IRDynamicPropsKind, IRNodeTypes, IRSlotType, LF, NEWLINE, TEXT_NODE_PLACEHOLDER, TEXT_PLACEHOLDER, VaporErrorCodes, VaporErrorMessages, analyzeExpressions, buildCodeFragment, buildDestructureIdMap, codeFragmentToString, compile, createStructuralDirectiveTransform, createVaporCompilerError, genCall, genMulti, generate, getBaseTransformPreset, getLiteralExpressionValue, isBlockOperation, isBuiltInComponent, isConstantExpression, isKeepAliveTag, isStaticExpression, isTeleportTag, isTransitionGroupTag, isTransitionTag, needsVaporCtx, parse, parseValueDestructure, propToExpression, transform, transformChildren, transformComment, transformElement, transformSlotOutlet, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVIf, transformVModel, transformVOn, transformVOnce, transformVShow, transformVSlot, transformVText, wrapTemplate };
+export { CodegenContext, DELIMITERS_ARRAY, DELIMITERS_ARRAY_NEWLINE, DELIMITERS_OBJECT, DELIMITERS_OBJECT_NEWLINE, DynamicFlag, IMPORT_EXPR_RE, IMPORT_EXP_END, IMPORT_EXP_START, INDENT_END, INDENT_START, IRDynamicPropsKind, IRNodeTypes, IRSlotType, LF, NEWLINE, TEXT_NODE_PLACEHOLDER, TEXT_PLACEHOLDER, VaporErrorCodes, VaporErrorMessages, analyzeExpressions, buildCodeFragment, buildDestructureIdMap, codeFragmentToString, compile, createStructuralDirectiveTransform, createVaporCompilerError, genCall, genMulti, generate, getBaseTransformPreset, getLiteralExpressionValue, isBlockOperation, isBuiltInComponent, isConstantExpression, isKeepAliveTag, isStaticExpression, isTeleportTag, isTransitionGroupTag, isTransitionTag, needsVaporCtx, parse, parseValueDestructure, propToExpression, transform, transformChildren, transformComment, transformElement, transformKey, transformSlotOutlet, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVIf, transformVModel, transformVOn, transformVOnce, transformVShow, transformVSlot, transformVText, wrapTemplate };