✨ Schema linking

Author: aexol

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-editor-cli",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "GraphQL -> anything. Use GraphQL as your source of truth. GraphQL Editor Official CLI.",
   "main": "lib/api.js",
   "author": "Artur Czemiel",
@@ -54,9 +54,9 @@
     "express": "^4.18.1",
     "fast-glob": "^3.2.12",
     "figures": "^5.0.0",
-    "graphql-js-tree": "^0.1.7",
-    "graphql-zeus": "^5.2.8",
-    "graphql-zeus-core": "^5.2.8",
+    "graphql-js-tree": "^1.0.5",
+    "graphql-zeus": "^5.3.1",
+    "graphql-zeus-core": "^5.3.1",
     "inquirer": "^9.1.2",
     "mime": "^3.0.0",
     "node-fetch": "^3.2.10",

packages/cli/package.json

@@ -10,6 +10,7 @@ import { Config } from '@/Configuration/index.js';
 import fetch from 'node-fetch';
 import { COMMON_FILES } from '@/gshared/constants/index.js';
 import ora from 'ora';
+import { mergeSDLs } from 'graphql-js-tree';
 
 export interface FileArray {
   name: string;
@@ -21,8 +22,8 @@ const jolt = () => {
   const token = Config.getTokenOptions('token');
   const headers: Record<string, string> = token
     ? {
-        Authorization: `Bearer ${token}`,
-      }
+      Authorization: `Bearer ${token}`,
+    }
     : {};
   return Chain('https://api.staging.project.graphqleditor.com/graphql', {
     headers,
@@ -33,8 +34,8 @@ const joltSubscription = () => {
   const token = Config.getTokenOptions('token');
   const headers: Record<string, string> = token
     ? {
-        Authorization: `Bearer ${token}`,
-      }
+      Authorization: `Bearer ${token}`,
+    }
     : {};
   return Subscription('https://api.staging.project.graphqleditor.com/graphql', {
     headers,
@@ -183,7 +184,9 @@ export class Editor {
         ? (await fetch(libraryURL.getUrl!)).text()
         : new Promise<string>((resolve) => resolve('')),
     ]);
-    return [libraryFile, graphqlFile].join('\n\n');
+    const sdlMerge = mergeSDLs(graphqlFile, libraryFile)
+    if (sdlMerge.__typename === 'error') throw new Error(sdlMerge.errors.map(e => `Conflict on: ${e.conflictingNode}.${e.conflictingField}`).join("\n"))
+    return sdlMerge.sdl
   };
 
   public static getSchema = async (resolve: {