@web-atoms/core 2.6.21 → 2.6.25

package/dist-esm/services/FetchBuilder.js

@@ -1,296 +1,345 @@
 import { __addDisposableResource, __disposeResources } from "tslib";
 import { App } from "../App.js";
 export default class FetchBuilder {
-    static buildUrl(strings, ...p) {
-        let r = "";
-        for (let index = 0; index < strings.length; index++) {
-            const element = strings[index];
-            r += element;
-            if (index < p.length) {
-                r += encodeURIComponent(p[index]);
-            }
-        }
-        return r;
-    }
-    static get(url) {
-        return this.method(url, "GET");
-    }
-    static put(url) {
-        return this.method(url, "PUT");
-    }
-    static post(url) {
-        return this.method(url, "POST");
-    }
-    static delete(url) {
-        return this.method(url, "DELETE");
-    }
-    static url(url) {
-        return this.method(url, "GET");
-    }
-    static header(name, value) {
-        return new FetchBuilder({ headers: { url: "", method: "POST", [name]: value } });
-    }
-    static method(url, method) {
-        return new FetchBuilder({ url, method });
-    }
-    constructor(request) {
-        this.request = request;
-    }
-    log(logger) {
-        return this.append({ log: logger });
-    }
-    logWhenFailed(logger) {
-        return this.append({ logError: logger });
-    }
-    get(url) {
-        return this.method(url, "GET");
-    }
-    put(url) {
-        return this.method(url, "PUT");
-    }
-    post(url) {
-        return this.method(url, "POST");
-    }
-    delete(url) {
-        return this.method(url, "DELETE");
-    }
-    method(url, method) {
-        return this.append({ url, method });
-    }
-    signal(signal) {
-        if (!signal) {
-            return this;
-        }
-        return this.append({
-            signal
-        });
-    }
-    cancelToken(ct) {
-        if (!ct) {
-            return this;
-        }
-        const ac = new AbortController();
-        const signal = ac.signal;
-        ct.registerForCancel(() => ac.abort());
-        return this.signal(signal);
-    }
-    form(name, value, fileName) {
+  static buildUrl(strings, ...p) {
+    let r = "";
+    for (let index = 0; index < strings.length; index++) {
+      const element = strings[index];
+      r += element;
+      if (index < p.length) {
+        r += encodeURIComponent(p[index]);
+      }
+    }
+    return r;
+  }
+  static get(url) {
+    return this.method(url, "GET");
+  }
+  static put(url) {
+    return this.method(url, "PUT");
+  }
+  static post(url) {
+    return this.method(url, "POST");
+  }
+  static delete(url) {
+    return this.method(url, "DELETE");
+  }
+  static url(url) {
+    return this.method(url, "GET");
+  }
+  static header(name, value) {
+    return new FetchBuilder({
+      headers: {
+        url: "",
+        method: "POST",
+        [name]: value
+      }
+    });
+  }
+  static method(url, method) {
+    return new FetchBuilder({
+      url,
+      method
+    });
+  }
+  constructor(request) {
+    this.request = request;
+  }
+  log(logger) {
+    return this.append({
+      log: logger
+    });
+  }
+  logWhenFailed(logger) {
+    return this.append({
+      logError: logger
+    });
+  }
+  get(url) {
+    return this.method(url, "GET");
+  }
+  put(url) {
+    return this.method(url, "PUT");
+  }
+  post(url) {
+    return this.method(url, "POST");
+  }
+  delete(url) {
+    return this.method(url, "DELETE");
+  }
+  method(url, method) {
+    return this.append({
+      url,
+      method
+    });
+  }
+  signal(signal) {
+    if (!signal) {
+      return this;
+    }
+    return this.append({
+      signal
+    });
+  }
+  cancelToken(ct) {
+    if (!ct) {
+      return this;
+    }
+    const ac = new AbortController();
+    const signal = ac.signal;
+    ct.registerForCancel(() => ac.abort());
+    return this.signal(signal);
+  }
+  form(name, value, fileName) {
+    if (value === void 0) {
+      return this;
+    }
+    const body = this.request.body ?? new FormData();
+    if (fileName) {
+      if (typeof value === "string") {
+        throw new Error("value must be a blob with content type set correctly.");
+      }
+      body.append(name, value, fileName);
+    } else {
+      body.append(name, value);
+    }
+    return this.append({
+      body
+    });
+  }
+  jsonBody(body, encode = true) {
+    if (encode) {
+      body = JSON.stringify(body);
+    }
+    const headers = this.request.headers ?? {};
+    headers["content-type"] = "application/json";
+    return this.append({
+      body,
+      headers
+    });
+  }
+  header(name, value) {
+    const headers = this.request.headers ?? {};
+    headers[name] = value;
+    return this.append({
+      headers
+    });
+  }
+  path(name, value, encode = true) {
+    let url = this.request.url;
+    if (encode) {
+      value = encodeURIComponent(value);
+    }
+    url = url.replace(name, value);
+    return this.append({
+      url
+    });
+  }
+  query(name, value, encode = true) {
+    if (value === void 0) {
+      return this;
+    }
+    let url = this.request.url;
+    if (encode) {
+      value = encodeURIComponent(value);
+    }
+    name = encodeURIComponent(name);
+    if (url.indexOf("?") === -1) {
+      url += `?${name}=${value}`;
+    } else {
+      url += `&${name}=${value}`;
+    }
+    return this.append({
+      url
+    });
+  }
+  queries(obj, encode = true, encodeObjectAsJson = true) {
+    let url = this.request.url;
+    let prefix = url.indexOf("?") === -1 ? "?" : "&";
+    for (const key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        let value = obj[key];
         if (value === void 0) {
-            return this;
-        }
-        const body = this.request.body ?? new FormData();
-        if (fileName) {
-            if (typeof value === "string") {
-                throw new Error("value must be a blob with content type set correctly.");
-            }
-            body.append(name, value, fileName);
-        }
-        else {
-            body.append(name, value);
-        }
-        return this.append({ body });
-    }
-    jsonBody(body, encode = true) {
-        if (encode) {
-            body = JSON.stringify(body);
-        }
-        const headers = this.request.headers ?? {};
-        headers["content-type"] = "application/json";
-        return this.append({ body, headers });
-    }
-    header(name, value) {
-        const headers = this.request.headers ?? {};
-        headers[name] = value;
-        return this.append({ headers });
-    }
-    path(name, value, encode = true) {
-        let url = this.request.url;
-        if (encode) {
-            value = encodeURIComponent(value);
+          continue;
         }
-        url = url.replace(name, value);
-        return this.append({ url });
-    }
-    query(name, value, encode = true) {
-        if (value === void 0) {
-            return this;
+        if (encodeObjectAsJson) {
+          if (typeof value === "object" && value !== null) {
+            value = JSON.stringify(value);
+          }
+          encode = true;
         }
-        let url = this.request.url;
         if (encode) {
-            value = encodeURIComponent(value);
-        }
-        name = encodeURIComponent(name);
-        if (url.indexOf("?") === -1) {
-            url += `?${name}=${value}`;
-        }
-        else {
-            url += `&${name}=${value}`;
-        }
-        return this.append({ url });
-    }
-    queries(obj, encode = true, encodeObjectAsJson = true) {
-        let url = this.request.url;
-        let prefix = url.indexOf("?") === -1 ? "?" : "&";
-        for (const key in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                let value = obj[key];
-                if (value === void 0) {
-                    continue;
-                }
-                if (encodeObjectAsJson) {
-                    if (typeof value === "object" && value !== null) {
-                        value = JSON.stringify(value);
-                    }
-                    encode = true;
-                }
-                if (encode) {
-                    value = encodeURIComponent(value);
-                }
-                const name = encodeURIComponent(key);
-                url += `${prefix}${name}=${value}`;
-                prefix = "&";
-            }
+          value = encodeURIComponent(value);
         }
-        return this.append({ url });
-    }
-    async asText(ensureSuccess = true) {
-        const { result } = await this.asTextResponse(ensureSuccess);
-        return result;
-    }
-    async asBlob(ensureSuccess = true) {
-        const { result } = await this.asBlobResponse(ensureSuccess);
-        return result;
-    }
-    async asJson(ensureSuccess = true) {
-        const { result } = await this.asJsonResponse(ensureSuccess);
-        return result;
-    }
-    jsonPostProcessor(jsonPostProcessor) {
-        return this.append({ jsonPostProcessor });
-    }
-    async asJsonResponse(ensureSuccess = true) {
-        return this.execute(ensureSuccess, async (x, jsonPostProcessor) => {
-            if (!/json/i.test(x.headers.get("content-type"))) {
-                throw new Error(`Failed to parse json from ${this.request.url}\n${await x.text()}`);
-            }
-            if (jsonPostProcessor) {
-                return x.json().then(jsonPostProcessor);
-            }
-            return x.json();
-        });
-    }
-    async asTextResponse(ensureSuccess = true) {
-        return this.execute(ensureSuccess, (x) => x.text());
-    }
-    asBlobResponse(ensureSuccess = true) {
-        return this.execute(ensureSuccess, (x) => x.blob());
-    }
-    dispatcher(dispatcher) {
-        return this.append({ dispatcher });
-    }
-    withFetchProxy(fetchProxy) {
-        return this.append({ fetchProxy });
-    }
-    async execute(ensureSuccess = true, postProcessor) {
-        const env_1 = { stack: [], error: void 0, hasError: false };
-        try {
-            let { log, logError, hideBusyIndicator } = this.request;
-            const _d = __addDisposableResource(env_1, !hideBusyIndicator ? App.current.createBusyIndicator() : null, false);
-            try {
-                const { headers, fetchProxy, jsonPostProcessor } = this.request;
-                const r = await (fetchProxy ?? fetch)(this.request.url, this.request);
-                if (ensureSuccess) {
-                    if (r.status > 300) {
-                        log = logError;
-                        log?.(`fetch: ${this.request.method ?? "GET"} ${this.request.url}`);
-                        if (log && headers) {
-                            for (const key in headers) {
-                                if (headers.hasOwnProperty(key)) {
-                                    log?.(`${key}: ${headers[key]}`);
-                                }
-                            }
-                        }
-                        log?.(`${r.status} ${r.statusText || "Http Error"}`);
-                        const type = r.headers.get("content-type");
-                        if (/\/json/i.test(type)) {
-                            const json = await r.json();
-                            log?.(json);
-                            const message = json.title
-                                ?? json.detail
-                                ?? json.message
-                                ?? json.exceptionMessage
-                                ?? "Json Server Error";
-                            log = null;
-                            logError = null;
-                            throw new JsonError(message, json);
-                        }
-                        const text = await r.text();
-                        log?.(text);
-                        log = null;
-                        logError = null;
-                        throw new Error(`Fetch failed with error ${r.status} for ${this.request.url}\n${text}`);
-                    }
-                }
-                log?.(`${this.request.method ?? "GET"} ${this.request.url}`);
-                if (log && headers) {
-                    for (const key in headers) {
-                        if (headers.hasOwnProperty(key)) {
-                            log?.(`${key}: ${headers[key]}`);
-                        }
-                    }
-                }
-                const result = await postProcessor(r, jsonPostProcessor);
-                if (log) {
-                    log(`${r.status} ${r.statusText || "OK"}`);
-                    log(result);
+        const name = encodeURIComponent(key);
+        url += `${prefix}${name}=${value}`;
+        prefix = "&";
+      }
+    }
+    return this.append({
+      url
+    });
+  }
+  async asText(ensureSuccess = true) {
+    const {
+      result
+    } = await this.asTextResponse(ensureSuccess);
+    return result;
+  }
+  async asBlob(ensureSuccess = true) {
+    const {
+      result
+    } = await this.asBlobResponse(ensureSuccess);
+    return result;
+  }
+  async asJson(ensureSuccess = true) {
+    const {
+      result
+    } = await this.asJsonResponse(ensureSuccess);
+    return result;
+  }
+  jsonPostProcessor(jsonPostProcessor) {
+    return this.append({
+      jsonPostProcessor
+    });
+  }
+  async asJsonResponse(ensureSuccess = true) {
+    return this.execute(ensureSuccess, async (x, jsonPostProcessor) => {
+      if (!/json/i.test(x.headers.get("content-type"))) {
+        throw new Error(`Failed to parse json from ${this.request.url}\n${await x.text()}`);
+      }
+      if (jsonPostProcessor) {
+        return x.json().then(jsonPostProcessor);
+      }
+      return x.json();
+    });
+  }
+  async asTextResponse(ensureSuccess = true) {
+    return this.execute(ensureSuccess, x => x.text());
+  }
+  asBlobResponse(ensureSuccess = true) {
+    return this.execute(ensureSuccess, x => x.blob());
+  }
+  dispatcher(dispatcher) {
+    return this.append({
+      dispatcher
+    });
+  }
+  withFetchProxy(fetchProxy) {
+    return this.append({
+      fetchProxy
+    });
+  }
+  async execute(ensureSuccess = true, postProcessor) {
+    const env_1 = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
+    try {
+      let {
+        log,
+        logError,
+        hideBusyIndicator
+      } = this.request;
+      const _d = __addDisposableResource(env_1, !hideBusyIndicator ? App.current.createBusyIndicator() : null, false);
+      try {
+        const {
+          headers,
+          fetchProxy,
+          jsonPostProcessor
+        } = this.request;
+        const r = await (fetchProxy ?? fetch)(this.request.url, this.request);
+        if (ensureSuccess) {
+          if (r.status > 300) {
+            log = logError;
+            log?.(`fetch: ${this.request.method ?? "GET"} ${this.request.url}`);
+            if (log && headers) {
+              for (const key in headers) {
+                if (headers.hasOwnProperty(key)) {
+                  log?.(`${key}: ${headers[key]}`);
                 }
-                return { result, headers: r.headers, status: r.status };
+              }
             }
-            catch (error) {
-                log?.(error);
-                throw error;
+            log?.(`${r.status} ${r.statusText || "Http Error"}`);
+            const type = r.headers.get("content-type");
+            if (/\/json/i.test(type)) {
+              const json = await r.json();
+              log?.(json);
+              const message = json.title ?? json.detail ?? json.message ?? json.exceptionMessage ?? "Json Server Error";
+              log = null;
+              logError = null;
+              throw new JsonError(message, json);
             }
+            const text = await r.text();
+            log?.(text);
+            log = null;
+            logError = null;
+            throw new Error(`Fetch failed with error ${r.status} for ${this.request.url}\n${text}`);
+          }
         }
-        catch (e_1) {
-            env_1.error = e_1;
-            env_1.hasError = true;
+        log?.(`${this.request.method ?? "GET"} ${this.request.url}`);
+        if (log && headers) {
+          for (const key in headers) {
+            if (headers.hasOwnProperty(key)) {
+              log?.(`${key}: ${headers[key]}`);
+            }
+          }
         }
-        finally {
-            __disposeResources(env_1);
+        const result = await postProcessor(r, jsonPostProcessor);
+        if (log) {
+          log(`${r.status} ${r.statusText || "OK"}`);
+          log(result);
         }
-    }
-    append(r) {
-        let { url } = this.request;
-        const { url: newUrl } = r;
-        if (newUrl) {
-            if (!url) {
-                url = newUrl;
-            }
-            else {
-                if (/^https?\:\/\//i.test(newUrl)) {
-                    url = newUrl;
-                }
-                else {
-                    let fullUrl = url;
-                    if (!/^https?\:\/\//i.test(url)) {
-                        fullUrl = new URL(url, location.href).toString();
-                    }
-                    url = (new URL(newUrl, fullUrl)).toString();
-                }
-            }
+        return {
+          result,
+          headers: r.headers,
+          status: r.status
+        };
+      } catch (error) {
+        log?.(error);
+        throw error;
+      }
+    } catch (e_1) {
+      env_1.error = e_1;
+      env_1.hasError = true;
+    } finally {
+      __disposeResources(env_1);
+    }
+  }
+  append(r) {
+    let {
+      url
+    } = this.request;
+    const {
+      url: newUrl
+    } = r;
+    if (newUrl) {
+      if (!url) {
+        url = newUrl;
+      } else {
+        if (/^https?\:\/\//i.test(newUrl)) {
+          url = newUrl;
+        } else {
+          let fullUrl = url;
+          if (!/^https?\:\/\//i.test(url)) {
+            fullUrl = new URL(url, location.href).toString();
+          }
+          url = new URL(newUrl, fullUrl).toString();
         }
-        return new FetchBuilder({
-            ...this.request,
-            ...r,
-            url
-        });
-    }
+      }
+    }
+    return new FetchBuilder({
+      ...this.request,
+      ...r,
+      url
+    });
+  }
 }
 class JsonError extends Error {
-    constructor(message, json) {
-        super(message);
-        this.json = json;
-    }
+  constructor(message, json) {
+    super(message);
+    this.json = json;
+  }
 }
-FetchBuilder.JsonError = JsonError;
-//# sourceMappingURL=FetchBuilder.js.map
+FetchBuilder.JsonError = JsonError;