@graphql-tools/url-loader 7.17.2 → 7.17.3

package/cjs/index.js

@@ -69,7 +69,11 @@ class UrlLoader {
             https: 'wss',
             http: 'ws',
         });
-        return (0, executor_graphql_ws_1.buildGraphQLWSExecutor)(WS_URL, webSocketImpl, connectionParams);
+        return (0, executor_graphql_ws_1.buildGraphQLWSExecutor)({
+            url: WS_URL,
+            webSocketImpl,
+            connectionParams,
+        });
     }
     buildWSLegacyExecutor(subscriptionsEndpoint, WebSocketImpl, options) {
         const WS_URL = switchProtocols(subscriptionsEndpoint, {
@@ -152,8 +156,13 @@ class UrlLoader {
             });
             // eslint-disable-next-line no-inner-declarations
             function getExecutorByRequest(request) {
-                const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
-                if (operationAst.operation === 'subscription' || (0, executor_http_1.isLiveQueryOperationDefinitionNode)(operationAst)) {
+                var _a;
+                request.operationType = request.operationType || ((_a = (0, utils_1.getOperationASTFromRequest)(request)) === null || _a === void 0 ? void 0 : _a.operation);
+                if (request.operationType === 'subscription' &&
+                    (0, executor_http_1.isLiveQueryOperationDefinitionNode)((0, utils_1.getOperationASTFromRequest)(request))) {
+                    request.operationType = graphql_1.OperationTypeNode.SUBSCRIPTION;
+                }
+                if (request.operationType === 'subscription') {
                     return subscriptionExecutor$;
                 }
                 else {

package/esm/index.js

@@ -1,4 +1,4 @@
-import { buildASTSchema, buildSchema } from 'graphql';
+import { buildASTSchema, buildSchema, OperationTypeNode } from 'graphql';
 import { parseGraphQLSDL, getOperationASTFromRequest, } from '@graphql-tools/utils';
 import { schemaFromExecutor, wrapSchema } from '@graphql-tools/wrap';
 import WebSocket from 'isomorphic-ws';
@@ -65,7 +65,11 @@ export class UrlLoader {
             https: 'wss',
             http: 'ws',
         });
-        return buildGraphQLWSExecutor(WS_URL, webSocketImpl, connectionParams);
+        return buildGraphQLWSExecutor({
+            url: WS_URL,
+            webSocketImpl,
+            connectionParams,
+        });
     }
     buildWSLegacyExecutor(subscriptionsEndpoint, WebSocketImpl, options) {
         const WS_URL = switchProtocols(subscriptionsEndpoint, {
@@ -148,8 +152,13 @@ export class UrlLoader {
             });
             // eslint-disable-next-line no-inner-declarations
             function getExecutorByRequest(request) {
-                const operationAst = getOperationASTFromRequest(request);
-                if (operationAst.operation === 'subscription' || isLiveQueryOperationDefinitionNode(operationAst)) {
+                var _a;
+                request.operationType = request.operationType || ((_a = getOperationASTFromRequest(request)) === null || _a === void 0 ? void 0 : _a.operation);
+                if (request.operationType === 'subscription' &&
+                    isLiveQueryOperationDefinitionNode(getOperationASTFromRequest(request))) {
+                    request.operationType = OperationTypeNode.SUBSCRIPTION;
+                }
+                if (request.operationType === 'subscription') {
                     return subscriptionExecutor$;
                 }
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.17.2",
+  "version": "7.17.3",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -9,7 +9,7 @@
   "dependencies": {
     "@graphql-tools/delegate": "9.0.22",
     "@graphql-tools/executor-http": "0.1.1",
-    "@graphql-tools/executor-graphql-ws": "0.0.6",
+    "@graphql-tools/executor-graphql-ws": "0.0.7",
     "@graphql-tools/executor-legacy-ws": "0.0.6",
     "@graphql-tools/utils": "9.1.4",
     "@graphql-tools/wrap": "9.3.1",