npm - @graphql-tools/url-loader - Versions diffs - 7.13.2-alpha-ec151071.0 → 7.13.2-alpha-4e77fdb4.0 - Mend

@graphql-tools/url-loader 7.13.2-alpha-ec151071.0 → 7.13.2-alpha-4e77fdb4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/cjs/event-stream/handleAsyncIterable.js CHANGED Viewed

@@ -1,18 +1,12 @@
 "use strict";
-/* eslint-disable no-labels */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleAsyncIterable = void 0;
-let decodeUint8Array;
-if (globalThis.Buffer) {
-    decodeUint8Array = uint8Array => globalThis.Buffer.from(uint8Array).toString('utf-8');
-}
-else {
-    const textDecoder = new TextDecoder();
-    decodeUint8Array = uint8Array => textDecoder.decode(uint8Array, { stream: true });
-}
+/* eslint-disable no-labels */
+const fetch_1 = require("@whatwg-node/fetch");
+const textDecoder = new fetch_1.TextDecoder('handleAsyncIterable');
 async function* handleAsyncIterable(asyncIterable) {
     outer: for await (const chunk of asyncIterable) {
-        const chunkStr = typeof chunk === 'string' ? chunk : decodeUint8Array(chunk);
+        const chunkStr = typeof chunk === 'string' ? chunk : textDecoder.decode(chunk, { stream: true });
         for (const part of chunkStr.split('\n\n')) {
             if (part) {
                 const eventStr = part.split('event: ')[1];

package/cjs/event-stream/handleEventStreamResponse.js CHANGED Viewed

@@ -1,17 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleEventStreamResponse = void 0;
+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");
+function isReadableStream(value) {
+    return value && typeof value.getReader === 'function';
+}
+exports.isReadableStream = isReadableStream;
 async function handleEventStreamResponse(response) {
     // node-fetch returns body as a promise so we need to resolve it
     const body = response.body;
     if (body) {
+        if (isReadableStream(body)) {
+            return (0, handleReadableStream_js_1.handleReadableStream)(body);
+        }
         if ((0, utils_1.isAsyncIterable)(body)) {
             return (0, handleAsyncIterable_js_1.handleAsyncIterable)(body);
         }
-        return (0, handleReadableStream_js_1.handleReadableStream)(body);
     }
     throw new Error('Response body is expected to be a readable stream but got; ' + (0, utils_1.inspect)(body));
 }

package/cjs/event-stream/handleReadableStream.js CHANGED Viewed

@@ -1,31 +1,51 @@
 "use strict";
-/* eslint-disable no-labels */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleReadableStream = void 0;
-async function* handleReadableStream(readableStream) {
-    const textDecoderStream = new TextDecoderStream();
-    const decodedStream = readableStream.pipeThrough(textDecoderStream);
-    const reader = decodedStream.getReader();
-    outer: while (true) {
-        const { value, done } = await reader.read();
-        if (value) {
-            for (const part of value.split('\n\n')) {
-                if (part) {
-                    const eventStr = part.split('event: ')[1];
-                    const dataStr = part.split('data: ')[1];
-                    if (eventStr === 'complete') {
-                        break outer;
+const utils_1 = require("@graphql-tools/utils");
+const fetch_1 = require("@whatwg-node/fetch");
+const textDecoder = new fetch_1.TextDecoder('handleReadableStream');
+function handleReadableStream(readableStream) {
+    return (0, utils_1.observableToAsyncIterable)({
+        subscribe: observer => {
+            const reader = readableStream.getReader();
+            let completed = false;
+            function pump() {
+                return reader.read().then(({ done, value }) => {
+                    if (completed) {
+                        return;
                     }
-                    if (dataStr) {
-                        const data = JSON.parse(dataStr);
-                        yield data.payload || data;
+                    if (value) {
+                        const chunk = typeof value === 'string' ? value : textDecoder.decode(value, { stream: true });
+                        for (const part of chunk.split('\n\n')) {
+                            if (part) {
+                                const eventStr = part.split('event: ')[1];
+                                const dataStr = part.split('data: ')[1];
+                                if (eventStr === 'complete') {
+                                    observer.complete();
+                                }
+                                if (dataStr) {
+                                    const data = JSON.parse(dataStr);
+                                    observer.next(data.payload || data);
+                                }
+                            }
+                        }
                     }
-                }
+                    if (done) {
+                        observer.complete();
+                    }
+                    else {
+                        pump();
+                    }
+                });
             }
-        }
-        if (done) {
-            break;
-        }
-    }
+            pump();
+            return {
+                unsubscribe: () => {
+                    reader.cancel();
+                    completed = true;
+                },
+            };
+        },
+    });
 }
 exports.handleReadableStream = handleReadableStream;

package/esm/event-stream/handleAsyncIterable.js CHANGED Viewed

@@ -1,15 +1,9 @@
 /* eslint-disable no-labels */
-let decodeUint8Array;
-if (globalThis.Buffer) {
-    decodeUint8Array = uint8Array => globalThis.Buffer.from(uint8Array).toString('utf-8');
-}
-else {
-    const textDecoder = new TextDecoder();
-    decodeUint8Array = uint8Array => textDecoder.decode(uint8Array, { stream: true });
-}
+import { TextDecoder } from '@whatwg-node/fetch';
+const textDecoder = new TextDecoder('handleAsyncIterable');
 export async function* handleAsyncIterable(asyncIterable) {
     outer: for await (const chunk of asyncIterable) {
-        const chunkStr = typeof chunk === 'string' ? chunk : decodeUint8Array(chunk);
+        const chunkStr = typeof chunk === 'string' ? chunk : textDecoder.decode(chunk, { stream: true });
         for (const part of chunkStr.split('\n\n')) {
             if (part) {
                 const eventStr = part.split('event: ')[1];

package/esm/event-stream/handleEventStreamResponse.js CHANGED Viewed

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

package/esm/event-stream/handleReadableStream.js CHANGED Viewed

@@ -1,27 +1,47 @@
-/* eslint-disable no-labels */
-export async function* handleReadableStream(readableStream) {
-    const textDecoderStream = new TextDecoderStream();
-    const decodedStream = readableStream.pipeThrough(textDecoderStream);
-    const reader = decodedStream.getReader();
-    outer: while (true) {
-        const { value, done } = await reader.read();
-        if (value) {
-            for (const part of value.split('\n\n')) {
-                if (part) {
-                    const eventStr = part.split('event: ')[1];
-                    const dataStr = part.split('data: ')[1];
-                    if (eventStr === 'complete') {
-                        break outer;
+import { observableToAsyncIterable } from '@graphql-tools/utils';
+import { TextDecoder } from '@whatwg-node/fetch';
+const textDecoder = new TextDecoder('handleReadableStream');
+export function handleReadableStream(readableStream) {
+    return observableToAsyncIterable({
+        subscribe: observer => {
+            const reader = readableStream.getReader();
+            let completed = false;
+            function pump() {
+                return reader.read().then(({ done, value }) => {
+                    if (completed) {
+                        return;
                     }
-                    if (dataStr) {
-                        const data = JSON.parse(dataStr);
-                        yield data.payload || data;
+                    if (value) {
+                        const chunk = typeof value === 'string' ? value : textDecoder.decode(value, { stream: true });
+                        for (const part of chunk.split('\n\n')) {
+                            if (part) {
+                                const eventStr = part.split('event: ')[1];
+                                const dataStr = part.split('data: ')[1];
+                                if (eventStr === 'complete') {
+                                    observer.complete();
+                                }
+                                if (dataStr) {
+                                    const data = JSON.parse(dataStr);
+                                    observer.next(data.payload || data);
+                                }
+                            }
+                        }
                     }
-                }
+                    if (done) {
+                        observer.complete();
+                    }
+                    else {
+                        pump();
+                    }
+                });
             }
-        }
-        if (done) {
-            break;
-        }
-    }
+            pump();
+            return {
+                unsubscribe: () => {
+                    reader.cancel();
+                    completed = true;
+                },
+            };
+        },
+    });
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.13.2-alpha-ec151071.0",
+  "version": "7.13.2-alpha-4e77fdb4.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -12,7 +12,7 @@
     "@graphql-tools/wrap": "8.5.1",
     "@n1ru4l/graphql-live-query": "^0.9.0",
     "@types/ws": "^8.0.0",
-    "@whatwg-node/fetch": "^0.2.3",
+    "@whatwg-node/fetch": "^0.2.4",
     "dset": "^3.1.2",
     "extract-files": "^11.0.0",
     "graphql-ws": "^5.4.1",

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

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

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

@@ -1 +1,2 @@
-export declare function handleReadableStream(readableStream: ReadableStream<Uint8Array>): AsyncGenerator<any, void, unknown>;
+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>>>;