@graphql-tools/url-loader 7.5.3 → 7.6.0-alpha-2dcefe9f.0

package/addCancelToResponseStream.d.ts

@@ -1 +1 @@
-export declare function addCancelToResponseStream<T>(resultStream: AsyncIterable<T>, controller: AbortController): AsyncIterator<T | undefined, any, undefined>;
+export declare function addCancelToResponseStream<T>(resultStream: AsyncIterable<T>, controller: AbortController): AsyncIterable<T | undefined>;

package/event-stream/handleEventStreamResponse.d.ts

@@ -1,2 +1,2 @@
 import { ExecutionResult } from 'graphql';
-export declare function handleEventStreamResponse(response: Response): Promise<AsyncIterableIterator<ExecutionResult>>;
+export declare function handleEventStreamResponse(response: Response): Promise<AsyncGenerator<ExecutionResult>>;

package/event-stream/handleReadable.d.ts

@@ -1,3 +1 @@
-/// <reference types="node" />
-import type { Readable } from 'stream';
-export declare function handleReadable(readable: Readable): AsyncGenerator<any, void, unknown>;
+export declare function handleReadable(readable: AsyncIterable<Uint8Array | string>): AsyncGenerator<any, void, unknown>;

package/handleMultipartMixedResponse.d.ts

@@ -1,2 +1,2 @@
-import { ExecutionResult } from 'graphql';
+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>>;

package/index.js

@@ -54,7 +54,6 @@ const defaultSyncFetch = (input, init) => {
     return syncFetchImported(input, init);
 };
 
-/* eslint-disable */
 function isIncomingMessage(body) {
     return body != null && typeof body === 'object' && 'pipe' in body;
 }
@@ -100,9 +99,11 @@ async function handleMultipartMixedResponse(response) {
     });
 }
 
+/* eslint-disable no-labels */
 async function* handleReadable(readable) {
+    const decoder = new TextDecoder();
     outer: for await (const chunk of readable) {
-        const chunkStr = chunk.toString();
+        const chunkStr = typeof chunk === 'string' ? chunk : decoder.decode(chunk);
         for (const part of chunkStr.split('\n\n')) {
             if (part) {
                 const eventStr = part.split('event: ')[1];
@@ -166,12 +167,10 @@ async function* handleReadableStream(stream) {
                             }
                             break;
                         }
-                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-ignore
                         case 13 /* CarriageReturn */: {
                             discardTrailingNewline = true;
+                            break;
                         }
-                        // eslint-disable-next-line no-fallthrough
                         case 10 /* NewLine */: {
                             lineEnd = position;
                             break;
@@ -249,20 +248,34 @@ function concat(a, b) {
     return res;
 }
 
-/* eslint-disable */
 async function handleEventStreamResponse(response) {
+    // node-fetch returns body as a promise so we need to resolve it
     const body = await response.body;
     if (body) {
-        if ('pipe' in body) {
+        if (utils.isAsyncIterable(body)) {
             return handleReadable(body);
         }
         return handleReadableStream(body);
     }
-    throw new Error('Body is null???');
+    throw new Error('Response body is expected to be a readable stream but got; ' + utils.inspect(body));
 }
 
 function addCancelToResponseStream(resultStream, controller) {
-    return utils.withCancel(resultStream, () => controller.abort());
+    return utils.withCancel(resultStream, () => {
+        if (!controller.signal.aborted) {
+            controller.abort();
+        }
+    });
+}
+
+function isBlob(obj) {
+    return typeof obj.arrayBuffer === 'function';
+}
+function isGraphQLUpload(upload) {
+    return typeof upload.createReadStream === 'function';
+}
+function isPromiseLike(obj) {
+    return typeof obj.then === 'function';
 }
 
 /* eslint-disable no-case-declarations */
@@ -333,18 +346,38 @@ class UrlLoader {
             extensions,
         }));
         form.append('map', JSON.stringify(map));
-        return valueOrPromise.ValueOrPromise.all(uploads.map((u$, i) => new valueOrPromise.ValueOrPromise(() => u$).then(u => {
+        function handleUpload(upload, i) {
             const indexStr = i.toString();
-            if (u != null && 'promise' in u) {
-                return u.promise.then((upload) => {
+            if (upload != null) {
+                const filename = upload.filename || upload.name || upload.path || `blob-${indexStr}`;
+                if (isPromiseLike(upload)) {
+                    return upload.then((resolvedUpload) => handleUpload(resolvedUpload, i));
+                    // If Blob
+                }
+                else if (isBlob(upload)) {
+                    return upload.arrayBuffer().then((arrayBuffer) => {
+                        form.append(indexStr, new crossUndiciFetch.File([arrayBuffer], filename, { type: upload.type }), filename);
+                    });
+                }
+                else if (isGraphQLUpload(upload)) {
                     const stream = upload.createReadStream();
-                    form.append(indexStr, stream, upload.filename);
-                });
-            }
-            else {
-                form.append(indexStr, u, u.name || u.path || indexStr);
+                    const chunks = [];
+                    return Promise.resolve().then(async () => {
+                        for await (const chunk of stream) {
+                            if (chunk) {
+                                chunks.push(...chunk);
+                            }
+                        }
+                        const blobPart = new Uint8Array(chunks);
+                        form.append(indexStr, new crossUndiciFetch.File([blobPart], filename, { type: upload.mimetype }), filename);
+                    });
+                }
+                else {
+                    form.append(indexStr, new crossUndiciFetch.File([upload], filename), filename);
+                }
             }
-        })))
+        }
+        return valueOrPromise.ValueOrPromise.all(uploads.map((upload, i) => new valueOrPromise.ValueOrPromise(() => handleUpload(upload, i))))
             .then(() => form)
             .resolve();
     }

package/index.mjs

@@ -1,5 +1,5 @@
 import { print, buildASTSchema, buildSchema } from 'graphql';
-import { mapAsyncIterator, withCancel, isAsyncIterable, observableToAsyncIterable, getOperationASTFromRequest, parseGraphQLSDL } from '@graphql-tools/utils';
+import { mapAsyncIterator, isAsyncIterable, inspect, withCancel, observableToAsyncIterable, getOperationASTFromRequest, parseGraphQLSDL } from '@graphql-tools/utils';
 import { isWebUri } from 'valid-url';
 import { introspectSchema, wrapSchema } from '@graphql-tools/wrap';
 import { createClient } from 'graphql-ws';
@@ -9,7 +9,7 @@ import { extractFiles, isExtractableFile } from 'extract-files';
 import { SubscriptionClient } from 'subscriptions-transport-ws';
 import { ValueOrPromise } from 'value-or-promise';
 import { isLiveQueryOperationDefinitionNode } from '@n1ru4l/graphql-live-query';
-import { fetch, FormData, AbortController } from 'cross-undici-fetch';
+import { fetch, FormData, AbortController, File } from 'cross-undici-fetch';
 import syncFetchImported from 'sync-fetch';
 import { meros } from 'meros/node';
 import { meros as meros$1 } from 'meros/browser';
@@ -29,7 +29,6 @@ const defaultSyncFetch = (input, init) => {
     return syncFetchImported(input, init);
 };
 
-/* eslint-disable */
 function isIncomingMessage(body) {
     return body != null && typeof body === 'object' && 'pipe' in body;
 }
@@ -75,9 +74,11 @@ async function handleMultipartMixedResponse(response) {
     });
 }
 
+/* eslint-disable no-labels */
 async function* handleReadable(readable) {
+    const decoder = new TextDecoder();
     outer: for await (const chunk of readable) {
-        const chunkStr = chunk.toString();
+        const chunkStr = typeof chunk === 'string' ? chunk : decoder.decode(chunk);
         for (const part of chunkStr.split('\n\n')) {
             if (part) {
                 const eventStr = part.split('event: ')[1];
@@ -141,12 +142,10 @@ async function* handleReadableStream(stream) {
                             }
                             break;
                         }
-                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                        // @ts-ignore
                         case 13 /* CarriageReturn */: {
                             discardTrailingNewline = true;
+                            break;
                         }
-                        // eslint-disable-next-line no-fallthrough
                         case 10 /* NewLine */: {
                             lineEnd = position;
                             break;
@@ -224,20 +223,34 @@ function concat(a, b) {
     return res;
 }
 
-/* eslint-disable */
 async function handleEventStreamResponse(response) {
+    // node-fetch returns body as a promise so we need to resolve it
     const body = await response.body;
     if (body) {
-        if ('pipe' in body) {
+        if (isAsyncIterable(body)) {
             return handleReadable(body);
         }
         return handleReadableStream(body);
     }
-    throw new Error('Body is null???');
+    throw new Error('Response body is expected to be a readable stream but got; ' + inspect(body));
 }
 
 function addCancelToResponseStream(resultStream, controller) {
-    return withCancel(resultStream, () => controller.abort());
+    return withCancel(resultStream, () => {
+        if (!controller.signal.aborted) {
+            controller.abort();
+        }
+    });
+}
+
+function isBlob(obj) {
+    return typeof obj.arrayBuffer === 'function';
+}
+function isGraphQLUpload(upload) {
+    return typeof upload.createReadStream === 'function';
+}
+function isPromiseLike(obj) {
+    return typeof obj.then === 'function';
 }
 
 /* eslint-disable no-case-declarations */
@@ -309,18 +322,38 @@ class UrlLoader {
             extensions,
         }));
         form.append('map', JSON.stringify(map));
-        return ValueOrPromise.all(uploads.map((u$, i) => new ValueOrPromise(() => u$).then(u => {
+        function handleUpload(upload, i) {
             const indexStr = i.toString();
-            if (u != null && 'promise' in u) {
-                return u.promise.then((upload) => {
+            if (upload != null) {
+                const filename = upload.filename || upload.name || upload.path || `blob-${indexStr}`;
+                if (isPromiseLike(upload)) {
+                    return upload.then((resolvedUpload) => handleUpload(resolvedUpload, i));
+                    // If Blob
+                }
+                else if (isBlob(upload)) {
+                    return upload.arrayBuffer().then((arrayBuffer) => {
+                        form.append(indexStr, new File([arrayBuffer], filename, { type: upload.type }), filename);
+                    });
+                }
+                else if (isGraphQLUpload(upload)) {
                     const stream = upload.createReadStream();
-                    form.append(indexStr, stream, upload.filename);
-                });
-            }
-            else {
-                form.append(indexStr, u, u.name || u.path || indexStr);
+                    const chunks = [];
+                    return Promise.resolve().then(async () => {
+                        for await (const chunk of stream) {
+                            if (chunk) {
+                                chunks.push(...chunk);
+                            }
+                        }
+                        const blobPart = new Uint8Array(chunks);
+                        form.append(indexStr, new File([blobPart], filename, { type: upload.mimetype }), filename);
+                    });
+                }
+                else {
+                    form.append(indexStr, new File([upload], filename), filename);
+                }
             }
-        })))
+        }
+        return ValueOrPromise.all(uploads.map((upload, i) => new ValueOrPromise(() => handleUpload(upload, i))))
             .then(() => form)
             .resolve();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.5.3",
+  "version": "7.6.0-alpha-2dcefe9f.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -10,22 +10,22 @@
     "@graphql-tools/delegate": "^8.4.1",
     "@graphql-tools/utils": "^8.5.1",
     "@graphql-tools/wrap": "^8.3.1",
-    "@n1ru4l/graphql-live-query": "0.9.0",
-    "@types/websocket": "1.0.4",
+    "@n1ru4l/graphql-live-query": "^0.9.0",
+    "@types/websocket": "^1.0.4",
     "@types/ws": "^8.0.0",
-    "cross-undici-fetch": "^0.0.26",
+    "cross-undici-fetch": "^0.1.4",
     "dset": "^3.1.0",
-    "extract-files": "11.0.0",
+    "extract-files": "^11.0.0",
     "graphql-sse": "^1.0.1",
     "graphql-ws": "^5.4.1",
-    "isomorphic-ws": "4.0.1",
-    "meros": "1.1.4",
+    "isomorphic-ws": "^4.0.1",
+    "meros": "^1.1.4",
     "subscriptions-transport-ws": "^0.11.0",
-    "sync-fetch": "0.3.1",
-    "tslib": "~2.3.0",
-    "valid-url": "1.0.9",
-    "value-or-promise": "1.0.11",
-    "ws": "8.3.0"
+    "sync-fetch": "^0.3.1",
+    "tslib": "^2.3.0",
+    "valid-url": "^1.0.9",
+    "value-or-promise": "^1.0.11",
+    "ws": "^8.3.0"
   },
   "repository": {
     "type": "git",

package/utils.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+import type { Readable } from 'stream';
+export declare function isBlob(obj: any): obj is Blob;
+interface GraphQLUpload {
+    filename: string;
+    mimetype: string;
+    createReadStream: () => Readable;
+}
+export declare function isGraphQLUpload(upload: any): upload is GraphQLUpload;
+export declare function isPromiseLike(obj: any): obj is PromiseLike<any>;
+export {};