@envelop/core 2.1.1-alpha-e859732.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;
@@ -1146,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);
@@ -1174,6 +1182,24 @@ const useMaskedErrors = (opts) => {
     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$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;
@@ -1142,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);
@@ -1170,6 +1178,24 @@ const useMaskedErrors = (opts) => {
     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$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.1.1-alpha-e859732.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.1-alpha-e859732.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 } 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/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;

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>;