feat: add Prop to main type declaration file [#6850]

types/index.d.ts

@@ -12,6 +12,7 @@ export {
  ComponentOptions,
  FunctionalComponentOptions,
  RenderContext,
+ PropType,
  PropOptions,
  ComputedOptions,
  WatchHandler,

types/options.d.ts

@@ -122,9 +122,11 @@ export interface RenderContext<Props=DefaultProps> {
  injections: any
 }
 
-export type Prop<T> = { (): T } | { new (...args: any[]): T & object }
+export type Prop<T> = { (): T } | { new(...args: any[]): T & object }
 
-export type PropValidator<T> = PropOptions<T> | Prop<T> | Prop<T>[];
+export type PropType<T> = Prop<T> | Prop<T>[];
+
+export type PropValidator<T> = PropOptions<T> | PropType<T>;
 
 export interface PropOptions<T=any> {
  type?: Prop<T> | Prop<T>[];

types/test/options-test.ts

@@ -1,4 +1,4 @@
-import Vue from "../index";
+import Vue, { PropType } from "../index";
 import { AsyncComponent, ComponentOptions, FunctionalComponentOptions } from "../index";
 import { CreateElement } from "../vue";
 
@@ -47,20 +47,36 @@ class Cat {
  private u: number
 }
 
+interface IUser {
+ foo: string,
+ bar: number
+}
+
+interface ICat {
+ foo: any,
+ bar: object
+}
+
 Vue.component('union-prop', {
  props: {
- primitive: [String, Number],
+ cat: Object as PropType<ICat>,
+ complexUnion: { type: [User, Number] as PropType<User | number> },
+ kittyUser: Object as PropType<ICat & IUser>,
+ mixed: [RegExp, Array],
  object: [Cat, User],
+ primitive: [String, Number],
  regex: RegExp,
- mixed: [RegExp, Array],
- union: [User, Number] as {new(): User | Number}[] // requires annotation
+ union: [User, Number] as PropType<User | number>
  },
  data() {
- this.primitive;
+ this.cat;
+ this.complexUnion;
+ this.kittyUser;
+ this.mixed;
  this.object;
- this.union;
+ this.primitive;
  this.regex.compile;
- this.mixed;
+ this.union;
  return {
  fixedSize: this.union,
  }