fix(2892): consider entity resolvers in n + 1 check

Cargo.toml

@@ -175,7 +175,7 @@ strum = "0.26.2"
 tailcall-valid = { workspace = true }
 dashmap = "6.1.0"
 urlencoding = "2.1.3"
-tailcall-chunk = "0.2.5"
+tailcall-chunk = "0.3.0"
 
 # to build rquickjs bindings on systems without builtin bindings
 [target.'cfg(all(target_os = "windows", target_arch = "x86"))'.dependencies]

src/core/config/config.rs

@@ -17,7 +17,7 @@ use super::directive::Directive;
 use super::from_document::from_document;
 use super::{
     AddField, Alias, Cache, Call, Discriminate, Expr, GraphQL, Grpc, Http, Link, Modify, Omit,
-    Protected, Resolver, ResolverSet, Server, Telemetry, Upstream, JS,
+    Protected, ResolverSet, Server, Telemetry, Upstream, JS,
 };
 use crate::core::config::npo::QueryPath;
 use crate::core::config::source::Source;
@@ -136,6 +136,14 @@ impl Display for Type {
 }
 
 impl Type {
+    pub fn has_resolver(&self) -> bool {
+        self.resolvers.has_resolver()
+    }
+
+    pub fn has_batched_resolver(&self) -> bool {
+        self.resolvers.is_batched()
+    }
+
     pub fn fields(mut self, fields: Vec<(&str, Field)>) -> Self {
         let mut graphql_fields = BTreeMap::new();
         for (name, field) in fields {
@@ -243,15 +251,11 @@ impl MergeRight for Field {
 
 impl Field {
     pub fn has_resolver(&self) -> bool {
-        !self.resolvers.is_empty()
+        self.resolvers.has_resolver()
     }
 
     pub fn has_batched_resolver(&self) -> bool {
-        if self.resolvers.is_empty() {
-            false
-        } else {
-            self.resolvers.iter().all(Resolver::is_batched)
-        }
+        self.resolvers.is_batched()
     }
 
     pub fn int() -> Self {

src/core/config/npo/fixtures/entity-resolver.graphql

@@ -0,0 +1,47 @@
+schema @server @upstream {
+  query: Query
+}
+
+type T1 @http(url: "") {
+  t1: Int
+}
+
+type T2 @http(url: "") {
+  t2: [N] @http(url: "")
+}
+
+type T3 @http(url: "", batchKey: ["id"]) {
+  t3: [N] @http(url: "")
+}
+
+type T4 @http(url: "", batchKey: ["id"]) {
+  t4: [N] @http(url: "", batchKey: ["id"])
+}
+
+type T5 @http(url: "", batchKey: ["id"]) {
+  t5: [String] @http(url: "", batchKey: ["id"])
+}
+
+type T6 @http(url: "", batchKey: ["id"]) {
+  t6: [Int]
+}
+
+type N {
+  n: [Int] @http(url: "")
+}
+
+type Query {
+  x: String
+  t1: T1 @http(url: "")
+  t2: T2 @http(url: "")
+  t3: T3 @http(url: "")
+  t4: T4 @http(url: "")
+  t5: T5 @http(url: "")
+  t6: T6 @http(url: "")
+  t1_ls: [T1] @http(url: "")
+  t2_ls: [T2] @http(url: "")
+  t3_ls: [T3] @http(url: "")
+  t4_ls: [T4] @http(url: "")
+  t5_ls: [T5] @http(url: "")
+  t6_ls: [T6] @http(url: "")
+}

src/core/config/npo/fixtures/multiple-deeply-nested.graphql

@@ -0,0 +1,23 @@
+schema @server @upstream {
+  query: Query
+}
+
+type Root {
+  nested: Nested1
+  nested_list: [Nested1]
+}
+
+type Nested1 {
+  a: DeepNested @http(url: "")
+  b: DeepNested @http(url: "", batchKey: ["id"])
+  c: DeepNested @http(url: "")
+  d: [DeepNested] @http(url: "")
+}
+
+type DeepNested {
+  test: [String] @http(url: "")
+}
+
+type Query {
+  root: Root @http(url: "")
+}

src/core/config/npo/fixtures/multiple-type-usage.graphql

@@ -0,0 +1,29 @@
+schema @server @upstream {
+  query: Query
+}
+
+type T1 {
+  t1: Int
+}
+
+type T2 {
+  t2: [N] @http(url: "")
+}
+
+type T3 {
+  t3: [N] @http(url: "", batchKey: ["id"])
+}
+
+type N {
+  n: Int @http(url: "")
+}
+
+type Query {
+  x: String
+  t1: T1 @http(url: "")
+  t2: T2 @http(url: "")
+  t3: T3 @http(url: "")
+  t1_ls: [T1] @http(url: "")
+  t2_ls: [T2] @http(url: "")
+  t3_ls: [T3] @http(url: "")
+}

src/core/config/npo/fixtures/nested.graphql

@@ -0,0 +1,21 @@
+schema @server(port: 8030) {
+  query: Query
+}
+
+type Query {
+  version: Int! @expr(body: 1)
+  foo: [Foo!]! @expr(body: [{fizz: "buzz"}])
+  bar: [Foo!]! @expr(body: [{fizz: "buzz"}])
+  buzz: [Foo!]! @expr(body: [{fizz: "buzz"}])
+}
+
+type Foo {
+  fizz: String!
+  c: Int
+}
+
+type Foo {
+  fizz: String!
+  c: Int
+  spam: [String!]! @http(url: "https://example.com/spam", query: [{key: "id", value: "{{.value.fizz}}"}])
+}

src/core/config/npo/snapshots/tailcall__core__config__npo__tracker__tests__cycles_with_resolvers.snap

@@ -2,5 +2,4 @@
 source: src/core/config/npo/tracker.rs
 expression: actual
 ---
-query { f1 { f1 { f2 } } }
 query { f1 { f2 } }

src/core/config/npo/snapshots/tailcall__core__config__npo__tracker__tests__entity_resolver.snap

@@ -0,0 +1,15 @@
+---
+source: src/core/config/npo/tracker.rs
+expression: actual
+snapshot_kind: text
+---
+query { t2 { t2 { n } } }
+query { t2_ls { t2 } }
+query { t3 { t3 { n } } }
+query { t3_ls { t3 } }
+query { t4 { t4 { n } } }
+query { t4_ls { t4 { n } } }
+query { __entities(representations: [{ __typename: "T1"}]) }
+query { __entities(representations: [{ __typename: "T2"}]) }
+query { __entities(representations: [{ __typename: "T3"}]) { t3 } }
+query { __entities(representations: [{ __typename: "T4"}]) { t4 { n } } }

src/core/config/npo/snapshots/tailcall__core__config__npo__tracker__tests__multiple_deeply_nested.snap

@@ -0,0 +1,10 @@
+---
+source: src/core/config/npo/tracker.rs
+expression: actual
+snapshot_kind: text
+---
+query { root { nested { d { test } } } }
+query { root { nested_list { a } } }
+query { root { nested_list { b { test } } } }
+query { root { nested_list { c } } }
+query { root { nested_list { d } } }

src/core/config/npo/snapshots/tailcall__core__config__npo__tracker__tests__multiple_keys.snap

@@ -1,6 +1,7 @@
 ---
 source: src/core/config/npo/tracker.rs
 expression: actual
+snapshot_kind: text
 ---
 query { f1 { f2 } }
 query { f1 { f3 } }

src/core/config/npo/snapshots/tailcall__core__config__npo__tracker__tests__multiple_type_usage.snap

@@ -0,0 +1,8 @@
+---
+source: src/core/config/npo/tracker.rs
+expression: actual
+---
+query { t2 { t2 { n } } }
+query { t2_ls { t2 } }
+query { t3 { t3 { n } } }
+query { t3_ls { t3 { n } } }

src/core/config/npo/snapshots/tailcall__core__config__npo__tracker__tests__nested_config.snap

@@ -0,0 +1,7 @@
+---
+source: src/core/config/npo/tracker.rs
+expression: actual
+---
+query { bar { spam } }
+query { buzz { spam } }
+query { foo { spam } }