mobx-tanstack-query-api 0.33.1 → 0.34.0

package/index.cjs

@@ -423,213 +423,65 @@ class EndpointMutation extends mobxTanstackQuery.Mutation {
     });
   }
 }
-const ContentType = {
-  Json: "application/json",
-  FormData: "multipart/form-data",
-  UrlEncoded: "application/x-www-form-urlencoded",
-  Text: "text/plain",
-  Binary: "application/octet-stream"
-};
-const isHttpResponse = (response, status) => !!response && typeof response === "object" && response instanceof Response && "data" in response && (!status || response.status === status);
-const isHttpBadResponse = (response) => {
-  return isHttpResponse(response) && (!response.ok || !!response.error);
-};
 const emptyStatusCodesSet = /* @__PURE__ */ new Set([204, 205, 304]);
-class HttpClient {
-  config;
-  fetch;
-  meta;
-  baseApiParams;
-  badResponse;
-  toQueryString;
-  constructor(config) {
-    this.config = config ?? {};
-    this.badResponse = null;
-    this.meta = config?.meta ?? null;
-    this.fetch = config?.fetch ?? ((...fetchParams) => globalThis.fetch(...fetchParams));
-    this.toQueryString = config?.toQueryString ?? ((query) => qs.stringify(query, config?.queryStringifyOptions));
-    this.baseApiParams = {
-      credentials: "same-origin",
-      headers: {},
-      redirect: "follow",
-      referrerPolicy: "no-referrer"
-    };
-    this.updateConfig(this.config);
-    mobx.observable.ref(this, "badResponse");
-    mobx.observable.ref(this, "meta");
-    mobx.action(this, "setMeta");
-    mobx.action(this, "setBadResponse");
-    mobx.makeObservable(this);
-  }
-  get baseUrl() {
-    return this.config.baseUrl ?? "";
-  }
-  updateConfig(update) {
-    Object.assign(this.config, update);
-    if (update.baseApiParams) {
-      Object.assign(this.baseApiParams, update.baseApiParams);
-    }
-    if (update.contentFormatters) {
-      Object.assign(this.contentFormatters, update.contentFormatters);
-    }
-    if (update.fetch) {
-      this.fetch = update.fetch;
-    }
-  }
-  setMeta = (data) => {
-    this.meta = data;
-  };
-  setBadResponse = (response) => {
-    this.badResponse = response;
-  };
-  contentFormatters = {
-    "application/json": (input) => input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
-    "text/plain": (input) => input !== null && typeof input !== "string" ? JSON.stringify(input) : input,
-    "multipart/form-data": (input) => Object.keys(input || {}).reduce((formData, key) => {
-      const property = input[key];
-      if (property instanceof Blob) {
-        formData.append(key, property);
-      } else if (typeof property === "object" && property !== null) {
-        formData.append(key, JSON.stringify(property));
-      } else {
-        formData.append(key, `${property}`);
-      }
-      return formData;
-    }, new FormData()),
-    "application/x-www-form-urlencoded": (input) => this.toQueryString(input),
-    "application/octet-stream": (input) => input
-  };
-  mergeRequestParams(params1, params2) {
-    return {
-      ...this.baseApiParams,
-      ...params1,
-      ...params2,
-      headers: {
-        ...this.baseApiParams.headers,
-        ...params1.headers,
-        ...params2?.headers
-      }
-    };
-  }
-  isEmptyResponseBody(response) {
-    if (emptyStatusCodesSet.has(response.status)) {
+class HttpResponse {
+  constructor(originalResponse, request) {
+    this.originalResponse = originalResponse;
+    this.request = request;
+    this.headers = originalResponse.headers;
+    this.ok = originalResponse.ok;
+    this.body = originalResponse.body;
+    this.redirected = originalResponse.redirected;
+    this.status = originalResponse.status;
+    this.statusText = originalResponse.statusText;
+    this.type = originalResponse.type;
+    this.url = originalResponse.url;
+    this.data = null;
+    this.error = null;
+  }
+  headers;
+  ok;
+  redirected;
+  statusText;
+  type;
+  url;
+  body;
+  data;
+  error;
+  status;
+  clone() {
+    return new HttpResponse(this.originalResponse.clone(), this.request);
+  }
+  isEmpty() {
+    if (emptyStatusCodesSet.has(this.status)) {
       return true;
     }
-    const contentLength = response.headers.get("content-length");
+    const contentLength = this.headers.get("content-length");
     if (contentLength !== null && contentLength === "0") {
       return true;
     }
-    if (response.body === null) {
+    if (this.body === null) {
       return true;
     }
     return false;
   }
-  /**
-   * Some custom fetch implementations expose read-only accessors (e.g. `data`),
-   * so plain assignment can throw in strict mode.
-   */
-  setResponseField = (response, key, value) => {
+  async resolveBody(responseFormat) {
     try {
-      response[key] = value;
-      return;
-    } catch {
-    }
-    Object.defineProperty(response, key, {
-      value,
-      writable: true,
-      configurable: true,
-      enumerable: true
-    });
-  };
-  async createResponse(responseFormat = "json", raw, url, params) {
-    const response = raw;
-    this.setResponseField(response, "request", { url, params });
-    this.setResponseField(response, "data", null);
-    this.setResponseField(response, "error", null);
-    if (this.isEmptyResponseBody(response)) {
-      return response;
-    }
-    try {
-      const formatted = await response[responseFormat]();
-      if (response.ok) {
-        this.setResponseField(response, "data", formatted);
+      const formatted = await this.originalResponse[responseFormat]();
+      if (this.ok) {
+        this.data = formatted;
       } else {
-        this.setResponseField(response, "error", formatted);
+        this.error = formatted;
       }
     } catch (error) {
-      this.setResponseField(response, "error", error);
-    }
-    if (!response.ok || response.error) {
-      this.setBadResponse(response);
-    }
-    return response;
-  }
-  buildUrl = (params) => {
-    const baseUrl = params.baseUrl ?? this.baseUrl ?? "";
-    const path = params.path;
-    const queryString = params.query && this.toQueryString(params.query);
-    const query = queryString ? `?${queryString}` : "";
-    if (this.config.buildUrl) {
-      return this.config.buildUrl(params, { baseUrl, path, query }, this.meta);
-    }
-    const url = baseUrl + path + query;
-    return url;
-  };
-  async request(fullParams, endpoint) {
-    this.setBadResponse(null);
-    const { body, contentType, format, ...params } = fullParams;
-    let requestParams = this.mergeRequestParams(params);
-    if (this.config.interceptor) {
-      requestParams = await this.config.interceptor(requestParams, this.meta, endpoint) ?? requestParams;
-    }
-    const responseFormat = format || requestParams.format;
-    const url = this.buildUrl(fullParams);
-    let headers;
-    if (requestParams.headers instanceof Headers) {
-      headers = requestParams.headers;
-    } else if (Array.isArray(requestParams.headers)) {
-      headers = new Headers(requestParams.headers);
-    } else {
-      headers = new Headers(requestParams.headers);
-    }
-    let bodyToSend;
-    if (contentType) {
-      if (contentType !== ContentType.FormData && !headers.has("Content-Type")) {
-        headers.set("Content-Type", contentType);
-      }
-      const payloadFormatter = this.contentFormatters[contentType];
-      if (body == null) {
-        bodyToSend = null;
-      } else if (payloadFormatter) {
-        bodyToSend = payloadFormatter(body);
-      } else {
-        bodyToSend = body;
-      }
-    }
-    const fetchUrl = url;
-    const fetchParams = {
-      ...requestParams,
-      headers,
-      body: bodyToSend
-    };
-    let response;
-    try {
-      response = await this.fetch(fetchUrl, fetchParams);
-    } catch (error) {
-      response = error;
-    }
-    const httpResponse = await this.createResponse(
-      responseFormat,
-      response,
-      fetchUrl,
-      fetchParams
-    );
-    if (!httpResponse.ok || httpResponse.error) {
-      throw httpResponse;
+      this.error = error;
     }
-    return httpResponse;
   }
 }
+const isHttpResponse = (response, status) => typeof response === "object" && response instanceof HttpResponse && "data" in response && (!status || response.status === status);
+const isHttpBadResponse = (response) => {
+  return isHttpResponse(response) && (!response.ok || !!response.error);
+};
 class Endpoint {
   constructor(configuration, queryClient, httpClient) {
     this.configuration = configuration;
@@ -847,12 +699,173 @@ const applyStringFilter = (filter, value) => {
   }
   return values.includes(filter);
 };
+const ContentType = {
+  Json: "application/json",
+  FormData: "multipart/form-data",
+  UrlEncoded: "application/x-www-form-urlencoded",
+  Text: "text/plain",
+  Binary: "application/octet-stream"
+};
+class HttpClient {
+  config;
+  fetch;
+  meta;
+  baseApiParams;
+  badResponse;
+  toQueryString;
+  constructor(config) {
+    this.config = config ?? {};
+    this.badResponse = null;
+    this.meta = config?.meta ?? null;
+    this.fetch = config?.fetch ?? ((...fetchParams) => globalThis.fetch(...fetchParams));
+    this.toQueryString = config?.toQueryString ?? ((query) => qs.stringify(query, config?.queryStringifyOptions));
+    this.baseApiParams = {
+      credentials: "same-origin",
+      headers: {},
+      redirect: "follow",
+      referrerPolicy: "no-referrer"
+    };
+    this.updateConfig(this.config);
+    mobx.observable.ref(this, "badResponse");
+    mobx.observable.ref(this, "meta");
+    mobx.action(this, "setMeta");
+    mobx.action(this, "setBadResponse");
+    mobx.makeObservable(this);
+  }
+  get baseUrl() {
+    return this.config.baseUrl ?? "";
+  }
+  updateConfig(update) {
+    Object.assign(this.config, update);
+    if (update.baseApiParams) {
+      Object.assign(this.baseApiParams, update.baseApiParams);
+    }
+    if (update.contentFormatters) {
+      Object.assign(this.contentFormatters, update.contentFormatters);
+    }
+    if (update.fetch) {
+      this.fetch = update.fetch;
+    }
+  }
+  setMeta = (data) => {
+    this.meta = data;
+  };
+  setBadResponse = (response) => {
+    this.badResponse = response;
+  };
+  contentFormatters = {
+    "application/json": (input) => input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    "text/plain": (input) => input !== null && typeof input !== "string" ? JSON.stringify(input) : input,
+    "multipart/form-data": (input) => Object.keys(input || {}).reduce((formData, key) => {
+      const property = input[key];
+      if (property instanceof Blob) {
+        formData.append(key, property);
+      } else if (typeof property === "object" && property !== null) {
+        formData.append(key, JSON.stringify(property));
+      } else {
+        formData.append(key, `${property}`);
+      }
+      return formData;
+    }, new FormData()),
+    "application/x-www-form-urlencoded": (input) => this.toQueryString(input),
+    "application/octet-stream": (input) => input
+  };
+  mergeRequestParams(params1, params2) {
+    return {
+      ...this.baseApiParams,
+      ...params1,
+      ...params2,
+      headers: {
+        ...this.baseApiParams.headers,
+        ...params1.headers,
+        ...params2?.headers
+      }
+    };
+  }
+  async createResponse(responseFormat = "json", raw, url, params) {
+    const response = new HttpResponse(raw, { url, params });
+    if (response.isEmpty()) {
+      return response;
+    }
+    await response.resolveBody(responseFormat);
+    if (!response.ok || response.error) {
+      this.setBadResponse(response);
+    }
+    return response;
+  }
+  buildUrl = (params) => {
+    const baseUrl = params.baseUrl ?? this.baseUrl ?? "";
+    const path = params.path;
+    const queryString = params.query && this.toQueryString(params.query);
+    const query = queryString ? `?${queryString}` : "";
+    if (this.config.buildUrl) {
+      return this.config.buildUrl(params, { baseUrl, path, query }, this.meta);
+    }
+    const url = baseUrl + path + query;
+    return url;
+  };
+  async request(fullParams, endpoint) {
+    this.setBadResponse(null);
+    const { body, contentType, format, ...params } = fullParams;
+    let requestParams = this.mergeRequestParams(params);
+    if (this.config.interceptor) {
+      requestParams = await this.config.interceptor(requestParams, this.meta, endpoint) ?? requestParams;
+    }
+    const responseFormat = format || requestParams.format;
+    const url = this.buildUrl(fullParams);
+    let headers;
+    if (requestParams.headers instanceof Headers) {
+      headers = requestParams.headers;
+    } else if (Array.isArray(requestParams.headers)) {
+      headers = new Headers(requestParams.headers);
+    } else {
+      headers = new Headers(requestParams.headers);
+    }
+    let bodyToSend;
+    if (contentType) {
+      if (contentType !== ContentType.FormData && !headers.has("Content-Type")) {
+        headers.set("Content-Type", contentType);
+      }
+      const payloadFormatter = this.contentFormatters[contentType];
+      if (body == null) {
+        bodyToSend = null;
+      } else if (payloadFormatter) {
+        bodyToSend = payloadFormatter(body);
+      } else {
+        bodyToSend = body;
+      }
+    }
+    const fetchUrl = url;
+    const fetchParams = {
+      ...requestParams,
+      headers,
+      body: bodyToSend
+    };
+    let response;
+    try {
+      response = await this.fetch(fetchUrl, fetchParams);
+    } catch (error) {
+      response = error;
+    }
+    const httpResponse = await this.createResponse(
+      responseFormat,
+      response,
+      fetchUrl,
+      fetchParams
+    );
+    if (!httpResponse.ok || httpResponse.error) {
+      throw httpResponse;
+    }
+    return httpResponse;
+  }
+}
 exports.ContentType = ContentType;
 exports.Endpoint = Endpoint;
 exports.EndpointMutation = EndpointMutation;
 exports.EndpointQuery = EndpointQuery;
 exports.EndpointQueryClient = EndpointQueryClient;
 exports.HttpClient = HttpClient;
+exports.HttpResponse = HttpResponse;
 exports.buildOptionsFromParams = buildOptionsFromParams;
 exports.emptyStatusCodesSet = emptyStatusCodesSet;
 exports.getParamsFromContext = getParamsFromContext;