Remove extra collect from connections without projection

angrykoala · angrykoala · commit fa5d1ef4797d · 2025-08-07T09:55:18.000+01:00
diff --git a/packages/graphql/src/translate/queryAST/ast/operations/ConnectionReadOperation.ts b/packages/graphql/src/translate/queryAST/ast/operations/ConnectionReadOperation.ts
@@ -135,7 +135,11 @@ export class ConnectionReadOperation extends Operation {
             nodeAndRelationshipMap.set("relationship", nestedContext.relationship);
         }
 
-        const withClause = new Cypher.With([Cypher.collect(nodeAndRelationshipMap), edgesVar], ...extraColumns);
+        const withClause = new Cypher.With();
+        if (this.shouldProjectEdges()) {
+            withClause.addColumns([Cypher.collect(nodeAndRelationshipMap), edgesVar]);
+        }
+        withClause.addColumns(...extraColumns);
 
         if (this.hasTotalCount) {
             withClause.addColumns([Cypher.count(nestedContext.target), totalCount]);
@@ -203,13 +207,26 @@ export class ConnectionReadOperation extends Operation {
             };
         }
 
-        const hasProjectionFields = this.hasEdgesProjection();
+        const hasProjectionFields = this.shouldProjectEdges();
         let unwindAndProjectionSubquery: Cypher.Call | undefined;
         if (hasProjectionFields) {
-            unwindAndProjectionSubquery = this.createUnwindAndProjectionSubquery(
-                nestedContext,
-                edgesVar,
-                edgesProjectionVar
+            const edgeVar = new Cypher.NamedVariable("edge");
+            const { prePaginationSubqueries, postPaginationSubqueries } = this.getPreAndPostSubqueries(nestedContext);
+
+            const unwindClause = this.getUnwindClause(nestedContext, edgeVar, edgesVar);
+
+            const edgeProjectionMap = this.createProjectionMapForEdge(nestedContext);
+            const paginationWith = this.generateSortAndPaginationClause(nestedContext);
+
+            unwindAndProjectionSubquery = new Cypher.Call(
+                Cypher.utils.concat(
+                    unwindClause,
+                    ...prePaginationSubqueries,
+                    paginationWith,
+                    ...postPaginationSubqueries,
+                    new Cypher.Return([Cypher.collect(edgeProjectionMap), edgesProjectionVar])
+                ),
+                [edgesVar]
             );
         }
 
@@ -269,7 +286,7 @@ export class ConnectionReadOperation extends Operation {
     }
 
     /** Defines if the query should project edges */
-    protected hasEdgesProjection(): boolean {
+    protected shouldProjectEdges(): boolean {
         const hasPagination = Boolean(this.pagination);
         const hasFields = this.nodeFields.length + this.edgeFields.length > 0;
         return hasPagination || hasFields;
diff --git a/packages/graphql/src/translate/queryAST/ast/operations/FulltextOperation.ts b/packages/graphql/src/translate/queryAST/ast/operations/FulltextOperation.ts
@@ -62,8 +62,8 @@ export class FulltextOperation extends ConnectionReadOperation {
         return filterTruthy([...super.getChildren(), this.scoreField]);
     }
 
-    protected hasEdgesProjection(): boolean {
-        return super.hasEdgesProjection() || Boolean(this.scoreField);
+    protected shouldProjectEdges(): boolean {
+        return super.shouldProjectEdges() || Boolean(this.scoreField);
     }
 
     protected createProjectionMapForEdge(context: QueryASTContext<Cypher.Node>): Cypher.Map {
diff --git a/packages/graphql/tests/performance/graphql/connections.graphql b/packages/graphql/tests/performance/graphql/connections.graphql
@@ -28,3 +28,9 @@ query NestedConnection {
         }
     }
 }
+
+query totalCount {
+    moviesConnection {
+        totalCount
+    }
+}
diff --git a/packages/graphql/tests/tck/connections/alias.test.ts b/packages/graphql/tests/tck/connections/alias.test.ts
@@ -64,8 +64,7 @@ describe("Connections Alias", () => {
             MATCH (this:Movie)
             CALL (this) {
                 MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH count(this1) AS totalCount
                 RETURN { totalCount: totalCount } AS var2
             }
             RETURN this { actors: var2 } AS this"
diff --git a/packages/graphql/tests/tck/connections/projections/projections.test.ts b/packages/graphql/tests/tck/connections/projections/projections.test.ts
@@ -64,8 +64,7 @@ describe("Relay Cursor Connection projections", () => {
             "CYPHER 5
             MATCH (this0:Movie)
             WHERE this0.title = $param0
-            WITH collect({ node: this0 }) AS edges
-            WITH edges, size(edges) AS totalCount
+            WITH count(this0) AS totalCount
             RETURN { totalCount: totalCount } AS this"
         `);
 
@@ -91,8 +90,7 @@ describe("Relay Cursor Connection projections", () => {
             "CYPHER 5
             MATCH (this0:Movie)
             WHERE this0.title = $param0
-            WITH collect({ node: this0 }) AS edges
-            WITH edges, size(edges) AS totalCount
+            WITH count(this0) AS totalCount
             RETURN { totalCount: totalCount } AS this"
         `);
 
@@ -123,8 +121,7 @@ describe("Relay Cursor Connection projections", () => {
             WHERE this.title = $param0
             CALL (this) {
                 MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH count(this1) AS totalCount
                 RETURN { totalCount: totalCount } AS var2
             }
             RETURN this { .title, actorsConnection: var2 } AS this"
@@ -162,8 +159,7 @@ describe("Relay Cursor Connection projections", () => {
             WHERE this.title = $param0
             CALL (this) {
                 MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH count(this1) AS totalCount
                 RETURN { totalCount: totalCount } AS var2
             }
             RETURN this { .title, actorsConnection: var2 } AS this"
@@ -196,8 +192,7 @@ describe("Relay Cursor Connection projections", () => {
             WHERE this.title = $param0
             CALL (this) {
                 MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this1, relationship: this0 }) AS edges, count(this1) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this1, edge.relationship AS this0
@@ -345,8 +340,7 @@ describe("Relay Cursor Connection projections", () => {
             WHERE this.title = $param0
             CALL (this) {
                 MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this1, relationship: this0 }) AS edges, count(this1) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this1, edge.relationship AS this0
@@ -389,8 +383,7 @@ describe("Relay Cursor Connection projections", () => {
             WHERE this.title = $param0
             CALL (this) {
                 MATCH (this)<-[this0:ACTED_IN]-(this1:Actor)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this1, relationship: this0 }) AS edges, count(this1) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this1, edge.relationship AS this0
diff --git a/packages/graphql/tests/tck/deprecated/cypher-sort-deprecated.test.ts b/packages/graphql/tests/tck/deprecated/cypher-sort-deprecated.test.ts
@@ -450,8 +450,7 @@ describe("Cypher sort deprecated", () => {
         expect(formatCypher(result.cypher)).toMatchInlineSnapshot(`
             "CYPHER 5
             MATCH (this0:Movie)
-            WITH collect({ node: this0 }) AS edges
-            WITH edges, size(edges) AS totalCount
+            WITH collect({ node: this0 }) AS edges, count(this0) AS totalCount
             CALL (edges) {
                 UNWIND edges AS edge
                 WITH edge.node AS this0
@@ -535,8 +534,7 @@ describe("Cypher sort deprecated", () => {
             MATCH (this:Actor)
             CALL (this) {
                 MATCH (this)-[this0:ACTED_IN]->(this1:Movie)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this1, relationship: this0 }) AS edges, count(this1) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this1, edge.relationship AS this0
diff --git a/packages/graphql/tests/tck/deprecated/generic-filtering/cypher-filtering-one-to-one-relationship-deprecated.test.ts b/packages/graphql/tests/tck/deprecated/generic-filtering/cypher-filtering-one-to-one-relationship-deprecated.test.ts
@@ -1496,8 +1496,7 @@ describe("cypher directive filtering - One To One Relationship - deprecated", ()
             WHERE (this.title ENDS WITH $param0 AND this1.name = $param1)
             CALL (this) {
                 MATCH (this)<-[this2:ACTED_IN]-(this3:Person)
-                WITH collect({ node: this3, relationship: this2 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this3, relationship: this2 }) AS edges, count(this3) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this3, edge.relationship AS this2
diff --git a/packages/graphql/tests/tck/directives/cypher/filtering/cypher-filtering-one-to-one-relationship.test.ts b/packages/graphql/tests/tck/directives/cypher/filtering/cypher-filtering-one-to-one-relationship.test.ts
@@ -1508,8 +1508,7 @@ describe("cypher directive filtering - One To One Relationship", () => {
             WHERE (this.title ENDS WITH $param0 AND this1.name = $param1)
             CALL (this) {
                 MATCH (this)<-[this2:ACTED_IN]-(this3:Person)
-                WITH collect({ node: this3, relationship: this2 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this3, relationship: this2 }) AS edges, count(this3) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this3, edge.relationship AS this2
diff --git a/packages/graphql/tests/tck/issues/2022.test.ts b/packages/graphql/tests/tck/issues/2022.test.ts
@@ -90,8 +90,7 @@ describe("https://github.com/neo4j/graphql/issues/2022", () => {
         expect(formatCypher(result.cypher)).toMatchInlineSnapshot(`
             "CYPHER 5
             MATCH (this0:ArtPiece)
-            WITH collect({ node: this0 }) AS edges
-            WITH edges, size(edges) AS totalCount
+            WITH collect({ node: this0 }) AS edges, count(this0) AS totalCount
             CALL (edges) {
                 UNWIND edges AS edge
                 WITH edge.node AS this0
diff --git a/packages/graphql/tests/tck/issues/2437.test.ts b/packages/graphql/tests/tck/issues/2437.test.ts
@@ -88,8 +88,7 @@ describe("https://github.com/neo4j/graphql/issues/2437", () => {
             CALL (this) {
                 MATCH (this)-[this0:IS_VALUATION_AGENT]->(this1:Valuation)
                 WHERE ($isAuthenticated = true AND this1.archivedAt IS NULL)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH collect({ node: this1, relationship: this0 }) AS edges, count(this1) AS totalCount
                 CALL (edges) {
                     UNWIND edges AS edge
                     WITH edge.node AS this1, edge.relationship AS this0
diff --git a/packages/graphql/tests/tck/issues/4741.test.ts b/packages/graphql/tests/tck/issues/4741.test.ts
@@ -77,8 +77,7 @@ describe("https://github.com/neo4j/graphql/issues/4741", () => {
                 LIMIT $param1
                 CALL (this0) {
                     MATCH (this0)-[this4:HAS_LIST]->(this5:ListOli)
-                    WITH collect({ node: this5, relationship: this4 }) AS edges
-                    WITH edges, size(edges) AS totalCount
+                    WITH count(this5) AS totalCount
                     RETURN { totalCount: totalCount } AS var6
                 }
                 RETURN collect({ node: { country: this0.country, listsOlisConnection: var6, __resolveType: \\"Opportunity\\" } }) AS var7
diff --git a/packages/graphql/tests/tck/issues/630.test.ts b/packages/graphql/tests/tck/issues/630.test.ts
@@ -77,8 +77,7 @@ describe("Cypher directive", () => {
                 WITH m AS this0
                 CALL (this0) {
                     MATCH (this0)<-[this1:ACTED_IN]-(this2:Actor)
-                    WITH collect({ node: this2, relationship: this1 }) AS edges
-                    WITH edges, size(edges) AS totalCount
+                    WITH count(this2) AS totalCount
                     RETURN { totalCount: totalCount } AS var3
                 }
                 WITH this0 { actorsConnection: var3 } AS this0
diff --git a/packages/graphql/tests/tck/operations/create.test.ts b/packages/graphql/tests/tck/operations/create.test.ts
@@ -491,8 +491,7 @@ describe("Cypher Create", () => {
                     CALL (this4) {
                         MATCH (this4)<-[this5:ACTED_IN]-(this6:Actor)
                         WHERE this6.name = $param2
-                        WITH collect({ node: this6, relationship: this5 }) AS edges
-                        WITH edges, size(edges) AS totalCount
+                        WITH collect({ node: this6, relationship: this5 }) AS edges, count(this6) AS totalCount
                         CALL (edges) {
                             UNWIND edges AS edge
                             WITH edge.node AS this6, edge.relationship AS this5
diff --git a/packages/graphql/tests/tck/root-connection.test.ts b/packages/graphql/tests/tck/root-connection.test.ts
@@ -63,8 +63,7 @@ describe("Root Connection Query tests", () => {
             "CYPHER 5
             MATCH (this0:Movie)
             WHERE this0.title = $param0
-            WITH collect({ node: this0 }) AS edges
-            WITH edges, size(edges) AS totalCount
+            WITH collect({ node: this0 }) AS edges, count(this0) AS totalCount
             CALL (edges) {
                 UNWIND edges AS edge
                 WITH edge.node AS this0
@@ -190,8 +189,7 @@ describe("Root Connection Query tests", () => {
                 LIMIT $param0
                 CALL (this0) {
                     MATCH (this0)<-[this1:ACTED_IN]-(this2:Actor)
-                    WITH collect({ node: this2, relationship: this1 }) AS edges
-                    WITH edges, size(edges) AS totalCount
+                    WITH collect({ node: this2, relationship: this1 }) AS edges, count(this2) AS totalCount
                     CALL (edges) {
                         UNWIND edges AS edge
                         WITH edge.node AS this2, edge.relationship AS this1
diff --git a/packages/graphql/tests/tck/undirected-relationships/query-direction-connection.test.ts b/packages/graphql/tests/tck/undirected-relationships/query-direction-connection.test.ts
@@ -52,8 +52,7 @@ describe("QueryDirection in relationships connection", () => {
             MATCH (this:User)
             CALL (this) {
                 MATCH (this)-[this0:FRIENDS_WITH]->(this1:User)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH count(this1) AS totalCount
                 RETURN { totalCount: totalCount } AS var2
             }
             RETURN this { friendsConnection: var2 } AS this"
@@ -90,8 +89,7 @@ describe("QueryDirection in relationships connection", () => {
             MATCH (this:User)
             CALL (this) {
                 MATCH (this)-[this0:FRIENDS_WITH]-(this1:User)
-                WITH collect({ node: this1, relationship: this0 }) AS edges
-                WITH edges, size(edges) AS totalCount
+                WITH count(this1) AS totalCount
                 RETURN { totalCount: totalCount } AS var2
             }
             RETURN this { friendsConnection: var2 } AS this"

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ export class FulltextOperation extends ConnectionReadOperation {`
`62`	`62`	`return filterTruthy([...super.getChildren(), this.scoreField]);`
`63`	`63`	`}`
`64`	`64`
`65`		`- protected hasEdgesProjection(): boolean {`
`66`		`- return super.hasEdgesProjection() \|\| Boolean(this.scoreField);`
	`65`	`+ protected shouldProjectEdges(): boolean {`
	`66`	`+ return super.shouldProjectEdges() \|\| Boolean(this.scoreField);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`protected createProjectionMapForEdge(context: QueryASTContext<Cypher.Node>): Cypher.Map {`
Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,9 @@ query NestedConnection {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+query totalCount {`
	`33`	`+ moviesConnection {`
	`34`	`+ totalCount`
	`35`	`+ }`
	`36`	`+}`