@vue-jsx-vapor/macros 2.1.8 → 2.3.0

package/dist/api.cjs

@@ -4,11 +4,11 @@
 
 
 
-var _chunkLPH34H6Ocjs = require('./chunk-LPH34H6O.cjs');
+var _chunkZQ4GVJKXcjs = require('./chunk-ZQ4GVJKX.cjs');
 
 
 
 
 
 
-exports.getMacroExpression = _chunkLPH34H6Ocjs.getMacroExpression; exports.getParamsStart = _chunkLPH34H6Ocjs.getParamsStart; exports.isFunctionalNode = _chunkLPH34H6Ocjs.isFunctionalNode; exports.restructure = _chunkLPH34H6Ocjs.restructure; exports.transformJsxMacros = _chunkLPH34H6Ocjs.transformJsxMacros;
+exports.getMacroExpression = _chunkZQ4GVJKXcjs.getMacroExpression; exports.getParamsStart = _chunkZQ4GVJKXcjs.getParamsStart; exports.isFunctionalNode = _chunkZQ4GVJKXcjs.isFunctionalNode; exports.restructure = _chunkZQ4GVJKXcjs.restructure; exports.transformJsxMacros = _chunkZQ4GVJKXcjs.transformJsxMacros;

package/dist/api.js

@@ -4,7 +4,7 @@ import {
   isFunctionalNode,
   restructure,
   transformJsxMacros
-} from "./chunk-TWP2JCYQ.js";
+} from "./chunk-SMWNQXL7.js";
 export {
   getMacroExpression,
   getParamsStart,

package/dist/astro.cjs

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 // src/astro.ts
@@ -11,7 +11,7 @@ var astro_default = (options) => ({
   hooks: {
     "astro:config:setup": (astro) => {
       astro.config.vite.plugins ||= [];
-      astro.config.vite.plugins.push(_chunkJWJVYLYIcjs.index_default.vite(options));
+      astro.config.vite.plugins.push(_chunkL26STXZKcjs.index_default.vite(options));
     }
   }
 });

package/dist/astro.js

@@ -1,8 +1,8 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 
 // src/astro.ts

package/dist/{chunk-LVZNHMZC.js → chunk-AUE5EAQA.js}

@@ -1,6 +1,6 @@
 import {
   raw_default
-} from "./chunk-WOWB5VHY.js";
+} from "./chunk-E5WGUCGE.js";
 
 // src/index.ts
 import { createUnplugin } from "unplugin";

package/dist/{chunk-WOWB5VHY.js → chunk-E5WGUCGE.js}

@@ -5,7 +5,7 @@ import {
   use_model_default,
   withDefaultsHelperId,
   with_defaults_default
-} from "./chunk-TWP2JCYQ.js";
+} from "./chunk-SMWNQXL7.js";
 import {
   resolveOptions
 } from "./chunk-DANY2WQD.js";
@@ -52,7 +52,10 @@ var plugin = (userOptions = {}) => {
       if (importMap.get(id)) return true;
       return filter(id);
     },
-    transform(code, id) {
+    transform(code, id, opt) {
+      if (opt?.ssr) {
+        options.defineComponent.autoReturnFunction = true;
+      }
       if (importMap.get(id)) return transformStyle(code, id, options);
       return transformJsxMacros(code, id, importMap, options);
     }

package/dist/{chunk-WZIZSQGW.js → chunk-HBVQYNJJ.js}

@@ -1,6 +1,6 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
+} from "./chunk-AUE5EAQA.js";
 
 // src/webpack.ts
 var webpack_default = index_default.webpack;

package/dist/{chunk-YCL7HGD4.cjs → chunk-KUKYWPEK.cjs}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
 
 // src/vite.ts
-var vite_default = _chunkJWJVYLYIcjs.index_default.vite;
+var vite_default = _chunkL26STXZKcjs.index_default.vite;
 
 
 

package/dist/{chunk-JWJVYLYI.cjs → chunk-L26STXZK.cjs}

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk35H4MC4Ncjs = require('./chunk-35H4MC4N.cjs');
+var _chunkUAWFIGPXcjs = require('./chunk-UAWFIGPX.cjs');
 
 // src/index.ts
 var _unplugin = require('unplugin');
-var unplugin = _unplugin.createUnplugin.call(void 0, _chunk35H4MC4Ncjs.raw_default);
+var unplugin = _unplugin.createUnplugin.call(void 0, _chunkUAWFIGPXcjs.raw_default);
 var index_default = unplugin;
 
 

package/dist/{chunk-NL4CWOW2.cjs → chunk-PWA6BBMQ.cjs}

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
 
 // src/webpack.ts
-var webpack_default = _chunkJWJVYLYIcjs.index_default.webpack;
+var webpack_default = _chunkL26STXZKcjs.index_default.webpack;
 
 
 

package/dist/{chunk-TWP2JCYQ.js → chunk-SMWNQXL7.js}

@@ -240,8 +240,18 @@ function processAwait(s, node, needSemi, isStatement) {
   );
 }
 
+// src/core/define-component/return.ts
+function transformReturn(root, s) {
+  const node = root.body.type === "BlockStatement" ? root.body.body.find((node2) => node2.type === "ReturnStatement")?.argument : root.body;
+  if (!node || isFunctionalNode(node)) return;
+  s.appendRight(
+    node.extra?.parenthesized ? node.extra.parenStart : node.start,
+    "() => "
+  );
+}
+
 // src/core/define-component/index.ts
-function transformDefineComponent(root, propsName, map, s) {
+function transformDefineComponent(root, propsName, map, s, autoReturnFunction = false) {
   if (!map.defineComponent) return;
   const defineComponentName = s.sliceNode(map.defineComponent.callee);
   if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) {
@@ -299,6 +309,9 @@ function transformDefineComponent(root, propsName, map, s) {
     }
   }
   transformAwait(root, s);
+  if (autoReturnFunction) {
+    transformReturn(root, s);
+  }
 }
 function prependObjectExpression(argument, name, value, s) {
   if (!argument.properties?.find(
@@ -463,7 +476,13 @@ function transformJsxMacros(code, id, importMap, options) {
       s.appendRight(getParamsStart(root, s.original), propsName);
     }
     if (map.defineComponent) {
-      transformDefineComponent(root, propsName, map, s);
+      transformDefineComponent(
+        root,
+        propsName,
+        map,
+        s,
+        options.defineComponent?.autoReturnFunction
+      );
     }
     if (map.defineModel?.length) {
       map.defineModel.forEach(({ expression }) => {

package/dist/{chunk-35H4MC4N.cjs → chunk-UAWFIGPX.cjs}

@@ -1,11 +1,11 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
 
 
 
 
-var _chunkLPH34H6Ocjs = require('./chunk-LPH34H6O.cjs');
+var _chunkZQ4GVJKXcjs = require('./chunk-ZQ4GVJKX.cjs');
 
 
 var _chunk53TNKVYDcjs = require('./chunk-53TNKVYD.cjs');
@@ -37,24 +37,27 @@ var plugin = (userOptions = {}) => {
     name,
     enforce: "pre",
     resolveId(id) {
-      if (_common.normalizePath.call(void 0, id).startsWith(_chunkLPH34H6Ocjs.helperPrefix)) return id;
+      if (_common.normalizePath.call(void 0, id).startsWith(_chunkZQ4GVJKXcjs.helperPrefix)) return id;
     },
     loadInclude(id) {
-      return _common.normalizePath.call(void 0, id).startsWith(_chunkLPH34H6Ocjs.helperPrefix);
+      return _common.normalizePath.call(void 0, id).startsWith(_chunkZQ4GVJKXcjs.helperPrefix);
     },
     load(_id) {
       const id = _common.normalizePath.call(void 0, _id);
-      if (id === _chunkLPH34H6Ocjs.useModelHelperId) return _chunkLPH34H6Ocjs.use_model_default;
-      else if (id === _chunkLPH34H6Ocjs.withDefaultsHelperId) return _chunkLPH34H6Ocjs.with_defaults_default;
+      if (id === _chunkZQ4GVJKXcjs.useModelHelperId) return _chunkZQ4GVJKXcjs.use_model_default;
+      else if (id === _chunkZQ4GVJKXcjs.withDefaultsHelperId) return _chunkZQ4GVJKXcjs.with_defaults_default;
       else if (importMap.get(id)) return importMap.get(id);
     },
     transformInclude(id) {
       if (importMap.get(id)) return true;
       return filter(id);
     },
-    transform(code, id) {
+    transform(code, id, opt) {
+      if (_optionalChain([opt, 'optionalAccess', _ => _.ssr])) {
+        options.defineComponent.autoReturnFunction = true;
+      }
       if (importMap.get(id)) return transformStyle(code, id, options);
-      return _chunkLPH34H6Ocjs.transformJsxMacros.call(void 0, code, id, importMap, options);
+      return _chunkZQ4GVJKXcjs.transformJsxMacros.call(void 0, code, id, importMap, options);
     }
   };
 };

package/dist/{chunk-LPH34H6O.cjs → chunk-ZQ4GVJKX.cjs}

@@ -240,8 +240,18 @@ function processAwait(s, node, needSemi, isStatement) {
   );
 }
 
+// src/core/define-component/return.ts
+function transformReturn(root, s) {
+  const node = root.body.type === "BlockStatement" ? _optionalChain([root, 'access', _13 => _13.body, 'access', _14 => _14.body, 'access', _15 => _15.find, 'call', _16 => _16((node2) => node2.type === "ReturnStatement"), 'optionalAccess', _17 => _17.argument]) : root.body;
+  if (!node || isFunctionalNode(node)) return;
+  s.appendRight(
+    _optionalChain([node, 'access', _18 => _18.extra, 'optionalAccess', _19 => _19.parenthesized]) ? node.extra.parenStart : node.start,
+    "() => "
+  );
+}
+
 // src/core/define-component/index.ts
-function transformDefineComponent(root, propsName, map, s) {
+function transformDefineComponent(root, propsName, map, s, autoReturnFunction = false) {
   if (!map.defineComponent) return;
   const defineComponentName = s.sliceNode(map.defineComponent.callee);
   if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) {
@@ -270,15 +280,15 @@ function transformDefineComponent(root, propsName, map, s) {
     }
   }
   for (const { expression, isRequired } of map.defineModel || []) {
-    const modelOptions = _optionalChain([expression, 'access', _13 => _13.arguments, 'access', _14 => _14[0], 'optionalAccess', _15 => _15.type]) === "ObjectExpression" ? expression.arguments[0] : _optionalChain([expression, 'access', _16 => _16.arguments, 'access', _17 => _17[1], 'optionalAccess', _18 => _18.type]) === "ObjectExpression" ? expression.arguments[1] : void 0;
+    const modelOptions = _optionalChain([expression, 'access', _20 => _20.arguments, 'access', _21 => _21[0], 'optionalAccess', _22 => _22.type]) === "ObjectExpression" ? expression.arguments[0] : _optionalChain([expression, 'access', _23 => _23.arguments, 'access', _24 => _24[1], 'optionalAccess', _25 => _25.type]) === "ObjectExpression" ? expression.arguments[1] : void 0;
     const options = {};
     if (isRequired) options.required = true;
-    for (const prop of _optionalChain([modelOptions, 'optionalAccess', _19 => _19.properties]) || []) {
+    for (const prop of _optionalChain([modelOptions, 'optionalAccess', _26 => _26.properties]) || []) {
       if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && ["validator", "type", "required"].includes(prop.key.name)) {
         options[prop.key.name] = s.sliceNode(prop.value);
       }
     }
-    const propName = _optionalChain([expression, 'access', _20 => _20.arguments, 'access', _21 => _21[0], 'optionalAccess', _22 => _22.type]) === "StringLiteral" ? expression.arguments[0].value : "modelValue";
+    const propName = _optionalChain([expression, 'access', _27 => _27.arguments, 'access', _28 => _28[0], 'optionalAccess', _29 => _29.type]) === "StringLiteral" ? expression.arguments[0].value : "modelValue";
     props[propName] = Object.keys(options).length ? `{ ${Object.entries(options).map(([key, value]) => `${key}: ${value}`).join(", ")} }` : null;
     props[`onUpdate:${propName}`] = null;
     props[`${propName === "modelValue" ? "model" : propName}Modifiers`] = null;
@@ -299,9 +309,12 @@ function transformDefineComponent(root, propsName, map, s) {
     }
   }
   transformAwait(root, s);
+  if (autoReturnFunction) {
+    transformReturn(root, s);
+  }
 }
 function prependObjectExpression(argument, name, value, s) {
-  if (!_optionalChain([argument, 'access', _23 => _23.properties, 'optionalAccess', _24 => _24.find, 'call', _25 => _25(
+  if (!_optionalChain([argument, 'access', _30 => _30.properties, 'optionalAccess', _31 => _31.find, 'call', _32 => _32(
     (prop) => prop.type === "ObjectProperty" && prop.key.type === "Identifier" && prop.key.name === name
   )])) {
     s.appendRight(argument.start + 1, `${name}: ${value},`);
@@ -312,7 +325,7 @@ function getWalkedIds(root, propsName) {
   _compilersfc.walkIdentifiers.call(void 0, 
     root.body,
     (id, parent) => {
-      if (id.name === propsName && (_optionalChain([parent, 'optionalAccess', _26 => _26.type]) === "MemberExpression" || _optionalChain([parent, 'optionalAccess', _27 => _27.type]) === "OptionalMemberExpression")) {
+      if (id.name === propsName && (_optionalChain([parent, 'optionalAccess', _33 => _33.type]) === "MemberExpression" || _optionalChain([parent, 'optionalAccess', _34 => _34.type]) === "OptionalMemberExpression")) {
         const prop = parent.property.type === "Identifier" ? parent.property.name : parent.property.type === "StringLiteral" ? parent.property.value : "";
         if (prop) walkedIds.add(prop);
       }
@@ -327,7 +340,7 @@ function getWalkedIds(root, propsName) {
 function transformDefineExpose(node, s, version) {
   s.overwriteNode(node.callee, ";");
   s.appendRight(
-    _optionalChain([node, 'access', _28 => _28.arguments, 'access', _29 => _29[0], 'optionalAccess', _30 => _30.start]) || node.end - 1,
+    _optionalChain([node, 'access', _35 => _35.arguments, 'access', _36 => _36[0], 'optionalAccess', _37 => _37.start]) || node.end - 1,
     version >= 3.6 ? `${_common.importHelperFn.call(void 0, s, 0, "currentInstance")}.exposed = ` : `${_common.importHelperFn.call(void 0, s, 0, "getCurrentInstance")}().exposed = `
   );
 }
@@ -340,8 +353,8 @@ function transformDefineModel(node, propsName, s) {
     _common.importHelperFn.call(void 0, s, 0, "useModel", void 0, useModelHelperId)
   );
   s.appendRight(
-    _optionalChain([node, 'access', _31 => _31.arguments, 'access', _32 => _32[0], 'optionalAccess', _33 => _33.start]) || node.end - 1,
-    `${propsName}, ${_optionalChain([node, 'access', _34 => _34.arguments, 'access', _35 => _35[0], 'optionalAccess', _36 => _36.type]) !== "StringLiteral" ? `'modelValue',` : ""}`
+    _optionalChain([node, 'access', _38 => _38.arguments, 'access', _39 => _39[0], 'optionalAccess', _40 => _40.start]) || node.end - 1,
+    `${propsName}, ${_optionalChain([node, 'access', _41 => _41.arguments, 'access', _42 => _42[0], 'optionalAccess', _43 => _43.type]) !== "StringLiteral" ? `'modelValue',` : ""}`
   );
 }
 
@@ -350,7 +363,7 @@ function transformDefineModel(node, propsName, s) {
 function transformDefineSlots(node, s) {
   s.overwrite(
     node.start,
-    _optionalChain([node, 'access', _37 => _37.arguments, 'access', _38 => _38[0], 'optionalAccess', _39 => _39.start]) && node.arguments[0].start - 1 || _optionalChain([node, 'access', _40 => _40.typeArguments, 'optionalAccess', _41 => _41.end]) || node.callee.end,
+    _optionalChain([node, 'access', _44 => _44.arguments, 'access', _45 => _45[0], 'optionalAccess', _46 => _46.start]) && node.arguments[0].start - 1 || _optionalChain([node, 'access', _47 => _47.typeArguments, 'optionalAccess', _48 => _48.end]) || node.callee.end,
     `Object.assign`
   );
   const slots = `${_common.importHelperFn.call(void 0, s, 0, "useSlots")}()`;
@@ -362,7 +375,7 @@ function transformDefineSlots(node, s) {
 var _hashsum = require('hash-sum'); var _hashsum2 = _interopRequireDefault(_hashsum);
 function transformDefineStyle(defineStyle, index, root, s, importMap) {
   const { expression, lang, isDeclaration } = defineStyle;
-  if (_optionalChain([expression, 'access', _42 => _42.arguments, 'access', _43 => _43[0], 'optionalAccess', _44 => _44.type]) !== "TemplateLiteral") return;
+  if (_optionalChain([expression, 'access', _49 => _49.arguments, 'access', _50 => _50[0], 'optionalAccess', _51 => _51.type]) !== "TemplateLiteral") return;
   let css = s.sliceNode(expression.arguments[0]).slice(1, -1);
   const scopeId = _hashsum2.default.call(void 0, css);
   const vars = /* @__PURE__ */ new Map();
@@ -389,7 +402,7 @@ function transformDefineStyle(defineStyle, index, root, s, importMap) {
     }
   }
   let scoped = !!root;
-  if (_optionalChain([expression, 'access', _45 => _45.arguments, 'access', _46 => _46[1], 'optionalAccess', _47 => _47.type]) === "ObjectExpression") {
+  if (_optionalChain([expression, 'access', _52 => _52.arguments, 'access', _53 => _53[1], 'optionalAccess', _54 => _54.type]) === "ObjectExpression") {
     for (const prop of expression.arguments[1].properties) {
       if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && prop.key.name === "scoped" && prop.value.type === "BooleanLiteral") {
         scoped = prop.value.value;
@@ -440,7 +453,7 @@ function transformJsxMacros(code, id, importMap, options) {
   const rootMap = getRootMap(ast, s, options);
   let defineStyleIndex = 0;
   for (const [root, map] of rootMap) {
-    _optionalChain([map, 'access', _48 => _48.defineStyle, 'optionalAccess', _49 => _49.forEach, 'call', _50 => _50((defineStyle) => {
+    _optionalChain([map, 'access', _55 => _55.defineStyle, 'optionalAccess', _56 => _56.forEach, 'call', _57 => _57((defineStyle) => {
       transformDefineStyle(defineStyle, defineStyleIndex++, root, s, importMap);
     })]);
     if (root === void 0) continue;
@@ -450,12 +463,12 @@ function transformJsxMacros(code, id, importMap, options) {
         propsName = root.params[0].name;
       } else if (root.params[0].type === "ObjectPattern") {
         const lastProp = root.params[0].properties.at(-1);
-        if (!map.defineComponent && _optionalChain([lastProp, 'optionalAccess', _51 => _51.type]) === "RestElement" && lastProp.argument.type === "Identifier") {
+        if (!map.defineComponent && _optionalChain([lastProp, 'optionalAccess', _58 => _58.type]) === "RestElement" && lastProp.argument.type === "Identifier") {
           propsName = lastProp.argument.name;
         } else {
           s.appendRight(
-            _optionalChain([root, 'access', _52 => _52.params, 'access', _53 => _53[0], 'access', _54 => _54.extra, 'optionalAccess', _55 => _55.trailingComma]) ? _optionalChain([root, 'access', _56 => _56.params, 'access', _57 => _57[0], 'access', _58 => _58.extra, 'optionalAccess', _59 => _59.trailingComma]) + 1 : _optionalChain([lastProp, 'optionalAccess', _60 => _60.end]) || root.params[0].end - 1,
-            `${!_optionalChain([root, 'access', _61 => _61.params, 'access', _62 => _62[0], 'access', _63 => _63.extra, 'optionalAccess', _64 => _64.trailingComma]) && root.params[0].properties.length ? "," : ""} ...${_common.HELPER_PREFIX}props`
+            _optionalChain([root, 'access', _59 => _59.params, 'access', _60 => _60[0], 'access', _61 => _61.extra, 'optionalAccess', _62 => _62.trailingComma]) ? _optionalChain([root, 'access', _63 => _63.params, 'access', _64 => _64[0], 'access', _65 => _65.extra, 'optionalAccess', _66 => _66.trailingComma]) + 1 : _optionalChain([lastProp, 'optionalAccess', _67 => _67.end]) || root.params[0].end - 1,
+            `${!_optionalChain([root, 'access', _68 => _68.params, 'access', _69 => _69[0], 'access', _70 => _70.extra, 'optionalAccess', _71 => _71.trailingComma]) && root.params[0].properties.length ? "," : ""} ...${_common.HELPER_PREFIX}props`
           );
         }
       }
@@ -463,9 +476,15 @@ function transformJsxMacros(code, id, importMap, options) {
       s.appendRight(getParamsStart(root, s.original), propsName);
     }
     if (map.defineComponent) {
-      transformDefineComponent(root, propsName, map, s);
+      transformDefineComponent(
+        root,
+        propsName,
+        map,
+        s,
+        _optionalChain([options, 'access', _72 => _72.defineComponent, 'optionalAccess', _73 => _73.autoReturnFunction])
+      );
     }
-    if (_optionalChain([map, 'access', _65 => _65.defineModel, 'optionalAccess', _66 => _66.length])) {
+    if (_optionalChain([map, 'access', _74 => _74.defineModel, 'optionalAccess', _75 => _75.length])) {
       map.defineModel.forEach(({ expression }) => {
         transformDefineModel(expression, propsName, s);
       });
@@ -486,13 +505,13 @@ function getRootMap(ast, s, options) {
     enter(node, parent) {
       parents.unshift(parent);
       const root = isFunctionalNode(parents[1]) ? parents[1] : void 0;
-      if (root && _optionalChain([parents, 'access', _67 => _67[2], 'optionalAccess', _68 => _68.type]) === "CallExpression" && options.defineComponent.alias.includes(s.sliceNode(parents[2].callee))) {
+      if (root && _optionalChain([parents, 'access', _76 => _76[2], 'optionalAccess', _77 => _77.type]) === "CallExpression" && options.defineComponent.alias.includes(s.sliceNode(parents[2].callee))) {
         if (!rootMap.has(root)) rootMap.set(root, {});
         if (!rootMap.get(root).defineComponent) {
           rootMap.get(root).defineComponent = parents[2];
         }
       }
-      const expression = node.type === "VariableDeclaration" ? _optionalChain([node, 'access', _69 => _69.declarations, 'access', _70 => _70[0], 'access', _71 => _71.init, 'optionalAccess', _72 => _72.type]) === "CallExpression" && s.sliceNode(node.declarations[0].init.callee) === "$" ? node.declarations[0].init.arguments[0] : node.declarations[0].init : node.type === "ExpressionStatement" ? node.expression : void 0;
+      const expression = node.type === "VariableDeclaration" ? _optionalChain([node, 'access', _78 => _78.declarations, 'access', _79 => _79[0], 'access', _80 => _80.init, 'optionalAccess', _81 => _81.type]) === "CallExpression" && s.sliceNode(node.declarations[0].init.callee) === "$" ? node.declarations[0].init.arguments[0] : node.declarations[0].init : node.type === "ExpressionStatement" ? node.expression : void 0;
       if (!expression) return;
       const macroExpression = getMacroExpression(expression, options);
       if (!macroExpression) return;
@@ -549,7 +568,7 @@ function getMacroExpression(node, options) {
   }
 }
 function getParamsStart(node, code) {
-  return node.params[0] ? node.params[0].start : node.start + (_optionalChain([code, 'access', _73 => _73.slice, 'call', _74 => _74(node.start, node.body.start), 'access', _75 => _75.match, 'call', _76 => _76(/\(\s*\)/), 'optionalAccess', _77 => _77.index]) || 0) + 1;
+  return node.params[0] ? node.params[0].start : node.start + (_optionalChain([code, 'access', _82 => _82.slice, 'call', _83 => _83(node.start, node.body.start), 'access', _84 => _84.match, 'call', _85 => _85(/\(\s*\)/), 'optionalAccess', _86 => _86.index]) || 0) + 1;
 }
 
 

package/dist/{chunk-RC5ZHWIN.js → chunk-ZXJQCFZZ.js}

@@ -1,6 +1,6 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
+} from "./chunk-AUE5EAQA.js";
 
 // src/vite.ts
 var vite_default = index_default.vite;

package/dist/esbuild.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 // src/esbuild.ts
-var esbuild_default = _chunkJWJVYLYIcjs.index_default.esbuild;
+var esbuild_default = _chunkL26STXZKcjs.index_default.esbuild;
 
 
 exports.default = esbuild_default;

package/dist/esbuild.js

@@ -1,8 +1,8 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 
 // src/esbuild.ts

package/dist/index.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 
 
 var _chunk53TNKVYDcjs = require('./chunk-53TNKVYD.cjs');
 
 
 
-exports.default = _chunkJWJVYLYIcjs.index_default; exports.resolveOptions = _chunk53TNKVYDcjs.resolveOptions;
+exports.default = _chunkL26STXZKcjs.index_default; exports.resolveOptions = _chunk53TNKVYDcjs.resolveOptions;

package/dist/index.js

@@ -1,8 +1,8 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import {
   resolveOptions
 } from "./chunk-DANY2WQD.js";

package/dist/nuxt.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkYCL7HGD4cjs = require('./chunk-YCL7HGD4.cjs');
+var _chunkKUKYWPEKcjs = require('./chunk-KUKYWPEK.cjs');
 
 
-var _chunkNL4CWOW2cjs = require('./chunk-NL4CWOW2.cjs');
-require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkPWA6BBMQcjs = require('./chunk-PWA6BBMQ.cjs');
+require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 // src/nuxt.ts
@@ -18,8 +18,8 @@ var nuxt_default = _kit.defineNuxtModule.call(void 0, {
     configKey: "unpluginStarter"
   },
   setup(options) {
-    _kit.addVitePlugin.call(void 0, () => _chunkYCL7HGD4cjs.vite_default.call(void 0, options));
-    _kit.addWebpackPlugin.call(void 0, () => _chunkNL4CWOW2cjs.webpack_default.call(void 0, options));
+    _kit.addVitePlugin.call(void 0, () => _chunkKUKYWPEKcjs.vite_default.call(void 0, options));
+    _kit.addWebpackPlugin.call(void 0, () => _chunkPWA6BBMQcjs.webpack_default.call(void 0, options));
   }
 });
 

package/dist/nuxt.js

@@ -1,12 +1,12 @@
 import {
   vite_default
-} from "./chunk-RC5ZHWIN.js";
+} from "./chunk-ZXJQCFZZ.js";
 import {
   webpack_default
-} from "./chunk-WZIZSQGW.js";
-import "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-HBVQYNJJ.js";
+import "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 
 // src/nuxt.ts

package/dist/options.d.cts

@@ -3,6 +3,7 @@ import { MarkRequired, BaseOptions } from '@vue-macros/common';
 type Options = BaseOptions & {
     defineComponent?: {
         alias: string[];
+        autoReturnFunction?: boolean;
     };
     defineModel?: {
         alias: string[];

package/dist/options.d.ts

@@ -3,6 +3,7 @@ import { MarkRequired, BaseOptions } from '@vue-macros/common';
 type Options = BaseOptions & {
     defineComponent?: {
         alias: string[];
+        autoReturnFunction?: boolean;
     };
     defineModel?: {
         alias: string[];

package/dist/raw.cjs

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunk35H4MC4Ncjs = require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkUAWFIGPXcjs = require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 
-exports.default = _chunk35H4MC4Ncjs.raw_default;
+exports.default = _chunkUAWFIGPXcjs.raw_default;
 
 module.exports = exports.default;

package/dist/raw.js

@@ -1,7 +1,7 @@
 import {
   raw_default
-} from "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 export {
   raw_default as default

package/dist/rolldown.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 // src/rolldown.ts
-var rolldown_default = _chunkJWJVYLYIcjs.index_default.rolldown;
+var rolldown_default = _chunkL26STXZKcjs.index_default.rolldown;
 
 
 exports.default = rolldown_default;

package/dist/rolldown.js

@@ -1,8 +1,8 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 
 // src/rolldown.ts

package/dist/rollup.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 // src/rollup.ts
-var rollup_default = _chunkJWJVYLYIcjs.index_default.rollup;
+var rollup_default = _chunkL26STXZKcjs.index_default.rollup;
 
 
 exports.default = rollup_default;

package/dist/rollup.js

@@ -1,8 +1,8 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 
 // src/rollup.ts

package/dist/rspack.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkL26STXZKcjs = require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 // src/rspack.ts
-var rspack_default = _chunkJWJVYLYIcjs.index_default.rspack;
+var rspack_default = _chunkL26STXZKcjs.index_default.rspack;
 
 
 exports.default = rspack_default;

package/dist/rspack.js

@@ -1,8 +1,8 @@
 import {
   index_default
-} from "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 
 // src/rspack.ts

package/dist/vite.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkYCL7HGD4cjs = require('./chunk-YCL7HGD4.cjs');
-require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkKUKYWPEKcjs = require('./chunk-KUKYWPEK.cjs');
+require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 
-exports.default = _chunkYCL7HGD4cjs.vite_default;
+exports.default = _chunkKUKYWPEKcjs.vite_default;
 
 module.exports = exports.default;

package/dist/vite.js

@@ -1,9 +1,9 @@
 import {
   vite_default
-} from "./chunk-RC5ZHWIN.js";
-import "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-ZXJQCFZZ.js";
+import "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 export {
   vite_default as default

package/dist/webpack.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkNL4CWOW2cjs = require('./chunk-NL4CWOW2.cjs');
-require('./chunk-JWJVYLYI.cjs');
-require('./chunk-35H4MC4N.cjs');
-require('./chunk-LPH34H6O.cjs');
+var _chunkPWA6BBMQcjs = require('./chunk-PWA6BBMQ.cjs');
+require('./chunk-L26STXZK.cjs');
+require('./chunk-UAWFIGPX.cjs');
+require('./chunk-ZQ4GVJKX.cjs');
 require('./chunk-53TNKVYD.cjs');
 
 
-exports.default = _chunkNL4CWOW2cjs.webpack_default;
+exports.default = _chunkPWA6BBMQcjs.webpack_default;
 
 module.exports = exports.default;

package/dist/webpack.js

@@ -1,9 +1,9 @@
 import {
   webpack_default
-} from "./chunk-WZIZSQGW.js";
-import "./chunk-LVZNHMZC.js";
-import "./chunk-WOWB5VHY.js";
-import "./chunk-TWP2JCYQ.js";
+} from "./chunk-HBVQYNJJ.js";
+import "./chunk-AUE5EAQA.js";
+import "./chunk-E5WGUCGE.js";
+import "./chunk-SMWNQXL7.js";
 import "./chunk-DANY2WQD.js";
 export {
   webpack_default as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.1.8",
+  "version": "2.3.0",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -172,7 +172,7 @@
     "@vue/language-core": "^2.2.8",
     "hash-sum": "^2.0.0",
     "ts-macro": "^0.1.25",
-    "unplugin": "^1.16.1"
+    "unplugin": "^2.2.2"
   },
   "devDependencies": {
     "@babel/types": "^7.26.8",