@nextgis/geocoder 2.2.3 → 2.4.0

package/lib/geocoder.esm-browser.js

@@ -1,10 +1,7 @@
-/** Bundle of @nextgis/geocoder; version: 2.2.3; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 2.4.0; author: NextGIS */
 var __defProp$g = Object.defineProperty;
 var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$e = (obj, key, value) => {
-  __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$e = (obj, key, value) => __defNormalProp$g(obj, typeof key !== "symbol" ? key + "" : key, value);
 class CancelError extends Error {
   constructor() {
     super();
@@ -15,10 +12,7 @@ class CancelError extends Error {
 
 var __defProp$f = Object.defineProperty;
 var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$d = (obj, key, value) => {
-  __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$d = (obj, key, value) => __defNormalProp$f(obj, typeof key !== "symbol" ? key + "" : key, value);
 class PromiseControl {
   constructor(options = {}) {
     this.options = options;
@@ -100,10 +94,7 @@ class PromiseControl {
 
 var __defProp$e = Object.defineProperty;
 var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$c = (obj, key, value) => {
-  __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$c = (obj, key, value) => __defNormalProp$e(obj, typeof key !== "symbol" ? key + "" : key, value);
 class TimeoutError extends Error {
   constructor() {
     super();
@@ -114,10 +105,7 @@ class TimeoutError extends Error {
 
 var __defProp$d = Object.defineProperty;
 var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$b = (obj, key, value) => {
-  __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$b = (obj, key, value) => __defNormalProp$d(obj, typeof key !== "symbol" ? key + "" : key, value);
 var _a;
 const handleCallback = (resolve, reject, callback, r) => {
   try {
@@ -127,6 +115,7 @@ const handleCallback = (resolve, reject, callback, r) => {
   }
 };
 let ID$2 = 0;
+_a = Symbol.toStringTag;
 const _CancelablePromise = class _CancelablePromise {
   constructor(executor, timeout) {
     // @ts-ignore
@@ -306,7 +295,6 @@ const _CancelablePromise = class _CancelablePromise {
     this._promise = void 0;
   }
 };
-_a = Symbol.toStringTag;
 __publicField$b(_CancelablePromise, "CancelError", CancelError);
 __publicField$b(_CancelablePromise, "TimeoutError", TimeoutError);
 __publicField$b(_CancelablePromise, "PromiseControl", PromiseControl);
@@ -350,19 +338,15 @@ function objectAssign(target, ...sources) {
 
 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 {
@@ -374,10 +358,8 @@ function isEqual(a, b, o, p) {
 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]];
@@ -430,9 +412,7 @@ var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
 var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
 var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __knownSymbol$2 = (name, symbol) => {
-  return (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-};
+var __knownSymbol$2 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
 var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
@@ -446,10 +426,7 @@ var __spreadValues$5 = (a, b) => {
   return a;
 };
 var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
-var __publicField$a = (obj, key, value) => {
-  __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$a = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async$1 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -482,9 +459,7 @@ var __asyncGenerator$2 = (__this, __arguments, generator) => {
     } catch (e) {
       no(e);
     }
-  };
-  var method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no));
-  var it = {};
+  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol$2("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
 var __forAwait = (obj, it, method) => (it = obj[__knownSymbol$2("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol$2("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
@@ -614,10 +589,7 @@ class Geocoder extends BaseGeocoder {
 
 var __defProp$b = Object.defineProperty;
 var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$9 = (obj, key, value) => {
-  __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$9 = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
 class BaseProvider extends BaseGeocoder {
   constructor() {
     super(...arguments);
@@ -1108,10 +1080,7 @@ function unwrapListeners(arr) {
 
 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$8 = (obj, key, value) => {
-  __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$8 = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
 const _Cache = class _Cache {
   constructor(options = {}) {
     __publicField$8(this, "cache", []);
@@ -1238,10 +1207,7 @@ let Cache = _Cache;
 
 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$7 = (obj, key, value) => {
-  __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$7 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NgwError extends Error {
   constructor(er) {
     super();
@@ -1260,10 +1226,7 @@ class NgwError extends Error {
 
 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$6 = (obj, key, value) => {
-  __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$6 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ResourceNotFoundError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -1321,10 +1284,7 @@ var __spreadValues$4 = (a, b) => {
   return a;
 };
 var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
-var __publicField$5 = (obj, key, value) => {
-  __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$5 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -1346,9 +1306,14 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 class ResourcesControl {
-  constructor(connector) {
+  constructor({
+    connector,
+    cacheId
+  }) {
+    __publicField$5(this, "cache");
+    __publicField$5(this, "connector");
     this.connector = connector;
-    __publicField$5(this, "cache", new Cache());
+    this.cache = new Cache({ namespace: cacheId });
   }
   // -------------------------------------------------------------------------
   // Resource Methods
@@ -1361,7 +1326,7 @@ class ResourcesControl {
    * 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$2(__spreadValues$4({}, requestOptions), { cache: false });
     if (typeof resource === "string") {
@@ -1390,7 +1355,10 @@ class ResourcesControl {
       }
       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) => {
@@ -1551,14 +1519,17 @@ class ResourcesControl {
   }
   _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) => {
@@ -1612,10 +1583,7 @@ function removeConnector(connector) {
 
 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$4 = (obj, key, value) => {
-  __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$4 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
 class InsufficientPermissionsError extends NgwError {
   constructor(obj) {
     super(obj);
@@ -1641,7 +1609,7 @@ function template(str, data) {
 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];
@@ -1695,10 +1663,7 @@ function apiRequest(opt) {
 
 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$3 = (obj, key, value) => {
-  __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$3 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
 class NetworkError extends Error {
   constructor(url) {
     super();
@@ -1807,10 +1772,7 @@ var __spreadValues$3 = (a, b) => {
     }
   return a;
 };
-var __publicField$2 = (obj, key, value) => {
-  __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
+var __publicField$2 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
 let ID = 0;
 class NgwConnector {
   constructor(options) {
@@ -1819,10 +1781,12 @@ class NgwConnector {
     __publicField$2(this, "emitter", new EventEmitter());
     __publicField$2(this, "user");
     __publicField$2(this, "resources");
+    __publicField$2(this, "cache");
     __publicField$2(this, "routeStr", "/api/component/pyramid/route");
     __publicField$2(this, "activeRequests", []);
     __publicField$2(this, "requestTransform");
     const exist = findConnector(options);
+    this.cache = new Cache({ namespace: options.cacheId });
     if (exist) {
       return exist;
     } else {
@@ -1832,13 +1796,23 @@ class NgwConnector {
       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;
   }
@@ -1866,7 +1840,6 @@ class NgwConnector {
    * ```
    */
   connect() {
-    const cache = new Cache();
     const auth = this.options.auth;
     const makeConnect = () => new CancelablePromise((resolve, reject) => {
       const makeQuery = () => {
@@ -1886,7 +1859,7 @@ class NgwConnector {
       }
       return makeQuery();
     });
-    return cache.add("route", makeConnect, {
+    return this.cache.add("route", makeConnect, {
       id: this.id,
       auth,
       baseUrl: this.options.baseUrl
@@ -1909,8 +1882,8 @@ class NgwConnector {
     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) {
@@ -1995,8 +1968,7 @@ class NgwConnector {
     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$3({
+      return this.cache.add(name, makeApiRequest, __spreadValues$3({
         params
       }, objectRemoveEmpty({
         headers,
@@ -2266,10 +2238,8 @@ function reEscape(s) {
 function like(b, a, iLike) {
   a = String(a);
   b = String(b);
-  if (a === b)
-    return true;
-  if (iLike && a.toUpperCase() === b.toUpperCase())
-    return true;
+  if (a === b) return true;
+  if (iLike && a.toUpperCase() === b.toUpperCase()) return true;
   const re = `^${reEscape(a)}$`.replace(/%/g, ".*").replace("_", ".");
   return new RegExp(re, iLike ? "i" : "").exec(b) !== null;
 }
@@ -2613,9 +2583,7 @@ var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __knownSymbol$1 = (name, symbol) => {
-  return (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-};
+var __knownSymbol$1 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
 var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -2628,10 +2596,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-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);
 var __await$1 = function(promise, isYieldStar) {
   this[0] = promise;
   this[1] = isYieldStar;
@@ -2644,9 +2609,7 @@ var __asyncGenerator$1 = (__this, __arguments, generator) => {
     } catch (e) {
       no(e);
     }
-  };
-  var method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no));
-  var it = {};
+  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol$1("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
 const _NgwProvider = class _NgwProvider extends BaseProvider {
@@ -2793,14 +2756,9 @@ __publicField$1(_NgwProvider, "limit", 300);
 let NgwProvider = _NgwProvider;
 
 var __defProp = Object.defineProperty;
-var __knownSymbol = (name, symbol) => {
-  return (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-};
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-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);
 var __await = function(promise, isYieldStar) {
   this[0] = promise;
   this[1] = isYieldStar;
@@ -2813,9 +2771,7 @@ var __asyncGenerator = (__this, __arguments, generator) => {
     } catch (e) {
       no(e);
     }
-  };
-  var method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no));
-  var it = {};
+  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
   return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
 };
 class NominatimProvider extends BaseProvider {