fix: prevent double-wrapping of field.resolve (#1773)

* fix: prevent double-wrapping of field.resolve fixes #1772

* fix: useOnResolve double-wrap prevention should be on field not field.resolve

.changeset/eighty-ties-lay.md

@@ -0,0 +1,5 @@
+---
+'@envelop/on-resolve': patch
+---
+
+Prevent re-wrapping field resolvers with useOnResolve plugin. Fixes #1773

packages/plugins/on-resolve/src/index.ts

@@ -40,6 +40,7 @@ export type OnResolve<PluginContext extends Record<string, any> = {}> = (
 export function useOnResolve<PluginContext extends Record<string, any> = {}>(
   onResolve: OnResolve<PluginContext>,
 ): Plugin<PluginContext> {
+  const hasWrappedResolveSymbol = Symbol('hasWrappedResolve');
   return {
     onSchemaChange({ schema: _schema }) {
       const schema = _schema as GraphQLSchema;
@@ -48,6 +49,8 @@ export function useOnResolve<PluginContext extends Record<string, any> = {}>(
       for (const type of Object.values(schema.getTypeMap())) {
         if (!isIntrospectionType(type) && isObjectType(type)) {
           for (const field of Object.values(type.getFields())) {
+            if (field[hasWrappedResolveSymbol]) continue;
+
             let resolver = (field.resolve || defaultFieldResolver) as Resolver<PluginContext>;
 
             field.resolve = async (root, args, context, info) => {
@@ -83,6 +86,8 @@ export function useOnResolve<PluginContext extends Record<string, any> = {}>(
               }
               return result;
             };
+
+            field[hasWrappedResolveSymbol] = true;
           }
         }
       }

packages/plugins/on-resolve/test/use-on-resolve.spec.ts

@@ -1,4 +1,4 @@
-import { OnResolveOptions, useOnResolve } from '@envelop/on-resolve';
+import { AfterResolver, OnResolveOptions, useOnResolve } from '@envelop/on-resolve';
 import { assertSingleExecutionValue, createTestkit } from '@envelop/testing';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 
@@ -60,4 +60,31 @@ describe('useOnResolve', () => {
 
     expect(result.data?.value1).toBe('value2');
   });
+
+  it('should only execute the onResolve function once after the schema has been replaced', async () => {
+    const afterResolve: AfterResolver = jest.fn(({ setResult }) => {
+      setResult('value2');
+    });
+    const testkit = createTestkit(
+      [
+        useOnResolve(() => afterResolve),
+        // This _should_ trigger another afterResolve call
+        useOnResolve(() => afterResolve),
+        // This should _NOT_ trigger another afterResolve call
+        {
+          onSchemaChange({ schema, replaceSchema }) {
+            replaceSchema(schema);
+          },
+        },
+      ],
+      schema,
+    );
+
+    const result = await testkit.execute('{ value1 }');
+    // Expect two calls, not four.
+    expect(afterResolve).toBeCalledTimes(2);
+
+    assertSingleExecutionValue(result);
+    expect(result.data?.value1).toBe('value2');
+  });
 });