@graphql-tools/url-loader 7.9.0 → 7.9.1

package/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="ws" />
 /// <reference lib="dom" />
 import { IntrospectionOptions } from 'graphql';
-import { AsyncExecutor, SyncExecutor, Source, Loader, BaseLoaderOptions } from '@graphql-tools/utils';
+import { AsyncExecutor, Executor, SyncExecutor, Source, Loader, BaseLoaderOptions } from '@graphql-tools/utils';
 import { ClientOptions } from 'graphql-ws';
 import { ClientOptions as GraphQLSSEClientOptions } from 'graphql-sse';
 import WebSocket from 'isomorphic-ws';
@@ -107,8 +107,6 @@ export interface LoadFromUrlOptions extends BaseLoaderOptions, Partial<Introspec
  * ```
  */
 export declare class UrlLoader implements Loader<LoadFromUrlOptions> {
-    canLoad(pointer: string, options: LoadFromUrlOptions): Promise<boolean>;
-    canLoadSync(pointer: string, _options: LoadFromUrlOptions): boolean;
     createFormDataFromVariables<TVariables>({ query, variables, operationName, extensions, }: {
         query: string;
         variables: TVariables;
@@ -124,17 +122,20 @@ export declare class UrlLoader implements Loader<LoadFromUrlOptions> {
     }): string;
     buildHTTPExecutor(endpoint: string, fetch: SyncFetchFn, options?: LoadFromUrlOptions): SyncExecutor<any, ExecutionExtensions>;
     buildHTTPExecutor(endpoint: string, fetch: AsyncFetchFn, options?: LoadFromUrlOptions): AsyncExecutor<any, ExecutionExtensions>;
-    buildWSExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ClientOptions['connectionParams']): AsyncExecutor;
-    buildWSLegacyExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ConnectionParamsOptions): AsyncExecutor;
+    buildWSExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ClientOptions['connectionParams']): Executor;
+    buildWSLegacyExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ConnectionParamsOptions): Executor;
     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;
     getWebSocketImpl(importFn: AsyncImportFn, options?: LoadFromUrlOptions): PromiseLike<typeof WebSocket>;
     getWebSocketImpl(importFn: SyncImportFn, options?: LoadFromUrlOptions): typeof WebSocket;
-    buildSubscriptionExecutor(subscriptionsEndpoint: string, fetch: AsyncFetchFn, options?: LoadFromUrlOptions): Promise<AsyncExecutor>;
-    getExecutorAsync(endpoint: string, options?: Omit<LoadFromUrlOptions, 'endpoint'>): Promise<AsyncExecutor>;
-    getExecutorSync(endpoint: string, options: Omit<LoadFromUrlOptions, 'endpoint'>): SyncExecutor;
+    buildSubscriptionExecutor(subscriptionsEndpoint: string, fetch: SyncFetchFn, syncImport: SyncImportFn, options?: LoadFromUrlOptions): SyncExecutor;
+    buildSubscriptionExecutor(subscriptionsEndpoint: string, fetch: AsyncFetchFn, asyncImport: AsyncImportFn, options?: LoadFromUrlOptions): Promise<AsyncExecutor> | AsyncExecutor;
+    getExecutor(endpoint: string, asyncImport: AsyncImportFn, options?: Omit<LoadFromUrlOptions, 'endpoint'>): AsyncExecutor;
+    getExecutor(endpoint: string, syncImport: SyncImportFn, options?: Omit<LoadFromUrlOptions, 'endpoint'>): SyncExecutor;
+    getExecutorAsync(endpoint: string, options?: Omit<LoadFromUrlOptions, 'endpoint'>): AsyncExecutor;
+    getExecutorSync(endpoint: string, options?: Omit<LoadFromUrlOptions, 'endpoint'>): SyncExecutor;
     handleSDL(pointer: string, fetch: SyncFetchFn, options: LoadFromUrlOptions): Source;
     handleSDL(pointer: string, fetch: AsyncFetchFn, options: LoadFromUrlOptions): Promise<Source>;
     load(pointer: string, options: LoadFromUrlOptions): Promise<Source[]>;

package/index.js

@@ -25,7 +25,6 @@ function _interopNamespace(e) {
 
 const graphql = require('graphql');
 const utils = require('@graphql-tools/utils');
-const validUrl = require('valid-url');
 const wrap = require('@graphql-tools/wrap');
 const graphqlWs = require('graphql-ws');
 const graphqlSse = require('graphql-sse');
@@ -296,14 +295,16 @@ const syncImport = (moduleName) => require(moduleName);
      */
     SubscriptionProtocol["GRAPHQL_SSE"] = "GRAPHQL_SSE";
 })(exports.SubscriptionProtocol || (exports.SubscriptionProtocol = {}));
-const isCompatibleUri = (uri) => {
-    if (validUrl.isWebUri(uri)) {
+function isCompatibleUri(uri) {
+    try {
+        // eslint-disable-next-line no-new
+        new URL(uri);
         return true;
     }
-    // we just replace the url part, the remaining validation is the same
-    const wsUri = uri.replace('wss://', 'http://').replace('ws://', 'http://');
-    return !!validUrl.isWebUri(wsUri);
-};
+    catch (_a) {
+        return false;
+    }
+}
 /**
  * This loader loads a schema from a URL. The loaded schema is a fully-executable,
  * remote schema since it's created using [@graphql-tools/wrap](/docs/remote-schemas).
@@ -317,12 +318,6 @@ const isCompatibleUri = (uri) => {
  * ```
  */
 class UrlLoader {
-    async canLoad(pointer, options) {
-        return this.canLoadSync(pointer, options);
-    }
-    canLoadSync(pointer, _options) {
-        return isCompatibleUri(pointer);
-    }
     createFormDataFromVariables({ query, variables, operationName, extensions, }) {
         const vars = Object.assign({}, variables);
         const { clone, files } = extractFiles.extractFiles(vars, 'variables', ((v) => extractFiles.isExtractableFile(v) ||
@@ -569,7 +564,7 @@ class UrlLoader {
             connectionParams,
             lazy: true,
         });
-        return async ({ document, variables, operationName, extensions }) => {
+        return ({ document, variables, operationName, extensions }) => {
             const query = graphql.print(document);
             return utils.observableToAsyncIterable({
                 subscribe: observer => {
@@ -595,7 +590,7 @@ class UrlLoader {
             connectionParams,
             lazy: true,
         }, webSocketImpl);
-        return async ({ document, variables, operationName }) => {
+        return ({ document, variables, operationName }) => {
             return utils.observableToAsyncIterable(subscriptionClient.request({
                 query: document,
                 variables,
@@ -665,7 +660,7 @@ class UrlLoader {
             return websocketImpl;
         }
     }
-    async buildSubscriptionExecutor(subscriptionsEndpoint, fetch, options) {
+    buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options) {
         if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === exports.SubscriptionProtocol.SSE) {
             return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, {
                 ...options,
@@ -681,34 +676,47 @@ class UrlLoader {
             return this.buildGraphQLSSEExecutor(subscriptionsEndpoint, fetch, options);
         }
         else {
-            const webSocketImpl = await this.getWebSocketImpl(asyncImport, options);
+            const webSocketImpl$ = new valueOrPromise.ValueOrPromise(() => this.getWebSocketImpl(importFn, options));
             const connectionParams = () => ({ headers: options === null || options === void 0 ? void 0 : options.headers });
-            if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === exports.SubscriptionProtocol.LEGACY_WS) {
-                return this.buildWSLegacyExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
-            }
-            else {
-                return this.buildWSExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
-            }
+            const executor$ = webSocketImpl$.then(webSocketImpl => {
+                if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === exports.SubscriptionProtocol.LEGACY_WS) {
+                    return this.buildWSLegacyExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
+                }
+                else {
+                    return this.buildWSExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
+                }
+            });
+            return request => executor$.then(executor => executor(request)).resolve();
         }
     }
-    async getExecutorAsync(endpoint, options) {
-        const fetch = await this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport);
-        const httpExecutor = this.buildHTTPExecutor(endpoint, fetch, options);
-        const subscriptionsEndpoint = (options === null || options === void 0 ? void 0 : options.subscriptionsEndpoint) || endpoint;
-        const subscriptionExecutor = await this.buildSubscriptionExecutor(subscriptionsEndpoint, fetch, options);
-        return request => {
+    getExecutor(endpoint, importFn, options) {
+        const fetch$ = new valueOrPromise.ValueOrPromise(() => this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport));
+        const httpExecutor$ = fetch$.then(fetch => {
+            return this.buildHTTPExecutor(endpoint, fetch, options);
+        });
+        const subscriptionExecutor$ = fetch$.then(fetch => {
+            const subscriptionsEndpoint = (options === null || options === void 0 ? void 0 : options.subscriptionsEndpoint) || endpoint;
+            return this.buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options);
+        });
+        function getExecutorByRequest(request) {
             const operationAst = utils.getOperationASTFromRequest(request);
             if (operationAst.operation === 'subscription' ||
                 graphqlLiveQuery.isLiveQueryOperationDefinitionNode(operationAst, request.variables)) {
-                return subscriptionExecutor(request);
+                return subscriptionExecutor$;
             }
-            return httpExecutor(request);
-        };
+            else {
+                return httpExecutor$;
+            }
+        }
+        return request => getExecutorByRequest(request)
+            .then(executor => executor(request))
+            .resolve();
+    }
+    getExecutorAsync(endpoint, options) {
+        return this.getExecutor(endpoint, asyncImport, options);
     }
     getExecutorSync(endpoint, options) {
-        const fetch = this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, syncImport);
-        const executor = this.buildHTTPExecutor(endpoint, fetch, options);
-        return executor;
+        return this.getExecutor(endpoint, syncImport, options);
     }
     handleSDL(pointer, fetch, options) {
         const defaultMethod = this.getDefaultMethodFromOptions(options === null || options === void 0 ? void 0 : options.method, 'GET');
@@ -721,15 +729,15 @@ class UrlLoader {
             .resolve();
     }
     async load(pointer, options) {
-        if (!(await this.canLoad(pointer, options))) {
+        if (!isCompatibleUri(pointer)) {
             return [];
         }
         let source = {
             location: pointer,
         };
-        const fetch = await this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport);
-        let executor = await this.getExecutorAsync(pointer, options);
+        let executor;
         if ((options === null || options === void 0 ? void 0 : options.handleAsSDL) || pointer.endsWith('.graphql') || pointer.endsWith('.graphqls')) {
+            const fetch = await this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport);
             source = await this.handleSDL(pointer, fetch, options);
             if (!source.schema && !source.document && !source.rawSDL) {
                 throw new Error(`Invalid SDL response`);
@@ -743,13 +751,14 @@ class UrlLoader {
                             : undefined);
         }
         else {
+            executor = this.getExecutorAsync(pointer, options);
             source.schema = await wrap.introspectSchema(executor, {}, options);
         }
         if (!source.schema) {
             throw new Error(`Invalid introspected schema`);
         }
         if (options === null || options === void 0 ? void 0 : options.endpoint) {
-            executor = await this.getExecutorAsync(options.endpoint, options);
+            executor = this.getExecutorAsync(options.endpoint, options);
         }
         source.schema = wrap.wrapSchema({
             schema: source.schema,
@@ -758,15 +767,15 @@ class UrlLoader {
         return [source];
     }
     loadSync(pointer, options) {
-        if (!this.canLoadSync(pointer, options)) {
+        if (!isCompatibleUri(pointer)) {
             return [];
         }
         let source = {
             location: pointer,
         };
-        const fetch = this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, syncImport);
-        let executor = this.getExecutorSync(pointer, options);
+        let executor;
         if ((options === null || options === void 0 ? void 0 : options.handleAsSDL) || pointer.endsWith('.graphql') || pointer.endsWith('.graphqls')) {
+            const fetch = this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, syncImport);
             source = this.handleSDL(pointer, fetch, options);
             if (!source.schema && !source.document && !source.rawSDL) {
                 throw new Error(`Invalid SDL response`);
@@ -780,6 +789,7 @@ class UrlLoader {
                             : undefined);
         }
         else {
+            executor = this.getExecutorSync(pointer, options);
             source.schema = wrap.introspectSchema(executor, {}, options);
         }
         if (!source.schema) {

package/index.mjs

@@ -1,6 +1,5 @@
 import { print, buildASTSchema, buildSchema } from 'graphql';
-import { mapAsyncIterator, isAsyncIterable, inspect, withCancel, observableToAsyncIterable, getOperationASTFromRequest, parseGraphQLSDL } from '@graphql-tools/utils';
-import { isWebUri } from 'valid-url';
+import { mapAsyncIterator, isAsyncIterable, inspect, withCancel, observableToAsyncIterable, parseGraphQLSDL, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { introspectSchema, wrapSchema } from '@graphql-tools/wrap';
 import { createClient } from 'graphql-ws';
 import { createClient as createClient$1 } from 'graphql-sse';
@@ -272,14 +271,16 @@ var SubscriptionProtocol;
      */
     SubscriptionProtocol["GRAPHQL_SSE"] = "GRAPHQL_SSE";
 })(SubscriptionProtocol || (SubscriptionProtocol = {}));
-const isCompatibleUri = (uri) => {
-    if (isWebUri(uri)) {
+function isCompatibleUri(uri) {
+    try {
+        // eslint-disable-next-line no-new
+        new URL(uri);
         return true;
     }
-    // we just replace the url part, the remaining validation is the same
-    const wsUri = uri.replace('wss://', 'http://').replace('ws://', 'http://');
-    return !!isWebUri(wsUri);
-};
+    catch (_a) {
+        return false;
+    }
+}
 /**
  * This loader loads a schema from a URL. The loaded schema is a fully-executable,
  * remote schema since it's created using [@graphql-tools/wrap](/docs/remote-schemas).
@@ -293,12 +294,6 @@ const isCompatibleUri = (uri) => {
  * ```
  */
 class UrlLoader {
-    async canLoad(pointer, options) {
-        return this.canLoadSync(pointer, options);
-    }
-    canLoadSync(pointer, _options) {
-        return isCompatibleUri(pointer);
-    }
     createFormDataFromVariables({ query, variables, operationName, extensions, }) {
         const vars = Object.assign({}, variables);
         const { clone, files } = extractFiles(vars, 'variables', ((v) => isExtractableFile(v) ||
@@ -545,7 +540,7 @@ class UrlLoader {
             connectionParams,
             lazy: true,
         });
-        return async ({ document, variables, operationName, extensions }) => {
+        return ({ document, variables, operationName, extensions }) => {
             const query = print(document);
             return observableToAsyncIterable({
                 subscribe: observer => {
@@ -571,7 +566,7 @@ class UrlLoader {
             connectionParams,
             lazy: true,
         }, webSocketImpl);
-        return async ({ document, variables, operationName }) => {
+        return ({ document, variables, operationName }) => {
             return observableToAsyncIterable(subscriptionClient.request({
                 query: document,
                 variables,
@@ -641,7 +636,7 @@ class UrlLoader {
             return websocketImpl;
         }
     }
-    async buildSubscriptionExecutor(subscriptionsEndpoint, fetch, options) {
+    buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options) {
         if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === SubscriptionProtocol.SSE) {
             return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, {
                 ...options,
@@ -657,34 +652,47 @@ class UrlLoader {
             return this.buildGraphQLSSEExecutor(subscriptionsEndpoint, fetch, options);
         }
         else {
-            const webSocketImpl = await this.getWebSocketImpl(asyncImport, options);
+            const webSocketImpl$ = new ValueOrPromise(() => this.getWebSocketImpl(importFn, options));
             const connectionParams = () => ({ headers: options === null || options === void 0 ? void 0 : options.headers });
-            if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === SubscriptionProtocol.LEGACY_WS) {
-                return this.buildWSLegacyExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
-            }
-            else {
-                return this.buildWSExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
-            }
+            const executor$ = webSocketImpl$.then(webSocketImpl => {
+                if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === SubscriptionProtocol.LEGACY_WS) {
+                    return this.buildWSLegacyExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
+                }
+                else {
+                    return this.buildWSExecutor(subscriptionsEndpoint, webSocketImpl, connectionParams);
+                }
+            });
+            return request => executor$.then(executor => executor(request)).resolve();
         }
     }
-    async getExecutorAsync(endpoint, options) {
-        const fetch = await this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport);
-        const httpExecutor = this.buildHTTPExecutor(endpoint, fetch, options);
-        const subscriptionsEndpoint = (options === null || options === void 0 ? void 0 : options.subscriptionsEndpoint) || endpoint;
-        const subscriptionExecutor = await this.buildSubscriptionExecutor(subscriptionsEndpoint, fetch, options);
-        return request => {
+    getExecutor(endpoint, importFn, options) {
+        const fetch$ = new ValueOrPromise(() => this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport));
+        const httpExecutor$ = fetch$.then(fetch => {
+            return this.buildHTTPExecutor(endpoint, fetch, options);
+        });
+        const subscriptionExecutor$ = fetch$.then(fetch => {
+            const subscriptionsEndpoint = (options === null || options === void 0 ? void 0 : options.subscriptionsEndpoint) || endpoint;
+            return this.buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options);
+        });
+        function getExecutorByRequest(request) {
             const operationAst = getOperationASTFromRequest(request);
             if (operationAst.operation === 'subscription' ||
                 isLiveQueryOperationDefinitionNode(operationAst, request.variables)) {
-                return subscriptionExecutor(request);
+                return subscriptionExecutor$;
             }
-            return httpExecutor(request);
-        };
+            else {
+                return httpExecutor$;
+            }
+        }
+        return request => getExecutorByRequest(request)
+            .then(executor => executor(request))
+            .resolve();
+    }
+    getExecutorAsync(endpoint, options) {
+        return this.getExecutor(endpoint, asyncImport, options);
     }
     getExecutorSync(endpoint, options) {
-        const fetch = this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, syncImport);
-        const executor = this.buildHTTPExecutor(endpoint, fetch, options);
-        return executor;
+        return this.getExecutor(endpoint, syncImport, options);
     }
     handleSDL(pointer, fetch, options) {
         const defaultMethod = this.getDefaultMethodFromOptions(options === null || options === void 0 ? void 0 : options.method, 'GET');
@@ -697,15 +705,15 @@ class UrlLoader {
             .resolve();
     }
     async load(pointer, options) {
-        if (!(await this.canLoad(pointer, options))) {
+        if (!isCompatibleUri(pointer)) {
             return [];
         }
         let source = {
             location: pointer,
         };
-        const fetch = await this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport);
-        let executor = await this.getExecutorAsync(pointer, options);
+        let executor;
         if ((options === null || options === void 0 ? void 0 : options.handleAsSDL) || pointer.endsWith('.graphql') || pointer.endsWith('.graphqls')) {
+            const fetch = await this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, asyncImport);
             source = await this.handleSDL(pointer, fetch, options);
             if (!source.schema && !source.document && !source.rawSDL) {
                 throw new Error(`Invalid SDL response`);
@@ -719,13 +727,14 @@ class UrlLoader {
                             : undefined);
         }
         else {
+            executor = this.getExecutorAsync(pointer, options);
             source.schema = await introspectSchema(executor, {}, options);
         }
         if (!source.schema) {
             throw new Error(`Invalid introspected schema`);
         }
         if (options === null || options === void 0 ? void 0 : options.endpoint) {
-            executor = await this.getExecutorAsync(options.endpoint, options);
+            executor = this.getExecutorAsync(options.endpoint, options);
         }
         source.schema = wrapSchema({
             schema: source.schema,
@@ -734,15 +743,15 @@ class UrlLoader {
         return [source];
     }
     loadSync(pointer, options) {
-        if (!this.canLoadSync(pointer, options)) {
+        if (!isCompatibleUri(pointer)) {
             return [];
         }
         let source = {
             location: pointer,
         };
-        const fetch = this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, syncImport);
-        let executor = this.getExecutorSync(pointer, options);
+        let executor;
         if ((options === null || options === void 0 ? void 0 : options.handleAsSDL) || pointer.endsWith('.graphql') || pointer.endsWith('.graphqls')) {
+            const fetch = this.getFetch(options === null || options === void 0 ? void 0 : options.customFetch, syncImport);
             source = this.handleSDL(pointer, fetch, options);
             if (!source.schema && !source.document && !source.rawSDL) {
                 throw new Error(`Invalid SDL response`);
@@ -756,6 +765,7 @@ class UrlLoader {
                             : undefined);
         }
         else {
+            executor = this.getExecutorSync(pointer, options);
             source.schema = introspectSchema(executor, {}, options);
         }
         if (!source.schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -23,7 +23,6 @@
     "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"
   },