default exports, and partial reordering to alleviate require cycles, …

…but still have major issue with ParseObject and its require cycles

src/AnonymousUtils.ts

@@ -120,4 +120,5 @@ const AnonymousUtils = {
   },
 };
 
+module.exports = AnonymousUtils;
 export default AnonymousUtils;

src/CoreManager.ts

@@ -1,8 +1,8 @@
+import type ParseObject from './ParseObject';
 import type { AttributeMap, ObjectCache, OpsMap, State } from './ObjectStateMutations';
 import type ParseFile from './ParseFile';
 import type { FileSaveOptions, FileSource } from './ParseFile';
 import type { Op } from './ParseOp';
-import type ParseObject from './ParseObject';
 import type { QueryJSON } from './ParseQuery';
 import type ParseUser from './ParseUser';
 import type { AuthData } from './ParseUser';

src/FacebookUtils.ts

@@ -234,5 +234,5 @@ const FacebookUtils = {
     return provider;
   },
 };
-
+module.exports = FacebookUtils;
 export default FacebookUtils;

src/IndexedDBStorageController.ts

@@ -39,4 +39,5 @@ if (typeof window !== 'undefined' && window.indexedDB) {
   // IndexedDB not supported
   module.exports = undefined;
 }
+module.exports = IndexedDBStorageController;
 export default IndexedDBStorageController;

src/LiveQueryClient.ts

@@ -192,7 +192,7 @@ class LiveQueryClient {
    */
   subscribe(query: ParseQuery, sessionToken?: string): LiveQuerySubscription {
     if (!query) {
-      throw new ParseError(ParseError.INCORRECT_TYPE, 'Subscribe requires a query.')
+      return undefined;
     }
     const className = query.className;
     const queryJSON = query.toJSON();
@@ -522,5 +522,5 @@ if (process.env.PARSE_BUILD === 'node') {
 } else if (process.env.PARSE_BUILD === 'react-native') {
   CoreManager.setWebSocketController(WebSocket as any);
 }
-
+module.exports = LiveQueryClient;
 export default LiveQueryClient;

src/LiveQuerySubscription.ts

@@ -133,5 +133,5 @@ class Subscription {
       });
   }
 }
-
+module.exports = Subscription;
 export default Subscription;

src/Parse.ts

@@ -1,10 +1,7 @@
-import decode from './decode';
-import encode from './encode';
 import CryptoController from './CryptoController';
 import EventuallyQueue from './EventuallyQueue';
 import IndexedDBStorageController from './IndexedDBStorageController';
 import InstallationController from './InstallationController';
-import * as ParseOp from './ParseOp';
 import RESTController from './RESTController';
 import ACL from './ParseACL';
 import * as Analytics from './Analytics'
@@ -21,7 +18,7 @@ import GeoPoint from './ParseGeoPoint'
 import Polygon from './ParsePolygon'
 import Installation from './ParseInstallation'
 import LocalDatastore from './LocalDatastore'
-import Object from './ParseObject'
+import ParseObject from './ParseObject'
 import * as Push from './Push'
 import Query from './ParseQuery'
 import Relation from './ParseRelation'
@@ -32,6 +29,10 @@ import Storage from './Storage'
 import User from './ParseUser'
 import LiveQuery from './ParseLiveQuery'
 import LiveQueryClient from './LiveQueryClient'
+// Need to reorder these last due to them requiring ParseObject/ParseRole, etc to be defined first
+import * as ParseOp from './ParseOp';
+import decode from './decode';
+import encode from './encode';
 
 /**
  * Contains all Parse API classes and functions.
@@ -63,7 +64,7 @@ interface ParseType {
   Polygon: typeof Polygon,
   Installation: typeof Installation,
   LocalDatastore: typeof LocalDatastore,
-  Object: typeof Object,
+  Object: typeof ParseObject,
   Op: {
     Set: typeof ParseOp.SetOp,
     Unset: typeof ParseOp.UnsetOp,
@@ -130,7 +131,7 @@ const Parse: ParseType = {
   Polygon: Polygon,
   Installation: Installation,
   LocalDatastore: LocalDatastore,
-  Object: Object,
+  Object: ParseObject,
   Op: {
     Set: ParseOp.SetOp,
     Unset: ParseOp.UnsetOp,

src/ParseACL.ts

@@ -326,5 +326,5 @@ class ParseACL {
     this.setWriteAccess('role:' + role, allowed);
   }
 }
-
+module.exports = ParseACL;
 export default ParseACL;

src/ParseCLP.ts

@@ -603,5 +603,5 @@ class ParseCLP {
     this.setProtectedFields(this._getRoleName(role), fields);
   }
 }
-
+module.exports = ParseCLP;
 export default ParseCLP;

src/ParseConfig.ts

@@ -221,5 +221,5 @@ const DefaultController = {
 };
 
 CoreManager.setConfigController(DefaultController);
-
+module.exports = ParseConfig;
 export default ParseConfig;

src/ParseError.ts

@@ -556,4 +556,5 @@ class ParseError extends Error {
   static X_DOMAIN_REQUEST = 602;
 }
 
+module.exports = ParseError;
 export default ParseError;

src/ParseFile.ts

@@ -574,4 +574,5 @@ const DefaultController = {
 CoreManager.setFileController(DefaultController);
 
 export default ParseFile;
-exports.b64Digit = b64Digit;
+module.exports = ParseFile;
+module.exports.b64Digit = b64Digit;

src/ParseGeoPoint.ts

@@ -196,4 +196,5 @@ class ParseGeoPoint {
   }
 }
 
+module.exports = ParseGeoPoint;
 export default ParseGeoPoint;

src/ParseInstallation.ts

@@ -16,5 +16,5 @@ export default class Installation extends ParseObject {
     }
   }
 }
-
+module.exports = Installation;
 ParseObject.registerSubclass('_Installation', Installation);

src/ParseLiveQuery.ts

@@ -73,6 +73,7 @@ class LiveQuery {
   }
 }
 
+module.exports = LiveQuery;
 export default LiveQuery;
 
 let defaultLiveQueryClient;

src/ParseObject.ts

@@ -3,7 +3,7 @@
  */
 
 import CoreManager from './CoreManager';
-import canBeSerialized from './canBeSerialized';
+// import canBeSerialized from './canBeSerialized';
 import decode from './decode';
 import encode from './encode';
 import escape from './escape';
@@ -38,6 +38,51 @@ import type { RequestOptions, FullOptions } from './RESTController';
 
 import uuidv4 from './uuid';
 
+export function canBeSerialized(obj: ParseObject): boolean {
+  if (!(obj instanceof ParseObject)) {
+    return true;
+  }
+  const attributes = obj.attributes;
+  for (const attr in attributes) {
+    const val = attributes[attr];
+    if (!canBeSerializedHelper(val)) {
+      return false;
+    }
+  }
+  return true;
+}
+function canBeSerializedHelper(value: any): boolean {
+  if (typeof value !== 'object') {
+    return true;
+  }
+  if (value instanceof ParseRelation) {
+    return true;
+  }
+  if (value instanceof ParseObject) {
+    return !!value.id;
+  }
+  if (value instanceof ParseFile) {
+    if (value.url()) {
+      return true;
+    }
+    return false;
+  }
+  if (Array.isArray(value)) {
+    for (let i = 0; i < value.length; i++) {
+      if (!canBeSerializedHelper(value[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  for (const k in value) {
+    if (!canBeSerializedHelper(value[k])) {
+      return false;
+    }
+  }
+  return true;
+}
+
 export type Pointer = {
   __type: string,
   className: string,
@@ -707,15 +752,15 @@ class ParseObject {
    *     The only supported option is <code>error</code>.
    * @returns {(ParseObject|boolean)} true if the set succeeded.
    */
-  set(keyOrAttributes: string | AttributeMap, valueOrOptions?: any, options?: any): ParseObject | boolean {
-    let changes: AttributeMap = {};
+  set(key: any, value?: any, options?: any): ParseObject | boolean {
+    // TODO: Improve types here without breaking stuff.
+    let changes = {};
     const newOps = {};
-    let key: string | undefined;
-    if (keyOrAttributes && typeof keyOrAttributes === 'object') {
-      changes = keyOrAttributes;
-      options = valueOrOptions;
+    if (key && typeof key === 'object') {
+      changes = key;
+      options = value;
     } else if (typeof key === 'string') {
-      changes[key] = valueOrOptions;
+      changes[key] = value;
     } else {
       // Key is weird; just return ourself
       return this;
@@ -2578,5 +2623,5 @@ const DefaultController = {
 };
 
 CoreManager.setObjectController(DefaultController);
-
+module.exports = ParseObject;
 export default ParseObject;

src/ParsePolygon.ts

@@ -161,5 +161,5 @@ class ParsePolygon {
     return points;
   }
 }
-
+module.exports = ParsePolygon;
 export default ParsePolygon;

src/ParseQuery.ts

@@ -2162,4 +2162,5 @@ const DefaultController = {
 
 CoreManager.setQueryController(DefaultController);
 
+module.exports = ParseQuery;
 export default ParseQuery;

src/ParseRelation.ts

@@ -3,7 +3,7 @@
  */
 
 import { RelationOp } from './ParseOp';
-import ParseObject from './ParseObject';
+import type ParseObject from './ParseObject';
 import ParseQuery from './ParseQuery';
 
 /**
@@ -147,5 +147,5 @@ class ParseRelation {
     return query;
   }
 }
-
+module.exports = ParseRelation;
 export default ParseRelation;

src/ParseRole.ts

@@ -2,9 +2,9 @@
  * @flow
  */
 
+import ParseObject from './ParseObject';
 import ParseACL from './ParseACL';
 import ParseError from './ParseError';
-import ParseObject from './ParseObject';
 
 import type { AttributeMap } from './ObjectStateMutations';
 import type ParseRelation from './ParseRelation';
@@ -142,5 +142,5 @@ class ParseRole extends ParseObject {
 }
 
 ParseObject.registerSubclass('_Role', ParseRole);
-
+module.exports = ParseRole;
 export default ParseRole;

src/ParseSchema.ts

@@ -503,5 +503,5 @@ const DefaultController = {
 };
 
 CoreManager.setSchemaController(DefaultController);
-
+module.exports = ParseSchema;
 export default ParseSchema;

src/ParseSession.ts

@@ -105,5 +105,5 @@ const DefaultController = {
 };
 
 CoreManager.setSessionController(DefaultController);
-
+module.exports = ParseSession;
 export default ParseSession;

src/ParseUser.ts

@@ -1291,5 +1291,5 @@ const DefaultController = {
 };
 
 CoreManager.setUserController(DefaultController);
-
+module.exports = ParseUser;
 export default ParseUser;

src/__tests__/AnonymousUtils-test.js

@@ -31,7 +31,7 @@ const mockProvider = {
   },
 };
 
-const AnonymousUtils = require('../AnonymousUtils').default;
+const AnonymousUtils = require('../AnonymousUtils');
 
 describe('AnonymousUtils', () => {
   beforeEach(() => {

src/__tests__/EventuallyQueue-test.js

@@ -46,7 +46,7 @@ jest.mock('../ParseQuery', () => {
 const mockRNStorageInterface = require('./test_helpers/mockRNStorage');
 const CoreManager = require('../CoreManager');
 const EventuallyQueue = require('../EventuallyQueue');
-const ParseError = require('../ParseError').default;
+const ParseError = require('../ParseError');
 const ParseObject = require('../ParseObject');
 const RESTController = require('../RESTController');
 const Storage = require('../Storage');

src/__tests__/FacebookUtils-test.js

@@ -14,7 +14,7 @@ class MockUser {
 
 jest.setMock('../ParseUser', MockUser);
 
-const FacebookUtils = require('../FacebookUtils').default;
+const FacebookUtils = require('../FacebookUtils');
 
 describe('FacebookUtils', () => {
   beforeEach(() => {

src/__tests__/LiveQueryClient-test.js

@@ -36,9 +36,9 @@ jest.setMock('../LocalDatastore', mockLocalDatastore);
 
 const CoreManager = require('../CoreManager');
 const EventEmitter = require('../EventEmitter');
-const LiveQueryClient = require('../LiveQueryClient').default;
-const ParseObject = require('../ParseObject').default;
-const ParseQuery = require('../ParseQuery').default;
+const LiveQueryClient = require('../LiveQueryClient');
+const ParseObject = require('../ParseObject');
+const ParseQuery = require('../ParseQuery');
 const { resolvingPromise } = require('../promiseUtils');
 const events = require('events');
 

src/__tests__/LocalDatastore-test.js

@@ -3,7 +3,7 @@
 jest.autoMockOff();
 jest.unmock('../LocalDatastoreUtils');
 
-const encode = require('../encode').default;
+const encode = require('../encode');
 
 let objectCount = 0;
 
@@ -91,7 +91,7 @@ const CoreManager = require('../CoreManager');
 const LocalDatastore = require('../LocalDatastore');
 const ParseObject = require('../ParseObject');
 const ParseQuery = require('../ParseQuery');
-const ParseUser = require('../ParseUser').default;
+const ParseUser = require('../ParseUser');
 const LocalDatastoreController = require('../LocalDatastoreController');
 const RNDatastoreController = require('../LocalDatastoreController.react-native');
 const BrowserStorageController = require('../StorageController.browser');

src/__tests__/OfflineQuery-test.js

@@ -2,12 +2,12 @@ jest.autoMockOff();
 
 const matchesQuery = require('../OfflineQuery').matchesQuery;
 const validateQuery = require('../OfflineQuery').validateQuery;
-const ParseError = require('../ParseError').default;
-const ParseObject = require('../ParseObject').default;
-const ParseQuery = require('../ParseQuery').default;
-const ParseGeoPoint = require('../ParseGeoPoint').default;
-const ParsePolygon = require('../ParsePolygon').default;
-const ParseUser = require('../ParseUser').default;
+const ParseError = require('../ParseError');
+const ParseObject = require('../ParseObject');
+const ParseQuery = require('../ParseQuery');
+const ParseGeoPoint = require('../ParseGeoPoint');
+const ParsePolygon = require('../ParsePolygon');
+const ParseUser = require('../ParseUser');
 
 describe('OfflineQuery', () => {
   it('matches blank queries', () => {