@nextgis/geocoder 3.0.0-alpha.5 → 3.0.0-alpha.7

package/lib/geocoder.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.5; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.7; author: NextGIS */
 import { objectAssign, fixUrlStr } from '@nextgis/utils';
 import NgwConnector from '@nextgis/ngw-connector';
 import { fetchNgwLayerItems } from '@nextgis/ngw-kit';

package/lib/geocoder.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.5; author: NextGIS */
+/** Bundle of @nextgis/geocoder; version: 3.0.0-alpha.7; author: NextGIS */
 var Geocoder = (function (exports) {
   'use strict';
 
@@ -820,10 +820,23 @@ var Geocoder = (function (exports) {
      * });
      * ```
      */
-    addFull(key, valueToSet, props) {
-      return this.add(key, valueToSet, props, true);
-    }
-    add(key, valueToSet, props, onlyFull) {
+    addFull(key, valueToSet, propsOrOptions, expirationTime) {
+      if (typeof propsOrOptions === "object" && "valueToSet" in propsOrOptions) {
+        propsOrOptions.onlyFull = true;
+      }
+      return this.add(key, valueToSet, propsOrOptions, true, expirationTime);
+    }
+    add(key, valueToSet, propsOrOptions, onlyFull, expirationTime) {
+      let opt;
+      let props;
+      if (typeof propsOrOptions === "object" && "valueToSet" in propsOrOptions) {
+        opt = propsOrOptions;
+        onlyFull = opt.onlyFull;
+        expirationTime = opt.expirationTime;
+        props = opt.props;
+      } else {
+        props = propsOrOptions;
+      }
       const exist = this._find(key, props);
       if (!exist) {
         let value;
@@ -833,10 +846,12 @@ var Geocoder = (function (exports) {
           value = valueToSet;
         }
         const nonEmptyProps = props && JSON.parse(JSON.stringify(objectRemoveEmpty(props)));
+        expirationTime = expirationTime ? Date.now() + expirationTime : void 0;
         const cacheItem = {
           key,
           value,
-          props: nonEmptyProps
+          props: nonEmptyProps,
+          expirationTime
         };
         if (onlyFull && !full(value)) {
           return value;
@@ -863,9 +878,19 @@ var Geocoder = (function (exports) {
     }
     match(key, props) {
       const cacheRecord = this._find(key, props);
+      if (cacheRecord && cacheRecord.expirationTime && Date.now() > cacheRecord.expirationTime) {
+        this.delete(cacheRecord);
+        return void 0;
+      }
       return cacheRecord == null ? void 0 : cacheRecord.value;
     }
     matchAll(key, props) {
+      const now = Date.now();
+      this.cache.forEach((item) => {
+        if (item.expirationTime && now > item.expirationTime) {
+          this.delete(item);
+        }
+      });
       if (key) {
         return this.cache.filter((x) => this._filter(x, key, props)).map((x) => x.value);
       }
@@ -895,7 +920,7 @@ var Geocoder = (function (exports) {
 
   var pkg = {
   	name: "@nextgis/ngw-connector",
-  	version: "3.0.0-alpha.5",
+  	version: "3.0.0-alpha.7",
   	_priority: 12,
   	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
   	main: "index.js",
@@ -904,7 +929,7 @@ var Geocoder = (function (exports) {
   	jsdelivr: "lib/ngw-connector.global.prod.js",
   	types: "lib/index.d.ts",
   	dependencies: {
-  		"@nextgis/cache": "^3.0.0-alpha.5",
+  		"@nextgis/cache": "^3.0.0-alpha.7",
   		"@nextgis/cancelable-promise": "^3.0.0-alpha.5",
   		"@nextgis/utils": "^3.0.0-alpha.5",
   		"@types/events": "^3.0.0",
@@ -1656,9 +1681,6 @@ var Geocoder = (function (exports) {
         addConnector(this);
       }
     }
-    static create(options) {
-      return new this(options);
-    }
     /**
      * Clear the cache.
      */
@@ -1839,7 +1861,7 @@ var Geocoder = (function (exports) {
             this._cleanActiveRequest(id);
           }
         });
-        if (cache && method === "GET") {
+        if (method === "GET") {
           const cacheOptions = cacheProps ? cacheProps : __spreadProps$2(__spreadValues$5({}, objectRemoveEmpty({
             headers,
             withCredentials,
@@ -1849,12 +1871,10 @@ var Geocoder = (function (exports) {
           })), {
             params
           });
-          return this.cache.add(
-            cacheName || url,
-            createPromise,
-            cacheOptions,
-            false
-          );
+          return this.cache.add(cacheName || url, createPromise, {
+            props: cacheOptions,
+            expirationTime: cache ? void 0 : 500
+          });
         }
         return createPromise();
       });
@@ -2312,13 +2332,15 @@ var Geocoder = (function (exports) {
   class NgwConnectorExtended extends NgwConnector {
     constructor(options) {
       super(options);
-      this.options = options;
       __publicField$2(this, "resources");
       this.resources = new ResourcesControl({
         connector: this,
         cacheId: options.cacheId
       });
     }
+    static create(options) {
+      return new this(options);
+    }
     /**
      * Clear the cache.
      */