@momsfriendlydevco/cowboy 1.0.11 → 1.0.14

package/lib/request.js

@@ -73,7 +73,7 @@ export default class CowboyRequest {
 	* @returns {Promise} A promise which will resolve when the body has been parsed
 	*/
 	async parseBody(forceType) {
-		let type = (forceType || this.headers['content-type'])
+		let type = (forceType || this.headers['content-type'] || '')
 			.replace(/^([a-z\-\/]+).*$/, '$1'); // Scrap everything after the mime
 
 		switch (type) {
@@ -107,7 +107,7 @@ export default class CowboyRequest {
 					throw new Error('Invalid text body');
 				}
 			default:
-				debug('EMPTY BODY PAYLOAD');
+				debug('Empty Body Payload');
 				this.body = {};
 		}
 	}

package/middleware/validate.js

@@ -1,10 +1,15 @@
 import joyful from '@momsfriendlydevco/joyful';
 
+/**
+* Run a Joi / Joyful validation function against a specific subkey within `req
+*
+* @param {String} subkey The subkey to run against
+* @param {Function|Object} Callback to use with Joyful to validate with
+* @returns {Void} Either a successful middleware cycle (if validatio succeeds) or a call to `res.status(400)` if failed
+*/
 export default function CowboyMiddlewareValidate(subkey, validator) {
 	return (req, res) => {
-		let joyfulResult = joyful({
-			[subkey]: validator,
-		});
+		let joyfulResult = joyful(req[subkey], validator);
 
 		if (joyfulResult !== true) { // Failed body validation?
 			return res

package/middleware/validateBody.js

@@ -1,7 +1,5 @@
 import CowboyMiddlewareValidate from '#middleware/validate';
 
 export default function CowboyMiddlewareValidateBody(validator) {
-	return CowboyMiddlewareValidate('body', {
-		body: validator,
-	})
+	return CowboyMiddlewareValidate('body', validator);
 }

package/middleware/validateParams.js

@@ -1,7 +1,5 @@
 import CowboyMiddlewareValidate from '#middleware/validate';
 
 export default function CowboyMiddlewareValidateParams(validator) {
-	return CowboyMiddlewareValidate('params', {
-		params: validator,
-	})
+	return CowboyMiddlewareValidate('params', validator);
 }

package/middleware/validateQuery.js

@@ -1,7 +1,5 @@
 import CowboyMiddlewareValidate from '#middleware/validate';
 
 export default function CowboyMiddlewareValidateQuery(validator) {
-	return CowboyMiddlewareValidate('query', {
-		query: validator,
-	})
+	return CowboyMiddlewareValidate('query', validator);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momsfriendlydevco/cowboy",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "description": "Wrapper around Cloudflare Wrangler to provide a more Express-like experience",
   "scripts": {
     "lint": "eslint ."