@nextgis/ngw-connector 2.2.3 → 2.4.0

package/lib/ngw-connector.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-connector; version: 2.2.3; author: NextGIS */
+/** Bundle of @nextgis/ngw-connector; version: 2.4.0; author: NextGIS */
 var NgwConnector = (function () {
   'use strict';
 
@@ -483,19 +483,15 @@ var NgwConnector = (function () {
 
   function isEqual(a, b, o, p) {
     if (a instanceof Array) {
-      if (!(b instanceof Array))
-        return false;
+      if (!(b instanceof Array)) return false;
       return b.sort().join("") === a.sort().join("");
     } else if (a instanceof Date) {
-      if (!(b instanceof Date))
-        return false;
+      if (!(b instanceof Date)) return false;
       return "" + a === "" + b;
     } else if (a instanceof Function) {
-      if (!(b instanceof Function))
-        return false;
+      if (!(b instanceof Function)) return false;
     } else if (a instanceof Object) {
-      if (!(b instanceof Object))
-        return false;
+      if (!(b instanceof Object)) return false;
       if (a === o) {
         return b === p;
       } else {
@@ -507,10 +503,8 @@ var NgwConnector = (function () {
   function objectDeepEqual(o, p) {
     const keysO = Object.keys(o).sort();
     const keysP = Object.keys(p).sort();
-    if (keysO.length !== keysP.length)
-      return false;
-    if (keysO.join("") !== keysP.join(""))
-      return false;
+    if (keysO.length !== keysP.length) return false;
+    if (keysO.join("") !== keysP.join("")) return false;
     for (let i = 0; i < keysO.length; i++) {
       const oVal = o[keysO[i]];
       const pVal = p[keysP[i]];
@@ -539,10 +533,7 @@ var NgwConnector = (function () {
 
   var __defProp$a = Object.defineProperty;
   var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$a = (obj, key, value) => {
-    __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$a = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
   const _Cache = class _Cache {
     constructor(options = {}) {
       __publicField$a(this, "cache", []);
@@ -669,10 +660,7 @@ var NgwConnector = (function () {
 
   var __defProp$9 = Object.defineProperty;
   var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$9 = (obj, key, value) => {
-    __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$9 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
   class CancelError extends Error {
     constructor() {
       super();
@@ -683,10 +671,7 @@ var NgwConnector = (function () {
 
   var __defProp$8 = Object.defineProperty;
   var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$8 = (obj, key, value) => {
-    __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$8 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
   class PromiseControl {
     constructor(options = {}) {
       this.options = options;
@@ -768,10 +753,7 @@ var NgwConnector = (function () {
 
   var __defProp$7 = Object.defineProperty;
   var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$7 = (obj, key, value) => {
-    __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$7 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
   class TimeoutError extends Error {
     constructor() {
       super();
@@ -782,10 +764,7 @@ var NgwConnector = (function () {
 
   var __defProp$6 = Object.defineProperty;
   var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$6 = (obj, key, value) => {
-    __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$6 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
   var _a;
   const handleCallback = (resolve, reject, callback, r) => {
     try {
@@ -795,6 +774,7 @@ var NgwConnector = (function () {
     }
   };
   let ID$1 = 0;
+  _a = Symbol.toStringTag;
   const _CancelablePromise = class _CancelablePromise {
     constructor(executor, timeout) {
       // @ts-ignore
@@ -974,7 +954,6 @@ var NgwConnector = (function () {
       this._promise = void 0;
     }
   };
-  _a = Symbol.toStringTag;
   __publicField$6(_CancelablePromise, "CancelError", CancelError);
   __publicField$6(_CancelablePromise, "TimeoutError", TimeoutError);
   __publicField$6(_CancelablePromise, "PromiseControl", PromiseControl);
@@ -983,10 +962,7 @@ var NgwConnector = (function () {
 
   var __defProp$5 = Object.defineProperty;
   var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$5 = (obj, key, value) => {
-    __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
   class NgwError extends Error {
     constructor(er) {
       super();
@@ -1005,10 +981,7 @@ var NgwConnector = (function () {
 
   var __defProp$4 = Object.defineProperty;
   var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$4 = (obj, key, value) => {
-    __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ResourceNotFoundError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1066,10 +1039,7 @@ var NgwConnector = (function () {
     return a;
   };
   var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-  var __publicField$3 = (obj, key, value) => {
-    __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
   var __async = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -1091,9 +1061,14 @@ var NgwConnector = (function () {
     });
   };
   class ResourcesControl {
-    constructor(connector) {
+    constructor({
+      connector,
+      cacheId
+    }) {
+      __publicField$3(this, "cache");
+      __publicField$3(this, "connector");
       this.connector = connector;
-      __publicField$3(this, "cache", new Cache());
+      this.cache = new Cache({ namespace: cacheId });
     }
     // -------------------------------------------------------------------------
     // Resource Methods
@@ -1106,7 +1081,7 @@ var NgwConnector = (function () {
      * Fetching resource would be cached to speed up next call
      */
     getOne(resource, requestOptions) {
-      const cache = new Cache();
+      const cache = this.cache;
       const forCache = {};
       const opt = __spreadProps(__spreadValues$1({}, requestOptions), { cache: false });
       if (typeof resource === "string") {
@@ -1135,7 +1110,10 @@ var NgwConnector = (function () {
         }
         return CancelablePromise.resolve(void 0);
       };
-      return cache.addFull("resource", makeRequest, forCache);
+      if (requestOptions == null ? void 0 : requestOptions.cache) {
+        return cache.addFull("resource", makeRequest, forCache);
+      }
+      return makeRequest();
     }
     getOneOrFail(resource, requestOptions) {
       return this.getOne(resource, requestOptions).then((res) => {
@@ -1296,14 +1274,17 @@ var NgwConnector = (function () {
     }
     _fetchResourceById(id, requestOptions) {
       const promise = () => this.connector.get("resource.item", requestOptions, { id });
-      return this.cache.add("resource.item", promise, {
-        id
-      }).catch((er) => {
-        if (!(er instanceof ResourceNotFoundError)) {
-          throw er;
-        }
-        return void 0;
-      });
+      if (requestOptions == null ? void 0 : requestOptions.cache) {
+        return this.cache.add("resource.item", promise, {
+          id
+        }).catch((er) => {
+          if (!(er instanceof ResourceNotFoundError)) {
+            throw er;
+          }
+          return void 0;
+        });
+      }
+      return promise();
     }
     _fetchResourceBy(resource, requestOptions) {
       return this.getMany(resource, requestOptions).then((resources) => {
@@ -1357,10 +1338,7 @@ var NgwConnector = (function () {
 
   var __defProp$2 = Object.defineProperty;
   var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$2 = (obj, key, value) => {
-    __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
   class InsufficientPermissionsError extends NgwError {
     constructor(obj) {
       super(obj);
@@ -1386,7 +1364,7 @@ var NgwConnector = (function () {
   function apiRequest(opt) {
     const params = opt.params;
     return new CancelablePromise((resolve, reject) => {
-      opt.connector.connect().then((apiItems) => {
+      return opt.connector.connect().then((apiItems) => {
         let apiItem = apiItems && apiItems[opt.name];
         if (apiItem) {
           apiItem = [...apiItem];
@@ -1440,10 +1418,7 @@ var NgwConnector = (function () {
 
   var __defProp$1 = Object.defineProperty;
   var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-  var __publicField$1 = (obj, key, value) => {
-    __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
   class NetworkError extends Error {
     constructor(url) {
       super();
@@ -1552,10 +1527,7 @@ var NgwConnector = (function () {
       }
     return a;
   };
-  var __publicField = (obj, key, value) => {
-    __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-    return value;
-  };
+  var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   let ID = 0;
   class NgwConnector {
     constructor(options) {
@@ -1564,10 +1536,12 @@ var NgwConnector = (function () {
       __publicField(this, "emitter", new EventEmitter());
       __publicField(this, "user");
       __publicField(this, "resources");
+      __publicField(this, "cache");
       __publicField(this, "routeStr", "/api/component/pyramid/route");
       __publicField(this, "activeRequests", []);
       __publicField(this, "requestTransform");
       const exist = findConnector(options);
+      this.cache = new Cache({ namespace: options.cacheId });
       if (exist) {
         return exist;
       } else {
@@ -1577,13 +1551,23 @@ var NgwConnector = (function () {
         if (this.options.requestTransform) {
           this.requestTransform = this.options.requestTransform;
         }
-        this.resources = new ResourcesControl(this);
+        this.resources = new ResourcesControl({
+          connector: this,
+          cacheId: options.cacheId
+        });
         addConnector(this);
       }
     }
     static create(options) {
       return new this(options);
     }
+    /**
+     * Clear the cache.
+     */
+    clearCache() {
+      this.cache.clean();
+      this.resources.cache.clean();
+    }
     setRequestTransform(requestTransform) {
       this.requestTransform = requestTransform;
     }
@@ -1611,7 +1595,6 @@ var NgwConnector = (function () {
      * ```
      */
     connect() {
-      const cache = new Cache();
       const auth = this.options.auth;
       const makeConnect = () => new CancelablePromise((resolve, reject) => {
         const makeQuery = () => {
@@ -1631,7 +1614,7 @@ var NgwConnector = (function () {
         }
         return makeQuery();
       });
-      return cache.add("route", makeConnect, {
+      return this.cache.add("route", makeConnect, {
         id: this.id,
         auth,
         baseUrl: this.options.baseUrl
@@ -1654,8 +1637,8 @@ var NgwConnector = (function () {
       removeConnector(this);
       this.options.auth = void 0;
       this.user = void 0;
+      this.clearCache();
       this.emitter.emit("logout");
-      this.resources.cache.clean();
     }
     getUserInfo(credentials, options) {
       if (this.user && this.user.id) {
@@ -1740,8 +1723,7 @@ var NgwConnector = (function () {
       const params = objectRemoveEmpty(params_);
       const makeApiRequest = () => apiRequest({ name, params, requestOptions, connector: this });
       if (requestOptions.cache && method === "GET") {
-        const cache = new Cache();
-        return cache.add(name, makeApiRequest, __spreadValues({
+        return this.cache.add(name, makeApiRequest, __spreadValues({
           params
         }, objectRemoveEmpty({
           headers,