Revert the breaking change introduces in (#4643)

ardatan · Aug 10, 2022 · 2609d71 · 2609d71 · vercel · Aug 10, 2022
1 parent 8a59a4d
commit 2609d71
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/.changeset/real-cougars-sing.md b/.changeset/real-cougars-sing.md
@@ -0,0 +1,7 @@
+---
+'@graphql-tools/utils': minor
+'@graphql-tools/merge': patch
+'@graphql-tools/schema': patch
+---
+
+Revert the breaking change introduced in `@graphql-tools/merge`
diff --git a/packages/merge/src/extensions.ts b/packages/merge/src/extensions.ts
@@ -1,5 +1,6 @@
 import { GraphQLSchema, GraphQLObjectType, GraphQLEnumType } from 'graphql';
 import { ExtensionsObject, Maybe, mergeDeep, SchemaExtensions } from '@graphql-tools/utils';
+export { extractExtensionsFromSchema } from '@graphql-tools/utils';
 
 export function mergeExtensions(extensions: SchemaExtensions[]): SchemaExtensions {
   return mergeDeep(extensions);

diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
@@ -6,4 +6,4 @@ export { extendResolversFromInterfaces } from './extendResolversFromInterfaces.j
 export * from './makeExecutableSchema.js';
 export * from './types.js';
 export * from './merge-schemas.js';
-export * from './extractExtensionsFromSchema.js';
+export { extractExtensionsFromSchema } from '@graphql-tools/utils';
diff --git a/packages/schema/src/merge-schemas.ts b/packages/schema/src/merge-schemas.ts
@@ -1,8 +1,14 @@
 import { GraphQLSchema } from 'graphql';
-import { IResolvers, asArray, getResolversFromSchema, TypeSource, SchemaExtensions } from '@graphql-tools/utils';
+import {
+  IResolvers,
+  asArray,
+  getResolversFromSchema,
+  TypeSource,
+  SchemaExtensions,
+  extractExtensionsFromSchema,
+} from '@graphql-tools/utils';
 import { makeExecutableSchema } from './makeExecutableSchema.js';
 import { IExecutableSchemaDefinition } from './types.js';
-import { extractExtensionsFromSchema } from './extractExtensionsFromSchema.js';
 
 /**
  * Configuration object for schema merging

diff --git a/...schema/src/extractExtensionsFromSchema.ts → .../utils/src/extractExtensionsFromSchema.ts b/...schema/src/extractExtensionsFromSchema.ts → .../utils/src/extractExtensionsFromSchema.ts
@@ -1,12 +1,7 @@
-import {
-  SchemaExtensions,
-  ObjectTypeExtensions,
-  EnumTypeExtensions,
-  InputTypeExtensions,
-  mapSchema,
-  MapperKind,
-} from '@graphql-tools/utils';
+import { mapSchema } from './mapSchema.js';
 import { GraphQLFieldConfig, GraphQLSchema } from 'graphql';
+import { EnumTypeExtensions, InputTypeExtensions, ObjectTypeExtensions, SchemaExtensions } from './types.js';
+import { MapperKind } from './Interfaces.js';
 
 export function extractExtensionsFromSchema(schema: GraphQLSchema): SchemaExtensions {
   const result: SchemaExtensions = {

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -48,3 +48,4 @@ export * from './inspect.js';
 export * from './memoize.js';
 export * from './fixSchemaAst.js';
 export * from './getOperationASTFromRequest.js';
+export * from './extractExtensionsFromSchema.js';