lint n nits

Author: dplewis

.eslintrc.json

@@ -22,6 +22,7 @@
         "no-multiple-empty-lines": 1,
         "prefer-const": "error",
         "space-infix-ops": "error",
-        "no-useless-escape": "off"
+        "no-useless-escape": "off",
+        "no-var": "error"
     }
 }

integration/server.js

@@ -1,10 +1,10 @@
-var express = require('express');
-var ParseServer = require('parse-server').ParseServer;
-var app = express();
+const express = require('express');
+const ParseServer = require('parse-server').ParseServer;
+const app = express();
 
 // Specify the connection string for your mongodb database
 // and the location to your Parse cloud code
-var api = new ParseServer({
+const api = new ParseServer({
   databaseURI: 'mongodb://localhost:27017/integration',
   appId: 'integration',
   masterKey: 'notsosecret',

integration/test/ParseObjectTest.js

@@ -1476,6 +1476,7 @@ describe('Parse Object', () => {
       beforeEach(() => {
         const StorageController = controller.file;
         Parse.CoreManager.setLocalDatastoreController(StorageController);
+        Parse.enableLocalDatastore();
       });
 
       it(`${controller.name} can pin (unsaved)`, async () => {

src/Analytics.js

@@ -62,7 +62,7 @@ export function track(
     throw new TypeError('A name for the custom event must be provided');
   }
 
-  for (var key in dimensions) {
+  for (const key in dimensions) {
     if (typeof key !== 'string' || typeof dimensions[key] !== 'string') {
       throw new TypeError(
         'track() dimensions expects keys and values of type "string".'
@@ -74,10 +74,10 @@ export function track(
     .track(name, dimensions);
 }
 
-var DefaultController = {
+const DefaultController = {
   track(name, dimensions) {
-    var path = 'events/' + name;
-    var RESTController = CoreManager.getRESTController();
+    const path = 'events/' + name;
+    const RESTController = CoreManager.getRESTController();
     return RESTController.request('POST', path, { dimensions: dimensions });
   }
 };

src/Cloud.js

@@ -48,7 +48,7 @@ export function run(
     throw new TypeError('Cloud function name must be a string.');
   }
 
-  var requestOptions = {};
+  const requestOptions = {};
   if (options.useMasterKey) {
     requestOptions.useMasterKey = options.useMasterKey;
   }
@@ -104,15 +104,15 @@ export function startJob(
   * @return {Parse.Object} Status of Job.
   */
 export function getJobStatus(jobStatusId: string): Promise {
-  var query = new ParseQuery('_JobStatus');
+  const query = new ParseQuery('_JobStatus');
   return query.get(jobStatusId, { useMasterKey: true });
 }
 
 const DefaultController = {
   run(name, data, options) {
-    var RESTController = CoreManager.getRESTController();
+    const RESTController = CoreManager.getRESTController();
 
-    var payload = encode(data, true);
+    const payload = encode(data, true);
 
     const request = RESTController.request(
       'POST',
@@ -134,7 +134,7 @@ const DefaultController = {
   },
 
   getJobsData(options) {
-    var RESTController = CoreManager.getRESTController();
+    const RESTController = CoreManager.getRESTController();
 
     return RESTController.request(
       'GET',
@@ -145,9 +145,9 @@ const DefaultController = {
   },
 
   startJob(name, data, options) {
-    var RESTController = CoreManager.getRESTController();
+    const RESTController = CoreManager.getRESTController();
 
-    var payload = encode(data, true);
+    const payload = encode(data, true);
 
     return RESTController.request(
       'POST',

src/CoreManager.js

@@ -156,7 +156,7 @@ type Config = {
   HooksController?: HooksController,
 };
 
-var config: Config & { [key: string]: mixed } = {
+const config: Config & { [key: string]: mixed } = {
   // Defaults
   IS_NODE: (typeof process !== 'undefined' &&
             !!process.versions &&

src/FacebookUtils.js

@@ -12,10 +12,10 @@
 import parseDate from './parseDate';
 import ParseUser from './ParseUser';
 
-var initialized = false;
-var requestedPermissions;
-var initOptions;
-var provider = {
+let initialized = false;
+let requestedPermissions;
+let initOptions;
+const provider = {
   authenticate(options) {
     if (typeof FB === 'undefined') {
       options.error(this, 'Facebook SDK not found.');
@@ -42,19 +42,19 @@ var provider = {
 
   restoreAuthentication(authData) {
     if (authData) {
-      var expiration = parseDate(authData.expiration_date);
-      var expiresIn = expiration ?
+      const expiration = parseDate(authData.expiration_date);
+      const expiresIn = expiration ?
         (expiration.getTime() - new Date().getTime()) / 1000 :
         0;
 
-      var authResponse = {
+      const authResponse = {
         userID: authData.id,
         accessToken: authData.access_token,
         expiresIn: expiresIn
       };
-      var newOptions = {};
+      const newOptions = {};
       if (initOptions) {
-        for (var key in initOptions) {
+        for (const key in initOptions) {
           newOptions[key] = initOptions[key];
         }
       }
@@ -67,7 +67,7 @@ var provider = {
       // Most of the time, the users will match -- it's only in cases where
       // the FB SDK knows of a different user than the one being restored
       // from a Parse User that logged in with username/password.
-      var existingResponse = FB.getAuthResponse();
+      const existingResponse = FB.getAuthResponse();
       if (existingResponse &&
           existingResponse.userID !== authResponse.userID) {
         FB.logout();
@@ -93,7 +93,7 @@ var provider = {
  * @static
  * @hideconstructor
  */
-var FacebookUtils = {
+const FacebookUtils = {
   /**
    * Initializes Parse Facebook integration.  Call this function after you
    * have loaded the Facebook Javascript SDK with the same parameters
@@ -120,12 +120,12 @@ var FacebookUtils = {
     }
     initOptions = {};
     if (options) {
-      for (var key in options) {
+      for (const key in options) {
         initOptions[key] = options[key];
       }
     }
     if (initOptions.status && typeof console !== 'undefined') {
-      var warn = console.warn || console.log || function() {}; // eslint-disable-line no-console
+      const warn = console.warn || console.log || function() {}; // eslint-disable-line no-console
       warn.call(console, 'The "status" flag passed into' +
         ' FB.init, when set to true, can interfere with Parse Facebook' +
         ' integration, so it has been suppressed. Please call' +
@@ -177,9 +177,9 @@ var FacebookUtils = {
       requestedPermissions = permissions;
       return ParseUser._logInWith('facebook', options);
     } else {
-      var newOptions = {};
+      const newOptions = {};
       if (options) {
-        for (var key in options) {
+        for (const key in options) {
           newOptions[key] = options[key];
         }
       }
@@ -216,9 +216,9 @@ var FacebookUtils = {
       requestedPermissions = permissions;
       return user._linkWith('facebook', options);
     } else {
-      var newOptions = {};
+      const newOptions = {};
       if (options) {
-        for (var key in options) {
+        for (const key in options) {
           newOptions[key] = options[key];
         }
       }

src/InstallationController.js

@@ -11,7 +11,7 @@
 
 import Storage from './Storage';
 
-var iidCache = null;
+let iidCache = null;
 
 function hexOctet() {
   return Math.floor(
@@ -29,12 +29,12 @@ function generateId() {
   );
 }
 
-var InstallationController = {
+const InstallationController = {
   currentInstallationId(): Promise {
     if (typeof iidCache === 'string') {
       return Promise.resolve(iidCache);
     }
-    var path = Storage.generatePath('installationId');
+    const path = Storage.generatePath('installationId');
     return Storage.getItemAsync(path).then((iid) => {
       if (!iid) {
         iid = generateId();

src/LocalDatastore.js

@@ -40,18 +40,15 @@ const LocalDatastore = {
   },
 
   _clear(): void {
-    var controller = CoreManager.getLocalDatastoreController();
+    const controller = CoreManager.getLocalDatastoreController();
     controller.clear();
   },
 
   _handlePinWithName(name: string, object: ParseObject) {
-    let pinName = DEFAULT_PIN;
-    if (name !== DEFAULT_PIN) {
-      pinName = PIN_PREFIX + name;
-    }
+    const pinName = this.getPinName(name);
     const objects = this._getChildren(object);
     objects[object._getId()] = object._toFullJSON();
-    for (var objectId in objects) {
+    for (const objectId in objects) {
       this.pinWithName(objectId, objects[objectId]);
     }
     const pinned = this.fromPinWithName(pinName) || [];
@@ -61,10 +58,7 @@ const LocalDatastore = {
   },
 
   _handleUnPinWithName(name: string, object: ParseObject) {
-    let pinName = DEFAULT_PIN;
-    if (name !== DEFAULT_PIN) {
-      pinName = PIN_PREFIX + name;
-    }
+    const pinName = this.getPinName(name);
     const objects = this._getChildren(object);
     const objectIds = Object.keys(objects);
     objectIds.push(object._getId());
@@ -112,10 +106,7 @@ const LocalDatastore = {
     if (!name) {
       return allObjects;
     }
-    let pinName = DEFAULT_PIN;
-    if (name !== DEFAULT_PIN) {
-      pinName = PIN_PREFIX + name;
-    }
+    const pinName = this.getPinName(name);
     const pinned = this.fromPinWithName(pinName);
     if (!Array.isArray(pinned)) {
       return [];
@@ -124,13 +115,19 @@ const LocalDatastore = {
   },
 
   _updateObjectIfPinned(object: ParseObject) {
+    if (!this.isEnabled) {
+      return;
+    }
     const pinned = this.fromPinWithName(object.id);
     if (pinned) {
       this.pinWithName(object.id, object._toFullJSON());
     }
   },
 
   _destroyObjectIfPinned(object: ParseObject) {
+    if (!this.isEnabled) {
+      return;
+    }
     const pin = this.fromPinWithName(object.id);
     if (!pin) {
       return;
@@ -173,6 +170,20 @@ const LocalDatastore = {
       }
     }
   },
+
+  getPinName(pinName: ?string) {
+    if (!pinName || pinName === DEFAULT_PIN) {
+      return DEFAULT_PIN;
+    }
+    return PIN_PREFIX + pinName;
+  },
+
+  checkIfEnabled() {
+    if (!this.isEnabled) {
+      console.log('Parse.enableLocalDatastore() must be called first'); // eslint-disable-line no-console
+    }
+    return this.isEnabled;
+  }
 };
 
 function isLocalStorageEnabled() {
@@ -188,6 +199,7 @@ function isLocalStorageEnabled() {
 LocalDatastore.DEFAULT_PIN = DEFAULT_PIN;
 LocalDatastore.PIN_PREFIX = PIN_PREFIX;
 LocalDatastore.isLocalStorageEnabled = isLocalStorageEnabled;
+LocalDatastore.isEnabled = false;
 module.exports = LocalDatastore;
 
 if (isLocalStorageEnabled()) {

src/LocalDatastoreController.default.js

@@ -31,7 +31,7 @@ const LocalDatastoreController = {
   },
 
   clear() {
-    for (var key in memMap) {
+    for (const key in memMap) {
       if (memMap.hasOwnProperty(key)) {
         delete memMap[key];
       }