@graphql-tools/url-loader 7.13.3-alpha-e7752ba5.0 → 7.13.3

package/cjs/event-stream/handleReadableStream.js

@@ -10,7 +10,9 @@ function handleReadableStream(readableStream) {
             const reader = readableStream.getReader();
             let completed = false;
             function pump() {
-                return reader.read().then(({ done, value }) => {
+                return reader
+                    .read()
+                    .then(({ done, value }) => {
                     if (completed) {
                         return;
                     }
@@ -36,13 +38,24 @@ function handleReadableStream(readableStream) {
                     else {
                         pump();
                     }
+                })
+                    .catch(e => {
+                    // canceling a request in browsers throws an error,
+                    // ignore it to avoid uncaught promise exceptions
+                    if (!completed)
+                        throw e;
                 });
             }
             pump();
             return {
                 unsubscribe: () => {
-                    reader.cancel();
                     completed = true;
+                    reader.cancel().catch(e => {
+                        // canceling a request in browsers throws an error,
+                        // ignore it to avoid uncaught promise exceptions
+                        if (!completed)
+                            throw e;
+                    });
                 },
             };
         },

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-tools/graphql");
+const graphql_1 = require("graphql");
 const utils_1 = require("@graphql-tools/utils");
 const wrap_1 = require("@graphql-tools/wrap");
 const graphql_ws_1 = require("graphql-ws");
@@ -159,7 +159,6 @@ class UrlLoader {
                 method = 'GET';
             }
             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';
@@ -308,9 +307,7 @@ class UrlLoader {
                         variables: variables,
                         operationName,
                         extensions,
-                    }, 
-                    // @ts-expect-error Uses graphql-js so it doesn't like us
-                    observer);
+                    }, observer);
                     return {
                         unsubscribe,
                     };
@@ -496,7 +493,6 @@ 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/event-stream/handleReadableStream.js

@@ -7,7 +7,9 @@ export function handleReadableStream(readableStream) {
             const reader = readableStream.getReader();
             let completed = false;
             function pump() {
-                return reader.read().then(({ done, value }) => {
+                return reader
+                    .read()
+                    .then(({ done, value }) => {
                     if (completed) {
                         return;
                     }
@@ -33,13 +35,24 @@ export function handleReadableStream(readableStream) {
                     else {
                         pump();
                     }
+                })
+                    .catch(e => {
+                    // canceling a request in browsers throws an error,
+                    // ignore it to avoid uncaught promise exceptions
+                    if (!completed)
+                        throw e;
                 });
             }
             pump();
             return {
                 unsubscribe: () => {
-                    reader.cancel();
                     completed = true;
+                    reader.cancel().catch(e => {
+                        // canceling a request in browsers throws an error,
+                        // ignore it to avoid uncaught promise exceptions
+                        if (!completed)
+                            throw e;
+                    });
                 },
             };
         },

package/esm/index.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-case-declarations */
 /// <reference lib="dom" />
-import { print, buildASTSchema, buildSchema } from '@graphql-tools/graphql';
+import { print, buildASTSchema, buildSchema } from 'graphql';
 import { observableToAsyncIterable, isAsyncIterable, parseGraphQLSDL, getOperationASTFromRequest, } from '@graphql-tools/utils';
 import { introspectSchema, wrapSchema } from '@graphql-tools/wrap';
 import { createClient } from 'graphql-ws';
@@ -155,7 +155,6 @@ export class UrlLoader {
                 method = 'GET';
             }
             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';
@@ -304,9 +303,7 @@ export class UrlLoader {
                         variables: variables,
                         operationName,
                         extensions,
-                    }, 
-                    // @ts-expect-error Uses graphql-js so it doesn't like us
-                    observer);
+                    }, observer);
                     return {
                         unsubscribe,
                     };
@@ -492,7 +489,6 @@ 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,15 +1,17 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.13.3-alpha-e7752ba5.0",
+  "version": "7.13.3",
   "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": "8.8.2-alpha-e7752ba5.0",
-    "@graphql-tools/utils": "8.9.1-alpha-e7752ba5.0",
-    "@graphql-tools/wrap": "8.5.2-alpha-e7752ba5.0",
+    "@graphql-tools/delegate": "8.8.1",
+    "@graphql-tools/utils": "8.9.0",
+    "@graphql-tools/wrap": "8.5.1",
     "@ardatan/sync-fetch": "0.0.1",
     "@n1ru4l/graphql-live-query": "^0.10.0",
-    "@graphql-tools/graphql": "0.1.0-alpha-e7752ba5.0",
     "@types/ws": "^8.0.0",
     "@whatwg-node/fetch": "^0.2.4",
     "dset": "^3.1.2",

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

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

@@ -1,2 +1,2 @@
-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>>>;
+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>>>;

package/typings/handleMultipartMixedResponse.d.ts

@@ -1,2 +1,2 @@
-import type { ExecutionResult } from '@graphql-tools/graphql';
-export declare function handleMultipartMixedResponse(response: Response): Promise<AsyncIterableIterator<ExecutionResult<import("../../../graphql/src/jsutils/ObjMap").ObjMap<unknown>, import("../../../graphql/src/jsutils/ObjMap").ObjMap<unknown>> | undefined>>;
+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/typings/index.d.ts

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