@vue-jsx-vapor/macros 2.1.6 → 2.1.7

package/dist/volar.cjs

@@ -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)) {

package/dist/volar.js

@@ -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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.1.6",
+  "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.6",
-    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@3e7464f",
+    "@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.6",
-    "vue": "https://pkg.pr.new/vue@3e7464f"
+    "@vue-macros/test-utils": "^3.0.0-beta.7",
+    "vue": "https://pkg.pr.new/vue@b43f4f5"
   },
   "scripts": {
     "build": "tsup",