Remove apoc.doIt from custom cypher mutations

packages/graphql/src/constants.ts

@@ -23,7 +23,7 @@ export const AUTH_FORBIDDEN_ERROR = "@neo4j/graphql/FORBIDDEN";
 export const AUTH_UNAUTHENTICATED_ERROR = "@neo4j/graphql/UNAUTHENTICATED";
 export const MIN_VERSIONS = [{ majorMinor: "4.3", neo4j: "4.3.2" }];
 export const REQUIRED_APOC_FUNCTIONS = ["apoc.util.validatePredicate", "apoc.date.convertFormat"];
-export const REQUIRED_APOC_PROCEDURES = ["apoc.util.validate", "apoc.cypher.doIt"];
+export const REQUIRED_APOC_PROCEDURES = ["apoc.util.validate"];
 export const DEBUG_ALL = `${DEBUG_PREFIX}:*`;
 export const DEBUG_AUTH = `${DEBUG_PREFIX}:auth`;
 export const DEBUG_GRAPHQL = `${DEBUG_PREFIX}:graphql`;

packages/graphql/src/schema/get-cypher-meta.test.ts

@@ -125,6 +125,12 @@ describe("getCypherMeta", () => {
                             // @ts-ignore
                             value: { kind: "StringValue", value: "MATCH (m:Movie) RETURN m" },
                         },
+                        {
+                            // @ts-ignore
+                            name: { value: "columnName" },
+                            // @ts-ignore
+                            value: { kind: "StringValue", value: "m" },
+                        },
                     ],
                 },
                 {

packages/graphql/src/schema/get-cypher-meta.ts

@@ -21,7 +21,7 @@ import type { DirectiveNode, FieldDefinitionNode } from "graphql";
 
 type CypherMeta = {
     statement: string;
-    columnName?: string;
+    columnName: string;
 };
 
 export function getCypherMeta(
@@ -53,10 +53,10 @@ function parseStatementFlag(directive: DirectiveNode): string {
     return stmtArg.value.value;
 }
 
-function parseColumnNameFlag(directive: DirectiveNode): string | undefined {
+function parseColumnNameFlag(directive: DirectiveNode): string {
     const stmtArg = directive.arguments?.find((x) => x.name.value === "columnName");
     if (!stmtArg) {
-        return undefined;
+        throw new Error("@cypher columnName required");
     }
     if (stmtArg.value.kind !== "StringValue") {
         throw new Error("@cypher columnName is not a string");

packages/graphql/src/translate/projection/subquery/translate-cypher-directive-projection.ts

@@ -56,7 +56,6 @@ export function translateCypherDirectiveProjection({
     const entity = context.schemaModel.entities.get(cypherField.typeMeta.name);
 
     const isArray = Boolean(cypherField.typeMeta.array);
-    const expectMultipleValues = Boolean((referenceNode || entity instanceof CompositeEntity) && isArray);
 
     const fieldFields = field.fieldsByTypeName;
 

packages/graphql/src/translate/translate-top-level-cypher.ts

@@ -155,18 +155,20 @@ export function translateTopLevelCypher({
 
     params = { ...params, ...apocParams.params };
 
-    const apocParamsStr = `{${apocParams.strs.length ? `${apocParams.strs.join(", ")}` : ""}}`;
-
     if (type === "Query") {
         const cypherStatement = createCypherDirectiveSubquery({
             field,
         });
         cypherStrs.push(...cypherStatement);
     } else {
+        const columnName = field.columnName;
         cypherStrs.push(`
-            CALL apoc.cypher.doIt("${statement}", ${apocParamsStr}) YIELD value
-            WITH [k in keys(value) | value[k]][0] AS this
-            `);
+            CALL {
+                ${statement}
+            }
+            WITH ${columnName} AS this
+
+        `);
     }
 
     if (unionWhere.length) {

packages/graphql/src/types.ts

@@ -169,7 +169,7 @@ export interface ConnectionField extends BaseField {
  */
 export interface CypherField extends BaseField {
     statement: string;
-    columnName?: string;
+    columnName: string;
     isEnum: boolean;
     isScalar: boolean;
 }

packages/graphql/tests/integration/custom-resolvers.int.test.ts

@@ -462,7 +462,7 @@ describe("Custom Resolvers", () => {
 
                 type Mutation {
                     test(id: ID!): ID! @cypher(statement: """
-                        RETURN \\"${id}\\" + $id as res
+                        RETURN "${id}" + $id as res
                     """, columnName: "res")
                 }
             `;

packages/graphql/tests/integration/issues/326.int.test.ts

@@ -115,7 +115,7 @@ describe("326", () => {
                 getSelf: [User]!
                   @cypher(
                     statement: """
-                        MATCH (user:User { id: \\"${id}\\" })
+                        MATCH (user:User { id: "${id}" })
                         RETURN user
                     """, columnName: "user"
                   )

packages/graphql/tests/integration/types/float.int.test.ts

@@ -187,9 +187,9 @@ describe("Float", () => {
                     @cypher(
                         statement: """
                         CREATE (m:Movie {id: $id, float: $float, floats: $nested.floats})
-                        RETURN m.float
+                        RETURN m.float as result
                         """,
-                        columnName: "m.float"
+                        columnName: "result"
                     )
             }
         `;

packages/graphql/tests/performance/graphql/cypher-directive.graphql

@@ -7,3 +7,9 @@ query TopLevelCypherDirective {
         }
     }
 }
+
+mutation TopLevelMutationDirective {
+    getCustomUser {
+        name
+    }
+}

packages/graphql/tests/performance/performance.ts

@@ -82,6 +82,17 @@ const typeDefs = gql`
                 columnName: "p"
             )
     }
+
+    type Mutation {
+        getCustomUser: [Person]!
+            @cypher(
+                statement: """
+                MATCH (user:Person { name_INCLUDES: "Wa" })
+                RETURN user
+                """
+                columnName: "user"
+            )
+    }
 `;
 
 let neoSchema: Neo4jGraphQL;