Remove old translation layer

Author: angrykoala

packages/graphql/src/classes/CallbackBucketDeprecated.ts

@@ -20,7 +20,7 @@
 import { Kind, type FieldNode, type GraphQLResolveInfo } from "graphql";
 import type { Node } from "../../../classes";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
-import { translateCreate } from "../../../translate";
+import { translateCreate } from "../../../translate/translate-create";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";

packages/graphql/src/schema/resolvers/mutation/create.ts

@@ -20,7 +20,7 @@
 import type { GraphQLResolveInfo } from "graphql";
 import type { SchemaComposer } from "graphql-compose";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
-import { translateDelete } from "../../../translate";
+import { translateDelete } from "../../../translate/translate-delete";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";

packages/graphql/src/schema/resolvers/mutation/delete.ts

@@ -17,19 +17,24 @@
  * limitations under the License.
  */
 
+import type Cypher from "@neo4j/cypher-builder";
+import { debug } from "console";
 import { Kind, type FieldNode, type GraphQLResolveInfo } from "graphql";
 import type {
     ObjectTypeComposerArgumentConfigAsObjectDefinition,
     ObjectTypeComposerFieldConfigAsObjectDefinition,
 } from "graphql-compose";
+import type { ResolveTree } from "graphql-parse-resolve-info";
 import type { Node } from "../../../classes";
+import type { EntityAdapter } from "../../../schema-model/entity/EntityAdapter";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
-import { translateUpdate } from "../../../translate";
+import { QueryASTFactory } from "../../../translate/queryAST/factory/QueryASTFactory";
+import { CallbackBucket } from "../../../translate/queryAST/utils/callback-bucket";
+import { buildClause } from "../../../translate/utils/build-clause";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";
 import type { Neo4jGraphQLComposedContext } from "../composition/wrap-query-and-mutation";
-import { translateUpdate2 } from "../../../translate/translate-update";
 
 export function updateResolver({
     node,
@@ -43,8 +48,7 @@ export function updateResolver({
 
         (context as Neo4jGraphQLTranslationContext).resolveTree = resolveTree;
 
-        // const [cypher, params] = await translateUpdate({ context: context as Neo4jGraphQLTranslationContext, node });
-        const { cypher, params } = await translateUpdate2({ context: context as Neo4jGraphQLTranslationContext, node });
+        const { cypher, params } = await translateUpdate({ context: context as Neo4jGraphQLTranslationContext, node });
         const executeResult = await execute({
             cypher,
             params,
@@ -85,3 +89,56 @@ export function updateResolver({
         },
     };
 }
+
+async function translateUsingQueryAST({
+    context,
+    entityAdapter,
+    resolveTree,
+    varName,
+}: {
+    context: Neo4jGraphQLTranslationContext;
+    entityAdapter: EntityAdapter;
+    resolveTree: ResolveTree;
+    varName: string;
+}): Promise<Cypher.CypherResult> {
+    const operationsTreeFactory = new QueryASTFactory(context.schemaModel);
+
+    if (!entityAdapter) {
+        throw new Error("Entity not found");
+    }
+
+    const callbackBucket = new CallbackBucket(context);
+
+    const operationsTree = operationsTreeFactory.createMutationAST({
+        resolveTree,
+        entityAdapter,
+        context,
+        varName,
+        callbackBucket,
+    });
+
+    debug(operationsTree.print());
+    await callbackBucket.resolveCallbacks();
+
+    const clause = operationsTree.build(context, varName);
+    return buildClause(clause, { context });
+}
+
+async function translateUpdate({
+    context,
+    node,
+}: {
+    context: Neo4jGraphQLTranslationContext;
+    node: Node;
+}): Promise<{ cypher: string; params: Record<string, any> }> {
+    const { resolveTree } = context;
+    const entityAdapter = context.schemaModel.getConcreteEntityAdapter(node.name);
+    if (!entityAdapter) {
+        throw new Error(`Transpilation error: ${node.name} is not a concrete entity`);
+    }
+
+    const varName = "this";
+    const result = await translateUsingQueryAST({ context, entityAdapter, resolveTree, varName });
+
+    return result;
+}

packages/graphql/src/schema/resolvers/mutation/update.ts

@@ -19,7 +19,7 @@
 
 import type { GraphQLResolveInfo } from "graphql";
 import type { AttributeAdapter } from "../../../schema-model/attribute/model-adapters/AttributeAdapter";
-import { translateTopLevelCypher } from "../../../translate";
+import { translateTopLevelCypher } from "../../../translate/translate-top-level-cypher";
 import type { CypherField } from "../../../types";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";

packages/graphql/src/schema/resolvers/query/cypher.ts

@@ -20,7 +20,7 @@
 import type { GraphQLFieldResolver, GraphQLResolveInfo, SelectionSetNode } from "graphql";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
 import type { InterfaceEntityAdapter } from "../../../schema-model/entity/model-adapters/InterfaceEntityAdapter";
-import { translateRead } from "../../../translate";
+import { translateRead } from "../../../translate/translate-read";
 import type { FulltextContext } from "../../../types";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";

packages/graphql/src/schema/resolvers/query/fulltext.ts

@@ -21,7 +21,7 @@ import type { GraphQLResolveInfo } from "graphql";
 import type { FieldsByTypeName } from "graphql-parse-resolve-info";
 import { parseResolveInfo } from "graphql-parse-resolve-info";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
-import { translateRead } from "../../../translate";
+import { translateRead } from "../../../translate/translate-read";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";

packages/graphql/src/schema/resolvers/query/global-node.ts

@@ -21,8 +21,8 @@ import { GraphQLInt, GraphQLNonNull, type GraphQLResolveInfo } from "graphql";
 import type { SchemaComposer } from "graphql-compose";
 import type { EntityAdapter } from "../../../schema-model/entity/EntityAdapter";
 import { UnionEntityAdapter } from "../../../schema-model/entity/model-adapters/UnionEntityAdapter";
-import { translateRead } from "../../../translate";
 import { isConcreteEntity } from "../../../translate/queryAST/utils/is-concrete-entity";
+import { translateRead } from "../../../translate/translate-read";
 import type { Neo4jGraphQLTranslationContext } from "../../../types/neo4j-graphql-translation-context";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";

packages/graphql/src/schema/resolvers/query/read.ts

@@ -30,7 +30,8 @@ import { PageInfo } from "../../../graphql/objects/PageInfo";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
 import type { InterfaceEntityAdapter } from "../../../schema-model/entity/model-adapters/InterfaceEntityAdapter";
 import { UnionEntityAdapter } from "../../../schema-model/entity/model-adapters/UnionEntityAdapter";
-import { translateRead } from "../../../translate";
+import type { Neo4jGraphQLSchemaModel } from "../../../schema-model/Neo4jGraphQLSchemaModel";
+import { translateRead } from "../../../translate/translate-read";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";
 import { isNeoInt } from "../../../utils/utils";
@@ -39,7 +40,6 @@ import { createConnectionWithEdgeProperties } from "../../pagination";
 import { graphqlDirectivesToCompose } from "../../to-compose";
 import type { Neo4jGraphQLComposedContext } from "../composition/wrap-query-and-mutation";
 import { emptyConnection } from "./empty-connection";
-import type { Neo4jGraphQLSchemaModel } from "../../../schema-model/Neo4jGraphQLSchemaModel";
 
 export function rootConnectionResolver({
     composer,

packages/graphql/src/schema/resolvers/query/root-connection.ts

@@ -20,7 +20,7 @@
 import type { GraphQLFieldResolver, GraphQLResolveInfo, SelectionSetNode } from "graphql";
 import type { ConcreteEntityAdapter } from "../../../schema-model/entity/model-adapters/ConcreteEntityAdapter";
 import type { InterfaceEntityAdapter } from "../../../schema-model/entity/model-adapters/InterfaceEntityAdapter";
-import { translateRead } from "../../../translate";
+import { translateRead } from "../../../translate/translate-read";
 import type { VectorContext } from "../../../types";
 import { execute } from "../../../utils";
 import getNeo4jResolveTree from "../../../utils/get-neo4j-resolve-tree";