Add release schema validation

build.rs

@@ -1,7 +1,7 @@
 // build.rs
 
 use serde_json::{map::Map, Value};
-use std::{env, error::Error, fs::File, path::Path};
+use std::{env, error::Error, fs::File, io::Write, path::Path};
 use wax::Glob;
 
 fn main() -> Result<(), Box<dyn Error>> {
@@ -13,29 +13,23 @@ fn main() -> Result<(), Box<dyn Error>> {
 }
 
 fn merge_version(version: u8) -> Result<(), Box<dyn Error>> {
+    // Open the file to write each schema to.
+    let out_dir = env::var_os("OUT_DIR").unwrap();
+    let dst_file = format!("pgxn-meta-v{version}.schemas.json");
+    let dst_path = Path::new(&out_dir).join(&dst_file);
+    let file = File::create(dst_path)?;
+
+    // Set up the search directory.
     let src_dir = Path::new("schema").join(format!("v{version}"));
     let glob = Glob::new("*.schema.json")?;
-    let mut defs = serde_json::map::Map::new();
 
+    // Write each file to the destination.
     for path in glob.walk(src_dir) {
         let path = &path?.into_path();
         let schema: Map<String, Value> = serde_json::from_reader(File::open(path)?)?;
-        // let id = schema["$id"].as_str().ok_or("No $id found in {path}")?;
-        let id = path.file_name().unwrap().to_str().unwrap();
-        defs.insert(id.to_string(), Value::Object(schema));
+        serde_json::to_writer(&file, &schema)?;
+        writeln!(&file)?;
     }
 
-    const ROOT: &str = "distribution.schema.json";
-    let mut dist = defs.remove(ROOT).unwrap();
-    dist.as_object_mut()
-        .unwrap()
-        .insert("$defs".to_string(), Value::Object(defs));
-
-    let out_dir = env::var_os("OUT_DIR").unwrap();
-    let dst_file = format!("pgxn-meta-v{version}.schema.json");
-    let dst_path = Path::new(&out_dir).join(&dst_file);
-    let file = File::create(dst_path)?;
-    serde_json::to_writer(&file, &dist)?;
-
     Ok(())
 }

src/valid/compiler/mod.rs

@@ -9,17 +9,19 @@ use serde_json::Value;
 /// new returns a new boon::Compiler with the schema files loaded from `dir`
 /// and configured to validate `path` and `license` formats.
 pub fn new() -> Compiler {
-    let schema_v1 = include_str!(concat!(env!("OUT_DIR"), "/pgxn-meta-v1.schema.json"));
-    let schema_v2 = include_str!(concat!(env!("OUT_DIR"), "/pgxn-meta-v2.schema.json"));
+    let schema_v1 = include_str!(concat!(env!("OUT_DIR"), "/pgxn-meta-v1.schemas.json"));
+    let schema_v2 = include_str!(concat!(env!("OUT_DIR"), "/pgxn-meta-v2.schemas.json"));
     let mut compiler = spec_compiler();
 
     for str in [schema_v1, schema_v2] {
-        let schema: Value = serde_json::from_str(str).unwrap();
-        let id = &schema["$id"]
-            .as_str()
-            .ok_or(super::ValidationError::UnknownID)
-            .unwrap();
-        compiler.add_resource(id, schema.to_owned()).unwrap();
+        for line in str.lines() {
+            let schema: Value = serde_json::from_str(line).unwrap();
+            let id = &schema["$id"]
+                .as_str()
+                .ok_or(super::ValidationError::UnknownID)
+                .unwrap();
+            compiler.add_resource(id, schema.to_owned()).unwrap();
+        }
     }
 
     compiler