From 307171f418644746bf63de3d8f485989de6aba50 Mon Sep 17 00:00:00 2001
From: Tom Gasson <tgasson@atlassian.com>
Date: Mon, 25 Mar 2024 15:22:36 +1100
Subject: [PATCH] Combine preloaded queries with mock files

---
 compiler/Cargo.lock                        |  2 ++
 compiler/crates/persisted-mocks/src/lib.rs | 10 +++++++---
 compiler/crates/relay-bin/src/main.rs      |  8 +++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/compiler/Cargo.lock b/compiler/Cargo.lock
index 5b8bb478a6312..93c2d52005ad2 100644
--- a/compiler/Cargo.lock
+++ b/compiler/Cargo.lock
@@ -1836,6 +1836,7 @@ name = "relay-schema"
 version = "0.0.0"
 dependencies = [
  "common",
+ "docblock-shared",
  "intern",
  "lazy_static",
  "schema",
@@ -1875,6 +1876,7 @@ dependencies = [
  "parking_lot",
  "regex",
  "relay-config",
+ "relay-schema",
  "relay-test-schema",
  "rustc-hash",
  "schema",
diff --git a/compiler/crates/persisted-mocks/src/lib.rs b/compiler/crates/persisted-mocks/src/lib.rs
index cc8608e96cd6a..00c3c06dacb69 100644
--- a/compiler/crates/persisted-mocks/src/lib.rs
+++ b/compiler/crates/persisted-mocks/src/lib.rs
@@ -6,6 +6,8 @@
  */
 
 use relay_codegen::QueryID;
+use relay_compiler::build_project::generate_extra_artifacts::default_generate_extra_artifacts_fn;
+use relay_compiler::config::Config;
 use relay_compiler::Artifact;
 use relay_compiler::ArtifactContent;
 use relay_compiler::ProjectConfig;
@@ -20,12 +22,14 @@ struct QueryForMock {
 }
 
 pub fn generate_persisted_mocks(
+    config: &Config,
     project_config: &ProjectConfig,
-    _schema: &SDLSchema,
-    _programs: &Programs,
+    schema: &SDLSchema,
+    program: &Programs,
     artifacts: &[Artifact],
 ) -> Vec<Artifact> {
-    let mut extra = vec![];
+    let mut extra =
+        default_generate_extra_artifacts_fn(config, project_config, schema, program, artifacts);
     if let Some(folder) = &project_config.extra_artifacts_output {
         for artifact in artifacts {
             if let ArtifactContent::Operation {
diff --git a/compiler/crates/relay-bin/src/main.rs b/compiler/crates/relay-bin/src/main.rs
index e7de0a7bfd0c1..13ed6ca98a29c 100644
--- a/compiler/crates/relay-bin/src/main.rs
+++ b/compiler/crates/relay-bin/src/main.rs
@@ -18,7 +18,6 @@ use intern::string_key::Intern;
 use log::error;
 use log::info;
 use relay_compiler::build_project::artifact_writer::ArtifactValidationWriter;
-use relay_compiler::build_project::generate_extra_artifacts::default_generate_extra_artifacts_fn;
 use relay_compiler::compiler::Compiler;
 use relay_compiler::config::Config;
 use relay_compiler::errors::Error as CompilerError;
@@ -284,9 +283,6 @@ async fn handle_compiler_command(command: CompileCommand) -> Result<(), Error> {
         )
     }));
 
-    // Atlassian: Output id -> query text for testing / mocking usage
-    config.generate_extra_artifacts = Some(Box::new(persisted_mocks::generate_persisted_mocks));
-
     config.file_source_config = if should_use_watchman() {
         FileSourceKind::Watchman
     } else {
@@ -300,7 +296,9 @@ async fn handle_compiler_command(command: CompileCommand) -> Result<(), Error> {
         );
     }
 
-    config.generate_extra_artifacts = Some(Box::new(default_generate_extra_artifacts_fn));
+    // Atlassian:
+    // Edited to output id -> query text for testing / mocking usage
+    config.generate_extra_artifacts = Some(Box::new(persisted_mocks::generate_persisted_mocks));
 
     let compiler = Compiler::new(Arc::new(config), Arc::new(ConsoleLogger));