version: 1.0.60

GEMINI.md

@@ -80,6 +80,8 @@ The Merger provides an automated, high-performance graph synchronization engine
 *   **Hierarchical Table Inheritance**: The Punc system uses distributed table inheritance (e.g. `person` inherits `user` inherits `organization` inherits `entity`). The Merger splits the incoming JSON payload and performs atomic row updates across *all* relevant tables in the lineage map.
 *   **The Archive Paradigm**: Data is never deleted in the Punc system. The Merger securely enforces referential integrity by toggling the `archived` Boolean flag on the base `entity` table rather than issuing SQL `DELETE` commands.
 *   **Change Tracking & Reactivity**: The Merger diffs the incoming JSON against the existing database row (utilizing static, `DashMap`-cached `lk_` SELECT string templates). Every detected change is recorded into the `agreego.change` audit table, tracking the user mapping. It then natively uses `pg_notify` to broadcast a completely flat row-level diff out to the Go WebSocket server for O(1) routing.
+*   **Flat Structural Beats (Unidirectional Flow)**: The Merger purposefully DOES NOT trace or hydrate outbound Foreign Keys or nested parent structures during writes. It emits completely flat, mathematically perfect structural deltas via `pg_notify` representing only the exact Postgres rows that changed. This guarantees the write-path remains O(1) lightning fast. It is the strict responsibility of the upstream Punc Framework (the Go `Speaker`) to intercept these flat beats, evaluate them against active Websocket Schema Topologies, and dynamically issue targeted `jspg_query` reads to hydrate the exact contextual subgraphs required by listening clients.
+*   **Pre-Order Notification Traversal**: To support proper topological hydration on the upstream Go Framework, the Merger decouples the `pg_notify` execution from the physical database write execution. The engine collects structural changes and explicitly fires `pg_notify` SQL statements in strict **Pre-Order** (Parent -> Relations -> Children). This guarantees that WebSocket clients receive the parent entity `Beat` prior to any nested child entities, ensuring stable unidirectional data flows without hydration race conditions.
 *   **Many-to-Many Graph Edge Management**: Operates seamlessly with the global `agreego.relationship` table, allowing the system to represent and merge arbitrary reified M:M relationships directionally between any two entities.
 *   **Sparse Updates**: Empty JSON strings `""` are directly bound as explicit SQL `NULL` directives to clear data, whilst omitted (missing) properties skip UPDATE execution entirely, ensuring partial UI submissions do not wipe out sibling fields.
 *   **Unified Return Structure**: To eliminate UI hydration race conditions and multi-user duplication, `jspg_merge` explicitly strips the response graph and returns only the root `{ "id": "uuid" }` (or an array of IDs for list insertions). External APIs can then explicitly call read APIs to fetch the resulting graph, while the UI relies 100% implicitly on the flat `pg_notify` pipeline for reactive state synchronization.

fixtures/merger.json

@@ -1213,21 +1213,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"date_of_birth\":\"2000-01-01\",",
-                            "        \"first_name\":\"Bob\",",
-                            "        \"id\":\"{{uuid:customer_id}}\",",
-                            "        \"last_name\":\"Smith\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"type\":\"person\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1295,6 +1280,21 @@
                             "        \"type\":\"order\"",
                             "    }",
                             "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"date_of_birth\":\"2000-01-01\",",
+                            "        \"first_name\":\"Bob\",",
+                            "        \"id\":\"{{uuid:customer_id}}\",",
+                            "        \"last_name\":\"Smith\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"type\":\"person\"",
+                            "    }",
+                            "}')"
                         ]
                     ]
                 }
@@ -1409,21 +1409,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:line_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"order_id\":\"abc\",",
-                            "        \"price\":99.0,",
-                            "        \"product\":\"Widget\",",
-                            "        \"type\":\"order_line\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.change (",
                             "    changes,",
@@ -1457,6 +1442,21 @@
                             "        \"type\":\"order\"",
                             "    }",
                             "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:line_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"order_id\":\"abc\",",
+                            "        \"price\":99.0,",
+                            "        \"product\":\"Widget\",",
+                            "        \"type\":\"order_line\"",
+                            "    }",
+                            "}')"
                         ]
                     ]
                 }
@@ -1587,19 +1587,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:phone1_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"number\":\"555-0001\",",
-                            "        \"type\":\"phone_number\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1661,23 +1648,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:contact1_id}}\",",
-                            "        \"is_primary\":true,",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"source_id\":\"{{uuid:person_id}}\",",
-                            "        \"source_type\":\"person\",",
-                            "        \"target_id\":\"{{uuid:phone1_id}}\",",
-                            "        \"target_type\":\"phone_number\",",
-                            "        \"type\":\"contact\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1722,19 +1692,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:phone2_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"number\":\"555-0002\",",
-                            "        \"type\":\"phone_number\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1796,23 +1753,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:contact2_id}}\",",
-                            "        \"is_primary\":false,",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"source_id\":\"{{uuid:person_id}}\",",
-                            "        \"source_type\":\"person\",",
-                            "        \"target_id\":\"{{uuid:phone2_id}}\",",
-                            "        \"target_type\":\"phone_number\",",
-                            "        \"type\":\"contact\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1857,19 +1797,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"address\":\"test@example.com\",",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:email1_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"type\":\"email_address\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1931,23 +1858,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:contact3_id}}\",",
-                            "        \"is_primary\":false,",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"source_id\":\"{{uuid:person_id}}\",",
-                            "        \"source_type\":\"person\",",
-                            "        \"target_id\":\"{{uuid:email1_id}}\",",
-                            "        \"target_type\":\"email_address\",",
-                            "        \"type\":\"contact\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.change (",
                             "    changes,",
@@ -1982,6 +1892,96 @@
                             "        \"type\":\"person\"",
                             "    }",
                             "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:contact1_id}}\",",
+                            "        \"is_primary\":true,",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"source_id\":\"{{uuid:person_id}}\",",
+                            "        \"source_type\":\"person\",",
+                            "        \"target_id\":\"{{uuid:phone1_id}}\",",
+                            "        \"target_type\":\"phone_number\",",
+                            "        \"type\":\"contact\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:phone1_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"number\":\"555-0001\",",
+                            "        \"type\":\"phone_number\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:contact2_id}}\",",
+                            "        \"is_primary\":false,",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"source_id\":\"{{uuid:person_id}}\",",
+                            "        \"source_type\":\"person\",",
+                            "        \"target_id\":\"{{uuid:phone2_id}}\",",
+                            "        \"target_type\":\"phone_number\",",
+                            "        \"type\":\"contact\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:phone2_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"number\":\"555-0002\",",
+                            "        \"type\":\"phone_number\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:contact3_id}}\",",
+                            "        \"is_primary\":false,",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"source_id\":\"{{uuid:person_id}}\",",
+                            "        \"source_type\":\"person\",",
+                            "        \"target_id\":\"{{uuid:email1_id}}\",",
+                            "        \"target_type\":\"email_address\",",
+                            "        \"type\":\"contact\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"address\":\"test@example.com\",",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:email1_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"type\":\"email_address\"",
+                            "    }",
+                            "}')"
                         ]
                     ]
                 }

fixtures/queryer.json

@@ -947,6 +947,9 @@
                         "$eq": true,
                         "$ne": false
                     },
+                    "contacts.#.is_primary": {
+                        "$eq": true
+                    },
                     "created_at": {
                         "$eq": "2020-01-01T00:00:00Z",
                         "$gt": "2019-01-01T00:00:00Z",
@@ -970,10 +973,6 @@
                             "Bob"
                         ]
                     },
-                    "last_name": {
-                        "$eq": "%Doe%",
-                        "$ne": "%Smith%"
-                    },
                     "id": {
                         "$eq": "00000000-0000-0000-0000-000000000001",
                         "$in": [
@@ -983,6 +982,13 @@
                         "$nin": [
                             "00000000-0000-0000-0000-000000000002"
                         ]
+                    },
+                    "last_name": {
+                        "$eq": "%Doe%",
+                        "$ne": "%Smith%"
+                    },
+                    "phone_numbers.#.target.number": {
+                        "$eq": "555-1234"
                     }
                 },
                 "expect": {
@@ -1037,6 +1043,7 @@
                             "    JOIN agreego.entity t1_obj_t2_contacts_t3 ON t1_obj_t2_contacts_t3.id = t1_obj_t2_contacts_t2.id",
                             "    WHERE",
                             "        NOT t1_obj_t2_contacts_t1.archived",
+                            "        AND t1_obj_t2_contacts_t1.is_primary = ($11#>>'{}')::boolean",
                             "        AND t1_obj_t2_contacts_t1.parent_id = t1_obj_t2.id),",
                             "    'created_at', t1_obj_t2.created_at,",
                             "    'email_addresses',",
@@ -1093,6 +1100,7 @@
                             "         JOIN agreego.entity t1_obj_t2_phone_numbers_t3_target_t2 ON t1_obj_t2_phone_numbers_t3_target_t2.id = t1_obj_t2_phone_numbers_t3_target_t1.id",
                             "         WHERE",
                             "             NOT t1_obj_t2_phone_numbers_t3_target_t1.archived",
+                            "             AND t1_obj_t2_phone_numbers_t3_target_t1.number ILIKE $32#>>'{}'",
                             "             AND t1_obj_t2_phone_numbers_t3_target_t1.parent_id = t1_obj_t2_phone_numbers_t3.id",
                             "        ),",
                             "        'type', t1_obj_t2_phone_numbers_t3.type",
@@ -1119,26 +1127,26 @@
                             "    AND t1_obj_t1.age NOT IN (SELECT value::numeric FROM jsonb_array_elements_text(($8#>>'{}')::jsonb))",
                             "    AND t1_obj_t2.archived = ($9#>>'{}')::boolean",
                             "    AND t1_obj_t2.archived != ($10#>>'{}')::boolean",
-                            "    AND t1_obj_t2.created_at = ($11#>>'{}')::timestamptz",
-                            "    AND t1_obj_t2.created_at > ($12#>>'{}')::timestamptz",
-                            "    AND t1_obj_t2.created_at >= ($13#>>'{}')::timestamptz",
-                            "    AND t1_obj_t2.created_at < ($14#>>'{}')::timestamptz",
-                            "    AND t1_obj_t2.created_at <= ($15#>>'{}')::timestamptz",
-                            "    AND t1_obj_t2.created_at != ($16#>>'{}')::timestamptz",
-                            "    AND t1_obj_t1.first_name ILIKE $17#>>'{}'",
-                            "    AND t1_obj_t1.first_name > ($18#>>'{}')",
-                            "    AND t1_obj_t1.first_name >= ($19#>>'{}')",
-                            "    AND t1_obj_t1.first_name IN (SELECT value FROM jsonb_array_elements_text(($20#>>'{}')::jsonb))",
-                            "    AND t1_obj_t1.first_name < ($21#>>'{}')",
-                            "    AND t1_obj_t1.first_name <= ($22#>>'{}')",
-                            "    AND t1_obj_t1.first_name NOT ILIKE $23#>>'{}'",
-                            "    AND t1_obj_t1.first_name NOT IN (SELECT value FROM jsonb_array_elements_text(($24#>>'{}')::jsonb))",
-                            "    AND t1_obj_t2.id = ($25#>>'{}')::uuid",
-                            "    AND t1_obj_t2.id IN (SELECT value::uuid FROM jsonb_array_elements_text(($26#>>'{}')::jsonb))",
-                            "    AND t1_obj_t2.id != ($27#>>'{}')::uuid",
-                            "    AND t1_obj_t2.id NOT IN (SELECT value::uuid FROM jsonb_array_elements_text(($28#>>'{}')::jsonb))",
-                            "    AND t1_obj_t1.last_name ILIKE $29#>>'{}'",
-                            "    AND t1_obj_t1.last_name NOT ILIKE $30#>>'{}'",
+                            "    AND t1_obj_t2.created_at = ($12#>>'{}')::timestamptz",
+                            "    AND t1_obj_t2.created_at > ($13#>>'{}')::timestamptz",
+                            "    AND t1_obj_t2.created_at >= ($14#>>'{}')::timestamptz",
+                            "    AND t1_obj_t2.created_at < ($15#>>'{}')::timestamptz",
+                            "    AND t1_obj_t2.created_at <= ($16#>>'{}')::timestamptz",
+                            "    AND t1_obj_t2.created_at != ($17#>>'{}')::timestamptz",
+                            "    AND t1_obj_t1.first_name ILIKE $18#>>'{}'",
+                            "    AND t1_obj_t1.first_name > ($19#>>'{}')",
+                            "    AND t1_obj_t1.first_name >= ($20#>>'{}')",
+                            "    AND t1_obj_t1.first_name IN (SELECT value FROM jsonb_array_elements_text(($21#>>'{}')::jsonb))",
+                            "    AND t1_obj_t1.first_name < ($22#>>'{}')",
+                            "    AND t1_obj_t1.first_name <= ($23#>>'{}')",
+                            "    AND t1_obj_t1.first_name NOT ILIKE $24#>>'{}'",
+                            "    AND t1_obj_t1.first_name NOT IN (SELECT value FROM jsonb_array_elements_text(($25#>>'{}')::jsonb))",
+                            "    AND t1_obj_t2.id = ($26#>>'{}')::uuid",
+                            "    AND t1_obj_t2.id IN (SELECT value::uuid FROM jsonb_array_elements_text(($27#>>'{}')::jsonb))",
+                            "    AND t1_obj_t2.id != ($28#>>'{}')::uuid",
+                            "    AND t1_obj_t2.id NOT IN (SELECT value::uuid FROM jsonb_array_elements_text(($29#>>'{}')::jsonb))",
+                            "    AND t1_obj_t1.last_name ILIKE $30#>>'{}'",
+                            "    AND t1_obj_t1.last_name NOT ILIKE $31#>>'{}'",
                             ")"
                         ]
                     ]
@@ -1159,7 +1167,22 @@
                             "    'id', t1_obj_t3.id,",
                             "    'is_primary', t1_obj_t1.is_primary,",
                             "    'name', t1_obj_t3.name,",
-                            "    'type', t1_obj_t3.type)",
+                            "    'target',",
+                            "    (SELECT jsonb_build_object(",
+                            "        'archived', t1_obj_t3_target_t2.archived,",
+                            "        'created_at', t1_obj_t3_target_t2.created_at,",
+                            "        'id', t1_obj_t3_target_t2.id,",
+                            "        'name', t1_obj_t3_target_t2.name,",
+                            "        'number', t1_obj_t3_target_t1.number,",
+                            "        'type', t1_obj_t3_target_t2.type",
+                            "    )",
+                            "    FROM agreego.phone_number t1_obj_t3_target_t1",
+                            "    JOIN agreego.entity t1_obj_t3_target_t2 ON t1_obj_t3_target_t2.id = t1_obj_t3_target_t1.id",
+                            "    WHERE",
+                            "        NOT t1_obj_t3_target_t1.archived",
+                            "        AND t1_obj_t3_target_t1.parent_id = t1_obj_t3.id),",
+                            "    'type', t1_obj_t3.type",
+                            ")",
                             "FROM agreego.contact t1_obj_t1",
                             "JOIN agreego.relationship t1_obj_t2 ON t1_obj_t2.id = t1_obj_t1.id",
                             "JOIN agreego.entity t1_obj_t3 ON t1_obj_t3.id = t1_obj_t2.id",

fixtures/stems.json

@@ -160,59 +160,148 @@
         "expect": {
           "success": true,
           "stems": {
-            "save_person.response": {
-              "": {
-                "type": "person"
-              },
-              "contacts.#": {
-                "type": "contact",
-                "relation": "contacts_id"
-              },
-              "contacts.#.target#(type==\"email_address\")": {
-                "type": "email_address",
-                "relation": "target_id"
-              },
-              "contacts.#.target#(type==\"phone_number\")": {
-                "type": "phone_number",
-                "relation": "target_id"
-              }
-            },
             "contact": {
               "": {
+                "schema": {
+                  "$id": "contact",
+                  "$ref": "relationship",
+                  "properties": {
+                    "target": {
+                      "oneOf": [
+                        {
+                          "$ref": "phone_number"
+                        },
+                        {
+                          "$ref": "email_address"
+                        }
+                      ]
+                    }
+                  }
+                },
                 "type": "contact"
               },
               "target#(type==\"email_address\")": {
-                "type": "email_address",
-                "relation": "target_id"
+                "relation": "target_id",
+                "schema": {
+                  "$id": "email_address",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "email_address"
               },
               "target#(type==\"phone_number\")": {
-                "type": "phone_number",
-                "relation": "target_id"
-              }
-            },
-            "person": {
-              "": {
-                "type": "person"
+                "relation": "target_id",
+                "schema": {
+                  "$id": "phone_number",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "phone_number"
               }
             },
             "email_address": {
               "": {
+                "schema": {
+                  "$id": "email_address",
+                  "$ref": "entity",
+                  "properties": {}
+                },
                 "type": "email_address"
               }
             },
+            "entity": {
+              "": {
+                "schema": {
+                  "$id": "entity",
+                  "properties": {},
+                  "type": "object"
+                },
+                "type": "entity"
+              }
+            },
+            "person": {
+              "": {
+                "schema": {
+                  "$id": "person",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "person"
+              }
+            },
             "phone_number": {
               "": {
+                "schema": {
+                  "$id": "phone_number",
+                  "$ref": "entity",
+                  "properties": {}
+                },
                 "type": "phone_number"
               }
             },
             "relationship": {
               "": {
+                "schema": {
+                  "$id": "relationship",
+                  "$ref": "entity",
+                  "properties": {}
+                },
                 "type": "relationship"
               }
             },
-            "entity": {
+            "save_person.response": {
               "": {
-                "type": "entity"
+                "schema": {
+                  "$id": "save_person.response",
+                  "$ref": "person",
+                  "properties": {
+                    "contacts": {
+                      "items": {
+                        "$ref": "contact"
+                      },
+                      "type": "array"
+                    }
+                  }
+                },
+                "type": "person"
+              },
+              "contacts.#": {
+                "relation": "contacts_id",
+                "schema": {
+                  "$id": "contact",
+                  "$ref": "relationship",
+                  "properties": {
+                    "target": {
+                      "oneOf": [
+                        {
+                          "$ref": "phone_number"
+                        },
+                        {
+                          "$ref": "email_address"
+                        }
+                      ]
+                    }
+                  }
+                },
+                "type": "contact"
+              },
+              "contacts.#.target#(type==\"email_address\")": {
+                "relation": "target_id",
+                "schema": {
+                  "$id": "email_address",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "email_address"
+              },
+              "contacts.#.target#(type==\"phone_number\")": {
+                "relation": "target_id",
+                "schema": {
+                  "$id": "phone_number",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "phone_number"
               }
             }
           }
@@ -220,4 +309,4 @@
       }
     ]
   }
-]
+]

src/database/schema.rs

@@ -5,7 +5,6 @@ use std::sync::Arc;
 
 // Schema mirrors the Go Punc Generator's schema struct for consistency.
 // It is an order-preserving representation of a JSON Schema.
-
 pub fn deserialize_some<'de, D>(deserializer: D) -> Result<Option<Value>, D::Error>
 where
   D: serde::Deserializer<'de>,
@@ -13,117 +12,159 @@ where
   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>,
-  /*
-     Note: The `Ref` field in the Go struct is a pointer populated by the linker.
-     In Rust, we might handle this differently (e.g., separate lookup or Rc/Arc),
-     so we omit the direct recursive `Ref` field for now and rely on `ref_string`.
-  */
+  #[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(skip)]
@@ -331,7 +372,9 @@ pub enum SchemaTypeOrArray {
 
 #[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)]

src/database/stem.rs

@@ -8,10 +8,5 @@ pub struct Stem {
   #[serde(skip_serializing_if = "Option::is_none")]
   pub relation: Option<String>,
 
-  // The actual database schema node mapping for
-  // O(1) jump table execution for queryer.
-  //
-  // Automatically skipped from `jspg_stems()` JSON payload output.
-  #[serde(skip)]
   pub schema: Arc<Schema>,
 }

src/lib.rs

@@ -112,8 +112,6 @@ pub fn jspg_validate(schema_id: &str, instance: JsonB) -> JsonB {
 
 #[cfg_attr(not(test), pg_extern)]
 pub fn jspg_stems() -> JsonB {
-  use serde_json::Value;
-
   let engine_opt = {
     let lock = GLOBAL_JSPG.read().unwrap();
     lock.clone()
@@ -121,24 +119,11 @@ pub fn jspg_stems() -> JsonB {
 
   match engine_opt {
     Some(engine) => {
-      let mut result_arr = Vec::new();
-      for (schema_name, stems_map) in &engine.database.stems {
-        let mut stems_arr = Vec::new();
-        for (path_key, stem_arc) in stems_map {
-          stems_arr.push(serde_json::json!({
-            "path": path_key,
-            "type": stem_arc.r#type,
-            "relation": stem_arc.relation
-          }));
-        }
-        result_arr.push(serde_json::json!({
-          "schema": schema_name,
-          "stems": stems_arr
-        }));
-      }
-      JsonB(serde_json::to_value(result_arr).unwrap_or(Value::Array(Vec::new())))
+      let stems_json = serde_json::to_value(&engine.database.stems)
+        .unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
+      JsonB(stems_json)
     }
-    None => JsonB(Value::Array(Vec::new())),
+    None => JsonB(serde_json::Value::Object(serde_json::Map::new())),
   }
 }
 

src/merger/mod.rs

@@ -21,63 +21,87 @@ impl Merger {
   }
 
   pub fn merge(&self, data: Value) -> crate::drop::Drop {
-    match self.merge_internal(data) {
+    let mut val_resolved = Value::Null;
+    let mut notifications_queue = Vec::new();
+    
+    let result = self.merge_internal(data, &mut notifications_queue);
+
+    match result {
       Ok(val) => {
-        let stripped_val = match val {
-          Value::Object(mut map) => {
+        val_resolved = val;
+      }
+      Err(msg) => {
+        return crate::drop::Drop::with_errors(vec![crate::drop::Error {
+          code: "MERGE_FAILED".to_string(),
+          message: msg,
+          details: crate::drop::ErrorDetails {
+            path: "".to_string(),
+          },
+        }]);
+      }
+    };
+
+    // Execute the globally collected, pre-ordered notifications last! 
+    for notify_sql in notifications_queue {
+      if let Err(e) = self.db.execute(&notify_sql, None) {
+        return crate::drop::Drop::with_errors(vec![crate::drop::Error {
+          code: "MERGE_FAILED".to_string(),
+          message: format!("Executor Error in pre-ordered notify: {:?}", e),
+          details: crate::drop::ErrorDetails {
+            path: "".to_string(),
+          },
+        }]);
+      }
+    }
+
+    let stripped_val = match val_resolved {
+      Value::Object(mut map) => {
+        let mut out = serde_json::Map::new();
+        if let Some(id) = map.remove("id") {
+          out.insert("id".to_string(), id);
+        }
+        Value::Object(out)
+      }
+      Value::Array(arr) => {
+        let mut out_arr = Vec::new();
+        for item in arr {
+          if let Value::Object(mut map) = item {
             let mut out = serde_json::Map::new();
             if let Some(id) = map.remove("id") {
               out.insert("id".to_string(), id);
             }
-            Value::Object(out)
+            out_arr.push(Value::Object(out));
+          } else {
+            out_arr.push(Value::Null);
           }
-          Value::Array(arr) => {
-            let mut out_arr = Vec::new();
-            for item in arr {
-              if let Value::Object(mut map) = item {
-                let mut out = serde_json::Map::new();
-                if let Some(id) = map.remove("id") {
-                  out.insert("id".to_string(), id);
-                }
-                out_arr.push(Value::Object(out));
-              } else {
-                out_arr.push(Value::Null);
-              }
-            }
-            Value::Array(out_arr)
-          }
-          other => other,
-        };
-        crate::drop::Drop::success_with_val(stripped_val)
+        }
+        Value::Array(out_arr)
       }
-      Err(msg) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
-        code: "MERGE_FAILED".to_string(),
-        message: msg,
-        details: crate::drop::ErrorDetails {
-          path: "".to_string(),
-        },
-      }]),
-    }
+      other => other,
+    };
+    crate::drop::Drop::success_with_val(stripped_val)
   }
 
-  pub(crate) fn merge_internal(&self, data: Value) -> Result<Value, String> {
+  pub(crate) fn merge_internal(&self, data: Value, notifications: &mut Vec<String>) -> Result<Value, String> {
     match data {
-      Value::Array(items) => self.merge_array(items),
-      Value::Object(map) => self.merge_object(map),
+      Value::Array(items) => self.merge_array(items, notifications),
+      Value::Object(map) => self.merge_object(map, notifications),
       _ => Err("Invalid merge payload: root must be an Object or Array".to_string()),
     }
   }
 
-  fn merge_array(&self, items: Vec<Value>) -> Result<Value, String> {
+  fn merge_array(&self, items: Vec<Value>, notifications: &mut Vec<String>) -> Result<Value, String> {
     let mut resolved_items = Vec::new();
     for item in items {
-      let resolved = self.merge_internal(item)?;
+      let resolved = self.merge_internal(item, notifications)?;
       resolved_items.push(resolved);
     }
     Ok(Value::Array(resolved_items))
   }
 
-  fn merge_object(&self, obj: serde_json::Map<String, Value>) -> Result<Value, String> {
+  fn merge_object(&self, obj: serde_json::Map<String, Value>, notifications: &mut Vec<String>) -> Result<Value, String> {
+    let queue_start = notifications.len();
+
     let type_name = match obj.get("type").and_then(|v| v.as_str()) {
       Some(t) => t.to_string(),
       None => return Err("Missing required 'type' field on object".to_string()),
@@ -147,7 +171,7 @@ impl Merger {
             }
           }
 
-          let merged_relative = match self.merge_internal(Value::Object(relative))? {
+          let merged_relative = match self.merge_internal(Value::Object(relative), notifications)? {
             Value::Object(m) => m,
             _ => continue,
           };
@@ -174,7 +198,7 @@ impl Merger {
             &entity_fields,
           );
 
-          let merged_relative = match self.merge_internal(Value::Object(relative))? {
+          let merged_relative = match self.merge_internal(Value::Object(relative), notifications)? {
             Value::Object(m) => m,
             _ => continue,
           };
@@ -242,7 +266,7 @@ impl Merger {
               &entity_fields,
             );
 
-            let merged_relative = match self.merge_internal(Value::Object(relative_item))? {
+            let merged_relative = match self.merge_internal(Value::Object(relative_item), notifications)? {
               Value::Object(m) => m,
               _ => continue,
             };
@@ -255,7 +279,7 @@ impl Merger {
     }
 
     // 7. Perform change tracking
-    self.merge_entity_change(
+    let notify_sql = self.merge_entity_change(
       &entity_fields,
       entity_fetched.as_ref(),
       entity_change_kind.as_deref(),
@@ -263,6 +287,10 @@ impl Merger {
       &timestamp,
     )?;
 
+    if let Some(sql) = notify_sql {
+      notifications.insert(queue_start, sql);
+    }
+
     // Produce the full tree response
     let mut final_response = serde_json::Map::new();
     if let Some(fetched) = entity_fetched {
@@ -614,10 +642,10 @@ impl Merger {
     entity_change_kind: Option<&str>,
     user_id: &str,
     timestamp: &str,
-  ) -> Result<(), String> {
+  ) -> Result<Option<String>, String> {
     let change_kind = match entity_change_kind {
       Some(k) => k,
-      None => return Ok(()),
+      None => return Ok(None),
     };
 
     let id_str = entity_fields.get("id").unwrap();
@@ -697,12 +725,8 @@ impl Merger {
       .db
       .execute(&change_sql, None)
       .map_err(|e| format!("Executor Error in change: {:?}", e))?;
-    self
-      .db
-      .execute(&notify_sql, None)
-      .map_err(|e| format!("Executor Error in notify: {:?}", e))?;
 
-    Ok(())
+    Ok(Some(notify_sql))
   }
 
   fn compare_entities(

src/queryer/compiler.rs

@@ -47,7 +47,7 @@ impl SqlCompiler {
 
     // We expect the top level to typically be an Object or Array
     let is_stem_query = stem_path.is_some();
-    let (sql, _) = self.walk_schema(target_schema, "t1", None, filter_keys, is_stem_query, 0)?;
+    let (sql, _) = self.walk_schema(target_schema, "t1", None, filter_keys, is_stem_query, 0, String::new())?;
     Ok(sql)
   }
 
@@ -61,17 +61,21 @@ impl SqlCompiler {
     filter_keys: &[String],
     is_stem_query: bool,
     depth: usize,
+    current_path: String,
   ) -> Result<(String, String), String> {
     // Determine the base schema type (could be an array, object, or literal)
     match &schema.obj.type_ {
       Some(crate::database::schema::SchemaTypeOrArray::Single(t)) if t == "array" => {
         // Handle Arrays:
         if let Some(items) = &schema.obj.items {
+          let next_path = if current_path.is_empty() {
+            String::from("#")
+          } else {
+            format!("{}.#", current_path)
+          };
+
           if let Some(ref_id) = &items.obj.r#ref {
             if let Some(type_def) = self.db.types.get(ref_id) {
-              if is_stem_query && depth > 0 {
-                return Ok(("".to_string(), "abort".to_string()));
-              }
               return self.compile_entity_node(
                 items,
                 type_def,
@@ -81,6 +85,7 @@ impl SqlCompiler {
                 filter_keys,
                 is_stem_query,
                 depth,
+                next_path,
               );
             }
           }
@@ -91,6 +96,7 @@ impl SqlCompiler {
             filter_keys,
             is_stem_query,
             depth + 1,
+            next_path,
           )?;
           return Ok((
             format!("(SELECT jsonb_agg({}) FROM TODO)", item_sql),
@@ -115,9 +121,6 @@ impl SqlCompiler {
         }
 
         if let Some(type_def) = resolved_type {
-          if is_stem_query && depth > 0 {
-            return Ok(("".to_string(), "abort".to_string()));
-          }
           return self.compile_entity_node(
             schema,
             type_def,
@@ -127,6 +130,7 @@ impl SqlCompiler {
             filter_keys,
             is_stem_query,
             depth,
+            current_path,
           );
         }
 
@@ -141,6 +145,7 @@ impl SqlCompiler {
               filter_keys,
               is_stem_query,
               depth,
+              current_path,
             );
           }
           return Err(format!("Unresolved $ref: {}", ref_id));
@@ -154,6 +159,7 @@ impl SqlCompiler {
             filter_keys,
             is_stem_query,
             depth,
+            current_path,
           );
         }
 
@@ -201,6 +207,7 @@ impl SqlCompiler {
     filter_keys: &[String],
     is_stem_query: bool,
     depth: usize,
+    current_path: String,
   ) -> Result<(String, String), String> {
     let local_ctx = format!("{}_{}", parent_alias, prop_name.unwrap_or("obj"));
 
@@ -216,6 +223,7 @@ impl SqlCompiler {
       filter_keys,
       is_stem_query,
       depth,
+      &current_path,
     )?;
 
     let jsonb_obj_sql = if select_args.is_empty() {
@@ -232,6 +240,7 @@ impl SqlCompiler {
       parent_alias,
       prop_name,
       filter_keys,
+      &current_path,
     )?;
 
     let selection = if is_array {
@@ -291,6 +300,7 @@ impl SqlCompiler {
     filter_keys: &[String],
     is_stem_query: bool,
     depth: usize,
+    current_path: &str,
   ) -> Result<Vec<String>, String> {
     let mut select_args = Vec::new();
     let grouped_fields = type_def.grouped_fields.as_ref().and_then(|v| v.as_object());
@@ -316,6 +326,12 @@ impl SqlCompiler {
         }
       }
 
+      let next_path = if current_path.is_empty() {
+        prop_key.clone()
+      } else {
+        format!("{}.{}", current_path, prop_key)
+      };
+
       let (val_sql, val_type) = self.walk_schema(
         prop_schema,
         &owner_alias,
@@ -323,6 +339,7 @@ impl SqlCompiler {
         filter_keys,
         is_stem_query,
         depth + 1,
+        next_path,
       )?;
 
       if val_type != "abort" {
@@ -340,6 +357,7 @@ impl SqlCompiler {
     parent_alias: &str,
     prop_name: Option<&str>,
     filter_keys: &[String],
+    current_path: &str,
   ) -> Result<Vec<String>, String> {
     let base_alias = table_aliases
       .get(&type_def.name)
@@ -349,15 +367,32 @@ impl SqlCompiler {
     let mut where_clauses = Vec::new();
     where_clauses.push(format!("NOT {}.archived", base_alias));
 
-    if parent_alias == "t1" {
-      for (i, filter_key) in filter_keys.iter().enumerate() {
-        let mut parts = filter_key.split(':');
-        let field_name = parts.next().unwrap_or(filter_key);
-        let op = parts.next().unwrap_or("$eq");
+    for (i, filter_key) in filter_keys.iter().enumerate() {
+      let mut parts = filter_key.split(':');
+      let full_field_path = parts.next().unwrap_or(filter_key);
+      let op = parts.next().unwrap_or("$eq");
 
-        let mut filter_alias = base_alias.clone();
+      let field_name = if current_path.is_empty() {
+        if full_field_path.contains('.') || full_field_path.contains('#') {
+          continue;
+        }
+        full_field_path
+      } else {
+        let prefix = format!("{}.", current_path);
+        if full_field_path.starts_with(&prefix) {
+          let remainder = &full_field_path[prefix.len()..];
+          if remainder.contains('.') || remainder.contains('#') {
+            continue;
+          }
+          remainder
+        } else {
+          continue;
+        }
+      };
 
-        if let Some(gf) = type_def.grouped_fields.as_ref().and_then(|v| v.as_object()) {
+      let mut filter_alias = base_alias.clone();
+
+      if let Some(gf) = type_def.grouped_fields.as_ref().and_then(|v| v.as_object()) {
           for (t_name, fields_val) in gf {
             if let Some(fields_arr) = fields_val.as_array() {
               if fields_arr.iter().any(|v| v.as_str() == Some(field_name)) {
@@ -459,7 +494,6 @@ impl SqlCompiler {
             "{}.{} {} {}",
             filter_alias, field_name, sql_op, param_sql
           ));
-        }
       }
     }
 
@@ -477,9 +511,16 @@ impl SqlCompiler {
     filter_keys: &[String],
     is_stem_query: bool,
     depth: usize,
+    current_path: String,
   ) -> Result<(String, String), String> {
     let mut build_args = Vec::new();
     for (k, v) in props {
+      let next_path = if current_path.is_empty() {
+        k.clone()
+      } else {
+        format!("{}.{}", current_path, k)
+      };
+      
       let (child_sql, val_type) = self.walk_schema(
         v,
         parent_alias,
@@ -487,6 +528,7 @@ impl SqlCompiler {
         filter_keys,
         is_stem_query,
         depth + 1,
+        next_path,
       )?;
       if val_type == "abort" {
         continue;

version

@@ -1 +1 @@
-1.0.59
+1.0.60