@vue-jsx-vapor/compiler 2.5.1 → 2.5.3

package/dist/index.cjs

@@ -144,18 +144,7 @@ function getLiteralExpressionValue(exp) {
 const isConstant = (node) => {
 	if (!node) return false;
 	if (node.type === "Identifier") return node.name === "undefined" || (0, __vue_shared.isGloballyAllowed)(node.name);
-	if ([
-		"JSXElement",
-		"JSXFragment",
-		"NullLiteral"
-	].includes(node.type)) return true;
-	if (node.type === "ArrayExpression") {
-		const { elements } = node;
-		return elements.every((element) => element && isConstant(element));
-	}
-	if (node.type === "ObjectExpression") return node.properties.every((property) => isConstant(property.value));
-	if (node.type === "TemplateLiteral" ? !node.expressions.length : (0, __babel_types.isLiteral)(node)) return true;
-	return false;
+	return (0, __vue_compiler_dom.isConstantNode)(node, {});
 };
 const EMPTY_TEXT_REGEX = /^[\t\v\f \u00A0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*[\n\r]\s*$/;
 const START_EMPTY_TEXT_REGEX = /^\s*[\n\r]/;
@@ -756,21 +745,10 @@ function genCreateComponent(operation, context) {
 	const { helper } = context;
 	const tag = genTag();
 	const { root, props, slots, once } = operation;
+	const rawProps = genRawProps(props, context);
 	const rawSlots = genRawSlots(slots, context);
-	const [ids, handlers] = processInlineHandlers(props, context);
-	const rawProps = context.withId(() => genRawProps(props, context), ids);
-	const inlineHandlers = handlers.reduce((acc, { name, value }) => {
-		const handler = genEventHandler(context, value, void 0, false);
-		return [
-			...acc,
-			`const ${name} = `,
-			...handler,
-			NEWLINE
-		];
-	}, []);
 	return [
 		NEWLINE,
-		...inlineHandlers,
 		`const n${operation.id} = `,
 		...genCall(operation.dynamic && !operation.dynamic.isStatic ? helper("createDynamicComponent") : operation.asset ? helper("createComponentWithFallback") : helper("createComponent"), tag, rawProps, rawSlots, root ? "true" : false, once && "true"),
 		...genDirectivesForElement(operation.id, context)
@@ -786,33 +764,6 @@ function genCreateComponent(operation, context) {
 		else return genExpression((0, __vue_shared.extend)((0, __vue_compiler_dom.createSimpleExpression)(operation.tag, false), { ast: null }), context);
 	}
 }
-function getUniqueHandlerName(context, name) {
-	const { seenInlineHandlerNames } = context;
-	const count = seenInlineHandlerNames[name] || 0;
-	seenInlineHandlerNames[name] = count + 1;
-	return count === 0 ? name : `${name}${count}`;
-}
-function processInlineHandlers(props, context) {
-	const ids = Object.create(null);
-	const handlers = [];
-	const staticProps = props[0];
-	if ((0, __vue_shared.isArray)(staticProps)) for (const prop of staticProps) {
-		if (!prop.handler) continue;
-		prop.values.forEach((value, i) => {
-			const isMemberExp = (0, __vue_compiler_dom.isMemberExpression)(value, context.options);
-			if (!isMemberExp) {
-				const name = getUniqueHandlerName(context, `_on_${prop.key.content.replace(":", "_")}`);
-				handlers.push({
-					name,
-					value
-				});
-				ids[name] = null;
-				prop.values[i] = (0, __vue_shared.extend)({ ast: null }, (0, __vue_compiler_dom.createSimpleExpression)(name));
-			}
-		});
-	}
-	return [ids, handlers];
-}
 function genRawProps(props, context) {
 	const staticProps = props[0];
 	if ((0, __vue_shared.isArray)(staticProps)) {
@@ -1069,23 +1020,27 @@ function genFor(oper, context) {
 		idMap[indexVar] = null;
 	}
 	const { selectorPatterns, keyOnlyBindingPatterns } = matchPatterns(render, keyProp, idMap);
-	const patternFrag = [];
+	const selectorDeclarations = [];
+	const selectorSetup = [];
 	for (const [i, { selector }] of selectorPatterns.entries()) {
 		const selectorName = `_selector${id}_${i}`;
-		patternFrag.push(NEWLINE, `const ${selectorName} = `, ...genCall(`n${id}.useSelector`, [`() => `, ...genExpression(selector, context)]));
+		selectorDeclarations.push(`let ${selectorName}`, NEWLINE);
+		if (i === 0) selectorSetup.push(`({ createSelector }) => {`, INDENT_START);
+		selectorSetup.push(NEWLINE, `${selectorName} = `, ...genCall(`createSelector`, [`() => `, ...genExpression(selector, context)]));
+		if (i === selectorPatterns.length - 1) selectorSetup.push(INDENT_END, NEWLINE, "}");
 	}
 	const blockFn = context.withId(() => {
 		const frag = [];
 		frag.push("(", ...args, ") => {", INDENT_START);
 		if (selectorPatterns.length || keyOnlyBindingPatterns.length) frag.push(...genBlockContent(render, context, false, () => {
-			const patternFrag$1 = [];
+			const patternFrag = [];
 			for (const [i, { effect }] of selectorPatterns.entries()) {
-				patternFrag$1.push(NEWLINE, `_selector${id}_${i}(() => {`, INDENT_START);
-				for (const oper$1 of effect.operations) patternFrag$1.push(...genOperation(oper$1, context));
-				patternFrag$1.push(INDENT_END, NEWLINE, `})`);
+				patternFrag.push(NEWLINE, `_selector${id}_${i}(() => {`, INDENT_START);
+				for (const oper$1 of effect.operations) patternFrag.push(...genOperation(oper$1, context));
+				patternFrag.push(INDENT_END, NEWLINE, `})`);
 			}
-			for (const { effect } of keyOnlyBindingPatterns) for (const oper$1 of effect.operations) patternFrag$1.push(...genOperation(oper$1, context));
-			return patternFrag$1;
+			for (const { effect } of keyOnlyBindingPatterns) for (const oper$1 of effect.operations) patternFrag.push(...genOperation(oper$1, context));
+			return patternFrag;
 		}));
 		else frag.push(...genBlockContent(render, context));
 		frag.push(INDENT_END, NEWLINE, "}");
@@ -1098,9 +1053,9 @@ function genFor(oper, context) {
 	if (once) flags |= VaporVForFlags.ONCE;
 	return [
 		NEWLINE,
+		...selectorDeclarations,
 		`const n${id} = `,
-		...genCall(helper("createFor"), sourceExpr, blockFn, genCallback(keyProp), flags ? String(flags) : void 0),
-		...patternFrag
+		...genCall([helper("createFor"), "undefined"], sourceExpr, blockFn, genCallback(keyProp), flags ? String(flags) : void 0, selectorSetup.length ? selectorSetup : void 0)
 	];
 	function parseValueDestructure() {
 		const map = /* @__PURE__ */ new Map();
@@ -1248,7 +1203,7 @@ function matchSelectorPattern(effect, keyAst, idMap) {
 			}
 		}
 		const content = effect.expressions[0].content;
-		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && (0, __vue_compiler_dom.isStaticNode)(ast.consequent) && (0, __vue_compiler_dom.isStaticNode)(ast.alternate)) {
+		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && isConstant(ast.consequent) && isConstant(ast.alternate)) {
 			const left = ast.test.left;
 			const right = ast.test.right;
 			for (const [a, b] of [[left, right], [right, left]]) {
@@ -1553,7 +1508,6 @@ var CodegenContext = class {
 	};
 	delegates = /* @__PURE__ */ new Set();
 	identifiers = Object.create(null);
-	seenInlineHandlerNames = Object.create(null);
 	block;
 	withId(fn, map) {
 		const { identifiers } = this;
@@ -1703,7 +1657,7 @@ var TransformContext = class TransformContext {
 	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, getOperationIndex);
+		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstant(e.ast))) return this.registerOperation(operations, getOperationIndex);
 		this.block.effect.splice(getEffectIndex(), 0, {
 			expressions,
 			operations
@@ -2052,7 +2006,7 @@ function processConditionalExpression(node, context) {
 		id,
 		condition,
 		positive: branch,
-		once: context.inVOnce || (0, __vue_compiler_dom.isStaticNode)(test)
+		once: context.inVOnce || isConstant(test)
 	};
 	return [() => {
 		onExit();
@@ -2220,7 +2174,7 @@ function processFor(node, dir, context) {
 	return () => {
 		exitBlock();
 		const { parent } = context;
-		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.length === 1;
+		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.filter((child) => !isEmptyText(child)).length === 1;
 		context.dynamic.operation = {
 			type: IRNodeTypes.FOR,
 			id,
@@ -2230,7 +2184,7 @@ function processFor(node, dir, context) {
 			index,
 			keyProp: keyProperty,
 			render,
-			once: context.inVOnce || !!(source.ast && (0, __vue_compiler_dom.isConstantNode)(source.ast, {})),
+			once: context.inVOnce || !!(source.ast && isConstant(source.ast)),
 			component: isComponent,
 			onlyChild: !!isOnlyChild
 		};
@@ -2305,7 +2259,7 @@ function processIf(node, attribute, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				once: context.inVOnce || (0, __vue_compiler_dom.isConstantNode)(attribute.value, {})
+				once: context.inVOnce || isConstant(attribute.value)
 			};
 		};
 	} else {

package/dist/index.d.cts

@@ -353,7 +353,6 @@ declare class CodegenContext {
   helper: (name: string) => string;
   delegates: Set<string>;
   identifiers: Record<string, (string | SimpleExpressionNode)[]>;
-  seenInlineHandlerNames: Record<string, number>;
   block: BlockIRNode;
   withId<T>(fn: () => T, map: Record<string, string | SimpleExpressionNode | null>): T;
   enterBlock(block: BlockIRNode): () => BlockIRNode;

package/dist/index.d.ts

@@ -353,7 +353,6 @@ declare class CodegenContext {
   helper: (name: string) => string;
   delegates: Set<string>;
   identifiers: Record<string, (string | SimpleExpressionNode)[]>;
-  seenInlineHandlerNames: Record<string, number>;
   block: BlockIRNode;
   withId<T>(fn: () => T, map: Record<string, string | SimpleExpressionNode | null>): T;
   enterBlock(block: BlockIRNode): () => BlockIRNode;

package/dist/index.js

@@ -1,8 +1,8 @@
 import { parse, parseExpression } from "@babel/parser";
 import { NOOP, camelize, canSetValueDirectly, capitalize, extend, isArray, isBuiltInDirective, isGloballyAllowed, isHTMLTag, isSVGTag, isString, isVoidTag, makeMap, remove, shouldSetAsAttr, toHandlerKey } from "@vue/shared";
-import { DOMErrorCodes, ErrorCodes, NewlineType, NodeTypes, TS_NODE_TYPES, advancePositionWithClone, advancePositionWithMutation, createCompilerError, createDOMCompilerError, createSimpleExpression, defaultOnError, defaultOnWarn, isConstantNode, isFnExpression, isLiteralWhitelisted, isMemberExpression, isSimpleIdentifier, isStaticNode, isStaticProperty, isValidHTMLNesting, locStub, resolveModifiers, toValidAssetId, unwrapTSNode, walkIdentifiers } from "@vue/compiler-dom";
+import { DOMErrorCodes, ErrorCodes, NewlineType, NodeTypes, TS_NODE_TYPES, advancePositionWithClone, advancePositionWithMutation, createCompilerError, createDOMCompilerError, createSimpleExpression, defaultOnError, defaultOnWarn, isConstantNode, isFnExpression, isLiteralWhitelisted, isMemberExpression, isSimpleIdentifier, isStaticProperty, isValidHTMLNesting, locStub, resolveModifiers, toValidAssetId, unwrapTSNode, walkIdentifiers } from "@vue/compiler-dom";
 import { walkAST, walkIdentifiers as walkIdentifiers$1 } from "ast-kit";
-import { isLiteral, isNodesEquivalent, jsxClosingFragment, jsxExpressionContainer, jsxFragment, jsxOpeningFragment } from "@babel/types";
+import { isNodesEquivalent, jsxClosingFragment, jsxExpressionContainer, jsxFragment, jsxOpeningFragment } from "@babel/types";
 import { SourceMapGenerator } from "source-map-js";
 
 //#region src/ir/component.ts
@@ -121,18 +121,7 @@ function getLiteralExpressionValue(exp) {
 const isConstant = (node) => {
 	if (!node) return false;
 	if (node.type === "Identifier") return node.name === "undefined" || isGloballyAllowed(node.name);
-	if ([
-		"JSXElement",
-		"JSXFragment",
-		"NullLiteral"
-	].includes(node.type)) return true;
-	if (node.type === "ArrayExpression") {
-		const { elements } = node;
-		return elements.every((element) => element && isConstant(element));
-	}
-	if (node.type === "ObjectExpression") return node.properties.every((property) => isConstant(property.value));
-	if (node.type === "TemplateLiteral" ? !node.expressions.length : isLiteral(node)) return true;
-	return false;
+	return isConstantNode(node, {});
 };
 const EMPTY_TEXT_REGEX = /^[\t\v\f \u00A0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*[\n\r]\s*$/;
 const START_EMPTY_TEXT_REGEX = /^\s*[\n\r]/;
@@ -733,21 +722,10 @@ function genCreateComponent(operation, context) {
 	const { helper } = context;
 	const tag = genTag();
 	const { root, props, slots, once } = operation;
+	const rawProps = genRawProps(props, context);
 	const rawSlots = genRawSlots(slots, context);
-	const [ids, handlers] = processInlineHandlers(props, context);
-	const rawProps = context.withId(() => genRawProps(props, context), ids);
-	const inlineHandlers = handlers.reduce((acc, { name, value }) => {
-		const handler = genEventHandler(context, value, void 0, false);
-		return [
-			...acc,
-			`const ${name} = `,
-			...handler,
-			NEWLINE
-		];
-	}, []);
 	return [
 		NEWLINE,
-		...inlineHandlers,
 		`const n${operation.id} = `,
 		...genCall(operation.dynamic && !operation.dynamic.isStatic ? helper("createDynamicComponent") : operation.asset ? helper("createComponentWithFallback") : helper("createComponent"), tag, rawProps, rawSlots, root ? "true" : false, once && "true"),
 		...genDirectivesForElement(operation.id, context)
@@ -763,33 +741,6 @@ function genCreateComponent(operation, context) {
 		else return genExpression(extend(createSimpleExpression(operation.tag, false), { ast: null }), context);
 	}
 }
-function getUniqueHandlerName(context, name) {
-	const { seenInlineHandlerNames } = context;
-	const count = seenInlineHandlerNames[name] || 0;
-	seenInlineHandlerNames[name] = count + 1;
-	return count === 0 ? name : `${name}${count}`;
-}
-function processInlineHandlers(props, context) {
-	const ids = Object.create(null);
-	const handlers = [];
-	const staticProps = props[0];
-	if (isArray(staticProps)) for (const prop of staticProps) {
-		if (!prop.handler) continue;
-		prop.values.forEach((value, i) => {
-			const isMemberExp = isMemberExpression(value, context.options);
-			if (!isMemberExp) {
-				const name = getUniqueHandlerName(context, `_on_${prop.key.content.replace(":", "_")}`);
-				handlers.push({
-					name,
-					value
-				});
-				ids[name] = null;
-				prop.values[i] = extend({ ast: null }, createSimpleExpression(name));
-			}
-		});
-	}
-	return [ids, handlers];
-}
 function genRawProps(props, context) {
 	const staticProps = props[0];
 	if (isArray(staticProps)) {
@@ -1046,23 +997,27 @@ function genFor(oper, context) {
 		idMap[indexVar] = null;
 	}
 	const { selectorPatterns, keyOnlyBindingPatterns } = matchPatterns(render, keyProp, idMap);
-	const patternFrag = [];
+	const selectorDeclarations = [];
+	const selectorSetup = [];
 	for (const [i, { selector }] of selectorPatterns.entries()) {
 		const selectorName = `_selector${id}_${i}`;
-		patternFrag.push(NEWLINE, `const ${selectorName} = `, ...genCall(`n${id}.useSelector`, [`() => `, ...genExpression(selector, context)]));
+		selectorDeclarations.push(`let ${selectorName}`, NEWLINE);
+		if (i === 0) selectorSetup.push(`({ createSelector }) => {`, INDENT_START);
+		selectorSetup.push(NEWLINE, `${selectorName} = `, ...genCall(`createSelector`, [`() => `, ...genExpression(selector, context)]));
+		if (i === selectorPatterns.length - 1) selectorSetup.push(INDENT_END, NEWLINE, "}");
 	}
 	const blockFn = context.withId(() => {
 		const frag = [];
 		frag.push("(", ...args, ") => {", INDENT_START);
 		if (selectorPatterns.length || keyOnlyBindingPatterns.length) frag.push(...genBlockContent(render, context, false, () => {
-			const patternFrag$1 = [];
+			const patternFrag = [];
 			for (const [i, { effect }] of selectorPatterns.entries()) {
-				patternFrag$1.push(NEWLINE, `_selector${id}_${i}(() => {`, INDENT_START);
-				for (const oper$1 of effect.operations) patternFrag$1.push(...genOperation(oper$1, context));
-				patternFrag$1.push(INDENT_END, NEWLINE, `})`);
+				patternFrag.push(NEWLINE, `_selector${id}_${i}(() => {`, INDENT_START);
+				for (const oper$1 of effect.operations) patternFrag.push(...genOperation(oper$1, context));
+				patternFrag.push(INDENT_END, NEWLINE, `})`);
 			}
-			for (const { effect } of keyOnlyBindingPatterns) for (const oper$1 of effect.operations) patternFrag$1.push(...genOperation(oper$1, context));
-			return patternFrag$1;
+			for (const { effect } of keyOnlyBindingPatterns) for (const oper$1 of effect.operations) patternFrag.push(...genOperation(oper$1, context));
+			return patternFrag;
 		}));
 		else frag.push(...genBlockContent(render, context));
 		frag.push(INDENT_END, NEWLINE, "}");
@@ -1075,9 +1030,9 @@ function genFor(oper, context) {
 	if (once) flags |= VaporVForFlags.ONCE;
 	return [
 		NEWLINE,
+		...selectorDeclarations,
 		`const n${id} = `,
-		...genCall(helper("createFor"), sourceExpr, blockFn, genCallback(keyProp), flags ? String(flags) : void 0),
-		...patternFrag
+		...genCall([helper("createFor"), "undefined"], sourceExpr, blockFn, genCallback(keyProp), flags ? String(flags) : void 0, selectorSetup.length ? selectorSetup : void 0)
 	];
 	function parseValueDestructure() {
 		const map = /* @__PURE__ */ new Map();
@@ -1225,7 +1180,7 @@ function matchSelectorPattern(effect, keyAst, idMap) {
 			}
 		}
 		const content = effect.expressions[0].content;
-		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && isStaticNode(ast.consequent) && isStaticNode(ast.alternate)) {
+		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && isConstant(ast.consequent) && isConstant(ast.alternate)) {
 			const left = ast.test.left;
 			const right = ast.test.right;
 			for (const [a, b] of [[left, right], [right, left]]) {
@@ -1530,7 +1485,6 @@ var CodegenContext = class {
 	};
 	delegates = /* @__PURE__ */ new Set();
 	identifiers = Object.create(null);
-	seenInlineHandlerNames = Object.create(null);
 	block;
 	withId(fn, map) {
 		const { identifiers } = this;
@@ -1680,7 +1634,7 @@ var TransformContext = class TransformContext {
 	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, getOperationIndex);
+		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstant(e.ast))) return this.registerOperation(operations, getOperationIndex);
 		this.block.effect.splice(getEffectIndex(), 0, {
 			expressions,
 			operations
@@ -2029,7 +1983,7 @@ function processConditionalExpression(node, context) {
 		id,
 		condition,
 		positive: branch,
-		once: context.inVOnce || isStaticNode(test)
+		once: context.inVOnce || isConstant(test)
 	};
 	return [() => {
 		onExit();
@@ -2197,7 +2151,7 @@ function processFor(node, dir, context) {
 	return () => {
 		exitBlock();
 		const { parent } = context;
-		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.length === 1;
+		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.filter((child) => !isEmptyText(child)).length === 1;
 		context.dynamic.operation = {
 			type: IRNodeTypes.FOR,
 			id,
@@ -2207,7 +2161,7 @@ function processFor(node, dir, context) {
 			index,
 			keyProp: keyProperty,
 			render,
-			once: context.inVOnce || !!(source.ast && isConstantNode(source.ast, {})),
+			once: context.inVOnce || !!(source.ast && isConstant(source.ast)),
 			component: isComponent,
 			onlyChild: !!isOnlyChild
 		};
@@ -2282,7 +2236,7 @@ function processIf(node, attribute, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				once: context.inVOnce || isConstantNode(attribute.value, {})
+				once: context.inVOnce || isConstant(attribute.value)
 			};
 		};
 	} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -36,8 +36,8 @@
   "dependencies": {
     "@babel/parser": "^7.28.0",
     "@babel/types": "^7.28.0",
-    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@73bceb2",
-    "@vue/shared": "https://pkg.pr.new/@vue/shared@73bceb2",
+    "@vue/compiler-dom": "3.6.0-alpha.2",
+    "@vue/shared": "3.6.0-alpha.2",
     "ast-kit": "^2.1.1",
     "source-map-js": "^1.2.1"
   },