@graphql-tools/executor-http 1.1.9 → 1.1.10-alpha-e8c01415b3b19676af5ff8b818bc152e3293f9e4

package/package.json

@@ -1,66 +1,58 @@
 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.1.9",
+  "version": "1.1.10-alpha-e8c01415b3b19676af5ff8b818bc152e3293f9e4",
+  "type": "module",
   "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/utils": "^10.5.6",
-    "@repeaterjs/repeater": "^3.0.4",
-    "@whatwg-node/fetch": "^0.10.0",
-    "extract-files": "^11.0.0",
-    "meros": "^1.2.1",
-    "tslib": "^2.4.0",
-    "value-or-promise": "^1.0.12"
-  },
   "repository": {
     "type": "git",
-    "url": "ardatan/graphql-tools",
+    "url": "graphql-hive/gateway",
     "directory": "packages/executors/http"
   },
   "author": "Arda TANRIKULU <ardatanrikulu@gmail.com>",
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
-  "main": "cjs/index.js",
-  "module": "esm/index.js",
-  "typings": "typings/index.d.ts",
-  "typescript": {
-    "definition": "typings/index.d.ts"
-  },
-  "type": "module",
+  "main": "./dist/index.js",
   "exports": {
     ".": {
       "require": {
-        "types": "./typings/index.d.cts",
-        "default": "./cjs/index.js"
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
       },
       "import": {
-        "types": "./typings/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "default": {
-        "types": "./typings/index.d.ts",
-        "default": "./esm/index.js"
-      }
-    },
-    "./*": {
-      "require": {
-        "types": "./typings/*.d.cts",
-        "default": "./cjs/*.js"
-      },
-      "import": {
-        "types": "./typings/*.d.ts",
-        "default": "./esm/*.js"
-      },
-      "default": {
-        "types": "./typings/*.d.ts",
-        "default": "./esm/*.js"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
     "./package.json": "./package.json"
-  }
+  },
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "pkgroll --clean-dist",
+    "prepack": "yarn build"
+  },
+  "peerDependencies": {
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+  },
+  "dependencies": {
+    "@graphql-tools/utils": "^10.5.6",
+    "@repeaterjs/repeater": "^3.0.4",
+    "@whatwg-node/fetch": "^0.10.0",
+    "extract-files": "^11.0.0",
+    "meros": "^1.2.1",
+    "tslib": "^2.4.0",
+    "value-or-promise": "^1.0.12"
+  },
+  "devDependencies": {
+    "@types/extract-files": "8.1.3",
+    "@whatwg-node/disposablestack": "^0.0.5",
+    "graphql": "^16.9.0",
+    "graphql-yoga": "^5.8.0",
+    "pkgroll": "2.5.1"
+  },
+  "sideEffects": false
 }

package/cjs/createFormDataFromVariables.js

@@ -1,76 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFormDataFromVariables = void 0;
-const extract_files_1 = require("extract-files");
-const value_or_promise_1 = require("value-or-promise");
-const utils_1 = require("@graphql-tools/utils");
-const fetch_1 = require("@whatwg-node/fetch");
-const isGraphQLUpload_js_1 = require("./isGraphQLUpload.js");
-function createFormDataFromVariables({ query, variables, operationName, extensions, }, { File: FileCtor = fetch_1.File, FormData: FormDataCtor = fetch_1.FormData, }) {
-    const vars = Object.assign({}, variables);
-    const { clone, files } = (0, extract_files_1.extractFiles)(vars, 'variables', ((v) => (0, extract_files_1.isExtractableFile)(v) ||
-        v?.promise ||
-        (0, utils_1.isAsyncIterable)(v) ||
-        v?.then ||
-        typeof v?.arrayBuffer === 'function'));
-    if (files.size === 0) {
-        return JSON.stringify({
-            query,
-            variables,
-            operationName,
-            extensions,
-        }, null, 2);
-    }
-    const map = {};
-    const uploads = [];
-    let currIndex = 0;
-    for (const [file, curr] of files) {
-        map[currIndex] = curr;
-        uploads[currIndex] = file;
-        currIndex++;
-    }
-    const form = new FormDataCtor();
-    form.append('operations', JSON.stringify({
-        query,
-        variables: clone,
-        operationName,
-        extensions,
-    }));
-    form.append('map', JSON.stringify(map, null, 2));
-    function handleUpload(upload, i) {
-        const indexStr = i.toString();
-        if (upload != null) {
-            const filename = upload.filename || upload.name || upload.path || `blob-${indexStr}`;
-            if ((0, utils_1.isPromise)(upload)) {
-                return upload.then((resolvedUpload) => handleUpload(resolvedUpload, i));
-                // If Blob
-            }
-            else if (isBlob(upload)) {
-                form.append(indexStr, upload, filename);
-            }
-            else if ((0, isGraphQLUpload_js_1.isGraphQLUpload)(upload)) {
-                const stream = upload.createReadStream();
-                const chunks = [];
-                return Promise.resolve().then(async () => {
-                    for await (const chunk of stream) {
-                        if (chunk) {
-                            chunks.push(...chunk);
-                        }
-                    }
-                    const blobPart = new Uint8Array(chunks);
-                    form.append(indexStr, new FileCtor([blobPart], filename, { type: upload.mimetype }), filename);
-                });
-            }
-            else {
-                form.append(indexStr, new FileCtor([upload], filename), filename);
-            }
-        }
-    }
-    return value_or_promise_1.ValueOrPromise.all(uploads.map((upload, i) => new value_or_promise_1.ValueOrPromise(() => handleUpload(upload, i))))
-        .then(() => form)
-        .resolve();
-}
-exports.createFormDataFromVariables = createFormDataFromVariables;
-function isBlob(obj) {
-    return typeof obj.arrayBuffer === 'function';
-}

package/cjs/createTimeoutSignal.js

@@ -1 +0,0 @@
-"use strict";

package/cjs/defaultPrintFn.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultPrintFn = void 0;
-const graphql_1 = require("graphql");
-const printCache = new WeakMap();
-function defaultPrintFn(document) {
-    let printed = printCache.get(document);
-    if (!printed) {
-        printed = (0, graphql_1.stripIgnoredCharacters)((0, graphql_1.print)(document));
-        printCache.set(document, printed);
-    }
-    return printed;
-}
-exports.defaultPrintFn = defaultPrintFn;

package/cjs/handleEventStreamResponse.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleEventStreamResponse = exports.isReadableStream = void 0;
-const utils_1 = require("@graphql-tools/utils");
-const repeater_1 = require("@repeaterjs/repeater");
-const fetch_1 = require("@whatwg-node/fetch");
-const DELIM = '\n\n';
-function isReadableStream(value) {
-    return value && typeof value.getReader === 'function';
-}
-exports.isReadableStream = isReadableStream;
-function handleEventStreamResponse(response) {
-    // node-fetch returns body as a promise so we need to resolve it
-    const body = response.body;
-    if (!isReadableStream(body)) {
-        throw new Error('Response body is expected to be a readable stream but got; ' + (0, utils_1.inspect)(body));
-    }
-    return new repeater_1.Repeater((push, stop) => {
-        const decoder = new fetch_1.TextDecoder();
-        const reader = body.getReader();
-        reader.closed.then(stop).catch(stop); // we dont use `finally` because we want to catch errors
-        stop.finally(() => reader.cancel());
-        let currChunk = '';
-        async function pump() {
-            const { done, value: chunk } = await reader.read();
-            if (done) {
-                return stop();
-            }
-            currChunk += typeof chunk === 'string' ? chunk : decoder.decode(chunk);
-            for (;;) {
-                const delimIndex = currChunk.indexOf(DELIM);
-                if (delimIndex === -1) {
-                    // incomplete message, wait for more chunks
-                    break;
-                }
-                const msg = currChunk.slice(0, delimIndex); // whole message
-                currChunk = currChunk.slice(delimIndex + DELIM.length); // remainder
-                // data
-                const dataStr = msg.split('data:')[1]?.trim();
-                if (dataStr) {
-                    const data = JSON.parse(dataStr);
-                    await push(data.payload || data);
-                }
-                // event
-                const event = msg.split('event:')[1]?.trim();
-                if (event === 'complete') {
-                    return stop();
-                }
-            }
-            return pump();
-        }
-        return pump();
-    });
-}
-exports.handleEventStreamResponse = handleEventStreamResponse;

package/cjs/handleMultipartMixedResponse.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMultipartMixedResponse = void 0;
-const browser_1 = require("meros/browser");
-const node_1 = require("meros/node");
-const utils_1 = require("@graphql-tools/utils");
-function isIncomingMessage(body) {
-    return body != null && typeof body === 'object' && 'pipe' in body;
-}
-async function handleMultipartMixedResponse(response) {
-    const body = response.body;
-    const contentType = response.headers.get('content-type') || '';
-    let asyncIterator;
-    if (isIncomingMessage(body)) {
-        // Meros/node expects headers as an object map with the content-type prop
-        body.headers = {
-            'content-type': contentType,
-        };
-        // And it expects `IncomingMessage` and `node-fetch` returns `body` as `Promise<PassThrough>`
-        const result = await (0, node_1.meros)(body);
-        if ('next' in result) {
-            asyncIterator = result;
-        }
-    }
-    else {
-        // Nothing is needed for regular `Response`.
-        const result = await (0, browser_1.meros)(response);
-        if ('next' in result) {
-            asyncIterator = result;
-        }
-    }
-    const executionResult = {};
-    if (asyncIterator == null) {
-        return executionResult;
-    }
-    const resultStream = (0, utils_1.mapAsyncIterator)(asyncIterator, (part) => {
-        if (part.json) {
-            const incrementalResult = part.body;
-            (0, utils_1.mergeIncrementalResult)({
-                incrementalResult,
-                executionResult,
-            });
-            return executionResult;
-        }
-    });
-    return resultStream;
-}
-exports.handleMultipartMixedResponse = handleMultipartMixedResponse;

package/cjs/index.js

@@ -1,314 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLiveQueryOperationDefinitionNode = exports.buildHTTPExecutor = void 0;
-const value_or_promise_1 = require("value-or-promise");
-const utils_1 = require("@graphql-tools/utils");
-const fetch_1 = require("@whatwg-node/fetch");
-const createFormDataFromVariables_js_1 = require("./createFormDataFromVariables.js");
-const defaultPrintFn_js_1 = require("./defaultPrintFn.js");
-const handleEventStreamResponse_js_1 = require("./handleEventStreamResponse.js");
-const handleMultipartMixedResponse_js_1 = require("./handleMultipartMixedResponse.js");
-const isLiveQueryOperationDefinitionNode_js_1 = require("./isLiveQueryOperationDefinitionNode.js");
-Object.defineProperty(exports, "isLiveQueryOperationDefinitionNode", { enumerable: true, get: function () { return isLiveQueryOperationDefinitionNode_js_1.isLiveQueryOperationDefinitionNode; } });
-const prepareGETUrl_js_1 = require("./prepareGETUrl.js");
-function buildHTTPExecutor(options) {
-    const printFn = options?.print ?? defaultPrintFn_js_1.defaultPrintFn;
-    let disposeCtrl;
-    const baseExecutor = (request) => {
-        if (disposeCtrl?.signal.aborted) {
-            return createResultForAbort(disposeCtrl.signal);
-        }
-        const fetchFn = request.extensions?.fetch ?? options?.fetch ?? fetch_1.fetch;
-        let method = request.extensions?.method || options?.method;
-        const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
-        const operationType = operationAst.operation;
-        if ((options?.useGETForQueries || request.extensions?.useGETForQueries) &&
-            operationType === 'query') {
-            method = 'GET';
-        }
-        let accept = 'application/graphql-response+json, application/json, multipart/mixed';
-        if (operationType === 'subscription' || (0, isLiveQueryOperationDefinitionNode_js_1.isLiveQueryOperationDefinitionNode)(operationAst)) {
-            method ||= 'GET';
-            accept = 'text/event-stream';
-        }
-        else {
-            method ||= 'POST';
-        }
-        const endpoint = request.extensions?.endpoint || options?.endpoint || '/graphql';
-        const headers = { accept };
-        if (options?.headers) {
-            Object.assign(headers, typeof options?.headers === 'function' ? options.headers(request) : options?.headers);
-        }
-        if (request.extensions?.headers) {
-            const { headers: headersFromExtensions, ...restExtensions } = request.extensions;
-            Object.assign(headers, headersFromExtensions);
-            request.extensions = restExtensions;
-        }
-        const query = printFn(request.document);
-        let signal = disposeCtrl?.signal;
-        let clearTimeoutFn = () => { };
-        if (options?.timeout) {
-            const timeoutCtrl = new AbortController();
-            signal = timeoutCtrl.signal;
-            disposeCtrl?.signal.addEventListener('abort', clearTimeoutFn);
-            const timeoutId = setTimeout(() => {
-                if (!timeoutCtrl.signal.aborted) {
-                    timeoutCtrl.abort('timeout');
-                }
-                disposeCtrl?.signal.removeEventListener('abort', clearTimeoutFn);
-            }, options.timeout);
-            clearTimeoutFn = () => {
-                clearTimeout(timeoutId);
-            };
-        }
-        const upstreamErrorExtensions = {
-            request: {
-                method,
-            },
-            response: {},
-        };
-        return new value_or_promise_1.ValueOrPromise(() => {
-            switch (method) {
-                case 'GET': {
-                    const finalUrl = (0, prepareGETUrl_js_1.prepareGETUrl)({
-                        baseUrl: endpoint,
-                        query,
-                        variables: request.variables,
-                        operationName: request.operationName,
-                        extensions: request.extensions,
-                    });
-                    const fetchOptions = {
-                        method: 'GET',
-                        headers,
-                        signal,
-                    };
-                    if (options?.credentials != null) {
-                        fetchOptions.credentials = options.credentials;
-                    }
-                    upstreamErrorExtensions.request.url = finalUrl;
-                    return fetchFn(finalUrl, fetchOptions, request.context, request.info);
-                }
-                case 'POST': {
-                    const body = {
-                        query,
-                        variables: request.variables,
-                        operationName: request.operationName,
-                        extensions: request.extensions,
-                    };
-                    upstreamErrorExtensions.request.body = body;
-                    return new value_or_promise_1.ValueOrPromise(() => (0, createFormDataFromVariables_js_1.createFormDataFromVariables)(body, {
-                        File: options?.File,
-                        FormData: options?.FormData,
-                    }))
-                        .then(body => {
-                        if (typeof body === 'string' && !headers['content-type']) {
-                            upstreamErrorExtensions.request.body = body;
-                            headers['content-type'] = 'application/json';
-                        }
-                        const fetchOptions = {
-                            method: 'POST',
-                            body,
-                            headers,
-                            signal,
-                        };
-                        if (options?.credentials != null) {
-                            fetchOptions.credentials = options.credentials;
-                        }
-                        return fetchFn(endpoint, fetchOptions, request.context, request.info);
-                    })
-                        .resolve();
-                }
-            }
-        })
-            .then((fetchResult) => {
-            upstreamErrorExtensions.response.status = fetchResult.status;
-            upstreamErrorExtensions.response.statusText = fetchResult.statusText;
-            Object.defineProperty(upstreamErrorExtensions.response, 'headers', {
-                get() {
-                    return Object.fromEntries(fetchResult.headers.entries());
-                },
-            });
-            clearTimeoutFn();
-            // Retry should respect HTTP Errors
-            if (options?.retry != null && !fetchResult.status.toString().startsWith('2')) {
-                throw new Error(fetchResult.statusText || `Upstream HTTP Error: ${fetchResult.status}`);
-            }
-            const contentType = fetchResult.headers.get('content-type');
-            if (contentType?.includes('text/event-stream')) {
-                return (0, handleEventStreamResponse_js_1.handleEventStreamResponse)(fetchResult);
-            }
-            else if (contentType?.includes('multipart/mixed')) {
-                return (0, handleMultipartMixedResponse_js_1.handleMultipartMixedResponse)(fetchResult);
-            }
-            return fetchResult.text();
-        })
-            .then(result => {
-            if (typeof result === 'string') {
-                upstreamErrorExtensions.response.body = result;
-                if (result) {
-                    try {
-                        const parsedResult = JSON.parse(result);
-                        upstreamErrorExtensions.response.body = parsedResult;
-                        if (parsedResult.data == null &&
-                            (parsedResult.errors == null || parsedResult.errors.length === 0)) {
-                            return {
-                                errors: [
-                                    (0, utils_1.createGraphQLError)('Unexpected empty "data" and "errors" fields in result: ' + result, {
-                                        extensions: upstreamErrorExtensions,
-                                    }),
-                                ],
-                            };
-                        }
-                        if (Array.isArray(parsedResult.errors)) {
-                            return {
-                                ...parsedResult,
-                                errors: parsedResult.errors.map(({ message, ...options }) => (0, utils_1.createGraphQLError)(message, {
-                                    ...options,
-                                    extensions: {
-                                        code: 'DOWNSTREAM_SERVICE_ERROR',
-                                        ...(options.extensions || {}),
-                                    },
-                                })),
-                            };
-                        }
-                        return parsedResult;
-                    }
-                    catch (e) {
-                        return {
-                            errors: [
-                                (0, utils_1.createGraphQLError)(`Unexpected response: ${JSON.stringify(result)}`, {
-                                    extensions: upstreamErrorExtensions,
-                                    originalError: e,
-                                }),
-                            ],
-                        };
-                    }
-                }
-            }
-            else {
-                return result;
-            }
-        })
-            .catch((e) => {
-            if (e.name === 'AggregateError') {
-                return {
-                    errors: e.errors.map((e) => coerceFetchError(e, {
-                        signal,
-                        endpoint,
-                        upstreamErrorExtensions,
-                    })),
-                };
-            }
-            return {
-                errors: [
-                    coerceFetchError(e, {
-                        signal,
-                        endpoint,
-                        upstreamErrorExtensions,
-                    }),
-                ],
-            };
-        })
-            .resolve();
-    };
-    let executor = baseExecutor;
-    if (options?.retry != null) {
-        executor = function retryExecutor(request) {
-            let result;
-            let attempt = 0;
-            function retryAttempt() {
-                if (disposeCtrl?.signal.aborted) {
-                    return createResultForAbort(disposeCtrl.signal);
-                }
-                attempt++;
-                if (attempt > options.retry) {
-                    if (result != null) {
-                        return result;
-                    }
-                    return {
-                        errors: [(0, utils_1.createGraphQLError)('No response returned from fetch')],
-                    };
-                }
-                return new value_or_promise_1.ValueOrPromise(() => baseExecutor(request))
-                    .then(res => {
-                    result = res;
-                    if (result?.errors?.length) {
-                        return retryAttempt();
-                    }
-                    return result;
-                })
-                    .resolve();
-            }
-            return retryAttempt();
-        };
-    }
-    if (!options?.disposable) {
-        disposeCtrl = undefined;
-        return executor;
-    }
-    disposeCtrl = new AbortController();
-    Object.defineProperties(executor, {
-        [Symbol.dispose]: {
-            get() {
-                return function dispose() {
-                    return disposeCtrl.abort(createAbortErrorReason());
-                };
-            },
-        },
-        [Symbol.asyncDispose]: {
-            get() {
-                return function asyncDispose() {
-                    return disposeCtrl.abort(createAbortErrorReason());
-                };
-            },
-        },
-    });
-    return executor;
-}
-exports.buildHTTPExecutor = buildHTTPExecutor;
-function coerceFetchError(e, { signal, endpoint, upstreamErrorExtensions, }) {
-    if (typeof e === 'string') {
-        return (0, utils_1.createGraphQLError)(e, {
-            extensions: upstreamErrorExtensions,
-        });
-    }
-    else if (e.name === 'GraphQLError') {
-        return e;
-    }
-    else if (e.name === 'TypeError' && e.message === 'fetch failed') {
-        return (0, utils_1.createGraphQLError)(`fetch failed to ${endpoint}`, {
-            extensions: upstreamErrorExtensions,
-            originalError: e,
-        });
-    }
-    else if (e.name === 'AbortError' && signal?.reason) {
-        return createGraphQLErrorForAbort(signal, {
-            extensions: upstreamErrorExtensions,
-        });
-    }
-    else if (e.message) {
-        return (0, utils_1.createGraphQLError)(e.message, {
-            extensions: upstreamErrorExtensions,
-            originalError: e,
-        });
-    }
-    else {
-        return (0, utils_1.createGraphQLError)('Unknown error', {
-            extensions: upstreamErrorExtensions,
-            originalError: e,
-        });
-    }
-}
-function createAbortErrorReason() {
-    return new Error('Executor was disposed.');
-}
-function createGraphQLErrorForAbort(signal, extensions) {
-    return (0, utils_1.createGraphQLError)('The operation was aborted. reason: ' + signal.reason, {
-        extensions,
-    });
-}
-function createResultForAbort(signal, extensions) {
-    return {
-        errors: [createGraphQLErrorForAbort(signal, extensions)],
-    };
-}

package/cjs/isGraphQLUpload.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGraphQLUpload = void 0;
-function isGraphQLUpload(upload) {
-    return typeof upload.createReadStream === 'function';
-}
-exports.isGraphQLUpload = isGraphQLUpload;

package/cjs/isLiveQueryOperationDefinitionNode.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLiveQueryOperationDefinitionNode = void 0;
-const utils_1 = require("@graphql-tools/utils");
-exports.isLiveQueryOperationDefinitionNode = (0, utils_1.memoize1)(function isLiveQueryOperationDefinitionNode(node) {
-    return (node.operation === 'query' &&
-        node.directives?.some(directive => directive.name.value === 'live'));
-});

package/cjs/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}

package/cjs/prepareGETUrl.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareGETUrl = void 0;
-const graphql_1 = require("graphql");
-function prepareGETUrl({ baseUrl = '', query, variables, operationName, extensions, }) {
-    const dummyHostname = 'https://dummyhostname.com';
-    const validUrl = baseUrl.startsWith('http')
-        ? baseUrl
-        : baseUrl?.startsWith('/')
-            ? `${dummyHostname}${baseUrl}`
-            : `${dummyHostname}/${baseUrl}`;
-    const urlObj = new URL(validUrl);
-    urlObj.searchParams.set('query', (0, graphql_1.stripIgnoredCharacters)(query));
-    if (variables && Object.keys(variables).length > 0) {
-        urlObj.searchParams.set('variables', JSON.stringify(variables));
-    }
-    if (operationName) {
-        urlObj.searchParams.set('operationName', operationName);
-    }
-    if (extensions) {
-        urlObj.searchParams.set('extensions', JSON.stringify(extensions));
-    }
-    const finalUrl = urlObj.toString().replace(dummyHostname, '');
-    return finalUrl;
-}
-exports.prepareGETUrl = prepareGETUrl;