Refactor

.babelrc

@@ -1,9 +1,12 @@
 {
   "plugins": [
     "inline-dotenv",
-    ["module-alias", [
-      { "src": "./src", "expose": "src" }
-    ]]
+    ["module-resolver", {
+      "alias": {
+        "package.json": "./package.json",
+        "src": "./src"
+      }
+    }]
   ],
   "presets": [
     "es2015",

.npmignore

@@ -6,78 +6,21 @@ npm-debug.log
 # Src files
 .babelrc
 .editorconfig
+.env
+.eslintignore
 .eslintrc
 .gitattributes
 .gitignore
-.nvmrc
+.istanbul.yml
+.npmignore
+.travis.yml
+CONTRIBUTING.md
 /src
-esdoc.json
-gulpfile.babel.js
-hints.md
-Makefile
-README.md
-
-# Build Files
-.env
-.tmp
-tmp
-/dist/kinvey-html5-sdk.js
-/dist/kinvey-html5-sdk.min.js
 
 # Test Files
 /coverage
 report.xml
-*.tap
 /test
-/test2
 
 # MacOS Files
 .DS_Store
-
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-# .idea/shelf
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties

dist/client.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Client = undefined;
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -36,7 +35,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 var defaultTimeout = process && process.env && process.env.KINVEY_DEFAULT_TIMEOUT || '60000' || 60000;
 var _sharedInstance = null;
 
-var Client = exports.Client = function () {
+var Client = function () {
   function Client() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -215,4 +214,6 @@ var Client = exports.Client = function () {
   }]);
 
   return Client;
-}();
+}();
+
+exports.default = Client;

dist/datastore/src/datastore.js

@@ -13,6 +13,8 @@ var _errors = require('../../errors');
 
 var _client = require('../../client');
 
+var _client2 = _interopRequireDefault(_client);
+
 var _networkstore = require('./networkstore');
 
 var _networkstore2 = _interopRequireDefault(_networkstore);
@@ -87,7 +89,7 @@ var DataStore = function () {
     value: function clearCache() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-      var client = options.client || _client.Client.sharedInstance();
+      var client = options.client || _client2.default.sharedInstance();
       var pathname = '/' + appdataNamespace + '/' + client.appKey;
       var request = new _request.CacheRequest({
         method: _request.RequestMethod.DELETE,

dist/datastore/src/networkstore.js

@@ -18,6 +18,8 @@ var _query2 = _interopRequireDefault(_query);
 
 var _client = require('../../client');
 
+var _client2 = _interopRequireDefault(_client);
+
 var _utils = require('../../utils');
 
 var _aggregation = require('../../aggregation');
@@ -472,10 +474,10 @@ var NetworkStore = function () {
         return this._client;
       }
 
-      return _client.Client.sharedInstance();
+      return _client2.default.sharedInstance();
     },
     set: function set(client) {
-      if (client instanceof _client.Client) {
+      if (client instanceof _client2.default) {
         this._client = client;
       } else {
         this._client = null;

dist/datastore/src/sync.js

@@ -15,6 +15,8 @@ var _errors = require('../../errors');
 
 var _client = require('../../client');
 
+var _client2 = _interopRequireDefault(_client);
+
 var _query = require('../../query');
 
 var _query2 = _interopRequireDefault(_query);
@@ -74,7 +76,7 @@ var SyncManager = function () {
 
     this.collection = collection;
 
-    this.client = options.client || _client.Client.sharedInstance();
+    this.client = options.client || _client2.default.sharedInstance();
   }
 
   _createClass(SyncManager, [{

dist/endpoint.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CustomEndpoint = undefined;
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _client = require('./client');
 
+var _client2 = _interopRequireDefault(_client);
+
 var _request = require('./request');
 
 var _errors = require('./errors');
@@ -27,7 +28,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 var rpcNamespace = process && process.env && process.env.KINVEY_RPC_NAMESPACE || 'rpc' || 'rpc';
 
-var CustomEndpoint = exports.CustomEndpoint = function () {
+var CustomEndpoint = function () {
   function CustomEndpoint() {
     _classCallCheck(this, CustomEndpoint);
 
@@ -39,7 +40,7 @@ var CustomEndpoint = exports.CustomEndpoint = function () {
     value: function execute(endpoint, args) {
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
-      var client = options.client || _client.Client.sharedInstance();
+      var client = options.client || _client2.default.sharedInstance();
 
       if (!endpoint) {
         return Promise.reject(new _errors.KinveyError('An endpoint argument is required.'));
@@ -69,4 +70,6 @@ var CustomEndpoint = exports.CustomEndpoint = function () {
   }]);
 
   return CustomEndpoint;
-}();
+}();
+
+exports.default = CustomEndpoint;

dist/entity/src/user.js

@@ -8,6 +8,8 @@ var _createClass = function () { function defineProperties(target, props) { for
 
 var _client = require('../../client');
 
+var _client2 = _interopRequireDefault(_client);
+
 var _acl = require('./acl');
 
 var _acl2 = _interopRequireDefault(_acl);
@@ -77,7 +79,7 @@ var User = function () {
 
     this.data = data;
 
-    this.client = options.client || _client.Client.sharedInstance();
+    this.client = options.client || _client2.default.sharedInstance();
   }
 
   _createClass(User, [{
@@ -532,7 +534,7 @@ var User = function () {
   }], [{
     key: 'getActiveUser',
     value: function getActiveUser() {
-      var client = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _client.Client.sharedInstance();
+      var client = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _client2.default.sharedInstance();
 
       var data = _request.CacheRequest.getActiveUser(client);
 
@@ -658,7 +660,7 @@ var User = function () {
         return _es6Promise2.default.reject(new _errors.KinveyError('The provided username is not a string.'));
       }
 
-      var client = options.client || _client.Client.sharedInstance();
+      var client = options.client || _client2.default.sharedInstance();
       var request = new _request.KinveyRequest({
         method: _request.RequestMethod.POST,
         authType: _request.AuthType.App,
@@ -688,7 +690,7 @@ var User = function () {
         return _es6Promise2.default.reject(new _errors.KinveyError('The provided email is not a string.'));
       }
 
-      var client = options.client || _client.Client.sharedInstance();
+      var client = options.client || _client2.default.sharedInstance();
       var request = new _request.KinveyRequest({
         method: _request.RequestMethod.POST,
         authType: _request.AuthType.App,
@@ -719,7 +721,7 @@ var User = function () {
         return _es6Promise2.default.reject(new _errors.KinveyError('The provided username is not a string.'));
       }
 
-      var client = options.client || _client.Client.sharedInstance();
+      var client = options.client || _client2.default.sharedInstance();
       var request = new _request.KinveyRequest({
         method: _request.RequestMethod.POST,
         authType: _request.AuthType.App,

dist/export.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Users = exports.UserStore = exports.User = exports.SocialIdentity = exports.Query = exports.Metadata = exports.Log = exports.Kinvey = exports.Files = exports.File = exports.DataStoreType = exports.DataStore = exports.CustomEndpoint = exports.AuthorizationGrant = exports.Group = exports.Aggregation = exports.Acl = undefined;
+exports.Users = exports.UserStore = exports.User = exports.Storage = exports.StatusCode = exports.SocialIdentity = exports.SerializeMiddleware = exports.Response = exports.RequestMethod = exports.Request = exports.Rack = exports.Query = exports.Properties = exports.ParseMiddleware = exports.NetworkRequest = exports.NetworkRack = exports.Middleware = exports.Metadata = exports.MemoryAdapter = exports.KinveyResponse = exports.KinveyRequest = exports.Kinvey = exports.HttpMiddleware = exports.Headers = exports.Files = exports.DeltaFetchRequest = exports.DataStoreType = exports.DataStore = exports.CustomEndpoint = exports.Client = exports.CacheRequest = exports.CacheRack = exports.CacheMiddleware = exports.AuthType = exports.AuthorizationGrant = exports.Group = exports.Aggregation = exports.Acl = undefined;
 
 var _errors = require('./errors');
 
@@ -17,20 +17,42 @@ Object.keys(_errors).forEach(function (key) {
   });
 });
 
-var _aggregation = require('./aggregation');
+var _utils = require('./utils');
 
-var _aggregation2 = _interopRequireDefault(_aggregation);
+Object.keys(_utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _utils[key];
+    }
+  });
+});
 
 var _datastore = require('./datastore');
 
 var _datastore2 = _interopRequireDefault(_datastore);
 
-var _endpoint = require('./endpoint');
-
 var _entity = require('./entity');
 
 var _identity = require('./identity');
 
+var _request = require('./request');
+
+var _request2 = _interopRequireDefault(_request);
+
+var _aggregation = require('./aggregation');
+
+var _aggregation2 = _interopRequireDefault(_aggregation);
+
+var _client = require('./client');
+
+var _client2 = _interopRequireDefault(_client);
+
+var _endpoint = require('./endpoint');
+
+var _endpoint2 = _interopRequireDefault(_endpoint);
+
 var _kinvey = require('./kinvey');
 
 var _kinvey2 = _interopRequireDefault(_kinvey);
@@ -39,24 +61,43 @@ var _query = require('./query');
 
 var _query2 = _interopRequireDefault(_query);
 
-var _utils = require('./utils');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 exports.Acl = _entity.Acl;
 exports.Aggregation = _aggregation2.default;
 exports.Group = _aggregation2.default;
 exports.AuthorizationGrant = _identity.AuthorizationGrant;
-exports.CustomEndpoint = _endpoint.CustomEndpoint;
+exports.AuthType = _request.AuthType;
+exports.CacheMiddleware = _request.CacheMiddleware;
+exports.CacheRack = _request.CacheRack;
+exports.CacheRequest = _request.CacheRequest;
+exports.Client = _client2.default;
+exports.CustomEndpoint = _endpoint2.default;
 exports.DataStore = _datastore2.default;
 exports.DataStoreType = _datastore.DataStoreType;
-exports.File = _datastore.FileStore;
+exports.DeltaFetchRequest = _request.DeltaFetchRequest;
 exports.Files = _datastore.FileStore;
+exports.Headers = _request.Headers;
+exports.HttpMiddleware = _request.HttpMiddleware;
 exports.Kinvey = _kinvey2.default;
-exports.Log = _utils.Log;
+exports.KinveyRequest = _request.KinveyRequest;
+exports.KinveyResponse = _request.KinveyResponse;
+exports.MemoryAdapter = _request.MemoryAdapter;
 exports.Metadata = _entity.Metadata;
+exports.Middleware = _request.Middleware;
+exports.NetworkRack = _request.NetworkRack;
+exports.NetworkRequest = _request.NetworkRequest;
+exports.ParseMiddleware = _request.ParseMiddleware;
+exports.Properties = _request.Properties;
 exports.Query = _query2.default;
+exports.Rack = _request.Rack;
+exports.Request = _request2.default;
+exports.RequestMethod = _request.RequestMethod;
+exports.Response = _request.Response;
+exports.SerializeMiddleware = _request.SerializeMiddleware;
 exports.SocialIdentity = _identity.SocialIdentity;
+exports.StatusCode = _request.StatusCode;
+exports.Storage = _request.Storage;
 exports.User = _entity.User;
 exports.UserStore = _datastore.UserStore;
 exports.Users = _datastore.UserStore;