@envelop/core 2.2.0 → 2.4.0-alpha-3936561.0

package/index.js

@@ -299,6 +299,49 @@ function errorAsyncIterator(source, onError) {
     };
     return stream;
 }
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+function getInMemoryLRUCache({ max = 1000, onDelete = () => { }, } = {}) {
+    let storage = {};
+    let keys = [];
+    return {
+        get(key) {
+            return storage[key];
+        },
+        set(key, value) {
+            queueMicrotask(() => {
+                if (storage[key] != null) {
+                    if (keys.indexOf(key)) {
+                        keys.splice(keys.indexOf(key), 1);
+                    }
+                }
+                keys.push(key);
+                storage[key] = value;
+                while (keys.length > max) {
+                    const key = keys.shift();
+                    if (key != null) {
+                        onDelete(key, storage[key]);
+                        delete storage[key];
+                    }
+                }
+            });
+        },
+        delete(key) {
+            queueMicrotask(() => {
+                if (storage[key] != null) {
+                    keys.splice(keys.indexOf(key), 1);
+                    onDelete(key, storage[key]);
+                    delete storage[key];
+                }
+            });
+        },
+        clear() {
+            queueMicrotask(() => {
+                storage = {};
+                keys = [];
+            });
+        },
+    };
+}
 
 function createEnvelopOrchestrator(plugins) {
     let schema = null;
@@ -486,8 +529,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 +564,7 @@ function createEnvelopOrchestrator(plugins) {
                 let error = err;
                 for (const errorCb of contextErrorHandlers) {
                     errorCb({
+                        context,
                         error,
                         setError: err => {
                             error = err;
@@ -1227,9 +1272,15 @@ const useMaskedErrors = (opts) => {
 
 const OnNonIntrospectionFieldReachedValidationRule = (onNonIntrospectionField) => ctx => {
     const rootQueryType = ctx.getSchema().getQueryType();
+    const rootMutationType = ctx.getSchema().getMutationType();
+    const rootSubscriptionType = ctx.getSchema().getSubscriptionType();
     return {
         Field(field) {
-            if (ctx.getParentType() === rootQueryType && !field.name.value.startsWith('__')) {
+            const parentType = ctx.getParentType();
+            const isQuery = parentType === rootQueryType;
+            const isMutation = parentType === rootMutationType;
+            const isSubscription = parentType === rootSubscriptionType;
+            if ((isQuery && !field.name.value.startsWith('__')) || isMutation || isSubscription) {
                 onNonIntrospectionField();
                 return graphql.BREAK;
             }
@@ -1281,6 +1332,7 @@ exports.envelopIsIntrospectionSymbol = envelopIsIntrospectionSymbol;
 exports.errorAsyncIterator = errorAsyncIterator;
 exports.finalAsyncIterator = finalAsyncIterator;
 exports.formatError = formatError;
+exports.getInMemoryLRUCache = getInMemoryLRUCache;
 exports.handleStreamOrSingleExecutionResult = handleStreamOrSingleExecutionResult;
 exports.isAsyncIterable = isAsyncIterable;
 exports.isIntrospectionDocument = isIntrospectionDocument;

package/index.mjs

@@ -295,6 +295,49 @@ function errorAsyncIterator(source, onError) {
     };
     return stream;
 }
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+function getInMemoryLRUCache({ max = 1000, onDelete = () => { }, } = {}) {
+    let storage = {};
+    let keys = [];
+    return {
+        get(key) {
+            return storage[key];
+        },
+        set(key, value) {
+            queueMicrotask(() => {
+                if (storage[key] != null) {
+                    if (keys.indexOf(key)) {
+                        keys.splice(keys.indexOf(key), 1);
+                    }
+                }
+                keys.push(key);
+                storage[key] = value;
+                while (keys.length > max) {
+                    const key = keys.shift();
+                    if (key != null) {
+                        onDelete(key, storage[key]);
+                        delete storage[key];
+                    }
+                }
+            });
+        },
+        delete(key) {
+            queueMicrotask(() => {
+                if (storage[key] != null) {
+                    keys.splice(keys.indexOf(key), 1);
+                    onDelete(key, storage[key]);
+                    delete storage[key];
+                }
+            });
+        },
+        clear() {
+            queueMicrotask(() => {
+                storage = {};
+                keys = [];
+            });
+        },
+    };
+}
 
 function createEnvelopOrchestrator(plugins) {
     let schema = null;
@@ -482,8 +525,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 +560,7 @@ function createEnvelopOrchestrator(plugins) {
                 let error = err;
                 for (const errorCb of contextErrorHandlers) {
                     errorCb({
+                        context,
                         error,
                         setError: err => {
                             error = err;
@@ -1223,9 +1268,15 @@ const useMaskedErrors = (opts) => {
 
 const OnNonIntrospectionFieldReachedValidationRule = (onNonIntrospectionField) => ctx => {
     const rootQueryType = ctx.getSchema().getQueryType();
+    const rootMutationType = ctx.getSchema().getMutationType();
+    const rootSubscriptionType = ctx.getSchema().getSubscriptionType();
     return {
         Field(field) {
-            if (ctx.getParentType() === rootQueryType && !field.name.value.startsWith('__')) {
+            const parentType = ctx.getParentType();
+            const isQuery = parentType === rootQueryType;
+            const isMutation = parentType === rootMutationType;
+            const isSubscription = parentType === rootSubscriptionType;
+            if ((isQuery && !field.name.value.startsWith('__')) || isMutation || isSubscription) {
                 onNonIntrospectionField();
                 return BREAK;
             }
@@ -1261,4 +1312,4 @@ const useImmediateIntrospection = () => {
     };
 };
 
-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 };
+export { DEFAULT_ERROR_MESSAGE, EnvelopError, enableIf, envelop, envelopIsIntrospectionSymbol, errorAsyncIterator, finalAsyncIterator, formatError, getInMemoryLRUCache, 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,12 +1,12 @@
 {
   "name": "@envelop/core",
-  "version": "2.2.0",
+  "version": "2.4.0-alpha-3936561.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@envelop/types": "2.1.0"
+    "@envelop/types": "2.2.0"
   },
   "repository": {
     "type": "git",

package/utils.d.ts

@@ -31,3 +31,12 @@ 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 getInMemoryLRUCache<V>({ max, onDelete, }?: {
+    max?: number;
+    onDelete?: (key: string, value: V) => void;
+}): {
+    get(key: string): V | undefined;
+    set(key: string, value: V): void;
+    delete(key: string): void;
+    clear(): void;
+};