@vue-jsx-vapor/macros 2.5.4-beta.1 → 2.6.1

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_core = require('./core-BnOBUOXo.cjs');
+const require_core = require('./core-BGMj1zaw.cjs');
 
 exports.getMacroExpression = require_core.getMacroExpression;
 exports.isFunctionalNode = require_core.isFunctionalNode;

package/dist/api.js

@@ -1,3 +1,3 @@
-import { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros } from "./core-CzkzlWGo.js";
+import { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros } from "./core-u2ydd_-y.js";
 
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/{core-BnOBUOXo.cjs → core-BGMj1zaw.cjs}

@@ -221,26 +221,17 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 	transformDefineModel$1(s, macros.defineModel, props);
 	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
 	if (propsString) {
-		const argument = macros.defineComponent.arguments[1];
-		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: {\n${propsString}\n} }`);
-		else if (argument.type === "ObjectExpression") {
-			const resolvedPropsString = `{\n${propsString}\n}`;
-			const prop = prependObjectExpression(argument, "props", resolvedPropsString, s);
-			if (prop && prop.type === "ObjectProperty" && prop.value.type === "ObjectExpression") {
-				s.appendLeft(prop.value.start, `{...${resolvedPropsString}, ...`);
-				s.appendRight(prop.value.end, "}");
-			}
-			if (hasRestProp) prependObjectExpression(argument, "inheritAttrs", "false", s);
+		const resolvedPropsString = `${hasRestProp ? "inheritAttrs: false, " : ""}props: {\n${propsString}\n}`;
+		const compOptions = macros.defineComponent.arguments[1];
+		if (!compOptions) s.appendRight(root.end, `, { ${resolvedPropsString} }`);
+		else if (compOptions.type === "ObjectExpression") {
+			s.appendLeft(compOptions.start, `{ ${resolvedPropsString}, ...`);
+			s.appendRight(compOptions.end, " }");
 		}
 	}
 	transformAwait(root, s);
 	if (autoReturnFunction) transformReturn(root, s);
 }
-function prependObjectExpression(argument, name, value, s) {
-	const prop = argument.properties?.find((prop$1) => prop$1.type === "ObjectProperty" && prop$1.key.type === "Identifier" && prop$1.key.name === name);
-	if (!prop) s.appendRight(argument.start + 1, `${name}: ${value},`);
-	return prop;
-}
 function getWalkedIds(root, propsName) {
 	const walkedIds = /* @__PURE__ */ new Set();
 	(0, __vue_macros_common.walkIdentifiers)(root.body, (id, parent) => {

package/dist/{core-CzkzlWGo.js → core-u2ydd_-y.js}

@@ -220,26 +220,17 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 	transformDefineModel$1(s, macros.defineModel, props);
 	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
 	if (propsString) {
-		const argument = macros.defineComponent.arguments[1];
-		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: {\n${propsString}\n} }`);
-		else if (argument.type === "ObjectExpression") {
-			const resolvedPropsString = `{\n${propsString}\n}`;
-			const prop = prependObjectExpression(argument, "props", resolvedPropsString, s);
-			if (prop && prop.type === "ObjectProperty" && prop.value.type === "ObjectExpression") {
-				s.appendLeft(prop.value.start, `{...${resolvedPropsString}, ...`);
-				s.appendRight(prop.value.end, "}");
-			}
-			if (hasRestProp) prependObjectExpression(argument, "inheritAttrs", "false", s);
+		const resolvedPropsString = `${hasRestProp ? "inheritAttrs: false, " : ""}props: {\n${propsString}\n}`;
+		const compOptions = macros.defineComponent.arguments[1];
+		if (!compOptions) s.appendRight(root.end, `, { ${resolvedPropsString} }`);
+		else if (compOptions.type === "ObjectExpression") {
+			s.appendLeft(compOptions.start, `{ ${resolvedPropsString}, ...`);
+			s.appendRight(compOptions.end, " }");
 		}
 	}
 	transformAwait(root, s);
 	if (autoReturnFunction) transformReturn(root, s);
 }
-function prependObjectExpression(argument, name, value, s) {
-	const prop = argument.properties?.find((prop$1) => prop$1.type === "ObjectProperty" && prop$1.key.type === "Identifier" && prop$1.key.name === name);
-	if (!prop) s.appendRight(argument.start + 1, `${name}: ${value},`);
-	return prop;
-}
 function getWalkedIds(root, propsName) {
 	const walkedIds = /* @__PURE__ */ new Set();
 	walkIdentifiers(root.body, (id, parent) => {

package/dist/esbuild.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/esbuild.ts
 var esbuild_default = src_default.esbuild;

package/dist/index.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 const require_options = require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import { resolveOptions } from "./options-BWRkHmm5.js";
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 export { src_default as default, resolveOptions };

package/dist/nuxt.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-DJK4pxUR.cjs');
-const require_vite = require('./vite-DRkDbCPE.cjs');
-const require_webpack = require('./webpack-CsAn2U-j.cjs');
+require('./src-Zbpeaztk.cjs');
+const require_vite = require('./vite-BX_gYdbF.cjs');
+const require_webpack = require('./webpack-337kgHM4.cjs');
 const __nuxt_kit = require_chunk.__toESM(require("@nuxt/kit"));
 require("@nuxt/schema");
 

package/dist/nuxt.js

@@ -1,9 +1,9 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import "./src-BMmuQ4rG.js";
-import { vite_default } from "./vite-DbwHYLPn.js";
-import { webpack_default } from "./webpack-WGax0jDH.js";
+import "./src-9_QEflZu.js";
+import { vite_default } from "./vite-DMiSdzmA.js";
+import { webpack_default } from "./webpack-BijR4yVK.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

package/dist/{raw-Cs8E-0N5.js → raw-Dprh1tIQ.js}

@@ -1,4 +1,4 @@
-import { helperPrefix, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default } from "./core-CzkzlWGo.js";
+import { helperPrefix, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default } from "./core-u2ydd_-y.js";
 import { resolveOptions } from "./options-BWRkHmm5.js";
 import { createFilter, normalizePath } from "@vue-macros/common";
 import { compileStyleAsync } from "@vue/compiler-sfc";

package/dist/{raw-DKCRm2ff.cjs → raw-V1VJGrnC.cjs}

@@ -1,5 +1,5 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_core = require('./core-BnOBUOXo.cjs');
+const require_core = require('./core-BGMj1zaw.cjs');
 const require_options = require('./options-BejTnOdM.cjs');
 const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
 const __vue_compiler_sfc = require_chunk.__toESM(require("@vue/compiler-sfc"));

package/dist/raw.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-const require_raw = require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+const require_raw = require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
 
 exports.default = require_raw.raw_default;

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-CzkzlWGo.js";
-import { raw_default } from "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import { raw_default } from "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
 
 export { raw_default as default };

package/dist/rolldown.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/rolldown.ts
 var rolldown_default = src_default.rolldown;

package/dist/rollup.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/rollup.ts
 var rollup_default = src_default.rollup;

package/dist/rspack.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;

package/dist/{src-BMmuQ4rG.js → src-9_QEflZu.js}

@@ -1,4 +1,4 @@
-import { raw_default } from "./raw-Cs8E-0N5.js";
+import { raw_default } from "./raw-Dprh1tIQ.js";
 import { createUnplugin } from "unplugin";
 
 //#region src/index.ts

package/dist/{src-DJK4pxUR.cjs → src-Zbpeaztk.cjs}

@@ -1,5 +1,5 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_raw = require('./raw-DKCRm2ff.cjs');
+const require_raw = require('./raw-V1VJGrnC.cjs');
 const unplugin = require_chunk.__toESM(require("unplugin"));
 
 //#region src/index.ts

package/dist/{vite-DRkDbCPE.cjs → vite-BX_gYdbF.cjs}

@@ -1,4 +1,4 @@
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/vite.ts
 var vite_default = require_src.src_default.vite;

package/dist/{vite-DbwHYLPn.js → vite-DMiSdzmA.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/vite.ts
 var vite_default = src_default.vite;

package/dist/vite.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-DJK4pxUR.cjs');
-const require_vite = require('./vite-DRkDbCPE.cjs');
+require('./src-Zbpeaztk.cjs');
+const require_vite = require('./vite-BX_gYdbF.cjs');
 
 exports.default = require_vite.vite_default;

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import "./src-BMmuQ4rG.js";
-import { vite_default } from "./vite-DbwHYLPn.js";
+import "./src-9_QEflZu.js";
+import { vite_default } from "./vite-DMiSdzmA.js";
 
 export { vite_default as default };

package/dist/volar.cjs

@@ -7,9 +7,38 @@ const ts_macro = require_chunk.__toESM(require("ts-macro"));
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
 	const { codes, ast, ts } = options;
-	codes.replaceRange(node.arguments[0].end, node.end - 1);
-	const componentOptions = node.arguments[1];
-	codes.replaceRange(node.getStart(ast), node.expression.end + 1, ts.isExpressionStatement(parent) ? ";" : "", "(", [node.expression.getText(ast), node.getStart(ast)], "(() => ({}) as any,", componentOptions ? [componentOptions.getText(ast), componentOptions.getStart(ast)] : "", "), ");
+	const [comp, compOptions] = node.arguments;
+	const isVapor = node.expression.getText(ast) === "defineVaporComponent";
+	codes.replaceRange(comp.end, node.end - 1);
+	codes.replaceRange(node.getStart(ast), node.expression.end, ts.isExpressionStatement(parent) ? ";" : "", `(() => {
+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 : {}`,
+		"\n  const __component = ",
+		[node.expression.getText(ast), node.expression.getStart(ast)],
+		`({`,
+		isVapor ? "" : `...{} as {
+    setup: () => __Exposed,
+    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
+    }) => {},
+  }`
+	];
+	codes.replaceRange(node.end, node.end, ...result, `\n})()`);
 }
 
 //#endregion
@@ -84,9 +113,9 @@ function transformJsxMacros(rootMap, options) {
 		if (!root?.body || Object.keys(macros).length === 1 && macros.defineStyle) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
 		if (asyncModifier && macros.defineComponent) codes.replaceRange(asyncModifier.pos, asyncModifier.end);
-		const result = `({}) as __VLS_PickNotAny<typeof ${__vue_macros_common.HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${__vue_macros_common.HELPER_PREFIX}ctx }`;
+		const result = macros.defineComponent && root.typeParameters?.length ? "({}) as JSX.Element" : "__ctx.render";
 		const propsType = root.parameters[0]?.type ? root.parameters[0].type.getText(ast) : "{}";
-		codes.replaceRange(root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `${__vue_macros_common.HELPER_PREFIX}props: typeof ${__vue_macros_common.HELPER_PREFIX}ctx.props & ${propsType}, `, `${__vue_macros_common.HELPER_PREFIX}placeholder?: {}, `, `${__vue_macros_common.HELPER_PREFIX}ctx = {} as Awaited<ReturnType<typeof ${__vue_macros_common.HELPER_PREFIX}setup>>, `, `${__vue_macros_common.HELPER_PREFIX}setup = (${asyncModifier ? "async" : ""}(`);
+		codes.replaceRange(root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `__props: typeof __ctx.props & ${propsType}, `, `__context?: typeof __ctx.context, `, `__ctx = {} as Awaited<ReturnType<typeof __fn>>, `, `__fn = (${asyncModifier ? "async" : ""}(`);
 		if (ts.isArrowFunction(root)) codes.replaceRange(root.end, root.end, `))${root.pos === root.parameters.pos ? ")" : ""} => `, result);
 		else {
 			codes.replaceRange(root.body.getStart(ast), root.body.getStart(ast), "=>");
@@ -102,14 +131,16 @@ function transformJsxMacros(rootMap, options) {
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
-				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
-				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), `const ${__vue_macros_common.HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
-				codes.replaceRange(node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
-return {
-  props: {} as {${props.join(", ")}},
-  slots: {} as ${macros.defineSlots ?? "{}"},
-  expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => {},
-  render: ${__vue_macros_common.HELPER_PREFIX}render,
+				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.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>
+  },
+  render: typeof __render
 }`);
 			}
 		});
@@ -121,8 +152,8 @@ return {
 function getGlobalTypes(rootMap, options) {
 	let defineStyle = "";
 	if (options.defineSlots.alias) {
-		defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs): T; scss: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; sass: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; stylus: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; less: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; postcss: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T };`).join("\n");
-		defineStyle += `\ntype ${__vue_macros_common.HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];`;
+		defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: __StyleArgs): T; scss: <T>(...args: __StyleArgs)=> T; sass: <T>(...args: __StyleArgs)=> T; stylus: <T>(...args: __StyleArgs)=> T; less: <T>(...args: __StyleArgs)=> T; postcss: <T>(...args: __StyleArgs)=> T };`).join("\n");
+		defineStyle += `\ntype __StyleArgs = [style: string, options?: { scoped?: boolean }];`;
 	}
 	if (!rootMap.size) return `\n${defineStyle}`;
 	const defineSlots = options.defineSlots.alias.flatMap((alias) => [`declare function ${alias}<T extends Record<string, any>>(): Partial<T>;`, `declare function ${alias}<T extends Record<string, any>>(slots: T): T;`]).join("\n");
@@ -135,8 +166,6 @@ ${VueMacros ? `declare const { ${VueMacros} }: typeof import('vue');` : ""}
 ${defineSlots}
 ${defineExpose}
 ${defineStyle}
-// @ts-ignore
-type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
 }
 
@@ -185,7 +214,7 @@ function getRootMap(options) {
 		if (root && parents[2] && ts.isCallExpression(parents[2]) && !parents[2].typeArguments && options.defineComponent.alias.includes(parents[2].expression.getText(ast))) {
 			if (!rootMap.has(root)) rootMap.set(root, {});
 			if (!rootMap.get(root).defineComponent) {
-				rootMap.get(root).defineComponent = true;
+				rootMap.get(root).defineComponent = parents[2];
 				transformDefineComponent(parents[2], parents[3], options);
 			}
 		}
@@ -214,18 +243,18 @@ function getRootMap(options) {
 						}
 						if (!hasRequired && isRequired) codes.replaceRange(modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
 					} else if (isRequired) codes.replaceRange(expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
-					const id = toValidAssetId(modelName, `${__vue_macros_common.HELPER_PREFIX}model`);
+					const id = toValidAssetId(modelName, `__model`);
 					const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
 					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>>`);
-					if (ts.isVariableStatement(node)) codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+					codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
 				} else if (options.defineSlots.alias.includes(macroName)) {
-					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}slots;\nconst ${__vue_macros_common.HELPER_PREFIX}slots = `);
-					rootMap.get(root).defineSlots = `Partial<typeof ${__vue_macros_common.HELPER_PREFIX}slots>`;
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__slots;\nconst __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${__vue_macros_common.HELPER_PREFIX}exposed;\nconst ${__vue_macros_common.HELPER_PREFIX}exposed = `);
-					rootMap.get(root).defineExpose = `typeof ${__vue_macros_common.HELPER_PREFIX}exposed`;
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__exposed;\nconst __exposed = `);
+					rootMap.get(root).defineExpose = `typeof __exposed`;
 				}
 			}
 		}

package/dist/volar.js

@@ -1,13 +1,42 @@
 import { resolveOptions } from "./options-BWRkHmm5.js";
-import { HELPER_PREFIX, REGEX_VUE_SFC, createFilter } from "@vue-macros/common";
+import { REGEX_VUE_SFC, createFilter } from "@vue-macros/common";
 import { allCodeFeatures, createPlugin, getText } from "ts-macro";
 
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
 	const { codes, ast, ts } = options;
-	codes.replaceRange(node.arguments[0].end, node.end - 1);
-	const componentOptions = node.arguments[1];
-	codes.replaceRange(node.getStart(ast), node.expression.end + 1, ts.isExpressionStatement(parent) ? ";" : "", "(", [node.expression.getText(ast), node.getStart(ast)], "(() => ({}) as any,", componentOptions ? [componentOptions.getText(ast), componentOptions.getStart(ast)] : "", "), ");
+	const [comp, compOptions] = node.arguments;
+	const isVapor = node.expression.getText(ast) === "defineVaporComponent";
+	codes.replaceRange(comp.end, node.end - 1);
+	codes.replaceRange(node.getStart(ast), node.expression.end, ts.isExpressionStatement(parent) ? ";" : "", `(() => {
+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 : {}`,
+		"\n  const __component = ",
+		[node.expression.getText(ast), node.expression.getStart(ast)],
+		`({`,
+		isVapor ? "" : `...{} as {
+    setup: () => __Exposed,
+    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
+    }) => {},
+  }`
+	];
+	codes.replaceRange(node.end, node.end, ...result, `\n})()`);
 }
 
 //#endregion
@@ -82,9 +111,9 @@ function transformJsxMacros(rootMap, options) {
 		if (!root?.body || Object.keys(macros).length === 1 && macros.defineStyle) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
 		if (asyncModifier && macros.defineComponent) codes.replaceRange(asyncModifier.pos, asyncModifier.end);
-		const result = `({}) as __VLS_PickNotAny<typeof ${HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${HELPER_PREFIX}ctx }`;
+		const result = macros.defineComponent && root.typeParameters?.length ? "({}) as JSX.Element" : "__ctx.render";
 		const propsType = root.parameters[0]?.type ? root.parameters[0].type.getText(ast) : "{}";
-		codes.replaceRange(root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `${HELPER_PREFIX}props: typeof ${HELPER_PREFIX}ctx.props & ${propsType}, `, `${HELPER_PREFIX}placeholder?: {}, `, `${HELPER_PREFIX}ctx = {} as Awaited<ReturnType<typeof ${HELPER_PREFIX}setup>>, `, `${HELPER_PREFIX}setup = (${asyncModifier ? "async" : ""}(`);
+		codes.replaceRange(root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `__props: typeof __ctx.props & ${propsType}, `, `__context?: typeof __ctx.context, `, `__ctx = {} as Awaited<ReturnType<typeof __fn>>, `, `__fn = (${asyncModifier ? "async" : ""}(`);
 		if (ts.isArrowFunction(root)) codes.replaceRange(root.end, root.end, `))${root.pos === root.parameters.pos ? ")" : ""} => `, result);
 		else {
 			codes.replaceRange(root.body.getStart(ast), root.body.getStart(ast), "=>");
@@ -100,14 +129,16 @@ function transformJsxMacros(rootMap, options) {
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
-				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
-				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), `const ${HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
-				codes.replaceRange(node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
-return {
-  props: {} as {${props.join(", ")}},
-  slots: {} as ${macros.defineSlots ?? "{}"},
-  expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => {},
-  render: ${HELPER_PREFIX}render,
+				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.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>
+  },
+  render: typeof __render
 }`);
 			}
 		});
@@ -119,8 +150,8 @@ return {
 function getGlobalTypes(rootMap, options) {
 	let defineStyle = "";
 	if (options.defineSlots.alias) {
-		defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: ${HELPER_PREFIX}StyleArgs): T; scss: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; sass: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; stylus: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; less: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; postcss: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T };`).join("\n");
-		defineStyle += `\ntype ${HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];`;
+		defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: __StyleArgs): T; scss: <T>(...args: __StyleArgs)=> T; sass: <T>(...args: __StyleArgs)=> T; stylus: <T>(...args: __StyleArgs)=> T; less: <T>(...args: __StyleArgs)=> T; postcss: <T>(...args: __StyleArgs)=> T };`).join("\n");
+		defineStyle += `\ntype __StyleArgs = [style: string, options?: { scoped?: boolean }];`;
 	}
 	if (!rootMap.size) return `\n${defineStyle}`;
 	const defineSlots = options.defineSlots.alias.flatMap((alias) => [`declare function ${alias}<T extends Record<string, any>>(): Partial<T>;`, `declare function ${alias}<T extends Record<string, any>>(slots: T): T;`]).join("\n");
@@ -133,8 +164,6 @@ ${VueMacros ? `declare const { ${VueMacros} }: typeof import('vue');` : ""}
 ${defineSlots}
 ${defineExpose}
 ${defineStyle}
-// @ts-ignore
-type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
 }
 
@@ -183,7 +212,7 @@ function getRootMap(options) {
 		if (root && parents[2] && ts.isCallExpression(parents[2]) && !parents[2].typeArguments && options.defineComponent.alias.includes(parents[2].expression.getText(ast))) {
 			if (!rootMap.has(root)) rootMap.set(root, {});
 			if (!rootMap.get(root).defineComponent) {
-				rootMap.get(root).defineComponent = true;
+				rootMap.get(root).defineComponent = parents[2];
 				transformDefineComponent(parents[2], parents[3], options);
 			}
 		}
@@ -212,18 +241,18 @@ function getRootMap(options) {
 						}
 						if (!hasRequired && isRequired) codes.replaceRange(modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
 					} else if (isRequired) codes.replaceRange(expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
-					const id = toValidAssetId(modelName, `${HELPER_PREFIX}model`);
+					const id = toValidAssetId(modelName, `__model`);
 					const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
 					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>>`);
-					if (ts.isVariableStatement(node)) codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+					codes.replaceRange(initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
 				} else if (options.defineSlots.alias.includes(macroName)) {
-					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}slots;\nconst ${HELPER_PREFIX}slots = `);
-					rootMap.get(root).defineSlots = `Partial<typeof ${HELPER_PREFIX}slots>`;
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__slots;\nconst __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${HELPER_PREFIX}exposed;\nconst ${HELPER_PREFIX}exposed = `);
-					rootMap.get(root).defineExpose = `typeof ${HELPER_PREFIX}exposed`;
+					codes.replaceRange(expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n__exposed;\nconst __exposed = `);
+					rootMap.get(root).defineExpose = `typeof __exposed`;
 				}
 			}
 		}

package/dist/{webpack-CsAn2U-j.cjs → webpack-337kgHM4.cjs}

@@ -1,4 +1,4 @@
-const require_src = require('./src-DJK4pxUR.cjs');
+const require_src = require('./src-Zbpeaztk.cjs');
 
 //#region src/webpack.ts
 var webpack_default = require_src.src_default.webpack;

package/dist/{webpack-WGax0jDH.js → webpack-BijR4yVK.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-BMmuQ4rG.js";
+import { src_default } from "./src-9_QEflZu.js";
 
 //#region src/webpack.ts
 var webpack_default = src_default.webpack;

package/dist/webpack.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-BnOBUOXo.cjs');
-require('./raw-DKCRm2ff.cjs');
+require('./core-BGMj1zaw.cjs');
+require('./raw-V1VJGrnC.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-DJK4pxUR.cjs');
-const require_webpack = require('./webpack-CsAn2U-j.cjs');
+require('./src-Zbpeaztk.cjs');
+const require_webpack = require('./webpack-337kgHM4.cjs');
 
 exports.default = require_webpack.webpack_default;

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-CzkzlWGo.js";
-import "./raw-Cs8E-0N5.js";
+import "./core-u2ydd_-y.js";
+import "./raw-Dprh1tIQ.js";
 import "./options-BWRkHmm5.js";
-import "./src-BMmuQ4rG.js";
-import { webpack_default } from "./webpack-WGax0jDH.js";
+import "./src-9_QEflZu.js";
+import { webpack_default } from "./webpack-BijR4yVK.js";
 
 export { webpack_default as default };

package/package.json

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