@envelop/execute-subscription-event 8.1.1 → 8.2.0

package/LICENSE

@@ -1,6 +1,8 @@
 MIT License
 
-Copyright (c) 2020 Dotan Simha
+Copyright (c) 2018-2020 Graphcool
+Copyright (c) 2020-2021 Prisma
+Copyright (c) 2021- The Guild
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/cjs/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useExtendContextValuePerExecuteSubscriptionEvent = void 0;
+// eslint-disable-next-line no-restricted-imports
 const graphql_1 = require("graphql");
 const core_1 = require("@envelop/core");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");

package/cjs/subscribe.js

@@ -1,15 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe = void 0;
+const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const core_1 = require("@envelop/core");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
+const validateSubscriptionArgsPromise = Promise.resolve().then(() => tslib_1.__importStar(require('graphql'))).then(graphqlModule => graphqlModule
+    .validateSubscriptionArgs);
+function getSourceEventStream(args, validateSubscriptionArgs) {
+    if (validateSubscriptionArgs) {
+        const validatedArgs = validateSubscriptionArgs(args);
+        if (!('schema' in validatedArgs)) {
+            return { errors: validatedArgs };
+        }
+        // Cast away the installed graphql version's own overloads here for backwards compatability
+        const createSourceEventStreamWithValidatedArgs = graphql_1.createSourceEventStream;
+        return createSourceEventStreamWithValidatedArgs(validatedArgs);
+    }
+    const legacyCreateSourceEventStream = graphql_1.createSourceEventStream;
+    return legacyCreateSourceEventStream(args.schema, args.document, args.rootValue, args.contextValue, args.variableValues ?? undefined, args.operationName, args.subscribeFieldResolver);
+}
 /**
  * This is a almost identical port from graphql-js subscribe.
  * The only difference is that a custom `execute` function can be injected for customizing the behavior.
  */
-const subscribe = (execute) => (0, core_1.makeSubscribe)(({ schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, subscribeFieldResolver, }) => {
-    return (0, promise_helpers_1.handleMaybePromise)(() => (0, graphql_1.createSourceEventStream)(schema, document, rootValue, contextValue, variableValues ?? undefined, operationName, subscribeFieldResolver), resultOrStream => {
+const subscribe = (execute) => (0, core_1.makeSubscribe)(args => {
+    const { schema, document, contextValue, variableValues, operationName, fieldResolver } = args;
+    return (0, promise_helpers_1.handleMaybePromise)(() => validateSubscriptionArgsPromise, (validateSubscriptionArgs) => (0, promise_helpers_1.handleMaybePromise)(() => getSourceEventStream(args, validateSubscriptionArgs), (resultOrStream) => {
         if (!(0, core_1.isAsyncIterable)(resultOrStream)) {
             return resultOrStream;
         }
@@ -30,6 +47,6 @@ const subscribe = (execute) => (0, core_1.makeSubscribe)(({ schema, document, ro
             operationName,
             fieldResolver,
         }));
-    });
+    }));
 });
 exports.subscribe = subscribe;

package/esm/index.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports
 import { execute } from 'graphql';
 import { makeExecute } from '@envelop/core';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';

package/esm/subscribe.js

@@ -1,12 +1,28 @@
 import { createSourceEventStream } from 'graphql';
-import { isAsyncIterable, makeSubscribe, mapAsyncIterator, } from '@envelop/core';
+import { isAsyncIterable, makeSubscribe, mapAsyncIterator } from '@envelop/core';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
+const validateSubscriptionArgsPromise = import('graphql').then(graphqlModule => graphqlModule
+    .validateSubscriptionArgs);
+function getSourceEventStream(args, validateSubscriptionArgs) {
+    if (validateSubscriptionArgs) {
+        const validatedArgs = validateSubscriptionArgs(args);
+        if (!('schema' in validatedArgs)) {
+            return { errors: validatedArgs };
+        }
+        // Cast away the installed graphql version's own overloads here for backwards compatability
+        const createSourceEventStreamWithValidatedArgs = createSourceEventStream;
+        return createSourceEventStreamWithValidatedArgs(validatedArgs);
+    }
+    const legacyCreateSourceEventStream = createSourceEventStream;
+    return legacyCreateSourceEventStream(args.schema, args.document, args.rootValue, args.contextValue, args.variableValues ?? undefined, args.operationName, args.subscribeFieldResolver);
+}
 /**
  * This is a almost identical port from graphql-js subscribe.
  * The only difference is that a custom `execute` function can be injected for customizing the behavior.
  */
-export const subscribe = (execute) => makeSubscribe(({ schema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, subscribeFieldResolver, }) => {
-    return handleMaybePromise(() => createSourceEventStream(schema, document, rootValue, contextValue, variableValues ?? undefined, operationName, subscribeFieldResolver), resultOrStream => {
+export const subscribe = (execute) => makeSubscribe(args => {
+    const { schema, document, contextValue, variableValues, operationName, fieldResolver } = args;
+    return handleMaybePromise(() => validateSubscriptionArgsPromise, (validateSubscriptionArgs) => handleMaybePromise(() => getSourceEventStream(args, validateSubscriptionArgs), (resultOrStream) => {
         if (!isAsyncIterable(resultOrStream)) {
             return resultOrStream;
         }
@@ -27,5 +43,5 @@ export const subscribe = (execute) => makeSubscribe(({ schema, document, rootVal
             operationName,
             fieldResolver,
         }));
-    });
+    }));
 });

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@envelop/execute-subscription-event",
-  "version": "8.1.1",
+  "version": "8.2.0",
   "sideEffects": false,
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@envelop/core": "^5.5.1"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
+    "@envelop/core": "^5.6.0"
   },
   "dependencies": {
     "@whatwg-node/promise-helpers": "^1.2.1",
@@ -12,8 +12,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/graphql-hive/envelop.git",
-    "directory": "packages/plugins/execute-subscription-event"
+    "url": "https://github.com/graphql-hive/graphql-yoga.git",
+    "directory": "packages/envelop/plugins/execute-subscription-event"
   },
   "author": "Laurin Quast <laurinquast@googlemail.com>",
   "license": "MIT",

package/typings/index.d.cts

@@ -1,8 +1,8 @@
-import { SubscriptionArgs } from 'graphql';
-import { DefaultContext, Plugin, PromiseOrValue } from '@envelop/core';
+import type { ExecutionArgs } from 'graphql';
+import type { DefaultContext, Plugin, PromiseOrValue } from '@envelop/core';
 export type ContextFactoryOptions = {
     /** The arguments with which the subscription was set up. */
-    args: SubscriptionArgs;
+    args: ExecutionArgs;
 };
 export type ContextFactoryHook<TContextValue> = {
     /** Context that will be used for the "ExecuteSubscriptionEvent" phase. */

package/typings/index.d.ts

@@ -1,8 +1,8 @@
-import { SubscriptionArgs } from 'graphql';
-import { DefaultContext, Plugin, PromiseOrValue } from '@envelop/core';
+import type { ExecutionArgs } from 'graphql';
+import type { DefaultContext, Plugin, PromiseOrValue } from '@envelop/core';
 export type ContextFactoryOptions = {
     /** The arguments with which the subscription was set up. */
-    args: SubscriptionArgs;
+    args: ExecutionArgs;
 };
 export type ContextFactoryHook<TContextValue> = {
     /** Context that will be used for the "ExecuteSubscriptionEvent" phase. */

package/typings/subscribe.d.cts

@@ -1,4 +1,4 @@
-import { ExecuteFunction, SubscribeFunction } from '@envelop/core';
+import type { ExecuteFunction, SubscribeFunction } from '@envelop/core';
 /**
  * This is a almost identical port from graphql-js subscribe.
  * The only difference is that a custom `execute` function can be injected for customizing the behavior.

package/typings/subscribe.d.ts

@@ -1,4 +1,4 @@
-import { ExecuteFunction, SubscribeFunction } from '@envelop/core';
+import type { ExecuteFunction, SubscribeFunction } from '@envelop/core';
 /**
  * This is a almost identical port from graphql-js subscribe.
  * The only difference is that a custom `execute` function can be injected for customizing the behavior.