vue-jsx-vapor 3.2.23 → 3.2.25

package/dist/volar.cjs

@@ -5,7 +5,7 @@ _vue_jsx_vapor_macros_volar = require_chunk.__toESM(_vue_jsx_vapor_macros_volar)
 let ts_macro = require("ts-macro");
 let _vue_shared = require("@vue/shared");
 
-//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=79e6492c51b3afca57b92023dd1aae9ddd57140efa1cf2cdf74d_44219e93f933d0e6c62a11c89d7bb95f/node_modules/@vue-macros/volar/dist/jsx-directive-w2gUTWdx.js
+//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=fd21154639cf4ca643d5e6948fd8469d3640226ab245fd5d0068_98acbb9d3ff744314cc8fc3f77242c15/node_modules/@vue-macros/volar/dist/jsx-directive-w2gUTWdx.js
 function getDirectiveArgs(attribute, options) {
 	const { ts, ast } = options;
 	const attributeName = attribute.name.getText(ast);
@@ -63,7 +63,7 @@ declare function __VLS_asFunctionalComponent<
           ? Props
           : any),
       ctx?: any,
-    ) => JSX.Element & {
+    ) => {
       __ctx: {
         attrs: Record<string, any>,
         props: (K extends { $props: infer Props }
@@ -153,7 +153,7 @@ function transformCtx(node, root, index, options) {
 	const ctxName = `__VLS_ctx_${refValue || index}`;
 	let tagName = "";
 	const originTagName = tagName = getTagName(node, options);
-	if ((0, _vue_shared.isHTMLTag)(tagName) || (0, _vue_shared.isSVGTag)(tagName) || tagName.includes("-")) tagName = `{}`;
+	if (!tagName.includes(".") && /^[a-z]/.test(tagName) || tagName.includes("-")) tagName = `{}`;
 	else {
 		let types = "";
 		if (openingElement.typeArguments?.length) {
@@ -541,10 +541,10 @@ function transformVSlot(nodeMap, ctxMap, options) {
 function transformVSlots(nodes, ctxMap, options) {
 	const { codes, ts } = options;
 	for (const { node, attribute: { initializer } } of nodes) if (initializer && ts.isJsxExpression(initializer) && initializer.expression) {
-		if (ts.isObjectLiteralExpression(initializer.expression)) codes.replaceRange(initializer.expression.end, initializer.expression.end, ` satisfies typeof ${ctxMap.get(node)}.slots`);
+		if (ts.isObjectLiteralExpression(initializer.expression)) codes.replaceRange(initializer.expression.end, initializer.expression.end, ` satisfies typeof ${ctxMap.get(node)}.slots as Record<string, any>`);
 		else if (ts.isFunctionExpression(initializer.expression) || ts.isArrowFunction(initializer.expression)) {
 			codes.replaceRange(initializer.expression.pos, initializer.expression.pos, "(");
-			codes.replaceRange(initializer.expression.end, initializer.expression.end, `) satisfies typeof ${ctxMap.get(node)}.slots.default`);
+			codes.replaceRange(initializer.expression.end, initializer.expression.end, `) satisfies typeof ${ctxMap.get(node)}.slots.default as any`);
 		}
 	}
 }
@@ -722,7 +722,7 @@ const plugin$2 = (0, ts_macro.createPlugin)(({ ts, vueCompilerOptions }, options
 var jsx_directive_default = plugin$2;
 
 //#endregion
-//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=79e6492c51b3afca57b92023dd1aae9ddd57140efa1cf2cdf74d_44219e93f933d0e6c62a11c89d7bb95f/node_modules/@vue-macros/volar/dist/jsx-ref-DZlb-F7c.js
+//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=fd21154639cf4ca643d5e6948fd8469d3640226ab245fd5d0068_98acbb9d3ff744314cc8fc3f77242c15/node_modules/@vue-macros/volar/dist/jsx-ref-DZlb-F7c.js
 function transformRef({ nodes, codes, ts }) {
 	for (const { name, initializer } of nodes) if (ts.isCallExpression(initializer)) codes.replaceRange(initializer.expression.end, initializer.expression.end, `<Parameters<typeof __VLS_ctx_${name.text}['expose']>[0] | null>`);
 }

package/dist/volar.js

@@ -2,7 +2,7 @@ import jsxMacros from "@vue-jsx-vapor/macros/volar";
 import { allCodeFeatures, createPlugin } from "ts-macro";
 import { isHTMLTag, isSVGTag } from "@vue/shared";
 
-//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=79e6492c51b3afca57b92023dd1aae9ddd57140efa1cf2cdf74d_44219e93f933d0e6c62a11c89d7bb95f/node_modules/@vue-macros/volar/dist/jsx-directive-w2gUTWdx.js
+//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=fd21154639cf4ca643d5e6948fd8469d3640226ab245fd5d0068_98acbb9d3ff744314cc8fc3f77242c15/node_modules/@vue-macros/volar/dist/jsx-directive-w2gUTWdx.js
 function getDirectiveArgs(attribute, options) {
 	const { ts, ast } = options;
 	const attributeName = attribute.name.getText(ast);
@@ -60,7 +60,7 @@ declare function __VLS_asFunctionalComponent<
           ? Props
           : any),
       ctx?: any,
-    ) => JSX.Element & {
+    ) => {
       __ctx: {
         attrs: Record<string, any>,
         props: (K extends { $props: infer Props }
@@ -150,7 +150,7 @@ function transformCtx(node, root, index, options) {
 	const ctxName = `__VLS_ctx_${refValue || index}`;
 	let tagName = "";
 	const originTagName = tagName = getTagName(node, options);
-	if (isHTMLTag(tagName) || isSVGTag(tagName) || tagName.includes("-")) tagName = `{}`;
+	if (!tagName.includes(".") && /^[a-z]/.test(tagName) || tagName.includes("-")) tagName = `{}`;
 	else {
 		let types = "";
 		if (openingElement.typeArguments?.length) {
@@ -538,10 +538,10 @@ function transformVSlot(nodeMap, ctxMap, options) {
 function transformVSlots(nodes, ctxMap, options) {
 	const { codes, ts } = options;
 	for (const { node, attribute: { initializer } } of nodes) if (initializer && ts.isJsxExpression(initializer) && initializer.expression) {
-		if (ts.isObjectLiteralExpression(initializer.expression)) codes.replaceRange(initializer.expression.end, initializer.expression.end, ` satisfies typeof ${ctxMap.get(node)}.slots`);
+		if (ts.isObjectLiteralExpression(initializer.expression)) codes.replaceRange(initializer.expression.end, initializer.expression.end, ` satisfies typeof ${ctxMap.get(node)}.slots as Record<string, any>`);
 		else if (ts.isFunctionExpression(initializer.expression) || ts.isArrowFunction(initializer.expression)) {
 			codes.replaceRange(initializer.expression.pos, initializer.expression.pos, "(");
-			codes.replaceRange(initializer.expression.end, initializer.expression.end, `) satisfies typeof ${ctxMap.get(node)}.slots.default`);
+			codes.replaceRange(initializer.expression.end, initializer.expression.end, `) satisfies typeof ${ctxMap.get(node)}.slots.default as any`);
 		}
 	}
 }
@@ -719,7 +719,7 @@ const plugin$2 = createPlugin(({ ts, vueCompilerOptions }, options = vueCompiler
 var jsx_directive_default = plugin$2;
 
 //#endregion
-//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=79e6492c51b3afca57b92023dd1aae9ddd57140efa1cf2cdf74d_44219e93f933d0e6c62a11c89d7bb95f/node_modules/@vue-macros/volar/dist/jsx-ref-DZlb-F7c.js
+//#region ../../node_modules/.pnpm/@vue-macros+volar@3.1.4_patch_hash=fd21154639cf4ca643d5e6948fd8469d3640226ab245fd5d0068_98acbb9d3ff744314cc8fc3f77242c15/node_modules/@vue-macros/volar/dist/jsx-ref-DZlb-F7c.js
 function transformRef({ nodes, codes, ts }) {
 	for (const { name, initializer } of nodes) if (ts.isCallExpression(initializer)) codes.replaceRange(initializer.expression.end, initializer.expression.end, `<Parameters<typeof __VLS_ctx_${name.text}['expose']>[0] | null>`);
 }

package/jsx-runtime/vapor.d.ts

@@ -1,10 +1,18 @@
 import { Fragment } from 'vue'
-import type { JSX, RenderResult } from 'vue-jsx-vapor'
+import type { RenderResult, JSX as VueJSX } from 'vue-jsx-vapor'
 
 declare global {
-  export type { JSX } from 'vue-jsx-vapor'
+  namespace JSX {
+    type Element = VueJSX.Element
+    type ElementAttributesProperty = VueJSX.ElementAttributesProperty
+    type ElementChildrenAttribute = VueJSX.ElementChildrenAttribute
+    type IntrinsicElements = VueJSX.IntrinsicElements
+    type IntrinsicAttributes = VueJSX.IntrinsicAttributes
+    type LibraryManagedAttributes<Component, Props> =
+      VueJSX.LibraryManagedAttributes<Component, Props>
+  }
 }
 
 declare function jsx(type: any, props: any, key: any): RenderResult
 
-export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs, type JSX }
+export { Fragment, jsx, jsx as jsxDEV, jsx as jsxs }

package/jsx-runtime/vdom.d.ts

@@ -1,8 +1,16 @@
 import type { Fragment, VNode } from 'vue'
-export type { JSX } from 'vue-jsx-vapor'
+import type { JSX as VueJSX } from 'vue-jsx-vapor'
 
 declare global {
-  export type { JSX } from 'vue-jsx-vapor'
+  namespace JSX {
+    type Element = VueJSX.Element
+    type ElementAttributesProperty = VueJSX.ElementAttributesProperty
+    type ElementChildrenAttribute = VueJSX.ElementChildrenAttribute
+    type IntrinsicElements = VueJSX.IntrinsicElements
+    type IntrinsicAttributes = VueJSX.IntrinsicAttributes
+    type LibraryManagedAttributes<Component, Props> =
+      VueJSX.LibraryManagedAttributes<Component, Props>
+  }
 }
 
 declare function jsx(type: any, props: any, key: any): VNode

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue-jsx-vapor",
   "type": "module",
-  "version": "3.2.23",
+  "version": "3.2.25",
   "description": "Vapor Mode of Vue JSX",
   "license": "MIT",
   "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",
@@ -171,20 +171,20 @@
     }
   },
   "dependencies": {
-    "@vue/shared": "3.6.0-rc.7",
+    "@vue/shared": "3.6.0-rc.9",
     "pathe": "^2.0.3",
     "ts-macro": "^0.3.7",
     "unplugin": "^3.0.0",
     "unplugin-utils": "^0.3.1",
-    "@vue-jsx-vapor/compiler-rs": "3.2.23",
-    "@vue-jsx-vapor/macros": "3.2.23",
-    "@vue-jsx-vapor/runtime": "3.2.23"
+    "@vue-jsx-vapor/macros": "3.2.25",
+    "@vue-jsx-vapor/runtime": "3.2.25",
+    "@vue-jsx-vapor/compiler-rs": "3.2.25"
   },
   "devDependencies": {
     "@nuxt/kit": "^3.21.4",
     "@nuxt/schema": "^3.21.4",
     "@vue-macros/volar": "^3.1.4",
-    "vue": "3.6.0-rc.7"
+    "vue": "3.6.0-rc.9"
   },
   "scripts": {
     "build": "tsdown",