Migrate to ES6 and new plugin infrastructure

Author: daffl

.babelrc

@@ -0,0 +1,4 @@
+{
+  "plugins": [ "add-module-exports" ],
+  "presets": [ "es2015" ]
+}

.gitattributes

@@ -1,4 +1,5 @@
 tmp*
 node_modules/
 npm-debug.log
-.idea/
+.idea/
+lib/

.gitignore

@@ -3,4 +3,8 @@ docs/
 test/
 .DS_Store
 *.markdown
-*.md
+*.md
+!lib/
+src/
+.babelrc
+.editorconfig

.npmignore

@@ -1,3 +1,6 @@
 sudo: false
 language: node_js
-node_js: node
+node_js:
+  - "0.10"
+  - "node"
+  - "iojs"

.travis.yml

@@ -7,12 +7,7 @@
     "feathers-plugin",
     "feathers"
   ],
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://github.com/feathersjs/feathers-hooks/blob/master/LICENSE"
-    }
-  ],
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git://github.com/feathersjs/feathers-hooks.git"
@@ -31,25 +26,30 @@
   },
   "main": "lib/hooks.js",
   "scripts": {
-    "test": "npm run jshint && npm run mocha",
-    "jshint": "jshint lib/. test/. --config",
-    "mocha": "mocha test/",
+    "prepublish": "npm run compile",
     "publish": "git push origin && git push origin --tags",
     "release:patch": "npm version patch && npm publish",
     "release:minor": "npm version minor && npm publish",
-    "release:major": "npm version major && npm publish"
+    "release:major": "npm version major && npm publish",
+    "compile": "rm -rf lib/ && babel -d lib/ src/",
+    "watch": "babel --watch -d lib/ src/",
+    "jshint": "jshint src/. test/. --config",
+    "mocha": "mocha test/ --compilers js:babel-core/register",
+    "test": "npm run compile && npm run jshint && npm run mocha"
   },
   "directories": {
     "lib": "lib"
   },
   "dependencies": {
-    "feathers-commons": "^0.2.8",
-    "lodash": "^2.4.1"
+    "feathers-commons": "^0.5.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-preset-es2015": "^6.3.13",
     "feathers": "^1.0.0",
     "jshint": "^2.8.0",
-    "mocha": "^2.3.3",
-    "q": "^1.0.1"
+    "mocha": "^2.3.3"
   }
 }

lib/hooks.js

@@ -1,27 +1,24 @@
-'use strict';
-
-var _ = require('lodash');
-var commons = require('./commons');
-var utils = require('feathers-commons').hooks;
+import { hooks as utils } from 'feathers-commons';
+import { makeHookFn, createMixin } from './commons';
 
 /**
  * Return the hook mixin method for the given name.
  *
  * @param {String} method The service method name
  * @returns {Function}
  */
-var getMixin = function (method) {
+function getMixin(method) {
   return function() {
     var _super = this._super;
 
     if(!this.__after || !this.__after[method].length) {
       return _super.apply(this, arguments);
     }
 
-    var args = _.toArray(arguments);
-    var hookObject = utils.hookObject(method, 'after', args);
+    const args = Array.from(arguments);
+    const hookObject = utils.hookObject(method, 'after', args);
     // Make a copy of our hooks
-    var hooks = this.__after[method].slice();
+    const hooks = this.__after[method].slice();
 
     // Remove the old callback and replace with the new callback that runs the hook
     args.pop();
@@ -40,7 +37,7 @@ var getMixin = function (method) {
       hookObject.result = result;
 
       while(hooks.length) {
-        fn = commons.makeHookFn(hooks.pop(), fn);
+        fn = makeHookFn(hooks.pop(), fn);
       }
 
       return fn.call(this, hookObject);
@@ -49,10 +46,10 @@ var getMixin = function (method) {
 
     return _super.apply(this, args);
   };
-};
+}
 
-var addHooks = function(hooks, method) {
-  var myHooks = this.__after[method];
+function addHooks(hooks, method) {
+  const myHooks = this.__after[method];
 
   if(hooks[method]) {
     myHooks.push.apply(myHooks, hooks[method]);
@@ -61,6 +58,6 @@ var addHooks = function(hooks, method) {
   if(hooks.all) {
     myHooks.push.apply(myHooks, hooks.all);
   }
-};
+}
 
-module.exports = commons.createMixin('after', getMixin, addHooks);
+module.exports = createMixin('after', getMixin, addHooks);

package.json

@@ -1,38 +1,36 @@
-'use strict';
-
-var commons = require('./commons');
-var utils = require('feathers-commons').hooks;
+import { hooks as utils } from 'feathers-commons';
+import { makeHookFn, createMixin } from './commons';
 
 /**
  * Return the hook mixin method for the given name.
  *
  * @param {String} method The service method name
  * @returns {Function}
  */
-var getMixin = function (method) {
+function getMixin(method) {
   return function() {
-    var _super = this._super;
+    const _super = this._super;
 
     if(!this.__before || !this.__before[method].length) {
       return _super.apply(this, arguments);
     }
 
     // Make a copy of our hooks
-    var hooks = this.__before[method].slice();
+    const hooks = this.__before[method].slice();
     // The chained function
-    var fn = function(hookObject) {
+    let fn = function(hookObject) {
       return _super.apply(this, utils.makeArguments(hookObject));
     };
 
     while(hooks.length) {
-      fn = commons.makeHookFn(hooks.pop(), fn);
+      fn = makeHookFn(hooks.pop(), fn);
     }
 
     return fn.call(this, utils.hookObject(method, 'before', arguments));
   };
-};
+}
 
-var addHooks = function(hooks, method) {
+function addHooks(hooks, method) {
   var myHooks = this.__before[method];
 
   if(hooks.all) {
@@ -42,6 +40,6 @@ var addHooks = function(hooks, method) {
   if(hooks[method]) {
     myHooks.push.apply(myHooks, hooks[method]);
   }
-};
+}
 
-module.exports = commons.createMixin('before', getMixin, addHooks);
+export default createMixin('before', getMixin, addHooks);

lib/after.js renamed to src/after.js

@@ -1,7 +1,4 @@
-'use strict';
-
-var _ = require('lodash');
-var utils = require('feathers-commons').hooks;
+import { hooks as utils } from 'feathers-commons';
 
 /**
  * Creates a new hook function for the execution chain.
@@ -10,11 +7,11 @@ var utils = require('feathers-commons').hooks;
  * @param {Function} prev The previous hook method in the chain
  * @returns {Function}
  */
-exports.makeHookFn = function(hook, prev) {
+export function makeHookFn(hook, prev) {
   return function(hookObject) {
     // The callback for the hook
-    var hookCallback = function(error, newHookObject) {
-      var currentHook = newHookObject || hookObject;
+    const hookCallback = (error, newHookObject) => {
+      const currentHook = newHookObject || hookObject;
 
       // Call the callback with the result we set in `newCallback`
       if(error) {
@@ -23,21 +20,19 @@ exports.makeHookFn = function(hook, prev) {
       }
 
       prev.call(this, currentHook);
-    }.bind(this);
+    };
 
-    var promise = hook.call(this, hookObject, hookCallback);
+    const promise = hook.call(this, hookObject, hookCallback);
 
     if(typeof promise !== 'undefined' && typeof promise.then === 'function') {
       promise.then(function() {
         hookCallback();
-      }, function(error) {
-        hookCallback(error);
-      });
+      }, hookCallback);
     }
 
     return promise;
   };
-};
+}
 
 /**
  * Returns the main mixin function for the given type.
@@ -48,33 +43,31 @@ exports.makeHookFn = function(hook, prev) {
  * @param {Function} addHooks A callback that adds the hooks
  * @returns {Function}
  */
-exports.createMixin = function(type, getMixin, addHooks) {
+export function createMixin(type, getMixin, addHooks) {
   return function(service) {
-    if(!_.isFunction(service.mixin)) {
+    if(typeof service.mixin !== 'function') {
       return;
     }
 
-    var app = this;
-    var hookProp = '__' + type;
-    var methods = app.methods;
-    var old = service[type];
+    const app = this;
+    const hookProp = '__' + type;
+    const methods = app.methods;
+    const old = service[type];
 
-    var mixin = {};
+    const mixin = {};
 
     mixin[type] = function(obj) {
       if(!this[hookProp]) {
         this[hookProp] = {};
-        _.each(methods, function(method) {
-          this[hookProp][method] = [];
-        }.bind(this));
+        methods.forEach(method => this[hookProp][method] = []);
       }
 
-      _.each(methods, addHooks.bind(this, utils.convertHookData(obj)));
+      methods.forEach(addHooks.bind(this, utils.convertHookData(obj)));
 
       return this;
     };
 
-    _.each(methods, function(method) {
+    methods.forEach(method => {
       if(typeof service[method] !== 'function') {
         return;
       }
@@ -88,4 +81,4 @@ exports.createMixin = function(type, getMixin, addHooks) {
       service[type](old);
     }
   };
-};
+}

lib/before.js renamed to src/before.js

@@ -0,0 +1,11 @@
+if(!global._babelPolyfill) { require('babel-polyfill'); }
+
+import before from './before';
+import after from './after';
+
+export default function() {
+  return function() {
+    this.mixins.push(before);
+    this.mixins.push(after);
+  };
+}