get rid of field queue

Author: rbalicki2

crates/isograph_compiler/src/watch.rs

@@ -11,7 +11,7 @@ use notify_debouncer_full::{
 };
 use std::{path::PathBuf, time::Duration};
 use tokio::{runtime::Handle, sync::mpsc::Receiver};
-use tracing::info;
+use tracing::{info, warn};
 
 use crate::{
     batch_compile::{BatchCompileError, compile, print_result},
@@ -251,7 +251,7 @@ pub fn create_debounced_file_watcher(
                 let sender = sender.clone();
                 current_runtime.spawn(async move {
                     if let Err(e) = sender.send(events).await {
-                        println!("Error sending event result: {e:?}");
+                        warn!("Error sending event result: {e:?}");
                     }
                 });
             }

crates/isograph_schema/src/memoized/client_selectable_access.rs

@@ -369,9 +369,10 @@ pub fn expose_field_map<TNetworkProtocol: NetworkProtocol>(
     >,
     MemoizedIsoLiteralError<TNetworkProtocol>,
 > {
-    let expose_as_field_queue = create_type_system_schema_with_server_selectables(db)
-        .as_ref()
-        .map_err(|e| e.clone())?;
+    let (expose_as_field_queue, _field_queue) =
+        create_type_system_schema_with_server_selectables(db)
+            .as_ref()
+            .map_err(|e| e.clone())?;
 
     let mut map = HashMap::new();
     for (parent_object_entity_name, expose_as_fields_to_insert) in expose_as_field_queue {

crates/isograph_schema/src/validated_isograph_schema/create_type_system_schema.rs

@@ -1,34 +1,44 @@
 use std::collections::HashMap;
 
 use crate::{
-    CreateAdditionalFieldsError, ExposeFieldToInsert, FieldToInsertToServerSelectableError,
-    IsographDatabase, NetworkProtocol,
+    CreateAdditionalFieldsError, ExposeFieldToInsert, FieldToInsert,
+    FieldToInsertToServerSelectableError, IsographDatabase, NetworkProtocol,
 };
-use common_lang_types::{SelectableName, ServerObjectEntityName};
+use common_lang_types::{SelectableName, ServerObjectEntityName, WithLocation};
 use pico_macros::memo;
 use thiserror::Error;
 
 #[memo]
+#[expect(clippy::type_complexity)]
 pub fn create_type_system_schema_with_server_selectables<TNetworkProtocol: NetworkProtocol>(
     db: &IsographDatabase<TNetworkProtocol>,
 ) -> Result<
-    HashMap<ServerObjectEntityName, Vec<ExposeFieldToInsert>>,
+    (
+        HashMap<ServerObjectEntityName, Vec<ExposeFieldToInsert>>,
+        HashMap<ServerObjectEntityName, Vec<WithLocation<FieldToInsert>>>,
+    ),
     CreateSchemaError<TNetworkProtocol>,
 > {
     let (items, _fetchable_types) = TNetworkProtocol::parse_type_system_documents(db)
         .as_ref()
         .map_err(|e| CreateSchemaError::ParseAndProcessTypeSystemDocument { message: e.clone() })?;
 
+    let mut field_queue = HashMap::new();
     let mut expose_as_field_queue = HashMap::new();
 
     for item in items.iter().flat_map(|x| x.as_ref().as_object()) {
+        field_queue.insert(
+            item.server_object_entity.item.name.item,
+            item.fields_to_insert.clone(),
+        );
+
         expose_as_field_queue.insert(
             item.server_object_entity.item.name.item,
             item.expose_fields_to_insert.clone(),
         );
     }
 
-    Ok(expose_as_field_queue)
+    Ok((expose_as_field_queue, field_queue))
 }
 
 #[derive(Error, Debug, PartialEq, Eq, Clone)]

crates/isograph_schema/src/validated_isograph_schema/get_validated_schema.rs

@@ -15,7 +15,7 @@ use thiserror::Error;
 pub fn get_validated_schema<TNetworkProtocol: NetworkProtocol>(
     db: &IsographDatabase<TNetworkProtocol>,
 ) -> Result<ContainsIsoStats, GetValidatedSchemaError<TNetworkProtocol>> {
-    let expose_as_field_queue = create_type_system_schema_with_server_selectables(db)
+    let (expose_as_field_queue, _) = create_type_system_schema_with_server_selectables(db)
         .as_ref()
         .map_err(|e| e.clone())?;