@serwist/expiration 8.3.0 → 8.4.1

package/dist/index.cjs

@@ -154,7 +154,7 @@ const normalizeURL = (unNormalizedUrl)=>{
         // Creating an ID from the URL and cache name won't be necessary once
         // Edge switches to Chromium and all browsers we support work with
         // array keyPaths.
-        return this._cacheName + "|" + normalizeURL(url);
+        return `${this._cacheName}|${normalizeURL(url)}`;
     }
     /**
    * Returns an open connection to the database.
@@ -245,10 +245,12 @@ const normalizeURL = (unNormalizedUrl)=>{
             if (urlsExpired.length > 0) {
                 internal.logger.groupCollapsed(`Expired ${urlsExpired.length} ` + `${urlsExpired.length === 1 ? "entry" : "entries"} and removed ` + `${urlsExpired.length === 1 ? "it" : "them"} from the ` + `'${this._cacheName}' cache.`);
                 internal.logger.log(`Expired the following ${urlsExpired.length === 1 ? "URL" : "URLs"}:`);
-                urlsExpired.forEach((url)=>internal.logger.log(`    ${url}`));
+                for (const url of urlsExpired){
+                    internal.logger.log(`    ${url}`);
+                }
                 internal.logger.groupEnd();
             } else {
-                internal.logger.debug(`Cache expiration ran and found no entries to remove.`);
+                internal.logger.debug("Cache expiration ran and found no entries to remove.");
             }
         }
         this._isRunning = false;
@@ -287,17 +289,16 @@ const normalizeURL = (unNormalizedUrl)=>{
    */ async isURLExpired(url) {
         if (!this._maxAgeSeconds) {
             if (process.env.NODE_ENV !== "production") {
-                throw new internal.SerwistError(`expired-test-without-max-age`, {
+                throw new internal.SerwistError("expired-test-without-max-age", {
                     methodName: "isURLExpired",
                     paramName: "maxAgeSeconds"
                 });
             }
             return false;
-        } else {
-            const timestamp = await this._timestampModel.getTimestamp(url);
-            const expireOlderThan = Date.now() - this._maxAgeSeconds * 1000;
-            return timestamp !== undefined ? timestamp < expireOlderThan : true;
         }
+        const timestamp = await this._timestampModel.getTimestamp(url);
+        const expireOlderThan = Date.now() - this._maxAgeSeconds * 1000;
+        return timestamp !== undefined ? timestamp < expireOlderThan : true;
     }
     /**
    * Removes the IndexedDB object store used to keep track of cache expiration
@@ -418,7 +419,7 @@ const normalizeURL = (unNormalizedUrl)=>{
                 if (process.env.NODE_ENV !== "production") {
                     // The event may not be a fetch event; only log the URL if it is.
                     if ("request" in event) {
-                        internal.logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache entry for ` + `'${internal.getFriendlyURL(event.request.url)}'.`);
+                        internal.logger.warn(`Unable to ensure service worker stays alive when updating cache entry for '${internal.getFriendlyURL(event.request.url)}'.`);
                     }
                 }
             }
@@ -463,7 +464,7 @@ const normalizeURL = (unNormalizedUrl)=>{
         const headerTime = parsedDate.getTime();
         // If the Date header was invalid for some reason, parsedDate.getTime()
         // will return NaN.
-        if (isNaN(headerTime)) {
+        if (Number.isNaN(headerTime)) {
             return null;
         }
         return headerTime;

package/dist/index.js

@@ -152,7 +152,7 @@ const normalizeURL = (unNormalizedUrl)=>{
         // Creating an ID from the URL and cache name won't be necessary once
         // Edge switches to Chromium and all browsers we support work with
         // array keyPaths.
-        return this._cacheName + "|" + normalizeURL(url);
+        return `${this._cacheName}|${normalizeURL(url)}`;
     }
     /**
    * Returns an open connection to the database.
@@ -243,10 +243,12 @@ const normalizeURL = (unNormalizedUrl)=>{
             if (urlsExpired.length > 0) {
                 logger.groupCollapsed(`Expired ${urlsExpired.length} ` + `${urlsExpired.length === 1 ? "entry" : "entries"} and removed ` + `${urlsExpired.length === 1 ? "it" : "them"} from the ` + `'${this._cacheName}' cache.`);
                 logger.log(`Expired the following ${urlsExpired.length === 1 ? "URL" : "URLs"}:`);
-                urlsExpired.forEach((url)=>logger.log(`    ${url}`));
+                for (const url of urlsExpired){
+                    logger.log(`    ${url}`);
+                }
                 logger.groupEnd();
             } else {
-                logger.debug(`Cache expiration ran and found no entries to remove.`);
+                logger.debug("Cache expiration ran and found no entries to remove.");
             }
         }
         this._isRunning = false;
@@ -285,17 +287,16 @@ const normalizeURL = (unNormalizedUrl)=>{
    */ async isURLExpired(url) {
         if (!this._maxAgeSeconds) {
             if (process.env.NODE_ENV !== "production") {
-                throw new SerwistError(`expired-test-without-max-age`, {
+                throw new SerwistError("expired-test-without-max-age", {
                     methodName: "isURLExpired",
                     paramName: "maxAgeSeconds"
                 });
             }
             return false;
-        } else {
-            const timestamp = await this._timestampModel.getTimestamp(url);
-            const expireOlderThan = Date.now() - this._maxAgeSeconds * 1000;
-            return timestamp !== undefined ? timestamp < expireOlderThan : true;
         }
+        const timestamp = await this._timestampModel.getTimestamp(url);
+        const expireOlderThan = Date.now() - this._maxAgeSeconds * 1000;
+        return timestamp !== undefined ? timestamp < expireOlderThan : true;
     }
     /**
    * Removes the IndexedDB object store used to keep track of cache expiration
@@ -416,7 +417,7 @@ const normalizeURL = (unNormalizedUrl)=>{
                 if (process.env.NODE_ENV !== "production") {
                     // The event may not be a fetch event; only log the URL if it is.
                     if ("request" in event) {
-                        logger.warn(`Unable to ensure service worker stays alive when ` + `updating cache entry for ` + `'${getFriendlyURL(event.request.url)}'.`);
+                        logger.warn(`Unable to ensure service worker stays alive when updating cache entry for '${getFriendlyURL(event.request.url)}'.`);
                     }
                 }
             }
@@ -461,7 +462,7 @@ const normalizeURL = (unNormalizedUrl)=>{
         const headerTime = parsedDate.getTime();
         // If the Date header was invalid for some reason, parsedDate.getTime()
         // will return NaN.
-        if (isNaN(headerTime)) {
+        if (Number.isNaN(headerTime)) {
             return null;
         }
         return headerTime;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/expiration",
-  "version": "8.3.0",
+  "version": "8.4.1",
   "type": "module",
   "description": "A service worker helper library that expires cached responses based on age or maximum number of entries.",
   "files": [
@@ -18,7 +18,7 @@
   "license": "MIT",
   "repository": "serwist/serwist",
   "bugs": "https://github.com/serwist/serwist/issues",
-  "homepage": "https://serwist.vercel.app",
+  "homepage": "https://serwist.pages.dev",
   "module": "./dist/index.js",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -37,15 +37,16 @@
   },
   "dependencies": {
     "idb": "8.0.0",
-    "@serwist/core": "8.3.0"
+    "@serwist/core": "8.4.1"
   },
   "devDependencies": {
     "rollup": "4.9.1",
-    "@serwist/constants": "8.3.0"
+    "@serwist/constants": "8.4.1"
   },
   "scripts": {
     "build": "rimraf dist && cross-env NODE_ENV=production rollup --config rollup.config.js",
-    "lint": "eslint src --ext ts,tsx,js,jsx,cjs,mjs",
+    "dev": "rollup --config rollup.config.js --watch",
+    "lint": "biome lint ./src",
     "typecheck": "tsc"
   }
 }