@vue-jsx-vapor/macros 2.6.7 → 2.7.3

package/dist/api.cjs

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

package/dist/api.d.cts

@@ -1,4 +1,4 @@
-import { OptionsResolved } from "./options-Egmm6BVJ.cjs";
+import { n as OptionsResolved } from "./options-BuPPJCpP.cjs";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node, VoidPattern } from "@babel/types";
 

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import { OptionsResolved } from "./options-K4yleEdU.js";
+import { n as OptionsResolved } from "./options-58c0LE2P.js";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node, VoidPattern } from "@babel/types";
 

package/dist/api.js

@@ -1,3 +1,3 @@
-import { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros } from "./core-IZ-lh7Ab.js";
+import { i as isFunctionalNode, n as transformJsxMacros, r as restructure, t as getMacroExpression } from "./core-CyBXDBOb.js";
 
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-const require_src = require('./src-sczI65zX.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+const require_src = require('./src-CnywhomA.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options-Egmm6BVJ.cjs";
+import { t as Options } from "./options-BuPPJCpP.cjs";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {
@@ -7,5 +7,4 @@ declare const _default: (options: Options) => {
     'astro:config:setup': (astro: any) => void;
   };
 };
-//#endregion
-export { _default as default };
+export = _default;

package/dist/astro.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options-K4yleEdU.js";
+import { t as Options } from "./options-58c0LE2P.js";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import { src_default } from "./src-COtQ0Dxh.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import { t as src_default } from "./src-Bpvs0dYS.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/{core-CJ6kVBLh.cjs → core-CXO9Fupx.cjs}

@@ -1,6 +1,8 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
-const hash_sum = require_chunk.__toESM(require("hash-sum"));
+let __vue_macros_common = require("@vue-macros/common");
+__vue_macros_common = require_chunk.__toESM(__vue_macros_common);
+let hash_sum = require("hash-sum");
+hash_sum = require_chunk.__toESM(hash_sum);
 
 //#region src/core/helper/use-model.ts?raw
 var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, 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        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === \"function\") emit(emittedValue);\n        }\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";
@@ -62,11 +64,7 @@ function restructure(s, node, options = {}) {
 			}
 		}
 		for (const [index$1, rest] of rests.entries()) prependFunctionalNode(node, s, options.generateRestProps?.(rest.name, index$1, rests) ?? `\nconst ${rest.name} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "createPropsRestProxy")}(${rest.path}, [${rest.value}])`);
-		for (const [path, values] of Object.entries(defaultValues)) {
-			const createPropsDefaultProxy = (0, __vue_macros_common.importHelperFn)(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId);
-			const resolvedValues = values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ");
-			prependFunctionalNode(node, s, `\n${path} = ${createPropsDefaultProxy}(${path}, {${resolvedValues}})`);
-		}
+		for (const [path, values] of Object.entries(defaultValues)) prependFunctionalNode(node, s, `\n${path} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId)}(${path}, {${values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ")}})`);
 		(0, __vue_macros_common.walkIdentifiers)(node.body, (id, parent) => {
 			const prop = propList.find((i) => i.name === id.name);
 			if (prop && !prop.isRest) s.overwrite(id.start, id.end, `${parent?.type === "ObjectProperty" && parent.shorthand ? `${id.name}: ` : ""}${prop.path}${prop.value}`);
@@ -135,11 +133,9 @@ function transformAwait(root, s) {
 				if (child.type === "BlockStatement") scope.push(child.body);
 				if (child.type === "AwaitExpression") {
 					hasAwait = true;
-					const currentScope = scope.at(-1);
-					const needsSemi = !!currentScope?.some((n, i) => {
+					processAwait(s, child, !!scope.at(-1)?.some((n, i) => {
 						return (scope.length === 1 || i > 0) && n.type === "ExpressionStatement" && n.start === child.start;
-					});
-					processAwait(s, child, needsSemi, parent.type === "ExpressionStatement");
+					}), parent.type === "ExpressionStatement");
 				}
 			},
 			leave(node$1) {
@@ -211,8 +207,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 				generateRestProps: (restPropsName, index, list) => {
 					if (index === list.length - 1) {
 						hasRestProp = true;
-						const useAttrs = (0, __vue_macros_common.importHelperFn)(s, 0, "useAttrs");
-						return `const ${restPropsName} = ${useAttrs}()`;
+						return `const ${restPropsName} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "useAttrs")}()`;
 					}
 				}
 			});
@@ -365,8 +360,7 @@ function transformDefineStyle(defineStyle, index, root, s, importMap, { defineSl
 		} });
 	}
 	css = s.sliceNode(expression.arguments[0]).slice(1, -1).replaceAll(/\/\/(.*)(?=\n)/g, "/*$1*/");
-	const module$1 = isCssModules ? "module." : "";
-	const importId = `${helperPrefix}/define-style/${index}?scopeId=${scopeId}&scoped=${scoped}&lang.${module$1}${lang}`;
+	const importId = `${helperPrefix}/define-style/${index}?scopeId=${scopeId}&scoped=${scoped}&lang.${isCssModules ? "module." : ""}${lang}`;
 	importMap.set(importId, css);
 	s.appendLeft(0, isCssModules ? `import style${index} from "${importId}";` : `import "${importId}";`);
 	s.overwriteNode(expression, isCssModules ? `style${index}` : "");
@@ -389,8 +383,7 @@ function transformJsxMacros(code, id, importMap, options) {
 	const s = new __vue_macros_common.MagicStringAST(code);
 	const lang = (0, __vue_macros_common.getLang)(id);
 	if (lang === "dts") return;
-	const ast = (0, __vue_macros_common.babelParse)(s.original, lang);
-	const rootMap = getRootMap(ast, s, options);
+	const rootMap = getRootMap((0, __vue_macros_common.babelParse)(s.original, lang), s, options);
 	let defineStyleIndex = 0;
 	for (const [root, macros] of rootMap) {
 		macros.defineStyle?.forEach((defineStyle) => {

package/dist/{core-IZ-lh7Ab.js → core-CyBXDBOb.js}

@@ -61,11 +61,7 @@ function restructure(s, node, options = {}) {
 			}
 		}
 		for (const [index$1, rest] of rests.entries()) prependFunctionalNode(node, s, options.generateRestProps?.(rest.name, index$1, rests) ?? `\nconst ${rest.name} = ${importHelperFn(s, 0, "createPropsRestProxy")}(${rest.path}, [${rest.value}])`);
-		for (const [path, values] of Object.entries(defaultValues)) {
-			const createPropsDefaultProxy = importHelperFn(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId);
-			const resolvedValues = values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ");
-			prependFunctionalNode(node, s, `\n${path} = ${createPropsDefaultProxy}(${path}, {${resolvedValues}})`);
-		}
+		for (const [path, values] of Object.entries(defaultValues)) prependFunctionalNode(node, s, `\n${path} = ${importHelperFn(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId)}(${path}, {${values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ")}})`);
 		walkIdentifiers(node.body, (id, parent) => {
 			const prop = propList.find((i) => i.name === id.name);
 			if (prop && !prop.isRest) s.overwrite(id.start, id.end, `${parent?.type === "ObjectProperty" && parent.shorthand ? `${id.name}: ` : ""}${prop.path}${prop.value}`);
@@ -134,11 +130,9 @@ function transformAwait(root, s) {
 				if (child.type === "BlockStatement") scope.push(child.body);
 				if (child.type === "AwaitExpression") {
 					hasAwait = true;
-					const currentScope = scope.at(-1);
-					const needsSemi = !!currentScope?.some((n, i) => {
+					processAwait(s, child, !!scope.at(-1)?.some((n, i) => {
 						return (scope.length === 1 || i > 0) && n.type === "ExpressionStatement" && n.start === child.start;
-					});
-					processAwait(s, child, needsSemi, parent.type === "ExpressionStatement");
+					}), parent.type === "ExpressionStatement");
 				}
 			},
 			leave(node$1) {
@@ -210,8 +204,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 				generateRestProps: (restPropsName, index, list) => {
 					if (index === list.length - 1) {
 						hasRestProp = true;
-						const useAttrs = importHelperFn(s, 0, "useAttrs");
-						return `const ${restPropsName} = ${useAttrs}()`;
+						return `const ${restPropsName} = ${importHelperFn(s, 0, "useAttrs")}()`;
 					}
 				}
 			});
@@ -364,8 +357,7 @@ function transformDefineStyle(defineStyle, index, root, s, importMap, { defineSl
 		} });
 	}
 	css = s.sliceNode(expression.arguments[0]).slice(1, -1).replaceAll(/\/\/(.*)(?=\n)/g, "/*$1*/");
-	const module = isCssModules ? "module." : "";
-	const importId = `${helperPrefix}/define-style/${index}?scopeId=${scopeId}&scoped=${scoped}&lang.${module}${lang}`;
+	const importId = `${helperPrefix}/define-style/${index}?scopeId=${scopeId}&scoped=${scoped}&lang.${isCssModules ? "module." : ""}${lang}`;
 	importMap.set(importId, css);
 	s.appendLeft(0, isCssModules ? `import style${index} from "${importId}";` : `import "${importId}";`);
 	s.overwriteNode(expression, isCssModules ? `style${index}` : "");
@@ -388,8 +380,7 @@ function transformJsxMacros(code, id, importMap, options) {
 	const s = new MagicStringAST(code);
 	const lang = getLang(id);
 	if (lang === "dts") return;
-	const ast = babelParse(s.original, lang);
-	const rootMap = getRootMap(ast, s, options);
+	const rootMap = getRootMap(babelParse(s.original, lang), s, options);
 	let defineStyleIndex = 0;
 	for (const [root, macros] of rootMap) {
 		macros.defineStyle?.forEach((defineStyle) => {
@@ -471,4 +462,4 @@ function getMacroExpression(node, options) {
 }
 
 //#endregion
-export { getMacroExpression, helperPrefix, isFunctionalNode, restructure, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default };
+export { helperPrefix as a, with_defaults_default as c, isFunctionalNode as i, use_model_default as l, transformJsxMacros as n, useModelHelperId as o, restructure as r, withDefaultsHelperId as s, getMacroExpression as t };

package/dist/esbuild.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-const require_src = require('./src-sczI65zX.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+const require_src = require('./src-CnywhomA.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.d.cts

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

package/dist/esbuild.d.ts

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

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import { src_default } from "./src-COtQ0Dxh.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import { t as src_default } from "./src-Bpvs0dYS.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-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-const require_options = require('./options-BejTnOdM.cjs');
-const require_src = require('./src-sczI65zX.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+const require_options = require('./options-CQy8quq_.cjs');
+const require_src = require('./src-CnywhomA.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Options, OptionsResolved, resolveOptions } from "./options-Egmm6BVJ.cjs";
+import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-BuPPJCpP.cjs";
 import { UnpluginInstance } from "unplugin";
 
 //#region src/index.d.ts

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Options, OptionsResolved, resolveOptions } from "./options-K4yleEdU.js";
+import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-58c0LE2P.js";
 import { UnpluginInstance } from "unplugin";
 
 //#region src/index.d.ts

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import { resolveOptions } from "./options-BWRkHmm5.js";
-import { src_default } from "./src-COtQ0Dxh.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import { t as resolveOptions } from "./options-BjmC0ExR.js";
+import { t as src_default } from "./src-Bpvs0dYS.js";
 
 export { src_default as default, resolveOptions };

package/dist/nuxt.cjs

@@ -1,12 +1,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-require('./core-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-require('./src-sczI65zX.cjs');
-const require_vite = require('./vite-BPouBS8o.cjs');
-const require_webpack = require('./webpack-4fI2h8AS.cjs');
-const __nuxt_kit = require_chunk.__toESM(require("@nuxt/kit"));
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+require('./src-CnywhomA.cjs');
+const require_vite = require('./vite-DoOJD9wV.cjs');
+const require_webpack = require('./webpack-Cm2Xd3Ni.cjs');
+let __nuxt_kit = require("@nuxt/kit");
+__nuxt_kit = require_chunk.__toESM(__nuxt_kit);
 require("@nuxt/schema");
 
 //#region src/nuxt.ts

package/dist/nuxt.d.cts

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

package/dist/nuxt.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options-K4yleEdU.js";
+import { t as Options } from "./options-58c0LE2P.js";
 import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts

package/dist/nuxt.js

@@ -1,9 +1,9 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import "./src-COtQ0Dxh.js";
-import { vite_default } from "./vite-C-w3oGdz.js";
-import { webpack_default } from "./webpack-BiwlEwnr.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import "./src-Bpvs0dYS.js";
+import { t as vite_default } from "./vite-Bv6oCWhV.js";
+import { t as webpack_default } from "./webpack-DlYXEngI.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

package/dist/{options-Egmm6BVJ.d.cts → options-58c0LE2P.d.ts}

@@ -33,4 +33,4 @@ type OptionsResolved = MarkRequired<Options, 'include' | 'version'> & {
 };
 declare function resolveOptions(options: Options): OptionsResolved;
 //#endregion
-export { Options, OptionsResolved, resolveOptions };
+export { OptionsResolved as n, resolveOptions as r, Options as t };

package/dist/{options-BWRkHmm5.js → options-BjmC0ExR.js}

@@ -20,4 +20,4 @@ function resolveOptions(options) {
 }
 
 //#endregion
-export { resolveOptions };
+export { resolveOptions as t };

package/dist/{options-K4yleEdU.d.ts → options-BuPPJCpP.d.cts}

@@ -33,4 +33,4 @@ type OptionsResolved = MarkRequired<Options, 'include' | 'version'> & {
 };
 declare function resolveOptions(options: Options): OptionsResolved;
 //#endregion
-export { Options, OptionsResolved, resolveOptions };
+export { OptionsResolved as n, resolveOptions as r, Options as t };

package/dist/{options-BejTnOdM.cjs → options-CQy8quq_.cjs}

@@ -1,5 +1,6 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
+let __vue_macros_common = require("@vue-macros/common");
+__vue_macros_common = require_chunk.__toESM(__vue_macros_common);
 
 //#region src/options.ts
 function resolveOptions(options) {

package/dist/options.cjs

@@ -1,3 +1,3 @@
-const require_options = require('./options-BejTnOdM.cjs');
+const require_options = require('./options-CQy8quq_.cjs');
 
 exports.resolveOptions = require_options.resolveOptions;

package/dist/options.d.cts

@@ -1,2 +1,2 @@
-import { Options, OptionsResolved, resolveOptions } from "./options-Egmm6BVJ.cjs";
+import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-BuPPJCpP.cjs";
 export { Options, OptionsResolved, resolveOptions };

package/dist/options.d.ts

@@ -1,2 +1,2 @@
-import { Options, OptionsResolved, resolveOptions } from "./options-K4yleEdU.js";
+import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-58c0LE2P.js";
 export { Options, OptionsResolved, resolveOptions };

package/dist/options.js

@@ -1,3 +1,3 @@
-import { resolveOptions } from "./options-BWRkHmm5.js";
+import { t as resolveOptions } from "./options-BjmC0ExR.js";
 
 export { resolveOptions };

package/dist/{raw-BzMrHm2x.js → raw-BAvssMkg.js}

@@ -1,19 +1,18 @@
-import { helperPrefix, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default } from "./core-IZ-lh7Ab.js";
-import { resolveOptions } from "./options-BWRkHmm5.js";
+import { a as helperPrefix, c as with_defaults_default, l as use_model_default, n as transformJsxMacros, o as useModelHelperId, s as withDefaultsHelperId } from "./core-CyBXDBOb.js";
+import { t as resolveOptions } from "./options-BjmC0ExR.js";
 import { createFilter, normalizePath } from "@vue-macros/common";
 import { compileStyleAsync } from "@vue/compiler-sfc";
 
 //#region src/core/style.ts
 async function transformStyle(code, id, options) {
 	const query = new URLSearchParams(id.split("?")[1]);
-	const result = await compileStyleAsync({
+	return (await compileStyleAsync({
 		filename: id,
 		id: `data-v-${query.get("scopeId")}`,
 		isProd: options.isProduction,
 		source: code,
 		scoped: query.get("scoped") === "true"
-	});
-	return result.code;
+	})).code;
 }
 
 //#endregion
@@ -52,4 +51,4 @@ const plugin = (userOptions = {}) => {
 var raw_default = plugin;
 
 //#endregion
-export { raw_default };
+export { raw_default as t };

package/dist/{raw-D-cvhDxp.cjs → raw-DxN93Vby.cjs}

@@ -1,20 +1,21 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_core = require('./core-CJ6kVBLh.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"));
+const require_core = require('./core-CXO9Fupx.cjs');
+const require_options = require('./options-CQy8quq_.cjs');
+let __vue_macros_common = require("@vue-macros/common");
+__vue_macros_common = require_chunk.__toESM(__vue_macros_common);
+let __vue_compiler_sfc = require("@vue/compiler-sfc");
+__vue_compiler_sfc = require_chunk.__toESM(__vue_compiler_sfc);
 
 //#region src/core/style.ts
 async function transformStyle(code, id, options) {
 	const query = new URLSearchParams(id.split("?")[1]);
-	const result = await (0, __vue_compiler_sfc.compileStyleAsync)({
+	return (await (0, __vue_compiler_sfc.compileStyleAsync)({
 		filename: id,
 		id: `data-v-${query.get("scopeId")}`,
 		isProd: options.isProduction,
 		source: code,
 		scoped: query.get("scoped") === "true"
-	});
-	return result.code;
+	})).code;
 }
 
 //#endregion

package/dist/raw.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CJ6kVBLh.cjs');
-const require_raw = require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
+require('./core-CXO9Fupx.cjs');
+const require_raw = require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
 
 exports.default = require_raw.raw_default;

package/dist/raw.d.cts

@@ -1,7 +1,6 @@
-import { Options } from "./options-Egmm6BVJ.cjs";
+import { t as Options } from "./options-BuPPJCpP.cjs";
 import { UnpluginOptions } from "unplugin";
 
 //#region src/raw.d.ts
 declare const plugin: (userOptions?: Options) => UnpluginOptions;
-//#endregion
-export { plugin as default };
+export = plugin;

package/dist/raw.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options-K4yleEdU.js";
+import { t as Options } from "./options-58c0LE2P.js";
 import { UnpluginOptions } from "unplugin";
 
 //#region src/raw.d.ts

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-IZ-lh7Ab.js";
-import { raw_default } from "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
+import "./core-CyBXDBOb.js";
+import { t as raw_default } from "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
 
 export { raw_default as default };

package/dist/rolldown.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-const require_src = require('./src-sczI65zX.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+const require_src = require('./src-CnywhomA.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.d.cts

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

package/dist/rolldown.d.ts

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

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import { src_default } from "./src-COtQ0Dxh.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import { t as src_default } from "./src-Bpvs0dYS.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-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-const require_src = require('./src-sczI65zX.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+const require_src = require('./src-CnywhomA.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.d.cts

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

package/dist/rollup.d.ts

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

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import { src_default } from "./src-COtQ0Dxh.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import { t as src_default } from "./src-Bpvs0dYS.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-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-const require_src = require('./src-sczI65zX.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+const require_src = require('./src-CnywhomA.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.d.cts

@@ -1,6 +1,5 @@
-import { Options } from "./options-Egmm6BVJ.cjs";
+import { t as Options } from "./options-BuPPJCpP.cjs";
 
 //#region src/rspack.d.ts
 declare const _default: (options?: Options | undefined) => RspackPluginInstance;
-//#endregion
-export { _default as default };
+export = _default;

package/dist/rspack.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options-K4yleEdU.js";
+import { t as Options } from "./options-58c0LE2P.js";
 
 //#region src/rspack.d.ts
 declare const _default: (options?: Options | undefined) => RspackPluginInstance;

package/dist/rspack.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import { src_default } from "./src-COtQ0Dxh.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import { t as src_default } from "./src-Bpvs0dYS.js";
 
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;

package/dist/{src-COtQ0Dxh.js → src-Bpvs0dYS.js}

@@ -1,4 +1,4 @@
-import { raw_default } from "./raw-BzMrHm2x.js";
+import { t as raw_default } from "./raw-BAvssMkg.js";
 import { createUnplugin } from "unplugin";
 
 //#region src/index.ts
@@ -6,4 +6,4 @@ const unplugin = createUnplugin(raw_default);
 var src_default = unplugin;
 
 //#endregion
-export { src_default };
+export { src_default as t };

package/dist/{src-sczI65zX.cjs → src-CnywhomA.cjs}

@@ -1,6 +1,7 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_raw = require('./raw-D-cvhDxp.cjs');
-const unplugin = require_chunk.__toESM(require("unplugin"));
+const require_raw = require('./raw-DxN93Vby.cjs');
+let unplugin = require("unplugin");
+unplugin = require_chunk.__toESM(unplugin);
 
 //#region src/index.ts
 const unplugin$1 = (0, unplugin.createUnplugin)(require_raw.raw_default);

package/dist/vite-Bv6oCWhV.js

@@ -0,0 +1,7 @@
+import { t as src_default } from "./src-Bpvs0dYS.js";
+
+//#region src/vite.ts
+var vite_default = src_default.vite;
+
+//#endregion
+export { vite_default as t };

package/dist/{vite-BPouBS8o.cjs → vite-DoOJD9wV.cjs}

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

package/dist/vite.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-require('./src-sczI65zX.cjs');
-const require_vite = require('./vite-BPouBS8o.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+require('./src-CnywhomA.cjs');
+const require_vite = require('./vite-DoOJD9wV.cjs');
 
 exports.default = require_vite.vite_default;

package/dist/vite.d.cts

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

package/dist/vite.d.ts

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

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import "./src-COtQ0Dxh.js";
-import { vite_default } from "./vite-C-w3oGdz.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import "./src-Bpvs0dYS.js";
+import { t as vite_default } from "./vite-Bv6oCWhV.js";
 
 export { vite_default as default };

package/dist/volar.cjs

@@ -1,8 +1,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_options = require('./options-BejTnOdM.cjs');
-const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
-const ts_macro = require_chunk.__toESM(require("ts-macro"));
+const require_options = require('./options-CQy8quq_.cjs');
+let __vue_macros_common = require("@vue-macros/common");
+__vue_macros_common = require_chunk.__toESM(__vue_macros_common);
+let ts_macro = require("ts-macro");
+ts_macro = require_chunk.__toESM(ts_macro);
 
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
@@ -126,11 +128,12 @@ function transformJsxMacros(rootMap, options) {
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
+				const isDefineComponent = macros.defineComponent?.expression.getText(ast) === "defineComponent";
 				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" : "", " = ");
+				], isDefineComponent ? ": () => JSX.Element" : "", " = ");
 				codes.replaceRange(node.expression.end, node.expression.end, `
 return {} as {
   props: {${props.join(", ")}},
@@ -139,7 +142,7 @@ return {} as {
     expose: (exposed: ${macros.defineExpose ?? "Record<string, any>"}) => void,
     attrs: Record<string, any>
   },
-  render: typeof __render
+  render: ${isDefineComponent ? `ReturnType<` : ""}typeof __render${isDefineComponent ? ">" : ""}
 }`);
 			}
 		});

package/dist/volar.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options-Egmm6BVJ.cjs";
+import { t as Options } from "./options-BuPPJCpP.cjs";
 import { PluginReturn } from "ts-macro";
 
 //#region src/volar.d.ts

package/dist/volar.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options-K4yleEdU.js";
+import { t as Options } from "./options-58c0LE2P.js";
 import { PluginReturn } from "ts-macro";
 
 //#region src/volar.d.ts

package/dist/volar.js

@@ -1,4 +1,4 @@
-import { resolveOptions } from "./options-BWRkHmm5.js";
+import { t as resolveOptions } from "./options-BjmC0ExR.js";
 import { REGEX_VUE_SFC, createFilter } from "@vue-macros/common";
 import { allCodeFeatures, createPlugin, getText } from "ts-macro";
 
@@ -124,11 +124,12 @@ function transformJsxMacros(rootMap, options) {
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
+				const isDefineComponent = macros.defineComponent?.expression.getText(ast) === "defineComponent";
 				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" : "", " = ");
+				], isDefineComponent ? ": () => JSX.Element" : "", " = ");
 				codes.replaceRange(node.expression.end, node.expression.end, `
 return {} as {
   props: {${props.join(", ")}},
@@ -137,7 +138,7 @@ return {} as {
     expose: (exposed: ${macros.defineExpose ?? "Record<string, any>"}) => void,
     attrs: Record<string, any>
   },
-  render: typeof __render
+  render: ${isDefineComponent ? `ReturnType<` : ""}typeof __render${isDefineComponent ? ">" : ""}
 }`);
 			}
 		});

package/dist/{webpack-4fI2h8AS.cjs → webpack-Cm2Xd3Ni.cjs}

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

package/dist/webpack-DlYXEngI.js

@@ -0,0 +1,7 @@
+import { t as src_default } from "./src-Bpvs0dYS.js";
+
+//#region src/webpack.ts
+var webpack_default = src_default.webpack;
+
+//#endregion
+export { webpack_default as t };

package/dist/webpack.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CJ6kVBLh.cjs');
-require('./raw-D-cvhDxp.cjs');
-require('./options-BejTnOdM.cjs');
-require('./src-sczI65zX.cjs');
-const require_webpack = require('./webpack-4fI2h8AS.cjs');
+require('./core-CXO9Fupx.cjs');
+require('./raw-DxN93Vby.cjs');
+require('./options-CQy8quq_.cjs');
+require('./src-CnywhomA.cjs');
+const require_webpack = require('./webpack-Cm2Xd3Ni.cjs');
 
 exports.default = require_webpack.webpack_default;

package/dist/webpack.d.cts

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

package/dist/webpack.d.ts

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

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-IZ-lh7Ab.js";
-import "./raw-BzMrHm2x.js";
-import "./options-BWRkHmm5.js";
-import "./src-COtQ0Dxh.js";
-import { webpack_default } from "./webpack-BiwlEwnr.js";
+import "./core-CyBXDBOb.js";
+import "./raw-BAvssMkg.js";
+import "./options-BjmC0ExR.js";
+import "./src-Bpvs0dYS.js";
+import { t as webpack_default } from "./webpack-DlYXEngI.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.6.7",
+  "version": "2.7.3",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [

package/dist/vite-C-w3oGdz.js

@@ -1,7 +0,0 @@
-import { src_default } from "./src-COtQ0Dxh.js";
-
-//#region src/vite.ts
-var vite_default = src_default.vite;
-
-//#endregion
-export { vite_default };

package/dist/webpack-BiwlEwnr.js

@@ -1,7 +0,0 @@
-import { src_default } from "./src-COtQ0Dxh.js";
-
-//#region src/webpack.ts
-var webpack_default = src_default.webpack;
-
-//#endregion
-export { webpack_default };