@vue-jsx/macros 3.3.0-beta.0 → 3.3.0-rc.1

package/dist/api.d.ts

@@ -1,6 +1,5 @@
-import { r as OptionsResolved } from "./options-CtTcew0x.js";
+import { r as OptionsResolved } from "./options-BjEfS--F.js";
 import MagicString from "magic-string";
-
 //#region ../../node_modules/.pnpm/@babel+types@7.29.0/node_modules/@babel/types/lib/index-legacy.d.ts
 // NOTE: This file is autogenerated. Do not modify.
 // See packages/babel-types/scripts/generators/typescript-legacy.ts for script used.
@@ -1500,7 +1499,7 @@ type ModuleDeclaration = ExportAllDeclaration | ExportDefaultDeclaration | Expor
 //#endregion
 //#region src/core/utils.d.ts
 type FunctionalNode = FunctionDeclaration | FunctionExpression | ArrowFunctionExpression;
-declare function isFunctionalNode(node?: Node | null): node is FunctionalNode;
+export declare function isFunctionalNode(node?: Node | null): node is FunctionalNode;
 //#endregion
 //#region src/core/restructure.d.ts
 type Options = {
@@ -1515,19 +1514,19 @@ type Prop = {
   defaultValue?: string;
   isRest?: boolean;
 };
-declare function restructure(s: MagicString, node: FunctionalNode, options?: Options): Prop[];
+export declare function restructure(s: MagicString, node: FunctionalNode, options?: Options): Prop[];
 //#endregion
 //#region src/core/index.d.ts
 interface CodeTransform {
   code: string;
   map: any;
 }
-type DefineStyle = {
+export type DefineStyle = {
   expression: CallExpression;
   isCssModules: boolean;
   lang: string;
 };
-type Macros = {
+export type Macros = {
   defineComponent?: CallExpression;
   defineModel?: {
     expression: CallExpression;
@@ -1540,7 +1539,6 @@ type Macros = {
   defineExpose?: CallExpression;
   defineStyle?: DefineStyle[];
 };
-declare function transformJsxMacros(code: string, id: string, importMap: Map<string, string>, options: OptionsResolved): Promise<CodeTransform | undefined>;
-declare function getMacroExpression(node: Node, options: OptionsResolved): CallExpression | undefined;
-//#endregion
-export { DefineStyle, Macros, getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };
+export declare function transformJsxMacros(code: string, id: string, importMap: Map<string, string>, options: OptionsResolved): Promise<CodeTransform | undefined>;
+export declare function getMacroExpression(node: Node, options: OptionsResolved): CallExpression | undefined;
+//#endregion

package/dist/api.js

@@ -1,2 +1,2 @@
-import { a as isFunctionalNode, n as transformJsxMacros, r as restructure, t as getMacroExpression } from "./core-BRE2gjfq.js";
+import { a as isFunctionalNode, n as transformJsxMacros, r as restructure, t as getMacroExpression } from "./core-aGhdCREk.js";
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.d.ts

@@ -1,7 +1,6 @@
-import { n as Options } from "./options-CtTcew0x.js";
-
+import { n as Options } from "./options-BjEfS--F.js";
 //#region src/astro.d.ts
-declare const _default: (options: Options) => {
+declare function _default(options: Options): {
   name: string;
   hooks: {
     'astro:config:setup': (astro: any) => void;

package/dist/astro.js

@@ -1,7 +1,7 @@
 import unplugin from "./index.js";
 //#region src/astro.ts
 var astro_default = (options) => ({
-	name: "vue-jsx-vapor",
+	name: "vue-jsx-macros",
 	hooks: { "astro:config:setup": (astro) => {
 		astro.config.vite.plugins ||= [];
 		astro.config.vite.plugins.push(unplugin.vite(options));

package/dist/bun.d.ts

@@ -1,5 +1,4 @@
-import { n as Options } from "./options-CtTcew0x.js";
-
+import { n as Options } from "./options-BjEfS--F.js";
 //#region src/bun.d.ts
 declare const _default: (options?: Options | undefined) => BunPlugin;
 //#endregion

package/dist/{core-BRE2gjfq.js → core-aGhdCREk.js}

@@ -155,9 +155,7 @@ function extractIdentifiers(node, identifiers = []) {
 		case "RestElement":
 			extractIdentifiers(node.argument, identifiers);
 			break;
-		case "AssignmentPattern":
-			extractIdentifiers(node.left, identifiers);
-			break;
+		case "AssignmentPattern": extractIdentifiers(node.left, identifiers);
 	}
 	return identifiers;
 }
@@ -440,18 +438,10 @@ function markScopeIdentifier(node, child, knownIds) {
 	markKnownIds(name, knownIds);
 	(node.scopeIds || (node.scopeIds = /* @__PURE__ */ new Set())).add(name);
 }
-//#endregion
-//#region src/core/helper/use-model.ts?raw
-var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nconst EMPTY_OBJ = {};\nexport function useModel(props, name, options = EMPTY_OBJ) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevSetValue = EMPTY_OBJ;\n    watchSyncEffect(() => {\n      let propValue = props[name];\n      if (propValue === void 0) {\n        propValue = options && options.default;\n      }\n      if (!Object.is(localValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        const emittedValue = options.set ? options.set(value) : value;\n        if (Object.is(emittedValue, localValue) && (prevSetValue === EMPTY_OBJ || Object.is(value, prevSetValue)))\n          return;\n        localValue = emittedValue;\n        trigger();\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === \"function\") emit(emittedValue);\n        }\n        prevSetValue = value;\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n";
-//#endregion
-//#region src/core/helper/use-slots.ts?raw
-var use_slots_default = "import { useSlots as _useSlots } from \"vue\";\nexport function useSlots(defaultSlots = {}) {\n  const slots = _useSlots();\n  return new Proxy(defaultSlots, {\n    get(target, key) {\n      return key in slots ? slots[key] : target[key];\n    }\n  });\n}\n";
-//#endregion
-//#region src/core/helper/with-defaults.ts?raw
-var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of /* @__PURE__ */ new Set([\n    ...Object.keys(props),\n    ...Object.keys(defaultProps)\n  ])) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
+/* v8 ignore file -- @preserve */
 //#endregion
 //#region src/core/helper/index.ts
-const helperPrefix = "/vue-jsx-vapor/macros";
+const helperPrefix = "/vue-jsx/macros";
 const useModelHelperId = `${helperPrefix}/use-model`;
 const withDefaultsHelperId = `${helperPrefix}/with-defaults`;
 const useSlotsHelperId = `${helperPrefix}/use-slots`;
@@ -493,7 +483,7 @@ function importHelperFn(s, imported, local = imported, from = "vue") {
 	if (!importedMap.get(s)?.has(cacheKey)) {
 		s.appendLeft(0, `\nimport ${imported === "default" ? "__" + local : `{ ${imported} as ${"__" + local} }`} from ${JSON.stringify(from)};`);
 		if (importedMap.has(s)) importedMap.get(s).add(cacheKey);
-		else importedMap.set(s, new Set([cacheKey]));
+		else importedMap.set(s, /* @__PURE__ */ new Set([cacheKey]));
 	}
 	return `__${local}`;
 }
@@ -504,7 +494,7 @@ function restructure(s, node, options = {}) {
 	const propList = [];
 	for (const param of node.params) {
 		const path = `__props${index++ || ""}`;
-		const props = getProps(s, options, param, path);
+		const props = getProps(s, param, path);
 		if (props) {
 			s.overwrite(param.start, param.end, path);
 			propList.push(...props);
@@ -529,7 +519,7 @@ function restructure(s, node, options = {}) {
 	}
 	return propList;
 }
-function getProps(s, options, node, path = "", props = []) {
+function getProps(s, node, path = "", props = []) {
 	const properties = node.type === "ObjectPattern" ? node.properties : node.type === "ArrayPattern" ? node.elements : [];
 	if (!properties.length) return;
 	const propNames = [];
@@ -551,16 +541,17 @@ function getProps(s, options, node, path = "", props = []) {
 			});
 			propNames.push(`'${prop.left.name}'`);
 		} else if (prop?.type === "ObjectProperty" && prop.key.type === "Identifier") {
-			if (prop.value.type === "AssignmentPattern") if (prop.value.left.type === "Identifier") {
-				const defaultValue = getDefaultValue(prop.value.right);
-				props.push({
-					path,
-					name: prop.value.left.name,
-					value: `.${prop.key.name}`,
-					defaultValue: s.slice(defaultValue.start, defaultValue.end)
-				});
-			} else getProps(s, options, prop.value.left, `${path}.${prop.key.name}`, props);
-			else if (!getProps(s, options, prop.value, `${path}.${prop.key.name}`, props)) {
+			if (prop.value.type === "AssignmentPattern") {
+				if (prop.value.left.type === "Identifier") {
+					const defaultValue = getDefaultValue(prop.value.right);
+					props.push({
+						path,
+						name: prop.value.left.name,
+						value: `.${prop.key.name}`,
+						defaultValue: s.slice(defaultValue.start, defaultValue.end)
+					});
+				} else getProps(s, prop.value.left, `${path}.${prop.key.name}`, props);
+			} else if (!getProps(s, prop.value, `${path}.${prop.key.name}`, props)) {
 				const name = prop.value.type === "Identifier" ? prop.value.name : prop.key.name;
 				props.push({
 					path,
@@ -575,7 +566,7 @@ function getProps(s, options, node, path = "", props = []) {
 			value: propNames.join(", "),
 			isRest: true
 		});
-		else if (prop) getProps(s, options, prop, `${path}[${index}]`, props);
+		else if (prop) getProps(s, prop, `${path}[${index}]`, props);
 	});
 	return props.length ? props : void 0;
 }
@@ -620,7 +611,7 @@ function transformDefineComponent(root, propsName, macros, s) {
 	if (root.params[0]) {
 		if (root.params[0].type === "Identifier") {
 			getWalkedIds(root, propsName).forEach((id) => props[id] = null);
-			prependFunctionalNode(root, s, `const ${propsName} = ${importHelperFn(s, "useFullProps", void 0, "/vue-jsx-vapor/props")}()`);
+			prependFunctionalNode(root, s, `const ${propsName} = ${importHelperFn(s, "useFullProps", void 0, "/vue-jsx/props")}()`);
 			s.overwrite(root.params[0].start, root.params[0].end, root.params.length > 1 ? `__props` : root.start === root.params[0].start ? "()" : "");
 		} else if (root.params[0].type === "ObjectPattern") {
 			const restructuredProps = root.params[0];
@@ -732,12 +723,13 @@ function getTypeAndValue(s, node) {
 		default: if (isFunctionalNode(node)) {
 			type = "Function";
 			value = s.slice(node.start, node.end);
-		} else if (node.type === "Identifier") if (node.name === "undefined") value = "undefined";
-		else {
-			skipFactory = true;
-			value = s.slice(node.start, node.end);
-		}
-		else if (node.type === "NullLiteral") value = "null";
+		} else if (node.type === "Identifier") {
+			if (node.name === "undefined") value = "undefined";
+			else {
+				skipFactory = true;
+				value = s.slice(node.start, node.end);
+			}
+		} else if (node.type === "NullLiteral") value = "null";
 	}
 	return {
 		value,
@@ -751,7 +743,7 @@ function transformDefineExpose(node, s) {
 	const argument = node.arguments[0];
 	const typeParameters = node.typeParameters ?? node.typeArguments;
 	s.overwrite(node.callee.start, typeParameters?.end ?? node.callee.end, ";");
-	s.appendRight(argument?.start ?? node.end - 1, `${importHelperFn(s, "getCurrentInstance", void 0, "/vue-jsx-vapor/props")}().exposed = ${argument ? "" : "{}"}`);
+	s.appendRight(argument?.start ?? node.end - 1, `${importHelperFn(s, "getCurrentInstance", void 0, "/vue-jsx/props")}().exposed = ${argument ? "" : "{}"}`);
 }
 //#endregion
 //#region src/core/define-model.ts
@@ -932,4 +924,4 @@ function getMacroExpression(node, options) {
 	}
 }
 //#endregion
-export { isFunctionalNode as a, withDefaultsHelperId as c, use_model_default as d, getRequire as i, with_defaults_default as l, transformJsxMacros as n, useModelHelperId as o, restructure as r, useSlotsHelperId as s, getMacroExpression as t, use_slots_default as u };
+export { isFunctionalNode as a, withDefaultsHelperId as c, getRequire as i, transformJsxMacros as n, useModelHelperId as o, restructure as r, useSlotsHelperId as s, getMacroExpression as t };

package/dist/esbuild.d.ts

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

package/dist/index.d.ts

@@ -1,6 +1,5 @@
-import { i as resolveOptions, n as Options, r as OptionsResolved, t as BaseOptions } from "./options-CtTcew0x.js";
+import { i as resolveOptions, n as Options, r as OptionsResolved, t as BaseOptions } from "./options-BjEfS--F.js";
 import { UnpluginInstance } from "unplugin";
-
 //#region src/index.d.ts
 declare const unplugin: UnpluginInstance<Options | undefined>;
 //#endregion

package/dist/index.js

@@ -1,4 +1,4 @@
-import { t as plugin } from "./raw-Qfl50r_v.js";
+import { t as plugin } from "./raw-CJo05-Hm.js";
 import { resolveOptions } from "./options.js";
 import { createUnplugin } from "unplugin";
 //#region src/index.ts

package/dist/nuxt.d.ts

@@ -1,8 +1,7 @@
-import { n as Options } from "./options-CtTcew0x.js";
-import * as _$_nuxt_schema0 from "@nuxt/schema";
-
+import { n as Options } from "./options-BjEfS--F.js";
+import "@nuxt/schema";
 //#region src/nuxt.d.ts
-interface ModuleOptions extends Options {}
-declare const _default: _$_nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;
+export interface ModuleOptions extends Options {}
+declare const _default: import("@nuxt/schema").NuxtModule<ModuleOptions, ModuleOptions, false>;
 //#endregion
-export { ModuleOptions, _default as default };
+export { _default as default };

package/dist/nuxt.js

@@ -5,8 +5,8 @@ import "@nuxt/schema";
 //#region src/nuxt.ts
 var nuxt_default = defineNuxtModule({
 	meta: {
-		name: "nuxt-vue-jsx-vapor-macros",
-		configKey: "unpluginStarter"
+		name: "@vue-jsx/macros",
+		configKey: "vueJsxMacros"
 	},
 	setup(options) {
 		addVitePlugin(() => vite_default(options));

package/dist/{options-CtTcew0x.d.ts → options-BjEfS--F.d.ts}

@@ -1,5 +1,4 @@
 import { FilterPattern } from "unplugin";
-
 //#region src/options.d.ts
 interface BaseOptions {
   include?: FilterPattern;

package/dist/options.d.ts

@@ -1,2 +1,2 @@
-import { i as resolveOptions, n as Options, r as OptionsResolved, t as BaseOptions } from "./options-CtTcew0x.js";
+import { i as resolveOptions, n as Options, r as OptionsResolved, t as BaseOptions } from "./options-BjEfS--F.js";
 export { BaseOptions, Options, OptionsResolved, resolveOptions };

package/dist/raw-CJo05-Hm.js

@@ -0,0 +1,101 @@
+import { c as withDefaultsHelperId, i as getRequire, n as transformJsxMacros, o as useModelHelperId, s as useSlotsHelperId } from "./core-aGhdCREk.js";
+import { resolveOptions } from "./options.js";
+//#region src/core/helper/use-model.ts?raw
+var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nconst EMPTY_OBJ = {};\nexport function useModel(props, name, options = EMPTY_OBJ) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevSetValue = EMPTY_OBJ;\n    watchSyncEffect(() => {\n      let propValue = props[name];\n      if (propValue === void 0) {\n        propValue = options && options.default;\n      }\n      if (!Object.is(localValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        const emittedValue = options.set ? options.set(value) : value;\n        if (Object.is(emittedValue, localValue) && (prevSetValue === EMPTY_OBJ || Object.is(value, prevSetValue)))\n          return;\n        localValue = emittedValue;\n        trigger();\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === \"function\") emit(emittedValue);\n        }\n        prevSetValue = value;\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n";
+//#endregion
+//#region src/core/helper/use-slots.ts?raw
+var use_slots_default = "import { useSlots as _useSlots } from \"vue\";\nexport function useSlots(defaultSlots = {}) {\n  const slots = _useSlots();\n  return new Proxy(defaultSlots, {\n    get(target, key) {\n      return key in slots ? slots[key] : target[key];\n    }\n  });\n}\n";
+//#endregion
+//#region src/core/helper/with-defaults.ts?raw
+var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of /* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
+//#endregion
+//#region src/core/style.ts
+let compileStyleAsync;
+async function getCompileStyleAsync() {
+	if (compileStyleAsync) return compileStyleAsync;
+	const require = getRequire();
+	try {
+		return compileStyleAsync = require ? require("vue/compiler-sfc").compileStyleAsync : (await import("https://esm.sh/@vue/compiler-sfc")).compileStyleAsync;
+	} catch {}
+}
+async function transformStyle(code, id, options) {
+	const query = new URLSearchParams(id.split("?")[1]);
+	const compileStyleAsync = await getCompileStyleAsync();
+	if (!compileStyleAsync) {
+		console.warn(`Cannot require vue/compiler-sfc, please install Vue first.`);
+		return "";
+	}
+	return (await compileStyleAsync({
+		filename: id,
+		id: `data-v-${query.get("scopeId")}`,
+		isProd: options.isProduction,
+		source: code,
+		scoped: query.get("scoped") === "true"
+	})).code;
+}
+//#endregion
+//#region src/raw.ts
+const plugin = (userOptions = {}) => {
+	const options = resolveOptions(userOptions);
+	const importMap = /* @__PURE__ */ new Map();
+	const macrosHelperId = /^\/vue-jsx\/macros\//;
+	const defineStyleHelperId = /^\/vue-jsx\/macros\/define-style/;
+	return [{
+		name: "@vue-jsx/macros",
+		enforce: "pre",
+		resolveId: {
+			filter: { id: macrosHelperId },
+			handler(id) {
+				return id;
+			}
+		},
+		load: {
+			filter: { id: macrosHelperId },
+			handler(id) {
+				if (id === useModelHelperId) return use_model_default;
+				if (id === withDefaultsHelperId) return with_defaults_default;
+				if (id === useSlotsHelperId) return use_slots_default;
+			}
+		},
+		transform: {
+			filter: {
+				id: {
+					include: options.include,
+					exclude: options.exclude
+				},
+				code: [
+					...options.defineComponent.alias,
+					...options.defineExpose.alias,
+					...options.defineModel.alias,
+					...options.defineSlots.alias,
+					...options.defineStyle.alias
+				]
+			},
+			handler(code, id) {
+				return transformJsxMacros(code, id, importMap, options);
+			}
+		}
+	}, {
+		name: "@vue-jsx/macros/define-style",
+		resolveId: {
+			filter: { id: defineStyleHelperId },
+			handler(id) {
+				return id;
+			}
+		},
+		load: {
+			filter: { id: defineStyleHelperId },
+			handler(id) {
+				return importMap.get(id);
+			}
+		},
+		transform: {
+			filter: { id: defineStyleHelperId },
+			handler(code, id) {
+				return transformStyle(code, id, options);
+			}
+		}
+	}];
+};
+//#endregion
+export { plugin as t };

package/dist/raw.d.ts

@@ -1,6 +1,5 @@
-import { n as Options } from "./options-CtTcew0x.js";
+import { n as Options } from "./options-BjEfS--F.js";
 import { UnpluginOptions } from "unplugin";
-
 //#region src/raw.d.ts
 declare const plugin: (userOptions?: Options) => UnpluginOptions[];
 //#endregion

package/dist/raw.js

@@ -1,2 +1,2 @@
-import { t as plugin } from "./raw-Qfl50r_v.js";
+import { t as plugin } from "./raw-CJo05-Hm.js";
 export { plugin as default };

package/dist/rolldown.d.ts

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

package/dist/rollup.d.ts

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

package/dist/rsbuild.d.ts

@@ -1,7 +1,6 @@
-import { n as Options } from "./options-CtTcew0x.js";
-
+import { n as Options } from "./options-BjEfS--F.js";
 //#region src/rsbuild.d.ts
-declare const _default: (options?: Options) => {
+declare function _default(options?: Options): {
   name: string;
   setup(api: any): void;
 };

package/dist/rsbuild.js

@@ -1,10 +1,10 @@
 import unplugin from "./index.js";
 //#region src/rsbuild.ts
 var rsbuild_default = (options = {}) => ({
-	name: "rsbuild:vue-jsx-vapor-macros",
+	name: "rsbuild:vue-jsx-macros",
 	setup(api) {
 		api.modifyBundlerChain((chain) => {
-			chain.plugin("vue-jsx-vapor-macros").use(unplugin.rspack(options));
+			chain.plugin("vue-jsx-macros").use(unplugin.rspack(options));
 		});
 	}
 });

package/dist/rspack.d.ts

@@ -1,5 +1,4 @@
-import { n as Options } from "./options-CtTcew0x.js";
-
+import { n as Options } from "./options-BjEfS--F.js";
 //#region src/rspack.d.ts
 declare const _default: (options?: Options | undefined) => RspackPluginInstance;
 //#endregion

package/dist/vite.d.ts

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

package/dist/volar.d.ts

@@ -1,11 +1,9 @@
-import { n as Options } from "./options-CtTcew0x.js";
-import * as _$ts_macro0 from "ts-macro";
-import { PluginReturn } from "ts-macro";
-
+import { n as Options } from "./options-BjEfS--F.js";
+import { PluginReturn, createPlugin } from "ts-macro";
 //#region src/volar/jsx-element.d.ts
-declare const _default: _$ts_macro0.PluginReturn<unknown, boolean>;
+declare const _default: import("ts-macro").PluginReturn<unknown, boolean>;
 //#endregion
 //#region src/volar.d.ts
 declare const plugin: PluginReturn<Options | undefined>;
 //#endregion
-export { plugin as default, plugin as "module.exports", _default as jsxElement };
+export { type PluginReturn, createPlugin, plugin as default, plugin as "module.exports", _default as jsxElement };

package/dist/volar.js

@@ -1,5 +1,5 @@
 import { resolveOptions } from "./options.js";
-import { allCodeFeatures, createPlugin, getText } from "ts-macro";
+import { allCodeFeatures, createPlugin, createPlugin as createPlugin$1, getText } from "ts-macro";
 import { createFilter } from "unplugin-utils";
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
@@ -172,11 +172,7 @@ function transformJsxMacros(rootMap, options) {
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
 				const isDefineComponent = macros.defineComponent && ["defineComponent", "defineCustomElement"].includes(macros.defineComponent.expression.getText(ast));
-				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), "const ", [
-					`__rndr`,
-					node.getStart(ast),
-					{ verification: true }
-				], isDefineComponent ? macros.slots ? " = (" : ": () => JSX.Element = " : " = ");
+				codes.replaceRange(node.getStart(ast), node.expression.getStart(ast), "const __render = ", isDefineComponent && macros.slots ? "(" : "");
 				codes.replaceRange(node.expression.end, node.expression.end, isDefineComponent && macros.slots ? ")()" : "", `
 return {} as {
   props: {${props.join(", ")}},
@@ -185,7 +181,7 @@ return {} as {
     expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "Record<string, any>"}>) => void,
     attrs: Record<string, any>
   },
-  render: ${isDefineComponent ? `ReturnType<` : ""}typeof __rndr${isDefineComponent ? ">" : ""}
+  render: ${isDefineComponent ? `ReturnType<` : ""}typeof __render${isDefineComponent ? ">" : ""}
 }`);
 			}
 		});
@@ -318,7 +314,7 @@ function toValidAssetId(name, type) {
 //#endregion
 //#region src/volar/jsx-element.ts
 const isCompRex = /^[\W_]/;
-var jsx_element_default = createPlugin(({ ts }) => {
+var jsx_element_default = createPlugin$1(({ ts }) => {
 	return {
 		name: "@vue-jsx/jsx-element",
 		resolveVirtualCode({ ast, codes }) {
@@ -350,7 +346,7 @@ type __InferJsxElement<T> = T extends keyof HTMLElementTagNameMap
         ? Instance extends { $: any }
           ? import('vue').VNode
           : Instance
-        : JSX.Element
+        : import('vue').VNode
       `);
 		}
 	};
@@ -382,4 +378,4 @@ const plugin = createPlugin(({ ts }, userOptions = {}) => {
 	};
 });
 //#endregion
-export { plugin as default, plugin as "module.exports", jsx_element_default as jsxElement };
+export { createPlugin, plugin as default, plugin as "module.exports", jsx_element_default as jsxElement };

package/dist/webpack.d.ts

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

package/package.json

@@ -1,24 +1,37 @@
 {
   "name": "@vue-jsx/macros",
-  "type": "module",
-  "version": "3.3.0-beta.0",
+  "version": "3.3.0-rc.1",
   "description": "Macros for Vue JSX",
-  "license": "MIT",
+  "keywords": [
+    "macros",
+    "transform",
+    "vapor",
+    "volar",
+    "vue-jsx"
+  ],
   "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",
+  "bugs": {
+    "url": "https://github.com/vuejs/vue-jsx-vapor/issues"
+  },
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-jsx-vapor.git"
   },
-  "bugs": {
-    "url": "https://github.com/vuejs/vue-jsx-vapor/issues"
-  },
-  "keywords": [
-    "transform",
-    "vue-jsx",
-    "macros",
-    "volar",
-    "vapor"
+  "files": [
+    "dist"
   ],
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "./dist/*",
+        "./*"
+      ]
+    }
+  },
   "exports": {
     ".": "./dist/index.js",
     "./astro": "./dist/astro.js",
@@ -35,23 +48,34 @@
     "./volar": "./dist/volar.js",
     "./*": "./*"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "./dist/*",
-        "./*"
-      ]
-    }
+  "dependencies": {
+    "hash-sum": "^2.0.0",
+    "magic-string": "^0.30.21",
+    "ts-macro": "^0.3.7",
+    "unplugin": "^3.0.0",
+    "unplugin-utils": "^0.3.1"
+  },
+  "devDependencies": {
+    "@babel/parser": "^7.29.3",
+    "@babel/types": "^7.29.0",
+    "@nuxt/kit": "^4.5.2",
+    "@nuxt/schema": "^4.5.2",
+    "@shikijs/vitepress-twoslash": "^4.0.2",
+    "@ts-macro/tsc": "^0.3.7",
+    "@ts-macro/twoslash": "^0.0.5",
+    "@types/hash-sum": "^1.0.2",
+    "@vitejs/plugin-vue": "^6.0.6",
+    "@vue-macros/volar": "^3.1.4",
+    "ast-kit": "^2.2.0",
+    "typescript": "^6.0.3",
+    "vite-plugin-inspect": "^11.3.3",
+    "vue": "3.6.0-rc.8"
   },
-  "files": [
-    "dist"
-  ],
   "peerDependencies": {
     "@nuxt/kit": "^3",
     "@nuxt/schema": "^3",
     "esbuild": "*",
+    "rolldown": "*",
     "rollup": "^3",
     "vite": ">=3",
     "vue": ">=3",
@@ -67,6 +91,9 @@
     "esbuild": {
       "optional": true
     },
+    "rolldown": {
+      "optional": true
+    },
     "rollup": {
       "optional": true
     },
@@ -77,24 +104,11 @@
       "optional": true
     }
   },
-  "dependencies": {
-    "hash-sum": "^2.0.0",
-    "magic-string": "^0.30.21",
-    "ts-macro": "^0.3.7",
-    "unplugin": "^3.0.0",
-    "unplugin-utils": "^0.3.1"
-  },
-  "devDependencies": {
-    "@babel/parser": "^7.29.3",
-    "@babel/types": "^7.29.0",
-    "@nuxt/kit": "^3.21.4",
-    "@nuxt/schema": "^3.21.4",
-    "@types/hash-sum": "^1.0.2",
-    "ast-kit": "^2.2.0",
-    "vue": "3.6.0-rc.5"
-  },
   "scripts": {
-    "build": "tsdown",
-    "dev": "DEV=true tsdown"
+    "build": "vp pack",
+    "dev": "DEV=true vp pack",
+    "typecheck": "tsmc --noEmit && tsmc -p playground --noEmit",
+    "play": "vp ./playground",
+    "play:build": "vp build ./playground"
   }
 }

package/dist/raw-Qfl50r_v.js

@@ -1,92 +0,0 @@
-import { c as withDefaultsHelperId, d as use_model_default, i as getRequire, l as with_defaults_default, n as transformJsxMacros, o as useModelHelperId, s as useSlotsHelperId, u as use_slots_default } from "./core-BRE2gjfq.js";
-import { resolveOptions } from "./options.js";
-//#region src/core/style.ts
-let compileStyleAsync;
-async function getCompileStyleAsync() {
-	if (compileStyleAsync) return compileStyleAsync;
-	const require = getRequire();
-	try {
-		return compileStyleAsync = require ? require("vue/compiler-sfc").compileStyleAsync : (await import("https://esm.sh/@vue/compiler-sfc")).compileStyleAsync;
-	} catch {}
-}
-async function transformStyle(code, id, options) {
-	const query = new URLSearchParams(id.split("?")[1]);
-	const compileStyleAsync = await getCompileStyleAsync();
-	if (!compileStyleAsync) {
-		console.warn(`Cannot require vue/compiler-sfc, please install Vue first.`);
-		return "";
-	}
-	return (await compileStyleAsync({
-		filename: id,
-		id: `data-v-${query.get("scopeId")}`,
-		isProd: options.isProduction,
-		source: code,
-		scoped: query.get("scoped") === "true"
-	})).code;
-}
-//#endregion
-//#region src/raw.ts
-const plugin = (userOptions = {}) => {
-	const options = resolveOptions(userOptions);
-	const importMap = /* @__PURE__ */ new Map();
-	const macrosHelperId = /^\/vue-jsx-vapor\/macros\//;
-	const defineStyleHelperId = /^\/vue-jsx-vapor\/macros\/define-style/;
-	return [{
-		name: "@vue-jsx/macros",
-		enforce: "pre",
-		resolveId: {
-			filter: { id: macrosHelperId },
-			handler(id) {
-				return id;
-			}
-		},
-		load: {
-			filter: { id: macrosHelperId },
-			handler(id) {
-				if (id === useModelHelperId) return use_model_default;
-				if (id === withDefaultsHelperId) return with_defaults_default;
-				if (id === useSlotsHelperId) return use_slots_default;
-			}
-		},
-		transform: {
-			filter: {
-				id: {
-					include: options.include,
-					exclude: options.exclude
-				},
-				code: [
-					...options.defineComponent.alias,
-					...options.defineExpose.alias,
-					...options.defineModel.alias,
-					...options.defineSlots.alias,
-					...options.defineStyle.alias
-				]
-			},
-			handler(code, id) {
-				return transformJsxMacros(code, id, importMap, options);
-			}
-		}
-	}, {
-		name: "@vue-jsx/macros/define-style",
-		resolveId: {
-			filter: { id: defineStyleHelperId },
-			handler(id) {
-				return id;
-			}
-		},
-		load: {
-			filter: { id: defineStyleHelperId },
-			handler(id) {
-				return importMap.get(id);
-			}
-		},
-		transform: {
-			filter: { id: defineStyleHelperId },
-			handler(code, id) {
-				return transformStyle(code, id, options);
-			}
-		}
-	}];
-};
-//#endregion
-export { plugin as t };