Add hapi 17 support, require node 8

Author: martinj

.gitignore

@@ -1,2 +1,3 @@
 node_modules
 coverage
+package-lock.json

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 6
   - 8
 
 script:

index.js

@@ -21,23 +21,20 @@ exports.formatObject = formatObject;
 exports.formatCollection = formatCollection;
 exports.toAPI = toAPI;
 
-exports.register = function (server, options, next) {
-	server.expose('formatObject', exports.formatObject);
-	server.expose('formatObjectWithOptions', exports.formatObjectWithOptions);
-	server.expose('formatCollection', exports.formatCollection);
-	server.expose('formatCollectionWithOptions', exports.formatCollectionWithOptions);
-	server.expose('toAPI', exports.toAPI);
-
-	server.ext('onPreResponse', formatError);
-
-	server.decorate('reply', 'jsonApi', replyJsonApi);
-	server.decorate('reply', 'jsonApiFunction', replyJsonApiFunction);
-
-	next();
-};
-
-exports.register.attributes = {
-	name: 'service-jsonapi'
+exports.plugin = {
+	name: 'service-jsonapi',
+	register(server) {
+		server.expose('formatObject', exports.formatObject);
+		server.expose('formatObjectWithOptions', exports.formatObjectWithOptions);
+		server.expose('formatCollection', exports.formatCollection);
+		server.expose('formatCollectionWithOptions', exports.formatCollectionWithOptions);
+		server.expose('toAPI', exports.toAPI);
+
+		server.ext('onPreResponse', formatError);
+
+		server.decorate('toolkit', 'jsonApi', replyJsonApi);
+		server.decorate('toolkit', 'jsonApiFunction', replyJsonApiFunction);
+	}
 };
 
 const internals = {
@@ -54,7 +51,7 @@ const internals = {
  * @return {Hapi.ResponseObject}
  */
 function replyJsonApi(type, objects, options) {
-	return replyFunction.bind(this)(type, objects, options); // jshint ignore:line
+	return replyFunction.bind(this)(type, objects, options);
 }
 
 /**
@@ -67,7 +64,7 @@ function replyJsonApi(type, objects, options) {
  * @return {Function} returns curried replyFunction that accepts objects to format as a parameter.
  */
 function replyJsonApiFunction(type, options, code) {
-	return R.curry(R.bind(replyFunction, this))(type, R.__, options, code); // jshint ignore:line
+	return R.curry(R.bind(replyFunction, this))(type, R.__, options, code);
 }
 
 /**
@@ -84,13 +81,13 @@ function replyFunction(type, objects, options, code) {
 	let resp;
 	options = options || {};
 	if (objects instanceof Array) {
-		resp = this.response(formatCollection(type, objects, options)); // jshint ignore:line
+		resp = this.response(formatCollection(type, objects, options));
 	} else {
-		resp = this.response(formatObject(type, objects, options)); // jshint ignore:line
+		resp = this.response(formatObject(type, objects, options));
 	}
 
 	if (code) {
-		resp.code(code); // jshint ignore:line
+		resp.code(code);
 	}
 
 	return resp;
@@ -99,19 +96,14 @@ function replyFunction(type, objects, options, code) {
 /**
  * onPreResponse handler for formatting error objects according to JSONAPI spec.
  * @param  {Hapi.Request} req
- * @param  {Hapi.Reply} reply
+ * @param  {Hapi.Toolkit} h
  * @return {Hapi.ResponseObject}
  */
-function formatError(req, reply) {
-	let response = req.response;
+function formatError(req, h) {
+	const response = req.response;
 
 	if (!response.isBoom) {
-		return reply.continue();
-	}
-
-	if (response.data && response.data.isBoom) {
-		// fix for https://github.com/hapijs/hapi/issues/3587
-		response = response.data;
+		return h.continue;
 	}
 
 	const errorObject = {
@@ -137,7 +129,7 @@ function formatError(req, reply) {
 		}
 	}
 
-	return reply({
+	return h.response({
 		errors: [errorObject]
 	}).code(response.output.statusCode);
 }

package.json

@@ -15,7 +15,7 @@
     "release:major": "npm run ci && release-it -n -i major"
   },
   "engines": {
-    "node": ">=6.x.x"
+    "node": ">=8.x.x"
   },
   "repository": {
     "type": "git",
@@ -33,22 +33,25 @@
   "homepage": "https://github.com/aptoma/hapi-json-api",
   "eslintConfig": {
     "extends": "@aptoma/eslint-config",
+    "parserOptions": {
+      "ecmaVersion": "2017"
+    },
     "env": {
       "node": true,
       "mocha": true,
       "es6": true
     }
   },
   "dependencies": {
-    "ramda": "^0.22.1"
+    "ramda": "^0.25.0"
   },
   "devDependencies": {
-    "@aptoma/eslint-config": "^4.0.0",
-    "chai": "^3.5.0",
-    "eslint": "^3.6.1",
-    "hapi": "^16.6.2",
+    "@aptoma/eslint-config": "^7.0.1",
+    "chai": "^4.1.2",
+    "eslint": "^4.12.1",
+    "hapi": "^17.1.1",
     "istanbul": "^0.4.5",
-    "mocha": "^3.2.0",
+    "mocha": "^4.0.1",
     "mocha-only-detector": "^0.1.0",
     "release-it": "^2.4.3"
   }