@envelop/core 2.2.0-alpha-555debe.0 → 2.2.0-alpha-e0e4d8e.0

package/index.js

@@ -475,6 +475,9 @@ function createEnvelopOrchestrator(plugins) {
                     extendContext: extension => {
                         Object.assign(context, extension);
                     },
+                    setResult: newResult => {
+                        result = newResult;
+                    },
                 });
             }
             return result;
@@ -1099,33 +1102,22 @@ const useAsyncSchema = (schemaPromise) => {
     };
 };
 
-const useErrorHandler = (errorHandler) => {
-    return {
-        onValidate({ context, params }) {
-            return function ({ result }) {
-                if (result.length) {
-                    errorHandler(result, {
-                        schema: params.schema,
-                        document: params.documentAST,
-                        contextValue: context,
-                    });
-                }
-            };
-        },
-        onExecute() {
-            return {
-                onExecuteDone(payload) {
-                    return handleStreamOrSingleExecutionResult(payload, ({ result, args }) => {
-                        var _a;
-                        if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
-                            errorHandler(result.errors, args);
-                        }
-                    });
-                },
-            };
-        },
-    };
+const makeHandleResult = (errorHandler) => ({ result, args }) => {
+    var _a;
+    if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
+        errorHandler(result.errors, args);
+    }
 };
+const useErrorHandler = (errorHandler) => ({
+    onExecute() {
+        const handleResult = makeHandleResult(errorHandler);
+        return {
+            onExecuteDone(payload) {
+                return handleStreamOrSingleExecutionResult(payload, handleResult);
+            },
+        };
+    },
+});
 
 const useExtendContext = (contextFactory) => ({
     async onContextBuilding({ context, extendContext }) {
@@ -1133,7 +1125,7 @@ const useExtendContext = (contextFactory) => ({
     },
 });
 
-const makeHandleResult = (formatter) => ({ args, result, setResult, }) => {
+const makeHandleResult$1 = (formatter) => ({ args, result, setResult, }) => {
     const modified = formatter(result, args);
     if (modified !== false) {
         setResult(modified);
@@ -1141,7 +1133,7 @@ const makeHandleResult = (formatter) => ({ args, result, setResult, }) => {
 };
 const usePayloadFormatter = (formatter) => ({
     onExecute() {
-        const handleResult = makeHandleResult(formatter);
+        const handleResult = makeHandleResult$1(formatter);
         return {
             onExecuteDone(payload) {
                 return handleStreamOrSingleExecutionResult(payload, handleResult);
@@ -1157,13 +1149,18 @@ class EnvelopError extends graphql.GraphQLError {
     }
 }
 const formatError = (err, message, isDev) => {
+    var _a, _b, _c, _d;
     if (err instanceof graphql.GraphQLError) {
-        if (err.originalError && err.originalError instanceof EnvelopError === false) {
+        if (
+        /** execution error */
+        (err.originalError && err.originalError instanceof EnvelopError === false) ||
+            /** validate and parse errors */
+            (err.originalError === undefined && err instanceof EnvelopError === false)) {
             return new graphql.GraphQLError(message, err.nodes, err.source, err.positions, err.path, undefined, isDev
                 ? {
                     originalError: {
-                        message: err.originalError.message,
-                        stack: err.originalError.stack,
+                        message: (_b = (_a = err.originalError) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : err.message,
+                        stack: (_d = (_c = err.originalError) === null || _c === void 0 ? void 0 : _c.stack) !== null && _d !== void 0 ? _d : err.stack,
                     },
                 }
                 : undefined);
@@ -1172,7 +1169,7 @@ const formatError = (err, message, isDev) => {
     }
     return new graphql.GraphQLError(message);
 };
-const makeHandleResult$1 = (format, message, isDev) => ({ result, setResult }) => {
+const makeHandleResult$2 = (format, message, isDev) => ({ result, setResult }) => {
     if (result.errors != null) {
         setResult({ ...result, errors: result.errors.map(error => format(error, message, isDev)) });
     }
@@ -1183,8 +1180,26 @@ const useMaskedErrors = (opts) => {
     const message = (opts === null || opts === void 0 ? void 0 : opts.errorMessage) || DEFAULT_ERROR_MESSAGE;
     // eslint-disable-next-line dot-notation
     const isDev = (_b = opts === null || opts === void 0 ? void 0 : opts.isDev) !== null && _b !== void 0 ? _b : (typeof process !== 'undefined' ? process.env['NODE_ENV'] === 'development' : false);
-    const handleResult = makeHandleResult$1(format, message, isDev);
+    const handleResult = makeHandleResult$2(format, message, isDev);
     return {
+        onParse: (opts === null || opts === void 0 ? void 0 : opts.onParse) === true
+            ? function onParse() {
+                return function onParseEnd({ result, replaceParseResult }) {
+                    if (result instanceof Error) {
+                        replaceParseResult(format(result, message, isDev));
+                    }
+                };
+            }
+            : undefined,
+        onValidate: (opts === null || opts === void 0 ? void 0 : opts.onValidate) === true
+            ? function onValidate() {
+                return function onValidateEnd({ valid, result, setResult }) {
+                    if (valid === false) {
+                        setResult(result.map(error => format(error, message, isDev)));
+                    }
+                };
+            }
+            : undefined,
         onPluginInit(context) {
             context.registerContextErrorHandler(({ error, setError }) => {
                 setError(formatError(error, message, isDev));

package/index.mjs

@@ -471,6 +471,9 @@ function createEnvelopOrchestrator(plugins) {
                     extendContext: extension => {
                         Object.assign(context, extension);
                     },
+                    setResult: newResult => {
+                        result = newResult;
+                    },
                 });
             }
             return result;
@@ -1095,33 +1098,22 @@ const useAsyncSchema = (schemaPromise) => {
     };
 };
 
-const useErrorHandler = (errorHandler) => {
-    return {
-        onValidate({ context, params }) {
-            return function ({ result }) {
-                if (result.length) {
-                    errorHandler(result, {
-                        schema: params.schema,
-                        document: params.documentAST,
-                        contextValue: context,
-                    });
-                }
-            };
-        },
-        onExecute() {
-            return {
-                onExecuteDone(payload) {
-                    return handleStreamOrSingleExecutionResult(payload, ({ result, args }) => {
-                        var _a;
-                        if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
-                            errorHandler(result.errors, args);
-                        }
-                    });
-                },
-            };
-        },
-    };
+const makeHandleResult = (errorHandler) => ({ result, args }) => {
+    var _a;
+    if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
+        errorHandler(result.errors, args);
+    }
 };
+const useErrorHandler = (errorHandler) => ({
+    onExecute() {
+        const handleResult = makeHandleResult(errorHandler);
+        return {
+            onExecuteDone(payload) {
+                return handleStreamOrSingleExecutionResult(payload, handleResult);
+            },
+        };
+    },
+});
 
 const useExtendContext = (contextFactory) => ({
     async onContextBuilding({ context, extendContext }) {
@@ -1129,7 +1121,7 @@ const useExtendContext = (contextFactory) => ({
     },
 });
 
-const makeHandleResult = (formatter) => ({ args, result, setResult, }) => {
+const makeHandleResult$1 = (formatter) => ({ args, result, setResult, }) => {
     const modified = formatter(result, args);
     if (modified !== false) {
         setResult(modified);
@@ -1137,7 +1129,7 @@ const makeHandleResult = (formatter) => ({ args, result, setResult, }) => {
 };
 const usePayloadFormatter = (formatter) => ({
     onExecute() {
-        const handleResult = makeHandleResult(formatter);
+        const handleResult = makeHandleResult$1(formatter);
         return {
             onExecuteDone(payload) {
                 return handleStreamOrSingleExecutionResult(payload, handleResult);
@@ -1153,13 +1145,18 @@ class EnvelopError extends GraphQLError {
     }
 }
 const formatError = (err, message, isDev) => {
+    var _a, _b, _c, _d;
     if (err instanceof GraphQLError) {
-        if (err.originalError && err.originalError instanceof EnvelopError === false) {
+        if (
+        /** execution error */
+        (err.originalError && err.originalError instanceof EnvelopError === false) ||
+            /** validate and parse errors */
+            (err.originalError === undefined && err instanceof EnvelopError === false)) {
             return new GraphQLError(message, err.nodes, err.source, err.positions, err.path, undefined, isDev
                 ? {
                     originalError: {
-                        message: err.originalError.message,
-                        stack: err.originalError.stack,
+                        message: (_b = (_a = err.originalError) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : err.message,
+                        stack: (_d = (_c = err.originalError) === null || _c === void 0 ? void 0 : _c.stack) !== null && _d !== void 0 ? _d : err.stack,
                     },
                 }
                 : undefined);
@@ -1168,7 +1165,7 @@ const formatError = (err, message, isDev) => {
     }
     return new GraphQLError(message);
 };
-const makeHandleResult$1 = (format, message, isDev) => ({ result, setResult }) => {
+const makeHandleResult$2 = (format, message, isDev) => ({ result, setResult }) => {
     if (result.errors != null) {
         setResult({ ...result, errors: result.errors.map(error => format(error, message, isDev)) });
     }
@@ -1179,8 +1176,26 @@ const useMaskedErrors = (opts) => {
     const message = (opts === null || opts === void 0 ? void 0 : opts.errorMessage) || DEFAULT_ERROR_MESSAGE;
     // eslint-disable-next-line dot-notation
     const isDev = (_b = opts === null || opts === void 0 ? void 0 : opts.isDev) !== null && _b !== void 0 ? _b : (typeof process !== 'undefined' ? process.env['NODE_ENV'] === 'development' : false);
-    const handleResult = makeHandleResult$1(format, message, isDev);
+    const handleResult = makeHandleResult$2(format, message, isDev);
     return {
+        onParse: (opts === null || opts === void 0 ? void 0 : opts.onParse) === true
+            ? function onParse() {
+                return function onParseEnd({ result, replaceParseResult }) {
+                    if (result instanceof Error) {
+                        replaceParseResult(format(result, message, isDev));
+                    }
+                };
+            }
+            : undefined,
+        onValidate: (opts === null || opts === void 0 ? void 0 : opts.onValidate) === true
+            ? function onValidate() {
+                return function onValidateEnd({ valid, result, setResult }) {
+                    if (valid === false) {
+                        setResult(result.map(error => format(error, message, isDev)));
+                    }
+                };
+            }
+            : undefined,
         onPluginInit(context) {
             context.registerContextErrorHandler(({ error, setError }) => {
                 setError(formatError(error, message, isDev));

package/package.json

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

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

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

package/plugins/use-masked-errors.d.ts

@@ -16,5 +16,15 @@ export declare type UseMaskedErrorsOpts = {
      * The default value is `process.env['NODE_ENV'] === 'development'`
      */
     isDev?: boolean;
+    /**
+     * Whether parse errors should be masked.
+     * @default false
+     */
+    onParse?: boolean;
+    /**
+     * Whether validation errors should be masked.
+     * @default false
+     */
+    onValidate?: boolean;
 };
 export declare const useMaskedErrors: (opts?: UseMaskedErrorsOpts | undefined) => Plugin;