Huge cleanup before major release (breaking) (#3081)

* Breaking cleanup before major release

* Fix TS

* More

.changeset/cuddly-horses-prove.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': major
+---
+
+BREAKING - Remove fieldToFieldConfig, fieldToFieldConfig, argsToFieldConfigArgument and argumentToArgumentConfig

.changeset/forty-ducks-drum.md

@@ -0,0 +1,7 @@
+---
+'@graphql-tools/schema': major
+'@graphql-tools/stitch': major
+'@graphql-tools/utils': major
+---
+
+BREAKING - deprecate legacy schema directives and directive resolvers

.changeset/heavy-vans-whisper.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/schema': major
+---
+
+breaking - remove logger and addErrorLoggingToSchema - use envelop instead

.changeset/long-rings-happen.md

@@ -0,0 +1,5 @@
+---
+'graphql-tools': major
+---
+
+Add deprecation notice and export makeExecutableSchema only

.changeset/mean-news-return.md

@@ -0,0 +1,8 @@
+---
+'@graphql-tools/delegate': major
+'@graphql-tools/apollo-engine-loader': major
+'@graphql-tools/utils': major
+'@graphql-tools/wrap': major
+---
+
+BREAKING - Use native AggregateError if possible. Native AggregateError doesn't have iterator but errors prop

.changeset/new-balloons-reply.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/schema': major
+---
+
+BREAKING - enhance(schema): remove schema level resolvers and addSchemaLevelResolver

.changeset/ninety-shirts-crash.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': major
+---
+
+BREAKING - remove debugLog

.changeset/polite-yaks-drive.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': major
+---
+
+BREAKING - do not apply camelCase naming convention in buildOperationNodeForField

.changeset/silent-comics-tell.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/schema': major
+---
+
+BREAKING(schema) - remove allowUndefinedResolve option, buildSchemaFromTypeDefinitions and use buildSchema instead

.changeset/smooth-tips-know.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': major
+---
+
+BREAKING - Remove SchemaVisitor, visitSchema and VisitSchemaKind

.changeset/twelve-suns-run.md

@@ -0,0 +1,5 @@
+---
+'@graphql-tools/schema': patch
+---
+
+enhance(schema): use merge package to handle typeDefs and resolvers merging

.github/workflows/tests.yml

@@ -57,12 +57,11 @@ jobs:
       - name: Build
         run: yarn ts:transpile
   test:
-    name: Test on ${{matrix.os}}, Node ${{matrix.node_version}} and GraphQL v${{matrix.graphql_version}}
-    runs-on: ${{matrix.os}}
+    name: Test, Node ${{matrix.node_version}} and GraphQL v${{matrix.graphql_version}}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest] # remove windows to speed up the tests
-        node_version: [10, 16]
+        node_version: [12, 16]
         graphql_version: [14, 15]
     steps:
       - name: Checkout Master

packages/delegate/package.json

@@ -35,7 +35,6 @@
     "@graphql-tools/batch-execute": "^7.1.2",
     "@graphql-tools/schema": "^7.1.5",
     "@graphql-tools/utils": "^7.7.1",
-    "@ardatan/aggregate-error": "0.0.6",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"

packages/delegate/src/delegateToSchema.ts

@@ -14,8 +14,6 @@ import {
 
 import { ValueOrPromise } from 'value-or-promise';
 
-import AggregateError from '@ardatan/aggregate-error';
-
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 
 import {
@@ -26,6 +24,7 @@ import {
   Subscriber,
   Maybe,
   assertSome,
+  AggregateError,
 } from '@graphql-tools/utils';
 
 import {

packages/delegate/src/resolveExternalValue.ts

@@ -13,14 +13,13 @@ import {
   locatedError,
 } from 'graphql';
 
-import AggregateError from '@ardatan/aggregate-error';
+import { AggregateError, Maybe } from '@graphql-tools/utils';
 
 import { StitchingInfo, SubschemaConfig } from './types';
 import { annotateExternalObject, isExternalObject } from './externalObjects';
 import { getFieldsNotInSubschema } from './getFieldsNotInSubschema';
 import { mergeFields } from './mergeFields';
 import { Subschema } from './Subschema';
-import { Maybe } from '@graphql-tools/utils';
 
 export function resolveExternalValue(
   result: any,

packages/delegate/src/transforms/CheckResultAndHandleErrors.ts

@@ -7,9 +7,7 @@ import {
   locatedError,
 } from 'graphql';
 
-import AggregateError from '@ardatan/aggregate-error';
-
-import { getResponseKeyFromInfo, ExecutionResult, relocatedError } from '@graphql-tools/utils';
+import { AggregateError, getResponseKeyFromInfo, ExecutionResult, relocatedError } from '@graphql-tools/utils';
 
 import { SubschemaConfig, Transform, DelegationContext } from '../types';
 import { resolveExternalValue } from '../resolveExternalValue';

packages/graphql-tools/package.json

@@ -36,30 +36,7 @@
     "directory": "dist"
   },
   "dependencies": {
-    "@graphql-tools/optimize": "1.0.1",
-    "@graphql-tools/batch-delegate": "^7.0.0",
-    "@graphql-tools/batch-execute": "^7.0.0",
-    "@graphql-tools/delegate": "^7.0.10",
-    "@graphql-tools/graphql-tag-pluck": "^6.2.6",
-    "@graphql-tools/import": "^6.2.4",
-    "@graphql-tools/links": "^7.0.4",
-    "@graphql-tools/load": "^6.2.5",
-    "@graphql-tools/code-file-loader": "^6.2.5",
-    "@graphql-tools/git-loader": "^6.2.5",
-    "@graphql-tools/github-loader": "^6.2.5",
-    "@graphql-tools/graphql-file-loader": "^6.2.5",
-    "@graphql-tools/json-file-loader": "^6.2.5",
-    "@graphql-tools/module-loader": "^6.2.5",
-    "@graphql-tools/url-loader": "^6.3.2",
-    "@graphql-tools/load-files": "^6.2.4",
-    "@graphql-tools/merge": "^6.2.14",
-    "@graphql-tools/mock": "^7.0.0",
-    "@graphql-tools/relay-operation-optimizer": "^6.2.5",
-    "@graphql-tools/resolvers-composition": "^6.2.5",
     "@graphql-tools/schema": "^7.0.0",
-    "@graphql-tools/stitch": "^7.3.0",
-    "@graphql-tools/utils": "^7.0.1",
-    "@graphql-tools/wrap": "^7.0.0",
     "tslib": "~2.3.0"
   }
 }

packages/graphql-tools/src/index.ts

@@ -1,23 +1,5 @@
-export * from '@graphql-tools/batch-delegate';
-export * from '@graphql-tools/batch-execute';
-export * from '@graphql-tools/delegate';
-export * from '@graphql-tools/graphql-tag-pluck';
-export * from '@graphql-tools/import';
-export * from '@graphql-tools/links';
-export * from '@graphql-tools/load';
-export * from '@graphql-tools/code-file-loader';
-export * from '@graphql-tools/git-loader';
-export * from '@graphql-tools/github-loader';
-export * from '@graphql-tools/graphql-file-loader';
-export * from '@graphql-tools/module-loader';
-export * from '@graphql-tools/url-loader';
-export * from '@graphql-tools/load-files';
-export * from '@graphql-tools/merge';
-export * from '@graphql-tools/mock';
-export * from '@graphql-tools/relay-operation-optimizer';
-export * from '@graphql-tools/resolvers-composition';
-export * from '@graphql-tools/schema';
-export * from '@graphql-tools/stitch';
-export * from '@graphql-tools/utils';
-export * from '@graphql-tools/wrap';
-export * from '@graphql-tools/optimize';
+export { makeExecutableSchema } from '@graphql-tools/schema';
+
+console.warn(`This package has been deprecated and now it only exports makeExecutableSchema.
+We recommend you to migrate to scoped packages.
+Check out https://www.graphql-tools.com for more information!`);

packages/load/src/filter-document-kind.ts

@@ -1,5 +1,5 @@
-import { debugLog } from '@graphql-tools/utils';
 import { DocumentNode, DefinitionNode, Kind } from 'graphql';
+import { env } from 'process';
 
 /**
  * @internal
@@ -18,7 +18,9 @@ export const filterKind = (content: DocumentNode | undefined, filterKinds: null
 
     if (invalidDefinitions.length > 0) {
       invalidDefinitions.forEach(d => {
-        debugLog(`Filtered document of kind ${d.kind} due to filter policy (${filterKinds.join(', ')})`);
+        if (env['DEBUG']) {
+          console.error(`Filtered document of kind ${d.kind} due to filter policy (${filterKinds.join(', ')})`);
+        }
       });
     }
 

packages/load/src/load-typedefs/load-file.ts

@@ -1,4 +1,5 @@
-import { Source, debugLog, Maybe } from '@graphql-tools/utils';
+import { Source, Maybe } from '@graphql-tools/utils';
+import { env } from 'process';
 import { LoadTypedefsOptions } from '../load-typedefs';
 
 export async function loadFile(pointer: string, options: LoadTypedefsOptions): Promise<Maybe<Source>> {
@@ -17,7 +18,9 @@ export async function loadFile(pointer: string, options: LoadTypedefsOptions): P
         return loadedValue;
       }
     } catch (error) {
-      debugLog(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+      if (env['DEBUG']) {
+        console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+      }
       throw error;
     }
   }
@@ -41,7 +44,9 @@ export function loadFileSync(pointer: string, options: LoadTypedefsOptions): May
         return loader.loadSync!(pointer, options);
       }
     } catch (error) {
-      debugLog(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+      if (env['DEBUG']) {
+        console.error(`Failed to find any GraphQL type definitions in: ${pointer} - ${error.message}`);
+      }
       throw error;
     }
   }

packages/loaders/apollo-engine/package.json

@@ -30,8 +30,7 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@ardatan/aggregate-error": "0.0.6",
-    "@graphql-tools/utils": "^7.0.0",
+    "@graphql-tools/utils": "^7.10.0",
     "cross-fetch": "3.1.4",
     "tslib": "~2.3.0",
     "sync-fetch": "0.3.0"

packages/loaders/apollo-engine/src/index.ts

@@ -1,6 +1,5 @@
-import { SchemaLoader, Source, SingleFileOptions, parseGraphQLSDL } from '@graphql-tools/utils';
+import { SchemaLoader, Source, SingleFileOptions, parseGraphQLSDL, AggregateError } from '@graphql-tools/utils';
 import { fetch } from 'cross-fetch';
-import AggregateError from '@ardatan/aggregate-error';
 import syncFetch from 'sync-fetch';
 
 /**
@@ -66,7 +65,7 @@ export class ApolloEngineLoader implements SchemaLoader<ApolloEngineOptions> {
     const { data, errors } = await response.json();
 
     if (errors) {
-      throw new AggregateError(errors);
+      throw new AggregateError(errors, 'Introspection from Apollo Engine failed');
     }
 
     return parseGraphQLSDL(pointer, data.service.schema.document, options);
@@ -79,7 +78,7 @@ export class ApolloEngineLoader implements SchemaLoader<ApolloEngineOptions> {
     const { data, errors } = response.json();
 
     if (errors) {
-      throw new AggregateError(errors);
+      throw new AggregateError(errors, 'Introspection from Apollo Engine failed');
     }
 
     return parseGraphQLSDL(pointer, data.service.schema.document, options);

packages/loaders/code-file/src/index.ts

@@ -4,7 +4,6 @@ import { isSchema, GraphQLSchema, DocumentNode } from 'graphql';
 import {
   SchemaPointerSingle,
   DocumentPointerSingle,
-  debugLog,
   SingleFileOptions,
   Source,
   UniversalLoader,
@@ -24,7 +23,7 @@ import isGlob from 'is-glob';
 import unixify from 'unixify';
 import { tryToLoadFromExport, tryToLoadFromExportSync } from './load-from-module';
 import { isAbsolute, resolve } from 'path';
-import { cwd } from 'process';
+import { cwd, env } from 'process';
 import { readFileSync, promises as fsPromises, existsSync } from 'fs';
 
 const { readFile, access } = fsPromises;
@@ -135,7 +134,9 @@ export class CodeFileLoader implements UniversalLoader<CodeFileLoaderOptions> {
           return parseGraphQLSDL(pointer, sdl, options);
         }
       } catch (e) {
-        debugLog(`Failed to load schema from code file "${normalizedFilePath}": ${e.message}`);
+        if (env['DEBUG']) {
+          console.error(`Failed to load schema from code file "${normalizedFilePath}": ${e.message}`);
+        }
         errors.push(e);
       }
     }
@@ -178,7 +179,9 @@ export class CodeFileLoader implements UniversalLoader<CodeFileLoaderOptions> {
           return parseGraphQLSDL(pointer, sdl, options);
         }
       } catch (e) {
-        debugLog(`Failed to load schema from code file "${normalizedFilePath}": ${e.message}`);
+        if (env['DEBUG']) {
+          console.error(`Failed to load schema from code file "${normalizedFilePath}": ${e.message}`);
+        }
         errors.push(e);
       }
     }

packages/loaders/prisma/src/prisma-yml/Variables.ts

@@ -1,4 +1,4 @@
-import * as lodash from 'lodash';
+import _ from 'lodash';
 // eslint-disable-next-line
 // @ts-ignore
 import replaceall from 'replaceall';
@@ -43,18 +43,18 @@ export class Variables {
     const deepMapValues = (object: any, callback: any, propertyPath?: string[]): any => {
       const deepMapValuesIteratee = (value: any, key: any) =>
         deepMapValues(value, callback, propertyPath ? propertyPath.concat(key) : [key]);
-      if (lodash.isArray(object)) {
-        return lodash.map(object, deepMapValuesIteratee);
-      } else if (lodash.isObject(object) && !lodash.isDate(object) && !lodash.isFunction(object)) {
-        return lodash.extend({}, object, lodash.mapValues(object, deepMapValuesIteratee));
+      if (_.isArray(object)) {
+        return _.map(object, deepMapValuesIteratee);
+      } else if (_.isObject(object) && !_.isDate(object) && !_.isFunction(object)) {
+        return _.extend({}, object, _.mapValues(object, deepMapValuesIteratee));
       }
       return callback(object, propertyPath);
     };
 
     deepMapValues(objectToPopulate, (property: any, propertyPath: any) => {
       if (typeof property === 'string') {
         const populateSingleProperty = this.populateProperty(property, true).then((newProperty: any) =>
-          lodash.set(objectToPopulate, propertyPath, newProperty)
+          _.set(objectToPopulate, propertyPath, newProperty)
         );
         populateAll.push(populateSingleProperty);
       }
@@ -64,7 +64,7 @@ export class Variables {
   }
 
   populateProperty(propertyParam: any, populateInPlace?: boolean): any {
-    let property = populateInPlace ? propertyParam : lodash.cloneDeep(propertyParam);
+    let property = populateInPlace ? propertyParam : _.cloneDeep(propertyParam);
     const allValuesToPopulate: any[] = [];
     let warned = false;
 
@@ -143,7 +143,7 @@ export class Variables {
         return (
           finalValue !== null &&
           typeof finalValue !== 'undefined' &&
-          !(typeof finalValue === 'object' && lodash.isEmpty(finalValue))
+          !(typeof finalValue === 'object' && _.isEmpty(finalValue))
         );
       });
       return Promise.resolve(finalValue);
@@ -215,7 +215,7 @@ export class Variables {
     if (
       valueToPopulate === null ||
       typeof valueToPopulate === 'undefined' ||
-      (typeof valueToPopulate === 'object' && lodash.isEmpty(valueToPopulate))
+      (typeof valueToPopulate === 'object' && _.isEmpty(valueToPopulate))
     ) {
       let varType;
       if (variableString.match(this.envRefSyntax)) {

packages/loaders/prisma/src/prisma-yml/constants.ts

@@ -1,4 +1,4 @@
-import { invert } from 'lodash';
+import _ from 'lodash';
 
 export const cloudApiEndpoint = process.env['CLOUD_API_ENDPOINT'] || 'https://api.cloud.prisma.sh';
 
@@ -7,4 +7,4 @@ export const clusterEndpointMap: { [key: string]: string } = {
   'prisma-us1': 'https://us1.prisma.sh',
 };
 
-export const clusterEndpointMapReverse: { [key: string]: string } = invert(clusterEndpointMap);
+export const clusterEndpointMapReverse: { [key: string]: string } = _.invert(clusterEndpointMap);