initial attempt

packages/loaders/url/src/index.ts

@@ -9,7 +9,7 @@ import {
 } from '@graphql-tools/utils';
 import { isWebUri } from 'valid-url';
 import { fetch as crossFetch } from 'cross-fetch';
-import { makeRemoteExecutableSchema, introspectSchema } from '@graphql-tools/schema-stitching';
+import { makeRemoteExecutableSchema, introspectSchema } from '@graphql-tools/schema-wrapping';
 
 export type FetchFn = typeof import('cross-fetch').fetch;
 

packages/schema-stitching/tests/Logger.ts → packages/schema-generator/tests/Logger.ts

@@ -2,7 +2,7 @@
  * A very simple class for logging errors
  */
 
-import { ILogger } from '@graphql-tools/schema-generator';
+import { ILogger } from '../src/types';
 
 export class Logger implements ILogger {
   public errors: Array<Error>;

packages/schema-stitching/tests/extensionExtraction.test.ts → packages/schema-generator/tests/extensionExtraction.test.ts

@@ -1,6 +1,6 @@
 import { parse } from 'graphql';
 
-import { extractExtensionDefinitions } from '@graphql-tools/schema-generator';
+import { extractExtensionDefinitions } from '../src/extensionDefinitions';
 
 describe('Extension extraction', () => {
   test('extracts extended inputs', () => {

packages/schema-generator/tests/forAwaitEach.ts

@@ -0,0 +1,19 @@
+/* eslint-disable callback-return */
+/* eslint-disable @typescript-eslint/await-thenable */
+
+function isAsyncIterable<T>(obj: any): obj is AsyncIterable<T> {
+  return Symbol.asyncIterator in obj;
+}
+
+export async function forAwaitEach<T>(
+  obj: AsyncIterable<T> | T,
+  callback: (i: T) => any | Promise<any>,
+) {
+  if (isAsyncIterable(obj)) {
+    for await (const i of obj) {
+      await callback(i);
+    }
+  } else {
+    await callback(obj);
+  }
+}

packages/schema-stitching/tests/logger.test.ts → packages/schema-generator/tests/logger.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable promise/param-names */
 import { graphql } from 'graphql';
 
-import { makeExecutableSchema } from '@graphql-tools/schema-generator';
+import { makeExecutableSchema } from '../src/makeExecutableSchema';
 
 import { Logger } from './Logger';
 

packages/schema-stitching/tests/resolution.test.ts → packages/schema-generator/tests/resolution.test.ts

@@ -8,7 +8,7 @@ import {
 } from 'graphql';
 import { PubSub } from 'graphql-subscriptions';
 
-import { makeExecutableSchema, addSchemaLevelResolver } from '@graphql-tools/schema-generator';
+import { makeExecutableSchema, addSchemaLevelResolver } from '../src/index';
 
 import { forAwaitEach } from './forAwaitEach';
 

packages/schema-generator/tests/schemaGenerator.test.ts

@@ -24,27 +24,27 @@ import {
   GraphQLSchema,
 } from 'graphql';
 
-import {
-  makeExecutableSchema,
-  addErrorLoggingToSchema,
-  addSchemaLevelResolver,
-  addResolversToSchema,
-  attachDirectiveResolvers,
-  chainResolvers,
-  concatenateTypeDefs,
-} from '@graphql-tools/schema-generator';
-
 import {
   IResolverValidationOptions,
   IResolvers,
   IDirectiveResolvers,
   NextResolverFn,
   VisitSchemaKind,
   ITypeDefinitions,
-  ILogger,
   visitSchema
 } from '@graphql-tools/utils';
 
+import {
+  makeExecutableSchema,
+  addErrorLoggingToSchema,
+  addSchemaLevelResolver,
+  addResolversToSchema,
+  attachDirectiveResolvers,
+  chainResolvers,
+  concatenateTypeDefs,
+  ILogger,
+} from '../src/index';
+
 import TypeA from './fixtures/circularSchemaA';
 
 interface Bird {

packages/schema-stitching/src/index.ts

@@ -1,4 +1 @@
-export * from './delegate';
-export * from './introspect';
-export * from './stitch';
-export * from './wrap';
+export * from './stitchSchemas';

packages/schema-stitching/src/stitch/mergeInfo.ts → packages/schema-stitching/src/mergeInfo.ts

@@ -20,12 +20,13 @@ import {
   parseSelectionSet,
   forEachField,
 } from '@graphql-tools/utils';
-import ExpandAbstractTypes from '../delegate/transforms/ExpandAbstractTypes';
-import AddReplacementFragments from '../delegate/transforms/AddReplacementFragments';
-
-import { delegateToSchema } from '../delegate/delegateToSchema';
-import { IDelegateToSchemaOptions, MergedTypeInfo } from '../delegate/types';
-import { MergeTypeCandidate, MergeInfo, IResolversParameter, MergeTypeFilter } from './types';
+import {
+  ExpandAbstractTypes,
+  AddReplacementFragments,
+  delegateToSchema,
+  IDelegateToSchemaOptions,
+} from '@graphql-tools/schema-wrapping';
+import { MergeTypeCandidate, MergedTypeInfo, MergeInfo, IResolversParameter, MergeTypeFilter } from './types';
 
 export function createMergeInfo(
   allSchemas: Array<GraphQLSchema>,

packages/schema-stitching/src/stitch/typeCandidates.ts → packages/schema-stitching/src/typeCandidates.ts

@@ -22,7 +22,7 @@ import {
 } from 'graphql';
 
 import { isSubschemaConfig, SubschemaConfig } from '@graphql-tools/utils';
-import { wrapSchema } from '../wrap/wrapSchema';
+import { wrapSchema } from '../../schema-wrapping/src/wrap/wrapSchema';
 
 import {
   extractTypeDefinitions,

packages/schema-stitching/src/stitch/types.ts → packages/schema-stitching/src/types.ts

@@ -1,4 +1,4 @@
-import { GraphQLNamedType, GraphQLSchema } from 'graphql';
+import { GraphQLNamedType, GraphQLSchema, SelectionSetNode } from 'graphql';
 import {
   SubschemaConfig,
   ReplacementSelectionSetMapping,
@@ -7,9 +7,10 @@ import {
   ITypeDefinitions,
   SchemaLikeObject,
   Transform,
+  TypeMap,
 } from '@graphql-tools/utils';
 import { GraphQLResolveInfo } from 'graphql/type';
-import { IDelegateToSchemaOptions, MergedTypeInfo } from '../delegate/types';
+import { IDelegateToSchemaOptions } from '@graphql-tools/schema-wrapping';
 import { IExecutableSchemaDefinition } from '@graphql-tools/schema-generator';
 
 export type MergeTypeCandidate = {
@@ -27,6 +28,16 @@ declare module 'graphql' {
   }
 }
 
+export interface MergedTypeInfo {
+  subschemas: Array<SubschemaConfig>;
+  selectionSet?: SelectionSetNode;
+  uniqueFields: Record<string, SubschemaConfig>;
+  nonUniqueFields: Record<string, Array<SubschemaConfig>>;
+  typeMaps: Map<SubschemaConfig, TypeMap>;
+  selectionSets: Map<SubschemaConfig, SelectionSetNode>;
+  containsSelectionSet: Map<SubschemaConfig, Map<SelectionSetNode, boolean>>;
+}
+
 export interface MergeInfo {
   delegate: (
     type: 'query' | 'mutation' | 'subscription',

packages/schema-stitching/tests/alternateStitchSchemas.test.ts

@@ -18,7 +18,6 @@ import {
 } from 'graphql';
 
 import {
-  transformSchema,
   wrapSchema,
   RenameTypes,
   RenameRootFields,
@@ -32,18 +31,19 @@ import {
   FilterObjectFields,
   RenameInterfaceFields,
   TransformRootFields,
-} from '../src/wrap/index';
+  delegateToSchema,
+  createMergedResolver
+} from '@graphql-tools/schema-wrapping';
 
-import { delegateToSchema } from '../src/delegate/index';
 import { makeExecutableSchema } from '@graphql-tools/schema-generator';
-import { stitchSchemas } from '../src/stitch/index';
-import { createMergedResolver } from '../src/delegate/createMergedResolver';
 import {
   wrapFieldNode,
   renameFieldNode,
   hoistFieldNodes, filterSchema, SubschemaConfig
 } from '@graphql-tools/utils';
 
+import { stitchSchemas } from '../src/stitchSchemas';
+
 import { forAwaitEach } from './forAwaitEach';
 
 import {
@@ -346,7 +346,7 @@ describe('merge schemas through transforms', () => {
 
 describe('transform object fields', () => {
   test('should work to add a resolver', async () => {
-    const transformedPropertySchema = transformSchema(propertySchema, [
+    const transformedPropertySchema = wrapSchema(propertySchema, [
       new TransformObjectFields(
         (
           typeName: string,
@@ -425,7 +425,7 @@ describe('transform object fields', () => {
 
 describe('default values', () => {
   test('should work to add a default value even when renaming root fields', async () => {
-    const transformedPropertySchema = transformSchema(propertySchema, [
+    const transformedPropertySchema = wrapSchema(propertySchema, [
       new TransformRootFields(
         (
           typeName: string,
@@ -594,7 +594,7 @@ describe('transform object fields', () => {
       },
     });
 
-    schema = transformSchema(itemSchema, [
+    schema = wrapSchema(itemSchema, [
       new FilterObjectFields((_typeName, fieldName) => {
         if (fieldName === 'id') {
           return false;
@@ -692,7 +692,7 @@ describe('filter and rename object fields', () => {
 
   beforeAll(() => {
     transformedPropertySchema = filterSchema({
-      schema: transformSchema(propertySchema, [
+      schema: wrapSchema(propertySchema, [
         new RenameTypes((name: string) => `New_${name}`),
         new RenameObjectFields((typeName: string, fieldName: string) =>
           typeName === 'New_Property' ? `new_${fieldName}` : fieldName,
@@ -848,7 +848,7 @@ describe('rename nested object fields with interfaces', () => {
       },
     });
 
-    const transformedSchema = transformSchema(originalSchema, [
+    const transformedSchema = wrapSchema(originalSchema, [
       new RenameObjectFields((typeName, fieldName) => {
         if (typeName === 'Query') {
           return fieldName;
@@ -905,7 +905,7 @@ describe('rename nested object fields with interfaces', () => {
 
 describe('WrapType transform', () => {
   test('should work', async () => {
-    const transformedPropertySchema = transformSchema(propertySchema, [
+    const transformedPropertySchema = wrapSchema(propertySchema, [
       new WrapType('Query', 'Namespace_Query', 'namespace'),
     ]);
     const result = await graphql(
@@ -960,7 +960,7 @@ describe('WrapType transform', () => {
 
 describe('schema transformation with extraction of nested fields', () => {
   test('should work via ExtendSchema transform', async () => {
-    const transformedPropertySchema = transformSchema(propertySchema, [
+    const transformedPropertySchema = wrapSchema(propertySchema, [
       new ExtendSchema({
         typeDefs: `
           extend type Property {
@@ -1030,7 +1030,7 @@ describe('schema transformation with extraction of nested fields', () => {
   });
 
   test('should work via HoistField transform', async () => {
-    const transformedPropertySchema = transformSchema(propertySchema, [
+    const transformedPropertySchema = wrapSchema(propertySchema, [
       new HoistField('Property', ['location', 'name'], 'locationName'),
     ]);
 
@@ -1062,7 +1062,7 @@ describe('schema transformation with extraction of nested fields', () => {
 
 describe('schema transformation with wrapping of object fields', () => {
   test('should work via ExtendSchema transform', async () => {
-    const transformedPropertySchema = transformSchema(propertySchema, [
+    const transformedPropertySchema = wrapSchema(propertySchema, [
       new ExtendSchema({
         typeDefs: `
           extend type Property {
@@ -1166,7 +1166,7 @@ describe('schema transformation with wrapping of object fields', () => {
 
   describe('WrapFields transform', () => {
     test('should work', async () => {
-      const transformedPropertySchema = transformSchema(propertySchema, [
+      const transformedPropertySchema = wrapSchema(propertySchema, [
         new WrapFields(
           'Property',
           ['outerWrap'],
@@ -1235,7 +1235,7 @@ describe('schema transformation with wrapping of object fields', () => {
     });
 
     test('should work, even with multiple fields', async () => {
-      const transformedPropertySchema = transformSchema(propertySchema, [
+      const transformedPropertySchema = wrapSchema(propertySchema, [
         new WrapFields(
           'Property',
           ['outerWrap', 'innerWrap'],
@@ -1317,7 +1317,7 @@ describe('schema transformation with renaming of object fields', () => {
   let transformedPropertySchema: GraphQLSchema;
 
   beforeAll(() => {
-    transformedPropertySchema = transformSchema(propertySchema, [
+    transformedPropertySchema = wrapSchema(propertySchema, [
       new ExtendSchema({
         typeDefs: `
           extend type Property {

packages/schema-stitching/tests/dataloader.test.ts

@@ -1,9 +1,10 @@
 import DataLoader from 'dataloader';
 import { graphql, GraphQLList, GraphQLResolveInfo } from 'graphql';
 
-import { delegateToSchema } from '../src/delegate/index';
+import { delegateToSchema } from '@graphql-tools/schema-wrapping';
 import { makeExecutableSchema } from '@graphql-tools/schema-generator';
-import { stitchSchemas } from '../src/stitch/index';
+
+import { stitchSchemas } from '../src/stitchSchemas';
 
 describe('dataloader', () => {
   test('should work', async () => {

packages/schema-stitching/tests/delegateToSchema.test.ts

@@ -1,10 +1,10 @@
 import { GraphQLSchema, graphql } from 'graphql';
 
-import { delegateToSchema } from '../src/delegate/delegateToSchema';
-import { stitchSchemas } from '../src/stitch/stitchSchemas';
-import { IResolvers } from '@graphql-tools/utils';
+import { delegateToSchema, wrapSchema } from '@graphql-tools/schema-wrapping';
 import { makeExecutableSchema } from '@graphql-tools/schema-generator';
-import { wrapSchema } from '../src/wrap';
+import { IResolvers } from '@graphql-tools/utils';
+
+import { stitchSchemas } from '../src/stitchSchemas';
 
 import {
   propertySchema,