@openaddresses/batch-schema 1.0.1 → 2.3.0

package/.eslintrc.json

@@ -1,18 +1,16 @@
 {
     "extends": "eslint:recommended",
     "root": true,
-    "parser": "@babel/eslint-parser",
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "babelOptions": {
-            "configFile": "./.babelrc"
-        }
-    },
     "env": {
-        "node": true,
-        "es6": true
+        "node": true
+    },
+    "globals": {
+        "Map": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 13
     },
-    "plugins": [ "node", "@babel" ],
+    "plugins": [ "node" ],
     "rules": {
         "no-console": 0,
         "arrow-parens": [ "error", "always" ],

package/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+    pull_request:
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - ready_for_review
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        if: github.event.pull_request.draft == false
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  ref: ${{ github.event.pull_request.head.sha }}
+
+            - uses: actions/setup-node@v2
+              with:
+                node-version: '16'
+
+            - run: npm install
+
+            - run: npm run lint
+
+            - run: npm test
+

package/CHANGELOG.md

@@ -10,6 +10,23 @@
 
 ## Version History
 
+### v2.3.0
+
+- :rocket: Remove babel in favour of ESLint's new ECMA13 support
+
+### v2.2.0
+
+- :tada: Add support for errors with `status` set from external libraries (IE OpenAddresses/tilebase)
+
+### v2.1.0
+
+- :tada: Add more detailed schema error messages
+
+### v2.0.0
+
+- :tada: Add support for populating `default` keys in schema
+- :arrow_up: General Dep Update
+
 ### v1.0.1
 
 - :bug: Check for schema in library before looking for schema in calling project

package/index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
     Schema: require('./lib/schema'),
     Err: require('./lib/error')

package/lib/error.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * @class
  */
@@ -15,12 +17,21 @@ class PublicError {
 
     static respond(err, res, messages = []) {
         if (err instanceof PublicError) {
-
             res.status(err.status).json({
                 status: err.status,
                 message: err.safe,
                 messages: messages
             });
+
+        // Duplicate Express supported Error extensions
+        } else if (err instanceof Error && (err.status || err.statusCode)) {
+            res.status(err.status).json({
+                status: err.status || err.statusCode,
+                message: err.message || 'Generic Error',
+                messages: messages
+            });
+
+        // Handle generic errors
         } else {
             console.error(err);
 

package/lib/schema.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const { Validator } = require('express-json-validator-middleware');
 const $RefParser = require('json-schema-ref-parser');
 const path = require('path');
@@ -54,6 +56,8 @@ class Schemas {
         }
 
         this.validator = new Validator({
+            removeAdditional: true,
+            useDefaults: true,
             allErrors: true
         });
 
@@ -239,17 +243,12 @@ class Schemas {
         this.router.use((err, req, res, next) => {
             if (err instanceof ValidationError) {
                 let errs = [];
-
                 if (err.validationErrors.body) {
-                    errs = errs.concat(err.validationErrors.body.map((e) => {
-                        return { message: e.message };
-                    }));
+                    errs = errs.concat(err.validationErrors.body);
                 }
 
                 if (err.validationErrors.query) {
-                    errs = errs.concat(err.validationErrors.query.map((e) => {
-                        return { message: e.message };
-                    }));
+                    errs = errs.concat(err.validationErrors.query);
                 }
 
                 return Err.respond(