fix

so1ve · Jul 7, 2023 · 8e0ed7e · 8e0ed7e
1 parent fb4c5ca
commit 8e0ed7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts
@@ -671,9 +671,9 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
  generateConstNameOption();
 
  if (scriptSetupRanges?.slotsTypeArg && sfc.scriptSetup) {
- codes.push(`var __VLS_slots!: `);
+ codes.push(`var __VLS_slots!: __VLS_NormalizeSlots<`);
  addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.slotsTypeArg.start, scriptSetupRanges.slotsTypeArg.end);
- codes.push(';\n');
+ codes.push('>;\n');
  };
 
  codes.push(`function __VLS_template() {\n`);

diff --git a/packages/vue-language-core/src/utils/globalTypes.ts b/packages/vue-language-core/src/utils/globalTypes.ts
@@ -110,6 +110,9 @@ declare function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K
  T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 >;
 type __VLS_AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
+type __VLS_NormalizeSlots<T> = {
+ [K in keyof T]: T[K] extends () => any ? (arg: any) => ReturnType<T[K]> : T[K]
+}
 
 declare function __VLS_componentProps<T, K>(comp: T, fnReturn: K):
  __VLS_PickNotAny<K, {}> extends { __ctx: { props: infer P } } ? NonNullable<P>