@openaddresses/batch-schema 2.3.4 → 3.1.0

package/.eslintrc.json

@@ -8,7 +8,8 @@
         "Map": true
     },
     "parserOptions": {
-        "ecmaVersion": 13
+        "ecmaVersion": 13,
+        "sourceType": "module"
     },
     "plugins": [ "node" ],
     "rules": {
@@ -39,7 +40,6 @@
         "template-curly-spacing": [ "error", "never" ],
         "semi-spacing": "error",
         "strict": "error",
-        "node/no-unsupported-features": [ "error", { "version": 8 } ],
         "node/no-missing-require": "error",
         "valid-jsdoc": ["error", {
             "requireParamDescription": false,

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ## Version History
 
+### v3.0.1
+
+- :rocket: Add `.main` property to package.json
+
+### v3.0.0
+
+- :rocket: Update to ES Module System
+
+### v2.4.0
+
+- :tada: Add `schema.not_found()`
+
 ### v2.3.4
 
 - :arrow_up: Update base deps

package/README.md

@@ -43,6 +43,9 @@ async function server() {
         });
     });
 
+    // Handle Unmatched Routes
+    schema.not_found();
+
     // Handle Validation Errors => JSON Middleware
     schema.error();
 }
@@ -72,6 +75,15 @@ Adds a route called `GET /schema` which allows the caller to get a list of endpo
 as well as full schema details for every route. If your API is public we recommend enabling this feature, however
 if you do not wish for API routes to be published, this feature is disabled unless called.
 
+### schema.not_found
+
+Adds a middlware which will catch all routes that have not been defined and return
+a standard error object.
+
+```
+schema.not_found()
+```
+
 ### schema.error
 
 Adds a middlware which will convert validation errors into a standard JSON error format.

package/index.js

@@ -1,4 +1,7 @@
-'use strict';
+import Schema from './lib/schema.js';
+import Err from './lib/error.js';
 
-module.exports.Schema = require('./lib/schema');
-module.exports.Err = require('./lib/error')
+export {
+    Schema,
+    Err
+};

package/lib/error.js

@@ -1,9 +1,7 @@
-'use strict';
-
 /**
  * @class
  */
-class PublicError {
+export default class PublicError {
     constructor(status, err, safe, print = true) {
         // Wrap postgres errors to ensure stack trace (line nums) are returned
         if (err && err.severity) err = new Error(err);
@@ -43,5 +41,3 @@ class PublicError {
         }
     }
 }
-
-module.exports = PublicError;

package/lib/schema.js

@@ -1,11 +1,9 @@
-'use strict';
+import { Validator } from 'express-json-validator-middleware';
+import { ValidationError } from 'express-json-validator-middleware';
+import $RefParser from 'json-schema-ref-parser';
 
-const { Validator } = require('express-json-validator-middleware');
-const $RefParser = require('json-schema-ref-parser');
-const path = require('path');
-const Err = require('./error');
-const SchemaRoute = require('../routes/schema');
-const { ValidationError } = require('express-json-validator-middleware');
+import Err from './error.js';
+import SchemaRoute from '../routes/schema.js';
 
 /**
  * @class
@@ -38,7 +36,7 @@ class Param {
 /**
  * @class
  */
-class Schemas {
+export default class Schemas {
     /**
      * @constructor
      *
@@ -50,7 +48,7 @@ class Schemas {
         if (!router) throw new Error('Router Param Required');
 
         if (!opts.schemas) {
-            this.schemas_path = path.resolve(__dirname, '../schema/');
+            this.schemas_path = String(new URL('../schema/', import.meta.url)).replace('file://', '');
         } else {
             this.schemas_path = opts.schemas;
         }
@@ -121,9 +119,9 @@ class Schemas {
             if (!schemas[type]) continue;
 
             try {
-                schemas[type] = await $RefParser.dereference(path.resolve(path.resolve(__dirname, '../schema/'), schemas[type]));
+                schemas[type] = await $RefParser.dereference(`../schema/${schemas[type]}`);
             } catch (err) {
-                schemas[type] = await $RefParser.dereference(path.resolve(this.schemas_path, schemas[type]));
+                schemas[type] = await $RefParser.dereference(`${this.schemas_path}/${schemas[type]}`);
             }
         }
 
@@ -236,6 +234,19 @@ class Schemas {
         return schema;
     }
 
+    /**
+     * Catch all for unmatched routes
+     */
+    not_found() {
+        this.router.all('*', (req, res) => {
+            return res.status(404).json({
+                status: 404,
+                message: 'API endpoint does not exist!',
+                messages: []
+            });
+        });
+    }
+
     /**
      * Convert validation errors into standardized JSON Error Messages
      */
@@ -281,5 +292,3 @@ class Schemas {
         return lite;
     }
 }
-
-module.exports = Schemas;

package/package.json

@@ -1,7 +1,9 @@
 {
     "name": "@openaddresses/batch-schema",
+    "type": "module",
     "root": true,
-    "version": "2.3.4",
+    "main": "index.js",
+    "version": "3.1.0",
     "description": "Strongly Validated JSON Schema support for address",
     "repository": "git@github.com:openaddresses/batch-schema",
     "author": "ingalls <nick@ingalls.ca>",

package/routes/schema.js

@@ -1,7 +1,6 @@
-'use strict';
-const Err = require('../lib/error');
+import Err from '../lib/error.js';
 
-async function router(schema) {
+export default async function router(schema) {
     /**
      * @api {get} /api/schema List Schemas
      * @apiVersion 1.0.0
@@ -36,5 +35,3 @@ async function router(schema) {
         }
     });
 }
-
-module.exports = router;

package/test/schema.srv.test.js

@@ -1,8 +1,7 @@
-'use strict';
-const test = require('tape');
-const express = require('express');
-const { Schema } = require('../');
-const got = require('got');
+import test from 'tape';
+import express from 'express';
+import { Schema } from '../index.js';
+import got from 'got';
 
 const app = express();
 const schema = new Schema(express.Router(), {

package/test/schema.test.js

@@ -1,17 +1,16 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const test = require('tape');
+import fs from 'fs';
+import path from 'path';
+import test from 'tape';
 
-const glob = require('glob');
-const $RefParser = require('json-schema-ref-parser');
-const Ajv = require('ajv');
+import glob from 'glob';
+import $RefParser from 'json-schema-ref-parser';
+import Ajv from 'ajv';
 
 const ajv = new Ajv({
     allErrors: true
 });
 
-glob.sync(path.resolve(__dirname, '../schema/**/*.json')).forEach((source) => {
+for (const source of glob.sync('../schema/**/*.json')) {
     test(`schema/${path.parse(source).base}`, async (t) => {
         try {
             const file = fs.readFileSync(source);
@@ -31,4 +30,4 @@ glob.sync(path.resolve(__dirname, '../schema/**/*.json')).forEach((source) => {
         }
         t.end();
     });
-});
+}