@envelop/core 1.8.0-alpha-f56d3a3.0 → 2.0.0

package/index.js

@@ -303,11 +303,19 @@ function errorAsyncIterator(source, onError) {
 function createEnvelopOrchestrator(plugins) {
     let schema = null;
     let initDone = false;
+    const onResolversHandlers = [];
+    for (const plugin of plugins) {
+        if (plugin.onResolverCalled) {
+            onResolversHandlers.push(plugin.onResolverCalled);
+        }
+    }
     // Define the initial method for replacing the GraphQL schema, this is needed in order
     // to allow setting the schema from the onPluginInit callback. We also need to make sure
     // here not to call the same plugin that initiated the schema switch.
     const replaceSchema = (newSchema, ignorePluginIndex = -1) => {
-        prepareTracedSchema(newSchema);
+        if (onResolversHandlers.length) {
+            prepareTracedSchema(newSchema);
+        }
         schema = newSchema;
         if (initDone) {
             for (const [i, plugin] of plugins.entries()) {
@@ -519,101 +527,100 @@ function createEnvelopOrchestrator(plugins) {
             }
         }
         : initialContext => orchestratorCtx => orchestratorCtx ? { ...initialContext, ...orchestratorCtx } : initialContext;
-    const customSubscribe = makeSubscribe(async (args) => {
-        const onResolversHandlers = [];
-        let subscribeFn = graphql.subscribe;
-        const afterCalls = [];
-        const subscribeErrorHandlers = [];
-        let context = args.contextValue || {};
-        for (const onSubscribe of beforeCallbacks.subscribe) {
-            const after = await onSubscribe({
-                subscribeFn,
-                setSubscribeFn: newSubscribeFn => {
-                    subscribeFn = newSubscribeFn;
-                },
-                extendContext: extension => {
-                    context = { ...context, ...extension };
-                },
-                args: args,
-            });
-            if (after) {
-                if (after.onSubscribeResult) {
-                    afterCalls.push(after.onSubscribeResult);
-                }
-                if (after.onSubscribeError) {
-                    subscribeErrorHandlers.push(after.onSubscribeError);
-                }
-                if (after.onResolverCalled) {
-                    onResolversHandlers.push(after.onResolverCalled);
+    const useCustomSubscribe = beforeCallbacks.subscribe.length || onResolversHandlers.length;
+    const customSubscribe = useCustomSubscribe
+        ? makeSubscribe(async (args) => {
+            let subscribeFn = graphql.subscribe;
+            const afterCalls = [];
+            const subscribeErrorHandlers = [];
+            let context = args.contextValue || {};
+            for (const onSubscribe of beforeCallbacks.subscribe) {
+                const after = await onSubscribe({
+                    subscribeFn,
+                    setSubscribeFn: newSubscribeFn => {
+                        subscribeFn = newSubscribeFn;
+                    },
+                    extendContext: extension => {
+                        context = { ...context, ...extension };
+                    },
+                    args: args,
+                });
+                if (after) {
+                    if (after.onSubscribeResult) {
+                        afterCalls.push(after.onSubscribeResult);
+                    }
+                    if (after.onSubscribeError) {
+                        subscribeErrorHandlers.push(after.onSubscribeError);
+                    }
                 }
             }
-        }
-        if (onResolversHandlers.length) {
-            context[resolversHooksSymbol] = onResolversHandlers;
-        }
-        let result = await subscribeFn({
-            ...args,
-            contextValue: context,
-            // Casted for GraphQL.js 15 compatibility
-            // Can be removed once we drop support for GraphQL.js 15
-        });
-        const onNextHandler = [];
-        const onEndHandler = [];
-        for (const afterCb of afterCalls) {
-            const hookResult = afterCb({
-                args: args,
-                result,
-                setResult: newResult => {
-                    result = newResult;
-                },
-            });
-            if (hookResult) {
-                if (hookResult.onNext) {
-                    onNextHandler.push(hookResult.onNext);
-                }
-                if (hookResult.onEnd) {
-                    onEndHandler.push(hookResult.onEnd);
-                }
+            if (onResolversHandlers.length) {
+                context[resolversHooksSymbol] = onResolversHandlers;
             }
-        }
-        if (onNextHandler.length && isAsyncIterable(result)) {
-            result = mapAsyncIterator(result, async (result) => {
-                for (const onNext of onNextHandler) {
-                    await onNext({
-                        args: args,
-                        result,
-                        setResult: newResult => (result = newResult),
-                    });
-                }
-                return result;
-            });
-        }
-        if (onEndHandler.length && isAsyncIterable(result)) {
-            result = finalAsyncIterator(result, () => {
-                for (const onEnd of onEndHandler) {
-                    onEnd();
-                }
+            let result = await subscribeFn({
+                ...args,
+                contextValue: context,
+                // Casted for GraphQL.js 15 compatibility
+                // Can be removed once we drop support for GraphQL.js 15
             });
-        }
-        if (subscribeErrorHandlers.length && isAsyncIterable(result)) {
-            result = errorAsyncIterator(result, err => {
-                let error = err;
-                for (const handler of subscribeErrorHandlers) {
-                    handler({
-                        error,
-                        setError: err => {
-                            error = err;
-                        },
-                    });
+            const onNextHandler = [];
+            const onEndHandler = [];
+            for (const afterCb of afterCalls) {
+                const hookResult = afterCb({
+                    args: args,
+                    result,
+                    setResult: newResult => {
+                        result = newResult;
+                    },
+                });
+                if (hookResult) {
+                    if (hookResult.onNext) {
+                        onNextHandler.push(hookResult.onNext);
+                    }
+                    if (hookResult.onEnd) {
+                        onEndHandler.push(hookResult.onEnd);
+                    }
                 }
-                throw error;
-            });
-        }
-        return result;
-    });
-    const customExecute = beforeCallbacks.execute.length
+            }
+            if (onNextHandler.length && isAsyncIterable(result)) {
+                result = mapAsyncIterator(result, async (result) => {
+                    for (const onNext of onNextHandler) {
+                        await onNext({
+                            args: args,
+                            result,
+                            setResult: newResult => (result = newResult),
+                        });
+                    }
+                    return result;
+                });
+            }
+            if (onEndHandler.length && isAsyncIterable(result)) {
+                result = finalAsyncIterator(result, () => {
+                    for (const onEnd of onEndHandler) {
+                        onEnd();
+                    }
+                });
+            }
+            if (subscribeErrorHandlers.length && isAsyncIterable(result)) {
+                result = errorAsyncIterator(result, err => {
+                    let error = err;
+                    for (const handler of subscribeErrorHandlers) {
+                        handler({
+                            error,
+                            setError: err => {
+                                error = err;
+                            },
+                        });
+                    }
+                    throw error;
+                });
+            }
+            return result;
+        })
+        : makeSubscribe(graphql.subscribe);
+    const useCustomExecute = beforeCallbacks.execute.length || onResolversHandlers.length;
+    const customExecute = useCustomExecute
         ? makeExecute(async (args) => {
-            const onResolversHandlers = [];
             let executeFn = graphql.execute;
             let result;
             const afterCalls = [];
@@ -649,9 +656,6 @@ function createEnvelopOrchestrator(plugins) {
                     if (after.onExecuteDone) {
                         afterCalls.push(after.onExecuteDone);
                     }
-                    if (after.onResolverCalled) {
-                        onResolversHandlers.push(after.onResolverCalled);
-                    }
                 }
             }
             if (onResolversHandlers.length) {
@@ -1004,12 +1008,12 @@ const useTiming = (rawOptions) => {
                     onExecuteDone: () => {
                         options.onExecutionMeasurement(args, deltaFrom(executeStartTime));
                     },
-                    onResolverCalled: ({ info }) => {
-                        const resolverStartTime = process.hrtime();
-                        return () => {
-                            options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
-                        };
-                    },
+                };
+            };
+            result.onResolverCalled = ({ info }) => {
+                const resolverStartTime = process.hrtime();
+                return () => {
+                    options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                 };
             };
         }
@@ -1038,12 +1042,12 @@ const useTiming = (rawOptions) => {
                     onSubscribeResult: () => {
                         options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom(subscribeStartTime));
                     },
-                    onResolverCalled: ({ info }) => {
-                        const resolverStartTime = process.hrtime();
-                        return () => {
-                            options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
-                        };
-                    },
+                };
+            };
+            result.onResolverCalled = ({ info }) => {
+                const resolverStartTime = process.hrtime();
+                return () => {
+                    options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                 };
             };
         }

package/index.mjs

@@ -1,5 +1,5 @@
 export * from '@envelop/types';
-import { isIntrospectionType, isObjectType, defaultFieldResolver, Kind, visit, BREAK, parse, specifiedRules, validate, execute, subscribe, GraphQLSchema, getOperationAST, GraphQLError } from 'graphql';
+import { isIntrospectionType, isObjectType, defaultFieldResolver, Kind, visit, BREAK, parse, specifiedRules, validate, subscribe, execute, GraphQLSchema, getOperationAST, GraphQLError } from 'graphql';
 
 /**
  * This enum is used only internally in order to create nominal type for the disabled plugin
@@ -299,11 +299,19 @@ function errorAsyncIterator(source, onError) {
 function createEnvelopOrchestrator(plugins) {
     let schema = null;
     let initDone = false;
+    const onResolversHandlers = [];
+    for (const plugin of plugins) {
+        if (plugin.onResolverCalled) {
+            onResolversHandlers.push(plugin.onResolverCalled);
+        }
+    }
     // Define the initial method for replacing the GraphQL schema, this is needed in order
     // to allow setting the schema from the onPluginInit callback. We also need to make sure
     // here not to call the same plugin that initiated the schema switch.
     const replaceSchema = (newSchema, ignorePluginIndex = -1) => {
-        prepareTracedSchema(newSchema);
+        if (onResolversHandlers.length) {
+            prepareTracedSchema(newSchema);
+        }
         schema = newSchema;
         if (initDone) {
             for (const [i, plugin] of plugins.entries()) {
@@ -515,101 +523,100 @@ function createEnvelopOrchestrator(plugins) {
             }
         }
         : initialContext => orchestratorCtx => orchestratorCtx ? { ...initialContext, ...orchestratorCtx } : initialContext;
-    const customSubscribe = makeSubscribe(async (args) => {
-        const onResolversHandlers = [];
-        let subscribeFn = subscribe;
-        const afterCalls = [];
-        const subscribeErrorHandlers = [];
-        let context = args.contextValue || {};
-        for (const onSubscribe of beforeCallbacks.subscribe) {
-            const after = await onSubscribe({
-                subscribeFn,
-                setSubscribeFn: newSubscribeFn => {
-                    subscribeFn = newSubscribeFn;
-                },
-                extendContext: extension => {
-                    context = { ...context, ...extension };
-                },
-                args: args,
-            });
-            if (after) {
-                if (after.onSubscribeResult) {
-                    afterCalls.push(after.onSubscribeResult);
-                }
-                if (after.onSubscribeError) {
-                    subscribeErrorHandlers.push(after.onSubscribeError);
-                }
-                if (after.onResolverCalled) {
-                    onResolversHandlers.push(after.onResolverCalled);
+    const useCustomSubscribe = beforeCallbacks.subscribe.length || onResolversHandlers.length;
+    const customSubscribe = useCustomSubscribe
+        ? makeSubscribe(async (args) => {
+            let subscribeFn = subscribe;
+            const afterCalls = [];
+            const subscribeErrorHandlers = [];
+            let context = args.contextValue || {};
+            for (const onSubscribe of beforeCallbacks.subscribe) {
+                const after = await onSubscribe({
+                    subscribeFn,
+                    setSubscribeFn: newSubscribeFn => {
+                        subscribeFn = newSubscribeFn;
+                    },
+                    extendContext: extension => {
+                        context = { ...context, ...extension };
+                    },
+                    args: args,
+                });
+                if (after) {
+                    if (after.onSubscribeResult) {
+                        afterCalls.push(after.onSubscribeResult);
+                    }
+                    if (after.onSubscribeError) {
+                        subscribeErrorHandlers.push(after.onSubscribeError);
+                    }
                 }
             }
-        }
-        if (onResolversHandlers.length) {
-            context[resolversHooksSymbol] = onResolversHandlers;
-        }
-        let result = await subscribeFn({
-            ...args,
-            contextValue: context,
-            // Casted for GraphQL.js 15 compatibility
-            // Can be removed once we drop support for GraphQL.js 15
-        });
-        const onNextHandler = [];
-        const onEndHandler = [];
-        for (const afterCb of afterCalls) {
-            const hookResult = afterCb({
-                args: args,
-                result,
-                setResult: newResult => {
-                    result = newResult;
-                },
-            });
-            if (hookResult) {
-                if (hookResult.onNext) {
-                    onNextHandler.push(hookResult.onNext);
-                }
-                if (hookResult.onEnd) {
-                    onEndHandler.push(hookResult.onEnd);
-                }
+            if (onResolversHandlers.length) {
+                context[resolversHooksSymbol] = onResolversHandlers;
             }
-        }
-        if (onNextHandler.length && isAsyncIterable(result)) {
-            result = mapAsyncIterator(result, async (result) => {
-                for (const onNext of onNextHandler) {
-                    await onNext({
-                        args: args,
-                        result,
-                        setResult: newResult => (result = newResult),
-                    });
-                }
-                return result;
-            });
-        }
-        if (onEndHandler.length && isAsyncIterable(result)) {
-            result = finalAsyncIterator(result, () => {
-                for (const onEnd of onEndHandler) {
-                    onEnd();
-                }
+            let result = await subscribeFn({
+                ...args,
+                contextValue: context,
+                // Casted for GraphQL.js 15 compatibility
+                // Can be removed once we drop support for GraphQL.js 15
             });
-        }
-        if (subscribeErrorHandlers.length && isAsyncIterable(result)) {
-            result = errorAsyncIterator(result, err => {
-                let error = err;
-                for (const handler of subscribeErrorHandlers) {
-                    handler({
-                        error,
-                        setError: err => {
-                            error = err;
-                        },
-                    });
+            const onNextHandler = [];
+            const onEndHandler = [];
+            for (const afterCb of afterCalls) {
+                const hookResult = afterCb({
+                    args: args,
+                    result,
+                    setResult: newResult => {
+                        result = newResult;
+                    },
+                });
+                if (hookResult) {
+                    if (hookResult.onNext) {
+                        onNextHandler.push(hookResult.onNext);
+                    }
+                    if (hookResult.onEnd) {
+                        onEndHandler.push(hookResult.onEnd);
+                    }
                 }
-                throw error;
-            });
-        }
-        return result;
-    });
-    const customExecute = beforeCallbacks.execute.length
+            }
+            if (onNextHandler.length && isAsyncIterable(result)) {
+                result = mapAsyncIterator(result, async (result) => {
+                    for (const onNext of onNextHandler) {
+                        await onNext({
+                            args: args,
+                            result,
+                            setResult: newResult => (result = newResult),
+                        });
+                    }
+                    return result;
+                });
+            }
+            if (onEndHandler.length && isAsyncIterable(result)) {
+                result = finalAsyncIterator(result, () => {
+                    for (const onEnd of onEndHandler) {
+                        onEnd();
+                    }
+                });
+            }
+            if (subscribeErrorHandlers.length && isAsyncIterable(result)) {
+                result = errorAsyncIterator(result, err => {
+                    let error = err;
+                    for (const handler of subscribeErrorHandlers) {
+                        handler({
+                            error,
+                            setError: err => {
+                                error = err;
+                            },
+                        });
+                    }
+                    throw error;
+                });
+            }
+            return result;
+        })
+        : makeSubscribe(subscribe);
+    const useCustomExecute = beforeCallbacks.execute.length || onResolversHandlers.length;
+    const customExecute = useCustomExecute
         ? makeExecute(async (args) => {
-            const onResolversHandlers = [];
             let executeFn = execute;
             let result;
             const afterCalls = [];
@@ -645,9 +652,6 @@ function createEnvelopOrchestrator(plugins) {
                     if (after.onExecuteDone) {
                         afterCalls.push(after.onExecuteDone);
                     }
-                    if (after.onResolverCalled) {
-                        onResolversHandlers.push(after.onResolverCalled);
-                    }
                 }
             }
             if (onResolversHandlers.length) {
@@ -1000,12 +1004,12 @@ const useTiming = (rawOptions) => {
                     onExecuteDone: () => {
                         options.onExecutionMeasurement(args, deltaFrom(executeStartTime));
                     },
-                    onResolverCalled: ({ info }) => {
-                        const resolverStartTime = process.hrtime();
-                        return () => {
-                            options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
-                        };
-                    },
+                };
+            };
+            result.onResolverCalled = ({ info }) => {
+                const resolverStartTime = process.hrtime();
+                return () => {
+                    options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                 };
             };
         }
@@ -1034,12 +1038,12 @@ const useTiming = (rawOptions) => {
                     onSubscribeResult: () => {
                         options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom(subscribeStartTime));
                     },
-                    onResolverCalled: ({ info }) => {
-                        const resolverStartTime = process.hrtime();
-                        return () => {
-                            options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
-                        };
-                    },
+                };
+            };
+            result.onResolverCalled = ({ info }) => {
+                const resolverStartTime = process.hrtime();
+                return () => {
+                    options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                 };
             };
         }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@envelop/core",
-  "version": "1.8.0-alpha-f56d3a3.0",
+  "version": "2.0.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@envelop/types": "1.6.0-alpha-f56d3a3.0"
+    "@envelop/types": "2.0.0"
   },
   "repository": {
     "type": "git",