split create schema into two parts

Author: rbalicki2

crates/isograph_compiler/src/compiler_state.rs

@@ -12,7 +12,7 @@ use pico::Database;
 
 use crate::{
     batch_compile::{BatchCompileError, CompilationStats},
-    create_schema::create_schema,
+    create_schema::{create_schema, process_iso_literals_for_schema},
     db_singletons::get_isograph_config,
     write_artifacts::write_artifacts_to_disk,
 };
@@ -81,7 +81,12 @@ pub fn compile<TNetworkProtocol: NetworkProtocol>(
     db: &Database,
 ) -> Result<CompilationStats, Box<dyn Error>> {
     // Create schema
-    let (isograph_schema, stats) = create_schema::<TNetworkProtocol>(db)?;
+    let (unvalidated_isograph_schema, unprocessed_items) = create_schema::<TNetworkProtocol>(db)?;
+    let (isograph_schema, stats) = process_iso_literals_for_schema::<TNetworkProtocol>(
+        db,
+        unvalidated_isograph_schema,
+        unprocessed_items,
+    )?;
 
     validate_use_of_arguments(&isograph_schema).map_err(|messages| {
         Box::new(BatchCompileError::MultipleErrorsWithLocations {

crates/isograph_compiler/src/create_schema.rs

@@ -18,7 +18,7 @@ use isograph_schema::{
     validate_entrypoints, CreateAdditionalFieldsError, FieldToInsert, NetworkProtocol,
     ProcessObjectTypeDefinitionOutcome, ProcessTypeSystemDocumentOutcome, RootOperationName,
     Schema, ServerEntityName, ServerObjectSelectable, ServerObjectSelectableVariant,
-    ServerScalarSelectable,
+    ServerScalarSelectable, UnprocessedClientFieldItem, UnprocessedClientPointerItem,
 };
 use pico::Database;
 
@@ -32,7 +32,13 @@ use crate::{
 
 pub fn create_schema<TNetworkProtocol: NetworkProtocol>(
     db: &Database,
-) -> Result<(Schema<TNetworkProtocol>, ContainsIsoStats), Box<dyn Error>> {
+) -> Result<
+    (
+        Schema<TNetworkProtocol>,
+        Vec<SelectionType<UnprocessedClientFieldItem, UnprocessedClientPointerItem>>,
+    ),
+    Box<dyn Error>,
+> {
     let ProcessTypeSystemDocumentOutcome { scalars, objects } =
         TNetworkProtocol::parse_and_process_type_system_documents(db)?;
 
@@ -104,6 +110,16 @@ pub fn create_schema<TNetworkProtocol: NetworkProtocol>(
         }
     }
 
+    Ok((unvalidated_isograph_schema, unprocessed_items))
+}
+
+pub fn process_iso_literals_for_schema<TNetworkProtocol: NetworkProtocol>(
+    db: &Database,
+    mut unvalidated_isograph_schema: Schema<TNetworkProtocol>,
+    mut unprocessed_items: Vec<
+        SelectionType<UnprocessedClientFieldItem, UnprocessedClientPointerItem>,
+    >,
+) -> Result<(Schema<TNetworkProtocol>, ContainsIsoStats), Box<dyn Error>> {
     let iso_literal_map = get_iso_literal_map(db);
     let contains_iso = parse_iso_literals(db, iso_literal_map)?;
     let contains_iso_stats = contains_iso.stats();