chore: add more external validation (wundergraph#1005)

oxyno-zeta · Aug 14, 2024 · 7446746 · 7446746
1 parent 10e882a
commit 7446746
Show file tree

Hide file tree

Showing 49 changed files with 3,828 additions and 2,216 deletions.
diff --git a/cli/src/commands/router/commands/compose.ts b/cli/src/commands/router/commands/compose.ts
@@ -123,7 +123,7 @@ export default (opts: BaseCommandOptions) => {
       subgraphs: config.subgraphs.map((s, index) => {
         const subgraphConfig = result.federationResult!.subgraphConfigBySubgraphName.get(s.name);
         const schema = subgraphConfig?.schema;
-        const configurationDataMap = subgraphConfig?.configurationDataMap;
+        const configurationDataByTypeName = subgraphConfig?.configurationDataByTypeName;
         return {
           id: `${index}`,
           name: s.name,
@@ -134,7 +134,7 @@ export default (opts: BaseCommandOptions) => {
           websocketSubprotocol:
             s.subscription?.protocol === 'ws' ? s.subscription?.websocketSubprotocol || 'auto' : undefined,
           schema,
-          configurationDataMap,
+          configurationDataByTypeName,
         };
       }),
     });
@@ -229,7 +229,7 @@ export default (opts: BaseCommandOptions) => {
           subgraphs: subgraphs.map((s, index) => {
             const subgraphConfig = result.federationResult!.subgraphConfigBySubgraphName.get(s.name);
             const schema = subgraphConfig?.schema;
-            const configurationDataMap = subgraphConfig?.configurationDataMap;
+            const configurationDataByTypeName = subgraphConfig?.configurationDataByTypeName;
             return {
               id: `${index}`,
               name: s.name,
@@ -240,7 +240,7 @@ export default (opts: BaseCommandOptions) => {
               websocketSubprotocol:
                 s.subscription?.protocol === 'ws' ? s.subscription?.websocketSubprotocol || 'auto' : undefined,
               schema,
-              configurationDataMap,
+              configurationDataByTypeName,
             };
           }),
         });

diff --git a/composition-go/index.global.js b/composition-go/index.global.js
diff --git a/composition-go/shim/src/index.ts b/composition-go/shim/src/index.ts
@@ -57,7 +57,7 @@ export function buildRouterConfiguration(subgraphs: Subgraph[]): string {
     subgraphs: subgraphs.map((s, index) => {
       const subgraphConfig = result.federationResult!.subgraphConfigBySubgraphName.get(s.name);
       const schema = subgraphConfig?.schema;
-      const configurationDataMap = subgraphConfig?.configurationDataMap;
+      const configurationDataByTypeName = subgraphConfig?.configurationDataByTypeName;
       return {
         id: `${index}`,
         name: s.name,
@@ -67,7 +67,7 @@ export function buildRouterConfiguration(subgraphs: Subgraph[]): string {
         subscriptionProtocol: s.subscription_protocol ?? 'ws',
         websocketSubprotocol: s.subscription_protocol === 'ws' ? s.websocketSubprotocol || 'auto': undefined,
         schema,
-        configurationDataMap,
+        configurationDataByTypeName,
       };
     }),
   });

diff --git a/composition/src/ast/utils.ts b/composition/src/ast/utils.ts
@@ -14,7 +14,7 @@ import {
   ObjectTypeDefinitionNode,
   ObjectTypeExtensionNode,
   OperationTypeNode,
-  parse,
+  parse as graphqlParse,
   ScalarTypeDefinitionNode,
   ScalarTypeExtensionNode,
   SchemaDefinitionNode,
@@ -47,7 +47,7 @@ import {
   SUBSCRIPTION,
   UNION_UPPER,
 } from '../utils/string-constants';
-import { duplicateInterfaceError, unexpectedKindFatalError } from '../errors/errors';
+import { duplicateInterfaceError } from '../errors/errors';
 import { ObjectLikeTypeNode } from '../schema-building/ast';
 
 export function isObjectLikeNodeEntity(node: ObjectLikeTypeNode): boolean {
@@ -292,9 +292,13 @@ type ParseResult = {
   error?: Error;
 };
 
+export function parse(source: string): DocumentNode {
+  return graphqlParse(source, { noLocation: true });
+}
+
 export function safeParse(value: string): ParseResult {
   try {
-    const parsedValue = parse(value, { noLocation: true });
+    const parsedValue = parse(value);
     return { documentNode: parsedValue };
   } catch (e) {
     return { error: e as Error };