@graphql-tools/url-loader 7.9.10-alpha-66bd3d52.0 → 7.9.10

package/defaultAsyncFetch.d.ts

@@ -1,3 +1,3 @@
-import crossUndiciFetch from 'cross-undici-fetch';
-export declare type AsyncFetchFn = typeof crossUndiciFetch.fetch;
+import { fetch } from 'cross-undici-fetch';
+export declare type AsyncFetchFn = typeof fetch;
 export declare const defaultAsyncFetch: AsyncFetchFn;

package/index.d.ts

@@ -124,7 +124,7 @@ export declare class UrlLoader implements Loader<LoadFromUrlOptions> {
     buildHTTPExecutor(endpoint: string, fetch: AsyncFetchFn, options?: LoadFromUrlOptions): AsyncExecutor<any, ExecutionExtensions>;
     buildWSExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ClientOptions['connectionParams']): Executor;
     buildWSLegacyExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ConnectionParamsOptions): Executor;
-    buildGraphQLSSEExecutor(url: string, fetchFn: AsyncFetchFn, options?: Omit<LoadFromUrlOptions, 'subscriptionEndpoint'>): AsyncExecutor;
+    buildGraphQLSSEExecutor(endpoint: string, fetch: AsyncFetchFn, options?: Omit<LoadFromUrlOptions, 'subscriptionEndpoint'>): AsyncExecutor;
     getFetch(customFetch: LoadFromUrlOptions['customFetch'], importFn: AsyncImportFn): PromiseLike<AsyncFetchFn> | AsyncFetchFn;
     getFetch(customFetch: LoadFromUrlOptions['customFetch'], importFn: SyncImportFn): SyncFetchFn;
     private getDefaultMethodFromOptions;

package/index.js

@@ -33,7 +33,7 @@ const extractFiles = require('extract-files');
 const subscriptionsTransportWs = require('subscriptions-transport-ws');
 const valueOrPromise = require('value-or-promise');
 const graphqlLiveQuery = require('@n1ru4l/graphql-live-query');
-const crossUndiciFetch = _interopDefault(require('cross-undici-fetch'));
+const crossUndiciFetch = require('cross-undici-fetch');
 const syncFetchImported = _interopDefault(require('sync-fetch'));
 const node = require('meros/node');
 const browser = require('meros/browser');
@@ -598,12 +598,12 @@ class UrlLoader {
             }));
         };
     }
-    buildGraphQLSSEExecutor(url, fetchFn, options = {}) {
+    buildGraphQLSSEExecutor(endpoint, fetch, options = {}) {
         const { headers } = options;
         const client = graphqlSse.createClient({
             ...options.graphqlSseOptions,
-            url,
-            fetchFn,
+            url: endpoint,
+            fetchFn: fetch,
             abortControllerImpl: crossUndiciFetch.AbortController,
             headers,
         });

package/index.mjs

@@ -8,14 +8,14 @@ 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 crossUndiciFetch 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';
 import { dset } from 'dset/merge';
 
 const defaultAsyncFetch = async (input, init) => {
-    return crossUndiciFetch.fetch(input, init);
+    return fetch(input, init);
 };
 
 const defaultSyncFetch = (input, init) => {
@@ -309,7 +309,7 @@ class UrlLoader {
             uploads[currIndex] = file;
             currIndex++;
         }
-        const form = new crossUndiciFetch.FormData();
+        const form = new FormData();
         form.append('operations', JSON.stringify({
             query,
             variables: clone,
@@ -327,7 +327,7 @@ class UrlLoader {
                 }
                 else if (isBlob(upload)) {
                     return upload.arrayBuffer().then((arrayBuffer) => {
-                        form.append(indexStr, new crossUndiciFetch.File([arrayBuffer], filename, { type: upload.type }), filename);
+                        form.append(indexStr, new File([arrayBuffer], filename, { type: upload.type }), filename);
                     });
                 }
                 else if (isGraphQLUpload(upload)) {
@@ -340,11 +340,11 @@ class UrlLoader {
                             }
                         }
                         const blobPart = new Uint8Array(chunks);
-                        form.append(indexStr, new crossUndiciFetch.File([blobPart], filename, { type: upload.mimetype }), filename);
+                        form.append(indexStr, new File([blobPart], filename, { type: upload.mimetype }), filename);
                     });
                 }
                 else {
-                    form.append(indexStr, new crossUndiciFetch.File([upload], filename), filename);
+                    form.append(indexStr, new File([upload], filename), filename);
                 }
             }
         }
@@ -385,7 +385,7 @@ class UrlLoader {
         });
         const executor = (request) => {
             var _a, _b;
-            const controller = new crossUndiciFetch.AbortController();
+            const controller = new AbortController();
             let method = defaultMethod;
             if (options === null || options === void 0 ? void 0 : options.useGETForQueries) {
                 const operationAst = getOperationASTFromRequest(request);
@@ -574,13 +574,13 @@ class UrlLoader {
             }));
         };
     }
-    buildGraphQLSSEExecutor(url, fetchFn, options = {}) {
+    buildGraphQLSSEExecutor(endpoint, fetch, options = {}) {
         const { headers } = options;
         const client = createClient$1({
             ...options.graphqlSseOptions,
-            url,
-            fetchFn,
-            abortControllerImpl: crossUndiciFetch.AbortController,
+            url: endpoint,
+            fetchFn: fetch,
+            abortControllerImpl: AbortController,
             headers,
         });
         return async ({ document, variables, operationName, extensions }) => {

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.9.10-alpha-66bd3d52.0",
+  "version": "7.9.10",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "8.7.3-alpha-66bd3d52.0",
+    "@graphql-tools/delegate": "8.7.3",
     "@graphql-tools/utils": "8.6.6",
-    "@graphql-tools/wrap": "8.4.12-alpha-66bd3d52.0",
+    "@graphql-tools/wrap": "8.4.12",
     "@n1ru4l/graphql-live-query": "^0.9.0",
     "@types/websocket": "^1.0.4",
     "@types/ws": "^8.0.0",
-    "cross-undici-fetch": "^0.2.0",
+    "cross-undici-fetch": "^0.2.4",
     "dset": "^3.1.0",
     "extract-files": "^11.0.0",
     "graphql-sse": "^1.0.1",