@envelop/core 2.1.1-alpha-698c9eb.0 → 2.1.1-alpha-60d043b.0

package/index.js

@@ -1199,12 +1199,15 @@ const useMaskedErrors = (opts) => {
     };
 };
 
-const OnNonIntrospectionFieldReachedValidationRule = (onNonIntrospectionField) => () => {
+const OnNonIntrospectionFieldReachedValidationRule = (onNonIntrospectionField) => ctx => {
+    const rootQueryType = ctx.getSchema().getQueryType();
     return {
         Field(field) {
-            if (!field.name.value.startsWith('__')) {
+            if (ctx.getParentType() === rootQueryType && !field.name.value.startsWith('__')) {
                 onNonIntrospectionField();
+                return graphql.BREAK;
             }
+            return undefined;
         },
     };
 };

package/index.mjs

@@ -1195,12 +1195,15 @@ const useMaskedErrors = (opts) => {
     };
 };
 
-const OnNonIntrospectionFieldReachedValidationRule = (onNonIntrospectionField) => () => {
+const OnNonIntrospectionFieldReachedValidationRule = (onNonIntrospectionField) => ctx => {
+    const rootQueryType = ctx.getSchema().getQueryType();
     return {
         Field(field) {
-            if (!field.name.value.startsWith('__')) {
+            if (ctx.getParentType() === rootQueryType && !field.name.value.startsWith('__')) {
                 onNonIntrospectionField();
+                return BREAK;
             }
+            return undefined;
         },
     };
 };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@envelop/core",
-  "version": "2.1.1-alpha-698c9eb.0",
+  "version": "2.1.1-alpha-60d043b.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@envelop/types": "2.0.1-alpha-698c9eb.0"
+    "@envelop/types": "2.0.0"
   },
   "repository": {
     "type": "git",

package/plugins/use-error-handler.d.ts

@@ -1,4 +1,4 @@
 import { Plugin, DefaultContext } from '@envelop/types';
 import { GraphQLError } from 'graphql';
 export declare type ErrorHandler = (errors: readonly GraphQLError[], context: Readonly<DefaultContext>) => void;
-export declare const useErrorHandler: <ContextType>(errorHandler: ErrorHandler) => Plugin<ContextType, ContextType>;
+export declare const useErrorHandler: <ContextType>(errorHandler: ErrorHandler) => Plugin<ContextType>;

package/plugins/use-extend-context.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from '@envelop/types';
 export declare type ContextFactoryFn<TResult = unknown, TCurrent = unknown> = (currentContext: TCurrent) => TResult | Promise<TResult>;
 declare type UnwrapAsync<T> = T extends Promise<infer U> ? U : T;
-export declare const useExtendContext: <TContextFactory extends (...args: any[]) => any>(contextFactory: TContextFactory) => Plugin<UnwrapAsync<ReturnType<TContextFactory>>, UnwrapAsync<ReturnType<TContextFactory>>>;
+export declare const useExtendContext: <TContextFactory extends (...args: any[]) => any>(contextFactory: TContextFactory) => Plugin<UnwrapAsync<ReturnType<TContextFactory>>>;
 export {};

package/utils.d.ts

@@ -28,6 +28,6 @@ export declare function isAsyncIterable<TType>(maybeAsyncIterable: unknown): may
  * @param fn The handler to be executed on each result
  * @returns a subscription for streamed results, or undefined in case of an non-async
  */
-export declare function handleStreamOrSingleExecutionResult<TInputContext = DefaultContext, TOutputContext = TInputContext>(payload: OnExecuteDoneEventPayload<TInputContext, TOutputContext>, fn: OnExecuteDoneHookResultOnNextHook<TInputContext, TOutputContext>): void | OnExecuteDoneHookResult<TInputContext, TOutputContext>;
+export declare function handleStreamOrSingleExecutionResult<ContextType = DefaultContext>(payload: OnExecuteDoneEventPayload<ContextType>, fn: OnExecuteDoneHookResultOnNextHook<ContextType>): void | OnExecuteDoneHookResult<ContextType>;
 export declare function finalAsyncIterator<TInput>(source: AsyncIterable<TInput>, onFinal: () => void): AsyncGenerator<TInput>;
 export declare function errorAsyncIterator<TInput>(source: AsyncIterable<TInput>, onError: (err: unknown) => void): AsyncGenerator<TInput>;