@envelop/core 2.2.0-alpha-4f3adf1.0 → 2.3.0

package/index.js

@@ -486,8 +486,9 @@ function createEnvelopOrchestrator(plugins) {
     const customContextFactory = beforeCallbacks.context.length
         ? initialContext => async (orchestratorCtx) => {
             const afterCalls = [];
+            // In order to have access to the "last working" context object we keep this outside of the try block:
+            let context = orchestratorCtx ? { ...initialContext, ...orchestratorCtx } : initialContext;
             try {
-                let context = orchestratorCtx ? { ...initialContext, ...orchestratorCtx } : initialContext;
                 let isBreakingContextBuilding = false;
                 for (const onContext of beforeCallbacks.context) {
                     const afterHookResult = await onContext({
@@ -520,6 +521,7 @@ function createEnvelopOrchestrator(plugins) {
                 let error = err;
                 for (const errorCb of contextErrorHandlers) {
                     errorCb({
+                        context,
                         error,
                         setError: err => {
                             error = err;
@@ -1225,12 +1227,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

@@ -482,8 +482,9 @@ function createEnvelopOrchestrator(plugins) {
     const customContextFactory = beforeCallbacks.context.length
         ? initialContext => async (orchestratorCtx) => {
             const afterCalls = [];
+            // In order to have access to the "last working" context object we keep this outside of the try block:
+            let context = orchestratorCtx ? { ...initialContext, ...orchestratorCtx } : initialContext;
             try {
-                let context = orchestratorCtx ? { ...initialContext, ...orchestratorCtx } : initialContext;
                 let isBreakingContextBuilding = false;
                 for (const onContext of beforeCallbacks.context) {
                     const afterHookResult = await onContext({
@@ -516,6 +517,7 @@ function createEnvelopOrchestrator(plugins) {
                 let error = err;
                 for (const errorCb of contextErrorHandlers) {
                     errorCb({
+                        context,
                         error,
                         setError: err => {
                             error = err;
@@ -1221,12 +1223,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.2.0-alpha-4f3adf1.0",
+  "version": "2.3.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@envelop/types": "2.1.0-alpha-4f3adf1.0"
+    "@envelop/types": "2.2.0"
   },
   "repository": {
     "type": "git",