@vue-jsx-vapor/macros 2.1.5 → 2.1.7

package/dist/api.cjs

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

package/dist/api.js

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

package/dist/astro.cjs

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

package/dist/astro.js

@@ -1,9 +1,9 @@
 import {
   index_default
-} from "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 
 // src/astro.ts
 var astro_default = (options) => ({

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

@@ -5,10 +5,10 @@
 
 
 
-var _chunkJS6XU4SQcjs = require('./chunk-JS6XU4SQ.cjs');
+var _chunkLPH34H6Ocjs = require('./chunk-LPH34H6O.cjs');
 
 
-var _chunkUZ426MO6cjs = require('./chunk-UZ426MO6.cjs');
+var _chunk53TNKVYDcjs = require('./chunk-53TNKVYD.cjs');
 
 // src/raw.ts
 var _common = require('@vue-macros/common');
@@ -30,22 +30,22 @@ async function transformStyle(code, id, options) {
 // src/raw.ts
 var name = "@vue-jsx-vapor/macros";
 var plugin = (userOptions = {}) => {
-  const options = _chunkUZ426MO6cjs.resolveOptions.call(void 0, userOptions);
+  const options = _chunk53TNKVYDcjs.resolveOptions.call(void 0, userOptions);
   const filter = _common.createFilter.call(void 0, options);
   const importMap = /* @__PURE__ */ new Map();
   return {
     name,
     enforce: "pre",
     resolveId(id) {
-      if (_common.normalizePath.call(void 0, id).startsWith(_chunkJS6XU4SQcjs.helperPrefix)) return id;
+      if (_common.normalizePath.call(void 0, id).startsWith(_chunkLPH34H6Ocjs.helperPrefix)) return id;
     },
     loadInclude(id) {
-      return _common.normalizePath.call(void 0, id).startsWith(_chunkJS6XU4SQcjs.helperPrefix);
+      return _common.normalizePath.call(void 0, id).startsWith(_chunkLPH34H6Ocjs.helperPrefix);
     },
     load(_id) {
       const id = _common.normalizePath.call(void 0, _id);
-      if (id === _chunkJS6XU4SQcjs.useModelHelperId) return _chunkJS6XU4SQcjs.use_model_default;
-      else if (id === _chunkJS6XU4SQcjs.withDefaultsHelperId) return _chunkJS6XU4SQcjs.with_defaults_default;
+      if (id === _chunkLPH34H6Ocjs.useModelHelperId) return _chunkLPH34H6Ocjs.use_model_default;
+      else if (id === _chunkLPH34H6Ocjs.withDefaultsHelperId) return _chunkLPH34H6Ocjs.with_defaults_default;
       else if (importMap.get(id)) return importMap.get(id);
     },
     transformInclude(id) {
@@ -54,7 +54,7 @@ var plugin = (userOptions = {}) => {
     },
     transform(code, id) {
       if (importMap.get(id)) return transformStyle(code, id, options);
-      return _chunkJS6XU4SQcjs.transformJsxMacros.call(void 0, code, id, importMap, options);
+      return _chunkLPH34H6Ocjs.transformJsxMacros.call(void 0, code, id, importMap, options);
     }
   };
 };

package/dist/{chunk-UZ426MO6.cjs → chunk-53TNKVYD.cjs}

@@ -3,17 +3,14 @@
 
 
 
-
 var _common = require('@vue-macros/common');
 function resolveOptions(options) {
-  const version = options.version || _common.detectVueVersion.call(void 0, );
-  const lib = options.lib || "vue/vapor";
+  const version = options.version || 3.6;
   return {
     include: [_common.REGEX_SRC_FILE],
     exclude: [_common.REGEX_SETUP_SFC, _common.REGEX_NODE_MODULES],
     ...options,
     version,
-    lib,
     defineComponent: {
       alias: _nullishCoalesce(_optionalChain([options, 'optionalAccess', _ => _.defineComponent, 'optionalAccess', _2 => _2.alias]), () => ( [
         "defineComponent",

package/dist/{chunk-ZXRSELD6.js → chunk-DANY2WQD.js}

@@ -1,19 +1,16 @@
 // src/options.ts
 import {
-  detectVueVersion,
   REGEX_NODE_MODULES,
   REGEX_SETUP_SFC,
   REGEX_SRC_FILE
 } from "@vue-macros/common";
 function resolveOptions(options) {
-  const version = options.version || detectVueVersion();
-  const lib = options.lib || "vue/vapor";
+  const version = options.version || 3.6;
   return {
     include: [REGEX_SRC_FILE],
     exclude: [REGEX_SETUP_SFC, REGEX_NODE_MODULES],
     ...options,
     version,
-    lib,
     defineComponent: {
       alias: options?.defineComponent?.alias ?? [
         "defineComponent",

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

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

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

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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; }// src/core/helper/use-model.ts?raw
-var use_model_default = 'import { customRef, watchSyncEffect } from "vue";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === "function") emit(emittedValue);\n        }\n      }\n    };\n  });\n  const modifiers = name === "modelValue" ? props.modelModifiers : props[`${name}Modifiers`];\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return { value: i++ ? modifiers || {} : res, done: false };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n';
+var use_model_default = 'import { customRef, watchSyncEffect } from "vue";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === "function") emit(emittedValue);\n        }\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n';
 
 // src/core/helper/with-defaults.ts?raw
 var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of [\n    .../* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])\n  ]) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
@@ -49,6 +49,7 @@ function restructure(s, node, options = {}) {
         s,
         0,
         "createPropsDefaultProxy",
+        void 0,
         _nullishCoalesce(options.withDefaultsFrom, () => ( withDefaultsHelperId))
       );
       const resolvedPath = path.replace(
@@ -73,8 +74,7 @@ const ${path} = ${createPropsDefaultProxy}(${resolvedPath}, {${resolvedValues}})
 const ${rest.name} = ${_common.importHelperFn.call(void 0, 
           s,
           0,
-          "createPropsRestProxy",
-          "vue"
+          "createPropsRestProxy"
         )}(${rest.path}, [${rest.value}])`))
       );
     }
@@ -227,8 +227,7 @@ function processAwait(s, node, needSemi, isStatement) {
   ([__temp,__restore] = ${_common.importHelperFn.call(void 0, 
       s,
       0,
-      `withAsyncContext`,
-      "vue"
+      `withAsyncContext`
     )}(${containsNestedAwait ? `async ` : ``}() => `
   );
   s.appendLeft(
@@ -246,7 +245,7 @@ function transformDefineComponent(root, propsName, map, s) {
   if (!map.defineComponent) return;
   const defineComponentName = s.sliceNode(map.defineComponent.callee);
   if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) {
-    _common.importHelperFn.call(void 0, s, 0, "defineComponent", "vue", false, defineComponentName);
+    _common.importHelperFn.call(void 0, s, 0, "defineComponent", defineComponentName);
   }
   let hasRestProp = false;
   const props = {};
@@ -258,7 +257,7 @@ function transformDefineComponent(root, propsName, map, s) {
         generateRestProps: (restPropsName, index, list) => {
           if (index === list.length - 1) {
             hasRestProp = true;
-            const useAttrs = _common.importHelperFn.call(void 0, s, 0, "useAttrs", "vue");
+            const useAttrs = _common.importHelperFn.call(void 0, s, 0, "useAttrs");
             return `const ${restPropsName} = ${useAttrs}()`;
           }
         }
@@ -325,11 +324,11 @@ function getWalkedIds(root, propsName) {
 
 // src/core/define-expose.ts
 
-function transformDefineExpose(node, s, lib) {
+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,
-    lib.includes("vapor") ? `${_common.importHelperFn.call(void 0, s, 0, "currentInstance", "vue")}.exposed = ` : `${_common.importHelperFn.call(void 0, s, 0, "getCurrentInstance", "vue")}().exposed = `
+    version >= 3.6 ? `${_common.importHelperFn.call(void 0, s, 0, "currentInstance")}.exposed = ` : `${_common.importHelperFn.call(void 0, s, 0, "getCurrentInstance")}().exposed = `
   );
 }
 
@@ -338,7 +337,7 @@ function transformDefineExpose(node, s, lib) {
 function transformDefineModel(node, propsName, s) {
   s.overwriteNode(
     node.callee,
-    _common.importHelperFn.call(void 0, s, 0, "useModel", useModelHelperId)
+    _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,
@@ -348,13 +347,13 @@ function transformDefineModel(node, propsName, s) {
 
 // src/core/define-slots.ts
 
-function transformDefineSlots(node, propsName, s, lib) {
+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,
     `Object.assign`
   );
-  const slots = lib.includes("vue") ? `${_common.importHelperFn.call(void 0, s, 0, "useSlots", "vue")}()` : `${propsName}.vSlots`;
+  const slots = `${_common.importHelperFn.call(void 0, s, 0, "useSlots")}()`;
   s.appendLeft(node.end - 1, `${node.arguments[0] ? "," : "{}, "}${slots}`);
 }
 
@@ -472,10 +471,10 @@ function transformJsxMacros(code, id, importMap, options) {
       });
     }
     if (map.defineSlots) {
-      transformDefineSlots(map.defineSlots, propsName, s, options.lib);
+      transformDefineSlots(map.defineSlots, s);
     }
     if (map.defineExpose) {
-      transformDefineExpose(map.defineExpose, s, options.lib);
+      transformDefineExpose(map.defineExpose, s, options.version);
     }
   }
   return _common.generateTransform.call(void 0, s, id);

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

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

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

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

package/dist/{chunk-75S7E24B.js → chunk-RC5ZHWIN.js}

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

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

@@ -1,5 +1,5 @@
 // src/core/helper/use-model.ts?raw
-var use_model_default = 'import { customRef, watchSyncEffect } from "vue";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === "function") emit(emittedValue);\n        }\n      }\n    };\n  });\n  const modifiers = name === "modelValue" ? props.modelModifiers : props[`${name}Modifiers`];\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return { value: i++ ? modifiers || {} : res, done: false };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n';
+var use_model_default = 'import { customRef, watchSyncEffect } from "vue";\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevEmittedValue;\n    watchSyncEffect(() => {\n      const propValue = props[name];\n      if (!Object.is(prevEmittedValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        if (Object.is(value, localValue)) return;\n        localValue = value;\n        trigger();\n        const emittedValue = prevEmittedValue = options.set ? options.set(value) : value;\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === "function") emit(emittedValue);\n        }\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n';
 
 // src/core/helper/with-defaults.ts?raw
 var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of [\n    .../* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])\n  ]) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
@@ -49,6 +49,7 @@ function restructure(s, node, options = {}) {
         s,
         0,
         "createPropsDefaultProxy",
+        void 0,
         options.withDefaultsFrom ?? withDefaultsHelperId
       );
       const resolvedPath = path.replace(
@@ -73,8 +74,7 @@ const ${path} = ${createPropsDefaultProxy}(${resolvedPath}, {${resolvedValues}})
 const ${rest.name} = ${importHelperFn(
           s,
           0,
-          "createPropsRestProxy",
-          "vue"
+          "createPropsRestProxy"
         )}(${rest.path}, [${rest.value}])`
       );
     }
@@ -227,8 +227,7 @@ function processAwait(s, node, needSemi, isStatement) {
   ([__temp,__restore] = ${importHelperFn2(
       s,
       0,
-      `withAsyncContext`,
-      "vue"
+      `withAsyncContext`
     )}(${containsNestedAwait ? `async ` : ``}() => `
   );
   s.appendLeft(
@@ -246,7 +245,7 @@ function transformDefineComponent(root, propsName, map, s) {
   if (!map.defineComponent) return;
   const defineComponentName = s.sliceNode(map.defineComponent.callee);
   if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) {
-    importHelperFn3(s, 0, "defineComponent", "vue", false, defineComponentName);
+    importHelperFn3(s, 0, "defineComponent", defineComponentName);
   }
   let hasRestProp = false;
   const props = {};
@@ -258,7 +257,7 @@ function transformDefineComponent(root, propsName, map, s) {
         generateRestProps: (restPropsName, index, list) => {
           if (index === list.length - 1) {
             hasRestProp = true;
-            const useAttrs = importHelperFn3(s, 0, "useAttrs", "vue");
+            const useAttrs = importHelperFn3(s, 0, "useAttrs");
             return `const ${restPropsName} = ${useAttrs}()`;
           }
         }
@@ -325,11 +324,11 @@ function getWalkedIds(root, propsName) {
 
 // src/core/define-expose.ts
 import { importHelperFn as importHelperFn4 } from "@vue-macros/common";
-function transformDefineExpose(node, s, lib) {
+function transformDefineExpose(node, s, version) {
   s.overwriteNode(node.callee, ";");
   s.appendRight(
     node.arguments[0]?.start || node.end - 1,
-    lib.includes("vapor") ? `${importHelperFn4(s, 0, "currentInstance", "vue")}.exposed = ` : `${importHelperFn4(s, 0, "getCurrentInstance", "vue")}().exposed = `
+    version >= 3.6 ? `${importHelperFn4(s, 0, "currentInstance")}.exposed = ` : `${importHelperFn4(s, 0, "getCurrentInstance")}().exposed = `
   );
 }
 
@@ -338,7 +337,7 @@ import { importHelperFn as importHelperFn5 } from "@vue-macros/common";
 function transformDefineModel(node, propsName, s) {
   s.overwriteNode(
     node.callee,
-    importHelperFn5(s, 0, "useModel", useModelHelperId)
+    importHelperFn5(s, 0, "useModel", void 0, useModelHelperId)
   );
   s.appendRight(
     node.arguments[0]?.start || node.end - 1,
@@ -348,13 +347,13 @@ function transformDefineModel(node, propsName, s) {
 
 // src/core/define-slots.ts
 import { importHelperFn as importHelperFn6 } from "@vue-macros/common";
-function transformDefineSlots(node, propsName, s, lib) {
+function transformDefineSlots(node, s) {
   s.overwrite(
     node.start,
     node.arguments[0]?.start && node.arguments[0].start - 1 || node.typeArguments?.end || node.callee.end,
     `Object.assign`
   );
-  const slots = lib.includes("vue") ? `${importHelperFn6(s, 0, "useSlots", "vue")}()` : `${propsName}.vSlots`;
+  const slots = `${importHelperFn6(s, 0, "useSlots")}()`;
   s.appendLeft(node.end - 1, `${node.arguments[0] ? "," : "{}, "}${slots}`);
 }
 
@@ -472,10 +471,10 @@ function transformJsxMacros(code, id, importMap, options) {
       });
     }
     if (map.defineSlots) {
-      transformDefineSlots(map.defineSlots, propsName, s, options.lib);
+      transformDefineSlots(map.defineSlots, s);
     }
     if (map.defineExpose) {
-      transformDefineExpose(map.defineExpose, s, options.lib);
+      transformDefineExpose(map.defineExpose, s, options.version);
     }
   }
   return generateTransform(s, id);

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

@@ -5,10 +5,10 @@ import {
   use_model_default,
   withDefaultsHelperId,
   with_defaults_default
-} from "./chunk-JKT6AV5O.js";
+} from "./chunk-TWP2JCYQ.js";
 import {
   resolveOptions
-} from "./chunk-ZXRSELD6.js";
+} from "./chunk-DANY2WQD.js";
 
 // src/raw.ts
 import { createFilter, normalizePath } from "@vue-macros/common";

package/dist/{chunk-3PWNZD2U.js → chunk-WZIZSQGW.js}

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

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

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

package/dist/esbuild.cjs

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

package/dist/esbuild.js

@@ -1,9 +1,9 @@
 import {
   index_default
-} from "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 
 // src/esbuild.ts
 var esbuild_default = index_default.esbuild;

package/dist/index.cjs

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

package/dist/index.js

@@ -1,11 +1,11 @@
 import {
   index_default
-} from "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
+} from "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
 import {
   resolveOptions
-} from "./chunk-ZXRSELD6.js";
+} from "./chunk-DANY2WQD.js";
 export {
   index_default as default,
   resolveOptions

package/dist/nuxt.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkKHR56IGIcjs = require('./chunk-KHR56IGI.cjs');
+var _chunkYCL7HGD4cjs = require('./chunk-YCL7HGD4.cjs');
 
 
-var _chunkWWH3HXFCcjs = require('./chunk-WWH3HXFC.cjs');
-require('./chunk-YRPLEEOM.cjs');
-require('./chunk-Y5EBYHAU.cjs');
-require('./chunk-JS6XU4SQ.cjs');
-require('./chunk-UZ426MO6.cjs');
+var _chunkNL4CWOW2cjs = require('./chunk-NL4CWOW2.cjs');
+require('./chunk-JWJVYLYI.cjs');
+require('./chunk-35H4MC4N.cjs');
+require('./chunk-LPH34H6O.cjs');
+require('./chunk-53TNKVYD.cjs');
 
 // src/nuxt.ts
 var _kit = require('@nuxt/kit');
@@ -18,8 +18,8 @@ var nuxt_default = _kit.defineNuxtModule.call(void 0, {
     configKey: "unpluginStarter"
   },
   setup(options) {
-    _kit.addVitePlugin.call(void 0, () => _chunkKHR56IGIcjs.vite_default.call(void 0, options));
-    _kit.addWebpackPlugin.call(void 0, () => _chunkWWH3HXFCcjs.webpack_default.call(void 0, 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));
   }
 });
 

package/dist/nuxt.js

@@ -1,13 +1,13 @@
 import {
   vite_default
-} from "./chunk-75S7E24B.js";
+} from "./chunk-RC5ZHWIN.js";
 import {
   webpack_default
-} from "./chunk-3PWNZD2U.js";
-import "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-WZIZSQGW.js";
+import "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 
 // src/nuxt.ts
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";

package/dist/options.cjs

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkUZ426MO6cjs = require('./chunk-UZ426MO6.cjs');
+var _chunk53TNKVYDcjs = require('./chunk-53TNKVYD.cjs');
 
 
-exports.resolveOptions = _chunkUZ426MO6cjs.resolveOptions;
+exports.resolveOptions = _chunk53TNKVYDcjs.resolveOptions;

package/dist/options.d.cts

@@ -1,7 +1,6 @@
 import { MarkRequired, BaseOptions } from '@vue-macros/common';
 
 type Options = BaseOptions & {
-    lib?: 'vue' | 'vue/vapor' | (string & {});
     defineComponent?: {
         alias: string[];
     };
@@ -18,7 +17,7 @@ type Options = BaseOptions & {
         alias: string[];
     };
 };
-type OptionsResolved = MarkRequired<Options, 'include' | 'version' | 'lib' | 'defineComponent' | 'defineModel' | 'defineExpose' | 'defineSlots' | 'defineStyle'>;
+type OptionsResolved = MarkRequired<Options, 'include' | 'version' | 'defineComponent' | 'defineModel' | 'defineExpose' | 'defineSlots' | 'defineStyle'>;
 declare function resolveOptions(options: Options): OptionsResolved;
 
 export { type Options, type OptionsResolved, resolveOptions };

package/dist/options.d.ts

@@ -1,7 +1,6 @@
 import { MarkRequired, BaseOptions } from '@vue-macros/common';
 
 type Options = BaseOptions & {
-    lib?: 'vue' | 'vue/vapor' | (string & {});
     defineComponent?: {
         alias: string[];
     };
@@ -18,7 +17,7 @@ type Options = BaseOptions & {
         alias: string[];
     };
 };
-type OptionsResolved = MarkRequired<Options, 'include' | 'version' | 'lib' | 'defineComponent' | 'defineModel' | 'defineExpose' | 'defineSlots' | 'defineStyle'>;
+type OptionsResolved = MarkRequired<Options, 'include' | 'version' | 'defineComponent' | 'defineModel' | 'defineExpose' | 'defineSlots' | 'defineStyle'>;
 declare function resolveOptions(options: Options): OptionsResolved;
 
 export { type Options, type OptionsResolved, resolveOptions };

package/dist/options.js

@@ -1,6 +1,6 @@
 import {
   resolveOptions
-} from "./chunk-ZXRSELD6.js";
+} from "./chunk-DANY2WQD.js";
 export {
   resolveOptions
 };

package/dist/raw.cjs

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

package/dist/raw.js

@@ -1,8 +1,8 @@
 import {
   raw_default
-} from "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.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 _chunkYRPLEEOMcjs = require('./chunk-YRPLEEOM.cjs');
-require('./chunk-Y5EBYHAU.cjs');
-require('./chunk-JS6XU4SQ.cjs');
-require('./chunk-UZ426MO6.cjs');
+var _chunkJWJVYLYIcjs = require('./chunk-JWJVYLYI.cjs');
+require('./chunk-35H4MC4N.cjs');
+require('./chunk-LPH34H6O.cjs');
+require('./chunk-53TNKVYD.cjs');
 
 // src/rolldown.ts
-var rolldown_default = _chunkYRPLEEOMcjs.index_default.rolldown;
+var rolldown_default = _chunkJWJVYLYIcjs.index_default.rolldown;
 
 
 exports.default = rolldown_default;

package/dist/rolldown.js

@@ -1,9 +1,9 @@
 import {
   index_default
-} from "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 
 // src/rolldown.ts
 var rolldown_default = index_default.rolldown;

package/dist/rollup.cjs

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

package/dist/rollup.js

@@ -1,9 +1,9 @@
 import {
   index_default
-} from "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 
 // src/rollup.ts
 var rollup_default = index_default.rollup;

package/dist/rspack.cjs

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

package/dist/rspack.js

@@ -1,9 +1,9 @@
 import {
   index_default
-} from "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 
 // src/rspack.ts
 var rspack_default = index_default.rspack;

package/dist/vite.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkKHR56IGIcjs = require('./chunk-KHR56IGI.cjs');
-require('./chunk-YRPLEEOM.cjs');
-require('./chunk-Y5EBYHAU.cjs');
-require('./chunk-JS6XU4SQ.cjs');
-require('./chunk-UZ426MO6.cjs');
+var _chunkYCL7HGD4cjs = require('./chunk-YCL7HGD4.cjs');
+require('./chunk-JWJVYLYI.cjs');
+require('./chunk-35H4MC4N.cjs');
+require('./chunk-LPH34H6O.cjs');
+require('./chunk-53TNKVYD.cjs');
 
 
-exports.default = _chunkKHR56IGIcjs.vite_default;
+exports.default = _chunkYCL7HGD4cjs.vite_default;
 
 module.exports = exports.default;

package/dist/vite.js

@@ -1,10 +1,10 @@
 import {
   vite_default
-} from "./chunk-75S7E24B.js";
-import "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-RC5ZHWIN.js";
+import "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.js";
+import "./chunk-DANY2WQD.js";
 export {
   vite_default as default
 };

package/dist/volar.cjs

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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 _chunkUZ426MO6cjs = require('./chunk-UZ426MO6.cjs');
+var _chunk53TNKVYDcjs = require('./chunk-53TNKVYD.cjs');
 
 // src/volar.ts
 var _common = require('@vue-macros/common');
@@ -118,15 +118,16 @@ function transformJsxMacros(rootMap, options) {
     )]);
     if (asyncModifier && map.defineComponent)
       _tsmacro.replaceRange.call(void 0, codes, asyncModifier.pos, asyncModifier.end);
-    const result = `({}) as __VLS_PickNotAny<Awaited<ReturnType<typeof ${_common.HELPER_PREFIX}setup>>['render'], {}> & { __ctx: Awaited<ReturnType<typeof ${_common.HELPER_PREFIX}setup>> }`;
+    const result = `({}) as __VLS_PickNotAny<typeof ${_common.HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${_common.HELPER_PREFIX}ctx }`;
     const propsType = _optionalChain([root, 'access', _8 => _8.parameters, 'access', _9 => _9[0], 'optionalAccess', _10 => _10.type]) ? String(root.parameters[0].type.getText(ast)) : "{}";
     _tsmacro.replaceRange.call(void 0, 
       codes,
       root.parameters.pos,
       root.parameters.pos,
       ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "",
-      `${_common.HELPER_PREFIX}props: Awaited<ReturnType<typeof ${_common.HELPER_PREFIX}setup>>['props'] & ${propsType}, `,
+      `${_common.HELPER_PREFIX}props: typeof ${_common.HELPER_PREFIX}ctx.props & ${propsType}, `,
       `${_common.HELPER_PREFIX}placeholder?: {}, `,
+      `${_common.HELPER_PREFIX}ctx = {} as Awaited<ReturnType<typeof ${_common.HELPER_PREFIX}setup>>, `,
       `${_common.HELPER_PREFIX}setup = (${asyncModifier ? "async" : ""}(`
     );
     if (ts.isArrowFunction(root)) {
@@ -166,7 +167,7 @@ props: {} as { ${props.join(", ")} }`,
           `,
 slots: {} as ${_nullishCoalesce(map.defineSlots, () => ( "{}"))}`,
           `,
-expose: (exposed: ${options.lib === "vue" ? `import('vue').ShallowUnwrapRef` : "NonNullable"}<${_nullishCoalesce(map.defineExpose, () => ( "{}"))}>) => {}`,
+expose: (exposed: import('vue').ShallowUnwrapRef<${_nullishCoalesce(map.defineExpose, () => ( "{}"))}>) => {}`,
           `,
 render: `,
           shouldWrapByCall ? "(" : ""
@@ -321,17 +322,23 @@ function getRootMap(options) {
       }
       const id = toValidAssetId(modelName, `${_common.HELPER_PREFIX}model`);
       const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
-      (rootMap.get(root).defineModel ??= []).push(
+      const defineModel = rootMap.get(root).defineModel ??= [];
+      defineModel.push(
         `${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`,
         `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`
       );
+      if (_optionalChain([expression, 'access', _11 => _11.typeArguments, 'optionalAccess', _12 => _12[1]])) {
+        defineModel.push(
+          `${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`
+        );
+      }
       _tsmacro.replaceRange.call(void 0, 
         codes,
         initializer.getStart(ast),
         initializer.getStart(ast),
         `// @ts-ignore
 ${id};
-let ${id} =`
+let ${id} = `
       );
     } else if (options.defineSlots.alias.includes(macroName)) {
       _tsmacro.replaceRange.call(void 0, 
@@ -367,7 +374,7 @@ function toValidAssetId(name, type) {
 // src/volar.ts
 var plugin = _tsmacro.createPlugin.call(void 0, 
   ({ ts }, userOptions = {}) => {
-    const resolvedOptions = _chunkUZ426MO6cjs.resolveOptions.call(void 0, userOptions);
+    const resolvedOptions = _chunk53TNKVYDcjs.resolveOptions.call(void 0, userOptions);
     const filter = _common.createFilter.call(void 0, resolvedOptions);
     return {
       name: "@vue-jsx-vapor/macros",

package/dist/volar.js

@@ -1,6 +1,6 @@
 import {
   resolveOptions
-} from "./chunk-ZXRSELD6.js";
+} from "./chunk-DANY2WQD.js";
 
 // src/volar.ts
 import { createFilter } from "@vue-macros/common";
@@ -118,15 +118,16 @@ function transformJsxMacros(rootMap, options) {
     );
     if (asyncModifier && map.defineComponent)
       replaceRange3(codes, asyncModifier.pos, asyncModifier.end);
-    const result = `({}) as __VLS_PickNotAny<Awaited<ReturnType<typeof ${HELPER_PREFIX2}setup>>['render'], {}> & { __ctx: Awaited<ReturnType<typeof ${HELPER_PREFIX2}setup>> }`;
+    const result = `({}) as __VLS_PickNotAny<typeof ${HELPER_PREFIX2}ctx.render, {}> & { __ctx: typeof ${HELPER_PREFIX2}ctx }`;
     const propsType = root.parameters[0]?.type ? String(root.parameters[0].type.getText(ast)) : "{}";
     replaceRange3(
       codes,
       root.parameters.pos,
       root.parameters.pos,
       ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "",
-      `${HELPER_PREFIX2}props: Awaited<ReturnType<typeof ${HELPER_PREFIX2}setup>>['props'] & ${propsType}, `,
+      `${HELPER_PREFIX2}props: typeof ${HELPER_PREFIX2}ctx.props & ${propsType}, `,
       `${HELPER_PREFIX2}placeholder?: {}, `,
+      `${HELPER_PREFIX2}ctx = {} as Awaited<ReturnType<typeof ${HELPER_PREFIX2}setup>>, `,
       `${HELPER_PREFIX2}setup = (${asyncModifier ? "async" : ""}(`
     );
     if (ts.isArrowFunction(root)) {
@@ -166,7 +167,7 @@ props: {} as { ${props.join(", ")} }`,
           `,
 slots: {} as ${map.defineSlots ?? "{}"}`,
           `,
-expose: (exposed: ${options.lib === "vue" ? `import('vue').ShallowUnwrapRef` : "NonNullable"}<${map.defineExpose ?? "{}"}>) => {}`,
+expose: (exposed: import('vue').ShallowUnwrapRef<${map.defineExpose ?? "{}"}>) => {}`,
           `,
 render: `,
           shouldWrapByCall ? "(" : ""
@@ -321,17 +322,23 @@ function getRootMap(options) {
       }
       const id = toValidAssetId(modelName, `${HELPER_PREFIX4}model`);
       const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
-      (rootMap.get(root).defineModel ??= []).push(
+      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>>`
+        );
+      }
       replaceRange4(
         codes,
         initializer.getStart(ast),
         initializer.getStart(ast),
         `// @ts-ignore
 ${id};
-let ${id} =`
+let ${id} = `
       );
     } else if (options.defineSlots.alias.includes(macroName)) {
       replaceRange4(

package/dist/webpack.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkWWH3HXFCcjs = require('./chunk-WWH3HXFC.cjs');
-require('./chunk-YRPLEEOM.cjs');
-require('./chunk-Y5EBYHAU.cjs');
-require('./chunk-JS6XU4SQ.cjs');
-require('./chunk-UZ426MO6.cjs');
+var _chunkNL4CWOW2cjs = require('./chunk-NL4CWOW2.cjs');
+require('./chunk-JWJVYLYI.cjs');
+require('./chunk-35H4MC4N.cjs');
+require('./chunk-LPH34H6O.cjs');
+require('./chunk-53TNKVYD.cjs');
 
 
-exports.default = _chunkWWH3HXFCcjs.webpack_default;
+exports.default = _chunkNL4CWOW2cjs.webpack_default;
 
 module.exports = exports.default;

package/dist/webpack.js

@@ -1,10 +1,10 @@
 import {
   webpack_default
-} from "./chunk-3PWNZD2U.js";
-import "./chunk-LLVVZVJJ.js";
-import "./chunk-IN7QS6NY.js";
-import "./chunk-JKT6AV5O.js";
-import "./chunk-ZXRSELD6.js";
+} from "./chunk-WZIZSQGW.js";
+import "./chunk-LVZNHMZC.js";
+import "./chunk-WOWB5VHY.js";
+import "./chunk-TWP2JCYQ.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.5",
+  "version": "2.1.7",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -167,8 +167,8 @@
     }
   },
   "dependencies": {
-    "@vue-macros/common": "3.0.0-beta.4",
-    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@eeab9c4",
+    "@vue-macros/common": "^3.0.0-beta.7",
+    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@b43f4f5",
     "@vue/language-core": "^2.2.8",
     "hash-sum": "^2.0.0",
     "ts-macro": "^0.1.25",
@@ -179,8 +179,8 @@
     "@nuxt/kit": "^3.16.0",
     "@nuxt/schema": "^3.16.0",
     "@types/hash-sum": "^1.0.2",
-    "@vue-macros/test-utils": "3.0.0-beta.4",
-    "vue": "https://pkg.pr.new/vue@eeab9c4"
+    "@vue-macros/test-utils": "^3.0.0-beta.7",
+    "vue": "https://pkg.pr.new/vue@b43f4f5"
   },
   "scripts": {
     "build": "tsup",