@catbee/utils 2.0.3 → 2.0.5

package/cache/index.cjs

@@ -33,6 +33,7 @@ var TTLCache = class {
     __name(this, "TTLCache");
   }
   cache = /* @__PURE__ */ new Map();
+  pending = /* @__PURE__ */ new Map();
   ttlMs;
   maxSize;
   cleanupInterval;
@@ -90,7 +91,7 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return void 0;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return void 0;
     }
@@ -102,17 +103,31 @@ var TTLCache = class {
   /**
   * Retrieves or computes a value if it's not in the cache or has expired.
   *
+  * Concurrent calls for the same key share the same producer promise,
+  * preventing duplicate computations while the value is being generated.
+  *
   * @param key - The key to retrieve
   * @param producer - Function to generate the value if not cached
   * @param ttlMs - Optional custom TTL for the computed value
   * @returns The cached or computed value
   */
   async getOrCompute(key, producer, ttlMs) {
-    const value = this.get(key);
-    if (value !== void 0) return value;
-    const newValue = await producer();
-    this.setWithTTL(key, newValue, ttlMs ?? this.ttlMs);
-    return newValue;
+    const cached = this.get(key);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const pending = this.pending.get(key);
+    if (pending) {
+      return pending;
+    }
+    const promise = Promise.resolve().then(producer).then((value) => {
+      this.setWithTTL(key, value, ttlMs ?? this.ttlMs);
+      return value;
+    }).finally(() => {
+      this.pending.delete(key);
+    });
+    this.pending.set(key, promise);
+    return promise;
   }
   /**
   * Checks if the key exists and hasn't expired.
@@ -174,7 +189,7 @@ var TTLCache = class {
     let removed = 0;
     const now = Date.now();
     for (const [key, entry] of this.cache.entries()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
         removed++;
       }
@@ -188,7 +203,7 @@ var TTLCache = class {
   */
   *entries() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield [
           key,
           entry.value
@@ -203,7 +218,7 @@ var TTLCache = class {
   */
   *keys() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield key;
       }
     }
@@ -215,7 +230,7 @@ var TTLCache = class {
   */
   *values() {
     for (const entry of this.cache.values()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield entry.value;
       }
     }
@@ -231,12 +246,14 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return false;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return false;
     }
     entry.expiresAt = now + (ttlMs ?? this.ttlMs);
     entry.lastAccessed = now;
+    this.cache.delete(key);
+    this.cache.set(key, entry);
     return true;
   }
   /**
@@ -249,7 +266,7 @@ var TTLCache = class {
     let expired = 0;
     let valid = 0;
     for (const entry of this.cache.values()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         expired++;
       } else {
         valid++;
@@ -277,14 +294,17 @@ var TTLCache = class {
   */
   evictLRU() {
     const now = Date.now();
-    for (const [key, entry] of Array.from(this.cache.entries())) {
-      if (now > entry.expiresAt) {
+    for (const [key, entry] of this.cache.entries()) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
       }
     }
     while (this.maxSize && this.cache.size > this.maxSize) {
-      const oldestKey = this.cache.keys().next().value;
-      this.cache.delete(oldestKey);
+      const next = this.cache.keys().next();
+      if (next.done) {
+        break;
+      }
+      this.cache.delete(next.value);
     }
   }
 };

package/cache/index.d.ts

@@ -41,11 +41,12 @@ interface TTLCacheOptions {
  *
  * @example
  * const cache = new TTLCache<string, number>({ ttlMs: 1000 });
- * cache.set("x", 123);
- * const value = cache.get("x"); // 123
+ * cache.set('x', 123);
+ * const value = cache.get('x'); // 123
  */
 declare class TTLCache<K, V> {
     private readonly cache;
+    private readonly pending;
     private readonly ttlMs;
     private readonly maxSize?;
     private cleanupInterval?;
@@ -78,6 +79,9 @@ declare class TTLCache<K, V> {
     /**
      * Retrieves or computes a value if it's not in the cache or has expired.
      *
+     * Concurrent calls for the same key share the same producer promise,
+     * preventing duplicate computations while the value is being generated.
+     *
      * @param key - The key to retrieve
      * @param producer - Function to generate the value if not cached
      * @param ttlMs - Optional custom TTL for the computed value

package/cache/index.mjs

@@ -31,6 +31,7 @@ var TTLCache = class {
     __name(this, "TTLCache");
   }
   cache = /* @__PURE__ */ new Map();
+  pending = /* @__PURE__ */ new Map();
   ttlMs;
   maxSize;
   cleanupInterval;
@@ -88,7 +89,7 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return void 0;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return void 0;
     }
@@ -100,17 +101,31 @@ var TTLCache = class {
   /**
   * Retrieves or computes a value if it's not in the cache or has expired.
   *
+  * Concurrent calls for the same key share the same producer promise,
+  * preventing duplicate computations while the value is being generated.
+  *
   * @param key - The key to retrieve
   * @param producer - Function to generate the value if not cached
   * @param ttlMs - Optional custom TTL for the computed value
   * @returns The cached or computed value
   */
   async getOrCompute(key, producer, ttlMs) {
-    const value = this.get(key);
-    if (value !== void 0) return value;
-    const newValue = await producer();
-    this.setWithTTL(key, newValue, ttlMs ?? this.ttlMs);
-    return newValue;
+    const cached = this.get(key);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const pending = this.pending.get(key);
+    if (pending) {
+      return pending;
+    }
+    const promise = Promise.resolve().then(producer).then((value) => {
+      this.setWithTTL(key, value, ttlMs ?? this.ttlMs);
+      return value;
+    }).finally(() => {
+      this.pending.delete(key);
+    });
+    this.pending.set(key, promise);
+    return promise;
   }
   /**
   * Checks if the key exists and hasn't expired.
@@ -172,7 +187,7 @@ var TTLCache = class {
     let removed = 0;
     const now = Date.now();
     for (const [key, entry] of this.cache.entries()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
         removed++;
       }
@@ -186,7 +201,7 @@ var TTLCache = class {
   */
   *entries() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield [
           key,
           entry.value
@@ -201,7 +216,7 @@ var TTLCache = class {
   */
   *keys() {
     for (const [key, entry] of this.cache.entries()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield key;
       }
     }
@@ -213,7 +228,7 @@ var TTLCache = class {
   */
   *values() {
     for (const entry of this.cache.values()) {
-      if (Date.now() <= entry.expiresAt) {
+      if (Date.now() < entry.expiresAt) {
         yield entry.value;
       }
     }
@@ -229,12 +244,14 @@ var TTLCache = class {
     const entry = this.cache.get(key);
     if (!entry) return false;
     const now = Date.now();
-    if (now > entry.expiresAt) {
+    if (now >= entry.expiresAt) {
       this.cache.delete(key);
       return false;
     }
     entry.expiresAt = now + (ttlMs ?? this.ttlMs);
     entry.lastAccessed = now;
+    this.cache.delete(key);
+    this.cache.set(key, entry);
     return true;
   }
   /**
@@ -247,7 +264,7 @@ var TTLCache = class {
     let expired = 0;
     let valid = 0;
     for (const entry of this.cache.values()) {
-      if (now > entry.expiresAt) {
+      if (now >= entry.expiresAt) {
         expired++;
       } else {
         valid++;
@@ -275,14 +292,17 @@ var TTLCache = class {
   */
   evictLRU() {
     const now = Date.now();
-    for (const [key, entry] of Array.from(this.cache.entries())) {
-      if (now > entry.expiresAt) {
+    for (const [key, entry] of this.cache.entries()) {
+      if (now >= entry.expiresAt) {
         this.cache.delete(key);
       }
     }
     while (this.maxSize && this.cache.size > this.maxSize) {
-      const oldestKey = this.cache.keys().next().value;
-      this.cache.delete(oldestKey);
+      const next = this.cache.keys().next();
+      if (next.done) {
+        break;
+      }
+      this.cache.delete(next.value);
     }
   }
 };

package/config/index.cjs

@@ -94,11 +94,6 @@ var defaultServerConfig = {
     exposeHeader: env.Env.getBoolean("SERVER_REQUEST_ID_EXPOSE_HEADER", true),
     generator: /* @__PURE__ */ __name(() => id.uuid(), "generator")
   },
-  metrics: {
-    enable: env.Env.getBoolean("SERVER_METRICS_ENABLE", false),
-    path: env.Env.get("SERVER_METRICS_PATH", "/metrics"),
-    withGlobalPrefix: env.Env.getBoolean("SERVER_METRICS_WITH_GLOBAL_PREFIX", false)
-  },
   serviceVersion: {
     enable: env.Env.getBoolean("SERVER_SERVICE_VERSION_ENABLE", false),
     headerName: env.Env.get("SERVER_SERVICE_VERSION_HEADER_NAME", "x-service-version"),

package/config/index.mjs

@@ -92,11 +92,6 @@ var defaultServerConfig = {
     exposeHeader: Env.getBoolean("SERVER_REQUEST_ID_EXPOSE_HEADER", true),
     generator: /* @__PURE__ */ __name(() => uuid(), "generator")
   },
-  metrics: {
-    enable: Env.getBoolean("SERVER_METRICS_ENABLE", false),
-    path: Env.get("SERVER_METRICS_PATH", "/metrics"),
-    withGlobalPrefix: Env.getBoolean("SERVER_METRICS_WITH_GLOBAL_PREFIX", false)
-  },
   serviceVersion: {
     enable: Env.getBoolean("SERVER_SERVICE_VERSION_ENABLE", false),
     headerName: Env.get("SERVER_SERVICE_VERSION_HEADER_NAME", "x-service-version"),

package/crypto/index.cjs

@@ -457,8 +457,16 @@ function generateNonce(byteLength = 16, encoding = "hex") {
 }
 __name(generateNonce, "generateNonce");
 function secureRandomInt(min, max) {
-  if (min > max) throw new Error("min must be less than or equal to max");
+  if (!Number.isSafeInteger(min) || !Number.isSafeInteger(max)) {
+    throw new TypeError("min and max must be safe integers");
+  }
+  if (min > max) {
+    throw new RangeError("min must be less than or equal to max");
+  }
   const range = max - min + 1;
+  if (!Number.isSafeInteger(range) || range <= 0) {
+    throw new RangeError("Range is too large");
+  }
   const bytesNeeded = Math.ceil(Math.log2(range) / 8);
   const maxValid = Math.floor(256 ** bytesNeeded / range) * range;
   let randomValue;

package/crypto/index.mjs

@@ -455,8 +455,16 @@ function generateNonce(byteLength = 16, encoding = "hex") {
 }
 __name(generateNonce, "generateNonce");
 function secureRandomInt(min, max) {
-  if (min > max) throw new Error("min must be less than or equal to max");
+  if (!Number.isSafeInteger(min) || !Number.isSafeInteger(max)) {
+    throw new TypeError("min and max must be safe integers");
+  }
+  if (min > max) {
+    throw new RangeError("min must be less than or equal to max");
+  }
   const range = max - min + 1;
+  if (!Number.isSafeInteger(range) || range <= 0) {
+    throw new RangeError("Range is too large");
+  }
   const bytesNeeded = Math.ceil(Math.log2(range) / 8);
   const maxValid = Math.floor(256 ** bytesNeeded / range) * range;
   let randomValue;

package/date/index.cjs

@@ -575,6 +575,278 @@ function getTimeZoneParts(date, timeZone) {
   };
 }
 __name(getTimeZoneParts, "getTimeZoneParts");
+var COUNTRY_CODES = [
+  "AD",
+  "AE",
+  "AF",
+  "AG",
+  "AI",
+  "AL",
+  "AM",
+  "AO",
+  "AQ",
+  "AR",
+  "AS",
+  "AT",
+  "AU",
+  "AW",
+  "AX",
+  "AZ",
+  "BA",
+  "BB",
+  "BD",
+  "BE",
+  "BF",
+  "BG",
+  "BH",
+  "BI",
+  "BJ",
+  "BL",
+  "BM",
+  "BN",
+  "BO",
+  "BQ",
+  "BR",
+  "BS",
+  "BT",
+  "BV",
+  "BW",
+  "BY",
+  "BZ",
+  "CA",
+  "CC",
+  "CD",
+  "CF",
+  "CG",
+  "CH",
+  "CI",
+  "CK",
+  "CL",
+  "CM",
+  "CN",
+  "CO",
+  "CR",
+  "CU",
+  "CV",
+  "CW",
+  "CX",
+  "CY",
+  "CZ",
+  "DE",
+  "DJ",
+  "DK",
+  "DM",
+  "DO",
+  "DZ",
+  "EC",
+  "EE",
+  "EG",
+  "EH",
+  "ER",
+  "ES",
+  "ET",
+  "FI",
+  "FJ",
+  "FK",
+  "FM",
+  "FO",
+  "FR",
+  "GA",
+  "GB",
+  "GD",
+  "GE",
+  "GF",
+  "GG",
+  "GH",
+  "GI",
+  "GL",
+  "GM",
+  "GN",
+  "GP",
+  "GQ",
+  "GR",
+  "GS",
+  "GT",
+  "GU",
+  "GW",
+  "GY",
+  "HK",
+  "HM",
+  "HN",
+  "HR",
+  "HT",
+  "HU",
+  "ID",
+  "IE",
+  "IL",
+  "IM",
+  "IN",
+  "IO",
+  "IQ",
+  "IR",
+  "IS",
+  "IT",
+  "JE",
+  "JM",
+  "JO",
+  "JP",
+  "KE",
+  "KG",
+  "KH",
+  "KI",
+  "KM",
+  "KN",
+  "KP",
+  "KR",
+  "KW",
+  "KY",
+  "KZ",
+  "LA",
+  "LB",
+  "LC",
+  "LI",
+  "LK",
+  "LR",
+  "LS",
+  "LT",
+  "LU",
+  "LV",
+  "LY",
+  "MA",
+  "MC",
+  "MD",
+  "ME",
+  "MF",
+  "MG",
+  "MH",
+  "MK",
+  "ML",
+  "MM",
+  "MN",
+  "MO",
+  "MP",
+  "MQ",
+  "MR",
+  "MS",
+  "MT",
+  "MU",
+  "MV",
+  "MW",
+  "MX",
+  "MY",
+  "MZ",
+  "NA",
+  "NC",
+  "NE",
+  "NF",
+  "NG",
+  "NI",
+  "NL",
+  "NO",
+  "NP",
+  "NR",
+  "NU",
+  "NZ",
+  "OM",
+  "PA",
+  "PE",
+  "PF",
+  "PG",
+  "PH",
+  "PK",
+  "PL",
+  "PM",
+  "PN",
+  "PR",
+  "PS",
+  "PT",
+  "PW",
+  "PY",
+  "QA",
+  "RE",
+  "RO",
+  "RS",
+  "RU",
+  "RW",
+  "SA",
+  "SB",
+  "SC",
+  "SD",
+  "SE",
+  "SG",
+  "SH",
+  "SI",
+  "SJ",
+  "SK",
+  "SL",
+  "SM",
+  "SN",
+  "SO",
+  "SR",
+  "SS",
+  "ST",
+  "SV",
+  "SX",
+  "SY",
+  "SZ",
+  "TC",
+  "TD",
+  "TF",
+  "TG",
+  "TH",
+  "TJ",
+  "TK",
+  "TL",
+  "TM",
+  "TN",
+  "TO",
+  "TR",
+  "TT",
+  "TV",
+  "TW",
+  "TZ",
+  "UA",
+  "UG",
+  "UM",
+  "US",
+  "UY",
+  "UZ",
+  "VA",
+  "VC",
+  "VE",
+  "VG",
+  "VI",
+  "VN",
+  "VU",
+  "WF",
+  "WS",
+  "YE",
+  "YT",
+  "ZA",
+  "ZM",
+  "ZW"
+];
+function getCountries(locale = "en") {
+  const regionNames = new Intl.DisplayNames([
+    locale
+  ], {
+    type: "region"
+  });
+  return COUNTRY_CODES.map((code) => ({
+    code,
+    name: regionNames.of(code)
+  }));
+}
+__name(getCountries, "getCountries");
+var SUPPORTED_TIMEZONE_NAMES = Intl.supportedValuesOf("timeZone");
+var TIMEZONE_NAMES = SUPPORTED_TIMEZONE_NAMES.includes("UTC") ? SUPPORTED_TIMEZONE_NAMES : [
+  ...SUPPORTED_TIMEZONE_NAMES,
+  "UTC"
+].sort((a, b) => a.localeCompare(b));
+function getTimezones() {
+  return TIMEZONE_NAMES;
+}
+__name(getTimezones, "getTimezones");
 
 // src/date/date.builder.ts
 var DateBuilder = class _DateBuilder {
@@ -1179,7 +1451,9 @@ var DateBuilder = class _DateBuilder {
   }
 };
 
+exports.COUNTRY_CODES = COUNTRY_CODES;
 exports.DateBuilder = DateBuilder;
+exports.TIMEZONE_NAMES = TIMEZONE_NAMES;
 exports.addDays = addDays;
 exports.addMonths = addMonths;
 exports.addToDate = addToDate;
@@ -1192,9 +1466,11 @@ exports.formatDate = formatDate;
 exports.formatDateInTimeZone = formatDateInTimeZone;
 exports.formatDuration = formatDuration;
 exports.formatRelativeTime = formatRelativeTime;
+exports.getCountries = getCountries;
 exports.getDateFromDuration = getDateFromDuration;
 exports.getTimezoneAbbreviation = getTimezoneAbbreviation;
 exports.getTimezoneOffset = getTimezoneOffset;
+exports.getTimezones = getTimezones;
 exports.isBetween = isBetween;
 exports.isDST = isDST;
 exports.isFuture = isFuture;