significantly simplified the validator and work continues on query

Cargo.lock

@@ -817,6 +817,7 @@ dependencies = [
  "chrono",
  "fluent-uri",
  "idna",
+ "indexmap",
  "json-pointer",
  "lazy_static",
  "once_cell",

Cargo.toml

@@ -19,6 +19,7 @@ percent-encoding = "2.3.2"
 uuid = { version = "1.20.0", features = ["v4", "serde"] }
 chrono = { version = "0.4.43", features = ["serde"] }
 json-pointer = "0.3.4"
+indexmap = { version = "2.13.0", features = ["serde"] }
 
 [dev-dependencies]
 pgrx-tests = "0.16.1"
@@ -51,4 +52,4 @@ lto = "fat"
 codegen-units = 1
 
 [package.metadata.jspg]
-target_draft = "draft2020-12"
+target_draft = "draft2020-12"

GEMINI.md

@@ -67,23 +67,41 @@ Returns a debug dump of the currently cached schemas (for development/debugging)
 
 ## ✨ Custom Features & Deviations
 
-JSPG implements specific extensions to the Draft 2020-12 standard to support the Punc architecture's object-oriented needs.
+JSPG implements specific extensions to the Draft 2020-12 standard to support the Punc architecture's object-oriented needs while heavily optimizing for zero-runtime lookups.
 
-### 1. Implicit Keyword Shadowing
-Standard JSON Schema composition (`allOf`) is additive (Intersection), meaning constraints can only be tightened, not replaced. However, JSPG treats `$ref` differently when it appears alongside other properties to support object-oriented inheritance.
+### 1. Polymorphism & Referencing (`$ref`, `$family`, and Native Types)
 
-*   **Inheritance (`$ref` + `properties`)**: When a schema uses `$ref` *and* defines its own properties, JSPG implements **Smart Merge** (or Shadowing). If a property is defined in the current schema, its constraints take precedence over the inherited constraints for that specific keyword.
-    *   *Example*: If `Entity` defines `type: { const: "entity" }` and `Person` (which refs Entity) defines `type: { const: "person" }`, validation passes for "person". The local `const` shadows the inherited `const`.
-    *   *Granularity*: Shadowing is per-keyword. If `Entity` defined `type: { const: "entity", minLength: 5 }`, `Person` would shadow `const` but still inherit `minLength: 5`.
+JSPG replaces the complex, dynamic reference resolution logic of standard JSON Schema (e.g., `$defs`, relative URIs, `$dynamicRef`, `$dynamicAnchor`, `if/then/else`) with a strict, explicitly structured global `$id` system. This powers predictable code generation and blazing-fast runtime validation.
 
-*   **Composition (`allOf`)**: When using `allOf`, standard intersection rules apply. No shadowing occurs; all constraints from all branches must pass. This is used for mixins or interfaces.
+#### A. Global `$id` Conventions & Schema Buckets
+Every schema is part of a flat, globally addressable namespace. However, where a schema is defined in the database determines its physical boundaries:
+*   **Types (Entities)**: Schemas defined within a Postgres `type` represent entities. The `$id` must be exactly the type name (`person`) or suffixed (`full.person`). All schemas in this bucket receive strict Native Type Discrimination based on the physical table hierarchy.
+*   **Puncs (APIs)**: Schemas defined within a `punc` are ad-hoc containers. The `$id` must be exactly `[punc_name].request` or `[punc_name].response`. They are never entities themselves.
+*   **Enums (Domains)**: Schemas defined within an `enum` represent enum definitions. The `$id` must be exactly the enum name (`job_status`) or suffixed (`short.job_status`).
 
-### 2. Virtual Family References (`$family`)
-To support polymorphic fields (e.g., a field that accepts any "User" type), JSPG generates virtual schemas representing type hierarchies.
+#### B. Native Type Discrimination (The `variations` Property)
+Because `jspg` knows which schemas are Entities based on their origin bucket (Types), it securely and implicitly manages the `"type"` property by attaching `compiled_variations`. 
+If a schema originates in the `user` bucket, the validator does *not* rigidly require `{"type": "user"}`. Instead, it queries the physical Postgres type inheritance graph (e.g. `[entity, organization, user]`) and allows the JSON to be `{"type": "person"}` or `{"type": "bot"}` automatically, enabling seamless API polymorphism.
 
-*   **Mechanism**: When caching types, if a type defines a `hierarchy` (e.g., `["entity", "organization", "person"]`), JSPG generates a virtual `oneOf` family containing refs to all valid descendants. These can be pointed to exclusively by using `{"$family": "organization"}`. Because `$family` is a macro-pointer that swaps in the virtual union, it **must** be used exclusively in its schema object; you cannot define other properties alongside it.
+#### C. Structural Inheritance & Viral Infection (`$ref`)
+`$ref` is used exclusively for structural inheritance. 
+*   **Viral Infection**: If an anonymous schema or an ad-hoc schema (like a Punc Request) `$ref`s a strict Entity schema (like `person.light`), it *virally inherits* the `compiled_variations` of that target. This means a Punc request instantly gains the exact polymorphic security boundaries of the Entity it points to.
+*   **`$ref` never creates a Union.** When you use `$ref`, you are asking for a single, concrete struct/shape. 
 
-### 3. Strict by Default & Extensibility
+#### D. Shape Polymorphism & Virtual Unions (`$family`)
+To support polymorphic API contracts (e.g., heterogeneous arrays of generic widgets) without manually writing massive `oneOf` blocks, JSPG provides the `$family` macro.
+While `$ref` defines rigid structure, `$family` relies on an abstract **Descendants Graph**.
+
+During compilation, `jspg` temporarily tracks every `$ref` pointer globally to build a reverse-lookup graph of "Descendants".
+When `{"$family": "widget"}` is encountered, JSPG:
+1. Locates the `widget` schema in the Descendants graph.
+2. Expands the macro by finding *every* schema in the entire database that structurally `$ref`s `widget`, directly or indirectly (e.g., `stock.widget`, an anonymous object, etc.).
+3. Replaces the `$family` keyword with a standard `one_of` array containing `$ref`s to those discovered descendants.
+
+If you request `{"$family": "light.widget"}`, it simply expands to all schemas that `$ref` the generic abstract `light.widget` interface. 
+This cleanly separates **Database Physics** (derived from the Postgres `Types` bucket and viral `$ref` inheritance) from **Structural Polymorphism** (derived purely from the abstract `$ref` tree).
+
+### 2. Strict by Default & Extensibility
 JSPG enforces a "Secure by Default" philosophy. All schemas are treated as if `unevaluatedProperties: false` (and `unevaluatedItems: false`) is set, unless explicitly overridden.
 
 *   **Strictness**: By default, any property or array item in the instance data that is not explicitly defined in the schema causes a validation error. This prevents clients from sending undeclared fields or extra array elements.
@@ -92,19 +110,17 @@ JSPG enforces a "Secure by Default" philosophy. All schemas are treated as if `u
 *   **Ref Boundaries**: Strictness is reset when crossing `$ref` boundaries. The referenced schema's strictness is determined by its own definition (strict by default unless `extensible: true`), ignoring the caller's state.
 *   **Inheritance**: Strictness is inherited. A schema extending a strict parent will also be strict unless it declares itself `extensible: true`. Conversely, a schema extending a loose parent will also be loose unless it declares itself `extensible: false`.
 
+### 3. Implicit Keyword Shadowing
+Standard JSON Schema composition (`allOf`) is additive (Intersection), meaning constraints can only be tightened, not replaced. However, JSPG treats `$ref` differently when it appears alongside other properties to support object-oriented inheritance.
+
+*   **Inheritance (`$ref` + properties)**: When a schema uses `$ref` and defines its own properties, JSPG implements Smart Merge (or Shadowing). If a property is defined in the current schema, its constraints take precedence over the inherited constraints for that specific keyword.
+    *   **Example**: If Entity defines `type: { const: "entity" }` and Person (which refs Entity) defines `type: { const: "person" }`, validation passes for "person". The local const shadows the inherited const.
+    *   **Granularity**: Shadowing is per-keyword. If Entity defined `type: { const: "entity", minLength: 5 }`, Person would shadow `const` but still inherit `minLength: 5`.
+*   **Composition (`allOf`)**: When using `allOf`, standard intersection rules apply. No shadowing occurs; all constraints from all branches must pass. This is used for mixins or interfaces.
+
 ### 4. Format Leniency for Empty Strings
 To simplify frontend form logic, the format validators for `uuid`, `date-time`, and `email` explicitly allow empty strings (`""`). This treats an empty string as "present but unset" rather than "invalid format".
 
-### 5. Masking (Constructive Validation)
-JSPG supports a "Constructive Validation" mode via `mask_json_schema`. This is designed for high-performance API responses where the schema dictates the exact shape of the returned data.
-
-*   **Mechanism**: The validator traverses the instance against the schema.
-*   **Valid Fields**: Kept in the output.
-*   **Unknown/Extra Fields**: Silently removed (pruned) if `extensible: false` (default).
-*   **Invalid Fields**: Still trigger standard validation errors.
-
-This allows the database to return "raw" joined rows (e.g. `SELECT * FROM person JOIN organization ...`) and have JSPG automatically shape the result into the expected API response, removing any internal or unrelated columns not defined in the schema.
-
 ## 🏗️ Architecture
 
 The extension is written in Rust using `pgrx` and structures its schema parser to mirror the Punc Generator's design:

build.rs

@@ -49,7 +49,41 @@ fn main() {
         let val: serde_json::Value = serde_json::from_reader(file).unwrap();
 
         if let Some(arr) = val.as_array() {
-          for (i, _item) in arr.iter().enumerate() {
+          for (i, item) in arr.iter().enumerate() {
+            // Enforce test suite structure
+            let group = item.as_object().expect("Test suite must be an object");
+
+            // Validate required suite fields
+            if !group.contains_key("description")
+              || !group.contains_key("database")
+              || !group.contains_key("tests")
+            {
+              panic!(
+                "File {} index {} is missing required suite fields (description, database, tests)",
+                file_name, i
+              );
+            }
+
+            // Validate required test case fields
+            let tests = group
+              .get("tests")
+              .unwrap()
+              .as_array()
+              .expect("Tests must be an array");
+            for (t_idx, test) in tests.iter().enumerate() {
+              let t_obj = test.as_object().expect("Test case must be an object");
+              if !t_obj.contains_key("description")
+                || !t_obj.contains_key("data")
+                || !t_obj.contains_key("valid")
+                || !t_obj.contains_key("schema_id")
+              {
+                panic!(
+                  "File {} suite {} test {} is missing required case fields (description, data, valid, schema_id)",
+                  file_name, i, t_idx
+                );
+              }
+            }
+
             // Use deterministic names: test_{filename}_{index}
             let safe_filename = to_safe_identifier(file_name);
             let fn_name = format!("test_{}_{}", safe_filename, i);

src/bin/pgrx_embed.rs

@@ -1 +1 @@
-::pgrx::pgrx_embed!();
+::pgrx::pgrx_embed!();

src/database/enum.rs

@@ -0,0 +1,12 @@
+use crate::database::schema::Schema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Enum {
+  pub name: String,
+  pub module: String,
+  pub source: String,
+  pub values: Vec<String>,
+  pub schemas: Vec<Schema>,
+}

src/database/formats.rs

@@ -0,0 +1,880 @@
+use std::{
+  collections::HashMap,
+  error::Error,
+  net::{Ipv4Addr, Ipv6Addr},
+};
+
+use lazy_static::lazy_static;
+use percent_encoding::percent_decode_str;
+use serde_json::Value;
+use url::Url;
+
+// use crate::ecma; // Assuming ecma is not yet available, stubbing regex for now
+
+/// Defines format for `format` keyword.
+#[derive(Clone, Copy)]
+pub struct Format {
+  /// Name of the format
+  pub name: &'static str,
+
+  /// validates given value.
+  pub func: fn(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>>, // Ensure thread safety if needed
+}
+
+lazy_static! {
+    pub(crate) static ref FORMATS: HashMap<&'static str, Format> = {
+        let mut m = HashMap::<&'static str, Format>::new();
+        // Helper to register formats
+        let mut register = |name, func| m.insert(name, Format { name, func });
+
+        // register("regex", validate_regex); // Stubbed
+        register("ipv4", validate_ipv4);
+        register("ipv6", validate_ipv6);
+        register("hostname", validate_hostname);
+        register("idn-hostname", validate_idn_hostname);
+        register("email", validate_email);
+        register("idn-email", validate_idn_email);
+        register("date", validate_date);
+        register("time", validate_time);
+        register("date-time", validate_date_time);
+        register("duration", validate_duration);
+        register("period", validate_period);
+        register("json-pointer", validate_json_pointer);
+        register("relative-json-pointer", validate_relative_json_pointer);
+        register("uuid", validate_uuid);
+        register("uri", validate_uri);
+        register("iri", validate_iri);
+        register("uri-reference", validate_uri_reference);
+        register("iri-reference", validate_iri_reference);
+        register("uri-template", validate_uri_template);
+        m
+    };
+}
+
+/*
+fn validate_regex(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+    let Value::String(s) = v else {
+        return Ok(());
+    };
+    // ecma::convert(s).map(|_| ())
+    Ok(())
+}
+*/
+
+fn validate_ipv4(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  s.parse::<Ipv4Addr>()?;
+  Ok(())
+}
+
+fn validate_ipv6(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  s.parse::<Ipv6Addr>()?;
+  Ok(())
+}
+
+fn validate_date(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_date(s)?;
+  Ok(())
+}
+
+fn matches_char(s: &str, index: usize, ch: char) -> bool {
+  s.is_char_boundary(index) && s[index..].starts_with(ch)
+}
+
+// see https://datatracker.ietf.org/doc/html/rfc3339#section-5.6
+fn check_date(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // yyyy-mm-dd
+  if s.len() != 10 {
+    Err("must be 10 characters long")?;
+  }
+  if !matches_char(s, 4, '-') || !matches_char(s, 7, '-') {
+    Err("missing hyphen in correct place")?;
+  }
+
+  let mut ymd = s.splitn(3, '-').filter_map(|t| t.parse::<usize>().ok());
+  let (Some(y), Some(m), Some(d)) = (ymd.next(), ymd.next(), ymd.next()) else {
+    Err("non-positive year/month/day")?
+  };
+
+  if !matches!(m, 1..=12) {
+    Err(format!("{m} months in year"))?;
+  }
+  if !matches!(d, 1..=31) {
+    Err(format!("{d} days in month"))?;
+  }
+
+  match m {
+    2 => {
+      let mut feb_days = 28;
+      if y % 4 == 0 && (y % 100 != 0 || y % 400 == 0) {
+        feb_days += 1; // leap year
+      };
+      if d > feb_days {
+        Err(format!("february has {feb_days} days only"))?;
+      }
+    }
+    4 | 6 | 9 | 11 => {
+      if d > 30 {
+        Err("month has 30 days only")?;
+      }
+    }
+    _ => {}
+  }
+  Ok(())
+}
+
+fn validate_time(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_time(s)
+}
+
+fn check_time(mut str: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // min: hh:mm:ssZ
+  if str.len() < 9 {
+    Err("less than 9 characters long")?
+  }
+  if !matches_char(str, 2, ':') || !matches_char(str, 5, ':') {
+    Err("missing colon in correct place")?
+  }
+
+  // parse hh:mm:ss
+  if !str.is_char_boundary(8) {
+    Err("contains non-ascii char")?
+  }
+  let mut hms = (str[..8])
+    .splitn(3, ':')
+    .filter_map(|t| t.parse::<usize>().ok());
+  let (Some(mut h), Some(mut m), Some(s)) = (hms.next(), hms.next(), hms.next()) else {
+    Err("non-positive hour/min/sec")?
+  };
+  if h > 23 || m > 59 || s > 60 {
+    Err("hour/min/sec out of range")?
+  }
+  str = &str[8..];
+
+  // parse sec-frac if present
+  if let Some(rem) = str.strip_prefix('.') {
+    let n_digits = rem.chars().take_while(char::is_ascii_digit).count();
+    if n_digits == 0 {
+      Err("no digits in second fraction")?;
+    }
+    str = &rem[n_digits..];
+  }
+
+  if str != "z" && str != "Z" {
+    // parse time-numoffset
+    if str.len() != 6 {
+      Err("offset must be 6 characters long")?;
+    }
+    let sign: isize = match str.chars().next() {
+      Some('+') => -1,
+      Some('-') => 1,
+      _ => return Err("offset must begin with plus/minus")?,
+    };
+    str = &str[1..];
+    if !matches_char(str, 2, ':') {
+      Err("missing colon in offset at correct place")?
+    }
+
+    let mut zhm = str.splitn(2, ':').filter_map(|t| t.parse::<usize>().ok());
+    let (Some(zh), Some(zm)) = (zhm.next(), zhm.next()) else {
+      Err("non-positive hour/min in offset")?
+    };
+    if zh > 23 || zm > 59 {
+      Err("hour/min in offset out of range")?
+    }
+
+    // apply timezone
+    let mut hm = (h * 60 + m) as isize + sign * (zh * 60 + zm) as isize;
+    if hm < 0 {
+      hm += 24 * 60;
+      debug_assert!(hm >= 0);
+    }
+    let hm = hm as usize;
+    (h, m) = (hm / 60, hm % 60);
+  }
+
+  // check leap second
+  if !(s < 60 || (h == 23 && m == 59)) {
+    Err("invalid leap second")?
+  }
+  Ok(())
+}
+
+fn validate_date_time(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_date_time(s)
+}
+
+fn check_date_time(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // min: yyyy-mm-ddThh:mm:ssZ
+  if s.len() < 20 {
+    Err("less than 20 characters long")?;
+  }
+  if !s.is_char_boundary(10) || !s[10..].starts_with(['t', 'T']) {
+    Err("11th character must be t or T")?;
+  }
+  if let Err(e) = check_date(&s[..10]) {
+    Err(format!("invalid date element: {e}"))?;
+  }
+  if let Err(e) = check_time(&s[11..]) {
+    Err(format!("invalid time element: {e}"))?;
+  }
+  Ok(())
+}
+
+fn validate_duration(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_duration(s)?;
+  Ok(())
+}
+
+// see https://datatracker.ietf.org/doc/html/rfc3339#appendix-A
+fn check_duration(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // must start with 'P'
+  let Some(s) = s.strip_prefix('P') else {
+    Err("must start with P")?
+  };
+  if s.is_empty() {
+    Err("nothing after P")?
+  }
+
+  // dur-week
+  if let Some(s) = s.strip_suffix('W') {
+    if s.is_empty() {
+      Err("no number in week")?
+    }
+    if !s.chars().all(|c| c.is_ascii_digit()) {
+      Err("invalid week")?
+    }
+    return Ok(());
+  }
+
+  static UNITS: [&str; 2] = ["YMD", "HMS"];
+  for (i, s) in s.split('T').enumerate() {
+    let mut s = s;
+    if i != 0 && s.is_empty() {
+      Err("no time elements")?
+    }
+    let Some(mut units) = UNITS.get(i).cloned() else {
+      Err("more than one T")?
+    };
+    while !s.is_empty() {
+      let digit_count = s.chars().take_while(char::is_ascii_digit).count();
+      if digit_count == 0 {
+        Err("missing number")?
+      }
+      s = &s[digit_count..];
+      let Some(unit) = s.chars().next() else {
+        Err("missing unit")?
+      };
+      let Some(j) = units.find(unit) else {
+        if UNITS[i].contains(unit) {
+          Err(format!("unit {unit} out of order"))?
+        }
+        Err(format!("invalid unit {unit}"))?
+      };
+      units = &units[j + 1..];
+      s = &s[1..];
+    }
+  }
+
+  Ok(())
+}
+
+// see https://datatracker.ietf.org/doc/html/rfc3339#appendix-A
+fn validate_period(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+
+  let Some(slash) = s.find('/') else {
+    Err("missing slash")?
+  };
+
+  let (start, end) = (&s[..slash], &s[slash + 1..]);
+  if start.starts_with('P') {
+    if let Err(e) = check_duration(start) {
+      Err(format!("invalid start duration: {e}"))?
+    }
+    if let Err(e) = check_date_time(end) {
+      Err(format!("invalid end date-time: {e}"))?
+    }
+  } else {
+    if let Err(e) = check_date_time(start) {
+      Err(format!("invalid start date-time: {e}"))?
+    }
+    if end.starts_with('P') {
+      if let Err(e) = check_duration(end) {
+        Err(format!("invalid end duration: {e}"))?;
+      }
+    } else if let Err(e) = check_date_time(end) {
+      Err(format!("invalid end date-time: {e}"))?;
+    }
+  }
+  Ok(())
+}
+
+fn validate_hostname(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_hostname(s)?;
+  Ok(())
+}
+
+// see https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
+fn check_hostname(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // entire hostname (including the delimiting dots but not a trailing dot) has a maximum of 253 ASCII characters
+
+  if s.len() > 253 {
+    Err("more than 253 characters long")?
+  }
+
+  // Hostnames are composed of series of labels concatenated with dots, as are all domain names
+  for label in s.split('.') {
+    // Each label must be from 1 to 63 characters long
+    if !matches!(label.len(), 1..=63) {
+      Err("label must be 1 to 63 characters long")?;
+    }
+
+    // labels must not start or end with a hyphen
+    if label.starts_with('-') {
+      Err("label starts with hyphen")?;
+    }
+
+    if label.ends_with('-') {
+      Err("label ends with hyphen")?;
+    }
+
+    // labels may contain only the ASCII letters 'a' through 'z' (in a case-insensitive manner),
+    // the digits '0' through '9', and the hyphen ('-')
+    if let Some(ch) = label
+      .chars()
+      .find(|c| !matches!(c, 'a'..='z' | 'A'..='Z' | '0'..='9' | '-'))
+    {
+      Err(format!("invalid character {ch:?}"))?;
+    }
+
+    // labels must not contain "--" in 3rd and 4th position unless they start with "xn--"
+    if label.len() >= 4 && &label[2..4] == "--" {
+      if !label.starts_with("xn--") {
+        Err("label has -- in 3rd/4th position but does not start with xn--")?;
+      } else {
+        let (unicode, errors) = idna::domain_to_unicode(label);
+        if let Err(_) = errors {
+          Err("invalid punycode")?;
+        }
+        check_unicode_idn_constraints(&unicode)
+          .map_err(|e| format!("invalid punycode/IDN: {e}"))?;
+      }
+    }
+  }
+
+  Ok(())
+}
+
+fn validate_idn_hostname(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_idn_hostname(s)?;
+  Ok(())
+}
+
+static DISALLOWED: [char; 10] = [
+  '\u{0640}', //  ARABIC TATWEEL
+  '\u{07FA}', //  NKO LAJANYALAN
+  '\u{302E}', //  HANGUL SINGLE DOT TONE MARK
+  '\u{302F}', //  HANGUL DOUBLE DOT TONE MARK
+  '\u{3031}', //  VERTICAL KANA REPEAT MARK
+  '\u{3032}', //  VERTICAL KANA REPEAT WITH VOICED SOUND MARK
+  '\u{3033}', //  VERTICAL KANA REPEAT MARK UPPER HALF
+  '\u{3034}', //  VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HA
+  '\u{3035}', //  VERTICAL KANA REPEAT MARK LOWER HALF
+  '\u{303B}', //  VERTICAL IDEOGRAPHIC ITERATION MARK
+];
+
+fn check_idn_hostname(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let s = idna::domain_to_ascii_strict(s).map_err(|e| format!("idna error: {:?}", e))?;
+  let (unicode, errors) = idna::domain_to_unicode(&s);
+  if let Err(e) = errors {
+    Err(format!("idna decoding error: {:?}", e))?;
+  }
+  check_unicode_idn_constraints(&unicode)?;
+  check_hostname(&s)?;
+  Ok(())
+}
+
+fn check_unicode_idn_constraints(unicode: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // see https://www.rfc-editor.org/rfc/rfc5892#section-2.6
+  {
+    if unicode.contains(DISALLOWED) {
+      Err("contains disallowed character")?;
+    }
+  }
+
+  // unicode string must not contain "--" in 3rd and 4th position
+  // and must not start and end with a '-'
+  // see https://www.rfc-editor.org/rfc/rfc5891#section-4.2.3.1
+  {
+    let count: usize = unicode
+      .chars()
+      .skip(2)
+      .take(2)
+      .map(|c| if c == '-' { 1 } else { 0 })
+      .sum();
+    if count == 2 {
+      Err("unicode string must not contain '--' in 3rd and 4th position")?;
+    }
+  }
+
+  // MIDDLE DOT is allowed between 'l' characters only
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.3
+  {
+    let middle_dot = '\u{00b7}';
+    let mut s = unicode;
+    while let Some(i) = s.find(middle_dot) {
+      let prefix = &s[..i];
+      let suffix = &s[i + middle_dot.len_utf8()..];
+      if !prefix.ends_with('l') || !suffix.ends_with('l') {
+        Err("MIDDLE DOT is allowed between 'l' characters only")?;
+      }
+      s = suffix;
+    }
+  }
+
+  // Greek KERAIA must be followed by Greek character
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.4
+  {
+    let keralia = '\u{0375}';
+    let greek = '\u{0370}'..='\u{03FF}';
+    let mut s = unicode;
+    while let Some(i) = s.find(keralia) {
+      let suffix = &s[i + keralia.len_utf8()..];
+      if !suffix.starts_with(|c| greek.contains(&c)) {
+        Err("Greek KERAIA must be followed by Greek character")?;
+      }
+      s = suffix;
+    }
+  }
+
+  // Hebrew GERESH must be preceded by Hebrew character
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.5
+  //
+  // Hebrew GERSHAYIM must be preceded by Hebrew character
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.6
+  {
+    let geresh = '\u{05F3}';
+    let gereshayim = '\u{05F4}';
+    let hebrew = '\u{0590}'..='\u{05FF}';
+    for ch in [geresh, gereshayim] {
+      let mut s = unicode;
+      while let Some(i) = s.find(ch) {
+        let prefix = &s[..i];
+        if !prefix.ends_with(|c| hebrew.contains(&c)) {
+          if i == 0 {
+            Err("Hebrew GERESH must be preceded by Hebrew character")?;
+          } else {
+            Err("Hebrew GERESHYIM must be preceded by Hebrew character")?;
+          }
+        }
+        let suffix = &s[i + ch.len_utf8()..];
+        s = suffix;
+      }
+    }
+  }
+
+  // KATAKANA MIDDLE DOT must be with Hiragana, Katakana, or Han
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.7
+  {
+    let katakana_middle_dot = '\u{30FB}';
+    if unicode.contains(katakana_middle_dot) {
+      let hiragana = '\u{3040}'..='\u{309F}';
+      let katakana = '\u{30A0}'..='\u{30FF}';
+      let han = '\u{4E00}'..='\u{9FFF}'; // https://en.wikipedia.org/wiki/CJK_Unified_Ideographs_(Unicode_block): is this range correct??
+      if unicode.contains(|c| hiragana.contains(&c))
+        || unicode.contains(|c| c != katakana_middle_dot && katakana.contains(&c))
+        || unicode.contains(|c| han.contains(&c))
+      {
+        // ok
+      } else {
+        Err("KATAKANA MIDDLE DOT must be with Hiragana, Katakana, or Han")?;
+      }
+    }
+  }
+
+  // ARABIC-INDIC DIGITS and Extended Arabic-Indic Digits cannot be mixed
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.8
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.9
+  {
+    let arabic_indic_digits = '\u{0660}'..='\u{0669}';
+    let extended_arabic_indic_digits = '\u{06F0}'..='\u{06F9}';
+    if unicode.contains(|c| arabic_indic_digits.contains(&c))
+      && unicode.contains(|c| extended_arabic_indic_digits.contains(&c))
+    {
+      Err("ARABIC-INDIC DIGITS and Extended Arabic-Indic Digits cannot be mixed")?;
+    }
+  }
+
+  // ZERO WIDTH JOINER must be preceded by Virama
+  // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.2
+  {
+    let zero_width_jointer = '\u{200D}';
+    static VIRAMA: [char; 61] = [
+      '\u{094D}',
+      '\u{09CD}',
+      '\u{0A4D}',
+      '\u{0ACD}',
+      '\u{0B4D}',
+      '\u{0BCD}',
+      '\u{0C4D}',
+      '\u{0CCD}',
+      '\u{0D3B}',
+      '\u{0D3C}',
+      '\u{0D4D}',
+      '\u{0DCA}',
+      '\u{0E3A}',
+      '\u{0EBA}',
+      '\u{0F84}',
+      '\u{1039}',
+      '\u{103A}',
+      '\u{1714}',
+      '\u{1734}',
+      '\u{17D2}',
+      '\u{1A60}',
+      '\u{1B44}',
+      '\u{1BAA}',
+      '\u{1BAB}',
+      '\u{1BF2}',
+      '\u{1BF3}',
+      '\u{2D7F}',
+      '\u{A806}',
+      '\u{A82C}',
+      '\u{A8C4}',
+      '\u{A953}',
+      '\u{A9C0}',
+      '\u{AAF6}',
+      '\u{ABED}',
+      '\u{10A3F}',
+      '\u{11046}',
+      '\u{1107F}',
+      '\u{110B9}',
+      '\u{11133}',
+      '\u{11134}',
+      '\u{111C0}',
+      '\u{11235}',
+      '\u{112EA}',
+      '\u{1134D}',
+      '\u{11442}',
+      '\u{114C2}',
+      '\u{115BF}',
+      '\u{1163F}',
+      '\u{116B6}',
+      '\u{1172B}',
+      '\u{11839}',
+      '\u{1193D}',
+      '\u{1193E}',
+      '\u{119E0}',
+      '\u{11A34}',
+      '\u{11A47}',
+      '\u{11A99}',
+      '\u{11C3F}',
+      '\u{11D44}',
+      '\u{11D45}',
+      '\u{11D97}',
+    ]; // https://www.compart.com/en/unicode/combining/9
+    let mut s = unicode;
+    while let Some(i) = s.find(zero_width_jointer) {
+      let prefix = &s[..i];
+      if !prefix.ends_with(VIRAMA) {
+        Err("ZERO WIDTH JOINER must be preceded by Virama")?;
+      }
+      let suffix = &s[i + zero_width_jointer.len_utf8()..];
+      s = suffix;
+    }
+  }
+
+  Ok(())
+}
+
+fn validate_email(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_email(s)?;
+  Ok(())
+}
+
+// see https://en.wikipedia.org/wiki/Email_address
+fn check_email(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  // entire email address to be no more than 254 characters long
+  if s.len() > 254 {
+    Err("more than 254 characters long")?
+  }
+
+  // email address is generally recognized as having two parts joined with an at-sign
+  let Some(at) = s.rfind('@') else {
+    Err("missing @")?
+  };
+  let (local, domain) = (&s[..at], &s[at + 1..]);
+
+  // local part may be up to 64 characters long
+  if local.len() > 64 {
+    Err("local part more than 64 characters long")?
+  }
+
+  if local.len() > 1 && local.starts_with('"') && local.ends_with('"') {
+    // quoted
+    let local = &local[1..local.len() - 1];
+    if local.contains(['\\', '"']) {
+      Err("backslash and quote not allowed within quoted local part")?
+    }
+  } else {
+    // unquoted
+
+    if local.starts_with('.') {
+      Err("starts with dot")?
+    }
+    if local.ends_with('.') {
+      Err("ends with dot")?
+    }
+
+    // consecutive dots not allowed
+    if local.contains("..") {
+      Err("consecutive dots")?
+    }
+
+    // check allowd chars
+    if let Some(ch) = local
+      .chars()
+      .find(|c| !(c.is_ascii_alphanumeric() || ".!#$%&'*+-/=?^_`{|}~".contains(*c)))
+    {
+      Err(format!("invalid character {ch:?}"))?
+    }
+  }
+
+  // domain if enclosed in brackets, must match an IP address
+  if domain.starts_with('[') && domain.ends_with(']') {
+    let s = &domain[1..domain.len() - 1];
+    if let Some(s) = s.strip_prefix("IPv6:") {
+      if let Err(e) = s.parse::<Ipv6Addr>() {
+        Err(format!("invalid ipv6 address: {e}"))?
+      }
+      return Ok(());
+    }
+    if let Err(e) = s.parse::<Ipv4Addr>() {
+      Err(format!("invalid ipv4 address: {e}"))?
+    }
+    return Ok(());
+  }
+
+  // domain must match the requirements for a hostname
+  if let Err(e) = check_hostname(domain) {
+    Err(format!("invalid domain: {e}"))?
+  }
+
+  Ok(())
+}
+
+fn validate_idn_email(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+
+  let Some(at) = s.rfind('@') else {
+    Err("missing @")?
+  };
+  let (local, domain) = (&s[..at], &s[at + 1..]);
+
+  let local = idna::domain_to_ascii_strict(local).map_err(|e| format!("idna error: {:?}", e))?;
+  let domain = idna::domain_to_ascii_strict(domain).map_err(|e| format!("idna error: {:?}", e))?;
+  if let Err(e) = check_idn_hostname(&domain) {
+    Err(format!("invalid domain: {e}"))?
+  }
+  check_email(&format!("{local}@{domain}"))
+}
+
+fn validate_json_pointer(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  check_json_pointer(s)?;
+  Ok(())
+}
+
+// see https://www.rfc-editor.org/rfc/rfc6901#section-3
+fn check_json_pointer(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
+  if s.is_empty() {
+    return Ok(());
+  }
+  if !s.starts_with('/') {
+    Err("not starting with slash")?;
+  }
+  for token in s.split('/').skip(1) {
+    let mut chars = token.chars();
+    while let Some(ch) = chars.next() {
+      if ch == '~' {
+        if !matches!(chars.next(), Some('0' | '1')) {
+          Err("~ must be followed by 0 or 1")?;
+        }
+      } else if !matches!(ch, '\x00'..='\x2E' | '\x30'..='\x7D' | '\x7F'..='\u{10FFFF}') {
+        Err("contains disallowed character")?;
+      }
+    }
+  }
+  Ok(())
+}
+
+// see https://tools.ietf.org/html/draft-handrews-relative-json-pointer-01#section-3
+fn validate_relative_json_pointer(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+
+  // start with non-negative-integer
+  let num_digits = s.chars().take_while(char::is_ascii_digit).count();
+  if num_digits == 0 {
+    Err("must start with non-negative integer")?;
+  }
+  if num_digits > 1 && s.starts_with('0') {
+    Err("starts with zero")?;
+  }
+  let s = &s[num_digits..];
+
+  // followed by either json-pointer or '#'
+  if s == "#" {
+    return Ok(());
+  }
+  if let Err(e) = check_json_pointer(s) {
+    Err(format!("invalid json-pointer element: {e}"))?;
+  }
+  Ok(())
+}
+
+// see https://datatracker.ietf.org/doc/html/rfc4122#page-4
+fn validate_uuid(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+
+  static HEX_GROUPS: [usize; 5] = [8, 4, 4, 4, 12];
+  let mut i = 0;
+  for group in s.split('-') {
+    if i >= HEX_GROUPS.len() {
+      Err("more than 5 elements")?;
+    }
+    if group.len() != HEX_GROUPS[i] {
+      Err(format!(
+        "element {} must be {} characters long",
+        i + 1,
+        HEX_GROUPS[i]
+      ))?;
+    }
+    if let Some(ch) = group.chars().find(|c| !c.is_ascii_hexdigit()) {
+      Err(format!("non-hex character {ch:?}"))?;
+    }
+    i += 1;
+  }
+  if i != HEX_GROUPS.len() {
+    Err("must have 5 elements")?;
+  }
+  Ok(())
+}
+
+fn validate_uri(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  if fluent_uri::UriRef::parse(s.as_str())
+    .map_err(|e| e.to_string())?
+    .scheme()
+    .is_none()
+  {
+    Err("relative url")?;
+  };
+  Ok(())
+}
+
+fn validate_iri(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  match Url::parse(s) {
+    Ok(_) => Ok(()),
+    Err(url::ParseError::RelativeUrlWithoutBase) => Err("relative url")?,
+    Err(e) => Err(e)?,
+  }
+}
+
+lazy_static! {
+  static ref TEMP_URL: Url = Url::parse("http://temp.com").unwrap();
+}
+
+fn parse_uri_reference(s: &str) -> Result<Url, Box<dyn Error + Send + Sync>> {
+  if s.contains('\\') {
+    Err("contains \\\\")?;
+  }
+  Ok(TEMP_URL.join(s)?)
+}
+
+fn validate_uri_reference(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  fluent_uri::UriRef::parse(s.as_str()).map_err(|e| e.to_string())?;
+  Ok(())
+}
+
+fn validate_iri_reference(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+  parse_uri_reference(s)?;
+  Ok(())
+}
+
+fn validate_uri_template(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
+  let Value::String(s) = v else {
+    return Ok(());
+  };
+
+  let url = parse_uri_reference(s)?;
+
+  let path = url.path();
+  // path we got has curly bases percent encoded
+  let path = percent_decode_str(path).decode_utf8()?;
+
+  // ensure curly brackets are not nested and balanced
+  for part in path.as_ref().split('/') {
+    let mut want = true;
+    for got in part
+      .chars()
+      .filter(|c| matches!(c, '{' | '}'))
+      .map(|c| c == '{')
+    {
+      if got != want {
+        Err("nested curly braces")?;
+      }
+      want = !want;
+    }
+    if !want {
+      Err("no matching closing brace")?
+    }
+  }
+  Ok(())
+}

src/database/mod.rs

@@ -0,0 +1,209 @@
+pub mod r#enum;
+pub mod formats;
+pub mod page;
+pub mod punc;
+pub mod schema;
+pub mod r#type;
+
+use crate::database::r#enum::Enum;
+use crate::database::punc::Punc;
+use crate::database::schema::Schema;
+use crate::database::r#type::Type;
+use std::collections::HashMap;
+
+pub struct Database {
+  pub enums: HashMap<String, Enum>,
+  pub types: HashMap<String, Type>,
+  pub puncs: HashMap<String, Punc>,
+  pub schemas: HashMap<String, Schema>,
+}
+
+impl Database {
+  pub fn new(val: &serde_json::Value) -> Self {
+    let mut db = Self {
+      enums: HashMap::new(),
+      types: HashMap::new(),
+      puncs: HashMap::new(),
+      schemas: HashMap::new(),
+    };
+
+    if let Some(arr) = val.get("enums").and_then(|v| v.as_array()) {
+      for item in arr {
+        if let Ok(def) = serde_json::from_value::<Enum>(item.clone()) {
+          db.enums.insert(def.name.clone(), def);
+        }
+      }
+    }
+
+    if let Some(arr) = val.get("types").and_then(|v| v.as_array()) {
+      for item in arr {
+        if let Ok(def) = serde_json::from_value::<Type>(item.clone()) {
+          db.types.insert(def.name.clone(), def);
+        }
+      }
+    }
+
+    if let Some(arr) = val.get("puncs").and_then(|v| v.as_array()) {
+      for item in arr {
+        if let Ok(def) = serde_json::from_value::<Punc>(item.clone()) {
+          db.puncs.insert(def.name.clone(), def);
+        }
+      }
+    }
+
+    if let Some(arr) = val.get("schemas").and_then(|v| v.as_array()) {
+      for (i, item) in arr.iter().enumerate() {
+        if let Ok(mut schema) = serde_json::from_value::<Schema>(item.clone()) {
+          let id = schema
+            .obj
+            .id
+            .clone()
+            .unwrap_or_else(|| format!("schema_{}", i));
+          schema.obj.id = Some(id.clone());
+          db.schemas.insert(id, schema);
+        }
+      }
+    }
+
+    let _ = db.compile();
+    db
+  }
+
+  /// Organizes the graph of the database, compiling regex, format functions, and pointing schema references.
+  fn compile(&mut self) -> Result<(), String> {
+    self.collect_schemas();
+
+    // 1. Build a structural descendant graph for $family macro expansion
+    let mut direct_refs: std::collections::HashMap<String, Vec<String>> =
+      std::collections::HashMap::new();
+    for (id, schema) in &self.schemas {
+      if let Some(ref_str) = &schema.obj.ref_string {
+        direct_refs
+          .entry(ref_str.clone())
+          .or_default()
+          .push(id.clone());
+      }
+    }
+
+    let schema_ids: Vec<String> = self.schemas.keys().cloned().collect();
+
+    // 2. Expand $family macros into oneOf blocks
+    for id in &schema_ids {
+      if let Some(schema) = self.schemas.get_mut(id) {
+        schema.map_children(|mut child| {
+          Self::expand_family(&mut child, &direct_refs);
+        });
+        Self::expand_family(schema, &direct_refs);
+      }
+    }
+
+    let schemas_snap = self.schemas.clone();
+
+    // 3. Compile internals and link memory pointers
+    for id in schema_ids {
+      if let Some(schema) = self.schemas.get_mut(&id) {
+        schema.compile_internals();
+        schema.link_refs(&schemas_snap);
+      }
+    }
+
+    Ok(())
+  }
+
+  fn collect_schemas(&mut self) {
+    let mut to_insert = Vec::new();
+
+    // Pass A: Entities - Compute Variations from hierarchies
+    // `hierarchy` is an array of ancestors. E.g. `person` -> `['entity', 'user', 'person']`.
+    // We map this backward so that `user`'s allowed variations = `['user', 'person']`.
+    let mut variations_by_entity = std::collections::HashMap::new();
+    for type_def in self.types.values() {
+      for ancestor in &type_def.hierarchy {
+        variations_by_entity
+          .entry(ancestor.clone())
+          .or_insert_with(std::collections::HashSet::new)
+          .insert(type_def.name.clone());
+      }
+    }
+
+    // Now stamp all exported entity schemas with their precise physical variations
+    for (_, type_def) in &self.types {
+      let allowed_strings = variations_by_entity
+        .get(&type_def.name)
+        .cloned()
+        .unwrap_or_default();
+      for mut schema in type_def.schemas.clone() {
+        schema.stamp_variations(Some(allowed_strings.clone()));
+        schema.harvest(&mut to_insert);
+      }
+    }
+
+    // Pass B: APIs and Enums (No initial variations stamped)
+    for (_, punc_def) in &self.puncs {
+      for mut schema in punc_def.schemas.clone() {
+        schema.harvest(&mut to_insert);
+      }
+    }
+    for (_, enum_def) in &self.enums {
+      for mut schema in enum_def.schemas.clone() {
+        schema.harvest(&mut to_insert);
+      }
+    }
+
+    for (id, schema) in to_insert {
+      self.schemas.insert(id, schema);
+    }
+  }
+
+  fn expand_family(
+    schema: &mut crate::database::schema::Schema,
+    direct_refs: &std::collections::HashMap<String, Vec<String>>,
+  ) {
+    if let Some(family_target) = &schema.obj.family {
+      let mut descendants = std::collections::HashSet::new();
+      Self::collect_descendants(family_target, direct_refs, &mut descendants);
+
+      // the "$family" macro is logically replaced by an anyOf of its descendants + itself
+      let mut derived_any_of = Vec::new();
+
+      // Include the target base itself if valid (which it always is structurally)
+      let mut base_ref = crate::database::schema::SchemaObject::default();
+      base_ref.ref_string = Some(family_target.clone());
+      derived_any_of.push(std::sync::Arc::new(crate::database::schema::Schema {
+        obj: base_ref,
+        always_fail: false,
+      }));
+
+      // Sort descendants for determinism during testing
+      let mut desc_vec: Vec<String> = descendants.into_iter().collect();
+      desc_vec.sort();
+
+      for child_id in desc_vec {
+        let mut child_ref = crate::database::schema::SchemaObject::default();
+        child_ref.ref_string = Some(child_id);
+        derived_any_of.push(std::sync::Arc::new(crate::database::schema::Schema {
+          obj: child_ref,
+          always_fail: false,
+        }));
+      }
+
+      schema.obj.any_of = Some(derived_any_of);
+      // Remove family so it doesn't cause conflicts or fail the simple validation
+      schema.obj.family = None;
+    }
+  }
+
+  fn collect_descendants(
+    target: &str,
+    direct_refs: &std::collections::HashMap<String, Vec<String>>,
+    descendants: &mut std::collections::HashSet<String>,
+  ) {
+    if let Some(children) = direct_refs.get(target) {
+      for child in children {
+        if descendants.insert(child.clone()) {
+          Self::collect_descendants(child, direct_refs, descendants);
+        }
+      }
+    }
+  }
+}

src/database/page.rs

@@ -0,0 +1,35 @@
+use indexmap::IndexMap;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Page {
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub path: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub title: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub sidebar: Option<Sidebar>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub actions: Option<IndexMap<String, Action>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Sidebar {
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub category: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub priority: Option<i32>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Action {
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub punc: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub navigate: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub present: Option<String>,
+}

src/database/punc.rs

@@ -0,0 +1,20 @@
+use crate::database::page::Page;
+use crate::database::schema::Schema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Punc {
+  pub id: String,
+  pub r#type: String,
+  pub name: String,
+  pub module: String,
+  pub source: String,
+  pub description: Option<String>,
+  pub public: bool,
+  pub form: bool,
+  pub get: Option<String>,
+  pub page: Option<Page>,
+  #[serde(default)]
+  pub schemas: Vec<Schema>,
+}

src/database/relation.rs

@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Relation {
+  pub id: String,
+  pub constraint_name: String,
+  pub source_type: String,
+  #[serde(default)]
+  pub source_columns: Vec<String>,
+  pub destination_type: String,
+  #[serde(default)]
+  pub destination_columns: Vec<String>,
+  pub prefix: Option<String>,
+}

src/database/schema.rs

@@ -0,0 +1,394 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::sync::Arc;
+
+// Schema mirrors the Go Punc Generator's schema struct for consistency.
+// It is an order-preserving representation of a JSON Schema.
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct SchemaObject {
+  // Core Schema Keywords
+  #[serde(rename = "$id")]
+  pub id: Option<String>,
+  #[serde(rename = "$ref")]
+  pub ref_string: Option<String>,
+  /*
+     Note: The `Ref` field in the Go struct is a pointer populated by the linker.
+     In Rust, we might handle this differently (e.g., separate lookup or Rc/Arc),
+     so we omit the direct recursive `Ref` field for now and rely on `ref_string`.
+  */
+  pub description: Option<String>,
+  pub title: Option<String>,
+  #[serde(default)] // Allow missing type
+  #[serde(rename = "type")]
+  pub type_: Option<SchemaTypeOrArray>, // Handles string or array of strings
+
+  // Object Keywords
+  pub properties: Option<BTreeMap<String, Arc<Schema>>>,
+  #[serde(rename = "patternProperties")]
+  pub pattern_properties: Option<BTreeMap<String, Arc<Schema>>>,
+  #[serde(rename = "additionalProperties")]
+  pub additional_properties: Option<Arc<Schema>>,
+  #[serde(rename = "$family")]
+  pub family: Option<String>,
+
+  pub required: Option<Vec<String>>,
+
+  // dependencies can be schema dependencies or property dependencies
+  pub dependencies: Option<BTreeMap<String, Dependency>>,
+
+  // Array Keywords
+  #[serde(rename = "items")]
+  pub items: Option<Arc<Schema>>,
+  #[serde(rename = "prefixItems")]
+  pub prefix_items: Option<Vec<Arc<Schema>>>,
+
+  // String Validation
+  #[serde(rename = "minLength")]
+  pub min_length: Option<f64>,
+  #[serde(rename = "maxLength")]
+  pub max_length: Option<f64>,
+  pub pattern: Option<String>,
+
+  // Array Validation
+  #[serde(rename = "minItems")]
+  pub min_items: Option<f64>,
+  #[serde(rename = "maxItems")]
+  pub max_items: Option<f64>,
+  #[serde(rename = "uniqueItems")]
+  pub unique_items: Option<bool>,
+  #[serde(rename = "contains")]
+  pub contains: Option<Arc<Schema>>,
+  #[serde(rename = "minContains")]
+  pub min_contains: Option<f64>,
+  #[serde(rename = "maxContains")]
+  pub max_contains: Option<f64>,
+
+  // Object Validation
+  #[serde(rename = "minProperties")]
+  pub min_properties: Option<f64>,
+  #[serde(rename = "maxProperties")]
+  pub max_properties: Option<f64>,
+  #[serde(rename = "propertyNames")]
+  pub property_names: Option<Arc<Schema>>,
+
+  // Numeric Validation
+  pub format: Option<String>,
+  #[serde(rename = "enum")]
+  pub enum_: Option<Vec<Value>>, // `enum` is a reserved keyword in Rust
+  #[serde(
+    default,
+    rename = "const",
+    deserialize_with = "crate::validator::util::deserialize_some"
+  )]
+  pub const_: Option<Value>,
+
+  // Numeric Validation
+  #[serde(rename = "multipleOf")]
+  pub multiple_of: Option<f64>,
+  pub minimum: Option<f64>,
+  pub maximum: Option<f64>,
+  #[serde(rename = "exclusiveMinimum")]
+  pub exclusive_minimum: Option<f64>,
+  #[serde(rename = "exclusiveMaximum")]
+  pub exclusive_maximum: Option<f64>,
+
+  // Combining Keywords
+  #[serde(rename = "allOf")]
+  pub all_of: Option<Vec<Arc<Schema>>>,
+  #[serde(rename = "anyOf")]
+  pub any_of: Option<Vec<Arc<Schema>>>,
+  #[serde(rename = "oneOf")]
+  pub one_of: Option<Vec<Arc<Schema>>>,
+  #[serde(rename = "not")]
+  pub not: Option<Arc<Schema>>,
+  #[serde(rename = "if")]
+  pub if_: Option<Arc<Schema>>,
+  #[serde(rename = "then")]
+  pub then_: Option<Arc<Schema>>,
+  #[serde(rename = "else")]
+  pub else_: Option<Arc<Schema>>,
+
+  // Custom Vocabularies
+  pub form: Option<Vec<String>>,
+  pub display: Option<Vec<String>>,
+  #[serde(rename = "enumNames")]
+  pub enum_names: Option<Vec<String>>,
+  pub control: Option<String>,
+  pub actions: Option<BTreeMap<String, Action>>,
+  pub computer: Option<String>,
+  #[serde(default)]
+  pub extensible: Option<bool>,
+
+  // Compiled Fields (Hidden from JSON/Serde)
+  #[serde(skip)]
+  pub compiled_ref: Option<Arc<Schema>>,
+  #[serde(skip)]
+  pub compiled_variations: Option<std::collections::HashSet<String>>,
+  #[serde(skip)]
+  pub compiled_format: Option<CompiledFormat>,
+  #[serde(skip)]
+  pub compiled_pattern: Option<CompiledRegex>,
+  #[serde(skip)]
+  pub compiled_pattern_properties: Option<Vec<(CompiledRegex, Arc<Schema>)>>,
+}
+
+/// Represents a compiled format validator
+#[derive(Clone)]
+pub enum CompiledFormat {
+  Func(fn(&serde_json::Value) -> Result<(), Box<dyn std::error::Error + Send + Sync>>),
+  Regex(regex::Regex),
+}
+
+impl std::fmt::Debug for CompiledFormat {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    match self {
+      CompiledFormat::Func(_) => write!(f, "CompiledFormat::Func(...)"),
+      CompiledFormat::Regex(r) => write!(f, "CompiledFormat::Regex({:?})", r),
+    }
+  }
+}
+
+/// A wrapper for compiled regex patterns
+#[derive(Debug, Clone)]
+pub struct CompiledRegex(pub regex::Regex);
+
+#[derive(Debug, Clone, Serialize)]
+pub struct Schema {
+  #[serde(flatten)]
+  pub obj: SchemaObject,
+  #[serde(skip)]
+  pub always_fail: bool,
+}
+
+impl Default for Schema {
+  fn default() -> Self {
+    Schema {
+      obj: SchemaObject::default(),
+      always_fail: false,
+    }
+  }
+}
+
+impl std::ops::Deref for Schema {
+  type Target = SchemaObject;
+  fn deref(&self) -> &Self::Target {
+    &self.obj
+  }
+}
+impl std::ops::DerefMut for Schema {
+  fn deref_mut(&mut self) -> &mut Self::Target {
+    &mut self.obj
+  }
+}
+
+impl Schema {
+  pub fn compile_internals(&mut self) {
+    self.map_children(|child| child.compile_internals());
+
+    if let Some(format_str) = &self.obj.format {
+      if let Some(fmt) = crate::database::formats::FORMATS.get(format_str.as_str()) {
+        self.obj.compiled_format = Some(crate::database::schema::CompiledFormat::Func(fmt.func));
+      }
+    }
+
+    if let Some(pattern_str) = &self.obj.pattern {
+      if let Ok(re) = regex::Regex::new(pattern_str) {
+        self.obj.compiled_pattern = Some(crate::database::schema::CompiledRegex(re));
+      }
+    }
+
+    if let Some(pattern_props) = &self.obj.pattern_properties {
+      let mut compiled = Vec::new();
+      for (k, v) in pattern_props {
+        if let Ok(re) = regex::Regex::new(k) {
+          compiled.push((crate::database::schema::CompiledRegex(re), v.clone()));
+        }
+      }
+      if !compiled.is_empty() {
+        self.obj.compiled_pattern_properties = Some(compiled);
+      }
+    }
+  }
+
+  pub fn link_refs(&mut self, schemas: &std::collections::HashMap<String, Schema>) {
+    if let Some(ref_str) = &self.obj.ref_string {
+      if let Some(target) = schemas.get(ref_str) {
+        self.obj.compiled_ref = Some(Arc::new(target.clone()));
+
+        // Viral Infection: Inherit physical entity boundaries across the $ref pointer recursively
+        if self.obj.compiled_variations.is_none() {
+          let mut visited = std::collections::HashSet::new();
+          self.obj.compiled_variations = Self::resolve_variations(ref_str, schemas, &mut visited);
+        }
+      }
+    }
+    self.map_children(|child| child.link_refs(schemas));
+  }
+
+  fn resolve_variations(
+    ref_str: &str,
+    schemas: &std::collections::HashMap<String, Schema>,
+    visited: &mut std::collections::HashSet<String>,
+  ) -> Option<std::collections::HashSet<String>> {
+    if !visited.insert(ref_str.to_string()) {
+      return None; // Cycle detected
+    }
+
+    if let Some(target) = schemas.get(ref_str) {
+      if let Some(vars) = &target.obj.compiled_variations {
+        return Some(vars.clone());
+      }
+      if let Some(next_ref) = &target.obj.ref_string {
+        return Self::resolve_variations(next_ref, schemas, visited);
+      }
+    }
+    None
+  }
+
+  pub fn stamp_variations(&mut self, variations: Option<std::collections::HashSet<String>>) {
+    self.obj.compiled_variations = variations.clone();
+    self.map_children(|child| child.stamp_variations(variations.clone()));
+  }
+
+  pub fn harvest(&mut self, to_insert: &mut Vec<(String, Schema)>) {
+    if let Some(id) = &self.obj.id {
+      to_insert.push((id.clone(), self.clone()));
+    }
+    self.map_children(|child| child.harvest(to_insert));
+  }
+
+  pub fn map_children<F>(&mut self, mut f: F)
+  where
+    F: FnMut(&mut Schema),
+  {
+    if let Some(props) = &mut self.obj.properties {
+      for (_, v) in props {
+        let mut inner = (**v).clone();
+        f(&mut inner);
+        *v = Arc::new(inner);
+      }
+    }
+
+    if let Some(pattern_props) = &mut self.obj.pattern_properties {
+      for (_, v) in pattern_props {
+        let mut inner = (**v).clone();
+        f(&mut inner);
+        *v = Arc::new(inner);
+      }
+    }
+
+    let mut map_arr = |arr: &mut Vec<Arc<Schema>>| {
+      for v in arr.iter_mut() {
+        let mut inner = (**v).clone();
+        f(&mut inner);
+        *v = Arc::new(inner);
+      }
+    };
+
+    if let Some(arr) = &mut self.obj.prefix_items {
+      map_arr(arr);
+    }
+    if let Some(arr) = &mut self.obj.all_of {
+      map_arr(arr);
+    }
+    if let Some(arr) = &mut self.obj.any_of {
+      map_arr(arr);
+    }
+    if let Some(arr) = &mut self.obj.one_of {
+      map_arr(arr);
+    }
+
+    let mut map_opt = |opt: &mut Option<Arc<Schema>>| {
+      if let Some(v) = opt {
+        let mut inner = (**v).clone();
+        f(&mut inner);
+        *v = Arc::new(inner);
+      }
+    };
+
+    map_opt(&mut self.obj.additional_properties);
+    map_opt(&mut self.obj.items);
+    map_opt(&mut self.obj.contains);
+    map_opt(&mut self.obj.property_names);
+    map_opt(&mut self.obj.not);
+    map_opt(&mut self.obj.if_);
+    map_opt(&mut self.obj.then_);
+    map_opt(&mut self.obj.else_);
+  }
+}
+
+impl<'de> Deserialize<'de> for Schema {
+  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+  where
+    D: serde::Deserializer<'de>,
+  {
+    let v: Value = Deserialize::deserialize(deserializer)?;
+
+    if let Some(b) = v.as_bool() {
+      let mut obj = SchemaObject::default();
+      if b {
+        obj.extensible = Some(true);
+      }
+      return Ok(Schema {
+        obj,
+        always_fail: !b,
+      });
+    }
+    let mut obj: SchemaObject =
+      serde_json::from_value(v.clone()).map_err(serde::de::Error::custom)?;
+
+    // If a schema is effectively empty (except for potentially carrying an ID),
+    // it functions as a boolean `true` schema in Draft2020 which means it should not
+    // restrict additional properties natively
+    let is_empty = obj.type_.is_none()
+      && obj.properties.is_none()
+      && obj.pattern_properties.is_none()
+      && obj.additional_properties.is_none()
+      && obj.required.is_none()
+      && obj.dependencies.is_none()
+      && obj.items.is_none()
+      && obj.prefix_items.is_none()
+      && obj.contains.is_none()
+      && obj.format.is_none()
+      && obj.enum_.is_none()
+      && obj.const_.is_none()
+      && obj.all_of.is_none()
+      && obj.any_of.is_none()
+      && obj.one_of.is_none()
+      && obj.not.is_none()
+      && obj.if_.is_none()
+      && obj.then_.is_none()
+      && obj.else_.is_none()
+      && obj.ref_string.is_none()
+      && obj.family.is_none();
+
+    if is_empty && obj.extensible.is_none() {
+      obj.extensible = Some(true);
+    }
+
+    Ok(Schema {
+      obj,
+      always_fail: false,
+    })
+  }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum SchemaTypeOrArray {
+  Single(String),
+  Multiple(Vec<String>),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Action {
+  pub navigate: Option<String>,
+  pub punc: Option<String>,
+}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum Dependency {
+  Props(Vec<String>),
+  Schema(Arc<Schema>),
+}

src/database/type.rs

@@ -0,0 +1,35 @@
+use crate::database::schema::Schema;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[serde(default)]
+pub struct Type {
+  pub id: String,
+  pub r#type: String,
+  pub name: String,
+  pub module: String,
+  pub source: String,
+  #[serde(default)]
+  pub historical: bool,
+  #[serde(default)]
+  pub sensitive: bool,
+  #[serde(default)]
+  pub ownable: bool,
+  pub longevity: Option<i32>,
+  #[serde(default)]
+  pub hierarchy: Vec<String>,
+  pub relationship: Option<bool>,
+  #[serde(default)]
+  pub fields: Vec<String>,
+  pub grouped_fields: Option<Value>,
+  #[serde(default)]
+  pub lookup_fields: Vec<String>,
+  #[serde(default)]
+  pub null_fields: Vec<String>,
+  #[serde(default)]
+  pub default_fields: Vec<String>,
+  pub field_types: Option<Value>,
+  #[serde(default)]
+  pub schemas: Vec<Schema>,
+}

src/jspg.rs

@@ -0,0 +1,29 @@
+use crate::database::Database;
+use crate::merger::Merger;
+use crate::queryer::Queryer;
+use crate::validator::Validator;
+use std::sync::Arc;
+
+pub struct Jspg {
+  pub database: Arc<Database>,
+  pub validator: Validator,
+  pub queryer: Queryer,
+  pub merger: Merger,
+}
+
+impl Jspg {
+  pub fn new(database_val: &serde_json::Value) -> Self {
+    let database_instance = Database::new(database_val);
+    let database = Arc::new(database_instance);
+    let validator = Validator::new(std::sync::Arc::new(database.schemas.clone()));
+    let queryer = Queryer::new();
+    let merger = Merger::new();
+
+    Self {
+      database,
+      validator,
+      queryer,
+      merger,
+    }
+  }
+}

src/lib.rs

@@ -2,7 +2,11 @@ use pgrx::*;
 
 pg_module_magic!();
 
+pub mod database;
 pub mod drop;
+pub mod jspg;
+pub mod merger;
+pub mod queryer;
 pub mod validator;
 
 use serde_json::json;
@@ -12,100 +16,38 @@ lazy_static::lazy_static! {
   // Global Atomic Swap Container:
   // - RwLock: To protect the SWAP of the Option.
   // - Option: Because it starts empty.
-  // - Arc: Because multiple running threads might hold the OLD validator while we swap.
-  // - Validator: It immutably owns the Registry.
-  static ref GLOBAL_VALIDATOR: RwLock<Option<Arc<validator::Validator>>> = RwLock::new(None);
+  // - Arc: Because multiple running threads might hold the OLD engine while we swap.
+  // - Jspg: The root semantic engine encapsulating the database metadata, validator, queryer, and merger.
+  static ref GLOBAL_JSPG: RwLock<Option<Arc<jspg::Jspg>>> = RwLock::new(None);
 }
 
 #[pg_extern(strict)]
-pub fn cache_json_schemas(enums: JsonB, types: JsonB, puncs: JsonB) -> JsonB {
-  // 1 & 2. Build Registry, Families, and Wrap in Validator all in one shot
-  let new_validator = crate::validator::Validator::from_punc_definition(
-    Some(&enums.0),
-    Some(&types.0),
-    Some(&puncs.0),
-  );
-  let new_arc = Arc::new(new_validator);
+pub fn jspg_cache_database(database: JsonB) -> JsonB {
+  let new_jspg = crate::jspg::Jspg::new(&database.0);
+  let new_arc = Arc::new(new_jspg);
 
   // 3. ATOMIC SWAP
   {
-    let mut lock = GLOBAL_VALIDATOR.write().unwrap();
+    let mut lock = GLOBAL_JSPG.write().unwrap();
     *lock = Some(new_arc);
   }
 
   let drop = crate::drop::Drop::success();
   JsonB(serde_json::to_value(drop).unwrap())
 }
-
-#[pg_extern(strict, parallel_safe)]
-pub fn mask_json_schema(schema_id: &str, instance: JsonB) -> JsonB {
-  // 1. Acquire Snapshot
-  let validator_arc = {
-    let lock = GLOBAL_VALIDATOR.read().unwrap();
-    lock.clone()
-  };
-
-  // 2. Validate (Lock-Free)
-  if let Some(validator) = validator_arc {
-    // We need a mutable copy of the value to mask it
-    let mut mutable_instance = instance.0.clone();
-
-    match validator.mask(schema_id, &mut mutable_instance) {
-      Ok(result) => {
-        // If valid, return the MASKED instance
-        if result.is_valid() {
-          let drop = crate::drop::Drop::success_with_val(mutable_instance);
-          JsonB(serde_json::to_value(drop).unwrap())
-        } else {
-          // If invalid, return errors (Schema Validation Errors)
-          let errors: Vec<crate::drop::Error> = result
-            .errors
-            .into_iter()
-            .map(|e| crate::drop::Error {
-              code: e.code,
-              message: e.message,
-              details: crate::drop::ErrorDetails { path: e.path },
-            })
-            .collect();
-          let drop = crate::drop::Drop::with_errors(errors);
-          JsonB(serde_json::to_value(drop).unwrap())
-        }
-      }
-      Err(e) => {
-        // Schema Not Found or other fatal error
-        let error = crate::drop::Error {
-          code: e.code,
-          message: e.message,
-          details: crate::drop::ErrorDetails { path: e.path },
-        };
-        let drop = crate::drop::Drop::with_errors(vec![error]);
-        JsonB(serde_json::to_value(drop).unwrap())
-      }
-    }
-  } else {
-    let error = crate::drop::Error {
-      code: "VALIDATOR_NOT_INITIALIZED".to_string(),
-      message: "JSON Schemas have not been cached yet. Run cache_json_schemas()".to_string(),
-      details: crate::drop::ErrorDetails {
-        path: "".to_string(),
-      },
-    };
-    let drop = crate::drop::Drop::with_errors(vec![error]);
-    JsonB(serde_json::to_value(drop).unwrap())
-  }
-}
+// `mask_json_schema` has been removed as the mask architecture is fully replaced by Spi string queries during DB interactions.
 
 #[pg_extern(strict, parallel_safe)]
 pub fn validate_json_schema(schema_id: &str, instance: JsonB) -> JsonB {
   // 1. Acquire Snapshot
-  let validator_arc = {
-    let lock = GLOBAL_VALIDATOR.read().unwrap();
+  let jspg_arc = {
+    let lock = GLOBAL_JSPG.read().unwrap();
     lock.clone()
   };
 
   // 2. Validate (Lock-Free)
-  if let Some(validator) = validator_arc {
-    match validator.validate(schema_id, &instance.0) {
+  if let Some(engine) = jspg_arc {
+    match engine.validator.validate(schema_id, &instance.0) {
       Ok(result) => {
         if result.is_valid() {
           let drop = crate::drop::Drop::success();
@@ -137,7 +79,7 @@ pub fn validate_json_schema(schema_id: &str, instance: JsonB) -> JsonB {
   } else {
     let error = crate::drop::Error {
       code: "VALIDATOR_NOT_INITIALIZED".to_string(),
-      message: "JSON Schemas have not been cached yet. Run cache_json_schemas()".to_string(),
+      message: "The JSPG database has not been cached yet. Run jspg_cache_database()".to_string(),
       details: crate::drop::ErrorDetails {
         path: "".to_string(),
       },
@@ -149,8 +91,11 @@ pub fn validate_json_schema(schema_id: &str, instance: JsonB) -> JsonB {
 
 #[pg_extern(strict, parallel_safe)]
 pub fn json_schema_cached(schema_id: &str) -> bool {
-  if let Some(validator) = GLOBAL_VALIDATOR.read().unwrap().as_ref() {
-    match validator.validate(schema_id, &serde_json::Value::Null) {
+  if let Some(engine) = GLOBAL_JSPG.read().unwrap().as_ref() {
+    match engine
+      .validator
+      .validate(schema_id, &serde_json::Value::Null)
+    {
       Err(e) if e.code == "SCHEMA_NOT_FOUND" => false,
       _ => true,
     }
@@ -161,7 +106,7 @@ pub fn json_schema_cached(schema_id: &str) -> bool {
 
 #[pg_extern(strict)]
 pub fn clear_json_schemas() -> JsonB {
-  let mut lock = GLOBAL_VALIDATOR.write().unwrap();
+  let mut lock = GLOBAL_JSPG.write().unwrap();
   *lock = None;
   let drop = crate::drop::Drop::success();
   JsonB(serde_json::to_value(drop).unwrap())
@@ -169,8 +114,8 @@ pub fn clear_json_schemas() -> JsonB {
 
 #[pg_extern(strict, parallel_safe)]
 pub fn show_json_schemas() -> JsonB {
-  if let Some(validator) = GLOBAL_VALIDATOR.read().unwrap().as_ref() {
-    let mut keys = validator.get_schema_ids();
+  if let Some(engine) = GLOBAL_JSPG.read().unwrap().as_ref() {
+    let mut keys = engine.validator.get_schema_ids();
     keys.sort();
     let drop = crate::drop::Drop::success_with_val(json!(keys));
     JsonB(serde_json::to_value(drop).unwrap())

src/merger/mod.rs

@@ -0,0 +1,9 @@
+pub struct Merger {
+  // To be implemented
+}
+
+impl Merger {
+  pub fn new() -> Self {
+    Self {}
+  }
+}

src/queryer/mod.rs

@@ -0,0 +1,9 @@
+pub struct Queryer {
+  // To be implemented
+}
+
+impl Queryer {
+  pub fn new() -> Self {
+    Self {}
+  }
+}

src/tests/fixtures.rs

@@ -1,28 +1,4 @@
 
-#[pg_test]
-fn test_anchor_0() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_anchor_1() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[pg_test]
-fn test_anchor_2() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[pg_test]
-fn test_anchor_3() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
-}
-
 #[pg_test]
 fn test_content_0() {
     let path = format!("{}/tests/fixtures/content.json", env!("CARGO_MANIFEST_DIR"));
@@ -107,54 +83,6 @@ fn test_min_items_2() {
     crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
 }
 
-#[pg_test]
-fn test_puncs_0() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_1() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_2() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_3() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_4() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 4).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_5() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 5).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_6() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 6).unwrap();
-}
-
-#[pg_test]
-fn test_puncs_7() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 7).unwrap();
-}
-
 #[pg_test]
 fn test_additional_properties_0() {
     let path = format!("{}/tests/fixtures/additionalProperties.json", env!("CARGO_MANIFEST_DIR"));
@@ -173,6 +101,72 @@ fn test_additional_properties_2() {
     crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
 }
 
+#[pg_test]
+fn test_dependencies_0() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_1() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_2() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_3() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_4() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 4).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_5() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 5).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_6() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 6).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_7() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 7).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_8() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 8).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_9() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 9).unwrap();
+}
+
+#[pg_test]
+fn test_dependencies_10() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 10).unwrap();
+}
+
 #[pg_test]
 fn test_exclusive_minimum_0() {
     let path = format!("{}/tests/fixtures/exclusiveMinimum.json", env!("CARGO_MANIFEST_DIR"));
@@ -347,6 +341,18 @@ fn test_any_of_9() {
     crate::validator::util::run_test_file_at_index(&path, 9).unwrap();
 }
 
+#[pg_test]
+fn test_families_0() {
+    let path = format!("{}/tests/fixtures/families.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
+}
+
+#[pg_test]
+fn test_families_1() {
+    let path = format!("{}/tests/fixtures/families.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
+}
+
 #[pg_test]
 fn test_property_names_0() {
     let path = format!("{}/tests/fixtures/propertyNames.json", env!("CARGO_MANIFEST_DIR"));
@@ -389,18 +395,6 @@ fn test_property_names_6() {
     crate::validator::util::run_test_file_at_index(&path, 6).unwrap();
 }
 
-#[pg_test]
-fn test_boolean_schema_0() {
-    let path = format!("{}/tests/fixtures/boolean_schema.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_boolean_schema_1() {
-    let path = format!("{}/tests/fixtures/boolean_schema.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
 #[pg_test]
 fn test_not_0() {
     let path = format!("{}/tests/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));
@@ -851,42 +845,6 @@ fn test_max_length_1() {
     crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
 }
 
-#[pg_test]
-fn test_dependent_schemas_0() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_schemas_1() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_schemas_2() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_schemas_3() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_schemas_4() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 4).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_schemas_5() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 5).unwrap();
-}
-
 #[pg_test]
 fn test_exclusive_maximum_0() {
     let path = format!("{}/tests/fixtures/exclusiveMaximum.json", env!("CARGO_MANIFEST_DIR"));
@@ -1013,6 +971,18 @@ fn test_one_of_12() {
     crate::validator::util::run_test_file_at_index(&path, 12).unwrap();
 }
 
+#[pg_test]
+fn test_boolean_schema_0() {
+    let path = format!("{}/tests/fixtures/booleanSchema.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
+}
+
+#[pg_test]
+fn test_boolean_schema_1() {
+    let path = format!("{}/tests/fixtures/booleanSchema.json", env!("CARGO_MANIFEST_DIR"));
+    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
+}
+
 #[pg_test]
 fn test_if_then_else_0() {
     let path = format!("{}/tests/fixtures/if-then-else.json", env!("CARGO_MANIFEST_DIR"));
@@ -1115,30 +1085,6 @@ fn test_pattern_1() {
     crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
 }
 
-#[pg_test]
-fn test_masking_0() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_masking_1() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[pg_test]
-fn test_masking_2() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[pg_test]
-fn test_masking_3() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
-}
-
 #[pg_test]
 fn test_max_properties_0() {
     let path = format!("{}/tests/fixtures/maxProperties.json", env!("CARGO_MANIFEST_DIR"));
@@ -1163,36 +1109,6 @@ fn test_max_properties_3() {
     crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
 }
 
-#[pg_test]
-fn test_dependent_required_0() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_required_1() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_required_2() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_required_3() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[pg_test]
-fn test_dependent_required_4() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 4).unwrap();
-}
-
 #[pg_test]
 fn test_required_0() {
     let path = format!("{}/tests/fixtures/required.json", env!("CARGO_MANIFEST_DIR"));
@@ -1721,150 +1637,6 @@ fn test_ref_15() {
     crate::validator::util::run_test_file_at_index(&path, 15).unwrap();
 }
 
-#[pg_test]
-fn test_ref_16() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 16).unwrap();
-}
-
-#[pg_test]
-fn test_ref_17() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 17).unwrap();
-}
-
-#[pg_test]
-fn test_ref_18() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 18).unwrap();
-}
-
-#[pg_test]
-fn test_ref_19() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 19).unwrap();
-}
-
-#[pg_test]
-fn test_ref_20() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 20).unwrap();
-}
-
-#[pg_test]
-fn test_ref_21() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 21).unwrap();
-}
-
-#[pg_test]
-fn test_ref_22() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 22).unwrap();
-}
-
-#[pg_test]
-fn test_ref_23() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 23).unwrap();
-}
-
-#[pg_test]
-fn test_ref_24() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 24).unwrap();
-}
-
-#[pg_test]
-fn test_ref_25() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 25).unwrap();
-}
-
-#[pg_test]
-fn test_ref_26() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 26).unwrap();
-}
-
-#[pg_test]
-fn test_ref_27() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 27).unwrap();
-}
-
-#[pg_test]
-fn test_ref_28() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 28).unwrap();
-}
-
-#[pg_test]
-fn test_ref_29() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 29).unwrap();
-}
-
-#[pg_test]
-fn test_ref_30() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 30).unwrap();
-}
-
-#[pg_test]
-fn test_ref_31() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 31).unwrap();
-}
-
-#[pg_test]
-fn test_ref_32() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 32).unwrap();
-}
-
-#[pg_test]
-fn test_ref_33() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 33).unwrap();
-}
-
-#[pg_test]
-fn test_ref_34() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 34).unwrap();
-}
-
-#[pg_test]
-fn test_ref_35() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 35).unwrap();
-}
-
-#[pg_test]
-fn test_ref_36() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 36).unwrap();
-}
-
-#[pg_test]
-fn test_ref_37() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 37).unwrap();
-}
-
-#[pg_test]
-fn test_ref_38() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 38).unwrap();
-}
-
-#[pg_test]
-fn test_ref_39() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 39).unwrap();
-}
-
 #[pg_test]
 fn test_maximum_0() {
     let path = format!("{}/tests/fixtures/maximum.json", env!("CARGO_MANIFEST_DIR"));
@@ -1960,129 +1732,3 @@ fn test_contains_8() {
     let path = format!("{}/tests/fixtures/contains.json", env!("CARGO_MANIFEST_DIR"));
     crate::validator::util::run_test_file_at_index(&path, 8).unwrap();
 }
-
-#[pg_test]
-fn test_dynamic_ref_0() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_1() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_2() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_3() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_4() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 4).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_5() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 5).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_6() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 6).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_7() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 7).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_8() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 8).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_9() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 9).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_10() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 10).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_11() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 11).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_12() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 12).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_13() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 13).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_14() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 14).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_15() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 15).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_16() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 16).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_17() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 17).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_18() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 18).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_19() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 19).unwrap();
-}
-
-#[pg_test]
-fn test_dynamic_ref_20() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    crate::validator::util::run_test_file_at_index(&path, 20).unwrap();
-}

src/validator/compiler.rs

@@ -1,394 +0,0 @@
-use crate::validator::schema::Schema;
-use regex::Regex;
-use serde_json::Value;
-// use std::collections::HashMap;
-use std::error::Error;
-use std::sync::Arc;
-
-/// Represents a compiled format validator
-#[derive(Debug, Clone)]
-pub enum CompiledFormat {
-  /// A simple function pointer validator
-  Func(fn(&Value) -> Result<(), Box<dyn Error + Send + Sync>>),
-  /// A regex-based validator
-  Regex(Regex),
-}
-
-/// A wrapper for compiled regex patterns
-#[derive(Debug, Clone)]
-pub struct CompiledRegex(pub Regex);
-
-/// The Compiler is responsible for pre-calculating high-cost schema operations
-pub struct Compiler;
-
-impl Compiler {
-  /// Internal: Compiles formats and regexes in-place
-  fn compile_formats_and_regexes(schema: &mut Schema) {
-    // 1. Compile Format
-    if let Some(format_str) = &schema.format {
-      if let Some(fmt) = crate::validator::formats::FORMATS.get(format_str.as_str()) {
-        schema.compiled_format = Some(CompiledFormat::Func(fmt.func));
-      }
-    }
-
-    // 2. Compile Pattern (regex)
-    if let Some(pattern_str) = &schema.pattern {
-      if let Ok(re) = Regex::new(pattern_str) {
-        schema.compiled_pattern = Some(CompiledRegex(re));
-      }
-    }
-
-    // 2.5 Compile Pattern Properties
-    if let Some(pp) = &schema.pattern_properties {
-      let mut compiled_pp = Vec::new();
-      for (pattern, sub_schema) in pp {
-        if let Ok(re) = Regex::new(pattern) {
-          compiled_pp.push((CompiledRegex(re), sub_schema.clone()));
-        } else {
-          eprintln!(
-            "Invalid patternProperty regex in schema (compile time): {}",
-            pattern
-          );
-        }
-      }
-      if !compiled_pp.is_empty() {
-        schema.compiled_pattern_properties = Some(compiled_pp);
-      }
-    }
-
-    // 3. Recurse
-    Self::compile_recursive(schema);
-  }
-
-  fn normalize_dependencies(schema: &mut Schema) {
-    if let Some(deps) = schema.dependencies.take() {
-      for (key, dep) in deps {
-        match dep {
-          crate::validator::schema::Dependency::Props(props) => {
-            schema
-              .dependent_required
-              .get_or_insert_with(std::collections::BTreeMap::new)
-              .insert(key, props);
-          }
-          crate::validator::schema::Dependency::Schema(sub_schema) => {
-            schema
-              .dependent_schemas
-              .get_or_insert_with(std::collections::BTreeMap::new)
-              .insert(key, sub_schema);
-          }
-        }
-      }
-    }
-  }
-
-  fn compile_recursive(schema: &mut Schema) {
-    Self::normalize_dependencies(schema);
-
-    // Compile self
-    if let Some(format_str) = &schema.format {
-      if let Some(fmt) = crate::validator::formats::FORMATS.get(format_str.as_str()) {
-        schema.compiled_format = Some(CompiledFormat::Func(fmt.func));
-      }
-    }
-    if let Some(pattern_str) = &schema.pattern {
-      if let Ok(re) = Regex::new(pattern_str) {
-        schema.compiled_pattern = Some(CompiledRegex(re));
-      }
-    }
-
-    // Recurse
-
-    if let Some(defs) = &mut schema.definitions {
-      for s in defs.values_mut() {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(defs) = &mut schema.defs {
-      for s in defs.values_mut() {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(props) = &mut schema.properties {
-      for s in props.values_mut() {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(add_props) = &mut schema.additional_properties {
-      Self::compile_recursive(Arc::make_mut(add_props));
-    }
-
-    // ... Recurse logic ...
-    if let Some(items) = &mut schema.items {
-      Self::compile_recursive(Arc::make_mut(items));
-    }
-    if let Some(prefix_items) = &mut schema.prefix_items {
-      for s in prefix_items {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(not) = &mut schema.not {
-      Self::compile_recursive(Arc::make_mut(not));
-    }
-    if let Some(all_of) = &mut schema.all_of {
-      for s in all_of {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(any_of) = &mut schema.any_of {
-      for s in any_of {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(one_of) = &mut schema.one_of {
-      for s in one_of {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(s) = &mut schema.if_ {
-      Self::compile_recursive(Arc::make_mut(s));
-    }
-    if let Some(s) = &mut schema.then_ {
-      Self::compile_recursive(Arc::make_mut(s));
-    }
-    if let Some(s) = &mut schema.else_ {
-      Self::compile_recursive(Arc::make_mut(s));
-    }
-
-    if let Some(ds) = &mut schema.dependent_schemas {
-      for s in ds.values_mut() {
-        Self::compile_recursive(Arc::make_mut(s));
-      }
-    }
-    if let Some(pn) = &mut schema.property_names {
-      Self::compile_recursive(Arc::make_mut(pn));
-    }
-  }
-
-  /// Recursively traverses the schema tree to build the local registry index.
-  fn compile_index(
-    schema: &Arc<Schema>,
-    registry: &mut crate::validator::registry::Registry,
-    parent_base: Option<String>,
-    pointer: json_pointer::JsonPointer<String, Vec<String>>,
-  ) {
-    // 1. Index using Parent Base (Path from Parent)
-    if let Some(base) = &parent_base {
-      // We use the pointer's string representation (e.g., "/definitions/foo")
-      // and append it to the base.
-      let fragment = pointer.to_string();
-      let ptr_uri = if fragment.is_empty() {
-        base.clone()
-      } else {
-        format!("{}#{}", base, fragment)
-      };
-      registry.insert(ptr_uri, schema.clone());
-    }
-
-    // 2. Determine Current Scope... (unchanged logic)
-    let mut current_base = parent_base.clone();
-    let mut child_pointer = pointer.clone();
-
-    if let Some(id) = &schema.obj.id {
-      let mut new_base = None;
-      if let Ok(_) = url::Url::parse(id) {
-        new_base = Some(id.clone());
-      } else if let Some(base) = &current_base {
-        if let Ok(base_url) = url::Url::parse(base) {
-          if let Ok(joined) = base_url.join(id) {
-            new_base = Some(joined.to_string());
-          }
-        }
-      } else {
-        new_base = Some(id.clone());
-      }
-
-      if let Some(base) = new_base {
-        // println!("DEBUG: Compiling index for path: {}", base); // Added println
-        registry.insert(base.clone(), schema.clone());
-        current_base = Some(base);
-        child_pointer = json_pointer::JsonPointer::new(vec![]); // Reset
-      }
-    }
-
-    // 3. Index by Anchor
-    if let Some(anchor) = &schema.obj.anchor {
-      if let Some(base) = &current_base {
-        let anchor_uri = format!("{}#{}", base, anchor);
-        registry.insert(anchor_uri, schema.clone());
-      }
-    }
-    // Index by Dynamic Anchor
-    if let Some(d_anchor) = &schema.obj.dynamic_anchor {
-      if let Some(base) = &current_base {
-        let anchor_uri = format!("{}#{}", base, d_anchor);
-        registry.insert(anchor_uri, schema.clone());
-      }
-    }
-
-    // 4. Recurse (unchanged logic structure, just passing registry)
-    if let Some(defs) = schema.defs.as_ref().or(schema.definitions.as_ref()) {
-      let segment = if schema.defs.is_some() {
-        "$defs"
-      } else {
-        "definitions"
-      };
-      for (key, sub_schema) in defs {
-        let mut sub = child_pointer.clone();
-        sub.push(segment.to_string());
-        let decoded_key = percent_encoding::percent_decode_str(key).decode_utf8_lossy();
-        sub.push(decoded_key.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-
-    if let Some(props) = &schema.properties {
-      for (key, sub_schema) in props {
-        let mut sub = child_pointer.clone();
-        sub.push("properties".to_string());
-        sub.push(key.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-
-    if let Some(items) = &schema.items {
-      let mut sub = child_pointer.clone();
-      sub.push("items".to_string());
-      Self::compile_index(items, registry, current_base.clone(), sub);
-    }
-
-    if let Some(prefix_items) = &schema.prefix_items {
-      for (i, sub_schema) in prefix_items.iter().enumerate() {
-        let mut sub = child_pointer.clone();
-        sub.push("prefixItems".to_string());
-        sub.push(i.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-
-    if let Some(all_of) = &schema.all_of {
-      for (i, sub_schema) in all_of.iter().enumerate() {
-        let mut sub = child_pointer.clone();
-        sub.push("allOf".to_string());
-        sub.push(i.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-    if let Some(any_of) = &schema.any_of {
-      for (i, sub_schema) in any_of.iter().enumerate() {
-        let mut sub = child_pointer.clone();
-        sub.push("anyOf".to_string());
-        sub.push(i.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-    if let Some(one_of) = &schema.one_of {
-      for (i, sub_schema) in one_of.iter().enumerate() {
-        let mut sub = child_pointer.clone();
-        sub.push("oneOf".to_string());
-        sub.push(i.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-
-    if let Some(not) = &schema.not {
-      let mut sub = child_pointer.clone();
-      sub.push("not".to_string());
-      Self::compile_index(not, registry, current_base.clone(), sub);
-    }
-    if let Some(if_) = &schema.if_ {
-      let mut sub = child_pointer.clone();
-      sub.push("if".to_string());
-      Self::compile_index(if_, registry, current_base.clone(), sub);
-    }
-    if let Some(then_) = &schema.then_ {
-      let mut sub = child_pointer.clone();
-      sub.push("then".to_string());
-      Self::compile_index(then_, registry, current_base.clone(), sub);
-    }
-    if let Some(else_) = &schema.else_ {
-      let mut sub = child_pointer.clone();
-      sub.push("else".to_string());
-      Self::compile_index(else_, registry, current_base.clone(), sub);
-    }
-    if let Some(deps) = &schema.dependent_schemas {
-      for (key, sub_schema) in deps {
-        let mut sub = child_pointer.clone();
-        sub.push("dependentSchemas".to_string());
-        sub.push(key.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-    if let Some(pp) = &schema.pattern_properties {
-      for (key, sub_schema) in pp {
-        let mut sub = child_pointer.clone();
-        sub.push("patternProperties".to_string());
-        sub.push(key.to_string());
-        Self::compile_index(sub_schema, registry, current_base.clone(), sub);
-      }
-    }
-    if let Some(add_props) = &schema.additional_properties {
-      let mut sub = child_pointer.clone();
-      sub.push("additionalProperties".to_string());
-      Self::compile_index(add_props, registry, current_base.clone(), sub);
-    }
-    if let Some(contains) = &schema.contains {
-      let mut sub = child_pointer.clone();
-      sub.push("contains".to_string());
-      Self::compile_index(contains, registry, current_base.clone(), sub);
-    }
-    if let Some(property_names) = &schema.property_names {
-      let mut sub = child_pointer.clone();
-      sub.push("propertyNames".to_string());
-      Self::compile_index(property_names, registry, current_base.clone(), sub);
-    }
-  }
-
-  pub fn compile(mut root_schema: Schema, root_id: Option<String>) -> Arc<Schema> {
-    // 1. Compile in-place (formats/regexes/normalization)
-    Self::compile_formats_and_regexes(&mut root_schema);
-
-    // Apply root_id override if schema ID is missing
-    if let Some(rid) = &root_id {
-      if root_schema.obj.id.is_none() {
-        root_schema.obj.id = Some(rid.clone());
-      }
-    }
-
-    // 2. Build ID/Pointer Index
-    let mut registry = crate::validator::registry::Registry::new();
-
-    // We need a temporary Arc to satisfy compile_index recursion
-    // But we are modifying root_schema.
-    // This is tricky. compile_index takes &Arc<Schema>.
-    // We should build the index first, THEN attach it.
-
-    let root = Arc::new(root_schema);
-
-    // Default base_uri to ""
-    let base_uri = root_id
-      .clone()
-      .or_else(|| root.obj.id.clone())
-      .or(Some("".to_string()));
-
-    Self::compile_index(
-      &root,
-      &mut registry,
-      base_uri,
-      json_pointer::JsonPointer::new(vec![]),
-    );
-
-    // Also ensure root id is indexed if present
-    if let Some(rid) = root_id {
-      registry.insert(rid, root.clone());
-    }
-
-    // Now we need to attach this registry to the root schema.
-    // Since root is an Arc, we might need to recreate it if we can't mutate.
-    // Schema struct modifications require &mut.
-
-    let mut final_schema = Arc::try_unwrap(root).unwrap_or_else(|arc| (*arc).clone());
-    final_schema.obj.compiled_registry = Some(Arc::new(registry));
-
-    Arc::new(final_schema)
-  }
-}

src/validator/context.rs

@@ -1,72 +1,64 @@
-use crate::validator::schema::Schema;
-use crate::validator::Validator;
+use crate::database::schema::Schema;
 use crate::validator::error::ValidationError;
-use crate::validator::instance::ValidationInstance;
 use crate::validator::result::ValidationResult;
-use std::collections::HashSet;
 
-pub struct ValidationContext<'a, I: ValidationInstance<'a>> {
-  pub validator: &'a Validator,
+pub struct ValidationContext<'a> {
+  pub schemas: &'a std::collections::HashMap<String, Schema>,
   pub root: &'a Schema,
   pub schema: &'a Schema,
-  pub instance: I,
+  pub instance: &'a serde_json::Value,
   pub path: String,
   pub depth: usize,
-  pub scope: Vec<String>,
-  pub overrides: HashSet<String>,
   pub extensible: bool,
   pub reporter: bool,
+  pub overrides: std::collections::HashSet<String>,
 }
 
-impl<'a, I: ValidationInstance<'a>> ValidationContext<'a, I> {
+impl<'a> ValidationContext<'a> {
   pub fn new(
-    validator: &'a Validator,
+    schemas: &'a std::collections::HashMap<String, Schema>,
     root: &'a Schema,
     schema: &'a Schema,
-    instance: I,
-    scope: Vec<String>,
-    overrides: HashSet<String>,
+    instance: &'a serde_json::Value,
+    overrides: std::collections::HashSet<String>,
     extensible: bool,
     reporter: bool,
   ) -> Self {
     let effective_extensible = schema.extensible.unwrap_or(extensible);
     Self {
-      validator,
+      schemas,
       root,
       schema,
       instance,
       path: String::new(),
       depth: 0,
-      scope,
-      overrides,
       extensible: effective_extensible,
       reporter,
+      overrides,
     }
   }
 
   pub fn derive(
     &self,
     schema: &'a Schema,
-    instance: I,
+    instance: &'a serde_json::Value,
     path: &str,
-    scope: Vec<String>,
-    overrides: HashSet<String>,
+    overrides: std::collections::HashSet<String>,
     extensible: bool,
     reporter: bool,
   ) -> Self {
     let effective_extensible = schema.extensible.unwrap_or(extensible);
 
     Self {
-      validator: self.validator,
+      schemas: self.schemas,
       root: self.root,
       schema,
       instance,
       path: path.to_string(),
       depth: self.depth + 1,
-      scope,
-      overrides,
       extensible: effective_extensible,
       reporter,
+      overrides,
     }
   }
 
@@ -75,44 +67,13 @@ impl<'a, I: ValidationInstance<'a>> ValidationContext<'a, I> {
       schema,
       self.instance,
       &self.path,
-      self.scope.clone(),
-      HashSet::new(),
+      std::collections::HashSet::new(),
       self.extensible,
       reporter,
     )
   }
 
   pub fn validate(&self) -> Result<ValidationResult, ValidationError> {
-    let mut effective_scope = self.scope.clone();
-
-    if let Some(id) = &self.schema.obj.id {
-      let current_base = self.scope.last().map(|s| s.as_str()).unwrap_or("");
-      let mut new_base = id.clone().to_string();
-      if !current_base.is_empty() {
-        if let Ok(base_url) = url::Url::parse(current_base) {
-          if let Ok(joined) = base_url.join(id) {
-            new_base = joined.to_string();
-          }
-        }
-      }
-
-      effective_scope.push(new_base);
-
-      let shadow = ValidationContext {
-        validator: self.validator,
-        root: self.root,
-        schema: self.schema,
-        instance: self.instance,
-        path: self.path.clone(),
-        depth: self.depth,
-        scope: effective_scope,
-        overrides: self.overrides.clone(),
-        extensible: self.extensible,
-        reporter: self.reporter,
-      };
-      return shadow.validate_scoped();
-    }
-
     self.validate_scoped()
   }
 }

src/validator/formats.rs

@@ -1,875 +0,0 @@
-use std::{
-    collections::HashMap,
-    error::Error,
-    net::{Ipv4Addr, Ipv6Addr},
-};
-
-use lazy_static::lazy_static;
-use percent_encoding::percent_decode_str;
-use serde_json::Value;
-use url::Url;
-
-// use crate::ecma; // Assuming ecma is not yet available, stubbing regex for now
-
-/// Defines format for `format` keyword.
-#[derive(Clone, Copy)]
-pub struct Format {
-    /// Name of the format
-    pub name: &'static str,
-
-    /// validates given value.
-    pub func: fn(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>>, // Ensure thread safety if needed
-}
-
-lazy_static! {
-    pub(crate) static ref FORMATS: HashMap<&'static str, Format> = {
-        let mut m = HashMap::<&'static str, Format>::new();
-        // Helper to register formats
-        let mut register = |name, func| m.insert(name, Format { name, func });
-        
-        // register("regex", validate_regex); // Stubbed
-        register("ipv4", validate_ipv4);
-        register("ipv6", validate_ipv6);
-        register("hostname", validate_hostname);
-        register("idn-hostname", validate_idn_hostname);
-        register("email", validate_email);
-        register("idn-email", validate_idn_email);
-        register("date", validate_date);
-        register("time", validate_time);
-        register("date-time", validate_date_time);
-        register("duration", validate_duration);
-        register("period", validate_period);
-        register("json-pointer", validate_json_pointer);
-        register("relative-json-pointer", validate_relative_json_pointer);
-        register("uuid", validate_uuid);
-        register("uri", validate_uri);
-        register("iri", validate_iri);
-        register("uri-reference", validate_uri_reference);
-        register("iri-reference", validate_iri_reference);
-        register("uri-template", validate_uri_template);
-        m
-    };
-}
-
-/*
-fn validate_regex(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    // ecma::convert(s).map(|_| ())
-    Ok(())
-}
-*/
-
-fn validate_ipv4(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    s.parse::<Ipv4Addr>()?;
-    Ok(())
-}
-
-fn validate_ipv6(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    s.parse::<Ipv6Addr>()?;
-    Ok(())
-}
-
-fn validate_date(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_date(s)?;
-    Ok(())
-}
-
-fn matches_char(s: &str, index: usize, ch: char) -> bool {
-    s.is_char_boundary(index) && s[index..].starts_with(ch)
-}
-
-// see https://datatracker.ietf.org/doc/html/rfc3339#section-5.6
-fn check_date(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // yyyy-mm-dd
-    if s.len() != 10 {
-        Err("must be 10 characters long")?;
-    }
-    if !matches_char(s, 4, '-') || !matches_char(s, 7, '-') {
-        Err("missing hyphen in correct place")?;
-    }
-
-    let mut ymd = s.splitn(3, '-').filter_map(|t| t.parse::<usize>().ok());
-    let (Some(y), Some(m), Some(d)) = (ymd.next(), ymd.next(), ymd.next()) else {
-        Err("non-positive year/month/day")?
-    };
-
-    if !matches!(m, 1..=12) {
-        Err(format!("{m} months in year"))?;
-    }
-    if !matches!(d, 1..=31) {
-        Err(format!("{d} days in month"))?;
-    }
-
-    match m {
-        2 => {
-            let mut feb_days = 28;
-            if y % 4 == 0 && (y % 100 != 0 || y % 400 == 0) {
-                feb_days += 1; // leap year
-            };
-            if d > feb_days {
-                Err(format!("february has {feb_days} days only"))?;
-            }
-        }
-        4 | 6 | 9 | 11 => {
-            if d > 30 {
-                Err("month has 30 days only")?;
-            }
-        }
-        _ => {}
-    }
-    Ok(())
-}
-
-fn validate_time(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_time(s)
-}
-
-fn check_time(mut str: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // min: hh:mm:ssZ
-    if str.len() < 9 {
-        Err("less than 9 characters long")?
-    }
-    if !matches_char(str, 2, ':') || !matches_char(str, 5, ':') {
-        Err("missing colon in correct place")?
-    }
-
-    // parse hh:mm:ss
-    if !str.is_char_boundary(8) {
-        Err("contains non-ascii char")?
-    }
-    let mut hms = (str[..8])
-        .splitn(3, ':')
-        .filter_map(|t| t.parse::<usize>().ok());
-    let (Some(mut h), Some(mut m), Some(s)) = (hms.next(), hms.next(), hms.next()) else {
-        Err("non-positive hour/min/sec")?
-    };
-    if h > 23 || m > 59 || s > 60 {
-        Err("hour/min/sec out of range")?
-    }
-    str = &str[8..];
-
-    // parse sec-frac if present
-    if let Some(rem) = str.strip_prefix('.') {
-        let n_digits = rem.chars().take_while(char::is_ascii_digit).count();
-        if n_digits == 0 {
-            Err("no digits in second fraction")?;
-        }
-        str = &rem[n_digits..];
-    }
-
-    if str != "z" && str != "Z" {
-        // parse time-numoffset
-        if str.len() != 6 {
-            Err("offset must be 6 characters long")?;
-        }
-        let sign: isize = match str.chars().next() {
-            Some('+') => -1,
-            Some('-') => 1,
-            _ => return Err("offset must begin with plus/minus")?,
-        };
-        str = &str[1..];
-        if !matches_char(str, 2, ':') {
-            Err("missing colon in offset at correct place")?
-        }
-
-        let mut zhm = str.splitn(2, ':').filter_map(|t| t.parse::<usize>().ok());
-        let (Some(zh), Some(zm)) = (zhm.next(), zhm.next()) else {
-            Err("non-positive hour/min in offset")?
-        };
-        if zh > 23 || zm > 59 {
-            Err("hour/min in offset out of range")?
-        }
-
-        // apply timezone
-        let mut hm = (h * 60 + m) as isize + sign * (zh * 60 + zm) as isize;
-        if hm < 0 {
-            hm += 24 * 60;
-            debug_assert!(hm >= 0);
-        }
-        let hm = hm as usize;
-        (h, m) = (hm / 60, hm % 60);
-    }
-
-    // check leap second
-    if !(s < 60 || (h == 23 && m == 59)) {
-        Err("invalid leap second")?
-    }
-    Ok(())
-}
-
-fn validate_date_time(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_date_time(s)
-}
-
-fn check_date_time(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // min: yyyy-mm-ddThh:mm:ssZ
-    if s.len() < 20 {
-        Err("less than 20 characters long")?;
-    }
-    if !s.is_char_boundary(10) || !s[10..].starts_with(['t', 'T']) {
-        Err("11th character must be t or T")?;
-    }
-    if let Err(e) = check_date(&s[..10]) {
-        Err(format!("invalid date element: {e}"))?;
-    }
-    if let Err(e) = check_time(&s[11..]) {
-        Err(format!("invalid time element: {e}"))?;
-    }
-    Ok(())
-}
-
-fn validate_duration(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_duration(s)?;
-    Ok(())
-}
-
-// see https://datatracker.ietf.org/doc/html/rfc3339#appendix-A
-fn check_duration(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // must start with 'P'
-    let Some(s) = s.strip_prefix('P') else {
-        Err("must start with P")?
-    };
-    if s.is_empty() {
-        Err("nothing after P")?
-    }
-
-    // dur-week
-    if let Some(s) = s.strip_suffix('W') {
-        if s.is_empty() {
-            Err("no number in week")?
-        }
-        if !s.chars().all(|c| c.is_ascii_digit()) {
-            Err("invalid week")?
-        }
-        return Ok(());
-    }
-
-    static UNITS: [&str; 2] = ["YMD", "HMS"];
-    for (i, s) in s.split('T').enumerate() {
-        let mut s = s;
-        if i != 0 && s.is_empty() {
-            Err("no time elements")?
-        }
-        let Some(mut units) = UNITS.get(i).cloned() else {
-            Err("more than one T")?
-        };
-        while !s.is_empty() {
-            let digit_count = s.chars().take_while(char::is_ascii_digit).count();
-            if digit_count == 0 {
-                Err("missing number")?
-            }
-            s = &s[digit_count..];
-            let Some(unit) = s.chars().next() else {
-                Err("missing unit")?
-            };
-            let Some(j) = units.find(unit) else {
-                if UNITS[i].contains(unit) {
-                    Err(format!("unit {unit} out of order"))?
-                }
-                Err(format!("invalid unit {unit}"))?
-            };
-            units = &units[j + 1..];
-            s = &s[1..];
-        }
-    }
-
-    Ok(())
-}
-
-// see https://datatracker.ietf.org/doc/html/rfc3339#appendix-A
-fn validate_period(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-
-    let Some(slash) = s.find('/') else {
-        Err("missing slash")?
-    };
-
-    let (start, end) = (&s[..slash], &s[slash + 1..]);
-    if start.starts_with('P') {
-        if let Err(e) = check_duration(start) {
-            Err(format!("invalid start duration: {e}"))?
-        }
-        if let Err(e) = check_date_time(end) {
-            Err(format!("invalid end date-time: {e}"))?
-        }
-    } else {
-        if let Err(e) = check_date_time(start) {
-            Err(format!("invalid start date-time: {e}"))?
-        }
-        if end.starts_with('P') {
-            if let Err(e) = check_duration(end) {
-                Err(format!("invalid end duration: {e}"))?;
-            }
-        } else if let Err(e) = check_date_time(end) {
-            Err(format!("invalid end date-time: {e}"))?;
-        }
-    }
-    Ok(())
-}
-
-fn validate_hostname(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_hostname(s)?;
-    Ok(())
-}
-
-// see https://en.wikipedia.org/wiki/Hostname#Restrictions_on_valid_host_names
-fn check_hostname(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // entire hostname (including the delimiting dots but not a trailing dot) has a maximum of 253 ASCII characters
-
-    if s.len() > 253 {
-        Err("more than 253 characters long")?
-    }
-
-    // Hostnames are composed of series of labels concatenated with dots, as are all domain names
-    for label in s.split('.') {
-        // Each label must be from 1 to 63 characters long
-        if !matches!(label.len(), 1..=63) {
-            Err("label must be 1 to 63 characters long")?;
-        }
-
-        // labels must not start or end with a hyphen
-        if label.starts_with('-') {
-            Err("label starts with hyphen")?;
-        }
-
-        if label.ends_with('-') {
-            Err("label ends with hyphen")?;
-        }
-
-        // labels may contain only the ASCII letters 'a' through 'z' (in a case-insensitive manner),
-        // the digits '0' through '9', and the hyphen ('-')
-        if let Some(ch) = label
-            .chars()
-            .find(|c| !matches!(c, 'a'..='z' | 'A'..='Z' | '0'..='9' | '-'))
-        {
-            Err(format!("invalid character {ch:?}"))?;
-        }
-
-        // labels must not contain "--" in 3rd and 4th position unless they start with "xn--"
-        if label.len() >= 4 && &label[2..4] == "--" {
-            if !label.starts_with("xn--") {
-                Err("label has -- in 3rd/4th position but does not start with xn--")?;
-            } else {
-                let (unicode, errors) = idna::domain_to_unicode(label);
-                if let Err(_) = errors {
-                    Err("invalid punycode")?;
-                }
-                check_unicode_idn_constraints(&unicode).map_err(|e| format!("invalid punycode/IDN: {e}"))?;
-            }
-        }
-    }
-
-    Ok(())
-}
-
-fn validate_idn_hostname(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_idn_hostname(s)?;
-    Ok(())
-}
-
-static DISALLOWED: [char; 10] = [
-    '\u{0640}', //  ARABIC TATWEEL
-    '\u{07FA}', //  NKO LAJANYALAN
-    '\u{302E}', //  HANGUL SINGLE DOT TONE MARK
-    '\u{302F}', //  HANGUL DOUBLE DOT TONE MARK
-    '\u{3031}', //  VERTICAL KANA REPEAT MARK
-    '\u{3032}', //  VERTICAL KANA REPEAT WITH VOICED SOUND MARK
-    '\u{3033}', //  VERTICAL KANA REPEAT MARK UPPER HALF
-    '\u{3034}', //  VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HA
-    '\u{3035}', //  VERTICAL KANA REPEAT MARK LOWER HALF
-    '\u{303B}', //  VERTICAL IDEOGRAPHIC ITERATION MARK
-];
-
-fn check_idn_hostname(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let s = idna::domain_to_ascii_strict(s).map_err(|e| format!("idna error: {:?}", e))?;
-    let (unicode, errors) = idna::domain_to_unicode(&s);
-    if let Err(e) = errors {
-        Err(format!("idna decoding error: {:?}", e))?;
-    }
-    check_unicode_idn_constraints(&unicode)?;
-    check_hostname(&s)?;
-    Ok(())
-}
-
-fn check_unicode_idn_constraints(unicode: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // see https://www.rfc-editor.org/rfc/rfc5892#section-2.6
-    {
-        if unicode.contains(DISALLOWED) {
-            Err("contains disallowed character")?;
-        }
-    }
-
-    // unicode string must not contain "--" in 3rd and 4th position
-    // and must not start and end with a '-'
-    // see https://www.rfc-editor.org/rfc/rfc5891#section-4.2.3.1
-    {
-        let count: usize = unicode
-            .chars()
-            .skip(2)
-            .take(2)
-            .map(|c| if c == '-' { 1 } else { 0 })
-            .sum();
-        if count == 2 {
-            Err("unicode string must not contain '--' in 3rd and 4th position")?;
-        }
-    }
-
-    // MIDDLE DOT is allowed between 'l' characters only
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.3
-    {
-        let middle_dot = '\u{00b7}';
-        let mut s = unicode;
-        while let Some(i) = s.find(middle_dot) {
-            let prefix = &s[..i];
-            let suffix = &s[i + middle_dot.len_utf8()..];
-            if !prefix.ends_with('l') || !suffix.ends_with('l') {
-                Err("MIDDLE DOT is allowed between 'l' characters only")?;
-            }
-            s = suffix;
-        }
-    }
-
-    // Greek KERAIA must be followed by Greek character
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.4
-    {
-        let keralia = '\u{0375}';
-        let greek = '\u{0370}'..='\u{03FF}';
-        let mut s = unicode;
-        while let Some(i) = s.find(keralia) {
-            let suffix = &s[i + keralia.len_utf8()..];
-            if !suffix.starts_with(|c| greek.contains(&c)) {
-                Err("Greek KERAIA must be followed by Greek character")?;
-            }
-            s = suffix;
-        }
-    }
-
-    // Hebrew GERESH must be preceded by Hebrew character
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.5
-    //
-    // Hebrew GERSHAYIM must be preceded by Hebrew character
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.6
-    {
-        let geresh = '\u{05F3}';
-        let gereshayim = '\u{05F4}';
-        let hebrew = '\u{0590}'..='\u{05FF}';
-        for ch in [geresh, gereshayim] {
-            let mut s = unicode;
-            while let Some(i) = s.find(ch) {
-                let prefix = &s[..i];
-                if !prefix.ends_with(|c| hebrew.contains(&c)) {
-                    if i == 0 {
-                        Err("Hebrew GERESH must be preceded by Hebrew character")?;
-                    } else {
-                        Err("Hebrew GERESHYIM must be preceded by Hebrew character")?;
-                    }
-                }
-                let suffix = &s[i + ch.len_utf8()..];
-                s = suffix;
-            }
-        }
-    }
-
-    // KATAKANA MIDDLE DOT must be with Hiragana, Katakana, or Han
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.7
-    {
-        let katakana_middle_dot = '\u{30FB}';
-        if unicode.contains(katakana_middle_dot) {
-            let hiragana = '\u{3040}'..='\u{309F}';
-            let katakana = '\u{30A0}'..='\u{30FF}';
-            let han = '\u{4E00}'..='\u{9FFF}'; // https://en.wikipedia.org/wiki/CJK_Unified_Ideographs_(Unicode_block): is this range correct??
-            if unicode.contains(|c| hiragana.contains(&c))
-                || unicode.contains(|c| c != katakana_middle_dot && katakana.contains(&c))
-                || unicode.contains(|c| han.contains(&c))
-            {
-                // ok
-            } else {
-                Err("KATAKANA MIDDLE DOT must be with Hiragana, Katakana, or Han")?;
-            }
-        }
-    }
-
-    // ARABIC-INDIC DIGITS and Extended Arabic-Indic Digits cannot be mixed
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.8
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.9
-    {
-        let arabic_indic_digits = '\u{0660}'..='\u{0669}';
-        let extended_arabic_indic_digits = '\u{06F0}'..='\u{06F9}';
-        if unicode.contains(|c| arabic_indic_digits.contains(&c))
-            && unicode.contains(|c| extended_arabic_indic_digits.contains(&c))
-        {
-            Err("ARABIC-INDIC DIGITS and Extended Arabic-Indic Digits cannot be mixed")?;
-        }
-    }
-
-    // ZERO WIDTH JOINER must be preceded by Virama
-    // see https://www.rfc-editor.org/rfc/rfc5892#appendix-A.2
-    {
-        let zero_width_jointer = '\u{200D}';
-        static VIRAMA: [char; 61] = [
-            '\u{094D}',
-            '\u{09CD}',
-            '\u{0A4D}',
-            '\u{0ACD}',
-            '\u{0B4D}',
-            '\u{0BCD}',
-            '\u{0C4D}',
-            '\u{0CCD}',
-            '\u{0D3B}',
-            '\u{0D3C}',
-            '\u{0D4D}',
-            '\u{0DCA}',
-            '\u{0E3A}',
-            '\u{0EBA}',
-            '\u{0F84}',
-            '\u{1039}',
-            '\u{103A}',
-            '\u{1714}',
-            '\u{1734}',
-            '\u{17D2}',
-            '\u{1A60}',
-            '\u{1B44}',
-            '\u{1BAA}',
-            '\u{1BAB}',
-            '\u{1BF2}',
-            '\u{1BF3}',
-            '\u{2D7F}',
-            '\u{A806}',
-            '\u{A82C}',
-            '\u{A8C4}',
-            '\u{A953}',
-            '\u{A9C0}',
-            '\u{AAF6}',
-            '\u{ABED}',
-            '\u{10A3F}',
-            '\u{11046}',
-            '\u{1107F}',
-            '\u{110B9}',
-            '\u{11133}',
-            '\u{11134}',
-            '\u{111C0}',
-            '\u{11235}',
-            '\u{112EA}',
-            '\u{1134D}',
-            '\u{11442}',
-            '\u{114C2}',
-            '\u{115BF}',
-            '\u{1163F}',
-            '\u{116B6}',
-            '\u{1172B}',
-            '\u{11839}',
-            '\u{1193D}',
-            '\u{1193E}',
-            '\u{119E0}',
-            '\u{11A34}',
-            '\u{11A47}',
-            '\u{11A99}',
-            '\u{11C3F}',
-            '\u{11D44}',
-            '\u{11D45}',
-            '\u{11D97}',
-        ]; // https://www.compart.com/en/unicode/combining/9
-        let mut s = unicode;
-        while let Some(i) = s.find(zero_width_jointer) {
-            let prefix = &s[..i];
-            if !prefix.ends_with(VIRAMA) {
-                Err("ZERO WIDTH JOINER must be preceded by Virama")?;
-            }
-            let suffix = &s[i + zero_width_jointer.len_utf8()..];
-            s = suffix;
-        }
-    }
-
-    Ok(())
-}
-
-fn validate_email(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_email(s)?;
-    Ok(())
-}
-
-// see https://en.wikipedia.org/wiki/Email_address
-fn check_email(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    // entire email address to be no more than 254 characters long
-    if s.len() > 254 {
-        Err("more than 254 characters long")?
-    }
-
-    // email address is generally recognized as having two parts joined with an at-sign
-    let Some(at) = s.rfind('@') else {
-        Err("missing @")?
-    };
-    let (local, domain) = (&s[..at], &s[at + 1..]);
-
-    // local part may be up to 64 characters long
-    if local.len() > 64 {
-        Err("local part more than 64 characters long")?
-    }
-
-    if local.len() > 1 && local.starts_with('"') && local.ends_with('"') {
-        // quoted
-        let local = &local[1..local.len() - 1];
-        if local.contains(['\\', '"']) {
-            Err("backslash and quote not allowed within quoted local part")?
-        }
-    } else {
-        // unquoted
-
-        if local.starts_with('.') {
-            Err("starts with dot")?
-        }
-        if local.ends_with('.') {
-            Err("ends with dot")?
-        }
-
-        // consecutive dots not allowed
-        if local.contains("..") {
-            Err("consecutive dots")?
-        }
-
-        // check allowd chars
-        if let Some(ch) = local
-            .chars()
-            .find(|c| !(c.is_ascii_alphanumeric() || ".!#$%&'*+-/=?^_`{|}~".contains(*c)))
-        {
-            Err(format!("invalid character {ch:?}"))?
-        }
-    }
-
-    // domain if enclosed in brackets, must match an IP address
-    if domain.starts_with('[') && domain.ends_with(']') {
-        let s = &domain[1..domain.len() - 1];
-        if let Some(s) = s.strip_prefix("IPv6:") {
-            if let Err(e) = s.parse::<Ipv6Addr>() {
-                Err(format!("invalid ipv6 address: {e}"))?
-            }
-            return Ok(());
-        }
-        if let Err(e) = s.parse::<Ipv4Addr>() {
-            Err(format!("invalid ipv4 address: {e}"))?
-        }
-        return Ok(());
-    }
-
-    // domain must match the requirements for a hostname
-    if let Err(e) = check_hostname(domain) {
-        Err(format!("invalid domain: {e}"))?
-    }
-
-    Ok(())
-}
-
-fn validate_idn_email(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-
-    let Some(at) = s.rfind('@') else {
-        Err("missing @")?
-    };
-    let (local, domain) = (&s[..at], &s[at + 1..]);
-
-    let local = idna::domain_to_ascii_strict(local).map_err(|e| format!("idna error: {:?}", e))?;
-    let domain = idna::domain_to_ascii_strict(domain).map_err(|e| format!("idna error: {:?}", e))?;
-    if let Err(e) = check_idn_hostname(&domain) {
-        Err(format!("invalid domain: {e}"))?
-    }
-    check_email(&format!("{local}@{domain}"))
-}
-
-fn validate_json_pointer(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    check_json_pointer(s)?;
-    Ok(())
-}
-
-// see https://www.rfc-editor.org/rfc/rfc6901#section-3
-fn check_json_pointer(s: &str) -> Result<(), Box<dyn Error + Send + Sync>> {
-    if s.is_empty() {
-        return Ok(());
-    }
-    if !s.starts_with('/') {
-        Err("not starting with slash")?;
-    }
-    for token in s.split('/').skip(1) {
-        let mut chars = token.chars();
-        while let Some(ch) = chars.next() {
-            if ch == '~' {
-                if !matches!(chars.next(), Some('0' | '1')) {
-                    Err("~ must be followed by 0 or 1")?;
-                }
-            } else if !matches!(ch, '\x00'..='\x2E' | '\x30'..='\x7D' | '\x7F'..='\u{10FFFF}') {
-                Err("contains disallowed character")?;
-            }
-        }
-    }
-    Ok(())
-}
-
-// see https://tools.ietf.org/html/draft-handrews-relative-json-pointer-01#section-3
-fn validate_relative_json_pointer(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-
-    // start with non-negative-integer
-    let num_digits = s.chars().take_while(char::is_ascii_digit).count();
-    if num_digits == 0 {
-        Err("must start with non-negative integer")?;
-    }
-    if num_digits > 1 && s.starts_with('0') {
-        Err("starts with zero")?;
-    }
-    let s = &s[num_digits..];
-
-    // followed by either json-pointer or '#'
-    if s == "#" {
-        return Ok(());
-    }
-    if let Err(e) = check_json_pointer(s) {
-        Err(format!("invalid json-pointer element: {e}"))?;
-    }
-    Ok(())
-}
-
-// see https://datatracker.ietf.org/doc/html/rfc4122#page-4
-fn validate_uuid(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-
-    static HEX_GROUPS: [usize; 5] = [8, 4, 4, 4, 12];
-    let mut i = 0;
-    for group in s.split('-') {
-        if i >= HEX_GROUPS.len() {
-            Err("more than 5 elements")?;
-        }
-        if group.len() != HEX_GROUPS[i] {
-            Err(format!(
-                "element {} must be {} characters long",
-                i + 1,
-                HEX_GROUPS[i]
-            ))?;
-        }
-        if let Some(ch) = group.chars().find(|c| !c.is_ascii_hexdigit()) {
-            Err(format!("non-hex character {ch:?}"))?;
-        }
-        i += 1;
-    }
-    if i != HEX_GROUPS.len() {
-        Err("must have 5 elements")?;
-    }
-    Ok(())
-}
-
-fn validate_uri(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    if fluent_uri::UriRef::parse(s.as_str()).map_err(|e| e.to_string())?.scheme().is_none() {
-        Err("relative url")?;
-    };
-    Ok(())
-}
-
-fn validate_iri(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    match Url::parse(s) {
-        Ok(_) => Ok(()),
-        Err(url::ParseError::RelativeUrlWithoutBase) => Err("relative url")?,
-        Err(e) => Err(e)?,
-    }
-}
-
-lazy_static! {
-    static ref TEMP_URL: Url = Url::parse("http://temp.com").unwrap();
-}
-
-fn parse_uri_reference(s: &str) -> Result<Url, Box<dyn Error + Send + Sync>> {
-    if s.contains('\\') {
-        Err("contains \\\\")?;
-    }
-    Ok(TEMP_URL.join(s)?)
-}
-
-fn validate_uri_reference(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    fluent_uri::UriRef::parse(s.as_str()).map_err(|e| e.to_string())?;
-    Ok(())
-}
-
-fn validate_iri_reference(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-    parse_uri_reference(s)?;
-    Ok(())
-}
-
-fn validate_uri_template(v: &Value) -> Result<(), Box<dyn Error + Send + Sync>> {
-    let Value::String(s) = v else {
-        return Ok(());
-    };
-
-    let url = parse_uri_reference(s)?;
-
-    let path = url.path();
-    // path we got has curly bases percent encoded
-    let path = percent_decode_str(path).decode_utf8()?;
-
-    // ensure curly brackets are not nested and balanced
-    for part in path.as_ref().split('/') {
-        let mut want = true;
-        for got in part
-            .chars()
-            .filter(|c| matches!(c, '{' | '}'))
-            .map(|c| c == '{')
-        {
-            if got != want {
-                Err("nested curly braces")?;
-            }
-            want = !want;
-        }
-        if !want {
-            Err("no matching closing brace")?
-        }
-    }
-    Ok(())
-}

src/validator/mod.rs

@@ -1,101 +1,28 @@
-pub mod compiler;
 pub mod context;
 pub mod error;
-pub mod formats;
-pub mod instance;
-pub mod registry;
 pub mod result;
 pub mod rules;
-pub mod schema;
 pub mod util;
 
 pub use context::ValidationContext;
 pub use error::ValidationError;
-pub use instance::{MutableInstance, ReadOnlyInstance};
 pub use result::ValidationResult;
 
-use crate::validator::registry::Registry;
-use crate::validator::schema::Schema;
+use crate::database::schema::Schema;
 use serde_json::Value;
-use std::collections::HashSet;
+use std::collections::HashMap;
 use std::sync::Arc;
-
-pub enum ResolvedRef<'a> {
-  Local(&'a Schema),
-  Global(&'a Schema, &'a Schema),
-}
-
 pub struct Validator {
-  pub registry: Registry,
-  pub families: std::collections::HashMap<String, Arc<Schema>>,
+  pub schemas: Arc<HashMap<String, Schema>>,
 }
 
 impl Validator {
-  pub fn from_punc_definition(
-    enums: Option<&Value>,
-    types: Option<&Value>,
-    puncs: Option<&Value>,
-  ) -> Self {
-    let mut registry = Registry::new();
-    let mut families = std::collections::HashMap::new();
-
-    let mut family_map: std::collections::HashMap<String, std::collections::HashSet<String>> =
-      std::collections::HashMap::new();
-
-    if let Some(Value::Array(arr)) = types {
-      for item in arr {
-        if let Some(name) = item.get("name").and_then(|v| v.as_str()) {
-          if let Some(hierarchy) = item.get("hierarchy").and_then(|v| v.as_array()) {
-            for ancestor in hierarchy {
-              if let Some(anc_str) = ancestor.as_str() {
-                family_map
-                  .entry(anc_str.to_string())
-                  .or_default()
-                  .insert(name.to_string());
-              }
-            }
-          }
-        }
-      }
-    }
-
-    for (family_name, members) in family_map {
-      let object_refs: Vec<Value> = members
-        .iter()
-        .map(|s| serde_json::json!({ "$ref": s }))
-        .collect();
-      let schema_json = serde_json::json!({
-          "oneOf": object_refs
-      });
-      if let Ok(schema) = serde_json::from_value::<Schema>(schema_json) {
-        let compiled = crate::validator::compiler::Compiler::compile(schema, None);
-        families.insert(family_name, compiled);
-      }
-    }
-
-    let mut cache_items = |items_val: Option<&Value>| {
-      if let Some(Value::Array(arr)) = items_val {
-        for item in arr {
-          if let Some(Value::Array(schemas)) = item.get("schemas") {
-            for schema_val in schemas {
-              if let Ok(schema) = serde_json::from_value::<Schema>(schema_val.clone()) {
-                registry.add(schema);
-              }
-            }
-          }
-        }
-      }
-    };
-
-    cache_items(enums);
-    cache_items(types);
-    cache_items(puncs);
-
-    Self { registry, families }
+  pub fn new(schemas: Arc<HashMap<String, Schema>>) -> Self {
+    Self { schemas }
   }
 
   pub fn get_schema_ids(&self) -> Vec<String> {
-    self.registry.schemas.keys().cloned().collect()
+    self.schemas.keys().cloned().collect()
   }
 
   pub fn check_type(t: &str, val: &Value) -> bool {
@@ -116,148 +43,22 @@ impl Validator {
     }
   }
 
-  pub fn resolve_ref<'a>(
-    &'a self,
-    root: &'a Schema,
-    ref_string: &str,
-    scope: &str,
-  ) -> Option<(ResolvedRef<'a>, String)> {
-    if ref_string.starts_with('#') {
-      if let Some(indexrs) = &root.obj.compiled_registry {
-        if let Some(s) = indexrs.schemas.get(ref_string) {
-          return Some((ResolvedRef::Local(s.as_ref()), ref_string.to_string()));
-        }
-      }
-    }
-
-    if let Ok(base) = url::Url::parse(scope) {
-      if let Ok(joined) = base.join(ref_string) {
-        let joined_str = joined.to_string();
-        if let Some(indexrs) = &root.obj.compiled_registry {
-          if let Some(s) = indexrs.schemas.get(&joined_str) {
-            return Some((ResolvedRef::Local(s.as_ref() as &Schema), joined_str));
-          }
-        }
-
-        if let Ok(decoded) = percent_encoding::percent_decode_str(&joined_str).decode_utf8() {
-          let decoded_str = decoded.to_string();
-          if decoded_str != joined_str {
-            if let Some(indexrs) = &root.obj.compiled_registry {
-              if let Some(s) = indexrs.schemas.get(&decoded_str) {
-                return Some((ResolvedRef::Local(s.as_ref() as &Schema), decoded_str));
-              }
-            }
-          }
-        }
-
-        if let Some(s) = self.registry.schemas.get(&joined_str) {
-          return Some((ResolvedRef::Global(s.as_ref(), s.as_ref()), joined_str));
-        }
-      }
-    } else {
-      if ref_string.starts_with('#') {
-        let joined_str = format!("{}{}", scope, ref_string);
-
-        if let Some(indexrs) = &root.obj.compiled_registry {
-          if let Some(s) = indexrs.schemas.get(&joined_str) {
-            return Some((ResolvedRef::Local(s.as_ref() as &Schema), joined_str));
-          }
-        }
-
-        if let Ok(decoded) = percent_encoding::percent_decode_str(&joined_str).decode_utf8() {
-          let decoded_str = decoded.to_string();
-          if decoded_str != joined_str {
-            if let Some(indexrs) = &root.obj.compiled_registry {
-              if let Some(s) = indexrs.schemas.get(&decoded_str) {
-                return Some((ResolvedRef::Local(s.as_ref() as &Schema), decoded_str));
-              }
-            }
-          }
-        }
-
-        if let Some(s) = self.registry.schemas.get(&joined_str) {
-          return Some((ResolvedRef::Global(s.as_ref(), s.as_ref()), joined_str));
-        }
-      }
-    }
-
-    if let Ok(parsed) = url::Url::parse(ref_string) {
-      let absolute = parsed.to_string();
-      if let Some(indexrs) = &root.obj.compiled_registry {
-        if let Some(s) = indexrs.schemas.get(&absolute) {
-          return Some((ResolvedRef::Local(s.as_ref()), absolute));
-        }
-      }
-
-      let resource_base = if let Some((base, _)) = absolute.split_once('#') {
-        base
-      } else {
-        &absolute
-      };
-
-      if let Some(compiled) = self.registry.schemas.get(resource_base) {
-        if let Some(indexrs) = &compiled.obj.compiled_registry {
-          if let Some(s) = indexrs.schemas.get(&absolute) {
-            return Some((ResolvedRef::Global(compiled.as_ref(), s.as_ref()), absolute));
-          }
-        }
-      }
-    }
-
-    if let Some(compiled) = self.registry.schemas.get(ref_string) {
-      return Some((
-        ResolvedRef::Global(compiled.as_ref(), compiled.as_ref()),
-        ref_string.to_string(),
-      ));
-    }
-
-    None
-  }
-
   pub fn validate(
     &self,
     schema_id: &str,
     instance: &Value,
   ) -> Result<ValidationResult, ValidationError> {
-    if let Some(schema) = self.registry.schemas.get(schema_id) {
+    if let Some(schema) = self.schemas.get(schema_id) {
       let ctx = ValidationContext::new(
-        self,
+        &self.schemas,
         schema,
         schema,
-        ReadOnlyInstance(instance),
-        vec![],
-        HashSet::new(),
+        instance,
+        std::collections::HashSet::new(),
         false,
         false,
       );
-      ctx.validate()
-    } else {
-      Err(ValidationError {
-        code: "SCHEMA_NOT_FOUND".to_string(),
-        message: format!("Schema {} not found", schema_id),
-        path: "".to_string(),
-      })
-    }
-  }
-
-  pub fn mask(
-    &self,
-    schema_id: &str,
-    instance: &mut Value,
-  ) -> Result<ValidationResult, ValidationError> {
-    if let Some(schema) = self.registry.schemas.get(schema_id) {
-      let ctx = ValidationContext::new(
-        self,
-        schema,
-        schema,
-        MutableInstance::new(instance),
-        vec![],
-        HashSet::new(),
-        false,
-        false,
-      );
-      let res = ctx.validate()?;
-      Ok(res)
+      ctx.validate_scoped()
     } else {
       Err(ValidationError {
         code: "SCHEMA_NOT_FOUND".to_string(),

src/validator/registry.rs

@@ -1,50 +0,0 @@
-use crate::validator::schema::Schema;
-use lazy_static::lazy_static;
-use std::collections::HashMap;
-use std::sync::RwLock;
-
-lazy_static! {
-  pub static ref REGISTRY: RwLock<Registry> = RwLock::new(Registry::new());
-}
-
-use std::sync::Arc;
-
-#[derive(Debug, Clone, Default)]
-pub struct Registry {
-  pub schemas: HashMap<String, Arc<Schema>>,
-}
-
-impl Registry {
-  pub fn new() -> Self {
-    Registry {
-      schemas: HashMap::new(),
-    }
-  }
-
-  pub fn add(&mut self, schema: crate::validator::schema::Schema) {
-    let id = schema
-      .obj
-      .id
-      .clone()
-      .expect("Schema must have an $id to be registered");
-    let compiled = crate::validator::compiler::Compiler::compile(schema, Some(id.clone()));
-    self.schemas.insert(id, compiled);
-  }
-
-  pub fn insert(&mut self, id: String, schema: Arc<Schema>) {
-    // We allow overwriting for now to support re-compilation in tests/dev
-    self.schemas.insert(id, schema);
-  }
-
-  pub fn get(&self, id: &str) -> Option<Arc<Schema>> {
-    self.schemas.get(id).cloned()
-  }
-
-  pub fn clear(&mut self) {
-    self.schemas.clear();
-  }
-
-  pub fn len(&self) -> usize {
-    self.schemas.len()
-  }
-}

src/validator/rules/array.rs

@@ -0,0 +1,133 @@
+use serde_json::Value;
+
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_array(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    let current = self.instance;
+    if let Some(arr) = current.as_array() {
+      if let Some(min) = self.schema.min_items {
+        if (arr.len() as f64) < min {
+          result.errors.push(ValidationError {
+            code: "MIN_ITEMS".to_string(),
+            message: "Too few items".to_string(),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(max) = self.schema.max_items {
+        if (arr.len() as f64) > max {
+          result.errors.push(ValidationError {
+            code: "MAX_ITEMS".to_string(),
+            message: "Too many items".to_string(),
+            path: self.path.to_string(),
+          });
+        }
+      }
+
+      if self.schema.unique_items.unwrap_or(false) {
+        let mut seen: Vec<&Value> = Vec::new();
+        for item in arr {
+          if seen.contains(&item) {
+            result.errors.push(ValidationError {
+              code: "UNIQUE_ITEMS_VIOLATED".to_string(),
+              message: "Array has duplicate items".to_string(),
+              path: self.path.to_string(),
+            });
+            break;
+          }
+          seen.push(item);
+        }
+      }
+
+      if let Some(ref contains_schema) = self.schema.contains {
+        let mut _match_count = 0;
+        for (i, child_instance) in arr.iter().enumerate() {
+          let derived = self.derive(
+            contains_schema,
+            child_instance,
+            &self.path,
+            std::collections::HashSet::new(),
+            self.extensible,
+            false,
+          );
+
+          let check = derived.validate()?;
+          if check.is_valid() {
+            _match_count += 1;
+            result.evaluated_indices.insert(i);
+          }
+        }
+
+        let min = self.schema.min_contains.unwrap_or(1.0) as usize;
+        if _match_count < min {
+          result.errors.push(ValidationError {
+            code: "CONTAINS_VIOLATED".to_string(),
+            message: format!("Contains matches {} < min {}", _match_count, min),
+            path: self.path.to_string(),
+          });
+        }
+        if let Some(max) = self.schema.max_contains {
+          if _match_count > max as usize {
+            result.errors.push(ValidationError {
+              code: "CONTAINS_VIOLATED".to_string(),
+              message: format!("Contains matches {} > max {}", _match_count, max),
+              path: self.path.to_string(),
+            });
+          }
+        }
+      }
+
+      let len = arr.len();
+      let mut validation_index = 0;
+
+      if let Some(ref prefix) = self.schema.prefix_items {
+        for (i, sub_schema) in prefix.iter().enumerate() {
+          if i < len {
+            let path = format!("{}/{}", self.path, i);
+            if let Some(child_instance) = arr.get(i) {
+              let derived = self.derive(
+                sub_schema,
+                child_instance,
+                &path,
+                std::collections::HashSet::new(),
+                self.extensible,
+                false,
+              );
+              let item_res = derived.validate()?;
+              result.merge(item_res);
+              result.evaluated_indices.insert(i);
+              validation_index += 1;
+            }
+          }
+        }
+      }
+
+      if let Some(ref items_schema) = self.schema.items {
+        for i in validation_index..len {
+          let path = format!("{}/{}", self.path, i);
+          if let Some(child_instance) = arr.get(i) {
+            let derived = self.derive(
+              items_schema,
+              child_instance,
+              &path,
+              std::collections::HashSet::new(),
+              self.extensible,
+              false,
+            );
+            let item_res = derived.validate()?;
+            result.merge(item_res);
+            result.evaluated_indices.insert(i);
+          }
+        }
+      }
+    }
+
+    Ok(true)
+  }
+}

src/validator/rules/combinators.rs

@@ -0,0 +1,83 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_combinators(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    if let Some(ref all_of) = self.schema.all_of {
+      for sub in all_of {
+        let derived = self.derive_for_schema(sub, true);
+        let res = derived.validate()?;
+        result.merge(res);
+      }
+    }
+
+    if let Some(ref any_of) = self.schema.any_of {
+      let mut valid = false;
+
+      for sub in any_of {
+        let derived = self.derive_for_schema(sub, true);
+        let sub_res = derived.validate()?;
+        if sub_res.is_valid() {
+          valid = true;
+          result.merge(sub_res);
+        }
+      }
+
+      if !valid {
+        result.errors.push(ValidationError {
+          code: "ANY_OF_VIOLATED".to_string(),
+          message: "Matches none of anyOf schemas".to_string(),
+          path: self.path.to_string(),
+        });
+      }
+    }
+
+    if let Some(ref one_of) = self.schema.one_of {
+      let mut valid_count = 0;
+      let mut valid_res = ValidationResult::new();
+
+      for sub in one_of {
+        let derived = self.derive_for_schema(sub, true);
+        let sub_res = derived.validate()?;
+        if sub_res.is_valid() {
+          valid_count += 1;
+          valid_res = sub_res;
+        }
+      }
+
+      if valid_count == 1 {
+        result.merge(valid_res);
+      } else if valid_count == 0 {
+        result.errors.push(ValidationError {
+          code: "ONE_OF_VIOLATED".to_string(),
+          message: "Matches none of oneOf schemas".to_string(),
+          path: self.path.to_string(),
+        });
+      } else {
+        result.errors.push(ValidationError {
+          code: "ONE_OF_VIOLATED".to_string(),
+          message: format!("Matches {} of oneOf schemas (expected 1)", valid_count),
+          path: self.path.to_string(),
+        });
+      }
+    }
+
+    if let Some(ref not_schema) = self.schema.not {
+      let derived = self.derive_for_schema(not_schema, true);
+      let sub_res = derived.validate()?;
+      if sub_res.is_valid() {
+        result.errors.push(ValidationError {
+          code: "NOT_VIOLATED".to_string(),
+          message: "Matched 'not' schema".to_string(),
+          path: self.path.to_string(),
+        });
+      }
+    }
+
+    Ok(true)
+  }
+}

src/validator/rules/conditionals.rs

@@ -0,0 +1,69 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_conditionals(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    if let Some(ref if_schema) = self.schema.if_ {
+      let derived_if = self.derive_for_schema(if_schema, true);
+      let if_res = derived_if.validate()?;
+
+      result.evaluated_keys.extend(if_res.evaluated_keys.clone());
+      result
+        .evaluated_indices
+        .extend(if_res.evaluated_indices.clone());
+
+      if if_res.is_valid() {
+        if let Some(ref then_schema) = self.schema.then_ {
+          let derived_then = self.derive_for_schema(then_schema, true);
+          result.merge(derived_then.validate()?);
+        }
+      } else {
+        if let Some(ref else_schema) = self.schema.else_ {
+          let derived_else = self.derive_for_schema(else_schema, true);
+          result.merge(derived_else.validate()?);
+        }
+      }
+    }
+
+    Ok(true)
+  }
+
+  pub(crate) fn validate_strictness(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    if self.extensible || self.reporter {
+      return Ok(true);
+    }
+
+    if let Some(obj) = self.instance.as_object() {
+      for key in obj.keys() {
+        if !result.evaluated_keys.contains(key) && !self.overrides.contains(key) {
+          result.errors.push(ValidationError {
+            code: "STRICT_PROPERTY_VIOLATION".to_string(),
+            message: format!("Unexpected property '{}'", key),
+            path: format!("{}/{}", self.path, key),
+          });
+        }
+      }
+    }
+
+    if let Some(arr) = self.instance.as_array() {
+      for i in 0..arr.len() {
+        if !result.evaluated_indices.contains(&i) {
+          result.errors.push(ValidationError {
+            code: "STRICT_ITEM_VIOLATION".to_string(),
+            message: format!("Unexpected item at index {}", i),
+            path: format!("{}/{}", self.path, i),
+          });
+        }
+      }
+    }
+
+    Ok(true)
+  }
+}

src/validator/rules/core.rs

@@ -0,0 +1,84 @@
+use crate::validator::Validator;
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_core(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    let current = self.instance;
+
+    if let Some(ref type_) = self.schema.type_ {
+      match type_ {
+        crate::database::schema::SchemaTypeOrArray::Single(t) => {
+          if !Validator::check_type(t, current) {
+            result.errors.push(ValidationError {
+              code: "INVALID_TYPE".to_string(),
+              message: format!("Expected type '{}'", t),
+              path: self.path.to_string(),
+            });
+          }
+        }
+        crate::database::schema::SchemaTypeOrArray::Multiple(types) => {
+          let mut valid = false;
+          for t in types {
+            if Validator::check_type(t, current) {
+              valid = true;
+              break;
+            }
+          }
+          if !valid {
+            result.errors.push(ValidationError {
+              code: "INVALID_TYPE".to_string(),
+              message: format!("Expected one of types {:?}", types),
+              path: self.path.to_string(),
+            });
+          }
+        }
+      }
+    }
+
+    if let Some(ref const_val) = self.schema.const_ {
+      if !crate::validator::util::equals(current, const_val) {
+        result.errors.push(ValidationError {
+          code: "CONST_VIOLATED".to_string(),
+          message: "Value does not match const".to_string(),
+          path: self.path.to_string(),
+        });
+      } else {
+        if let Some(obj) = current.as_object() {
+          result.evaluated_keys.extend(obj.keys().cloned());
+        } else if let Some(arr) = current.as_array() {
+          result.evaluated_indices.extend(0..arr.len());
+        }
+      }
+    }
+
+    if let Some(ref enum_vals) = self.schema.enum_ {
+      let mut found = false;
+      for val in enum_vals {
+        if crate::validator::util::equals(current, val) {
+          found = true;
+          break;
+        }
+      }
+      if !found {
+        result.errors.push(ValidationError {
+          code: "ENUM_MISMATCH".to_string(),
+          message: "Value is not in enum".to_string(),
+          path: self.path.to_string(),
+        });
+      } else {
+        if let Some(obj) = current.as_object() {
+          result.evaluated_keys.extend(obj.keys().cloned());
+        } else if let Some(arr) = current.as_array() {
+          result.evaluated_indices.extend(0..arr.len());
+        }
+      }
+    }
+
+    Ok(true)
+  }
+}

src/validator/rules/format.rs

@@ -0,0 +1,44 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_format(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    let current = self.instance;
+    if let Some(ref compiled_fmt) = self.schema.compiled_format {
+      match compiled_fmt {
+        crate::database::schema::CompiledFormat::Func(f) => {
+          let should = if let Some(s) = current.as_str() {
+            !s.is_empty()
+          } else {
+            true
+          };
+          if should {
+            if let Err(e) = f(current) {
+              result.errors.push(ValidationError {
+                code: "FORMAT_MISMATCH".to_string(),
+                message: format!("Format error: {}", e),
+                path: self.path.to_string(),
+              });
+            }
+          }
+        }
+        crate::database::schema::CompiledFormat::Regex(re) => {
+          if let Some(s) = current.as_str() {
+            if !re.is_match(s) {
+              result.errors.push(ValidationError {
+                code: "FORMAT_MISMATCH".to_string(),
+                message: "Format regex mismatch".to_string(),
+                path: self.path.to_string(),
+              });
+            }
+          }
+        }
+      }
+    }
+    Ok(true)
+  }
+}

src/validator/rules/mod.rs

@@ -0,0 +1,91 @@
+
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+pub mod array;
+pub mod combinators;
+pub mod conditionals;
+pub mod core;
+pub mod format;
+pub mod numeric;
+pub mod object;
+pub mod polymorphism;
+pub mod string;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_scoped(&self) -> Result<ValidationResult, ValidationError> {
+    let mut result = ValidationResult::new();
+
+    // Structural Limits
+    if !self.validate_depth(&mut result)? {
+      return Ok(result);
+    }
+    if !self.validate_always_fail(&mut result)? {
+      return Ok(result);
+    }
+    if !self.validate_family(&mut result)? {
+      return Ok(result);
+    }
+    if !self.validate_refs(&mut result)? {
+      return Ok(result);
+    }
+
+    // Core Type Constraints
+    self.validate_core(&mut result)?;
+    self.validate_numeric(&mut result)?;
+    self.validate_string(&mut result)?;
+    self.validate_format(&mut result)?;
+
+    // Complex Structures
+    self.validate_object(&mut result)?;
+    self.validate_array(&mut result)?;
+
+    // Multipliers & Conditionals
+    self.validate_combinators(&mut result)?;
+    self.validate_conditionals(&mut result)?;
+
+    // State Tracking
+    self.validate_extensible(&mut result)?;
+    self.validate_strictness(&mut result)?;
+
+    Ok(result)
+  }
+
+  fn validate_depth(&self, _result: &mut ValidationResult) -> Result<bool, ValidationError> {
+    if self.depth > 100 {
+      Err(ValidationError {
+        code: "RECURSION_LIMIT_EXCEEDED".to_string(),
+        message: "Recursion limit exceeded".to_string(),
+        path: self.path.to_string(),
+      })
+    } else {
+      Ok(true)
+    }
+  }
+
+  fn validate_always_fail(&self, result: &mut ValidationResult) -> Result<bool, ValidationError> {
+    if self.schema.always_fail {
+      result.errors.push(ValidationError {
+        code: "FALSE_SCHEMA".to_string(),
+        message: "Schema is false".to_string(),
+        path: self.path.to_string(),
+      });
+      // Short-circuit
+      Ok(false)
+    } else {
+      Ok(true)
+    }
+  }
+
+  fn validate_extensible(&self, result: &mut ValidationResult) -> Result<bool, ValidationError> {
+    if self.extensible {
+      if let Some(obj) = self.instance.as_object() {
+        result.evaluated_keys.extend(obj.keys().cloned());
+      } else if let Some(arr) = self.instance.as_array() {
+        result.evaluated_indices.extend(0..arr.len());
+      }
+    }
+    Ok(true)
+  }
+}

src/validator/rules/numeric.rs

@@ -0,0 +1,61 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_numeric(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    let current = self.instance;
+    if let Some(num) = current.as_f64() {
+      if let Some(min) = self.schema.minimum {
+        if num < min {
+          result.errors.push(ValidationError {
+            code: "MINIMUM_VIOLATED".to_string(),
+            message: format!("Value {} < min {}", num, min),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(max) = self.schema.maximum {
+        if num > max {
+          result.errors.push(ValidationError {
+            code: "MAXIMUM_VIOLATED".to_string(),
+            message: format!("Value {} > max {}", num, max),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(ex_min) = self.schema.exclusive_minimum {
+        if num <= ex_min {
+          result.errors.push(ValidationError {
+            code: "EXCLUSIVE_MINIMUM_VIOLATED".to_string(),
+            message: format!("Value {} <= ex_min {}", num, ex_min),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(ex_max) = self.schema.exclusive_maximum {
+        if num >= ex_max {
+          result.errors.push(ValidationError {
+            code: "EXCLUSIVE_MAXIMUM_VIOLATED".to_string(),
+            message: format!("Value {} >= ex_max {}", num, ex_max),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(multiple_of) = self.schema.multiple_of {
+        let val: f64 = num / multiple_of;
+        if (val - val.round()).abs() > f64::EPSILON {
+          result.errors.push(ValidationError {
+            code: "MULTIPLE_OF_VIOLATED".to_string(),
+            message: format!("Value {} not multiple of {}", num, multiple_of),
+            path: self.path.to_string(),
+          });
+        }
+      }
+    }
+    Ok(true)
+  }
+}

src/validator/rules/object.rs

@@ -0,0 +1,216 @@
+use serde_json::Value;
+
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_object(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    let current = self.instance;
+    if let Some(obj) = current.as_object() {
+      // Entity Bound Implicit Type Validation
+      if let Some(allowed_types) = &self.schema.obj.compiled_variations {
+        if let Some(type_val) = obj.get("type") {
+          if let Some(type_str) = type_val.as_str() {
+            if allowed_types.contains(type_str) {
+              // Ensure it passes strict mode
+              result.evaluated_keys.insert("type".to_string());
+            } else {
+              result.errors.push(ValidationError {
+                code: "CONST_VIOLATED".to_string(), // Aligning with original const override errors
+                message: format!(
+                  "Type '{}' is not a valid descendant for this entity bound schema",
+                  type_str
+                ),
+                path: format!("{}/type", self.path),
+              });
+            }
+          }
+        }
+      }
+      if let Some(min) = self.schema.min_properties {
+        if (obj.len() as f64) < min {
+          result.errors.push(ValidationError {
+            code: "MIN_PROPERTIES".to_string(),
+            message: "Too few properties".to_string(),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(max) = self.schema.max_properties {
+        if (obj.len() as f64) > max {
+          result.errors.push(ValidationError {
+            code: "MAX_PROPERTIES".to_string(),
+            message: "Too many properties".to_string(),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(ref req) = self.schema.required {
+        for field in req {
+          if !obj.contains_key(field) {
+            result.errors.push(ValidationError {
+              code: "REQUIRED_FIELD_MISSING".to_string(),
+              message: format!("Missing {}", field),
+              path: format!("{}/{}", self.path, field),
+            });
+          }
+        }
+      }
+
+      if let Some(ref deps) = self.schema.dependencies {
+        for (prop, dep) in deps {
+          if obj.contains_key(prop) {
+            match dep {
+              crate::database::schema::Dependency::Props(required_props) => {
+                for req_prop in required_props {
+                  if !obj.contains_key(req_prop) {
+                    result.errors.push(ValidationError {
+                      code: "DEPENDENCY_MISSING".to_string(),
+                      message: format!("Property '{}' requires property '{}'", prop, req_prop),
+                      path: self.path.to_string(),
+                    });
+                  }
+                }
+              }
+              crate::database::schema::Dependency::Schema(dep_schema) => {
+                let derived = self.derive_for_schema(dep_schema, false);
+                let dep_res = derived.validate()?;
+                result.evaluated_keys.extend(dep_res.evaluated_keys.clone());
+                result.merge(dep_res);
+              }
+            }
+          }
+        }
+      }
+
+      if let Some(props) = &self.schema.properties {
+        for (key, sub_schema) in props {
+          if self.overrides.contains(key) {
+            continue; // Skip validation if exactly this property was overridden by a child
+          }
+
+          if let Some(child_instance) = obj.get(key) {
+            let new_path = format!("{}/{}", self.path, key);
+            let is_ref = sub_schema.ref_string.is_some() || sub_schema.obj.compiled_ref.is_some();
+            let next_extensible = if is_ref { false } else { self.extensible };
+
+            let derived = self.derive(
+              sub_schema,
+              child_instance,
+              &new_path,
+              std::collections::HashSet::new(),
+              next_extensible,
+              false,
+            );
+            let mut item_res = derived.validate()?;
+
+            // Entity Bound Implicit Type Interception
+            if key == "type" {
+              if let Some(allowed_types) = &self.schema.obj.compiled_variations {
+                if let Some(instance_type) = child_instance.as_str() {
+                  if allowed_types.contains(instance_type) {
+                    item_res
+                      .errors
+                      .retain(|e| e.code != "CONST_VIOLATED" && e.code != "ENUM_VIOLATED");
+                  }
+                }
+              }
+            }
+
+            result.merge(item_res);
+            result.evaluated_keys.insert(key.to_string());
+          }
+        }
+      }
+
+      if let Some(ref compiled_pp) = self.schema.compiled_pattern_properties {
+        for (compiled_re, sub_schema) in compiled_pp {
+          for (key, child_instance) in obj {
+            if compiled_re.0.is_match(key) {
+              let new_path = format!("{}/{}", self.path, key);
+              let is_ref = sub_schema.ref_string.is_some() || sub_schema.obj.compiled_ref.is_some();
+              let next_extensible = if is_ref { false } else { self.extensible };
+
+              let derived = self.derive(
+                sub_schema,
+                child_instance,
+                &new_path,
+                std::collections::HashSet::new(),
+                next_extensible,
+                false,
+              );
+              let item_res = derived.validate()?;
+              result.merge(item_res);
+              result.evaluated_keys.insert(key.to_string());
+            }
+          }
+        }
+      }
+
+      if let Some(ref additional_schema) = self.schema.additional_properties {
+        for (key, child_instance) in obj {
+          let mut locally_matched = false;
+          if let Some(props) = &self.schema.properties {
+            if props.contains_key(&key.to_string()) {
+              locally_matched = true;
+            }
+          }
+          if !locally_matched {
+            if let Some(ref compiled_pp) = self.schema.compiled_pattern_properties {
+              for (compiled_re, _) in compiled_pp {
+                if compiled_re.0.is_match(key) {
+                  locally_matched = true;
+                  break;
+                }
+              }
+            }
+          }
+
+          if !locally_matched {
+            let new_path = format!("{}/{}", self.path, key);
+            let is_ref = additional_schema.ref_string.is_some()
+              || additional_schema.obj.compiled_ref.is_some();
+            let next_extensible = if is_ref { false } else { self.extensible };
+
+            let derived = self.derive(
+              additional_schema,
+              child_instance,
+              &new_path,
+              std::collections::HashSet::new(),
+              next_extensible,
+              false,
+            );
+            let item_res = derived.validate()?;
+            result.merge(item_res);
+            result.evaluated_keys.insert(key.to_string());
+          }
+        }
+      }
+
+      if let Some(ref property_names) = self.schema.property_names {
+        for key in obj.keys() {
+          let _new_path = format!("{}/propertyNames/{}", self.path, key);
+          let val_str = Value::String(key.to_string());
+
+          let ctx = ValidationContext::new(
+            self.schemas,
+            self.root,
+            property_names,
+            &val_str,
+            std::collections::HashSet::new(),
+            self.extensible,
+            self.reporter,
+          );
+
+          result.merge(ctx.validate()?);
+        }
+      }
+    }
+
+    Ok(true)
+  }
+}

src/validator/rules/polymorphism.rs

@@ -0,0 +1,73 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_family(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    if self.schema.family.is_some() {
+      let conflicts = self.schema.type_.is_some()
+        || self.schema.properties.is_some()
+        || self.schema.required.is_some()
+        || self.schema.additional_properties.is_some()
+        || self.schema.items.is_some()
+        || self.schema.ref_string.is_some()
+        || self.schema.one_of.is_some()
+        || self.schema.any_of.is_some()
+        || self.schema.all_of.is_some()
+        || self.schema.enum_.is_some()
+        || self.schema.const_.is_some();
+
+      if conflicts {
+        result.errors.push(ValidationError {
+          code: "INVALID_SCHEMA".to_string(),
+          message: "$family must be used exclusively without other constraints".to_string(),
+          path: self.path.to_string(),
+        });
+        // Short-circuit: the schema formulation is broken
+        return Ok(false);
+      }
+    }
+
+    // Family specific runtime validation will go here later if needed
+    Ok(true)
+  }
+
+  pub(crate) fn validate_refs(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    // 1. Core $ref logic relies on the fast O(1) map to allow cycles and proper nesting
+    if let Some(ref_str) = &self.schema.ref_string {
+      if let Some(global_schema) = self.schemas.get(ref_str) {
+        let mut new_overrides = self.overrides.clone();
+        if let Some(props) = &self.schema.properties {
+          new_overrides.extend(props.keys().map(|k| k.to_string()));
+        }
+
+        let mut shadow = self.derive(
+          global_schema,
+          self.instance,
+          &self.path,
+          new_overrides,
+          self.extensible,
+          true,
+        );
+        shadow.root = global_schema;
+        result.merge(shadow.validate()?);
+      } else {
+        result.errors.push(ValidationError {
+          code: "REF_RESOLUTION_FAILED".to_string(),
+          message: format!(
+            "Reference pointer to '{}' was not found in schema registry",
+            ref_str
+          ),
+          path: self.path.to_string(),
+        });
+      }
+    }
+    Ok(true)
+  }
+}

src/validator/rules/string.rs

@@ -0,0 +1,53 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+use regex::Regex;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_string(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    let current = self.instance;
+    if let Some(s) = current.as_str() {
+      if let Some(min) = self.schema.min_length {
+        if (s.chars().count() as f64) < min {
+          result.errors.push(ValidationError {
+            code: "MIN_LENGTH_VIOLATED".to_string(),
+            message: format!("Length < min {}", min),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(max) = self.schema.max_length {
+        if (s.chars().count() as f64) > max {
+          result.errors.push(ValidationError {
+            code: "MAX_LENGTH_VIOLATED".to_string(),
+            message: format!("Length > max {}", max),
+            path: self.path.to_string(),
+          });
+        }
+      }
+      if let Some(ref compiled_re) = self.schema.compiled_pattern {
+        if !compiled_re.0.is_match(s) {
+          result.errors.push(ValidationError {
+            code: "PATTERN_VIOLATED".to_string(),
+            message: format!("Pattern mismatch {:?}", self.schema.pattern),
+            path: self.path.to_string(),
+          });
+        }
+      } else if let Some(ref pattern) = self.schema.pattern {
+        if let Ok(re) = Regex::new(pattern) {
+          if !re.is_match(s) {
+            result.errors.push(ValidationError {
+              code: "PATTERN_VIOLATED".to_string(),
+              message: format!("Pattern mismatch {}", pattern),
+              path: self.path.to_string(),
+            });
+          }
+        }
+      }
+    }
+    Ok(true)
+  }
+}

src/validator/schema.rs

@@ -1,222 +0,0 @@
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::collections::BTreeMap;
-use std::sync::Arc;
-
-// Schema mirrors the Go Punc Generator's schema struct for consistency.
-// It is an order-preserving representation of a JSON Schema.
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct SchemaObject {
-  // Core Schema Keywords
-  #[serde(rename = "$id")]
-  pub id: Option<String>,
-  #[serde(rename = "$ref")]
-  pub ref_string: Option<String>,
-  #[serde(rename = "$anchor")]
-  pub anchor: Option<String>,
-  #[serde(rename = "$dynamicAnchor")]
-  pub dynamic_anchor: Option<String>,
-  #[serde(rename = "$dynamicRef")]
-  pub dynamic_ref: Option<String>,
-  /*
-     Note: The `Ref` field in the Go struct is a pointer populated by the linker.
-     In Rust, we might handle this differently (e.g., separate lookup or Rc/Arc),
-     so we omit the direct recursive `Ref` field for now and rely on `ref_string`.
-  */
-  pub description: Option<String>,
-  pub title: Option<String>,
-  #[serde(default)] // Allow missing type
-  #[serde(rename = "type")]
-  pub type_: Option<SchemaTypeOrArray>, // Handles string or array of strings
-
-  // Object Keywords
-  pub properties: Option<BTreeMap<String, Arc<Schema>>>,
-  #[serde(rename = "patternProperties")]
-  pub pattern_properties: Option<BTreeMap<String, Arc<Schema>>>,
-  #[serde(rename = "additionalProperties")]
-  pub additional_properties: Option<Arc<Schema>>,
-  #[serde(rename = "$family")]
-  pub family: Option<String>,
-
-  pub required: Option<Vec<String>>,
-
-  // dependencies can be schema dependencies or property dependencies
-  pub dependencies: Option<BTreeMap<String, Dependency>>,
-
-  // Definitions (for $ref resolution)
-  #[serde(rename = "$defs")]
-  pub defs: Option<BTreeMap<String, Arc<Schema>>>,
-  #[serde(rename = "definitions")]
-  pub definitions: Option<BTreeMap<String, Arc<Schema>>>,
-
-  // Array Keywords
-  #[serde(rename = "items")]
-  pub items: Option<Arc<Schema>>,
-  #[serde(rename = "prefixItems")]
-  pub prefix_items: Option<Vec<Arc<Schema>>>,
-
-  // String Validation
-  #[serde(rename = "minLength")]
-  pub min_length: Option<f64>,
-  #[serde(rename = "maxLength")]
-  pub max_length: Option<f64>,
-  pub pattern: Option<String>,
-
-  // Array Validation
-  #[serde(rename = "minItems")]
-  pub min_items: Option<f64>,
-  #[serde(rename = "maxItems")]
-  pub max_items: Option<f64>,
-  #[serde(rename = "uniqueItems")]
-  pub unique_items: Option<bool>,
-  #[serde(rename = "contains")]
-  pub contains: Option<Arc<Schema>>,
-  #[serde(rename = "minContains")]
-  pub min_contains: Option<f64>,
-  #[serde(rename = "maxContains")]
-  pub max_contains: Option<f64>,
-
-  // Object Validation
-  #[serde(rename = "minProperties")]
-  pub min_properties: Option<f64>,
-  #[serde(rename = "maxProperties")]
-  pub max_properties: Option<f64>,
-  #[serde(rename = "propertyNames")]
-  pub property_names: Option<Arc<Schema>>,
-  #[serde(rename = "dependentRequired")]
-  pub dependent_required: Option<BTreeMap<String, Vec<String>>>,
-  #[serde(rename = "dependentSchemas")]
-  pub dependent_schemas: Option<BTreeMap<String, Arc<Schema>>>,
-
-  // Numeric Validation
-  pub format: Option<String>,
-  #[serde(rename = "enum")]
-  pub enum_: Option<Vec<Value>>, // `enum` is a reserved keyword in Rust
-  #[serde(
-    default,
-    rename = "const",
-    deserialize_with = "crate::validator::util::deserialize_some"
-  )]
-  pub const_: Option<Value>,
-
-  // Numeric Validation
-  #[serde(rename = "multipleOf")]
-  pub multiple_of: Option<f64>,
-  pub minimum: Option<f64>,
-  pub maximum: Option<f64>,
-  #[serde(rename = "exclusiveMinimum")]
-  pub exclusive_minimum: Option<f64>,
-  #[serde(rename = "exclusiveMaximum")]
-  pub exclusive_maximum: Option<f64>,
-
-  // Combining Keywords
-  #[serde(rename = "allOf")]
-  pub all_of: Option<Vec<Arc<Schema>>>,
-  #[serde(rename = "anyOf")]
-  pub any_of: Option<Vec<Arc<Schema>>>,
-  #[serde(rename = "oneOf")]
-  pub one_of: Option<Vec<Arc<Schema>>>,
-  #[serde(rename = "not")]
-  pub not: Option<Arc<Schema>>,
-  #[serde(rename = "if")]
-  pub if_: Option<Arc<Schema>>,
-  #[serde(rename = "then")]
-  pub then_: Option<Arc<Schema>>,
-  #[serde(rename = "else")]
-  pub else_: Option<Arc<Schema>>,
-
-  // Custom Vocabularies
-  pub form: Option<Vec<String>>,
-  pub display: Option<Vec<String>>,
-  #[serde(rename = "enumNames")]
-  pub enum_names: Option<Vec<String>>,
-  pub control: Option<String>,
-  pub actions: Option<BTreeMap<String, Action>>,
-  pub computer: Option<String>,
-  #[serde(default)]
-  pub extensible: Option<bool>,
-
-  // Compiled Fields (Hidden from JSON/Serde)
-  #[serde(skip)]
-  pub compiled_format: Option<crate::validator::compiler::CompiledFormat>,
-  #[serde(skip)]
-  pub compiled_pattern: Option<crate::validator::compiler::CompiledRegex>,
-  #[serde(skip)]
-  pub compiled_pattern_properties: Option<Vec<(crate::validator::compiler::CompiledRegex, Arc<Schema>)>>,
-  #[serde(skip)]
-  pub compiled_registry: Option<Arc<crate::validator::registry::Registry>>,
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct Schema {
-  #[serde(flatten)]
-  pub obj: SchemaObject,
-  #[serde(skip)]
-  pub always_fail: bool,
-}
-
-impl Default for Schema {
-  fn default() -> Self {
-    Schema {
-      obj: SchemaObject::default(),
-      always_fail: false,
-    }
-  }
-}
-
-impl std::ops::Deref for Schema {
-  type Target = SchemaObject;
-  fn deref(&self) -> &Self::Target {
-    &self.obj
-  }
-}
-impl std::ops::DerefMut for Schema {
-  fn deref_mut(&mut self) -> &mut Self::Target {
-    &mut self.obj
-  }
-}
-
-impl<'de> Deserialize<'de> for Schema {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: serde::Deserializer<'de>,
-  {
-    let v: Value = Deserialize::deserialize(deserializer)?;
-
-    if let Some(b) = v.as_bool() {
-      let mut obj = SchemaObject::default();
-      if b {
-        obj.extensible = Some(true);
-      }
-      return Ok(Schema {
-        obj,
-        always_fail: !b,
-      });
-    }
-    let obj: SchemaObject = serde_json::from_value(v.clone()).map_err(serde::de::Error::custom)?;
-
-    Ok(Schema {
-      obj,
-      always_fail: false,
-    })
-  }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum SchemaTypeOrArray {
-  Single(String),
-  Multiple(Vec<String>),
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Action {
-  pub navigate: Option<String>,
-  pub punc: Option<String>,
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum Dependency {
-  Props(Vec<String>),
-  Schema(Arc<Schema>),
-}

src/validator/util.rs

@@ -5,11 +5,7 @@ use std::fs;
 struct TestSuite {
   #[allow(dead_code)]
   description: String,
-  schema: Option<serde_json::Value>,
-  // Support JSPG-style test suites with explicit types/enums/puncs
-  types: Option<serde_json::Value>,
-  enums: Option<serde_json::Value>,
-  puncs: Option<serde_json::Value>,
+  database: serde_json::Value,
   tests: Vec<TestCase>,
 }
 
@@ -19,10 +15,7 @@ struct TestCase {
   data: serde_json::Value,
   valid: bool,
   // Support explicit schema ID target for test case
-  schema_id: Option<String>,
-  // Expected output for masking tests
-  #[allow(dead_code)]
-  expected: Option<serde_json::Value>,
+  schema_id: String,
 }
 
 // use crate::validator::registry::REGISTRY; // No longer used directly for tests!
@@ -50,124 +43,42 @@ pub fn run_test_file_at_index(path: &str, index: usize) -> Result<(), String> {
   let group = &suite[index];
   let mut failures = Vec::<String>::new();
 
-  // Create Validator Instance and parse enums, types, and puncs automatically
-  let mut validator = Validator::from_punc_definition(
-    group.enums.as_ref(),
-    group.types.as_ref(),
-    group.puncs.as_ref(),
-  );
-
-  // 3. Register root 'schemas' if present (generic test support)
-  // Some tests use a raw 'schema' or 'schemas' field at the group level
-  if let Some(schema_val) = &group.schema {
-    match serde_json::from_value::<crate::validator::schema::Schema>(schema_val.clone()) {
-      Ok(mut schema) => {
-        let id_clone = schema.obj.id.clone();
-        if id_clone.is_some() {
-          validator.registry.add(schema);
-        } else {
-          // Fallback ID if none provided in schema
-          let id = format!("test:{}:{}", path, index);
-          schema.obj.id = Some(id);
-          validator.registry.add(schema);
-        }
-      }
-      Err(e) => {
-        eprintln!(
-          "DEBUG: FAILED to deserialize group schema for index {}: {}",
-          index, e
-        );
-      }
-    }
-  }
+  let db_json = group.database.clone();
+  let db = crate::database::Database::new(&db_json);
+  let validator = Validator::new(std::sync::Arc::new(db.schemas));
 
   // 4. Run Tests
   for (_test_index, test) in group.tests.iter().enumerate() {
-    let mut schema_id = test.schema_id.clone();
+    let schema_id = &test.schema_id;
 
-    // If no explicit schema_id, try to infer from the single schema in the group
-    if schema_id.is_none() {
-      if let Some(s) = &group.schema {
-        // If 'schema' is a single object, use its ID or "root"
-        if let Some(obj) = s.as_object() {
-          if let Some(id_val) = obj.get("$id") {
-            schema_id = id_val.as_str().map(|s| s.to_string());
-          }
-        }
-        if schema_id.is_none() {
-          schema_id = Some(format!("test:{}:{}", path, index));
-        }
-      }
+    if validator.schemas.get(schema_id).is_none() {
+      failures.push(format!(
+        "[{}] Missing Schema: Cannot find schema ID '{}'",
+        group.description, schema_id
+      ));
+      continue;
     }
 
-    // Default to the first punc if present (for puncs.json style)
-    if schema_id.is_none() {
-      if let Some(Value::Array(puncs)) = &group.puncs {
-        if let Some(first_punc) = puncs.first() {
-          if let Some(Value::Array(schemas)) = first_punc.get("schemas") {
-            if let Some(first_schema) = schemas.first() {
-              if let Some(id) = first_schema.get("$id").and_then(|v| v.as_str()) {
-                schema_id = Some(id.to_string());
-              }
-            }
-          }
-        }
+    let result = validator.validate(schema_id, &test.data);
+
+    let (got_valid, _errors) = match &result {
+      Ok(res) => (res.is_valid(), &res.errors),
+      Err(_e) => {
+        // If we encounter an execution error (e.g. Schema Not Found),
+        // we treat it as a test failure.
+        (false, &vec![])
       }
-    }
+    };
 
-    if let Some(sid) = schema_id {
-      let result = validator.validate(&sid, &test.data);
-
-      let (got_valid, _errors) = match &result {
-        Ok(res) => (res.is_valid(), &res.errors),
-        Err(_e) => {
-          // If we encounter an execution error (e.g. Schema Not Found),
-          // we treat it as a test failure.
-          (false, &vec![])
-        }
+    if got_valid != test.valid {
+      let error_msg = match &result {
+        Ok(res) => format!("{:?}", res.errors),
+        Err(e) => format!("Execution Error: {:?}", e),
       };
 
-      if let Some(expected) = &test.expected {
-        // Masking Test
-        let mut data_for_mask = test.data.clone();
-        match validator.mask(&sid, &mut data_for_mask) {
-          Ok(_) => {
-            if !equals(&data_for_mask, expected) {
-              let msg = format!(
-                "Masking Test '{}' failed.\nExpected: {:?}\nGot: {:?}",
-                test.description, expected, data_for_mask
-              );
-              eprintln!("{}", msg);
-              failures.push(msg);
-            }
-          }
-          Err(e) => {
-            let msg = format!(
-              "Masking Test '{}' failed with execution error: {:?}",
-              test.description, e
-            );
-            eprintln!("{}", msg);
-            failures.push(msg);
-          }
-        }
-      } else {
-        // Standard Validation Test
-        if got_valid != test.valid {
-          let error_msg = match &result {
-            Ok(res) => format!("{:?}", res.errors),
-            Err(e) => format!("Execution Error: {:?}", e),
-          };
-
-          failures.push(format!(
-            "[{}] Test '{}' failed. Expected: {}, Got: {}. Errors: {}",
-            group.description, test.description, test.valid, got_valid, error_msg
-          ));
-        }
-      }
-    } else {
       failures.push(format!(
-        "[{}] Test '{}' skipped: No schema ID found.",
-        group.description, test.description
+        "[{}] Test '{}' failed. Expected: {}, Got: {}. Errors: {}",
+        group.description, test.description, test.valid, got_valid, error_msg
       ));
     }
   }
@@ -178,96 +89,6 @@ pub fn run_test_file_at_index(path: &str, index: usize) -> Result<(), String> {
 
   Ok(())
 }
-pub fn run_test_file(path: &str) -> Result<(), String> {
-  let content =
-    fs::read_to_string(path).unwrap_or_else(|_| panic!("Failed to read file: {}", path));
-  let suite: Vec<TestSuite> = serde_json::from_str(&content)
-    .unwrap_or_else(|e| panic!("Failed to parse JSON in {}: {}", path, e));
-
-  let mut failures = Vec::<String>::new();
-  for (group_index, group) in suite.into_iter().enumerate() {
-    // Create Validator Instance and parse enums, types, and puncs automatically
-    let mut validator = Validator::from_punc_definition(
-      group.enums.as_ref(),
-      group.types.as_ref(),
-      group.puncs.as_ref(),
-    );
-
-    let unique_id = format!("test:{}:{}", path, group_index);
-
-    // Register main 'schema' if present (Standard style)
-    if let Some(ref schema_val) = group.schema {
-      let mut schema: crate::validator::schema::Schema =
-        serde_json::from_value(schema_val.clone()).expect("Failed to parse test schema");
-
-      // If schema has no ID, assign unique_id and use add() or manual insert?
-      // Compiler needs ID. Registry::add needs ID.
-      if schema.obj.id.is_none() {
-        schema.obj.id = Some(unique_id.clone());
-      }
-      validator.registry.add(schema);
-    }
-
-    for test in group.tests {
-      // Use explicit schema_id from test, or default to unique_id
-      let schema_id = test.schema_id.as_deref().unwrap_or(&unique_id).to_string();
-
-      let result = validator.validate(&schema_id, &test.data);
-
-      if test.valid {
-        match result {
-          Ok(res) => {
-            if !res.is_valid() {
-              let msg = format!(
-                "Test failed (expected valid): {}\nSchema: {:?}\nData: {:?}\nErrors: {:?}",
-                test.description,
-                group.schema, // We might need to find the actual schema used if schema_id is custom
-                test.data,
-                res.errors
-              );
-              eprintln!("{}", msg);
-              failures.push(msg);
-            }
-          }
-          Err(e) => {
-            let msg = format!(
-              "Test failed (expected valid) but got execution error: {}\nSchema: {:?}\nData: {:?}\nError: {:?}",
-              test.description, group.schema, test.data, e
-            );
-            eprintln!("{}", msg);
-            failures.push(msg);
-          }
-        }
-      } else {
-        match result {
-          Ok(res) => {
-            if res.is_valid() {
-              let msg = format!(
-                "Test failed (expected invalid): {}\nSchema: {:?}\nData: {:?}",
-                test.description, group.schema, test.data
-              );
-              eprintln!("{}", msg);
-              failures.push(msg);
-            }
-          }
-          Err(_) => {
-            // Expected invalid, got error (which implies invalid/failure), so this is PASS.
-          }
-        }
-      }
-    }
-  }
-
-  if !failures.is_empty() {
-    return Err(format!(
-      "{} tests failed in file {}:\n\n{}",
-      failures.len(),
-      path,
-      failures.join("\n\n")
-    ));
-  }
-  Ok(())
-}
 
 pub fn is_integer(v: &Value) -> bool {
   match v {

test_err.log

@@ -0,0 +1,62 @@
+   Compiling jspg v0.1.0 (/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg)
+    Finished `test` profile [unoptimized + debuginfo] target(s) in 26.14s
+     Running unittests src/lib.rs (target/debug/deps/jspg-99ace086c3537f5a)
+
+running 1 test
+       Using PgConfig("pg18") and `pg_config` from /opt/homebrew/opt/postgresql@18/bin/pg_config
+    Building extension with features pg_test pg18
+     Running command "/opt/homebrew/bin/cargo" "build" "--lib" "--features" "pg_test pg18" "--no-default-features" "--message-format=json-render-diagnostics"
+   Compiling jspg v0.1.0 (/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg)
+    Finished `dev` profile [unoptimized + debuginfo] target(s) in 7.10s
+  Installing extension
+     Copying control file to /opt/homebrew/share/postgresql@18/extension/jspg.control
+     Copying shared library to /opt/homebrew/lib/postgresql@18/jspg.dylib
+  Discovered 351 SQL entities: 1 schemas (1 unique), 350 functions, 0 types, 0 enums, 0 sqls, 0 ords, 0 hashes, 0 aggregates, 0 triggers
+  Rebuilding pgrx_embed, in debug mode, for SQL generation with features pg_test pg18
+   Compiling jspg v0.1.0 (/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg)
+    Finished `dev` profile [unoptimized + debuginfo] target(s) in 10.63s
+     Writing SQL entities to /opt/homebrew/share/postgresql@18/extension/jspg--0.1.0.sql
+    Finished installing jspg
+[2026-03-01 22:54:19.068 EST] [82952] [69a509eb.14408]: LOG:  starting PostgreSQL 18.1 (Homebrew) on aarch64-apple-darwin25.2.0, compiled by Apple clang version 17.0.0 (clang-1700.6.3.2), 64-bit
+[2026-03-01 22:54:19.070 EST] [82952] [69a509eb.14408]: LOG:  listening on IPv6 address "::1", port 32218
+[2026-03-01 22:54:19.070 EST] [82952] [69a509eb.14408]: LOG:  listening on IPv4 address "127.0.0.1", port 32218
+[2026-03-01 22:54:19.071 EST] [82952] [69a509eb.14408]: LOG:  listening on Unix socket "/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg/target/test-pgdata/.s.PGSQL.32218"
+[2026-03-01 22:54:19.077 EST] [82958] [69a509eb.1440e]: LOG:  database system was shut down at 2026-03-01 22:49:02 EST
+    Creating database pgrx_tests
+
+thread 'tests::pg_test_typed_refs_0' (29092254) panicked at /Users/awgneo/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/pgrx-tests-0.16.1/src/framework.rs:166:9:
+
+
+Postgres Messages:
+[2026-03-01 22:54:19.068 EST] [82952] [69a509eb.14408]: LOG:  starting PostgreSQL 18.1 (Homebrew) on aarch64-apple-darwin25.2.0, compiled by Apple clang version 17.0.0 (clang-1700.6.3.2), 64-bit
+[2026-03-01 22:54:19.070 EST] [82952] [69a509eb.14408]: LOG:  listening on IPv6 address "::1", port 32218
+[2026-03-01 22:54:19.070 EST] [82952] [69a509eb.14408]: LOG:  listening on IPv4 address "127.0.0.1", port 32218
+[2026-03-01 22:54:19.071 EST] [82952] [69a509eb.14408]: LOG:  listening on Unix socket "/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg/target/test-pgdata/.s.PGSQL.32218"
+[2026-03-01 22:54:19.081 EST] [82952] [69a509eb.14408]: LOG:  database system is ready to accept connections
+
+
+Test Function Messages:
+[2026-03-01 22:54:20.058 EST] [82982] [69a509ec.14426]: LOG:  statement: START TRANSACTION
+[2026-03-01 22:54:20.058 EST] [82982] [69a509ec.14426]: LOG:  statement: SELECT "tests"."test_typed_refs_0"();
+[2026-03-01 22:54:20.062 EST] [82982] [69a509ec.14426]: ERROR:  called `Result::unwrap()` on an `Err` value: "[Entity inheritance and native type discrimination] Test 'Valid person against organization schema (implicit type allowance)' failed. Expected: true, Got: false. Errors: [ValidationError { code: \"CONST_VIOLATED\", message: \"Value does not match const\", path: \"/type\" }, ValidationError { code: \"STRICT_PROPERTY_VIOLATION\", message: \"Unexpected property 'first_name'\", path: \"/first_name\" }, ValidationError { code: \"STRICT_PROPERTY_VIOLATION\", message: \"Unexpected property 'first_name'\", path: \"/first_name\" }, ValidationError { code: \"STRICT_PROPERTY_VIOLATION\", message: \"Unexpected property 'first_name'\", path: \"/first_name\" }]\n[Entity inheritance and native type discrimination] Test 'Valid organization against organization schema' failed. Expected: true, Got: false. Errors: [ValidationError { code: \"CONST_VIOLATED\", message: \"Value does not match const\", path: \"/type\" }]\n[Entity inheritance and native type discrimination] Test 'Invalid entity against organization schema (ancestor not allowed)' failed. Expected: false, Got: true. Errors: []"
+[2026-03-01 22:54:20.062 EST] [82982] [69a509ec.14426]: STATEMENT:  SELECT "tests"."test_typed_refs_0"();
+[2026-03-01 22:54:20.062 EST] [82982] [69a509ec.14426]: LOG:  statement: ROLLBACK
+
+
+Client Error:
+called `Result::unwrap()` on an `Err` value: "[Entity inheritance and native type discrimination] Test 'Valid person against organization schema (implicit type allowance)' failed. Expected: true, Got: false. Errors: [ValidationError { code: \"CONST_VIOLATED\", message: \"Value does not match const\", path: \"/type\" }, ValidationError { code: \"STRICT_PROPERTY_VIOLATION\", message: \"Unexpected property 'first_name'\", path: \"/first_name\" }, ValidationError { code: \"STRICT_PROPERTY_VIOLATION\", message: \"Unexpected property 'first_name'\", path: \"/first_name\" }, ValidationError { code: \"STRICT_PROPERTY_VIOLATION\", message: \"Unexpected property 'first_name'\", path: \"/first_name\" }]\n[Entity inheritance and native type discrimination] Test 'Valid organization against organization schema' failed. Expected: true, Got: false. Errors: [ValidationError { code: \"CONST_VIOLATED\", message: \"Value does not match const\", path: \"/type\" }]\n[Entity inheritance and native type discrimination] Test 'Invalid entity against organization schema (ancestor not allowed)' failed. Expected: false, Got: true. Errors: []"
+postgres location: fixtures.rs
+rust location: <unknown>
+
+
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+test tests::pg_test_typed_refs_0 ... FAILED
+
+failures:
+
+failures:
+    tests::pg_test_typed_refs_0
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 343 filtered out; finished in 21.82s
+
+error: test failed, to rerun pass `--lib`

tests/fixtures.rs

@@ -1,29 +1,5 @@
 use jspg::validator::util;
 
-#[test]
-fn test_anchor_0() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_anchor_1() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[test]
-fn test_anchor_2() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[test]
-fn test_anchor_3() {
-    let path = format!("{}/tests/fixtures/anchor.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 3).unwrap();
-}
-
 #[test]
 fn test_content_0() {
     let path = format!("{}/tests/fixtures/content.json", env!("CARGO_MANIFEST_DIR"));
@@ -108,54 +84,6 @@ fn test_min_items_2() {
     util::run_test_file_at_index(&path, 2).unwrap();
 }
 
-#[test]
-fn test_puncs_0() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_puncs_1() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[test]
-fn test_puncs_2() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[test]
-fn test_puncs_3() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[test]
-fn test_puncs_4() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 4).unwrap();
-}
-
-#[test]
-fn test_puncs_5() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 5).unwrap();
-}
-
-#[test]
-fn test_puncs_6() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 6).unwrap();
-}
-
-#[test]
-fn test_puncs_7() {
-    let path = format!("{}/tests/fixtures/puncs.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 7).unwrap();
-}
-
 #[test]
 fn test_additional_properties_0() {
     let path = format!("{}/tests/fixtures/additionalProperties.json", env!("CARGO_MANIFEST_DIR"));
@@ -174,6 +102,72 @@ fn test_additional_properties_2() {
     util::run_test_file_at_index(&path, 2).unwrap();
 }
 
+#[test]
+fn test_dependencies_0() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 0).unwrap();
+}
+
+#[test]
+fn test_dependencies_1() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 1).unwrap();
+}
+
+#[test]
+fn test_dependencies_2() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 2).unwrap();
+}
+
+#[test]
+fn test_dependencies_3() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 3).unwrap();
+}
+
+#[test]
+fn test_dependencies_4() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 4).unwrap();
+}
+
+#[test]
+fn test_dependencies_5() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 5).unwrap();
+}
+
+#[test]
+fn test_dependencies_6() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 6).unwrap();
+}
+
+#[test]
+fn test_dependencies_7() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 7).unwrap();
+}
+
+#[test]
+fn test_dependencies_8() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 8).unwrap();
+}
+
+#[test]
+fn test_dependencies_9() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 9).unwrap();
+}
+
+#[test]
+fn test_dependencies_10() {
+    let path = format!("{}/tests/fixtures/dependencies.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 10).unwrap();
+}
+
 #[test]
 fn test_exclusive_minimum_0() {
     let path = format!("{}/tests/fixtures/exclusiveMinimum.json", env!("CARGO_MANIFEST_DIR"));
@@ -348,6 +342,18 @@ fn test_any_of_9() {
     util::run_test_file_at_index(&path, 9).unwrap();
 }
 
+#[test]
+fn test_families_0() {
+    let path = format!("{}/tests/fixtures/families.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 0).unwrap();
+}
+
+#[test]
+fn test_families_1() {
+    let path = format!("{}/tests/fixtures/families.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 1).unwrap();
+}
+
 #[test]
 fn test_property_names_0() {
     let path = format!("{}/tests/fixtures/propertyNames.json", env!("CARGO_MANIFEST_DIR"));
@@ -390,18 +396,6 @@ fn test_property_names_6() {
     util::run_test_file_at_index(&path, 6).unwrap();
 }
 
-#[test]
-fn test_boolean_schema_0() {
-    let path = format!("{}/tests/fixtures/boolean_schema.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_boolean_schema_1() {
-    let path = format!("{}/tests/fixtures/boolean_schema.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
 #[test]
 fn test_not_0() {
     let path = format!("{}/tests/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));
@@ -852,42 +846,6 @@ fn test_max_length_1() {
     util::run_test_file_at_index(&path, 1).unwrap();
 }
 
-#[test]
-fn test_dependent_schemas_0() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_dependent_schemas_1() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[test]
-fn test_dependent_schemas_2() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[test]
-fn test_dependent_schemas_3() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[test]
-fn test_dependent_schemas_4() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 4).unwrap();
-}
-
-#[test]
-fn test_dependent_schemas_5() {
-    let path = format!("{}/tests/fixtures/dependentSchemas.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 5).unwrap();
-}
-
 #[test]
 fn test_exclusive_maximum_0() {
     let path = format!("{}/tests/fixtures/exclusiveMaximum.json", env!("CARGO_MANIFEST_DIR"));
@@ -1014,6 +972,18 @@ fn test_one_of_12() {
     util::run_test_file_at_index(&path, 12).unwrap();
 }
 
+#[test]
+fn test_boolean_schema_0() {
+    let path = format!("{}/tests/fixtures/booleanSchema.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 0).unwrap();
+}
+
+#[test]
+fn test_boolean_schema_1() {
+    let path = format!("{}/tests/fixtures/booleanSchema.json", env!("CARGO_MANIFEST_DIR"));
+    util::run_test_file_at_index(&path, 1).unwrap();
+}
+
 #[test]
 fn test_if_then_else_0() {
     let path = format!("{}/tests/fixtures/if-then-else.json", env!("CARGO_MANIFEST_DIR"));
@@ -1116,30 +1086,6 @@ fn test_pattern_1() {
     util::run_test_file_at_index(&path, 1).unwrap();
 }
 
-#[test]
-fn test_masking_0() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_masking_1() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[test]
-fn test_masking_2() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[test]
-fn test_masking_3() {
-    let path = format!("{}/tests/fixtures/masking.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 3).unwrap();
-}
-
 #[test]
 fn test_max_properties_0() {
     let path = format!("{}/tests/fixtures/maxProperties.json", env!("CARGO_MANIFEST_DIR"));
@@ -1164,36 +1110,6 @@ fn test_max_properties_3() {
     util::run_test_file_at_index(&path, 3).unwrap();
 }
 
-#[test]
-fn test_dependent_required_0() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_dependent_required_1() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[test]
-fn test_dependent_required_2() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[test]
-fn test_dependent_required_3() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[test]
-fn test_dependent_required_4() {
-    let path = format!("{}/tests/fixtures/dependentRequired.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 4).unwrap();
-}
-
 #[test]
 fn test_required_0() {
     let path = format!("{}/tests/fixtures/required.json", env!("CARGO_MANIFEST_DIR"));
@@ -1722,150 +1638,6 @@ fn test_ref_15() {
     util::run_test_file_at_index(&path, 15).unwrap();
 }
 
-#[test]
-fn test_ref_16() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 16).unwrap();
-}
-
-#[test]
-fn test_ref_17() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 17).unwrap();
-}
-
-#[test]
-fn test_ref_18() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 18).unwrap();
-}
-
-#[test]
-fn test_ref_19() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 19).unwrap();
-}
-
-#[test]
-fn test_ref_20() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 20).unwrap();
-}
-
-#[test]
-fn test_ref_21() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 21).unwrap();
-}
-
-#[test]
-fn test_ref_22() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 22).unwrap();
-}
-
-#[test]
-fn test_ref_23() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 23).unwrap();
-}
-
-#[test]
-fn test_ref_24() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 24).unwrap();
-}
-
-#[test]
-fn test_ref_25() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 25).unwrap();
-}
-
-#[test]
-fn test_ref_26() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 26).unwrap();
-}
-
-#[test]
-fn test_ref_27() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 27).unwrap();
-}
-
-#[test]
-fn test_ref_28() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 28).unwrap();
-}
-
-#[test]
-fn test_ref_29() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 29).unwrap();
-}
-
-#[test]
-fn test_ref_30() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 30).unwrap();
-}
-
-#[test]
-fn test_ref_31() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 31).unwrap();
-}
-
-#[test]
-fn test_ref_32() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 32).unwrap();
-}
-
-#[test]
-fn test_ref_33() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 33).unwrap();
-}
-
-#[test]
-fn test_ref_34() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 34).unwrap();
-}
-
-#[test]
-fn test_ref_35() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 35).unwrap();
-}
-
-#[test]
-fn test_ref_36() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 36).unwrap();
-}
-
-#[test]
-fn test_ref_37() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 37).unwrap();
-}
-
-#[test]
-fn test_ref_38() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 38).unwrap();
-}
-
-#[test]
-fn test_ref_39() {
-    let path = format!("{}/tests/fixtures/ref.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 39).unwrap();
-}
-
 #[test]
 fn test_maximum_0() {
     let path = format!("{}/tests/fixtures/maximum.json", env!("CARGO_MANIFEST_DIR"));
@@ -1961,129 +1733,3 @@ fn test_contains_8() {
     let path = format!("{}/tests/fixtures/contains.json", env!("CARGO_MANIFEST_DIR"));
     util::run_test_file_at_index(&path, 8).unwrap();
 }
-
-#[test]
-fn test_dynamic_ref_0() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 0).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_1() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 1).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_2() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 2).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_3() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 3).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_4() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 4).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_5() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 5).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_6() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 6).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_7() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 7).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_8() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 8).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_9() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 9).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_10() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 10).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_11() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 11).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_12() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 12).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_13() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 13).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_14() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 14).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_15() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 15).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_16() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 16).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_17() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 17).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_18() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 18).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_19() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 19).unwrap();
-}
-
-#[test]
-fn test_dynamic_ref_20() {
-    let path = format!("{}/tests/fixtures/dynamicRef.json", env!("CARGO_MANIFEST_DIR"));
-    util::run_test_file_at_index(&path, 20).unwrap();
-}

tests/fixtures/additionalProperties.json

@@ -1,19 +1,23 @@
 [
     {
         "description": "additionalProperties validates properties not matched by properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "string"
-                },
-                "bar": {
-                    "type": "number"
+        "database": {
+            "schemas": [
+                {
+                    "$id": "schema1",
+                    "properties": {
+                        "foo": {
+                            "type": "string"
+                        },
+                        "bar": {
+                            "type": "number"
+                        }
+                    },
+                    "additionalProperties": {
+                        "type": "boolean"
+                    }
                 }
-            },
-            "additionalProperties": {
-                "type": "boolean"
-            }
+            ]
         },
         "tests": [
             {
@@ -22,7 +26,8 @@
                     "foo": "value",
                     "bar": 123
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "schema1"
             },
             {
                 "description": "additional property matching schema is valid",
@@ -31,7 +36,8 @@
                     "is_active": true,
                     "hidden": false
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "schema1"
             },
             {
                 "description": "additional property not matching schema is invalid",
@@ -39,23 +45,28 @@
                     "foo": "value",
                     "is_active": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "schema1"
             }
         ]
     },
     {
         "description": "extensible: true with additionalProperties still validates structure",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {
+                            "type": "string"
+                        }
+                    },
+                    "extensible": true,
+                    "additionalProperties": {
+                        "type": "integer"
+                    },
+                    "$id": "additionalProperties_1_0"
                 }
-            },
-            "extensible": true,
-            "additionalProperties": {
-                "type": "integer"
-            }
+            ]
         },
         "tests": [
             {
@@ -65,7 +76,8 @@
                     "count": 5,
                     "age": 42
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "additionalProperties_1_0"
             },
             {
                 "description": "additional property not matching schema is invalid despite extensible: true",
@@ -73,25 +85,30 @@
                     "foo": "hello",
                     "count": "five"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "additionalProperties_1_0"
             }
         ]
     },
     {
         "description": "complex additionalProperties with object and array items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "type": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "$id": "schema3",
+                    "properties": {
+                        "type": {
+                            "type": "string"
+                        }
+                    },
+                    "additionalProperties": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
                 }
-            },
-            "additionalProperties": {
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            }
+            ]
         },
         "tests": [
             {
@@ -106,7 +123,8 @@
                         "field3"
                     ]
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "schema3"
             },
             {
                 "description": "invalid array of integers",
@@ -117,7 +135,8 @@
                         2
                     ]
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "schema3"
             },
             {
                 "description": "invalid non-array type",
@@ -125,7 +144,8 @@
                     "type": "my_type",
                     "group_a": "field1"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "schema3"
             }
         ]
     }

tests/fixtures/allOf.json

@@ -1,28 +1,32 @@
 [
     {
         "description": "allOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "bar": {
-                            "type": "integer"
+                    "allOf": [
+                        {
+                            "properties": {
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "bar"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "foo"
+                            ]
                         }
-                    },
-                    "required": [
-                        "bar"
-                    ]
-                },
-                {
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "foo"
-                    ]
+                    ],
+                    "$id": "allOf_0_0"
                 }
             ]
         },
@@ -33,21 +37,24 @@
                     "foo": "baz",
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_0_0"
             },
             {
                 "description": "mismatch second",
                 "data": {
                     "foo": "baz"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_0_0"
             },
             {
                 "description": "mismatch first",
                 "data": {
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_0_0"
             },
             {
                 "description": "wrong type",
@@ -55,46 +62,51 @@
                     "foo": "baz",
                     "bar": "quux"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_0_0"
             }
         ]
     },
     {
         "description": "allOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "bar": {
-                    "type": "integer"
-                },
-                "baz": {},
-                "foo": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "bar"
-            ],
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
                     "properties": {
+                        "bar": {
+                            "type": "integer"
+                        },
+                        "baz": {},
                         "foo": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "foo"
-                    ]
-                },
-                {
-                    "properties": {
-                        "baz": {
-                            "type": "null"
+                        "bar"
+                    ],
+                    "allOf": [
+                        {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "foo"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "baz": {
+                                    "type": "null"
+                                }
+                            },
+                            "required": [
+                                "baz"
+                            ]
                         }
-                    },
-                    "required": [
-                        "baz"
-                    ]
+                    ],
+                    "$id": "allOf_1_0"
                 }
             ]
         },
@@ -106,7 +118,8 @@
                     "bar": 2,
                     "baz": null
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_1_0"
             },
             {
                 "description": "mismatch base schema",
@@ -114,7 +127,8 @@
                     "foo": "quux",
                     "baz": null
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_1_0"
             },
             {
                 "description": "mismatch first allOf",
@@ -122,7 +136,8 @@
                     "bar": 2,
                     "baz": null
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_1_0"
             },
             {
                 "description": "mismatch second allOf",
@@ -130,27 +145,33 @@
                     "foo": "quux",
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_1_0"
             },
             {
                 "description": "mismatch both",
                 "data": {
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_1_0"
             }
         ]
     },
     {
         "description": "allOf simple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "maximum": 30
-                },
-                {
-                    "minimum": 20
+                    "allOf": [
+                        {
+                            "maximum": 30
+                        },
+                        {
+                            "minimum": 20
+                        }
+                    ],
+                    "$id": "allOf_2_0"
                 }
             ]
         },
@@ -158,107 +179,138 @@
             {
                 "description": "valid",
                 "data": 25,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_2_0"
             },
             {
                 "description": "mismatch one",
                 "data": 35,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_2_0"
             }
         ]
     },
     {
         "description": "allOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                true,
-                true
+        "database": {
+            "schemas": [
+                {
+                    "allOf": [
+                        true,
+                        true
+                    ],
+                    "$id": "allOf_3_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_3_0"
             }
         ]
     },
     {
         "description": "allOf with boolean schemas, some false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                true,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "allOf": [
+                        true,
+                        false
+                    ],
+                    "$id": "allOf_4_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_4_0"
             }
         ]
     },
     {
         "description": "allOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                false,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "allOf": [
+                        false,
+                        false
+                    ],
+                    "$id": "allOf_5_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_5_0"
             }
         ]
     },
     {
         "description": "allOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {}
+        "database": {
+            "schemas": [
+                {
+                    "allOf": [
+                        {}
+                    ],
+                    "$id": "allOf_6_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any data is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_6_0"
             }
         ]
     },
     {
         "description": "allOf with two empty schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {},
-                {}
+        "database": {
+            "schemas": [
+                {
+                    "allOf": [
+                        {},
+                        {}
+                    ],
+                    "$id": "allOf_7_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any data is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_7_0"
             }
         ]
     },
     {
         "description": "allOf with the first empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
-                {},
+        "database": {
+            "schemas": [
                 {
-                    "type": "number"
+                    "allOf": [
+                        {},
+                        {
+                            "type": "number"
+                        }
+                    ],
+                    "$id": "allOf_8_0"
                 }
             ]
         },
@@ -266,50 +318,62 @@
             {
                 "description": "number is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_8_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_8_0"
             }
         ]
     },
     {
         "description": "allOf with the last empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "number"
-                },
-                {}
+                    "allOf": [
+                        {
+                            "type": "number"
+                        },
+                        {}
+                    ],
+                    "$id": "allOf_9_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "number is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_9_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_9_0"
             }
         ]
     },
     {
         "description": "nested allOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
                     "allOf": [
                         {
-                            "type": "null"
+                            "allOf": [
+                                {
+                                    "type": "null"
+                                }
+                            ]
                         }
-                    ]
+                    ],
+                    "$id": "allOf_10_0"
                 }
             ]
         },
@@ -317,32 +381,38 @@
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_10_0"
             },
             {
                 "description": "anything non-null is invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_10_0"
             }
         ]
     },
     {
         "description": "allOf combined with anyOf, oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "multipleOf": 2
-                }
-            ],
-            "anyOf": [
-                {
-                    "multipleOf": 3
-                }
-            ],
-            "oneOf": [
-                {
-                    "multipleOf": 5
+                    "allOf": [
+                        {
+                            "multipleOf": 2
+                        }
+                    ],
+                    "anyOf": [
+                        {
+                            "multipleOf": 3
+                        }
+                    ],
+                    "oneOf": [
+                        {
+                            "multipleOf": 5
+                        }
+                    ],
+                    "$id": "allOf_11_0"
                 }
             ]
         },
@@ -350,72 +420,84 @@
             {
                 "description": "allOf: false, anyOf: false, oneOf: false",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: false, anyOf: false, oneOf: true",
                 "data": 5,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: false, anyOf: true, oneOf: false",
                 "data": 3,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: false, anyOf: true, oneOf: true",
                 "data": 15,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: true, anyOf: false, oneOf: false",
                 "data": 2,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: true, anyOf: false, oneOf: true",
                 "data": 10,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: true, anyOf: true, oneOf: false",
                 "data": 6,
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_11_0"
             },
             {
                 "description": "allOf: true, anyOf: true, oneOf: true",
                 "data": 30,
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_11_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in allOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "bar": {
-                            "type": "integer"
+                    "allOf": [
+                        {
+                            "properties": {
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "bar"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "foo"
+                            ]
                         }
-                    },
-                    "required": [
-                        "bar"
-                    ]
-                },
-                {
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "foo"
-                    ]
+                    ],
+                    "extensible": true,
+                    "$id": "allOf_12_0"
                 }
-            ],
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -425,28 +507,33 @@
                     "bar": 2,
                     "qux": 3
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_12_0"
             }
         ]
     },
     {
         "description": "strict by default with allOf properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "foo": {
-                            "const": 1
+                    "allOf": [
+                        {
+                            "properties": {
+                                "foo": {
+                                    "const": 1
+                                }
+                            }
+                        },
+                        {
+                            "properties": {
+                                "bar": {
+                                    "const": 2
+                                }
+                            }
                         }
-                    }
-                },
-                {
-                    "properties": {
-                        "bar": {
-                            "const": 2
-                        }
-                    }
+                    ],
+                    "$id": "allOf_13_0"
                 }
             ]
         },
@@ -457,7 +544,8 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_13_0"
             },
             {
                 "description": "fails on extra property z explicitly",
@@ -466,29 +554,34 @@
                     "bar": 2,
                     "z": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_13_0"
             }
         ]
     },
     {
         "description": "allOf with nested extensible: true (partial looseness)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "foo": {
-                            "const": 1
+                    "allOf": [
+                        {
+                            "properties": {
+                                "foo": {
+                                    "const": 1
+                                }
+                            }
+                        },
+                        {
+                            "extensible": true,
+                            "properties": {
+                                "bar": {
+                                    "const": 2
+                                }
+                            }
                         }
-                    }
-                },
-                {
-                    "extensible": true,
-                    "properties": {
-                        "bar": {
-                            "const": 2
-                        }
-                    }
+                    ],
+                    "$id": "allOf_14_0"
                 }
             ]
         },
@@ -500,37 +593,43 @@
                     "bar": 2,
                     "z": 3
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_14_0"
             }
         ]
     },
     {
         "description": "strictness: allOf composition with strict refs",
-        "schema": {
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "$ref": "#/$defs/partA"
+                    "allOf": [
+                        {
+                            "$ref": "partA"
+                        },
+                        {
+                            "$ref": "partB"
+                        }
+                    ],
+                    "$id": "allOf_15_0"
                 },
                 {
-                    "$ref": "#/$defs/partB"
-                }
-            ],
-            "$defs": {
-                "partA": {
+                    "$id": "partA",
                     "properties": {
                         "id": {
                             "type": "string"
                         }
                     }
                 },
-                "partB": {
+                {
+                    "$id": "partB",
                     "properties": {
                         "name": {
                             "type": "string"
                         }
                     }
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -539,7 +638,8 @@
                     "id": "1",
                     "name": "Me"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "allOf_15_0"
             },
             {
                 "description": "extra property is invalid (root is strict)",
@@ -548,7 +648,8 @@
                     "name": "Me",
                     "extra": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_15_0"
             },
             {
                 "description": "partA mismatch is invalid",
@@ -556,7 +657,8 @@
                     "id": 1,
                     "name": "Me"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "allOf_15_0"
             }
         ]
     }

tests/fixtures/anchor.json

@@ -1,120 +0,0 @@
-[
-    {
-        "description": "Location-independent identifier",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "#foo",
-            "$defs": {
-                "A": {
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with absolute URI",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$ref": "http://localhost:1234/draft2020-12/bar#foo",
-            "$defs": {
-                "A": {
-                    "$id": "http://localhost:1234/draft2020-12/bar",
-                    "$anchor": "foo",
-                    "type": "integer"
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "Location-independent identifier with base URI change in subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/root",
-            "$ref": "http://localhost:1234/draft2020-12/nested.json#foo",
-            "$defs": {
-                "A": {
-                    "$id": "nested.json",
-                    "$defs": {
-                        "B": {
-                            "$anchor": "foo",
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "data": 1,
-                "description": "match",
-                "valid": true
-            },
-            {
-                "data": "a",
-                "description": "mismatch",
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "same $anchor with different base uri",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$id": "http://localhost:1234/draft2020-12/foobar",
-            "$defs": {
-                "A": {
-                    "$id": "child1",
-                    "allOf": [
-                        {
-                            "$id": "child2",
-                            "$anchor": "my_anchor",
-                            "type": "number"
-                        },
-                        {
-                            "$anchor": "my_anchor",
-                            "type": "string"
-                        }
-                    ]
-                }
-            },
-            "$ref": "child1#my_anchor"
-        },
-        "tests": [
-            {
-                "description": "$ref resolves to /$defs/A/allOf/1",
-                "data": "a",
-                "valid": true
-            },
-            {
-                "description": "$ref does not resolve to /$defs/A/allOf/0",
-                "data": 1,
-                "valid": false
-            }
-        ]
-    }
-]

tests/fixtures/anyOf.json

@@ -1,14 +1,18 @@
 [
     {
         "description": "anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
+                    "anyOf": [
+                        {
+                            "type": "integer"
+                        },
+                        {
+                            "minimum": 2
+                        }
+                    ],
+                    "$id": "anyOf_0_0"
                 }
             ]
         },
@@ -16,36 +20,44 @@
             {
                 "description": "first anyOf valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_0_0"
             },
             {
                 "description": "second anyOf valid",
                 "data": 2.5,
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_0_0"
             },
             {
                 "description": "both anyOf valid",
                 "data": 3,
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_0_0"
             },
             {
                 "description": "neither anyOf valid",
                 "data": 1.5,
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_0_0"
             }
         ]
     },
     {
         "description": "anyOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
-                    "maxLength": 2
-                },
-                {
-                    "minLength": 4
+                    "type": "string",
+                    "anyOf": [
+                        {
+                            "maxLength": 2
+                        },
+                        {
+                            "minLength": 4
+                        }
+                    ],
+                    "$id": "anyOf_1_0"
                 }
             ]
         },
@@ -53,95 +65,117 @@
             {
                 "description": "mismatch base schema",
                 "data": 3,
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_1_0"
             },
             {
                 "description": "one anyOf valid",
                 "data": "foobar",
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_1_0"
             },
             {
                 "description": "both anyOf invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_1_0"
             }
         ]
     },
     {
         "description": "anyOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                true,
-                true
+        "database": {
+            "schemas": [
+                {
+                    "anyOf": [
+                        true,
+                        true
+                    ],
+                    "$id": "anyOf_2_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_2_0"
             }
         ]
     },
     {
         "description": "anyOf with boolean schemas, some true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                true,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "anyOf": [
+                        true,
+                        false
+                    ],
+                    "$id": "anyOf_3_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_3_0"
             }
         ]
     },
     {
         "description": "anyOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
-                false,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "anyOf": [
+                        false,
+                        false
+                    ],
+                    "$id": "anyOf_4_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_4_0"
             }
         ]
     },
     {
         "description": "anyOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "bar": {
-                            "type": "integer"
+                    "anyOf": [
+                        {
+                            "properties": {
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "bar"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "foo"
+                            ]
                         }
-                    },
-                    "required": [
-                        "bar"
-                    ]
-                },
-                {
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "foo"
-                    ]
+                    ],
+                    "$id": "anyOf_5_0"
                 }
             ]
         },
@@ -151,14 +185,16 @@
                 "data": {
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_5_0"
             },
             {
                 "description": "second anyOf valid (complex)",
                 "data": {
                     "foo": "baz"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_5_0"
             },
             {
                 "description": "both anyOf valid (complex)",
@@ -166,7 +202,8 @@
                     "foo": "baz",
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_5_0"
             },
             {
                 "description": "neither anyOf valid (complex)",
@@ -174,45 +211,56 @@
                     "foo": 2,
                     "bar": "quux"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_5_0"
             }
         ]
     },
     {
         "description": "anyOf with one empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "number"
-                },
-                {}
+                    "anyOf": [
+                        {
+                            "type": "number"
+                        },
+                        {}
+                    ],
+                    "$id": "anyOf_6_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "string is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_6_0"
             },
             {
                 "description": "number is valid",
                 "data": 123,
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_6_0"
             }
         ]
     },
     {
         "description": "nested anyOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
                     "anyOf": [
                         {
-                            "type": "null"
+                            "anyOf": [
+                                {
+                                    "type": "null"
+                                }
+                            ]
                         }
-                    ]
+                    ],
+                    "$id": "anyOf_7_0"
                 }
             ]
         },
@@ -220,28 +268,34 @@
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_7_0"
             },
             {
                 "description": "anything non-null is invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_7_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in anyOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
+                    "anyOf": [
+                        {
+                            "type": "integer"
+                        },
+                        {
+                            "minimum": 2
+                        }
+                    ],
+                    "extensible": true,
+                    "$id": "anyOf_8_0"
                 }
-            ],
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -249,28 +303,33 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_8_0"
             }
         ]
     },
     {
         "description": "strict by default with anyOf properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "anyOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "foo": {
-                            "const": 1
+                    "anyOf": [
+                        {
+                            "properties": {
+                                "foo": {
+                                    "const": 1
+                                }
+                            }
+                        },
+                        {
+                            "properties": {
+                                "bar": {
+                                    "const": 2
+                                }
+                            }
                         }
-                    }
-                },
-                {
-                    "properties": {
-                        "bar": {
-                            "const": 2
-                        }
-                    }
+                    ],
+                    "$id": "anyOf_9_0"
                 }
             ]
         },
@@ -280,7 +339,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "anyOf_9_0"
             },
             {
                 "description": "fails on extra property z explicitly",
@@ -288,7 +348,8 @@
                     "foo": 1,
                     "z": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "anyOf_9_0"
             }
         ]
     }

tests/fixtures/booleanSchema.json

@@ -1,111 +1,142 @@
 [
     {
         "description": "boolean schema 'true'",
-        "schema": true,
+        "database": {
+            "schemas": [
+                {
+                    "$id": "booleanSchema_0_0"
+                }
+            ]
+        },
         "tests": [
             {
                 "description": "number is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "string is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "boolean true is valid",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "boolean false is valid",
                 "data": false,
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "object is valid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "array is valid",
                 "data": [
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             },
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "booleanSchema_0_0"
             }
         ]
     },
     {
         "description": "boolean schema 'false'",
-        "schema": false,
+        "database": {
+            "schemas": [
+                {
+                    "not": {},
+                    "$id": "booleanSchema_1_0"
+                }
+            ]
+        },
         "tests": [
             {
                 "description": "number is invalid",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "boolean true is invalid",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "boolean false is invalid",
                 "data": false,
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "null is invalid",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "object is invalid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "empty object is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "array is invalid",
                 "data": [
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "booleanSchema_1_0"
             }
         ]
     }

tests/fixtures/const.json

@@ -1,40 +1,51 @@
 [
     {
         "description": "const validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 2
+        "database": {
+            "schemas": [
+                {
+                    "const": 2,
+                    "$id": "const_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "same value is valid",
                 "data": 2,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_0_0"
             },
             {
                 "description": "another value is invalid",
                 "data": 5,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_0_0"
             },
             {
                 "description": "another type is invalid",
                 "data": "a",
-                "valid": false
+                "valid": false,
+                "schema_id": "const_0_0"
             }
         ]
     },
     {
         "description": "const with object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {
-                "foo": "bar",
-                "baz": "bax"
-            },
-            "properties": {
-                "foo": {},
-                "baz": {}
-            }
+        "database": {
+            "schemas": [
+                {
+                    "const": {
+                        "foo": "bar",
+                        "baz": "bax"
+                    },
+                    "properties": {
+                        "foo": {},
+                        "baz": {}
+                    },
+                    "$id": "const_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -43,7 +54,8 @@
                     "foo": "bar",
                     "baz": "bax"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "const_1_0"
             },
             {
                 "description": "same object with different property order is valid",
@@ -51,14 +63,16 @@
                     "baz": "bax",
                     "foo": "bar"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "const_1_0"
             },
             {
                 "description": "another object is invalid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "const_1_0"
             },
             {
                 "description": "another type is invalid",
@@ -66,17 +80,22 @@
                     1,
                     2
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_1_0"
             }
         ]
     },
     {
         "description": "const with array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": [
+        "database": {
+            "schemas": [
                 {
-                    "foo": "bar"
+                    "const": [
+                        {
+                            "foo": "bar"
+                        }
+                    ],
+                    "$id": "const_2_0"
                 }
             ]
         },
@@ -88,14 +107,16 @@
                         "foo": "bar"
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "const_2_0"
             },
             {
                 "description": "another array item is invalid",
                 "data": [
                     2
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_2_0"
             },
             {
                 "description": "array with additional items is invalid",
@@ -104,83 +125,108 @@
                     2,
                     3
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_2_0"
             }
         ]
     },
     {
         "description": "const with null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": null
+        "database": {
+            "schemas": [
+                {
+                    "const": null,
+                    "$id": "const_3_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_3_0"
             },
             {
                 "description": "not null is invalid",
                 "data": 0,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_3_0"
             }
         ]
     },
     {
         "description": "const with false does not match 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": false
+        "database": {
+            "schemas": [
+                {
+                    "const": false,
+                    "$id": "const_4_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "false is valid",
                 "data": false,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_4_0"
             },
             {
                 "description": "integer zero is invalid",
                 "data": 0,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_4_0"
             },
             {
                 "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
+                "data": 0,
+                "valid": false,
+                "schema_id": "const_4_0"
             }
         ]
     },
     {
         "description": "const with true does not match 1",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": true
+        "database": {
+            "schemas": [
+                {
+                    "const": true,
+                    "$id": "const_5_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "true is valid",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_5_0"
             },
             {
                 "description": "integer one is invalid",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_5_0"
             },
             {
                 "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
+                "data": 1,
+                "valid": false,
+                "schema_id": "const_5_0"
             }
         ]
     },
     {
         "description": "const with [false] does not match [0]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": [
-                false
+        "database": {
+            "schemas": [
+                {
+                    "const": [
+                        false
+                    ],
+                    "$id": "const_6_0"
+                }
             ]
         },
         "tests": [
@@ -189,30 +235,37 @@
                 "data": [
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "const_6_0"
             },
             {
                 "description": "[0] is invalid",
                 "data": [
                     0
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_6_0"
             },
             {
                 "description": "[0.0] is invalid",
                 "data": [
-                    0.0
+                    0
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_6_0"
             }
         ]
     },
     {
         "description": "const with [true] does not match [1]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": [
-                true
+        "database": {
+            "schemas": [
+                {
+                    "const": [
+                        true
+                    ],
+                    "$id": "const_7_0"
+                }
             ]
         },
         "tests": [
@@ -221,31 +274,38 @@
                 "data": [
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "const_7_0"
             },
             {
                 "description": "[1] is invalid",
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_7_0"
             },
             {
                 "description": "[1.0] is invalid",
                 "data": [
-                    1.0
+                    1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_7_0"
             }
         ]
     },
     {
         "description": "const with {\"a\": false} does not match {\"a\": 0}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {
-                "a": false
-            }
+        "database": {
+            "schemas": [
+                {
+                    "const": {
+                        "a": false
+                    },
+                    "$id": "const_8_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -253,31 +313,38 @@
                 "data": {
                     "a": false
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "const_8_0"
             },
             {
                 "description": "{\"a\": 0} is invalid",
                 "data": {
                     "a": 0
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "const_8_0"
             },
             {
                 "description": "{\"a\": 0.0} is invalid",
                 "data": {
-                    "a": 0.0
+                    "a": 0
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "const_8_0"
             }
         ]
     },
     {
         "description": "const with {\"a\": true} does not match {\"a\": 1}",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {
-                "a": true
-            }
+        "database": {
+            "schemas": [
+                {
+                    "const": {
+                        "a": true
+                    },
+                    "$id": "const_9_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -285,221 +352,280 @@
                 "data": {
                     "a": true
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "const_9_0"
             },
             {
                 "description": "{\"a\": 1} is invalid",
                 "data": {
                     "a": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "const_9_0"
             },
             {
                 "description": "{\"a\": 1.0} is invalid",
                 "data": {
-                    "a": 1.0
+                    "a": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "const_9_0"
             }
         ]
     },
     {
         "description": "const with 0 does not match other zero-like types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 0
+        "database": {
+            "schemas": [
+                {
+                    "const": 0,
+                    "$id": "const_10_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "false is invalid",
                 "data": false,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_10_0"
             },
             {
                 "description": "integer zero is valid",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_10_0"
             },
             {
                 "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
+                "data": 0,
+                "valid": true,
+                "schema_id": "const_10_0"
             },
             {
                 "description": "empty object is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "const_10_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "const_10_0"
             },
             {
                 "description": "empty string is invalid",
                 "data": "",
-                "valid": false
+                "valid": false,
+                "schema_id": "const_10_0"
             }
         ]
     },
     {
         "description": "const with 1 does not match true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 1
+        "database": {
+            "schemas": [
+                {
+                    "const": 1,
+                    "$id": "const_11_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "true is invalid",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_11_0"
             },
             {
                 "description": "integer one is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_11_0"
             },
             {
                 "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
+                "data": 1,
+                "valid": true,
+                "schema_id": "const_11_0"
             }
         ]
     },
     {
         "description": "const with -2.0 matches integer and float types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": -2.0
+        "database": {
+            "schemas": [
+                {
+                    "const": -2,
+                    "$id": "const_12_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "integer -2 is valid",
                 "data": -2,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_12_0"
             },
             {
                 "description": "integer 2 is invalid",
                 "data": 2,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_12_0"
             },
             {
                 "description": "float -2.0 is valid",
-                "data": -2.0,
-                "valid": true
+                "data": -2,
+                "valid": true,
+                "schema_id": "const_12_0"
             },
             {
                 "description": "float 2.0 is invalid",
-                "data": 2.0,
-                "valid": false
+                "data": 2,
+                "valid": false,
+                "schema_id": "const_12_0"
             },
             {
                 "description": "float -2.00001 is invalid",
                 "data": -2.00001,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_12_0"
             }
         ]
     },
     {
         "description": "float and integers are equal up to 64-bit representation limits",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": 9007199254740992
+        "database": {
+            "schemas": [
+                {
+                    "const": 9007199254740992,
+                    "$id": "const_13_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "integer is valid",
                 "data": 9007199254740992,
-                "valid": true
+                "valid": true,
+                "schema_id": "const_13_0"
             },
             {
                 "description": "integer minus one is invalid",
                 "data": 9007199254740991,
-                "valid": false
+                "valid": false,
+                "schema_id": "const_13_0"
             },
             {
                 "description": "float is valid",
-                "data": 9007199254740992.0,
-                "valid": true
+                "data": 9007199254740992,
+                "valid": true,
+                "schema_id": "const_13_0"
             },
             {
                 "description": "float minus one is invalid",
-                "data": 9007199254740991.0,
-                "valid": false
+                "data": 9007199254740991,
+                "valid": false,
+                "schema_id": "const_13_0"
             }
         ]
     },
     {
         "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": "hello\u0000there"
+        "database": {
+            "schemas": [
+                {
+                    "const": "hello\u0000there",
+                    "$id": "const_14_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "match string with nul",
                 "data": "hello\u0000there",
-                "valid": true
+                "valid": true,
+                "schema_id": "const_14_0"
             },
             {
                 "description": "do not match string lacking nul",
                 "data": "hellothere",
-                "valid": false
+                "valid": false,
+                "schema_id": "const_14_0"
             }
         ]
     },
     {
         "description": "characters with the same visual representation but different codepoint",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": "μ",
-            "$comment": "U+03BC"
+        "database": {
+            "schemas": [
+                {
+                    "const": "μ",
+                    "$comment": "U+03BC",
+                    "$id": "const_15_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "character uses the same codepoint",
                 "data": "μ",
                 "comment": "U+03BC",
-                "valid": true
+                "valid": true,
+                "schema_id": "const_15_0"
             },
             {
                 "description": "character looks the same but uses a different codepoint",
                 "data": "µ",
                 "comment": "U+00B5",
-                "valid": false
+                "valid": false,
+                "schema_id": "const_15_0"
             }
         ]
     },
     {
         "description": "characters with the same visual representation, but different number of codepoints",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": "ä",
-            "$comment": "U+00E4"
+        "database": {
+            "schemas": [
+                {
+                    "const": "ä",
+                    "$comment": "U+00E4",
+                    "$id": "const_16_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "character uses the same codepoint",
                 "data": "ä",
                 "comment": "U+00E4",
-                "valid": true
+                "valid": true,
+                "schema_id": "const_16_0"
             },
             {
                 "description": "character looks the same but uses combining marks",
                 "data": "ä",
                 "comment": "a, U+0308",
-                "valid": false
+                "valid": false,
+                "schema_id": "const_16_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in const object match",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "const": {
-                "a": 1
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "const": {
+                        "a": 1
+                    },
+                    "extensible": true,
+                    "$id": "const_17_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -508,14 +634,16 @@
                     "a": 1,
                     "b": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "const_17_0"
             },
             {
                 "description": "extra property match in const (this is effectively impossible if data has extra props not in const, it implicitly fails const check unless we assume const check ignored extra props? No, const check is strict. So this test is just to show strictness passes.)",
                 "data": {
                     "a": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "const_17_0"
             }
         ]
     }

tests/fixtures/contains.json

@@ -1,12 +1,16 @@
 [
     {
         "description": "contains keyword validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "minimum": 5
-            },
-            "items": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "minimum": 5
+                    },
+                    "items": true,
+                    "$id": "contains_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -16,7 +20,8 @@
                     4,
                     5
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_0_0"
             },
             {
                 "description": "array with item matching schema (6) is valid (items: true)",
@@ -25,7 +30,8 @@
                     4,
                     6
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_0_0"
             },
             {
                 "description": "array with two items matching schema (5, 6) is valid (items: true)",
@@ -35,7 +41,8 @@
                     5,
                     6
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_0_0"
             },
             {
                 "description": "array without items matching schema is invalid",
@@ -44,28 +51,35 @@
                     3,
                     4
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_0_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_0_0"
             },
             {
                 "description": "not array is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_0_0"
             }
         ]
     },
     {
         "description": "contains keyword with const keyword",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 5
-            },
-            "items": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 5
+                    },
+                    "items": true,
+                    "$id": "contains_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -75,7 +89,8 @@
                     4,
                     5
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_1_0"
             },
             {
                 "description": "array with two items 5 is valid (items: true)",
@@ -85,7 +100,8 @@
                     5,
                     5
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_1_0"
             },
             {
                 "description": "array without item 5 is invalid",
@@ -95,15 +111,20 @@
                     3,
                     4
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_1_0"
             }
         ]
     },
     {
         "description": "contains keyword with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": true,
+                    "$id": "contains_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -111,20 +132,26 @@
                 "data": [
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_2_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_2_0"
             }
         ]
     },
     {
         "description": "contains keyword with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": false
+        "database": {
+            "schemas": [
+                {
+                    "contains": false,
+                    "$id": "contains_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -132,30 +159,37 @@
                 "data": [
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_3_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_3_0"
             },
             {
                 "description": "non-arrays are valid",
                 "data": "contains does not apply to strings",
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_3_0"
             }
         ]
     },
     {
         "description": "items + contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": {
-                "multipleOf": 2
-            },
-            "contains": {
-                "multipleOf": 3
-            }
+        "database": {
+            "schemas": [
+                {
+                    "items": {
+                        "multipleOf": 2
+                    },
+                    "contains": {
+                        "multipleOf": 3
+                    },
+                    "$id": "contains_4_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -165,7 +199,8 @@
                     4,
                     8
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_4_0"
             },
             {
                 "description": "does not match items, matches contains",
@@ -174,7 +209,8 @@
                     6,
                     9
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_4_0"
             },
             {
                 "description": "matches both items and contains",
@@ -182,7 +218,8 @@
                     6,
                     12
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_4_0"
             },
             {
                 "description": "matches neither items nor contains",
@@ -190,18 +227,23 @@
                     1,
                     5
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_4_0"
             }
         ]
     },
     {
         "description": "contains with false if subschema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "if": false,
-                "else": true
-            }
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "if": false,
+                        "else": true
+                    },
+                    "$id": "contains_5_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -209,22 +251,28 @@
                 "data": [
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_5_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_5_0"
             }
         ]
     },
     {
         "description": "contains with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "type": "null"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "type": "null"
+                    },
+                    "$id": "contains_6_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -232,18 +280,23 @@
                 "data": [
                     null
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_6_0"
             }
         ]
     },
     {
         "description": "extensible: true allows non-matching items in contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "extensible": true,
+                    "$id": "contains_7_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -252,17 +305,22 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_7_0"
             }
         ]
     },
     {
         "description": "strict by default: non-matching items in contains are invalid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            }
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "$id": "contains_8_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -271,7 +329,8 @@
                     1,
                     2
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "contains_8_0"
             },
             {
                 "description": "only matching items is valid",
@@ -279,7 +338,8 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "contains_8_0"
             }
         ]
     }

tests/fixtures/content.json

@@ -1,143 +1,177 @@
 [
     {
         "description": "validation of string-encoded content based on media type",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentMediaType": "application/json"
+        "database": {
+            "schemas": [
+                {
+                    "contentMediaType": "application/json",
+                    "$id": "content_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "a valid JSON document",
                 "data": "{\"foo\": \"bar\"}",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_0_0"
             },
             {
                 "description": "an invalid JSON document; validates true",
                 "data": "{:}",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_0_0"
             },
             {
                 "description": "ignores non-strings",
                 "data": 100,
-                "valid": true
+                "valid": true,
+                "schema_id": "content_0_0"
             }
         ]
     },
     {
         "description": "validation of binary string-encoding",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentEncoding": "base64"
+        "database": {
+            "schemas": [
+                {
+                    "contentEncoding": "base64",
+                    "$id": "content_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "a valid base64 string",
                 "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_1_0"
             },
             {
                 "description": "an invalid base64 string (% is not a valid character); validates true",
                 "data": "eyJmb28iOi%iYmFyIn0K",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_1_0"
             },
             {
                 "description": "ignores non-strings",
                 "data": 100,
-                "valid": true
+                "valid": true,
+                "schema_id": "content_1_0"
             }
         ]
     },
     {
         "description": "validation of binary-encoded media type documents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64"
+        "database": {
+            "schemas": [
+                {
+                    "contentMediaType": "application/json",
+                    "contentEncoding": "base64",
+                    "$id": "content_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "a valid base64-encoded JSON document",
                 "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_2_0"
             },
             {
                 "description": "a validly-encoded invalid JSON document; validates true",
                 "data": "ezp9Cg==",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_2_0"
             },
             {
                 "description": "an invalid base64 string that is valid JSON; validates true",
                 "data": "{}",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_2_0"
             },
             {
                 "description": "ignores non-strings",
                 "data": 100,
-                "valid": true
+                "valid": true,
+                "schema_id": "content_2_0"
             }
         ]
     },
     {
         "description": "validation of binary-encoded media type documents with schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contentMediaType": "application/json",
-            "contentEncoding": "base64",
-            "contentSchema": {
-                "type": "object",
-                "required": [
-                    "foo"
-                ],
-                "properties": {
-                    "foo": {
-                        "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "contentMediaType": "application/json",
+                    "contentEncoding": "base64",
+                    "contentSchema": {
+                        "type": "object",
+                        "required": [
+                            "foo"
+                        ],
+                        "properties": {
+                            "foo": {
+                                "type": "string"
+                            },
+                            "boo": {
+                                "type": "integer"
+                            }
+                        }
                     },
-                    "boo": {
-                        "type": "integer"
-                    }
+                    "$id": "content_3_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
                 "description": "a valid base64-encoded JSON document",
                 "data": "eyJmb28iOiAiYmFyIn0K",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "another valid base64-encoded JSON document",
                 "data": "eyJib28iOiAyMCwgImZvbyI6ICJiYXoifQ==",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "an invalid base64-encoded JSON document; validates true",
                 "data": "eyJib28iOiAyMH0=",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "an empty object as a base64-encoded JSON document; validates true",
                 "data": "e30=",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "an empty array as a base64-encoded JSON document",
                 "data": "W10=",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "a validly-encoded invalid JSON document; validates true",
                 "data": "ezp9Cg==",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "an invalid base64 string that is valid JSON; validates true",
                 "data": "{}",
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             },
             {
                 "description": "ignores non-strings",
                 "data": 100,
-                "valid": true
+                "valid": true,
+                "schema_id": "content_3_0"
             }
         ]
     }

tests/fixtures/dependencies.json

@@ -0,0 +1,619 @@
+[
+    {
+        "description": "single dependency (required)",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema1",
+                    "dependencies": {
+                        "bar": [
+                            "foo"
+                        ]
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "neither",
+                "data": {},
+                "valid": true,
+                "schema_id": "schema1"
+            },
+            {
+                "description": "nondependant",
+                "data": {
+                    "foo": 1
+                },
+                "valid": true,
+                "schema_id": "schema1"
+            },
+            {
+                "description": "with dependency",
+                "data": {
+                    "foo": 1,
+                    "bar": 2
+                },
+                "valid": true,
+                "schema_id": "schema1"
+            },
+            {
+                "description": "missing dependency",
+                "data": {
+                    "bar": 2
+                },
+                "valid": false,
+                "schema_id": "schema1"
+            },
+            {
+                "description": "ignores arrays",
+                "data": [
+                    "bar"
+                ],
+                "valid": true,
+                "schema_id": "schema1"
+            },
+            {
+                "description": "ignores strings",
+                "data": "foobar",
+                "valid": true,
+                "schema_id": "schema1"
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true,
+                "schema_id": "schema1"
+            }
+        ]
+    },
+    {
+        "description": "empty dependents",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema2",
+                    "dependencies": {
+                        "bar": []
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "empty object",
+                "data": {},
+                "valid": true,
+                "schema_id": "schema2"
+            },
+            {
+                "description": "object with one property",
+                "data": {
+                    "bar": 2
+                },
+                "valid": true,
+                "schema_id": "schema2"
+            },
+            {
+                "description": "non-object is valid",
+                "data": 1,
+                "valid": true,
+                "schema_id": "schema2"
+            }
+        ]
+    },
+    {
+        "description": "multiple dependents required",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema3",
+                    "dependencies": {
+                        "quux": [
+                            "foo",
+                            "bar"
+                        ]
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "neither",
+                "data": {},
+                "valid": true,
+                "schema_id": "schema3"
+            },
+            {
+                "description": "nondependants",
+                "data": {
+                    "foo": 1,
+                    "bar": 2
+                },
+                "valid": true,
+                "schema_id": "schema3"
+            },
+            {
+                "description": "with dependencies",
+                "data": {
+                    "foo": 1,
+                    "bar": 2,
+                    "quux": 3
+                },
+                "valid": true,
+                "schema_id": "schema3"
+            },
+            {
+                "description": "missing dependency",
+                "data": {
+                    "foo": 1,
+                    "quux": 2
+                },
+                "valid": false,
+                "schema_id": "schema3"
+            },
+            {
+                "description": "missing other dependency",
+                "data": {
+                    "bar": 1,
+                    "quux": 2
+                },
+                "valid": false,
+                "schema_id": "schema3"
+            },
+            {
+                "description": "missing both dependencies",
+                "data": {
+                    "quux": 1
+                },
+                "valid": false,
+                "schema_id": "schema3"
+            }
+        ]
+    },
+    {
+        "description": "dependencies with escaped characters",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema4",
+                    "dependencies": {
+                        "foo\nbar": [
+                            "foo\rbar"
+                        ],
+                        "foo\"bar": [
+                            "foo'bar"
+                        ]
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "CRLF",
+                "data": {
+                    "foo\nbar": 1,
+                    "foo\rbar": 2
+                },
+                "valid": true,
+                "schema_id": "schema4"
+            },
+            {
+                "description": "quoted quotes",
+                "data": {
+                    "foo'bar": 1,
+                    "foo\"bar": 2
+                },
+                "valid": true,
+                "schema_id": "schema4"
+            },
+            {
+                "description": "CRLF missing dependent",
+                "data": {
+                    "foo\nbar": 1,
+                    "foo": 2
+                },
+                "valid": false,
+                "schema_id": "schema4"
+            },
+            {
+                "description": "quoted quotes missing dependent",
+                "data": {
+                    "foo\"bar": 2
+                },
+                "valid": false,
+                "schema_id": "schema4"
+            }
+        ]
+    },
+    {
+        "description": "extensible: true allows extra properties in dependentRequired",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema5",
+                    "dependencies": {
+                        "bar": [
+                            "foo"
+                        ]
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "extra property is valid",
+                "data": {
+                    "foo": 1,
+                    "bar": 2,
+                    "baz": 3
+                },
+                "valid": true,
+                "schema_id": "schema5"
+            }
+        ]
+    },
+    {
+        "description": "single dependency (schemas, STRICT)",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema_schema1",
+                    "properties": {
+                        "foo": true,
+                        "bar": true
+                    },
+                    "dependencies": {
+                        "bar": {
+                            "properties": {
+                                "foo": {
+                                    "type": "integer"
+                                },
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            }
+                        }
+                    }
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "valid",
+                "data": {
+                    "foo": 1,
+                    "bar": 2
+                },
+                "valid": true,
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "no dependency",
+                "data": {
+                    "foo": "quux"
+                },
+                "valid": true,
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "wrong type",
+                "data": {
+                    "foo": "quux",
+                    "bar": 2
+                },
+                "valid": false,
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "wrong type other",
+                "data": {
+                    "foo": 2,
+                    "bar": "quux"
+                },
+                "valid": false,
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "wrong type both",
+                "data": {
+                    "foo": "quux",
+                    "bar": "quux"
+                },
+                "valid": false,
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "ignores arrays (invalid in strict mode)",
+                "data": [
+                    "bar"
+                ],
+                "valid": false,
+                "expect_errors": [
+                    {
+                        "code": "STRICT_ITEM_VIOLATION"
+                    }
+                ],
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "ignores strings",
+                "data": "foobar",
+                "valid": true,
+                "schema_id": "schema_schema1"
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true,
+                "schema_id": "schema_schema1"
+            }
+        ]
+    },
+    {
+        "description": "single dependency (schemas, EXTENSIBLE)",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema_schema2",
+                    "properties": {
+                        "foo": true,
+                        "bar": true
+                    },
+                    "dependencies": {
+                        "bar": {
+                            "properties": {
+                                "foo": {
+                                    "type": "integer"
+                                },
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            }
+                        }
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "ignores arrays (valid in extensible mode)",
+                "data": [
+                    "bar"
+                ],
+                "valid": true,
+                "schema_id": "schema_schema2"
+            }
+        ]
+    },
+    {
+        "description": "boolean subschemas",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema_schema3",
+                    "properties": {
+                        "foo": true,
+                        "bar": true
+                    },
+                    "dependencies": {
+                        "foo": true,
+                        "bar": false
+                    }
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "object with property having schema true is valid",
+                "data": {
+                    "foo": 1
+                },
+                "valid": true,
+                "schema_id": "schema_schema3"
+            },
+            {
+                "description": "object with property having schema false is invalid",
+                "data": {
+                    "bar": 2
+                },
+                "valid": false,
+                "schema_id": "schema_schema3"
+            },
+            {
+                "description": "object with both properties is invalid",
+                "data": {
+                    "foo": 1,
+                    "bar": 2
+                },
+                "valid": false,
+                "schema_id": "schema_schema3"
+            },
+            {
+                "description": "empty object is valid",
+                "data": {},
+                "valid": true,
+                "schema_id": "schema_schema3"
+            }
+        ]
+    },
+    {
+        "description": "dependencies with escaped characters",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema_schema4",
+                    "properties": {
+                        "foo\tbar": true,
+                        "foo'bar": true,
+                        "a": true,
+                        "b": true,
+                        "c": true
+                    },
+                    "dependencies": {
+                        "foo\tbar": {
+                            "minProperties": 4,
+                            "extensible": true
+                        },
+                        "foo'bar": {
+                            "required": [
+                                "foo\"bar"
+                            ]
+                        }
+                    }
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "quoted tab",
+                "data": {
+                    "foo\tbar": 1,
+                    "a": 2,
+                    "b": 3,
+                    "c": 4
+                },
+                "valid": true,
+                "schema_id": "schema_schema4"
+            },
+            {
+                "description": "quoted quote",
+                "data": {
+                    "foo'bar": {
+                        "foo\"bar": 1
+                    }
+                },
+                "valid": false,
+                "schema_id": "schema_schema4"
+            },
+            {
+                "description": "quoted tab invalid under dependent schema",
+                "data": {
+                    "foo\tbar": 1,
+                    "a": 2
+                },
+                "valid": false,
+                "schema_id": "schema_schema4"
+            },
+            {
+                "description": "quoted quote invalid under dependent schema",
+                "data": {
+                    "foo'bar": 1
+                },
+                "valid": false,
+                "schema_id": "schema_schema4"
+            }
+        ]
+    },
+    {
+        "description": "dependent subschema incompatible with root (STRICT)",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema_schema5",
+                    "properties": {
+                        "foo": {},
+                        "baz": true
+                    },
+                    "dependencies": {
+                        "foo": {
+                            "properties": {
+                                "bar": {}
+                            }
+                        }
+                    }
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "matches root",
+                "data": {
+                    "foo": 1
+                },
+                "valid": false,
+                "schema_id": "schema_schema5"
+            },
+            {
+                "description": "matches dependency (invalid in strict mode - bar not allowed if foo missing)",
+                "data": {
+                    "bar": 1
+                },
+                "valid": false,
+                "expect_errors": [
+                    {
+                        "code": "STRICT_PROPERTY_VIOLATION"
+                    }
+                ],
+                "schema_id": "schema_schema5"
+            },
+            {
+                "description": "matches both",
+                "data": {
+                    "foo": 1,
+                    "bar": 2
+                },
+                "valid": false,
+                "schema_id": "schema_schema5"
+            },
+            {
+                "description": "no dependency",
+                "data": {
+                    "baz": 1
+                },
+                "valid": true,
+                "schema_id": "schema_schema5"
+            }
+        ]
+    },
+    {
+        "description": "dependent subschema incompatible with root (EXTENSIBLE)",
+        "database": {
+            "schemas": [
+                {
+                    "$schema": "https://json-schema.org/draft/2020-12/schema",
+                    "$id": "schema_schema6",
+                    "properties": {
+                        "foo": {},
+                        "baz": true
+                    },
+                    "dependencies": {
+                        "foo": {
+                            "properties": {
+                                "bar": {}
+                            },
+                            "additionalProperties": false
+                        }
+                    },
+                    "extensible": true
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "matches dependency (valid in extensible mode)",
+                "data": {
+                    "bar": 1
+                },
+                "valid": true,
+                "schema_id": "schema_schema6"
+            }
+        ]
+    }
+]

tests/fixtures/dependentRequired.json

@@ -1,220 +0,0 @@
-[
-    {
-        "description": "single dependency",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {
-                "bar": [
-                    "foo"
-                ]
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependant",
-                "data": {
-                    "foo": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "with dependency",
-                "data": {
-                    "foo": 1,
-                    "bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {
-                    "bar": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "ignores arrays",
-                "data": [
-                    "bar"
-                ],
-                "valid": true
-            },
-            {
-                "description": "ignores strings",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "empty dependents",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {
-                "bar": []
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "empty object",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "object with one property",
-                "data": {
-                    "bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "non-object is valid",
-                "data": 1,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "multiple dependents required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {
-                "quux": [
-                    "foo",
-                    "bar"
-                ]
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "neither",
-                "data": {},
-                "valid": true
-            },
-            {
-                "description": "nondependants",
-                "data": {
-                    "foo": 1,
-                    "bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "with dependencies",
-                "data": {
-                    "foo": 1,
-                    "bar": 2,
-                    "quux": 3
-                },
-                "valid": true
-            },
-            {
-                "description": "missing dependency",
-                "data": {
-                    "foo": 1,
-                    "quux": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "missing other dependency",
-                "data": {
-                    "bar": 1,
-                    "quux": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "missing both dependencies",
-                "data": {
-                    "quux": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {
-                "foo\nbar": [
-                    "foo\rbar"
-                ],
-                "foo\"bar": [
-                    "foo'bar"
-                ]
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "CRLF",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo\rbar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quotes",
-                "data": {
-                    "foo'bar": 1,
-                    "foo\"bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "CRLF missing dependent",
-                "data": {
-                    "foo\nbar": 1,
-                    "foo": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quotes missing dependent",
-                "data": {
-                    "foo\"bar": 2
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "extensible: true allows extra properties in dependentRequired",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "dependentRequired": {
-                "bar": [
-                    "foo"
-                ]
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "extra property is valid",
-                "data": {
-                    "foo": 1,
-                    "bar": 2,
-                    "baz": 3
-                },
-                "valid": true
-            }
-        ]
-    }
-]

tests/fixtures/dependentSchemas.json

@@ -1,303 +0,0 @@
-[
-    {
-        "description": "single dependency (STRICT)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": true,
-                "bar": true
-            },
-            "dependentSchemas": {
-                "bar": {
-                    "properties": {
-                        "foo": {
-                            "type": "integer"
-                        },
-                        "bar": {
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "valid",
-                "data": {
-                    "foo": 1,
-                    "bar": 2
-                },
-                "valid": true
-            },
-            {
-                "description": "no dependency",
-                "data": {
-                    "foo": "quux"
-                },
-                "valid": true
-            },
-            {
-                "description": "wrong type",
-                "data": {
-                    "foo": "quux",
-                    "bar": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "wrong type other",
-                "data": {
-                    "foo": 2,
-                    "bar": "quux"
-                },
-                "valid": false
-            },
-            {
-                "description": "wrong type both",
-                "data": {
-                    "foo": "quux",
-                    "bar": "quux"
-                },
-                "valid": false
-            },
-            {
-                "description": "ignores arrays (invalid in strict mode)",
-                "data": [
-                    "bar"
-                ],
-                "valid": false,
-                "expect_errors": [
-                    {
-                        "code": "STRICT_ITEM_VIOLATION"
-                    }
-                ]
-            },
-            {
-                "description": "ignores strings (invalid in strict mode - wait, strings are scalars, strict only checks obj/arr)",
-                "data": "foobar",
-                "valid": true
-            },
-            {
-                "description": "ignores other non-objects",
-                "data": 12,
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "single dependency (EXTENSIBLE)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": true,
-                "bar": true
-            },
-            "dependentSchemas": {
-                "bar": {
-                    "properties": {
-                        "foo": {
-                            "type": "integer"
-                        },
-                        "bar": {
-                            "type": "integer"
-                        }
-                    }
-                }
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "ignores arrays (valid in extensible mode)",
-                "data": [
-                    "bar"
-                ],
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "boolean subschemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": true,
-                "bar": true
-            },
-            "dependentSchemas": {
-                "foo": true,
-                "bar": false
-            }
-        },
-        "tests": [
-            {
-                "description": "object with property having schema true is valid",
-                "data": {
-                    "foo": 1
-                },
-                "valid": true
-            },
-            {
-                "description": "object with property having schema false is invalid",
-                "data": {
-                    "bar": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "object with both properties is invalid",
-                "data": {
-                    "foo": 1,
-                    "bar": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "empty object is valid",
-                "data": {},
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependencies with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo\tbar": true,
-                "foo'bar": true,
-                "a": true,
-                "b": true,
-                "c": true
-            },
-            "dependentSchemas": {
-                "foo\tbar": {
-                    "minProperties": 4,
-                    "extensible": true
-                },
-                "foo'bar": {
-                    "required": [
-                        "foo\"bar"
-                    ]
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "quoted tab",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2,
-                    "b": 3,
-                    "c": 4
-                },
-                "valid": true
-            },
-            {
-                "description": "quoted quote",
-                "data": {
-                    "foo'bar": {
-                        "foo\"bar": 1
-                    }
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted tab invalid under dependent schema",
-                "data": {
-                    "foo\tbar": 1,
-                    "a": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "quoted quote invalid under dependent schema",
-                "data": {
-                    "foo'bar": 1
-                },
-                "valid": false
-            }
-        ]
-    },
-    {
-        "description": "dependent subschema incompatible with root (STRICT)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {},
-                "baz": true
-            },
-            "dependentSchemas": {
-                "foo": {
-                    "properties": {
-                        "bar": {}
-                    }
-                }
-            }
-        },
-        "tests": [
-            {
-                "description": "matches root",
-                "data": {
-                    "foo": 1
-                },
-                "valid": false
-            },
-            {
-                "description": "matches dependency (invalid in strict mode - bar not allowed if foo missing)",
-                "data": {
-                    "bar": 1
-                },
-                "valid": false,
-                "expect_errors": [
-                    {
-                        "code": "STRICT_PROPERTY_VIOLATION"
-                    }
-                ]
-            },
-            {
-                "description": "matches both",
-                "data": {
-                    "foo": 1,
-                    "bar": 2
-                },
-                "valid": false
-            },
-            {
-                "description": "no dependency",
-                "data": {
-                    "baz": 1
-                },
-                "valid": true
-            }
-        ]
-    },
-    {
-        "description": "dependent subschema incompatible with root (EXTENSIBLE)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {},
-                "baz": true
-            },
-            "dependentSchemas": {
-                "foo": {
-                    "properties": {
-                        "bar": {}
-                    },
-                    "additionalProperties": false
-                }
-            },
-            "extensible": true
-        },
-        "tests": [
-            {
-                "description": "matches dependency (valid in extensible mode)",
-                "data": {
-                    "bar": 1
-                },
-                "valid": true
-            }
-        ]
-    }
-]

tests/fixtures/emptyString.json

@@ -1,41 +1,45 @@
 [
     {
         "description": "empty string is valid for all types (except const)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "obj": {
-                    "type": "object"
-                },
-                "arr": {
-                    "type": "array"
-                },
-                "str": {
-                    "type": "string"
-                },
-                "int": {
-                    "type": "integer"
-                },
-                "num": {
-                    "type": "number"
-                },
-                "bool": {
-                    "type": "boolean"
-                },
-                "nul": {
-                    "type": "null"
-                },
-                "fmt": {
-                    "type": "string",
-                    "format": "uuid"
-                },
-                "con": {
-                    "const": "value"
-                },
-                "con_empty": {
-                    "const": ""
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "obj": {
+                            "type": "object"
+                        },
+                        "arr": {
+                            "type": "array"
+                        },
+                        "str": {
+                            "type": "string"
+                        },
+                        "int": {
+                            "type": "integer"
+                        },
+                        "num": {
+                            "type": "number"
+                        },
+                        "bool": {
+                            "type": "boolean"
+                        },
+                        "nul": {
+                            "type": "null"
+                        },
+                        "fmt": {
+                            "type": "string",
+                            "format": "uuid"
+                        },
+                        "con": {
+                            "const": "value"
+                        },
+                        "con_empty": {
+                            "const": ""
+                        }
+                    },
+                    "$id": "emptyString_0_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -43,56 +47,64 @@
                 "data": {
                     "obj": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for array",
                 "data": {
                     "arr": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for string",
                 "data": {
                     "str": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for integer",
                 "data": {
                     "int": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for number",
                 "data": {
                     "num": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for boolean",
                 "data": {
                     "bool": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for null",
                 "data": {
                     "nul": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string valid for format",
                 "data": {
                     "fmt": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string INVALID for const (unless const is empty string)",
@@ -105,14 +117,16 @@
                         "code": "CONST_VIOLATED",
                         "path": "/con"
                     }
-                ]
+                ],
+                "schema_id": "emptyString_0_0"
             },
             {
                 "description": "empty string VALID for const if const IS empty string",
                 "data": {
                     "con_empty": ""
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "emptyString_0_0"
             }
         ]
     }

tests/fixtures/enum.json

@@ -1,68 +1,82 @@
 [
     {
         "description": "simple enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                1,
-                2,
-                3
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        1,
+                        2,
+                        3
+                    ],
+                    "$id": "enum_0_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "one of the enum is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_0_0"
             },
             {
                 "description": "something else is invalid",
                 "data": 4,
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_0_0"
             }
         ]
     },
     {
         "description": "heterogeneous enum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                6,
-                "foo",
-                [],
-                true,
+        "database": {
+            "schemas": [
                 {
-                    "foo": 12
+                    "enum": [
+                        6,
+                        "foo",
+                        [],
+                        true,
+                        {
+                            "foo": 12
+                        }
+                    ],
+                    "properties": {
+                        "foo": {}
+                    },
+                    "$id": "enum_1_0"
                 }
-            ],
-            "properties": {
-                "foo": {}
-            }
+            ]
         },
         "tests": [
             {
                 "description": "one of the enum is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_1_0"
             },
             {
                 "description": "something else is invalid",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_1_0"
             },
             {
                 "description": "objects are deep compared",
                 "data": {
                     "foo": false
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_1_0"
             },
             {
                 "description": "valid object matches",
                 "data": {
                     "foo": 12
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_1_0"
             },
             {
                 "description": "extra properties in object is invalid",
@@ -70,56 +84,68 @@
                     "foo": 12,
                     "boo": 42
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_1_0"
             }
         ]
     },
     {
         "description": "heterogeneous enum-with-null validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                6,
-                null
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        6,
+                        null
+                    ],
+                    "$id": "enum_2_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_2_0"
             },
             {
                 "description": "number is valid",
                 "data": 6,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_2_0"
             },
             {
                 "description": "something else is invalid",
                 "data": "test",
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_2_0"
             }
         ]
     },
     {
         "description": "enums in properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": {
-                    "enum": [
-                        "foo"
-                    ]
-                },
-                "bar": {
-                    "enum": [
+        "database": {
+            "schemas": [
+                {
+                    "type": "object",
+                    "properties": {
+                        "foo": {
+                            "enum": [
+                                "foo"
+                            ]
+                        },
+                        "bar": {
+                            "enum": [
+                                "bar"
+                            ]
+                        }
+                    },
+                    "required": [
                         "bar"
-                    ]
+                    ],
+                    "$id": "enum_3_0"
                 }
-            },
-            "required": [
-                "bar"
             ]
         },
         "tests": [
@@ -129,7 +155,8 @@
                     "foo": "foo",
                     "bar": "bar"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_3_0"
             },
             {
                 "description": "wrong foo value",
@@ -137,7 +164,8 @@
                     "foo": "foot",
                     "bar": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_3_0"
             },
             {
                 "description": "wrong bar value",
@@ -145,90 +173,112 @@
                     "foo": "foo",
                     "bar": "bart"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_3_0"
             },
             {
                 "description": "missing optional property is valid",
                 "data": {
                     "bar": "bar"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_3_0"
             },
             {
                 "description": "missing required property is invalid",
                 "data": {
                     "foo": "foo"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_3_0"
             },
             {
                 "description": "missing all properties is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_3_0"
             }
         ]
     },
     {
         "description": "enum with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                "foo\nbar",
-                "foo\rbar"
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        "foo\nbar",
+                        "foo\rbar"
+                    ],
+                    "$id": "enum_4_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "member 1 is valid",
                 "data": "foo\nbar",
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_4_0"
             },
             {
                 "description": "member 2 is valid",
                 "data": "foo\rbar",
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_4_0"
             },
             {
                 "description": "another string is invalid",
                 "data": "abc",
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_4_0"
             }
         ]
     },
     {
         "description": "enum with false does not match 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                false
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        false
+                    ],
+                    "$id": "enum_5_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "false is valid",
                 "data": false,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_5_0"
             },
             {
                 "description": "integer zero is invalid",
                 "data": 0,
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_5_0"
             },
             {
                 "description": "float zero is invalid",
-                "data": 0.0,
-                "valid": false
+                "data": 0,
+                "valid": false,
+                "schema_id": "enum_5_0"
             }
         ]
     },
     {
         "description": "enum with [false] does not match [0]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                [
-                    false
-                ]
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        [
+                            false
+                        ]
+                    ],
+                    "$id": "enum_6_0"
+                }
             ]
         },
         "tests": [
@@ -237,58 +287,72 @@
                 "data": [
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_6_0"
             },
             {
                 "description": "[0] is invalid",
                 "data": [
                     0
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_6_0"
             },
             {
                 "description": "[0.0] is invalid",
                 "data": [
-                    0.0
+                    0
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_6_0"
             }
         ]
     },
     {
         "description": "enum with true does not match 1",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                true
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        true
+                    ],
+                    "$id": "enum_7_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "true is valid",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_7_0"
             },
             {
                 "description": "integer one is invalid",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_7_0"
             },
             {
                 "description": "float one is invalid",
-                "data": 1.0,
-                "valid": false
+                "data": 1,
+                "valid": false,
+                "schema_id": "enum_7_0"
             }
         ]
     },
     {
         "description": "enum with [true] does not match [1]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                [
-                    true
-                ]
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        [
+                            true
+                        ]
+                    ],
+                    "$id": "enum_8_0"
+                }
             ]
         },
         "tests": [
@@ -297,58 +361,72 @@
                 "data": [
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_8_0"
             },
             {
                 "description": "[1] is invalid",
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_8_0"
             },
             {
                 "description": "[1.0] is invalid",
                 "data": [
-                    1.0
+                    1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_8_0"
             }
         ]
     },
     {
         "description": "enum with 0 does not match false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                0
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        0
+                    ],
+                    "$id": "enum_9_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "false is invalid",
                 "data": false,
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_9_0"
             },
             {
                 "description": "integer zero is valid",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_9_0"
             },
             {
                 "description": "float zero is valid",
-                "data": 0.0,
-                "valid": true
+                "data": 0,
+                "valid": true,
+                "schema_id": "enum_9_0"
             }
         ]
     },
     {
         "description": "enum with [0] does not match [false]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                [
-                    0
-                ]
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        [
+                            0
+                        ]
+                    ],
+                    "$id": "enum_10_0"
+                }
             ]
         },
         "tests": [
@@ -357,58 +435,72 @@
                 "data": [
                     false
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_10_0"
             },
             {
                 "description": "[0] is valid",
                 "data": [
                     0
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_10_0"
             },
             {
                 "description": "[0.0] is valid",
                 "data": [
-                    0.0
+                    0
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_10_0"
             }
         ]
     },
     {
         "description": "enum with 1 does not match true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                1
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        1
+                    ],
+                    "$id": "enum_11_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "true is invalid",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_11_0"
             },
             {
                 "description": "integer one is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_11_0"
             },
             {
                 "description": "float one is valid",
-                "data": 1.0,
-                "valid": true
+                "data": 1,
+                "valid": true,
+                "schema_id": "enum_11_0"
             }
         ]
     },
     {
         "description": "enum with [1] does not match [true]",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                [
-                    1
-                ]
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        [
+                            1
+                        ]
+                    ],
+                    "$id": "enum_12_0"
+                }
             ]
         },
         "tests": [
@@ -417,55 +509,68 @@
                 "data": [
                     true
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_12_0"
             },
             {
                 "description": "[1] is valid",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_12_0"
             },
             {
                 "description": "[1.0] is valid",
                 "data": [
-                    1.0
+                    1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_12_0"
             }
         ]
     },
     {
         "description": "nul characters in strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
-                "hello\u0000there"
+        "database": {
+            "schemas": [
+                {
+                    "enum": [
+                        "hello\u0000there"
+                    ],
+                    "$id": "enum_13_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "match string with nul",
                 "data": "hello\u0000there",
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_13_0"
             },
             {
                 "description": "do not match string lacking nul",
                 "data": "hellothere",
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_13_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in enum object match",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "enum": [
+        "database": {
+            "schemas": [
                 {
-                    "foo": 1
+                    "enum": [
+                        {
+                            "foo": 1
+                        }
+                    ],
+                    "extensible": true,
+                    "$id": "enum_14_0"
                 }
-            ],
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -474,14 +579,16 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "enum_14_0"
             },
             {
                 "description": "extra property ignored during strict check, enum match succeeds",
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "enum_14_0"
             }
         ]
     }

tests/fixtures/exclusiveMaximum.json

@@ -1,31 +1,39 @@
 [
     {
         "description": "exclusiveMaximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "exclusiveMaximum": 3.0
+        "database": {
+            "schemas": [
+                {
+                    "exclusiveMaximum": 3,
+                    "$id": "exclusiveMaximum_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "below the exclusiveMaximum is valid",
                 "data": 2.2,
-                "valid": true
+                "valid": true,
+                "schema_id": "exclusiveMaximum_0_0"
             },
             {
                 "description": "boundary point is invalid",
-                "data": 3.0,
-                "valid": false
+                "data": 3,
+                "valid": false,
+                "schema_id": "exclusiveMaximum_0_0"
             },
             {
                 "description": "above the exclusiveMaximum is invalid",
                 "data": 3.5,
-                "valid": false
+                "valid": false,
+                "schema_id": "exclusiveMaximum_0_0"
             },
             {
                 "description": "ignores non-numbers",
                 "data": "x",
-                "valid": true
+                "valid": true,
+                "schema_id": "exclusiveMaximum_0_0"
             }
         ]
     }
-]
+]

tests/fixtures/exclusiveMinimum.json

@@ -1,31 +1,39 @@
 [
     {
         "description": "exclusiveMinimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "exclusiveMinimum": 1.1
+        "database": {
+            "schemas": [
+                {
+                    "exclusiveMinimum": 1.1,
+                    "$id": "exclusiveMinimum_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "above the exclusiveMinimum is valid",
                 "data": 1.2,
-                "valid": true
+                "valid": true,
+                "schema_id": "exclusiveMinimum_0_0"
             },
             {
                 "description": "boundary point is invalid",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "exclusiveMinimum_0_0"
             },
             {
                 "description": "below the exclusiveMinimum is invalid",
                 "data": 0.6,
-                "valid": false
+                "valid": false,
+                "schema_id": "exclusiveMinimum_0_0"
             },
             {
                 "description": "ignores non-numbers",
                 "data": "x",
-                "valid": true
+                "valid": true,
+                "schema_id": "exclusiveMinimum_0_0"
             }
         ]
     }
-]
+]

tests/fixtures/families.json

@@ -0,0 +1,199 @@
+[
+    {
+        "description": "Entity families via pure $ref graph",
+        "database": {
+            "types": [
+                {
+                    "name": "entity",
+                    "hierarchy": [
+                        "entity"
+                    ],
+                    "schemas": [
+                        {
+                            "$id": "entity",
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        {
+                            "$id": "entity.light",
+                            "$ref": "entity"
+                        }
+                    ]
+                },
+                {
+                    "name": "organization",
+                    "hierarchy": [
+                        "entity",
+                        "organization"
+                    ],
+                    "schemas": [
+                        {
+                            "$id": "organization",
+                            "$ref": "entity",
+                            "properties": {
+                                "name": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    ]
+                },
+                {
+                    "name": "person",
+                    "hierarchy": [
+                        "entity",
+                        "organization",
+                        "person"
+                    ],
+                    "schemas": [
+                        {
+                            "$id": "person",
+                            "$ref": "organization",
+                            "properties": {
+                                "first_name": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        {
+                            "$id": "person.light",
+                            "$ref": "entity.light"
+                        }
+                    ]
+                }
+            ],
+            "puncs": [
+                {
+                    "name": "get_entities",
+                    "schemas": [
+                        {
+                            "$id": "get_entities.response",
+                            "$family": "entity"
+                        }
+                    ]
+                },
+                {
+                    "name": "get_light_entities",
+                    "schemas": [
+                        {
+                            "$id": "get_light_entities.response",
+                            "$family": "entity.light"
+                        }
+                    ]
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "Family matches base entity",
+                "schema_id": "get_entities.response",
+                "data": {
+                    "id": "1",
+                    "type": "entity"
+                },
+                "valid": true
+            },
+            {
+                "description": "Family matches descendant person",
+                "schema_id": "get_entities.response",
+                "data": {
+                    "id": "2",
+                    "type": "person",
+                    "name": "ACME",
+                    "first_name": "John"
+                },
+                "valid": true
+            },
+            {
+                "description": "Graph family matches entity.light",
+                "schema_id": "get_light_entities.response",
+                "data": {
+                    "id": "3",
+                    "type": "entity"
+                },
+                "valid": true
+            },
+            {
+                "description": "Graph family matches person.light (because it $refs entity.light)",
+                "schema_id": "get_light_entities.response",
+                "data": {
+                    "id": "4",
+                    "type": "person"
+                },
+                "valid": true
+            },
+            {
+                "description": "Graph family excludes organization (missing .light schema that $refs entity.light)",
+                "schema_id": "get_light_entities.response",
+                "data": {
+                    "id": "5",
+                    "type": "organization",
+                    "name": "ACME"
+                },
+                "valid": false,
+                "expect_errors": [
+                    {
+                        "code": "FAMILY_MISMATCH",
+                        "path": ""
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "description": "Ad-hoc non-entity families (using normal json-schema object structures)",
+        "database": {
+            "puncs": [
+                {
+                    "name": "get_widgets",
+                    "schemas": [
+                        {
+                            "$id": "widget",
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "widget_type": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        {
+                            "$id": "special_widget",
+                            "$ref": "widget",
+                            "properties": {
+                                "special_feature": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        {
+                            "$id": "get_widgets.response",
+                            "$family": "widget"
+                        }
+                    ]
+                }
+            ]
+        },
+        "tests": [
+            {
+                "description": "Ad-hoc family matches strictly by shape (no magic variations for base schemas)",
+                "schema_id": "get_widgets.response",
+                "data": {
+                    "id": "1",
+                    "widget_type": "special",
+                    "special_feature": "yes"
+                },
+                "valid": true
+            }
+        ]
+    }
+]

tests/fixtures/if-then-else.json

@@ -1,181 +1,225 @@
 [
     {
         "description": "ignore if without then or else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "const": 0
-            }
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "const": 0
+                    },
+                    "$id": "if-then-else_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid when valid against lone if",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_0_0"
             },
             {
                 "description": "valid when invalid against lone if",
                 "data": "hello",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_0_0"
             }
         ]
     },
     {
         "description": "ignore then without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "then": {
-                "const": 0
-            }
+        "database": {
+            "schemas": [
+                {
+                    "then": {
+                        "const": 0
+                    },
+                    "$id": "if-then-else_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid when valid against lone then",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_1_0"
             },
             {
                 "description": "valid when invalid against lone then",
                 "data": "hello",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_1_0"
             }
         ]
     },
     {
         "description": "ignore else without if",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "else": {
-                "const": 0
-            }
+        "database": {
+            "schemas": [
+                {
+                    "else": {
+                        "const": 0
+                    },
+                    "$id": "if-then-else_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid when valid against lone else",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_2_0"
             },
             {
                 "description": "valid when invalid against lone else",
                 "data": "hello",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_2_0"
             }
         ]
     },
     {
         "description": "if and then without else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            }
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "exclusiveMaximum": 0
+                    },
+                    "then": {
+                        "minimum": -10
+                    },
+                    "$id": "if-then-else_3_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid through then",
                 "data": -1,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_3_0"
             },
             {
                 "description": "invalid through then",
                 "data": -100,
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_3_0"
             },
             {
                 "description": "valid when if test fails",
                 "data": 3,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_3_0"
             }
         ]
     },
     {
         "description": "if and else without then",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "else": {
-                "multipleOf": 2
-            }
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "exclusiveMaximum": 0
+                    },
+                    "else": {
+                        "multipleOf": 2
+                    },
+                    "$id": "if-then-else_4_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid when if test passes",
                 "data": -1,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_4_0"
             },
             {
                 "description": "valid through else",
                 "data": 4,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_4_0"
             },
             {
                 "description": "invalid through else",
                 "data": 3,
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_4_0"
             }
         ]
     },
     {
         "description": "validate against correct branch, then vs else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "exclusiveMaximum": 0
-            },
-            "then": {
-                "minimum": -10
-            },
-            "else": {
-                "multipleOf": 2
-            }
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "exclusiveMaximum": 0
+                    },
+                    "then": {
+                        "minimum": -10
+                    },
+                    "else": {
+                        "multipleOf": 2
+                    },
+                    "$id": "if-then-else_5_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid through then",
                 "data": -1,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_5_0"
             },
             {
                 "description": "invalid through then",
                 "data": -100,
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_5_0"
             },
             {
                 "description": "valid through else",
                 "data": 4,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_5_0"
             },
             {
                 "description": "invalid through else",
                 "data": 3,
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_5_0"
             }
         ]
     },
     {
         "description": "non-interference across combined schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "if": {
-                        "exclusiveMaximum": 0
-                    }
-                },
-                {
-                    "then": {
-                        "minimum": -10
-                    }
-                },
-                {
-                    "else": {
-                        "multipleOf": 2
-                    }
+                    "allOf": [
+                        {
+                            "if": {
+                                "exclusiveMaximum": 0
+                            }
+                        },
+                        {
+                            "then": {
+                                "minimum": -10
+                            }
+                        },
+                        {
+                            "else": {
+                                "multipleOf": 2
+                            }
+                        }
+                    ],
+                    "$id": "if-then-else_6_0"
                 }
             ]
         },
@@ -183,169 +227,209 @@
             {
                 "description": "valid, but would have been invalid through then",
                 "data": -100,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_6_0"
             },
             {
                 "description": "valid, but would have been invalid through else",
                 "data": 3,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_6_0"
             }
         ]
     },
     {
         "description": "if with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": true,
-            "then": {
-                "const": "then"
-            },
-            "else": {
-                "const": "else"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "if": true,
+                    "then": {
+                        "const": "then"
+                    },
+                    "else": {
+                        "const": "else"
+                    },
+                    "$id": "if-then-else_7_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "boolean schema true in if always chooses the then path (valid)",
                 "data": "then",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_7_0"
             },
             {
                 "description": "boolean schema true in if always chooses the then path (invalid)",
                 "data": "else",
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_7_0"
             }
         ]
     },
     {
         "description": "if with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": false,
-            "then": {
-                "const": "then"
-            },
-            "else": {
-                "const": "else"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "if": false,
+                    "then": {
+                        "const": "then"
+                    },
+                    "else": {
+                        "const": "else"
+                    },
+                    "$id": "if-then-else_8_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "boolean schema false in if always chooses the else path (invalid)",
                 "data": "then",
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_8_0"
             },
             {
                 "description": "boolean schema false in if always chooses the else path (valid)",
                 "data": "else",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_8_0"
             }
         ]
     },
     {
         "description": "if appears at the end when serialized (keyword processing sequence)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "then": {
-                "const": "yes"
-            },
-            "else": {
-                "const": "other"
-            },
-            "if": {
-                "maxLength": 4
-            }
+        "database": {
+            "schemas": [
+                {
+                    "then": {
+                        "const": "yes"
+                    },
+                    "else": {
+                        "const": "other"
+                    },
+                    "if": {
+                        "maxLength": 4
+                    },
+                    "$id": "if-then-else_9_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "yes redirects to then and passes",
                 "data": "yes",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_9_0"
             },
             {
                 "description": "other redirects to else and passes",
                 "data": "other",
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_9_0"
             },
             {
                 "description": "no redirects to then and fails",
                 "data": "no",
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_9_0"
             },
             {
                 "description": "invalid redirects to else and fails",
                 "data": "invalid",
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_9_0"
             }
         ]
     },
     {
         "description": "then: false fails when condition matches",
-        "schema": {
-            "if": {
-                "const": 1
-            },
-            "then": false
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "const": 1
+                    },
+                    "then": false,
+                    "$id": "if-then-else_10_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "matches if → then=false → invalid",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_10_0"
             },
             {
                 "description": "does not match if → then ignored → valid",
                 "data": 2,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_10_0"
             }
         ]
     },
     {
         "description": "else: false fails when condition does not match",
-        "schema": {
-            "if": {
-                "const": 1
-            },
-            "else": false
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "const": 1
+                    },
+                    "else": false,
+                    "$id": "if-then-else_11_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "matches if → else ignored → valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_11_0"
             },
             {
                 "description": "does not match if → else executes → invalid",
                 "data": 2,
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_11_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in if-then-else",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "properties": {
-                    "foo": {
-                        "const": 1
-                    }
-                },
-                "required": [
-                    "foo"
-                ]
-            },
-            "then": {
-                "properties": {
-                    "bar": {
-                        "const": 2
-                    }
-                },
-                "required": [
-                    "bar"
-                ]
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "properties": {
+                            "foo": {
+                                "const": 1
+                            }
+                        },
+                        "required": [
+                            "foo"
+                        ]
+                    },
+                    "then": {
+                        "properties": {
+                            "bar": {
+                                "const": 2
+                            }
+                        },
+                        "required": [
+                            "bar"
+                        ]
+                    },
+                    "extensible": true,
+                    "$id": "if-then-else_12_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -355,31 +439,36 @@
                     "bar": 2,
                     "extra": "prop"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_12_0"
             }
         ]
     },
     {
         "description": "strict by default with if-then properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "if": {
-                "properties": {
-                    "foo": {
-                        "const": 1
-                    }
-                },
-                "required": [
-                    "foo"
-                ]
-            },
-            "then": {
-                "properties": {
-                    "bar": {
-                        "const": 2
-                    }
+        "database": {
+            "schemas": [
+                {
+                    "if": {
+                        "properties": {
+                            "foo": {
+                                "const": 1
+                            }
+                        },
+                        "required": [
+                            "foo"
+                        ]
+                    },
+                    "then": {
+                        "properties": {
+                            "bar": {
+                                "const": 2
+                            }
+                        }
+                    },
+                    "$id": "if-then-else_13_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -388,7 +477,8 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "if-then-else_13_0"
             },
             {
                 "description": "fails on extra property z explicitly",
@@ -397,7 +487,8 @@
                     "bar": 2,
                     "z": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "if-then-else_13_0"
             }
         ]
     }

tests/fixtures/items.json

@@ -1,11 +1,15 @@
 [
     {
         "description": "a schema given for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": {
-                "type": "integer"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "items": {
+                        "type": "integer"
+                    },
+                    "$id": "items_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -15,7 +19,8 @@
                     2,
                     3
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_0_0"
             },
             {
                 "description": "wrong type of items",
@@ -23,14 +28,16 @@
                     1,
                     "x"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_0_0"
             },
             {
                 "description": "non-arrays are invalid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "items_0_0"
             },
             {
                 "description": "JavaScript pseudo-arrays are invalid",
@@ -38,15 +45,20 @@
                     "0": "invalid",
                     "length": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "items_0_0"
             }
         ]
     },
     {
         "description": "items with boolean schema (true)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": true
+        "database": {
+            "schemas": [
+                {
+                    "items": true,
+                    "$id": "items_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -56,20 +68,26 @@
                     "foo",
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_1_0"
             },
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_1_0"
             }
         ]
     },
     {
         "description": "items with boolean schema (false)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": false
+        "database": {
+            "schemas": [
+                {
+                    "items": false,
+                    "$id": "items_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -79,51 +97,57 @@
                     "foo",
                     true
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_2_0"
             },
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_2_0"
             }
         ]
     },
     {
         "description": "items and subitems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "item": {
+        "database": {
+            "schemas": [
+                {
                     "type": "array",
                     "items": false,
                     "prefixItems": [
                         {
-                            "$ref": "#/$defs/sub-item"
+                            "$ref": "item"
                         },
                         {
-                            "$ref": "#/$defs/sub-item"
+                            "$ref": "item"
+                        },
+                        {
+                            "$ref": "item"
+                        }
+                    ],
+                    "$id": "items_3_0"
+                },
+                {
+                    "$id": "item",
+                    "type": "array",
+                    "items": false,
+                    "prefixItems": [
+                        {
+                            "$ref": "sub-item"
+                        },
+                        {
+                            "$ref": "sub-item"
                         }
                     ]
                 },
-                "sub-item": {
+                {
+                    "$id": "sub-item",
                     "type": "object",
                     "required": [
                         "foo"
                     ]
                 }
-            },
-            "type": "array",
-            "items": false,
-            "prefixItems": [
-                {
-                    "$ref": "#/$defs/item"
-                },
-                {
-                    "$ref": "#/$defs/item"
-                },
-                {
-                    "$ref": "#/$defs/item"
-                }
             ]
         },
         "tests": [
@@ -155,7 +179,8 @@
                         }
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_3_0"
             },
             {
                 "description": "too many items",
@@ -193,7 +218,8 @@
                         }
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_3_0"
             },
             {
                 "description": "too many sub-items",
@@ -226,7 +252,8 @@
                         }
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_3_0"
             },
             {
                 "description": "wrong item",
@@ -251,7 +278,8 @@
                         }
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_3_0"
             },
             {
                 "description": "wrong sub-item",
@@ -279,7 +307,8 @@
                         }
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_3_0"
             },
             {
                 "description": "fewer items is invalid",
@@ -295,27 +324,32 @@
                         }
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_3_0"
             }
         ]
     },
     {
         "description": "nested items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "items": {
-                "type": "array",
-                "items": {
+        "database": {
+            "schemas": [
+                {
                     "type": "array",
                     "items": {
                         "type": "array",
                         "items": {
-                            "type": "number"
+                            "type": "array",
+                            "items": {
+                                "type": "array",
+                                "items": {
+                                    "type": "number"
+                                }
+                            }
                         }
-                    }
+                    },
+                    "$id": "items_4_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -350,7 +384,8 @@
                         ]
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_4_0"
             },
             {
                 "description": "nested array with invalid type",
@@ -384,7 +419,8 @@
                         ]
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_4_0"
             },
             {
                 "description": "not deep enough",
@@ -412,33 +448,40 @@
                         ]
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_4_0"
             }
         ]
     },
     {
         "description": "prefixItems with no additional items allowed",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                {},
-                {},
-                {}
-            ],
-            "items": false
+        "database": {
+            "schemas": [
+                {
+                    "prefixItems": [
+                        {},
+                        {},
+                        {}
+                    ],
+                    "items": false,
+                    "$id": "items_5_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty array",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_5_0"
             },
             {
                 "description": "fewer number of items present (1)",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_5_0"
             },
             {
                 "description": "fewer number of items present (2)",
@@ -446,7 +489,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_5_0"
             },
             {
                 "description": "equal number of items present",
@@ -455,7 +499,8 @@
                     2,
                     3
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_5_0"
             },
             {
                 "description": "additional items are not permitted",
@@ -465,26 +510,31 @@
                     3,
                     4
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_5_0"
             }
         ]
     },
     {
         "description": "items does not look in applicators, valid case",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "allOf": [
+        "database": {
+            "schemas": [
                 {
-                    "prefixItems": [
+                    "allOf": [
                         {
-                            "minimum": 3
+                            "prefixItems": [
+                                {
+                                    "minimum": 3
+                                }
+                            ]
                         }
-                    ]
+                    ],
+                    "items": {
+                        "minimum": 5
+                    },
+                    "$id": "items_6_0"
                 }
-            ],
-            "items": {
-                "minimum": 5
-            }
+            ]
         },
         "tests": [
             {
@@ -493,7 +543,8 @@
                     3,
                     5
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_6_0"
             },
             {
                 "description": "prefixItems in allOf does not constrain items, valid case",
@@ -501,22 +552,27 @@
                     5,
                     5
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_6_0"
             }
         ]
     },
     {
         "description": "prefixItems validation adjusts the starting index for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "string"
+                    "prefixItems": [
+                        {
+                            "type": "string"
+                        }
+                    ],
+                    "items": {
+                        "type": "integer"
+                    },
+                    "$id": "items_7_0"
                 }
-            ],
-            "items": {
-                "type": "integer"
-            }
+            ]
         },
         "tests": [
             {
@@ -526,7 +582,8 @@
                     2,
                     3
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_7_0"
             },
             {
                 "description": "wrong type of second item",
@@ -534,18 +591,23 @@
                     "x",
                     "y"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_7_0"
             }
         ]
     },
     {
         "description": "items with heterogeneous array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                {}
-            ],
-            "items": false
+        "database": {
+            "schemas": [
+                {
+                    "prefixItems": [
+                        {}
+                    ],
+                    "items": false,
+                    "$id": "items_8_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -555,24 +617,30 @@
                     "bar",
                     37
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_8_0"
             },
             {
                 "description": "valid instance",
                 "data": [
                     null
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_8_0"
             }
         ]
     },
     {
         "description": "items with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": {
-                "type": "null"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "items": {
+                        "type": "null"
+                    },
+                    "$id": "items_9_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -580,16 +648,21 @@
                 "data": [
                     null
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_9_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra items (when items is false)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": false,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "items": false,
+                    "extensible": true,
+                    "$id": "items_10_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -597,18 +670,23 @@
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_10_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties for items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "items": {
-                "minimum": 5
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "items": {
+                        "minimum": 5
+                    },
+                    "extensible": true,
+                    "$id": "items_11_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -617,29 +695,36 @@
                     5,
                     6
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_11_0"
             },
             {
                 "description": "invalid item (less than min) is invalid even with extensible: true",
                 "data": [
                     4
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_11_0"
             }
         ]
     },
     {
         "description": "array: simple extensible array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "type": "array",
+                    "extensible": true,
+                    "$id": "items_12_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_12_0"
             },
             {
                 "description": "array with items is valid (extensible)",
@@ -647,46 +732,58 @@
                     1,
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_12_0"
             }
         ]
     },
     {
         "description": "array: strict array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "extensible": false
+        "database": {
+            "schemas": [
+                {
+                    "type": "array",
+                    "extensible": false,
+                    "$id": "items_13_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_13_0"
             },
             {
                 "description": "array with items is invalid (strict)",
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_13_0"
             }
         ]
     },
     {
         "description": "array: items extensible",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "items": {
-                "extensible": true
-            }
+        "database": {
+            "schemas": [
+                {
+                    "type": "array",
+                    "items": {
+                        "extensible": true
+                    },
+                    "$id": "items_14_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_14_0"
             },
             {
                 "description": "array with items is valid (items explicitly allowed to be anything extensible)",
@@ -695,19 +792,24 @@
                     "foo",
                     {}
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_14_0"
             }
         ]
     },
     {
         "description": "array: items strict",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array",
-            "items": {
-                "type": "object",
-                "extensible": false
-            }
+        "database": {
+            "schemas": [
+                {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "extensible": false
+                    },
+                    "$id": "items_15_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -715,14 +817,16 @@
                 "data": [
                     {}
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_15_0"
             },
             {
                 "description": "array with strict object items is valid",
                 "data": [
                     {}
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "items_15_0"
             },
             {
                 "description": "array with invalid strict object items (extra property)",
@@ -731,7 +835,8 @@
                         "extra": 1
                     }
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "items_15_0"
             }
         ]
     }

tests/fixtures/masking.json

@@ -1,171 +0,0 @@
-[
-    {
-        "description": "Masking Properties",
-        "schema": {
-            "$id": "mask_properties",
-            "type": "object",
-            "properties": {
-                "foo": {
-                    "type": "string"
-                },
-                "bar": {
-                    "type": "integer"
-                }
-            },
-            "required": [
-                "foo"
-            ],
-            "extensible": false
-        },
-        "tests": [
-            {
-                "description": "Keep valid properties",
-                "data": {
-                    "foo": "a",
-                    "bar": 1
-                },
-                "valid": true,
-                "expected": {
-                    "foo": "a",
-                    "bar": 1
-                }
-            },
-            {
-                "description": "Remove unknown properties",
-                "data": {
-                    "foo": "a",
-                    "baz": true
-                },
-                "valid": true,
-                "expected": {
-                    "foo": "a"
-                }
-            },
-            {
-                "description": "Keep valid properties with unknown",
-                "data": {
-                    "foo": "a",
-                    "bar": 1,
-                    "baz": true
-                },
-                "valid": true,
-                "expected": {
-                    "foo": "a",
-                    "bar": 1
-                }
-            }
-        ]
-    },
-    {
-        "description": "Masking Nested Objects",
-        "schema": {
-            "$id": "mask_nested",
-            "type": "object",
-            "properties": {
-                "meta": {
-                    "type": "object",
-                    "properties": {
-                        "id": {
-                            "type": "integer"
-                        }
-                    },
-                    "extensible": false
-                }
-            },
-            "extensible": false
-        },
-        "tests": [
-            {
-                "description": "Mask nested object",
-                "data": {
-                    "meta": {
-                        "id": 1,
-                        "extra": "x"
-                    },
-                    "top_extra": "y"
-                },
-                "valid": true,
-                "expected": {
-                    "meta": {
-                        "id": 1
-                    }
-                }
-            }
-        ]
-    },
-    {
-        "description": "Masking Arrays",
-        "schema": {
-            "$id": "mask_arrays",
-            "type": "object",
-            "properties": {
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "extensible": false
-        },
-        "tests": [
-            {
-                "description": "Arrays are kept (items are valid)",
-                "data": {
-                    "tags": [
-                        "a",
-                        "b"
-                    ]
-                },
-                "valid": true,
-                "expected": {
-                    "tags": [
-                        "a",
-                        "b"
-                    ]
-                }
-            }
-        ]
-    },
-    {
-        "description": "Masking Tuple Arrays (prefixItems)",
-        "schema": {
-            "$id": "mask_tuple",
-            "type": "object",
-            "properties": {
-                "coord": {
-                    "type": "array",
-                    "prefixItems": [
-                        {
-                            "type": "number"
-                        },
-                        {
-                            "type": "number"
-                        }
-                    ]
-                }
-            },
-            "extensible": false
-        },
-        "tests": [
-            {
-                "description": "Extra tuple items removed",
-                "data": {
-                    "coord": [
-                        1,
-                        2,
-                        3,
-                        "extra"
-                    ]
-                },
-                "valid": true,
-                "expected": {
-                    "coord": [
-                        1,
-                        2
-                    ]
-                }
-            }
-        ]
-    }
-]

tests/fixtures/maxContains.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "maxContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxContains": 1,
+                    "extensible": true,
+                    "$id": "maxContains_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -12,7 +16,8 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_0_0"
             },
             {
                 "description": "two items still valid against lone maxContains",
@@ -20,32 +25,39 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_0_0"
             }
         ]
     },
     {
         "description": "maxContains with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "maxContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "maxContains": 1,
+                    "extensible": true,
+                    "$id": "maxContains_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxContains_1_0"
             },
             {
                 "description": "all elements match, valid maxContains",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_1_0"
             },
             {
                 "description": "all elements match, invalid maxContains",
@@ -53,7 +65,8 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxContains_1_0"
             },
             {
                 "description": "some elements match, valid maxContains",
@@ -61,7 +74,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_1_0"
             },
             {
                 "description": "some elements match, invalid maxContains",
@@ -70,19 +84,24 @@
                     2,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxContains_1_0"
             }
         ]
     },
     {
         "description": "maxContains with contains, value with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "maxContains": 1.0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "maxContains": 1,
+                    "extensible": true,
+                    "$id": "maxContains_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -90,7 +109,8 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_2_0"
             },
             {
                 "description": "too many elements match, invalid maxContains",
@@ -98,26 +118,32 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxContains_2_0"
             }
         ]
     },
     {
         "description": "minContains < maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 1,
-            "maxContains": 3,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 1,
+                    "maxContains": 3,
+                    "extensible": true,
+                    "$id": "maxContains_3_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "actual < minContains < maxContains",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxContains_3_0"
             },
             {
                 "description": "minContains < actual < maxContains",
@@ -125,7 +151,8 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_3_0"
             },
             {
                 "description": "minContains < maxContains < actual",
@@ -135,19 +162,24 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxContains_3_0"
             }
         ]
     },
     {
         "description": "extensible: true allows non-matching items in maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "maxContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "maxContains": 1,
+                    "extensible": true,
+                    "$id": "maxContains_4_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -156,7 +188,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxContains_4_0"
             }
         ]
     }

tests/fixtures/maxItems.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "maxItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxItems": 2,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxItems": 2,
+                    "extensible": true,
+                    "$id": "maxItems_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -12,7 +16,8 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxItems_0_0"
             },
             {
                 "description": "exact length is valid",
@@ -20,7 +25,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxItems_0_0"
             },
             {
                 "description": "too long is invalid",
@@ -29,21 +35,27 @@
                     2,
                     3
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxItems_0_0"
             },
             {
                 "description": "ignores non-arrays",
                 "data": "foobar",
-                "valid": true
+                "valid": true,
+                "schema_id": "maxItems_0_0"
             }
         ]
     },
     {
         "description": "maxItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxItems": 2.0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxItems": 2,
+                    "extensible": true,
+                    "$id": "maxItems_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -51,7 +63,8 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxItems_1_0"
             },
             {
                 "description": "too long is invalid",
@@ -60,16 +73,21 @@
                     2,
                     3
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxItems_1_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra items in maxItems (but counted)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxItems": 2,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxItems": 2,
+                    "extensible": true,
+                    "$id": "maxItems_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -79,7 +97,8 @@
                     2,
                     3
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "maxItems_2_0"
             }
         ]
     }

tests/fixtures/maxLength.json

@@ -1,55 +1,70 @@
 [
     {
         "description": "maxLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxLength": 2
+        "database": {
+            "schemas": [
+                {
+                    "maxLength": 2,
+                    "$id": "maxLength_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "shorter is valid",
                 "data": "f",
-                "valid": true
+                "valid": true,
+                "schema_id": "maxLength_0_0"
             },
             {
                 "description": "exact length is valid",
                 "data": "fo",
-                "valid": true
+                "valid": true,
+                "schema_id": "maxLength_0_0"
             },
             {
                 "description": "too long is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "maxLength_0_0"
             },
             {
                 "description": "ignores non-strings",
                 "data": 100,
-                "valid": true
+                "valid": true,
+                "schema_id": "maxLength_0_0"
             },
             {
                 "description": "two graphemes is long enough",
-                "data": "\uD83D\uDCA9\uD83D\uDCA9",
-                "valid": true
+                "data": "💩💩",
+                "valid": true,
+                "schema_id": "maxLength_0_0"
             }
         ]
     },
     {
         "description": "maxLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxLength": 2.0
+        "database": {
+            "schemas": [
+                {
+                    "maxLength": 2,
+                    "$id": "maxLength_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "shorter is valid",
                 "data": "f",
-                "valid": true
+                "valid": true,
+                "schema_id": "maxLength_1_0"
             },
             {
                 "description": "too long is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "maxLength_1_0"
             }
         ]
     }
-]
+]

tests/fixtures/maxProperties.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "maxProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 2,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxProperties": 2,
+                    "extensible": true,
+                    "$id": "maxProperties_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -12,7 +16,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_0_0"
             },
             {
                 "description": "exact length is valid",
@@ -20,7 +25,8 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_0_0"
             },
             {
                 "description": "too long is invalid",
@@ -29,7 +35,8 @@
                     "bar": 2,
                     "baz": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "maxProperties_0_0"
             },
             {
                 "description": "ignores arrays",
@@ -38,26 +45,33 @@
                     2,
                     3
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_0_0"
             },
             {
                 "description": "ignores strings",
                 "data": "foobar",
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_0_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_0_0"
             }
         ]
     },
     {
         "description": "maxProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 2.0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxProperties": 2,
+                    "extensible": true,
+                    "$id": "maxProperties_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -65,7 +79,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_1_0"
             },
             {
                 "description": "too long is invalid",
@@ -74,38 +89,49 @@
                     "bar": 2,
                     "baz": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "maxProperties_1_0"
             }
         ]
     },
     {
         "description": "maxProperties = 0 means the object is empty",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxProperties": 0,
+                    "extensible": true,
+                    "$id": "maxProperties_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "no properties is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_2_0"
             },
             {
                 "description": "one property is invalid",
                 "data": {
                     "foo": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "maxProperties_2_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in maxProperties (though maxProperties still counts them!)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maxProperties": 2,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "maxProperties": 2,
+                    "extensible": true,
+                    "$id": "maxProperties_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -115,14 +141,16 @@
                     "bar": 2,
                     "baz": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "maxProperties_3_0"
             },
             {
                 "description": "extra property is valid if below maxProperties",
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "maxProperties_3_0"
             }
         ]
     }

tests/fixtures/maximum.json

@@ -1,60 +1,76 @@
 [
     {
         "description": "maximum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maximum": 3.0
+        "database": {
+            "schemas": [
+                {
+                    "maximum": 3,
+                    "$id": "maximum_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "below the maximum is valid",
                 "data": 2.6,
-                "valid": true
+                "valid": true,
+                "schema_id": "maximum_0_0"
             },
             {
                 "description": "boundary point is valid",
-                "data": 3.0,
-                "valid": true
+                "data": 3,
+                "valid": true,
+                "schema_id": "maximum_0_0"
             },
             {
                 "description": "above the maximum is invalid",
                 "data": 3.5,
-                "valid": false
+                "valid": false,
+                "schema_id": "maximum_0_0"
             },
             {
                 "description": "ignores non-numbers",
                 "data": "x",
-                "valid": true
+                "valid": true,
+                "schema_id": "maximum_0_0"
             }
         ]
     },
     {
         "description": "maximum validation with unsigned integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "maximum": 300
+        "database": {
+            "schemas": [
+                {
+                    "maximum": 300,
+                    "$id": "maximum_1_0"
+                }
+            ]
         },
-        "tests":  [
+        "tests": [
             {
                 "description": "below the maximum is invalid",
                 "data": 299.97,
-                "valid": true
+                "valid": true,
+                "schema_id": "maximum_1_0"
             },
             {
                 "description": "boundary point integer is valid",
                 "data": 300,
-                "valid": true
+                "valid": true,
+                "schema_id": "maximum_1_0"
             },
             {
                 "description": "boundary point float is valid",
-                "data": 300.00,
-                "valid": true
+                "data": 300,
+                "valid": true,
+                "schema_id": "maximum_1_0"
             },
             {
                 "description": "above the maximum is invalid",
                 "data": 300.5,
-                "valid": false
+                "valid": false,
+                "schema_id": "maximum_1_0"
             }
         ]
     }
-]
+]

tests/fixtures/merge.json

@@ -1,23 +1,26 @@
 [
     {
         "description": "merging: properties accumulate",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "base": {
+        "database": {
+            "schemas": [
+                {
+                    "$id": "base_0",
                     "properties": {
                         "base_prop": {
                             "type": "string"
                         }
                     }
+                },
+                {
+                    "$ref": "base_0",
+                    "properties": {
+                        "child_prop": {
+                            "type": "string"
+                        }
+                    },
+                    "$id": "merge_0_0"
                 }
-            },
-            "$ref": "#/$defs/base",
-            "properties": {
-                "child_prop": {
-                    "type": "string"
-                }
-            }
+            ]
         },
         "tests": [
             {
@@ -26,7 +29,8 @@
                     "base_prop": "a",
                     "child_prop": "b"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "merge_0_0"
             },
             {
                 "description": "invalid when base property has wrong type",
@@ -40,16 +44,17 @@
                         "code": "TYPE_MISMATCH",
                         "path": "/base_prop"
                     }
-                ]
+                ],
+                "schema_id": "merge_0_0"
             }
         ]
     },
     {
         "description": "merging: required fields accumulate",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "base": {
+        "database": {
+            "schemas": [
+                {
+                    "$id": "base_1",
                     "properties": {
                         "a": {
                             "type": "string"
@@ -58,16 +63,19 @@
                     "required": [
                         "a"
                     ]
+                },
+                {
+                    "$ref": "base_1",
+                    "properties": {
+                        "b": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "b"
+                    ],
+                    "$id": "merge_1_0"
                 }
-            },
-            "$ref": "#/$defs/base",
-            "properties": {
-                "b": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "b"
             ]
         },
         "tests": [
@@ -77,7 +85,8 @@
                     "a": "ok",
                     "b": "ok"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "merge_1_0"
             },
             {
                 "description": "invalid when base required missing",
@@ -90,7 +99,8 @@
                         "code": "REQUIRED_FIELD_MISSING",
                         "path": "/a"
                     }
-                ]
+                ],
+                "schema_id": "merge_1_0"
             },
             {
                 "description": "invalid when child required missing",
@@ -103,16 +113,17 @@
                         "code": "REQUIRED_FIELD_MISSING",
                         "path": "/b"
                     }
-                ]
+                ],
+                "schema_id": "merge_1_0"
             }
         ]
     },
     {
         "description": "merging: dependencies accumulate",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "base": {
+        "database": {
+            "schemas": [
+                {
+                    "$id": "base_2",
                     "properties": {
                         "trigger": {
                             "type": "string"
@@ -126,19 +137,22 @@
                             "base_dep"
                         ]
                     }
+                },
+                {
+                    "$ref": "base_2",
+                    "properties": {
+                        "child_dep": {
+                            "type": "string"
+                        }
+                    },
+                    "dependencies": {
+                        "trigger": [
+                            "child_dep"
+                        ]
+                    },
+                    "$id": "merge_2_0"
                 }
-            },
-            "$ref": "#/$defs/base",
-            "properties": {
-                "child_dep": {
-                    "type": "string"
-                }
-            },
-            "dependencies": {
-                "trigger": [
-                    "child_dep"
-                ]
-            }
+            ]
         },
         "tests": [
             {
@@ -148,7 +162,8 @@
                     "base_dep": "ok",
                     "child_dep": "ok"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "merge_2_0"
             },
             {
                 "description": "invalid missing base dep",
@@ -162,7 +177,8 @@
                         "code": "DEPENDENCY_FAILED",
                         "path": "/base_dep"
                     }
-                ]
+                ],
+                "schema_id": "merge_2_0"
             },
             {
                 "description": "invalid missing child dep",
@@ -176,16 +192,17 @@
                         "code": "DEPENDENCY_FAILED",
                         "path": "/child_dep"
                     }
-                ]
+                ],
+                "schema_id": "merge_2_0"
             }
         ]
     },
     {
         "description": "merging: form and display do NOT merge",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "$defs": {
-                "base": {
+        "database": {
+            "schemas": [
+                {
+                    "$id": "base_3",
                     "properties": {
                         "a": {
                             "type": "string"
@@ -198,16 +215,19 @@
                         "a",
                         "b"
                     ]
+                },
+                {
+                    "$ref": "base_3",
+                    "properties": {
+                        "c": {
+                            "type": "string"
+                        }
+                    },
+                    "form": [
+                        "c"
+                    ],
+                    "$id": "merge_3_0"
                 }
-            },
-            "$ref": "#/$defs/base",
-            "properties": {
-                "c": {
-                    "type": "string"
-                }
-            },
-            "form": [
-                "c"
             ]
         },
         "tests": [
@@ -219,7 +239,8 @@
                     "c": "ok"
                 },
                 "valid": true,
-                "comment": "Verifies validator handles the unmerged metadata correctly (ignores it or handles replacement)"
+                "comment": "Verifies validator handles the unmerged metadata correctly (ignores it or handles replacement)",
+                "schema_id": "merge_3_0"
             }
         ]
     }

tests/fixtures/minContains.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "minContains without contains is ignored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minContains": 1,
+                    "extensible": true,
+                    "$id": "minContains_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -12,44 +16,53 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_0_0"
             },
             {
                 "description": "zero items still valid against lone minContains",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_0_0"
             }
         ]
     },
     {
         "description": "minContains=1 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 1,
+                    "extensible": true,
+                    "$id": "minContains_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_1_0"
             },
             {
                 "description": "no elements match",
                 "data": [
                     2
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_1_0"
             },
             {
                 "description": "single element matches, valid minContains",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_1_0"
             },
             {
                 "description": "some elements match, valid minContains",
@@ -57,7 +70,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_1_0"
             },
             {
                 "description": "all elements match, valid minContains",
@@ -65,32 +79,39 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_1_0"
             }
         ]
     },
     {
         "description": "minContains=2 with contains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 2,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 2,
+                    "extensible": true,
+                    "$id": "minContains_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_2_0"
             },
             {
                 "description": "all elements match, invalid minContains",
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_2_0"
             },
             {
                 "description": "some elements match, invalid minContains",
@@ -98,7 +119,8 @@
                     1,
                     2
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_2_0"
             },
             {
                 "description": "all elements match, valid minContains (exactly as needed)",
@@ -106,7 +128,8 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_2_0"
             },
             {
                 "description": "all elements match, valid minContains (more than needed)",
@@ -115,7 +138,8 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_2_0"
             },
             {
                 "description": "some elements match, valid minContains",
@@ -124,19 +148,24 @@
                     2,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_2_0"
             }
         ]
     },
     {
         "description": "minContains=2 with contains with a decimal value",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 2.0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 2,
+                    "extensible": true,
+                    "$id": "minContains_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -144,7 +173,8 @@
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_3_0"
             },
             {
                 "description": "both elements match, valid minContains",
@@ -152,33 +182,40 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_3_0"
             }
         ]
     },
     {
         "description": "maxContains = minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "maxContains": 2,
-            "minContains": 2,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "maxContains": 2,
+                    "minContains": 2,
+                    "extensible": true,
+                    "$id": "minContains_4_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_4_0"
             },
             {
                 "description": "all elements match, invalid minContains",
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_4_0"
             },
             {
                 "description": "all elements match, invalid maxContains",
@@ -187,7 +224,8 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_4_0"
             },
             {
                 "description": "all elements match, valid maxContains and minContains",
@@ -195,33 +233,40 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_4_0"
             }
         ]
     },
     {
         "description": "maxContains < minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "maxContains": 1,
-            "minContains": 3,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "maxContains": 1,
+                    "minContains": 3,
+                    "extensible": true,
+                    "$id": "minContains_5_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_5_0"
             },
             {
                 "description": "invalid minContains",
                 "data": [
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_5_0"
             },
             {
                 "description": "invalid maxContains",
@@ -230,7 +275,8 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_5_0"
             },
             {
                 "description": "invalid maxContains and minContains",
@@ -238,58 +284,71 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_5_0"
             }
         ]
     },
     {
         "description": "minContains = 0",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 0,
+                    "extensible": true,
+                    "$id": "minContains_6_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_6_0"
             },
             {
                 "description": "minContains = 0 makes contains always pass",
                 "data": [
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_6_0"
             }
         ]
     },
     {
         "description": "minContains = 0 with maxContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 0,
-            "maxContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 0,
+                    "maxContains": 1,
+                    "extensible": true,
+                    "$id": "minContains_7_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "empty data",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_7_0"
             },
             {
                 "description": "not more than maxContains",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_7_0"
             },
             {
                 "description": "too many",
@@ -297,19 +356,24 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "minContains_7_0"
             }
         ]
     },
     {
         "description": "extensible: true allows non-matching items in minContains",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "contains": {
-                "const": 1
-            },
-            "minContains": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "contains": {
+                        "const": 1
+                    },
+                    "minContains": 1,
+                    "extensible": true,
+                    "$id": "minContains_8_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -318,7 +382,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minContains_8_0"
             }
         ]
     }

tests/fixtures/minItems.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "minItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minItems": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minItems": 1,
+                    "extensible": true,
+                    "$id": "minItems_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -13,33 +17,41 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minItems_0_0"
             },
             {
                 "description": "exact length is valid",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minItems_0_0"
             },
             {
                 "description": "too short is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "minItems_0_0"
             },
             {
                 "description": "ignores non-arrays",
                 "data": "",
-                "valid": true
+                "valid": true,
+                "schema_id": "minItems_0_0"
             }
         ]
     },
     {
         "description": "minItems validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minItems": 1.0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minItems": 1,
+                    "extensible": true,
+                    "$id": "minItems_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -48,21 +60,27 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minItems_1_0"
             },
             {
                 "description": "too short is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "minItems_1_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra items in minItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minItems": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minItems": 1,
+                    "extensible": true,
+                    "$id": "minItems_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -70,7 +88,8 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "minItems_2_0"
             }
         ]
     }

tests/fixtures/minLength.json

@@ -1,55 +1,70 @@
 [
     {
         "description": "minLength validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minLength": 2
+        "database": {
+            "schemas": [
+                {
+                    "minLength": 2,
+                    "$id": "minLength_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "longer is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "minLength_0_0"
             },
             {
                 "description": "exact length is valid",
                 "data": "fo",
-                "valid": true
+                "valid": true,
+                "schema_id": "minLength_0_0"
             },
             {
                 "description": "too short is invalid",
                 "data": "f",
-                "valid": false
+                "valid": false,
+                "schema_id": "minLength_0_0"
             },
             {
                 "description": "ignores non-strings",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "minLength_0_0"
             },
             {
                 "description": "one grapheme is not long enough",
-                "data": "\uD83D\uDCA9",
-                "valid": false
+                "data": "💩",
+                "valid": false,
+                "schema_id": "minLength_0_0"
             }
         ]
     },
     {
         "description": "minLength validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minLength": 2.0
+        "database": {
+            "schemas": [
+                {
+                    "minLength": 2,
+                    "$id": "minLength_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "longer is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "minLength_1_0"
             },
             {
                 "description": "too short is invalid",
                 "data": "f",
-                "valid": false
+                "valid": false,
+                "schema_id": "minLength_1_0"
             }
         ]
     }
-]
+]

tests/fixtures/minProperties.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "minProperties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minProperties": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minProperties": 1,
+                    "extensible": true,
+                    "$id": "minProperties_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -13,43 +17,53 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_0_0"
             },
             {
                 "description": "exact length is valid",
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_0_0"
             },
             {
                 "description": "too short is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "minProperties_0_0"
             },
             {
                 "description": "ignores arrays",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_0_0"
             },
             {
                 "description": "ignores strings",
                 "data": "",
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_0_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_0_0"
             }
         ]
     },
     {
         "description": "minProperties validation with a decimal",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minProperties": 1.0,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minProperties": 1,
+                    "extensible": true,
+                    "$id": "minProperties_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -58,21 +72,27 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_1_0"
             },
             {
                 "description": "too short is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "minProperties_1_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in minProperties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minProperties": 1,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "minProperties": 1,
+                    "extensible": true,
+                    "$id": "minProperties_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -80,7 +100,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "minProperties_2_0"
             }
         ]
     }

tests/fixtures/minimum.json

@@ -1,75 +1,94 @@
 [
     {
         "description": "minimum validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minimum": 1.1
+        "database": {
+            "schemas": [
+                {
+                    "minimum": 1.1,
+                    "$id": "minimum_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "above the minimum is valid",
                 "data": 2.6,
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_0_0"
             },
             {
                 "description": "boundary point is valid",
                 "data": 1.1,
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_0_0"
             },
             {
                 "description": "below the minimum is invalid",
                 "data": 0.6,
-                "valid": false
+                "valid": false,
+                "schema_id": "minimum_0_0"
             },
             {
                 "description": "ignores non-numbers",
                 "data": "x",
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_0_0"
             }
         ]
     },
     {
         "description": "minimum validation with signed integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "minimum": -2
+        "database": {
+            "schemas": [
+                {
+                    "minimum": -2,
+                    "$id": "minimum_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "negative above the minimum is valid",
                 "data": -1,
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_1_0"
             },
             {
                 "description": "positive above the minimum is valid",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_1_0"
             },
             {
                 "description": "boundary point is valid",
                 "data": -2,
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_1_0"
             },
             {
                 "description": "boundary point with float is valid",
-                "data": -2.0,
-                "valid": true
+                "data": -2,
+                "valid": true,
+                "schema_id": "minimum_1_0"
             },
             {
                 "description": "float below the minimum is invalid",
                 "data": -2.0001,
-                "valid": false
+                "valid": false,
+                "schema_id": "minimum_1_0"
             },
             {
                 "description": "int below the minimum is invalid",
                 "data": -3,
-                "valid": false
+                "valid": false,
+                "schema_id": "minimum_1_0"
             },
             {
                 "description": "ignores non-numbers",
                 "data": "x",
-                "valid": true
+                "valid": true,
+                "schema_id": "minimum_1_0"
             }
         ]
     }
-]
+]

tests/fixtures/multipleOf.json

@@ -1,83 +1,108 @@
 [
     {
         "description": "by int",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "multipleOf": 2
+        "database": {
+            "schemas": [
+                {
+                    "multipleOf": 2,
+                    "$id": "multipleOf_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "int by int",
                 "data": 10,
-                "valid": true
+                "valid": true,
+                "schema_id": "multipleOf_0_0"
             },
             {
                 "description": "int by int fail",
                 "data": 7,
-                "valid": false
+                "valid": false,
+                "schema_id": "multipleOf_0_0"
             },
             {
                 "description": "ignores non-numbers",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "multipleOf_0_0"
             }
         ]
     },
     {
         "description": "by number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "multipleOf": 1.5
+        "database": {
+            "schemas": [
+                {
+                    "multipleOf": 1.5,
+                    "$id": "multipleOf_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "zero is multiple of anything",
                 "data": 0,
-                "valid": true
+                "valid": true,
+                "schema_id": "multipleOf_1_0"
             },
             {
                 "description": "4.5 is multiple of 1.5",
                 "data": 4.5,
-                "valid": true
+                "valid": true,
+                "schema_id": "multipleOf_1_0"
             },
             {
                 "description": "35 is not multiple of 1.5",
                 "data": 35,
-                "valid": false
+                "valid": false,
+                "schema_id": "multipleOf_1_0"
             }
         ]
     },
     {
         "description": "by small number",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "multipleOf": 0.0001
+        "database": {
+            "schemas": [
+                {
+                    "multipleOf": 0.0001,
+                    "$id": "multipleOf_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "0.0075 is multiple of 0.0001",
                 "data": 0.0075,
-                "valid": true
+                "valid": true,
+                "schema_id": "multipleOf_2_0"
             },
             {
                 "description": "0.00751 is not multiple of 0.0001",
                 "data": 0.00751,
-                "valid": false
+                "valid": false,
+                "schema_id": "multipleOf_2_0"
             }
         ]
     },
     {
         "description": "small multiple of large integer",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "integer",
-            "multipleOf": 1e-8
+        "database": {
+            "schemas": [
+                {
+                    "type": "integer",
+                    "multipleOf": 1e-8,
+                    "$id": "multipleOf_3_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "any integer is a multiple of 1e-8",
                 "data": 12391239123,
-                "valid": true
+                "valid": true,
+                "schema_id": "multipleOf_3_0"
             }
         ]
     }

tests/fixtures/not.json

@@ -1,99 +1,123 @@
 [
     {
         "description": "not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "type": "integer"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "not": {
+                        "type": "integer"
+                    },
+                    "$id": "not_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "allowed",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "not_0_0"
             },
             {
                 "description": "disallowed",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_0_0"
             }
         ]
     },
     {
         "description": "not multiple types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "type": [
-                    "integer",
-                    "boolean"
-                ]
-            }
+        "database": {
+            "schemas": [
+                {
+                    "not": {
+                        "type": [
+                            "integer",
+                            "boolean"
+                        ]
+                    },
+                    "$id": "not_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "not_1_0"
             },
             {
                 "description": "mismatch",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_1_0"
             },
             {
                 "description": "other mismatch",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_1_0"
             }
         ]
     },
     {
         "description": "not more complex schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "type": "object",
-                "properties": {
-                    "foo": {
-                        "type": "string"
-                    }
+        "database": {
+            "schemas": [
+                {
+                    "not": {
+                        "type": "object",
+                        "properties": {
+                            "foo": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "extensible": true,
+                    "$id": "not_2_0"
                 }
-            },
-            "extensible": true
+            ]
         },
         "tests": [
             {
                 "description": "match",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "not_2_0"
             },
             {
                 "description": "other match",
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "not_2_0"
             },
             {
                 "description": "mismatch",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "not_2_0"
             }
         ]
     },
     {
         "description": "forbidden property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "not": {}
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {
+                            "not": {}
+                        }
+                    },
+                    "$id": "not_3_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -102,214 +126,264 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "not_3_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "not_3_0"
             }
         ]
     },
     {
         "description": "forbid everything with empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {}
+        "database": {
+            "schemas": [
+                {
+                    "not": {},
+                    "$id": "not_4_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "number is invalid",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "boolean true is invalid",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "boolean false is invalid",
                 "data": false,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "null is invalid",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "object is invalid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "empty object is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "array is invalid",
                 "data": [
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "not_4_0"
             }
         ]
     },
     {
         "description": "forbid everything with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": true
+        "database": {
+            "schemas": [
+                {
+                    "not": true,
+                    "$id": "not_5_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "number is invalid",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "boolean true is invalid",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "boolean false is invalid",
                 "data": false,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "null is invalid",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "object is invalid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "empty object is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "array is invalid",
                 "data": [
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             },
             {
                 "description": "empty array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "not_5_0"
             }
         ]
     },
     {
         "description": "allow everything with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": false,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "not": false,
+                    "extensible": true,
+                    "$id": "not_6_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "number is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "string is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "boolean true is valid",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "boolean false is valid",
                 "data": false,
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "object is valid",
                 "data": {
                     "foo": "bar"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "array is valid",
                 "data": [
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             },
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "not_6_0"
             }
         ]
     },
     {
         "description": "double negation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "not": {}
-            }
+        "database": {
+            "schemas": [
+                {
+                    "not": {
+                        "not": {}
+                    },
+                    "$id": "not_7_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "any value is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "not_7_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "type": "integer"
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "not": {
+                        "type": "integer"
+                    },
+                    "extensible": true,
+                    "$id": "not_8_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -317,17 +391,22 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "not_8_0"
             }
         ]
     },
     {
         "description": "extensible: false (default) forbids extra properties in not",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "not": {
-                "type": "integer"
-            }
+        "database": {
+            "schemas": [
+                {
+                    "not": {
+                        "type": "integer"
+                    },
+                    "$id": "not_9_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -335,23 +414,28 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "not_9_0"
             }
         ]
     },
     {
         "description": "property next to not (extensible: true)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "bar": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "bar": {
+                            "type": "string"
+                        }
+                    },
+                    "not": {
+                        "type": "integer"
+                    },
+                    "extensible": true,
+                    "$id": "not_10_0"
                 }
-            },
-            "not": {
-                "type": "integer"
-            },
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -360,22 +444,27 @@
                     "bar": "baz",
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "not_10_0"
             }
         ]
     },
     {
         "description": "property next to not (extensible: false)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "bar": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "bar": {
+                            "type": "string"
+                        }
+                    },
+                    "not": {
+                        "type": "integer"
+                    },
+                    "$id": "not_11_0"
                 }
-            },
-            "not": {
-                "type": "integer"
-            }
+            ]
         },
         "tests": [
             {
@@ -384,14 +473,16 @@
                     "bar": "baz",
                     "foo": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "not_11_0"
             },
             {
                 "description": "defined property allowed",
                 "data": {
                     "bar": "baz"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "not_11_0"
             }
         ]
     }

tests/fixtures/oneOf.json

@@ -1,14 +1,18 @@
 [
     {
         "description": "oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "integer"
-                },
-                {
-                    "minimum": 2
+                    "oneOf": [
+                        {
+                            "type": "integer"
+                        },
+                        {
+                            "minimum": 2
+                        }
+                    ],
+                    "$id": "oneOf_0_0"
                 }
             ]
         },
@@ -16,36 +20,44 @@
             {
                 "description": "first oneOf valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_0_0"
             },
             {
                 "description": "second oneOf valid",
                 "data": 2.5,
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_0_0"
             },
             {
                 "description": "both oneOf valid",
                 "data": 3,
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_0_0"
             },
             {
                 "description": "neither oneOf valid",
                 "data": 1.5,
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_0_0"
             }
         ]
     },
     {
         "description": "oneOf with base schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "minLength": 2
-                },
-                {
-                    "maxLength": 4
+                    "type": "string",
+                    "oneOf": [
+                        {
+                            "minLength": 2
+                        },
+                        {
+                            "maxLength": 4
+                        }
+                    ],
+                    "$id": "oneOf_1_0"
                 }
             ]
         },
@@ -53,116 +65,143 @@
             {
                 "description": "mismatch base schema",
                 "data": 3,
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_1_0"
             },
             {
                 "description": "one oneOf valid",
                 "data": "foobar",
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_1_0"
             },
             {
                 "description": "both oneOf valid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_1_0"
             }
         ]
     },
     {
         "description": "oneOf with boolean schemas, all true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                true,
-                true,
-                true
+        "database": {
+            "schemas": [
+                {
+                    "oneOf": [
+                        true,
+                        true,
+                        true
+                    ],
+                    "$id": "oneOf_2_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_2_0"
             }
         ]
     },
     {
         "description": "oneOf with boolean schemas, one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                true,
-                false,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "oneOf": [
+                        true,
+                        false,
+                        false
+                    ],
+                    "$id": "oneOf_3_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_3_0"
             }
         ]
     },
     {
         "description": "oneOf with boolean schemas, more than one true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                true,
-                true,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "oneOf": [
+                        true,
+                        true,
+                        false
+                    ],
+                    "$id": "oneOf_4_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_4_0"
             }
         ]
     },
     {
         "description": "oneOf with boolean schemas, all false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
-                false,
-                false,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "oneOf": [
+                        false,
+                        false,
+                        false
+                    ],
+                    "$id": "oneOf_5_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "any value is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_5_0"
             }
         ]
     },
     {
         "description": "oneOf complex types",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "bar": {
-                            "type": "integer"
+                    "oneOf": [
+                        {
+                            "properties": {
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "bar"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "foo"
+                            ]
                         }
-                    },
-                    "required": [
-                        "bar"
-                    ]
-                },
-                {
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "foo"
-                    ]
+                    ],
+                    "$id": "oneOf_6_0"
                 }
             ]
         },
@@ -172,14 +211,16 @@
                 "data": {
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_6_0"
             },
             {
                 "description": "second oneOf valid (complex)",
                 "data": {
                     "foo": "baz"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_6_0"
             },
             {
                 "description": "both oneOf valid (complex)",
@@ -187,7 +228,8 @@
                     "foo": "baz",
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_6_0"
             },
             {
                 "description": "neither oneOf valid (complex)",
@@ -195,56 +237,67 @@
                     "foo": 2,
                     "bar": "quux"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_6_0"
             }
         ]
     },
     {
         "description": "oneOf with empty schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "number"
-                },
-                {}
+                    "oneOf": [
+                        {
+                            "type": "number"
+                        },
+                        {}
+                    ],
+                    "$id": "oneOf_7_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "one valid - valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_7_0"
             },
             {
                 "description": "both valid - invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_7_0"
             }
         ]
     },
     {
         "description": "oneOf with required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "properties": {
-                "foo": true,
-                "bar": true,
-                "baz": true
-            },
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "required": [
-                        "foo",
-                        "bar"
-                    ]
-                },
-                {
-                    "required": [
-                        "foo",
-                        "baz"
-                    ]
+                    "type": "object",
+                    "properties": {
+                        "foo": true,
+                        "bar": true,
+                        "baz": true
+                    },
+                    "oneOf": [
+                        {
+                            "required": [
+                                "foo",
+                                "bar"
+                            ]
+                        },
+                        {
+                            "required": [
+                                "foo",
+                                "baz"
+                            ]
+                        }
+                    ],
+                    "$id": "oneOf_8_0"
                 }
             ]
         },
@@ -254,7 +307,8 @@
                 "data": {
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_8_0"
             },
             {
                 "description": "first valid - valid",
@@ -262,7 +316,8 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_8_0"
             },
             {
                 "description": "second valid - valid",
@@ -270,7 +325,8 @@
                     "foo": 1,
                     "baz": 3
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_8_0"
             },
             {
                 "description": "both valid - invalid",
@@ -279,7 +335,8 @@
                     "bar": 2,
                     "baz": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_8_0"
             },
             {
                 "description": "extra property invalid (strict)",
@@ -288,28 +345,33 @@
                     "bar": 2,
                     "extra": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_8_0"
             }
         ]
     },
     {
         "description": "oneOf with required (extensible)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "extensible": true,
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "required": [
-                        "foo",
-                        "bar"
-                    ]
-                },
-                {
-                    "required": [
-                        "foo",
-                        "baz"
-                    ]
+                    "type": "object",
+                    "extensible": true,
+                    "oneOf": [
+                        {
+                            "required": [
+                                "foo",
+                                "bar"
+                            ]
+                        },
+                        {
+                            "required": [
+                                "foo",
+                                "baz"
+                            ]
+                        }
+                    ],
+                    "$id": "oneOf_9_0"
                 }
             ]
         },
@@ -319,7 +381,8 @@
                 "data": {
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_9_0"
             },
             {
                 "description": "first valid - valid",
@@ -327,7 +390,8 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_9_0"
             },
             {
                 "description": "second valid - valid",
@@ -335,7 +399,8 @@
                     "foo": 1,
                     "baz": 3
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_9_0"
             },
             {
                 "description": "both valid - invalid",
@@ -344,7 +409,8 @@
                     "bar": 2,
                     "baz": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_9_0"
             },
             {
                 "description": "extra properties are valid (extensible)",
@@ -353,31 +419,36 @@
                     "bar": 2,
                     "extra": "value"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_9_0"
             }
         ]
     },
     {
         "description": "oneOf with missing optional property",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "bar": true,
-                        "baz": true
-                    },
-                    "required": [
-                        "bar"
-                    ]
-                },
-                {
-                    "properties": {
-                        "foo": true
-                    },
-                    "required": [
-                        "foo"
-                    ]
+                    "oneOf": [
+                        {
+                            "properties": {
+                                "bar": true,
+                                "baz": true
+                            },
+                            "required": [
+                                "bar"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "foo": true
+                            },
+                            "required": [
+                                "foo"
+                            ]
+                        }
+                    ],
+                    "$id": "oneOf_10_0"
                 }
             ]
         },
@@ -387,14 +458,16 @@
                 "data": {
                     "bar": 8
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_10_0"
             },
             {
                 "description": "second oneOf valid",
                 "data": {
                     "foo": "foo"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_10_0"
             },
             {
                 "description": "both oneOf valid",
@@ -402,28 +475,34 @@
                     "foo": "foo",
                     "bar": 8
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_10_0"
             },
             {
                 "description": "neither oneOf valid",
                 "data": {
                     "baz": "quux"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_10_0"
             }
         ]
     },
     {
         "description": "nested oneOf, to check validation semantics",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
                     "oneOf": [
                         {
-                            "type": "null"
+                            "oneOf": [
+                                {
+                                    "type": "null"
+                                }
+                            ]
                         }
-                    ]
+                    ],
+                    "$id": "oneOf_11_0"
                 }
             ]
         },
@@ -431,42 +510,48 @@
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_11_0"
             },
             {
                 "description": "anything non-null is invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "oneOf_11_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in oneOf",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "oneOf": [
+        "database": {
+            "schemas": [
                 {
-                    "properties": {
-                        "bar": {
-                            "type": "integer"
+                    "oneOf": [
+                        {
+                            "properties": {
+                                "bar": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "bar"
+                            ]
+                        },
+                        {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "foo"
+                            ]
                         }
-                    },
-                    "required": [
-                        "bar"
-                    ]
-                },
-                {
-                    "properties": {
-                        "foo": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "foo"
-                    ]
+                    ],
+                    "extensible": true,
+                    "$id": "oneOf_12_0"
                 }
-            ],
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -475,7 +560,8 @@
                     "bar": 2,
                     "extra": "prop"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "oneOf_12_0"
             }
         ]
     }

tests/fixtures/pattern.json

@@ -1,65 +1,82 @@
 [
     {
         "description": "pattern validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "^a*$"
+        "database": {
+            "schemas": [
+                {
+                    "pattern": "^a*$",
+                    "$id": "pattern_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "a matching pattern is valid",
                 "data": "aaa",
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "a non-matching pattern is invalid",
                 "data": "abc",
-                "valid": false
+                "valid": false,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "ignores booleans",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "ignores integers",
                 "data": 123,
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "ignores floats",
-                "data": 1.0,
-                "valid": true
+                "data": 1,
+                "valid": true,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "ignores objects",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "ignores arrays",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_0_0"
             },
             {
                 "description": "ignores null",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_0_0"
             }
         ]
     },
     {
         "description": "pattern is not anchored",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "pattern": "a+"
+        "database": {
+            "schemas": [
+                {
+                    "pattern": "a+",
+                    "$id": "pattern_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "matches a substring",
                 "data": "xxaayy",
-                "valid": true
+                "valid": true,
+                "schema_id": "pattern_1_0"
             }
         ]
     }
-]
+]

tests/fixtures/patternProperties.json

@@ -1,14 +1,18 @@
 [
     {
         "description": "patternProperties validates properties matching a regex",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "f.*o": {
-                    "type": "integer"
+        "database": {
+            "schemas": [
+                {
+                    "patternProperties": {
+                        "f.*o": {
+                            "type": "integer"
+                        }
+                    },
+                    "items": {},
+                    "$id": "patternProperties_0_0"
                 }
-            },
-            "items": {}
+            ]
         },
         "tests": [
             {
@@ -16,7 +20,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "multiple valid matches is valid",
@@ -24,7 +29,8 @@
                     "foo": 1,
                     "foooooo": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "a single invalid match is invalid",
@@ -32,7 +38,8 @@
                     "foo": "bar",
                     "fooooo": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "multiple invalid matches is invalid",
@@ -40,24 +47,28 @@
                     "foo": "bar",
                     "foooooo": "baz"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "ignores arrays",
                 "data": [
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "ignores strings",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_0_0"
             },
             {
                 "description": "extra property not matching pattern is INVALID (strict by default)",
@@ -65,22 +76,27 @@
                     "foo": 1,
                     "extra": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_0_0"
             }
         ]
     },
     {
         "description": "multiple simultaneous patternProperties are validated",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "a*": {
-                    "type": "integer"
-                },
-                "aaa*": {
-                    "maximum": 20
+        "database": {
+            "schemas": [
+                {
+                    "patternProperties": {
+                        "a*": {
+                            "type": "integer"
+                        },
+                        "aaa*": {
+                            "maximum": 20
+                        }
+                    },
+                    "$id": "patternProperties_1_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -88,14 +104,16 @@
                 "data": {
                     "a": 21
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_1_0"
             },
             {
                 "description": "a simultaneous match is valid",
                 "data": {
                     "aaaa": 18
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_1_0"
             },
             {
                 "description": "multiple matches is valid",
@@ -103,21 +121,24 @@
                     "a": 21,
                     "aaaa": 18
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_1_0"
             },
             {
                 "description": "an invalid due to one is invalid",
                 "data": {
                     "a": "bar"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_1_0"
             },
             {
                 "description": "an invalid due to the other is invalid",
                 "data": {
                     "aaaa": 31
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_1_0"
             },
             {
                 "description": "an invalid due to both is invalid",
@@ -125,23 +146,28 @@
                     "aaa": "foo",
                     "aaaa": 31
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_1_0"
             }
         ]
     },
     {
         "description": "regexes are not anchored by default and are case sensitive",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "[0-9]{2,}": {
-                    "type": "boolean"
-                },
-                "X_": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "patternProperties": {
+                        "[0-9]{2,}": {
+                            "type": "boolean"
+                        },
+                        "X_": {
+                            "type": "string"
+                        }
+                    },
+                    "extensible": true,
+                    "$id": "patternProperties_2_0"
                 }
-            },
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -149,39 +175,47 @@
                 "data": {
                     "answer 1": "42"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_2_0"
             },
             {
                 "description": "recognized members are accounted for",
                 "data": {
                     "a31b": null
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_2_0"
             },
             {
                 "description": "regexes are case sensitive",
                 "data": {
                     "a_x_3": 3
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_2_0"
             },
             {
                 "description": "regexes are case sensitive, 2",
                 "data": {
                     "a_X_3": 3
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_2_0"
             }
         ]
     },
     {
         "description": "patternProperties with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "f.*": true,
-                "b.*": false
-            }
+        "database": {
+            "schemas": [
+                {
+                    "patternProperties": {
+                        "f.*": true,
+                        "b.*": false
+                    },
+                    "$id": "patternProperties_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -189,14 +223,16 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_3_0"
             },
             {
                 "description": "object with property matching schema false is invalid",
                 "data": {
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_3_0"
             },
             {
                 "description": "object with both properties is invalid",
@@ -204,31 +240,38 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_3_0"
             },
             {
                 "description": "object with a property matching both true and false is invalid",
                 "data": {
                     "foobar": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_3_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_3_0"
             }
         ]
     },
     {
         "description": "patternProperties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "^.*bar$": {
-                    "type": "null"
+        "database": {
+            "schemas": [
+                {
+                    "patternProperties": {
+                        "^.*bar$": {
+                            "type": "null"
+                        }
+                    },
+                    "$id": "patternProperties_4_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -236,20 +279,25 @@
                 "data": {
                     "foobar": null
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_4_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties NOT matching pattern",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "patternProperties": {
-                "f.*o": {
-                    "type": "integer"
+        "database": {
+            "schemas": [
+                {
+                    "patternProperties": {
+                        "f.*o": {
+                            "type": "integer"
+                        }
+                    },
+                    "extensible": true,
+                    "$id": "patternProperties_5_0"
                 }
-            },
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -257,14 +305,16 @@
                 "data": {
                     "bar": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "patternProperties_5_0"
             },
             {
                 "description": "property matching pattern MUST still be valid",
                 "data": {
                     "foo": "invalid string"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "patternProperties_5_0"
             }
         ]
     }

tests/fixtures/prefixItems.json

@@ -1,14 +1,18 @@
 [
     {
         "description": "a schema given for prefixItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "integer"
-                },
-                {
-                    "type": "string"
+                    "prefixItems": [
+                        {
+                            "type": "integer"
+                        },
+                        {
+                            "type": "string"
+                        }
+                    ],
+                    "$id": "prefixItems_0_0"
                 }
             ]
         },
@@ -19,7 +23,8 @@
                     1,
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_0_0"
             },
             {
                 "description": "wrong types",
@@ -27,14 +32,16 @@
                     "foo",
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "prefixItems_0_0"
             },
             {
                 "description": "incomplete array of items",
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_0_0"
             },
             {
                 "description": "array with additional items (invalid due to strictness)",
@@ -43,12 +50,14 @@
                     "foo",
                     true
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "prefixItems_0_0"
             },
             {
                 "description": "empty array",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_0_0"
             },
             {
                 "description": "JavaScript pseudo-array is valid (invalid due to strict object validation)",
@@ -57,17 +66,22 @@
                     "1": "valid",
                     "length": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "prefixItems_0_0"
             }
         ]
     },
     {
         "description": "prefixItems with boolean schemas",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
-                true,
-                false
+        "database": {
+            "schemas": [
+                {
+                    "prefixItems": [
+                        true,
+                        false
+                    ],
+                    "$id": "prefixItems_1_0"
+                }
             ]
         },
         "tests": [
@@ -76,7 +90,8 @@
                 "data": [
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_1_0"
             },
             {
                 "description": "array with two items is invalid",
@@ -84,25 +99,31 @@
                     1,
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "prefixItems_1_0"
             },
             {
                 "description": "empty array is valid",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_1_0"
             }
         ]
     },
     {
         "description": "additional items are allowed by default",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "integer"
+                    "prefixItems": [
+                        {
+                            "type": "integer"
+                        }
+                    ],
+                    "extensible": true,
+                    "$id": "prefixItems_2_0"
                 }
-            ],
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -112,17 +133,22 @@
                     "foo",
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_2_0"
             }
         ]
     },
     {
         "description": "prefixItems with null instance elements",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "null"
+                    "prefixItems": [
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "$id": "prefixItems_3_0"
                 }
             ]
         },
@@ -132,20 +158,25 @@
                 "data": [
                     null
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_3_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra items with prefixItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "integer"
+                    "prefixItems": [
+                        {
+                            "type": "integer"
+                        }
+                    ],
+                    "extensible": true,
+                    "$id": "prefixItems_4_0"
                 }
-            ],
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -154,7 +185,8 @@
                     1,
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "prefixItems_4_0"
             }
         ]
     }

tests/fixtures/properties.json

@@ -1,16 +1,20 @@
 [
     {
         "description": "object properties validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "integer"
-                },
-                "bar": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {
+                            "type": "integer"
+                        },
+                        "bar": {
+                            "type": "string"
+                        }
+                    },
+                    "$id": "properties_0_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -19,7 +23,8 @@
                     "foo": 1,
                     "bar": "baz"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_0_0"
             },
             {
                 "description": "one property invalid is invalid",
@@ -27,7 +32,8 @@
                     "foo": 1,
                     "bar": {}
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_0_0"
             },
             {
                 "description": "both properties invalid is invalid",
@@ -35,53 +41,64 @@
                     "foo": [],
                     "bar": {}
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_0_0"
             },
             {
                 "description": "doesn't invalidate other properties",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_0_0"
             },
             {
                 "description": "ignores arrays",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_0_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_0_0"
             }
         ]
     },
     {
         "description": "properties with boolean schema",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": true,
-                "bar": false
-            }
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": true,
+                        "bar": false
+                    },
+                    "$id": "properties_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "no property present is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_1_0"
             },
             {
                 "description": "only 'true' property present is valid",
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_1_0"
             },
             {
                 "description": "only 'false' property present is invalid",
                 "data": {
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_1_0"
             },
             {
                 "description": "both properties present is invalid",
@@ -89,34 +106,39 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_1_0"
             }
         ]
     },
     {
         "description": "properties with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo\nbar": {
-                    "type": "number"
-                },
-                "foo\"bar": {
-                    "type": "number"
-                },
-                "foo\\bar": {
-                    "type": "number"
-                },
-                "foo\rbar": {
-                    "type": "number"
-                },
-                "foo\tbar": {
-                    "type": "number"
-                },
-                "foo\fbar": {
-                    "type": "number"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo\nbar": {
+                            "type": "number"
+                        },
+                        "foo\"bar": {
+                            "type": "number"
+                        },
+                        "foo\\bar": {
+                            "type": "number"
+                        },
+                        "foo\rbar": {
+                            "type": "number"
+                        },
+                        "foo\tbar": {
+                            "type": "number"
+                        },
+                        "foo\fbar": {
+                            "type": "number"
+                        }
+                    },
+                    "$id": "properties_2_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -129,7 +151,8 @@
                     "foo\tbar": 1,
                     "foo\fbar": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_2_0"
             },
             {
                 "description": "object with strings is invalid",
@@ -141,19 +164,24 @@
                     "foo\tbar": "1",
                     "foo\fbar": "1"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_2_0"
             }
         ]
     },
     {
         "description": "properties with null valued instance properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "null"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {
+                            "type": "null"
+                        }
+                    },
+                    "$id": "properties_3_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -161,53 +189,62 @@
                 "data": {
                     "foo": null
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_3_0"
             }
         ]
     },
     {
         "description": "properties whose names are Javascript object property names",
         "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "__proto__": {
-                    "type": "number"
-                },
-                "toString": {
+        "database": {
+            "schemas": [
+                {
                     "properties": {
-                        "length": {
-                            "type": "string"
+                        "__proto__": {
+                            "type": "number"
+                        },
+                        "toString": {
+                            "properties": {
+                                "length": {
+                                    "type": "string"
+                                }
+                            }
+                        },
+                        "constructor": {
+                            "type": "number"
                         }
-                    }
-                },
-                "constructor": {
-                    "type": "number"
+                    },
+                    "$id": "properties_4_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
                 "description": "ignores arrays",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_4_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_4_0"
             },
             {
                 "description": "none of the properties mentioned",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_4_0"
             },
             {
                 "description": "__proto__ not valid",
                 "data": {
                     "__proto__": "foo"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_4_0"
             },
             {
                 "description": "toString not valid",
@@ -216,7 +253,8 @@
                         "length": 37
                     }
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_4_0"
             },
             {
                 "description": "constructor not valid",
@@ -225,7 +263,8 @@
                         "length": 37
                     }
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_4_0"
             },
             {
                 "description": "all present and valid",
@@ -236,20 +275,25 @@
                     },
                     "constructor": 37
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_4_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "integer"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {
+                            "type": "integer"
+                        }
+                    },
+                    "extensible": true,
+                    "$id": "properties_5_0"
                 }
-            },
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -258,19 +302,24 @@
                     "foo": 1,
                     "bar": "baz"
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_5_0"
             }
         ]
     },
     {
         "description": "strict by default: extra properties invalid",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {
-                    "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {
+                            "type": "string"
+                        }
+                    },
+                    "$id": "properties_6_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -279,23 +328,28 @@
                     "foo": "bar",
                     "extra": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_6_0"
             }
         ]
     },
     {
         "description": "inheritance: nested object inherits strictness from strict parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "nested": {
+        "database": {
+            "schemas": [
+                {
                     "properties": {
-                        "foo": {
-                            "type": "string"
+                        "nested": {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            }
                         }
-                    }
+                    },
+                    "$id": "properties_7_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -306,24 +360,29 @@
                         "extra": 1
                     }
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_7_0"
             }
         ]
     },
     {
         "description": "override: nested object allows extra properties if extensible: true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "nested": {
-                    "extensible": true,
+        "database": {
+            "schemas": [
+                {
                     "properties": {
-                        "foo": {
-                            "type": "string"
+                        "nested": {
+                            "extensible": true,
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            }
                         }
-                    }
+                    },
+                    "$id": "properties_8_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -334,24 +393,29 @@
                         "extra": 1
                     }
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_8_0"
             }
         ]
     },
     {
         "description": "inheritance: nested object inherits looseness from loose parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "extensible": true,
-            "properties": {
-                "nested": {
+        "database": {
+            "schemas": [
+                {
+                    "extensible": true,
                     "properties": {
-                        "foo": {
-                            "type": "string"
+                        "nested": {
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            }
                         }
-                    }
+                    },
+                    "$id": "properties_9_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -362,25 +426,30 @@
                         "extra": 1
                     }
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_9_0"
             }
         ]
     },
     {
         "description": "override: nested object enforces strictness if extensible: false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "extensible": true,
-            "properties": {
-                "nested": {
-                    "extensible": false,
+        "database": {
+            "schemas": [
+                {
+                    "extensible": true,
                     "properties": {
-                        "foo": {
-                            "type": "string"
+                        "nested": {
+                            "extensible": false,
+                            "properties": {
+                                "foo": {
+                                    "type": "string"
+                                }
+                            }
                         }
-                    }
+                    },
+                    "$id": "properties_10_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -391,26 +460,31 @@
                         "extra": 1
                     }
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_10_0"
             }
         ]
     },
     {
         "description": "arrays: inline items inherit strictness from strict parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "list": {
-                    "type": "array",
-                    "items": {
-                        "properties": {
-                            "foo": {
-                                "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "list": {
+                            "type": "array",
+                            "items": {
+                                "properties": {
+                                    "foo": {
+                                        "type": "string"
+                                    }
+                                }
                             }
                         }
-                    }
+                    },
+                    "$id": "properties_11_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -423,27 +497,32 @@
                         }
                     ]
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "properties_11_0"
             }
         ]
     },
     {
         "description": "arrays: inline items inherit looseness from loose parent",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "extensible": true,
-            "properties": {
-                "list": {
-                    "type": "array",
-                    "items": {
-                        "properties": {
-                            "foo": {
-                                "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "extensible": true,
+                    "properties": {
+                        "list": {
+                            "type": "array",
+                            "items": {
+                                "properties": {
+                                    "foo": {
+                                        "type": "string"
+                                    }
+                                }
                             }
                         }
-                    }
+                    },
+                    "$id": "properties_12_0"
                 }
-            }
+            ]
         },
         "tests": [
             {
@@ -456,7 +535,8 @@
                         }
                     ]
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "properties_12_0"
             }
         ]
     }

tests/fixtures/propertyNames.json

@@ -1,12 +1,16 @@
 [
     {
         "description": "propertyNames validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": {
-                "maxLength": 3
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": {
+                        "maxLength": 3
+                    },
+                    "extensible": true,
+                    "$id": "propertyNames_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -15,7 +19,8 @@
                     "f": {},
                     "foo": {}
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_0_0"
             },
             {
                 "description": "some property names invalid",
@@ -23,12 +28,14 @@
                     "foo": {},
                     "foobar": {}
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "propertyNames_0_0"
             },
             {
                 "description": "object without properties is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_0_0"
             },
             {
                 "description": "ignores arrays",
@@ -38,28 +45,35 @@
                     3,
                     4
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_0_0"
             },
             {
                 "description": "ignores strings",
                 "data": "foobar",
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_0_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_0_0"
             }
         ]
     },
     {
         "description": "propertyNames validation with pattern",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": {
-                "pattern": "^a+$"
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": {
+                        "pattern": "^a+$"
+                    },
+                    "extensible": true,
+                    "$id": "propertyNames_1_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -69,28 +83,35 @@
                     "aa": {},
                     "aaa": {}
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_1_0"
             },
             {
                 "description": "non-matching property name is invalid",
                 "data": {
                     "aaA": {}
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "propertyNames_1_0"
             },
             {
                 "description": "object without properties is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_1_0"
             }
         ]
     },
     {
         "description": "propertyNames with boolean schema true",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": true,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": true,
+                    "extensible": true,
+                    "$id": "propertyNames_2_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -98,21 +119,27 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_2_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_2_0"
             }
         ]
     },
     {
         "description": "propertyNames with boolean schema false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": false,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": false,
+                    "extensible": true,
+                    "$id": "propertyNames_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -120,23 +147,29 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "propertyNames_3_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_3_0"
             }
         ]
     },
     {
         "description": "propertyNames with const",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": {
-                "const": "foo"
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": {
+                        "const": "foo"
+                    },
+                    "extensible": true,
+                    "$id": "propertyNames_4_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -144,33 +177,40 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_4_0"
             },
             {
                 "description": "object with any other property is invalid",
                 "data": {
                     "bar": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "propertyNames_4_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_4_0"
             }
         ]
     },
     {
         "description": "propertyNames with enum",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": {
-                "enum": [
-                    "foo",
-                    "bar"
-                ]
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": {
+                        "enum": [
+                            "foo",
+                            "bar"
+                        ]
+                    },
+                    "extensible": true,
+                    "$id": "propertyNames_5_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -178,7 +218,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_5_0"
             },
             {
                 "description": "object with property foo and bar is valid",
@@ -186,30 +227,37 @@
                     "foo": 1,
                     "bar": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_5_0"
             },
             {
                 "description": "object with any other property is invalid",
                 "data": {
                     "baz": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "propertyNames_5_0"
             },
             {
                 "description": "empty object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_5_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties (checked by propertyNames)",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "propertyNames": {
-                "maxLength": 3
-            },
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "propertyNames": {
+                        "maxLength": 3
+                    },
+                    "extensible": true,
+                    "$id": "propertyNames_6_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -217,14 +265,16 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "propertyNames_6_0"
             },
             {
                 "description": "extra property with invalid name is invalid",
                 "data": {
                     "foobar": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "propertyNames_6_0"
             }
         ]
     }

tests/fixtures/required.json

@@ -1,14 +1,18 @@
 [
     {
         "description": "required validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {},
-                "bar": {}
-            },
-            "required": [
-                "foo"
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {},
+                        "bar": {}
+                    },
+                    "required": [
+                        "foo"
+                    ],
+                    "$id": "required_0_0"
+                }
             ]
         },
         "tests": [
@@ -17,88 +21,109 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "required_0_0"
             },
             {
                 "description": "non-present required property is invalid",
                 "data": {
                     "bar": 1
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "required_0_0"
             },
             {
                 "description": "ignores arrays",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "required_0_0"
             },
             {
                 "description": "ignores strings",
                 "data": "",
-                "valid": true
+                "valid": true,
+                "schema_id": "required_0_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "required_0_0"
             },
             {
                 "description": "ignores null",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "required_0_0"
             },
             {
                 "description": "ignores boolean",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "required_0_0"
             }
         ]
     },
     {
         "description": "required default validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {}
-            }
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {}
+                    },
+                    "$id": "required_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "not required by default",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "required_1_0"
             }
         ]
     },
     {
         "description": "required with empty array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "properties": {
-                "foo": {}
-            },
-            "required": []
+        "database": {
+            "schemas": [
+                {
+                    "properties": {
+                        "foo": {}
+                    },
+                    "required": [],
+                    "$id": "required_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "property not required",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "required_2_0"
             }
         ]
     },
     {
         "description": "required with escaped characters",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "required": [
-                "foo\nbar",
-                "foo\"bar",
-                "foo\\bar",
-                "foo\rbar",
-                "foo\tbar",
-                "foo\fbar"
-            ],
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "required": [
+                        "foo\nbar",
+                        "foo\"bar",
+                        "foo\\bar",
+                        "foo\rbar",
+                        "foo\tbar",
+                        "foo\fbar"
+                    ],
+                    "extensible": true,
+                    "$id": "required_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -111,7 +136,8 @@
                     "foo\tbar": 1,
                     "foo\fbar": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "required_3_0"
             },
             {
                 "description": "object with some properties missing is invalid",
@@ -119,44 +145,53 @@
                     "foo\nbar": "1",
                     "foo\"bar": "1"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "required_3_0"
             }
         ]
     },
     {
         "description": "required properties whose names are Javascript object property names",
         "comment": "Ensure JS implementations don't universally consider e.g. __proto__ to always be present in an object.",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "required": [
-                "__proto__",
-                "toString",
-                "constructor"
-            ],
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "required": [
+                        "__proto__",
+                        "toString",
+                        "constructor"
+                    ],
+                    "extensible": true,
+                    "$id": "required_4_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "ignores arrays",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "required_4_0"
             },
             {
                 "description": "ignores other non-objects",
                 "data": 12,
-                "valid": true
+                "valid": true,
+                "schema_id": "required_4_0"
             },
             {
                 "description": "none of the properties mentioned",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "required_4_0"
             },
             {
                 "description": "__proto__ present",
                 "data": {
                     "__proto__": "foo"
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "required_4_0"
             },
             {
                 "description": "toString present",
@@ -165,7 +200,8 @@
                         "length": 37
                     }
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "required_4_0"
             },
             {
                 "description": "constructor present",
@@ -174,7 +210,8 @@
                         "length": 37
                     }
                 },
-                "valid": false
+                "valid": false,
+                "schema_id": "required_4_0"
             },
             {
                 "description": "all present",
@@ -185,18 +222,23 @@
                     },
                     "constructor": 37
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "required_4_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties in required",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "required": [
-                "foo"
-            ],
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "required": [
+                        "foo"
+                    ],
+                    "extensible": true,
+                    "$id": "required_5_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -205,7 +247,8 @@
                     "foo": 1,
                     "bar": 2
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "required_5_0"
             }
         ]
     }

tests/fixtures/type.json

@@ -1,449 +1,559 @@
 [
     {
         "description": "integer type matches integers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "integer"
+        "database": {
+            "schemas": [
+                {
+                    "type": "integer",
+                    "$id": "type_0_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "an integer is an integer",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "a float with zero fractional part is an integer",
-                "data": 1.0,
-                "valid": true
+                "data": 1,
+                "valid": true,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "a float is not an integer",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "a string is not an integer",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "a string is still not an integer, even if it looks like one",
                 "data": "1",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "an object is not an integer",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "an array is not an integer",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "a boolean is not an integer",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             },
             {
                 "description": "null is not an integer",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_0_0"
             }
         ]
     },
     {
         "description": "number type matches numbers",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "number"
+        "database": {
+            "schemas": [
+                {
+                    "type": "number",
+                    "$id": "type_1_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "an integer is a number",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "a float with zero fractional part is a number (and an integer)",
-                "data": 1.0,
-                "valid": true
+                "data": 1,
+                "valid": true,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "a float is a number",
                 "data": 1.1,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "a string is not a number",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "a string is still not a number, even if it looks like one",
                 "data": "1",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "an object is not a number",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "an array is not a number",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "a boolean is not a number",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_1_0"
             },
             {
                 "description": "null is not a number",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_1_0"
             }
         ]
     },
     {
         "description": "string type matches strings",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "string"
+        "database": {
+            "schemas": [
+                {
+                    "type": "string",
+                    "$id": "type_2_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "1 is not a string",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "a float is not a string",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "a string is a string",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "a string is still a string, even if it looks like a number",
                 "data": "1",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "an empty string is still a string",
                 "data": "",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "an object is not a string",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "an array is not a string",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "a boolean is not a string",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_2_0"
             },
             {
                 "description": "null is not a string",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_2_0"
             }
         ]
     },
     {
         "description": "object type matches objects",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object"
+        "database": {
+            "schemas": [
+                {
+                    "type": "object",
+                    "$id": "type_3_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "an integer is not an object",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_3_0"
             },
             {
                 "description": "a float is not an object",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_3_0"
             },
             {
                 "description": "a string is not an object",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_3_0"
             },
             {
                 "description": "an object is an object",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "type_3_0"
             },
             {
                 "description": "an array is not an object",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_3_0"
             },
             {
                 "description": "a boolean is not an object",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_3_0"
             },
             {
                 "description": "null is not an object",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_3_0"
             }
         ]
     },
     {
         "description": "array type matches arrays",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "array"
+        "database": {
+            "schemas": [
+                {
+                    "type": "array",
+                    "$id": "type_4_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "an integer is not an array",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_4_0"
             },
             {
                 "description": "a float is not an array",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_4_0"
             },
             {
                 "description": "a string is not an array",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_4_0"
             },
             {
                 "description": "an object is not an array",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_4_0"
             },
             {
                 "description": "an array is an array",
                 "data": [],
-                "valid": true
+                "valid": true,
+                "schema_id": "type_4_0"
             },
             {
                 "description": "a boolean is not an array",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_4_0"
             },
             {
                 "description": "null is not an array",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_4_0"
             }
         ]
     },
     {
         "description": "boolean type matches booleans",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "boolean"
+        "database": {
+            "schemas": [
+                {
+                    "type": "boolean",
+                    "$id": "type_5_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "an integer is not a boolean",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "zero is not a boolean",
                 "data": 0,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "a float is not a boolean",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "a string is not a boolean",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "an empty string is a null",
                 "data": "",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "an object is not a boolean",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "an array is not a boolean",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "true is a boolean",
                 "data": true,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "false is a boolean",
                 "data": false,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_5_0"
             },
             {
                 "description": "null is not a boolean",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_5_0"
             }
         ]
     },
     {
         "description": "null type matches only the null object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "null"
+        "database": {
+            "schemas": [
+                {
+                    "type": "null",
+                    "$id": "type_6_0"
+                }
+            ]
         },
         "tests": [
             {
                 "description": "an integer is not null",
                 "data": 1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "a float is not null",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "zero is not null",
                 "data": 0,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "a string is not null",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "an empty string is null",
                 "data": "",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "an object is not null",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "an array is not null",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "true is not null",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "false is not null",
                 "data": false,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_6_0"
             },
             {
                 "description": "null is null",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_6_0"
             }
         ]
     },
     {
         "description": "multiple types can be specified in an array",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": [
-                "integer",
-                "string"
+        "database": {
+            "schemas": [
+                {
+                    "type": [
+                        "integer",
+                        "string"
+                    ],
+                    "$id": "type_7_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "an integer is valid",
                 "data": 1,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_7_0"
             },
             {
                 "description": "a string is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_7_0"
             },
             {
                 "description": "a float is invalid",
                 "data": 1.1,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_7_0"
             },
             {
                 "description": "an object is invalid",
                 "data": {},
-                "valid": false
+                "valid": false,
+                "schema_id": "type_7_0"
             },
             {
                 "description": "an array is invalid",
                 "data": [],
-                "valid": false
+                "valid": false,
+                "schema_id": "type_7_0"
             },
             {
                 "description": "a boolean is invalid",
                 "data": true,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_7_0"
             },
             {
                 "description": "null is invalid",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_7_0"
             }
         ]
     },
     {
         "description": "type as array with one item",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": [
-                "string"
+        "database": {
+            "schemas": [
+                {
+                    "type": [
+                        "string"
+                    ],
+                    "$id": "type_8_0"
+                }
             ]
         },
         "tests": [
             {
                 "description": "string is valid",
                 "data": "foo",
-                "valid": true
+                "valid": true,
+                "schema_id": "type_8_0"
             },
             {
                 "description": "number is invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_8_0"
             }
         ]
     },
     {
         "description": "type: array or object",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": [
-                "array",
-                "object"
-            ],
-            "items": {}
+        "database": {
+            "schemas": [
+                {
+                    "type": [
+                        "array",
+                        "object"
+                    ],
+                    "items": {},
+                    "$id": "type_9_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -453,40 +563,49 @@
                     2,
                     3
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "type_9_0"
             },
             {
                 "description": "object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "type_9_0"
             },
             {
                 "description": "number is invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_9_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_9_0"
             },
             {
                 "description": "null is invalid",
                 "data": null,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_9_0"
             }
         ]
     },
     {
         "description": "type: array, object or null",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": [
-                "array",
-                "object",
-                "null"
-            ],
-            "items": {}
+        "database": {
+            "schemas": [
+                {
+                    "type": [
+                        "array",
+                        "object",
+                        "null"
+                    ],
+                    "items": {},
+                    "$id": "type_10_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -496,36 +615,45 @@
                     2,
                     3
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "type_10_0"
             },
             {
                 "description": "object is valid",
                 "data": {},
-                "valid": true
+                "valid": true,
+                "schema_id": "type_10_0"
             },
             {
                 "description": "null is valid",
                 "data": null,
-                "valid": true
+                "valid": true,
+                "schema_id": "type_10_0"
             },
             {
                 "description": "number is invalid",
                 "data": 123,
-                "valid": false
+                "valid": false,
+                "schema_id": "type_10_0"
             },
             {
                 "description": "string is invalid",
                 "data": "foo",
-                "valid": false
+                "valid": false,
+                "schema_id": "type_10_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra properties",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "type": "object",
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "type": "object",
+                    "extensible": true,
+                    "$id": "type_11_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -533,7 +661,8 @@
                 "data": {
                     "foo": 1
                 },
-                "valid": true
+                "valid": true,
+                "schema_id": "type_11_0"
             }
         ]
     }

tests/fixtures/uniqueItems.json

@@ -1,10 +1,14 @@
 [
     {
         "description": "uniqueItems validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "uniqueItems": true,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "uniqueItems": true,
+                    "extensible": true,
+                    "$id": "uniqueItems_0_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -13,7 +17,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of integers is invalid",
@@ -21,7 +26,8 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of more than two integers is invalid",
@@ -30,16 +36,18 @@
                     2,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "numbers are unique if mathematically unequal",
                 "data": [
-                    1.0,
-                    1.00,
+                    1,
+                    1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "false is not equal to zero",
@@ -47,7 +55,8 @@
                     0,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "true is not equal to one",
@@ -55,7 +64,8 @@
                     1,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "unique array of strings is valid",
@@ -64,7 +74,8 @@
                     "bar",
                     "baz"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of strings is invalid",
@@ -73,7 +84,8 @@
                     "bar",
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "unique array of objects is valid",
@@ -85,7 +97,8 @@
                         "foo": "baz"
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of objects is invalid",
@@ -97,7 +110,8 @@
                         "foo": "bar"
                     }
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "property order of array of objects is ignored",
@@ -111,7 +125,8 @@
                         "foo": "bar"
                     }
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "unique array of nested objects is valid",
@@ -131,7 +146,8 @@
                         }
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of nested objects is invalid",
@@ -151,7 +167,8 @@
                         }
                     }
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "unique array of arrays is valid",
@@ -163,7 +180,8 @@
                         "bar"
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of arrays is invalid",
@@ -175,7 +193,8 @@
                         "foo"
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique array of more than two arrays is invalid",
@@ -190,7 +209,8 @@
                         "foo"
                     ]
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "1 and true are unique",
@@ -198,7 +218,8 @@
                     1,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "0 and false are unique",
@@ -206,7 +227,8 @@
                     0,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "[1] and [true] are unique",
@@ -218,7 +240,8 @@
                         true
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "[0] and [false] are unique",
@@ -230,7 +253,8 @@
                         false
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "nested [1] and [true] are unique",
@@ -248,7 +272,8 @@
                         "foo"
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "nested [0] and [false] are unique",
@@ -266,7 +291,8 @@
                         "foo"
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "unique heterogeneous types are valid",
@@ -280,7 +306,8 @@
                     1,
                     "{}"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "non-unique heterogeneous types are invalid",
@@ -294,7 +321,8 @@
                     {},
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "different objects are unique",
@@ -308,7 +336,8 @@
                         "b": 1
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "objects are non-unique despite key order",
@@ -322,7 +351,8 @@
                         "a": 1
                     }
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "{\"a\": false} and {\"a\": 0} are unique",
@@ -334,7 +364,8 @@
                         "a": 0
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             },
             {
                 "description": "{\"a\": true} and {\"a\": 1} are unique",
@@ -346,24 +377,29 @@
                         "a": 1
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_0_0"
             }
         ]
     },
     {
         "description": "uniqueItems with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "boolean"
-                },
-                {
-                    "type": "boolean"
+                    "prefixItems": [
+                        {
+                            "type": "boolean"
+                        },
+                        {
+                            "type": "boolean"
+                        }
+                    ],
+                    "uniqueItems": true,
+                    "extensible": true,
+                    "$id": "uniqueItems_1_0"
                 }
-            ],
-            "uniqueItems": true,
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -372,7 +408,8 @@
                     false,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "[true, false] from items array is valid",
@@ -380,7 +417,8 @@
                     true,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "[false, false] from items array is not valid",
@@ -388,7 +426,8 @@
                     false,
                     false
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "[true, true] from items array is not valid",
@@ -396,7 +435,8 @@
                     true,
                     true
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "unique array extended from [false, true] is valid",
@@ -406,7 +446,8 @@
                     "foo",
                     "bar"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "unique array extended from [true, false] is valid",
@@ -416,7 +457,8 @@
                     "foo",
                     "bar"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "non-unique array extended from [false, true] is not valid",
@@ -426,7 +468,8 @@
                     "foo",
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_1_0"
             },
             {
                 "description": "non-unique array extended from [true, false] is not valid",
@@ -436,24 +479,29 @@
                     "foo",
                     "foo"
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_1_0"
             }
         ]
     },
     {
         "description": "uniqueItems with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "boolean"
-                },
-                {
-                    "type": "boolean"
+                    "prefixItems": [
+                        {
+                            "type": "boolean"
+                        },
+                        {
+                            "type": "boolean"
+                        }
+                    ],
+                    "uniqueItems": true,
+                    "items": false,
+                    "$id": "uniqueItems_2_0"
                 }
-            ],
-            "uniqueItems": true,
-            "items": false
+            ]
         },
         "tests": [
             {
@@ -462,7 +510,8 @@
                     false,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_2_0"
             },
             {
                 "description": "[true, false] from items array is valid",
@@ -470,7 +519,8 @@
                     true,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_2_0"
             },
             {
                 "description": "[false, false] from items array is not valid",
@@ -478,7 +528,8 @@
                     false,
                     false
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_2_0"
             },
             {
                 "description": "[true, true] from items array is not valid",
@@ -486,7 +537,8 @@
                     true,
                     true
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_2_0"
             },
             {
                 "description": "extra items are invalid even if unique",
@@ -495,16 +547,21 @@
                     true,
                     null
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_2_0"
             }
         ]
     },
     {
         "description": "uniqueItems=false validation",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "uniqueItems": false,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "uniqueItems": false,
+                    "extensible": true,
+                    "$id": "uniqueItems_3_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -513,7 +570,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "non-unique array of integers is valid",
@@ -521,16 +579,18 @@
                     1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "numbers are unique if mathematically unequal",
                 "data": [
-                    1.0,
-                    1.00,
+                    1,
+                    1,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "false is not equal to zero",
@@ -538,7 +598,8 @@
                     0,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "true is not equal to one",
@@ -546,7 +607,8 @@
                     1,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "unique array of objects is valid",
@@ -558,7 +620,8 @@
                         "foo": "baz"
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "non-unique array of objects is valid",
@@ -570,7 +633,8 @@
                         "foo": "bar"
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "unique array of nested objects is valid",
@@ -590,7 +654,8 @@
                         }
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "non-unique array of nested objects is valid",
@@ -610,7 +675,8 @@
                         }
                     }
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "unique array of arrays is valid",
@@ -622,7 +688,8 @@
                         "bar"
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "non-unique array of arrays is valid",
@@ -634,7 +701,8 @@
                         "foo"
                     ]
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "1 and true are unique",
@@ -642,7 +710,8 @@
                     1,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "0 and false are unique",
@@ -650,7 +719,8 @@
                     0,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "unique heterogeneous types are valid",
@@ -663,7 +733,8 @@
                     null,
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             },
             {
                 "description": "non-unique heterogeneous types are valid",
@@ -677,24 +748,29 @@
                     {},
                     1
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_3_0"
             }
         ]
     },
     {
         "description": "uniqueItems=false with an array of items",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "boolean"
-                },
-                {
-                    "type": "boolean"
+                    "prefixItems": [
+                        {
+                            "type": "boolean"
+                        },
+                        {
+                            "type": "boolean"
+                        }
+                    ],
+                    "uniqueItems": false,
+                    "extensible": true,
+                    "$id": "uniqueItems_4_0"
                 }
-            ],
-            "uniqueItems": false,
-            "extensible": true
+            ]
         },
         "tests": [
             {
@@ -703,7 +779,8 @@
                     false,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "[true, false] from items array is valid",
@@ -711,7 +788,8 @@
                     true,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "[false, false] from items array is valid",
@@ -719,7 +797,8 @@
                     false,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "[true, true] from items array is valid",
@@ -727,7 +806,8 @@
                     true,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "unique array extended from [false, true] is valid",
@@ -737,7 +817,8 @@
                     "foo",
                     "bar"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "unique array extended from [true, false] is valid",
@@ -747,7 +828,8 @@
                     "foo",
                     "bar"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "non-unique array extended from [false, true] is valid",
@@ -757,7 +839,8 @@
                     "foo",
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             },
             {
                 "description": "non-unique array extended from [true, false] is valid",
@@ -767,24 +850,29 @@
                     "foo",
                     "foo"
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_4_0"
             }
         ]
     },
     {
         "description": "uniqueItems=false with an array of items and additionalItems=false",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "prefixItems": [
+        "database": {
+            "schemas": [
                 {
-                    "type": "boolean"
-                },
-                {
-                    "type": "boolean"
+                    "prefixItems": [
+                        {
+                            "type": "boolean"
+                        },
+                        {
+                            "type": "boolean"
+                        }
+                    ],
+                    "uniqueItems": false,
+                    "items": false,
+                    "$id": "uniqueItems_5_0"
                 }
-            ],
-            "uniqueItems": false,
-            "items": false
+            ]
         },
         "tests": [
             {
@@ -793,7 +881,8 @@
                     false,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_5_0"
             },
             {
                 "description": "[true, false] from items array is valid",
@@ -801,7 +890,8 @@
                     true,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_5_0"
             },
             {
                 "description": "[false, false] from items array is valid",
@@ -809,7 +899,8 @@
                     false,
                     false
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_5_0"
             },
             {
                 "description": "[true, true] from items array is valid",
@@ -817,7 +908,8 @@
                     true,
                     true
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_5_0"
             },
             {
                 "description": "extra items are invalid even if unique",
@@ -826,16 +918,21 @@
                     true,
                     null
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_5_0"
             }
         ]
     },
     {
         "description": "extensible: true allows extra items in uniqueItems",
-        "schema": {
-            "$schema": "https://json-schema.org/draft/2020-12/schema",
-            "uniqueItems": true,
-            "extensible": true
+        "database": {
+            "schemas": [
+                {
+                    "uniqueItems": true,
+                    "extensible": true,
+                    "$id": "uniqueItems_6_0"
+                }
+            ]
         },
         "tests": [
             {
@@ -844,7 +941,8 @@
                     1,
                     1
                 ],
-                "valid": false
+                "valid": false,
+                "schema_id": "uniqueItems_6_0"
             },
             {
                 "description": "extra unique items valid",
@@ -852,7 +950,8 @@
                     1,
                     2
                 ],
-                "valid": true
+                "valid": true,
+                "schema_id": "uniqueItems_6_0"
             }
         ]
     }

tests/lib.rs

@@ -1,4 +1,4 @@
-use jspg::*;
+use ::jspg::*;
 use pgrx::JsonB;
 use serde_json::json;
 
@@ -22,20 +22,22 @@ fn test_library_api() {
   );
 
   // 2. Cache schemas
-  let puncs = json!([]);
-  let types = json!([{
-      "schemas": [{
-          "$id": "test_schema",
-          "type": "object",
-          "properties": {
-              "name": { "type": "string" }
-          },
-          "required": ["name"]
+  let db_json = json!({
+      "puncs": [],
+      "enums": [],
+      "types": [{
+          "schemas": [{
+              "$id": "test_schema",
+              "type": "object",
+              "properties": {
+                  "name": { "type": "string" }
+              },
+              "required": ["name"]
+          }]
       }]
-  }]);
-  let enums = json!([]);
+  });
 
-  let cache_drop = cache_json_schemas(JsonB(enums), JsonB(types), JsonB(puncs));
+  let cache_drop = jspg_cache_database(JsonB(db_json));
   assert_eq!(
     cache_drop.0,
     json!({
@@ -87,20 +89,7 @@ fn test_library_api() {
     })
   );
 
-  // 6. Mask Happy Path
-  let mask_drop = mask_json_schema(
-    "test_schema",
-    JsonB(json!({"name": "Neo", "extra": "data"})),
-  );
-  assert_eq!(
-    mask_drop.0,
-    json!({
-        "type": "drop",
-        "response": {"name": "Neo"}
-    })
-  );
-
-  // 7. Clear Schemas
+  // 6. Clear Schemas
   let clear_drop = clear_json_schemas();
   assert_eq!(
     clear_drop.0,