@envelop/core 2.3.2-alpha-b81730b.0 → 2.3.2-alpha-763ffe6.0

package/index.js

@@ -299,10 +299,6 @@ function errorAsyncIterator(source, onError) {
     };
     return stream;
 }
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-function isPromise(obj) {
-    return obj != null && obj.then;
-}
 
 function createEnvelopOrchestrator(plugins) {
     let schema = null;
@@ -1091,97 +1087,20 @@ const useSchema = (schema) => {
         },
     };
 };
-const VALIDATE_FN = Symbol('VALIDATE_FN');
-const VALIDATION_ERRORS = Symbol('VALIDATION_ERRORS');
-const useLazyLoadedSchema = (schemaLoader, validateSchema = true) => {
-    let schemaSet$;
+const useLazyLoadedSchema = (schemaLoader) => {
     return {
         onEnveloped({ setSchema, context }) {
-            const schema$ = schemaLoader(context);
-            if (isPromise(schema$)) {
-                schemaSet$ = schema$.then(schemaObj => {
-                    setSchema(schemaObj);
-                    return schemaObj;
-                });
-            }
-            else {
-                setSchema(schema$);
-            }
-        },
-        onValidate({ validateFn, params, setValidationFn, extendContext }) {
-            if (schemaSet$ != null) {
-                if (validateSchema) {
-                    extendContext({
-                        [VALIDATE_FN]: () => schemaSet$.then(schema => validateFn(schema, params.documentAST, params.rules, params.typeInfo, params.options)),
-                    });
-                }
-                setValidationFn(() => []);
-            }
-        },
-        onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            var _a;
-            (_a = context[VALIDATE_FN]) === null || _a === void 0 ? void 0 : _a.call(context).then((errors) => {
-                if (errors === null || errors === void 0 ? void 0 : errors.length) {
-                    extendContext({
-                        [VALIDATION_ERRORS]: errors,
-                    });
-                    breakContextBuilding();
-                }
-            });
-        },
-        onExecute({ args: { contextValue }, setResultAndStopExecution }) {
-            // If validation errors are set in context
-            if (contextValue[VALIDATION_ERRORS]) {
-                setResultAndStopExecution({
-                    errors: contextValue[VALIDATION_ERRORS],
-                });
-            }
+            setSchema(schemaLoader(context));
         },
     };
 };
-const useAsyncSchema = (schema$, validateSchema = true) => {
-    let schemaSet$;
+const useAsyncSchema = (schemaPromise) => {
     return {
         onPluginInit({ setSchema }) {
-            if (isPromise(schema$)) {
-                schemaSet$ = schema$.then(schemaObj => {
-                    setSchema(schemaObj);
-                    return schemaObj;
-                });
-            }
-            else {
-                setSchema(schema$);
-            }
-        },
-        onValidate({ validateFn, params, setValidationFn, extendContext }) {
-            if (schemaSet$ != null) {
-                if (validateSchema) {
-                    extendContext({
-                        [VALIDATE_FN]: () => schemaSet$.then(schema => validateFn(schema, params.documentAST, params.rules, params.typeInfo, params.options)),
-                    });
-                }
-                setValidationFn(() => []);
-            }
-        },
-        onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            var _a;
-            (_a = context[VALIDATE_FN]) === null || _a === void 0 ? void 0 : _a.call(context).then((errors) => {
-                if (errors === null || errors === void 0 ? void 0 : errors.length) {
-                    extendContext({
-                        [VALIDATION_ERRORS]: errors,
-                    });
-                    breakContextBuilding();
-                }
+            schemaPromise.then(schemaObj => {
+                setSchema(schemaObj);
             });
         },
-        onExecute({ args: { contextValue }, setResultAndStopExecution }) {
-            // If validation errors are set in context
-            if (contextValue[VALIDATION_ERRORS]) {
-                setResultAndStopExecution({
-                    errors: contextValue[VALIDATION_ERRORS],
-                });
-            }
-        },
     };
 };
 
@@ -1377,7 +1296,6 @@ exports.isIntrospectionOperation = isIntrospectionOperation;
 exports.isIntrospectionOperationString = isIntrospectionOperationString;
 exports.isOperationDefinition = isOperationDefinition;
 exports.isPluginEnabled = isPluginEnabled;
-exports.isPromise = isPromise;
 exports.makeExecute = makeExecute;
 exports.makeSubscribe = makeSubscribe;
 exports.mapAsyncIterator = mapAsyncIterator;

package/index.mjs

@@ -295,10 +295,6 @@ function errorAsyncIterator(source, onError) {
     };
     return stream;
 }
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-function isPromise(obj) {
-    return obj != null && obj.then;
-}
 
 function createEnvelopOrchestrator(plugins) {
     let schema = null;
@@ -1087,97 +1083,20 @@ const useSchema = (schema) => {
         },
     };
 };
-const VALIDATE_FN = Symbol('VALIDATE_FN');
-const VALIDATION_ERRORS = Symbol('VALIDATION_ERRORS');
-const useLazyLoadedSchema = (schemaLoader, validateSchema = true) => {
-    let schemaSet$;
+const useLazyLoadedSchema = (schemaLoader) => {
     return {
         onEnveloped({ setSchema, context }) {
-            const schema$ = schemaLoader(context);
-            if (isPromise(schema$)) {
-                schemaSet$ = schema$.then(schemaObj => {
-                    setSchema(schemaObj);
-                    return schemaObj;
-                });
-            }
-            else {
-                setSchema(schema$);
-            }
-        },
-        onValidate({ validateFn, params, setValidationFn, extendContext }) {
-            if (schemaSet$ != null) {
-                if (validateSchema) {
-                    extendContext({
-                        [VALIDATE_FN]: () => schemaSet$.then(schema => validateFn(schema, params.documentAST, params.rules, params.typeInfo, params.options)),
-                    });
-                }
-                setValidationFn(() => []);
-            }
-        },
-        onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            var _a;
-            (_a = context[VALIDATE_FN]) === null || _a === void 0 ? void 0 : _a.call(context).then((errors) => {
-                if (errors === null || errors === void 0 ? void 0 : errors.length) {
-                    extendContext({
-                        [VALIDATION_ERRORS]: errors,
-                    });
-                    breakContextBuilding();
-                }
-            });
-        },
-        onExecute({ args: { contextValue }, setResultAndStopExecution }) {
-            // If validation errors are set in context
-            if (contextValue[VALIDATION_ERRORS]) {
-                setResultAndStopExecution({
-                    errors: contextValue[VALIDATION_ERRORS],
-                });
-            }
+            setSchema(schemaLoader(context));
         },
     };
 };
-const useAsyncSchema = (schema$, validateSchema = true) => {
-    let schemaSet$;
+const useAsyncSchema = (schemaPromise) => {
     return {
         onPluginInit({ setSchema }) {
-            if (isPromise(schema$)) {
-                schemaSet$ = schema$.then(schemaObj => {
-                    setSchema(schemaObj);
-                    return schemaObj;
-                });
-            }
-            else {
-                setSchema(schema$);
-            }
-        },
-        onValidate({ validateFn, params, setValidationFn, extendContext }) {
-            if (schemaSet$ != null) {
-                if (validateSchema) {
-                    extendContext({
-                        [VALIDATE_FN]: () => schemaSet$.then(schema => validateFn(schema, params.documentAST, params.rules, params.typeInfo, params.options)),
-                    });
-                }
-                setValidationFn(() => []);
-            }
-        },
-        onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            var _a;
-            (_a = context[VALIDATE_FN]) === null || _a === void 0 ? void 0 : _a.call(context).then((errors) => {
-                if (errors === null || errors === void 0 ? void 0 : errors.length) {
-                    extendContext({
-                        [VALIDATION_ERRORS]: errors,
-                    });
-                    breakContextBuilding();
-                }
+            schemaPromise.then(schemaObj => {
+                setSchema(schemaObj);
             });
         },
-        onExecute({ args: { contextValue }, setResultAndStopExecution }) {
-            // If validation errors are set in context
-            if (contextValue[VALIDATION_ERRORS]) {
-                setResultAndStopExecution({
-                    errors: contextValue[VALIDATION_ERRORS],
-                });
-            }
-        },
     };
 };
 
@@ -1350,4 +1269,4 @@ const useImmediateIntrospection = () => {
     };
 };
 
-export { DEFAULT_ERROR_MESSAGE, EnvelopError, enableIf, envelop, envelopIsIntrospectionSymbol, errorAsyncIterator, finalAsyncIterator, formatError, handleStreamOrSingleExecutionResult, isAsyncIterable, isIntrospectionDocument, isIntrospectionOperation, isIntrospectionOperationString, isOperationDefinition, isPluginEnabled, isPromise, makeExecute, makeSubscribe, mapAsyncIterator, useAsyncSchema, useEnvelop, useErrorHandler, useExtendContext, useImmediateIntrospection, useLazyLoadedSchema, useLogger, useMaskedErrors, usePayloadFormatter, useSchema, useTiming };
+export { DEFAULT_ERROR_MESSAGE, EnvelopError, enableIf, envelop, envelopIsIntrospectionSymbol, errorAsyncIterator, finalAsyncIterator, formatError, handleStreamOrSingleExecutionResult, isAsyncIterable, isIntrospectionDocument, isIntrospectionOperation, isIntrospectionOperationString, isOperationDefinition, isPluginEnabled, makeExecute, makeSubscribe, mapAsyncIterator, useAsyncSchema, useEnvelop, useErrorHandler, useExtendContext, useImmediateIntrospection, useLazyLoadedSchema, useLogger, useMaskedErrors, usePayloadFormatter, useSchema, useTiming };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envelop/core",
-  "version": "2.3.2-alpha-b81730b.0",
+  "version": "2.3.2-alpha-763ffe6.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"

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

@@ -1,8 +1,8 @@
 import { Plugin } from '@envelop/types';
-import { GraphQLError } from 'graphql';
+import { GraphQLError, GraphQLErrorExtensions } from 'graphql';
 export declare const DEFAULT_ERROR_MESSAGE = "Unexpected error.";
 export declare class EnvelopError extends GraphQLError {
-    constructor(message: string, extensions?: Record<string, any>);
+    constructor(message: string, extensions?: GraphQLErrorExtensions);
 }
 export declare type FormatErrorHandler = (error: GraphQLError | unknown, message: string, isDev: boolean) => GraphQLError;
 export declare const formatError: FormatErrorHandler;

package/plugins/use-schema.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql';
-import { DefaultContext, Maybe, Plugin, PromiseOrValue } from '@envelop/types';
+import { DefaultContext, Maybe, Plugin } from '@envelop/types';
 export declare const useSchema: (schema: GraphQLSchema) => Plugin;
-export declare const useLazyLoadedSchema: (schemaLoader: (context: Maybe<DefaultContext>) => PromiseOrValue<GraphQLSchema>, validateSchema?: boolean) => Plugin;
-export declare const useAsyncSchema: (schema$: PromiseOrValue<GraphQLSchema>, validateSchema?: boolean) => Plugin;
+export declare const useLazyLoadedSchema: (schemaLoader: (context: Maybe<DefaultContext>) => GraphQLSchema) => Plugin;
+export declare const useAsyncSchema: (schemaPromise: Promise<GraphQLSchema>) => Plugin;

package/utils.d.ts

@@ -31,4 +31,3 @@ export declare function isAsyncIterable<TType>(maybeAsyncIterable: unknown): may
 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>;
-export declare function isPromise<T>(obj: any): obj is Promise<T>;