@openaddresses/batch-schema 2.4.0 → 3.1.1

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.1.1
+
+- :bug: Internal schema path
+
+### 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()`

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(new URL(`../schema/${schemas[type]}`, import.meta.url));
             } catch (err) {
-                schemas[type] = await $RefParser.dereference(path.resolve(this.schemas_path, schemas[type]));
+                schemas[type] = await $RefParser.dereference(`${this.schemas_path}/${schemas[type]}`);
             }
         }
 
@@ -294,5 +292,3 @@ class Schemas {
         return lite;
     }
 }
-
-module.exports = Schemas;