vue-jsx-vapor 2.6.2 → 2.6.4

package/dist/esbuild.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as esbuild13 from "esbuild";
+import * as esbuild1 from "esbuild";
 
 //#region src/esbuild.d.ts
-declare const _default: (options?: Options | undefined) => esbuild13.Plugin;
+declare const _default: (options?: Options | undefined) => esbuild1.Plugin;
 //#endregion
 export { _default as default };

package/dist/esbuild.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as esbuild13 from "esbuild";
+import * as esbuild1 from "esbuild";
 
 //#region src/esbuild.d.ts
-declare const _default: (options?: Options | undefined) => esbuild13.Plugin;
+declare const _default: (options?: Options | undefined) => esbuild1.Plugin;
 //#endregion
 export { _default as default };

package/dist/nuxt.d.ts

@@ -1,8 +1,8 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as _nuxt_schema0 from "@nuxt/schema";
+import * as _nuxt_schema2 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts
 interface ModuleOptions extends Options {}
-declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: _nuxt_schema2.NuxtModule<ModuleOptions, ModuleOptions, false>;
 //#endregion
 export { ModuleOptions, _default as default };

package/dist/rolldown.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as rollup5 from "rollup";
+import * as rollup8 from "rollup";
 
 //#region src/rolldown.d.ts
-declare const _default: (options?: Options | undefined) => rollup5.Plugin<any> | rollup5.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup8.Plugin<any> | rollup8.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rolldown.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as rollup2 from "rollup";
+import * as rollup4 from "rollup";
 
 //#region src/rolldown.d.ts
-declare const _default: (options?: Options | undefined) => rollup2.Plugin<any> | rollup2.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup4.Plugin<any> | rollup4.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rollup.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as rollup1 from "rollup";
+import * as rollup11 from "rollup";
 
 //#region src/rollup.d.ts
-declare const _default: (options?: Options | undefined) => rollup1.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup11.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rollup.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as rollup8 from "rollup";
+import * as rollup7 from "rollup";
 
 //#region src/rollup.d.ts
-declare const _default: (options?: Options | undefined) => rollup8.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup7.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/unplugin.d.cts

@@ -1,9 +1,9 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as unplugin7 from "unplugin";
+import * as unplugin4 from "unplugin";
 import { UnpluginFactory } from "unplugin";
 
 //#region src/unplugin.d.ts
 declare const unpluginFactory: UnpluginFactory<Options | undefined, true>;
-declare const unplugin: unplugin7.UnpluginInstance<Options | undefined, true>;
+declare const unplugin: unplugin4.UnpluginInstance<Options | undefined, true>;
 //#endregion
 export { Options, unplugin as default, unplugin, unpluginFactory };

package/dist/unplugin.d.ts

@@ -1,9 +1,9 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as unplugin4 from "unplugin";
+import * as unplugin9 from "unplugin";
 import { UnpluginFactory } from "unplugin";
 
 //#region src/unplugin.d.ts
 declare const unpluginFactory: UnpluginFactory<Options | undefined, true>;
-declare const unplugin: unplugin4.UnpluginInstance<Options | undefined, true>;
+declare const unplugin: unplugin9.UnpluginInstance<Options | undefined, true>;
 //#endregion
 export { Options, unplugin as default, unplugin, unpluginFactory };

package/dist/vite.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as vite9 from "vite";
+import * as vite6 from "vite";
 
 //#region src/vite.d.ts
-declare const _default: (options?: Options | undefined) => vite9.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => vite6.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/vite.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as vite6 from "vite";
+import * as vite11 from "vite";
 
 //#region src/vite.d.ts
-declare const _default: (options?: Options | undefined) => vite6.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => vite11.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/volar.cjs

@@ -4,13 +4,57 @@ const __vue_jsx_vapor_macros_volar = require_chunk.__toESM(require("@vue-jsx-vap
 const __vue_macros_volar_jsx_directive = require_chunk.__toESM(require("@vue-macros/volar/jsx-directive"));
 const __vue_macros_volar_jsx_ref = require_chunk.__toESM(require("@vue-macros/volar/jsx-ref"));
 const ts_macro = require_chunk.__toESM(require("ts-macro"));
+const __vue_shared = require_chunk.__toESM(require("@vue/shared"));
 
+//#region src/volar/jsx-element.ts
+var jsx_element_default = (0, ts_macro.createPlugin)(({ ts }) => {
+	return {
+		name: "@vue-jsx-vapor/jsx-element",
+		resolveVirtualCode({ ast, codes }) {
+			let transformed = false;
+			ast.forEachChild(function walk(node, parent = ast) {
+				if (!ts.isJsxElement(parent) && !ts.isJsxFragment(parent) && !ts.isJsxExpression(parent) && !(parent.parent ? isConditionalExpression(ts, parent) : false)) {
+					const openingElement = ts.isJsxElement(node) ? node.openingElement : ts.isJsxSelfClosingElement(node) ? node : null;
+					if (openingElement) {
+						const tagName = openingElement.tagName.getText(ast);
+						if (!tagName.includes("-")) {
+							transformed = true;
+							codes.replaceRange(node.getStart(ast), node.getStart(ast) + 1, "(<");
+							codes.replaceRange(node.end, node.end, " as unknown as __InferJsxElement<", (0, __vue_shared.isHTMLTag)(tagName) || (0, __vue_shared.isSVGTag)(tagName) ? `'${tagName}'` : `typeof ${tagName}`, ">)");
+						}
+					}
+				}
+				if (!ts.isCallExpression(node) || node.expression.getText(ast) !== "defineSlots") node.forEachChild((child) => walk(child, node));
+			});
+			transformed && codes.push(`
+type __InferJsxElement<T> = T extends keyof HTMLElementTagNameMap
+  ? HTMLElementTagNameMap[T]
+  : T extends keyof SVGElementTagNameMap
+    ? SVGElementTagNameMap[T]
+    : T extends (props: infer Props, ctx: { slots: infer Slots, expose: (exposed: infer Exposed) => void, attrs: any, emit: any }) => infer TypeBlock
+      // @ts-ignore
+      ? import('vue-jsx-vapor').VaporComponentInstance<Props, {}, Slots, Exposed, TypeBlock>
+      : T extends { new (...args: any[]): infer Instance }
+        ? Instance extends { $: any }
+          ? import('vue').VNode
+          : Instance
+        : JSX.Element
+      `);
+		}
+	};
+});
+function isConditionalExpression(ts, node) {
+	return !!(node && (ts.isBinaryExpression(node) || ts.isConditionalExpression(node)) && node.parent && (ts.isJsxExpression(node.parent) || isConditionalExpression(ts, node.parent)));
+}
+
+//#endregion
 //#region src/volar.ts
 const plugin = (0, ts_macro.createPlugin)((ctx, options = ctx.vueCompilerOptions?.["vue-jsx-vapor"]) => {
 	return [
 		(0, __vue_macros_volar_jsx_directive.default)()(ctx),
 		options?.ref === false ? [] : (0, __vue_macros_volar_jsx_ref.default)(options?.ref === true ? void 0 : options?.ref)(ctx),
-		options?.macros === false ? [] : options?.macros ? (0, __vue_jsx_vapor_macros_volar.default)(options.macros === true ? void 0 : options.macros)(ctx) : []
+		options?.macros === false ? [] : options?.macros ? (0, __vue_jsx_vapor_macros_volar.default)(options.macros === true ? void 0 : options.macros)(ctx) : [],
+		options?.interop ? [] : jsx_element_default()(ctx)
 	].flat();
 });
 var volar_default = plugin;

package/dist/volar.js

@@ -2,13 +2,57 @@ import jsxMacros from "@vue-jsx-vapor/macros/volar";
 import jsxDirective from "@vue-macros/volar/jsx-directive";
 import jsxRef from "@vue-macros/volar/jsx-ref";
 import { createPlugin } from "ts-macro";
+import { isHTMLTag, isSVGTag } from "@vue/shared";
 
+//#region src/volar/jsx-element.ts
+var jsx_element_default = createPlugin(({ ts }) => {
+	return {
+		name: "@vue-jsx-vapor/jsx-element",
+		resolveVirtualCode({ ast, codes }) {
+			let transformed = false;
+			ast.forEachChild(function walk(node, parent = ast) {
+				if (!ts.isJsxElement(parent) && !ts.isJsxFragment(parent) && !ts.isJsxExpression(parent) && !(parent.parent ? isConditionalExpression(ts, parent) : false)) {
+					const openingElement = ts.isJsxElement(node) ? node.openingElement : ts.isJsxSelfClosingElement(node) ? node : null;
+					if (openingElement) {
+						const tagName = openingElement.tagName.getText(ast);
+						if (!tagName.includes("-")) {
+							transformed = true;
+							codes.replaceRange(node.getStart(ast), node.getStart(ast) + 1, "(<");
+							codes.replaceRange(node.end, node.end, " as unknown as __InferJsxElement<", isHTMLTag(tagName) || isSVGTag(tagName) ? `'${tagName}'` : `typeof ${tagName}`, ">)");
+						}
+					}
+				}
+				if (!ts.isCallExpression(node) || node.expression.getText(ast) !== "defineSlots") node.forEachChild((child) => walk(child, node));
+			});
+			transformed && codes.push(`
+type __InferJsxElement<T> = T extends keyof HTMLElementTagNameMap
+  ? HTMLElementTagNameMap[T]
+  : T extends keyof SVGElementTagNameMap
+    ? SVGElementTagNameMap[T]
+    : T extends (props: infer Props, ctx: { slots: infer Slots, expose: (exposed: infer Exposed) => void, attrs: any, emit: any }) => infer TypeBlock
+      // @ts-ignore
+      ? import('vue-jsx-vapor').VaporComponentInstance<Props, {}, Slots, Exposed, TypeBlock>
+      : T extends { new (...args: any[]): infer Instance }
+        ? Instance extends { $: any }
+          ? import('vue').VNode
+          : Instance
+        : JSX.Element
+      `);
+		}
+	};
+});
+function isConditionalExpression(ts, node) {
+	return !!(node && (ts.isBinaryExpression(node) || ts.isConditionalExpression(node)) && node.parent && (ts.isJsxExpression(node.parent) || isConditionalExpression(ts, node.parent)));
+}
+
+//#endregion
 //#region src/volar.ts
 const plugin = createPlugin((ctx, options = ctx.vueCompilerOptions?.["vue-jsx-vapor"]) => {
 	return [
 		jsxDirective()(ctx),
 		options?.ref === false ? [] : jsxRef(options?.ref === true ? void 0 : options?.ref)(ctx),
-		options?.macros === false ? [] : options?.macros ? jsxMacros(options.macros === true ? void 0 : options.macros)(ctx) : []
+		options?.macros === false ? [] : options?.macros ? jsxMacros(options.macros === true ? void 0 : options.macros)(ctx) : [],
+		options?.interop ? [] : jsx_element_default()(ctx)
 	].flat();
 });
 var volar_default = plugin;

package/dist/webpack.d.cts

@@ -1,7 +1,7 @@
 import { Options } from "./options-jKAq0dFf.cjs";
-import * as webpack11 from "webpack";
+import * as webpack13 from "webpack";
 
 //#region src/webpack.d.ts
-declare const _default: (options?: Options | undefined) => webpack11.WebpackPluginInstance;
+declare const _default: (options?: Options | undefined) => webpack13.WebpackPluginInstance;
 //#endregion
 export { _default as default };

package/dist/webpack.d.ts

@@ -1,7 +1,7 @@
 import { Options } from "./options-CBMw6D8V.js";
-import * as webpack10 from "webpack";
+import * as webpack13 from "webpack";
 
 //#region src/webpack.d.ts
-declare const _default: (options?: Options | undefined) => webpack10.WebpackPluginInstance;
+declare const _default: (options?: Options | undefined) => webpack13.WebpackPluginInstance;
 //#endregion
 export { _default as default };

package/jsx-runtime/index.cjs

@@ -1,15 +1,14 @@
 //#region rolldown:runtime
-var __create = Object.create
-var __defProp = Object.defineProperty
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor
-var __getOwnPropNames = Object.getOwnPropertyNames
-var __getProtoOf = Object.getPrototypeOf
-var __hasOwnProp = Object.prototype.hasOwnProperty
-var __copyProps = (to, from, except, desc) => {
+const __create = Object.create
+const __defProp = Object.defineProperty
+const __getOwnPropDesc = Object.getOwnPropertyDescriptor
+const __getOwnPropNames = Object.getOwnPropertyNames
+const __getProtoOf = Object.getPrototypeOf
+const __hasOwnProp = Object.prototype.hasOwnProperty
+const __copyProps = (to, from, except, desc) => {
   if ((from && typeof from === 'object') || typeof from === 'function')
     for (
-      // eslint-disable-next-line vars-on-top
-      var keys = __getOwnPropNames(from), i = 0, n = keys.length, key;
+      let keys = __getOwnPropNames(from), i = 0, n = keys.length, key;
       i < n;
       i++
     ) {
@@ -22,7 +21,7 @@ var __copyProps = (to, from, except, desc) => {
     }
   return to
 }
-var __toESM = (mod, isNodeMode, target) => (
+const __toESM = (mod, isNodeMode, target) => (
   (target = mod != null ? __create(__getProtoOf(mod)) : {}),
   __copyProps(
     isNodeMode || !mod || !mod.__esModule
@@ -39,7 +38,7 @@ const vue = __toESM(require('vue'))
 const vue_jsx_vapor = __toESM(require('vue-jsx-vapor'))
 
 function jsx(type, props, key) {
-  const { children, ['v-slots']: vSlots } = props
+  const { children, 'v-slots': vSlots } = props
   delete props.children
   delete props['v-slots']
   if (arguments.length > 2) props.key = key

package/jsx-runtime/index.d.ts

@@ -4,7 +4,7 @@ import type { h, NativeElements, ReservedProps } from 'vue-jsx-vapor'
 declare function jsx(type: any, props: any, key: any): ReturnType<typeof h>
 declare global {
   namespace JSX {
-    type Element = Block & VNode
+    type Element = VNode | Block | Element[]
     interface ElementAttributesProperty {
       $props
     }

package/jsx-runtime/index.js

@@ -2,7 +2,7 @@ import { Fragment } from 'vue'
 import { h } from 'vue-jsx-vapor'
 
 function jsx(type, props, key) {
-  const { children, ['v-slots']: vSlots } = props
+  const { children, 'v-slots': vSlots } = props
   delete props.children
   delete props['v-slots']
   if (arguments.length > 2) props.key = key

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-jsx-vapor",
-  "version": "2.6.2",
-  "description": "Convert Vue JSX to Vapor",
+  "version": "2.6.4",
+  "description": "Vapor Mode of Vue JSX",
   "type": "module",
   "keywords": [
     "unplugin",
@@ -161,24 +161,25 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.28.0",
+    "@babel/core": "^7.28.4",
     "@babel/plugin-transform-typescript": "^7.28.0",
-    "@vue-macros/jsx-directive": "^3.0.0-beta.20",
-    "@vue-macros/volar": "^3.0.0-beta.20",
-    "@vue/babel-plugin-jsx": "^1.4.0",
+    "@vue-macros/jsx-directive": "^3.0.0-beta.23",
+    "@vue-macros/volar": "^3.0.0-beta.23",
+    "@vue/babel-plugin-jsx": "^1.5.0",
+    "@vue/shared": "3.6.0-alpha.2",
     "hash-sum": "^2.0.0",
     "pathe": "^2.0.3",
-    "ts-macro": "^0.3.2",
-    "unplugin": "^2.3.5",
-    "unplugin-utils": "^0.2.4",
-    "@vue-jsx-vapor/compiler": "2.6.2",
-    "@vue-jsx-vapor/babel": "2.6.2",
-    "@vue-jsx-vapor/macros": "2.6.2",
-    "@vue-jsx-vapor/runtime": "2.6.2"
+    "ts-macro": "^0.3.4",
+    "unplugin": "^2.3.10",
+    "unplugin-utils": "^0.2.5",
+    "@vue-jsx-vapor/compiler": "2.6.4",
+    "@vue-jsx-vapor/babel": "2.6.4",
+    "@vue-jsx-vapor/macros": "2.6.4",
+    "@vue-jsx-vapor/runtime": "2.6.4"
   },
   "devDependencies": {
-    "@nuxt/kit": "^3.18.1",
-    "@nuxt/schema": "^3.18.1",
+    "@nuxt/kit": "^3.19.1",
+    "@nuxt/schema": "^3.19.1",
     "@types/babel__core": "^7.20.5",
     "@types/hash-sum": "^1.0.2"
   },