@vue-jsx-vapor/compiler 2.5.1 → 2.5.2

package/dist/index.cjs

@@ -756,21 +756,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 +775,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 +1031,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 +1064,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();
@@ -1553,7 +1519,6 @@ var CodegenContext = class {
 	};
 	delegates = /* @__PURE__ */ new Set();
 	identifiers = Object.create(null);
-	seenInlineHandlerNames = Object.create(null);
 	block;
 	withId(fn, map) {
 		const { identifiers } = this;

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

@@ -733,21 +733,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 +752,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 +1008,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 +1041,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();
@@ -1530,7 +1496,6 @@ var CodegenContext = class {
 	};
 	delegates = /* @__PURE__ */ new Set();
 	identifiers = Object.create(null);
-	seenInlineHandlerNames = Object.create(null);
 	block;
 	withId(fn, map) {
 		const { identifiers } = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "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": "https://pkg.pr.new/@vue/compiler-dom@5771104",
+    "@vue/shared": "https://pkg.pr.new/@vue/shared@5771104",
     "ast-kit": "^2.1.1",
     "source-map-js": "^1.2.1"
   },