sebelga
diff --git a/‎.eslintrc.json
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎.eslintrc.json
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎.travis.yml
Copy file name to clipboard
+1-17Lines changed: 1 addition & 17 deletions b/‎.travis.yml
Copy file name to clipboard
+1-17Lines changed: 1 addition & 17 deletions
diff --git a/‎lib/dataloader.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/dataloader.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/entity.js
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎lib/entity.js
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎lib/errors.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎lib/errors.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/helpers/defaultValues.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎lib/helpers/defaultValues.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/helpers/queryhelpers.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎lib/helpers/queryhelpers.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/helpers/validation.js
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎lib/helpers/validation.js
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎lib/index.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎lib/index.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -13,6 +13,7 @@
         "mocha"
     ],
     "rules": {
+        "arrow-parens": ["error", "as-needed"],
         "indent": [
             "error",
             4,
@@ -51,6 +52,7 @@
                 "objects": "always-multiline",
                 "functions": "ignore"
             }
-        ]
+        ],
+        "strict": ["error", "global"]
     }
 }
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - "lts/*"
-  - "8"
+  - "10"
 
 branches:
   only:
@@ -15,22 +15,6 @@ script:
 after_success:
   - npm run coveralls
 
-sudo: required
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.14.0
-  - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add node-gyp node-pre-gyp
-
-env:
-  - CXX=g++-5
-
-# https://stackoverflow.com/a/40802733/5642633
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-5
 cache:
   yarn: true
 
@@ -28,7 +28,7 @@ function createDataLoader(ds) {
             // calls return an Array
             const entities = arrify(res);
             const entitiesByKey = {};
-            entities.forEach((entity) => {
+            entities.forEach(entity => {
                 entitiesByKey[keyToString(entity[ds.KEY])] = entity;
             });
 
 
@@ -93,7 +93,7 @@ class Entity {
             if (_this.constructor.__hasCache(options)) {
                 return _this.constructor.clearCache()
                     .then(() => _this)
-                    .catch((err) => {
+                    .catch(err => {
                         let msg = 'Error while clearing the cache after saving the entity.';
                         msg += 'The entity has been saved successfully though. ';
                         msg += 'Both the cache error and the entity saved have been attached.';
@@ -170,7 +170,7 @@ class Entity {
                     return;
                 }
 
-                this.schema.__meta.geoPointsProps.forEach((property) => {
+                this.schema.__meta.geoPointsProps.forEach(property => {
                     if ({}.hasOwnProperty.call(_this.entityData, property)
                         && _this.entityData[property] !== null
                         && _this.entityData[property].constructor.name !== 'GeoPoint') {
@@ -301,9 +301,9 @@ class Entity {
 
     getEntityDataWithVirtuals() {
         const { virtuals } = this.schema;
-        const entityData = Object.assign({}, this.entityData);
+        const entityData = { ...this.entityData };
 
-        Object.keys(virtuals).forEach((k) => {
+        Object.keys(virtuals).forEach(k => {
             if ({}.hasOwnProperty.call(entityData, k)) {
                 virtuals[k].applySetters(entityData[k], entityData);
             } else {
@@ -381,15 +381,15 @@ function buildEntityData(self, data) {
         const { error, value } = schema.validateJoi(data);
 
         if (!error) {
-            entityData = Object.assign({}, value);
+            entityData = { ...value };
         }
     }
 
-    entityData = Object.assign({}, entityData, data);
+    entityData = { ...entityData, ...data };
 
     let isTypeArray;
 
-    Object.keys(schema.paths).forEach((k) => {
+    Object.keys(schema.paths).forEach(k => {
         const prop = schema.paths[k];
         const hasValue = {}.hasOwnProperty.call(entityData, k);
         const isOptional = {}.hasOwnProperty.call(prop, 'optional') && prop.optional !== false;
@@ -471,12 +471,12 @@ function registerHooksFromSchema(self) {
         }
 
         // Add Pre hooks
-        callQueue[method].pres.forEach((fn) => {
+        callQueue[method].pres.forEach(fn => {
             self.pre(method, fn);
         });
 
         // Add Pre hooks
-        callQueue[method].post.forEach((fn) => {
+        callQueue[method].post.forEach(fn => {
             self.post(method, fn);
         });
     }
 
@@ -1,4 +1,4 @@
-/* eslint no-use-before-define: "off" */
+/* eslint-disable max-classes-per-file, no-use-before-define */
 
 'use strict';
 
@@ -50,7 +50,7 @@ class GstoreError extends Error {
         this.code = code || errorCodes.ERR_GENERIC;
 
         if (args) {
-            Object.keys(args).forEach((k) => {
+            Object.keys(args).forEach(k => {
                 if (k !== 'messageParams') {
                     this[k] = args[k];
                 }
 
@@ -6,7 +6,7 @@ const map = {
     CURRENT_DATETIME: timeNow,
 };
 
-const handler = (value) => {
+const handler = value => {
     if (({}).hasOwnProperty.call(map, value)) {
         return map[value]();
     }
 
@@ -23,7 +23,7 @@ function buildFromOptions(query, options, ds) {
         if (!options.order.length) {
             options.order = [options.order];
         }
-        options.order.forEach((order) => {
+        options.order.forEach(order => {
             query.order(order.property, {
                 descending: {}.hasOwnProperty.call(order, 'descending') ? order.descending : false,
             });
@@ -56,7 +56,7 @@ function buildFromOptions(query, options, ds) {
         }
 
         if (options.filters[0].length > 1) {
-            options.filters.forEach((filter) => {
+            options.filters.forEach(filter => {
                 // We check if the value is a function
                 // if it is, we execute it.
                 let value = filter[filter.length - 1];
 
@@ -6,7 +6,7 @@ const is = require('is');
 
 const gstoreErrors = require('../errors');
 
-const isValidDate = (value) => {
+const isValidDate = value => {
     if (value.constructor.name !== 'Date'
         && (typeof value !== 'string'
             || !value.match(/\d{4}-\d{2}-\d{2}([ ,T])?(\d{2}:\d{2}:\d{2})?(\.\d{1,3})?/)
@@ -24,7 +24,7 @@ const isValueEmpty = v => (
     v === null || v === undefined || (typeof v === 'string' && v.trim().length === 0)
 );
 
-const isValidLngLat = (data) => {
+const isValidLngLat = data => {
     const validLatitude = (isInt(data.latitude) || isFloat(data.latitude))
         && data.latitude >= -90 && data.latitude <= 90;
     const validLongitude = (isInt(data.longitude) || isFloat(data.longitude))
@@ -310,7 +310,7 @@ const validate = (entityData, schema, entityKind, datastore) => {
 
             return Promise.resolve(onSuccess(entityData));
         },
-        catch: (onError) => {
+        catch: onError => {
             if (validationError) {
                 return Promise.resolve(onError(validationError));
             }
 
@@ -38,7 +38,7 @@ class Gstore {
         this.models = {};
         this.modelSchemas = {};
         this.options = {};
-        this.config = Object.assign({}, defaultConfig, config);
+        this.config = { ...defaultConfig, ...config };
         this.Schema = Schema;
         this.Queries = queries;
         this._defaultValues = defaultValues;
@@ -118,7 +118,7 @@ class Gstore {
          */
         if (options.validate) {
             let error;
-            const validateEntity = (entity) => {
+            const validateEntity = entity => {
                 ({ error } = entity.validate());
                 if (error) {
                     throw error;
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`"mocha"`
`14`	`14`	`],`
`15`	`15`	`"rules": {`
	`16`	`+ "arrow-parens": ["error", "as-needed"],`
`16`	`17`	`"indent": [`
`17`	`18`	`"error",`
`18`	`19`	`4,`
`@@ -51,6 +52,7 @@`
`51`	`52`	`"objects": "always-multiline",`
`52`	`53`	`"functions": "ignore"`
`53`	`54`	`}`
`54`		`- ]`
	`55`	`+ ],`
	`56`	`+ "strict": ["error", "global"]`
`55`	`57`	`}`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ const map = {`
`6`	`6`	`CURRENT_DATETIME: timeNow,`
`7`	`7`	`};`
`8`	`8`
`9`		`-const handler = (value) => {`
	`9`	`+const handler = value => {`
`10`	`10`	`if (({}).hasOwnProperty.call(map, value)) {`
`11`	`11`	`return map[value]();`
`12`	`12`	`}`