version: 1.0.110

.agent/workflows/jspg.md

@@ -4,9 +4,11 @@ description: jspg work preparation
 
 This workflow will get you up-to-speed on the JSPG custom json-schema-based cargo pgrx postgres validation extension. Everything you read will be in the jspg directory/project.
 
-Read over this entire workflow and commit to every section of work in a task list, so that you don't stop half way through before reviewing all of the directories and files mentioned. Do not ask for confirmation after generating this task list and proceed through all sections in your list.
+Read over this entire workflow and commit to every section of work in a fresh task list (DO THIS FIRST), so that you don't stop half way through before reviewing all of the directories and files mentioned. Do not ask for confirmation after generating this task list and proceed through all sections in your list.
 
-Please analyze the files and directories and do not use cat, find, or the terminal to discover or read in any of these files. Analyze every file mentioned. If a directory is mentioned or a /*, please analyze the directory, every single file at its root, and recursively analyze every subdirectory and every single file in every subdirectory to capture not just critical files, but the entirety of what is requested. I state again, DO NOT just review a cherry picking of files in any folder or wildcard specified. Review 100% of all files discovered recursively!
+Please analyze the files and directories and do not use cat, find, or the terminal AT ALL to discover or read in any of these files! USE YOUR TOOLS ONLY. Analyze every file mentioned. If a directory is mentioned or a /*, please analyze the directory, every single file at its root, and recursively analyze every subdirectory and every single file in every subdirectory to capture not just critical files, but the entirety of what is requested. I state again, DO NOT just review a cherry picking of files in any folder or wildcard specified. Review 100% of all files discovered recursively!
+
+Do not make any code changes. Just focus on your task list and reading files!
 
 Section 1: Various Documentation
 
@@ -48,7 +50,6 @@ Now, review some punc type and enum source in the api project with api/ these fi
 - api/punc/sql/tables.sql
 - api/punc/sql/domains.sql
 - api/punc/sql/indexes.sql
-- api/punc/sql/functions/entity.sql
 - api/punc/sql/functions/puncs.sql
 - api/punc/sql/puncs/entity.sql
 - api/punc/sql/puncs/persons.sql

GEMINI.md

@@ -10,7 +10,7 @@ JSPG operates by deeply integrating the JSON Schema Draft 2020-12 specification
 *   **Queryer**: Compile JSON Schemas into static, cached SQL SPI `SELECT` plans for fetching full entities or isolated ad-hoc object boundaries.
 
 ### 🎯 Goals
-1.  **Draft 2020-12 Compliance**: Attempt to adhere to the official JSON Schema Draft 2020-12 specification.
+1.  **Draft 2020-12 Based**: Attempt to adhere to the official JSON Schema Draft 2020-12 specification, while heavily augmenting it for strict structural typing.
 2.  **Ultra-Fast Execution**: Compile schemas into optimized in-memory validation trees and cached SQL SPIs to bypass Postgres Query Builder overheads.
 3.  **Connection-Bound Caching**: Leverage the PostgreSQL session lifecycle using an **Atomic Swap** pattern. Schemas are 100% frozen, completely eliminating locks during read access.
 4.  **Structural Inheritance**: Support object-oriented schema design via Implicit Keyword Shadowing and virtual `$family` references natively mapped to Postgres table constraints.
@@ -20,9 +20,147 @@ JSPG operates by deeply integrating the JSON Schema Draft 2020-12 specification
 To support high-throughput operations while allowing for runtime updates (e.g., during hot-reloading), JSPG uses an **Atomic Swap** pattern:
 1. **Parser Phase**: Schema JSONs are parsed into ordered `Schema` structs.
 2. **Compiler Phase**: The database iterates all parsed schemas and pre-computes native optimization maps (Descendants Map, Depths Map, Variations Map).
-3. **Immutable AST Caching**: The `Validator` struct immutably owns the `Database` registry. Schemas themselves are frozen structurally, but utilize `OnceLock` interior mutability during the Compilation Phase to permanently cache resolved `$ref` inheritances, properties, and `compiled_edges` directly onto their AST nodes. This guarantees strict `O(1)` relationship and property validation execution at runtime without locking or recursive DB polling.
+3. **Immutable AST Caching**: The `Validator` struct immutably owns the `Database` registry. Schemas themselves are frozen structurally, but utilize `OnceLock` interior mutability during the Compilation Phase to permanently cache resolved `type` inheritances, properties, and `compiled_edges` directly onto their AST nodes. This guarantees strict `O(1)` relationship and property validation execution at runtime without locking or recursive DB polling.
 4. **Lock-Free Reads**: Incoming operations acquire a read lock just long enough to clone the `Arc` inside an `RwLock<Option<Arc<Validator>>>`, ensuring zero blocking during schema updates.
 
+### Global API Reference
+These functions operate on the global `GLOBAL_JSPG` engine instance and provide administrative boundaries:
+
+*   `jspg_setup(database jsonb) -> jsonb`: Initializes the engine. Deserializes the full database schema registry (types, enums, puncs, relations) from Postgres and compiles them into memory atomically.
+*   `jspg_teardown() -> jsonb`: Clears the current session's engine instance from `GLOBAL_JSPG`, resetting the cache.
+*   `jspg_schemas() -> jsonb`: Exports the fully compiled AST snapshot (including all inherited dependencies) out of `GLOBAL_JSPG` into standard JSON Schema representations.
+
+---
+
+## 2. Schema Modeling (Punc Developer Guide)
+
+JSPG augments standard JSON Schema 2020-12 to provide an opinionated, strict, and highly ergonomic Object-Oriented paradigm. Developers defining Punc Data Models should follow these conventions.
+
+### Types of Types
+*   **Table-Backed (Entity Types)**: Primarily defined in root type schemas. These represent physical Postgres tables.
+    *   They absolutely **require** an `$id`.
+    *   The schema conceptually requires a `type` discriminator at runtime so the engine knows what physical variation to interact with.
+    *   Can inherit other entity types to build lineage (e.g. `person` -> `organization` -> `entity`).
+*   **Field-Backed (JSONB Bubbles)**: These are shapes that live entirely inside a Postgres JSONB column without being tied to a top-level table constraint.
+    *   **Global `$id` Promotion**: Utilizing explicit `$id` declarations promotes the schema to the Global Registry. This effectively creates strictly-typed code-generator universes (e.g., generating an `InvoiceNotificationMetadata` Dart class) operating cleanly inside unstructured Postgres JSONB columns.
+    *   They can re-use the standard `type` discriminator locally for `oneOf` polymorphism without conflicting with global Postgres Table constraints.
+
+### Discriminators & The Dot Convention (A.B)
+In Punc, polymorphic targets like explicit tagged unions or STI (Single Table Inheritance) rely on discriminators. Because Punc favors universal consistency, a schema's data contract must be explicit and mathematically identical regardless of the routing context an endpoint consumes it through.
+
+**The 2-Tier Paradigm**: The system inherently prevents "God Tables" by restricting routing to exactly two dimensions, guaranteeing absolute $O(1)$ lookups without ambiguity:
+1. **Vertical Routing (`type`)**: Identifies the specific Postgres Table lineage (e.g. `person` vs `organization`).
+2. **Horizontal Routing (`kind.type`)**: Natively evaluates Single Table Inheritance. The runtime dynamically concatenates `$kind.$type` to yield the namespace-protected schema `$id` (e.g. `light.person`), maintaining collision-free schema registration.
+
+Therefore, any schema that participates in polymorphic discrimination MUST explicitly define its discriminator properties natively inside its `properties` block. However, to stay DRY and maintain flexible APIs, you **DO NOT** need to hardcode `const` values, nor should you add them to your `required` array. The Punc engine treats `type` and `kind` as **magic properties**.
+
+**Magic Validation Constraints**: 
+* **Dynamically Required**: The system inherently drives the need for their requirement. The Validator dynamically expects the discriminators and structurally bubbles `MISSING_TYPE` ultimata ONLY when a polymorphic router (`$family` / `oneOf`) dynamically requires them to resolve a path. You never manually put them in the JSON schema `required` block.
+* **Implicit Resolution**: When wrapped in `$family` or `oneOf`, the polymorphic router can mathematically parse the schema `$id` (e.g. `light.person`) and natively validate that `type` equals `"person"` and `kind` equals `"light"`, bubbling `CONST_VIOLATED` if they mismatch, all without you ever hardcoding `const` limitations.
+* **Generator Explicitness**: Because Postgres is the Single Source of Truth, forcing the explicit definition in `properties` initially guarantees the downstream Dart/Go code generators observe the fields and can cleanly serialize them dynamically back to the server.
+
+For example, a schema representing `$id: "light.person"` must natively define its own structural boundaries:
+```json
+{
+  "$id": "light.person",
+  "type": "person", 
+  "properties": {
+    "type": { "type": "string" },
+    "kind": { "type": "string" }
+  },
+  "required": ["type", "kind"]
+}
+```
+
+*   **The Object Contract (Presence)**: The Object enforces its own structural integrity mechanically. Standard JSON Validation natively ensures `type` and `kind` are present, bubbling `REQUIRED_FIELD_MISSING` organically if omitted.
+*   **The Dynamic Values (`db.types`)**: Because the `type` and `kind` properties technically exist, the Punc engine dynamically intercepts them during `validate_object`. It mathematically parses the schema `$id` (e.g. `light.person`) and natively validates that `type` equals `"person"` (or a valid descendant in `db.types`) and `kind` equals `"light"`, bubbling `CONST_VIOLATED` if they mismatch.
+*   **The Routing Contract**: When wrapped in `$family` or `oneOf`, the polymorphic router can execute Lightning Fast $O(1)$ fast-paths by reading the payload's `type`/`kind` identifiers, and gracefully fallback to standard structural failure if omitted.
+
+### Composition & Inheritance (The `type` keyword)
+Punc completely abandons the standard JSON Schema `$ref` keyword. Instead, it overloads the exact same `type` keyword used for primitives. A `"type"` in Punc is mathematically evaluated as either a Native Primitive (`"string"`, `"null"`) or a Custom Object Pointer (`"budget"`, `"user"`).
+*   **Single Inheritance**: Setting `"type": "user"` acts exactly like an `extends` keyword. The schema borrows all fields and constraints from the `user` identity. During `jspg_setup`, the compiler recursively crawls the dependencies to map the physical Postgres table, permanently mapping its type restriction to `"object"` under the hood so JSON standards remain unbroken.
+*   **Implicit Keyword Shadowing**: Unlike standard JSON Schema inheritance, local property definitions natively override and shadow inherited properties.
+*   **Primitive Array Shorthand (Optionality)**: The `type` array syntax is heavily optimized for nullable fields. Defining `"type": ["budget", "null"]` natively builds a nullable strict, generating `Budget? budget;` in Dart. You can freely mix primitives like `["string", "number", "null"]`.
+    *   **Strict Array Constraint**: To explicitly prevent mathematically ambiguous Multiple Inheritance, a `type` array is strictly constrained to at most **ONE** Custom Object Pointer. Defining `"type": ["person", "organization"]` will intentionally trigger a fatal database compilation error natively instructing developers to build a proper tagged union (`oneOf`) instead.
+
+### Polymorphism (`$family` and `oneOf`)
+Polymorphism is how an object boundary can dynamically take on entirely different shapes based on the payload provided at runtime. Punc utilizes the static database metadata generated from Postgres (`db.types`) to enforce these boundaries deterministically, rather than relying on ambiguous tree-traversals.
+
+*   **`$family` (Target-Based Polymorphism)**: An explicit Punc compiler macro instructing the engine to resolve dynamic options against the registered database `types` variations or its inner schema registry. It uses the exact physical constraints of the database to build SQL and validation routes.
+    *   **Scenario A: Global Tables (Vertical Routing)**
+        *   *Setup*: `{ "$family": "organization" }`
+        *   *Execution*: The engine queries `db.types.get("organization").variations` and finds `["bot", "organization", "person"]`. Because organizations are structurally table-backed, the `$family` automatically uses `type` as the discriminator.
+        *   *Options*: `bot` -> `bot`, `person` -> `person`, `organization` -> `organization`.
+    *   **Scenario B: Prefixed Tables (Vertical Projection)**
+        *   *Setup*: `{ "$family": "light.organization" }`
+        *   *Execution*: The engine sees the prefix `light.` and base `organization`. It queries `db.types.get("organization").variations` and dynamically prepends the prefix to discover the relevant UI schemas.
+        *   *Options*: `person` -> `light.person`, `organization` -> `light.organization`. (If a projection like `light.bot` does not exist in `db.schemas`, it is safely ignored).
+    *   **Scenario C: Single Table Inheritance (Horizontal Routing)**
+        *   *Setup*: `{ "$family": "widget" }` (Where `widget` is a table type but has no external variations).
+        *   *Execution*: The engine queries `db.types.get("widget").variations` and finds only `["widget"]`. Since it lacks table inheritance, it is treated as STI. The engine scans the specific, confined `schemas` array directly under `db.types.get("widget")` for any `$id` terminating in the base `.widget` (e.g., `stock.widget`). The `$family` automatically uses `kind` as the discriminator.
+        *   *Options*: `stock` -> `stock.widget`, `tasks` -> `tasks.widget`.
+
+*   **`oneOf` (Strict Tagged Unions)**: A hardcoded list of candidate schemas. Unlike `$family` which relies on global DB metadata, `oneOf` forces pure mathematical structural evaluation of the provided candidates. It strictly bans typical JSON Schema "Union of Sets" fallback searches. Every candidate MUST possess a mathematically unique discriminator payload to allow $O(1)$ routing.
+    *   **Disjoint Types**: `oneOf: [{ "type": "person" }, { "type": "widget" }]`. The engine succeeds because the native `type` acts as a unique discriminator (`"person"` vs `"widget"`).
+    *   **STI Types**: `oneOf: [{ "type": "heavy.person" }, { "type": "light.person" }]`. The engine succeeds. Even though both share `"type": "person"`, their explicit discriminator is `kind` (`"heavy"` vs `"light"`), ensuring unique $O(1)$ fast-paths.
+    *   **Conflicting Types**: `oneOf: [{ "type": "person" }, { "type": "light.person" }]`. The engine **fails compilation natively**. Both schemas evaluate to `"type": "person"` and neither provides a disjoint `kind` constraint, making them mathematically ambiguous and impossible to route in $O(1)$ time.
+
+### Conditionals (`cases`)
+Standard JSON Schema forces developers to write deeply nested `allOf` -> `if` -> `properties` blocks just to execute conditional branching. **JSPG completely abandons `allOf` and this practice.** For declarative business logic and structural mutations conditionally based upon property bounds, use the top-level `cases` array. 
+
+It evaluates as an **Independent Declarative Rules Engine**. Every `Case` block within the array is evaluated independently in parallel. For a given rule, if the `when` condition evaluates to true, its `then` schema is executed. If it evaluates to false, its `else` schema is executed (if present). To maintain strict standard JSON Schema compatibility internally, the `when` block utilizes pure JSON Schema `properties` definitions (e.g. `enum`, `const`) rather than injecting unstandardized MongoDB operators. Because `when`, `then`, and `else` are themselves standard schemas, they natively support nested `cases` to handle mutually exclusive `else if` architectures.
+
+```json
+{
+  "$id": "save_external_account",
+  "cases": [
+    {
+      "when": {
+        "properties": {
+          "status": { "const": "unverified" }
+        },
+        "required": ["status"]
+      },
+      "then": {
+        "required": ["amount_1", "amount_2"]
+      }
+    },
+    {
+      "when": { 
+        "properties": { "kind": { "const": "credit" } },
+        "required": ["kind"]
+      },
+      "then": {
+        "required": ["details"]
+      },
+      "else": {
+        "cases": [
+          {
+            "when": { "properties": { "kind": { "const": "checking" } }, "required": ["kind"] },
+            "then": { "required": ["routing_number"] }
+          }
+        ]
+      }
+    }
+  ]
+}
+```
+
+### Strict by Default & Extensibility
+*   **Strictness**: By default, any property not explicitly defined in the schema causes a validation error (effectively enforcing `additionalProperties: false` globally). 
+*   **Extensibility (`extensible: true`)**: To allow a free-for-all of undefined properties, schemas must explicitly declare `"extensible": true`. 
+*   **Structured Additional Properties**: If `additionalProperties: {...}` is defined as a schema, arbitrary keys are allowed so long as their values match the defined type constraint.
+*   **Inheritance Boundaries**: Strictness resets when crossing non-primitive `type` boundaries. A schema extending a strict parent remains strict unless it explicitly overrides with `"extensible": true`.
+
+### Format Leniency for Empty Strings
+To simplify frontend form validation, format validators specifically for `uuid`, `date-time`, and `email` explicitly allow empty strings (`""`), treating them as "present but unset".
+
+---
+
+## 3. Database
+
+The Database module manages the core execution graphs and structural compilation of the Postgres environment.
+
 ### Relational Edge Resolution
 When compiling nested object graphs or arrays, the JSPG engine must dynamically infer which Postgres Foreign Key constraint correctly bridges the parent to the nested schema. To guarantee deterministic SQL generation, it utilizes a strict, multi-step algebraic resolution process applied during the `OnceLock` Compilation phase:
 
@@ -33,16 +171,14 @@ When compiling nested object graphs or arrays, the JSPG engine must dynamically
 5.  **Implicit Base Fallback (1:M)**: If no explicit prefix matches, and M:M deduction fails, the compiler filters for exactly one remaining relation with a `null` prefix (e.g. `fk_invoice_line_invoice` -> `prefix: null`). A `null` prefix mathematically denotes the core structural parent-child ownership edge and is used safely as a fallback.
 6.  **Deterministic Abort**: If the engine exhausts all deduction pathways and the edge remains ambiguous, it explicitly aborts schema compilation (`returns None`) rather than silently generating unpredictable SQL.
 
-### Global API Reference
-These functions operate on the global `GLOBAL_JSPG` engine instance and provide administrative boundaries:
-
-*   `jspg_setup(database jsonb) -> jsonb`: Initializes the engine. Deserializes the full database schema registry (types, enums, puncs, relations) from Postgres and compiles them into memory atomically.
-*   `jspg_teardown() -> jsonb`: Clears the current session's engine instance from `GLOBAL_JSPG`, resetting the cache.
-*   `jspg_schemas() -> jsonb`: Exports the fully compiled AST snapshot (including all inherited dependencies) out of `GLOBAL_JSPG` into standard JSON Schema representations.
+### Ad-Hoc Schema Promotion
+To seamlessly support deeply nested, inline Object definitions that don't declare an explicit `$id`, JSPG aggressively promotes them to standalone topological entities during the database compilation phase. 
+*   **Hash Generation:** While evaluating the unified graph, if the compiler enters an `Object` or `Array` structure completely lacking an `$id`, it dynamically calculates a localized hash alias representing exactly its structural constraints.
+*   **Promotion:** This inline chunk is mathematically elevated to its own `$id` in the `db.schemas` cache registry. This guarantees that $O(1)$ WebSockets or isolated queries can natively target any arbitrary sub-object of a massive database topology directly without recursively re-parsing its parent's AST block every read.
 
 ---
 
-## 2. Validator
+## 4. Validator
 
 The Validator provides strict, schema-driven evaluation for the "Punc" architecture.
 
@@ -53,35 +189,13 @@ The Validator provides strict, schema-driven evaluation for the "Punc" architect
 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.
 
 *   **Caching Strategy**: The Validator caches the pre-compiled `Database` registry in memory upon initialization (`jspg_setup`). This registry holds the comprehensive graph of schema boundaries, Types, ENUMs, and Foreign Key relationships, acting as the Single Source of Truth for all validation operations without polling Postgres.
-
-#### A. Polymorphism & Referencing (`$ref`, `$family`, and Native Types)
-*   **Native Type Discrimination (`variations`)**: Schemas defined inside a Postgres `type` are Entities. The validator securely and implicitly manages their `"type"` property. If an entity inherits from `user`, incoming JSON can safely define `{"type": "person"}` without errors, thanks to `compiled_variations` inheritance.
-*   **Structural Inheritance & Viral Infection (`$ref`)**: `$ref` is used exclusively for structural inheritance and explicit composition, *never* for union creation. A `$ref` ALWAYS targets a specific, *single* schema struct (e.g., `full.person`). It represents an explicit, known structural shape. A Punc request schema that `$ref`s an Entity virally inherits all physical database polymorphism rules for that target.
-*   **Shape Polymorphism (`$family`)**: Unlike `$ref`, `$family` ALWAYS targets an abstract *table lineage* (e.g., `organization` or `widget`). It instructs the engine to dynamically expand the response payload into multiple possible schema shapes based on the row's physical database `type`. If `{"$family": "widget"}` is used, the Validator dynamically identifies *every* schema in the registry that `$ref`s `widget` (e.g., `stock.widget`, `task.widget`) and recursively evaluates the JSON against all of them.
-*   **Strict Matches & Depth Heuristic**: Polymorphic structures MUST match exactly **one** schema permutation. If multiple inherited struct permutations pass, JSPG applies the **Depth Heuristic Tie-Breaker**, selecting the candidate deepest in the inheritance tree. 
-
-#### B. Dot-Notation Schema Resolution & Database Mapping
-*   **The Dot Convention**: When a schema represents a specific variation or shape of an underlying physical database `Type` (e.g., a "summary" of a "person"), its `$id` must adhere to a dot-notation suffix convention (e.g., `summary.person` or `full.person`). 
-*   **Entity Resolution**: The framework (Validator, Queryer, Merger) dynamically determines the backing PostgreSQL table structure by splitting the schema's `$id` (or `$ref`) by `.` and extracting the **last segment** (`next_back()`). If the last segment matches a known Database Type (like `person`), the framework natively applies that table's inheritance rules, variations, and physical foreign keys to the schema graph, regardless of the prefix.
-
-#### C. Strict by Default & Extensibility
-*   **Strictness**: By default, any property not explicitly defined in the schema causes a validation error (effectively enforcing `additionalProperties: false` globally). 
-*   **Extensibility (`extensible: true`)**: To allow a free-for-all of undefined properties, schemas must explicitly declare `"extensible": true`. 
-*   **Structured Additional Properties**: If `additionalProperties: {...}` is defined as a schema, arbitrary keys are allowed so long as their values match the defined type constraint.
-*   **Inheritance Boundaries**: Strictness resets when crossing `$ref` boundaries. A schema extending a strict parent remains strict unless it explicitly overrides with `"extensible": true`.
-
-#### D. Implicit Keyword Shadowing
-*   **Inheritance (`$ref` + properties)**: Unlike standard JSON Schema, when a schema uses `$ref` alongside local properties, JSPG implements **Smart Merge**. Local constraints natively take precedence over (shadow) inherited constraints for the same keyword. 
-    *   *Example*: If `entity` has `type: {const: "entity"}`, but `person` defines `type: {const: "person"}`, the local `person` const cleanly overrides the inherited one.
-*   **Composition (`allOf`)**: When evaluating `allOf`, standard intersection rules apply seamlessly. No shadowing occurs, meaning all constraints from all branches must pass.
-
-#### E. Format Leniency for Empty Strings
-To simplify frontend form validation, format validators specifically for `uuid`, `date-time`, and `email` explicitly allow empty strings (`""`), treating them as "present but unset".
+*   **Discriminator Fast Paths & Extraction**: When executing a polymorphic node (`oneOf` or `$family`), the engine statically analyzes the incoming JSON payload for the literal `type` and `kind` string coordinates. It routes the evaluation specifically to matching candidates in $O(1)$ while returning `MISSING_TYPE` ultimata directly.
+*   **Missing Type Ultimatum**: If an entity logically requires a discriminator and the JSON payload omits it, JSPG short-circuits branch execution entirely, bubbling a single, perfectly-pathed `MISSING_TYPE` error back to the UI natively to prevent confusing cascading failures.
+*   **Golden Match Context**: When exactly one structural candidate perfectly maps a discriminator, the Validator exclusively cascades that specific structural error context directly to the user, stripping away all noise generated by other parallel schemas.
 
 ---
 
-
-## 3. Merger
+## 5. Merger
 
 The Merger provides an automated, high-performance graph synchronization engine. It orchestrates the complex mapping of nested JSON objects into normalized Postgres relational tables, honoring all inheritance and graph constraints.
 
@@ -106,7 +220,7 @@ The Merger provides an automated, high-performance graph synchronization engine.
 
 ---
 
-## 4. Queryer
+## 6. Queryer
 
 The Queryer transforms Postgres into a pre-compiled Semantic Query Engine, designed to serve the exact shape of Punc responses directly via SQL.
 
@@ -116,7 +230,8 @@ The Queryer transforms Postgres into a pre-compiled Semantic Query Engine, desig
 ### Core Features
 
 *   **Caching Strategy (DashMap SQL Caching)**: The Queryer securely caches its compiled, static SQL string templates per schema permutation inside the `GLOBAL_JSPG` concurrent `DashMap`. This eliminates recursive AST schema crawling on consecutive requests. Furthermore, it evaluates the strings via Postgres SPI (Server Programming Interface) Prepared Statements, leveraging native database caching of execution plans for extreme performance.
-*   **Schema-to-SQL Compilation**: Compiles JSON Schema ASTs spanning deep arrays directly into static, pre-planned SQL multi-JOIN queries. This explicitly features the `Smart Merge` evaluation engine which natively translates properties through `allOf` and `$ref` inheritances, mapping JSON fields specifically to their physical database table aliases during translation.
+*   **Schema-to-SQL Compilation**: Compiles JSON Schema ASTs spanning deep arrays directly into static, pre-planned SQL multi-JOIN queries. This explicitly features the `Smart Merge` evaluation engine which natively translates properties through `type` inheritances, mapping JSON fields specifically to their physical database table aliases during translation.
+*   **Root Null-Stripping Optimization**: Unlike traditional nested document builders, the Queryer intelligently defers Postgres' natively recursive `jsonb_strip_nulls` execution to the absolute apex of the compiled query pipeline. The compiler organically layers millions of rapid `jsonb_build_object()` sub-query allocations instantly, wrapping them in a singular overarching pass. This strips all empty optionals uniformly before exiting the database, maximizing CPU throughput.
 *   **Dynamic Filtering**: Binds parameters natively through `cue.filters` objects. The queryer enforces a strict, structured, MongoDB-style operator syntax to map incoming JSON request constraints directly to their originating structural table columns. Filters support both flat path notation (e.g., `"contacts/is_primary": {...}`) and deeply nested recursive JSON structures (e.g., `{"contacts": {"is_primary": {...}}}`). The queryer recursively traverses and flattens these structures at AST compilation time.
     *   **Equality / Inequality**: `{"$eq": value}`, `{"$ne": value}` automatically map to `=` and `!=`.
     *   **Comparison**: `{"$gt": ...}`, `{"$gte": ...}`, `{"$lt": ...}`, `{"$lte": ...}` directly compile to Postgres comparison operators (`> `, `>=`, `<`, `<=`).
@@ -125,16 +240,12 @@ The Queryer transforms Postgres into a pre-compiled Semantic Query Engine, desig
     *   **Type Casting**: Safely resolves dynamic combinations by casting values instantly into the physical database types mapped in the schema (e.g. parsing `uuid` bindings to `::uuid`, formatting DateTimes to `::timestamptz`, and numbers to `::numeric`).
 *   **Polymorphic SQL Generation (`$family`)**: Compiles `$family` properties by analyzing the **Physical Database Variations**, *not* the schema descendants.
     *   **The Dot Convention**: When a schema requests `$family: "target.schema"`, the compiler extracts the base type (e.g. `schema`) and looks up its Physical Table definition.
-    *   **Multi-Table Branching**: If the Physical Table is a parent to other tables (e.g. `organization` has variations `["organization", "bot", "person"]`), the compiler generates a dynamic `CASE WHEN type = '...' THEN ...` query, expanding into `JOIN`s for each variation.
+    *   **Multi-Table Branching**: If the Physical Table is a parent to other tables (e.g. `organization` has variations `["organization", "bot", "person"]`), the compiler generates a dynamic `CASE WHEN type = '...' THEN ...` query, expanding into sub-queries for each variation. To ensure safe resolution, the compiler dynamically evaluates correlation boundaries: it attempts standard Relational Edge discovery first. If no explicit relational edge exists (indicating pure Table Inheritance rather than a standard foreign-key graph relationship), it safely invokes a **Table Parity Fallback**. This generates an explicit ID correlation constraint (`AND inner.id = outer.id`), perfectly binding the structural variations back to the parent row to eliminate Cartesian products.
     *   **Single-Table Bypass**: If the Physical Table is a leaf node with only one variation (e.g. `person` has variations `["person"]`), the compiler cleanly bypasses `CASE` generation and compiles a simple `SELECT` across the base table, as all schema extensions (e.g. `light.person`, `full.person`) are guaranteed to reside in the exact same physical row.
 
-### Ad-Hoc Schema Promotion
+---
 
-To seamlessly support deeply nested, inline Object definitions that don't declare an explicit `$id`, JSPG aggressively promotes them to standalone topological entities during the database compilation phase. 
-*   **Hash Generation:** While evaluating the unified graph, if the compiler enters an `Object` or `Array` structure completely lacking an `$id`, it dynamically calculates a localized hash alias representing exactly its structural constraints.
-*   **Promotion:** This inline chunk is mathematically elevated to its own `$id` in the `db.schemas` cache registry. This guarantees that $O(1)$ WebSockets or isolated queries can natively target any arbitrary sub-object of a massive database topology directly without recursively re-parsing its parent's AST block every read.
-
-## 5. Testing & Execution Architecture
+## 7. Testing & Execution Architecture
 
 JSPG implements a strict separation of concerns to bypass the need to boot a full PostgreSQL cluster for unit and integration testing. Because `pgrx::spi::Spi` directly links to PostgreSQL C-headers, building the library with `cargo test` on macOS natively normally results in fatal `dyld` crashes.
 

fixtures/allOf.json

@@ -1,677 +0,0 @@
-[
-  {
-    "description": "allOf",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "properties": {
-                "bar": {
-                  "type": "integer"
-                }
-              },
-              "required": [
-                "bar"
-              ]
-            },
-            {
-              "properties": {
-                "foo": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "foo"
-              ]
-            }
-          ],
-          "$id": "allOf_0_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "allOf",
-        "data": {
-          "foo": "baz",
-          "bar": 2
-        },
-        "schema_id": "allOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "mismatch second",
-        "data": {
-          "foo": "baz"
-        },
-        "schema_id": "allOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "mismatch first",
-        "data": {
-          "bar": 2
-        },
-        "schema_id": "allOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "wrong type",
-        "data": {
-          "foo": "baz",
-          "bar": "quux"
-        },
-        "schema_id": "allOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with base schema",
-    "database": {
-      "schemas": [
-        {
-          "properties": {
-            "bar": {
-              "type": "integer"
-            },
-            "baz": {},
-            "foo": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "bar"
-          ],
-          "allOf": [
-            {
-              "properties": {
-                "foo": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "foo"
-              ]
-            },
-            {
-              "properties": {
-                "baz": {
-                  "type": "null"
-                }
-              },
-              "required": [
-                "baz"
-              ]
-            }
-          ],
-          "$id": "allOf_1_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid",
-        "data": {
-          "foo": "quux",
-          "bar": 2,
-          "baz": null
-        },
-        "schema_id": "allOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "mismatch base schema",
-        "data": {
-          "foo": "quux",
-          "baz": null
-        },
-        "schema_id": "allOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "mismatch first allOf",
-        "data": {
-          "bar": 2,
-          "baz": null
-        },
-        "schema_id": "allOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "mismatch second allOf",
-        "data": {
-          "foo": "quux",
-          "bar": 2
-        },
-        "schema_id": "allOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "mismatch both",
-        "data": {
-          "bar": 2
-        },
-        "schema_id": "allOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf simple types",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "maximum": 30
-            },
-            {
-              "minimum": 20
-            }
-          ],
-          "$id": "allOf_2_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid",
-        "data": 25,
-        "schema_id": "allOf_2_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "mismatch one",
-        "data": 35,
-        "schema_id": "allOf_2_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with boolean schemas, all true",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            true,
-            true
-          ],
-          "$id": "allOf_3_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is valid",
-        "data": "foo",
-        "schema_id": "allOf_3_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with boolean schemas, some false",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            true,
-            false
-          ],
-          "$id": "allOf_4_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is invalid",
-        "data": "foo",
-        "schema_id": "allOf_4_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with boolean schemas, all false",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            false,
-            false
-          ],
-          "$id": "allOf_5_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is invalid",
-        "data": "foo",
-        "schema_id": "allOf_5_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with one empty schema",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {}
-          ],
-          "$id": "allOf_6_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any data is valid",
-        "data": 1,
-        "schema_id": "allOf_6_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with two empty schemas",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {},
-            {}
-          ],
-          "$id": "allOf_7_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any data is valid",
-        "data": 1,
-        "schema_id": "allOf_7_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with the first empty schema",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {},
-            {
-              "type": "number"
-            }
-          ],
-          "$id": "allOf_8_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "number is valid",
-        "data": 1,
-        "schema_id": "allOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "string is invalid",
-        "data": "foo",
-        "schema_id": "allOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with the last empty schema",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "type": "number"
-            },
-            {}
-          ],
-          "$id": "allOf_9_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "number is valid",
-        "data": 1,
-        "schema_id": "allOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "string is invalid",
-        "data": "foo",
-        "schema_id": "allOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "nested allOf, to check validation semantics",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "allOf": [
-                {
-                  "type": "null"
-                }
-              ]
-            }
-          ],
-          "$id": "allOf_10_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "null is valid",
-        "data": null,
-        "schema_id": "allOf_10_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "anything non-null is invalid",
-        "data": 123,
-        "schema_id": "allOf_10_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "extensible: true allows extra properties in allOf",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "properties": {
-                "bar": {
-                  "type": "integer"
-                }
-              },
-              "required": [
-                "bar"
-              ]
-            },
-            {
-              "properties": {
-                "foo": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "foo"
-              ]
-            }
-          ],
-          "extensible": true,
-          "$id": "allOf_12_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "extra property is valid",
-        "data": {
-          "foo": "baz",
-          "bar": 2,
-          "qux": 3
-        },
-        "schema_id": "allOf_12_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "strict by default with allOf properties",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "properties": {
-                "foo": {
-                  "const": 1
-                }
-              }
-            },
-            {
-              "properties": {
-                "bar": {
-                  "const": 2
-                }
-              }
-            }
-          ],
-          "$id": "allOf_13_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "validates merged properties",
-        "data": {
-          "foo": 1,
-          "bar": 2
-        },
-        "schema_id": "allOf_13_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "fails on extra property z explicitly",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "z": 3
-        },
-        "schema_id": "allOf_13_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "allOf with nested extensible: true (partial looseness)",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "properties": {
-                "foo": {
-                  "const": 1
-                }
-              }
-            },
-            {
-              "extensible": true,
-              "properties": {
-                "bar": {
-                  "const": 2
-                }
-              }
-            }
-          ],
-          "$id": "allOf_14_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "extensible subschema doesn't make root extensible if root is strict",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "z": 3
-        },
-        "schema_id": "allOf_14_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "strictness: allOf composition with strict refs",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "$ref": "partA"
-            },
-            {
-              "$ref": "partB"
-            }
-          ],
-          "$id": "allOf_15_0"
-        },
-        {
-          "$id": "partA",
-          "properties": {
-            "id": {
-              "type": "string"
-            }
-          }
-        },
-        {
-          "$id": "partB",
-          "properties": {
-            "name": {
-              "type": "string"
-            }
-          }
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "merged instance is valid",
-        "data": {
-          "id": "1",
-          "name": "Me"
-        },
-        "schema_id": "allOf_15_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "extra property is invalid (root is strict)",
-        "data": {
-          "id": "1",
-          "name": "Me",
-          "extra": 1
-        },
-        "schema_id": "allOf_15_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "partA mismatch is invalid",
-        "data": {
-          "id": 1,
-          "name": "Me"
-        },
-        "schema_id": "allOf_15_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  }
-]

fixtures/cases.json

@@ -0,0 +1,183 @@
+[
+  {
+    "description": "Multi-Paradigm Declarative Cases",
+    "database": {
+      "schemas": [
+        {
+          "$id": "parallel_rules",
+          "type": "object",
+          "properties": {
+            "status": { "type": "string" },
+            "kind": { "type": "string" }
+          },
+          "cases": [
+            {
+              "when": { "properties": { "status": {"const": "unverified"} }, "required": ["status"] },
+              "then": { 
+                "properties": {
+                  "amount_1": {"type": "number"},
+                  "amount_2": {"type": "number"}
+                },
+                "required": ["amount_1", "amount_2"] 
+              }
+            },
+            {
+              "when": { "properties": { "kind": {"const": "credit"} }, "required": ["kind"] },
+              "then": { 
+                "properties": {
+                  "cvv": {"type": "number"}
+                },
+                "required": ["cvv"] 
+              }
+            }
+          ]
+        },
+        {
+          "$id": "mutually_exclusive",
+          "type": "object",
+          "properties": {
+            "type": { "type": "string" }
+          },
+          "cases": [
+            {
+              "when": { "properties": { "type": {"const": "A"} }, "required": ["type"] },
+              "then": { 
+                "properties": { "field_a": {"type": "number"} },
+                "required": ["field_a"] 
+              }
+            },
+            {
+              "when": { "properties": { "type": {"const": "B"} }, "required": ["type"] },
+              "then": { 
+                "properties": { "field_b": {"type": "number"} },
+                "required": ["field_b"] 
+              },
+              "else": { 
+                "properties": { "fallback_b": {"type": "number"} },
+                "required": ["fallback_b"] 
+              }
+            }
+          ]
+        },
+        {
+          "$id": "nested_fallbacks",
+          "type": "object",
+          "properties": {
+            "tier": { "type": "string" }
+          },
+          "cases": [
+            {
+              "when": { "properties": { "tier": {"const": "1"} }, "required": ["tier"] },
+              "then": { 
+                "properties": { "basic": {"type": "number"} },
+                "required": ["basic"] 
+              },
+              "else": {
+                "cases": [
+                  {
+                    "when": { "properties": { "tier": {"const": "2"} }, "required": ["tier"] },
+                    "then": { 
+                      "properties": { "standard": {"type": "number"} },
+                      "required": ["standard"] 
+                    },
+                    "else": { 
+                      "properties": { "premium": {"type": "number"} },
+                      "required": ["premium"] 
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        },
+        {
+          "$id": "missing_when",
+          "type": "object",
+          "cases": [
+            {
+              "else": { 
+                "properties": { "unconditional": {"type": "number"} },
+                "required": ["unconditional"] 
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Fires only the first rule successfully",
+        "data": { "status": "unverified", "amount_1": 1, "amount_2": 2 },
+        "schema_id": "parallel_rules",
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Fires both independent parallel rules flawlessly",
+        "data": { "status": "unverified", "kind": "credit", "amount_1": 1, "amount_2": 2, "cvv": 123 },
+        "schema_id": "parallel_rules",
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Catches errors triggered concurrently by multiple independent blocked rules",
+        "data": { "status": "unverified", "kind": "credit" },
+        "schema_id": "parallel_rules",
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            { "code": "REQUIRED_FIELD_MISSING", "details": { "path": "amount_1" } },
+            { "code": "REQUIRED_FIELD_MISSING", "details": { "path": "amount_2" } },
+            { "code": "REQUIRED_FIELD_MISSING", "details": { "path": "cvv" } }
+          ]
+        }
+      },
+      {
+        "description": "STRICT_PROPERTY_VIOLATION throws if an un-triggered then property is submitted",
+        "data": { "status": "verified", "cvv": 123 },
+        "schema_id": "parallel_rules",
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            { "code": "STRICT_PROPERTY_VIOLATION", "details": { "path": "cvv" } }
+          ]
+        }
+      },
+      {
+        "description": "Successfully routes mutually exclusive properties seamlessly",
+        "data": { "type": "A", "field_a": 1, "fallback_b": 2 },
+        "schema_id": "mutually_exclusive",
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Nested fallbacks execute seamlessly",
+        "data": { "tier": "3", "premium": 1 },
+        "schema_id": "nested_fallbacks",
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "A case without a when executes its else indiscriminately",
+        "data": { "unconditional": 1 },
+        "schema_id": "missing_when",
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "A case without a when throws if else unconditionally requires field",
+        "data": { },
+        "schema_id": "missing_when",
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            { "code": "REQUIRED_FIELD_MISSING", "details": { "path": "unconditional" } }
+          ]
+        }
+      }
+    ]
+  }
+]

fixtures/database.json

@@ -23,7 +23,7 @@
                 "missing_users": {
                   "type": "array",
                   "items": {
-                    "$ref": "full.user"
+                    "type": "full.user"
                   }
                 }
               }
@@ -92,7 +92,7 @@
                 "children": {
                   "type": "array",
                   "items": {
-                    "$ref": "full.child"
+                    "type": "full.child"
                   }
                 }
               }
@@ -175,7 +175,7 @@
                 "activities": {
                   "type": "array",
                   "items": {
-                    "$ref": "full.activity"
+                    "type": "full.activity"
                   }
                 }
               }
@@ -282,7 +282,7 @@
                 "ambiguous_edge": {
                   "type": "array",
                   "items": {
-                    "$ref": "empty.junction"
+                    "type": "empty.junction"
                   }
                 }
               }

fixtures/families.json

@@ -1,217 +0,0 @@
-[
-  {
-    "description": "Entity families via pure $ref graph",
-    "database": {
-      "types": [
-        {
-          "name": "entity",
-          "variations": [
-            "entity",
-            "organization",
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "entity",
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "type": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "light.entity",
-              "$ref": "entity"
-            }
-          ]
-        },
-        {
-          "name": "organization",
-          "variations": [
-            "organization",
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "organization",
-              "$ref": "entity",
-              "properties": {
-                "name": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        },
-        {
-          "name": "person",
-          "variations": [
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "person",
-              "$ref": "organization",
-              "properties": {
-                "first_name": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "light.person",
-              "$ref": "light.entity"
-            }
-          ]
-        }
-      ],
-      "puncs": [
-        {
-          "name": "get_entities",
-          "schemas": [
-            {
-              "$id": "get_entities.response",
-              "$family": "entity"
-            }
-          ]
-        },
-        {
-          "name": "get_light_entities",
-          "schemas": [
-            {
-              "$id": "get_light_entities.response",
-              "$family": "light.entity"
-            }
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "Family matches base entity",
-        "schema_id": "get_entities.response",
-        "data": {
-          "id": "1",
-          "type": "entity"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Family matches descendant person",
-        "schema_id": "get_entities.response",
-        "data": {
-          "id": "2",
-          "type": "person",
-          "name": "ACME",
-          "first_name": "John"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Graph family matches light.entity",
-        "schema_id": "get_light_entities.response",
-        "data": {
-          "id": "3",
-          "type": "entity"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Graph family matches light.person (because it $refs light.entity)",
-        "schema_id": "get_light_entities.response",
-        "data": {
-          "id": "4",
-          "type": "person"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Graph family excludes organization (missing light. schema that $refs light.entity)",
-        "schema_id": "get_light_entities.response",
-        "data": {
-          "id": "5",
-          "type": "organization",
-          "name": "ACME"
-        },
-        "action": "validate",
-        "expect": {
-          "success": false,
-          "errors": [
-            {
-              "code": "NO_FAMILY_MATCH",
-              "details": { "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"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  }
-]

fixtures/if-then-else.json

@@ -1,594 +0,0 @@
-[
-  {
-    "description": "ignore if without then or else",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "const": 0
-          },
-          "$id": "if-then-else_0_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid when valid against lone if",
-        "data": 0,
-        "schema_id": "if-then-else_0_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "valid when invalid against lone if",
-        "data": "hello",
-        "schema_id": "if-then-else_0_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "ignore then without if",
-    "database": {
-      "schemas": [
-        {
-          "then": {
-            "const": 0
-          },
-          "$id": "if-then-else_1_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid when valid against lone then",
-        "data": 0,
-        "schema_id": "if-then-else_1_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "valid when invalid against lone then",
-        "data": "hello",
-        "schema_id": "if-then-else_1_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "ignore else without if",
-    "database": {
-      "schemas": [
-        {
-          "else": {
-            "const": 0
-          },
-          "$id": "if-then-else_2_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid when valid against lone else",
-        "data": 0,
-        "schema_id": "if-then-else_2_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "valid when invalid against lone else",
-        "data": "hello",
-        "schema_id": "if-then-else_2_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "if and then without else",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "exclusiveMaximum": 0
-          },
-          "then": {
-            "minimum": -10
-          },
-          "$id": "if-then-else_3_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid through then",
-        "data": -1,
-        "schema_id": "if-then-else_3_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "invalid through then",
-        "data": -100,
-        "schema_id": "if-then-else_3_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "valid when if test fails",
-        "data": 3,
-        "schema_id": "if-then-else_3_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "if and else without then",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "exclusiveMaximum": 0
-          },
-          "else": {
-            "multipleOf": 2
-          },
-          "$id": "if-then-else_4_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid when if test passes",
-        "data": -1,
-        "schema_id": "if-then-else_4_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "valid through else",
-        "data": 4,
-        "schema_id": "if-then-else_4_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "invalid through else",
-        "data": 3,
-        "schema_id": "if-then-else_4_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "validate against correct branch, then vs else",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "exclusiveMaximum": 0
-          },
-          "then": {
-            "minimum": -10
-          },
-          "else": {
-            "multipleOf": 2
-          },
-          "$id": "if-then-else_5_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid through then",
-        "data": -1,
-        "schema_id": "if-then-else_5_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "invalid through then",
-        "data": -100,
-        "schema_id": "if-then-else_5_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "valid through else",
-        "data": 4,
-        "schema_id": "if-then-else_5_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "invalid through else",
-        "data": 3,
-        "schema_id": "if-then-else_5_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "non-interference across combined schemas",
-    "database": {
-      "schemas": [
-        {
-          "allOf": [
-            {
-              "if": {
-                "exclusiveMaximum": 0
-              }
-            },
-            {
-              "then": {
-                "minimum": -10
-              }
-            },
-            {
-              "else": {
-                "multipleOf": 2
-              }
-            }
-          ],
-          "$id": "if-then-else_6_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid, but would have been invalid through then",
-        "data": -100,
-        "schema_id": "if-then-else_6_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "valid, but would have been invalid through else",
-        "data": 3,
-        "schema_id": "if-then-else_6_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "if with boolean schema true",
-    "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",
-        "schema_id": "if-then-else_7_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "boolean schema true in if always chooses the then path (invalid)",
-        "data": "else",
-        "schema_id": "if-then-else_7_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "if with boolean schema false",
-    "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",
-        "schema_id": "if-then-else_8_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "boolean schema false in if always chooses the else path (valid)",
-        "data": "else",
-        "schema_id": "if-then-else_8_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "if appears at the end when serialized (keyword processing sequence)",
-    "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",
-        "schema_id": "if-then-else_9_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "other redirects to else and passes",
-        "data": "other",
-        "schema_id": "if-then-else_9_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "no redirects to then and fails",
-        "data": "no",
-        "schema_id": "if-then-else_9_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "invalid redirects to else and fails",
-        "data": "invalid",
-        "schema_id": "if-then-else_9_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "then: false fails when condition matches",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "const": 1
-          },
-          "then": false,
-          "$id": "if-then-else_10_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "matches if → then=false → invalid",
-        "data": 1,
-        "schema_id": "if-then-else_10_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "does not match if → then ignored → valid",
-        "data": 2,
-        "schema_id": "if-then-else_10_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "else: false fails when condition does not match",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "const": 1
-          },
-          "else": false,
-          "$id": "if-then-else_11_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "matches if → else ignored → valid",
-        "data": 1,
-        "schema_id": "if-then-else_11_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "does not match if → else executes → invalid",
-        "data": 2,
-        "schema_id": "if-then-else_11_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "extensible: true allows extra properties in if-then-else",
-    "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": [
-      {
-        "description": "extra property is valid (matches if and then)",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "extra": "prop"
-        },
-        "schema_id": "if-then-else_12_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "strict by default with if-then properties",
-    "database": {
-      "schemas": [
-        {
-          "if": {
-            "properties": {
-              "foo": {
-                "const": 1
-              }
-            },
-            "required": [
-              "foo"
-            ]
-          },
-          "then": {
-            "properties": {
-              "bar": {
-                "const": 2
-              }
-            }
-          },
-          "$id": "if-then-else_13_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "valid match (foo + bar)",
-        "data": {
-          "foo": 1,
-          "bar": 2
-        },
-        "schema_id": "if-then-else_13_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "fails on extra property z explicitly",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "z": 3
-        },
-        "schema_id": "if-then-else_13_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  }
-]

fixtures/invoice.json

@@ -0,0 +1,219 @@
+[
+  {
+    "description": "Invoice Attachment Reproducer",
+    "database": {
+      "puncs": [
+        {
+          "name": "get_invoice",
+          "schemas": [
+            {
+              "$id": "get_invoice.response",
+              "oneOf": [
+                { "type": "invoice" },
+                { "type": "null" }
+              ]
+            }
+          ]
+        }
+      ],
+      "enums": [],
+      "relations": [
+        {
+          "id": "10000000-0000-0000-0000-000000000001",
+          "type": "relation",
+          "constraint": "fk_attachment_attachable_entity",
+          "source_type": "attachment",
+          "source_columns": ["attachable_id", "attachable_type"],
+          "destination_type": "entity",
+          "destination_columns": ["id", "type"],
+          "prefix": null
+        }
+      ],
+      "types": [
+        {
+          "name": "entity",
+          "schemas": [
+            {
+              "$id": "entity",
+              "type": "object",
+              "properties": {
+                "id": { "type": "string", "format": "uuid" },
+                "type": { "type": "string" },
+                "archived": { "type": "boolean" },
+                "created_at": { "type": "string", "format": "date-time" }
+              }
+            }
+          ],
+          "hierarchy": ["entity"],
+          "variations": ["entity", "activity", "invoice", "attachment"],
+          "fields": ["id", "type", "archived", "created_at"],
+          "grouped_fields": {
+            "entity": ["id", "type", "archived", "created_at"]
+          },
+          "field_types": {
+            "id": "uuid",
+            "type": "text",
+            "archived": "boolean",
+            "created_at": "timestamptz"
+          },
+          "lookup_fields": [],
+          "historical": false,
+          "notify": false,
+          "relationship": false
+        },
+        {
+          "name": "activity",
+          "schemas": [
+            {
+              "$id": "activity",
+              "type": "entity",
+              "properties": {
+                "start_date": { "type": "string", "format": "date-time" }
+              }
+            }
+          ],
+          "hierarchy": ["activity", "entity"],
+          "variations": ["activity", "invoice"],
+          "fields": ["id", "type", "archived", "created_at", "start_date"],
+          "grouped_fields": {
+            "entity": ["id", "type", "archived", "created_at"],
+            "activity": ["start_date"]
+          },
+          "field_types": {
+            "id": "uuid",
+            "type": "text",
+            "archived": "boolean",
+            "created_at": "timestamptz",
+            "start_date": "timestamptz"
+          },
+          "lookup_fields": [],
+          "historical": false,
+          "notify": false,
+          "relationship": false
+        },
+        {
+          "name": "invoice",
+          "schemas": [
+            {
+              "$id": "invoice",
+              "type": "activity",
+              "properties": {
+                "status": { "type": "string" },
+                "attachments": {
+                  "type": "array",
+                  "items": { "type": "attachment" }
+                }
+              }
+            }
+          ],
+          "hierarchy": ["invoice", "activity", "entity"],
+          "variations": ["invoice"],
+          "fields": ["id", "type", "archived", "created_at", "start_date", "status"],
+          "grouped_fields": {
+            "entity": ["id", "type", "archived", "created_at"],
+            "activity": ["start_date"],
+            "invoice": ["status"]
+          },
+          "field_types": {
+            "id": "uuid",
+            "type": "text",
+            "archived": "boolean",
+            "created_at": "timestamptz",
+            "start_date": "timestamptz",
+            "status": "text"
+          },
+          "lookup_fields": [],
+          "historical": false,
+          "notify": false,
+          "relationship": false
+        },
+        {
+          "name": "attachment",
+          "schemas": [
+            {
+              "$id": "attachment",
+              "type": "entity",
+              "properties": {
+                "name": { "type": "string" },
+                "attachable_id": { "type": "string", "format": "uuid" },
+                "attachable_type": { "type": "string" },
+                "kind": { "type": "string" },
+                "file": { "type": "string" },
+                "data": { "type": "object" }
+              }
+            }
+          ],
+          "hierarchy": ["attachment", "entity"],
+          "variations": ["attachment"],
+          "fields": ["id", "type", "archived", "created_at", "attachable_id", "attachable_type", "kind", "file", "data", "name"],
+          "grouped_fields": {
+            "entity": ["id", "type", "archived", "created_at"],
+            "attachment": ["attachable_id", "attachable_type", "kind", "file", "data", "name"]
+          },
+          "field_types": {
+            "id": "uuid",
+            "type": "text",
+            "archived": "boolean",
+            "created_at": "timestamptz",
+            "attachable_id": "uuid",
+            "attachable_type": "text",
+            "kind": "text",
+            "file": "text",
+            "data": "jsonb",
+            "name": "text"
+          },
+          "lookup_fields": [],
+          "historical": false,
+          "notify": false,
+          "relationship": false
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Invoice with an empty array of attachments",
+        "schema_id": "get_invoice.response",
+        "data": {
+          "id": "11111111-1111-1111-1111-111111111111",
+          "type": "invoice",
+          "archived": false,
+          "created_at": "2023-01-01T00:00:00Z",
+          "status": "draft",
+          "attachments": []
+        },
+        "action": "validate",
+        "expect": {
+          "success": true
+        }
+      },
+      {
+        "description": "Invoice with a valid attachment with null data",
+        "schema_id": "get_invoice.response",
+        "data": {
+          "id": "11111111-1111-1111-1111-111111111111",
+          "type": "invoice",
+          "archived": false,
+          "created_at": "2023-01-01T00:00:00Z",
+          "status": "draft",
+          "attachments": [
+            {
+              "id": "22222222-2222-2222-2222-222222222222",
+              "type": "attachment",
+              "archived": false,
+              "created_at": "2023-01-01T00:00:00Z",
+              "name": "receipt",
+              "attachable_id": "11111111-1111-1111-1111-111111111111",
+              "attachable_type": "invoice",
+              "kind": "document",
+              "file": "path/to/doc.pdf"
+            }
+          ]
+        },
+        "action": "validate",
+        "expect": {
+          "success": true
+        }
+      }
+    ]
+  }
+]

fixtures/items.json

@@ -141,13 +141,13 @@
           "items": false,
           "prefixItems": [
             {
-              "$ref": "item"
+              "type": "item"
             },
             {
-              "$ref": "item"
+              "type": "item"
             },
             {
-              "$ref": "item"
+              "type": "item"
             }
           ],
           "$id": "items_3_0"
@@ -158,10 +158,10 @@
           "items": false,
           "prefixItems": [
             {
-              "$ref": "sub-item"
+              "type": "sub-item"
             },
             {
-              "$ref": "sub-item"
+              "type": "sub-item"
             }
           ]
         },

fixtures/merge.json

@@ -12,7 +12,7 @@
           }
         },
         {
-          "$ref": "base_0",
+          "type": "base_0",
           "properties": {
             "child_prop": {
               "type": "string"
@@ -71,7 +71,7 @@
           ]
         },
         {
-          "$ref": "base_1",
+          "type": "base_1",
           "properties": {
             "b": {
               "type": "string"
@@ -154,7 +154,7 @@
           }
         },
         {
-          "$ref": "base_2",
+          "type": "base_2",
           "properties": {
             "child_dep": {
               "type": "string"
@@ -241,7 +241,7 @@
           ]
         },
         {
-          "$ref": "base_3",
+          "type": "base_3",
           "properties": {
             "c": {
               "type": "string"

fixtures/merger.json

@@ -165,7 +165,7 @@
                     "schemas": [
                         {
                             "$id": "organization",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {
                                 "name": {
                                     "type": "string"
@@ -213,7 +213,7 @@
                     "schemas": [
                         {
                             "$id": "user",
-                            "$ref": "organization",
+                            "type": "organization",
                             "properties": {}
                         }
                     ],
@@ -262,7 +262,7 @@
                     "schemas": [
                         {
                             "$id": "person",
-                            "$ref": "user",
+                            "type": "user",
                             "properties": {
                                 "first_name": {
                                     "type": "string"
@@ -282,15 +282,15 @@
                                 "contacts": {
                                     "type": "array",
                                     "items": {
-                                        "$ref": "contact",
+                                        "type": "contact",
                                         "properties": {
                                             "target": {
                                                 "oneOf": [
                                                     {
-                                                        "$ref": "phone_number"
+                                                        "type": "phone_number"
                                                     },
                                                     {
-                                                        "$ref": "email_address"
+                                                        "type": "email_address"
                                                     }
                                                 ]
                                             }
@@ -300,10 +300,10 @@
                                 "email_addresses": {
                                     "type": "array",
                                     "items": {
-                                        "$ref": "contact",
+                                        "type": "contact",
                                         "properties": {
                                             "target": {
-                                                "$ref": "email_address"
+                                                "type": "email_address"
                                             }
                                         }
                                     }
@@ -376,7 +376,7 @@
                     "schemas": [
                         {
                             "$id": "order",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {
                                 "total": {
                                     "type": "number"
@@ -385,12 +385,12 @@
                                     "type": "string"
                                 },
                                 "customer": {
-                                    "$ref": "person"
+                                    "type": "person"
                                 },
                                 "lines": {
                                     "type": "array",
                                     "items": {
-                                        "$ref": "order_line"
+                                        "type": "order_line"
                                     }
                                 }
                             }
@@ -440,7 +440,7 @@
                     "schemas": [
                         {
                             "$id": "order_line",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {
                                 "order_id": {
                                     "type": "string"
@@ -549,7 +549,7 @@
                     "schemas": [
                         {
                             "$id": "relationship",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {}
                         }
                     ],
@@ -619,7 +619,7 @@
                     "schemas": [
                         {
                             "$id": "contact",
-                            "$ref": "relationship",
+                            "type": "relationship",
                             "properties": {
                                 "is_primary": {
                                     "type": "boolean"
@@ -677,7 +677,7 @@
                     "schemas": [
                         {
                             "$id": "phone_number",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {
                                 "number": {
                                     "type": "string"
@@ -736,7 +736,7 @@
                     "schemas": [
                         {
                             "$id": "email_address",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {
                                 "address": {
                                     "type": "string"
@@ -772,7 +772,7 @@
                         },
                         {
                             "$id": "attachment",
-                            "$ref": "entity",
+                            "type": "entity",
                             "properties": {
                                 "flags": {
                                     "type": "array",
@@ -781,10 +781,10 @@
                                     }
                                 },
                                 "type_metadata": {
-                                    "$ref": "type_metadata"
+                                    "type": "type_metadata"
                                 },
                                 "other_metadata": {
-                                    "$ref": "other_metadata"
+                                    "type": "other_metadata"
                                 }
                             }
                         }

fixtures/objectTypes.json

@@ -0,0 +1,167 @@
+[
+  {
+    "description": "Strict Inheritance",
+    "database": {
+      "schemas": [
+        {
+          "$id": "parent_type",
+          "type": "object",
+          "properties": {"a": {"type": "integer"}},
+          "required": ["a"]
+        },
+        {
+          "$id": "child_type",
+          "type": "parent_type",
+          "properties": {"b": {"type": "integer"}}
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "valid child inherits properties and strictness",
+        "schema_id": "child_type",
+        "data": {"a": 1, "b": 2},
+        "action": "validate",
+        "expect": {"success": true}
+      },
+      {
+        "description": "missing inherited required property fails",
+        "schema_id": "child_type",
+        "data": {"b": 2},
+        "action": "validate",
+        "expect": {"success": false}
+      },
+      {
+        "description": "additional properties fail due to inherited strictness",
+        "schema_id": "child_type",
+        "data": {"a": 1, "b": 2, "c": 3},
+        "action": "validate",
+        "expect": {"success": false}
+      }
+    ]
+  },
+  {
+    "description": "Local Shadowing (Composition & Proxies)",
+    "database": {
+      "schemas": [
+        {
+          "$id": "budget",
+          "type": "object",
+          "properties": {
+            "max": {"type": "integer", "maximum": 100}
+          }
+        },
+        {
+          "$id": "custom_budget",
+          "type": "budget",
+          "properties": {
+            "max": {"type": "integer", "maximum": 50}
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "shadowing override applies (50 is locally allowed)",
+        "schema_id": "custom_budget",
+        "data": {"max": 40},
+        "action": "validate",
+        "expect": {"success": true}
+      },
+      {
+        "description": "shadowing override applies natively, rejecting 60 even though parent allowed 100",
+        "schema_id": "custom_budget",
+        "data": {"max": 60},
+        "action": "validate",
+        "expect": {"success": false}
+      }
+    ]
+  },
+  {
+    "description": "Inline id Resolution",
+    "database": {
+      "schemas": [
+        {
+          "$id": "api.request",
+          "type": "object",
+          "properties": {
+            "inline_obj": {
+              "$id": "inline_nested",
+              "type": "object",
+              "properties": {"foo": {"type": "string"}},
+              "required": ["foo"]
+            },
+            "proxy_obj": {
+              "type": "inline_nested"
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "proxy resolves and validates to the inline component",
+        "schema_id": "api.request",
+        "data": {
+          "inline_obj": {"foo": "bar"},
+          "proxy_obj": {"foo": "baz"}
+        },
+        "action": "validate",
+        "expect": {"success": true}
+      },
+      {
+        "description": "proxy resolves and catches violation targeting inline component constraints",
+        "schema_id": "api.request",
+        "data": {
+          "inline_obj": {"foo": "bar"},
+          "proxy_obj": {}
+        },
+        "action": "validate",
+        "expect": {"success": false}
+      }
+    ]
+  },
+  {
+    "description": "Primitive Array Shorthand (Optionality)",
+    "database": {
+      "schemas": [
+        {
+          "$id": "invoice",
+          "type": "object",
+          "properties": {"amount": {"type": "integer"}},
+          "required": ["amount"]
+        },
+        {
+          "$id": "request",
+          "type": "object",
+          "properties": {
+            "inv": {"type": ["invoice", "null"]}
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "valid object passes shorthand inheritance check",
+        "schema_id": "request",
+        "data": {"inv": {"amount": 5}},
+        "action": "validate",
+        "expect": {"success": true}
+      },
+      {
+        "description": "null passes shorthand inheritance check",
+        "schema_id": "request",
+        "data": {"inv": null},
+        "action": "validate",
+        "expect": {"success": true}
+      },
+      {
+        "description": "invalid object fails inner constraints safely",
+        "schema_id": "request",
+        "data": {"inv": {"amount": "string"}},
+        "action": "validate",
+        "expect": {"success": false}
+      }
+    ]
+  }
+]

fixtures/oneOf.json

@@ -1,670 +0,0 @@
-[
-  {
-    "description": "oneOf",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "minimum": 2
-            }
-          ],
-          "$id": "oneOf_0_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "first oneOf valid",
-        "data": 1,
-        "schema_id": "oneOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "second oneOf valid",
-        "data": 2.5,
-        "schema_id": "oneOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both oneOf valid",
-        "data": 3,
-        "schema_id": "oneOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "neither oneOf valid",
-        "data": 1.5,
-        "schema_id": "oneOf_0_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with base schema",
-    "database": {
-      "schemas": [
-        {
-          "type": "string",
-          "oneOf": [
-            {
-              "minLength": 2
-            },
-            {
-              "maxLength": 4
-            }
-          ],
-          "$id": "oneOf_1_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "mismatch base schema",
-        "data": 3,
-        "schema_id": "oneOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "one oneOf valid",
-        "data": "foobar",
-        "schema_id": "oneOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both oneOf valid",
-        "data": "foo",
-        "schema_id": "oneOf_1_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with boolean schemas, all true",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            true,
-            true,
-            true
-          ],
-          "$id": "oneOf_2_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is invalid",
-        "data": "foo",
-        "schema_id": "oneOf_2_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with boolean schemas, one true",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            true,
-            false,
-            false
-          ],
-          "$id": "oneOf_3_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is valid",
-        "data": "foo",
-        "schema_id": "oneOf_3_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with boolean schemas, more than one true",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            true,
-            true,
-            false
-          ],
-          "$id": "oneOf_4_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is invalid",
-        "data": "foo",
-        "schema_id": "oneOf_4_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with boolean schemas, all false",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            false,
-            false,
-            false
-          ],
-          "$id": "oneOf_5_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is invalid",
-        "data": "foo",
-        "schema_id": "oneOf_5_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf complex types",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            {
-              "properties": {
-                "bar": {
-                  "type": "integer"
-                }
-              },
-              "required": [
-                "bar"
-              ]
-            },
-            {
-              "properties": {
-                "foo": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "foo"
-              ]
-            }
-          ],
-          "$id": "oneOf_6_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "first oneOf valid (complex)",
-        "data": {
-          "bar": 2
-        },
-        "schema_id": "oneOf_6_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "second oneOf valid (complex)",
-        "data": {
-          "foo": "baz"
-        },
-        "schema_id": "oneOf_6_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both oneOf valid (complex)",
-        "data": {
-          "foo": "baz",
-          "bar": 2
-        },
-        "schema_id": "oneOf_6_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "neither oneOf valid (complex)",
-        "data": {
-          "foo": 2,
-          "bar": "quux"
-        },
-        "schema_id": "oneOf_6_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with empty schema",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            {
-              "type": "number"
-            },
-            {}
-          ],
-          "$id": "oneOf_7_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "one valid - valid",
-        "data": "foo",
-        "schema_id": "oneOf_7_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both valid - invalid",
-        "data": 123,
-        "schema_id": "oneOf_7_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with required",
-    "database": {
-      "schemas": [
-        {
-          "type": "object",
-          "properties": {
-            "foo": true,
-            "bar": true,
-            "baz": true
-          },
-          "oneOf": [
-            {
-              "required": [
-                "foo",
-                "bar"
-              ]
-            },
-            {
-              "required": [
-                "foo",
-                "baz"
-              ]
-            }
-          ],
-          "$id": "oneOf_8_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "both invalid - invalid",
-        "data": {
-          "bar": 2
-        },
-        "schema_id": "oneOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "first valid - valid",
-        "data": {
-          "foo": 1,
-          "bar": 2
-        },
-        "schema_id": "oneOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "second valid - valid",
-        "data": {
-          "foo": 1,
-          "baz": 3
-        },
-        "schema_id": "oneOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both valid - invalid",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "baz": 3
-        },
-        "schema_id": "oneOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "extra property invalid (strict)",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "extra": 3
-        },
-        "schema_id": "oneOf_8_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with required (extensible)",
-    "database": {
-      "schemas": [
-        {
-          "type": "object",
-          "extensible": true,
-          "oneOf": [
-            {
-              "required": [
-                "foo",
-                "bar"
-              ]
-            },
-            {
-              "required": [
-                "foo",
-                "baz"
-              ]
-            }
-          ],
-          "$id": "oneOf_9_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "both invalid - invalid",
-        "data": {
-          "bar": 2
-        },
-        "schema_id": "oneOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "first valid - valid",
-        "data": {
-          "foo": 1,
-          "bar": 2
-        },
-        "schema_id": "oneOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "second valid - valid",
-        "data": {
-          "foo": 1,
-          "baz": 3
-        },
-        "schema_id": "oneOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both valid - invalid",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "baz": 3
-        },
-        "schema_id": "oneOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "extra properties are valid (extensible)",
-        "data": {
-          "foo": 1,
-          "bar": 2,
-          "extra": "value"
-        },
-        "schema_id": "oneOf_9_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "oneOf with missing optional property",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            {
-              "properties": {
-                "bar": true,
-                "baz": true
-              },
-              "required": [
-                "bar"
-              ]
-            },
-            {
-              "properties": {
-                "foo": true
-              },
-              "required": [
-                "foo"
-              ]
-            }
-          ],
-          "$id": "oneOf_10_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "first oneOf valid",
-        "data": {
-          "bar": 8
-        },
-        "schema_id": "oneOf_10_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "second oneOf valid",
-        "data": {
-          "foo": "foo"
-        },
-        "schema_id": "oneOf_10_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "both oneOf valid",
-        "data": {
-          "foo": "foo",
-          "bar": 8
-        },
-        "schema_id": "oneOf_10_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "neither oneOf valid",
-        "data": {
-          "baz": "quux"
-        },
-        "schema_id": "oneOf_10_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "nested oneOf, to check validation semantics",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            {
-              "oneOf": [
-                {
-                  "type": "null"
-                }
-              ]
-            }
-          ],
-          "$id": "oneOf_11_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "null is valid",
-        "data": null,
-        "schema_id": "oneOf_11_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "anything non-null is invalid",
-        "data": 123,
-        "schema_id": "oneOf_11_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "extensible: true allows extra properties in oneOf",
-    "database": {
-      "schemas": [
-        {
-          "oneOf": [
-            {
-              "properties": {
-                "bar": {
-                  "type": "integer"
-                }
-              },
-              "required": [
-                "bar"
-              ]
-            },
-            {
-              "properties": {
-                "foo": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "foo"
-              ]
-            }
-          ],
-          "extensible": true,
-          "$id": "oneOf_12_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "extra property is valid (matches first option)",
-        "data": {
-          "bar": 2,
-          "extra": "prop"
-        },
-        "schema_id": "oneOf_12_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  }
-]

fixtures/paths.json

@@ -148,6 +148,10 @@
             {
               "code": "REQUIRED_FIELD_MISSING",
               "details": { "path": "ad_hoc_objects/1/name" }
+            },
+            {
+              "code": "STRICT_PROPERTY_VIOLATION",
+              "details": { "path": "ad_hoc_objects/1/age" }
             }
           ]
         }
@@ -210,5 +214,154 @@
         }
       }
     ]
+  },
+  {
+    "description": "Polymorphic Structure Pathing",
+    "database": {
+      "types": [
+        {
+          "name": "widget",
+          "variations": ["widget"],
+          "schemas": [
+            {
+              "$id": "widget",
+              "type": "object",
+              "properties": {
+                "id": { "type": "string" },
+                "type": { "type": "string" }
+              }
+            },
+            {
+              "$id": "stock.widget",
+              "type": "widget",
+              "properties": {
+                "kind": { "type": "string" },
+                "amount": { "type": "integer" },
+                "details": {
+                  "type": "object",
+                  "properties": {
+                    "nested_metric": { "type": "number" }
+                  },
+                  "required": ["nested_metric"]
+                }
+              },
+              "required": ["amount", "details"]
+            }
+          ]
+        }
+      ],
+      "schemas": [
+        {
+          "$id": "polymorphic_pathing",
+          "type": "object",
+          "properties": {
+            "metadata_bubbles": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  {
+                    "$id": "contact_metadata",
+                    "type": "object",
+                    "properties": {
+                      "type": { "const": "contact" },
+                      "phone": { "type": "string" }
+                    },
+                    "required": ["phone"]
+                  },
+                  {
+                    "$id": "invoice_metadata",
+                    "type": "object",
+                    "properties": {
+                      "type": { "const": "invoice" },
+                      "invoice_id": { "type": "integer" }
+                    },
+                    "required": ["invoice_id"]
+                  }
+                ]
+              }
+            },
+            "table_families": {
+              "type": "array",
+              "items": {
+                "$family": "widget"
+              }
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "oneOf tags natively bubble specific schema paths into deep array roots",
+        "data": {
+          "metadata_bubbles": [
+            { "type": "invoice", "invoice_id": 100 },
+            { "type": "contact", "phone": 12345, "rogue_field": "x" }
+          ]
+        },
+        "schema_id": "polymorphic_pathing",
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "INVALID_TYPE",
+              "details": { "path": "metadata_bubbles/1/phone" }
+            },
+            {
+              "code": "STRICT_PROPERTY_VIOLATION",
+              "details": { "path": "metadata_bubbles/1/rogue_field" }
+            }
+          ]
+        }
+      },
+      {
+        "description": "families mechanically map physical variants directly onto topological uuid array paths",
+        "data": {
+          "table_families": [
+            {
+              "id": "widget-1",
+              "type": "widget",
+              "kind": "stock",
+              "amount": 500,
+              "details": { "nested_metric": 42.0 }
+            },
+            {
+              "id": "widget-2",
+              "type": "widget",
+              "kind": "stock",
+              "amount": "not_an_int",
+              "details": {
+                 "stray_child": true
+              },
+              "unexpected_root_prop": "hi"
+            }
+          ]
+        },
+        "schema_id": "polymorphic_pathing",
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "INVALID_TYPE",
+              "details": { "path": "table_families/widget-2/amount" }
+            },
+            {
+              "code": "REQUIRED_FIELD_MISSING",
+              "details": { "path": "table_families/widget-2/details/nested_metric" }
+            },
+            {
+              "code": "STRICT_PROPERTY_VIOLATION",
+              "details": { "path": "table_families/widget-2/details/stray_child" }
+            },
+            {
+              "code": "STRICT_PROPERTY_VIOLATION",
+              "details": { "path": "table_families/widget-2/unexpected_root_prop" }
+            }
+          ]
+        }
+      }
+    ]
   }
 ]

fixtures/polymorphism.json

@@ -0,0 +1,487 @@
+[
+  {
+    "description": "Vertical $family Routing (Across Tables)",
+    "database": {
+      "types": [
+        {
+          "name": "entity",
+          "variations": ["entity", "organization", "person", "bot"],
+          "schemas": [
+            {
+              "$id": "entity",
+              "type": "object",
+              "properties": {
+                "type": { "type": "string" },
+                "id": { "type": "string" }
+              }
+            }
+          ]
+        },
+        {
+          "name": "organization",
+          "variations": ["organization", "person"],
+          "schemas": [
+            {
+              "$id": "organization",
+              "type": "entity",
+              "properties": {
+                "name": { "type": "string" }
+              }
+            }
+          ]
+        },
+        {
+          "name": "person",
+          "variations": ["person"],
+          "schemas": [
+            {
+              "$id": "person",
+              "type": "organization",
+              "properties": {
+                "first_name": { "type": "string" }
+              }
+            }
+          ]
+        },
+        {
+          "name": "bot",
+          "variations": ["bot"],
+          "schemas": [
+            {
+              "$id": "bot",
+              "type": "entity",
+              "properties": {
+                "model": { "type": "string" }
+              }
+            }
+          ]
+        }
+      ],
+      "schemas": [
+        {
+          "$id": "family_entity",
+          "$family": "entity"
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Matches base entity",
+        "schema_id": "family_entity",
+        "data": { "type": "entity", "id": "1" },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Matches descendant person natively",
+        "schema_id": "family_entity",
+        "data": { "type": "person", "id": "2", "first_name": "Bob" },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Missing type fails out immediately",
+        "schema_id": "family_entity",
+        "data": { "id": "3", "first_name": "Bob" },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "MISSING_TYPE", "details": { "path": "" } } ] }
+      },
+      {
+        "description": "Alias matching failure",
+        "schema_id": "family_entity",
+        "data": { "type": "alien", "id": "4" },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "NO_FAMILY_MATCH", "details": { "path": "" } } ] }
+      }
+    ]
+  },
+  {
+    "description": "Matrix $family Routing (Vertical + Horizontal Intersections)",
+    "database": {
+      "types": [
+        {
+          "name": "entity",
+          "variations": ["entity", "organization", "person", "bot"],
+          "schemas": [
+            {
+              "$id": "entity",
+              "type": "object",
+              "properties": {
+                "type": { "type": "string" }
+              }
+            },
+            {
+              "$id": "light.entity",
+              "type": "entity",
+              "properties": {
+                "kind": { "type": "string" }
+              }
+            }
+          ]
+        },
+        {
+          "name": "organization",
+          "variations": ["organization", "person"],
+          "schemas": [
+            {
+              "$id": "organization",
+              "type": "entity"
+            },
+            {
+              "$id": "light.organization",
+              "type": "light.entity"
+            }
+          ]
+        },
+        {
+          "name": "person",
+          "variations": ["person"],
+          "schemas": [
+            {
+              "$id": "person",
+              "type": "organization"
+            },
+            {
+              "$id": "light.person",
+              "type": "light.organization"
+            }
+          ]
+        },
+        {
+          "name": "bot",
+          "variations": ["bot"],
+          "schemas": [
+            {
+              "$id": "bot",
+              "type": "entity"
+            },
+            {
+              "$id": "light.bot",
+              "type": "light.entity"
+            }
+          ]
+        }
+      ],
+      "schemas": [
+        {
+          "$id": "family_light_org",
+          "$family": "light.organization"
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Matches light.organization exact matrix target",
+        "schema_id": "family_light_org",
+        "data": { "type": "organization", "kind": "light" },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Matches descendant light.person through matrix evaluation",
+        "schema_id": "family_light_org",
+        "data": { "type": "person", "kind": "light" },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Structurally fails to route bot (bot is not descendant of organization)",
+        "schema_id": "family_light_org",
+        "data": { "type": "bot", "kind": "light" },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "NO_FAMILY_MATCH", "details": { "path": "" } } ] }
+      }
+    ]
+  },
+  {
+    "description": "Horizontal $family Routing (Virtual Variations)",
+    "database": {
+      "types": [
+        {
+          "name": "widget",
+          "variations": ["widget"],
+          "schemas": [
+            {
+              "$id": "widget",
+              "type": "object",
+              "properties": {
+                "type": { "type": "string" }
+              }
+            },
+            {
+              "$id": "stock.widget",
+              "type": "widget",
+              "properties": {
+                "kind": { "type": "string" },
+                "amount": { "type": "integer" }
+              }
+            },
+            {
+              "$id": "super_stock.widget",
+              "type": "stock.widget",
+              "properties": {
+                "super_amount": { "type": "integer" }
+              }
+            }
+          ]
+        }
+      ],
+      "schemas": [
+        {
+          "$id": "family_widget",
+          "$family": "widget"
+        },
+        {
+          "$id": "family_stock_widget",
+          "$family": "stock.widget"
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Base widget resolves stock widget horizontally",
+        "schema_id": "family_widget",
+        "data": { "type": "widget", "kind": "stock", "amount": 5 },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Base widget resolves nested super stock widget natively via descendants crawl",
+        "schema_id": "family_widget",
+        "data": { "type": "widget", "kind": "super_stock", "amount": 5, "super_amount": 10 },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "stock.widget explicit family resolves nested super stock via fast path",
+        "schema_id": "family_stock_widget",
+        "data": { "type": "widget", "kind": "super_stock", "amount": 5, "super_amount": 10 },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "stock.widget fails when presented an invalid payload constraint",
+        "schema_id": "family_stock_widget",
+        "data": { "type": "widget", "kind": "super_stock", "amount": 5, "super_amount": "not_an_int" },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "INVALID_TYPE", "details": { "path": "super_amount" } } ] }
+      }
+    ]
+  },
+  {
+    "description": "Strict oneOf Punc Pointers (Tagged Unions)",
+    "database": {
+      "types": [
+        {
+          "name": "entity",
+          "variations": ["entity", "person", "bot"],
+          "schemas": [
+            {
+              "$id": "entity",
+              "type": "object",
+              "properties": {
+                "type": { "type": "string" }
+              }
+            }
+          ]
+        },
+        {
+          "name": "person",
+          "variations": ["person"],
+          "schemas": [
+            {
+              "$id": "person",
+              "type": "entity"
+            },
+            {
+              "$id": "full.person",
+              "type": "person",
+              "properties": {
+                "kind": { "type": "string" },
+                "age": { "type": "integer" }
+              },
+              "required": ["age"]
+            }
+          ]
+        },
+        {
+          "name": "bot",
+          "variations": ["bot"],
+          "schemas": [
+            {
+              "$id": "bot",
+              "type": "entity"
+            },
+            {
+              "$id": "full.bot",
+              "type": "bot",
+              "properties": {
+                "kind": { "type": "string" },
+                "version": { "type": "string" }
+              },
+              "required": ["version"]
+            }
+          ]
+        }
+      ],
+      "schemas": [
+        {
+          "$id": "oneOf_union",
+          "oneOf": [
+            { "type": "full.person" },
+            { "type": "full.bot" }
+          ]
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Throws MISSING_TYPE if discriminator matches neither",
+        "schema_id": "oneOf_union",
+        "data": { "kind": "full", "age": 5 },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "MISSING_TYPE", "details": { "path": "" } } ] }
+      },
+      {
+        "description": "Golden match throws pure structural error exclusively on person",
+        "schema_id": "oneOf_union",
+        "data": { "type": "person", "kind": "full", "age": "five" },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "INVALID_TYPE", "details": { "path": "age" } } ] }
+      },
+      {
+        "description": "Golden matches perfectly",
+        "schema_id": "oneOf_union",
+        "data": { "type": "person", "kind": "full", "age": 5 },
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Fails nicely with NO_ONEOF_MATCH",
+        "schema_id": "oneOf_union",
+        "data": { "type": "alien", "kind": "full", "age": 5 },
+        "action": "validate",
+        "expect": { "success": false, "errors": [ { "code": "NO_ONEOF_MATCH", "details": { "path": "" } } ] }
+      }
+    ]
+  },
+  {
+    "description": "JSONB Field Bubble oneOf Discrimination (Promoted IDs)",
+    "database": {
+      "schemas": [
+        {
+          "$id": "metadata",
+          "type": "object",
+          "properties": {
+            "type": { "type": "string" }
+          }
+        },
+        {
+          "$id": "invoice.metadata",
+          "type": "metadata",
+          "properties": {
+            "invoice_id": { "type": "integer" }
+          },
+          "required": ["invoice_id"]
+        },
+        {
+          "$id": "payment.metadata",
+          "type": "metadata",
+          "properties": {
+            "payment_id": { "type": "integer" }
+          },
+          "required": ["payment_id"]
+        },
+        {
+          "$id": "oneOf_bubble",
+          "oneOf": [
+            { "type": "invoice.metadata" },
+            { "type": "payment.metadata" }
+          ]
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Extracts golden match natively from explicit JSONB type discriminator",
+        "schema_id": "oneOf_bubble",
+        "data": { "type": "invoice.metadata", "invoice_id": "nan" },
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [ { "code": "INVALID_TYPE", "details": { "path": "invoice_id" } } ]
+        }
+      },
+      {
+        "description": "Valid payload succeeds perfectly in JSONB universe",
+        "schema_id": "oneOf_bubble",
+        "data": { "type": "payment.metadata", "payment_id": 123 },
+        "action": "validate",
+        "expect": { "success": true }
+      }
+    ]
+  },
+  {
+    "description": "Standard JSON Schema oneOf",
+    "database": {
+      "schemas": [
+        {
+          "$id": "oneOf_scalars",
+          "oneOf": [
+            { "type": "integer" },
+            { "minimum": 2 }
+          ]
+        },
+        {
+          "$id": "oneOf_dedupe",
+          "oneOf": [
+            {
+              "type": "object",
+              "properties": {
+                "shared": { "type": "integer" }
+              },
+              "required": ["shared"]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "shared": { "type": "integer" },
+                "extra": { "type": "string" }
+              },
+              "required": ["shared", "extra"]
+            }
+          ]
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Valid exclusively against first scalar choice",
+        "schema_id": "oneOf_scalars",
+        "data": 1,
+        "action": "validate",
+        "expect": { "success": true }
+      },
+      {
+        "description": "Fails mathematically if matches both schemas natively",
+        "schema_id": "oneOf_scalars",
+        "data": 3,
+        "action": "validate",
+        "expect": { "success": false }
+      },
+      {
+        "description": "Deduper merges shared errors dynamically exactly like JSON Schema",
+        "schema_id": "oneOf_dedupe",
+        "data": { "shared": "nan" },
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            { "code": "NO_ONEOF_MATCH", "details": { "path": "" } },
+            { "code": "INVALID_TYPE", "details": { "path": "shared" } }
+          ]
+        }
+      }
+    ]
+  }
+]

fixtures/queryer.json

@@ -8,7 +8,7 @@
           "schemas": [
             {
               "$id": "get_organization.response",
-              "$ref": "organization"
+              "type": "organization"
             }
           ]
         },
@@ -25,11 +25,20 @@
           ]
         },
         {
-          "name": "get_person",
+          "name": "get_light_organization",
           "schemas": [
             {
-              "$id": "get_person.response",
-              "$family": "person"
+              "$id": "get_light_organization.response",
+              "$family": "light.organization"
+            }
+          ]
+        },
+        {
+          "name": "get_full_organization",
+          "schemas": [
+            {
+              "$id": "get_full_organization.response",
+              "$family": "full.organization"
             }
           ]
         },
@@ -40,7 +49,19 @@
               "$id": "get_orders.response",
               "type": "array",
               "items": {
-                "$ref": "light.order"
+                "type": "light.order"
+              }
+            }
+          ]
+        },
+        {
+          "name": "get_widgets",
+          "schemas": [
+            {
+              "$id": "get_widgets.response",
+              "type": "array",
+              "items": {
+                "$family": "widget"
               }
             }
           ]
@@ -238,7 +259,7 @@
           "schemas": [
             {
               "$id": "organization",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {
                 "name": {
                   "type": "string"
@@ -260,7 +281,9 @@
             "type",
             "name",
             "archived",
-            "created_at"
+            "created_at",
+            "token",
+            "role"
           ],
           "grouped_fields": {
             "entity": [
@@ -273,7 +296,8 @@
               "name"
             ],
             "bot": [
-              "token"
+              "token",
+              "role"
             ]
           },
           "field_types": {
@@ -282,12 +306,25 @@
             "archived": "boolean",
             "name": "text",
             "token": "text",
+            "role": "text",
             "created_at": "timestamptz"
           },
           "schemas": [
             {
               "$id": "bot",
-              "$ref": "organization",
+              "type": "organization",
+              "properties": {
+                "token": {
+                  "type": "string"
+                },
+                "role": {
+                  "type": "string"
+                }
+              }
+            },
+            {
+              "$id": "light.bot",
+              "type": "organization",
               "properties": {
                 "token": {
                   "type": "string"
@@ -345,7 +382,7 @@
           "schemas": [
             {
               "$id": "person",
-              "$ref": "organization",
+              "type": "organization",
               "properties": {
                 "first_name": {
                   "type": "string"
@@ -360,20 +397,27 @@
             },
             {
               "$id": "light.person",
-              "$ref": "person",
-              "properties": {}
+              "type": "organization",
+              "properties": {
+                "first_name": {
+                  "type": "string"
+                },
+                "last_name": {
+                  "type": "string"
+                }
+              }
             },
             {
               "$id": "full.person",
-              "$ref": "person",
+              "type": "person",
               "properties": {
                 "phone_numbers": {
                   "type": "array",
                   "items": {
-                    "$ref": "contact",
+                    "type": "contact",
                     "properties": {
                       "target": {
-                        "$ref": "phone_number"
+                        "type": "phone_number"
                       }
                     }
                   }
@@ -381,10 +425,10 @@
                 "email_addresses": {
                   "type": "array",
                   "items": {
-                    "$ref": "contact",
+                    "type": "contact",
                     "properties": {
                       "target": {
-                        "$ref": "email_address"
+                        "type": "email_address"
                       }
                     }
                   }
@@ -392,10 +436,10 @@
                 "addresses": {
                   "type": "array",
                   "items": {
-                    "$ref": "contact",
+                    "type": "contact",
                     "properties": {
                       "target": {
-                        "$ref": "address"
+                        "type": "address"
                       }
                     }
                   }
@@ -403,18 +447,18 @@
                 "contacts": {
                   "type": "array",
                   "items": {
-                    "$ref": "contact",
+                    "type": "contact",
                     "properties": {
                       "target": {
                         "oneOf": [
                           {
-                            "$ref": "phone_number"
+                            "type": "phone_number"
                           },
                           {
-                            "$ref": "email_address"
+                            "type": "email_address"
                           },
                           {
-                            "$ref": "address"
+                            "type": "address"
                           }
                         ]
                       }
@@ -472,7 +516,7 @@
           "schemas": [
             {
               "$id": "relationship",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {}
             }
           ],
@@ -531,7 +575,7 @@
           "schemas": [
             {
               "$id": "contact",
-              "$ref": "relationship",
+              "type": "relationship",
               "properties": {
                 "is_primary": {
                   "type": "boolean"
@@ -577,7 +621,7 @@
           "schemas": [
             {
               "$id": "phone_number",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {
                 "number": {
                   "type": "string"
@@ -623,7 +667,7 @@
           "schemas": [
             {
               "$id": "email_address",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {
                 "address": {
                   "type": "string"
@@ -669,7 +713,7 @@
           "schemas": [
             {
               "$id": "address",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {
                 "city": {
                   "type": "string"
@@ -686,7 +730,7 @@
           "schemas": [
             {
               "$id": "order",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {
                 "total": {
                   "type": "number"
@@ -698,24 +742,24 @@
             },
             {
               "$id": "light.order",
-              "$ref": "order",
+              "type": "order",
               "properties": {
                 "customer": {
-                  "$ref": "person"
+                  "type": "person"
                 }
               }
             },
             {
               "$id": "full.order",
-              "$ref": "order",
+              "type": "order",
               "properties": {
                 "customer": {
-                  "$ref": "person"
+                  "type": "person"
                 },
                 "lines": {
                   "type": "array",
                   "items": {
-                    "$ref": "order_line"
+                    "type": "order_line"
                   }
                 }
               }
@@ -784,7 +828,7 @@
           "schemas": [
             {
               "$id": "order_line",
-              "$ref": "entity",
+              "type": "entity",
               "properties": {
                 "order_id": {
                   "type": "string"
@@ -850,6 +894,70 @@
           "variations": [
             "order_line"
           ]
+        },
+        {
+          "name": "widget",
+          "hierarchy": [
+            "widget",
+            "entity"
+          ],
+          "fields": [
+            "id",
+            "type",
+            "kind",
+            "archived",
+            "created_at"
+          ],
+          "grouped_fields": {
+            "entity": [
+              "id",
+              "type",
+              "archived",
+              "created_at"
+            ],
+            "widget": [
+              "kind"
+            ]
+          },
+          "field_types": {
+            "id": "uuid",
+            "type": "text",
+            "kind": "text",
+            "archived": "boolean",
+            "created_at": "timestamptz"
+          },
+          "variations": [
+            "widget"
+          ],
+          "schemas": [
+            {
+              "$id": "widget",
+              "type": "entity",
+              "properties": {
+                "kind": {
+                  "type": "string"
+                }
+              }
+            },
+            {
+              "$id": "stock.widget",
+              "type": "widget",
+              "properties": {
+                "kind": {
+                  "const": "stock"
+                }
+              }
+            },
+            {
+              "$id": "tasks.widget",
+              "type": "widget",
+              "properties": {
+                "kind": {
+                  "const": "tasks"
+                }
+              }
+            }
+          ]
         }
       ]
     },
@@ -862,13 +970,13 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'archived', entity_1.archived,",
               "    'created_at', entity_1.created_at,",
               "    'id', entity_1.id,",
               "    'type', entity_1.type)",
               "FROM agreego.entity entity_1",
-              "WHERE NOT entity_1.archived)"
+              "WHERE NOT entity_1.archived)))"
             ]
           ]
         }
@@ -905,7 +1013,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'archived', entity_1.archived,",
               "    'created_at', entity_1.created_at,",
               "    'id', entity_1.id,",
@@ -926,7 +1034,7 @@
               "    AND entity_1.id IN (SELECT value::uuid FROM jsonb_array_elements_text(($10#>>'{}')::jsonb))",
               "    AND entity_1.id != ($11#>>'{}')::uuid",
               "    AND entity_1.id NOT IN (SELECT value::uuid FROM jsonb_array_elements_text(($12#>>'{}')::jsonb))",
-              ")"
+              ")))"
             ]
           ]
         }
@@ -939,7 +1047,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'age', person_1.age,",
               "    'archived', entity_3.archived,",
               "    'created_at', entity_3.created_at,",
@@ -951,7 +1059,7 @@
               "FROM agreego.person person_1",
               "JOIN agreego.organization organization_2 ON organization_2.id = person_1.id",
               "JOIN agreego.entity entity_3 ON entity_3.id = organization_2.id",
-              "WHERE NOT entity_3.archived)"
+              "WHERE NOT entity_3.archived)))"
             ]
           ]
         }
@@ -964,7 +1072,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'addresses',",
               "    (SELECT COALESCE(jsonb_agg(jsonb_build_object(",
               "        'archived', entity_6.archived,",
@@ -1004,17 +1112,17 @@
               "        'target', CASE",
               "            WHEN entity_11.target_type = 'address' THEN",
               "                ((SELECT jsonb_build_object(",
-              "                     'archived', entity_17.archived,",
-              "                     'city', address_16.city,",
-              "                     'created_at', entity_17.created_at,",
-              "                     'id', entity_17.id,",
-              "                     'type', entity_17.type",
+              "                     'archived', entity_13.archived,",
+              "                     'city', address_12.city,",
+              "                     'created_at', entity_13.created_at,",
+              "                     'id', entity_13.id,",
+              "                     'type', entity_13.type",
               "                 )",
-              "                 FROM agreego.address address_16",
-              "                 JOIN agreego.entity entity_17 ON entity_17.id = address_16.id",
+              "                 FROM agreego.address address_12",
+              "                 JOIN agreego.entity entity_13 ON entity_13.id = address_12.id",
               "                 WHERE",
-              "                     NOT entity_17.archived",
-              "                     AND relationship_10.target_id = entity_17.id))",
+              "                     NOT entity_13.archived",
+              "                     AND relationship_10.target_id = entity_13.id))",
               "            WHEN entity_11.target_type = 'email_address' THEN",
               "                ((SELECT jsonb_build_object(",
               "                     'address', email_address_14.address,",
@@ -1030,17 +1138,17 @@
               "                     AND relationship_10.target_id = entity_15.id))",
               "            WHEN entity_11.target_type = 'phone_number' THEN",
               "                ((SELECT jsonb_build_object(",
-              "                     'archived', entity_13.archived,",
-              "                     'created_at', entity_13.created_at,",
-              "                     'id', entity_13.id,",
-              "                     'number', phone_number_12.number,",
-              "                     'type', entity_13.type",
+              "                     'archived', entity_17.archived,",
+              "                     'created_at', entity_17.created_at,",
+              "                     'id', entity_17.id,",
+              "                     'number', phone_number_16.number,",
+              "                     'type', entity_17.type",
               "                 )",
-              "                 FROM agreego.phone_number phone_number_12",
-              "                 JOIN agreego.entity entity_13 ON entity_13.id = phone_number_12.id",
+              "                 FROM agreego.phone_number phone_number_16",
+              "                 JOIN agreego.entity entity_17 ON entity_17.id = phone_number_16.id",
               "                 WHERE",
-              "                     NOT entity_13.archived",
-              "                     AND relationship_10.target_id = entity_13.id))",
+              "                     NOT entity_17.archived",
+              "                     AND relationship_10.target_id = entity_17.id))",
               "            ELSE NULL END,",
               "        'type', entity_11.type",
               "    )), '[]'::jsonb)",
@@ -1116,7 +1224,7 @@
               "FROM agreego.person person_1",
               "JOIN agreego.organization organization_2 ON organization_2.id = person_1.id",
               "JOIN agreego.entity entity_3 ON entity_3.id = organization_2.id",
-              "WHERE NOT entity_3.archived)"
+              "WHERE NOT entity_3.archived)))"
             ]
           ]
         }
@@ -1200,7 +1308,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'addresses',",
               "    (SELECT COALESCE(jsonb_agg(jsonb_build_object(",
               "        'archived', entity_6.archived,",
@@ -1240,17 +1348,17 @@
               "        'target', CASE",
               "            WHEN entity_11.target_type = 'address' THEN",
               "                ((SELECT jsonb_build_object(",
-              "                     'archived', entity_17.archived,",
-              "                     'city', address_16.city,",
-              "                     'created_at', entity_17.created_at,",
-              "                     'id', entity_17.id,",
-              "                     'type', entity_17.type",
+              "                     'archived', entity_13.archived,",
+              "                     'city', address_12.city,",
+              "                     'created_at', entity_13.created_at,",
+              "                     'id', entity_13.id,",
+              "                     'type', entity_13.type",
               "                 )",
-              "                 FROM agreego.address address_16",
-              "                 JOIN agreego.entity entity_17 ON entity_17.id = address_16.id",
+              "                 FROM agreego.address address_12",
+              "                 JOIN agreego.entity entity_13 ON entity_13.id = address_12.id",
               "                 WHERE",
-              "                     NOT entity_17.archived",
-              "                     AND relationship_10.target_id = entity_17.id))",
+              "                     NOT entity_13.archived",
+              "                     AND relationship_10.target_id = entity_13.id))",
               "            WHEN entity_11.target_type = 'email_address' THEN",
               "                ((SELECT jsonb_build_object(",
               "                     'address', email_address_14.address,",
@@ -1266,17 +1374,17 @@
               "                     AND relationship_10.target_id = entity_15.id))",
               "            WHEN entity_11.target_type = 'phone_number' THEN",
               "                ((SELECT jsonb_build_object(",
-              "                     'archived', entity_13.archived,",
-              "                     'created_at', entity_13.created_at,",
-              "                     'id', entity_13.id,",
-              "                     'number', phone_number_12.number,",
-              "                     'type', entity_13.type",
+              "                     'archived', entity_17.archived,",
+              "                     'created_at', entity_17.created_at,",
+              "                     'id', entity_17.id,",
+              "                     'number', phone_number_16.number,",
+              "                     'type', entity_17.type",
               "                 )",
-              "                 FROM agreego.phone_number phone_number_12",
-              "                 JOIN agreego.entity entity_13 ON entity_13.id = phone_number_12.id",
+              "                 FROM agreego.phone_number phone_number_16",
+              "                 JOIN agreego.entity entity_17 ON entity_17.id = phone_number_16.id",
               "                 WHERE",
-              "                     NOT entity_13.archived",
-              "                     AND relationship_10.target_id = entity_13.id))",
+              "                     NOT entity_17.archived",
+              "                     AND relationship_10.target_id = entity_17.id))",
               "            ELSE NULL END,",
               "        'type', entity_11.type",
               "    )), '[]'::jsonb)",
@@ -1385,7 +1493,7 @@
               "    AND entity_3.id != ($28#>>'{}')::uuid",
               "    AND entity_3.id NOT IN (SELECT value::uuid FROM jsonb_array_elements_text(($29#>>'{}')::jsonb))",
               "    AND person_1.last_name ILIKE $30#>>'{}'",
-              "    AND person_1.last_name NOT ILIKE $31#>>'{}')"
+              "    AND person_1.last_name NOT ILIKE $31#>>'{}')))"
             ]
           ]
         }
@@ -1398,7 +1506,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'archived', entity_3.archived,",
               "    'created_at', entity_3.created_at,",
               "    'id', entity_3.id,",
@@ -1423,7 +1531,7 @@
               "JOIN agreego.entity entity_3 ON entity_3.id = relationship_2.id",
               "WHERE",
               "    NOT entity_3.archived",
-              "    AND relationship_2.target_type = 'email_address')"
+              "    AND relationship_2.target_type = 'email_address')))"
             ]
           ]
         }
@@ -1436,7 +1544,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'archived', entity_2.archived,",
               "    'created_at', entity_2.created_at,",
               "    'customer',",
@@ -1478,7 +1586,7 @@
               ")",
               "FROM agreego.order order_1",
               "JOIN agreego.entity entity_2 ON entity_2.id = order_1.id",
-              "WHERE NOT entity_2.archived)"
+              "WHERE NOT entity_2.archived)))"
             ]
           ]
         }
@@ -1491,7 +1599,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT jsonb_build_object(",
               "    'archived', entity_2.archived,",
               "    'created_at', entity_2.created_at,",
               "    'id', entity_2.id,",
@@ -1500,7 +1608,7 @@
               ")",
               "FROM agreego.organization organization_1",
               "JOIN agreego.entity entity_2 ON entity_2.id = organization_1.id",
-              "WHERE NOT entity_2.archived)"
+              "WHERE NOT entity_2.archived)))"
             ]
           ]
         }
@@ -1513,79 +1621,288 @@
           "success": true,
           "sql": [
             [
-              "(SELECT COALESCE(jsonb_agg(jsonb_build_object(",
-              "    'id', organization_1.id,",
-              "    'type', CASE",
-              "        WHEN organization_1.type = 'bot' THEN",
-              "            ((SELECT jsonb_build_object(",
-              "                 'archived', entity_5.archived,",
-              "                 'created_at', entity_5.created_at,",
-              "                 'id', entity_5.id,",
-              "                 'name', organization_4.name,",
-              "                 'token', bot_3.token,",
-              "                 'type', entity_5.type",
-              "             )",
-              "             FROM agreego.bot bot_3",
-              "             JOIN agreego.organization organization_4 ON organization_4.id = bot_3.id",
-              "             JOIN agreego.entity entity_5 ON entity_5.id = organization_4.id",
-              "             WHERE NOT entity_5.archived))",
-              "        WHEN organization_1.type = 'organization' THEN",
-              "            ((SELECT jsonb_build_object(",
-              "                 'archived', entity_7.archived,",
-              "                 'created_at', entity_7.created_at,",
-              "                 'id', entity_7.id,",
-              "                 'name', organization_6.name,",
-              "                 'type', entity_7.type",
-              "             )",
-              "             FROM agreego.organization organization_6",
-              "             JOIN agreego.entity entity_7 ON entity_7.id = organization_6.id",
-              "             WHERE NOT entity_7.archived))",
-              "        WHEN organization_1.type = 'person' THEN",
-              "            ((SELECT jsonb_build_object(",
-              "                 'age', person_8.age,",
-              "                 'archived', entity_10.archived,",
-              "                 'created_at', entity_10.created_at,",
-              "                 'first_name', person_8.first_name,",
-              "                 'id', entity_10.id,",
-              "                 'last_name', person_8.last_name,",
-              "                 'name', organization_9.name,",
-              "                 'type', entity_10.type",
-              "             )",
-              "             FROM agreego.person person_8",
-              "             JOIN agreego.organization organization_9 ON organization_9.id = person_8.id",
-              "             JOIN agreego.entity entity_10 ON entity_10.id = organization_9.id",
-              "             WHERE NOT entity_10.archived))",
-              "        ELSE NULL END",
-              ")), '[]'::jsonb)",
+              "(SELECT jsonb_strip_nulls((SELECT COALESCE(jsonb_agg(",
+              "    CASE",
+              "        WHEN organization_1.type = 'bot' THEN (",
+              "            (SELECT jsonb_build_object(",
+              "                'archived', entity_5.archived,",
+              "                'created_at', entity_5.created_at,",
+              "                'id', entity_5.id,",
+              "                'name', organization_4.name,",
+              "                'role', bot_3.role,",
+              "                'token', bot_3.token,",
+              "                'type', entity_5.type",
+              "            )",
+              "            FROM agreego.bot bot_3",
+              "            JOIN agreego.organization organization_4 ON organization_4.id = bot_3.id",
+              "            JOIN agreego.entity entity_5 ON entity_5.id = organization_4.id",
+              "            WHERE",
+              "                NOT entity_5.archived",
+              "                AND entity_5.id = entity_2.id)",
+              "        )",
+              "        WHEN organization_1.type = 'organization' THEN (",
+              "            (SELECT jsonb_build_object(",
+              "                'archived', entity_7.archived,",
+              "                'created_at', entity_7.created_at,",
+              "                'id', entity_7.id,",
+              "                'name', organization_6.name,",
+              "                'type', entity_7.type",
+              "            )",
+              "            FROM agreego.organization organization_6",
+              "            JOIN agreego.entity entity_7 ON entity_7.id = organization_6.id",
+              "            WHERE",
+              "                NOT entity_7.archived",
+              "                AND entity_7.id = entity_2.id)",
+              "        )",
+              "        WHEN organization_1.type = 'person' THEN (",
+              "            (SELECT jsonb_build_object(",
+              "                'age', person_8.age,",
+              "                'archived', entity_10.archived,",
+              "                'created_at', entity_10.created_at,",
+              "                'first_name', person_8.first_name,",
+              "                'id', entity_10.id,",
+              "                'last_name', person_8.last_name,",
+              "                'name', organization_9.name,",
+              "                'type', entity_10.type",
+              "            )",
+              "            FROM agreego.person person_8",
+              "            JOIN agreego.organization organization_9 ON organization_9.id = person_8.id",
+              "            JOIN agreego.entity entity_10 ON entity_10.id = organization_9.id",
+              "            WHERE",
+              "                NOT entity_10.archived",
+              "                AND entity_10.id = entity_2.id)",
+              "        )",
+              "        ELSE NULL",
+              "    END",
+              "), '[]'::jsonb)",
               "FROM agreego.organization organization_1",
               "JOIN agreego.entity entity_2 ON entity_2.id = organization_1.id",
-              "WHERE NOT entity_2.archived)"
+              "WHERE NOT entity_2.archived)))"
             ]
           ]
         }
       },
       {
-        "description": "Person select via a punc response with family",
+        "description": "Light organizations select via a punc response with family",
         "action": "query",
-        "schema_id": "get_person.response",
+        "schema_id": "get_light_organization.response",
         "expect": {
           "success": true,
           "sql": [
             [
-              "(SELECT jsonb_build_object(",
-              "    'age', person_1.age,",
-              "    'archived', entity_3.archived,",
-              "    'created_at', entity_3.created_at,",
-              "    'first_name', person_1.first_name,",
-              "    'id', entity_3.id,",
-              "    'last_name', person_1.last_name,",
-              "    'name', organization_2.name,",
-              "    'type', entity_3.type",
-              ")",
-              "FROM agreego.person person_1",
-              "JOIN agreego.organization organization_2 ON organization_2.id = person_1.id",
-              "JOIN agreego.entity entity_3 ON entity_3.id = organization_2.id",
-              "WHERE NOT entity_3.archived)"
+              "(SELECT jsonb_strip_nulls((SELECT ",
+              "    CASE",
+              "        WHEN organization_1.type = 'bot' THEN (",
+              "            (SELECT jsonb_build_object(",
+              "                'archived', entity_5.archived,",
+              "                'created_at', entity_5.created_at,",
+              "                'id', entity_5.id,",
+              "                'name', organization_4.name,",
+              "                'token', bot_3.token,",
+              "                'type', entity_5.type",
+              "            )",
+              "            FROM agreego.bot bot_3",
+              "            JOIN agreego.organization organization_4 ON organization_4.id = bot_3.id",
+              "            JOIN agreego.entity entity_5 ON entity_5.id = organization_4.id",
+              "            WHERE NOT entity_5.archived AND entity_5.id = entity_2.id)",
+              "        )",
+              "        WHEN organization_1.type = 'person' THEN (",
+              "            (SELECT jsonb_build_object(",
+              "                'archived', entity_8.archived,",
+              "                'created_at', entity_8.created_at,",
+              "                'first_name', person_6.first_name,",
+              "                'id', entity_8.id,",
+              "                'last_name', person_6.last_name,",
+              "                'name', organization_7.name,",
+              "                'type', entity_8.type",
+              "            )",
+              "            FROM agreego.person person_6",
+              "            JOIN agreego.organization organization_7 ON organization_7.id = person_6.id",
+              "            JOIN agreego.entity entity_8 ON entity_8.id = organization_7.id",
+              "            WHERE NOT entity_8.archived AND entity_8.id = entity_2.id)",
+              "        )",
+              "        ELSE NULL",
+              "    END",
+              "FROM agreego.organization organization_1",
+              "JOIN agreego.entity entity_2 ON entity_2.id = organization_1.id",
+              "WHERE NOT entity_2.archived)))"
+            ]
+          ]
+        }
+      },
+      {
+        "description": "Full organizations select via a punc response with family",
+        "action": "query",
+        "schema_id": "get_full_organization.response",
+        "expect": {
+          "success": true,
+          "sql": [
+            [
+              "(SELECT jsonb_strip_nulls((SELECT CASE",
+              "    WHEN organization_1.type = 'person' THEN (",
+              "    (SELECT jsonb_build_object(",
+              "        'addresses',",
+              "        (SELECT COALESCE(jsonb_agg(jsonb_build_object(",
+              "            'archived', entity_8.archived,",
+              "            'created_at', entity_8.created_at,",
+              "            'id', entity_8.id,",
+              "            'is_primary', contact_6.is_primary,",
+              "            'target',",
+              "            (SELECT jsonb_build_object(",
+              "                'archived', entity_10.archived,",
+              "                'city', address_9.city,",
+              "                'created_at', entity_10.created_at,",
+              "                'id', entity_10.id,",
+              "                'type', entity_10.type",
+              "            )",
+              "            FROM agreego.address address_9",
+              "            JOIN agreego.entity entity_10 ON entity_10.id = address_9.id",
+              "            WHERE",
+              "                NOT entity_10.archived",
+              "                AND relationship_7.target_id = entity_10.id),",
+              "            'type', entity_8.type",
+              "        )), '[]'::jsonb)",
+              "        FROM agreego.contact contact_6",
+              "        JOIN agreego.relationship relationship_7 ON relationship_7.id = contact_6.id",
+              "        JOIN agreego.entity entity_8 ON entity_8.id = relationship_7.id",
+              "        WHERE",
+              "            NOT entity_8.archived",
+              "            AND relationship_7.target_type = 'address'",
+              "            AND relationship_7.source_id = entity_5.id),",
+              "        'age', person_3.age,",
+              "        'archived', entity_5.archived,",
+              "        'contacts',",
+              "        (SELECT COALESCE(jsonb_agg(jsonb_build_object(",
+              "            'archived', entity_13.archived,",
+              "            'created_at', entity_13.created_at,",
+              "            'id', entity_13.id,",
+              "            'is_primary', contact_11.is_primary,",
+              "            'target',",
+              "            CASE",
+              "                WHEN entity_13.target_type = 'address' THEN (",
+              "                    (SELECT jsonb_build_object(",
+              "                        'archived', entity_15.archived,",
+              "                        'city', address_14.city,",
+              "                        'created_at', entity_15.created_at,",
+              "                        'id', entity_15.id,",
+              "                        'type', entity_15.type",
+              "                    )",
+              "                    FROM agreego.address address_14",
+              "                    JOIN agreego.entity entity_15 ON entity_15.id = address_14.id",
+              "                    WHERE",
+              "                        NOT entity_15.archived",
+              "                        AND relationship_12.target_id = entity_15.id)",
+              "                )",
+              "                WHEN entity_13.target_type = 'email_address' THEN (",
+              "                    (SELECT jsonb_build_object(",
+              "                        'address', email_address_16.address,",
+              "                        'archived', entity_17.archived,",
+              "                        'created_at', entity_17.created_at,",
+              "                        'id', entity_17.id,",
+              "                        'type', entity_17.type",
+              "                    )",
+              "                    FROM agreego.email_address email_address_16",
+              "                    JOIN agreego.entity entity_17 ON entity_17.id = email_address_16.id",
+              "                    WHERE",
+              "                        NOT entity_17.archived",
+              "                        AND relationship_12.target_id = entity_17.id)",
+              "                )",
+              "                WHEN entity_13.target_type = 'phone_number' THEN (",
+              "                    (SELECT jsonb_build_object(",
+              "                        'archived', entity_19.archived,",
+              "                        'created_at', entity_19.created_at,",
+              "                        'id', entity_19.id,",
+              "                        'number', phone_number_18.number,",
+              "                        'type', entity_19.type",
+              "                    )",
+              "                    FROM agreego.phone_number phone_number_18",
+              "                    JOIN agreego.entity entity_19 ON entity_19.id = phone_number_18.id",
+              "                    WHERE",
+              "                        NOT entity_19.archived",
+              "                        AND relationship_12.target_id = entity_19.id)",
+              "                )",
+              "                ELSE NULL",
+              "            END,",
+              "            'type', entity_13.type",
+              "        )), '[]'::jsonb)",
+              "        FROM agreego.contact contact_11",
+              "        JOIN agreego.relationship relationship_12 ON relationship_12.id = contact_11.id",
+              "        JOIN agreego.entity entity_13 ON entity_13.id = relationship_12.id",
+              "        WHERE",
+              "            NOT entity_13.archived",
+              "            AND relationship_12.source_id = entity_5.id),",
+              "        'created_at', entity_5.created_at,",
+              "        'email_addresses',",
+              "        (SELECT COALESCE(jsonb_agg(jsonb_build_object(",
+              "            'archived', entity_22.archived,",
+              "            'created_at', entity_22.created_at,",
+              "            'id', entity_22.id,",
+              "            'is_primary', contact_20.is_primary,",
+              "            'target',",
+              "            (SELECT jsonb_build_object(",
+              "                'address', email_address_23.address,",
+              "                'archived', entity_24.archived,",
+              "                'created_at', entity_24.created_at,",
+              "                'id', entity_24.id,",
+              "                'type', entity_24.type",
+              "            )",
+              "            FROM agreego.email_address email_address_23",
+              "            JOIN agreego.entity entity_24 ON entity_24.id = email_address_23.id",
+              "            WHERE",
+              "                NOT entity_24.archived",
+              "                AND relationship_21.target_id = entity_24.id),",
+              "            'type', entity_22.type",
+              "        )), '[]'::jsonb)",
+              "        FROM agreego.contact contact_20",
+              "        JOIN agreego.relationship relationship_21 ON relationship_21.id = contact_20.id",
+              "        JOIN agreego.entity entity_22 ON entity_22.id = relationship_21.id",
+              "        WHERE",
+              "            NOT entity_22.archived",
+              "            AND relationship_21.target_type = 'email_address'",
+              "            AND relationship_21.source_id = entity_5.id),",
+              "        'first_name', person_3.first_name,",
+              "        'id', entity_5.id,",
+              "        'last_name', person_3.last_name,",
+              "        'name', organization_4.name,",
+              "        'phone_numbers',",
+              "        (SELECT COALESCE(jsonb_agg(jsonb_build_object(",
+              "            'archived', entity_27.archived,",
+              "            'created_at', entity_27.created_at,",
+              "            'id', entity_27.id,",
+              "            'is_primary', contact_25.is_primary,",
+              "            'target',",
+              "            (SELECT jsonb_build_object(",
+              "                'archived', entity_29.archived,",
+              "                'created_at', entity_29.created_at,",
+              "                'id', entity_29.id,",
+              "                'number', phone_number_28.number,",
+              "                'type', entity_29.type",
+              "            )",
+              "            FROM agreego.phone_number phone_number_28",
+              "            JOIN agreego.entity entity_29 ON entity_29.id = phone_number_28.id",
+              "            WHERE",
+              "                NOT entity_29.archived",
+              "                AND relationship_26.target_id = entity_29.id),",
+              "            'type', entity_27.type",
+              "        )), '[]'::jsonb)",
+              "        FROM agreego.contact contact_25",
+              "        JOIN agreego.relationship relationship_26 ON relationship_26.id = contact_25.id",
+              "        JOIN agreego.entity entity_27 ON entity_27.id = relationship_26.id",
+              "        WHERE",
+              "            NOT entity_27.archived",
+              "            AND relationship_26.target_type = 'phone_number'",
+              "            AND relationship_26.source_id = entity_5.id),",
+              "        'type', entity_5.type",
+              "    )",
+              "    FROM agreego.person person_3",
+              "    JOIN agreego.organization organization_4 ON organization_4.id = person_3.id",
+              "    JOIN agreego.entity entity_5 ON entity_5.id = organization_4.id",
+              "    WHERE NOT entity_5.archived AND entity_5.id = entity_2.id))",
+              "    ELSE NULL",
+              "END",
+              "FROM agreego.organization organization_1",
+              "JOIN agreego.entity entity_2 ON entity_2.id = organization_1.id",
+              "WHERE NOT entity_2.archived)))"
             ]
           ]
         }
@@ -1598,7 +1915,7 @@
           "success": true,
           "sql": [
             [
-              "(SELECT COALESCE(jsonb_agg(jsonb_build_object(",
+              "(SELECT jsonb_strip_nulls((SELECT COALESCE(jsonb_agg(jsonb_build_object(",
               "    'archived', entity_2.archived,",
               "    'created_at', entity_2.created_at,",
               "    'customer',",
@@ -1625,7 +1942,45 @@
               ")), '[]'::jsonb)",
               "FROM agreego.order order_1",
               "JOIN agreego.entity entity_2 ON entity_2.id = order_1.id",
-              "WHERE NOT entity_2.archived)"
+              "WHERE NOT entity_2.archived)))"
+            ]
+          ]
+        }
+      },
+      {
+        "description": "Widgets select via a punc response with family (STI)",
+        "action": "query",
+        "schema_id": "get_widgets.response",
+        "expect": {
+          "success": true,
+          "sql": [
+            [
+              "(SELECT jsonb_strip_nulls((SELECT COALESCE(jsonb_agg(",
+              "    CASE",
+              "        WHEN widget_1.kind = 'stock' THEN (",
+              "            jsonb_build_object(",
+              "                'archived', entity_2.archived,",
+              "                'created_at', entity_2.created_at,",
+              "                'id', entity_2.id,",
+              "                'kind', widget_1.kind,",
+              "                'type', entity_2.type",
+              "            )",
+              "        )",
+              "        WHEN widget_1.kind = 'tasks' THEN (",
+              "            jsonb_build_object(",
+              "                'archived', entity_2.archived,",
+              "                'created_at', entity_2.created_at,",
+              "                'id', entity_2.id,",
+              "                'kind', widget_1.kind,",
+              "                'type', entity_2.type",
+              "            )",
+              "        )",
+              "        ELSE NULL",
+              "    END",
+              "), '[]'::jsonb)",
+              "FROM agreego.widget widget_1",
+              "JOIN agreego.entity entity_2 ON entity_2.id = widget_1.id",
+              "WHERE NOT entity_2.archived)))"
             ]
           ]
         }

fixtures/ref.json

@@ -1,929 +0,0 @@
-[
-  {
-    "description": "nested refs",
-    "database": {
-      "schemas": [
-        {
-          "$ref": "c_212",
-          "$id": "ref_4_0"
-        },
-        {
-          "$id": "a_212",
-          "type": "integer"
-        },
-        {
-          "$id": "b_212",
-          "$ref": "a_212"
-        },
-        {
-          "$id": "c_212",
-          "$ref": "b_212"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "nested ref valid",
-        "data": 5,
-        "schema_id": "ref_4_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "nested ref invalid",
-        "data": "a",
-        "schema_id": "ref_4_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "ref applies alongside sibling keywords",
-    "database": {
-      "schemas": [
-        {
-          "properties": {
-            "foo": {
-              "$ref": "reffed_248",
-              "maxItems": 2
-            }
-          },
-          "$id": "ref_5_0"
-        },
-        {
-          "$id": "reffed_248",
-          "type": "array"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "ref valid, maxItems valid",
-        "data": {
-          "foo": []
-        },
-        "schema_id": "ref_5_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "ref valid, maxItems invalid",
-        "data": {
-          "foo": [
-            1,
-            2,
-            3
-          ]
-        },
-        "schema_id": "ref_5_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "ref invalid",
-        "data": {
-          "foo": "string"
-        },
-        "schema_id": "ref_5_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "property named $ref that is not a reference",
-    "database": {
-      "schemas": [
-        {
-          "properties": {
-            "$ref": {
-              "type": "string"
-            }
-          },
-          "$id": "ref_6_0"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "property named $ref valid",
-        "data": {
-          "$ref": "a"
-        },
-        "schema_id": "ref_6_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "property named $ref invalid",
-        "data": {
-          "$ref": 2
-        },
-        "schema_id": "ref_6_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "property named $ref, containing an actual $ref",
-    "database": {
-      "schemas": [
-        {
-          "properties": {
-            "$ref": {
-              "$ref": "is-string_344"
-            }
-          },
-          "$id": "ref_7_0"
-        },
-        {
-          "$id": "is-string_344",
-          "type": "string"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "property named $ref valid",
-        "data": {
-          "$ref": "a"
-        },
-        "schema_id": "ref_7_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "property named $ref invalid",
-        "data": {
-          "$ref": 2
-        },
-        "schema_id": "ref_7_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "$ref to boolean schema true",
-    "database": {
-      "schemas": [
-        {
-          "$ref": "bool_378",
-          "$id": "ref_8_0"
-        },
-        {
-          "$id": "bool_378",
-          "extensible": true
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is valid",
-        "data": "foo",
-        "schema_id": "ref_8_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "$ref to boolean schema false",
-    "database": {
-      "schemas": [
-        {
-          "$ref": "bool_400",
-          "$id": "ref_9_0"
-        },
-        {
-          "$id": "bool_400",
-          "extensible": false,
-          "not": {}
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "any value is invalid",
-        "data": "foo",
-        "schema_id": "ref_9_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "refs with quote",
-    "database": {
-      "schemas": [
-        {
-          "properties": {
-            "foo\"bar": {
-              "$ref": "foo%22bar_550"
-            }
-          },
-          "$id": "ref_11_0"
-        },
-        {
-          "$id": "foo%22bar_550",
-          "type": "number"
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "object with numbers is valid",
-        "data": {
-          "foo\"bar": 1
-        },
-        "schema_id": "ref_11_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "object with strings is invalid",
-        "data": {
-          "foo\"bar": "1"
-        },
-        "schema_id": "ref_11_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "$ref boundary resets to loose",
-    "database": {
-      "schemas": [
-        {
-          "$ref": "target_1465",
-          "$id": "ref_35_0"
-        },
-        {
-          "$id": "target_1465",
-          "properties": {
-            "foo": {
-              "type": "string"
-            }
-          }
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "extra property in ref target is invalid (strict by default)",
-        "data": {
-          "foo": "bar",
-          "extra": 1
-        },
-        "schema_id": "ref_35_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "$ref target can enforce strictness",
-    "database": {
-      "schemas": [
-        {
-          "$ref": "target_1496",
-          "$id": "ref_36_0"
-        },
-        {
-          "$id": "target_1496",
-          "extensible": false,
-          "properties": {
-            "foo": {
-              "type": "string"
-            }
-          }
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "extra property in ref target is invalid",
-        "data": {
-          "foo": "bar",
-          "extra": 1
-        },
-        "schema_id": "ref_36_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "strictness: boundary reset at $ref",
-    "database": {
-      "schemas": [
-        {
-          "extensible": true,
-          "properties": {
-            "inline_child": {
-              "properties": {
-                "a": {
-                  "type": "integer"
-                }
-              }
-            },
-            "ref_child": {
-              "$ref": "strict_node_1544"
-            },
-            "extensible_ref_child": {
-              "$ref": "extensible_node_1551"
-            }
-          },
-          "$id": "ref_37_0"
-        },
-        {
-          "$id": "strict_node_1544",
-          "properties": {
-            "b": {
-              "type": "integer"
-            }
-          }
-        },
-        {
-          "$id": "extensible_node_1551",
-          "extensible": true,
-          "properties": {
-            "c": {
-              "type": "integer"
-            }
-          }
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "inline child inherits looseness",
-        "data": {
-          "inline_child": {
-            "a": 1,
-            "extra": 2
-          }
-        },
-        "schema_id": "ref_37_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "ref child resets to strict (default)",
-        "data": {
-          "ref_child": {
-            "b": 1,
-            "extra": 2
-          }
-        },
-        "schema_id": "ref_37_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "ref child with explicit extensible=true is loose",
-        "data": {
-          "extensible_ref_child": {
-            "c": 1,
-            "extra": 2
-          }
-        },
-        "schema_id": "ref_37_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "arrays: ref items inherit strictness (reset at boundary)",
-    "database": {
-      "schemas": [
-        {
-          "properties": {
-            "list": {
-              "type": "array",
-              "items": {
-                "$ref": "strict_node_1614"
-              }
-            }
-          },
-          "$id": "ref_38_0"
-        },
-        {
-          "$id": "strict_node_1614",
-          "properties": {
-            "a": {
-              "type": "integer"
-            }
-          }
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "ref item with extra property is invalid (strict by default)",
-        "data": {
-          "list": [
-            {
-              "a": 1,
-              "extra": 2
-            }
-          ]
-        },
-        "schema_id": "ref_38_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  },
-  {
-    "description": "implicit keyword shadowing",
-    "database": {
-      "schemas": [
-        {
-          "$ref": "parent_1648",
-          "properties": {
-            "type": {
-              "const": "child"
-            },
-            "age": {
-              "minimum": 15
-            }
-          },
-          "$id": "ref_39_0"
-        },
-        {
-          "$id": "parent_1648",
-          "type": "object",
-          "properties": {
-            "type": {
-              "const": "parent"
-            },
-            "age": {
-              "minimum": 10,
-              "maximum": 20
-            }
-          },
-          "required": [
-            "type",
-            "age"
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "child type overrides parent type",
-        "data": {
-          "type": "child",
-          "age": 15
-        },
-        "schema_id": "ref_39_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "parent type is now invalid (shadowed)",
-        "data": {
-          "type": "parent",
-          "age": 15
-        },
-        "schema_id": "ref_39_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "child min age (15) is enforced",
-        "data": {
-          "type": "child",
-          "age": 12
-        },
-        "schema_id": "ref_39_0",
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      },
-      {
-        "description": "parent max age (20) is shadowed (replaced) by child definition",
-        "data": {
-          "type": "child",
-          "age": 21
-        },
-        "schema_id": "ref_39_0",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "Entities extending entities (Physical Birth)",
-    "database": {
-      "types": [
-        {
-          "name": "entity",
-          "variations": [
-            "entity",
-            "organization",
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "entity",
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "type": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        },
-        {
-          "name": "organization",
-          "variations": [
-            "organization",
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "organization",
-              "$ref": "entity",
-              "properties": {
-                "name": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        },
-        {
-          "name": "person",
-          "variations": [
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "person",
-              "$ref": "organization",
-              "properties": {
-                "first_name": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        }
-      ],
-      "puncs": [
-        {
-          "name": "save_org",
-          "schemas": [
-            {
-              "$id": "save_org.request",
-              "$ref": "organization"
-            }
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "Valid person against organization schema (implicit type allowance from physical hierarchy)",
-        "schema_id": "save_org.request",
-        "data": {
-          "id": "1",
-          "type": "person",
-          "name": "ACME"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Valid organization against organization schema",
-        "schema_id": "save_org.request",
-        "data": {
-          "id": "2",
-          "type": "organization",
-          "name": "ACME"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Invalid entity against organization schema (ancestor not allowed)",
-        "schema_id": "save_org.request",
-        "data": {
-          "id": "3",
-          "type": "entity"
-        },
-        "action": "validate",
-        "expect": {
-          "success": false,
-          "errors": [
-            {
-              "code": "CONST_VIOLATED",
-              "details": { "path": "type" }
-            }
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "description": "Viral Infection: Ad-hocs inheriting entity boundaries via $ref",
-    "database": {
-      "types": [
-        {
-          "name": "entity",
-          "variations": [
-            "entity",
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "entity",
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string"
-                },
-                "type": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        },
-        {
-          "name": "person",
-          "variations": [
-            "person"
-          ],
-          "schemas": [
-            {
-              "$id": "person",
-              "$ref": "entity",
-              "properties": {
-                "first_name": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "light.person",
-              "$ref": "entity",
-              "properties": {
-                "first_name": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        }
-      ],
-      "puncs": [
-        {
-          "name": "save_person_light",
-          "schemas": [
-            {
-              "$id": "save_person_light.request",
-              "$ref": "light.person",
-              "properties": {
-                "extra_request_field": {
-                  "type": "string"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "Valid person against ad-hoc request schema (request virally inherited person variations)",
-        "schema_id": "save_person_light.request",
-        "data": {
-          "id": "1",
-          "type": "person",
-          "first_name": "John",
-          "extra_request_field": "test"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Invalid entity against ad-hoc request schema (viral inheritance enforces person boundary)",
-        "schema_id": "save_person_light.request",
-        "data": {
-          "id": "1",
-          "type": "entity",
-          "first_name": "John"
-        },
-        "action": "validate",
-        "expect": {
-          "success": false,
-          "errors": [
-            {
-              "code": "CONST_VIOLATED",
-              "details": { "path": "type" }
-            }
-          ]
-        }
-      }
-    ]
-  },
-  {
-    "description": "Ad-hocs extending ad-hocs (No type property)",
-    "database": {
-      "puncs": [
-        {
-          "name": "save_address",
-          "schemas": [
-            {
-              "$id": "address",
-              "type": "object",
-              "properties": {
-                "street": {
-                  "type": "string"
-                },
-                "city": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "us_address",
-              "$ref": "address",
-              "properties": {
-                "state": {
-                  "type": "string"
-                },
-                "zip": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "save_address.request",
-              "$ref": "us_address"
-            }
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "Valid us_address",
-        "schema_id": "save_address.request",
-        "data": {
-          "street": "123 Main",
-          "city": "Anytown",
-          "state": "CA",
-          "zip": "12345"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Invalid base address against us_address",
-        "schema_id": "save_address.request",
-        "data": {
-          "street": "123 Main",
-          "city": "Anytown"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      }
-    ]
-  },
-  {
-    "description": "Ad-hocs extending ad-hocs (with string type property, no magic)",
-    "database": {
-      "puncs": [
-        {
-          "name": "save_config",
-          "schemas": [
-            {
-              "$id": "config_base",
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "string",
-                  "const": "config_base"
-                },
-                "setting": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "config_advanced",
-              "$ref": "config_base",
-              "properties": {
-                "type": {
-                  "type": "string",
-                  "const": "config_advanced"
-                },
-                "advanced_setting": {
-                  "type": "string"
-                }
-              }
-            },
-            {
-              "$id": "save_config.request",
-              "$ref": "config_base"
-            }
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "Valid config_base against config_base",
-        "schema_id": "save_config.request",
-        "data": {
-          "type": "config_base",
-          "setting": "on"
-        },
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Invalid config_advanced against config_base (no type magic, const is strictly 'config_base')",
-        "schema_id": "save_config.request",
-        "data": {
-          "type": "config_advanced",
-          "setting": "on",
-          "advanced_setting": "off"
-        },
-        "action": "validate",
-        "expect": {
-          "success": false
-        }
-      }
-    ]
-  }
-]

src/database/mod.rs

@@ -4,6 +4,7 @@ pub mod executors;
 pub mod formats;
 pub mod page;
 pub mod punc;
+pub mod object;
 pub mod relation;
 pub mod schema;
 pub mod r#type;
@@ -23,7 +24,8 @@ use punc::Punc;
 use relation::Relation;
 use schema::Schema;
 use serde_json::Value;
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
+use std::sync::Arc;
 use r#type::Type;
 
 pub struct Database {
@@ -31,9 +33,7 @@ pub struct Database {
   pub types: HashMap<String, Type>,
   pub puncs: HashMap<String, Punc>,
   pub relations: HashMap<String, Relation>,
-  pub schemas: HashMap<String, Schema>,
-  pub descendants: HashMap<String, Vec<String>>,
-  pub depths: HashMap<String, usize>,
+  pub schemas: HashMap<String, Arc<Schema>>,
   pub executor: Box<dyn DatabaseExecutor + Send + Sync>,
 }
 
@@ -45,8 +45,6 @@ impl Database {
       relations: HashMap::new(),
       puncs: HashMap::new(),
       schemas: HashMap::new(),
-      descendants: HashMap::new(),
-      depths: HashMap::new(),
       #[cfg(not(test))]
       executor: Box::new(SpiExecutor::new()),
       #[cfg(test)]
@@ -137,7 +135,7 @@ impl Database {
               .clone()
               .unwrap_or_else(|| format!("schema_{}", i));
             schema.obj.id = Some(id.clone());
-            db.schemas.insert(id, schema);
+            db.schemas.insert(id, Arc::new(schema));
           }
           Err(e) => {
             errors.push(crate::drop::Error {
@@ -187,19 +185,21 @@ impl Database {
 
   pub fn compile(&mut self, errors: &mut Vec<crate::drop::Error>) {
     let mut harvested = Vec::new();
-    for schema in self.schemas.values_mut() {
-      schema.collect_schemas(None, &mut harvested, errors);
+    for schema_arc in self.schemas.values_mut() {
+        if let Some(s) = std::sync::Arc::get_mut(schema_arc) {
+          s.collect_schemas(None, &mut harvested, errors);
+        }
+    }
+    for (id, schema) in harvested {
+      self.schemas.insert(id, Arc::new(schema));
     }
-    self.schemas.extend(harvested);
 
     self.collect_schemas(errors);
-    self.collect_depths();
-    self.collect_descendants();
 
     // Mathematically evaluate all property inheritances, formats, schemas, and foreign key edges topographically over OnceLocks
     let mut visited = std::collections::HashSet::new();
-    for schema in self.schemas.values() {
-      schema.compile(self, &mut visited, errors);
+    for schema_arc in self.schemas.values() {
+      schema_arc.as_ref().compile(self, &mut visited, errors);
     }
   }
 
@@ -225,70 +225,185 @@ impl Database {
     }
 
     for (id, schema) in to_insert {
-      self.schemas.insert(id, schema);
+      self.schemas.insert(id, Arc::new(schema));
     }
   }
 
-  fn collect_depths(&mut self) {
-    let mut depths: HashMap<String, usize> = HashMap::new();
-    let schema_ids: Vec<String> = self.schemas.keys().cloned().collect();
+  /// Inspects the Postgres pg_constraint relations catalog to securely identify
+  /// the precise Foreign Key connecting a parent and child hierarchy path.
+  pub fn resolve_relation<'a>(
+    &'a self,
+    parent_type: &str,
+    child_type: &str,
+    prop_name: &str,
+    relative_keys: Option<&Vec<String>>,
+    is_array: bool,
+    schema_id: Option<&str>,
+    path: &str,
+    errors: &mut Vec<crate::drop::Error>,
+  ) -> Option<(&'a crate::database::relation::Relation, bool)> {
+    // Enforce graph locality by ensuring we don't accidentally crawl to pure structural entity boundaries
+    if parent_type == "entity" && child_type == "entity" {
+      return None;
+    }
 
-    for id in schema_ids {
-      let mut current_id = id.clone();
-      let mut depth = 0;
-      let mut visited = HashSet::new();
+    let p_def = self.types.get(parent_type)?;
+    let c_def = self.types.get(child_type)?;
 
-      while let Some(schema) = self.schemas.get(&current_id) {
-        if !visited.insert(current_id.clone()) {
-          break; // Cycle detected
-        }
-        if let Some(ref_str) = &schema.obj.r#ref {
-          current_id = ref_str.clone();
-          depth += 1;
-        } else {
+    let mut matching_rels = Vec::new();
+    let mut directions = Vec::new();
+
+    // Scour the complete catalog for any Edge matching the inheritance scope of the two objects
+    // This automatically binds polymorphic structures (e.g. recognizing a relationship targeting User
+    // also natively binds instances specifically typed as Person).
+    let mut all_rels: Vec<&crate::database::relation::Relation> = self.relations.values().collect();
+    all_rels.sort_by(|a, b| a.constraint.cmp(&b.constraint));
+
+    for rel in all_rels {
+      let mut is_forward =
+        p_def.hierarchy.contains(&rel.source_type) && c_def.hierarchy.contains(&rel.destination_type);
+      let is_reverse =
+        p_def.hierarchy.contains(&rel.destination_type) && c_def.hierarchy.contains(&rel.source_type);
+
+      // Structural Cardinality Filtration:
+      // If the schema requires a collection (Array), it is mathematically impossible for a pure
+      // Forward scalar edge (where the parent holds exactly one UUID pointer) to fulfill a One-to-Many request.
+      // Thus, if it's an array, we fully reject pure Forward edges and only accept Reverse edges (or Junction edges).
+      if is_array && is_forward && !is_reverse {
+        is_forward = false;
+      }
+
+      if is_forward {
+        matching_rels.push(rel);
+        directions.push(true);
+      } else if is_reverse {
+        matching_rels.push(rel);
+        directions.push(false);
+      }
+    }
+
+    // Abort relation discovery early if no hierarchical inheritance match was found
+    if matching_rels.is_empty() {
+      let mut details = crate::drop::ErrorDetails {
+        path: path.to_string(),
+        ..Default::default()
+      };
+      if let Some(sid) = schema_id {
+        details.schema = Some(sid.to_string());
+      }
+
+      errors.push(crate::drop::Error {
+        code: "EDGE_MISSING".to_string(),
+        message: format!(
+          "No database relation exists between '{}' and '{}' for property '{}'",
+          parent_type, child_type, prop_name
+        ),
+        details,
+      });
+      return None;
+    }
+
+    // Ideal State: The objects only share a solitary structural relation, resolving ambiguity instantly.
+    if matching_rels.len() == 1 {
+      return Some((matching_rels[0], directions[0]));
+    }
+
+    let mut chosen_idx = 0;
+    let mut resolved = false;
+
+    // Exact Prefix Disambiguation: Determine if the database specifically names this constraint
+    // directly mapping to the JSON Schema property name (e.g., `fk_{child}_{property_name}`)
+    for (i, rel) in matching_rels.iter().enumerate() {
+      if let Some(prefix) = &rel.prefix {
+        if prop_name.starts_with(prefix)
+          || prefix.starts_with(prop_name)
+          || prefix.replace("_", "") == prop_name.replace("_", "")
+        {
+          chosen_idx = i;
+          resolved = true;
           break;
         }
       }
-      depths.insert(id, depth);
     }
-    self.depths = depths;
-  }
 
-  fn collect_descendants(&mut self) {
-    let mut direct_refs: HashMap<String, Vec<String>> = HashMap::new();
-    for (id, schema) in &self.schemas {
-      if let Some(ref_str) = &schema.obj.r#ref {
-        direct_refs
-          .entry(ref_str.clone())
-          .or_default()
-          .push(id.clone());
+    // Complex Subgraph Resolution: The database contains multiple equally explicit foreign key constraints
+    // linking these objects (such as pointing to `source` and `target` in Many-to-Many junction models).
+    if !resolved && relative_keys.is_some() {
+      // Twin Deduction Pass 1: We inspect the exact properties structurally defined inside the compiled payload
+      // to observe which explicit relation arrow the child payload natively consumes.
+      let keys = relative_keys.unwrap();
+      let mut consumed_rel_idx = None;
+      for (i, rel) in matching_rels.iter().enumerate() {
+        if let Some(prefix) = &rel.prefix {
+          if keys.contains(prefix) {
+            consumed_rel_idx = Some(i);
+            break; // Found the routing edge explicitly consumed by the schema payload
+          }
+        }
       }
-    }
 
-    // Cache exhaustive descendants matrix for generic $family string lookups natively
-    let mut descendants = HashMap::new();
-    for id in self.schemas.keys() {
-      let mut desc_set = HashSet::new();
-      Self::collect_descendants_recursively(id, &direct_refs, &mut desc_set);
-      let mut desc_vec: Vec<String> = desc_set.into_iter().collect();
-      desc_vec.sort();
+      // Twin Deduction Pass 2: Knowing which arrow points outbound, we can mathematically deduce its twin
+      // providing the reverse ownership on the same junction boundary must be the incoming Edge to the parent.
+      if let Some(used_idx) = consumed_rel_idx {
+        let used_rel = matching_rels[used_idx];
+        let mut twin_ids = Vec::new();
+        for (i, rel) in matching_rels.iter().enumerate() {
+          if i != used_idx
+            && rel.source_type == used_rel.source_type
+            && rel.destination_type == used_rel.destination_type
+            && rel.prefix.is_some()
+          {
+            twin_ids.push(i);
+          }
+        }
 
-      descendants.insert(id.clone(), desc_vec);
-    }
-    self.descendants = descendants;
-  }
-
-  fn collect_descendants_recursively(
-    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_recursively(child, direct_refs, descendants);
+        if twin_ids.len() == 1 {
+          chosen_idx = twin_ids[0];
+          resolved = true;
         }
       }
     }
+
+    // Implicit Base Fallback: If no complex explicit paths resolve, but exactly one relation
+    // sits entirely naked (without a constraint prefix), it must be the core structural parent ownership.
+    if !resolved {
+      let mut null_prefix_ids = Vec::new();
+      for (i, rel) in matching_rels.iter().enumerate() {
+        if rel.prefix.is_none() {
+          null_prefix_ids.push(i);
+        }
+      }
+      if null_prefix_ids.len() == 1 {
+        chosen_idx = null_prefix_ids[0];
+        resolved = true;
+      }
+    }
+
+    // If we exhausted all mathematical deduction pathways and STILL cannot isolate a single edge,
+    // we must abort rather than silently guessing. Returning None prevents arbitrary SQL generation
+    // and forces a clean structural error for the architect.
+    if !resolved {
+      let mut details = crate::drop::ErrorDetails {
+        path: path.to_string(),
+        context: serde_json::to_value(&matching_rels).ok(),
+        cause: Some("Multiple conflicting constraints found matching prefixes".to_string()),
+        ..Default::default()
+      };
+      if let Some(sid) = schema_id {
+        details.schema = Some(sid.to_string());
+      }
+
+      errors.push(crate::drop::Error {
+        code: "AMBIGUOUS_TYPE_RELATIONS".to_string(),
+        message: format!(
+          "Ambiguous database relation between '{}' and '{}' for property '{}'",
+          parent_type, child_type, prop_name
+        ),
+        details,
+      });
+      return None;
+    }
+
+    Some((matching_rels[chosen_idx], directions[chosen_idx]))
   }
 }

src/database/object.rs

@@ -0,0 +1,367 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::collections::BTreeMap;
+use std::sync::Arc;
+use std::sync::OnceLock;
+use crate::database::schema::Schema;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Case {
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub when: Option<Arc<Schema>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub then: Option<Arc<Schema>>,
+  #[serde(rename = "else")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub else_: Option<Arc<Schema>>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct SchemaObject {
+  // Core Schema Keywords
+  #[serde(rename = "$id")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub id: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub description: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub title: Option<String>,
+  #[serde(default)] // Allow missing type
+  #[serde(rename = "type")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub type_: Option<SchemaTypeOrArray>, // Handles string or array of strings
+
+  // Object Keywords
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub properties: Option<BTreeMap<String, Arc<Schema>>>,
+  #[serde(rename = "patternProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub pattern_properties: Option<BTreeMap<String, Arc<Schema>>>,
+  #[serde(rename = "additionalProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub additional_properties: Option<Arc<Schema>>,
+  #[serde(rename = "$family")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub family: Option<String>,
+
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub required: Option<Vec<String>>,
+
+  // dependencies can be schema dependencies or property dependencies
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub dependencies: Option<BTreeMap<String, Dependency>>,
+
+  // Array Keywords
+  #[serde(rename = "items")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub items: Option<Arc<Schema>>,
+  #[serde(rename = "prefixItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub prefix_items: Option<Vec<Arc<Schema>>>,
+
+  // String Validation
+  #[serde(rename = "minLength")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub min_length: Option<f64>,
+  #[serde(rename = "maxLength")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub max_length: Option<f64>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub pattern: Option<String>,
+
+  // Array Validation
+  #[serde(rename = "minItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub min_items: Option<f64>,
+  #[serde(rename = "maxItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub max_items: Option<f64>,
+  #[serde(rename = "uniqueItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub unique_items: Option<bool>,
+  #[serde(rename = "contains")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub contains: Option<Arc<Schema>>,
+  #[serde(rename = "minContains")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub min_contains: Option<f64>,
+  #[serde(rename = "maxContains")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub max_contains: Option<f64>,
+
+  // Object Validation
+  #[serde(rename = "minProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub min_properties: Option<f64>,
+  #[serde(rename = "maxProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub max_properties: Option<f64>,
+  #[serde(rename = "propertyNames")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub property_names: Option<Arc<Schema>>,
+
+  // Numeric Validation
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub format: Option<String>,
+  #[serde(rename = "enum")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub enum_: Option<Vec<Value>>, // `enum` is a reserved keyword in Rust
+  #[serde(
+    default,
+    rename = "const",
+    deserialize_with = "crate::database::object::deserialize_some"
+  )]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub const_: Option<Value>,
+
+  // Numeric Validation
+  #[serde(rename = "multipleOf")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub multiple_of: Option<f64>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub minimum: Option<f64>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub maximum: Option<f64>,
+  #[serde(rename = "exclusiveMinimum")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub exclusive_minimum: Option<f64>,
+  #[serde(rename = "exclusiveMaximum")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub exclusive_maximum: Option<f64>,
+
+  // Combining Keywords
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub cases: Option<Vec<Case>>,
+  #[serde(rename = "oneOf")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub one_of: Option<Vec<Arc<Schema>>>,
+  #[serde(rename = "not")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub not: Option<Arc<Schema>>,
+
+  // Custom Vocabularies
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub form: Option<Vec<String>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub display: Option<Vec<String>>,
+  #[serde(rename = "enumNames")]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub enum_names: Option<Vec<String>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub control: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub actions: Option<BTreeMap<String, Action>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub computer: Option<String>,
+  #[serde(default)]
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub extensible: Option<bool>,
+
+  #[serde(rename = "compiledProperties")]
+  #[serde(skip_deserializing)]
+  #[serde(skip_serializing_if = "crate::database::object::is_once_lock_vec_empty")]
+  #[serde(serialize_with = "crate::database::object::serialize_once_lock")]
+  pub compiled_property_names: OnceLock<Vec<String>>,
+
+  #[serde(skip)]
+  pub compiled_properties: OnceLock<BTreeMap<String, Arc<Schema>>>,
+
+  #[serde(rename = "compiledDiscriminator")]
+  #[serde(skip_deserializing)]
+  #[serde(skip_serializing_if = "crate::database::object::is_once_lock_string_empty")]
+  #[serde(serialize_with = "crate::database::object::serialize_once_lock")]
+  pub compiled_discriminator: OnceLock<String>,
+
+  #[serde(rename = "compiledOptions")]
+  #[serde(skip_deserializing)]
+  #[serde(skip_serializing_if = "crate::database::object::is_once_lock_map_empty")]
+  #[serde(serialize_with = "crate::database::object::serialize_once_lock")]
+  pub compiled_options: OnceLock<BTreeMap<String, String>>,
+
+  #[serde(rename = "compiledEdges")]
+  #[serde(skip_deserializing)]
+  #[serde(skip_serializing_if = "crate::database::object::is_once_lock_map_empty")]
+  #[serde(serialize_with = "crate::database::object::serialize_once_lock")]
+  pub compiled_edges: OnceLock<BTreeMap<String, crate::database::edge::Edge>>,
+
+  #[serde(skip)]
+  pub compiled_format: OnceLock<CompiledFormat>,
+  #[serde(skip)]
+  pub compiled_pattern: OnceLock<CompiledRegex>,
+  #[serde(skip)]
+  pub compiled_pattern_properties: OnceLock<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, Deserialize)]
+#[serde(untagged)]
+pub enum SchemaTypeOrArray {
+  Single(String),
+  Multiple(Vec<String>),
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Action {
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub navigate: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub punc: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum Dependency {
+  Props(Vec<String>),
+  Schema(Arc<Schema>),
+}
+
+pub fn serialize_once_lock<T: serde::Serialize, S: serde::Serializer>(
+  lock: &OnceLock<T>,
+  serializer: S,
+) -> Result<S::Ok, S::Error> {
+  if let Some(val) = lock.get() {
+    val.serialize(serializer)
+  } else {
+    serializer.serialize_none()
+  }
+}
+
+pub fn is_once_lock_map_empty<K, V>(lock: &OnceLock<std::collections::BTreeMap<K, V>>) -> bool {
+  lock.get().map_or(true, |m| m.is_empty())
+}
+
+pub fn is_once_lock_vec_empty<T>(lock: &OnceLock<Vec<T>>) -> bool {
+  lock.get().map_or(true, |v| v.is_empty())
+}
+
+pub fn is_once_lock_string_empty(lock: &OnceLock<String>) -> bool {
+  lock.get().map_or(true, |s| s.is_empty())
+}
+
+// Schema mirrors the Go Punc Generator's schema struct for consistency.
+// It is an order-preserving representation of a JSON Schema.
+pub fn deserialize_some<'de, D>(deserializer: D) -> Result<Option<Value>, D::Error>
+where
+  D: serde::Deserializer<'de>,
+{
+  let v = Value::deserialize(deserializer)?;
+  Ok(Some(v))
+}
+
+pub fn is_primitive_type(t: &str) -> bool {
+  matches!(
+    t,
+    "string" | "number" | "integer" | "boolean" | "object" | "array" | "null"
+  )
+}
+
+impl SchemaObject {
+  pub fn identifier(&self) -> Option<String> {
+    if let Some(id) = &self.id {
+      return Some(id.split('.').next_back().unwrap_or("").to_string());
+    }
+    if let Some(SchemaTypeOrArray::Single(t)) = &self.type_ {
+      if !is_primitive_type(t) {
+        return Some(t.split('.').next_back().unwrap_or("").to_string());
+      }
+    }
+    None
+  }
+
+  pub fn get_discriminator_value(&self, dim: &str) -> Option<String> {
+    let is_split = self
+      .compiled_properties
+      .get()
+      .map_or(false, |p| p.contains_key("kind"));
+    if let Some(id) = &self.id {
+      if id.contains("light.person") || id.contains("light.organization") {
+        println!(
+          "[DEBUG SPLIT] ID: {}, dim: {}, is_split: {:?}, props: {:?}",
+          id,
+          dim,
+          is_split,
+          self
+            .compiled_properties
+            .get()
+            .map(|p| p.keys().cloned().collect::<Vec<_>>())
+        );
+      }
+    }
+
+    if let Some(props) = self.compiled_properties.get() {
+      if let Some(prop_schema) = props.get(dim) {
+        if let Some(c) = &prop_schema.obj.const_ {
+          if let Some(s) = c.as_str() {
+            return Some(s.to_string());
+          }
+        }
+        if let Some(e) = &prop_schema.obj.enum_ {
+          if e.len() == 1 {
+            if let Some(s) = e[0].as_str() {
+              return Some(s.to_string());
+            }
+          }
+        }
+      }
+    }
+
+    if dim == "kind" {
+      if let Some(id) = &self.id {
+        let base = id.split('/').last().unwrap_or(id);
+        if let Some(idx) = base.rfind('.') {
+          return Some(base[..idx].to_string());
+        }
+      }
+      if let Some(SchemaTypeOrArray::Single(t)) = &self.type_ {
+        if !is_primitive_type(t) {
+          let base = t.split('/').last().unwrap_or(t);
+          if let Some(idx) = base.rfind('.') {
+            return Some(base[..idx].to_string());
+          }
+        }
+      }
+    }
+
+    if dim == "type" {
+      if let Some(id) = &self.id {
+        let base = id.split('/').last().unwrap_or(id);
+        if is_split {
+          return Some(base.split('.').next_back().unwrap_or(base).to_string());
+        } else {
+          return Some(base.to_string());
+        }
+      }
+      if let Some(SchemaTypeOrArray::Single(t)) = &self.type_ {
+        if !is_primitive_type(t) {
+          let base = t.split('/').last().unwrap_or(t);
+          if is_split {
+            return Some(base.split('.').next_back().unwrap_or(base).to_string());
+          } else {
+            return Some(base.to_string());
+          }
+        }
+      }
+    }
+
+    None
+  }
+}

src/database/schema.rs

@@ -1,235 +1,7 @@
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::collections::BTreeMap;
 use std::sync::Arc;
-use std::sync::OnceLock;
-
-pub fn serialize_once_lock<T: serde::Serialize, S: serde::Serializer>(
-  lock: &OnceLock<T>,
-  serializer: S,
-) -> Result<S::Ok, S::Error> {
-  if let Some(val) = lock.get() {
-    val.serialize(serializer)
-  } else {
-    serializer.serialize_none()
-  }
-}
-
-pub fn is_once_lock_map_empty<K, V>(lock: &OnceLock<std::collections::BTreeMap<K, V>>) -> bool {
-  lock.get().map_or(true, |m| m.is_empty())
-}
-
-pub fn is_once_lock_vec_empty<T>(lock: &OnceLock<Vec<T>>) -> bool {
-  lock.get().map_or(true, |v| v.is_empty())
-}
-
-// Schema mirrors the Go Punc Generator's schema struct for consistency.
-// It is an order-preserving representation of a JSON Schema.
-pub fn deserialize_some<'de, D>(deserializer: D) -> Result<Option<Value>, D::Error>
-where
-  D: serde::Deserializer<'de>,
-{
-  let v = Value::deserialize(deserializer)?;
-  Ok(Some(v))
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-pub struct SchemaObject {
-  // Core Schema Keywords
-  #[serde(rename = "$id")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub id: Option<String>,
-  #[serde(rename = "$ref")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub r#ref: Option<String>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub description: Option<String>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub title: Option<String>,
-  #[serde(default)] // Allow missing type
-  #[serde(rename = "type")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub type_: Option<SchemaTypeOrArray>, // Handles string or array of strings
-
-  // Object Keywords
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub properties: Option<BTreeMap<String, Arc<Schema>>>,
-  #[serde(rename = "patternProperties")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub pattern_properties: Option<BTreeMap<String, Arc<Schema>>>,
-  #[serde(rename = "additionalProperties")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub additional_properties: Option<Arc<Schema>>,
-  #[serde(rename = "$family")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub family: Option<String>,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub required: Option<Vec<String>>,
-
-  // dependencies can be schema dependencies or property dependencies
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub dependencies: Option<BTreeMap<String, Dependency>>,
-
-  // Array Keywords
-  #[serde(rename = "items")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub items: Option<Arc<Schema>>,
-  #[serde(rename = "prefixItems")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub prefix_items: Option<Vec<Arc<Schema>>>,
-
-  // String Validation
-  #[serde(rename = "minLength")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub min_length: Option<f64>,
-  #[serde(rename = "maxLength")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub max_length: Option<f64>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub pattern: Option<String>,
-
-  // Array Validation
-  #[serde(rename = "minItems")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub min_items: Option<f64>,
-  #[serde(rename = "maxItems")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub max_items: Option<f64>,
-  #[serde(rename = "uniqueItems")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub unique_items: Option<bool>,
-  #[serde(rename = "contains")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub contains: Option<Arc<Schema>>,
-  #[serde(rename = "minContains")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub min_contains: Option<f64>,
-  #[serde(rename = "maxContains")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub max_contains: Option<f64>,
-
-  // Object Validation
-  #[serde(rename = "minProperties")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub min_properties: Option<f64>,
-  #[serde(rename = "maxProperties")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub max_properties: Option<f64>,
-  #[serde(rename = "propertyNames")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub property_names: Option<Arc<Schema>>,
-
-  // Numeric Validation
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub format: Option<String>,
-  #[serde(rename = "enum")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub enum_: Option<Vec<Value>>, // `enum` is a reserved keyword in Rust
-  #[serde(
-    default,
-    rename = "const",
-    deserialize_with = "crate::database::schema::deserialize_some"
-  )]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub const_: Option<Value>,
-
-  // Numeric Validation
-  #[serde(rename = "multipleOf")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub multiple_of: Option<f64>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub minimum: Option<f64>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub maximum: Option<f64>,
-  #[serde(rename = "exclusiveMinimum")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub exclusive_minimum: Option<f64>,
-  #[serde(rename = "exclusiveMaximum")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub exclusive_maximum: Option<f64>,
-
-  // Combining Keywords
-  #[serde(rename = "allOf")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub all_of: Option<Vec<Arc<Schema>>>,
-  #[serde(rename = "oneOf")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub one_of: Option<Vec<Arc<Schema>>>,
-  #[serde(rename = "not")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub not: Option<Arc<Schema>>,
-  #[serde(rename = "if")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub if_: Option<Arc<Schema>>,
-  #[serde(rename = "then")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub then_: Option<Arc<Schema>>,
-  #[serde(rename = "else")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub else_: Option<Arc<Schema>>,
-
-  // Custom Vocabularies
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub form: Option<Vec<String>>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub display: Option<Vec<String>>,
-  #[serde(rename = "enumNames")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub enum_names: Option<Vec<String>>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub control: Option<String>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub actions: Option<BTreeMap<String, Action>>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub computer: Option<String>,
-  #[serde(default)]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub extensible: Option<bool>,
-
-  #[serde(rename = "compiledProperties")]
-  #[serde(skip_deserializing)]
-  #[serde(skip_serializing_if = "crate::database::schema::is_once_lock_vec_empty")]
-  #[serde(serialize_with = "crate::database::schema::serialize_once_lock")]
-  pub compiled_property_names: OnceLock<Vec<String>>,
-
-  #[serde(skip)]
-  pub compiled_properties: OnceLock<BTreeMap<String, Arc<Schema>>>,
-
-  #[serde(rename = "compiledEdges")]
-  #[serde(skip_deserializing)]
-  #[serde(skip_serializing_if = "crate::database::schema::is_once_lock_map_empty")]
-  #[serde(serialize_with = "crate::database::schema::serialize_once_lock")]
-  pub compiled_edges: OnceLock<BTreeMap<String, crate::database::edge::Edge>>,
-
-  #[serde(skip)]
-  pub compiled_format: OnceLock<CompiledFormat>,
-  #[serde(skip)]
-  pub compiled_pattern: OnceLock<CompiledRegex>,
-  #[serde(skip)]
-  pub compiled_pattern_properties: OnceLock<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);
-
+use crate::database::object::*;
 #[derive(Debug, Clone, Serialize, Default)]
 pub struct Schema {
   #[serde(flatten)]
@@ -272,7 +44,7 @@ impl Schema {
         let _ = self
           .obj
           .compiled_format
-          .set(crate::database::schema::CompiledFormat::Func(fmt.func));
+          .set(crate::database::object::CompiledFormat::Func(fmt.func));
       }
     }
 
@@ -281,7 +53,7 @@ impl Schema {
         let _ = self
           .obj
           .compiled_pattern
-          .set(crate::database::schema::CompiledRegex(re));
+          .set(crate::database::object::CompiledRegex(re));
       }
     }
 
@@ -289,7 +61,7 @@ impl Schema {
       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()));
+          compiled.push((crate::database::object::CompiledRegex(re), v.clone()));
         }
       }
       if !compiled.is_empty() {
@@ -300,35 +72,45 @@ impl Schema {
     let mut props = std::collections::BTreeMap::new();
 
     // 1. Resolve INHERITANCE dependencies first
-    if let Some(ref_id) = &self.obj.r#ref {
-      if let Some(parent) = db.schemas.get(ref_id) {
-        parent.compile(db, visited, errors);
-        if let Some(p_props) = parent.obj.compiled_properties.get() {
-          props.extend(p_props.clone());
+    if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &self.obj.type_ {
+      if !crate::database::object::is_primitive_type(t) {
+        if let Some(parent) = db.schemas.get(t) {
+          parent.as_ref().compile(db, visited, errors);
+          if let Some(p_props) = parent.obj.compiled_properties.get() {
+            props.extend(p_props.clone());
+          }
         }
       }
     }
 
-    if let Some(all_of) = &self.obj.all_of {
-      for ao in all_of {
-        ao.compile(db, visited, errors);
-        if let Some(ao_props) = ao.obj.compiled_properties.get() {
-          props.extend(ao_props.clone());
+    if let Some(crate::database::object::SchemaTypeOrArray::Multiple(types)) = &self.obj.type_ {
+      let mut custom_type_count = 0;
+      for t in types {
+        if !crate::database::object::is_primitive_type(t) {
+          custom_type_count += 1;
         }
       }
-    }
 
-    if let Some(then_schema) = &self.obj.then_ {
-      then_schema.compile(db, visited, errors);
-      if let Some(t_props) = then_schema.obj.compiled_properties.get() {
-        props.extend(t_props.clone());
+      if custom_type_count > 1 {
+        errors.push(crate::drop::Error {
+          code: "MULTIPLE_INHERITANCE_PROHIBITED".to_string(),
+          message: format!(
+            "Schema '{}' attempts to extend multiple custom object pointers in its type array. Use 'oneOf' for polymorphism and tagged unions.",
+            self.obj.identifier().unwrap_or("unknown".to_string())
+          ),
+          details: crate::drop::ErrorDetails {
+             path: self.obj.identifier().unwrap_or("unknown".to_string()),
+             ..Default::default()
+          }
+        });
       }
-    }
 
-    if let Some(else_schema) = &self.obj.else_ {
-      else_schema.compile(db, visited, errors);
-      if let Some(e_props) = else_schema.obj.compiled_properties.get() {
-        props.extend(e_props.clone());
+      for t in types {
+        if !crate::database::object::is_primitive_type(t) {
+          if let Some(parent) = db.schemas.get(t) {
+            parent.as_ref().compile(db, visited, errors);
+          }
+        }
       }
     }
 
@@ -382,18 +164,234 @@ impl Schema {
     if let Some(child) = &self.obj.contains {
       child.compile(db, visited, errors);
     }
-    if let Some(child) = &self.obj.property_names {
-      child.compile(db, visited, errors);
-    }
-    if let Some(child) = &self.obj.if_ {
-      child.compile(db, visited, errors);
+    if let Some(cases) = &self.obj.cases {
+      for c in cases {
+        if let Some(child) = &c.when {
+          child.compile(db, visited, errors);
+        }
+        if let Some(child) = &c.then {
+          child.compile(db, visited, errors);
+        }
+        if let Some(child) = &c.else_ {
+          child.compile(db, visited, errors);
+        }
+      }
     }
 
+    self.compile_polymorphism(db, errors);
+
     if let Some(id) = &self.obj.id {
       visited.remove(id);
     }
   }
 
+  /// Dynamically infers and compiles all structural database relationships between this Schema
+  /// and its nested children. This functions recursively traverses the JSON Schema abstract syntax
+  /// tree, identifies physical PostgreSQL table boundaries, and locks the resulting relation
+  /// constraint paths directly onto the `compiled_edges` map in O(1) memory.
+  pub fn compile_edges(
+    &self,
+    db: &crate::database::Database,
+    visited: &mut std::collections::HashSet<String>,
+    props: &std::collections::BTreeMap<String, std::sync::Arc<Schema>>,
+    errors: &mut Vec<crate::drop::Error>,
+  ) -> std::collections::BTreeMap<String, crate::database::edge::Edge> {
+    let mut schema_edges = std::collections::BTreeMap::new();
+
+    // Determine the physical Database Table Name this schema structurally represents
+    // Plucks the polymorphic discriminator via dot-notation (e.g. extracting "person" from "full.person")
+    let mut parent_type_name = None;
+    if let Some(family) = &self.obj.family {
+      parent_type_name = Some(family.split('.').next_back().unwrap_or(family).to_string());
+    } else if let Some(identifier) = self.obj.identifier() {
+      parent_type_name = Some(
+        identifier
+          .split('.')
+          .next_back()
+          .unwrap_or(&identifier)
+          .to_string(),
+      );
+    }
+
+    if let Some(p_type) = parent_type_name {
+      // Proceed only if the resolved table physically exists within the Postgres Type hierarchy
+      if db.types.contains_key(&p_type) {
+        // Iterate over all discovered schema boundaries mapped inside the object
+        for (prop_name, prop_schema) in props {
+          let mut child_type_name = None;
+          let mut target_schema = prop_schema.clone();
+          let mut is_array = false;
+
+          // Structurally unpack the inner target entity if the object maps to an array list
+          if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) =
+            &prop_schema.obj.type_
+          {
+            if t == "array" {
+              is_array = true;
+              if let Some(items) = &prop_schema.obj.items {
+                target_schema = items.clone();
+              }
+            }
+          }
+
+          // Determine the physical Postgres table backing the nested child schema recursively
+          if let Some(family) = &target_schema.obj.family {
+            child_type_name = Some(family.split('.').next_back().unwrap_or(family).to_string());
+          } else if let Some(ref_id) = target_schema.obj.identifier() {
+            child_type_name = Some(ref_id.split('.').next_back().unwrap_or(&ref_id).to_string());
+          } else if let Some(arr) = &target_schema.obj.one_of {
+            if let Some(first) = arr.first() {
+              if let Some(ref_id) = first.obj.identifier() {
+                child_type_name =
+                  Some(ref_id.split('.').next_back().unwrap_or(&ref_id).to_string());
+              }
+            }
+          }
+
+          if let Some(c_type) = child_type_name {
+            if db.types.contains_key(&c_type) {
+              // Ensure the child Schema's AST has accurately compiled its own physical property keys so we can
+              // inject them securely for Many-to-Many Twin Deduction disambiguation matching.
+              target_schema.compile(db, visited, errors);
+              if let Some(compiled_target_props) = target_schema.obj.compiled_properties.get() {
+                let keys_for_ambiguity: Vec<String> =
+                  compiled_target_props.keys().cloned().collect();
+
+                // Interrogate the Database catalog graph to discover the exact Foreign Key Constraint connecting the components
+                if let Some((relation, is_forward)) = db.resolve_relation(
+                  &p_type,
+                  &c_type,
+                  prop_name,
+                  Some(&keys_for_ambiguity),
+                  is_array,
+                  self.id.as_deref(),
+                  &format!("/{}", prop_name),
+                  errors,
+                ) {
+                  schema_edges.insert(
+                    prop_name.clone(),
+                    crate::database::edge::Edge {
+                      constraint: relation.constraint.clone(),
+                      forward: is_forward,
+                    },
+                  );
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    schema_edges
+  }
+
+  pub fn compile_polymorphism(
+    &self,
+    db: &crate::database::Database,
+    errors: &mut Vec<crate::drop::Error>,
+  ) {
+    let mut options = std::collections::BTreeMap::new();
+    let mut strategy = String::new();
+
+    if let Some(family) = &self.obj.family {
+      let family_base = family.split('.').next_back().unwrap_or(family).to_string();
+      let family_prefix = family
+        .strip_suffix(&family_base)
+        .unwrap_or("")
+        .trim_end_matches('.');
+
+      if let Some(type_def) = db.types.get(&family_base) {
+        if type_def.variations.len() > 1 && type_def.variations.iter().any(|v| v != &family_base) {
+          // Scenario A / B: Table Variations
+          strategy = "type".to_string();
+          for var in &type_def.variations {
+            let target_id = if family_prefix.is_empty() {
+              var.to_string()
+            } else {
+              format!("{}.{}", family_prefix, var)
+            };
+
+            if db.schemas.contains_key(&target_id) {
+              options.insert(var.to_string(), target_id);
+            }
+          }
+        } else {
+          // Scenario C: Single Table Inheritance (Horizontal)
+          strategy = "kind".to_string();
+
+          let suffix = format!(".{}", family_base);
+
+          for schema in &type_def.schemas {
+            if let Some(id) = &schema.obj.id {
+              if id.ends_with(&suffix) || id == &family_base {
+                if let Some(kind_val) = schema.obj.get_discriminator_value("kind") {
+                  options.insert(kind_val, id.to_string());
+                }
+              }
+            }
+          }
+        }
+      }
+    } else if let Some(one_of) = &self.obj.one_of {
+      let mut type_vals = std::collections::HashSet::new();
+      let mut kind_vals = std::collections::HashSet::new();
+
+      for c in one_of {
+        if let Some(t_val) = c.obj.get_discriminator_value("type") {
+          type_vals.insert(t_val);
+        }
+        if let Some(k_val) = c.obj.get_discriminator_value("kind") {
+          kind_vals.insert(k_val);
+        }
+      }
+
+      strategy = if type_vals.len() > 1 && type_vals.len() == one_of.len() {
+        "type".to_string()
+      } else if kind_vals.len() > 1 && kind_vals.len() == one_of.len() {
+        "kind".to_string()
+      } else {
+        "".to_string()
+      };
+
+      if strategy.is_empty() {
+        return;
+      }
+
+      for c in one_of {
+        if let Some(val) = c.obj.get_discriminator_value(&strategy) {
+          if options.contains_key(&val) {
+            errors.push(crate::drop::Error {
+              code: "POLYMORPHIC_COLLISION".to_string(),
+              message: format!("Polymorphic boundary defines multiple candidates mapped to the identical discriminator value '{}'.", val),
+              details: crate::drop::ErrorDetails::default()
+            });
+            continue;
+          }
+
+          let mut target_id = c.obj.id.clone();
+          if target_id.is_none() {
+            if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &c.obj.type_ {
+              if !crate::database::object::is_primitive_type(t) {
+                target_id = Some(t.clone());
+              }
+            }
+          }
+
+          if let Some(tid) = target_id {
+            options.insert(val, tid);
+          }
+        }
+      }
+    } else {
+      return;
+    }
+
+    if !options.is_empty() {
+      let _ = self.obj.compiled_discriminator.set(strategy);
+      let _ = self.obj.compiled_options.set(options);
+    }
+  }
+
   #[allow(unused_variables)]
   fn validate_identifier(id: &str, field_name: &str, errors: &mut Vec<crate::drop::Error>) {
     #[cfg(not(test))]
@@ -422,8 +420,10 @@ impl Schema {
       Self::validate_identifier(id, "$id", errors);
       to_insert.push((id.clone(), self.clone()));
     }
-    if let Some(r#ref) = &self.obj.r#ref {
-      Self::validate_identifier(r#ref, "$ref", errors);
+    if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &self.obj.type_ {
+      if !crate::database::object::is_primitive_type(t) {
+        Self::validate_identifier(t, "type", errors);
+      }
     }
     if let Some(family) = &self.obj.family {
       Self::validate_identifier(family, "$family", errors);
@@ -431,9 +431,13 @@ impl Schema {
 
     // Is this schema an inline ad-hoc composition?
     // Meaning it has a tracking context, lacks an explicit $id, but extends an Entity ref with explicit properties!
-    if self.obj.id.is_none() && self.obj.r#ref.is_some() && self.obj.properties.is_some() {
-      if let Some(ref path) = tracking_path {
-        to_insert.push((path.clone(), self.clone()));
+    if self.obj.id.is_none() && self.obj.properties.is_some() {
+      if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &self.obj.type_ {
+        if !crate::database::object::is_primitive_type(t) {
+          if let Some(ref path) = tracking_path {
+            to_insert.push((path.clone(), self.clone()));
+          }
+        }
       }
     }
 
@@ -478,9 +482,7 @@ impl Schema {
     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.one_of {
       map_arr(arr);
     }
@@ -503,291 +505,28 @@ impl Schema {
     map_opt(&mut self.obj.not, false);
     map_opt(&mut self.obj.contains, false);
     map_opt(&mut self.obj.property_names, false);
-    map_opt(&mut self.obj.if_, false);
-    map_opt(&mut self.obj.then_, false);
-    map_opt(&mut self.obj.else_, false);
-  }
-
-  /// Dynamically infers and compiles all structural database relationships between this Schema
-  /// and its nested children. This functions recursively traverses the JSON Schema abstract syntax
-  /// tree, identifies physical PostgreSQL table boundaries, and locks the resulting relation
-  /// constraint paths directly onto the `compiled_edges` map in O(1) memory.
-  pub fn compile_edges(
-    &self,
-    db: &crate::database::Database,
-    visited: &mut std::collections::HashSet<String>,
-    props: &std::collections::BTreeMap<String, std::sync::Arc<Schema>>,
-    errors: &mut Vec<crate::drop::Error>,
-  ) -> std::collections::BTreeMap<String, crate::database::edge::Edge> {
-    let mut schema_edges = std::collections::BTreeMap::new();
-
-    // Determine the physical Database Table Name this schema structurally represents
-    // Plucks the polymorphic discriminator via dot-notation (e.g. extracting "person" from "full.person")
-    let mut parent_type_name = None;
-    if let Some(family) = &self.obj.family {
-      parent_type_name = Some(family.split('.').next_back().unwrap_or(family).to_string());
-    } else if let Some(identifier) = self.obj.identifier() {
-      parent_type_name = Some(
-        identifier
-          .split('.')
-          .next_back()
-          .unwrap_or(&identifier)
-          .to_string(),
-      );
-    }
-
-    if let Some(p_type) = parent_type_name {
-      // Proceed only if the resolved table physically exists within the Postgres Type hierarchy
-      if db.types.contains_key(&p_type) {
-        // Iterate over all discovered schema boundaries mapped inside the object
-        for (prop_name, prop_schema) in props {
-          let mut child_type_name = None;
-          let mut target_schema = prop_schema.clone();
-          let mut is_array = false;
-
-          // Structurally unpack the inner target entity if the object maps to an array list
-          if let Some(crate::database::schema::SchemaTypeOrArray::Single(t)) =
-            &prop_schema.obj.type_
-          {
-            if t == "array" {
-              is_array = true;
-              if let Some(items) = &prop_schema.obj.items {
-                target_schema = items.clone();
-              }
-            }
-          }
-
-          // Determine the physical Postgres table backing the nested child schema recursively
-          if let Some(family) = &target_schema.obj.family {
-            child_type_name = Some(family.split('.').next_back().unwrap_or(family).to_string());
-          } else if let Some(ref_id) = target_schema.obj.identifier() {
-            child_type_name = Some(ref_id.split('.').next_back().unwrap_or(&ref_id).to_string());
-          } else if let Some(arr) = &target_schema.obj.one_of {
-            if let Some(first) = arr.first() {
-              if let Some(ref_id) = first.obj.identifier() {
-                child_type_name =
-                  Some(ref_id.split('.').next_back().unwrap_or(&ref_id).to_string());
-              }
-            }
-          }
-
-          if let Some(c_type) = child_type_name {
-            if db.types.contains_key(&c_type) {
-              // Ensure the child Schema's AST has accurately compiled its own physical property keys so we can
-              // inject them securely for Many-to-Many Twin Deduction disambiguation matching.
-              target_schema.compile(db, visited, errors);
-              if let Some(compiled_target_props) = target_schema.obj.compiled_properties.get() {
-                let keys_for_ambiguity: Vec<String> =
-                  compiled_target_props.keys().cloned().collect();
-
-                // Interrogate the Database catalog graph to discover the exact Foreign Key Constraint connecting the components
-                if let Some((relation, is_forward)) = resolve_relation(
-                  db,
-                  &p_type,
-                  &c_type,
-                  prop_name,
-                  Some(&keys_for_ambiguity),
-                  is_array,
-                  self.id.as_deref(),
-                  &format!("/{}", prop_name),
-                  errors,
-                ) {
-                  schema_edges.insert(
-                    prop_name.clone(),
-                    crate::database::edge::Edge {
-                      constraint: relation.constraint.clone(),
-                      forward: is_forward,
-                    },
-                  );
-                }
-              }
-            }
-          }
+    if let Some(cases) = &mut self.obj.cases {
+      for c in cases.iter_mut() {
+        if let Some(when) = &mut c.when {
+          let mut inner = (**when).clone();
+          inner.collect_schemas(origin_path.clone(), to_insert, errors);
+          *when = Arc::new(inner);
+        }
+        if let Some(then) = &mut c.then {
+          let mut inner = (**then).clone();
+          inner.collect_schemas(origin_path.clone(), to_insert, errors);
+          *then = Arc::new(inner);
+        }
+        if let Some(else_) = &mut c.else_ {
+          let mut inner = (**else_).clone();
+          inner.collect_schemas(origin_path.clone(), to_insert, errors);
+          *else_ = Arc::new(inner);
         }
       }
     }
-    schema_edges
   }
 }
 
-/// Inspects the Postgres pg_constraint relations catalog to securely identify
-/// the precise Foreign Key connecting a parent and child hierarchy path.
-pub(crate) fn resolve_relation<'a>(
-  db: &'a crate::database::Database,
-  parent_type: &str,
-  child_type: &str,
-  prop_name: &str,
-  relative_keys: Option<&Vec<String>>,
-  is_array: bool,
-  schema_id: Option<&str>,
-  path: &str,
-  errors: &mut Vec<crate::drop::Error>,
-) -> Option<(&'a crate::database::relation::Relation, bool)> {
-  // Enforce graph locality by ensuring we don't accidentally crawl to pure structural entity boundaries
-  if parent_type == "entity" && child_type == "entity" {
-    return None;
-  }
-
-  let p_def = db.types.get(parent_type)?;
-  let c_def = db.types.get(child_type)?;
-
-  let mut matching_rels = Vec::new();
-  let mut directions = Vec::new();
-
-  // Scour the complete catalog for any Edge matching the inheritance scope of the two objects
-  // This automatically binds polymorphic structures (e.g. recognizing a relationship targeting User
-  // also natively binds instances specifically typed as Person).
-  let mut all_rels: Vec<&crate::database::relation::Relation> = db.relations.values().collect();
-  all_rels.sort_by(|a, b| a.constraint.cmp(&b.constraint));
-
-  for rel in all_rels {
-    let mut is_forward =
-      p_def.hierarchy.contains(&rel.source_type) && c_def.hierarchy.contains(&rel.destination_type);
-    let is_reverse =
-      p_def.hierarchy.contains(&rel.destination_type) && c_def.hierarchy.contains(&rel.source_type);
-
-    // Structural Cardinality Filtration:
-    // If the schema requires a collection (Array), it is mathematically impossible for a pure
-    // Forward scalar edge (where the parent holds exactly one UUID pointer) to fulfill a One-to-Many request.
-    // Thus, if it's an array, we fully reject pure Forward edges and only accept Reverse edges (or Junction edges).
-    if is_array && is_forward && !is_reverse {
-      is_forward = false;
-    }
-
-    if is_forward {
-      matching_rels.push(rel);
-      directions.push(true);
-    } else if is_reverse {
-      matching_rels.push(rel);
-      directions.push(false);
-    }
-  }
-
-  // Abort relation discovery early if no hierarchical inheritance match was found
-  if matching_rels.is_empty() {
-    let mut details = crate::drop::ErrorDetails {
-      path: path.to_string(),
-      ..Default::default()
-    };
-    if let Some(sid) = schema_id {
-      details.schema = Some(sid.to_string());
-    }
-
-    errors.push(crate::drop::Error {
-      code: "EDGE_MISSING".to_string(),
-      message: format!(
-        "No database relation exists between '{}' and '{}' for property '{}'",
-        parent_type, child_type, prop_name
-      ),
-      details,
-    });
-    return None;
-  }
-
-  // Ideal State: The objects only share a solitary structural relation, resolving ambiguity instantly.
-  if matching_rels.len() == 1 {
-    return Some((matching_rels[0], directions[0]));
-  }
-
-  let mut chosen_idx = 0;
-  let mut resolved = false;
-
-  // Exact Prefix Disambiguation: Determine if the database specifically names this constraint
-  // directly mapping to the JSON Schema property name (e.g., `fk_{child}_{property_name}`)
-  for (i, rel) in matching_rels.iter().enumerate() {
-    if let Some(prefix) = &rel.prefix {
-      if prop_name.starts_with(prefix)
-        || prefix.starts_with(prop_name)
-        || prefix.replace("_", "") == prop_name.replace("_", "")
-      {
-        chosen_idx = i;
-        resolved = true;
-        break;
-      }
-    }
-  }
-
-  // Complex Subgraph Resolution: The database contains multiple equally explicit foreign key constraints
-  // linking these objects (such as pointing to `source` and `target` in Many-to-Many junction models).
-  if !resolved && relative_keys.is_some() {
-    // Twin Deduction Pass 1: We inspect the exact properties structurally defined inside the compiled payload
-    // to observe which explicit relation arrow the child payload natively consumes.
-    let keys = relative_keys.unwrap();
-    let mut consumed_rel_idx = None;
-    for (i, rel) in matching_rels.iter().enumerate() {
-      if let Some(prefix) = &rel.prefix {
-        if keys.contains(prefix) {
-          consumed_rel_idx = Some(i);
-          break; // Found the routing edge explicitly consumed by the schema payload
-        }
-      }
-    }
-
-    // Twin Deduction Pass 2: Knowing which arrow points outbound, we can mathematically deduce its twin
-    // providing the reverse ownership on the same junction boundary must be the incoming Edge to the parent.
-    if let Some(used_idx) = consumed_rel_idx {
-      let used_rel = matching_rels[used_idx];
-      let mut twin_ids = Vec::new();
-      for (i, rel) in matching_rels.iter().enumerate() {
-        if i != used_idx
-          && rel.source_type == used_rel.source_type
-          && rel.destination_type == used_rel.destination_type
-          && rel.prefix.is_some()
-        {
-          twin_ids.push(i);
-        }
-      }
-
-      if twin_ids.len() == 1 {
-        chosen_idx = twin_ids[0];
-        resolved = true;
-      }
-    }
-  }
-
-  // Implicit Base Fallback: If no complex explicit paths resolve, but exactly one relation
-  // sits entirely naked (without a constraint prefix), it must be the core structural parent ownership.
-  if !resolved {
-    let mut null_prefix_ids = Vec::new();
-    for (i, rel) in matching_rels.iter().enumerate() {
-      if rel.prefix.is_none() {
-        null_prefix_ids.push(i);
-      }
-    }
-    if null_prefix_ids.len() == 1 {
-      chosen_idx = null_prefix_ids[0];
-      resolved = true;
-    }
-  }
-
-  // If we exhausted all mathematical deduction pathways and STILL cannot isolate a single edge,
-  // we must abort rather than silently guessing. Returning None prevents arbitrary SQL generation
-  // and forces a clean structural error for the architect.
-  if !resolved {
-    let mut details = crate::drop::ErrorDetails {
-      path: path.to_string(),
-      context: serde_json::to_value(&matching_rels).ok(),
-      cause: Some("Multiple conflicting constraints found matching prefixes".to_string()),
-      ..Default::default()
-    };
-    if let Some(sid) = schema_id {
-      details.schema = Some(sid.to_string());
-    }
-
-    errors.push(crate::drop::Error {
-      code: "AMBIGUOUS_TYPE_RELATIONS".to_string(),
-      message: format!(
-        "Ambiguous database relation between '{}' and '{}' for property '{}'",
-        parent_type, child_type, prop_name
-      ),
-      details,
-    });
-    return None;
-  }
-
-  Some((matching_rels[chosen_idx], directions[chosen_idx]))
-}
-
 impl<'de> Deserialize<'de> for Schema {
   fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
   where
@@ -823,13 +562,9 @@ impl<'de> Deserialize<'de> for Schema {
       && obj.format.is_none()
       && obj.enum_.is_none()
       && obj.const_.is_none()
-      && obj.all_of.is_none()
+      && obj.cases.is_none()
       && obj.one_of.is_none()
       && obj.not.is_none()
-      && obj.if_.is_none()
-      && obj.then_.is_none()
-      && obj.else_.is_none()
-      && obj.r#ref.is_none()
       && obj.family.is_none();
 
     if is_empty && obj.extensible.is_none() {
@@ -842,34 +577,3 @@ impl<'de> Deserialize<'de> for Schema {
     })
   }
 }
-
-impl SchemaObject {
-  pub fn identifier(&self) -> Option<String> {
-    if let Some(lookup_key) = self.id.as_ref().or(self.r#ref.as_ref()) {
-      Some(lookup_key.split('.').next_back().unwrap_or("").to_string())
-    } else {
-      None
-    }
-  }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum SchemaTypeOrArray {
-  Single(String),
-  Multiple(Vec<String>),
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Action {
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub navigate: Option<String>,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub punc: Option<String>,
-}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum Dependency {
-  Props(Vec<String>),
-  Schema(Arc<Schema>),
-}

src/merger/mod.rs

@@ -25,7 +25,7 @@ impl Merger {
     let mut notifications_queue = Vec::new();
 
     let target_schema = match self.db.schemas.get(schema_id) {
-      Some(s) => Arc::new(s.clone()),
+      Some(s) => Arc::clone(s),
       None => {
         return crate::drop::Drop::with_errors(vec![crate::drop::Error {
           code: "MERGE_FAILED".to_string(),
@@ -131,13 +131,33 @@ impl Merger {
 
   pub(crate) fn merge_internal(
     &self,
-    schema: Arc<crate::database::schema::Schema>,
+    mut schema: Arc<crate::database::schema::Schema>,
     data: Value,
     notifications: &mut Vec<String>,
   ) -> Result<Value, String> {
     match data {
       Value::Array(items) => self.merge_array(schema, items, notifications),
-      Value::Object(map) => self.merge_object(schema, map, notifications),
+      Value::Object(map) => {
+        if let Some(options) = schema.obj.compiled_options.get() {
+          if let Some(disc) = schema.obj.compiled_discriminator.get() {
+            let val = map.get(disc).and_then(|v| v.as_str());
+            if let Some(v) = val {
+              if let Some(target_id) = options.get(v) {
+                if let Some(target_schema) = self.db.schemas.get(target_id) {
+                  schema = Arc::clone(target_schema);
+                } else {
+                  return Err(format!("Polymorphic mapped target '{}' not found in database registry", target_id));
+                }
+              } else {
+                return Err(format!("Polymorphic discriminator {}='{}' matched no compiled options", disc, v));
+              }
+            } else {
+              return Err(format!("Polymorphic merging failed: missing required discriminator '{}'", disc));
+            }
+          }
+        }
+        self.merge_object(schema, map, notifications)
+      },
       _ => Err("Invalid merge payload: root must be an Object or Array".to_string()),
     }
   }
@@ -149,7 +169,7 @@ impl Merger {
     notifications: &mut Vec<String>,
   ) -> Result<Value, String> {
     let mut item_schema = schema.clone();
-    if let Some(crate::database::schema::SchemaTypeOrArray::Single(t)) = &schema.obj.type_ {
+    if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &schema.obj.type_ {
       if t == "array" {
         if let Some(items_def) = &schema.obj.items {
           item_schema = items_def.clone();
@@ -369,7 +389,7 @@ impl Merger {
                 );
 
                 let mut item_schema = rel_schema.clone();
-                if let Some(crate::database::schema::SchemaTypeOrArray::Single(t)) =
+                if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) =
                   &rel_schema.obj.type_
                 {
                   if t == "array" {

src/queryer/compiler.rs

@@ -1,5 +1,6 @@
 use crate::database::Database;
 use std::sync::Arc;
+
 pub struct Compiler<'a> {
   pub db: &'a Database,
   pub filter_keys: &'a [String],
@@ -16,6 +17,7 @@ pub struct Node<'a> {
   pub property_name: Option<String>,
   pub depth: usize,
   pub ast_path: String,
+  pub is_polymorphic_branch: bool,
 }
 
 impl<'a> Compiler<'a> {
@@ -27,7 +29,7 @@ impl<'a> Compiler<'a> {
       .get(schema_id)
       .ok_or_else(|| format!("Schema not found: {}", schema_id))?;
 
-    let target_schema = std::sync::Arc::new(schema.clone());
+    let target_schema = std::sync::Arc::clone(schema);
 
     let mut compiler = Compiler {
       db: &self.db,
@@ -44,10 +46,11 @@ impl<'a> Compiler<'a> {
       property_name: None,
       depth: 0,
       ast_path: String::new(),
+      is_polymorphic_branch: false,
     };
 
     let (sql, _) = compiler.compile_node(node)?;
-    Ok(sql)
+    Ok(format!("(SELECT jsonb_strip_nulls({}))", sql))
   }
 
   /// Recursively walks the schema AST emitting native PostgreSQL jsonb mapping
@@ -55,7 +58,7 @@ impl<'a> Compiler<'a> {
   fn compile_node(&mut self, node: Node<'a>) -> Result<(String, String), String> {
     // Determine the base schema type (could be an array, object, or literal)
     match &node.schema.obj.type_ {
-      Some(crate::database::schema::SchemaTypeOrArray::Single(t)) if t == "array" => {
+      Some(crate::database::object::SchemaTypeOrArray::Single(t)) if t == "array" => {
         self.compile_array(node)
       }
       _ => self.compile_reference(node),
@@ -63,7 +66,7 @@ impl<'a> Compiler<'a> {
   }
 
   fn compile_array(&mut self, node: Node<'a>) -> Result<(String, String), String> {
-    // 1. Array of DB Entities (`$ref` or `$family` pointing to a table limit)
+    // 1. Array of DB Entities (`type` or `$family` pointing to a table limit)
     if let Some(items) = &node.schema.obj.items {
       let mut resolved_type = None;
       if let Some(family_target) = items.obj.family.as_ref() {
@@ -103,7 +106,11 @@ impl<'a> Compiler<'a> {
     let mut resolved_type = None;
 
     if let Some(family_target) = node.schema.obj.family.as_ref() {
-      resolved_type = self.db.types.get(family_target);
+      let base_type_name = family_target
+        .split('.')
+        .next_back()
+        .unwrap_or(family_target);
+      resolved_type = self.db.types.get(base_type_name);
     } else if let Some(base_type_name) = node.schema.obj.identifier() {
       resolved_type = self.db.types.get(&base_type_name);
     }
@@ -112,45 +119,31 @@ impl<'a> Compiler<'a> {
       return self.compile_entity(type_def, node.clone(), false);
     }
 
-    // Handle Direct Refs
-    if let Some(ref_id) = &node.schema.obj.r#ref {
-      // If it's just an ad-hoc struct ref, we should resolve it
-      if let Some(target_schema) = self.db.schemas.get(ref_id) {
-        let mut ref_node = node.clone();
-        ref_node.schema = std::sync::Arc::new(target_schema.clone());
-        return self.compile_node(ref_node);
+    // Handle Direct Refs via type pointer
+    if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &node.schema.obj.type_ {
+      if !crate::database::object::is_primitive_type(t) {
+        // If it's just an ad-hoc struct ref, we should resolve it
+        if let Some(target_schema) = self.db.schemas.get(t) {
+          let mut ref_node = node.clone();
+          ref_node.schema = Arc::clone(target_schema);
+          return self.compile_node(ref_node);
+        }
+        return Err(format!("Unresolved schema type pointer: {}", t));
       }
-      return Err(format!("Unresolved $ref: {}", ref_id));
     }
-    // Handle $family Polymorphism fallbacks for relations
-    if let Some(family_target) = &node.schema.obj.family {
-      let mut all_targets = vec![family_target.clone()];
-      if let Some(descendants) = self.db.descendants.get(family_target) {
-        all_targets.extend(descendants.clone());
-      }
-
-      if all_targets.len() == 1 {
-        let mut bypass_schema = crate::database::schema::Schema::default();
-        bypass_schema.obj.r#ref = Some(all_targets[0].clone());
-        let mut bypass_node = node.clone();
-        bypass_node.schema = std::sync::Arc::new(bypass_schema);
-        return self.compile_node(bypass_node);
-      }
-
-      all_targets.sort();
-      let mut family_schemas = Vec::new();
-      for variation in &all_targets {
-        let mut ref_schema = crate::database::schema::Schema::default();
-        ref_schema.obj.r#ref = Some(variation.clone());
-        family_schemas.push(std::sync::Arc::new(ref_schema));
-      }
-
-      return self.compile_one_of(&family_schemas, node);
-    }
-
-    // Handle oneOf Polymorphism fallbacks for relations
-    if let Some(one_of) = &node.schema.obj.one_of {
-      return self.compile_one_of(one_of, node.clone());
+    // Handle Polymorphism fallbacks for relations
+    if node.schema.obj.family.is_some() || node.schema.obj.one_of.is_some() {
+       if let Some(options) = node.schema.obj.compiled_options.get() {
+          if options.len() == 1 {
+             let target_id = options.values().next().unwrap();
+             let mut bypass_schema = crate::database::schema::Schema::default();
+             bypass_schema.obj.type_ = Some(crate::database::object::SchemaTypeOrArray::Single(target_id.clone()));
+             let mut bypass_node = node.clone();
+             bypass_node.schema = std::sync::Arc::new(bypass_schema);
+             return self.compile_node(bypass_node);
+          }
+       }
+       return self.compile_one_of(node);
     }
 
     // Just an inline object definition?
@@ -177,17 +170,28 @@ impl<'a> Compiler<'a> {
   ) -> Result<(String, String), String> {
     let (table_aliases, from_clauses) = self.compile_from_clause(r#type);
 
-    // 2. Map properties and build jsonb_build_object args
-    let mut select_args = self.compile_select_clause(r#type, &table_aliases, node.clone())?;
+    let jsonb_obj_sql = if node.schema.obj.family.is_some() || node.schema.obj.one_of.is_some() {
+        let base_alias = table_aliases
+          .get(&r#type.name)
+          .cloned()
+          .unwrap_or_else(|| node.parent_alias.to_string());
           
-    // 2.5 Inject polymorphism directly into the query object
-    let mut poly_args = self.compile_polymorphism_select(r#type, &table_aliases, node.clone())?;
-    select_args.append(&mut poly_args);
+        let mut case_node = node.clone();
+        case_node.parent_alias = base_alias.clone();
+        let arc_aliases = std::sync::Arc::new(table_aliases.clone());
+        case_node.parent_type_aliases = Some(arc_aliases);
+        case_node.parent_type = Some(r#type);
 
-    let jsonb_obj_sql = if select_args.is_empty() {
-      "jsonb_build_object()".to_string()
+        let (case_sql, _) = self.compile_one_of(case_node)?;
+        case_sql
     } else {
-      format!("jsonb_build_object({})", select_args.join(", "))
+        let select_args = self.compile_select_clause(r#type, &table_aliases, node.clone())?;
+        
+        if select_args.is_empty() {
+          "jsonb_build_object()".to_string()
+        } else {
+          format!("jsonb_build_object({})", select_args.join(", "))
+        }
     };
 
     // 3. Build WHERE clauses
@@ -216,90 +220,6 @@ impl<'a> Compiler<'a> {
     ))
   }
 
-  fn compile_polymorphism_select(
-    &mut self,
-    r#type: &'a crate::database::r#type::Type,
-    table_aliases: &std::collections::HashMap<String, String>,
-    node: Node<'a>,
-  ) -> Result<Vec<String>, String> {
-    let mut select_args = Vec::new();
-
-    if let Some(family_target) = node.schema.obj.family.as_ref() {
-      let family_prefix = family_target.rfind('.').map(|idx| &family_target[..idx]);
-
-      let mut all_targets = vec![family_target.clone()];
-      if let Some(descendants) = self.db.descendants.get(family_target) {
-        all_targets.extend(descendants.clone());
-      }
-
-      // Filter targets to EXACTLY match the family_target prefix
-      let mut final_targets = Vec::new();
-      for target in all_targets {
-        let target_prefix = target.rfind('.').map(|idx| &target[..idx]);
-        if target_prefix == family_prefix {
-          final_targets.push(target);
-        }
-      }
-
-      final_targets.sort();
-      final_targets.dedup();
-
-      if final_targets.len() == 1 {
-        let variation = &final_targets[0];
-        if let Some(target_schema) = self.db.schemas.get(variation) {
-          let mut bypass_node = node.clone();
-          bypass_node.schema = std::sync::Arc::new(target_schema.clone());
-
-          let mut bypassed_args = self.compile_select_clause(r#type, table_aliases, bypass_node)?;
-          select_args.append(&mut bypassed_args);
-        } else {
-          return Err(format!("Could not find schema for variation {}", variation));
-        }
-      } else {
-        let mut family_schemas = Vec::new();
-
-        for variation in &final_targets {
-          if let Some(target_schema) = self.db.schemas.get(variation) {
-            family_schemas.push(std::sync::Arc::new(target_schema.clone()));
-          } else {
-            return Err(format!(
-              "Could not find schema metadata for variation {}",
-              variation
-            ));
-          }
-        }
-
-        let base_alias = table_aliases
-          .get(&r#type.name)
-          .cloned()
-          .unwrap_or_else(|| node.parent_alias.to_string());
-        select_args.push(format!("'id', {}.id", base_alias));
-        let mut case_node = node.clone();
-        case_node.parent_alias = base_alias.clone();
-        let arc_aliases = std::sync::Arc::new(table_aliases.clone());
-        case_node.parent_type_aliases = Some(arc_aliases);
-
-        let (case_sql, _) = self.compile_one_of(&family_schemas, case_node)?;
-        select_args.push(format!("'type', {}", case_sql));
-      }
-    } else if let Some(one_of) = &node.schema.obj.one_of {
-      let base_alias = table_aliases
-        .get(&r#type.name)
-        .cloned()
-        .unwrap_or_else(|| node.parent_alias.to_string());
-      select_args.push(format!("'id', {}.id", base_alias));
-      let mut case_node = node.clone();
-      case_node.parent_alias = base_alias.clone();
-      let arc_aliases = std::sync::Arc::new(table_aliases.clone());
-      case_node.parent_type_aliases = Some(arc_aliases);
-
-      let (case_sql, _) = self.compile_one_of(one_of, case_node)?;
-      select_args.push(format!("'type', {}", case_sql));
-    }
-
-    Ok(select_args)
-  }
-
   fn compile_object(
     &mut self,
     props: &std::collections::BTreeMap<String, std::sync::Arc<crate::database::schema::Schema>>,
@@ -331,26 +251,45 @@ impl<'a> Compiler<'a> {
 
   fn compile_one_of(
     &mut self,
-    schemas: &[Arc<crate::database::schema::Schema>],
     node: Node<'a>,
   ) -> Result<(String, String), String> {
     let mut case_statements = Vec::new();
+
+    let options = node.schema.obj.compiled_options.get().ok_or("Missing compiled options for polymorphism")?;
+    let disc = node.schema.obj.compiled_discriminator.get().ok_or("Missing compiled discriminator for polymorphism")?;
+
     let type_col = if let Some(prop) = &node.property_name {
-      format!("{}_type", prop)
+      format!("{}_{}", prop, disc)
     } else {
-      "type".to_string()
+      disc.to_string()
     };
 
-    for option_schema in schemas {
-      if let Some(base_type_name) = option_schema.obj.identifier() {
-        // Generate the nested SQL for this specific target type
+    for (disc_val, target_id) in options {
+      if let Some(target_schema) = self.db.schemas.get(target_id) {
         let mut child_node = node.clone();
-        child_node.schema = std::sync::Arc::clone(option_schema);
-        let (val_sql, _) = self.compile_node(child_node)?;
+        child_node.schema = Arc::clone(target_schema);
+        child_node.is_polymorphic_branch = true;
+
+        let val_sql = if disc == "kind" && node.parent_type.is_some() && node.parent_type_aliases.is_some() {
+            let aliases_arc = node.parent_type_aliases.as_ref().unwrap();
+            let aliases = aliases_arc.as_ref();
+            let p_type = node.parent_type.unwrap();
+            
+            let select_args = self.compile_select_clause(p_type, aliases, child_node.clone())?;
+            
+            if select_args.is_empty() {
+                "jsonb_build_object()".to_string()
+            } else {
+                format!("jsonb_build_object({})", select_args.join(", "))
+            }
+        } else {
+            let (sql, _) = self.compile_node(child_node)?;
+            sql
+        };
 
         case_statements.push(format!(
           "WHEN {}.{} = '{}' THEN ({})",
-          node.parent_alias, type_col, base_type_name, val_sql
+          node.parent_alias, type_col, disc_val, val_sql
         ));
       }
     }
@@ -399,7 +338,9 @@ impl<'a> Compiler<'a> {
   ) -> Result<Vec<String>, String> {
     let mut select_args = Vec::new();
     let grouped_fields = r#type.grouped_fields.as_ref().and_then(|v| v.as_object());
-    let merged_props = node.schema.obj.compiled_properties.get().unwrap();
+    let default_props = std::collections::BTreeMap::new();
+    let merged_props = node.schema.obj.compiled_properties.get().unwrap_or(&default_props);
+    
     let mut sorted_keys: Vec<&String> = merged_props.keys().collect();
     sorted_keys.sort();
 
@@ -407,16 +348,23 @@ impl<'a> Compiler<'a> {
       let prop_schema = &merged_props[prop_key];
 
       let is_object_or_array = match &prop_schema.obj.type_ {
-        Some(crate::database::schema::SchemaTypeOrArray::Single(s)) => {
+        Some(crate::database::object::SchemaTypeOrArray::Single(s)) => {
           s == "object" || s == "array"
         }
-        Some(crate::database::schema::SchemaTypeOrArray::Multiple(v)) => {
+        Some(crate::database::object::SchemaTypeOrArray::Multiple(v)) => {
           v.contains(&"object".to_string()) || v.contains(&"array".to_string())
         }
         _ => false,
       };
 
-      let is_primitive = prop_schema.obj.r#ref.is_none()
+      let is_custom_object_pointer = match &prop_schema.obj.type_ {
+        Some(crate::database::object::SchemaTypeOrArray::Single(s)) => {
+          !crate::database::object::is_primitive_type(s)
+        }
+        _ => false,
+      };
+
+      let is_primitive = !is_custom_object_pointer
         && !is_object_or_array
         && prop_schema.obj.family.is_none()
         && prop_schema.obj.one_of.is_none();
@@ -461,6 +409,7 @@ impl<'a> Compiler<'a> {
         } else {
           format!("{}/{}", node.ast_path, prop_key)
         },
+        is_polymorphic_branch: false,
       };
 
       let (val_sql, val_type) = self.compile_node(child_node)?;
@@ -500,6 +449,8 @@ impl<'a> Compiler<'a> {
 
     self.compile_filter_conditions(r#type, type_aliases, &node, &base_alias, &mut where_clauses);
     self.compile_polymorphic_bounds(r#type, type_aliases, &node, &mut where_clauses);
+    
+    let start_len = where_clauses.len();
     self.compile_relation_conditions(
       r#type,
       type_aliases,
@@ -508,6 +459,14 @@ impl<'a> Compiler<'a> {
       &mut where_clauses,
     )?;
 
+    if node.is_polymorphic_branch && where_clauses.len() == start_len {
+      if let Some(parent_aliases) = &node.parent_type_aliases {
+        if let Some(outer_entity_alias) = parent_aliases.get("entity") {
+          where_clauses.push(format!("{}.id = {}.id", entity_alias, outer_entity_alias));
+        }
+      }
+    }
+
     Ok(where_clauses)
   }
 

src/tests/mod.rs

@@ -42,19 +42,21 @@ fn test_library_api() {
       "types": [
           {
               "name": "source_schema",
+              "variations": ["source_schema"],
               "hierarchy": ["source_schema", "entity"],
               "schemas": [{
                   "$id": "source_schema",
                   "type": "object",
                   "properties": {
                       "name": { "type": "string" },
-                      "target": { "$ref": "target_schema" }
+                      "target": { "type": "target_schema" }
                   },
                   "required": ["name"]
               }]
           },
           {
               "name": "target_schema",
+              "variations": ["target_schema"],
               "hierarchy": ["target_schema", "entity"],
               "schemas": [{
                   "$id": "target_schema",
@@ -89,7 +91,7 @@ fn test_library_api() {
                 "properties": {
                     "name": { "type": "string" },
                     "target": {
-                        "$ref": "target_schema",
+                        "type": "target_schema",
                         "compiledProperties": ["value"]
                     }
                 },
@@ -115,7 +117,7 @@ fn test_library_api() {
   );
 
   // 4. Validate Happy Path
-  let happy_drop = jspg_validate("source_schema", JsonB(json!({"name": "Neo"})));
+  let happy_drop = jspg_validate("source_schema", JsonB(json!({"type": "source_schema", "name": "Neo"})));
   assert_eq!(
     happy_drop.0,
     json!({
@@ -125,7 +127,7 @@ fn test_library_api() {
   );
 
   // 5. Validate Unhappy Path
-  let unhappy_drop = jspg_validate("source_schema", JsonB(json!({"wrong": "data"})));
+  let unhappy_drop = jspg_validate("source_schema", JsonB(json!({"type": "source_schema", "wrong": "data"})));
   assert_eq!(
     unhappy_drop.0,
     json!({

src/tests/types/expect/drop.rs

@@ -19,6 +19,16 @@ impl Expect {
           .map(|e| serde_json::to_value(e).unwrap())
           .collect();
 
+        if expected_errors.len() != actual_values.len() {
+          return Err(format!(
+            "Expected {} errors, but got {}.\nExpected subset: {:?}\nActual full errors: {:?}",
+            expected_errors.len(),
+            actual_values.len(),
+            expected_errors,
+            drop.errors
+          ));
+        }
+
         for (i, expected_val) in expected_errors.iter().enumerate() {
           let mut matched = false;
           

src/validator/rules/cases.rs

@@ -0,0 +1,45 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_cases(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    if let Some(cases) = &self.schema.cases {
+      for case in cases {
+        if let Some(ref when_schema) = case.when {
+          let derived_when = self.derive_for_schema(when_schema, true);
+          let when_res = derived_when.validate()?;
+
+          // Evaluates all cases independently.
+          if when_res.is_valid() {
+            result
+              .evaluated_keys
+              .extend(when_res.evaluated_keys.clone());
+            result
+              .evaluated_indices
+              .extend(when_res.evaluated_indices.clone());
+
+            if let Some(ref then_schema) = case.then {
+              let derived_then = self.derive_for_schema(then_schema, true);
+              result.merge(derived_then.validate()?);
+            }
+          } else {
+            if let Some(ref else_schema) = case.else_ {
+              let derived_else = self.derive_for_schema(else_schema, true);
+              result.merge(derived_else.validate()?);
+            }
+          }
+        } else if let Some(ref else_schema) = case.else_ {
+          // A rule with a missing `when` fires the `else` indiscriminately
+          let derived_else = self.derive_for_schema(else_schema, true);
+          result.merge(derived_else.validate()?);
+        }
+      }
+    }
+
+    Ok(true)
+  }
+}

src/validator/rules/combinators.rs

@@ -1,92 +0,0 @@
-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 one_of) = self.schema.one_of {
-      let mut passed_candidates: Vec<(Option<String>, usize, ValidationResult)> = Vec::new();
-
-      for sub in one_of {
-        let derived = self.derive_for_schema(sub, true);
-        let sub_res = derived.validate()?;
-        if sub_res.is_valid() {
-          let child_id = sub.id.clone();
-          let depth = child_id
-            .as_ref()
-            .and_then(|id| self.db.depths.get(id).copied())
-            .unwrap_or(0);
-          passed_candidates.push((child_id, depth, sub_res));
-        }
-      }
-
-      if passed_candidates.len() == 1 {
-        result.merge(passed_candidates.pop().unwrap().2);
-      } else if passed_candidates.is_empty() {
-        result.errors.push(ValidationError {
-          code: "NO_ONEOF_MATCH".to_string(),
-          message: "Matches none of oneOf schemas".to_string(),
-          path: self.path.to_string(),
-        });
-      } else {
-        // Apply depth heuristic tie-breaker
-        let mut best_depth: Option<usize> = None;
-        let mut ambiguous = false;
-        let mut best_res = None;
-
-        for (_, depth, res) in passed_candidates.into_iter() {
-          if let Some(current_best) = best_depth {
-            if depth > current_best {
-              best_depth = Some(depth);
-              best_res = Some(res);
-              ambiguous = false;
-            } else if depth == current_best {
-              ambiguous = true;
-            }
-          } else {
-            best_depth = Some(depth);
-            best_res = Some(res);
-          }
-        }
-
-        if !ambiguous {
-          if let Some(res) = best_res {
-            result.merge(res);
-            return Ok(true);
-          }
-        }
-
-        result.errors.push(ValidationError {
-          code: "AMBIGUOUS_ONEOF_MATCH".to_string(),
-          message: "Matches multiple oneOf schemas without a clear depth winner".to_string(),
-          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/core.rs

@@ -13,7 +13,7 @@ impl<'a> ValidationContext<'a> {
 
     if let Some(ref type_) = self.schema.type_ {
       match type_ {
-        crate::database::schema::SchemaTypeOrArray::Single(t) => {
+        crate::database::object::SchemaTypeOrArray::Single(t) => {
           if !Validator::check_type(t, current) {
             result.errors.push(ValidationError {
               code: "INVALID_TYPE".to_string(),
@@ -22,7 +22,7 @@ impl<'a> ValidationContext<'a> {
             });
           }
         }
-        crate::database::schema::SchemaTypeOrArray::Multiple(types) => {
+        crate::database::object::SchemaTypeOrArray::Multiple(types) => {
           let mut valid = false;
           for t in types {
             if Validator::check_type(t, current) {

src/validator/rules/extensible.rs

@@ -3,30 +3,14 @@ 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()?);
+  pub(crate) 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)
   }
 
@@ -40,6 +24,9 @@ impl<'a> ValidationContext<'a> {
 
     if let Some(obj) = self.instance.as_object() {
       for key in obj.keys() {
+        if key == "type" || key == "kind" {
+          continue; // Reserved keywords implicitly allowed
+        }
         if !result.evaluated_keys.contains(key) && !self.overrides.contains(key) {
           result.errors.push(ValidationError {
             code: "STRICT_PROPERTY_VIOLATION".to_string(),

src/validator/rules/format.rs

@@ -10,7 +10,7 @@ impl<'a> ValidationContext<'a> {
     let current = self.instance;
     if let Some(compiled_fmt) = self.schema.compiled_format.get() {
       match compiled_fmt {
-        crate::database::schema::CompiledFormat::Func(f) => {
+        crate::database::object::CompiledFormat::Func(f) => {
           let should = if let Some(s) = current.as_str() {
             !s.is_empty()
           } else {
@@ -24,7 +24,7 @@ impl<'a> ValidationContext<'a> {
             });
           }
         }
-        crate::database::schema::CompiledFormat::Regex(re) => {
+        crate::database::object::CompiledFormat::Regex(re) => {
           if let Some(s) = current.as_str()
             && !re.is_match(s)
           {

src/validator/rules/mod.rs

@@ -3,10 +3,11 @@ use crate::validator::error::ValidationError;
 use crate::validator::result::ValidationResult;
 
 pub mod array;
-pub mod combinators;
-pub mod conditionals;
+pub mod cases;
 pub mod core;
+pub mod extensible;
 pub mod format;
+pub mod not;
 pub mod numeric;
 pub mod object;
 pub mod polymorphism;
@@ -27,7 +28,7 @@ impl<'a> ValidationContext<'a> {
     if !self.validate_family(&mut result)? {
       return Ok(result);
     }
-    if !self.validate_refs(&mut result)? {
+    if !self.validate_type_inheritance(&mut result)? {
       return Ok(result);
     }
 
@@ -42,8 +43,11 @@ impl<'a> ValidationContext<'a> {
     self.validate_array(&mut result)?;
 
     // Multipliers & Conditionals
-    self.validate_combinators(&mut result)?;
-    self.validate_conditionals(&mut result)?;
+    if !self.validate_one_of(&mut result)? {
+      return Ok(result);
+    }
+    self.validate_not(&mut result)?;
+    self.validate_cases(&mut result)?;
 
     // State Tracking
     self.validate_extensible(&mut result)?;
@@ -77,15 +81,4 @@ impl<'a> ValidationContext<'a> {
       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/not.rs

@@ -0,0 +1,24 @@
+use crate::validator::context::ValidationContext;
+use crate::validator::error::ValidationError;
+use crate::validator::result::ValidationResult;
+
+impl<'a> ValidationContext<'a> {
+  pub(crate) fn validate_not(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    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/object.rs

@@ -15,32 +15,68 @@ impl<'a> ValidationContext<'a> {
     if let Some(obj) = current.as_object() {
       // Entity implicit type validation
       if let Some(schema_identifier) = self.schema.identifier() {
-        // Kick in if the data object has a type field
-        if let Some(type_val) = obj.get("type")
-          && let Some(type_str) = type_val.as_str()
-        {
-          // Check if the identifier is a global type name
-          if let Some(type_def) = self.db.types.get(&schema_identifier) {
-            // Ensure the instance type is a variation of the global type
-            if type_def.variations.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: self.join_path("type"),
-              });
+        // We decompose identity string routing inherently
+        let expected_type = schema_identifier.split('.').last().unwrap_or(&schema_identifier);
+        
+        // Check if the identifier represents a registered global database entity boundary mathematically
+        if let Some(type_def) = self.db.types.get(expected_type) {
+          if let Some(type_val) = obj.get("type") {
+            if let Some(type_str) = type_val.as_str() {
+              if type_def.variations.contains(type_str) {
+                // The instance is validly declaring a known structural descent
+                result.evaluated_keys.insert("type".to_string());
+              } else {
+                result.errors.push(ValidationError {
+                  code: "CONST_VIOLATED".to_string(), // Aligning with original const override errors natively
+                  message: format!(
+                    "Type '{}' is not a valid descendant for this entity bound schema",
+                    type_str
+                  ),
+                  path: self.join_path("type"),
+                });
+              }
             }
           } else {
-            // Ad-Hoc schemas natively use strict schema discriminator strings instead of variation inheritance
-            if type_str == schema_identifier.as_str() {
-              result.evaluated_keys.insert("type".to_string());
+            // Because it's a global entity target, the payload must structurally provide a discriminator natively
+            result.errors.push(ValidationError {
+              code: "MISSING_TYPE".to_string(),
+              message: format!("Schema mechanically requires type discrimination '{}'", expected_type),
+              path: self.path.clone(), // Empty boundary
+            });
+          }
+
+          // If the target mathematically declares a horizontal structural STI variation natively
+          if schema_identifier.contains('.') {
+            if obj.get("kind").is_none() {
+              result.errors.push(ValidationError {
+                code: "MISSING_KIND".to_string(),
+                message: "Schema mechanically requires horizontal kind discrimination".to_string(),
+                path: self.path.clone(),
+              });
+            } else {
+              result.evaluated_keys.insert("kind".to_string());
             }
           }
+        } else {
+          // If it isn't registered globally, it might be a nested Ad-Hoc candidate running via O(1) union routers.
+          // Because they lack manual type property descriptors, we natively shield "type" and "kind" keys from
+          // triggering additionalProperty violations natively IF they precisely correspond to their fast-path boundaries
+          if let Some(type_val) = obj.get("type") {
+             if let Some(type_str) = type_val.as_str() {
+                if type_str == expected_type {
+                   result.evaluated_keys.insert("type".to_string());
+                }
+             }
+          }
+          if let Some(kind_val) = obj.get("kind") {
+             if let Some((kind_str, _)) = schema_identifier.rsplit_once('.') {
+                if let Some(actual_kind) = kind_val.as_str() {
+                   if actual_kind == kind_str {
+                      result.evaluated_keys.insert("kind".to_string());
+                   }
+                }
+             }
+          }
         }
       }
 
@@ -67,11 +103,19 @@ impl<'a> ValidationContext<'a> {
       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: self.join_path(field),
-            });
+            if field == "type" {
+              result.errors.push(ValidationError {
+                code: "MISSING_TYPE".to_string(),
+                message: "Missing type discriminator".to_string(),
+                path: self.join_path(field),
+              });
+            } else {
+              result.errors.push(ValidationError {
+                code: "REQUIRED_FIELD_MISSING".to_string(),
+                message: format!("Missing {}", field),
+                path: self.join_path(field),
+              });
+            }
           }
         }
       }
@@ -80,7 +124,7 @@ impl<'a> ValidationContext<'a> {
         for (prop, dep) in deps {
           if obj.contains_key(prop) {
             match dep {
-              crate::database::schema::Dependency::Props(required_props) => {
+              crate::database::object::Dependency::Props(required_props) => {
                 for req_prop in required_props {
                   if !obj.contains_key(req_prop) {
                     result.errors.push(ValidationError {
@@ -91,7 +135,7 @@ impl<'a> ValidationContext<'a> {
                   }
                 }
               }
-              crate::database::schema::Dependency::Schema(dep_schema) => {
+              crate::database::object::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());
@@ -110,7 +154,10 @@ impl<'a> ValidationContext<'a> {
 
           if let Some(child_instance) = obj.get(key) {
             let new_path = self.join_path(key);
-            let is_ref = sub_schema.r#ref.is_some();
+            let is_ref = match &sub_schema.type_ {
+              Some(crate::database::object::SchemaTypeOrArray::Single(t)) => !crate::database::object::is_primitive_type(t),
+              _ => false,
+            };
             let next_extensible = if is_ref { false } else { self.extensible };
 
             let derived = self.derive(
@@ -121,21 +168,9 @@ impl<'a> ValidationContext<'a> {
               next_extensible,
               false,
             );
-            let mut item_res = derived.validate()?;
+            let item_res = derived.validate()?;
+
 
-            // Entity Bound Implicit Type Interception
-            if key == "type"
-              && let Some(schema_bound) = sub_schema.identifier()
-            {
-              if let Some(type_def) = self.db.types.get(&schema_bound)
-                && let Some(instance_type) = child_instance.as_str()
-                && type_def.variations.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());
@@ -148,7 +183,10 @@ impl<'a> ValidationContext<'a> {
           for (key, child_instance) in obj {
             if compiled_re.0.is_match(key) {
               let new_path = self.join_path(key);
-              let is_ref = sub_schema.r#ref.is_some();
+              let is_ref = match &sub_schema.type_ {
+                Some(crate::database::object::SchemaTypeOrArray::Single(t)) => !crate::database::object::is_primitive_type(t),
+                _ => false,
+              };
               let next_extensible = if is_ref { false } else { self.extensible };
 
               let derived = self.derive(
@@ -187,7 +225,10 @@ impl<'a> ValidationContext<'a> {
 
           if !locally_matched {
             let new_path = self.join_path(key);
-            let is_ref = additional_schema.r#ref.is_some();
+            let is_ref = match &additional_schema.type_ {
+              Some(crate::database::object::SchemaTypeOrArray::Single(t)) => !crate::database::object::is_primitive_type(t),
+              _ => false,
+            };
             let next_extensible = if is_ref { false } else { self.extensible };
 
             let derived = self.derive(

src/validator/rules/polymorphism.rs

@@ -13,9 +13,8 @@ impl<'a> ValidationContext<'a> {
         || self.schema.required.is_some()
         || self.schema.additional_properties.is_some()
         || self.schema.items.is_some()
-        || self.schema.r#ref.is_some()
+        || self.schema.cases.is_some()
         || self.schema.one_of.is_some()
-        || self.schema.all_of.is_some()
         || self.schema.enum_.is_some()
         || self.schema.const_.is_some();
 
@@ -25,88 +24,14 @@ impl<'a> ValidationContext<'a> {
           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);
       }
     }
 
-    if let Some(family_target) = &self.schema.family {
-      if let Some(descendants) = self.db.descendants.get(family_target) {
-        // Validate against all descendants simulating strict oneOf logic
-        let mut passed_candidates: Vec<(String, usize, ValidationResult)> = Vec::new();
-
-        // The target itself is also an implicitly valid candidate
-        let mut all_targets = vec![family_target.clone()];
-        all_targets.extend(descendants.clone());
-
-        for child_id in &all_targets {
-          if let Some(child_schema) = self.db.schemas.get(child_id) {
-            let derived = self.derive(
-              child_schema,
-              self.instance,
-              &self.path,
-              self.overrides.clone(),
-              self.extensible,
-              self.reporter, // Inherit parent reporter flag, do not bypass strictness!
-            );
-
-            // Explicitly run validate_scoped to accurately test candidates with strictness checks enabled
-            let res = derived.validate_scoped()?;
-
-            if res.is_valid() {
-              let depth = self.db.depths.get(child_id).copied().unwrap_or(0);
-              passed_candidates.push((child_id.clone(), depth, res));
-            }
-          }
-        }
-
-        if passed_candidates.len() == 1 {
-          result.merge(passed_candidates.pop().unwrap().2);
-        } else if passed_candidates.is_empty() {
-          result.errors.push(ValidationError {
-            code: "NO_FAMILY_MATCH".to_string(),
-            message: format!(
-              "Payload did not match any descendants of family '{}'",
-              family_target
-            ),
-            path: self.path.to_string(),
-          });
-        } else {
-          // Apply depth heuristic tie-breaker
-          let mut best_depth: Option<usize> = None;
-          let mut ambiguous = false;
-          let mut best_res = None;
-
-          for (_, depth, res) in passed_candidates.into_iter() {
-            if let Some(current_best) = best_depth {
-              if depth > current_best {
-                best_depth = Some(depth);
-                best_res = Some(res);
-                ambiguous = false; // Broke the tie
-              } else if depth == current_best {
-                ambiguous = true; // Tie at the highest level
-              }
-            } else {
-              best_depth = Some(depth);
-              best_res = Some(res);
-            }
-          }
-
-          if !ambiguous {
-            if let Some(res) = best_res {
-              result.merge(res);
-              return Ok(true);
-            }
-          }
-
-          result.errors.push(ValidationError {
-            code: "AMBIGUOUS_FAMILY_MATCH".to_string(),
-            message: format!(
-              "Payload matched multiple descendants of family '{}' without a clear depth winner",
-              family_target
-            ),
-            path: self.path.to_string(),
-          });
+    if self.schema.family.is_some() {
+      if let Some(options) = self.schema.compiled_options.get() {
+        if let Some(disc) = self.schema.compiled_discriminator.get() {
+          return self.execute_polymorph(disc, options, result);
         }
       }
     }
@@ -114,13 +39,161 @@ impl<'a> ValidationContext<'a> {
     Ok(true)
   }
   
-  pub(crate) fn validate_refs(
+  pub(crate) fn validate_one_of(
     &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.r#ref {
-      if let Some(global_schema) = self.db.schemas.get(ref_str) {
+    if let Some(one_of) = &self.schema.one_of {
+      if let Some(options) = self.schema.compiled_options.get() {
+        if let Some(disc) = self.schema.compiled_discriminator.get() {
+          return self.execute_polymorph(disc, options, result);
+        }
+      }
+
+      // Native Draft2020-12 oneOf Evaluation Fallback
+      let mut valid_count = 0;
+      let mut final_successful_result = None;
+      let mut failed_candidates = Vec::new();
+
+      for child_schema in one_of {
+        let derived = self.derive_for_schema(child_schema, false);
+        if let Ok(sub_res) = derived.validate_scoped() {
+          if sub_res.is_valid() {
+            valid_count += 1;
+            final_successful_result = Some(sub_res.clone());
+          } else {
+            failed_candidates.push(sub_res);
+          }
+        }
+      }
+
+      if valid_count == 1 {
+         if let Some(successful_res) = final_successful_result {
+             result.merge(successful_res);
+         }
+         return Ok(true);
+      } else if valid_count == 0 {
+         result.errors.push(ValidationError {
+            code: "NO_ONEOF_MATCH".to_string(),
+            message: "Payload matches none of the required candidate sub-schemas natively".to_string(),
+            path: self.path.to_string(),
+         });
+         
+         if let Some(first) = failed_candidates.first() {
+            let mut shared_errors = first.errors.clone();
+            for sub_res in failed_candidates.iter().skip(1) {
+              shared_errors.retain(|e1| {
+                 sub_res.errors.iter().any(|e2| e1.code == e2.code && e1.path == e2.path)
+              });
+            }
+            for e in shared_errors {
+              if !result.errors.iter().any(|existing| existing.code == e.code && existing.path == e.path) {
+                result.errors.push(e);
+              }
+            }
+         }
+         
+         return Ok(false);
+      } else {
+         result.errors.push(ValidationError {
+            code: "AMBIGUOUS_POLYMORPHIC_MATCH".to_string(),
+            message: "Matches multiple polymorphic candidates inextricably natively".to_string(),
+            path: self.path.to_string(),
+         });
+         return Ok(false);
+      }
+    }
+    Ok(true)
+  }
+
+  pub(crate) fn execute_polymorph(
+    &self,
+    disc: &str,
+    options: &std::collections::BTreeMap<String, String>,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    // 1. O(1) Fast-Path Router & Extractor
+    let instance_val = self.instance.as_object().and_then(|o| o.get(disc)).and_then(|t| t.as_str());
+
+    if let Some(val) = instance_val {
+       result.evaluated_keys.insert(disc.to_string());
+       
+       if let Some(target_id) = options.get(val) {
+          if let Some(target_schema) = self.db.schemas.get(target_id) {
+             let derived = self.derive_for_schema(target_schema.as_ref(), false);
+             let sub_res = derived.validate()?; 
+             let is_valid = sub_res.is_valid();
+             result.merge(sub_res);
+             return Ok(is_valid); 
+          } else {
+             result.errors.push(ValidationError {
+               code: "MISSING_COMPILED_SCHEMA".to_string(),
+               message: format!("Polymorphic router target '{}' does not exist in the database schemas map", target_id),
+               path: self.path.to_string(),
+             });
+             return Ok(false);
+          }
+       } else {
+          result.errors.push(ValidationError {
+            code: if self.schema.family.is_some() { "NO_FAMILY_MATCH".to_string() } else { "NO_ONEOF_MATCH".to_string() },
+            message: format!("Payload provided discriminator {}='{}' which matches none of the required candidate sub-schemas", disc, val),
+            path: self.path.to_string(),
+          });
+          return Ok(false);
+       }
+    } else {
+        result.errors.push(ValidationError {
+          code: "MISSING_TYPE".to_string(),
+          message: format!("Missing '{}' discriminator. Unable to resolve polymorphic boundaries", disc),
+          path: self.path.to_string(),
+        });
+        return Ok(false);
+    }
+  }
+
+  pub(crate) fn validate_type_inheritance(
+    &self,
+    result: &mut ValidationResult,
+  ) -> Result<bool, ValidationError> {
+    // Core inheritance logic replaces legacy routing
+    let payload_primitive = match self.instance {
+      serde_json::Value::Null => "null",
+      serde_json::Value::Bool(_) => "boolean",
+      serde_json::Value::Number(n) => {
+        if n.is_i64() || n.is_u64() {
+          "integer"
+        } else {
+          "number"
+        }
+      }
+      serde_json::Value::String(_) => "string",
+      serde_json::Value::Array(_) => "array",
+      serde_json::Value::Object(_) => "object",
+    };
+
+    let mut custom_types = Vec::new();
+    match &self.schema.type_ {
+      Some(crate::database::object::SchemaTypeOrArray::Single(t)) => {
+        if !crate::database::object::is_primitive_type(t) {
+          custom_types.push(t.clone());
+        }
+      }
+      Some(crate::database::object::SchemaTypeOrArray::Multiple(arr)) => {
+        if arr.contains(&payload_primitive.to_string()) || (payload_primitive == "integer" && arr.contains(&"number".to_string())) {
+           // It natively matched a primitive in the array options, skip forcing custom proxy fallback
+        } else {
+           for t in arr {
+             if !crate::database::object::is_primitive_type(t) {
+               custom_types.push(t.clone());
+             }
+           }
+        }
+      }
+      None => {}
+    }
+
+    for t in custom_types {
+      if let Some(global_schema) = self.db.schemas.get(&t) {
         let mut new_overrides = self.overrides.clone();
         if let Some(props) = &self.schema.properties {
           new_overrides.extend(props.keys().map(|k| k.to_string()));
@@ -132,16 +205,16 @@ impl<'a> ValidationContext<'a> {
           &self.path,
           new_overrides,
           self.extensible,
-          true,
+          true, // Reporter mode
         );
         shadow.root = global_schema;
         result.merge(shadow.validate()?);
       } else {
         result.errors.push(ValidationError {
-          code: "REF_RESOLUTION_FAILED".to_string(),
+          code: "INHERITANCE_RESOLUTION_FAILED".to_string(),
           message: format!(
-            "Reference pointer to '{}' was not found in schema registry",
-            ref_str
+            "Inherited entity pointer '{}' was not found in schema registry",
+            t
           ),
           path: self.path.to_string(),
         });

version

@@ -1 +1 @@
-1.0.105
+1.0.110