@vue-jsx-vapor/macros 2.6.1 → 2.6.3

package/dist/esbuild.d.cts

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

package/dist/esbuild.d.ts

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

package/dist/nuxt.d.cts

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

package/dist/nuxt.d.ts

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

package/dist/rolldown.d.cts

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

package/dist/rolldown.d.ts

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

package/dist/rollup.d.cts

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

package/dist/rollup.d.ts

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

package/dist/vite.d.cts

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

package/dist/vite.d.ts

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

package/dist/volar.cjs

@@ -14,28 +14,23 @@ function transformDefineComponent(node, parent, options) {
 const __setup = `);
 	const result = (ts.isArrowFunction(comp) || ts.isFunctionExpression(comp)) && comp.typeParameters?.length ? ["\nreturn __setup"] : [
 		`
-  type __Props = Parameters<typeof __setup>[0]
-  type __Slots = Parameters<typeof __setup>[1] extends { slots?: infer Slots } | undefined ? Slots : {}
-  type __Exposed = Parameters<typeof __setup>[1] extends { expose?: (exposed: infer Exposed) => any } | undefined ? Exposed : {}`,
+  type __Setup = typeof __setup
+  type __Props = Parameters<__Setup>[0]
+  type __Slots = Parameters<__Setup>[1] extends { slots?: infer Slots } | undefined ? Slots : {}
+  type __Exposed = Parameters<__Setup>[1] extends { expose?: (exposed: infer Exposed) => any } | undefined ? Exposed : {}`,
 		"\n  const __component = ",
+		isVapor ? `// @ts-ignore\n(defineVaporComponent,await import('vue-jsx-vapor')).` : "",
 		[node.expression.getText(ast), node.expression.getStart(ast)],
-		`({`,
-		isVapor ? "" : `...{} as {
-    setup: () => __Exposed,
-    slots: import('vue').SlotsType<__Slots>
+		`({\n`,
+		`...{} as {
+    setup: (props: __Props) => __Exposed,
+    render: () => ReturnType<__Setup>
+    slots: ${isVapor ? "__Slots" : `import('vue').SlotsType<__Slots>`} 
   },`,
 		...compOptions ? ["...", [compOptions.getText(ast), compOptions.getStart(ast)]] : [],
 		`})
-  type __Instance = {${isVapor ? "\n/** @deprecated This is only a type when used in Vapor Instances. */" : ""}
-    $props: __Props
-  } & (typeof __component extends new (...args: any) => any ? InstanceType<typeof __component> : typeof __component)
-  return {} as {
-    new (props: __Props): __Instance,
-    setup: (props: __Props, ctx?: {
-      attrs?: Record<string, any>
-      slots?: __Slots,
-      expose?: (exposed: keyof __Exposed extends never ? __Instance : __Exposed) => any
-    }) => {},
+  return {} as Omit<typeof __component, 'constructor'> & {
+    new (props?: __Props): InstanceType<typeof __component> & {${isVapor ? "\n/** @deprecated This is only a type when used in Vapor Instances. */\n$props: __Props" : ""}},
   }`
 	];
 	codes.replaceRange(node.end, node.end, ...result, `\n})()`);
@@ -131,14 +126,18 @@ function transformJsxMacros(rootMap, options) {
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
-				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), `const __render`, macros.defineComponent ? macros.defineComponent?.expression.getText(ast) === "defineVaporComponent" ? ": import(\"vue-jsx-vapor\").NodeChild" : ": () => import(\"vue\").VNodeChild" : "", ` = `);
+				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), "const ", [
+					`__render`,
+					node.getStart(ast) - 1,
+					{ verification: true }
+				], macros.defineComponent ? macros.defineComponent?.expression.getText(ast) === "defineVaporComponent" ? "" : ": () => JSX.Element" : "", " = ");
 				codes.replaceRange(node.expression.end, node.expression.end, `
 return {} as {
   props: {${props.join(", ")}},
-  context: {
-    slots?: ${macros.defineSlots ?? "{}"},
-    expose?: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => void,
-    attrs?: Record<string, any>
+  context: ${root.parameters[1]?.type ? root.parameters[1].type.getText(ast) : "{}"} & {
+    slots: ${macros.defineSlots ?? "{}"},
+    expose: (exposed: ${macros.defineExpose ?? "{}"}) => void,
+    attrs: Record<string, any>
   },
   render: typeof __render
 }`);
@@ -181,6 +180,7 @@ function getMacro(node, ts, options) {
 			const expression = getMacroExpression(initializer);
 			if (expression) return {
 				expression,
+				variableDeclaration: decl,
 				initializer: decl.initializer,
 				isRequired: ts.isNonNullExpression(initializer)
 			};
@@ -220,7 +220,7 @@ function getRootMap(options) {
 		}
 		const macro = getMacro(node, ts, options);
 		if (macro) {
-			const { expression, initializer } = macro;
+			const { expression, initializer, variableDeclaration } = macro;
 			let isRequired = macro.isRequired;
 			if (!rootMap.has(root)) rootMap.set(root, {});
 			const macroName = expression.expression.getText(ast);
@@ -248,12 +248,12 @@ function getRootMap(options) {
 					const defineModel = rootMap.get(root).defineModel ??= [];
 					defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
 					if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${(0, ts_macro.getText)(expression.typeArguments[1], ast, ts)}, boolean>>`);
-					codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+					codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), variableDeclaration ? `// @ts-ignore\n${id};\n` : "", `let ${id} = `);
 				} else if (options.defineSlots.alias.includes(macroName)) {
-					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__slots;\nconst __slots = `);
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), variableDeclaration ? "// @ts-ignore\n__slots;\n" : "", `const __slots = `);
 					rootMap.get(root).defineSlots = `Partial<typeof __slots>`;
 				} else if (options.defineExpose.alias.includes(macroName)) {
-					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__exposed;\nconst __exposed = `);
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), variableDeclaration ? "// @ts-ignore\n__exposed;\n" : "", `const __exposed = `);
 					rootMap.get(root).defineExpose = `typeof __exposed`;
 				}
 			}

package/dist/volar.js

@@ -12,28 +12,23 @@ function transformDefineComponent(node, parent, options) {
 const __setup = `);
 	const result = (ts.isArrowFunction(comp) || ts.isFunctionExpression(comp)) && comp.typeParameters?.length ? ["\nreturn __setup"] : [
 		`
-  type __Props = Parameters<typeof __setup>[0]
-  type __Slots = Parameters<typeof __setup>[1] extends { slots?: infer Slots } | undefined ? Slots : {}
-  type __Exposed = Parameters<typeof __setup>[1] extends { expose?: (exposed: infer Exposed) => any } | undefined ? Exposed : {}`,
+  type __Setup = typeof __setup
+  type __Props = Parameters<__Setup>[0]
+  type __Slots = Parameters<__Setup>[1] extends { slots?: infer Slots } | undefined ? Slots : {}
+  type __Exposed = Parameters<__Setup>[1] extends { expose?: (exposed: infer Exposed) => any } | undefined ? Exposed : {}`,
 		"\n  const __component = ",
+		isVapor ? `// @ts-ignore\n(defineVaporComponent,await import('vue-jsx-vapor')).` : "",
 		[node.expression.getText(ast), node.expression.getStart(ast)],
-		`({`,
-		isVapor ? "" : `...{} as {
-    setup: () => __Exposed,
-    slots: import('vue').SlotsType<__Slots>
+		`({\n`,
+		`...{} as {
+    setup: (props: __Props) => __Exposed,
+    render: () => ReturnType<__Setup>
+    slots: ${isVapor ? "__Slots" : `import('vue').SlotsType<__Slots>`} 
   },`,
 		...compOptions ? ["...", [compOptions.getText(ast), compOptions.getStart(ast)]] : [],
 		`})
-  type __Instance = {${isVapor ? "\n/** @deprecated This is only a type when used in Vapor Instances. */" : ""}
-    $props: __Props
-  } & (typeof __component extends new (...args: any) => any ? InstanceType<typeof __component> : typeof __component)
-  return {} as {
-    new (props: __Props): __Instance,
-    setup: (props: __Props, ctx?: {
-      attrs?: Record<string, any>
-      slots?: __Slots,
-      expose?: (exposed: keyof __Exposed extends never ? __Instance : __Exposed) => any
-    }) => {},
+  return {} as Omit<typeof __component, 'constructor'> & {
+    new (props?: __Props): InstanceType<typeof __component> & {${isVapor ? "\n/** @deprecated This is only a type when used in Vapor Instances. */\n$props: __Props" : ""}},
   }`
 	];
 	codes.replaceRange(node.end, node.end, ...result, `\n})()`);
@@ -129,14 +124,18 @@ function transformJsxMacros(rootMap, options) {
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
-				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), `const __render`, macros.defineComponent ? macros.defineComponent?.expression.getText(ast) === "defineVaporComponent" ? ": import(\"vue-jsx-vapor\").NodeChild" : ": () => import(\"vue\").VNodeChild" : "", ` = `);
+				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), "const ", [
+					`__render`,
+					node.getStart(ast) - 1,
+					{ verification: true }
+				], macros.defineComponent ? macros.defineComponent?.expression.getText(ast) === "defineVaporComponent" ? "" : ": () => JSX.Element" : "", " = ");
 				codes.replaceRange(node.expression.end, node.expression.end, `
 return {} as {
   props: {${props.join(", ")}},
-  context: {
-    slots?: ${macros.defineSlots ?? "{}"},
-    expose?: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => void,
-    attrs?: Record<string, any>
+  context: ${root.parameters[1]?.type ? root.parameters[1].type.getText(ast) : "{}"} & {
+    slots: ${macros.defineSlots ?? "{}"},
+    expose: (exposed: ${macros.defineExpose ?? "{}"}) => void,
+    attrs: Record<string, any>
   },
   render: typeof __render
 }`);
@@ -179,6 +178,7 @@ function getMacro(node, ts, options) {
 			const expression = getMacroExpression(initializer);
 			if (expression) return {
 				expression,
+				variableDeclaration: decl,
 				initializer: decl.initializer,
 				isRequired: ts.isNonNullExpression(initializer)
 			};
@@ -218,7 +218,7 @@ function getRootMap(options) {
 		}
 		const macro = getMacro(node, ts, options);
 		if (macro) {
-			const { expression, initializer } = macro;
+			const { expression, initializer, variableDeclaration } = macro;
 			let isRequired = macro.isRequired;
 			if (!rootMap.has(root)) rootMap.set(root, {});
 			const macroName = expression.expression.getText(ast);
@@ -246,12 +246,12 @@ function getRootMap(options) {
 					const defineModel = rootMap.get(root).defineModel ??= [];
 					defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
 					if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${getText(expression.typeArguments[1], ast, ts)}, boolean>>`);
-					codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+					codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), variableDeclaration ? `// @ts-ignore\n${id};\n` : "", `let ${id} = `);
 				} else if (options.defineSlots.alias.includes(macroName)) {
-					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__slots;\nconst __slots = `);
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), variableDeclaration ? "// @ts-ignore\n__slots;\n" : "", `const __slots = `);
 					rootMap.get(root).defineSlots = `Partial<typeof __slots>`;
 				} else if (options.defineExpose.alias.includes(macroName)) {
-					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__exposed;\nconst __exposed = `);
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), variableDeclaration ? "// @ts-ignore\n__exposed;\n" : "", `const __exposed = `);
 					rootMap.get(root).defineExpose = `typeof __exposed`;
 				}
 			}

package/dist/webpack.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -131,18 +131,18 @@
     }
   },
   "dependencies": {
-    "@vue-macros/common": "^3.0.0-beta.20",
+    "@vue-macros/common": "^3.0.0-beta.23",
     "@vue/compiler-sfc": "3.6.0-alpha.2",
     "hash-sum": "^2.0.0",
-    "ts-macro": "^0.3.2",
-    "unplugin": "^2.3.5"
+    "ts-macro": "^0.3.4",
+    "unplugin": "^2.3.10"
   },
   "devDependencies": {
-    "@babel/types": "^7.28.0",
-    "@nuxt/kit": "^3.18.1",
-    "@nuxt/schema": "^3.18.1",
+    "@babel/types": "^7.28.4",
+    "@nuxt/kit": "^3.19.1",
+    "@nuxt/schema": "^3.19.1",
     "@types/hash-sum": "^1.0.2",
-    "@vue-macros/test-utils": "^3.0.0-beta.20",
+    "@vue-macros/test-utils": "^3.0.0-beta.23",
     "vue": "3.6.0-alpha.2"
   },
   "scripts": {