@graphql-tools/url-loader 7.13.7 → 7.13.8-alpha-20220812093637-a8293ed7

package/cjs/event-stream/addCancelToResponseStream.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addCancelToResponseStream = exports.cancelNeeded = void 0;
+const utils_1 = require("@graphql-tools/utils");
+function cancelNeeded() {
+    var _a, _b;
+    if ((_b = (_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.versions) === null || _b === void 0 ? void 0 : _b.node) {
+        const [nodeMajorStr, nodeMinorStr] = process.versions.node.split('.');
+        const nodeMajor = parseInt(nodeMajorStr);
+        const nodeMinor = parseInt(nodeMinorStr);
+        if (nodeMajor > 16 || (nodeMajor === 16 && nodeMinor >= 5)) {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+exports.cancelNeeded = cancelNeeded;
+function addCancelToResponseStream(resultStream, controller) {
+    return (0, utils_1.withCancel)(resultStream, () => {
+        if (!controller.signal.aborted) {
+            controller.abort();
+        }
+    });
+}
+exports.addCancelToResponseStream = addCancelToResponseStream;

package/cjs/event-stream/handleEventStreamResponse.js

@@ -4,11 +4,12 @@ exports.handleEventStreamResponse = exports.isReadableStream = void 0;
 const utils_1 = require("@graphql-tools/utils");
 const handleAsyncIterable_js_1 = require("./handleAsyncIterable.js");
 const handleReadableStream_js_1 = require("./handleReadableStream.js");
+const addCancelToResponseStream_js_1 = require("./addCancelToResponseStream.js");
 function isReadableStream(value) {
     return value && typeof value.getReader === 'function';
 }
 exports.isReadableStream = isReadableStream;
-async function handleEventStreamResponse(response) {
+async function handleEventStreamResponse(response, controller) {
     // node-fetch returns body as a promise so we need to resolve it
     const body = response.body;
     if (body) {
@@ -16,7 +17,13 @@ async function handleEventStreamResponse(response) {
             return (0, handleReadableStream_js_1.handleReadableStream)(body);
         }
         if ((0, utils_1.isAsyncIterable)(body)) {
-            return (0, handleAsyncIterable_js_1.handleAsyncIterable)(body);
+            const resultStream = (0, handleAsyncIterable_js_1.handleAsyncIterable)(body);
+            if (controller) {
+                return (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller);
+            }
+            else {
+                return resultStream;
+            }
         }
     }
     throw new Error('Response body is expected to be a readable stream but got; ' + (0, utils_1.inspect)(body));

package/cjs/handleMultipartMixedResponse.js

@@ -5,10 +5,11 @@ const node_1 = require("meros/node");
 const browser_1 = require("meros/browser");
 const utils_1 = require("@graphql-tools/utils");
 const merge_1 = require("dset/merge");
+const addCancelToResponseStream_js_1 = require("./event-stream/addCancelToResponseStream.js");
 function isIncomingMessage(body) {
     return body != null && typeof body === 'object' && 'pipe' in body;
 }
-async function handleMultipartMixedResponse(response) {
+async function handleMultipartMixedResponse(response, controller) {
     const body = await response.body;
     const contentType = response.headers.get('content-type') || '';
     let asyncIterator;
@@ -25,7 +26,7 @@ async function handleMultipartMixedResponse(response) {
         asyncIterator = (await (0, browser_1.meros)(response));
     }
     const executionResult = {};
-    return (0, utils_1.mapAsyncIterator)(asyncIterator, (part) => {
+    const resultStream = (0, utils_1.mapAsyncIterator)(asyncIterator, (part) => {
         if (part.json) {
             const chunk = part.body;
             if (chunk.path) {
@@ -48,5 +49,9 @@ async function handleMultipartMixedResponse(response) {
             return executionResult;
         }
     });
+    if (controller) {
+        return (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller);
+    }
+    return resultStream;
 }
 exports.handleMultipartMixedResponse = handleMultipartMixedResponse;

package/cjs/index.js

@@ -16,7 +16,7 @@ const defaultAsyncFetch_js_1 = require("./defaultAsyncFetch.js");
 const defaultSyncFetch_js_1 = require("./defaultSyncFetch.js");
 const handleMultipartMixedResponse_js_1 = require("./handleMultipartMixedResponse.js");
 const handleEventStreamResponse_js_1 = require("./event-stream/handleEventStreamResponse.js");
-const addCancelToResponseStream_js_1 = require("./addCancelToResponseStream.js");
+const addCancelToResponseStream_js_1 = require("./event-stream/addCancelToResponseStream.js");
 const fetch_1 = require("@whatwg-node/fetch");
 const utils_js_1 = require("./utils.js");
 const asyncImport = (moduleName) => Promise.resolve().then(() => tslib_1.__importStar(require(moduleName)));
@@ -67,6 +67,14 @@ class UrlLoader {
             (0, utils_1.isAsyncIterable)(v) ||
             (v === null || v === void 0 ? void 0 : v.then) ||
             typeof (v === null || v === void 0 ? void 0 : v.arrayBuffer) === 'function'));
+        if (files.size === 0) {
+            return JSON.stringify({
+                query,
+                variables,
+                operationName,
+                extensions,
+            });
+        }
         const map = {};
         const uploads = [];
         let currIndex = 0;
@@ -92,9 +100,7 @@ class UrlLoader {
                     // If Blob
                 }
                 else if ((0, utils_js_1.isBlob)(upload)) {
-                    return upload.arrayBuffer().then((arrayBuffer) => {
-                        form.append(indexStr, new fetch_1.File([arrayBuffer], filename, { type: upload.type }), filename);
-                    });
+                    form.append(indexStr, upload, filename);
                 }
                 else if ((0, utils_js_1.isGraphQLUpload)(upload)) {
                     const stream = upload.createReadStream();
@@ -151,14 +157,14 @@ class UrlLoader {
         });
         const executor = (request) => {
             var _a, _b;
-            const controller = new fetch_1.AbortController();
+            const controller = (0, addCancelToResponseStream_js_1.cancelNeeded)() ? new fetch_1.AbortController() : undefined;
             let method = defaultMethod;
             const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
             const operationType = operationAst.operation;
             if ((options === null || options === void 0 ? void 0 : options.useGETForQueries) && operationType === 'query') {
                 method = 'GET';
             }
-            let accept = 'application/json, multipart/mixed';
+            let accept = 'application/json';
             if (operationType === 'subscription' || (0, graphql_live_query_1.isLiveQueryOperationDefinitionNode)(operationAst)) {
                 method = 'GET';
                 accept = 'text/event-stream';
@@ -177,8 +183,8 @@ class UrlLoader {
             let timeoutId;
             if (options === null || options === void 0 ? void 0 : options.timeout) {
                 timeoutId = setTimeout(() => {
-                    if (!controller.signal.aborted) {
-                        controller.abort();
+                    if (!(controller === null || controller === void 0 ? void 0 : controller.signal.aborted)) {
+                        controller === null || controller === void 0 ? void 0 : controller.abort();
                     }
                 }, options.timeout);
             }
@@ -194,17 +200,20 @@ class UrlLoader {
                             method: 'GET',
                             ...(credentials != null ? { credentials } : {}),
                             headers,
-                            signal: controller.signal,
+                            signal: controller === null || controller === void 0 ? void 0 : controller.signal,
                         });
                     case 'POST':
                         if (options === null || options === void 0 ? void 0 : options.multipart) {
                             return new value_or_promise_1.ValueOrPromise(() => this.createFormDataFromVariables(requestBody))
-                                .then(form => fetch(endpoint, {
+                                .then(body => fetch(endpoint, {
                                 method: 'POST',
                                 ...(credentials != null ? { credentials } : {}),
-                                body: form,
-                                headers,
-                                signal: controller.signal,
+                                body,
+                                headers: {
+                                    ...headers,
+                                    ...(typeof body === 'string' ? { 'content-type': 'application/json' } : {}),
+                                },
+                                signal: controller === null || controller === void 0 ? void 0 : controller.signal,
                             }))
                                 .resolve();
                         }
@@ -217,7 +226,7 @@ class UrlLoader {
                                     'content-type': 'application/json',
                                     ...headers,
                                 },
-                                signal: controller.signal,
+                                signal: controller === null || controller === void 0 ? void 0 : controller.signal,
                             });
                         }
                 }
@@ -232,10 +241,10 @@ class UrlLoader {
                 }
                 const contentType = fetchResult.headers.get('content-type');
                 if (contentType === null || contentType === void 0 ? void 0 : contentType.includes('text/event-stream')) {
-                    return (0, handleEventStreamResponse_js_1.handleEventStreamResponse)(fetchResult).then(resultStream => (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller));
+                    return (0, handleEventStreamResponse_js_1.handleEventStreamResponse)(fetchResult, controller);
                 }
                 else if (contentType === null || contentType === void 0 ? void 0 : contentType.includes('multipart/mixed')) {
-                    return (0, handleMultipartMixedResponse_js_1.handleMultipartMixedResponse)(fetchResult).then(resultStream => (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller));
+                    return (0, handleMultipartMixedResponse_js_1.handleMultipartMixedResponse)(fetchResult, controller);
                 }
                 return fetchResult.text();
             })

package/esm/event-stream/addCancelToResponseStream.js

@@ -0,0 +1,21 @@
+import { withCancel } from '@graphql-tools/utils';
+export function cancelNeeded() {
+    var _a, _b;
+    if ((_b = (_a = globalThis.process) === null || _a === void 0 ? void 0 : _a.versions) === null || _b === void 0 ? void 0 : _b.node) {
+        const [nodeMajorStr, nodeMinorStr] = process.versions.node.split('.');
+        const nodeMajor = parseInt(nodeMajorStr);
+        const nodeMinor = parseInt(nodeMinorStr);
+        if (nodeMajor > 16 || (nodeMajor === 16 && nodeMinor >= 5)) {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+export function addCancelToResponseStream(resultStream, controller) {
+    return withCancel(resultStream, () => {
+        if (!controller.signal.aborted) {
+            controller.abort();
+        }
+    });
+}

package/esm/event-stream/handleEventStreamResponse.js

@@ -1,10 +1,11 @@
 import { inspect, isAsyncIterable } from '@graphql-tools/utils';
 import { handleAsyncIterable } from './handleAsyncIterable.js';
 import { handleReadableStream } from './handleReadableStream.js';
+import { addCancelToResponseStream } from './addCancelToResponseStream.js';
 export function isReadableStream(value) {
     return value && typeof value.getReader === 'function';
 }
-export async function handleEventStreamResponse(response) {
+export async function handleEventStreamResponse(response, controller) {
     // node-fetch returns body as a promise so we need to resolve it
     const body = response.body;
     if (body) {
@@ -12,7 +13,13 @@ export async function handleEventStreamResponse(response) {
             return handleReadableStream(body);
         }
         if (isAsyncIterable(body)) {
-            return handleAsyncIterable(body);
+            const resultStream = handleAsyncIterable(body);
+            if (controller) {
+                return addCancelToResponseStream(resultStream, controller);
+            }
+            else {
+                return resultStream;
+            }
         }
     }
     throw new Error('Response body is expected to be a readable stream but got; ' + inspect(body));

package/esm/handleMultipartMixedResponse.js

@@ -2,10 +2,11 @@ import { meros as merosIncomingMessage } from 'meros/node';
 import { meros as merosReadableStream } from 'meros/browser';
 import { mapAsyncIterator } from '@graphql-tools/utils';
 import { dset } from 'dset/merge';
+import { addCancelToResponseStream } from './event-stream/addCancelToResponseStream.js';
 function isIncomingMessage(body) {
     return body != null && typeof body === 'object' && 'pipe' in body;
 }
-export async function handleMultipartMixedResponse(response) {
+export async function handleMultipartMixedResponse(response, controller) {
     const body = await response.body;
     const contentType = response.headers.get('content-type') || '';
     let asyncIterator;
@@ -22,7 +23,7 @@ export async function handleMultipartMixedResponse(response) {
         asyncIterator = (await merosReadableStream(response));
     }
     const executionResult = {};
-    return mapAsyncIterator(asyncIterator, (part) => {
+    const resultStream = mapAsyncIterator(asyncIterator, (part) => {
         if (part.json) {
             const chunk = part.body;
             if (chunk.path) {
@@ -45,4 +46,8 @@ export async function handleMultipartMixedResponse(response) {
             return executionResult;
         }
     });
+    if (controller) {
+        return addCancelToResponseStream(resultStream, controller);
+    }
+    return resultStream;
 }

package/esm/index.js

@@ -12,7 +12,7 @@ import { defaultAsyncFetch } from './defaultAsyncFetch.js';
 import { defaultSyncFetch } from './defaultSyncFetch.js';
 import { handleMultipartMixedResponse } from './handleMultipartMixedResponse.js';
 import { handleEventStreamResponse } from './event-stream/handleEventStreamResponse.js';
-import { addCancelToResponseStream } from './addCancelToResponseStream.js';
+import { cancelNeeded } from './event-stream/addCancelToResponseStream.js';
 import { AbortController, FormData, File } from '@whatwg-node/fetch';
 import { isBlob, isGraphQLUpload, isPromiseLike, LEGACY_WS } from './utils.js';
 const asyncImport = (moduleName) => import(moduleName);
@@ -63,6 +63,14 @@ export class UrlLoader {
             isAsyncIterable(v) ||
             (v === null || v === void 0 ? void 0 : v.then) ||
             typeof (v === null || v === void 0 ? void 0 : v.arrayBuffer) === 'function'));
+        if (files.size === 0) {
+            return JSON.stringify({
+                query,
+                variables,
+                operationName,
+                extensions,
+            });
+        }
         const map = {};
         const uploads = [];
         let currIndex = 0;
@@ -88,9 +96,7 @@ export class UrlLoader {
                     // If Blob
                 }
                 else if (isBlob(upload)) {
-                    return upload.arrayBuffer().then((arrayBuffer) => {
-                        form.append(indexStr, new File([arrayBuffer], filename, { type: upload.type }), filename);
-                    });
+                    form.append(indexStr, upload, filename);
                 }
                 else if (isGraphQLUpload(upload)) {
                     const stream = upload.createReadStream();
@@ -147,14 +153,14 @@ export class UrlLoader {
         });
         const executor = (request) => {
             var _a, _b;
-            const controller = new AbortController();
+            const controller = cancelNeeded() ? new AbortController() : undefined;
             let method = defaultMethod;
             const operationAst = getOperationASTFromRequest(request);
             const operationType = operationAst.operation;
             if ((options === null || options === void 0 ? void 0 : options.useGETForQueries) && operationType === 'query') {
                 method = 'GET';
             }
-            let accept = 'application/json, multipart/mixed';
+            let accept = 'application/json';
             if (operationType === 'subscription' || isLiveQueryOperationDefinitionNode(operationAst)) {
                 method = 'GET';
                 accept = 'text/event-stream';
@@ -173,8 +179,8 @@ export class UrlLoader {
             let timeoutId;
             if (options === null || options === void 0 ? void 0 : options.timeout) {
                 timeoutId = setTimeout(() => {
-                    if (!controller.signal.aborted) {
-                        controller.abort();
+                    if (!(controller === null || controller === void 0 ? void 0 : controller.signal.aborted)) {
+                        controller === null || controller === void 0 ? void 0 : controller.abort();
                     }
                 }, options.timeout);
             }
@@ -190,17 +196,20 @@ export class UrlLoader {
                             method: 'GET',
                             ...(credentials != null ? { credentials } : {}),
                             headers,
-                            signal: controller.signal,
+                            signal: controller === null || controller === void 0 ? void 0 : controller.signal,
                         });
                     case 'POST':
                         if (options === null || options === void 0 ? void 0 : options.multipart) {
                             return new ValueOrPromise(() => this.createFormDataFromVariables(requestBody))
-                                .then(form => fetch(endpoint, {
+                                .then(body => fetch(endpoint, {
                                 method: 'POST',
                                 ...(credentials != null ? { credentials } : {}),
-                                body: form,
-                                headers,
-                                signal: controller.signal,
+                                body,
+                                headers: {
+                                    ...headers,
+                                    ...(typeof body === 'string' ? { 'content-type': 'application/json' } : {}),
+                                },
+                                signal: controller === null || controller === void 0 ? void 0 : controller.signal,
                             }))
                                 .resolve();
                         }
@@ -213,7 +222,7 @@ export class UrlLoader {
                                     'content-type': 'application/json',
                                     ...headers,
                                 },
-                                signal: controller.signal,
+                                signal: controller === null || controller === void 0 ? void 0 : controller.signal,
                             });
                         }
                 }
@@ -228,10 +237,10 @@ export class UrlLoader {
                 }
                 const contentType = fetchResult.headers.get('content-type');
                 if (contentType === null || contentType === void 0 ? void 0 : contentType.includes('text/event-stream')) {
-                    return handleEventStreamResponse(fetchResult).then(resultStream => addCancelToResponseStream(resultStream, controller));
+                    return handleEventStreamResponse(fetchResult, controller);
                 }
                 else if (contentType === null || contentType === void 0 ? void 0 : contentType.includes('multipart/mixed')) {
-                    return handleMultipartMixedResponse(fetchResult).then(resultStream => addCancelToResponseStream(resultStream, controller));
+                    return handleMultipartMixedResponse(fetchResult, controller);
                 }
                 return fetchResult.text();
             })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.13.7",
+  "version": "7.13.8-alpha-20220812093637-a8293ed7",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -9,11 +9,11 @@
   "dependencies": {
     "@graphql-tools/delegate": "9.0.3",
     "@graphql-tools/utils": "8.10.0",
-    "@graphql-tools/wrap": "9.0.3",
+    "@graphql-tools/wrap": "9.0.4-alpha-20220812093637-a8293ed7",
     "@ardatan/sync-fetch": "0.0.1",
     "@n1ru4l/graphql-live-query": "^0.10.0",
     "@types/ws": "^8.0.0",
-    "@whatwg-node/fetch": "^0.2.4",
+    "@whatwg-node/fetch": "^0.2.9",
     "dset": "^3.1.2",
     "extract-files": "^11.0.0",
     "graphql-ws": "^5.4.1",

package/typings/{addCancelToResponseStream.d.cts → event-stream/addCancelToResponseStream.d.cts}

@@ -1 +1,2 @@
+export declare function cancelNeeded(): boolean;
 export declare function addCancelToResponseStream<T>(resultStream: AsyncIterable<T>, controller: AbortController): AsyncIterable<T>;

package/typings/{addCancelToResponseStream.d.ts → event-stream/addCancelToResponseStream.d.ts}

@@ -1 +1,2 @@
+export declare function cancelNeeded(): boolean;
 export declare function addCancelToResponseStream<T>(resultStream: AsyncIterable<T>, controller: AbortController): AsyncIterable<T>;

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

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

package/typings/handleMultipartMixedResponse.d.cts

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

package/typings/handleMultipartMixedResponse.d.ts

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

package/typings/index.d.cts

@@ -120,7 +120,7 @@ export declare class UrlLoader implements Loader<LoadFromUrlOptions> {
         variables: TVariables;
         operationName?: string;
         extensions?: any;
-    }): FormData | Promise<FormData>;
+    }): string | FormData | Promise<FormData>;
     prepareGETUrl({ baseUrl, query, variables, operationName, extensions, }: {
         baseUrl: string;
         query: string;

package/typings/index.d.ts

@@ -120,7 +120,7 @@ export declare class UrlLoader implements Loader<LoadFromUrlOptions> {
         variables: TVariables;
         operationName?: string;
         extensions?: any;
-    }): FormData | Promise<FormData>;
+    }): string | FormData | Promise<FormData>;
     prepareGETUrl({ baseUrl, query, variables, operationName, extensions, }: {
         baseUrl: string;
         query: string;

package/cjs/addCancelToResponseStream.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addCancelToResponseStream = void 0;
-const utils_1 = require("@graphql-tools/utils");
-function addCancelToResponseStream(resultStream, controller) {
-    return (0, utils_1.withCancel)(resultStream, () => {
-        if (!controller.signal.aborted) {
-            controller.abort();
-        }
-    });
-}
-exports.addCancelToResponseStream = addCancelToResponseStream;

package/esm/addCancelToResponseStream.js

@@ -1,8 +0,0 @@
-import { withCancel } from '@graphql-tools/utils';
-export function addCancelToResponseStream(resultStream, controller) {
-    return withCancel(resultStream, () => {
-        if (!controller.signal.aborted) {
-            controller.abort();
-        }
-    });
-}