@ls-stack/utils 2.12.0 → 2.13.0

package/dist/cache.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cache_exports = {};
 __export(cache_exports, {
   RejectValue: () => RejectValue,
+  WithExpiration: () => WithExpiration,
   cachedGetter: () => cachedGetter,
   createCache: () => createCache
 });
@@ -34,6 +35,22 @@ function isPromise(value) {
   return isObject(value) && "then" in value;
 }
 
+// src/time.ts
+var MINUTE_AS_MS = 60 * 1e3;
+var HOUR_AS_MS = 60 * MINUTE_AS_MS;
+var DAY_AS_MS = 24 * HOUR_AS_MS;
+var WEEK_AS_MS = 7 * DAY_AS_MS;
+var MONTH_AS_MS = 30 * DAY_AS_MS;
+var YEAR_AS_MS = 365 * DAY_AS_MS;
+var HOUR_AS_SECS = 60 * 60;
+var DAY_AS_SECS = 24 * HOUR_AS_SECS;
+var WEEK_AS_SECS = 7 * DAY_AS_SECS;
+var MONTH_AS_SECS = 30 * DAY_AS_SECS;
+var YEAR_AS_SECS = 365 * DAY_AS_SECS;
+function durationObjToMs(durationObj) {
+  return (durationObj.hours ?? 0) * HOUR_AS_MS + (durationObj.minutes ?? 0) * MINUTE_AS_MS + (durationObj.seconds ?? 0) * 1e3 + (durationObj.ms ?? 0) + (durationObj.days ?? 0) * DAY_AS_MS;
+}
+
 // src/cache.ts
 function cachedGetter(getter) {
   return {
@@ -50,6 +67,18 @@ var RejectValue = class {
     this.value = value;
   }
 };
+var WithExpiration = class {
+  value;
+  expiration;
+  /**
+   * @param value - The value to store in the cache.
+   * @param expiration - The expiration time of the value in seconds or a duration object.
+   */
+  constructor(value, expiration) {
+    this.value = value;
+    this.expiration = durationObjToMs(expiration);
+  }
+};
 function createCache({
   maxCacheSize = 1e3,
   maxItemAge,
@@ -57,13 +86,14 @@ function createCache({
 } = {}) {
   const cache = /* @__PURE__ */ new Map();
   let lastExpirationCheck = 0;
+  const defaultMaxItemAgeMs = maxItemAge && durationObjToMs(maxItemAge);
   function cleanExpiredItems() {
     const now = Date.now();
-    if (!maxItemAge || now - lastExpirationCheck < expirationThrottle) return;
+    if (!defaultMaxItemAgeMs || now - lastExpirationCheck < expirationThrottle)
+      return;
     lastExpirationCheck = now;
-    const maxAgeMs = maxItemAge * 1e3;
     for (const [key, item] of cache.entries()) {
-      if (now - item.timestamp > maxAgeMs) {
+      if (isExpired(item, now)) {
         cache.delete(key);
       }
     }
@@ -81,25 +111,40 @@ function createCache({
       }
     }
   }
-  function isExpired(timestamp, now) {
-    return maxItemAge !== void 0 && now - timestamp > maxItemAge * 1e3;
+  function isExpired(entry, now) {
+    const maxItemAgeMs = entry.expiration ?? defaultMaxItemAgeMs;
+    return !!maxItemAgeMs && now - entry.timestamp > maxItemAgeMs;
+  }
+  function unwrapValue(value, now) {
+    if (value instanceof WithExpiration) {
+      return {
+        value: value.value,
+        timestamp: now,
+        expiration: value.expiration ? typeof value.expiration === "number" ? value.expiration : now + durationObjToMs(value.expiration) : void 0
+      };
+    }
+    return { value, timestamp: now, expiration: void 0 };
   }
   const utils = {
-    reject: (value) => new RejectValue(value)
+    reject: (value) => new RejectValue(value),
+    withExpiration: (value, expiration) => {
+      return new WithExpiration(value, expiration);
+    }
   };
   return {
     getOrInsert(cacheKey, val) {
       const now = Date.now();
       const entry = cache.get(cacheKey);
-      if (!entry || isExpired(entry.timestamp, now)) {
+      if (!entry || isExpired(entry, now)) {
         const value = val(utils);
         if (value instanceof RejectValue) {
           return value.value;
         }
-        cache.set(cacheKey, { value, timestamp: now });
+        const unwrappedValue = unwrapValue(value, now);
+        cache.set(cacheKey, unwrappedValue);
         trimToSize();
         cleanExpiredItems();
-        return value;
+        return unwrappedValue.value;
       }
       if (isPromise(entry.value)) {
         throw new Error(
@@ -114,7 +159,7 @@ function createCache({
         return entry.value;
       }
       const now = Date.now();
-      if (entry && !isExpired(entry.timestamp, now)) {
+      if (entry && !isExpired(entry, now)) {
         return entry.value;
       }
       const promise = val(utils).then((result) => {
@@ -125,13 +170,18 @@ function createCache({
           }
           return result.value;
         }
-        cache.set(cacheKey, { value: result, timestamp: Date.now() });
-        return result;
+        const unwrappedValue = unwrapValue(result, Date.now());
+        cache.set(cacheKey, unwrappedValue);
+        return unwrappedValue.value;
       }).catch((error) => {
         cache.delete(cacheKey);
         throw error;
       });
-      cache.set(cacheKey, { value: promise, timestamp: now });
+      cache.set(cacheKey, {
+        value: promise,
+        timestamp: now,
+        expiration: void 0
+      });
       trimToSize();
       cleanExpiredItems();
       return promise;
@@ -141,7 +191,7 @@ function createCache({
     },
     get(cacheKey) {
       const entry = cache.get(cacheKey);
-      if (!entry || isExpired(entry.timestamp, Date.now())) {
+      if (!entry || isExpired(entry, Date.now())) {
         return void 0;
       }
       if (isPromise(entry.value)) {
@@ -150,28 +200,41 @@ function createCache({
       return entry.value;
     },
     set(cacheKey, value) {
-      cache.set(cacheKey, { value, timestamp: Date.now() });
+      cache.set(cacheKey, unwrapValue(value, Date.now()));
       trimToSize();
       cleanExpiredItems();
     },
     async getAsync(cacheKey) {
       const entry = cache.get(cacheKey);
-      if (!entry || isExpired(entry.timestamp, Date.now())) {
+      if (!entry || isExpired(entry, Date.now())) {
         return void 0;
       }
-      return await entry.value;
+      return entry.value;
     },
-    setAsync(cacheKey, value) {
-      const promise = value().then((result) => {
-        cache.set(cacheKey, { value: result, timestamp: Date.now() });
-        return result;
+    async setAsync(cacheKey, value) {
+      const promise = value(utils).then((result) => {
+        if (result instanceof RejectValue) {
+          const cacheValue = cache.get(cacheKey);
+          if (cacheValue?.value === promise) {
+            cache.delete(cacheKey);
+          }
+          return result.value;
+        }
+        const unwrappedValue = unwrapValue(result, Date.now());
+        cache.set(cacheKey, unwrappedValue);
+        return unwrappedValue.value;
       }).catch((error) => {
         cache.delete(cacheKey);
         throw error;
       });
-      cache.set(cacheKey, { value: promise, timestamp: Date.now() });
+      cache.set(cacheKey, {
+        value: promise,
+        timestamp: Date.now(),
+        expiration: void 0
+      });
       trimToSize();
       cleanExpiredItems();
+      return promise;
     },
     cleanExpiredItems,
     /** @internal */
@@ -181,6 +244,7 @@ function createCache({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RejectValue,
+  WithExpiration,
   cachedGetter,
   createCache
 });

package/dist/cache.d.cts

@@ -1,3 +1,5 @@
+import { DurationObj } from './time.cjs';
+
 declare function cachedGetter<T>(getter: () => T): {
     value: T;
 };
@@ -8,9 +10,9 @@ type Options = {
      */
     maxCacheSize?: number;
     /**
-     * The maximum age of items in the cache in seconds.
+     * The maximum age of items in the cache.
      */
-    maxItemAge?: number;
+    maxItemAge?: DurationObj;
     /**
      * The throttle for checking expired items in milliseconds.
      * @default
@@ -22,19 +24,33 @@ declare class RejectValue<T> {
     value: T;
     constructor(value: T);
 }
+declare class WithExpiration<T> {
+    value: T;
+    expiration: number;
+    /**
+     * @param value - The value to store in the cache.
+     * @param expiration - The expiration time of the value in seconds or a duration object.
+     */
+    constructor(value: T, expiration: DurationObj);
+}
+type Utils<T> = {
+    reject: (value: T) => RejectValue<T>;
+    /**
+     * Create a new WithExpiration object with the given value and expiration time.
+     * @param value - The value to store in the cache.
+     * @param expiration - The expiration time of the value in seconds or a duration object.
+     */
+    withExpiration: (value: T, expiration: DurationObj) => WithExpiration<T>;
+};
 type Cache<T> = {
-    getOrInsert: (cacheKey: string, val: (utils: {
-        reject: (value: T) => RejectValue<T>;
-    }) => T | RejectValue<T>) => T;
-    getOrInsertAsync: (cacheKey: string, val: (utils: {
-        reject: (value: T) => RejectValue<T>;
-    }) => Promise<T | RejectValue<T>>) => Promise<T>;
+    getOrInsert: (cacheKey: string, val: (utils: Utils<T>) => T | RejectValue<T>) => T;
+    getOrInsertAsync: (cacheKey: string, val: (utils: Utils<T>) => Promise<T | RejectValue<T>>) => Promise<T>;
     clear: () => void;
     get: (cacheKey: string) => T | undefined;
-    set: (cacheKey: string, value: T) => void;
+    set: (cacheKey: string, value: T | WithExpiration<T>) => void;
     cleanExpiredItems: () => void;
     getAsync: (cacheKey: string) => Promise<T | undefined>;
-    setAsync: (cacheKey: string, value: () => Promise<T>) => void;
+    setAsync: (cacheKey: string, value: (utils: Utils<T>) => Promise<T | WithExpiration<T>>) => Promise<T>;
     [' cache']: {
         map: Map<string, {
             value: T | Promise<T>;
@@ -44,4 +60,4 @@ type Cache<T> = {
 };
 declare function createCache<T>({ maxCacheSize, maxItemAge, expirationThrottle, }?: Options): Cache<T>;
 
-export { type Cache, RejectValue, cachedGetter, createCache };
+export { type Cache, RejectValue, WithExpiration, cachedGetter, createCache };

package/dist/cache.d.ts

@@ -1,3 +1,5 @@
+import { DurationObj } from './time.js';
+
 declare function cachedGetter<T>(getter: () => T): {
     value: T;
 };
@@ -8,9 +10,9 @@ type Options = {
      */
     maxCacheSize?: number;
     /**
-     * The maximum age of items in the cache in seconds.
+     * The maximum age of items in the cache.
      */
-    maxItemAge?: number;
+    maxItemAge?: DurationObj;
     /**
      * The throttle for checking expired items in milliseconds.
      * @default
@@ -22,19 +24,33 @@ declare class RejectValue<T> {
     value: T;
     constructor(value: T);
 }
+declare class WithExpiration<T> {
+    value: T;
+    expiration: number;
+    /**
+     * @param value - The value to store in the cache.
+     * @param expiration - The expiration time of the value in seconds or a duration object.
+     */
+    constructor(value: T, expiration: DurationObj);
+}
+type Utils<T> = {
+    reject: (value: T) => RejectValue<T>;
+    /**
+     * Create a new WithExpiration object with the given value and expiration time.
+     * @param value - The value to store in the cache.
+     * @param expiration - The expiration time of the value in seconds or a duration object.
+     */
+    withExpiration: (value: T, expiration: DurationObj) => WithExpiration<T>;
+};
 type Cache<T> = {
-    getOrInsert: (cacheKey: string, val: (utils: {
-        reject: (value: T) => RejectValue<T>;
-    }) => T | RejectValue<T>) => T;
-    getOrInsertAsync: (cacheKey: string, val: (utils: {
-        reject: (value: T) => RejectValue<T>;
-    }) => Promise<T | RejectValue<T>>) => Promise<T>;
+    getOrInsert: (cacheKey: string, val: (utils: Utils<T>) => T | RejectValue<T>) => T;
+    getOrInsertAsync: (cacheKey: string, val: (utils: Utils<T>) => Promise<T | RejectValue<T>>) => Promise<T>;
     clear: () => void;
     get: (cacheKey: string) => T | undefined;
-    set: (cacheKey: string, value: T) => void;
+    set: (cacheKey: string, value: T | WithExpiration<T>) => void;
     cleanExpiredItems: () => void;
     getAsync: (cacheKey: string) => Promise<T | undefined>;
-    setAsync: (cacheKey: string, value: () => Promise<T>) => void;
+    setAsync: (cacheKey: string, value: (utils: Utils<T>) => Promise<T | WithExpiration<T>>) => Promise<T>;
     [' cache']: {
         map: Map<string, {
             value: T | Promise<T>;
@@ -44,4 +60,4 @@ type Cache<T> = {
 };
 declare function createCache<T>({ maxCacheSize, maxItemAge, expirationThrottle, }?: Options): Cache<T>;
 
-export { type Cache, RejectValue, cachedGetter, createCache };
+export { type Cache, RejectValue, WithExpiration, cachedGetter, createCache };

package/dist/cache.js

@@ -1,6 +1,11 @@
+import {
+  durationObjToMs
+} from "./chunk-RK6PT7JY.js";
+import "./chunk-HTCYUMDR.js";
 import {
   isPromise
 } from "./chunk-4UGSP3L3.js";
+import "./chunk-GBFS2I67.js";
 
 // src/cache.ts
 function cachedGetter(getter) {
@@ -18,6 +23,18 @@ var RejectValue = class {
     this.value = value;
   }
 };
+var WithExpiration = class {
+  value;
+  expiration;
+  /**
+   * @param value - The value to store in the cache.
+   * @param expiration - The expiration time of the value in seconds or a duration object.
+   */
+  constructor(value, expiration) {
+    this.value = value;
+    this.expiration = durationObjToMs(expiration);
+  }
+};
 function createCache({
   maxCacheSize = 1e3,
   maxItemAge,
@@ -25,13 +42,14 @@ function createCache({
 } = {}) {
   const cache = /* @__PURE__ */ new Map();
   let lastExpirationCheck = 0;
+  const defaultMaxItemAgeMs = maxItemAge && durationObjToMs(maxItemAge);
   function cleanExpiredItems() {
     const now = Date.now();
-    if (!maxItemAge || now - lastExpirationCheck < expirationThrottle) return;
+    if (!defaultMaxItemAgeMs || now - lastExpirationCheck < expirationThrottle)
+      return;
     lastExpirationCheck = now;
-    const maxAgeMs = maxItemAge * 1e3;
     for (const [key, item] of cache.entries()) {
-      if (now - item.timestamp > maxAgeMs) {
+      if (isExpired(item, now)) {
         cache.delete(key);
       }
     }
@@ -49,25 +67,40 @@ function createCache({
       }
     }
   }
-  function isExpired(timestamp, now) {
-    return maxItemAge !== void 0 && now - timestamp > maxItemAge * 1e3;
+  function isExpired(entry, now) {
+    const maxItemAgeMs = entry.expiration ?? defaultMaxItemAgeMs;
+    return !!maxItemAgeMs && now - entry.timestamp > maxItemAgeMs;
+  }
+  function unwrapValue(value, now) {
+    if (value instanceof WithExpiration) {
+      return {
+        value: value.value,
+        timestamp: now,
+        expiration: value.expiration ? typeof value.expiration === "number" ? value.expiration : now + durationObjToMs(value.expiration) : void 0
+      };
+    }
+    return { value, timestamp: now, expiration: void 0 };
   }
   const utils = {
-    reject: (value) => new RejectValue(value)
+    reject: (value) => new RejectValue(value),
+    withExpiration: (value, expiration) => {
+      return new WithExpiration(value, expiration);
+    }
   };
   return {
     getOrInsert(cacheKey, val) {
       const now = Date.now();
       const entry = cache.get(cacheKey);
-      if (!entry || isExpired(entry.timestamp, now)) {
+      if (!entry || isExpired(entry, now)) {
         const value = val(utils);
         if (value instanceof RejectValue) {
           return value.value;
         }
-        cache.set(cacheKey, { value, timestamp: now });
+        const unwrappedValue = unwrapValue(value, now);
+        cache.set(cacheKey, unwrappedValue);
         trimToSize();
         cleanExpiredItems();
-        return value;
+        return unwrappedValue.value;
       }
       if (isPromise(entry.value)) {
         throw new Error(
@@ -82,7 +115,7 @@ function createCache({
         return entry.value;
       }
       const now = Date.now();
-      if (entry && !isExpired(entry.timestamp, now)) {
+      if (entry && !isExpired(entry, now)) {
         return entry.value;
       }
       const promise = val(utils).then((result) => {
@@ -93,13 +126,18 @@ function createCache({
           }
           return result.value;
         }
-        cache.set(cacheKey, { value: result, timestamp: Date.now() });
-        return result;
+        const unwrappedValue = unwrapValue(result, Date.now());
+        cache.set(cacheKey, unwrappedValue);
+        return unwrappedValue.value;
       }).catch((error) => {
         cache.delete(cacheKey);
         throw error;
       });
-      cache.set(cacheKey, { value: promise, timestamp: now });
+      cache.set(cacheKey, {
+        value: promise,
+        timestamp: now,
+        expiration: void 0
+      });
       trimToSize();
       cleanExpiredItems();
       return promise;
@@ -109,7 +147,7 @@ function createCache({
     },
     get(cacheKey) {
       const entry = cache.get(cacheKey);
-      if (!entry || isExpired(entry.timestamp, Date.now())) {
+      if (!entry || isExpired(entry, Date.now())) {
         return void 0;
       }
       if (isPromise(entry.value)) {
@@ -118,28 +156,41 @@ function createCache({
       return entry.value;
     },
     set(cacheKey, value) {
-      cache.set(cacheKey, { value, timestamp: Date.now() });
+      cache.set(cacheKey, unwrapValue(value, Date.now()));
       trimToSize();
       cleanExpiredItems();
     },
     async getAsync(cacheKey) {
       const entry = cache.get(cacheKey);
-      if (!entry || isExpired(entry.timestamp, Date.now())) {
+      if (!entry || isExpired(entry, Date.now())) {
         return void 0;
       }
-      return await entry.value;
+      return entry.value;
     },
-    setAsync(cacheKey, value) {
-      const promise = value().then((result) => {
-        cache.set(cacheKey, { value: result, timestamp: Date.now() });
-        return result;
+    async setAsync(cacheKey, value) {
+      const promise = value(utils).then((result) => {
+        if (result instanceof RejectValue) {
+          const cacheValue = cache.get(cacheKey);
+          if (cacheValue?.value === promise) {
+            cache.delete(cacheKey);
+          }
+          return result.value;
+        }
+        const unwrappedValue = unwrapValue(result, Date.now());
+        cache.set(cacheKey, unwrappedValue);
+        return unwrappedValue.value;
       }).catch((error) => {
         cache.delete(cacheKey);
         throw error;
       });
-      cache.set(cacheKey, { value: promise, timestamp: Date.now() });
+      cache.set(cacheKey, {
+        value: promise,
+        timestamp: Date.now(),
+        expiration: void 0
+      });
       trimToSize();
       cleanExpiredItems();
+      return promise;
     },
     cleanExpiredItems,
     /** @internal */
@@ -148,6 +199,7 @@ function createCache({
 }
 export {
   RejectValue,
+  WithExpiration,
   cachedGetter,
   createCache
 };

package/dist/chunk-RK6PT7JY.js

@@ -0,0 +1,96 @@
+import {
+  clampMax
+} from "./chunk-HTCYUMDR.js";
+import {
+  castToNumber
+} from "./chunk-GBFS2I67.js";
+
+// src/time.ts
+var MINUTE_AS_MS = 60 * 1e3;
+var HOUR_AS_MS = 60 * MINUTE_AS_MS;
+var DAY_AS_MS = 24 * HOUR_AS_MS;
+var WEEK_AS_MS = 7 * DAY_AS_MS;
+var MONTH_AS_MS = 30 * DAY_AS_MS;
+var YEAR_AS_MS = 365 * DAY_AS_MS;
+var HOUR_AS_SECS = 60 * 60;
+var DAY_AS_SECS = 24 * HOUR_AS_SECS;
+var WEEK_AS_SECS = 7 * DAY_AS_SECS;
+var MONTH_AS_SECS = 30 * DAY_AS_SECS;
+var YEAR_AS_SECS = 365 * DAY_AS_SECS;
+function dateStringOrNullToUnixMs(isoString) {
+  if (!isoString) return null;
+  const unixMs = new Date(isoString).getTime();
+  if (isNaN(unixMs)) return null;
+  return unixMs;
+}
+function msToTimeString(ms, format, hoursMinLength = 2) {
+  const { hours, minutes, seconds, milliseconds } = msToDurationObj(ms);
+  const hoursString = padTimeVal(hours, hoursMinLength);
+  const minutesString = padTimeVal(minutes);
+  if (format === "minutes") {
+    return `${hoursString}:${minutesString}`;
+  }
+  const secondsString = padTimeVal(seconds);
+  if (format === "seconds") {
+    return `${hoursString}:${minutesString}:${secondsString}`;
+  }
+  return `${hoursString}:${minutesString}:${secondsString}:${padTimeVal(
+    milliseconds,
+    3
+  )}`;
+}
+function padTimeVal(val, maxLength = 2) {
+  return val.toString().padStart(maxLength, "0");
+}
+function parseTimeStringToMs(timeString) {
+  if (!timeString.trim()) return 0;
+  const [hours, minutes, seconds, ms] = timeString.split(":");
+  return getTimeStringPartToInt(hours) * HOUR_AS_MS + clampMax(getTimeStringPartToInt(minutes), 59) * MINUTE_AS_MS + clampMax(getTimeStringPartToInt(seconds), 59) * 1e3 + getTimeStringPartToInt(ms, 3);
+}
+function getTimeStringPartToInt(timeStringPart, length) {
+  if (!timeStringPart?.trim()) return 0;
+  let string = timeStringPart.replaceAll("_", "0");
+  string = string.replaceAll("-", "");
+  if (length) {
+    string = string.padEnd(length, "0");
+    if (string.length > length) {
+      string = string.slice(0, length);
+    }
+  }
+  const num = castToNumber(string);
+  if (!num) return 0;
+  return Math.floor(num);
+}
+function msToDurationObj(ms) {
+  return {
+    milliseconds: ms % 1e3,
+    seconds: Math.floor(ms / 1e3) % 60,
+    minutes: Math.floor(ms / 1e3 / 60) % 60,
+    hours: Math.floor(ms / 1e3 / 60 / 60)
+  };
+}
+function getUnixSeconds() {
+  return Math.floor(Date.now() / 1e3);
+}
+function durationObjToMs(durationObj) {
+  return (durationObj.hours ?? 0) * HOUR_AS_MS + (durationObj.minutes ?? 0) * MINUTE_AS_MS + (durationObj.seconds ?? 0) * 1e3 + (durationObj.ms ?? 0) + (durationObj.days ?? 0) * DAY_AS_MS;
+}
+
+export {
+  MINUTE_AS_MS,
+  HOUR_AS_MS,
+  DAY_AS_MS,
+  WEEK_AS_MS,
+  MONTH_AS_MS,
+  YEAR_AS_MS,
+  HOUR_AS_SECS,
+  DAY_AS_SECS,
+  WEEK_AS_SECS,
+  MONTH_AS_SECS,
+  YEAR_AS_SECS,
+  dateStringOrNullToUnixMs,
+  msToTimeString,
+  parseTimeStringToMs,
+  getUnixSeconds,
+  durationObjToMs
+};

package/dist/createThrottleController.cjs

@@ -121,22 +121,29 @@ var EnhancedMap = class _EnhancedMap extends Map {
   }
 };
 
+// src/time.ts
+var MINUTE_AS_MS = 60 * 1e3;
+var HOUR_AS_MS = 60 * MINUTE_AS_MS;
+var DAY_AS_MS = 24 * HOUR_AS_MS;
+var WEEK_AS_MS = 7 * DAY_AS_MS;
+var MONTH_AS_MS = 30 * DAY_AS_MS;
+var YEAR_AS_MS = 365 * DAY_AS_MS;
+var HOUR_AS_SECS = 60 * 60;
+var DAY_AS_SECS = 24 * HOUR_AS_SECS;
+var WEEK_AS_SECS = 7 * DAY_AS_SECS;
+var MONTH_AS_SECS = 30 * DAY_AS_SECS;
+var YEAR_AS_SECS = 365 * DAY_AS_SECS;
+function durationObjToMs(durationObj) {
+  return (durationObj.hours ?? 0) * HOUR_AS_MS + (durationObj.minutes ?? 0) * MINUTE_AS_MS + (durationObj.seconds ?? 0) * 1e3 + (durationObj.ms ?? 0) + (durationObj.days ?? 0) * DAY_AS_MS;
+}
+
 // src/createThrottleController.ts
 function createThrottleController({
   maxCalls,
   per,
   cleanupCheckSecsInterval = 60 * 30
 }) {
-  let msInterval = 0;
-  if (per.ms) {
-    msInterval = per.ms;
-  } else if (per.seconds) {
-    msInterval = per.seconds * 1e3;
-  } else if (per.minutes) {
-    msInterval = per.minutes * 1e3 * 60;
-  } else if (per.hours) {
-    msInterval = per.hours * 1e3 * 60 * 60;
-  }
+  const msInterval = durationObjToMs(per);
   if (msInterval === 0) {
     throw new Error("Invalid interval");
   }

package/dist/createThrottleController.d.cts

@@ -1,11 +1,8 @@
+import { DurationObj } from './time.cjs';
+
 type Options = {
     maxCalls: number;
-    per: {
-        ms?: number;
-        seconds?: number;
-        minutes?: number;
-        hours?: number;
-    };
+    per: DurationObj;
     cleanupCheckSecsInterval?: number;
 };
 type ThrottleController = {

package/dist/createThrottleController.d.ts

@@ -1,11 +1,8 @@
+import { DurationObj } from './time.js';
+
 type Options = {
     maxCalls: number;
-    per: {
-        ms?: number;
-        seconds?: number;
-        minutes?: number;
-        hours?: number;
-    };
+    per: DurationObj;
     cleanupCheckSecsInterval?: number;
 };
 type ThrottleController = {

package/dist/createThrottleController.js

@@ -1,7 +1,12 @@
 import {
   EnhancedMap
 } from "./chunk-T5WDDPFI.js";
+import {
+  durationObjToMs
+} from "./chunk-RK6PT7JY.js";
+import "./chunk-HTCYUMDR.js";
 import "./chunk-4UGSP3L3.js";
+import "./chunk-GBFS2I67.js";
 
 // src/createThrottleController.ts
 function createThrottleController({
@@ -9,16 +14,7 @@ function createThrottleController({
   per,
   cleanupCheckSecsInterval = 60 * 30
 }) {
-  let msInterval = 0;
-  if (per.ms) {
-    msInterval = per.ms;
-  } else if (per.seconds) {
-    msInterval = per.seconds * 1e3;
-  } else if (per.minutes) {
-    msInterval = per.minutes * 1e3 * 60;
-  } else if (per.hours) {
-    msInterval = per.hours * 1e3 * 60 * 60;
-  }
+  const msInterval = durationObjToMs(per);
   if (msInterval === 0) {
     throw new Error("Invalid interval");
   }

package/dist/testUtils.js

@@ -5,13 +5,13 @@ import {
 import {
   deepEqual
 } from "./chunk-JQFUKJU5.js";
-import {
-  clampMin
-} from "./chunk-HTCYUMDR.js";
 import {
   arrayWithPrevAndIndex,
   filterAndMap
 } from "./chunk-QMFZE2VO.js";
+import {
+  clampMin
+} from "./chunk-HTCYUMDR.js";
 import {
   isObject
 } from "./chunk-4UGSP3L3.js";

package/dist/time.cjs

@@ -32,6 +32,7 @@ __export(time_exports, {
   YEAR_AS_MS: () => YEAR_AS_MS,
   YEAR_AS_SECS: () => YEAR_AS_SECS,
   dateStringOrNullToUnixMs: () => dateStringOrNullToUnixMs,
+  durationObjToMs: () => durationObjToMs,
   getUnixSeconds: () => getUnixSeconds,
   msToTimeString: () => msToTimeString,
   parseTimeStringToMs: () => parseTimeStringToMs
@@ -119,6 +120,9 @@ function msToDurationObj(ms) {
 function getUnixSeconds() {
   return Math.floor(Date.now() / 1e3);
 }
+function durationObjToMs(durationObj) {
+  return (durationObj.hours ?? 0) * HOUR_AS_MS + (durationObj.minutes ?? 0) * MINUTE_AS_MS + (durationObj.seconds ?? 0) * 1e3 + (durationObj.ms ?? 0) + (durationObj.days ?? 0) * DAY_AS_MS;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DAY_AS_MS,
@@ -133,6 +137,7 @@ function getUnixSeconds() {
   YEAR_AS_MS,
   YEAR_AS_SECS,
   dateStringOrNullToUnixMs,
+  durationObjToMs,
   getUnixSeconds,
   msToTimeString,
   parseTimeStringToMs

package/dist/time.d.cts

@@ -13,5 +13,13 @@ declare function dateStringOrNullToUnixMs(isoString: string | null | undefined):
 declare function msToTimeString(ms: number, format: 'minutes' | 'seconds' | 'milliseconds', hoursMinLength?: number): string;
 declare function parseTimeStringToMs(timeString: string): number;
 declare function getUnixSeconds(): number;
+type DurationObj = {
+    ms?: number;
+    seconds?: number;
+    minutes?: number;
+    hours?: number;
+    days?: number;
+};
+declare function durationObjToMs(durationObj: DurationObj): number;
 
-export { DAY_AS_MS, DAY_AS_SECS, HOUR_AS_MS, HOUR_AS_SECS, MINUTE_AS_MS, MONTH_AS_MS, MONTH_AS_SECS, WEEK_AS_MS, WEEK_AS_SECS, YEAR_AS_MS, YEAR_AS_SECS, dateStringOrNullToUnixMs, getUnixSeconds, msToTimeString, parseTimeStringToMs };
+export { DAY_AS_MS, DAY_AS_SECS, type DurationObj, HOUR_AS_MS, HOUR_AS_SECS, MINUTE_AS_MS, MONTH_AS_MS, MONTH_AS_SECS, WEEK_AS_MS, WEEK_AS_SECS, YEAR_AS_MS, YEAR_AS_SECS, dateStringOrNullToUnixMs, durationObjToMs, getUnixSeconds, msToTimeString, parseTimeStringToMs };

package/dist/time.d.ts

@@ -13,5 +13,13 @@ declare function dateStringOrNullToUnixMs(isoString: string | null | undefined):
 declare function msToTimeString(ms: number, format: 'minutes' | 'seconds' | 'milliseconds', hoursMinLength?: number): string;
 declare function parseTimeStringToMs(timeString: string): number;
 declare function getUnixSeconds(): number;
+type DurationObj = {
+    ms?: number;
+    seconds?: number;
+    minutes?: number;
+    hours?: number;
+    days?: number;
+};
+declare function durationObjToMs(durationObj: DurationObj): number;
 
-export { DAY_AS_MS, DAY_AS_SECS, HOUR_AS_MS, HOUR_AS_SECS, MINUTE_AS_MS, MONTH_AS_MS, MONTH_AS_SECS, WEEK_AS_MS, WEEK_AS_SECS, YEAR_AS_MS, YEAR_AS_SECS, dateStringOrNullToUnixMs, getUnixSeconds, msToTimeString, parseTimeStringToMs };
+export { DAY_AS_MS, DAY_AS_SECS, type DurationObj, HOUR_AS_MS, HOUR_AS_SECS, MINUTE_AS_MS, MONTH_AS_MS, MONTH_AS_SECS, WEEK_AS_MS, WEEK_AS_SECS, YEAR_AS_MS, YEAR_AS_SECS, dateStringOrNullToUnixMs, durationObjToMs, getUnixSeconds, msToTimeString, parseTimeStringToMs };

package/dist/time.js

@@ -1,77 +1,23 @@
 import {
-  clampMax
-} from "./chunk-HTCYUMDR.js";
-import {
-  castToNumber
-} from "./chunk-GBFS2I67.js";
-
-// src/time.ts
-var MINUTE_AS_MS = 60 * 1e3;
-var HOUR_AS_MS = 60 * MINUTE_AS_MS;
-var DAY_AS_MS = 24 * HOUR_AS_MS;
-var WEEK_AS_MS = 7 * DAY_AS_MS;
-var MONTH_AS_MS = 30 * DAY_AS_MS;
-var YEAR_AS_MS = 365 * DAY_AS_MS;
-var HOUR_AS_SECS = 60 * 60;
-var DAY_AS_SECS = 24 * HOUR_AS_SECS;
-var WEEK_AS_SECS = 7 * DAY_AS_SECS;
-var MONTH_AS_SECS = 30 * DAY_AS_SECS;
-var YEAR_AS_SECS = 365 * DAY_AS_SECS;
-function dateStringOrNullToUnixMs(isoString) {
-  if (!isoString) return null;
-  const unixMs = new Date(isoString).getTime();
-  if (isNaN(unixMs)) return null;
-  return unixMs;
-}
-function msToTimeString(ms, format, hoursMinLength = 2) {
-  const { hours, minutes, seconds, milliseconds } = msToDurationObj(ms);
-  const hoursString = padTimeVal(hours, hoursMinLength);
-  const minutesString = padTimeVal(minutes);
-  if (format === "minutes") {
-    return `${hoursString}:${minutesString}`;
-  }
-  const secondsString = padTimeVal(seconds);
-  if (format === "seconds") {
-    return `${hoursString}:${minutesString}:${secondsString}`;
-  }
-  return `${hoursString}:${minutesString}:${secondsString}:${padTimeVal(
-    milliseconds,
-    3
-  )}`;
-}
-function padTimeVal(val, maxLength = 2) {
-  return val.toString().padStart(maxLength, "0");
-}
-function parseTimeStringToMs(timeString) {
-  if (!timeString.trim()) return 0;
-  const [hours, minutes, seconds, ms] = timeString.split(":");
-  return getTimeStringPartToInt(hours) * HOUR_AS_MS + clampMax(getTimeStringPartToInt(minutes), 59) * MINUTE_AS_MS + clampMax(getTimeStringPartToInt(seconds), 59) * 1e3 + getTimeStringPartToInt(ms, 3);
-}
-function getTimeStringPartToInt(timeStringPart, length) {
-  if (!timeStringPart?.trim()) return 0;
-  let string = timeStringPart.replaceAll("_", "0");
-  string = string.replaceAll("-", "");
-  if (length) {
-    string = string.padEnd(length, "0");
-    if (string.length > length) {
-      string = string.slice(0, length);
-    }
-  }
-  const num = castToNumber(string);
-  if (!num) return 0;
-  return Math.floor(num);
-}
-function msToDurationObj(ms) {
-  return {
-    milliseconds: ms % 1e3,
-    seconds: Math.floor(ms / 1e3) % 60,
-    minutes: Math.floor(ms / 1e3 / 60) % 60,
-    hours: Math.floor(ms / 1e3 / 60 / 60)
-  };
-}
-function getUnixSeconds() {
-  return Math.floor(Date.now() / 1e3);
-}
+  DAY_AS_MS,
+  DAY_AS_SECS,
+  HOUR_AS_MS,
+  HOUR_AS_SECS,
+  MINUTE_AS_MS,
+  MONTH_AS_MS,
+  MONTH_AS_SECS,
+  WEEK_AS_MS,
+  WEEK_AS_SECS,
+  YEAR_AS_MS,
+  YEAR_AS_SECS,
+  dateStringOrNullToUnixMs,
+  durationObjToMs,
+  getUnixSeconds,
+  msToTimeString,
+  parseTimeStringToMs
+} from "./chunk-RK6PT7JY.js";
+import "./chunk-HTCYUMDR.js";
+import "./chunk-GBFS2I67.js";
 export {
   DAY_AS_MS,
   DAY_AS_SECS,
@@ -85,6 +31,7 @@ export {
   YEAR_AS_MS,
   YEAR_AS_SECS,
   dateStringOrNullToUnixMs,
+  durationObjToMs,
   getUnixSeconds,
   msToTimeString,
   parseTimeStringToMs

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ls-stack/utils",
   "description": "Typescript utils",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "license": "MIT",
   "files": [
     "dist"