🐛 Fixed marker library bug

graphql-editor · Sep 29, 2023 · 88abcbd · 88abcbd
1 parent 65c7c5c
commit 88abcbd
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/editor-worker/package.json b/packages/editor-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-editor-worker",
-  "version": "6.9.8",
+  "version": "6.9.9",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",

diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-editor",
-  "version": "6.9.8",
+  "version": "6.9.9",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",
@@ -45,7 +45,7 @@
     "file-saver": "^2.0.5",
     "framer-motion": "^10.12.16",
     "fuzzyjs": "^5.0.1",
-    "graphql-editor-worker": "^6.9.8",
+    "graphql-editor-worker": "^6.9.9",
     "graphql-js-tree": "^1.0.5",
     "graphql-language-service": "3.1.4",
     "html-to-image": "^1.10.8",

diff --git a/packages/editor/src/editor/code/guild/editor/EnrichedLanguageService.ts b/packages/editor/src/editor/code/guild/editor/EnrichedLanguageService.ts
@@ -6,7 +6,7 @@ import {
   IPosition as GraphQLPosition,
   ContextToken,
 } from "graphql-language-service";
-import type * as monaco from "monaco-editor";
+import * as monaco from "monaco-editor";
 import {
   BridgeOptions,
   coreDefinitionSource,
@@ -20,6 +20,7 @@ import {
   toMonacoRange,
   removeFalsey,
 } from "./utils";
+import { mergeSDLs } from "graphql-js-tree";
 
 export class EnrichedLanguageService extends LanguageService {
   async getNodeAtPosition(
@@ -164,7 +165,8 @@ export class EnrichedLanguageService extends LanguageService {
   private async handleDiagnostics(
     rawDiagnosticsSources: DiagnosticsSource[],
     model: monaco.editor.ITextModel,
-    monacoInstance: typeof monaco
+    monacoInstance: typeof monaco,
+    libraries?: string
   ): Promise<void> {
     const diagnosticsSources = [
       ...rawDiagnosticsSources,
@@ -175,10 +177,34 @@ export class EnrichedLanguageService extends LanguageService {
       await Promise.all(
         diagnosticsSources.map(async (source) => {
           try {
+            let c = model.getValue().toString();
+            if (libraries) {
+              const result = mergeSDLs(model.getValue().toString(), libraries);
+              if (result.__typename === "error") {
+                return [
+                  {
+                    message:
+                      "Cannot merge nodes: " +
+                      result.errors
+                        .map(
+                          (e) => `${e.conflictingNode}.${e.conflictingField}`
+                        )
+                        .join(","),
+                    endColumn: 1000,
+                    endLineNumber: 19999,
+                    startColumn: 0,
+                    startLineNumber: 0,
+                    severity: monaco.MarkerSeverity.Warning,
+                  },
+                ];
+              } else {
+                c = result.sdl;
+              }
+            }
             const s = await source.forDocument({
               languageService: this,
               model,
-              document: model.getValue().toString(),
+              document: c,
             });
             return s;
           } catch (e) {
@@ -194,7 +220,9 @@ export class EnrichedLanguageService extends LanguageService {
     monacoInstance.editor.setModelMarkers(model, "graphql", markerData);
   }
 
-  getModelChangeHandler(): (
+  getModelChangeHandler(
+    libraries?: string
+  ): (
     editorInstance: monaco.editor.IStandaloneCodeEditor,
     monacoInstance: typeof monaco,
     diagnosticsSources: DiagnosticsSource[],
@@ -213,7 +241,12 @@ export class EnrichedLanguageService extends LanguageService {
       }
 
       await Promise.all([
-        this.handleDiagnostics(diagnosticsSources, model, monacoInstance),
+        this.handleDiagnostics(
+          diagnosticsSources,
+          model,
+          monacoInstance,
+          libraries
+        ),
         this.handleDecorations(
           decorationsSources,
           model,

diff --git a/packages/editor/src/editor/code/guild/editor/use-schema-services.tsx b/packages/editor/src/editor/code/guild/editor/use-schema-services.tsx
@@ -174,7 +174,9 @@ export const useSchemaServices = (options: SchemaServicesOptions) => {
         });
       }
 
-      const handler = languageService.getModelChangeHandler();
+      const handler = languageService.getModelChangeHandler(
+        options.schema?.libraries
+      );
       handler(
         editorRef,
         monacoRef,

diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "6.9.8",
+  "version": "6.9.9",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",
@@ -48,7 +48,7 @@
     "@aexol-studio/styling-system": "^0.0.8",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "graphql-editor": "^6.9.8",
+    "graphql-editor": "^6.9.9",
     "graphql-js-tree": "^0.1.6",
     "socket.io-client": "^4.7.2"
   },

diff --git a/packages/socket-live-test/package.json b/packages/socket-live-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket-live-test",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "testing editor live",
   "main": "index.js",
   "type": "module",

diff --git a/packages/svg-ts-sync/package.json b/packages/svg-ts-sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svg-ts-sync",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "private": false,
   "license": "MIT",
   "description": "Sync folders with svg's to react typescript components",