✨ Added fromLibrary flag

aexol · aexol · commit b51a4b342175 · 2023-06-18T22:44:55.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-js-tree",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "private": false,
   "license": "MIT",
   "description": "GraphQL Parser providing simplier structure",
diff --git a/src/Models/ParserTree.ts b/src/Models/ParserTree.ts
@@ -15,6 +15,7 @@ export interface ParserField {
   directives: ParserField[];
   description?: string;
   fromInterface?: string[];
+  fromLibrary?: boolean;
   value?: {
     type: Value;
     value?: string;
diff --git a/src/TreeOperations/merge.ts b/src/TreeOperations/merge.ts
@@ -3,11 +3,13 @@ import { Parser } from '@/Parser';
 import { isExtensionNode } from '@/TreeOperations/shared';
 import { TreeToGraphQL } from '@/TreeToGraphQL';
 
+const addFromLibrary = (n: ParserField): ParserField => ({ ...n, fromLibrary: true });
+
 const mergeNode = (n1: ParserField, n2: ParserField) => {
   const mergedNode = {
     ...n1,
-    args: [...n1.args, ...n2.args],
-    directives: [...n1.directives, ...n2.directives],
+    args: [...n1.args, ...n2.args.map(addFromLibrary)],
+    directives: [...n1.directives, ...n2.directives.map(addFromLibrary)],
     interfaces: [...n1.interfaces, ...n2.interfaces],
   } as ParserField;
   //dedupe
diff --git a/src/__tests__/TreeOperations/merge.spec.ts b/src/__tests__/TreeOperations/merge.spec.ts
@@ -1,4 +1,5 @@
-import { mergeSDLs } from '@/TreeOperations/merge';
+import { Parser } from '@/Parser';
+import { mergeSDLs, mergeTrees } from '@/TreeOperations/merge';
 import { expectTrimmedEqual } from '@/__tests__/TestUtils';
 
 // const mergingErrorSchema = `
@@ -81,6 +82,37 @@ describe('Merging GraphQL Schemas', () => {
     }`,
     );
   });
+  it('Tree test - Should merge interfaces and implementation of both nodes matching library fields.', () => {
+    const baseSchema = `
+    type Person implements Node{
+        firstName: String
+        health: String
+        _id: String
+    }
+    interface Node {
+        _id: String
+    }
+    `;
+
+    const mergingSchema = `
+    type Person implements Dateable{
+        lastName: String
+        createdAt: String
+    }
+    interface Dateable {
+        createdAt: String
+    }
+    `;
+    const baseTree = Parser.parse(baseSchema);
+    const libraryTree = Parser.parse(mergingSchema);
+    const mergedTree = mergeTrees(baseTree, libraryTree);
+    if (mergedTree.__typename === 'error') throw new Error('Invalid parse');
+    const PersonNode = mergedTree.nodes.find((n) => n.name === 'Person');
+    const lastNameField = PersonNode?.args.find((a) => a.name === 'lastName');
+    const createdAtField = PersonNode?.args.find((a) => a.name === 'createdAt');
+    expect(lastNameField?.fromLibrary).toBeTruthy();
+    expect(createdAtField?.fromLibrary).toBeTruthy();
+  });
   it('Should merge interfaces and implementation of both nodes', () => {
     const baseSchema = `
     type Person implements Node{

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "graphql-js-tree",`
`3`		`- "version": "0.3.7",`
	`3`	`+ "version": "0.3.8",`
`4`	`4`	`"private": false,`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"description": "GraphQL Parser providing simplier structure",`