@vue-jsx-vapor/compiler 2.4.4 → 2.4.6

package/dist/index.cjs

@@ -303,7 +303,6 @@ function newBlock(node) {
 		effect: [],
 		operation: [],
 		returns: [],
-		expressions: [],
 		tempId: 0
 	};
 }
@@ -407,23 +406,17 @@ var TransformContext = class TransformContext {
 		const id = this.pushTemplate(this.template);
 		return this.dynamic.template = id;
 	}
-	registerEffect(expressions, ...operations) {
+	registerEffect(expressions, operation, getEffectIndex = () => this.block.effect.length, getOperationIndex = () => this.block.operation.length) {
+		const operations = [operation].flat();
 		expressions = expressions.filter((exp) => !isConstantExpression(exp));
-		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && (0, __vue_compiler_dom.isConstantNode)(e.ast, {}))) return this.registerOperation(...operations);
-		this.block.expressions.push(...expressions);
-		const existing = this.block.effect.find((e) => isSameExpression(e.expressions, expressions));
-		if (existing) existing.operations.push(...operations);
-		else this.block.effect.push({
+		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && (0, __vue_compiler_dom.isConstantNode)(e.ast, {}))) return this.registerOperation(operations, getOperationIndex);
+		this.block.effect.splice(getEffectIndex(), 0, {
 			expressions,
 			operations
 		});
-		function isSameExpression(a, b) {
-			if (a.length !== b.length) return false;
-			return a.every((exp, i) => exp.content === b[i].content);
-		}
 	}
-	registerOperation(...node) {
-		this.block.operation.push(...node);
+	registerOperation(operation, getOperationIndex = () => this.block.operation.length) {
+		this.block.operation.splice(getOperationIndex(), 0, ...[operation].flat());
 	}
 	create(node, index) {
 		return Object.assign(Object.create(TransformContext.prototype), this, {
@@ -548,6 +541,10 @@ const isReservedProp = /* @__PURE__ */ (0, __vue_shared.makeMap)(",key,ref,ref_f
 const isEventRegex = /^on[A-Z]/;
 const isDirectiveRegex = /^v-[a-z]/;
 const transformElement = (node, context) => {
+	let effectIndex = context.block.effect.length;
+	const getEffectIndex = () => effectIndex++;
+	let operationIndex = context.block.operation.length;
+	const getOperationIndex = () => operationIndex++;
 	return function postTransformElement() {
 		({node} = context);
 		if (node.type !== "JSXElement" || isTemplate(node)) return;
@@ -557,8 +554,8 @@ const transformElement = (node, context) => {
 		const propsResult = buildProps(node, context, isComponent);
 		let { parent } = context;
 		while (parent && parent.parent && parent.node.type === "JSXElement" && isTemplate(parent.node)) parent = parent.parent;
-		const singleRoot = context.root === parent && parent.node.children.filter((child) => !isJSXComponent(child)).length === 1;
-		(isComponent ? transformComponentElement : transformNativeElement)(tag, propsResult, singleRoot, context);
+		const singleRoot = context.root === parent && parent.node.type !== "JSXFragment";
+		(isComponent ? transformComponentElement : transformNativeElement)(tag, propsResult, singleRoot, context, getEffectIndex, getOperationIndex);
 	};
 };
 function transformComponentElement(tag, propsResult, singleRoot, context) {
@@ -584,13 +581,13 @@ function transformComponentElement(tag, propsResult, singleRoot, context) {
 		tag,
 		props: propsResult[0] ? propsResult[1] : [propsResult[1]],
 		asset,
-		root: singleRoot,
+		root: singleRoot && !context.inVFor,
 		slots: [...context.slots],
 		once: context.inVOnce
 	};
 	context.slots = [];
 }
-function transformNativeElement(tag, propsResult, singleRoot, context) {
+function transformNativeElement(tag, propsResult, singleRoot, context, getEffectIndex, getOperationIndex) {
 	const { scopeId } = context.options;
 	let template = "";
 	template += `<${tag}`;
@@ -603,7 +600,7 @@ function transformNativeElement(tag, propsResult, singleRoot, context) {
 			element: context.reference(),
 			props: dynamicArgs,
 			root: singleRoot
-		});
+		}, getEffectIndex, getOperationIndex);
 	} else for (const prop of propsResult[1]) {
 		const { key, values } = prop;
 		if (key.isStatic && values.length === 1 && values[0].isStatic) {
@@ -617,7 +614,7 @@ function transformNativeElement(tag, propsResult, singleRoot, context) {
 				prop,
 				tag,
 				root: singleRoot
-			});
+			}, getEffectIndex, getOperationIndex);
 		}
 	}
 	template += `>${context.childrenTemplate.join("")}`;
@@ -801,6 +798,9 @@ function processLogicalExpression(node, context) {
 //#endregion
 //#region src/transforms/transformText.ts
 const seen = /* @__PURE__ */ new WeakMap();
+function markNonTemplate(node, context) {
+	seen.get(context.root).add(node);
+}
 const transformText = (node, context) => {
 	if (!seen.has(context.root)) seen.set(context.root, /* @__PURE__ */ new WeakSet());
 	if (seen.get(context.root).has(node)) {
@@ -817,7 +817,7 @@ const transformText = (node, context) => {
 		else if (hasInterp) for (let i = 0; i < node.children.length; i++) {
 			const c = node.children[i];
 			const prev = node.children[i - 1];
-			if (c.type === "JSXExpressionContainer" && prev && prev.type === "JSXText") seen.get(context.root).add(prev);
+			if (c.type === "JSXExpressionContainer" && prev && prev.type === "JSXText") markNonTemplate(prev, context);
 		}
 	} else if (node.type === "JSXExpressionContainer") if (node.expression.type === "ConditionalExpression") return processConditionalExpression(node.expression, context);
 	else if (node.expression.type === "LogicalExpression") return processLogicalExpression(node.expression, context);
@@ -877,7 +877,7 @@ function processTextContainer(children, context) {
 function createTextLikeExpressions(nodes, context) {
 	const values = [];
 	for (const node of nodes) {
-		seen.get(context.root).add(node);
+		markNonTemplate(node, context);
 		if (isEmptyText(node)) continue;
 		values.push(resolveExpression(node, context, !context.inVOnce));
 	}
@@ -1020,7 +1020,10 @@ function processIf(node, attribute, context) {
 		let lastIfNode;
 		if (siblings) {
 			let i = siblings.length;
-			while (i--) if (siblings[i].operation) lastIfNode = siblings[i].operation;
+			while (i--) if (siblings[i].operation && siblings[i].operation.type === IRNodeTypes.IF) {
+				lastIfNode = siblings[i].operation;
+				break;
+			}
 		}
 		if (!siblingIf || !lastIfNode || lastIfNode.type !== IRNodeTypes.IF) {
 			context.options.onError((0, __vue_compiler_dom.createCompilerError)(__vue_compiler_dom.ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, resolveLocation(node.loc, context)));
@@ -1404,8 +1407,8 @@ function getBaseTransformPreset() {
 		transformVIf,
 		transformVFor,
 		transformTemplateRef,
-		transformText,
 		transformElement,
+		transformText,
 		transformVSlot,
 		transformChildren
 	], {

package/dist/index.d.cts

@@ -42,8 +42,8 @@ declare class TransformContext<T extends BlockIRNode['node'] = BlockIRNode['node
   reference(): number;
   pushTemplate(content: string): number;
   registerTemplate(): number;
-  registerEffect(expressions: SimpleExpressionNode[], ...operations: OperationNode[]): void;
-  registerOperation(...node: OperationNode[]): void;
+  registerEffect(expressions: SimpleExpressionNode[], operation: OperationNode | OperationNode[], getEffectIndex?: () => number, getOperationIndex?: () => number): void;
+  registerOperation(operation: OperationNode | OperationNode[], getOperationIndex?: () => number): void;
   create<E extends T>(node: E, index: number): TransformContext<E>;
 }
 declare function transform(node: RootNode, options?: TransformOptions): RootIRNode;
@@ -135,7 +135,7 @@ interface BaseIRNode {
   type: IRNodeTypes;
 }
 interface RootNode {
-  type: IRNodeTypes.ROOT;
+  type: IRNodeTypes.ROOT | JSXFragment['type'];
   source: string;
   children: JSXFragment['children'];
 }
@@ -146,7 +146,6 @@ interface BlockIRNode extends BaseIRNode {
   tempId: number;
   effect: IREffect[];
   operation: OperationNode[];
-  expressions: SimpleExpressionNode[];
   returns: number[];
 }
 interface RootIRNode {

package/dist/index.d.ts

@@ -42,8 +42,8 @@ declare class TransformContext<T extends BlockIRNode['node'] = BlockIRNode['node
   reference(): number;
   pushTemplate(content: string): number;
   registerTemplate(): number;
-  registerEffect(expressions: SimpleExpressionNode[], ...operations: OperationNode[]): void;
-  registerOperation(...node: OperationNode[]): void;
+  registerEffect(expressions: SimpleExpressionNode[], operation: OperationNode | OperationNode[], getEffectIndex?: () => number, getOperationIndex?: () => number): void;
+  registerOperation(operation: OperationNode | OperationNode[], getOperationIndex?: () => number): void;
   create<E extends T>(node: E, index: number): TransformContext<E>;
 }
 declare function transform(node: RootNode, options?: TransformOptions): RootIRNode;
@@ -135,7 +135,7 @@ interface BaseIRNode {
   type: IRNodeTypes;
 }
 interface RootNode {
-  type: IRNodeTypes.ROOT;
+  type: IRNodeTypes.ROOT | JSXFragment['type'];
   source: string;
   children: JSXFragment['children'];
 }
@@ -146,7 +146,6 @@ interface BlockIRNode extends BaseIRNode {
   tempId: number;
   effect: IREffect[];
   operation: OperationNode[];
-  expressions: SimpleExpressionNode[];
   returns: number[];
 }
 interface RootIRNode {

package/dist/index.js

@@ -280,7 +280,6 @@ function newBlock(node) {
 		effect: [],
 		operation: [],
 		returns: [],
-		expressions: [],
 		tempId: 0
 	};
 }
@@ -384,23 +383,17 @@ var TransformContext = class TransformContext {
 		const id = this.pushTemplate(this.template);
 		return this.dynamic.template = id;
 	}
-	registerEffect(expressions, ...operations) {
+	registerEffect(expressions, operation, getEffectIndex = () => this.block.effect.length, getOperationIndex = () => this.block.operation.length) {
+		const operations = [operation].flat();
 		expressions = expressions.filter((exp) => !isConstantExpression(exp));
-		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstantNode(e.ast, {}))) return this.registerOperation(...operations);
-		this.block.expressions.push(...expressions);
-		const existing = this.block.effect.find((e) => isSameExpression(e.expressions, expressions));
-		if (existing) existing.operations.push(...operations);
-		else this.block.effect.push({
+		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstantNode(e.ast, {}))) return this.registerOperation(operations, getOperationIndex);
+		this.block.effect.splice(getEffectIndex(), 0, {
 			expressions,
 			operations
 		});
-		function isSameExpression(a, b) {
-			if (a.length !== b.length) return false;
-			return a.every((exp, i) => exp.content === b[i].content);
-		}
 	}
-	registerOperation(...node) {
-		this.block.operation.push(...node);
+	registerOperation(operation, getOperationIndex = () => this.block.operation.length) {
+		this.block.operation.splice(getOperationIndex(), 0, ...[operation].flat());
 	}
 	create(node, index) {
 		return Object.assign(Object.create(TransformContext.prototype), this, {
@@ -525,6 +518,10 @@ const isReservedProp = /* @__PURE__ */ makeMap(",key,ref,ref_for,ref_key,");
 const isEventRegex = /^on[A-Z]/;
 const isDirectiveRegex = /^v-[a-z]/;
 const transformElement = (node, context) => {
+	let effectIndex = context.block.effect.length;
+	const getEffectIndex = () => effectIndex++;
+	let operationIndex = context.block.operation.length;
+	const getOperationIndex = () => operationIndex++;
 	return function postTransformElement() {
 		({node} = context);
 		if (node.type !== "JSXElement" || isTemplate(node)) return;
@@ -534,8 +531,8 @@ const transformElement = (node, context) => {
 		const propsResult = buildProps(node, context, isComponent);
 		let { parent } = context;
 		while (parent && parent.parent && parent.node.type === "JSXElement" && isTemplate(parent.node)) parent = parent.parent;
-		const singleRoot = context.root === parent && parent.node.children.filter((child) => !isJSXComponent(child)).length === 1;
-		(isComponent ? transformComponentElement : transformNativeElement)(tag, propsResult, singleRoot, context);
+		const singleRoot = context.root === parent && parent.node.type !== "JSXFragment";
+		(isComponent ? transformComponentElement : transformNativeElement)(tag, propsResult, singleRoot, context, getEffectIndex, getOperationIndex);
 	};
 };
 function transformComponentElement(tag, propsResult, singleRoot, context) {
@@ -561,13 +558,13 @@ function transformComponentElement(tag, propsResult, singleRoot, context) {
 		tag,
 		props: propsResult[0] ? propsResult[1] : [propsResult[1]],
 		asset,
-		root: singleRoot,
+		root: singleRoot && !context.inVFor,
 		slots: [...context.slots],
 		once: context.inVOnce
 	};
 	context.slots = [];
 }
-function transformNativeElement(tag, propsResult, singleRoot, context) {
+function transformNativeElement(tag, propsResult, singleRoot, context, getEffectIndex, getOperationIndex) {
 	const { scopeId } = context.options;
 	let template = "";
 	template += `<${tag}`;
@@ -580,7 +577,7 @@ function transformNativeElement(tag, propsResult, singleRoot, context) {
 			element: context.reference(),
 			props: dynamicArgs,
 			root: singleRoot
-		});
+		}, getEffectIndex, getOperationIndex);
 	} else for (const prop of propsResult[1]) {
 		const { key, values } = prop;
 		if (key.isStatic && values.length === 1 && values[0].isStatic) {
@@ -594,7 +591,7 @@ function transformNativeElement(tag, propsResult, singleRoot, context) {
 				prop,
 				tag,
 				root: singleRoot
-			});
+			}, getEffectIndex, getOperationIndex);
 		}
 	}
 	template += `>${context.childrenTemplate.join("")}`;
@@ -778,6 +775,9 @@ function processLogicalExpression(node, context) {
 //#endregion
 //#region src/transforms/transformText.ts
 const seen = /* @__PURE__ */ new WeakMap();
+function markNonTemplate(node, context) {
+	seen.get(context.root).add(node);
+}
 const transformText = (node, context) => {
 	if (!seen.has(context.root)) seen.set(context.root, /* @__PURE__ */ new WeakSet());
 	if (seen.get(context.root).has(node)) {
@@ -794,7 +794,7 @@ const transformText = (node, context) => {
 		else if (hasInterp) for (let i = 0; i < node.children.length; i++) {
 			const c = node.children[i];
 			const prev = node.children[i - 1];
-			if (c.type === "JSXExpressionContainer" && prev && prev.type === "JSXText") seen.get(context.root).add(prev);
+			if (c.type === "JSXExpressionContainer" && prev && prev.type === "JSXText") markNonTemplate(prev, context);
 		}
 	} else if (node.type === "JSXExpressionContainer") if (node.expression.type === "ConditionalExpression") return processConditionalExpression(node.expression, context);
 	else if (node.expression.type === "LogicalExpression") return processLogicalExpression(node.expression, context);
@@ -854,7 +854,7 @@ function processTextContainer(children, context) {
 function createTextLikeExpressions(nodes, context) {
 	const values = [];
 	for (const node of nodes) {
-		seen.get(context.root).add(node);
+		markNonTemplate(node, context);
 		if (isEmptyText(node)) continue;
 		values.push(resolveExpression(node, context, !context.inVOnce));
 	}
@@ -997,7 +997,10 @@ function processIf(node, attribute, context) {
 		let lastIfNode;
 		if (siblings) {
 			let i = siblings.length;
-			while (i--) if (siblings[i].operation) lastIfNode = siblings[i].operation;
+			while (i--) if (siblings[i].operation && siblings[i].operation.type === IRNodeTypes.IF) {
+				lastIfNode = siblings[i].operation;
+				break;
+			}
 		}
 		if (!siblingIf || !lastIfNode || lastIfNode.type !== IRNodeTypes.IF) {
 			context.options.onError(createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, resolveLocation(node.loc, context)));
@@ -1381,8 +1384,8 @@ function getBaseTransformPreset() {
 		transformVIf,
 		transformVFor,
 		transformTemplateRef,
-		transformText,
 		transformElement,
+		transformText,
 		transformVSlot,
 		transformChildren
 	], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -34,11 +34,11 @@
     "./*": "./*"
   },
   "dependencies": {
-    "@babel/parser": "^7.27.3",
-    "@babel/types": "^7.27.3",
-    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@280bc48",
-    "@vue/compiler-vapor": "https://pkg.pr.new/@vue/compiler-vapor@280bc48",
-    "@vue/shared": "https://pkg.pr.new/@vue/shared@280bc48"
+    "@babel/parser": "^7.27.7",
+    "@babel/types": "^7.27.7",
+    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@9e2eea9",
+    "@vue/compiler-vapor": "https://pkg.pr.new/@vue/compiler-vapor@9e2eea9",
+    "@vue/shared": "https://pkg.pr.new/@vue/shared@9e2eea9"
   },
   "scripts": {
     "build": "tsdown",