✨ changed id generation to take only extension nodes for extended ids

Author: aexol

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-js-tree",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "private": false,
   "license": "MIT",
   "description": "GraphQL Parser providing simplier structure",

src/__tests__/TreeOperations/tree.addField.spec.ts

@@ -6,15 +6,13 @@ import { createMock, createInterfaceMock } from '@/__tests__/TreeOperations/mock
 describe('Tree Operations tests - adding fields', () => {
   test('Add field to root node', () => {
     const treeMock = createMock();
-    const oldPersonNodeId = treeMock.nodes[0].id;
     const lastNameNode = createPlainField({
       type: ScalarTypes.String,
       name: 'lastName',
     });
 
     mutate(treeMock, treeMock.nodes).addFieldToNode(treeMock.nodes[0], lastNameNode);
 
-    expect(treeMock.nodes[0].id).not.toEqual(oldPersonNodeId);
     expect(treeMock.nodes[0].args).toContainEqual(lastNameNode);
   });
   test('Add field to interface node', () => {
@@ -32,17 +30,13 @@ describe('Tree Operations tests - adding fields', () => {
   });
   test('Add field to field node', () => {
     const treeMock = createMock();
-    const oldPersonNodeId = treeMock.nodes[0].id;
-    const oldFriendsNodeId = treeMock.nodes[0].args[2].id;
     const limitNode = createPlainInputValue({
       type: ScalarTypes.Int,
       name: 'limit',
     });
 
     mutate(treeMock, treeMock.nodes).addFieldToNode(treeMock.nodes[0].args[2], limitNode);
 
-    expect(treeMock.nodes[0].id).not.toEqual(oldPersonNodeId);
-    expect(treeMock.nodes[0].args[2].id).not.toEqual(oldFriendsNodeId);
     expect(treeMock.nodes[0].args[2].args).toContainEqual(limitNode);
   });
 });

src/__tests__/TreeOperations/tree.remove.spec.ts

@@ -4,13 +4,11 @@ import { createMock, createInterfaceMock } from '@/__tests__/TreeOperations/mock
 describe('Tree Operations - node removal tests', () => {
   test('Delete node from tree', () => {
     const treeMock = createMock();
-    const oldQueryId = treeMock.nodes[1].id;
     const nodeCopy = JSON.parse(JSON.stringify(treeMock.nodes[0]));
 
     mutate(treeMock, treeMock.nodes).removeNode(treeMock.nodes[0]);
 
     expect(treeMock.nodes).not.toContainEqual(nodeCopy);
-    expect(treeMock.nodes[0].id).not.toEqual(oldQueryId);
   });
   test('Delete interface node from tree', () => {
     const treeMock = createInterfaceMock();
@@ -28,13 +26,11 @@ describe('Tree Operations - node removal tests', () => {
   });
   test('Delete field from root node', () => {
     const treeMock = createMock();
-    const oldPersonNodeId = treeMock.nodes[0].id;
     const oldField = JSON.parse(JSON.stringify(treeMock.nodes[0].args[0]));
 
     mutate(treeMock, treeMock.nodes).removeNode(treeMock.nodes[0].args[0]);
 
     expect(treeMock.nodes[0].args).not.toContainEqual(oldField);
-    expect(treeMock.nodes[0].id).not.toEqual(oldPersonNodeId);
   });
   test('Delete field from interface node', () => {
     const treeMock = createInterfaceMock();
@@ -46,14 +42,10 @@ describe('Tree Operations - node removal tests', () => {
   });
   test('Delete input value from field node', () => {
     const treeMock = createMock();
-    const oldFieldId = treeMock.nodes[1].args[1].id;
-    const oldQueryId = treeMock.nodes[1].id;
     const oldInputValue = JSON.parse(JSON.stringify(treeMock.nodes[1].args[1].args[0]));
     mutate(treeMock, treeMock.nodes).removeNode(treeMock.nodes[1].args[1].args[0]);
 
     expect(treeMock.nodes[1].args[1].args).not.toContainEqual(oldInputValue);
-    expect(treeMock.nodes[1].args[1].id).not.toEqual(oldFieldId);
-    expect(treeMock.nodes[1].id).not.toEqual(oldQueryId);
   });
   test('Delete directive from node', () => {
     const treeMock = createMock();

src/__tests__/TreeOperations/tree.rename.spec.ts

@@ -31,7 +31,6 @@ describe('Tree Operations tests - rename operations', () => {
   });
   test('Update field name on field node', () => {
     const treeMock = createMock();
-    const oldPersonNodeId = treeMock.nodes[0].id;
     const oldField = JSON.parse(JSON.stringify(treeMock.nodes[0].args[1]));
     const updatedField = createParserField({
       ...treeMock.nodes[0].args[1],
@@ -41,7 +40,6 @@ describe('Tree Operations tests - rename operations', () => {
     mutate(treeMock, treeMock.nodes).updateFieldOnNode(treeMock.nodes[0], 1, updatedField);
 
     expect(treeMock.nodes[0].args).not.toContainEqual(oldField);
-    expect(treeMock.nodes[0].id).not.toEqual(oldPersonNodeId);
     expect(treeMock.nodes[0].args).toContainEqual(updatedField);
   });
   test('Update field name on field node of interface', () => {
@@ -92,8 +90,6 @@ describe('Tree Operations tests - rename operations', () => {
   });
   test('Update input value name on input value node', () => {
     const treeMock = createMock();
-    const oldQueryId = treeMock.nodes[1].id;
-    const oldFieldId = treeMock.nodes[1].args[1].id;
     const oldInputValue = JSON.parse(JSON.stringify(treeMock.nodes[1].args[1].args[0]));
     const updatedInputValue = createParserField({
       ...treeMock.nodes[1].args[1].args[0],
@@ -103,7 +99,5 @@ describe('Tree Operations tests - rename operations', () => {
 
     expect(treeMock.nodes[1].args[1].args).not.toContainEqual(oldInputValue);
     expect(treeMock.nodes[1].args[1].args).toContainEqual(updatedInputValue);
-    expect(treeMock.nodes[1].args[1].id).not.toEqual(oldFieldId);
-    expect(treeMock.nodes[1].id).not.toEqual(oldQueryId);
   });
 });

src/shared/index.ts

@@ -11,6 +11,7 @@ import {
   TypeSystemDefinition,
   ValueDefinition,
 } from '@/Models';
+import { isExtensionNode } from '@/TreeOperations/shared';
 
 export const getTypeName = (f: FieldType): string => {
   if (f.type === Options.name) {
@@ -51,7 +52,7 @@ export const decompileType = (typeName: string): FieldType => {
 };
 
 export const generateNodeId = (name: string, dataType: AllTypes, args: ParserField[]) => {
-  const s = [name, dataType, args.map((a) => a.id).join('-')].join('-');
+  const s = [name, dataType, isExtensionNode(dataType) ? args.map((a) => a.id).join('-') : ''].join('-');
   return cyrb53(s);
 };
 const cyrb53 = (str: string, seed = 0) => {