fix(merge): fix handling schema definitions with convertExtensions flag

Author: ardatan

.changeset/nasty-days-hug.md

@@ -0,0 +1,6 @@
+---
+'@graphql-tools/load': patch
+'@graphql-tools/merge': patch
+---
+
+fix(merge): fix handling schema definitions with convertExtensions flag

packages/load/package.json

@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@graphql-tools/utils": "^7.5.0",
-    "@graphql-tools/merge": "^6.2.9",
+    "@graphql-tools/merge": "^6.2.11",
     "globby": "11.0.3",
     "import-from": "3.0.0",
     "is-glob": "4.0.1",

packages/load/tests/loaders/schema/schema-from-json.spec.ts

@@ -1,6 +1,6 @@
 import { loadSchema, loadSchemaSync } from '@graphql-tools/load';
 import { JsonFileLoader } from '@graphql-tools/json-file-loader';
-import { isSchema, GraphQLObjectType, GraphQLInterfaceType } from 'graphql';
+import { isSchema } from 'graphql';
 import { runTests, useMonorepo } from '../../../../testing/utils';
 
 const monorepo = useMonorepo({

packages/load/tests/loaders/schema/schema-from-string.spec.ts

@@ -0,0 +1,64 @@
+import '../../../../testing/to-be-similar-string'
+import { loadSchema, loadSchemaSync } from '@graphql-tools/load';
+import { printSchemaWithDirectives } from '@graphql-tools/utils';
+import { runTests, useMonorepo } from '../../../../testing/utils';
+import { printSchema } from 'graphql';
+
+const monorepo = useMonorepo({
+  dirname: __dirname,
+});
+describe('schema from string', () => {
+
+  monorepo.correctCWD();
+
+    runTests({
+      async: loadSchema,
+      sync: loadSchemaSync
+    })(load => {
+    it('should load schema from string', async () => {
+      const schemaString = /* GraphQL */`
+        type Query {
+          book: String
+        }
+      `;
+      const schema = await load(schemaString, {
+        loaders: []
+      });
+      const printedSchema = printSchema(schema);
+      expect(printedSchema).toBeSimilarString(schemaString);
+    });
+    it('should load schema from string with schema definition', async () => {
+      const schemaString = /* GraphQL */`
+        schema {
+          query: Query
+        }
+
+        type Query {
+          book: String
+        }
+      `;
+      const schema = await load(schemaString, {
+        loaders: []
+      });
+      const printedSchema = printSchemaWithDirectives(schema);
+      expect(printedSchema).toBeSimilarString(schemaString);
+    });
+    it('should load schema from string with schema definition and convertExtensions flag', async () => {
+      const schemaString = /* GraphQL */`
+        schema {
+          query: Query
+        }
+
+        type Query {
+          book: String
+        }
+      `;
+      const schema = await load(schemaString, {
+        loaders: [],
+        convertExtensions: true
+      });
+      const printedSchema = printSchemaWithDirectives(schema);
+      expect(printedSchema).toBeSimilarString(schemaString);
+    });
+  })
+})

packages/merge/src/typedefs-mergers/schema-def.ts

@@ -31,7 +31,6 @@ export function mergeSchemaDefs(
   if (existingNode) {
     return {
       kind:
-        config?.convertExtensions ||
         node.kind === Kind.SCHEMA_DEFINITION ||
         existingNode.kind === Kind.SCHEMA_DEFINITION
           ? Kind.SCHEMA_DEFINITION