.eslintrc.json

@@ -7,8 +7,7 @@
     "eslint:recommended",
     "standard",
     "prettier",
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint"
+    "plugin:@typescript-eslint/recommended"
   ],
   "plugins": ["@typescript-eslint"],
   "rules": {

package.json

@@ -7,14 +7,13 @@
     "postinstall": "patch-package",
     "predeploy:website": "yarn build:api-docs",
     "deploy:website": "cd website && yarn deploy",
-    "ts:transpile": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.es5.json",
+    "ts:transpile": "concurrently \"tsc --project tsconfig.build.json\" \"tsc --project tsconfig.build.es5.json\"",
     "build": "yarn ts:transpile && bob build",
     "build:api-docs": "node scripts/build-api-docs.js",
     "lint": "eslint --ext .ts .",
     "prettier": "prettier --ignore-path .gitignore --write --list-different \"**/*.{ts,tsx,graphql,yml}\"",
     "prettier:check": "prettier --ignore-path .gitignore --check \"**/*.{ts,tsx,graphql,yml}\"",
     "test": "jest --no-watchman --forceExit",
-    "test-and-build": "yarn build && yarn test",
     "prerelease": "yarn build",
     "prerelease-canary": "yarn build",
     "release": "changeset publish",
@@ -45,12 +44,13 @@
     "patch-package": "6.2.2",
     "@changesets/cli": "2.14.0",
     "@types/jest": "26.0.20",
-    "@types/node": "14.14.28",
-    "@typescript-eslint/eslint-plugin": "4.15.1",
-    "@typescript-eslint/parser": "4.15.1",
+    "@types/node": "14.14.31",
+    "@typescript-eslint/eslint-plugin": "4.15.2",
+    "@typescript-eslint/parser": "4.15.2",
     "@ardatan/bob-the-bundler": "1.2.2",
+    "concurrently": "6.0.0",
     "eslint": "7.20.0",
-    "eslint-config-prettier": "7.2.0",
+    "eslint-config-prettier": "8.0.0",
     "eslint-config-standard": "16.0.2",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-node": "11.1.0",
@@ -64,10 +64,10 @@
     "lint-staged": "10.5.4",
     "nock": "13.0.7",
     "prettier": "2.2.1",
-    "ts-jest": "26.5.1",
-    "typedoc": "0.20.25",
+    "ts-jest": "26.5.2",
+    "typedoc": "0.20.28",
     "typedoc-plugin-markdown": "3.5.0",
-    "typescript": "4.1.5"
+    "typescript": "4.2.2"
   },
   "husky": {
     "hooks": {

packages/batch-delegate/package.json

@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@graphql-tools/schema": "7.1.3",
-    "@graphql-tools/stitch": "7.3.0",
+    "@graphql-tools/stitch": "7.4.0",
     "@graphql-tools/utils": "7.5.0"
   },
   "publishConfig": {

packages/graphql-tag-pluck/package.json

@@ -19,9 +19,9 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@babel/parser": "7.12.16",
-    "@babel/traverse": "7.12.13",
-    "@babel/types": "7.12.13",
+    "@babel/parser": "7.13.4",
+    "@babel/traverse": "7.13.0",
+    "@babel/types": "7.13.0",
     "@graphql-tools/utils": "^7.0.0",
     "tslib": "~2.1.0"
   },

packages/links/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/links
 
+## 7.0.6
+
+### Patch Changes
+
+- 1516c89a: fix(links): fix typing issues with linkToExecutor and AsyncExecutor
+
 ## 7.0.5
 
 ### Patch Changes

packages/links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/links",
-  "version": "7.0.5",
+  "version": "7.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",

packages/links/src/linkToExecutor.ts

@@ -2,12 +2,12 @@ import { ApolloLink, execute } from '@apollo/client/link/core';
 import { Observable } from '@apollo/client/utilities';
 import { toPromise } from '@apollo/client/link/utils';
 
-import { Executor, ExecutionParams } from '@graphql-tools/delegate';
+import { AsyncExecutor, ExecutionParams } from '@graphql-tools/delegate';
 import { ExecutionResult } from '@graphql-tools/utils';
 
-export const linkToExecutor = (link: ApolloLink): Executor => <TReturn, TArgs, TContext>(
+export const linkToExecutor = (link: ApolloLink): AsyncExecutor => <TReturn, TArgs, TContext>(
   params: ExecutionParams<TArgs, TContext>
-): ExecutionResult<TReturn> | Promise<ExecutionResult<TReturn>> => {
+): Promise<ExecutionResult<TReturn>> => {
   const { document, variables, extensions, context, info } = params;
   return toPromise(
     execute(link, {

packages/merge/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @graphql-tools/merge
 
+## 6.2.10
+
+### Patch Changes
+
+- 0194118f: Introduces a suite of stitched schema validations that enforce the integrity of merged schemas. This includes validations for:
+
+  - Strict and safe null consistency (the later of which allows safe transitions in nullability).
+  - Named type consistency with the option to whitelist proxiable scalar mappings.
+  - Argument and input field name consistency.
+  - Enum value consistency when used as an input value.
+
+  Validations may be adjusted by setting `validationLevel` to `off|warn|error` globally or scoped for specific types and fields. In this initial v7 release, all validations are introduced at the `warn` threshold for backwards compatibility. Most of these validations will become automatic errors in v8. To enable validation errors now, set `validationLevel: 'error'`. Full configuration options look like this:
+
+  ```js
+  const gatewaySchema = stitchSchemas({
+    subschemas: [...],
+    typeMergingOptions: {
+      validationSettings: {
+        validationLevel: 'error',
+        strictNullComparison: false, // << gateway "String" may proxy subschema "String!"
+        proxiableScalars: {
+          ID: ['String'], // << gateway "ID" may proxy subschema "String"
+        }
+      },
+      validationScopes: {
+        // scope to specific element paths
+        'User.id': {
+          validationLevel: 'warn',
+          strictNullComparison: true,
+        },
+      }
+    },
+  });
+  ```
+
 ## 6.2.9
 
 ### Patch Changes

packages/merge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/merge",
-  "version": "6.2.9",
+  "version": "6.2.10",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",

packages/merge/src/typedefs-mergers/fields.ts

@@ -5,10 +5,10 @@ import { mergeDirectives } from './directives';
 import { isNotEqual, compareNodes } from '@graphql-tools/utils';
 import { mergeArguments } from './arguments';
 
-function fieldAlreadyExists(fieldsArr: ReadonlyArray<any>, otherField: any): boolean {
+function fieldAlreadyExists(fieldsArr: ReadonlyArray<any>, otherField: any, config?: Config): boolean {
   const result: FieldDefinitionNode | null = fieldsArr.find(field => field.name.value === otherField.name.value);
 
-  if (result) {
+  if (result && !config?.ignoreFieldConflicts) {
     const t1 = extractType(result.type);
     const t2 = extractType(otherField.type);
 
@@ -26,22 +26,24 @@ export function mergeFields<T extends FieldDefinitionNode | InputValueDefinition
   type: { name: NameNode },
   f1: ReadonlyArray<T>,
   f2: ReadonlyArray<T>,
-  config: Config
+  config?: Config
 ): T[] {
   const result: T[] = [...f2];
 
   for (const field of f1) {
-    if (fieldAlreadyExists(result, field)) {
+    if (fieldAlreadyExists(result, field, config)) {
       const existing: any = result.find((f: any) => f.name.value === (field as any).name.value);
 
-      if (config && config.throwOnConflict) {
-        preventConflicts(type, existing, field, false);
-      } else {
-        preventConflicts(type, existing, field, true);
-      }
+      if (!config?.ignoreFieldConflicts) {
+        if (config?.throwOnConflict) {
+          preventConflicts(type, existing, field, false);
+        } else {
+          preventConflicts(type, existing, field, true);
+        }
 
-      if (isNonNullTypeNode(field.type) && !isNonNullTypeNode(existing.type)) {
-        existing.type = field.type;
+        if (isNonNullTypeNode(field.type) && !isNonNullTypeNode(existing.type)) {
+          existing.type = field.type;
+        }
       }
 
       existing.arguments = mergeArguments(field['arguments'] || [], existing.arguments || [], config);

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

@@ -58,6 +58,7 @@ export interface Config {
   sort?: boolean | CompareFn<string>;
   convertExtensions?: boolean;
   consistentEnumMerge?: boolean;
+  ignoreFieldConflicts?: boolean;
 }
 
 /**

packages/mock/tests/addMocksToSchema.spec.ts

@@ -20,20 +20,25 @@ type UserImageURL {
   url: String!
 }
 
+scalar Date
+
 interface Book {
   id: ID!
   title: String
+  publishedAt: Date
 }
 
 type TextBook implements Book {
   id: ID!
   title: String
+  publishedAt: Date
   text: String
 }
 
 type ColoringBook implements Book {
   id: ID!
   title: String
+  publishedAt: Date
   colors: [String]
 }
 
@@ -201,4 +206,33 @@ describe('addMocksToSchema', () => {
     expect(data).toBeDefined();
     expect(data!['viewer']['book']['__typename']).toBeDefined();
   });
+  it('should handle custom scalars', async () => {
+
+    const mockDate = new Date().toJSON().split('T')[0];
+
+    const query = `
+      query {
+        viewer {
+          book {
+            title
+            publishedAt
+          }
+        }
+      }
+    `;
+
+    const mockedSchema = addMocksToSchema({ schema, mocks: {
+      Date: () => mockDate
+    }});
+    const { data, errors } = await graphql({
+      schema: mockedSchema,
+      source: query,
+    });
+
+
+    expect(errors).not.toBeDefined();
+    expect(data).toBeDefined();
+    expect(data!['viewer']['book']['publishedAt']).toBe(mockDate);
+
+  })
 });

packages/resolvers-composition/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @graphql-tools/resolvers-composition
 
+## 6.2.6
+
+### Patch Changes
+
+- 0194118f: chore(resolvers-composition): bump lodash version
+
 ## 6.2.5
 
 ### Patch Changes

packages/resolvers-composition/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/resolvers-composition",
-  "version": "6.2.5",
+  "version": "6.2.6",
   "description": "Common package containing utils and types for GraphQL tools",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@graphql-tools/utils": "^7.0.0",
-    "lodash": "4.17.20",
+    "lodash": "4.17.21",
     "tslib": "~2.1.0"
   },
   "publishConfig": {

packages/stitch/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @graphql-tools/stitch
 
+## 7.4.0
+
+### Minor Changes
+
+- 0194118f: Introduces a suite of stitched schema validations that enforce the integrity of merged schemas. This includes validations for:
+
+  - Strict and safe null consistency (the later of which allows safe transitions in nullability).
+  - Named type consistency with the option to whitelist proxiable scalar mappings.
+  - Argument and input field name consistency.
+  - Enum value consistency when used as an input value.
+
+  Validations may be adjusted by setting `validationLevel` to `off|warn|error` globally or scoped for specific types and fields. In this initial v7 release, all validations are introduced at the `warn` threshold for backwards compatibility. Most of these validations will become automatic errors in v8. To enable validation errors now, set `validationLevel: 'error'`. Full configuration options look like this:
+
+  ```js
+  const gatewaySchema = stitchSchemas({
+    subschemas: [...],
+    typeMergingOptions: {
+      validationSettings: {
+        validationLevel: 'error',
+        strictNullComparison: false, // << gateway "String" may proxy subschema "String!"
+        proxiableScalars: {
+          ID: ['String'], // << gateway "ID" may proxy subschema "String"
+        }
+      },
+      validationScopes: {
+        // scope to specific element paths
+        'User.id': {
+          validationLevel: 'warn',
+          strictNullComparison: true,
+        },
+      }
+    },
+  });
+  ```
+
+### Patch Changes
+
+- Updated dependencies [0194118f]
+  - @graphql-tools/merge@6.2.10
+
 ## 7.3.0
 
 ### Minor Changes

packages/stitch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/stitch",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@graphql-tools/batch-delegate": "^7.0.0",
     "@graphql-tools/delegate": "^7.0.10",
-    "@graphql-tools/merge": "^6.2.7",
+    "@graphql-tools/merge": "^6.2.10",
     "@graphql-tools/schema": "^7.1.2",
     "@graphql-tools/utils": "^7.2.4",
     "@graphql-tools/wrap": "^7.0.3",