version: 1.0.76

.test/tests.md

@@ -0,0 +1,11 @@
+# 🗒️ Test Report (punc/framework)
+
+_Generated at Wed Mar 18 05:21:40 EDT 2026_
+
+## Summary
+
+| Lang | Status | Tests | Passed | Failed | Duration |
+| :--- | :---: | :---: | :---: | :---: | ---: |
+
+## Results
+

fixtures/queryer.json

@@ -858,27 +858,6 @@
           ]
         }
       },
-      {
-        "description": "Simple entity select on root stem",
-        "action": "query",
-        "schema_id": "entity",
-        "stem": "",
-        "expect": {
-          "success": true,
-          "sql": [
-            [
-              "(SELECT jsonb_build_object(",
-              "    'archived', entity_1.archived,",
-              "    'created_at', entity_1.created_at,",
-              "    'id', entity_1.id,",
-              "    'name', entity_1.name,",
-              "    'type', entity_1.type)",
-              "FROM agreego.entity entity_1",
-              "WHERE NOT entity_1.archived)"
-            ]
-          ]
-        }
-      },
       {
         "description": "Simple entity select with multiple filters",
         "action": "query",
@@ -1429,94 +1408,6 @@
           ]
         }
       },
-      {
-        "description": "Full person stem query on phone number contact",
-        "action": "query",
-        "schema_id": "full.person",
-        "stem": "phone_numbers.#",
-        "expect": {
-          "success": true,
-          "sql": [
-            [
-              "(SELECT jsonb_build_object(",
-              "    'archived', entity_3.archived,",
-              "    'created_at', entity_3.created_at,",
-              "    'id', entity_3.id,",
-              "    'is_primary', contact_1.is_primary,",
-              "    'name', entity_3.name,",
-              "    'target',",
-              "    (SELECT jsonb_build_object(",
-              "        'archived', entity_5.archived,",
-              "        'created_at', entity_5.created_at,",
-              "        'id', entity_5.id,",
-              "        'name', entity_5.name,",
-              "        'number', phone_number_4.number,",
-              "        'type', entity_5.type",
-              "    )",
-              "    FROM agreego.phone_number phone_number_4",
-              "    JOIN agreego.entity entity_5 ON entity_5.id = phone_number_4.id",
-              "    WHERE",
-              "        NOT entity_5.archived",
-              "        AND relationship_2.target_id = entity_5.id",
-              "    ),",
-              "    'type', entity_3.type",
-              ")",
-              "FROM agreego.contact contact_1",
-              "JOIN agreego.relationship relationship_2 ON relationship_2.id = contact_1.id",
-              "JOIN agreego.entity entity_3 ON entity_3.id = relationship_2.id",
-              "WHERE NOT entity_3.archived)"
-            ]
-          ]
-        }
-      },
-      {
-        "description": "Full person stem query on phone number contact on phone number",
-        "action": "query",
-        "schema_id": "full.person",
-        "stem": "phone_numbers.#.target",
-        "expect": {
-          "success": true,
-          "sql": [
-            [
-              "(SELECT jsonb_build_object(",
-              "    'archived', entity_2.archived,",
-              "    'created_at', entity_2.created_at,",
-              "    'id', entity_2.id,",
-              "    'name', entity_2.name,",
-              "    'number', phone_number_1.number,",
-              "    'type', entity_2.type",
-              ")",
-              "FROM agreego.phone_number phone_number_1",
-              "JOIN agreego.entity entity_2 ON entity_2.id = phone_number_1.id",
-              "WHERE NOT entity_2.archived)"
-            ]
-          ]
-        }
-      },
-      {
-        "description": "Full person stem query on contact email address",
-        "action": "query",
-        "schema_id": "full.person",
-        "stem": "contacts.#.target#(type==\"email_address\")",
-        "expect": {
-          "success": true,
-          "sql": [
-            [
-              "(SELECT jsonb_build_object(",
-              "    'address', email_address_1.address,",
-              "    'archived', entity_2.archived,",
-              "    'created_at', entity_2.created_at,",
-              "    'id', entity_2.id,",
-              "    'name', entity_2.name,",
-              "    'type', entity_2.type",
-              ")",
-              "FROM agreego.email_address email_address_1",
-              "JOIN agreego.entity entity_2 ON entity_2.id = email_address_1.id",
-              "WHERE NOT entity_2.archived)"
-            ]
-          ]
-        }
-      },
       {
         "description": "Order select with customer and lines",
         "action": "query",

fixtures/stems.json

@@ -1,312 +0,0 @@
-[
-  {
-    "description": "Stem Engine Unit Tests",
-    "database": {
-      "puncs": [],
-      "enums": [],
-      "relations": [
-        {
-          "id": "rel1",
-          "type": "relation",
-          "constraint": "fk_contact_entity",
-          "source_type": "contact",
-          "source_columns": [
-            "entity_id"
-          ],
-          "destination_type": "person",
-          "destination_columns": [
-            "id"
-          ],
-          "prefix": null
-        },
-        {
-          "id": "rel2",
-          "type": "relation",
-          "constraint": "fk_relationship_target",
-          "source_type": "relationship",
-          "source_columns": [
-            "target_id",
-            "target_type"
-          ],
-          "destination_type": "entity",
-          "destination_columns": [
-            "id",
-            "type"
-          ],
-          "prefix": "target"
-        }
-      ],
-      "types": [
-        {
-          "name": "entity",
-          "hierarchy": [
-            "entity"
-          ],
-          "schemas": [
-            {
-              "$id": "entity",
-              "type": "object",
-              "properties": {}
-            }
-          ]
-        },
-        {
-          "name": "person",
-          "hierarchy": [
-            "person",
-            "entity"
-          ],
-          "schemas": [
-            {
-              "$id": "person",
-              "$ref": "entity",
-              "properties": {}
-            }
-          ]
-        },
-        {
-          "name": "email_address",
-          "hierarchy": [
-            "email_address",
-            "entity"
-          ],
-          "schemas": [
-            {
-              "$id": "email_address",
-              "$ref": "entity",
-              "properties": {}
-            }
-          ]
-        },
-        {
-          "name": "phone_number",
-          "hierarchy": [
-            "phone_number",
-            "entity"
-          ],
-          "schemas": [
-            {
-              "$id": "phone_number",
-              "$ref": "entity",
-              "properties": {}
-            }
-          ]
-        },
-        {
-          "name": "relationship",
-          "relationship": true,
-          "hierarchy": [
-            "relationship",
-            "entity"
-          ],
-          "schemas": [
-            {
-              "$id": "relationship",
-              "$ref": "entity",
-              "properties": {}
-            }
-          ]
-        },
-        {
-          "name": "contact",
-          "relationship": true,
-          "hierarchy": [
-            "contact",
-            "relationship",
-            "entity"
-          ],
-          "schemas": [
-            {
-              "$id": "contact",
-              "$ref": "relationship",
-              "properties": {
-                "target": {
-                  "oneOf": [
-                    {
-                      "$ref": "phone_number"
-                    },
-                    {
-                      "$ref": "email_address"
-                    }
-                  ]
-                }
-              }
-            }
-          ]
-        },
-        {
-          "name": "save_person",
-          "schemas": [
-            {
-              "$id": "save_person.response",
-              "$ref": "person",
-              "properties": {
-                "contacts": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "contact"
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "tests": [
-      {
-        "description": "correctly squashes deep oneOf refs through array paths",
-        "action": "compile",
-        "expect": {
-          "success": true,
-          "stems": {
-            "contact": {
-              "": {
-                "schema": {
-                  "$id": "contact",
-                  "$ref": "relationship",
-                  "properties": {
-                    "target": {
-                      "oneOf": [
-                        {
-                          "$ref": "phone_number"
-                        },
-                        {
-                          "$ref": "email_address"
-                        }
-                      ]
-                    }
-                  }
-                },
-                "type": "contact"
-              },
-              "target#(type==\"email_address\")": {
-                "relation": "target_id",
-                "schema": {
-                  "$id": "email_address",
-                  "$ref": "entity",
-                  "properties": {}
-                },
-                "type": "email_address"
-              },
-              "target#(type==\"phone_number\")": {
-                "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"
-              }
-            },
-            "save_person.response": {
-              "": {
-                "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"
-              }
-            }
-          }
-        }
-      }
-    ]
-  }
-]

src/database/mod.rs

@@ -18,14 +18,11 @@ use executors::pgrx::SpiExecutor;
 #[cfg(test)]
 use executors::mock::MockExecutor;
 
-pub mod stem;
 use punc::Punc;
 use relation::Relation;
 use schema::Schema;
 use serde_json::Value;
 use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
-use stem::Stem;
 use r#type::Type;
 
 pub struct Database {
@@ -34,8 +31,6 @@ pub struct Database {
   pub puncs: HashMap<String, Punc>,
   pub relations: Vec<Relation>,
   pub schemas: HashMap<String, Schema>,
-  // Map of Schema ID -> { Entity Type -> Target Subschema Arc }
-  pub stems: HashMap<String, HashMap<String, Arc<Stem>>>,
   pub descendants: HashMap<String, Vec<String>>,
   pub depths: HashMap<String, usize>,
   pub executor: Box<dyn DatabaseExecutor + Send + Sync>,
@@ -49,7 +44,6 @@ impl Database {
       relations: Vec::new(),
       puncs: HashMap::new(),
       schemas: HashMap::new(),
-      stems: HashMap::new(),
       descendants: HashMap::new(),
       depths: HashMap::new(),
       #[cfg(not(test))]
@@ -146,7 +140,6 @@ impl Database {
     self.collect_depths();
     self.collect_descendants();
     self.compile_schemas();
-    self.collect_stems()?;
 
     Ok(())
   }
@@ -325,236 +318,4 @@ impl Database {
       }
     }
   }
-
-  fn collect_stems(&mut self) -> Result<(), crate::drop::Drop> {
-    let mut db_stems: HashMap<String, HashMap<String, Arc<Stem>>> = HashMap::new();
-    let mut errors: Vec<crate::drop::Error> = Vec::new();
-
-    let schema_ids: Vec<String> = self.schemas.keys().cloned().collect();
-    for schema_id in schema_ids {
-      if let Some(schema) = self.schemas.get(&schema_id) {
-        let mut inner_map = HashMap::new();
-        Self::discover_stems(
-          self,
-          &schema_id,
-          schema,
-          String::from(""),
-          None,
-          None,
-          false,
-          &mut inner_map,
-          Vec::new(),
-          &mut errors,
-        );
-        if !inner_map.is_empty() {
-          db_stems.insert(schema_id, inner_map);
-        }
-      }
-    }
-
-    self.stems = db_stems;
-
-    if !errors.is_empty() {
-      return Err(crate::drop::Drop::with_errors(errors));
-    }
-    Ok(())
-  }
-
-  fn discover_stems(
-    db: &Database,
-    root_schema_id: &str,
-    schema: &Schema,
-    current_path: String,
-    parent_type: Option<String>,
-    property_name: Option<String>,
-    is_polymorphic: bool,
-    inner_map: &mut HashMap<String, Arc<Stem>>,
-    seen_entities: Vec<String>,
-    errors: &mut Vec<crate::drop::Error>,
-  ) {
-    let mut is_entity = false;
-    let mut entity_type = String::new();
-
-    // First check if the Schema's $id is a native Database Type
-    if let Some(ref id) = schema.obj.id {
-      let parts: Vec<&str> = id.split('.').collect();
-      if let Some(last_seg) = parts.last() {
-        if db.types.contains_key(*last_seg) {
-          is_entity = true;
-          entity_type = last_seg.to_string();
-        }
-      }
-    }
-
-    // If not found via $id, check the $ref pointer
-    // This allows ad-hoc schemas (like `save_person.response`) to successfully adopt the Type of what they $ref
-    if !is_entity {
-      if let Some(ref r) = schema.obj.r#ref {
-        let parts: Vec<&str> = r.split('.').collect();
-        if let Some(last_seg) = parts.last() {
-          if db.types.contains_key(*last_seg) {
-            is_entity = true;
-            entity_type = last_seg.to_string();
-          }
-        }
-      }
-    }
-
-    if is_entity {
-      if seen_entities.contains(&entity_type) {
-        return; // Break cyclical schemas!
-      }
-    }
-
-    let mut relation_col = None;
-    if is_entity {
-      if let (Some(pt), Some(prop)) = (&parent_type, &property_name) {
-        let expected_col = format!("{}_id", prop);
-        let mut found = false;
-
-        if let Some((rel, _)) = db.get_relation(pt, &entity_type, prop, None) {
-          if rel.source_columns.contains(&expected_col) {
-            relation_col = Some(expected_col.clone());
-            found = true;
-          }
-        }
-
-        if !found {
-          relation_col = Some(expected_col);
-        }
-      }
-
-      let mut final_path = current_path.clone();
-      if is_polymorphic && !final_path.is_empty() && !final_path.ends_with(&entity_type) {
-        if final_path.ends_with(".#") {
-          final_path = format!("{}(type==\"{}\")", final_path, entity_type);
-        } else {
-          final_path = format!("{}#(type==\"{}\")", final_path, entity_type);
-        }
-      }
-
-      let stem = Stem {
-        r#type: entity_type.clone(),
-        relation: relation_col,
-        schema: Arc::new(schema.clone()),
-      };
-      inner_map.insert(final_path, Arc::new(stem));
-    }
-
-    let next_parent = if is_entity {
-      Some(entity_type.clone())
-    } else {
-      parent_type.clone()
-    };
-
-    let pass_seen = if is_entity {
-      let mut ns = seen_entities.clone();
-      ns.push(entity_type.clone());
-      ns
-    } else {
-      seen_entities.clone()
-    };
-
-    // Properties branch
-    if let Some(props) = &schema.obj.properties {
-      for (k, v) in props {
-        // Standard Property Pathing
-        let next_path = if current_path.is_empty() {
-          k.clone()
-        } else {
-          format!("{}.{}", current_path, k)
-        };
-
-        Self::discover_stems(
-          db,
-          root_schema_id,
-          v,
-          next_path,
-          next_parent.clone(),
-          Some(k.clone()),
-          false,
-          inner_map,
-          pass_seen.clone(),
-          errors,
-        );
-      }
-    }
-
-    // Array Item branch
-    if let Some(items) = &schema.obj.items {
-      let next_path = if current_path.is_empty() {
-        String::from("#")
-      } else {
-        format!("{}.#", current_path)
-      };
-
-      Self::discover_stems(
-        db,
-        root_schema_id,
-        items,
-        next_path,
-        next_parent.clone(),
-        property_name.clone(),
-        false,
-        inner_map,
-        pass_seen.clone(),
-        errors,
-      );
-    }
-
-    // Follow external reference if we didn't just crawl local properties
-    if schema.obj.properties.is_none() && schema.obj.items.is_none() && schema.obj.one_of.is_none()
-    {
-      if let Some(ref r) = schema.obj.r#ref {
-        if let Some(target_schema) = db.schemas.get(r) {
-          Self::discover_stems(
-            db,
-            root_schema_id,
-            target_schema,
-            current_path.clone(),
-            next_parent.clone(),
-            property_name.clone(),
-            is_polymorphic,
-            inner_map,
-            seen_entities.clone(),
-            errors,
-          );
-        }
-      }
-    }
-
-    // Polymorphism branch
-    if let Some(arr) = &schema.obj.one_of {
-      for v in arr {
-        Self::discover_stems(
-          db,
-          root_schema_id,
-          v.as_ref(),
-          current_path.clone(),
-          next_parent.clone(),
-          property_name.clone(),
-          true,
-          inner_map,
-          pass_seen.clone(),
-          errors,
-        );
-      }
-    }
-    if let Some(arr) = &schema.obj.all_of {
-      for v in arr {
-        Self::discover_stems(
-          db,
-          root_schema_id,
-          v.as_ref(),
-          current_path.clone(),
-          next_parent.clone(),
-          property_name.clone(),
-          is_polymorphic,
-          inner_map,
-          pass_seen.clone(),
-          errors,
-        );
-      }
-    }
-  }
 }

src/database/stem.rs

@@ -1,12 +0,0 @@
-use crate::database::schema::Schema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Stem {
-  pub r#type: String,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub relation: Option<String>,
-
-  pub schema: Arc<Schema>,
-}

src/lib.rs

@@ -77,7 +77,7 @@ pub fn jspg_merge(data: JsonB) -> JsonB {
 }
 
 #[cfg_attr(not(test), pg_extern)]
-pub fn jspg_query(schema_id: &str, stem: Option<&str>, filters: Option<JsonB>) -> JsonB {
+pub fn jspg_query(schema_id: &str, filters: Option<JsonB>) -> JsonB {
   let engine_opt = {
     let lock = GLOBAL_JSPG.read().unwrap();
     lock.clone()
@@ -87,7 +87,7 @@ pub fn jspg_query(schema_id: &str, stem: Option<&str>, filters: Option<JsonB>) -
     Some(engine) => {
       let drop = engine
         .queryer
-        .query(schema_id, stem, filters.as_ref().map(|f| &f.0));
+        .query(schema_id, filters.as_ref().map(|f| &f.0));
       JsonB(serde_json::to_value(drop).unwrap())
     }
     None => jspg_failure(),
@@ -131,24 +131,6 @@ pub fn jspg_schemas() -> JsonB {
   }
 }
 
-#[cfg_attr(not(test), pg_extern)]
-pub fn jspg_stems() -> JsonB {
-  let engine_opt = {
-    let lock = GLOBAL_JSPG.read().unwrap();
-    lock.clone()
-  };
-
-  match engine_opt {
-    Some(engine) => {
-      let stems_json = serde_json::to_value(&engine.database.stems)
-        .unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
-      let drop = crate::drop::Drop::success_with_val(stems_json);
-      JsonB(serde_json::to_value(drop).unwrap())
-    }
-    None => jspg_failure(),
-  }
-}
-
 #[cfg_attr(not(test), pg_extern(strict))]
 pub fn jspg_teardown() -> JsonB {
   let mut lock = GLOBAL_JSPG.write().unwrap();

src/queryer/compiler.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 pub struct Compiler<'a> {
   pub db: &'a Database,
   pub filter_keys: &'a [String],
-  pub is_stem_query: bool,
   pub alias_counter: usize,
 }
 
@@ -15,7 +14,7 @@ pub struct Node<'a> {
   pub parent_type: Option<&'a crate::database::r#type::Type>,
   pub property_name: Option<String>,
   pub depth: usize,
-  pub stem_path: String,
+  pub ast_path: String,
 }
 
 impl<'a> Compiler<'a> {
@@ -23,7 +22,6 @@ impl<'a> Compiler<'a> {
   pub fn compile(
     &self,
     schema_id: &str,
-    stem_path: Option<&str>,
     filter_keys: &[String],
   ) -> Result<String, String> {
     let schema = self
@@ -32,32 +30,11 @@ impl<'a> Compiler<'a> {
       .get(schema_id)
       .ok_or_else(|| format!("Schema not found: {}", schema_id))?;
 
-    let target_schema = if let Some(path) = stem_path.filter(|p| !p.is_empty() && *p != "/") {
+    let target_schema = std::sync::Arc::new(schema.clone());
-      if let Some(stems_map) = self.db.stems.get(schema_id) {
-        if let Some(stem) = stems_map.get(path) {
-          stem.schema.clone()
-        } else {
-          return Err(format!(
-            "Stem entity type '{}' not found in schema '{}'",
-            path, schema_id
-          ));
-        }
-      } else {
-        return Err(format!(
-          "Stem entity type '{}' not found in schema '{}'",
-          path, schema_id
-        ));
-      }
-    } else {
-      std::sync::Arc::new(schema.clone())
-    };
-
-    let is_stem_query = stem_path.is_some();
 
     let mut compiler = Compiler {
       db: &self.db,
       filter_keys,
-      is_stem_query,
       alias_counter: 0,
     };
 
@@ -68,7 +45,7 @@ impl<'a> Compiler<'a> {
       parent_type: None,
       property_name: None,
       depth: 0,
-      stem_path: String::new(),
+      ast_path: String::new(),
     };
 
     let (sql, _) = compiler.compile_node(node)?;
@@ -89,24 +66,24 @@ impl<'a> Compiler<'a> {
 
   fn compile_array(&mut self, node: Node<'a>) -> Result<(String, String), String> {
     if let Some(items) = &node.schema.obj.items {
-      let next_path = if node.stem_path.is_empty() {
+      let next_path = if node.ast_path.is_empty() {
         String::from("#")
       } else {
-        format!("{}.#", node.stem_path)
+        format!("{}.#", node.ast_path)
       };
 
       if let Some(ref_id) = &items.obj.r#ref {
         if let Some(type_def) = self.db.types.get(ref_id) {
-          let mut entity_noke = node.clone();
+          let mut entity_node = node.clone();
-          entity_noke.stem_path = next_path;
+          entity_node.ast_path = next_path;
-          entity_noke.schema = std::sync::Arc::clone(items);
+          entity_node.schema = std::sync::Arc::clone(items);
-          return self.compile_entity(type_def, entity_noke, true);
+          return self.compile_entity(type_def, entity_node, true);
         }
       }
 
       let mut next_node = node.clone();
       next_node.depth += 1;
-      next_node.stem_path = next_path;
+      next_node.ast_path = next_path;
       next_node.schema = std::sync::Arc::clone(items);
       let (item_sql, _) = self.compile_node(next_node)?;
       return Ok((
@@ -328,16 +305,16 @@ impl<'a> Compiler<'a> {
   ) -> Result<(String, String), String> {
     let mut build_args = Vec::new();
     for (k, v) in props {
-      let next_path = if node.stem_path.is_empty() {
+      let next_path = if node.ast_path.is_empty() {
         k.clone()
       } else {
-        format!("{}.{}", node.stem_path, k)
+        format!("{}.{}", node.ast_path, k)
       };
 
       let mut child_node = node.clone();
       child_node.property_name = Some(k.clone());
       child_node.depth += 1;
-      child_node.stem_path = next_path;
+      child_node.ast_path = next_path;
       child_node.schema = std::sync::Arc::clone(v);
 
       let (child_sql, val_type) = self.compile_node(child_node)?;
@@ -479,13 +456,13 @@ impl<'a> Compiler<'a> {
       child_node.parent_type = Some(r#type);
       child_node.property_name = Some(prop_key.clone());
       child_node.depth += 1;
-      let next_path = if node.stem_path.is_empty() {
+      let next_path = if node.ast_path.is_empty() {
         prop_key.clone()
       } else {
-        format!("{}.{}", node.stem_path, prop_key)
+        format!("{}.{}", node.ast_path, prop_key)
       };
 
-      child_node.stem_path = next_path;
+      child_node.ast_path = next_path;
       child_node.schema = std::sync::Arc::clone(prop_schema);
 
       let (val_sql, val_type) = self.compile_node(child_node)?;
@@ -593,13 +570,13 @@ impl<'a> Compiler<'a> {
       let full_field_path = parts.next().unwrap_or(filter_key);
       let op = parts.next().unwrap_or("$eq");
 
-      let field_name = if node.stem_path.is_empty() {
+      let field_name = if node.ast_path.is_empty() {
         if full_field_path.contains('.') || full_field_path.contains('#') {
           continue;
         }
         full_field_path
       } else {
-        let prefix = format!("{}.", node.stem_path);
+        let prefix = format!("{}.", node.ast_path);
         if full_field_path.starts_with(&prefix) {
           let remainder = &full_field_path[prefix.len()..];
           if remainder.contains('.') || remainder.contains('#') {

src/queryer/mod.rs

@@ -21,7 +21,6 @@ impl Queryer {
   pub fn query(
     &self,
     schema_id: &str,
-    stem_opt: Option<&str>,
     filters: Option<&serde_json::Value>,
   ) -> crate::drop::Drop {
     let filters_map = filters.and_then(|f| f.as_object());
@@ -43,11 +42,10 @@ impl Queryer {
       }
     };
 
-    let stem_key = stem_opt.unwrap_or("/");
+    let cache_key = format!("{}:{}", schema_id, filter_keys.join(","));
-    let cache_key = format!("{}(Stem:{}):{}", schema_id, stem_key, filter_keys.join(","));
 
     // 2. Fetch from cache or compile
-    let sql = match self.get_or_compile_sql(&cache_key, schema_id, stem_opt, &filter_keys) {
+    let sql = match self.get_or_compile_sql(&cache_key, schema_id, &filter_keys) {
       Ok(sql) => sql,
       Err(drop) => return drop,
     };
@@ -90,7 +88,6 @@ impl Queryer {
     &self,
     cache_key: &str,
     schema_id: &str,
-    stem_opt: Option<&str>,
     filter_keys: &[String],
   ) -> Result<String, crate::drop::Drop> {
     if let Some(cached_sql) = self.cache.get(cache_key) {
@@ -100,11 +97,10 @@ impl Queryer {
     let compiler = compiler::Compiler {
       db: &self.db,
       filter_keys: filter_keys,
-      is_stem_query: stem_opt.is_some(),
       alias_counter: 0,
     };
 
-    match compiler.compile(schema_id, stem_opt, filter_keys) {
+    match compiler.compile(schema_id, filter_keys) {
       Ok(compiled_sql) => {
         self
           .cache

src/tests/fixtures.rs

@@ -1451,30 +1451,6 @@ fn test_queryer_0_6() {
     crate::tests::runner::run_test_case(&path, 0, 6).unwrap();
 }
 
-#[test]
-fn test_queryer_0_7() {
-    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 7).unwrap();
-}
-
-#[test]
-fn test_queryer_0_8() {
-    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 8).unwrap();
-}
-
-#[test]
-fn test_queryer_0_9() {
-    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 9).unwrap();
-}
-
-#[test]
-fn test_queryer_0_10() {
-    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 10).unwrap();
-}
-
 #[test]
 fn test_not_0_0() {
     let path = format!("{}/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));
@@ -3449,12 +3425,6 @@ fn test_if_then_else_13_1() {
     crate::tests::runner::run_test_case(&path, 13, 1).unwrap();
 }
 
-#[test]
-fn test_stems_0_0() {
-    let path = format!("{}/fixtures/stems.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 0).unwrap();
-}
-
 #[test]
 fn test_empty_string_0_0() {
     let path = format!("{}/fixtures/emptyString.json", env!("CARGO_MANIFEST_DIR"));

src/tests/types/case.rs

@@ -16,9 +16,6 @@ pub struct Case {
   pub schema_id: String,
 
   // For Query
-  #[serde(default)]
-  pub stem: Option<String>,
-
   #[serde(default)]
   pub filters: Option<serde_json::Value>,
 
@@ -38,7 +35,7 @@ fn default_action() -> String {
 }
 
 impl Case {
-  pub fn run_compile(&self, db: Arc<Database>) -> Result<(), String> {
+  pub fn run_compile(&self, _db: Arc<Database>) -> Result<(), String> {
     let expected_success = self.expect.as_ref().map(|e| e.success).unwrap_or(false);
 
     // We assume db has already been setup and compiled successfully by runner.rs's `jspg_setup`
@@ -52,24 +49,6 @@ impl Case {
       ));
     }
 
-    // Assert stems
-    if let Some(expect) = &self.expect {
-      if let Some(expected_stems) = &expect.stems {
-        // Convert the Db stems (HashMap<String, HashMap<String, Arc<Stem>>>) to matching JSON shape
-        let db_stems_json = serde_json::to_value(&db.stems).unwrap();
-        let expect_stems_json = serde_json::to_value(expected_stems).unwrap();
-
-        if db_stems_json != expect_stems_json {
-          let expected_pretty = serde_json::to_string_pretty(&expect_stems_json).unwrap();
-          let got_pretty = serde_json::to_string_pretty(&db_stems_json).unwrap();
-          return Err(format!(
-            "Stem validation failed.\nExpected:\n{}\n\nGot:\n{}",
-            expected_pretty, got_pretty
-          ));
-        }
-      }
-    }
-
     Ok(())
   }
 
@@ -158,8 +137,7 @@ impl Case {
     use crate::queryer::Queryer;
     let queryer = Queryer::new(db.clone());
 
-    let stem_opt = self.stem.as_deref();
+    let result = queryer.query(&self.schema_id, self.filters.as_ref());
-    let result = queryer.query(&self.schema_id, stem_opt, self.filters.as_ref());
 
     let expected_success = self.expect.as_ref().map(|e| e.success).unwrap_or(false);
     let got_success = result.errors.is_empty();

src/tests/types/expect/mod.rs

@@ -2,7 +2,6 @@ pub mod pattern;
 pub mod sql;
 
 use serde::Deserialize;
-use std::collections::HashMap;
 
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
@@ -16,7 +15,6 @@ pub struct Expect {
   pub success: bool,
   pub result: Option<serde_json::Value>,
   pub errors: Option<Vec<serde_json::Value>>,
-  pub stems: Option<HashMap<String, HashMap<String, serde_json::Value>>>,
   #[serde(default)]
   pub sql: Option<Vec<SqlExpectation>>,
 }

version

@@ -1 +1 @@
-1.0.75
+1.0.76