merge allOfs as dereference does not

airr-community · Feb 13, 2024 · b8d5490 · b8d5490
1 parent d4a41e2
commit b8d5490
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lang/js/airr.js b/lang/js/airr.js
@@ -17,6 +17,7 @@ var yaml = require('js-yaml');
 var path = require('path');
 var fs = require('fs');
 const $RefParser = require("@apidevtools/json-schema-ref-parser");
+const merge = require('allof-merge');
 
 var airr = {};
 module.exports = airr;
@@ -30,6 +31,12 @@ airr.load_schema = async function() {
 
     // dereference all $ref objects
     var spec = await $RefParser.dereference(doc);
+    // merge allOfs
+    for (let obj in spec) {
+        if (spec[obj]['type'] || spec[obj]['allOf']) {
+            spec[obj] = merge.merge(spec[obj]);
+        }
+    }
     var schema = require('./schema')(airr, spec);
     var io = require('./io')(airr);
 
@@ -45,6 +52,12 @@ airr.load_custom_schema = async function(obj, filename) {
 
     // dereference all $ref objects
     var spec = await $RefParser.dereference(doc);
+    // merge allOfs
+    for (let obj in spec) {
+        if (spec[obj]['type'] || spec[obj]['allOf']) {
+            spec[obj] = merge.merge(spec[obj]);
+        }
+    }
     var schema = require('./schema')(obj, spec);
 
     return Promise.resolve(spec);

diff --git a/lang/js/package.json b/lang/js/package.json
@@ -25,6 +25,7 @@
     "@apidevtools/json-schema-ref-parser": "^10.1.0",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
+    "allof-merge": "^0.6.5",
     "csv-parser": "^2.3.2",
     "js-yaml": "^3.10.0"
   },