refactor: use links only from the root config (#3190)

Author: meskill

src/core/config/config_module/fixtures/router.graphql

@@ -1,4 +1,4 @@
-schema {
+schema @server(port: 8000) @upstream(httpCache: 42, batch: {delay: 100}) {
   #   @link(src: "http://localhost:4000", type: SubGraph, meta: {name: "Users"})
   #   @link(src: "http://localhost:5000", type: SubGraph, meta: {name: "Posts"})
   query: Query

src/core/config/config_module/fixtures/subgraph-posts.graphql

@@ -1,4 +1,4 @@
-schema @server(port: 8000) @upstream(httpCache: 42, batch: {delay: 100}) {
+schema {
   query: Query
 }
 

src/core/config/config_module/fixtures/subgraph-users.graphql

@@ -1,4 +1,4 @@
-schema @server(port: 8000) @upstream(httpCache: 42, batch: {delay: 100}) {
+schema {
   query: Query
 }
 

src/core/config/config_module/merge.rs

@@ -4,10 +4,10 @@ use indexmap::IndexMap;
 use tailcall_valid::{Valid, Validator};
 
 use super::{Cache, ConfigModule};
-use crate::core;
-use crate::core::config::{Arg, Config, Enum, Field, Type};
+use crate::core::config::{Arg, Config, Enum, Field, RootSchema, Type};
 use crate::core::merge_right::MergeRight;
 use crate::core::variance::{Contravariant, Covariant, Invariant};
+use crate::core::{self};
 
 impl core::Type {
     fn merge(self, other: Self, non_null_merge: fn(bool, bool) -> bool) -> Valid<Self, String> {
@@ -183,6 +183,24 @@ impl Covariant for Enum {
     }
 }
 
+impl Invariant for RootSchema {
+    fn unify(self, other: Self) -> Valid<Self, String> {
+        fn unify_option<T>(left: Option<T>, right: Option<T>) -> Option<T> {
+            match (left, right) {
+                (None, None) => None,
+                (None, Some(that)) => Some(that),
+                (Some(this), _) => Some(this),
+            }
+        }
+
+        Valid::succeed(Self {
+            query: unify_option(self.query, other.query),
+            mutation: unify_option(self.mutation, other.mutation),
+            subscription: unify_option(self.subscription, other.subscription),
+        })
+    }
+}
+
 impl Invariant for Cache {
     fn unify(self, other: Self) -> Valid<Self, String> {
         let mut types = self.config.types;
@@ -270,12 +288,18 @@ impl Invariant for Cache {
             .map(|en| (name, en))
             .trace(&trace_name)
         }))
-        .map( |(merged_types, merged_enums)| {
+        .fuse(self.config.schema.unify(other.config.schema))
+        .map( |(merged_types, merged_enums, schema)| {
             types.extend(merged_types);
             enums.extend(merged_enums);
 
             let config = Config {
-                types, enums, unions: self.config.unions.merge_right(other.config.unions), server: self.config.server.merge_right(other.config.server), upstream: self.config.upstream.merge_right(other.config.upstream), schema: self.config.schema.merge_right(other.config.schema), links: self.config.links.merge_right(other.config.links), telemetry: self.config.telemetry.merge_right(other.config.telemetry)  };
+                types,
+                enums,
+                unions: self.config.unions.merge_right(other.config.unions),
+                schema,
+                ..self.config
+            };
 
             Cache {
                 config,

src/core/config/reader.rs

@@ -1,10 +1,11 @@
 use std::path::Path;
 
+use futures_util::future::join_all;
 use rustls_pemfile;
 use rustls_pki_types::{
     CertificateDer, PrivateKeyDer, PrivatePkcs1KeyDer, PrivatePkcs8KeyDer, PrivateSec1KeyDer,
 };
-use tailcall_valid::{Valid, Validator};
+use tailcall_valid::{Valid, ValidationError, Validator};
 use url::Url;
 
 use super::{ConfigModule, Content, Link, LinkType, PrivateKey};
@@ -34,11 +35,10 @@ impl ConfigReader {
     }
 
     /// Reads the links in a Config and fill the content
-    #[async_recursion::async_recursion]
     async fn ext_links(
         &self,
         config_module: ConfigModule,
-        parent_dir: Option<&'async_recursion Path>,
+        parent_dir: Option<&Path>,
     ) -> anyhow::Result<ConfigModule> {
         let reader_ctx = ConfigReaderContext::new(&self.runtime);
 
@@ -77,14 +77,6 @@ impl ConfigReader {
                     config_module = config_module.and_then(|config_module| {
                         config_module.unify(ConfigModule::from(config.clone()))
                     });
-
-                    if !config.links.is_empty() {
-                        let cfg_module = self
-                            .ext_links(ConfigModule::from(config), Path::new(&link.src).parent())
-                            .await?;
-                        config_module =
-                            config_module.and_then(|config_module| config_module.unify(cfg_module));
-                    }
                 }
                 LinkType::Protobuf => {
                     let meta = self.proto_reader.read(path, None).await?;
@@ -200,24 +192,32 @@ impl ConfigReader {
             .map(|file| file.render(&reader_ctx))
             .collect::<Vec<_>>();
 
-        let mut config_module = Valid::succeed(ConfigModule::default());
-
-        for file in files.iter() {
+        let mut config_modules = join_all(files.iter().map(|file| async {
             let source = Source::detect(&file.path)?;
             let schema = &file.content;
 
             // Create initial config module
-            let new_config_module = self
-                .resolve(
-                    Config::from_source(source, schema)?,
-                    Path::new(&file.path).parent(),
-                )
-                .await?;
-
-            // Merge it with the original config set
-            config_module =
-                config_module.and_then(|config_module| config_module.unify(new_config_module));
-        }
+            self.resolve(
+                Config::from_source(source, schema)?,
+                Path::new(&file.path).parent(),
+            )
+            .await
+        }))
+        .await
+        .into_iter();
+
+        let config_module = Valid::from(
+            config_modules
+                .next()
+                .ok_or(anyhow::anyhow!("At least one config should be defined"))?
+                .map_err(to_validation_error),
+        );
+
+        let config_module = config_modules.fold(config_module, |acc, other| {
+            acc.and_then(|cfg| {
+                Valid::from(other.map_err(to_validation_error)).and_then(|other| cfg.unify(other))
+            })
+        });
 
         Ok(config_module.to_result()?)
     }
@@ -256,6 +256,13 @@ impl ConfigReader {
     }
 }
 
+fn to_validation_error(error: anyhow::Error) -> ValidationError<String> {
+    match error.downcast::<ValidationError<String>>() {
+        Ok(err) => err,
+        Err(err) => ValidationError::new(err.to_string()),
+    }
+}
+
 #[cfg(test)]
 mod reader_tests {
     use std::path::{Path, PathBuf};

tests/core/snapshots/https.md_0.snap

@@ -1,10 +1,10 @@
 ---
 source: tests/core/spec.rs
 expression: formatted
+snapshot_kind: text
 ---
-enum Foo {
-  BAR
-  BAZ
+type Foo {
+  foo: String
 }
 
 type Post {

tests/core/snapshots/https.md_client.snap

@@ -1,19 +1,18 @@
 ---
 source: tests/core/spec.rs
 expression: formatter
+snapshot_kind: text
 ---
 schema
-  @server
-  @upstream
-  @link(src: "graphql-with-link.graphql", type: Config)
-  @link(src: "link-enum.graphql", type: Config)
-  @link(src: "link-enum.graphql", type: Config) {
+  @server(port: 8000)
+  @upstream(batch: {delay: 10, headers: []}, httpCache: 10)
+  @link(src: "link-1.graphql", type: Config)
+  @link(src: "link-2.graphql", type: Config) {
   query: Query
 }
 
-enum Foo {
-  BAR
-  BAZ
+type Foo {
+  foo: String
 }
 
 type Post {