npm - @envelop/core - Versions diffs - 2.3.2-alpha-fd02291.0 → 2.3.2 - Mend

@envelop/core 2.3.2-alpha-fd02291.0 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/index.js +6 -93
package/index.mjs +7 -93
package/package.json +1 -1
package/plugins/use-masked-errors.d.ts +2 -2
package/plugins/use-schema.d.ts +3 -3
package/utils.d.ts +0 -1

package/index.js CHANGED Viewed

@@ -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,101 +1087,19 @@ 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 promise is still ongoing
-            if (schemaSet$ != null) {
-                if (validateSchema) {
-                    extendContext({
-                        [VALIDATE_FN]: () => schemaSet$.then(schema => validateFn(schema, params.documentAST, params.rules, params.typeInfo, params.options)),
-                    });
-                }
-                setValidationFn(() => []);
-            }
-        },
-        async onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            // If schemaSet promise is still ongoing
-            if (context[VALIDATE_FN]) {
-                const validateFn = context[VALIDATE_FN];
-                const errors = validateFn === null || validateFn === void 0 ? void 0 : validateFn();
-                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(() => []);
-            }
-        },
-        async onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            // If schemaSet promise is still ongoing
-            if (context[VALIDATE_FN]) {
-                const validateFn = context[VALIDATE_FN];
-                const errors = validateFn === null || validateFn === void 0 ? void 0 : validateFn();
-                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],
-                });
-            }
+            schemaPromise.then(schemaObj => {
+                setSchema(schemaObj);
+            });
         },
     };
 };
@@ -1382,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 CHANGED Viewed

@@ -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,101 +1083,19 @@ 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 promise is still ongoing
-            if (schemaSet$ != null) {
-                if (validateSchema) {
-                    extendContext({
-                        [VALIDATE_FN]: () => schemaSet$.then(schema => validateFn(schema, params.documentAST, params.rules, params.typeInfo, params.options)),
-                    });
-                }
-                setValidationFn(() => []);
-            }
-        },
-        async onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            // If schemaSet promise is still ongoing
-            if (context[VALIDATE_FN]) {
-                const validateFn = context[VALIDATE_FN];
-                const errors = validateFn === null || validateFn === void 0 ? void 0 : validateFn();
-                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(() => []);
-            }
-        },
-        async onContextBuilding({ context, extendContext, breakContextBuilding }) {
-            // If schemaSet promise is still ongoing
-            if (context[VALIDATE_FN]) {
-                const validateFn = context[VALIDATE_FN];
-                const errors = validateFn === null || validateFn === void 0 ? void 0 : validateFn();
-                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],
-                });
-            }
+            schemaPromise.then(schemaObj => {
+                setSchema(schemaObj);
+            });
         },
     };
 };
@@ -1355,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 CHANGED Viewed

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

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

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