feat: catch sync errors during validation

Author: AVVS

.babelrc

@@ -1,8 +1,8 @@
 {
   "plugins": [
-    "transform-strict-mode",
-    "transform-class-properties",
-    "transform-object-rest-spread"
+    "@babel/plugin-transform-strict-mode",
+    "@babel/plugin-proposal-class-properties",
+    ["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": true }]
   ],
   "env": {
     "test": {

.eslintrc

@@ -1,3 +1,4 @@
 {
-  "extends": "makeomatic"
+  "extends": "makeomatic",
+  "parser": "babel-eslint"
 }

.nycrc

@@ -3,7 +3,7 @@
     "src/**/*.js"
   ],
   "require": [
-    "babel-register"
+    "@babel/register"
   ],
   "sourceMap": false,
   "instrument": false,

package.json

@@ -30,25 +30,26 @@
   },
   "homepage": "https://github.com/makeomatic/ms-validation#readme",
   "devDependencies": {
-    "@makeomatic/deploy": "^6.1.2",
-    "babel-cli": "^6.26.0",
-    "babel-eslint": "^8.2.3",
-    "babel-plugin-istanbul": "^4.1.6",
-    "babel-plugin-transform-class-properties": "^6.11.5",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-transform-strict-mode": "^6.11.3",
-    "babel-register": "^6.26.0",
-    "codecov": "^3.0.2",
-    "cross-env": "^5.1.5",
-    "eslint": "^4.19.1",
-    "eslint-config-makeomatic": "^2.0.1",
-    "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-promise": "^3.7.0",
-    "mocha": "^5.1.1",
-    "nyc": "^11.8.0"
+    "@makeomatic/deploy": "^7.0.1",
+    "babel-eslint": "^8.2.6",
+    "babel-plugin-istanbul": "^5.0.0",
+    "@babel/cli": "^7.0.0-rc.1",
+    "@babel/core": "^7.0.0-rc.1",
+    "@babel/plugin-proposal-class-properties": "^7.0.0-rc.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-rc.1",
+    "@babel/plugin-transform-strict-mode": "^7.0.0-rc.1",
+    "@babel/register": "^7.0.0-rc.1",
+    "codecov": "^3.0.4",
+    "cross-env": "^5.2.0",
+    "eslint": "^5.3.0",
+    "eslint-config-makeomatic": "^3.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-promise": "^3.8.0",
+    "mocha": "^5.2.0",
+    "nyc": "^12.0.2"
   },
   "dependencies": {
-    "ajv": "^6.5.0",
+    "ajv": "^6.5.2",
     "ajv-keywords": "^3.2.0",
     "bluebird": "^3.5.1",
     "callsite": "^1.0.0",

src/index.js

@@ -6,7 +6,12 @@ const callsite = require('callsite');
 const glob = require('glob');
 const fs = require('fs');
 const debug = require('debug')('ms-validation');
-const { ValidationError, io, NotFoundError } = require('common-errors');
+const {
+  io,
+  ValidationError,
+  NotFoundError,
+  InvalidOperationError,
+} = require('common-errors');
 
 // this is taken from ajv, but removed
 // eslint-disable-next-line max-len
@@ -57,6 +62,16 @@ ValidationError.prototype.toJSON = function toJSON() {
 const json = filename => path.extname(filename) === '.json';
 const slashes = new RegExp(path.sep, 'g');
 
+function safeValidate(validate, doc) {
+  try {
+    validate(doc);
+  } catch (e) {
+    return e;
+  }
+
+  return true;
+}
+
 /**
  * @namespace Validator
  */
@@ -207,14 +222,17 @@ class Validator {
       return { error: new NotFoundError(`validator "${schema}" not found`) };
     }
 
-    validate(data);
+    const isValidationCompleted = safeValidate(validate, data);
+    if (isValidationCompleted !== true) {
+      return { error: new InvalidOperationError('internal validation error', isValidationCompleted), doc: data };
+    }
 
     if (validate.errors) {
       const readable = this.$ajv.errorsText(validate.errors);
 
       let onlyAdditionalProperties = true;
       const error = new ValidationError(`${schema} validation failed: ${readable}`);
-      validate.errors.forEach((err) => {
+      for (const err of validate.errors) {
         if (err.message !== 'should NOT have additional properties') {
           onlyAdditionalProperties = false;
         }
@@ -224,7 +242,7 @@ class Validator {
           : err.field;
 
         error.addError(new ValidationError(err.message, 400, field));
-      });
+      }
 
       error.code = onlyAdditionalProperties ? 417 : 400;
 
@@ -251,7 +269,14 @@ class Validator {
    */
   validate = (schema, data) => {
     const output = this.$validate(schema, data);
-    if ('error' in output) {
+
+    if (hasOwnProperty.call(output, 'error') === true) {
+      // so that it can be inspected later
+      Object.defineProperty(output.error, '$orig', {
+        value: output.doc,
+      });
+
+      // reject
       return Promise.reject(output.error);
     }
 

test/mocha.opts

@@ -1,2 +1,2 @@
---require babel-register
+--require @babel/register
 -R spec