@web-atoms/core 2.6.24 → 2.6.25

package/dist-esm/services/http/RestService.js

@@ -10,46 +10,46 @@ import CacheService from "../CacheService.js";
 import { JsonService } from "../JsonService.js";
 import JsonError from "./JsonError.js";
 function methodBuilder(method) {
-    return function (url, options) {
-        return function (target, propertyKey, descriptor) {
-            target.methods = target.methods || {};
-            const a = target.methods[propertyKey];
-            const oldFunction = descriptor.value;
-            descriptor.value = function (...args) {
-                if (this.testMode || Atom.designMode) {
-                    console.log(`Test Design Mode: ${url} .. ${args.join(",")}`);
-                    const ro = oldFunction.apply(this, args);
-                    if (ro) {
-                        return ro;
-                    }
-                }
-                const jsCache = options ? options.jsCacheSeconds : 0;
-                if (jsCache) {
-                    const cacheService = this.app.resolve(CacheService);
-                    const jArgs = args.map((arg) => arg instanceof CancelToken ? null : arg);
-                    const key = `${this.constructor.name}:${method}:${url}:${JSON.stringify(jArgs)}`;
-                    return cacheService.getOrCreate(key, (e) => {
-                        e.ttlSeconds = jsCache;
-                        return this.invoke(url, method, a, args, options);
-                    });
-                }
-                return this.invoke(url, method, a, args, options);
-            };
-        };
+  return function (url, options) {
+    return function (target, propertyKey, descriptor) {
+      target.methods = target.methods || {};
+      const a = target.methods[propertyKey];
+      const oldFunction = descriptor.value;
+      descriptor.value = function (...args) {
+        if (this.testMode || Atom.designMode) {
+          console.log(`Test Design Mode: ${url} .. ${args.join(",")}`);
+          const ro = oldFunction.apply(this, args);
+          if (ro) {
+            return ro;
+          }
+        }
+        const jsCache = options ? options.jsCacheSeconds : 0;
+        if (jsCache) {
+          const cacheService = this.app.resolve(CacheService);
+          const jArgs = args.map(arg => arg instanceof CancelToken ? null : arg);
+          const key = `${this.constructor.name}:${method}:${url}:${JSON.stringify(jArgs)}`;
+          return cacheService.getOrCreate(key, e => {
+            e.ttlSeconds = jsCache;
+            return this.invoke(url, method, a, args, options);
+          });
+        }
+        return this.invoke(url, method, a, args, options);
+      };
     };
+  };
 }
 function parameterBuilder(paramName, defaultValue) {
-    return function (key) {
-        return function (target, propertyKey, parameterIndex) {
-            target.methods = target.methods || {};
-            let a = target.methods[propertyKey];
-            if (!a) {
-                a = [];
-                target.methods[propertyKey] = a;
-            }
-            a[parameterIndex] = new ServiceParameter(paramName, key, defaultValue);
-        };
+  return function (key) {
+    return function (target, propertyKey, parameterIndex) {
+      target.methods = target.methods || {};
+      let a = target.methods[propertyKey];
+      if (!a) {
+        a = [];
+        target.methods[propertyKey] = a;
+      }
+      a[parameterIndex] = new ServiceParameter(paramName, key, defaultValue);
     };
+  };
 }
 export const Path = parameterBuilder("Path");
 export const Header = parameterBuilder("Header");
@@ -65,306 +65,297 @@ export const Delete = methodBuilder("Delete");
 export const Put = methodBuilder("Put");
 export const Patch = methodBuilder("Patch");
 export function Cancel(target, propertyKey, parameterIndex) {
-    if (!target.methods) {
-        target.methods = {};
-    }
-    let a = target.methods[propertyKey];
-    if (!a) {
-        a = [];
-        target.methods[propertyKey] = a;
-    }
-    a[parameterIndex] = new ServiceParameter("cancel", "");
+  if (!target.methods) {
+    target.methods = {};
+  }
+  let a = target.methods[propertyKey];
+  if (!a) {
+    a = [];
+    target.methods[propertyKey] = a;
+  }
+  a[parameterIndex] = new ServiceParameter("cancel", "");
 }
 export class ServiceParameter {
-    constructor(type, key, defaultValue) {
-        this.type = type;
-        this.key = key;
-        this.defaultValue = defaultValue;
-        this.type = type.toLowerCase();
-        this.key = key;
-    }
+  constructor(type, key, defaultValue) {
+    this.type = type;
+    this.key = key;
+    this.defaultValue = defaultValue;
+    this.type = type.toLowerCase();
+    this.key = key;
+  }
 }
 export default function BaseUrl(baseUrl) {
-    return (target) => {
-        const key = TypeKey.get(target);
-        BaseService.baseUrls[key] = baseUrl;
-    };
+  return target => {
+    const key = TypeKey.get(target);
+    BaseService.baseUrls[key] = baseUrl;
+  };
 }
-const globalNS = (typeof global !== "undefined") ? global : window;
+const globalNS = typeof global !== "undefined" ? global : window;
 if (!globalNS.XMLHttpRequest) {
-    globalNS.XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest;
+  globalNS.XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest;
 }
 let BaseService = class BaseService {
-    static { BaseService_1 = this; }
-    static { this.baseUrls = {}; }
-    constructor(app, jsonService) {
-        this.app = app;
-        this.jsonService = jsonService;
-        this.testMode = false;
-        this.showProgress = true;
-        this.showError = false;
-        this.methods = {};
-        this.methodReturns = {};
-        this.jsonOptions = null;
-        this.headers = null;
-        this.jsonOptions = {
-            ...this.jsonService.options
-        };
-    }
-    encodeData(o) {
-        o.dataType = "application/json";
-        o.data = this.jsonService.stringify(o.data, this.jsonOptions);
-        o.contentType = "application/json";
-        return o;
-    }
-    sendResult(result, error) {
-        return new Promise((resolve, reject) => {
-            if (error) {
-                setTimeout(() => {
-                    reject(error);
-                }, 1);
-                return;
-            }
-            setTimeout(() => {
-                resolve(result);
-            }, 1);
-        });
-    }
-    async invoke(url, method, bag, values, methodOptions) {
-        const env_1 = { stack: [], error: void 0, hasError: false };
-        try {
-            if (this.baseUrl === undefined) {
-                let p = Object.getPrototypeOf(this);
-                while (p) {
-                    const t = TypeKey.get(p.constructor || p);
-                    const bu = BaseService_1.baseUrls[t];
-                    if (bu) {
-                        this.baseUrl = bu;
-                        break;
-                    }
-                    p = Object.getPrototypeOf(p);
-                }
-                if (this.baseUrl === undefined) {
-                    this.baseUrl = null;
-                }
-            }
-            if (this.baseUrl) {
-                if (!/^\//.test(url)) {
-                    url = `${this.baseUrl}${url}`;
-                }
-            }
-            const _busyIndicator = __addDisposableResource(env_1, this.showProgress ? (this.app.createBusyIndicator({
-                title: url,
-                description: `${method} ${url}`
-            })) : null, false);
-            url = UMD.resolvePath(url);
-            let options = new AjaxOptions();
-            options.method = method;
-            if (methodOptions) {
-                options.headers = methodOptions.headers;
-                options.dataType = methodOptions.accept;
-            }
-            const methodHeaders = (options.headers = options.headers || {});
-            const headers = this.headers
-                ? ({ ...this.headers, ...methodHeaders })
-                : methodHeaders;
-            if (!headers["X-Requested-With"]) {
-                headers["X-Requested-With"] = "XMLHttpRequest";
-            }
-            options.dataType = options.dataType || "application/json";
-            const jsonOptions = {
-                ...this.jsonOptions,
-                ...(methodOptions ? methodOptions.jsonOptions : {})
-            };
-            if (bag) {
-                for (let i = 0; i < bag.length; i++) {
-                    const p = bag[i];
-                    const vi = values[i];
-                    const v = vi === undefined ? p.defaultValue : vi;
-                    if (v instanceof CancelToken) {
-                        options.cancel = v;
-                        continue;
-                    }
-                    switch (p.type) {
-                        case "path":
-                            if (v === undefined) {
-                                continue;
-                            }
-                            const vs = v + "";
-                            const replacer = `{${p.key}}`;
-                            url = url.split(replacer).join(vs);
-                            break;
-                        case "query":
-                            if (v === undefined) {
-                                continue;
-                            }
-                            if (url.indexOf("?") === -1) {
-                                url += "?";
-                            }
-                            if (!/(\&|\?)$/.test(url)) {
-                                url += "&";
-                            }
-                            url += `${encodeURIComponent(p.key)}=${encodeURIComponent(v)}`;
-                            break;
-                        case "queries":
-                            if (url.indexOf("?") === -1) {
-                                url += "?";
-                            }
-                            if (!/(\&|\?)$/.test(url)) {
-                                url += "&";
-                            }
-                            for (const key in v) {
-                                if (v.hasOwnProperty(key)) {
-                                    const element = v[key];
-                                    if (element !== undefined) {
-                                        url += `${encodeURIComponent(key)}=${encodeURIComponent(element)}&`;
-                                    }
-                                }
-                            }
-                            break;
-                        case "body":
-                            options.data = v;
-                            options = this.encodeData(options);
-                            break;
-                        case "bodyformmodel":
-                            options.data = v;
-                            break;
-                        case "rawbody":
-                            options.data = v;
-                            break;
-                        case "xmlbody":
-                            options.contentType = "text/xml";
-                            options.data = v;
-                            break;
-                        case "cancel":
-                            options.cancel = v;
-                            break;
-                        case "header":
-                            if (v === undefined) {
-                                continue;
-                            }
-                            headers[p.key] = v;
-                            break;
-                    }
-                }
-            }
-            options.url = url;
-            const xhr = await this.ajax(url, options);
-            if (/json/i.test(xhr.responseType)) {
-                const text = xhr.responseText;
-                const response = this.jsonService.parse(text, jsonOptions);
-                if (xhr.status >= 400) {
-                    throw new JsonError(typeof response === "string"
-                        ? response
-                        : (response.title
-                            ?? response.detail
-                            ?? response.message
-                            ?? response.exceptionMessage
-                            ?? text
-                            ?? "Json Server Error"), response);
-                }
-                if (methodOptions && methodOptions.returnHeaders) {
-                    return {
-                        headers: this.parseHeaders(xhr.responseHeaders),
-                        value: response
-                    };
+  static {
+    BaseService_1 = this;
+  }
+  static {
+    this.baseUrls = {};
+  }
+  constructor(app, jsonService) {
+    this.app = app;
+    this.jsonService = jsonService;
+    this.testMode = false;
+    this.showProgress = true;
+    this.showError = false;
+    this.methods = {};
+    this.methodReturns = {};
+    this.jsonOptions = null;
+    this.headers = null;
+    this.jsonOptions = {
+      ...this.jsonService.options
+    };
+  }
+  encodeData(o) {
+    o.dataType = "application/json";
+    o.data = this.jsonService.stringify(o.data, this.jsonOptions);
+    o.contentType = "application/json";
+    return o;
+  }
+  sendResult(result, error) {
+    return new Promise((resolve, reject) => {
+      if (error) {
+        setTimeout(() => {
+          reject(error);
+        }, 1);
+        return;
+      }
+      setTimeout(() => {
+        resolve(result);
+      }, 1);
+    });
+  }
+  async invoke(url, method, bag, values, methodOptions) {
+    const env_1 = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
+    try {
+      if (this.baseUrl === undefined) {
+        let p = Object.getPrototypeOf(this);
+        while (p) {
+          const t = TypeKey.get(p.constructor || p);
+          const bu = BaseService_1.baseUrls[t];
+          if (bu) {
+            this.baseUrl = bu;
+            break;
+          }
+          p = Object.getPrototypeOf(p);
+        }
+        if (this.baseUrl === undefined) {
+          this.baseUrl = null;
+        }
+      }
+      if (this.baseUrl) {
+        if (!/^\//.test(url)) {
+          url = `${this.baseUrl}${url}`;
+        }
+      }
+      const _busyIndicator = __addDisposableResource(env_1, this.showProgress ? this.app.createBusyIndicator({
+        title: url,
+        description: `${method} ${url}`
+      }) : null, false);
+      url = UMD.resolvePath(url);
+      let options = new AjaxOptions();
+      options.method = method;
+      if (methodOptions) {
+        options.headers = methodOptions.headers;
+        options.dataType = methodOptions.accept;
+      }
+      const methodHeaders = options.headers = options.headers || {};
+      const headers = this.headers ? {
+        ...this.headers,
+        ...methodHeaders
+      } : methodHeaders;
+      if (!headers["X-Requested-With"]) {
+        headers["X-Requested-With"] = "XMLHttpRequest";
+      }
+      options.dataType = options.dataType || "application/json";
+      const jsonOptions = {
+        ...this.jsonOptions,
+        ...(methodOptions ? methodOptions.jsonOptions : {})
+      };
+      if (bag) {
+        for (let i = 0; i < bag.length; i++) {
+          const p = bag[i];
+          const vi = values[i];
+          const v = vi === undefined ? p.defaultValue : vi;
+          if (v instanceof CancelToken) {
+            options.cancel = v;
+            continue;
+          }
+          switch (p.type) {
+            case "path":
+              if (v === undefined) {
+                continue;
+              }
+              const vs = v + "";
+              const replacer = `{${p.key}}`;
+              url = url.split(replacer).join(vs);
+              break;
+            case "query":
+              if (v === undefined) {
+                continue;
+              }
+              if (url.indexOf("?") === -1) {
+                url += "?";
+              }
+              if (!/(\&|\?)$/.test(url)) {
+                url += "&";
+              }
+              url += `${encodeURIComponent(p.key)}=${encodeURIComponent(v)}`;
+              break;
+            case "queries":
+              if (url.indexOf("?") === -1) {
+                url += "?";
+              }
+              if (!/(\&|\?)$/.test(url)) {
+                url += "&";
+              }
+              for (const key in v) {
+                if (v.hasOwnProperty(key)) {
+                  const element = v[key];
+                  if (element !== undefined) {
+                    url += `${encodeURIComponent(key)}=${encodeURIComponent(element)}&`;
+                  }
                 }
-                return response;
-            }
-            if (xhr.status >= 400) {
-                throw new Error(xhr.responseText || "Server Error");
-            }
-            if (methodOptions && methodOptions.returnHeaders) {
-                return {
-                    headers: this.parseHeaders(xhr.responseHeaders),
-                    value: xhr.responseText
-                };
-            }
-            return xhr.responseText;
+              }
+              break;
+            case "body":
+              options.data = v;
+              options = this.encodeData(options);
+              break;
+            case "bodyformmodel":
+              options.data = v;
+              break;
+            case "rawbody":
+              options.data = v;
+              break;
+            case "xmlbody":
+              options.contentType = "text/xml";
+              options.data = v;
+              break;
+            case "cancel":
+              options.cancel = v;
+              break;
+            case "header":
+              if (v === undefined) {
+                continue;
+              }
+              headers[p.key] = v;
+              break;
+          }
         }
-        catch (e_1) {
-            env_1.error = e_1;
-            env_1.hasError = true;
+      }
+      options.url = url;
+      const xhr = await this.ajax(url, options);
+      if (/json/i.test(xhr.responseType)) {
+        const text = xhr.responseText;
+        const response = this.jsonService.parse(text, jsonOptions);
+        if (xhr.status >= 400) {
+          throw new JsonError(typeof response === "string" ? response : response.title ?? response.detail ?? response.message ?? response.exceptionMessage ?? text ?? "Json Server Error", response);
         }
-        finally {
-            __disposeResources(env_1);
+        if (methodOptions && methodOptions.returnHeaders) {
+          return {
+            headers: this.parseHeaders(xhr.responseHeaders),
+            value: response
+          };
         }
+        return response;
+      }
+      if (xhr.status >= 400) {
+        throw new Error(xhr.responseText || "Server Error");
+      }
+      if (methodOptions && methodOptions.returnHeaders) {
+        return {
+          headers: this.parseHeaders(xhr.responseHeaders),
+          value: xhr.responseText
+        };
+      }
+      return xhr.responseText;
+    } catch (e_1) {
+      env_1.error = e_1;
+      env_1.hasError = true;
+    } finally {
+      __disposeResources(env_1);
     }
-    parseHeaders(headers) {
-        if (typeof headers === "object") {
-            return headers;
-        }
-        return (headers || "")
-            .split("\n")
-            .reduce((pv, c) => {
-            const cv = c.split(":");
-            pv[cv[0]] = (cv[1] || "").trim();
-            return pv;
-        }, {});
+  }
+  parseHeaders(headers) {
+    if (typeof headers === "object") {
+      return headers;
     }
-    async ajax(url, options) {
-        url = url || options.url;
-        if (options.cancel && options.cancel.cancelled) {
-            throw new Error("cancelled");
-        }
-        const xhr = new XMLHttpRequest();
-        return await new Promise((resolve, reject) => {
-            if (options.cancel && options.cancel.cancelled) {
-                reject(options.cancel.cancelled);
-                return;
-            }
-            if (options.cancel) {
-                options.cancel.registerForCancel((r) => {
-                    xhr.abort();
-                    reject(r);
-                    return;
-                });
-            }
-            xhr.onreadystatechange = (e) => {
-                if (xhr.readyState === XMLHttpRequest.DONE) {
-                    options.status = xhr.status;
-                    options.responseText = xhr.responseText;
-                    options.responseHeaders = xhr.getAllResponseHeaders();
-                    const ct = xhr.getResponseHeader("content-type");
-                    options.responseType = ct || xhr.responseType;
-                    resolve(options);
-                }
-            };
-            xhr.open(options.method, url, true);
-            if (options.dataType) {
-                xhr.setRequestHeader("accept", options.dataType);
-            }
-            if (options.contentType) {
-                xhr.setRequestHeader("content-type", options.contentType);
-            }
-            const h = options.headers;
-            if (h) {
-                for (const key in h) {
-                    if (h.hasOwnProperty(key)) {
-                        const element = h[key];
-                        xhr.setRequestHeader(key, element.toString());
-                    }
-                }
-            }
-            try {
-                xhr.send(options.data);
-            }
-            catch (e) {
-                options.status = xhr.status;
-                options.responseText = xhr.responseText;
-                options.responseHeaders = xhr.getAllResponseHeaders();
-                const ct = xhr.getResponseHeader("content-type");
-                options.responseType = ct || xhr.responseType;
-                resolve(options);
-            }
-        });
+    return (headers || "").split("\n").reduce((pv, c) => {
+      const cv = c.split(":");
+      pv[cv[0]] = (cv[1] || "").trim();
+      return pv;
+    }, {});
+  }
+  async ajax(url, options) {
+    url = url || options.url;
+    if (options.cancel && options.cancel.cancelled) {
+      throw new Error("cancelled");
     }
+    const xhr = new XMLHttpRequest();
+    return await new Promise((resolve, reject) => {
+      if (options.cancel && options.cancel.cancelled) {
+        reject(options.cancel.cancelled);
+        return;
+      }
+      if (options.cancel) {
+        options.cancel.registerForCancel(r => {
+          xhr.abort();
+          reject(r);
+          return;
+        });
+      }
+      xhr.onreadystatechange = e => {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
+          options.status = xhr.status;
+          options.responseText = xhr.responseText;
+          options.responseHeaders = xhr.getAllResponseHeaders();
+          const ct = xhr.getResponseHeader("content-type");
+          options.responseType = ct || xhr.responseType;
+          resolve(options);
+        }
+      };
+      xhr.open(options.method, url, true);
+      if (options.dataType) {
+        xhr.setRequestHeader("accept", options.dataType);
+      }
+      if (options.contentType) {
+        xhr.setRequestHeader("content-type", options.contentType);
+      }
+      const h = options.headers;
+      if (h) {
+        for (const key in h) {
+          if (h.hasOwnProperty(key)) {
+            const element = h[key];
+            xhr.setRequestHeader(key, element.toString());
+          }
+        }
+      }
+      try {
+        xhr.send(options.data);
+      } catch (e) {
+        options.status = xhr.status;
+        options.responseText = xhr.responseText;
+        options.responseHeaders = xhr.getAllResponseHeaders();
+        const ct = xhr.getResponseHeader("content-type");
+        options.responseType = ct || xhr.responseType;
+        resolve(options);
+      }
+    });
+  }
 };
-BaseService = BaseService_1 = __decorate([
-    __param(0, Inject),
-    __param(1, Inject),
-    __metadata("design:paramtypes", [App,
-        JsonService])
-], BaseService);
-export { BaseService };
-//# sourceMappingURL=RestService.js.map
+BaseService = BaseService_1 = __decorate([__param(0, Inject), __param(1, Inject), __metadata("design:paramtypes", [App, JsonService])], BaseService);
+export { BaseService };