@openaddresses/batch-schema 2.0.0 → 2.3.1

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,22 @@
 
 ## Version History
 
+### v2.3.1
+
+- :arrow_up: Update Base Deps
+
+### 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

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');
@@ -241,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(

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@openaddresses/batch-schema",
     "root": true,
-    "version": "2.0.0",
+    "version": "2.3.1",
     "description": "Strongly Validated JSON Schema support for address",
     "repository": "git@github.com:openaddresses/batch",
     "author": "ingalls <nick@ingalls.ca>",
@@ -22,10 +22,6 @@
         "tape": "^5.3.1"
     },
     "devDependencies": {
-        "@babel/eslint-parser": "^7.15.7",
-        "@babel/eslint-plugin": "^7.14.5",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/preset-env": "^7.15.6",
         "eslint": "^8.0.1",
         "eslint-plugin-node": "^11.0.0"
     }

package/routes/schema.js

@@ -1,3 +1,4 @@
+'use strict';
 const Err = require('../lib/error');
 
 async function router(schema) {

package/test/schema.srv.test.js

@@ -1,3 +1,4 @@
+'use strict';
 const test = require('tape');
 const express = require('express');
 const { Schema } = require('../');
@@ -51,6 +52,12 @@ test('GET: api/schema?method=FAKE', async (t) => {
             status: 400,
             message: 'validation error',
             messages: [{
+                keyword: 'enum',
+                dataPath: '.method',
+                schemaPath: '#/properties/method/enum',
+                params: {
+                    allowedValues: ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'TRACE', 'PATCH']
+                },
                 message: 'should be equal to one of the allowed values'
             }]
         });

package/test/schema.test.js

@@ -1,3 +1,4 @@
+'use strict';
 const fs = require('fs');
 const path = require('path');
 const test = require('tape');

package/.babelrc

@@ -1,7 +0,0 @@
-{
-    "presets": ["@babel/env"],
-    "plugins": [
-        "@babel/plugin-syntax-class-properties"
-    ]
-}
-