@envelop/core 1.6.2 → 1.6.6-alpha-1e6c37b.0

package/index.js

@@ -135,10 +135,31 @@ function getSubscribeArgs(args) {
  * Utility function for making a subscribe function that handles polymorphic arguments.
  */
 const makeSubscribe = (subscribeFn) => ((...polyArgs) => subscribeFn(getSubscribeArgs(polyArgs)));
-async function* mapAsyncIterator(asyncIterable, map) {
-    for await (const value of asyncIterable) {
-        yield map(value);
-    }
+function mapAsyncIterator(source, mapper) {
+    const iterable = source[Symbol.asyncIterator]();
+    const stream = {
+        [Symbol.asyncIterator]() {
+            return stream;
+        },
+        async next() {
+            const value = await iterable.next();
+            if (value.done) {
+                return value;
+            }
+            return { done: false, value: await mapper(value.value) };
+        },
+        async return() {
+            var _a;
+            (_a = iterable.return) === null || _a === void 0 ? void 0 : _a.call(iterable);
+            return { done: true, value: undefined };
+        },
+        async throw(error) {
+            var _a;
+            (_a = iterable.throw) === null || _a === void 0 ? void 0 : _a.call(iterable, error);
+            return { done: true, value: undefined };
+        },
+    };
+    return stream;
 }
 function getExecuteArgs(args) {
     return args.length === 1
@@ -189,21 +210,65 @@ function handleStreamOrSingleExecutionResult(payload, fn) {
         return undefined;
     }
 }
-async function* finalAsyncIterator(asyncIterable, onFinal) {
-    try {
-        yield* asyncIterable;
-    }
-    finally {
-        onFinal();
-    }
+function finalAsyncIterator(source, onFinal) {
+    const iterable = source[Symbol.asyncIterator]();
+    let isDone = false;
+    const stream = {
+        [Symbol.asyncIterator]() {
+            return stream;
+        },
+        async next() {
+            const result = await iterable.next();
+            if (result.done && isDone === false) {
+                isDone = true;
+                onFinal();
+            }
+            return result;
+        },
+        async return() {
+            var _a;
+            (_a = iterable.return) === null || _a === void 0 ? void 0 : _a.call(iterable);
+            if (isDone === false) {
+                isDone = true;
+                onFinal();
+            }
+            return { done: true, value: undefined };
+        },
+        async throw(error) {
+            var _a;
+            (_a = iterable.throw) === null || _a === void 0 ? void 0 : _a.call(iterable, error);
+            return { done: true, value: undefined };
+        },
+    };
+    return stream;
 }
-async function* errorAsyncIterator(asyncIterable, onError) {
-    try {
-        yield* asyncIterable;
-    }
-    catch (err) {
-        onError(err);
-    }
+function errorAsyncIterator(source, onError) {
+    const iterable = source[Symbol.asyncIterator]();
+    const stream = {
+        [Symbol.asyncIterator]() {
+            return stream;
+        },
+        async next() {
+            try {
+                return await iterable.next();
+            }
+            catch (error) {
+                onError(error);
+                throw error;
+            }
+        },
+        async return() {
+            var _a;
+            (_a = iterable.return) === null || _a === void 0 ? void 0 : _a.call(iterable);
+            return { done: true, value: undefined };
+        },
+        async throw(error) {
+            var _a;
+            (_a = iterable.throw) === null || _a === void 0 ? void 0 : _a.call(iterable, error);
+            return { done: true, value: undefined };
+        },
+    };
+    return stream;
 }
 
 function createEnvelopOrchestrator(plugins) {
@@ -628,25 +693,27 @@ function createEnvelopOrchestrator(plugins) {
     };
 }
 
-const HR_TO_NS = 1e9;
-const NS_TO_MS = 1e6;
-const deltaFrom = (hrtime) => {
-    const delta = process.hrtime(hrtime);
-    const ns = delta[0] * HR_TO_NS + delta[1];
-    return ns / NS_TO_MS;
+var _a;
+const getTimestamp = typeof globalThis !== 'undefined' && ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.performance) === null || _a === void 0 ? void 0 : _a.now) ? () => performance.now() : () => Date.now();
+const measure = () => {
+    const start = getTimestamp();
+    return () => {
+        const end = getTimestamp();
+        return end - start;
+    };
 };
+const tracingSymbol = Symbol('envelopTracing');
 function traceOrchestrator(orchestrator) {
     const createTracer = (name, ctx) => {
-        const hrtime = process.hrtime();
+        const end = measure();
         return () => {
-            const time = deltaFrom(hrtime);
-            ctx._envelopTracing[name] = time;
+            ctx[tracingSymbol][name] = end();
         };
     };
     return {
         ...orchestrator,
         init: (ctx = {}) => {
-            ctx._envelopTracing = ctx._envelopTracing || {};
+            ctx[tracingSymbol] = ctx[tracingSymbol] || {};
             const done = createTracer('init', ctx || {});
             try {
                 return orchestrator.init(ctx);
@@ -656,7 +723,7 @@ function traceOrchestrator(orchestrator) {
             }
         },
         parse: (ctx = {}) => {
-            ctx._envelopTracing = ctx._envelopTracing || {};
+            ctx[tracingSymbol] = ctx[tracingSymbol] || {};
             const actualFn = orchestrator.parse(ctx);
             return (...args) => {
                 const done = createTracer('parse', ctx);
@@ -669,7 +736,7 @@ function traceOrchestrator(orchestrator) {
             };
         },
         validate: (ctx = {}) => {
-            ctx._envelopTracing = ctx._envelopTracing || {};
+            ctx[tracingSymbol] = ctx[tracingSymbol] || {};
             const actualFn = orchestrator.validate(ctx);
             return (...args) => {
                 const done = createTracer('validate', ctx);
@@ -704,7 +771,7 @@ function traceOrchestrator(orchestrator) {
                     result.extensions = result.extensions || {};
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore GraphQL.js types contextValue as unknown
-                    result.extensions.envelopTracing = args.contextValue._envelopTracing;
+                    result.extensions.envelopTracing = args.contextValue[tracingSymbol];
                 }
                 else {
                     // eslint-disable-next-line no-console
@@ -828,8 +895,8 @@ const useLogger = (rawOptions = DEFAULT_OPTIONS) => {
     };
 };
 
-const HR_TO_NS$1 = 1e9;
-const NS_TO_MS$1 = 1e6;
+const HR_TO_NS = 1e9;
+const NS_TO_MS = 1e6;
 const DEFAULT_OPTIONS$1 = {
     onExecutionMeasurement: (args, timing) => console.log(`Operation execution "${args.operationName}" done in ${timing.ms}ms`),
     onSubscriptionMeasurement: (args, timing) => console.log(`Operation subscription "${args.operationName}" done in ${timing.ms}ms`),
@@ -838,13 +905,13 @@ const DEFAULT_OPTIONS$1 = {
     onResolverMeasurement: (info, timing) => console.log(`\tResolver of "${info.parentType.toString()}.${info.fieldName}" done in ${timing.ms}ms`),
     onContextBuildingMeasurement: (timing) => console.log(`Context building done in ${timing.ms}ms`),
 };
-const deltaFrom$1 = (hrtime) => {
+const deltaFrom = (hrtime) => {
     const delta = process.hrtime(hrtime);
-    const ns = delta[0] * HR_TO_NS$1 + delta[1];
+    const ns = delta[0] * HR_TO_NS + delta[1];
     return {
         ns,
         get ms() {
-            return ns / NS_TO_MS$1;
+            return ns / NS_TO_MS;
         },
     };
 };
@@ -861,7 +928,7 @@ const useTiming = (rawOptions) => {
             }
             const contextStartTime = process.hrtime();
             return () => {
-                options.onContextBuildingMeasurement(deltaFrom$1(contextStartTime));
+                options.onContextBuildingMeasurement(deltaFrom(contextStartTime));
             };
         };
     }
@@ -875,7 +942,7 @@ const useTiming = (rawOptions) => {
             }
             const parseStartTime = process.hrtime();
             return () => {
-                options.onParsingMeasurement(params.source, deltaFrom$1(parseStartTime));
+                options.onParsingMeasurement(params.source, deltaFrom(parseStartTime));
             };
         };
     }
@@ -886,7 +953,7 @@ const useTiming = (rawOptions) => {
             }
             const validateStartTime = process.hrtime();
             return () => {
-                options.onValidationMeasurement(params.documentAST, deltaFrom$1(validateStartTime));
+                options.onValidationMeasurement(params.documentAST, deltaFrom(validateStartTime));
             };
         };
     }
@@ -899,12 +966,12 @@ const useTiming = (rawOptions) => {
                 const executeStartTime = process.hrtime();
                 return {
                     onExecuteDone: () => {
-                        options.onExecutionMeasurement(args, deltaFrom$1(executeStartTime));
+                        options.onExecutionMeasurement(args, deltaFrom(executeStartTime));
                     },
                     onResolverCalled: ({ info }) => {
                         const resolverStartTime = process.hrtime();
                         return () => {
-                            options.onResolverMeasurement(info, deltaFrom$1(resolverStartTime));
+                            options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                         };
                     },
                 };
@@ -918,7 +985,7 @@ const useTiming = (rawOptions) => {
                 const executeStartTime = process.hrtime();
                 return {
                     onExecuteDone: () => {
-                        options.onExecutionMeasurement(args, deltaFrom$1(executeStartTime));
+                        options.onExecutionMeasurement(args, deltaFrom(executeStartTime));
                     },
                 };
             };
@@ -933,12 +1000,12 @@ const useTiming = (rawOptions) => {
                 const subscribeStartTime = process.hrtime();
                 return {
                     onSubscribeResult: () => {
-                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom$1(subscribeStartTime));
+                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom(subscribeStartTime));
                     },
                     onResolverCalled: ({ info }) => {
                         const resolverStartTime = process.hrtime();
                         return () => {
-                            options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom$1(resolverStartTime));
+                            options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                         };
                     },
                 };
@@ -952,7 +1019,7 @@ const useTiming = (rawOptions) => {
                 const subscribeStartTime = process.hrtime();
                 return {
                     onSubscribeResult: () => {
-                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom$1(subscribeStartTime));
+                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom(subscribeStartTime));
                     },
                 };
             };
@@ -1008,8 +1075,8 @@ const useExtendContext = (contextFactory) => ({
     },
 });
 
-const makeHandleResult$1 = (formatter) => ({ result, setResult }) => {
-    const modified = formatter(result);
+const makeHandleResult$1 = (formatter) => ({ args, result, setResult, }) => {
+    const modified = formatter(result, args);
     if (modified !== false) {
         setResult(modified);
     }

package/index.mjs

@@ -131,10 +131,31 @@ function getSubscribeArgs(args) {
  * Utility function for making a subscribe function that handles polymorphic arguments.
  */
 const makeSubscribe = (subscribeFn) => ((...polyArgs) => subscribeFn(getSubscribeArgs(polyArgs)));
-async function* mapAsyncIterator(asyncIterable, map) {
-    for await (const value of asyncIterable) {
-        yield map(value);
-    }
+function mapAsyncIterator(source, mapper) {
+    const iterable = source[Symbol.asyncIterator]();
+    const stream = {
+        [Symbol.asyncIterator]() {
+            return stream;
+        },
+        async next() {
+            const value = await iterable.next();
+            if (value.done) {
+                return value;
+            }
+            return { done: false, value: await mapper(value.value) };
+        },
+        async return() {
+            var _a;
+            (_a = iterable.return) === null || _a === void 0 ? void 0 : _a.call(iterable);
+            return { done: true, value: undefined };
+        },
+        async throw(error) {
+            var _a;
+            (_a = iterable.throw) === null || _a === void 0 ? void 0 : _a.call(iterable, error);
+            return { done: true, value: undefined };
+        },
+    };
+    return stream;
 }
 function getExecuteArgs(args) {
     return args.length === 1
@@ -185,21 +206,65 @@ function handleStreamOrSingleExecutionResult(payload, fn) {
         return undefined;
     }
 }
-async function* finalAsyncIterator(asyncIterable, onFinal) {
-    try {
-        yield* asyncIterable;
-    }
-    finally {
-        onFinal();
-    }
+function finalAsyncIterator(source, onFinal) {
+    const iterable = source[Symbol.asyncIterator]();
+    let isDone = false;
+    const stream = {
+        [Symbol.asyncIterator]() {
+            return stream;
+        },
+        async next() {
+            const result = await iterable.next();
+            if (result.done && isDone === false) {
+                isDone = true;
+                onFinal();
+            }
+            return result;
+        },
+        async return() {
+            var _a;
+            (_a = iterable.return) === null || _a === void 0 ? void 0 : _a.call(iterable);
+            if (isDone === false) {
+                isDone = true;
+                onFinal();
+            }
+            return { done: true, value: undefined };
+        },
+        async throw(error) {
+            var _a;
+            (_a = iterable.throw) === null || _a === void 0 ? void 0 : _a.call(iterable, error);
+            return { done: true, value: undefined };
+        },
+    };
+    return stream;
 }
-async function* errorAsyncIterator(asyncIterable, onError) {
-    try {
-        yield* asyncIterable;
-    }
-    catch (err) {
-        onError(err);
-    }
+function errorAsyncIterator(source, onError) {
+    const iterable = source[Symbol.asyncIterator]();
+    const stream = {
+        [Symbol.asyncIterator]() {
+            return stream;
+        },
+        async next() {
+            try {
+                return await iterable.next();
+            }
+            catch (error) {
+                onError(error);
+                throw error;
+            }
+        },
+        async return() {
+            var _a;
+            (_a = iterable.return) === null || _a === void 0 ? void 0 : _a.call(iterable);
+            return { done: true, value: undefined };
+        },
+        async throw(error) {
+            var _a;
+            (_a = iterable.throw) === null || _a === void 0 ? void 0 : _a.call(iterable, error);
+            return { done: true, value: undefined };
+        },
+    };
+    return stream;
 }
 
 function createEnvelopOrchestrator(plugins) {
@@ -624,25 +689,27 @@ function createEnvelopOrchestrator(plugins) {
     };
 }
 
-const HR_TO_NS = 1e9;
-const NS_TO_MS = 1e6;
-const deltaFrom = (hrtime) => {
-    const delta = process.hrtime(hrtime);
-    const ns = delta[0] * HR_TO_NS + delta[1];
-    return ns / NS_TO_MS;
+var _a;
+const getTimestamp = typeof globalThis !== 'undefined' && ((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.performance) === null || _a === void 0 ? void 0 : _a.now) ? () => performance.now() : () => Date.now();
+const measure = () => {
+    const start = getTimestamp();
+    return () => {
+        const end = getTimestamp();
+        return end - start;
+    };
 };
+const tracingSymbol = Symbol('envelopTracing');
 function traceOrchestrator(orchestrator) {
     const createTracer = (name, ctx) => {
-        const hrtime = process.hrtime();
+        const end = measure();
         return () => {
-            const time = deltaFrom(hrtime);
-            ctx._envelopTracing[name] = time;
+            ctx[tracingSymbol][name] = end();
         };
     };
     return {
         ...orchestrator,
         init: (ctx = {}) => {
-            ctx._envelopTracing = ctx._envelopTracing || {};
+            ctx[tracingSymbol] = ctx[tracingSymbol] || {};
             const done = createTracer('init', ctx || {});
             try {
                 return orchestrator.init(ctx);
@@ -652,7 +719,7 @@ function traceOrchestrator(orchestrator) {
             }
         },
         parse: (ctx = {}) => {
-            ctx._envelopTracing = ctx._envelopTracing || {};
+            ctx[tracingSymbol] = ctx[tracingSymbol] || {};
             const actualFn = orchestrator.parse(ctx);
             return (...args) => {
                 const done = createTracer('parse', ctx);
@@ -665,7 +732,7 @@ function traceOrchestrator(orchestrator) {
             };
         },
         validate: (ctx = {}) => {
-            ctx._envelopTracing = ctx._envelopTracing || {};
+            ctx[tracingSymbol] = ctx[tracingSymbol] || {};
             const actualFn = orchestrator.validate(ctx);
             return (...args) => {
                 const done = createTracer('validate', ctx);
@@ -700,7 +767,7 @@ function traceOrchestrator(orchestrator) {
                     result.extensions = result.extensions || {};
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore GraphQL.js types contextValue as unknown
-                    result.extensions.envelopTracing = args.contextValue._envelopTracing;
+                    result.extensions.envelopTracing = args.contextValue[tracingSymbol];
                 }
                 else {
                     // eslint-disable-next-line no-console
@@ -824,8 +891,8 @@ const useLogger = (rawOptions = DEFAULT_OPTIONS) => {
     };
 };
 
-const HR_TO_NS$1 = 1e9;
-const NS_TO_MS$1 = 1e6;
+const HR_TO_NS = 1e9;
+const NS_TO_MS = 1e6;
 const DEFAULT_OPTIONS$1 = {
     onExecutionMeasurement: (args, timing) => console.log(`Operation execution "${args.operationName}" done in ${timing.ms}ms`),
     onSubscriptionMeasurement: (args, timing) => console.log(`Operation subscription "${args.operationName}" done in ${timing.ms}ms`),
@@ -834,13 +901,13 @@ const DEFAULT_OPTIONS$1 = {
     onResolverMeasurement: (info, timing) => console.log(`\tResolver of "${info.parentType.toString()}.${info.fieldName}" done in ${timing.ms}ms`),
     onContextBuildingMeasurement: (timing) => console.log(`Context building done in ${timing.ms}ms`),
 };
-const deltaFrom$1 = (hrtime) => {
+const deltaFrom = (hrtime) => {
     const delta = process.hrtime(hrtime);
-    const ns = delta[0] * HR_TO_NS$1 + delta[1];
+    const ns = delta[0] * HR_TO_NS + delta[1];
     return {
         ns,
         get ms() {
-            return ns / NS_TO_MS$1;
+            return ns / NS_TO_MS;
         },
     };
 };
@@ -857,7 +924,7 @@ const useTiming = (rawOptions) => {
             }
             const contextStartTime = process.hrtime();
             return () => {
-                options.onContextBuildingMeasurement(deltaFrom$1(contextStartTime));
+                options.onContextBuildingMeasurement(deltaFrom(contextStartTime));
             };
         };
     }
@@ -871,7 +938,7 @@ const useTiming = (rawOptions) => {
             }
             const parseStartTime = process.hrtime();
             return () => {
-                options.onParsingMeasurement(params.source, deltaFrom$1(parseStartTime));
+                options.onParsingMeasurement(params.source, deltaFrom(parseStartTime));
             };
         };
     }
@@ -882,7 +949,7 @@ const useTiming = (rawOptions) => {
             }
             const validateStartTime = process.hrtime();
             return () => {
-                options.onValidationMeasurement(params.documentAST, deltaFrom$1(validateStartTime));
+                options.onValidationMeasurement(params.documentAST, deltaFrom(validateStartTime));
             };
         };
     }
@@ -895,12 +962,12 @@ const useTiming = (rawOptions) => {
                 const executeStartTime = process.hrtime();
                 return {
                     onExecuteDone: () => {
-                        options.onExecutionMeasurement(args, deltaFrom$1(executeStartTime));
+                        options.onExecutionMeasurement(args, deltaFrom(executeStartTime));
                     },
                     onResolverCalled: ({ info }) => {
                         const resolverStartTime = process.hrtime();
                         return () => {
-                            options.onResolverMeasurement(info, deltaFrom$1(resolverStartTime));
+                            options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                         };
                     },
                 };
@@ -914,7 +981,7 @@ const useTiming = (rawOptions) => {
                 const executeStartTime = process.hrtime();
                 return {
                     onExecuteDone: () => {
-                        options.onExecutionMeasurement(args, deltaFrom$1(executeStartTime));
+                        options.onExecutionMeasurement(args, deltaFrom(executeStartTime));
                     },
                 };
             };
@@ -929,12 +996,12 @@ const useTiming = (rawOptions) => {
                 const subscribeStartTime = process.hrtime();
                 return {
                     onSubscribeResult: () => {
-                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom$1(subscribeStartTime));
+                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom(subscribeStartTime));
                     },
                     onResolverCalled: ({ info }) => {
                         const resolverStartTime = process.hrtime();
                         return () => {
-                            options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom$1(resolverStartTime));
+                            options.onResolverMeasurement && options.onResolverMeasurement(info, deltaFrom(resolverStartTime));
                         };
                     },
                 };
@@ -948,7 +1015,7 @@ const useTiming = (rawOptions) => {
                 const subscribeStartTime = process.hrtime();
                 return {
                     onSubscribeResult: () => {
-                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom$1(subscribeStartTime));
+                        options.onSubscriptionMeasurement && options.onSubscriptionMeasurement(args, deltaFrom(subscribeStartTime));
                     },
                 };
             };
@@ -1004,8 +1071,8 @@ const useExtendContext = (contextFactory) => ({
     },
 });
 
-const makeHandleResult$1 = (formatter) => ({ result, setResult }) => {
-    const modified = formatter(result);
+const makeHandleResult$1 = (formatter) => ({ args, result, setResult, }) => {
+    const modified = formatter(result, args);
     if (modified !== false) {
         setResult(modified);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envelop/core",
-  "version": "1.6.2",
+  "version": "1.6.6-alpha-1e6c37b.0",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
@@ -38,6 +38,7 @@
     "./*": {
       "require": "./*.js",
       "import": "./*.mjs"
-    }
+    },
+    "./package.json": "./package.json"
   }
 }

package/plugins/use-extend-context.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from '@envelop/types';
-export declare type ContextFactoryFn<TResult = unknown> = (currentContext: unknown) => TResult | Promise<TResult>;
+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>>>;
 export {};

package/plugins/use-payload-formatter.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '@envelop/types';
+import { Plugin, TypedExecutionArgs } from '@envelop/types';
 import { ExecutionResult } from 'graphql';
-export declare type FormatterFunction = (result: ExecutionResult<any, any>) => false | ExecutionResult<any, any>;
+export declare type FormatterFunction = (result: ExecutionResult<any, any>, args: TypedExecutionArgs<any>) => false | ExecutionResult<any, any>;
 export declare const usePayloadFormatter: (formatter: FormatterFunction) => Plugin;

package/traced-orchestrator.d.ts

@@ -1,5 +1,7 @@
 import { ArbitraryObject } from '@envelop/types';
 import { EnvelopOrchestrator } from './orchestrator';
+declare const tracingSymbol: unique symbol;
 export declare function traceOrchestrator<TInitialContext extends ArbitraryObject, TPluginsContext extends ArbitraryObject>(orchestrator: EnvelopOrchestrator<TInitialContext, TPluginsContext>): EnvelopOrchestrator<TInitialContext & {
-    _envelopTracing?: {};
+    [tracingSymbol]?: {};
 }, TPluginsContext>;
+export {};

package/utils.d.ts

@@ -9,7 +9,7 @@ export declare function isIntrospectionOperationString(operation: string | Sourc
  * Utility function for making a subscribe function that handles polymorphic arguments.
  */
 export declare const makeSubscribe: (subscribeFn: (args: SubscriptionArgs) => PromiseOrValue<AsyncIterableIterator<ExecutionResult>>) => SubscribeFunction;
-export declare function mapAsyncIterator<TInput, TOutput = TInput>(asyncIterable: AsyncIterable<TInput>, map: (input: TInput) => Promise<TOutput> | TOutput): AsyncIterableIterator<TOutput>;
+export declare function mapAsyncIterator<T, O>(source: AsyncIterable<T>, mapper: (input: T) => Promise<O> | O): AsyncGenerator<O>;
 /**
  * Utility function for making a execute function that handles polymorphic arguments.
  */
@@ -29,5 +29,5 @@ export declare function isAsyncIterable<TType>(maybeAsyncIterable: unknown): may
  * @returns a subscription for streamed results, or undefined in case of an non-async
  */
 export declare function handleStreamOrSingleExecutionResult<ContextType = DefaultContext>(payload: OnExecuteDoneEventPayload<ContextType>, fn: OnExecuteDoneHookResultOnNextHook<ContextType>): void | OnExecuteDoneHookResult<ContextType>;
-export declare function finalAsyncIterator<TInput>(asyncIterable: AsyncIterable<TInput>, onFinal: () => void): AsyncIterableIterator<TInput>;
-export declare function errorAsyncIterator<TInput>(asyncIterable: AsyncIterable<TInput>, onError: (err: unknown) => void): AsyncIterableIterator<TInput>;
+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>;