fix: handle empty query in plan (#1219)

wundergraph · Sep 25, 2024 · 37af012 · 37af012
1 parent 3bc8035
commit 37af012
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/playground/src/components/playground/plan-view.tsx b/playground/src/components/playground/plan-view.tsx
@@ -221,14 +221,17 @@ export const PlanView = () => {
                     // Match keywords followed by (service
                     [/\b(\w+)(?=\s*\(service)/, 'keyword'],
 
+                    // Match Flatten followed by (path
+                    [/\b(Flatten)(?=\s*\(path)/, 'keyword'],
+
                     // Match Sequence, Parallel, Single followed by {
                     [/\b(QueryPlan|Sequence|Parallel)(?=\s*{)/, 'keyword'],
 
                     // Match keywords followed by { with previous line ending in }
                     [/(?<=}\s*\n\s*)(\w+)/, 'keyword'],
 
                     // Match service declarations: service: "serviceName"
-                    [/(service)(\s*:\s*)("[^"]*")/, ['identifier', '', 'string.service']],
+                    [/(service|path)(\s*:\s*)("[^"]*")/, ['identifier', '', 'string.service']],
 
                     // Match variables: $variableName
                     [/\$[a-zA-Z_]\w*/, 'variable'],

diff --git a/playground/src/components/playground/prettyPrint.ts b/playground/src/components/playground/prettyPrint.ts
@@ -1,10 +1,10 @@
-import { QueryPlanFetchNode, QueryPlanFetchTypeNode, Representation } from './types';
+import { QueryPlan, QueryPlanFetchNode, QueryPlanFetchTypeNode, Representation } from './types';
 
 export class PlanPrinter {
   depth: number = 0;
   buf: string[] = [];
 
-  print(plan: QueryPlanFetchTypeNode): string {
+  print(plan: QueryPlan): string {
     this.buf = [];
     this.printText('QueryPlan {');
     this.printPlanNode(plan, true);
@@ -57,7 +57,10 @@ export class PlanPrinter {
     if (fetch.representations) {
       this.printRepresentations(fetch.representations);
     }
-    this.printQuery(fetch.query);
+
+    if (fetch.query) {
+      this.printQuery(fetch.query);
+    }
 
     this.depth--;
     this.printText('}');

diff --git a/playground/src/components/playground/types.ts b/playground/src/components/playground/types.ts
@@ -49,7 +49,7 @@ export type QueryPlanFetchNode = {
   kind: string;
   subgraphName: string;
   subgraphId: string;
-  query: string;
+  query?: string;
   path?: string;
   representations?: Representation[];
 };

diff --git a/router/internal/graphiql/graphiql.html b/router/internal/graphiql/graphiql.html
diff --git a/studio/src/components/playground/plan-view.tsx b/studio/src/components/playground/plan-view.tsx
@@ -206,6 +206,9 @@ export const PlanView = () => {
                     // Match keywords followed by (service
                     [/\b(\w+)(?=\s*\(service)/, "keyword"],
 
+                    // Match Flatten followed by (path
+                    [/\b(Flatten)(?=\s*\(path)/, "keyword"],
+
                     // Match Sequence, Parallel, Single followed by {
                     [/\b(QueryPlan|Sequence|Parallel)(?=\s*{)/, "keyword"],
 
@@ -214,7 +217,7 @@ export const PlanView = () => {
 
                     // Match service declarations: service: "serviceName"
                     [
-                      /(service)(\s*:\s*)("[^"]*")/,
+                      /(service|path)(\s*:\s*)("[^"]*")/,
                       ["identifier", "", "string.service"],
                     ],
 

diff --git a/studio/src/components/playground/prettyPrint.ts b/studio/src/components/playground/prettyPrint.ts
@@ -1,4 +1,5 @@
 import {
+  QueryPlan,
   QueryPlanFetchNode,
   QueryPlanFetchTypeNode,
   Representation,
@@ -8,7 +9,7 @@ export class PlanPrinter {
   depth: number = 0;
   buf: string[] = [];
 
-  print(plan: QueryPlanFetchTypeNode): string {
+  print(plan: QueryPlan): string {
     this.buf = [];
     this.printText("QueryPlan {");
     this.printPlanNode(plan, true);
@@ -63,7 +64,10 @@ export class PlanPrinter {
     if (fetch.representations) {
       this.printRepresentations(fetch.representations);
     }
-    this.printQuery(fetch.query);
+
+    if (fetch.query) {
+      this.printQuery(fetch.query);
+    }
 
     this.depth--;
     this.printText("}");

diff --git a/studio/src/components/playground/types.ts b/studio/src/components/playground/types.ts
@@ -49,7 +49,7 @@ export type QueryPlanFetchNode = {
   kind: string;
   subgraphName: string;
   subgraphId: string;
-  query: string;
+  query?: string;
   path?: string;
   representations?: Representation[];
 };