@zuplo/cli 6.71.21 → 6.71.23

package/node_modules/toad-cache/dist/toad-cache.mjs

@@ -3,17 +3,26 @@
  *
  * @copyright 2026 Igor Savin <kibertoad@gmail.com>
  * @license MIT
- * @version 3.7.0
+ * @version 3.7.3
  */
-class FifoMap {
-  constructor(max = 1000, ttlInMsecs = 0) {
-    if (isNaN(max) || max < 0) {
-      throw new Error('Invalid max value')
-    }
+/**
+ * Validates the shared cache constructor parameters.
+ * Both values must be non-negative integers.
+ *
+ * @param {number} max
+ * @param {number} ttlInMsecs
+ */
+function validateCacheParams(max, ttlInMsecs) {
+  if (typeof max !== 'number' || !Number.isInteger(max) || max < 0) {
+    throw new Error('Invalid max value')
+  }
 
-    if (isNaN(ttlInMsecs) || ttlInMsecs < 0) {
-      throw new Error('Invalid ttl value')
-    }
+  if (typeof ttlInMsecs !== 'number' || !Number.isInteger(ttlInMsecs) || ttlInMsecs < 0) {
+    throw new Error('Invalid ttl value')
+  }
+}class FifoMap {
+  constructor(max = 1000, ttlInMsecs = 0) {
+    validateCacheParams(max, ttlInMsecs);
 
     this.first = null;
     this.items = new Map();
@@ -27,15 +36,15 @@ class FifoMap {
   }
 
   clear() {
-    this.items = new Map();
+    this.items.clear();
     this.first = null;
     this.last = null;
   }
 
   delete(key) {
-    if (this.items.has(key)) {
-      const deletedItem = this.items.get(key);
+    const deletedItem = this.items.get(key);
 
+    if (deletedItem !== undefined) {
       this.items.delete(key);
 
       if (deletedItem.prev !== null) {
@@ -79,15 +88,17 @@ class FifoMap {
   }
 
   expiresAt(key) {
-    if (this.items.has(key)) {
-      return this.items.get(key).expiry
+    const item = this.items.get(key);
+
+    if (item !== undefined) {
+      return item.expiry
     }
   }
 
   get(key) {
-    if (this.items.has(key)) {
-      const item = this.items.get(key);
+    const item = this.items.get(key);
 
+    if (item !== undefined) {
       if (this.ttl > 0 && item.expiry <= Date.now()) {
         this.delete(key);
         return
@@ -98,10 +109,10 @@ class FifoMap {
   }
 
   getMany(keys) {
-    const result = [];
+    const result = new Array(keys.length);
 
     for (var i = 0; i < keys.length; i++) {
-      result.push(this.get(keys[i]));
+      result[i] = this.get(keys[i]);
     }
 
     return result
@@ -113,17 +124,17 @@ class FifoMap {
 
   set(key, value) {
     // Replace existing item
-    if (this.items.has(key)) {
-      const item = this.items.get(key);
-      item.value = value;
+    const existing = this.items.get(key);
 
-      item.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
+    if (existing !== undefined) {
+      existing.value = value;
+      existing.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
 
       return
     }
 
     // Add new item
-    if (this.max > 0 && this.size === this.max) {
+    if (this.max > 0 && this.size >= this.max) {
       this.evict();
     }
 
@@ -146,13 +157,7 @@ class FifoMap {
   }
 }class FifoObject {
   constructor(max = 1000, ttlInMsecs = 0) {
-    if (isNaN(max) || max < 0) {
-      throw new Error('Invalid max value')
-    }
-
-    if (isNaN(ttlInMsecs) || ttlInMsecs < 0) {
-      throw new Error('Invalid ttl value')
-    }
+    validateCacheParams(max, ttlInMsecs);
 
     this.first = null;
     this.items = Object.create(null);
@@ -170,9 +175,9 @@ class FifoMap {
   }
 
   delete(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const deletedItem = this.items[key];
+    const deletedItem = this.items[key];
 
+    if (deletedItem !== undefined) {
       delete this.items[key];
       this.size--;
 
@@ -217,15 +222,17 @@ class FifoMap {
   }
 
   expiresAt(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      return this.items[key].expiry
+    const item = this.items[key];
+
+    if (item !== undefined) {
+      return item.expiry
     }
   }
 
   get(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const item = this.items[key];
+    const item = this.items[key];
 
+    if (item !== undefined) {
       if (this.ttl > 0 && item.expiry <= Date.now()) {
         this.delete(key);
         return
@@ -236,10 +243,10 @@ class FifoMap {
   }
 
   getMany(keys) {
-    const result = [];
+    const result = new Array(keys.length);
 
     for (var i = 0; i < keys.length; i++) {
-      result.push(this.get(keys[i]));
+      result[i] = this.get(keys[i]);
     }
 
     return result
@@ -251,17 +258,17 @@ class FifoMap {
 
   set(key, value) {
     // Replace existing item
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const item = this.items[key];
-      item.value = value;
+    const existing = this.items[key];
 
-      item.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
+    if (existing !== undefined) {
+      existing.value = value;
+      existing.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
 
       return
     }
 
     // Add new item
-    if (this.max > 0 && this.size === this.max) {
+    if (this.max > 0 && this.size >= this.max) {
       this.evict();
     }
 
@@ -282,6 +289,24 @@ class FifoMap {
 
     this.last = item;
   }
+}/**
+ * Creates a zeroed statistics record for a single collection window.
+ *
+ * @returns {object}
+ */
+function createEmptyStatisticsRecord() {
+  return {
+    cacheSize: 0,
+    hits: 0,
+    falsyHits: 0,
+    emptyHits: 0,
+    misses: 0,
+    expirations: 0,
+    evictions: 0,
+    invalidateOne: 0,
+    invalidateAll: 0,
+    sets: 0,
+  }
 }class HitStatisticsRecord {
   constructor() {
     this.records = {};
@@ -289,35 +314,17 @@ class FifoMap {
 
   initForCache(cacheId, currentTimeStamp) {
     this.records[cacheId] = {
-      [currentTimeStamp]: {
-        cacheSize: 0,
-        hits: 0,
-        falsyHits: 0,
-        emptyHits: 0,
-        misses: 0,
-        expirations: 0,
-        evictions: 0,
-        invalidateOne: 0,
-        invalidateAll: 0,
-        sets: 0,
-      },
+      [currentTimeStamp]: createEmptyStatisticsRecord(),
     };
   }
 
   resetForCache(cacheId) {
+    if (!this.records[cacheId]) {
+      return
+    }
+
     for (let key of Object.keys(this.records[cacheId])) {
-      this.records[cacheId][key] = {
-        cacheSize: 0,
-        hits: 0,
-        falsyHits: 0,
-        emptyHits: 0,
-        misses: 0,
-        expirations: 0,
-        evictions: 0,
-        invalidateOne: 0,
-        invalidateAll: 0,
-        sets: 0,
-      };
+      this.records[cacheId][key] = createEmptyStatisticsRecord();
     }
   }
 
@@ -326,13 +333,7 @@ class FifoMap {
   }
 }class LruMap {
   constructor(max = 1000, ttlInMsecs = 0) {
-    if (isNaN(max) || max < 0) {
-      throw new Error('Invalid max value')
-    }
-
-    if (isNaN(ttlInMsecs) || ttlInMsecs < 0) {
-      throw new Error('Invalid ttl value')
-    }
+    validateCacheParams(max, ttlInMsecs);
 
     this.first = null;
     this.items = new Map();
@@ -366,6 +367,7 @@ class FifoMap {
       prev.next = next;
     }
 
+    /* v8 ignore next 3 -- next is always non-null here: the early return above guarantees item !== this.last in a well-formed list */
     if (next !== null) {
       next.prev = prev;
     }
@@ -374,15 +376,15 @@ class FifoMap {
   }
 
   clear() {
-    this.items = new Map();
+    this.items.clear();
     this.first = null;
     this.last = null;
   }
 
   delete(key) {
-    if (this.items.has(key)) {
-      const item = this.items.get(key);
+    const item = this.items.get(key);
 
+    if (item !== undefined) {
       this.items.delete(key);
 
       if (item.prev !== null) {
@@ -426,15 +428,17 @@ class FifoMap {
   }
 
   expiresAt(key) {
-    if (this.items.has(key)) {
-      return this.items.get(key).expiry
+    const item = this.items.get(key);
+
+    if (item !== undefined) {
+      return item.expiry
     }
   }
 
   get(key) {
-    if (this.items.has(key)) {
-      const item = this.items.get(key);
+    const item = this.items.get(key);
 
+    if (item !== undefined) {
       // Item has already expired
       if (this.ttl > 0 && item.expiry <= Date.now()) {
         this.delete(key);
@@ -448,10 +452,10 @@ class FifoMap {
   }
 
   getMany(keys) {
-    const result = [];
+    const result = new Array(keys.length);
 
     for (var i = 0; i < keys.length; i++) {
-      result.push(this.get(keys[i]));
+      result[i] = this.get(keys[i]);
     }
 
     return result
@@ -463,21 +467,18 @@ class FifoMap {
 
   set(key, value) {
     // Replace existing item
-    if (this.items.has(key)) {
-      const item = this.items.get(key);
-      item.value = value;
-
-      item.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
+    const existing = this.items.get(key);
 
-      if (this.last !== item) {
-        this.bumpLru(item);
-      }
+    if (existing !== undefined) {
+      existing.value = value;
+      existing.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
+      this.bumpLru(existing);
 
       return
     }
 
     // Add new item
-    if (this.max > 0 && this.size === this.max) {
+    if (this.max > 0 && this.size >= this.max) {
       this.evict();
     }
 
@@ -500,13 +501,7 @@ class FifoMap {
   }
 }class LruObject {
   constructor(max = 1000, ttlInMsecs = 0) {
-    if (isNaN(max) || max < 0) {
-      throw new Error('Invalid max value')
-    }
-
-    if (isNaN(ttlInMsecs) || ttlInMsecs < 0) {
-      throw new Error('Invalid ttl value')
-    }
+    validateCacheParams(max, ttlInMsecs);
 
     this.first = null;
     this.items = Object.create(null);
@@ -537,6 +532,7 @@ class FifoMap {
       prev.next = next;
     }
 
+    /* v8 ignore next 3 -- next is always non-null here: the early return above guarantees item !== this.last in a well-formed list */
     if (next !== null) {
       next.prev = prev;
     }
@@ -552,9 +548,9 @@ class FifoMap {
   }
 
   delete(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const item = this.items[key];
+    const item = this.items[key];
 
+    if (item !== undefined) {
       delete this.items[key];
       this.size--;
 
@@ -599,15 +595,17 @@ class FifoMap {
   }
 
   expiresAt(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      return this.items[key].expiry
+    const item = this.items[key];
+
+    if (item !== undefined) {
+      return item.expiry
     }
   }
 
   get(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const item = this.items[key];
+    const item = this.items[key];
 
+    if (item !== undefined) {
       // Item has already expired
       if (this.ttl > 0 && item.expiry <= Date.now()) {
         this.delete(key);
@@ -621,10 +619,10 @@ class FifoMap {
   }
 
   getMany(keys) {
-    const result = [];
+    const result = new Array(keys.length);
 
     for (var i = 0; i < keys.length; i++) {
-      result.push(this.get(keys[i]));
+      result[i] = this.get(keys[i]);
     }
 
     return result
@@ -636,21 +634,18 @@ class FifoMap {
 
   set(key, value) {
     // Replace existing item
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const item = this.items[key];
-      item.value = value;
+    const existing = this.items[key];
 
-      item.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
-
-      if (this.last !== item) {
-        this.bumpLru(item);
-      }
+    if (existing !== undefined) {
+      existing.value = value;
+      existing.expiry = this.ttl > 0 ? Date.now() + this.ttl : this.ttl;
+      this.bumpLru(existing);
 
       return
     }
 
     // Add new item
-    if (this.max > 0 && this.size === this.max) {
+    if (this.max > 0 && this.size >= this.max) {
       this.evict();
     }
 
@@ -688,32 +683,24 @@ function getTimestamp(date) {
 
     this.collectionStart = new Date();
     this.currentTimeStamp = getTimestamp(this.collectionStart);
+    this.archiveAfter = this.collectionStart.getTime() + this.statisticTtlInHours * 3_600_000;
 
     this.records = globalStatisticsRecord || new HitStatisticsRecord();
     this.records.initForCache(this.cacheId, this.currentTimeStamp);
   }
 
   get currentRecord() {
+    const cacheRecords = this.records.records[this.cacheId];
     // safety net
-    /* c8 ignore next 14 */
-    if (!this.records.records[this.cacheId][this.currentTimeStamp]) {
-      this.records.records[this.cacheId][this.currentTimeStamp] = {
-        cacheSize: 0,
-        hits: 0,
-        falsyHits: 0,
-        emptyHits: 0,
-        misses: 0,
-        expirations: 0,
-        evictions: 0,
-        sets: 0,
-        invalidateOne: 0,
-        invalidateAll: 0,
-      };
+    /* c8 ignore next 3 */
+    if (!cacheRecords[this.currentTimeStamp]) {
+      cacheRecords[this.currentTimeStamp] = createEmptyStatisticsRecord();
     }
 
-    return this.records.records[this.cacheId][this.currentTimeStamp]
+    return cacheRecords[this.currentTimeStamp]
   }
 
+  /* v8 ignore next 3 -- kept for compatibility, no longer used internally */
   hoursPassed() {
     return (Date.now() - this.collectionStart) / 1000 / 60 / 60
   }
@@ -772,15 +759,19 @@ function getTimestamp(date) {
   }
 
   archiveIfNeeded() {
-    if (this.hoursPassed() >= this.statisticTtlInHours) {
+    if (Date.now() >= this.archiveAfter) {
       this.collectionStart = new Date();
       this.currentTimeStamp = getTimestamp(this.collectionStart);
+      this.archiveAfter = this.collectionStart.getTime() + this.statisticTtlInHours * 3_600_000;
       this.records.initForCache(this.cacheId, this.currentTimeStamp);
     }
   }
 }class LruObjectHitStatistics extends LruObject {
   constructor(max, ttlInMsecs, cacheId, globalStatisticsRecord, statisticTtlInHours) {
-    super(max || 1000, ttlInMsecs || 0);
+    // Pass through as-is: the base constructor applies the 1000/0 defaults for
+    // omitted (undefined) values and validates everything else, so explicit 0
+    // stays unlimited and null/NaN are rejected the same way as the base class.
+    super(max, ttlInMsecs);
 
     if (!cacheId) {
       throw new Error('Cache id is mandatory')
@@ -804,15 +795,19 @@ function getTimestamp(date) {
   }
 
   evict() {
+    const hadItems = this.size > 0;
     super.evict();
-    this.hitStatistics.addEviction();
+    if (hadItems) {
+      this.hitStatistics.addEviction();
+    }
     this.hitStatistics.setCacheSize(this.size);
   }
 
   delete(key, isExpiration = false) {
+    const existed = this.items[key] !== undefined;
     super.delete(key);
 
-    if (!isExpiration) {
+    if (existed && !isExpiration) {
       this.hitStatistics.addInvalidateOne();
     }
     this.hitStatistics.setCacheSize(this.size);
@@ -826,9 +821,9 @@ function getTimestamp(date) {
   }
 
   get(key) {
-    if (Object.prototype.hasOwnProperty.call(this.items, key)) {
-      const item = this.items[key];
+    const item = this.items[key];
 
+    if (item !== undefined) {
       // Item has already expired
       if (this.ttl > 0 && item.expiry <= Date.now()) {
         this.delete(key, true);
@@ -840,9 +835,10 @@ function getTimestamp(date) {
       this.bumpLru(item);
       if (!item.value) {
         this.hitStatistics.addFalsyHit();
-      }
-      if (item.value === undefined || item.value === null || item.value === '') {
-        this.hitStatistics.addEmptyHit();
+        // Empty values are a subset of falsy values
+        if (item.value === undefined || item.value === null || item.value === '') {
+          this.hitStatistics.addEmptyHit();
+        }
       }
       this.hitStatistics.addHit();
       return item.value

package/node_modules/toad-cache/package.json

@@ -1,7 +1,7 @@
 {
   "name": "toad-cache",
   "description": "LRU and FIFO caches for Client or Server",
-  "version": "3.7.1",
+  "version": "3.7.4",
   "homepage": "https://github.com/kibertoad/toad-cache",
   "author": "Igor Savin <kibertoad@gmail.com>",
   "repository": {
@@ -41,20 +41,20 @@
   "devEngines": {
     "runtime": {
       "name": "node",
-      "version": ">=20",
+      "version": ">=22.13",
       "onFail": "error"
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.15",
-    "@vitest/coverage-v8": "^4.1.6",
-    "auto-changelog": "^2.5.0",
+    "@biomejs/biome": "^2.5.2",
+    "@vitest/coverage-v8": "^4.1.9",
+    "auto-changelog": "^2.6.0",
     "del-cli": "^7.0.0",
     "precise": "^5.0.1",
-    "rollup": "^4.60.4",
+    "rollup": "^4.62.2",
     "tsd": "^0.33.0",
     "typescript": "~6.0.3",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.9"
   },
   "keywords": [
     "LRU",
@@ -76,7 +76,7 @@
     "lint:fix": "biome check --apply index.js benchmark.js src test biome.json",
     "rollup": "rollup --config",
     "test": "vitest",
-    "test:coverage": "pnpm run rollup && pnpm run test -- --coverage",
+    "test:coverage": "pnpm run rollup && vitest --coverage",
     "test:ci": "pnpm run lint && pnpm run test:coverage && pnpm run test:typescript",
     "test:typescript": "tsd",
     "types:generate": "pnpm exec tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir ."

package/node_modules/toad-cache/toad-cache.d.cts

@@ -8,6 +8,19 @@ type CacheEntry<T> = {
     value: T
 }
 
+type CacheStatistics = {
+    expirations: number,
+    evictions: number,
+    hits: number,
+    emptyHits: number,
+    falsyHits: number,
+    misses: number,
+    invalidateAll: number,
+    invalidateOne: number,
+    cacheSize: number,
+    sets: number,
+}
+
 interface ToadCache<T> {
     first: any;
     last: any;
@@ -28,7 +41,7 @@ interface ToadCache<T> {
 declare class FifoMap<T> implements ToadCache<T>{
     constructor(max?: number, ttlInMsecs?: number);
     first: any;
-    items: Map<any, T>;
+    items: Map<any, CacheEntry<T>>;
     last: any;
     max: number;
     ttl: number;
@@ -66,7 +79,7 @@ declare class FifoObject<T> implements ToadCache<T> {
 declare class LruMap<T> implements ToadCache<T> {
     constructor(max?: number, ttlInMsecs?: number);
     first: any;
-    items: Map<any, T>;
+    items: Map<any, CacheEntry<T>>;
     last: any;
     max: number;
     ttl: number;
@@ -103,29 +116,22 @@ declare class LruObject<T> implements ToadCache<T> {
 }
 
 declare class HitStatisticsRecord {
-    records: Record<string, Record<string, {
-        expirations: number,
-        evictions: number,
-        hits: number,
-        emptyHits: number,
-        falsyHits: number,
-        misses: number,
-        invalidateAll: number,
-        invalidateOne: number,
-        cacheSize: number,
-        sets: number,
-    }>>
+    records: Record<string, Record<string, CacheStatistics>>
 
     initForCache(cacheId: string, currentTimeStamp: string): void
     resetForCache(cacheId: string): void
+    getStatistics(): Record<string, Record<string, CacheStatistics>>
 }
 
 declare class LruObjectHitStatistics<T> extends LruObject<T>{
     constructor(max?: number, ttlInMsecs?: number, cacheId?: string, globalStatisticsRecord?: HitStatisticsRecord, statisticTtlInHours?: number);
+    getStatistics(): Record<string, Record<string, CacheStatistics>>
 }
 
 export {
     CacheConstructor,
+    CacheEntry,
+    CacheStatistics,
     ToadCache,
     LruObject,
     LruMap,