chore(2818): variance based merging of types (#2927)

Co-authored-by: Tushar Mathur <tusharmath@gmail.com>

src/core/blueprint/mod.rs

@@ -16,7 +16,6 @@ pub mod telemetry;
 mod timeout;
 mod union_resolver;
 mod upstream;
-mod wrapping_type;
 
 pub use auth::*;
 pub use blueprint::*;
@@ -31,7 +30,6 @@ pub use schema::*;
 pub use server::*;
 pub use timeout::GlobalTimeout;
 pub use upstream::*;
-pub use wrapping_type::Type;
 
 use crate::core::config::ConfigModule;
 use crate::core::try_fold::TryFold;

src/core/config/config.rs

@@ -212,7 +212,15 @@ pub struct RootSchema {
 }
 
 #[derive(
-    Serialize, Deserialize, Clone, Debug, PartialEq, Eq, schemars::JsonSchema, DirectiveDefinition,
+    Serialize,
+    Deserialize,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    schemars::JsonSchema,
+    DirectiveDefinition,
+    MergeRight,
 )]
 #[directive_definition(locations = "FieldDefinition")]
 #[serde(deny_unknown_fields)]
@@ -332,6 +340,7 @@ impl Field {
     schemars::JsonSchema,
     DirectiveDefinition,
     InputDefinition,
+    MergeRight,
 )]
 #[directive_definition(locations = "FieldDefinition")]
 #[serde(deny_unknown_fields)]
@@ -554,6 +563,8 @@ impl Config {
                     types = self.find_connections(field.type_of.name(), types);
                 }
             }
+        } else if self.find_enum(type_of).is_some() {
+            types.insert(type_of.into());
         }
         types
     }

src/core/config/config_module.rs

@@ -13,6 +13,8 @@ use crate::core::rest::{EndpointSet, Unchecked};
 use crate::core::valid::{Valid, Validator};
 use crate::core::Transform;
 
+mod merge;
+
 /// A wrapper on top of Config that contains all the resolved extensions and
 /// computed values.
 #[derive(Clone, Debug, Default, MergeRight)]

src/core/config/config_module/fixtures/enums-1.graphql

@@ -0,0 +1,21 @@
+schema {
+  query: Query
+}
+
+type Query {
+  a: A
+}
+
+enum enumInput {
+  A
+  B
+}
+
+enum enumOutput {
+  A
+  B
+}
+
+type A {
+  a(x: enumInput): enumOutput
+}

src/core/config/config_module/fixtures/enums-2.graphql

@@ -0,0 +1,9 @@
+enum enumInput {
+  B
+  C
+}
+
+enum enumOutput {
+  B
+  C
+}

src/core/config/config_module/fixtures/enums-3.graphql

@@ -0,0 +1,13 @@
+enum enumInput {
+  B
+  C
+}
+
+enum enumOutput {
+  B
+  C
+}
+
+type A {
+  b(x: enumOutput): enumInput
+}

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

@@ -0,0 +1,9 @@
+schema {
+  #   @link(src: "http://localhost:4000", type: SubGraph, meta: {name: "Users"})
+  #   @link(src: "http://localhost:5000", type: SubGraph, meta: {name: "Posts"})
+  query: Query
+}
+
+type Query {
+  version: String @expr(body: "test")
+}

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

@@ -0,0 +1,43 @@
+schema
+  @server(port: 8000)
+  @upstream(baseURL: "http://jsonplaceholder.typicode.com", httpCache: 42, batch: {delay: 100}) {
+  query: Query
+}
+
+type Query {
+  posts: [UserPost] @http(path: "/posts")
+  addComment(postId: Int!, comment: CommentInput!, premium: Boolean): Boolean @http(path: "/add-comment", method: POST)
+  searchComments(type: CommentSearch): [Comment] @http(path: "/comment")
+}
+
+interface Post {
+  id: Int!
+  body: String
+}
+
+enum Role {
+  ADMIN
+  EMPLOYEE
+}
+
+type UserPost implements Post {
+  id: Int!
+  userId: Int!
+  title: String!
+  body: String
+}
+
+input CommentInput {
+  userId: Int!
+  body: String!
+}
+
+type Comment {
+  body: String
+}
+
+enum CommentSearch {
+  TODAY
+  WEEK
+  MONTH
+}

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

@@ -0,0 +1,52 @@
+schema
+  @server(port: 8000)
+  @upstream(baseURL: "http://jsonplaceholder.typicode.com", httpCache: 42, batch: {delay: 100}) {
+  query: Query
+}
+
+type Query {
+  users: [User] @http(path: "/users")
+  user(id: Int!): User @http(path: "/users/{{.args.id}}")
+  addComment(postId: Int!, comment: CommentInput!): Boolean @http(path: "/add-comment")
+}
+
+enum Role {
+  USER
+}
+
+type User {
+  id: Int!
+  name: String!
+  username: String!
+  email: String!
+  phone: String
+  website: String
+  role: Role
+}
+
+interface Post {
+  userId: Int!
+  user: User @http(path: "/users/{{.value.userId}}")
+}
+
+type UserPost implements Post {
+  userId: Int!
+  title: String
+  user: User @http(path: "/users/{{.value.userId}}")
+}
+
+input CommentInput {
+  userId: Int!
+  title: String
+  body: String!
+}
+
+type Comment {
+  body: String
+}
+
+enum CommentSearch {
+  WEEK
+  MONTH
+  YEAR
+}

src/core/config/config_module/fixtures/types-1.graphql

@@ -0,0 +1,13 @@
+schema {
+  query: Query
+}
+
+type Query {
+  a: A
+}
+
+type A {
+  a: String
+  b: Int
+  c: Boolean
+}

src/core/config/config_module/fixtures/types-2.graphql

@@ -0,0 +1,5 @@
+type A {
+  b: Int!
+  d: Float!
+  e: String
+}

src/core/config/config_module/fixtures/types-3.graphql

@@ -0,0 +1,6 @@
+type A {
+  a: Int
+  b: [Int]
+  c: Boolean
+  d: Float
+}

src/core/config/config_module/fixtures/unions-1.graphql

@@ -0,0 +1,17 @@
+schema {
+  query: Query
+}
+
+type Query {
+  b: B
+}
+
+type A {
+  a: String
+}
+
+type B {
+  b: String
+}
+
+union Union = A | B

src/core/config/config_module/fixtures/unions-2.graphql

@@ -0,0 +1,9 @@
+type B {
+  b: String
+}
+
+type C {
+  c: Int
+}
+
+union Union = B | C