@graphql-tools/url-loader 7.13.8 → 7.13.10-alpha-20220815173503-a11014cc

package/cjs/index.js

@@ -4,7 +4,7 @@ exports.UrlLoader = exports.SubscriptionProtocol = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable no-case-declarations */
 /// <reference lib="dom" />
-const graphql_1 = require("graphql");
+const graphql_1 = require("@graphql-tools/graphql");
 const utils_1 = require("@graphql-tools/utils");
 const wrap_1 = require("@graphql-tools/wrap");
 const graphql_ws_1 = require("graphql-ws");
@@ -156,7 +156,7 @@ class UrlLoader {
             ws: 'http',
         });
         const executor = (request) => {
-            var _a, _b;
+            var _a, _b, _c;
             const controller = (0, addCancelToResponseStream_js_1.cancelNeeded)() ? new fetch_1.AbortController() : undefined;
             let method = defaultMethod;
             const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
@@ -164,15 +164,19 @@ class UrlLoader {
             if ((options === null || options === void 0 ? void 0 : options.useGETForQueries) && operationType === 'query') {
                 method = 'GET';
             }
-            let accept = 'application/json';
+            let accept = 'application/json, multipart/mixed';
+            // @ts-expect-error Uses graphql-js so it doesn't like us
             if (operationType === 'subscription' || (0, graphql_live_query_1.isLiveQueryOperationDefinitionNode)(operationAst)) {
                 method = 'GET';
                 accept = 'text/event-stream';
             }
-            const endpoint = ((_a = request.extensions) === null || _a === void 0 ? void 0 : _a.endpoint) || HTTP_URL;
+            else if ((_a = operationAst.directives) === null || _a === void 0 ? void 0 : _a.some(({ name }) => name.value === 'defer' || name.value === 'stream')) {
+                accept += ', multipart/mixed';
+            }
+            const endpoint = ((_b = request.extensions) === null || _b === void 0 ? void 0 : _b.endpoint) || HTTP_URL;
             const headers = Object.assign({
                 accept,
-            }, options === null || options === void 0 ? void 0 : options.headers, ((_b = request.extensions) === null || _b === void 0 ? void 0 : _b.headers) || {});
+            }, options === null || options === void 0 ? void 0 : options.headers, ((_c = request.extensions) === null || _c === void 0 ? void 0 : _c.headers) || {});
             const query = (0, graphql_1.print)(request.document);
             const requestBody = {
                 query,
@@ -316,7 +320,9 @@ class UrlLoader {
                         variables: variables,
                         operationName,
                         extensions,
-                    }, observer);
+                    }, 
+                    // @ts-expect-error Uses graphql-js so it doesn't like us
+                    observer);
                     return {
                         unsubscribe,
                     };
@@ -502,6 +508,7 @@ class UrlLoader {
             function getExecutorByRequest(request) {
                 const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
                 if (operationAst.operation === 'subscription' ||
+                    // @ts-expect-error Uses graphql-js so it doesn't like us
                     (0, graphql_live_query_1.isLiveQueryOperationDefinitionNode)(operationAst, request.variables)) {
                     return subscriptionExecutor$;
                 }

package/esm/index.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-case-declarations */
 /// <reference lib="dom" />
-import { print, buildASTSchema, buildSchema } from 'graphql';
+import { print, buildASTSchema, buildSchema, } from '@graphql-tools/graphql';
 import { observableToAsyncIterable, isAsyncIterable, parseGraphQLSDL, getOperationASTFromRequest, } from '@graphql-tools/utils';
 import { introspectSchema, wrapSchema } from '@graphql-tools/wrap';
 import { createClient } from 'graphql-ws';
@@ -152,7 +152,7 @@ export class UrlLoader {
             ws: 'http',
         });
         const executor = (request) => {
-            var _a, _b;
+            var _a, _b, _c;
             const controller = cancelNeeded() ? new AbortController() : undefined;
             let method = defaultMethod;
             const operationAst = getOperationASTFromRequest(request);
@@ -160,15 +160,19 @@ export class UrlLoader {
             if ((options === null || options === void 0 ? void 0 : options.useGETForQueries) && operationType === 'query') {
                 method = 'GET';
             }
-            let accept = 'application/json';
+            let accept = 'application/json, multipart/mixed';
+            // @ts-expect-error Uses graphql-js so it doesn't like us
             if (operationType === 'subscription' || isLiveQueryOperationDefinitionNode(operationAst)) {
                 method = 'GET';
                 accept = 'text/event-stream';
             }
-            const endpoint = ((_a = request.extensions) === null || _a === void 0 ? void 0 : _a.endpoint) || HTTP_URL;
+            else if ((_a = operationAst.directives) === null || _a === void 0 ? void 0 : _a.some(({ name }) => name.value === 'defer' || name.value === 'stream')) {
+                accept += ', multipart/mixed';
+            }
+            const endpoint = ((_b = request.extensions) === null || _b === void 0 ? void 0 : _b.endpoint) || HTTP_URL;
             const headers = Object.assign({
                 accept,
-            }, options === null || options === void 0 ? void 0 : options.headers, ((_b = request.extensions) === null || _b === void 0 ? void 0 : _b.headers) || {});
+            }, options === null || options === void 0 ? void 0 : options.headers, ((_c = request.extensions) === null || _c === void 0 ? void 0 : _c.headers) || {});
             const query = print(request.document);
             const requestBody = {
                 query,
@@ -312,7 +316,9 @@ export class UrlLoader {
                         variables: variables,
                         operationName,
                         extensions,
-                    }, observer);
+                    }, 
+                    // @ts-expect-error Uses graphql-js so it doesn't like us
+                    observer);
                     return {
                         unsubscribe,
                     };
@@ -498,6 +504,7 @@ export class UrlLoader {
             function getExecutorByRequest(request) {
                 const operationAst = getOperationASTFromRequest(request);
                 if (operationAst.operation === 'subscription' ||
+                    // @ts-expect-error Uses graphql-js so it doesn't like us
                     isLiveQueryOperationDefinitionNode(operationAst, request.variables)) {
                     return subscriptionExecutor$;
                 }

package/package.json

@@ -1,17 +1,15 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.13.8",
+  "version": "7.13.10-alpha-20220815173503-a11014cc",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
-  "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
-  },
   "dependencies": {
-    "@graphql-tools/delegate": "9.0.3",
-    "@graphql-tools/utils": "8.10.0",
-    "@graphql-tools/wrap": "9.0.4",
+    "@graphql-tools/delegate": "9.0.4-alpha-20220815173503-a11014cc",
+    "@graphql-tools/utils": "8.10.1-alpha-20220815173503-a11014cc",
+    "@graphql-tools/wrap": "9.0.5-alpha-20220815173503-a11014cc",
     "@ardatan/sync-fetch": "0.0.1",
     "@n1ru4l/graphql-live-query": "^0.10.0",
+    "@graphql-tools/graphql": "0.1.0-alpha-20220815173503-a11014cc",
     "@types/ws": "^8.0.0",
     "@whatwg-node/fetch": "^0.2.9",
     "dset": "^3.1.2",

package/typings/event-stream/handleEventStreamResponse.d.cts

@@ -1,3 +1,3 @@
-import { ExecutionResult } from 'graphql';
+import { ExecutionResult } from '@graphql-tools/graphql';
 export declare function isReadableStream(value: any): value is ReadableStream;
 export declare function handleEventStreamResponse(response: Response, controller?: AbortController): Promise<AsyncIterable<ExecutionResult>>;

package/typings/event-stream/handleEventStreamResponse.d.ts

@@ -1,3 +1,3 @@
-import { ExecutionResult } from 'graphql';
+import { ExecutionResult } from '@graphql-tools/graphql';
 export declare function isReadableStream(value: any): value is ReadableStream;
 export declare function handleEventStreamResponse(response: Response, controller?: AbortController): Promise<AsyncIterable<ExecutionResult>>;

package/typings/event-stream/handleReadableStream.d.cts

@@ -1,2 +1,2 @@
-import { ExecutionResult } from 'graphql';
-export declare function handleReadableStream(readableStream: ReadableStream<Uint8Array>): AsyncIterableIterator<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>>>;
+import { ExecutionResult } from '@graphql-tools/graphql';
+export declare function handleReadableStream(readableStream: ReadableStream<Uint8Array>): AsyncIterableIterator<ExecutionResult<import("../../../../graphql/src/jsutils/ObjMap").ObjMap<unknown>, import("../../../../graphql/src/jsutils/ObjMap").ObjMap<unknown>>>;

package/typings/event-stream/handleReadableStream.d.ts

@@ -1,2 +1,2 @@
-import { ExecutionResult } from 'graphql';
-export declare function handleReadableStream(readableStream: ReadableStream<Uint8Array>): AsyncIterableIterator<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>>>;
+import { ExecutionResult } from '@graphql-tools/graphql';
+export declare function handleReadableStream(readableStream: ReadableStream<Uint8Array>): AsyncIterableIterator<ExecutionResult<import("../../../../graphql/src/jsutils/ObjMap").ObjMap<unknown>, import("../../../../graphql/src/jsutils/ObjMap").ObjMap<unknown>>>;

package/typings/handleMultipartMixedResponse.d.cts

@@ -1,2 +1,2 @@
-import type { ExecutionResult } from 'graphql';
-export declare function handleMultipartMixedResponse(response: Response, controller?: AbortController): Promise<AsyncIterable<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>> | undefined>>;
+import type { ExecutionResult } from '@graphql-tools/graphql';
+export declare function handleMultipartMixedResponse(response: Response, controller?: AbortController): Promise<AsyncIterable<ExecutionResult<import("../../../graphql/src/jsutils/ObjMap.js").ObjMap<unknown>, import("../../../graphql/src/jsutils/ObjMap.js").ObjMap<unknown>> | undefined>>;

package/typings/handleMultipartMixedResponse.d.ts

@@ -1,2 +1,2 @@
-import type { ExecutionResult } from 'graphql';
-export declare function handleMultipartMixedResponse(response: Response, controller?: AbortController): Promise<AsyncIterable<ExecutionResult<import("graphql/jsutils/ObjMap").ObjMap<unknown>, import("graphql/jsutils/ObjMap").ObjMap<unknown>> | undefined>>;
+import type { ExecutionResult } from '@graphql-tools/graphql';
+export declare function handleMultipartMixedResponse(response: Response, controller?: AbortController): Promise<AsyncIterable<ExecutionResult<import("../../../graphql/src/jsutils/ObjMap.js").ObjMap<unknown>, import("../../../graphql/src/jsutils/ObjMap.js").ObjMap<unknown>> | undefined>>;

package/typings/index.d.cts

@@ -1,6 +1,6 @@
 /// <reference types="ws" />
 /// <reference lib="dom" />
-import { IntrospectionOptions } from 'graphql';
+import { IntrospectionOptions } from '@graphql-tools/graphql';
 import { AsyncExecutor, Executor, SyncExecutor, Source, Loader, BaseLoaderOptions } from '@graphql-tools/utils';
 import { ClientOptions } from 'graphql-ws';
 import WebSocket from 'isomorphic-ws';

package/typings/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="ws" />
 /// <reference lib="dom" />
-import { IntrospectionOptions } from 'graphql';
+import { IntrospectionOptions } from '@graphql-tools/graphql';
 import { AsyncExecutor, Executor, SyncExecutor, Source, Loader, BaseLoaderOptions } from '@graphql-tools/utils';
 import { ClientOptions } from 'graphql-ws';
 import WebSocket from 'isomorphic-ws';