create-request 1.4.3-rc.0 → 1.4.3-rc.2

package/dist/library/index.esm.js

@@ -101,7 +101,7 @@ class RequestError extends Error {
     isTimeout;
     isAborted;
     constructor(message, url, method, options = {}) {
-        super(message);
+        super(message, { cause: options.cause });
         this.name = "RequestError";
         this.url = url;
         this.method = method;
@@ -120,7 +120,7 @@ class RequestError extends Error {
      * Static methods for creating specific types of RequestError
      */
     static timeout(url, method, timeoutMs) {
-        return new RequestError(`Timeout: ${timeoutMs}ms`, url, method, {
+        return new RequestError(`Timeout ${timeoutMs}ms`, url, method, {
             isTimeout: true,
         });
     }
@@ -162,16 +162,16 @@ class RequestError extends Error {
             // Check for connection errors (but not timeout errors)
             const isConnectionError = !isTimeoutError && (errorCode === "ECONNREFUSED" || errorCode === "ECONNRESET" || stack.includes("ECONNREFUSED") || stack.includes("connect"));
             if (isTimeoutError) {
-                message = `Network error: Request timeout for ${url}`;
+                message = `Timeout ${url}`;
             }
             else if (isDnsError) {
-                message = `Network error: Unable to resolve hostname for ${url}`;
+                message = `DNS error ${url}`;
             }
             else if (isConnectionError) {
-                message = `Network error: Connection refused for ${url}`;
+                message = `Connection refused ${url}`;
             }
             else {
-                message = `Network error: Failed to fetch ${url}`;
+                message = `Network error ${url}`;
             }
         }
         const error = new RequestError(message, url, method, {
@@ -198,11 +198,15 @@ class RequestError extends Error {
  * Wrapper for HTTP responses with methods to transform the response data
  */
 class ResponseWrapper {
-    response;
     url;
     method;
-    // GraphQL-specific options
+    response;
     graphQLOptions;
+    // Cache the body as the last used method
+    cachedBlob;
+    cachedText;
+    cachedJson;
+    cachedArrayBuffer;
     constructor(response, url, method, graphQLOptions) {
         this.response = response;
         this.url = url;
@@ -229,6 +233,18 @@ class ResponseWrapper {
     get raw() {
         return this.response;
     }
+    /**
+     * Check if the response body has already been consumed and throw an error if so
+     * @throws RequestError if the body has already been consumed
+     */
+    checkBodyNotConsumed() {
+        if (this.response.bodyUsed) {
+            throw new RequestError("Body already consumed", this.url || "", this.method || "", {
+                status: this.response.status,
+                response: this.response,
+            });
+        }
+    }
     /**
      * Check for GraphQL errors and throw if throwOnError is enabled
      * @param data - The parsed JSON data
@@ -243,18 +259,17 @@ class ResponseWrapper {
         const errors = responseData.errors;
         const errorMessages = errors.map(x => typeof x === "string" ? x : x && typeof x === "object" && "message" in x ? String(x.message || "Unknown error") : String(x));
         const errorMessage = errorMessages.join(", ");
-        throw new RequestError(`GraphQL request failed with errors: ${errorMessage}`, this.url || "", this.method || "", {
+        throw new RequestError(`GraphQL errors: ${errorMessage}`, this.url || "", this.method || "", {
             status: this.response.status,
             response: this.response,
         });
     }
     /**
      * Parse the response body as JSON
-     * Note: This consumes the response body and can only be called once.
      * If GraphQL options are set with throwOnError=true, will check for GraphQL errors and throw.
      *
      * @returns The parsed JSON data
-     * @throws {RequestError} When the request fails, JSON parsing fails, GraphQL errors occur (if throwOnError enabled), or body is already consumed
+     * @throws {RequestError} When the request fails, JSON parsing fails, or GraphQL errors occur (if throwOnError enabled).
      *
      * @example
      * const data = await response.getJson();
@@ -271,19 +286,16 @@ class ResponseWrapper {
      * }
      */
     async getJson() {
-        if (this.response.bodyUsed) {
-            throw new RequestError("Body already consumed", this.url || "", this.method || "", {
-                status: this.response.status,
-                response: this.response,
-            });
-        }
+        if (this.cachedJson !== undefined)
+            return this.cachedJson;
+        this.checkBodyNotConsumed();
         try {
             const parsed = await this.response.json();
+            this.cachedJson = parsed;
             this.checkGraphQLErrors(parsed);
             return parsed;
         }
         catch (error) {
-            // Re-throw RequestErrors from checkGraphQLErrors without wrapping
             if (error instanceof RequestError) {
                 throw error;
             }
@@ -296,23 +308,21 @@ class ResponseWrapper {
     }
     /**
      * Get the response body as text
-     * Note: This consumes the response body and can only be called once.
      *
      * @returns The response text
-     * @throws {RequestError} When reading fails or the response has already been consumed
+     * @throws {RequestError} When reading fails
      *
      * @example
      * const text = await response.getText();
      */
     async getText() {
-        if (this.response.bodyUsed) {
-            throw new RequestError("Body already consumed", this.url || "", this.method || "", {
-                status: this.response.status,
-                response: this.response,
-            });
-        }
+        if (this.cachedText !== undefined)
+            return this.cachedText;
+        this.checkBodyNotConsumed();
         try {
-            return await this.response.text();
+            const text = await this.response.text();
+            this.cachedText = text;
+            return text;
         }
         catch (e) {
             const errorMessage = e instanceof Error ? e.message : String(e);
@@ -324,24 +334,22 @@ class ResponseWrapper {
     }
     /**
      * Get the response body as a Blob
-     * Note: This consumes the response body and can only be called once.
      *
      * @returns The response as a Blob
-     * @throws {RequestError} When reading fails or the response has already been consumed
+     * @throws {RequestError} When reading fails
      *
      * @example
      * const blob = await response.getBlob();
      * const url = URL.createObjectURL(blob);
      */
     async getBlob() {
-        if (this.response.bodyUsed) {
-            throw new RequestError("Body already consumed", this.url || "", this.method || "", {
-                status: this.response.status,
-                response: this.response,
-            });
-        }
+        if (this.cachedBlob !== undefined)
+            return this.cachedBlob;
+        this.checkBodyNotConsumed();
         try {
-            return await this.response.blob();
+            const blob = await this.response.blob();
+            this.cachedBlob = blob;
+            return blob;
         }
         catch (e) {
             const errorMessage = e instanceof Error ? e.message : String(e);
@@ -353,24 +361,23 @@ class ResponseWrapper {
     }
     /**
      * Get the response body as an ArrayBuffer
-     * Note: This consumes the response body and can only be called once.
      *
      * @returns The response as an ArrayBuffer
-     * @throws {RequestError} When reading fails or the response has already been consumed
+     * @throws {RequestError} When reading fails
      *
      * @example
      * const buffer = await response.getArrayBuffer();
      * const uint8Array = new Uint8Array(buffer);
      */
     async getArrayBuffer() {
-        if (this.response.bodyUsed) {
-            throw new RequestError("Body already consumed", this.url || "", this.method || "", {
-                status: this.response.status,
-                response: this.response,
-            });
+        if (this.cachedArrayBuffer !== undefined) {
+            return this.cachedArrayBuffer;
         }
+        this.checkBodyNotConsumed();
         try {
-            return await this.response.arrayBuffer();
+            const arrayBuffer = await this.response.arrayBuffer();
+            this.cachedArrayBuffer = arrayBuffer;
+            return arrayBuffer;
         }
         catch (e) {
             const errorMessage = e instanceof Error ? e.message : String(e);
@@ -383,6 +390,7 @@ class ResponseWrapper {
     /**
      * Get the raw response body as a ReadableStream
      * Note: This consumes the response body and should only be called once.
+     * Unlike other methods, streams cannot be cached, so this will throw if the body is already consumed.
      *
      * @returns The response body as a ReadableStream or null
      * @throws {RequestError} When the response body has already been consumed
@@ -395,12 +403,7 @@ class ResponseWrapper {
      * }
      */
     getBody() {
-        if (this.response.bodyUsed) {
-            throw new RequestError("Body already consumed", this.url || "", this.method || "", {
-                status: this.response.status,
-                response: this.response,
-            });
-        }
+        this.checkBodyNotConsumed();
         return this.response.body;
     }
     /**
@@ -892,9 +895,9 @@ class BaseRequest {
     }
     validateUrl(url) {
         if (!url?.trim())
-            throw new RequestError("URL cannot be empty", url, this.method);
+            throw new RequestError("Invalid URL", url, this.method);
         if (url.includes("\0") || url.includes("\r") || url.includes("\n")) {
-            throw new RequestError("Invalid URL (control chars)", url, this.method);
+            throw new RequestError("Invalid URL", url, this.method);
         }
         const trimmed = url.trim();
         if (/^https?:\/\//.test(trimmed)) {
@@ -902,7 +905,7 @@ class BaseRequest {
                 new URL(trimmed);
             }
             catch {
-                throw new RequestError(`Invalid URL: ${trimmed}`, trimmed, this.method);
+                throw new RequestError("Invalid URL", trimmed, this.method);
             }
         }
     }
@@ -943,11 +946,7 @@ class BaseRequest {
      * request.withHeader('Accept', 'application/json');
      */
     withHeader(key, value) {
-        // Ignore null and undefined values
-        if (value !== null && value !== undefined) {
-            return this.withHeaders({ [key]: value });
-        }
-        return this;
+        return this.withHeaders({ [key]: value });
     }
     /**
      * Set a timeout for the request
@@ -962,7 +961,7 @@ class BaseRequest {
      */
     withTimeout(timeout) {
         if (!Number.isFinite(timeout) || timeout <= 0)
-            throw new RequestError("Timeout must be a positive number", this.url, this.method);
+            throw new RequestError("Invalid timeout", this.url, this.method);
         this.requestOptions.timeout = timeout;
         return this;
     }
@@ -1346,13 +1345,7 @@ class BaseRequest {
      * @returns The instance for chaining
      */
     withQueryParam(key, value) {
-        if (value === null || value === undefined)
-            return this;
-        if (Array.isArray(value))
-            value.forEach(v => this.queryParams.append(key, String(v)));
-        else
-            this.queryParams.append(key, String(value));
-        return this;
+        return this.withQueryParams({ [key]: value });
     }
     /**
      * Sets the request mode, which determines the CORS (Cross-Origin Resource Sharing) behavior
@@ -1396,9 +1389,7 @@ class BaseRequest {
      * @returns The instance for chaining
      */
     withContentType(contentType) {
-        return this.withHeaders({
-            "Content-Type": contentType,
-        });
+        return this.withHeader("Content-Type", contentType);
     }
     /**
      * Shorthand for setting the Authorization header
@@ -1406,9 +1397,7 @@ class BaseRequest {
      * @returns The instance for chaining
      */
     withAuthorization(authValue) {
-        return this.withHeaders({
-            Authorization: authValue,
-        });
+        return this.withHeader("Authorization", authValue);
     }
     /**
      * Shorthand for setting up Basic authentication
@@ -1438,7 +1427,7 @@ class BaseRequest {
         if (typeof Buffer !== "undefined")
             return Buffer.from(str).toString("base64");
         // Fallback (should never happen in modern environments)
-        throw new RequestError("Base64 encoding is not supported", this.url, this.method);
+        throw new RequestError("Encoding not supported", this.url, this.method);
     }
     /**
      * Sets the bearer token for authentication
@@ -1523,9 +1512,7 @@ class BaseRequest {
      * @returns The instance for chaining
      */
     withCsrfToken(token, headerName = "X-CSRF-Token") {
-        return this.withHeaders({
-            [headerName]: token,
-        });
+        return this.withHeader(headerName, token);
     }
     /**
      * Disables automatic anti-CSRF protection.
@@ -1541,9 +1528,7 @@ class BaseRequest {
      * @returns The instance for chaining
      */
     withAntiCsrfHeaders() {
-        return this.withHeaders({
-            "X-Requested-With": "XMLHttpRequest",
-        });
+        return this.withHeader("X-Requested-With", "XMLHttpRequest");
     }
     /**
      * Add a request interceptor for this specific request
@@ -1712,9 +1697,7 @@ class BaseRequest {
         const config = Config.getInstance();
         // Apply anti-CSRF headers if enabled
         if (config.isAntiCsrfEnabled()) {
-            this.withHeaders({
-                "X-Requested-With": "XMLHttpRequest",
-            });
+            this.withAntiCsrfHeaders();
         }
         // Apply global CSRF token if set
         const globalToken = config.getCsrfToken();
@@ -1722,9 +1705,7 @@ class BaseRequest {
             const csrfHeaderName = config.getCsrfHeaderName();
             const hasLocalToken = this.hasHeader("X-CSRF-Token") || this.hasHeader(csrfHeaderName);
             if (!hasLocalToken) {
-                this.withHeaders({
-                    [csrfHeaderName]: globalToken,
-                });
+                this.withHeader(csrfHeaderName, globalToken);
             }
         }
         // Check for XSRF token in cookies and send it as a header
@@ -1734,9 +1715,7 @@ class BaseRequest {
                 const xsrfHeaderName = config.getXsrfHeaderName();
                 const hasLocalToken = this.hasHeader("X-XSRF-TOKEN") || this.hasHeader(xsrfHeaderName);
                 if (!hasLocalToken) {
-                    this.withHeaders({
-                        [xsrfHeaderName]: xsrfToken,
-                    });
+                    this.withHeader(xsrfHeaderName, xsrfToken);
                 }
             }
         }
@@ -1795,7 +1774,7 @@ class BaseRequest {
                     const delay = typeof retriesConfig.delay === "function" ? retriesConfig.delay({ attempt: attempt + 1, error: requestError }) : retriesConfig.delay;
                     // Validate delay result
                     if (typeof delay !== "number" || !Number.isFinite(delay) || delay < 0) {
-                        throw new RequestError(`Invalid retry delay: ${delay}`, url, method);
+                        throw new RequestError(`Invalid delay: ${delay}`, url, method);
                     }
                     // Wait for the delay
                     if (delay > 0) {
@@ -1805,7 +1784,7 @@ class BaseRequest {
             }
         }
         // This should never happen but is needed for type safety
-        throw new RequestError(`Max retries reached`, url, method);
+        throw new RequestError(`EO`, url, method);
     }
     /**
      * Run request interceptors in order: global interceptors first, then per-request
@@ -1827,7 +1806,7 @@ class BaseRequest {
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
-                throw new RequestError(`Request interceptor failed: ${errorMessage}`, currentConfig.url, currentConfig.method);
+                throw new RequestError(`Req Interceptor failed: ${errorMessage}`, currentConfig.url, currentConfig.method);
             }
         }
         return currentConfig;
@@ -1851,7 +1830,7 @@ class BaseRequest {
                 const errorMessage = error instanceof Error ? error.message : String(error);
                 const url = currentResponse.url || "";
                 const method = currentResponse.method || "";
-                throw new RequestError(`Response interceptor failed: ${errorMessage}`, url, method);
+                throw new RequestError(`Res Interceptor failed: ${errorMessage}`, url, method);
             }
         }
         return currentResponse;
@@ -1885,22 +1864,18 @@ class BaseRequest {
                     const errorMessage = interceptorError instanceof Error ? interceptorError.message : String(interceptorError);
                     // Always wrap in RequestError when we have context
                     if (currentError instanceof RequestError) {
-                        currentError = new RequestError(`Error interceptor ${i + 1} failed: ${errorMessage}`, currentError.url, currentError.method, {
+                        currentError = new RequestError(`Err Interceptor ${i + 1} failed: ${errorMessage}`, currentError.url, currentError.method, {
                             status: currentError.status,
                             response: currentError.response,
                         });
                     }
-                    else if (currentError instanceof ResponseWrapper && currentError.url && currentError.method) {
-                        // If it's a ResponseWrapper, we can still create a proper RequestError from its context
-                        currentError = new RequestError(`Error interceptor ${i + 1} failed: ${errorMessage}`, currentError.url, currentError.method, {
-                            status: currentError.status,
-                        });
-                    }
                     else {
+                        /* c8 ignore start */
                         // Last resort: if we have no context at all, use the original error's context
                         // This shouldn't happen in practice, but handle it gracefully
                         const errorObj = interceptorError instanceof Error ? interceptorError : new Error(String(interceptorError));
                         currentError = RequestError.networkError(error.url, error.method, errorObj);
+                        /* c8 ignore end */
                     }
                 }
             }
@@ -2135,7 +2110,7 @@ class BodyRequest extends BaseRequest {
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : String(error);
-                throw new RequestError(`JSON stringify failed: ${errorMessage}`, this.url, this.method);
+                throw new RequestError(`Invalid JSON: ${errorMessage}`, this.url, this.method);
             }
         }
         else {
@@ -2167,21 +2142,21 @@ class BodyRequest extends BaseRequest {
      */
     withGraphQL(query, variables, options) {
         if (typeof query !== "string" || query.length === 0) {
-            throw new RequestError("Invalid GraphQL query", this.url, this.method);
+            throw new RequestError("Invalid query", this.url, this.method);
         }
         const graphQLBody = {
             query: query,
         };
         if (variables !== undefined) {
             if (typeof variables !== "object" || variables === null || Array.isArray(variables)) {
-                throw new RequestError("Invalid GraphQL variables", this.url, this.method);
+                throw new RequestError("Invalid vars", this.url, this.method);
             }
             graphQLBody.variables = variables;
         }
         // Store GraphQL options if provided
         if (options !== undefined) {
             if (typeof options !== "object" || options === null || Array.isArray(options)) {
-                throw new RequestError("Invalid GraphQL options", this.url, this.method);
+                throw new RequestError("Invalid options", this.url, this.method);
             }
             // Store only the known GraphQL options properties
             const opts = options;
@@ -2195,7 +2170,7 @@ class BodyRequest extends BaseRequest {
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
-            throw new RequestError(`JSON stringify failed: ${errorMessage}`, this.url, this.method);
+            throw new RequestError(`Invalid JSON: ${errorMessage}`, this.url, this.method);
         }
         this.body = graphQLBody;
         this.bodyType = BodyType.JSON;
@@ -2678,7 +2653,7 @@ class ApiBuilder {
                     return propertyValue;
                 }
                 if (typeof prop === "string" && prop.startsWith("with") && prop !== "withBaseURL") {
-                    if (prop === "withAbortController" || prop === "withBody" || prop === "withGraphQL")
+                    if (prop === "withAbortController" || prop === "withBody" || prop === "withGraphQL" || prop === "withQueryParam" || prop === "withQueryParams")
                         return undefined;
                     const prototypeMethod = BaseRequest.prototype[prop];
                     if (typeof prototypeMethod === "function") {
@@ -2734,5 +2709,5 @@ const create = {
     config: Config.getInstance(),
 };
 
-export { CookieUtils, CredentialsPolicy, DeleteRequest, GetRequest, HeadRequest, HttpMethod, OptionsRequest, PatchRequest, PostRequest, PutRequest, RedirectMode, ReferrerPolicy, RequestError, RequestMode, RequestPriority, ResponseWrapper, SameSitePolicy, create as default };
+export { CacheMode, CookieUtils, CredentialsPolicy, DeleteRequest, GetRequest, HeadRequest, HttpMethod, OptionsRequest, PatchRequest, PostRequest, PutRequest, RedirectMode, ReferrerPolicy, RequestError, RequestMode, RequestPriority, ResponseWrapper, SameSitePolicy, api, create as default, del, get, head, options, patch, post, put };
 //# sourceMappingURL=index.esm.js.map