fix(volar): support defineSlots for the latest Volar

vue-macros · May 24, 2023 · dd3ea8d · dd3ea8d
1 parent 76322d6
commit dd3ea8d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.changeset/unlucky-pots-thank.md b/.changeset/unlucky-pots-thank.md
@@ -0,0 +1,5 @@
+---
+'@vue-macros/volar': patch
+---
+
+support `defineSlots` for the latest Volar
diff --git a/packages/volar/src/define-slots.ts b/packages/volar/src/define-slots.ts
@@ -28,8 +28,8 @@ const transform = ({
 
   replace(
     embeddedFile.content,
-    'return __VLS_slots',
-    `return __VLS_slots as __VLS_DefineSlots<`,
+    /var __VLS_slots!: .*/,
+    'var __VLS_slots!: __VLS_DefineSlots<',
     (): Segment<FileRangeCapabilities> => [
       // slots type
       sfc.scriptSetup!.content.slice(typeArg.pos, typeArg.end),
@@ -40,7 +40,7 @@ const transform = ({
     '>'
   )
   embeddedFile.content.push(
-    `type __VLS_DefineSlots<T> = { [SlotName in keyof T]: (_: T[SlotName]) => any }`
+    `type __VLS_DefineSlots<T> = { [SlotName in keyof T]: T[SlotName] extends Function ? T[SlotName] : (_: T[SlotName]) => any }`
   )
 }
 

diff --git a/playground/vue3/src/examples/define-slots/child.vue b/playground/vue3/src/examples/define-slots/child.vue
@@ -3,16 +3,13 @@ interface Slots {
   title: {
     foo: 'foo' | boolean
   }
-  default: {
-    bar: 'bar' | number
-  }
+  default: (scope: { bar: 'bar' | number }) => any
 }
-defineSlots<Slots & { title: never }>()
+defineSlots<Slots>()
 </script>
 
 <template>
   <div>defineSlots</div>
-  <div>
-    <slot name="title" foo="bar">title</slot>
-  </div>
+  <slot name="title" foo="foo">title</slot>
+  <slot name="default" bar="bar">title</slot>
 </template>