fix: stitching graphql validation (#6864)

Author: n1ru4l

.changeset/tough-crabs-deny.md

@@ -0,0 +1,5 @@
+---
+'hive': patch
+---
+
+Validate schema stitching output sdl. Previously, this caused invalid SDL to be promoted as the latest valid schema version.

integration-tests/tests/cli/__snapshots__/schema.spec.ts.snap

@@ -781,11 +781,10 @@ exitCode------------------------------------------:
 stderr--------------------------------------------:
 __NONE__
 stdout--------------------------------------------:
-✖ Detected 3 errors
+✖ Detected 2 errors
 
    - Unknown type User.
    - Unknown type: User.
-   - Unknown type: User.
 
 View full report:
 http://__URL__

integration-tests/tests/models/stitching.spec.ts

@@ -472,7 +472,7 @@ describe('publish', () => {
         expect(message).toMatch('Str');
       });
 
-      test.concurrent('rejected: not composable, breaking changes', async () => {
+      test.concurrent('rejected: not composable, breaking changes (syntax error)', async () => {
         const {
           cli: { publish, check },
         } = await prepare(ffs);
@@ -508,9 +508,50 @@ describe('publish', () => {
           expect: 'rejected',
         });
 
-        expect(message).toMatch('topProduct');
         expect(message).toMatch('Expected Name');
       });
+
+      test.concurrent('rejected: object type passed to input argument', async () => {
+        const {
+          cli: { publish, check },
+        } = await prepare(ffs);
+
+        await publish({
+          sdl: /* GraphQL */ `
+            type Query {
+              topProduct: Product
+            }
+
+            type Product @key(selectionSet: "{ id }") {
+              id: ID!
+              name: String
+            }
+          `,
+          serviceName: 'products',
+          serviceUrl: 'http://products:3000/graphql',
+          expect: 'latest-composable',
+        });
+
+        await check({
+          sdl: /* GraphQL */ `
+            type Query {
+              topProduct(filter: TopProductFilter): Product
+            }
+
+            type Product @key(selectionSet: "{ id }") {
+              id: ID!
+              name: String
+            }
+
+            type TopProductFilter {
+              year: Int
+              category: String
+            }
+          `,
+          serviceName: 'products',
+          expect: 'rejected',
+        });
+      });
     });
   });
 });

packages/services/schema/src/composition/stitching.ts

@@ -1,4 +1,13 @@
-import { buildASTSchema, concatAST, DocumentNode, Kind, parse, printSchema } from 'graphql';
+import {
+  buildASTSchema,
+  concatAST,
+  DocumentNode,
+  GraphQLSchema,
+  Kind,
+  parse,
+  printSchema,
+  validateSchema,
+} from 'graphql';
 import { validateSDL } from 'graphql/validation/validate.js';
 import { stitchSchemas } from '@graphql-tools/stitch';
 import { stitchingDirectives } from '@graphql-tools/stitching-directives';
@@ -64,25 +73,37 @@ export async function composeStitching(args: ComposeStitchingArgs) {
     .map(schema => validateStitchedSchema(schema))
     .flat();
 
+  let stitchedSchema: GraphQLSchema | null = null;
   let sdl: string | null = null;
-  try {
-    sdl = printSchema(
-      stitchSchemas({
+
+  if (errors.length === 0) {
+    try {
+      stitchedSchema = stitchSchemas({
         subschemas: args.schemas.map(schema =>
           buildASTSchema(trimDescriptions(parse(schema.raw)), {
             assumeValid: true,
             assumeValidSDL: true,
           }),
         ),
-      }),
+      });
+      sdl = printSchema(stitchedSchema);
+    } catch (error) {
+      errors.push(toValidationError(error, 'composition'));
+    }
+  }
+
+  if (stitchedSchema) {
+    errors.push(
+      ...validateSchema(stitchedSchema).map(error => ({
+        message: error.message,
+        source: 'graphql' as const,
+      })),
     );
-  } catch (error) {
-    errors.push(toValidationError(error, 'composition'));
   }
 
   return {
     errors,
-    sdl,
+    sdl: errors.length ? null : sdl,
     supergraph: null,
     contracts: null,
     tags: null,