Merge pull request #6775 from neo4j/update-populated-by-new-translation-layer

Update populated by new translation layer

Author: angrykoala

packages/graphql/src/translate/queryAST/ast/input-fields/ParamInputField.ts

@@ -61,6 +61,13 @@ export class ParamInputField extends InputField {
  queryASTContext: QueryASTContext<Cypher.Node>,
  _inputVariable?: Cypher.Variable
  ): Cypher.SetParam[] {
+ // This check is needed for populatedBy callbacks
+ const param = this.getParam();
+ if (param instanceof Cypher.Param) {
+ if (param.value === undefined) {
+ return [];
+ }
+ }
  const leftExpr = this.getLeftExpression(queryASTContext);
  const rightExpr = this.getRightExpression(queryASTContext);
 

packages/graphql/src/translate/queryAST/factory/Operations/UpdateFactory.ts

@@ -148,7 +148,6 @@ export class UpdateFactory {
  // });
 
  this.addEntityAuthorization({ entity: target, context, operation: update });
-
  asArray(input).forEach((inputItem) => {
  const targetInput = this.getInputNode(inputItem, isNested);
  raiseAttributeAmbiguityForUpdate(Object.keys(targetInput), target);
@@ -170,12 +169,11 @@ export class UpdateFactory {
  }
  if (attribute) {
  if (operator) {
- const paramInputField = this.getInputFieldDeprecated(
- "node",
- operator,
- attribute,
- targetInput[key]
- );
+ const value = targetInput[key];
+ if (attribute.typeHelper.isRequired() && value === null && operator === "SET") {
+ throw new Error(`Cannot set non-nullable field ${target.name}.${attribute.name} to null`);
+ }
+ const paramInputField = this.getInputFieldDeprecated("node", operator, attribute, value);
  update.addField(paramInputField);
 
  this.addAttributeAuthorization({
@@ -193,12 +191,13 @@ export class UpdateFactory {
  );
  }
  for (const op of Object.keys(targetInput[fieldName])) {
- const paramInputField = this.getInputField(
- "node",
- op,
- attribute,
- targetInput[fieldName][op]
- );
+ const value = targetInput[fieldName][op];
+ if (attribute.typeHelper.isRequired() && value === null && op === "set") {
+ throw new Error(
+ `Cannot set non-nullable field ${target.name}.${attribute.name} to null`
+ );
+ }
+ const paramInputField = this.getInputField("node", op, attribute, value);
  update.addField(paramInputField);
 
  this.addAttributeAuthorization({
@@ -429,16 +428,22 @@ export class UpdateFactory {
  }
  }
  }
+ if (Object.keys(targetInputEdge).length > 0) {
+ this.addPopulatedByFieldToUpdate({
+ entity: target,
+ update,
+ input: targetInputEdge,
+ callbackBucket,
+ relationship,
+ });
+ }
  }
- });
-
- // TODO: handle operations
- this.addPopulatedByFieldToUpdate({
- entity: target,
- update,
- input,
- callbackBucket,
- relationship,
+ this.addPopulatedByFieldToUpdate({
+ entity: target,
+ update,
+ input: targetInput,
+ callbackBucket,
+ });
  });
  }
 
@@ -501,7 +506,7 @@ export class UpdateFactory {
  callbackBucket.addCallback({
  functionName: callbackFunctionName,
  param: relCallbackParam,
- parent: input.edge,
+ parent: input,
  type: attribute.type,
  });
  });

packages/graphql/src/translate/queryAST/utils/callback-bucket.ts

@@ -79,7 +79,13 @@ export class CallbackBucket {
  const callbackFunction = callbacksList[cb.functionName];
  if (callbackFunction) {
  const paramValue = await callbackFunction(cb.parent, {}, this.context);
- cb.param.value = this.parseCallbackResult(paramValue, cb.type);
+ if (paramValue === undefined) {
+ cb.param.value = undefined;
+ } else if (paramValue === null) {
+ cb.param.value = null;
+ } else {
+ cb.param.value = this.parseCallbackResult(paramValue, cb.type);
+ }
  }
  })
  );

packages/graphql/tests/integration/directives/populatedBy/populatedBy-node-properties.int.test.ts

@@ -1811,7 +1811,7 @@ describe("@populatedBy directive - Node properties", () => {
  [testMovie.plural]: [
  {
  id: movieId,
- callback: `${date.toISOString().split("T")[1]?.split("Z")[0]}Z`,
+ callback: `${date.toISOString().split("T")[1]?.split("Z")[0]}000000Z`,
  },
  ],
  },

packages/graphql/tests/integration/directives/populatedBy/populatedBy-relationship-properties.int.test.ts

@@ -2441,7 +2441,6 @@ describe("@populatedBy directive - Relationship properties", () => {
  type: "Time",
  callback: () => Promise.resolve(`${date.toISOString().split("T")[1]}`),
  expectedValue: `${date.toISOString().split("T")[1]?.split("Z")[0]}000000Z`,
- expectedValueTemp: `${date.toISOString().split("T")[1]?.split("Z")[0]}Z`, // TODO: this is a due to a bug with custom input objects, only used for Update until this is moved to QueryAST
  },
  {
  description: "@populatedBy - LocalDateTime",
@@ -3208,7 +3207,6 @@ describe("@populatedBy directive - Relationship properties", () => {
  const testMovie = testHelper.createUniqueType("Movie");
  const testGenre = testHelper.createUniqueType("Genre");
  const callback = (parent) => `${parent.title_SET}-slug`;
-
  const typeDefs = /* GraphQL */ `
  type ${testMovie.name} @node {
  id: ID
@@ -3286,7 +3284,6 @@ describe("@populatedBy directive - Relationship properties", () => {
  `);
 
  const result = await testHelper.executeGraphQL(mutation);
-
  expect(result.errors).toBeUndefined();
  expect(result.data as any).toMatchObject({
  [testMovie.operations.update]: {