Fix a bunch of flow typing

Author: andrewimm

src/Cloud.js

@@ -43,7 +43,7 @@ export function run(
   name: string,
   data: mixed,
   options: { [key: string]: mixed }
-) {
+): ParsePromise {
   options = options || {};
 
   if (typeof name !== 'string' || name.length === 0) {

src/CoreManager.js

@@ -9,8 +9,9 @@
  * @flow
  */
 
-import type { AttributeMap } from './ObjectStateMutations';
+import type { AttributeMap, ObjectCache, OpsMap, State } from './ObjectStateMutations';
 import type { FileSource } from './ParseFile';
+import type { Op } from './ParseOp';
 import type ParseObject from './ParseObject';
 import type ParsePromise from './ParsePromise';
 import type { QueryJSON } from './ParseQuery';
@@ -44,21 +45,21 @@ type ObjectController = {
   destroy: (object: ParseObject, options: RequestOptions) => ParsePromise;
 };
 type ObjectStateController = {
-  getState: (obj: ParseObject) => ?State;
-  initializeState: (obj: ParseObject, initial?: State) => State;
-  removeState: (obj: ParseObject) => ?State;
-  getServerData: (obj: ParseObject) => AttributeMap;
-  setServerData: (obj: ParseObject, attributes: AttributeMap) => void;
-  getPendingOps: (obj: ParseObject) => Array<OpsMap>;
-  setPendingOp: (obj: ParseObject, attr: string, op: ?Op) => void;
-  pushPendingState: (obj: ParseObject) => void;
-  popPendingState: (obj: ParseObject) => OpsMap;
-  mergeFirstPendingState: (obj: ParseObject) => void;
-  getObjectCache: (obj: ParseObject) => ObjectCache;
-  estimateAttribute: (obj: ParseObject, attr: string) => mixed;
-  estimateAttributes: (obj: ParseObject) => AttributeMap;
-  commitServerChanges: (obj: ParseObject, changes: AttributeMap) => void;
-  enqueueTask: (obj: ParseObject, task: () => ParsePromise) => void;
+  getState: (obj: any) => ?State;
+  initializeState: (obj: any, initial?: State) => State;
+  removeState: (obj: any) => ?State;
+  getServerData: (obj: any) => AttributeMap;
+  setServerData: (obj: any, attributes: AttributeMap) => void;
+  getPendingOps: (obj: any) => Array<OpsMap>;
+  setPendingOp: (obj: any, attr: string, op: ?Op) => void;
+  pushPendingState: (obj: any) => void;
+  popPendingState: (obj: any) => OpsMap;
+  mergeFirstPendingState: (obj: any) => void;
+  getObjectCache: (obj: any) => ObjectCache;
+  estimateAttribute: (obj: any, attr: string) => mixed;
+  estimateAttributes: (obj: any) => AttributeMap;
+  commitServerChanges: (obj: any, changes: AttributeMap) => void;
+  enqueueTask: (obj: any, task: () => ParsePromise) => ParsePromise;
   clearAllState: () => void;
 };
 type PushController = {
@@ -82,6 +83,7 @@ type StorageController = {
   getItemAsync?: (path: string) => ParsePromise;
   setItemAsync?: (path: string, value: string) => ParsePromise;
   removeItemAsync?: (path: string) => ParsePromise;
+  clear: () => void;
 } | {
   async: 1;
   getItem?: (path: string) => ?string;
@@ -90,6 +92,7 @@ type StorageController = {
   getItemAsync: (path: string) => ParsePromise;
   setItemAsync: (path: string, value: string) => ParsePromise;
   removeItemAsync: (path: string) => ParsePromise;
+  clear: () => void;
 };
 type UserController = {
   setCurrentUser: (user: ParseUser) => ParsePromise;
@@ -100,6 +103,7 @@ type UserController = {
   become: (options: RequestOptions) => ParsePromise;
   logOut: () => ParsePromise;
   requestPasswordReset: (email: string, options: RequestOptions) => ParsePromise;
+  updateUserOnDisk: (user: ParseUser) => ParsePromise;
   upgradeToRevocableSession: (user: ParseUser, options: RequestOptions) => ParsePromise;
   linkWith: (user: ParseUser, authData: AuthData) => ParsePromise;
 };

src/ParseConfig.js

@@ -48,7 +48,7 @@ export default class ParseConfig {
    * @method escape
    * @param {String} attr The name of an attribute.
    */
-  escape(attr: string) {
+  escape(attr: string): string {
     var html = this._escapedAttributes[attr];
     if (html) {
       return html;

src/ParseObject.js

@@ -179,7 +179,7 @@ export default class ParseObject {
   /**
    * Returns a unique identifier used to pull data from the State Controller.
    */
-  _getStateIdentifier(): string {
+  _getStateIdentifier(): mixed {
     if (singleInstance) {
       let id = this.id;
       if (!id) {
@@ -254,7 +254,7 @@ export default class ParseObject {
     return dirty;
   }
 
-  _toFullJSON(seen): AttributeMap {
+  _toFullJSON(seen: Array<any>): AttributeMap {
     var json: { [key: string]: mixed } = this.toJSON(seen);
     json.__type = 'Object';
     json.className = this.className;
@@ -398,7 +398,7 @@ export default class ParseObject {
    * @method toJSON
    * @return {Object}
    */
-  toJSON(seen): AttributeMap {
+  toJSON(seen: Array<any>): AttributeMap {
     var seenEntry = this.id ? this.className + ':' + this.id : this;
     var seen = seen || [seenEntry];
     var json = {};
@@ -829,7 +829,7 @@ export default class ParseObject {
    * @return {} False if the data is valid.  An error object otherwise.
    * @see Parse.Object#set
    */
-  validate(attrs: AttributeMap) {
+  validate(attrs: AttributeMap): ParseError | boolean {
     if (attrs.hasOwnProperty('ACL') && !(attrs.ACL instanceof ParseACL)) {
       return new ParseError(
         ParseError.OTHER_CAUSE,
@@ -915,7 +915,7 @@ export default class ParseObject {
    * @return {Parse.Promise} A promise that is fulfilled when the fetch
    *     completes.
    */
-  fetch(options: RequestOptions) {
+  fetch(options: RequestOptions): ParsePromise {
     options = options || {};
     var fetchOptions = {};
     if (options.hasOwnProperty('useMasterKey')) {
@@ -979,12 +979,16 @@ export default class ParseObject {
     arg1: ?string | { [attr: string]: mixed },
     arg2: FullOptions | mixed,
     arg3?: FullOptions
-  ) {
+  ): ParsePromise {
     var attrs;
     var options;
     if (typeof arg1 === 'object' || typeof arg1 === 'undefined') {
       attrs = arg1;
-      options = arg2;
+      if (typeof arg2 === 'object') {
+        options = arg2;
+      } else {
+        options = {};
+      }
     } else {
       attrs = {};
       attrs[arg1] = arg2;
@@ -1049,7 +1053,7 @@ export default class ParseObject {
    * @return {Parse.Promise} A promise that is fulfilled when the destroy
    *     completes.
    */
-  destroy(options: RequestOptions) {
+  destroy(options: RequestOptions): ParsePromise {
     options = options || {};
     var destroyOptions = {};
     if (options.hasOwnProperty('useMasterKey')) {
@@ -1772,8 +1776,7 @@ var DefaultController = {
       }
 
       stateController.pushPendingState(target._getStateIdentifier());
-      let enqueueTask = stateController.enqueueTask(target._getStateIdentifier(), task);
-      return enqueueTask.then(() => {
+      return stateController.enqueueTask(target._getStateIdentifier(), task).then(() => {
         return target;
       }, (error) => {
         return ParsePromise.error(error);

src/ParseQuery.js

@@ -108,7 +108,7 @@ export default class ParseQuery {
   _order: Array<string>;
   _extraOptions: { [key: string]: mixed };
 
-  constructor(objectClass) {
+  constructor(objectClass: string | ParseObject) {
     if (typeof objectClass === 'string') {
       if (objectClass === 'User' && CoreManager.get('PERFORM_USER_REWRITE')) {
         this.className = '_User';
@@ -215,7 +215,7 @@ export default class ParseQuery {
    * @return {Parse.Promise} A promise that is resolved with the result when
    * the query completes.
    */
-  get(objectId: string, options?: FullOptions) {
+  get(objectId: string, options?: FullOptions): ParsePromise {
     this.equalTo('objectId', objectId);
 
     var firstOptions = {};
@@ -398,7 +398,7 @@ export default class ParseQuery {
    * @return {Parse.Promise} A promise that will be fulfilled once the
    *     iteration has completed.
    */
-  each(callback: (obj: ParseObject) => any, options?: FullOptions) {
+  each(callback: (obj: ParseObject) => any, options?: FullOptions): ParsePromise {
     options = options || {};
 
     if (this._order || this._skip || (this._limit >= 0)) {

src/ParseRole.js

@@ -104,7 +104,7 @@ export default class ParseRole extends ParseObject {
     return this.relation('roles');
   }
 
-  validate(attrs: AttributeMap, options?: mixed) {
+  validate(attrs: AttributeMap, options?: mixed): ParseError | boolean {
     var isInvalid = super.validate(attrs, options);
     if (isInvalid) {
       return isInvalid;

src/ParseUser.js

@@ -56,7 +56,7 @@ export default class ParseUser extends ParseObject {
    * @return {Parse.Promise} A promise that is resolved when the replacement
    *   token has been fetched.
    */
-  _upgradeToRevocableSession(options: RequestOptions) {
+  _upgradeToRevocableSession(options: RequestOptions): ParsePromise {
     options = options || {};
 
     var upgradeOptions = {};
@@ -358,7 +358,7 @@ export default class ParseUser extends ParseObject {
    * @return {Parse.Promise} A promise that is fulfilled when the signup
    *     finishes.
    */
-  signUp(attrs: AttributeMap, options: FullOptions) {
+  signUp(attrs: AttributeMap, options: FullOptions): ParsePromise {
     options = options || {};
 
     var signupOptions = {};
@@ -388,7 +388,7 @@ export default class ParseUser extends ParseObject {
    * @return {Parse.Promise} A promise that is fulfilled with the user when
    *     the login is complete.
    */
-  logIn(options: FullOptions) {
+  logIn(options: FullOptions): ParsePromise {
     options = options || {};
 
     var loginOptions = {};
@@ -404,7 +404,7 @@ export default class ParseUser extends ParseObject {
    * Wrap the default save behavior with functionality to save to local
    * storage if this is current user.
    */
-  save(...args) {
+  save(...args: Array<any>): ParsePromise {
     return super.save.apply(this, args).then(() => {
       if (this.isCurrent()) {
         return CoreManager.getUserController().updateUserOnDisk(this);
@@ -417,7 +417,7 @@ export default class ParseUser extends ParseObject {
    * Wrap the default fetch behavior with functionality to save to local
    * storage if this is current user.
    */
-  fetch(...args) {
+  fetch(...args: Array<any>): ParsePromise {
     return super.fetch.apply(this, args).then(() => {
       if (this.isCurrent()) {
         return CoreManager.getUserController().updateUserOnDisk(this);

src/RESTController.js

@@ -24,7 +24,7 @@ export type FullOptions = {
   error?: any;
   useMasterKey?: boolean;
   sessionToken?: string;
-}
+};
 
 var XHR = null;
 if (typeof XMLHttpRequest !== 'undefined') {
@@ -70,7 +70,7 @@ function ajaxIE9(method: string, url: string, data: any) {
   return promise;
 }
 
-var RESTController = {
+const RESTController = {
   ajax(method: string, url: string, data: any, headers?: any) {
     if (useXDomainRequest) {
       return ajaxIE9(method, url, data, headers);

src/SingleInstanceState.js

@@ -11,6 +11,10 @@
 
 import * as ObjectStateMutations from './ObjectStateMutations';
 
+import type { Op } from './ParseOp';
+import type ParsePromise from './ParsePromise';
+import type { AttributeMap, ObjectCache, OpsMap, State } from './ObjectStateMutations';
+
 type ObjectIdentifier = {
   className: string;
   id: string
@@ -120,7 +124,7 @@ export function commitServerChanges(obj: ObjectIdentifier, changes: AttributeMap
   ObjectStateMutations.commitServerChanges(state.serverData, state.objectCache, changes);
 }
 
-export function enqueueTask(obj: ObjectIdentifier, task: () => ParsePromise) {
+export function enqueueTask(obj: ObjectIdentifier, task: () => ParsePromise): ParsePromise {
   let state = initializeState(obj);
   return state.tasks.enqueue(task);
 }

src/Storage.js

@@ -36,7 +36,7 @@ var Storage = {
     return ParsePromise.as(controller.getItem(path));
   },
 
-  setItem(path: string, value: string) {
+  setItem(path: string, value: string): void {
     var controller = CoreManager.getStorageController();
     if (controller.async === 1) {
       throw new Error(
@@ -54,7 +54,7 @@ var Storage = {
     return ParsePromise.as(controller.setItem(path, value));
   },
 
-  removeItem(path: string) {
+  removeItem(path: string): void {
     var controller = CoreManager.getStorageController();
     if (controller.async === 1) {
       throw new Error(