types(runtime-core): fix for multiple possible prop types including Date

vuejs · Sep 5, 2021 · 2759113 · 2759113
1 parent 3ad9dc4
commit 2759113
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
@@ -109,6 +109,10 @@ type InferPropType<T> = [T] extends [null]
   ? boolean
   : [T] extends [DateConstructor | { type: DateConstructor }]
   ? Date
+  : [T] extends [
+      (DateConstructor | infer U)[] | { type: (DateConstructor | infer U)[] }
+    ]
+  ? Date | InferPropType<U>
   : [T] extends [Prop<infer V, infer D>]
   ? unknown extends V
     ? D

diff --git a/test-dts/defineComponent.test-d.tsx b/test-dts/defineComponent.test-d.tsx
@@ -42,6 +42,8 @@ describe('with object props', () => {
     kkk?: any
     validated?: string
     date?: Date
+    l?: Date
+    ll?: Date | number
   }
 
   type GT = string & { __brand: unknown }
@@ -131,7 +133,9 @@ describe('with object props', () => {
         // validator requires explicit annotation
         validator: (val: unknown) => val !== ''
       },
-      date: Date
+      date: Date,
+      l: [Date],
+      ll: [Date, Number]
     },
     setup(props) {
       // type assertion. See https://github.com/SamVerschueren/tsd
@@ -164,6 +168,8 @@ describe('with object props', () => {
       expectType<ExpectedProps['kkk']>(props.kkk)
       expectType<ExpectedProps['validated']>(props.validated)
       expectType<ExpectedProps['date']>(props.date)
+      expectType<ExpectedProps['l']>(props.l)
+      expectType<ExpectedProps['ll']>(props.ll)
 
       // @ts-expect-error props should be readonly
       expectError((props.a = 1))