update types for new features

yyx990803 · yyx990803 · commit 73c5614740be · 2017-02-21T22:35:50.000-05:00
diff --git a/flow/component.js b/flow/component.js
@@ -69,6 +69,7 @@ declare interface Component {
   _vnode: ?VNode;
   _staticTrees: ?Array<VNode>;
   _hasHookEvent: boolean;
+  _provided: ?Object;
 
   // private methods
   // lifecycle
diff --git a/flow/options.js b/flow/options.js
@@ -24,30 +24,44 @@ declare type ComponentOptions = {
       cache?: boolean
     }
   };
-  methods?: {
-    [key: string]: Function
-  };
-  watch?: {
-    [key: string]: Function | string
-  };
+  methods?: { [key: string]: Function };
+  watch?: { [key: string]: Function | string };
+
   // DOM
   el?: string | Element;
   template?: string;
   render: (h: () => VNode) => VNode;
   renderError?: (h: () => VNode, err: Error) => VNode;
   staticRenderFns?: Array<() => VNode>;
+
   // lifecycle
   beforeCreate?: Function;
   created?: Function;
   beforeMount?: Function;
   mounted?: Function;
   beforeUpdate?: Function;
   updated?: Function;
+  activated?: Function;
+  deactivated?: Function;
+  beforeDestroy?: Function;
+  destroyed?: Function;
+
   // assets
   directives?: { [key: string]: Object };
   components?: { [key: string]: Class<Component> };
   transitions?: { [key: string]: Object };
   filters?: { [key: string]: Function };
+
+  // context
+  provide?: Object | () => Object;
+  inject?: { [key: string]: string } | Array<string>;
+
+  // component v-model customization
+  model?: {
+    prop?: string;
+    event?: string;
+  };
+
   // misc
   parent?: Component;
   mixins?: Array<Object>;
diff --git a/src/core/config.js b/src/core/config.js
@@ -9,7 +9,7 @@ export type Config = {
   productionTip: boolean;
   performance: boolean;
   devtools: boolean;
-  errorHandler: ?Function;
+  errorHandler: ?(err: Error, vm: Component, info: string) => void;
   ignoredElements: Array<string>;
   keyCodes: { [key: string]: number };
   // platform
diff --git a/src/core/instance/inject.js b/src/core/instance/inject.js
@@ -1,11 +1,16 @@
-export function initInjections (vm) {
-  const { provide, inject } = vm.$options
+/* @flow */
+
+export function initInjections (vm: Component) {
+  const provide = vm.$options.provide
+  const inject: any = vm.$options.inject
   if (provide) {
     vm._provided = typeof provide === 'function'
       ? provide.call(vm)
       : provide
   }
   if (inject) {
+    // inject is :any because flow is not smart enough to figure out cached
+    // isArray here
     const isArray = Array.isArray(inject)
     const keys = isArray ? inject : Object.keys(inject)
     for (let i = 0; i < keys.length; i++) {
diff --git a/types/options.d.ts b/types/options.d.ts
@@ -40,6 +40,14 @@ export interface ComponentOptions<V extends Vue> {
   transitions?: { [key: string]: Object };
   filters?: { [key: string]: Function };
 
+  provide?: Object | (() => Object);
+  inject?: { [key: string]: string } | Array<string>;
+
+  model?: {
+    prop?: string;
+    event?: string;
+  };
+
   parent?: Vue;
   mixins?: (ComponentOptions<Vue> | typeof Vue)[];
   name?: string;
diff --git a/types/vue.d.ts b/types/vue.d.ts
@@ -71,7 +71,10 @@ export declare class Vue {
     silent: boolean;
     optionMergeStrategies: any;
     devtools: boolean;
-    errorHandler(err: Error, vm: Vue): void;
+    productionTip: boolean;
+    performance: boolean;
+    errorHandler(err: Error, vm: Vue, info: string): void;
+    ignoredElements: string[];
     keyCodes: { [key: string]: number };
   }
 
