reapply vuejs#352 and fix test

sapphi-red · Jun 11, 2020 · d001ad9 · d001ad9
1 parent 0792f18
commit d001ad9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/component/componentProps.ts b/src/component/componentProps.ts
@@ -34,6 +34,16 @@ type RequiredKeys<T, MakeDefaultRequired> = {
 
 type OptionalKeys<T, MakeDefaultRequired> = Exclude<keyof T, RequiredKeys<T, MakeDefaultRequired>>;
 
+type ExtractFunctionPropType<
+  T extends Function,
+  TArgs extends Array<any> = any[],
+  TResult = any
+> = T extends (...args: TArgs) => TResult ? T : never;
+
+type ExtractCorrectPropType<T> = T extends Function
+  ? ExtractFunctionPropType<T>
+  : Exclude<T, Function>;
+
 // prettier-ignore
 type InferPropType<T> = T extends null
   ? any // null & true would fail to infer
@@ -43,7 +53,8 @@ type InferPropType<T> = T extends null
       ? { [key: string]: any }
       : T extends BooleanConstructor | { type: BooleanConstructor }
         ? boolean
-        : T extends Prop<infer V> ? V : T;
+        : T extends Prop<infer V>
+          ? ExtractCorrectPropType<V> : T;
 
 export type ExtractPropTypes<O, MakeDefaultRequired extends boolean = true> = O extends object
   ? { [K in RequiredKeys<O, MakeDefaultRequired>]: InferPropType<O[K]> } &

diff --git a/test/types/defineComponent.spec.ts b/test/types/defineComponent.spec.ts
@@ -122,7 +122,7 @@ describe('defineComponent', () => {
       },
       setup(props) {
         type PropsType = typeof props;
-        isSubType<{ user?: User }, PropsType>(true);
+        isSubType<{ user?: User; func?: () => boolean; userFunc?: (u: User) => User }, PropsType>(true);
         isSubType<PropsType, { user?: User; func?: () => boolean; userFunc?: (u: User) => User }>(
           true
         );