@nextgis/ngw-map 3.0.0-alpha.6 → 3.0.0-alpha.7

package/lib/ngw-map.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.6; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.7; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.6; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 3.0.0-alpha.7; author: NextGIS */
 var domain;
 
 // This constructor is used to store event handlers. Instantiating this is
@@ -865,10 +865,23 @@ const _Cache = class _Cache {
    * });
    * ```
    */
-  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;
@@ -878,10 +891,12 @@ const _Cache = class _Cache {
         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;
@@ -908,9 +923,19 @@ const _Cache = class _Cache {
   }
   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);
     }
@@ -940,7 +965,7 @@ let Cache = _Cache;
 
 var pkg = {
 	name: "@nextgis/ngw-connector",
-	version: "3.0.0-alpha.6",
+	version: "3.0.0-alpha.7",
 	_priority: 12,
 	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
 	main: "index.js",
@@ -949,7 +974,7 @@ var pkg = {
 	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",
@@ -1701,9 +1726,6 @@ class NgwConnector {
       addConnector(this);
     }
   }
-  static create(options) {
-    return new this(options);
-  }
   /**
    * Clear the cache.
    */
@@ -1884,7 +1906,7 @@ class NgwConnector {
           this._cleanActiveRequest(id);
         }
       });
-      if (cache && method === "GET") {
+      if (method === "GET") {
         const cacheOptions = cacheProps ? cacheProps : __spreadProps$g(__spreadValues$v({}, objectRemoveEmpty({
           headers,
           withCredentials,
@@ -1894,12 +1916,10 @@ class NgwConnector {
         })), {
           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();
     });
@@ -2363,6 +2383,9 @@ class NgwConnectorExtended extends NgwConnector {
       cacheId: options.cacheId
     });
   }
+  static create(options) {
+    return new this(options);
+  }
   /**
    * Clear the cache.
    */