Remove argument verification and add further utilities (#81)

* Remove argument verification and add further utilities

* Some small updates to filterQuery

* Update filterQuery

* Add ACTIVATE_HOOKS to commons

lib/commons.js

@@ -1,6 +1,5 @@
 const utils = require('./utils');
 const hooks = require('./hooks');
-const args = require('./arguments');
 const filterQuery = require('./filter-query');
 
-module.exports = Object.assign({}, utils, args, { hooks, filterQuery });
+module.exports = Object.assign({}, utils, { hooks, filterQuery });

lib/filter-query.js

@@ -25,22 +25,16 @@ function convertSort (sort) {
     return sort;
   }
 
-  const result = {};
-
-  Object.keys(sort).forEach(key => {
+  return Object.keys(sort).reduce((result, key) => {
     result[key] = typeof sort[key] === 'object'
       ? sort[key] : parseInt(sort[key], 10);
-  });
 
-  return result;
+    return result;
+  }, {});
 }
 
 function cleanQuery (query, operators) {
-  if (Array.isArray(query)) {
-    return query.map((query) => cleanQuery(query, operators));
-  }
-
-  if (query && query.constructor === Object) {
+  if (_.isObject(query)) {
     const result = {};
     _.each(query, (query, key) => {
       if (key[0] === '$' && operators.indexOf(key) === -1) return;
@@ -62,6 +56,8 @@ function assignFilters (object, query, filters, options) {
       object[key] = converter(query[key], options);
     });
   }
+
+  return object;
 }
 
 const FILTERS = {
@@ -77,15 +73,18 @@ const OPERATORS = ['$in', '$nin', '$lt', '$lte', '$gt', '$gte', '$ne', '$or'];
 // and returns them separately a `filters` and the rest of the query
 // as `query`
 module.exports = function filterQuery (query, options = {}) {
-  let { filters: additionalFilters = {}, operators: additionalOperators = [] } = options;
-  let result = {};
+  const {
+    filters: additionalFilters = {},
+    operators: additionalOperators = []
+  } = options;
+  const result = {};
 
-  result.filters = {};
-  assignFilters(result.filters, query, FILTERS, options);
-  assignFilters(result.filters, query, additionalFilters, options);
+  result.filters = assignFilters({}, query, FILTERS, options);
+  result.filters = assignFilters(result.filters, query, additionalFilters, options);
 
-  let operators = OPERATORS.concat(additionalOperators);
-  result.query = cleanQuery(query, operators);
+  result.query = cleanQuery(query, OPERATORS.concat(additionalOperators));
 
   return result;
 };
+
+Object.assign(module.exports, { OPERATORS, FILTERS });

lib/hooks.js

@@ -1,9 +1,10 @@
-const { each, pick } = require('./utils')._;
+const { _: { each, pick }, createSymbol } = require('./utils');
 
 // To skip further hooks
-const SKIP = exports.SKIP = typeof Symbol !== 'undefined'
-  ? Symbol('__feathersSkipHooks')
-  : '__feathersSkipHooks';
+const SKIP = createSymbol('__feathersSkipHooks');
+
+exports.SKIP = SKIP;
+exports.ACTIVATE_HOOKS = createSymbol('__feathersActivateHooks');
 
 exports.createHookObject = function createHookObject (method, data = {}) {
   const hook = {};

lib/utils.js

@@ -45,6 +45,10 @@ const _ = exports._ = {
     return (typeof item === 'object' && !Array.isArray(item) && item !== null);
   },
 
+  isObjectOrArray (value) {
+    return typeof value === 'object' && value !== null;
+  },
+
   extend (...args) {
     return Object.assign(...args);
   },
@@ -130,6 +134,10 @@ exports.makeUrl = function makeUrl (path, app = {}) {
   return `${protocol}://${host}${port}/${exports.stripSlashes(path)}`;
 };
 
+exports.createSymbol = name => {
+  return typeof Symbol !== 'undefined' ? Symbol(name) : name;
+};
+
 // Sorting algorithm taken from NeDB (https://github.com/louischatriot/nedb)
 // See https://github.com/louischatriot/nedb/blob/e3f0078499aa1005a59d0c2372e425ab789145c1/lib/model.js#L189
 

test/filter-query.test.js

@@ -6,9 +6,14 @@ const expect = chai.expect;
 describe('.filterQuery', function () {
   describe('$sort', function () {
     it('returns $sort when present in query', function () {
-      const { filters, query } = filter({ $sort: { name: 1 } });
+      const originalQuery = { $sort: { name: 1 } };
+      const { filters, query } = filter(originalQuery);
+
       expect(filters.$sort.name).to.equal(1);
       expect(query).to.deep.equal({});
+      expect(originalQuery).to.deep.equal({
+        $sort: { name: 1 }
+      }, 'does not modify original query');
     });
 
     it('returns $sort when present in query as an object', function () {

test/module.test.js

@@ -9,7 +9,6 @@ describe('module', () => {
     expect(typeof commons.stripSlashes).to.equal('function');
     expect(typeof commons.sorter).to.equal('function');
     expect(typeof commons.select).to.equal('function');
-    expect(typeof commons.validateArguments).to.equal('function');
     expect(typeof commons.hooks).to.equal('object');
     expect(typeof commons._).to.equal('object');
   });

test/utils.test.js

@@ -8,7 +8,8 @@ const {
   stripSlashes,
   select,
   isPromise,
-  makeUrl
+  makeUrl,
+  createSymbol
 } = require('../lib/utils');
 
 describe('@feathersjs/commons utils', () => {
@@ -29,13 +30,23 @@ describe('@feathersjs/commons utils', () => {
     expect(isPromise(null)).to.equal(false);
   });
 
+  it('createSymbol', () => {
+    expect(typeof createSymbol('a test')).to.equal('symbol');
+  });
+
   describe('_', () => {
     it('isObject', () => {
       expect(_.isObject({})).to.equal(true);
       expect(_.isObject([])).to.equal(false);
       expect(_.isObject(null)).to.equal(false);
     });
 
+    it('isObjectOrArray', () => {
+      expect(_.isObjectOrArray({})).to.equal(true);
+      expect(_.isObjectOrArray([])).to.equal(true);
+      expect(_.isObjectOrArray(null)).to.equal(false);
+    });
+
     it('each', () => {
       _.each({ hi: 'there' }, (value, key) => {
         expect(key).to.equal('hi');