@dereekb/util 11.1.5 → 11.1.6

package/fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/fetch",
-  "version": "11.1.5",
+  "version": "11.1.6",
   ".": {
     "types": "./src/index.d.ts",
     "node": {

package/index.cjs.js

@@ -13049,6 +13049,7 @@ function expirationDetails(input) {
     expires,
     now: inputNow,
     expiresFromDate,
+    defaultExpiresFromDateToNow,
     expiresIn
   } = input;
   const parsedExpiresFromDate = expiresFromDate != null ? dateFromDateOrTimeNumber(expiresFromDate) : null;
@@ -13057,10 +13058,16 @@ function expirationDetails(input) {
     const now = (_ref = nowOverride != null ? nowOverride : inputNow) != null ? _ref : new Date();
     return now;
   }
-  function hasExpired(nowOverride) {
+  function hasExpired(nowOverride, defaultIfNoExpirationDate = false) {
     const now = getNow(nowOverride);
     const expirationDate = getExpirationDateForNow(now);
-    return expirationDate != null && expirationDate <= now;
+    let result;
+    if (expirationDate == null) {
+      result = defaultIfNoExpirationDate;
+    } else {
+      result = expirationDate <= now;
+    }
+    return result;
   }
   function getExpirationDate(nowOverride) {
     const now = getNow(nowOverride);
@@ -13073,7 +13080,7 @@ function expirationDetails(input) {
     } else if (expiresAt != null) {
       expirationDate = expiresAt;
     } else if (expiresIn != null) {
-      const date = parsedExpiresFromDate != null ? parsedExpiresFromDate : now;
+      const date = parsedExpiresFromDate != null ? parsedExpiresFromDate : defaultExpiresFromDateToNow !== false ? now : null;
       expirationDate = addMilliseconds(date, expiresIn);
     }
     return expirationDate;
@@ -13106,9 +13113,10 @@ function calculateExpirationDate(input) {
  */
 function isThrottled(throttleTime, lastRunAt, now) {
   return !expirationDetails({
-    expiresFromDate: lastRunAt,
+    defaultExpiresFromDateToNow: false,
+    expiresFromDate: lastRunAt != null ? lastRunAt : null,
     expiresIn: throttleTime
-  }).hasExpired(now);
+  }).hasExpired(now, true);
 }
 /**
  * Returns true if any of the input ExpirationDetails have not expired.

package/index.esm.js

@@ -14807,6 +14807,7 @@ function expirationDetails(input) {
     expires,
     now: inputNow,
     expiresFromDate,
+    defaultExpiresFromDateToNow,
     expiresIn
   } = input;
   const parsedExpiresFromDate = expiresFromDate != null ? dateFromDateOrTimeNumber(expiresFromDate) : null;
@@ -14815,10 +14816,16 @@ function expirationDetails(input) {
     const now = (_ref = nowOverride != null ? nowOverride : inputNow) != null ? _ref : new Date();
     return now;
   }
-  function hasExpired(nowOverride) {
+  function hasExpired(nowOverride, defaultIfNoExpirationDate = false) {
     const now = getNow(nowOverride);
     const expirationDate = getExpirationDateForNow(now);
-    return expirationDate != null && expirationDate <= now;
+    let result;
+    if (expirationDate == null) {
+      result = defaultIfNoExpirationDate;
+    } else {
+      result = expirationDate <= now;
+    }
+    return result;
   }
   function getExpirationDate(nowOverride) {
     const now = getNow(nowOverride);
@@ -14831,7 +14838,7 @@ function expirationDetails(input) {
     } else if (expiresAt != null) {
       expirationDate = expiresAt;
     } else if (expiresIn != null) {
-      const date = parsedExpiresFromDate != null ? parsedExpiresFromDate : now;
+      const date = parsedExpiresFromDate != null ? parsedExpiresFromDate : defaultExpiresFromDateToNow !== false ? now : null;
       expirationDate = addMilliseconds(date, expiresIn);
     }
     return expirationDate;
@@ -14866,9 +14873,10 @@ function calculateExpirationDate(input) {
  */
 function isThrottled(throttleTime, lastRunAt, now) {
   return !expirationDetails({
-    expiresFromDate: lastRunAt,
+    defaultExpiresFromDateToNow: false,
+    expiresFromDate: lastRunAt != null ? lastRunAt : null,
     expiresIn: throttleTime
-  }).hasExpired(now);
+  }).hasExpired(now, true);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util",
-  "version": "11.1.5",
+  "version": "11.1.6",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",

package/src/lib/date/expires.d.ts

@@ -25,15 +25,23 @@ export interface ExpirationDetailsInput<T extends Expires = Expires> extends Exp
      */
     expires?: Maybe<T>;
     /**
-     * Current time override to use.
+     * Default current now time to use.
+     *
+     * If not set, functions will use the current time when they are called.
      */
     now?: Maybe<Date>;
     /**
      * The base date or time number to calculate expirations from.
      *
-     * If not provided, defaults to now.
+     * If not defined, the expiresFromDate is considered to have never been run/set.
      */
     expiresFromDate?: Maybe<DateOrUnixDateTimeNumber>;
+    /**
+     * If true, the "expiresFromDate" will default to the calculated now time when calculating the expiration.
+     *
+     * Defaults to true.
+     */
+    defaultExpiresFromDateToNow?: Maybe<boolean>;
     /**
      * Time after "now" that expiration will occur.
      */
@@ -47,15 +55,16 @@ export interface ExpirationDetails<T extends Expires = Expires> {
     /**
      * Returns true if the expiration time has passed.
      *
-     * @param nowOverride
+     * @param nowOverride Optional override for the current time. Defaults to the current time.
+     * @param defaultIfNoExpirationDate If true, returns true if no expiration date is defined. Defaults to false.
      */
-    hasExpired(nowOverride?: Maybe<Date>): boolean;
+    hasExpired(nowOverride?: Maybe<Date>, defaultIfNoExpirationDate?: boolean): boolean;
     /**
      * Returns the expiration date.
      *
      * Returns null if no expiration is defined.
      *
-     * @param nowOverride
+     * @param nowOverride Optional override for the current time. Defaults to the current time.
      */
     getExpirationDate(nowOverride?: Maybe<Date>): Maybe<Date>;
 }

package/test/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [11.1.6](https://github.com/dereekb/dbx-components/compare/v11.1.5-dev...v11.1.6) (2025-03-20)
+
+
+
 ## [11.1.5](https://github.com/dereekb/dbx-components/compare/v11.1.4-dev...v11.1.5) (2025-03-20)
 
 

package/test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/test",
-  "version": "11.1.5",
+  "version": "11.1.6",
   "type": "commonjs",
   "peerDependencies": {
     "@dereekb/util": "*"