@vue-jsx-vapor/macros 2.5.0 → 2.5.2

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_core = require('./core-VaQGgjRA.cjs');
+const require_core = require('./core-CJIyaYlk.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-EFrKZ0uz.js";
+import { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros } from "./core-CtkYfL-E.js";
 
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DR0MpvO3.cjs');
+const require_src = require('./src-CnMPxcfy.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/{core-VaQGgjRA.cjs → core-CJIyaYlk.cjs}

@@ -317,7 +317,7 @@ function getTypeAndValue(s, node) {
 //#region src/core/define-expose.ts
 function transformDefineExpose(node, s) {
 	s.overwriteNode(node.callee, ";");
-	s.appendRight(node.arguments[0]?.start || node.end - 1, `${(0, __vue_macros_common.importHelperFn)(s, 0, "getCurrentInstance")}(true).exposed = `);
+	s.appendRight(node.arguments[0]?.start || node.end - 1, `${(0, __vue_macros_common.importHelperFn)(s, 0, "getCurrentInstance", void 0, "vue-jsx-vapor")}().exposed = `);
 }
 
 //#endregion

package/dist/{core-EFrKZ0uz.js → core-CtkYfL-E.js}

@@ -316,7 +316,7 @@ function getTypeAndValue(s, node) {
 //#region src/core/define-expose.ts
 function transformDefineExpose(node, s) {
 	s.overwriteNode(node.callee, ";");
-	s.appendRight(node.arguments[0]?.start || node.end - 1, `${importHelperFn(s, 0, "getCurrentInstance")}(true).exposed = `);
+	s.appendRight(node.arguments[0]?.start || node.end - 1, `${importHelperFn(s, 0, "getCurrentInstance", void 0, "vue-jsx-vapor")}().exposed = `);
 }
 
 //#endregion

package/dist/esbuild.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DR0MpvO3.cjs');
+const require_src = require('./src-CnMPxcfy.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.d.cts

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

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 const require_options = require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DR0MpvO3.cjs');
+const require_src = require('./src-CnMPxcfy.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import { resolveOptions } from "./options-BWRkHmm5.js";
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-DR0MpvO3.cjs');
-const require_vite = require('./vite-CidPNLGK.cjs');
-const require_webpack = require('./webpack-8f5BBtfW.cjs');
+require('./src-CnMPxcfy.cjs');
+const require_vite = require('./vite-55JkDcH_.cjs');
+const require_webpack = require('./webpack-CMEaEJ1m.cjs');
 const __nuxt_kit = require_chunk.__toESM(require("@nuxt/kit"));
 require("@nuxt/schema");
 

package/dist/nuxt.d.cts

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

package/dist/nuxt.js

@@ -1,9 +1,9 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import "./src-jAatnMXF.js";
-import { vite_default } from "./vite-lpGm3bCJ.js";
-import { webpack_default } from "./webpack-BVBzZxio.js";
+import "./src-CYY_kpUg.js";
+import { vite_default } from "./vite-UTnXGFnz.js";
+import { webpack_default } from "./webpack-vi_c875X.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

package/dist/{raw-tGX-VsT-.js → raw-CdxUliM8.js}

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

package/dist/{raw-CHl9tce7.cjs → raw-fnyAVQJZ.cjs}

@@ -1,5 +1,5 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_core = require('./core-VaQGgjRA.cjs');
+const require_core = require('./core-CJIyaYlk.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-VaQGgjRA.cjs');
-const require_raw = require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+const require_raw = require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
 
 exports.default = require_raw.raw_default;

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-EFrKZ0uz.js";
-import { raw_default } from "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import { raw_default } from "./raw-CdxUliM8.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DR0MpvO3.cjs');
+const require_src = require('./src-CnMPxcfy.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.d.cts

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

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DR0MpvO3.cjs');
+const require_src = require('./src-CnMPxcfy.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.d.cts

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

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-DR0MpvO3.cjs');
+const require_src = require('./src-CnMPxcfy.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.js";
 
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;

package/dist/{src-jAatnMXF.js → src-CYY_kpUg.js}

@@ -1,4 +1,4 @@
-import { raw_default } from "./raw-tGX-VsT-.js";
+import { raw_default } from "./raw-CdxUliM8.js";
 import { createUnplugin } from "unplugin";
 
 //#region src/index.ts

package/dist/{src-DR0MpvO3.cjs → src-CnMPxcfy.cjs}

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

package/dist/{vite-CidPNLGK.cjs → vite-55JkDcH_.cjs}

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

package/dist/{vite-lpGm3bCJ.js → vite-UTnXGFnz.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-DR0MpvO3.cjs');
-const require_vite = require('./vite-CidPNLGK.cjs');
+require('./src-CnMPxcfy.cjs');
+const require_vite = require('./vite-55JkDcH_.cjs');
 
 exports.default = require_vite.vite_default;

package/dist/vite.d.cts

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

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import "./src-jAatnMXF.js";
-import { vite_default } from "./vite-lpGm3bCJ.js";
+import "./src-CYY_kpUg.js";
+import { vite_default } from "./vite-UTnXGFnz.js";
 
 export { vite_default as default };

package/dist/volar.cjs

@@ -7,24 +7,16 @@ 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;
-	(0, ts_macro.replaceRange)(codes, node.arguments[0].end, node.end - 1);
+	codes.replaceRange(node.arguments[0].end, node.end - 1);
 	const componentOptions = node.arguments[1];
-	(0, ts_macro.replaceRange)(codes, node.getStart(ast), node.expression.end + 1, ts.isExpressionStatement(parent) ? ";" : "", "(", [
-		node.expression.getText(ast),
-		node.getStart(ast),
-		ts_macro.allCodeFeatures
-	], "(() => ({}) as any, ", componentOptions ? [
-		componentOptions.getText(ast),
-		componentOptions.getStart(ast),
-		ts_macro.allCodeFeatures
-	] : "", "), ");
+	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)] : "", "), ");
 }
 
 //#endregion
 //#region src/volar/define-style.ts
 function transformDefineStyle({ expression, isCssModules }, index, options) {
 	const { ts, codes, ast } = options;
-	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) (0, ts_macro.replaceRange)(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).flatMap(({ text, offset }) => [
+	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) codes.replaceRange(expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).flatMap(({ text, offset }) => [
 		`\n`,
 		[
 			`'${text.slice(1)}'`,
@@ -84,28 +76,28 @@ function transformJsxMacros(rootMap, options) {
 		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
 		if (!root?.body) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
-		if (asyncModifier && macros.defineComponent) (0, ts_macro.replaceRange)(codes, asyncModifier.pos, asyncModifier.end);
+		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 propsType = root.parameters[0]?.type ? String(root.parameters[0].type.getText(ast)) : "{}";
-		(0, ts_macro.replaceRange)(codes, 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" : ""}(`);
-		if (ts.isArrowFunction(root)) (0, ts_macro.replaceRange)(codes, root.end, root.end, `))${root.pos === root.parameters.pos ? ")" : ""} => `, result);
+		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" : ""}(`);
+		if (ts.isArrowFunction(root)) codes.replaceRange(root.end, root.end, `))${root.pos === root.parameters.pos ? ")" : ""} => `, result);
 		else {
-			(0, ts_macro.replaceRange)(codes, root.body.getStart(ast), root.body.getStart(ast), "=>");
-			(0, ts_macro.replaceRange)(codes, root.end, root.end, `)){ return `, result, "}");
+			codes.replaceRange(root.body.getStart(ast), root.body.getStart(ast), "=>");
+			codes.replaceRange(root.end, root.end, `)){ return `, result, "}");
 		}
-		ts.forEachChild(root.body, (node) => {
+		root.body.forEachChild((node) => {
 			if (ts.isReturnStatement(node) && node.expression) {
 				const props = [...macros.defineModel ?? []];
 				const elements = root.parameters[0] && !root.parameters[0].type && ts.isObjectBindingPattern(root.parameters[0].name) ? root.parameters[0].name.elements : [];
 				for (const element of elements) if (ts.isIdentifier(element.name)) {
-					const isRequired = ts.forEachChild(element, function isNonNullExpression(node$1) {
-						return ts.isNonNullExpression(node$1) || !!ts.forEachChild(node$1, isNonNullExpression);
+					const isRequired = element.forEachChild(function isNonNullExpression(node$1) {
+						return ts.isNonNullExpression(node$1) || !!node$1.forEachChild(isNonNullExpression);
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
 				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
-				(0, ts_macro.replaceRange)(codes, node.getStart(ast), node.expression.getStart(ast), `const ${__vue_macros_common.HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
-				(0, ts_macro.replaceRange)(codes, node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
+				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 ?? "{}"},
@@ -140,7 +132,7 @@ type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B
 //#region src/volar/index.ts
 function getMacro(node, ts, options) {
 	if (!node) return;
-	if (ts.isVariableStatement(node)) return ts.forEachChild(node.declarationList, (decl) => getExpression(decl));
+	if (ts.isVariableStatement(node)) return node.declarationList.forEachChild((decl) => getExpression(decl));
 	else return getExpression(node);
 	function getExpression(decl) {
 		if (ts.isVariableDeclaration(decl) && decl.initializer) {
@@ -208,30 +200,30 @@ function getRootMap(options) {
 							hasRequired = true;
 							isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
 						}
-						if (!hasRequired && isRequired) (0, ts_macro.replaceRange)(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
-					} else if (isRequired) (0, ts_macro.replaceRange)(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
+						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 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<${expression.typeArguments[1].getText(ast)}, boolean>>`);
-					if (ts.isVariableStatement(node)) (0, ts_macro.replaceRange)(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+					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} = `);
 				} else if (options.defineSlots.alias.includes(macroName)) {
-					(0, ts_macro.replaceRange)(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}slots;\nconst ${__vue_macros_common.HELPER_PREFIX}slots = `);
+					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>`;
 				} else if (options.defineExpose.alias.includes(macroName)) {
-					(0, ts_macro.replaceRange)(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}exposed;\nconst ${__vue_macros_common.HELPER_PREFIX}exposed = `);
+					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`;
 				}
 			}
 		}
-		ts.forEachChild(node, (child) => {
+		node.forEachChild((child) => {
 			parents.unshift(node);
 			walk(child, parents);
 			parents.shift();
 		});
 	}
-	ts.forEachChild(ast, (node) => walk(node, []));
+	ast.forEachChild((node) => walk(node, []));
 	return rootMap;
 }
 function toValidAssetId(name, type) {
@@ -244,6 +236,7 @@ function toValidAssetId(name, type) {
 //#region src/volar.ts
 const plugin = (0, ts_macro.createPlugin)(({ ts }, userOptions = {}) => {
 	const resolvedOptions = require_options.resolveOptions(userOptions);
+	resolvedOptions.include.push(__vue_macros_common.REGEX_VUE_SFC);
 	const filter = (0, __vue_macros_common.createFilter)(resolvedOptions);
 	return {
 		name: "@vue-jsx-vapor/macros",
@@ -266,4 +259,5 @@ const plugin = (0, ts_macro.createPlugin)(({ ts }, userOptions = {}) => {
 var volar_default = plugin;
 
 //#endregion
-exports.default = volar_default;
+exports.default = volar_default;
+exports["module.exports"] = plugin;

package/dist/volar.d.cts

@@ -4,4 +4,4 @@ import { PluginReturn } from "ts-macro";
 //#region src/volar.d.ts
 declare const plugin: PluginReturn<Options | undefined>;
 //#endregion
-export { plugin as default };
+export { plugin as default, plugin as "module.exports" };

package/dist/volar.d.ts

@@ -4,4 +4,4 @@ import { PluginReturn } from "ts-macro";
 //#region src/volar.d.ts
 declare const plugin: PluginReturn<Options | undefined>;
 //#endregion
-export { plugin as default };
+export { plugin as default, plugin as "module.exports" };

package/dist/volar.js

@@ -1,28 +1,20 @@
 import { resolveOptions } from "./options-BWRkHmm5.js";
-import { HELPER_PREFIX, createFilter } from "@vue-macros/common";
-import { allCodeFeatures, createPlugin, replaceRange } from "ts-macro";
+import { HELPER_PREFIX, 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;
-	replaceRange(codes, node.arguments[0].end, node.end - 1);
+	codes.replaceRange(node.arguments[0].end, node.end - 1);
 	const componentOptions = node.arguments[1];
-	replaceRange(codes, node.getStart(ast), node.expression.end + 1, ts.isExpressionStatement(parent) ? ";" : "", "(", [
-		node.expression.getText(ast),
-		node.getStart(ast),
-		allCodeFeatures
-	], "(() => ({}) as any, ", componentOptions ? [
-		componentOptions.getText(ast),
-		componentOptions.getStart(ast),
-		allCodeFeatures
-	] : "", "), ");
+	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)] : "", "), ");
 }
 
 //#endregion
 //#region src/volar/define-style.ts
 function transformDefineStyle({ expression, isCssModules }, index, options) {
 	const { ts, codes, ast } = options;
-	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) replaceRange(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).flatMap(({ text, offset }) => [
+	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) codes.replaceRange(expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).flatMap(({ text, offset }) => [
 		`\n`,
 		[
 			`'${text.slice(1)}'`,
@@ -82,28 +74,28 @@ function transformJsxMacros(rootMap, options) {
 		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
 		if (!root?.body) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
-		if (asyncModifier && macros.defineComponent) replaceRange(codes, asyncModifier.pos, asyncModifier.end);
+		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 propsType = root.parameters[0]?.type ? String(root.parameters[0].type.getText(ast)) : "{}";
-		replaceRange(codes, 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" : ""}(`);
-		if (ts.isArrowFunction(root)) replaceRange(codes, root.end, root.end, `))${root.pos === root.parameters.pos ? ")" : ""} => `, result);
+		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" : ""}(`);
+		if (ts.isArrowFunction(root)) codes.replaceRange(root.end, root.end, `))${root.pos === root.parameters.pos ? ")" : ""} => `, result);
 		else {
-			replaceRange(codes, root.body.getStart(ast), root.body.getStart(ast), "=>");
-			replaceRange(codes, root.end, root.end, `)){ return `, result, "}");
+			codes.replaceRange(root.body.getStart(ast), root.body.getStart(ast), "=>");
+			codes.replaceRange(root.end, root.end, `)){ return `, result, "}");
 		}
-		ts.forEachChild(root.body, (node) => {
+		root.body.forEachChild((node) => {
 			if (ts.isReturnStatement(node) && node.expression) {
 				const props = [...macros.defineModel ?? []];
 				const elements = root.parameters[0] && !root.parameters[0].type && ts.isObjectBindingPattern(root.parameters[0].name) ? root.parameters[0].name.elements : [];
 				for (const element of elements) if (ts.isIdentifier(element.name)) {
-					const isRequired = ts.forEachChild(element, function isNonNullExpression(node$1) {
-						return ts.isNonNullExpression(node$1) || !!ts.forEachChild(node$1, isNonNullExpression);
+					const isRequired = element.forEachChild(function isNonNullExpression(node$1) {
+						return ts.isNonNullExpression(node$1) || !!node$1.forEachChild(isNonNullExpression);
 					});
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
 				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
-				replaceRange(codes, node.getStart(ast), node.expression.getStart(ast), `const ${HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
-				replaceRange(codes, node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
+				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 ?? "{}"},
@@ -138,7 +130,7 @@ type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B
 //#region src/volar/index.ts
 function getMacro(node, ts, options) {
 	if (!node) return;
-	if (ts.isVariableStatement(node)) return ts.forEachChild(node.declarationList, (decl) => getExpression(decl));
+	if (ts.isVariableStatement(node)) return node.declarationList.forEachChild((decl) => getExpression(decl));
 	else return getExpression(node);
 	function getExpression(decl) {
 		if (ts.isVariableDeclaration(decl) && decl.initializer) {
@@ -206,30 +198,30 @@ function getRootMap(options) {
 							hasRequired = true;
 							isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
 						}
-						if (!hasRequired && isRequired) replaceRange(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
-					} else if (isRequired) replaceRange(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
+						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 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<${expression.typeArguments[1].getText(ast)}, boolean>>`);
-					if (ts.isVariableStatement(node)) replaceRange(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+					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} = `);
 				} else if (options.defineSlots.alias.includes(macroName)) {
-					replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}slots;\nconst ${HELPER_PREFIX}slots = `);
+					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>`;
 				} else if (options.defineExpose.alias.includes(macroName)) {
-					replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}exposed;\nconst ${HELPER_PREFIX}exposed = `);
+					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`;
 				}
 			}
 		}
-		ts.forEachChild(node, (child) => {
+		node.forEachChild((child) => {
 			parents.unshift(node);
 			walk(child, parents);
 			parents.shift();
 		});
 	}
-	ts.forEachChild(ast, (node) => walk(node, []));
+	ast.forEachChild((node) => walk(node, []));
 	return rootMap;
 }
 function toValidAssetId(name, type) {
@@ -242,6 +234,7 @@ function toValidAssetId(name, type) {
 //#region src/volar.ts
 const plugin = createPlugin(({ ts }, userOptions = {}) => {
 	const resolvedOptions = resolveOptions(userOptions);
+	resolvedOptions.include.push(REGEX_VUE_SFC);
 	const filter = createFilter(resolvedOptions);
 	return {
 		name: "@vue-jsx-vapor/macros",
@@ -264,4 +257,4 @@ const plugin = createPlugin(({ ts }, userOptions = {}) => {
 var volar_default = plugin;
 
 //#endregion
-export { volar_default as default };
+export { volar_default as default, plugin as "module.exports" };

package/dist/{webpack-8f5BBtfW.cjs → webpack-CMEaEJ1m.cjs}

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

package/dist/{webpack-BVBzZxio.js → webpack-vi_c875X.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-jAatnMXF.js";
+import { src_default } from "./src-CYY_kpUg.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-VaQGgjRA.cjs');
-require('./raw-CHl9tce7.cjs');
+require('./core-CJIyaYlk.cjs');
+require('./raw-fnyAVQJZ.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-DR0MpvO3.cjs');
-const require_webpack = require('./webpack-8f5BBtfW.cjs');
+require('./src-CnMPxcfy.cjs');
+const require_webpack = require('./webpack-CMEaEJ1m.cjs');
 
 exports.default = require_webpack.webpack_default;

package/dist/webpack.d.cts

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

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-EFrKZ0uz.js";
-import "./raw-tGX-VsT-.js";
+import "./core-CtkYfL-E.js";
+import "./raw-CdxUliM8.js";
 import "./options-BWRkHmm5.js";
-import "./src-jAatnMXF.js";
-import { webpack_default } from "./webpack-BVBzZxio.js";
+import "./src-CYY_kpUg.js";
+import { webpack_default } from "./webpack-vi_c875X.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -131,10 +131,10 @@
     }
   },
   "dependencies": {
-    "@vue-macros/common": "^3.0.0-beta.15",
-    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@51677cd",
+    "@vue-macros/common": "^3.0.0-beta.17",
+    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@5771104",
     "hash-sum": "^2.0.0",
-    "ts-macro": "^0.1.35",
+    "ts-macro": "^0.2.7",
     "unplugin": "^2.3.5"
   },
   "devDependencies": {
@@ -142,8 +142,8 @@
     "@nuxt/kit": "^3.17.6",
     "@nuxt/schema": "^3.17.6",
     "@types/hash-sum": "^1.0.2",
-    "@vue-macros/test-utils": "^3.0.0-beta.15",
-    "vue": "https://pkg.pr.new/vue@51677cd"
+    "@vue-macros/test-utils": "^3.0.0-beta.17",
+    "vue": "https://pkg.pr.new/vue@5771104"
   },
   "scripts": {
     "build": "tsdown",