@atproto-labs/fetch 0.0.1 → 0.1.1

package/dist/fetch-response.js

@@ -1,17 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchJsonZodProcessor = exports.fetchJsonProcessor = exports.jsonTranformer = exports.fetchTypeProcessor = exports.fetchResponseMaxSize = exports.fetchMaxSizeProcessor = exports.fetchOkProcessor = exports.FetchResponseError = void 0;
-const transformer_1 = require("@atproto-labs/transformer");
+exports.fetchJsonZodProcessor = exports.fetchJsonProcessor = exports.fetchResponseJsonTranformer = exports.fetchResponseTypeChecker = exports.fetchTypeProcessor = exports.fetchResponseMaxSizeChecker = exports.fetchMaxSizeProcessor = exports.fetchOkTransformer = exports.fetchOkProcessor = exports.cancelBodyOnError = exports.extractMime = exports.extractLength = exports.checkLength = exports.peekJson = exports.FetchResponseError = void 0;
+const pipe_1 = require("@atproto-labs/pipe");
 const fetch_error_js_1 = require("./fetch-error.js");
-const util_js_1 = require("./util.js");
 const transformed_response_js_1 = require("./transformed-response.js");
+const util_js_1 = require("./util.js");
+class FetchResponseError extends fetch_error_js_1.FetchError {
+    constructor(response, statusCode = response.status, message = response.statusText, options) {
+        super(statusCode, message, options);
+        Object.defineProperty(this, "response", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: response
+        });
+    }
+    static async from(response, customMessage = extractResponseMessage, statusCode = response.status, options) {
+        const message = typeof customMessage === 'string'
+            ? customMessage
+            : typeof customMessage === 'function'
+                ? await customMessage(response)
+                : undefined;
+        return new FetchResponseError(response, statusCode, message, options);
+    }
+}
+exports.FetchResponseError = FetchResponseError;
 const extractResponseMessage = async (response) => {
-    if (!response.body)
-        return undefined;
-    const contentType = response.headers.get('content-type');
-    if (!contentType)
-        return undefined;
-    const mimeType = contentType.split(';')[0].trim();
+    const mimeType = extractMime(response);
     if (!mimeType)
         return undefined;
     try {
@@ -38,99 +53,137 @@ const extractResponseMessage = async (response) => {
     }
     return undefined;
 };
-class FetchResponseError extends fetch_error_js_1.FetchError {
-    constructor(response, statusCode = response.status, message = response.statusText, options) {
-        super(statusCode, message, { response, ...options });
+async function peekJson(response, maxSize = Infinity) {
+    const type = extractMime(response);
+    if (type !== 'application/json')
+        return undefined;
+    checkLength(response, maxSize);
+    // 1) Clone the request so we can consume the body
+    const clonedResponse = response.clone();
+    // 2) Make sure the request's body is not too large
+    const limitedResponse = response.body && maxSize < Infinity
+        ? new transformed_response_js_1.TransformedResponse(clonedResponse, new util_js_1.MaxBytesTransformStream(maxSize))
+        : // Note: some runtimes (e.g. react-native) don't expose a body property
+            clonedResponse;
+    // 3) Parse the JSON
+    return limitedResponse.json();
+}
+exports.peekJson = peekJson;
+function checkLength(response, maxBytes) {
+    // Note: negation accounts for invalid value types (NaN, non numbers)
+    if (!(maxBytes >= 0)) {
+        throw new TypeError('maxBytes must be a non-negative number');
     }
-    static async from(response, statusCode = response.status, customMessage = extractResponseMessage, options) {
-        const message = typeof customMessage === 'string'
-            ? customMessage
-            : typeof customMessage === 'function'
-                ? await customMessage(response)
-                : undefined;
-        // Make sure the body gets consumed as, in some environments (Node 👀), the
-        // response will not automatically be GC'd.
-        if (!response.bodyUsed)
-            await response.body?.cancel();
-        return new FetchResponseError(response, statusCode, message, options);
+    const length = extractLength(response);
+    if (length != null && length > maxBytes) {
+        throw new FetchResponseError(response, 502, 'Response too large');
     }
+    return length;
 }
-exports.FetchResponseError = FetchResponseError;
-function fetchOkProcessor(customMessage) {
+exports.checkLength = checkLength;
+function extractLength(response) {
+    const contentLength = response.headers.get('Content-Length');
+    if (contentLength == null)
+        return undefined;
+    if (!/^\d+$/.test(contentLength)) {
+        throw new FetchResponseError(response, 502, 'Invalid Content-Length');
+    }
+    const length = Number(contentLength);
+    if (!Number.isSafeInteger(length)) {
+        throw new FetchResponseError(response, 502, 'Content-Length too large');
+    }
+    return length;
+}
+exports.extractLength = extractLength;
+function extractMime(response) {
+    const contentType = response.headers.get('Content-Type');
+    if (contentType == null)
+        return undefined;
+    return contentType.split(';', 1)[0].trim();
+}
+exports.extractMime = extractMime;
+/**
+ * If the transformer results in an error, ensure that the response body is
+ * consumed as, in some environments (Node 👀), the response will not
+ * automatically be GC'd.
+ *
+ * @see {@link https://undici.nodejs.org/#/?id=garbage-collection}
+ * @param [onCancellationError] - Callback to handle any async body cancelling
+ * error. Defaults to logging the error. Do not use `null` if the request is
+ * cloned.
+ */
+function cancelBodyOnError(transformer, onCancellationError = util_js_1.logCancellationError) {
     return async (response) => {
-        if (response.ok)
-            return response;
-        throw await FetchResponseError.from(response, undefined, customMessage);
+        try {
+            return await transformer(response);
+        }
+        catch (err) {
+            await (0, util_js_1.cancelBody)(response, onCancellationError ?? undefined);
+            throw err;
+        }
     };
 }
+exports.cancelBodyOnError = cancelBodyOnError;
+function fetchOkProcessor(customMessage) {
+    return cancelBodyOnError((response) => {
+        return fetchOkTransformer(response, customMessage);
+    });
+}
 exports.fetchOkProcessor = fetchOkProcessor;
+async function fetchOkTransformer(response, customMessage) {
+    if (response.ok)
+        return response;
+    throw await FetchResponseError.from(response, customMessage);
+}
+exports.fetchOkTransformer = fetchOkTransformer;
 function fetchMaxSizeProcessor(maxBytes) {
     if (maxBytes === Infinity)
         return (response) => response;
     if (!Number.isFinite(maxBytes) || maxBytes < 0) {
-        throw new TypeError('maxBytes must be a non-negative number');
+        throw new TypeError('maxBytes must be a 0, Infinity or a positive number');
     }
-    return async (response) => fetchResponseMaxSize(response, maxBytes);
+    return cancelBodyOnError((response) => {
+        return fetchResponseMaxSizeChecker(response, maxBytes);
+    });
 }
 exports.fetchMaxSizeProcessor = fetchMaxSizeProcessor;
-async function fetchResponseMaxSize(response, maxBytes) {
+function fetchResponseMaxSizeChecker(response, maxBytes) {
     if (maxBytes === Infinity)
         return response;
+    checkLength(response, maxBytes);
+    // Some engines (react-native 👀) don't expose a body property. In that case,
+    // we will only rely on the Content-Length header.
     if (!response.body)
         return response;
-    const contentLength = response.headers.get('content-length');
-    if (contentLength) {
-        const length = Number(contentLength);
-        if (!(length < maxBytes)) {
-            const err = new FetchResponseError(response, 502, 'Response too large');
-            await response.body.cancel(err);
-            throw err;
-        }
-    }
-    let bytesRead = 0;
-    const transform = new TransformStream({
-        transform: (chunk, ctrl) => {
-            if ((bytesRead += chunk.length) <= maxBytes) {
-                ctrl.enqueue(chunk);
-            }
-            else {
-                ctrl.error(new FetchResponseError(response, 502, 'Response too large'));
-            }
-        },
-    });
+    const transform = new util_js_1.MaxBytesTransformStream(maxBytes);
     return new transformed_response_js_1.TransformedResponse(response, transform);
 }
-exports.fetchResponseMaxSize = fetchResponseMaxSize;
-function fetchTypeProcessor(expectedType, contentTypeRequired = true) {
-    const isExpected = typeof expectedType === 'string'
-        ? (ct) => ct === expectedType
-        : expectedType instanceof RegExp
-            ? (ct) => expectedType.test(ct)
-            : expectedType;
-    return async (response) => {
-        const contentType = response.headers
-            .get('content-type')
-            ?.split(';')[0]
-            .trim();
-        if (contentType) {
-            if (!isExpected(contentType)) {
-                throw await FetchResponseError.from(response, 502, `Unexpected response Content-Type (${contentType})`);
-            }
-        }
-        else if (contentTypeRequired) {
-            throw await FetchResponseError.from(response, 502, 'Missing response Content-Type header');
-        }
-        return response;
-    };
+exports.fetchResponseMaxSizeChecker = fetchResponseMaxSizeChecker;
+function fetchTypeProcessor(expectedMime, contentTypeRequired = true) {
+    const isExpected = typeof expectedMime === 'string'
+        ? (mimeType) => mimeType === expectedMime
+        : expectedMime instanceof RegExp
+            ? (mimeType) => expectedMime.test(mimeType)
+            : expectedMime;
+    return cancelBodyOnError((response) => {
+        return fetchResponseTypeChecker(response, isExpected, contentTypeRequired);
+    });
 }
 exports.fetchTypeProcessor = fetchTypeProcessor;
-async function jsonTranformer(response) {
-    if (response.body === null) {
-        throw new FetchResponseError(response, 502, 'No response body');
+async function fetchResponseTypeChecker(response, isExpectedMime, contentTypeRequired = true) {
+    const mimeType = extractMime(response);
+    if (mimeType) {
+        if (!isExpectedMime(mimeType)) {
+            throw await FetchResponseError.from(response, `Unexpected response Content-Type (${mimeType})`, 502);
+        }
     }
-    if (response.bodyUsed) {
-        throw new FetchResponseError(response, 500, 'Response body already used');
+    else if (contentTypeRequired) {
+        throw await FetchResponseError.from(response, 'Missing response Content-Type header', 502);
     }
+    return response;
+}
+exports.fetchResponseTypeChecker = fetchResponseTypeChecker;
+async function fetchResponseJsonTranformer(response) {
     try {
         const json = (await response.json());
         return { response, json };
@@ -139,9 +192,9 @@ async function jsonTranformer(response) {
         throw new FetchResponseError(response, 502, 'Unable to parse response as JSON', { cause });
     }
 }
-exports.jsonTranformer = jsonTranformer;
-function fetchJsonProcessor(contentType = /^application\/(?:[^+]+\+)?json$/, contentTypeRequired = true) {
-    return (0, transformer_1.compose)(fetchTypeProcessor(contentType, contentTypeRequired), (jsonTranformer));
+exports.fetchResponseJsonTranformer = fetchResponseJsonTranformer;
+function fetchJsonProcessor(expectedMime = /^application\/(?:[^+]+\+)?json$/, contentTypeRequired = true) {
+    return (0, pipe_1.pipe)(fetchTypeProcessor(expectedMime, contentTypeRequired), cancelBodyOnError((fetchResponseJsonTranformer)));
 }
 exports.fetchJsonProcessor = fetchJsonProcessor;
 function fetchJsonZodProcessor(schema, params) {

package/dist/fetch-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-response.js","sourceRoot":"","sources":["../src/fetch-response.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-response.js","sourceRoot":"","sources":["../src/fetch-response.ts"],"names":[],"mappings":"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"}

package/dist/fetch-wrap.d.ts

@@ -1,10 +1,48 @@
-import { Fetch } from './fetch.js';
-export declare const loggedFetchWrap: ({ fetch, }?: {
-    fetch?: Fetch | undefined;
-}) => Fetch;
-export declare const timeoutFetchWrap: ({ fetch, timeout, }?: {
-    fetch?: Fetch | undefined;
-    timeout?: number | undefined;
-}) => Fetch;
-export declare function fetchTimeout(this: ThisParameterType<Fetch>, request: Request, timeout?: number, fetch?: Fetch): Promise<Response>;
+import { Fetch, FetchContext } from './fetch.js';
+type LogFn<Args extends unknown[]> = (...args: Args) => void | PromiseLike<void>;
+export declare function loggedFetch<C = FetchContext>({ fetch, logRequest, logResponse, logError, }: {
+    fetch?: Fetch<C> | undefined;
+    logRequest?: boolean | LogFn<[request: Request]> | undefined;
+    logResponse?: boolean | LogFn<[response: Response, request: Request]> | undefined;
+    logError?: boolean | LogFn<[error: unknown, request: Request]> | undefined;
+}): Fetch<C>;
+export declare const timedFetch: <C = FetchContext>(timeout?: number, fetch?: Fetch<C>) => Fetch<C>;
+/**
+ * Wraps a fetch function to bind it to a specific context, and wrap any thrown
+ * errors into a FetchRequestError.
+ *
+ * @example
+ *
+ * ```ts
+ * class MyClient {
+ *   constructor(private fetch = globalThis.fetch) {}
+ *
+ *   async get(url: string) {
+ *     // This will generate an error, because the context used is not a
+ *     // FetchContext (it's a MyClient instance).
+ *     return this.fetch(url)
+ *   }
+ * }
+ * ```
+ *
+ * @example
+ *
+ * ```ts
+ * class MyClient {
+ *   private fetch: Fetch<unknown>
+ *
+ *   constructor(fetch = globalThis.fetch) {
+ *     this.fetch = bindFetch(fetch)
+ *   }
+ *
+ *   async get(url: string) {
+ *     return this.fetch(url) // no more error
+ *   }
+ * }
+ * ```
+ */
+export declare function bindFetch<C = FetchContext>(fetch?: Fetch<C>, context?: C): ((this: unknown, input: string | Request | URL, init?: RequestInit | undefined) => Promise<Response>) & {
+    bind(context: unknown): (input: string | Request | URL, init?: RequestInit | undefined) => Promise<Response>;
+};
+export {};
 //# sourceMappingURL=fetch-wrap.d.ts.map

package/dist/fetch-wrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-wrap.d.ts","sourceRoot":"","sources":["../src/fetch-wrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGlC,eAAO,MAAM,eAAe;;MAEnB,KAIR,CAAA;AAyCD,eAAO,MAAM,gBAAgB;;;MAGpB,KAQR,CAAA;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAC9B,OAAO,EAAE,OAAO,EAChB,OAAO,SAAO,EACd,KAAK,GAAE,KAAwB,GAC9B,OAAO,CAAC,QAAQ,CAAC,CAgCnB"}
+{"version":3,"file":"fetch-wrap.d.ts","sourceRoot":"","sources":["../src/fetch-wrap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAwB,MAAM,YAAY,CAAA;AAItE,KAAK,KAAK,CAAC,IAAI,SAAS,OAAO,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;AAEhF,wBAAgB,WAAW,CAAC,CAAC,GAAG,YAAY,EAAE,EAC5C,KAAoC,EACpC,UAAwD,EACxD,WAA6E,EAC7E,QAAsE,GACvE;;;;;CAAA,YAgDA;AAED,eAAO,MAAM,UAAU,+CAEd,MAAM,CAAC,CAAC,KACd,MAAM,CAAC,CAqCT,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,YAAY,EACxC,KAAK,GAAE,KAAK,CAAC,CAAC,CAAoB,EAClC,OAAO,GAAE,CAAmB;;EAS7B"}

package/dist/fetch-wrap.js

@@ -1,73 +1,124 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchTimeout = exports.timeoutFetchWrap = exports.loggedFetchWrap = void 0;
+exports.bindFetch = exports.timedFetch = exports.loggedFetch = void 0;
+const fetch_request_js_1 = require("./fetch-request.js");
+const fetch_js_1 = require("./fetch.js");
 const transformed_response_js_1 = require("./transformed-response.js");
-const loggedFetchWrap = ({ fetch = globalThis.fetch, } = {}) => {
-    return async function (request) {
-        return fetchLog.call(this, request, fetch);
-    };
-};
-exports.loggedFetchWrap = loggedFetchWrap;
-async function fetchLog(request, fetch = globalThis.fetch) {
-    console.info(`> ${request.method} ${request.url}\n` +
-        stringifyPayload(request.headers, await request.clone().text()));
-    try {
-        const response = await fetch(request);
-        console.info(`< HTTP/1.1 ${response.status} ${response.statusText}\n` +
-            stringifyPayload(response.headers, await response.clone().text()));
-        return response;
-    }
-    catch (error) {
-        console.error(`< Error:`, error);
-        throw error;
-    }
+const util_js_1 = require("./util.js");
+function loggedFetch({ fetch = globalThis.fetch, logRequest = true, logResponse = true, logError = true, }) {
+    const onRequest = logRequest === true
+        ? async (request) => {
+            const requestMessage = await (0, util_js_1.stringifyMessage)(request);
+            console.info(`> ${request.method} ${request.url}\n${(0, util_js_1.padLines)(requestMessage, '  ')}`);
+        }
+        : logRequest || undefined;
+    const onResponse = logResponse === true
+        ? async (response) => {
+            const responseMessage = await (0, util_js_1.stringifyMessage)(response.clone());
+            console.info(`< HTTP/1.1 ${response.status} ${response.statusText}\n${(0, util_js_1.padLines)(responseMessage, '  ')}`);
+        }
+        : logResponse || undefined;
+    const onError = logError === true
+        ? async (error) => {
+            console.error(`< Error:`, error);
+        }
+        : logError || undefined;
+    if (!onRequest && !onResponse && !onError)
+        return fetch;
+    return (0, fetch_js_1.toRequestTransformer)(async function (request) {
+        if (onRequest)
+            await onRequest(request);
+        try {
+            const response = await fetch.call(this, request);
+            if (onResponse)
+                await onResponse(response, request);
+            return response;
+        }
+        catch (error) {
+            if (onError)
+                await onError(error, request);
+            throw error;
+        }
+    });
 }
-const stringifyPayload = (headers, body) => [stringifyHeaders(headers), stringifyBody(body)]
-    .filter(Boolean)
-    .join('\n  ') + '\n  ';
-const stringifyHeaders = (headers) => Array.from(headers)
-    .map(([name, value]) => `  ${name}: ${value}\n`)
-    .join('');
-const stringifyBody = (body) => body ? `\n  ${body.replace(/\r?\n/g, '\\n')}` : '';
-const timeoutFetchWrap = ({ fetch = globalThis.fetch, timeout = 60e3, } = {}) => {
+exports.loggedFetch = loggedFetch;
+const timedFetch = (timeout = 60e3, fetch = globalThis.fetch) => {
     if (timeout === Infinity)
         return fetch;
     if (!Number.isFinite(timeout) || timeout <= 0) {
         throw new TypeError('Timeout must be positive');
     }
-    return async function (request) {
-        return fetchTimeout.call(this, request, timeout, fetch);
-    };
+    return (0, fetch_js_1.toRequestTransformer)(async function (request) {
+        const controller = new AbortController();
+        const signal = controller.signal;
+        const abort = () => {
+            controller.abort();
+        };
+        const cleanup = () => {
+            clearTimeout(timer);
+            request.signal?.removeEventListener('abort', abort);
+        };
+        const timer = setTimeout(abort, timeout);
+        if (typeof timer === 'object')
+            timer.unref?.(); // only on node
+        request.signal?.addEventListener('abort', abort);
+        signal.addEventListener('abort', cleanup);
+        const response = await fetch.call(this, request, { signal });
+        if (!response.body) {
+            cleanup();
+            return response;
+        }
+        else {
+            // Cleanup the timer & event listeners when the body stream is closed
+            const transform = new TransformStream({ flush: cleanup });
+            return new transformed_response_js_1.TransformedResponse(response, transform);
+        }
+    });
 };
-exports.timeoutFetchWrap = timeoutFetchWrap;
-async function fetchTimeout(request, timeout = 30e3, fetch = globalThis.fetch) {
-    if (timeout === Infinity)
-        return fetch(request);
-    if (!Number.isFinite(timeout) || timeout <= 0) {
-        throw new TypeError('Timeout must be positive');
-    }
-    const controller = new AbortController();
-    const signal = controller.signal;
-    const abort = () => {
-        controller.abort();
-    };
-    const cleanup = () => {
-        clearTimeout(timeoutId);
-        request.signal?.removeEventListener('abort', abort);
-    };
-    const timeoutId = setTimeout(abort, timeout).unref();
-    request.signal?.addEventListener('abort', abort);
-    signal.addEventListener('abort', cleanup);
-    const response = await fetch(new Request(request, { signal }));
-    if (!response.body) {
-        cleanup();
-        return response;
-    }
-    else {
-        // Cleanup the timer & event listeners when the body stream is closed
-        const transform = new TransformStream({ flush: cleanup });
-        return new transformed_response_js_1.TransformedResponse(response, transform);
-    }
+exports.timedFetch = timedFetch;
+/**
+ * Wraps a fetch function to bind it to a specific context, and wrap any thrown
+ * errors into a FetchRequestError.
+ *
+ * @example
+ *
+ * ```ts
+ * class MyClient {
+ *   constructor(private fetch = globalThis.fetch) {}
+ *
+ *   async get(url: string) {
+ *     // This will generate an error, because the context used is not a
+ *     // FetchContext (it's a MyClient instance).
+ *     return this.fetch(url)
+ *   }
+ * }
+ * ```
+ *
+ * @example
+ *
+ * ```ts
+ * class MyClient {
+ *   private fetch: Fetch<unknown>
+ *
+ *   constructor(fetch = globalThis.fetch) {
+ *     this.fetch = bindFetch(fetch)
+ *   }
+ *
+ *   async get(url: string) {
+ *     return this.fetch(url) // no more error
+ *   }
+ * }
+ * ```
+ */
+function bindFetch(fetch = globalThis.fetch, context = globalThis) {
+    return (0, fetch_js_1.toRequestTransformer)(async (request) => {
+        try {
+            return await fetch.call(context, request);
+        }
+        catch (err) {
+            throw fetch_request_js_1.FetchRequestError.from(request, err);
+        }
+    });
 }
-exports.fetchTimeout = fetchTimeout;
+exports.bindFetch = bindFetch;
 //# sourceMappingURL=fetch-wrap.js.map

package/dist/fetch-wrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-wrap.js","sourceRoot":"","sources":["../src/fetch-wrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-wrap.js","sourceRoot":"","sources":["../src/fetch-wrap.ts"],"names":[],"mappings":"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"}

package/dist/fetch.d.ts

@@ -1,2 +1,9 @@
-export type Fetch = (this: void | null | typeof globalThis, input: Request) => Promise<Response>;
+import { ThisParameterOverride } from './util.js';
+export type FetchContext = void | null | typeof globalThis;
+export type FetchBound = (input: string | URL | Request, init?: RequestInit) => Promise<Response>;
+export type Fetch<C = FetchContext> = ThisParameterOverride<C, FetchBound>;
+export type SimpleFetchBound = (input: Request) => Promise<Response>;
+export type SimpleFetch<C = FetchContext> = ThisParameterOverride<C, SimpleFetchBound>;
+export declare function toRequestTransformer<C, O>(requestTransformer: (this: C, input: Request) => O): ThisParameterOverride<C, (input: string | URL | Request, init?: RequestInit) => O>;
+export declare function asRequest(input: string | URL | Request, init?: RequestInit): Request;
 //# sourceMappingURL=fetch.d.ts.map

package/dist/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG,CAClB,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,UAAU,EACrC,KAAK,EAAE,OAAO,KACX,OAAO,CAAC,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAEjD,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,IAAI,GAAG,OAAO,UAAU,CAAA;AAE1D,MAAM,MAAM,UAAU,GAAG,CACvB,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC7B,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,QAAQ,CAAC,CAAA;AAMtB,MAAM,MAAM,KAAK,CAAC,CAAC,GAAG,YAAY,IAAI,qBAAqB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;AAE1E,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;AACpE,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,YAAY,IAAI,qBAAqB,CAC/D,CAAC,EACD,gBAAgB,CACjB,CAAA;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,CAAC,EACvC,kBAAkB,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,KAAK,CAAC,GACjD,qBAAqB,CACtB,CAAC,EACD,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,CAAC,CACzD,CAIA;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,EAC7B,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAGT"}

package/dist/fetch.js

@@ -1,3 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.asRequest = exports.toRequestTransformer = void 0;
+function toRequestTransformer(requestTransformer) {
+    return function (input, init) {
+        return requestTransformer.call(this, asRequest(input, init));
+    };
+}
+exports.toRequestTransformer = toRequestTransformer;
+function asRequest(input, init) {
+    if (!init && input instanceof Request)
+        return input;
+    return new Request(input, init);
+}
+exports.asRequest = asRequest;
 //# sourceMappingURL=fetch.js.map

package/dist/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":""}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;AAqBA,SAAgB,oBAAoB,CAClC,kBAAkD;IAKlD,OAAO,UAAmB,KAAK,EAAE,IAAI;QACnC,OAAO,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAC9D,CAAC,CAAA;AACH,CAAC;AATD,oDASC;AAED,SAAgB,SAAS,CACvB,KAA6B,EAC7B,IAAkB;IAElB,IAAI,CAAC,IAAI,IAAI,KAAK,YAAY,OAAO;QAAE,OAAO,KAAK,CAAA;IACnD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AACjC,CAAC;AAND,8BAMC"}

package/dist/transformed-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformed-response.d.ts","sourceRoot":"","sources":["../src/transformed-response.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAoB,SAAQ,QAAQ;;gBAGnC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe;IAc1D;;OAEG;IACH,IAAI,GAAG,WAEN;IACD,IAAI,UAAU,YAEb;IACD,IAAI,IAAI,iBAEP;IACD,IAAI,UAAU,WAEb;CACF"}
+{"version":3,"file":"transformed-response.d.ts","sourceRoot":"","sources":["../src/transformed-response.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAoB,SAAQ,QAAQ;;gBAGnC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,eAAe;IAiB1D;;OAEG;IACH,IAAI,GAAG,WAEN;IACD,IAAI,UAAU,YAEb;IACD,IAAI,IAAI,iBAEP;IACD,IAAI,UAAU,WAEb;CACF"}