🐛 Final fix :D

graphql-editor · Aug 14, 2023 · 0575013 · 0575013
1 parent fe52094
commit 0575013
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 37 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.0",
+  "version": "6.9.1",
   "private": false,
   "license": "MIT",
   "description": "Visual node editor for GraphQL",
@@ -30,7 +30,7 @@
     "@qix/elkjs-patched": "^0.8.0-patch3",
     "d3": "^7.8.4",
     "elkjs": "^0.8.2",
-    "graphql-js-tree": "^1.0.3",
+    "graphql-js-tree": "^1.0.5",
     "graphql-language-service": "3.1.4"
   },
   "config": {

diff --git a/packages/editor-worker/src/validation.ts b/packages/editor-worker/src/validation.ts
@@ -70,6 +70,7 @@ export const catchSchemaErrors = (
       code = mergeResult.sdl;
     }
     const errors = validateSDLErrors(code);
+
     if (errors.length > 0) {
       return errors
         .filter((e) => allowMultipleDirectivesAtLocation(e.text))

diff --git a/packages/editor-worker/src/worker/index.ts b/packages/editor-worker/src/worker/index.ts
@@ -43,8 +43,16 @@ export class GraphQLEditorWorker {
   static generateCode(tree: ParserTree) {
     return send("parse", { tree });
   }
-  static generateTree(schema: string, libraries?: string) {
-    return send("parseSchema", { schema, libraries });
+  static generateTree({
+    schema,
+    libraries,
+    cutSchemaDefinition,
+  }: {
+    schema: string;
+    libraries?: string;
+    cutSchemaDefinition?: boolean;
+  }) {
+    return send("parseSchema", { schema, libraries, cutSchemaDefinition });
   }
   static getTokenAtPosition(
     document: string,

diff --git a/packages/editor-worker/src/worker/validation.worker.ts b/packages/editor-worker/src/worker/validation.worker.ts
@@ -6,6 +6,7 @@ import {
   ParserField,
   ParserTree,
   TreeToGraphQL,
+  TypeSystemDefinition,
   mergeTrees,
 } from "graphql-js-tree";
 import { getTokenAtPosition, IPosition } from "graphql-language-service";
@@ -29,6 +30,7 @@ export type WorkerEvents = {
     args: {
       schema: string;
       libraries?: string;
+      cutSchemaDefinition?: boolean;
     };
     returned: ParserTree;
   };
@@ -119,7 +121,16 @@ ctx.addEventListener("message", (message) => {
       Parser.parse(args.schema),
       args.libraries ? Parser.parse(args.libraries) : { nodes: [] }
     );
+    console.log(mtress, args);
     if (mtress.nodes) {
+      if (args.cutSchemaDefinition) {
+        return {
+          ...mtress,
+          nodes: mtress.nodes.filter(
+            (n) => n.data.type !== TypeSystemDefinition.SchemaDefinition
+          ),
+        };
+      }
       return mtress;
     }
     throw new Error("No nodes to parse");

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

diff --git a/packages/editor/src/editor/Editor.tsx b/packages/editor/src/editor/Editor.tsx
@@ -200,7 +200,10 @@ export const Editor = React.forwardRef<ExternalEditorAPI, EditorProps>(
 
     useEffect(() => {
       if (schema.libraries) {
-        GraphQLEditorWorker.generateTree(schema.libraries).then(setLibraryTree);
+        GraphQLEditorWorker.generateTree({
+          schema: schema.libraries,
+          cutSchemaDefinition: true,
+        }).then(setLibraryTree);
       } else {
         setLibraryTree({ nodes: [] });
       }

diff --git a/packages/editor/src/state/containers/trees/index.ts b/packages/editor/src/state/containers/trees/index.ts
@@ -243,10 +243,10 @@ const useTreesStateContainer = createContainer(() => {
       return;
     }
     try {
-      await GraphQLEditorWorker.generateTree(
-        schema.code,
-        schema.libraries
-      ).then((parsedResult) => {
+      await GraphQLEditorWorker.generateTree({
+        schema: schema.code,
+        libraries: schema.libraries,
+      }).then((parsedResult) => {
         setTree(
           {
             nodes: parsedResult.nodes,
@@ -340,7 +340,6 @@ const useTreesStateContainer = createContainer(() => {
   };
   const idempotentOperationAssign = (node: ParserField) => {
     const nodeName = node.name.toLowerCase();
-    console.log(nodeName);
     if (
       !(
         nodeName === "query" ||
@@ -383,7 +382,6 @@ const useTreesStateContainer = createContainer(() => {
     tree.nodes = tree.nodes.filter(
       (n) => n.data.type !== TypeSystemDefinition.SchemaDefinition
     );
-    console.log(schemaNode);
     tree.nodes.push(schemaNode);
   };
   const setOperationNode = (
@@ -401,7 +399,6 @@ const useTreesStateContainer = createContainer(() => {
             type: node.name,
           }),
         ];
-        console.log(n);
       }
     });
     if (noSchemaDefinitionNode) {

diff --git a/packages/sandbox/apps/mergedLibraries.tsx b/packages/sandbox/apps/mergedLibraries.tsx
@@ -8,7 +8,6 @@ export const MergedLibraries = () => {
     code: schemas.mergedLibs.code,
     libraries: schemas.mergedLibs.libraries,
   });
-  console.log(mySchema);
   return (
     <div
       style={{

diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sandbox",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "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.0",
+    "graphql-editor": "^6.9.1",
     "graphql-js-tree": "^0.1.6"
   },
   "config": {

diff --git a/packages/sandbox/schema/mergedLibs.ts b/packages/sandbox/schema/mergedLibs.ts
@@ -12,5 +12,11 @@ export const mergedLibs = {
     type Animal{
       kind: String
     }
+    type Query{
+      health: String
+    }
+    type Mutation{
+      health: String
+    }
 `,
 };
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.0",
+  "version": "0.8.1",
   "private": false,
   "license": "MIT",
   "description": "Sync folders with svg's to react typescript components",