@envelop/core 1.5.0-alpha-4b48fe8.0 → 1.5.0

package/index.js

@@ -422,6 +422,8 @@ function createEnvelopOrchestrator(plugins) {
         let result = await subscribeFn({
             ...args,
             contextValue: context,
+            // Casted for GraphQL.js 15 compatibility
+            // Can be removed once we drop support for GraphQL.js 15
         });
         const onNextHandler = [];
         const onEndHandler = [];
@@ -659,12 +661,16 @@ function traceOrchestrator(orchestrator) {
                     typeResolver,
                 }
                 : argsOrSchema;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore GraphQL.js types contextValue as unknown
             const done = createTracer('execute', args.contextValue || {});
             try {
                 const result = await orchestrator.execute(args);
                 done();
                 if (!types.isAsyncIterable(result)) {
                     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;
                 }
                 else {
@@ -691,6 +697,8 @@ function traceOrchestrator(orchestrator) {
                     subscribeFieldResolver,
                 }
                 : argsOrSchema;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore GraphQL.js types contextValue as unknown
             const done = createTracer('subscribe', args.contextValue || {});
             try {
                 return await orchestrator.subscribe(args);

package/index.mjs

@@ -419,6 +419,8 @@ function createEnvelopOrchestrator(plugins) {
         let result = await subscribeFn({
             ...args,
             contextValue: context,
+            // Casted for GraphQL.js 15 compatibility
+            // Can be removed once we drop support for GraphQL.js 15
         });
         const onNextHandler = [];
         const onEndHandler = [];
@@ -656,12 +658,16 @@ function traceOrchestrator(orchestrator) {
                     typeResolver,
                 }
                 : argsOrSchema;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore GraphQL.js types contextValue as unknown
             const done = createTracer('execute', args.contextValue || {});
             try {
                 const result = await orchestrator.execute(args);
                 done();
                 if (!isAsyncIterable(result)) {
                     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;
                 }
                 else {
@@ -688,6 +694,8 @@ function traceOrchestrator(orchestrator) {
                     subscribeFieldResolver,
                 }
                 : argsOrSchema;
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore GraphQL.js types contextValue as unknown
             const done = createTracer('subscribe', args.contextValue || {});
             try {
                 return await orchestrator.subscribe(args);

package/orchestrator.d.ts

@@ -1,6 +1,5 @@
-import { ArbitraryObject, EnvelopContextFnWrapper, GetEnvelopedFn, Plugin, DefaultContext } from '@envelop/types';
+import { ArbitraryObject, EnvelopContextFnWrapper, GetEnvelopedFn, Plugin, DefaultContext, Maybe } from '@envelop/types';
 import { GraphQLSchema } from 'graphql';
-import { Maybe } from 'graphql/jsutils/Maybe';
 export declare type EnvelopOrchestrator<InitialContext extends ArbitraryObject = ArbitraryObject, PluginsContext extends ArbitraryObject = ArbitraryObject> = {
     init: (initialContext?: Maybe<InitialContext>) => void;
     parse: EnvelopContextFnWrapper<ReturnType<GetEnvelopedFn<PluginsContext>>['parse'], InitialContext>;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@envelop/core",
-  "version": "1.5.0-alpha-4b48fe8.0",
+  "version": "1.5.0",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@envelop/types": "1.3.0"
+    "@envelop/types": "1.4.0"
   },
   "repository": {
     "type": "git",

package/utils.d.ts

@@ -1,6 +1,5 @@
 import { ASTNode, DocumentNode, OperationDefinitionNode, Source, ExecutionResult, SubscriptionArgs, ExecutionArgs } from 'graphql';
-import { AsyncIterableIteratorOrValue, ExecuteFunction, SubscribeFunction } from '@envelop/types';
-import { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue';
+import { AsyncIterableIteratorOrValue, ExecuteFunction, SubscribeFunction, PromiseOrValue } from '@envelop/types';
 export declare const envelopIsIntrospectionSymbol: unique symbol;
 export declare function isOperationDefinition(def: ASTNode): def is OperationDefinitionNode;
 export declare function isIntrospectionOperation(operation: OperationDefinitionNode): boolean;
@@ -9,11 +8,11 @@ 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> | ExecutionResult>) => SubscribeFunction;
-export declare function mapAsyncIterator<TInput, TOutput = TInput>(asyncIterable: AsyncIterableIterator<TInput>, map: (input: TInput) => Promise<TOutput> | TOutput): AsyncIterableIterator<TOutput>;
+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>;
 /**
  * Utility function for making a execute function that handles polymorphic arguments.
  */
 export declare const makeExecute: (executeFn: (args: ExecutionArgs) => PromiseOrValue<AsyncIterableIteratorOrValue<ExecutionResult>>) => ExecuteFunction;
-export declare function finalAsyncIterator<TInput>(asyncIterable: AsyncIterableIterator<TInput>, onFinal: () => void): AsyncIterableIterator<TInput>;
-export declare function errorAsyncIterator<TInput>(asyncIterable: AsyncIterableIterator<TInput>, onError: (err: unknown) => void): AsyncIterableIterator<TInput>;
+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>;