@openaddresses/batch-schema 7.4.0 → 7.5.0

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ## Version History
 
+### v7.5.0
+
+- :tada: Add support for inline JSON Schemas
+
 ### v7.4.0
 
 - :tada: Add experimental `blueprint()` function

package/lib/schema.js

@@ -71,7 +71,7 @@ export default class Schemas {
 
         // Load dynamic routes directory
         for (const r of fs.readdirSync(dirpath)) {
-            if (!opts.silent) console.error(`ok - loaded routes/${r}`);
+            if (!opts.silent) console.log(`ok - loaded routes/${r}`);
             await (await import(path.resolve(dirpath, r))).default(this, config);
         }
     }
@@ -85,7 +85,7 @@ export default class Schemas {
      * @param {boolean} opts.silent     Squelch StdOut
      */
     async blueprint(bp_class, config, opts = {}) {
-        if (!opts.silent) console.error(`ok - loaded ${bp_class}`);
+        if (!opts.silent) console.log(`ok - loaded ${bp_class.name}`);
         await bp_class.blueprint(this, config);
     }
 
@@ -140,11 +140,17 @@ export default class Schemas {
             if (!schemas[type]) continue;
 
             // TODO: Write schemas to a tmp directory so blueprints & main schemas are in the same place
-            schemas[`${type}_url`] = '../schema/' + schemas[type];
-            try {
-                schemas[type] = await $RefParser.dereference((new URL(`../schema/${schemas[type]}`, import.meta.url)).pathname);
-            } catch (err) {
-                schemas[type] = await $RefParser.dereference(`${this.schemas_path}/${schemas[type]}`);
+            if (typeof schemas[type] === 'object') {
+                schemas[`${type}_url`] = null;
+            } else if (typeof schemas[type] === 'string') {
+                schemas[`${type}_url`] = '../schema/' + schemas[type];
+                try {
+                    schemas[type] = await $RefParser.dereference((new URL(`../schema/${schemas[type]}`, import.meta.url)).pathname);
+                } catch (err) {
+                    schemas[type] = await $RefParser.dereference(`${this.schemas_path}/${schemas[type]}`);
+                }
+            } else {
+                throw new Error(`Unsupported Value in ${type} value for ${url}`);
             }
         }
 

package/package.json

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