fix: Date infer string in props (#627)

vuejs · Jan 14, 2021 · b2acb2d · b2acb2d
1 parent 5301d49
commit b2acb2d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/component/componentProps.ts b/src/component/componentProps.ts
@@ -51,13 +51,15 @@ type InferPropType<T> = T extends null
       ? Record<string, any>
       : T extends BooleanConstructor | { type: BooleanConstructor }
         ? boolean
-        : T extends FunctionConstructor
-          ? Function
-          : T extends Prop<infer V, infer D>
-            ? unknown extends V
-              ? D
-              : ExtractCorrectPropType<V>
-            : T
+          : T extends DateConstructor | { type: DateConstructor}
+            ? Date
+              : T extends FunctionConstructor
+                ? Function
+                : T extends Prop<infer V, infer D>
+                  ? unknown extends V
+                    ? D
+                    : ExtractCorrectPropType<V>
+                  : T
 
 export type ExtractPropTypes<O> = O extends object
   ? { [K in RequiredKeys<O>]: InferPropType<O[K]> } &

diff --git a/test-dts/defineComponent.test-d.ts b/test-dts/defineComponent.test-d.ts
@@ -27,6 +27,7 @@ describe('with object props', () => {
     ggg: 'foo' | 'bar'
     ffff: (a: number, b: string) => { a: boolean }
     validated?: string
+    date: Date
   }
 
   type GT = string & { __brand: unknown }
@@ -96,6 +97,10 @@ describe('with object props', () => {
         // validator requires explicit annotation
         validator: (val: unknown) => val !== '',
       },
+      date: {
+        type: Date,
+        required: true,
+      },
     },
     setup(props) {
       // type assertion. See https://github.com/SamVerschueren/tsd
@@ -116,6 +121,7 @@ describe('with object props', () => {
       expectType<ExpectedProps['hhh']>(props.hhh)
       expectType<ExpectedProps['ffff']>(props.ffff)
       expectType<ExpectedProps['validated']>(props.validated)
+      expectType<ExpectedProps['date']>(props.date)
 
       isNotAnyOrUndefined(props.a)
       isNotAnyOrUndefined(props.b)