make type_graph.nodes private and expose a .type_def method to get the type_def give an type_id

Author: zahash

codegen-java/src/lib.rs

@@ -63,7 +63,7 @@ impl From<serde_json::Value> for Java {
         let mut unions = vec![];
 
         // Determine root type
-        if let Some(type_def) = type_graph.nodes.get(&type_graph.root) {
+        if let Some(type_def) = type_graph.type_def(type_graph.root) {
             match type_def {
                 TypeDef::Object(_) => {
                     root = RootType::Extension(derive_type_name(
@@ -149,7 +149,7 @@ impl From<serde_json::Value> for Java {
                 let mut vars: Vec<UnionMemberVar> = Vec::with_capacity(inner_type_ids.len());
                 for inner_type_id in inner_type_ids {
                     let type_name = derive_type_name(*inner_type_id, &type_graph, &name_registry);
-                    let var_name = match type_graph.nodes.get(inner_type_id) {
+                    let var_name = match type_graph.type_def(*inner_type_id) {
                         Some(inner_type_def) => match inner_type_def {
                             TypeDef::String => "strVal".into(),
                             TypeDef::Integer => "intVal".into(),
@@ -203,7 +203,7 @@ fn derive_type_name(
     type_graph: &TypeGraph,
     name_registry: &NameRegistry,
 ) -> String {
-    match type_graph.nodes.get(&type_id) {
+    match type_graph.type_def(type_id) {
         Some(type_def) => match type_def {
             TypeDef::String => "String".into(),
             TypeDef::Integer => "Long".into(),

codegen-rust/src/lib.rs

@@ -53,7 +53,7 @@ impl From<serde_json::Value> for Rust {
         let mut structs = vec![];
         let mut enums = vec![];
 
-        if let Some(type_def) = type_graph.nodes.get(&type_graph.root) {
+        if let Some(type_def) = type_graph.type_def(type_graph.root) {
             match type_def {
                 TypeDef::Object(_) => {
                     root = derive_type_name(
@@ -138,7 +138,7 @@ impl From<serde_json::Value> for Rust {
                         type_id,
                         &back_edges,
                     );
-                    let variant_name = match type_graph.nodes.get(inner_type_id) {
+                    let variant_name = match type_graph.type_def(*inner_type_id) {
                         Some(inner_type_def) => match inner_type_def {
                             TypeDef::String => "String".into(),
                             TypeDef::Integer => "Int".into(),
@@ -195,7 +195,7 @@ fn back_edges(type_graph: &TypeGraph) -> Vec<(TypeId, TypeId)> {
 
     while let Some(type_id) = frontier.pop() {
         path.push(type_id);
-        if let Some(type_def) = type_graph.nodes.get(&type_id) {
+        if let Some(type_def) = type_graph.type_def(type_id) {
             let adj_type_ids: Box<dyn Iterator<Item = usize>> = match type_def {
                 TypeDef::Object(object_fields) => Box::new(object_fields.iter().map(|f| f.type_id)),
                 TypeDef::Union(inner_type_ids) => Box::new(inner_type_ids.into_iter().copied()),
@@ -227,7 +227,7 @@ fn derive_type_name(
     parent_type_id: TypeId,
     back_edges: &[(TypeId, TypeId)],
 ) -> String {
-    match type_graph.nodes.get(&type_id) {
+    match type_graph.type_def(type_id) {
         Some(type_def) => match type_def {
             TypeDef::String => "String".into(),
             TypeDef::Integer => "isize".into(),

core/src/name_registry.rs

@@ -135,7 +135,7 @@ impl<'type_graph> NameCollector<'type_graph> {
         }
         self.visited.insert(type_id);
 
-        if let Some(type_def) = self.type_graph.nodes.get(&type_id) {
+        if let Some(type_def) = self.type_graph.type_def(type_id) {
             match type_def {
                 TypeDef::Object(object_fields) => {
                     for object_field in object_fields {
@@ -156,7 +156,7 @@ impl<'type_graph> NameCollector<'type_graph> {
     }
 
     fn process_object_field(&mut self, object_field: &'type_graph ObjectField) {
-        if let Some(object_field_type_def) = self.type_graph.nodes.get(&object_field.type_id) {
+        if let Some(object_field_type_def) = self.type_graph.type_def(object_field.type_id) {
             match object_field_type_def {
                 TypeDef::Object(nested_object_fields) => {
                     let names = self.names.entry(object_field.type_id).or_default();
@@ -193,7 +193,7 @@ impl<'type_graph> NameCollector<'type_graph> {
         let mut visited = vec![];
         while !visited.contains(&type_id) {
             visited.push(type_id);
-            if let Some(type_def) = self.type_graph.nodes.get(&type_id) {
+            if let Some(type_def) = self.type_graph.type_def(type_id) {
                 if let TypeDef::Array(inner_type_id) | TypeDef::Optional(inner_type_id) = type_def {
                     type_id = *inner_type_id;
                 }

core/src/type_graph.rs

@@ -182,7 +182,7 @@ pub type TypeId = usize;
 #[derive(Debug, Clone)]
 pub struct TypeGraph {
     pub root: TypeId,
-    pub nodes: BTreeMap<TypeId, TypeDef>,
+    nodes: BTreeMap<TypeId, TypeDef>,
 }
 
 /// Type definition node. Mirrors FieldType but uses [`TypeId`] references.
@@ -225,6 +225,12 @@ impl From<Schema> for TypeGraph {
     }
 }
 
+impl TypeGraph {
+    pub fn type_def(&self, type_id: TypeId) -> Option<&TypeDef> {
+        self.nodes.get(&type_id)
+    }
+}
+
 pub struct TypeGraphIter<'type_graph> {
     type_graph: &'type_graph TypeGraph,
     frontier: VecDeque<TypeId>,
@@ -247,7 +253,7 @@ impl<'type_graph> Iterator for TypeGraphIter<'type_graph> {
     fn next(&mut self) -> Option<Self::Item> {
         while let Some(type_id) = self.frontier.pop_front() {
             if self.visited.insert(type_id) {
-                if let Some(type_def) = self.type_graph.nodes.get(&type_id) {
+                if let Some(type_def) = self.type_graph.type_def(type_id) {
                     match type_def {
                         TypeDef::Object(object_fields) => self
                             .frontier
@@ -634,7 +640,7 @@ impl<'type_graph> CanonicalView<'type_graph> {
         }
         visited.insert(type_id);
 
-        if let Some(type_def) = self.type_graph.nodes.get(&type_id) {
+        if let Some(type_def) = self.type_graph.type_def(type_id) {
             match type_def {
                 TypeDef::String => write!(f, "str")?,
                 TypeDef::Integer => write!(f, "int")?,