Merge pull request #3 from graphql-editor/fix-field-on-node-update

fix
graphql-editor · May 7, 2024 · a898af6 · a898af6
2 parents 63ccf8a + 253fae1
commit a898af6
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 10 deletions.
diff --git a/src/TreeOperations/tree.ts b/src/TreeOperations/tree.ts
@@ -33,12 +33,14 @@ import {
 } from '@/TreeOperations/shared';
 
 export const mutate = (tree: ParserTree, allNodes: ParserField[]) => {
-  const mutateParentIfField = (node: ParserField) => {
+  const mutateParentIfField = (node: ParserField, parentNode?: string) => {
     if (node.data.type === TypeSystemDefinition.FieldDefinition) {
-      const parentNode = allNodes.find((an) => an.args.some((a) => a.id === node.id));
-      if (!parentNode) throw new Error('Invalid field definition');
-      const fieldIndex = parentNode.args.findIndex((a) => a.id == node.id);
-      updateFieldOnNode(parentNode, fieldIndex, node);
+      const findParentNode = parentNode
+        ? allNodes.find((n) => n.id === parentNode)
+        : allNodes.find((an) => an.args.some((a) => a.id === node.id));
+      if (!findParentNode) throw new Error('Invalid field definition');
+      const fieldIndex = findParentNode.args.findIndex((a) => a.id == node.id);
+      updateFieldOnNode(findParentNode, fieldIndex, node);
       return;
     }
   };
@@ -65,7 +67,7 @@ export const mutate = (tree: ParserTree, allNodes: ParserField[]) => {
     mutateParentIfField(n);
   };
 
-  const updateFieldOnNode = (node: ParserField, i: number, updatedField: ParserField) => {
+  const updateFieldOnNode = (node: ParserField, i: number, updatedField: ParserField, parentNode?: string) => {
     regenerateId(updatedField);
     if (node.data.type === TypeSystemDefinition.DirectiveDefinition) {
       const oldField: ParserField = JSON.parse(JSON.stringify(node.args[i]));
@@ -77,7 +79,7 @@ export const mutate = (tree: ParserTree, allNodes: ParserField[]) => {
     }
     node.args[i] = updatedField;
     regenerateId(node);
-    mutateParentIfField(node);
+    mutateParentIfField(node, parentNode);
   };
 
   const addFieldToNode = (node: ParserField, f: ParserField) => {

diff --git a/src/__tests__/TreeOperations/mocks.ts b/src/__tests__/TreeOperations/mocks.ts
@@ -44,6 +44,16 @@ const mainMock: ParserTree = {
           name: 'friends',
           type: ScalarTypes.String,
         }),
+        createPlainField({
+          name: 'testUpdate',
+          type: ScalarTypes.Boolean,
+          args: [
+            createPlainInputValue({
+              name: 'firstName',
+              type: ScalarTypes.String,
+            }),
+          ],
+        }),
       ],
     }),
     createRootField({
@@ -105,9 +115,15 @@ const mainMock: ParserTree = {
       name: 'AnInput',
       type: TypeDefinition.InputObjectTypeDefinition,
       args: [
-        createPlainInputValue({
-          name: 'firstName',
-          type: ScalarTypes.String,
+        createPlainField({
+          name: 'testUpdate',
+          type: ScalarTypes.Boolean,
+          args: [
+            createPlainInputValue({
+              name: 'firstName',
+              type: ScalarTypes.String,
+            }),
+          ],
         }),
       ],
     }),

diff --git a/src/__tests__/TreeOperations/tree.rename.spec.ts b/src/__tests__/TreeOperations/tree.rename.spec.ts
@@ -55,6 +55,23 @@ describe('Tree Operations tests - rename operations', () => {
       fromInterface: [treeMock.nodes[0].name],
     });
   });
+  test('Update field on input definition inside node args', () => {
+    const treeMock = createMock();
+    const oldField = treeMock.nodes[2].args[0].args[0];
+    const updatedField = {
+      ...oldField,
+      name: 'secondName',
+    };
+
+    mutate(treeMock, treeMock.nodes).updateFieldOnNode(
+      treeMock.nodes[2].args[0],
+      0,
+      updatedField,
+      treeMock.nodes[2].id,
+    );
+    expect(treeMock.nodes[2].args[0].args).toContainEqual(updatedField);
+    expect(treeMock.nodes[0].args[3].args).not.toContainEqual(updatedField);
+  });
   test('Update field name on directive definition', () => {
     const treeMock = createMock();
     const updatedField = createParserField({