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

package/dist/api.cjs

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

package/dist/astro.cjs

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

package/dist/astro.js

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

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

@@ -177,7 +177,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 		if (root.params[0].type === "Identifier") {
 			getWalkedIds(root, propsName).forEach((id) => props[id] = null);
 			prependFunctionalNode(root, s, `const ${propsName} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "useFullProps", void 0, "vue-jsx-vapor")}()`);
-			s.overwrite(root.params[0].start, root.params[0].end, `${__vue_macros_common.HELPER_PREFIX}props`);
+			s.overwrite(root.params[0].start, root.params[0].end, root.params.length > 1 ? `${__vue_macros_common.HELPER_PREFIX}props` : "");
 		} else if (root.params[0].type === "ObjectPattern") {
 			const restructuredProps = root.params[0];
 			for (const prop of restructuredProps.properties) {
@@ -412,7 +412,7 @@ function transformJsxMacros(code, id, importMap, options) {
 				if (!macros.defineComponent && lastProp?.type === "RestElement" && lastProp.argument.type === "Identifier") propsName = lastProp.argument.name;
 				else s.appendRight(root.params[0].extra?.trailingComma ? root.params[0].extra?.trailingComma + 1 : lastProp?.end || root.params[0].end - 1, `${!root.params[0].extra?.trailingComma && root.params[0].properties.length ? "," : ""} ...${__vue_macros_common.HELPER_PREFIX}props`);
 			}
-		} else s.appendRight(getParamsStart(root, s.original), propsName);
+		} else if (macros.defineModel?.length) s.appendRight(getParamsStart(root, s.original), propsName);
 		if (macros.defineComponent) transformDefineComponent(root, propsName, macros, s, options.defineComponent?.autoReturnFunction);
 		if (macros.defineModel?.length) macros.defineModel.forEach(({ expression }) => {
 			transformDefineModel(expression, propsName, s);

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

@@ -176,7 +176,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 		if (root.params[0].type === "Identifier") {
 			getWalkedIds(root, propsName).forEach((id) => props[id] = null);
 			prependFunctionalNode(root, s, `const ${propsName} = ${importHelperFn(s, 0, "useFullProps", void 0, "vue-jsx-vapor")}()`);
-			s.overwrite(root.params[0].start, root.params[0].end, `${HELPER_PREFIX}props`);
+			s.overwrite(root.params[0].start, root.params[0].end, root.params.length > 1 ? `${HELPER_PREFIX}props` : "");
 		} else if (root.params[0].type === "ObjectPattern") {
 			const restructuredProps = root.params[0];
 			for (const prop of restructuredProps.properties) {
@@ -411,7 +411,7 @@ function transformJsxMacros(code, id, importMap, options) {
 				if (!macros.defineComponent && lastProp?.type === "RestElement" && lastProp.argument.type === "Identifier") propsName = lastProp.argument.name;
 				else s.appendRight(root.params[0].extra?.trailingComma ? root.params[0].extra?.trailingComma + 1 : lastProp?.end || root.params[0].end - 1, `${!root.params[0].extra?.trailingComma && root.params[0].properties.length ? "," : ""} ...${HELPER_PREFIX}props`);
 			}
-		} else s.appendRight(getParamsStart(root, s.original), propsName);
+		} else if (macros.defineModel?.length) s.appendRight(getParamsStart(root, s.original), propsName);
 		if (macros.defineComponent) transformDefineComponent(root, propsName, macros, s, options.defineComponent?.autoReturnFunction);
 		if (macros.defineModel?.length) macros.defineModel.forEach(({ expression }) => {
 			transformDefineModel(expression, propsName, s);

package/dist/esbuild.cjs

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

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-CYY_kpUg.js";
+import { src_default } from "./src-BMmuQ4rG.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-CJIyaYlk.cjs');
-require('./raw-fnyAVQJZ.cjs');
+require('./core-BnOBUOXo.cjs');
+require('./raw-DKCRm2ff.cjs');
 const require_options = require('./options-BejTnOdM.cjs');
-const require_src = require('./src-CnMPxcfy.cjs');
+const require_src = require('./src-DJK4pxUR.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import { resolveOptions } from "./options-BWRkHmm5.js";
-import { src_default } from "./src-CYY_kpUg.js";
+import { src_default } from "./src-BMmuQ4rG.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-CJIyaYlk.cjs');
-require('./raw-fnyAVQJZ.cjs');
+require('./core-BnOBUOXo.cjs');
+require('./raw-DKCRm2ff.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-CnMPxcfy.cjs');
-const require_vite = require('./vite-55JkDcH_.cjs');
-const require_webpack = require('./webpack-CMEaEJ1m.cjs');
+require('./src-DJK4pxUR.cjs');
+const require_vite = require('./vite-DRkDbCPE.cjs');
+const require_webpack = require('./webpack-CsAn2U-j.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_schema5 from "@nuxt/schema";
+import * as _nuxt_schema2 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts
 interface ModuleOptions extends Options {}
-declare const _default: _nuxt_schema5.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: _nuxt_schema2.NuxtModule<ModuleOptions, ModuleOptions, false>;
 //#endregion
 export { ModuleOptions, _default as default };

package/dist/nuxt.js

@@ -1,9 +1,9 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import "./src-CYY_kpUg.js";
-import { vite_default } from "./vite-UTnXGFnz.js";
-import { webpack_default } from "./webpack-vi_c875X.js";
+import "./src-BMmuQ4rG.js";
+import { vite_default } from "./vite-DbwHYLPn.js";
+import { webpack_default } from "./webpack-WGax0jDH.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

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

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

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

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

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-CtkYfL-E.js";
-import { raw_default } from "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import { raw_default } from "./raw-Cs8E-0N5.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-CJIyaYlk.cjs');
-require('./raw-fnyAVQJZ.cjs');
+require('./core-BnOBUOXo.cjs');
+require('./raw-DKCRm2ff.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-CnMPxcfy.cjs');
+const require_src = require('./src-DJK4pxUR.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 unplugin8 from "unplugin";
+import * as unplugin4 from "unplugin";
 
 //#region src/rolldown.d.ts
-declare const _default: (options?: Options | undefined) => unplugin8.RolldownPlugin<any> | unplugin8.RolldownPlugin<any>[];
+declare const _default: (options?: Options | undefined) => unplugin4.RolldownPlugin<any> | unplugin4.RolldownPlugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-CYY_kpUg.js";
+import { src_default } from "./src-BMmuQ4rG.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-CJIyaYlk.cjs');
-require('./raw-fnyAVQJZ.cjs');
+require('./core-BnOBUOXo.cjs');
+require('./raw-DKCRm2ff.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-CnMPxcfy.cjs');
+const require_src = require('./src-DJK4pxUR.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 rollup3 from "rollup";
+import * as rollup7 from "rollup";
 
 //#region src/rollup.d.ts
-declare const _default: (options?: Options | undefined) => rollup3.Plugin<any> | rollup3.Plugin<any>[];
+declare const _default: (options?: Options | undefined) => rollup7.Plugin<any> | rollup7.Plugin<any>[];
 //#endregion
 export { _default as default };

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-CYY_kpUg.js";
+import { src_default } from "./src-BMmuQ4rG.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-CJIyaYlk.cjs');
-require('./raw-fnyAVQJZ.cjs');
+require('./core-BnOBUOXo.cjs');
+require('./raw-DKCRm2ff.cjs');
 require('./options-BejTnOdM.cjs');
-const require_src = require('./src-CnMPxcfy.cjs');
+const require_src = require('./src-DJK4pxUR.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

@@ -1,7 +1,7 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-CYY_kpUg.js";
+import { src_default } from "./src-BMmuQ4rG.js";
 
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;

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

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

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

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

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

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

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

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

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import "./src-CYY_kpUg.js";
-import { vite_default } from "./vite-UTnXGFnz.js";
+import "./src-BMmuQ4rG.js";
+import { vite_default } from "./vite-DbwHYLPn.js";
 
 export { vite_default as default };

package/dist/volar.cjs

@@ -14,7 +14,7 @@ function transformDefineComponent(node, parent, options) {
 
 //#endregion
 //#region src/volar/define-style.ts
-function transformDefineStyle({ expression, isCssModules }, index, options) {
+function transformDefineStyle({ expression, isCssModules }, index, root, options) {
 	const { ts, codes, ast } = options;
 	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`,
@@ -26,6 +26,13 @@ function transformDefineStyle({ expression, isCssModules }, index, options) {
 		],
 		`: string`
 	]), "\n}>");
+	else if (root?.body) {
+		const returnNode = root.body.forEachChild((node) => ts.isReturnStatement(node) ? node : void 0);
+		if (returnNode) {
+			codes.replaceRange(expression.getStart(ast), expression.getEnd());
+			codes.replaceRange(returnNode.pos, returnNode.pos, ";", [expression.getText(ast), expression.getStart(ast)]);
+		}
+	}
 	addEmbeddedCode(expression, index, options);
 }
 const commentReg = /(?<=\/\*)[\s\S]*?(?=\*\/)|(?<=\/\/)[\s\S]*?(?=\n)/g;
@@ -73,8 +80,8 @@ function transformJsxMacros(rootMap, options) {
 	const { ts, codes, ast } = options;
 	let defineStyleIndex = 0;
 	for (const [root, macros] of rootMap) {
-		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
-		if (!root?.body) continue;
+		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, root, options));
+		if (!root?.body || Object.keys(macros).length === 1 && macros.defineStyle) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
 		if (asyncModifier && macros.defineComponent) codes.replaceRange(asyncModifier.pos, asyncModifier.end);
 		const result = `({}) as __VLS_PickNotAny<typeof ${__vue_macros_common.HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${__vue_macros_common.HELPER_PREFIX}ctx }`;
@@ -111,18 +118,23 @@ return {
 
 //#endregion
 //#region src/volar/global-types.ts
-function getGlobalTypes(options) {
-	const defineSlots = options.defineSlots.alias.flatMap((alias) => [`declare function ${alias}<T extends Record<string, any>>(): Partial<T>;`, `declare function ${alias}<T extends Record<string, any>>(slots: T): T;\n`]).join("");
-	const defineExpose = options.defineExpose.alias.map((alias) => `declare function ${alias}<Exposed extends Record<string, any> = Record<string, any>>(exposed?: Exposed): Exposed;`).join("");
-	const defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs): T; scss: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; sass: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; stylus: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; less: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; postcss: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T };\n`).join("");
-	const defineModel = options.defineModel.alias.map((alias) => alias === "defineModel" ? "defineModel" : `defineModel: ${alias}`).join(", ");
-	const defineComponent = options.defineComponent.alias.map((alias) => ["defineComponent", "defineVaporComponent"].includes(alias) ? "" : `defineComponent: ${alias}`).filter(Boolean).join(", ");
+function getGlobalTypes(rootMap, options) {
+	let defineStyle = "";
+	if (options.defineSlots.alias) {
+		defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs): T; scss: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; sass: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; stylus: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; less: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T; postcss: <T>(...args: ${__vue_macros_common.HELPER_PREFIX}StyleArgs)=> T };`).join("\n");
+		defineStyle += `\ntype ${__vue_macros_common.HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];`;
+	}
+	if (!rootMap.size) return `\n${defineStyle}`;
+	const defineSlots = options.defineSlots.alias.flatMap((alias) => [`declare function ${alias}<T extends Record<string, any>>(): Partial<T>;`, `declare function ${alias}<T extends Record<string, any>>(slots: T): T;`]).join("\n");
+	const defineExpose = options.defineExpose.alias.map((alias) => `declare function ${alias}<Exposed extends Record<string, any> = Record<string, any>>(exposed?: Exposed): Exposed;`).join("\n");
+	const defineModel = options.defineModel.alias.map((alias) => alias === "defineModel" ? "defineModel" : `defineModel: ${alias}`);
+	const defineComponent = options.defineComponent.alias.map((alias) => ["defineComponent", "defineVaporComponent"].includes(alias) ? "" : `defineComponent: ${alias}`);
+	const VueMacros = [...defineModel, ...defineComponent].filter(Boolean).join(",");
 	return `
-declare const { ${defineModel}, ${defineComponent} }: typeof import('vue')
+${VueMacros ? `declare const { ${VueMacros} }: typeof import('vue');` : ""}
 ${defineSlots}
 ${defineExpose}
 ${defineStyle}
-type ${__vue_macros_common.HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];
 // @ts-ignore
 type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
@@ -249,10 +261,8 @@ const plugin = (0, ts_macro.createPlugin)(({ ts }, userOptions = {}) => {
 				...resolvedOptions
 			};
 			const rootMap = getRootMap(options);
-			if (rootMap.size) {
-				transformJsxMacros(rootMap, options);
-				codes.push(getGlobalTypes(options));
-			}
+			if (rootMap.size) transformJsxMacros(rootMap, options);
+			codes.push(getGlobalTypes(rootMap, options));
 		}
 	};
 });

package/dist/volar.js

@@ -12,7 +12,7 @@ function transformDefineComponent(node, parent, options) {
 
 //#endregion
 //#region src/volar/define-style.ts
-function transformDefineStyle({ expression, isCssModules }, index, options) {
+function transformDefineStyle({ expression, isCssModules }, index, root, options) {
 	const { ts, codes, ast } = options;
 	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`,
@@ -24,6 +24,13 @@ function transformDefineStyle({ expression, isCssModules }, index, options) {
 		],
 		`: string`
 	]), "\n}>");
+	else if (root?.body) {
+		const returnNode = root.body.forEachChild((node) => ts.isReturnStatement(node) ? node : void 0);
+		if (returnNode) {
+			codes.replaceRange(expression.getStart(ast), expression.getEnd());
+			codes.replaceRange(returnNode.pos, returnNode.pos, ";", [expression.getText(ast), expression.getStart(ast)]);
+		}
+	}
 	addEmbeddedCode(expression, index, options);
 }
 const commentReg = /(?<=\/\*)[\s\S]*?(?=\*\/)|(?<=\/\/)[\s\S]*?(?=\n)/g;
@@ -71,8 +78,8 @@ function transformJsxMacros(rootMap, options) {
 	const { ts, codes, ast } = options;
 	let defineStyleIndex = 0;
 	for (const [root, macros] of rootMap) {
-		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
-		if (!root?.body) continue;
+		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, root, options));
+		if (!root?.body || Object.keys(macros).length === 1 && macros.defineStyle) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
 		if (asyncModifier && macros.defineComponent) codes.replaceRange(asyncModifier.pos, asyncModifier.end);
 		const result = `({}) as __VLS_PickNotAny<typeof ${HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${HELPER_PREFIX}ctx }`;
@@ -109,18 +116,23 @@ return {
 
 //#endregion
 //#region src/volar/global-types.ts
-function getGlobalTypes(options) {
-	const defineSlots = options.defineSlots.alias.flatMap((alias) => [`declare function ${alias}<T extends Record<string, any>>(): Partial<T>;`, `declare function ${alias}<T extends Record<string, any>>(slots: T): T;\n`]).join("");
-	const defineExpose = options.defineExpose.alias.map((alias) => `declare function ${alias}<Exposed extends Record<string, any> = Record<string, any>>(exposed?: Exposed): Exposed;`).join("");
-	const defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: ${HELPER_PREFIX}StyleArgs): T; scss: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; sass: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; stylus: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; less: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; postcss: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T };\n`).join("");
-	const defineModel = options.defineModel.alias.map((alias) => alias === "defineModel" ? "defineModel" : `defineModel: ${alias}`).join(", ");
-	const defineComponent = options.defineComponent.alias.map((alias) => ["defineComponent", "defineVaporComponent"].includes(alias) ? "" : `defineComponent: ${alias}`).filter(Boolean).join(", ");
+function getGlobalTypes(rootMap, options) {
+	let defineStyle = "";
+	if (options.defineSlots.alias) {
+		defineStyle = options.defineStyle.alias.map((alias) => `declare const ${alias}: { <T>(...args: ${HELPER_PREFIX}StyleArgs): T; scss: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; sass: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; stylus: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; less: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T; postcss: <T>(...args: ${HELPER_PREFIX}StyleArgs)=> T };`).join("\n");
+		defineStyle += `\ntype ${HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];`;
+	}
+	if (!rootMap.size) return `\n${defineStyle}`;
+	const defineSlots = options.defineSlots.alias.flatMap((alias) => [`declare function ${alias}<T extends Record<string, any>>(): Partial<T>;`, `declare function ${alias}<T extends Record<string, any>>(slots: T): T;`]).join("\n");
+	const defineExpose = options.defineExpose.alias.map((alias) => `declare function ${alias}<Exposed extends Record<string, any> = Record<string, any>>(exposed?: Exposed): Exposed;`).join("\n");
+	const defineModel = options.defineModel.alias.map((alias) => alias === "defineModel" ? "defineModel" : `defineModel: ${alias}`);
+	const defineComponent = options.defineComponent.alias.map((alias) => ["defineComponent", "defineVaporComponent"].includes(alias) ? "" : `defineComponent: ${alias}`);
+	const VueMacros = [...defineModel, ...defineComponent].filter(Boolean).join(",");
 	return `
-declare const { ${defineModel}, ${defineComponent} }: typeof import('vue')
+${VueMacros ? `declare const { ${VueMacros} }: typeof import('vue');` : ""}
 ${defineSlots}
 ${defineExpose}
 ${defineStyle}
-type ${HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];
 // @ts-ignore
 type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
@@ -247,10 +259,8 @@ const plugin = createPlugin(({ ts }, userOptions = {}) => {
 				...resolvedOptions
 			};
 			const rootMap = getRootMap(options);
-			if (rootMap.size) {
-				transformJsxMacros(rootMap, options);
-				codes.push(getGlobalTypes(options));
-			}
+			if (rootMap.size) transformJsxMacros(rootMap, options);
+			codes.push(getGlobalTypes(rootMap, options));
 		}
 	};
 });

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

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

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

@@ -1,4 +1,4 @@
-import { src_default } from "./src-CYY_kpUg.js";
+import { src_default } from "./src-BMmuQ4rG.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-CJIyaYlk.cjs');
-require('./raw-fnyAVQJZ.cjs');
+require('./core-BnOBUOXo.cjs');
+require('./raw-DKCRm2ff.cjs');
 require('./options-BejTnOdM.cjs');
-require('./src-CnMPxcfy.cjs');
-const require_webpack = require('./webpack-CMEaEJ1m.cjs');
+require('./src-DJK4pxUR.cjs');
+const require_webpack = require('./webpack-CsAn2U-j.cjs');
 
 exports.default = require_webpack.webpack_default;

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-CtkYfL-E.js";
-import "./raw-CdxUliM8.js";
+import "./core-CzkzlWGo.js";
+import "./raw-Cs8E-0N5.js";
 import "./options-BWRkHmm5.js";
-import "./src-CYY_kpUg.js";
-import { webpack_default } from "./webpack-vi_c875X.js";
+import "./src-BMmuQ4rG.js";
+import { webpack_default } from "./webpack-WGax0jDH.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.5.2",
+  "version": "2.5.4-beta.1",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -132,7 +132,7 @@
   },
   "dependencies": {
     "@vue-macros/common": "^3.0.0-beta.17",
-    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@5771104",
+    "@vue/compiler-sfc": "3.6.0-alpha.2",
     "hash-sum": "^2.0.0",
     "ts-macro": "^0.2.7",
     "unplugin": "^2.3.5"
@@ -143,7 +143,7 @@
     "@nuxt/schema": "^3.17.6",
     "@types/hash-sum": "^1.0.2",
     "@vue-macros/test-utils": "^3.0.0-beta.17",
-    "vue": "https://pkg.pr.new/vue@5771104"
+    "vue": "3.6.0-alpha.2"
   },
   "scripts": {
     "build": "tsdown",