fix(mergeSchemas): Prevent custom resolvers from being overwritten by default resolvers

[borisno2]

🚨 IMPORTANT: Please do not create a Pull Request without creating an issue first.

Any change needs to be discussed before proceeding. Failure to do so may result in the rejection of the pull request.

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Related #4367

Type of change

Please delete options that are not relevant.

• Breaking change (fix or feature that would cause existing functionality to not work as expected)

Screenshots/Sandbox (if appropriate/relevant):

Adding links to sandbox or providing screenshots can help us understand more about this PR and take action on it as appropriate

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

• yarn test
• Create Schema and custom resolver, pass in schema and resolver to mergeSchema to ensure the resolver overrides the schema
• written new test should override resolver in schema with resolver passed into config

Test Environment:

• OS: MacOS
• @graphql-tools/schema:
• NodeJS: v16.15.0

Checklist:

• I have followed the CONTRIBUTING doc and the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests and linter rules pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

[changeset-bot]

🦋 Changeset detected

Latest commit: a6d2283

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 14 packages

Name	Type
@graphql-tools/schema	Major
@graphql-tools/batch-delegate	Patch
@graphql-tools/delegate	Patch
graphql-tools	Patch
@graphql-tools/load	Patch
@graphql-tools/mock	Patch
@graphql-tools/stitch	Patch
@graphql-tools/stitching-directives	Patch
@graphql-tools/wrap	Patch
@graphql-tools/links	Patch
@graphql-tools/url-loader	Patch
@graphql-tools/node-require	Patch
federation-benchmark	Patch
@graphql-tools/prisma-loader	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[vercel]

@borisno2 is attempting to deploy a commit to the The Guild Team on Vercel.

A member of the Team first needs to authorize it.

[borisno2]

Replaces #4368

[Urigo]

@borisno2 can you also add test cases that cover these behaviours?

[borisno2]

Done @Urigo

See should override resolver in schema with resolver passed into config

Fails on current code and passes on new code

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
graphql-tools	✅ Ready (Inspect)	Visit Preview	May 12, 2022 at 9:12AM (UTC)

[ardatan]

@borisno2 I couldn't edit your PR so I created a new one with some additional breaking changes since we are already going to release a major :)