@graphql-tools/url-loader 8.0.25-alpha-20250130084102-0293c7e33db7171829b11520fa3c5062fb44cb3d → 8.0.25-alpha-20250209212603-8422ca208e29154daa75f23ffdc70e969464572b

package/cjs/defaultAsyncFetch.js

@@ -2,7 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultAsyncFetch = void 0;
 const fetch_1 = require("@whatwg-node/fetch");
-const defaultAsyncFetch = async (input, init) => {
-    return (0, fetch_1.fetch)(input, init);
-};
-exports.defaultAsyncFetch = defaultAsyncFetch;
+exports.defaultAsyncFetch = fetch_1.fetch;

package/cjs/index.js

@@ -4,7 +4,6 @@ exports.UrlLoader = exports.SubscriptionProtocol = void 0;
 const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const isomorphic_ws_1 = tslib_1.__importDefault(require("isomorphic-ws"));
-const value_or_promise_1 = require("value-or-promise");
 const executor_graphql_ws_1 = require("@graphql-tools/executor-graphql-ws");
 const executor_http_1 = require("@graphql-tools/executor-http");
 const executor_legacy_ws_1 = require("@graphql-tools/executor-legacy-ws");
@@ -33,13 +32,10 @@ var SubscriptionProtocol;
 })(SubscriptionProtocol || (exports.SubscriptionProtocol = SubscriptionProtocol = {}));
 const acceptableProtocols = ['http:', 'https:', 'ws:', 'wss:'];
 function isCompatibleUri(uri) {
-    try {
-        const url = new URL(uri);
-        return acceptableProtocols.includes(url.protocol);
-    }
-    catch {
-        return false;
+    if (acceptableProtocols.some(protocol => uri.startsWith(protocol))) {
+        return (0, utils_1.isUrl)(uri);
     }
+    return false;
 }
 /**
  * This loader loads a schema from a URL. The loaded schema is a fully-executable,
@@ -87,9 +83,7 @@ class UrlLoader {
         if (customFetch) {
             if (typeof customFetch === 'string') {
                 const [moduleName, fetchFnName] = customFetch.split('#');
-                return new value_or_promise_1.ValueOrPromise(() => importFn(moduleName))
-                    .then(module => (fetchFnName ? module[fetchFnName] : module))
-                    .resolve();
+                return (0, utils_1.mapMaybePromise)(importFn(moduleName), module => fetchFnName ? module[fetchFnName] : module);
             }
             else if (typeof customFetch === 'function') {
                 return customFetch;
@@ -111,9 +105,7 @@ class UrlLoader {
     getWebSocketImpl(importFn, options) {
         if (typeof options?.webSocketImpl === 'string') {
             const [moduleName, webSocketImplName] = options.webSocketImpl.split('#');
-            return new value_or_promise_1.ValueOrPromise(() => importFn(moduleName))
-                .then(importedModule => webSocketImplName ? importedModule[webSocketImplName] : importedModule)
-                .resolve();
+            return (0, utils_1.mapMaybePromise)(importFn(moduleName), importedModule => webSocketImplName ? importedModule[webSocketImplName] : importedModule);
         }
         else {
             const websocketImpl = options?.webSocketImpl || isomorphic_ws_1.default;
@@ -133,8 +125,7 @@ class UrlLoader {
             return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, options);
         }
         else {
-            const webSocketImpl$ = new value_or_promise_1.ValueOrPromise(() => this.getWebSocketImpl(importFn, options));
-            const executor$ = webSocketImpl$.then(webSocketImpl => {
+            const executor$ = (0, utils_1.mapMaybePromise)(this.getWebSocketImpl(importFn, options), webSocketImpl => {
                 if (options?.subscriptionsProtocol === SubscriptionProtocol.LEGACY_WS) {
                     return this.buildWSLegacyExecutor(subscriptionsEndpoint, webSocketImpl, options);
                 }
@@ -142,17 +133,15 @@ class UrlLoader {
                     return this.buildWSExecutor(subscriptionsEndpoint, webSocketImpl, options?.connectionParams);
                 }
             });
-            return request => executor$.then(executor => executor(request)).resolve();
+            return request => (0, utils_1.mapMaybePromise)(executor$, executor => executor(request));
         }
     }
     getExecutor(endpoint, importFn, options) {
-        const fetch$ = new value_or_promise_1.ValueOrPromise(() => this.getFetch(options?.customFetch, importFn));
-        const httpExecutor$ = fetch$.then(fetch => {
-            return this.buildHTTPExecutor(endpoint, fetch, options);
-        });
+        const fetch$ = this.getFetch(options?.customFetch, importFn);
+        const httpExecutor$ = (0, utils_1.mapMaybePromise)(fetch$, fetch => this.buildHTTPExecutor(endpoint, fetch, options));
         if (options?.subscriptionsEndpoint != null ||
             options?.subscriptionsProtocol !== SubscriptionProtocol.SSE) {
-            const subscriptionExecutor$ = fetch$.then(fetch => {
+            const subscriptionExecutor$ = (0, utils_1.mapMaybePromise)(fetch$, fetch => {
                 const subscriptionsEndpoint = options?.subscriptionsEndpoint || endpoint;
                 return this.buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options);
             });
@@ -170,12 +159,10 @@ class UrlLoader {
                     return httpExecutor$;
                 }
             }
-            return request => getExecutorByRequest(request)
-                .then(executor => executor(request))
-                .resolve();
+            return request => (0, utils_1.mapMaybePromise)(getExecutorByRequest(request), executor => executor(request));
         }
         else {
-            return request => httpExecutor$.then(executor => executor(request)).resolve();
+            return request => (0, utils_1.mapMaybePromise)(httpExecutor$, executor => executor(request));
         }
     }
     getExecutorAsync(endpoint, options) {
@@ -186,13 +173,10 @@ class UrlLoader {
     }
     handleSDL(pointer, fetch, options) {
         const defaultMethod = this.getDefaultMethodFromOptions(options?.method, 'GET');
-        return new value_or_promise_1.ValueOrPromise(() => fetch(pointer, {
+        return (0, utils_1.mapMaybePromise)(fetch(pointer, {
             method: defaultMethod,
             headers: typeof options?.headers === 'function' ? options.headers() : options?.headers,
-        }))
-            .then(response => response.text())
-            .then(schemaString => (0, utils_1.parseGraphQLSDL)(pointer, schemaString, options))
-            .resolve();
+        }), res => (0, utils_1.mapMaybePromise)(res.text(), schemaString => (0, utils_1.parseGraphQLSDL)(pointer, schemaString, options)));
     }
     async load(pointer, options) {
         if (!isCompatibleUri(pointer)) {

package/esm/defaultAsyncFetch.js

@@ -1,4 +1,2 @@
 import { fetch } from '@whatwg-node/fetch';
-export const defaultAsyncFetch = async (input, init) => {
-    return fetch(input, init);
-};
+export const defaultAsyncFetch = fetch;

package/esm/index.js

@@ -1,10 +1,9 @@
 import { buildASTSchema, buildSchema } from 'graphql';
 import WebSocket from 'isomorphic-ws';
-import { ValueOrPromise } from 'value-or-promise';
 import { buildGraphQLWSExecutor } from '@graphql-tools/executor-graphql-ws';
 import { buildHTTPExecutor, isLiveQueryOperationDefinitionNode, } from '@graphql-tools/executor-http';
 import { buildWSLegacyExecutor } from '@graphql-tools/executor-legacy-ws';
-import { getOperationASTFromRequest, parseGraphQLSDL, } from '@graphql-tools/utils';
+import { getOperationASTFromRequest, isUrl, mapMaybePromise, parseGraphQLSDL, } from '@graphql-tools/utils';
 import { schemaFromExecutor, wrapSchema } from '@graphql-tools/wrap';
 import { defaultAsyncFetch } from './defaultAsyncFetch.js';
 import { defaultSyncFetch } from './defaultSyncFetch.js';
@@ -29,13 +28,10 @@ export var SubscriptionProtocol;
 })(SubscriptionProtocol || (SubscriptionProtocol = {}));
 const acceptableProtocols = ['http:', 'https:', 'ws:', 'wss:'];
 function isCompatibleUri(uri) {
-    try {
-        const url = new URL(uri);
-        return acceptableProtocols.includes(url.protocol);
-    }
-    catch {
-        return false;
+    if (acceptableProtocols.some(protocol => uri.startsWith(protocol))) {
+        return isUrl(uri);
     }
+    return false;
 }
 /**
  * This loader loads a schema from a URL. The loaded schema is a fully-executable,
@@ -83,9 +79,7 @@ export class UrlLoader {
         if (customFetch) {
             if (typeof customFetch === 'string') {
                 const [moduleName, fetchFnName] = customFetch.split('#');
-                return new ValueOrPromise(() => importFn(moduleName))
-                    .then(module => (fetchFnName ? module[fetchFnName] : module))
-                    .resolve();
+                return mapMaybePromise(importFn(moduleName), module => fetchFnName ? module[fetchFnName] : module);
             }
             else if (typeof customFetch === 'function') {
                 return customFetch;
@@ -107,9 +101,7 @@ export class UrlLoader {
     getWebSocketImpl(importFn, options) {
         if (typeof options?.webSocketImpl === 'string') {
             const [moduleName, webSocketImplName] = options.webSocketImpl.split('#');
-            return new ValueOrPromise(() => importFn(moduleName))
-                .then(importedModule => webSocketImplName ? importedModule[webSocketImplName] : importedModule)
-                .resolve();
+            return mapMaybePromise(importFn(moduleName), importedModule => webSocketImplName ? importedModule[webSocketImplName] : importedModule);
         }
         else {
             const websocketImpl = options?.webSocketImpl || WebSocket;
@@ -129,8 +121,7 @@ export class UrlLoader {
             return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, options);
         }
         else {
-            const webSocketImpl$ = new ValueOrPromise(() => this.getWebSocketImpl(importFn, options));
-            const executor$ = webSocketImpl$.then(webSocketImpl => {
+            const executor$ = mapMaybePromise(this.getWebSocketImpl(importFn, options), webSocketImpl => {
                 if (options?.subscriptionsProtocol === SubscriptionProtocol.LEGACY_WS) {
                     return this.buildWSLegacyExecutor(subscriptionsEndpoint, webSocketImpl, options);
                 }
@@ -138,17 +129,15 @@ export class UrlLoader {
                     return this.buildWSExecutor(subscriptionsEndpoint, webSocketImpl, options?.connectionParams);
                 }
             });
-            return request => executor$.then(executor => executor(request)).resolve();
+            return request => mapMaybePromise(executor$, executor => executor(request));
         }
     }
     getExecutor(endpoint, importFn, options) {
-        const fetch$ = new ValueOrPromise(() => this.getFetch(options?.customFetch, importFn));
-        const httpExecutor$ = fetch$.then(fetch => {
-            return this.buildHTTPExecutor(endpoint, fetch, options);
-        });
+        const fetch$ = this.getFetch(options?.customFetch, importFn);
+        const httpExecutor$ = mapMaybePromise(fetch$, fetch => this.buildHTTPExecutor(endpoint, fetch, options));
         if (options?.subscriptionsEndpoint != null ||
             options?.subscriptionsProtocol !== SubscriptionProtocol.SSE) {
-            const subscriptionExecutor$ = fetch$.then(fetch => {
+            const subscriptionExecutor$ = mapMaybePromise(fetch$, fetch => {
                 const subscriptionsEndpoint = options?.subscriptionsEndpoint || endpoint;
                 return this.buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options);
             });
@@ -166,12 +155,10 @@ export class UrlLoader {
                     return httpExecutor$;
                 }
             }
-            return request => getExecutorByRequest(request)
-                .then(executor => executor(request))
-                .resolve();
+            return request => mapMaybePromise(getExecutorByRequest(request), executor => executor(request));
         }
         else {
-            return request => httpExecutor$.then(executor => executor(request)).resolve();
+            return request => mapMaybePromise(httpExecutor$, executor => executor(request));
         }
     }
     getExecutorAsync(endpoint, options) {
@@ -182,13 +169,10 @@ export class UrlLoader {
     }
     handleSDL(pointer, fetch, options) {
         const defaultMethod = this.getDefaultMethodFromOptions(options?.method, 'GET');
-        return new ValueOrPromise(() => fetch(pointer, {
+        return mapMaybePromise(fetch(pointer, {
             method: defaultMethod,
             headers: typeof options?.headers === 'function' ? options.headers() : options?.headers,
-        }))
-            .then(response => response.text())
-            .then(schemaString => parseGraphQLSDL(pointer, schemaString, options))
-            .resolve();
+        }), res => mapMaybePromise(res.text(), schemaString => parseGraphQLSDL(pointer, schemaString, options)));
     }
     async load(pointer, options) {
         if (!isCompatibleUri(pointer)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "8.0.25-alpha-20250130084102-0293c7e33db7171829b11520fa3c5062fb44cb3d",
+  "version": "8.0.25-alpha-20250209212603-8422ca208e29154daa75f23ffdc70e969464572b",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
@@ -9,15 +9,14 @@
   "dependencies": {
     "@graphql-tools/executor-graphql-ws": "^1.3.2",
     "@graphql-tools/executor-http": "^1.1.9",
-    "@graphql-tools/executor-legacy-ws": "1.1.11-alpha-20250130084102-0293c7e33db7171829b11520fa3c5062fb44cb3d",
-    "@graphql-tools/utils": "10.8.0-alpha-20250130084102-0293c7e33db7171829b11520fa3c5062fb44cb3d",
+    "@graphql-tools/executor-legacy-ws": "1.1.11-alpha-20250209212603-8422ca208e29154daa75f23ffdc70e969464572b",
+    "@graphql-tools/utils": "10.8.0-alpha-20250209212603-8422ca208e29154daa75f23ffdc70e969464572b",
     "@graphql-tools/wrap": "^10.0.16",
     "@types/ws": "^8.0.0",
     "@whatwg-node/fetch": "^0.10.0",
     "isomorphic-ws": "^5.0.0",
     "sync-fetch": "0.6.0-2",
     "tslib": "^2.4.0",
-    "value-or-promise": "^1.0.11",
     "ws": "^8.17.1"
   },
   "repository": {