@ls-stack/utils 2.5.0 → 2.7.0

package/dist/cache.cjs

@@ -0,0 +1,125 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/cache.ts
+var cache_exports = {};
+__export(cache_exports, {
+  cachedGetter: () => cachedGetter,
+  createCache: () => createCache
+});
+module.exports = __toCommonJS(cache_exports);
+
+// src/assertions.ts
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isPromise(value) {
+  return isObject(value) && "then" in value;
+}
+
+// src/cache.ts
+function cachedGetter(getter) {
+  return {
+    get value() {
+      const value = getter();
+      Object.defineProperty(this, "value", { value });
+      return value;
+    }
+  };
+}
+function createCache({
+  maxCacheSize = 1e3,
+  maxItemAge,
+  expirationThrottle = 1e4
+} = {}) {
+  const cache = /* @__PURE__ */ new Map();
+  let lastExpirationCheck = 0;
+  function checkExpiredItems() {
+    const now = Date.now();
+    if (!maxItemAge || now - lastExpirationCheck < expirationThrottle) return;
+    lastExpirationCheck = now;
+    const maxAgeMs = maxItemAge * 1e3;
+    for (const [key, item] of cache.entries()) {
+      if (now - item.timestamp > maxAgeMs) {
+        cache.delete(key);
+      }
+    }
+  }
+  function trimToSize() {
+    const currentSize = cache.size;
+    if (currentSize > maxCacheSize) {
+      const keysToRemove = currentSize - maxCacheSize;
+      const iterator = cache.keys();
+      for (let i = 0; i < keysToRemove; i++) {
+        const { value: key } = iterator.next();
+        if (key) {
+          cache.delete(key);
+        }
+      }
+    }
+  }
+  function isExpired(timestamp, now) {
+    return maxItemAge !== void 0 && now - timestamp > maxItemAge * 1e3;
+  }
+  function getOrInsert(cacheKey, val) {
+    const now = Date.now();
+    const entry = cache.get(cacheKey);
+    if (!entry || isExpired(entry.timestamp, now)) {
+      const value = val();
+      cache.set(cacheKey, { value, timestamp: now });
+      trimToSize();
+      checkExpiredItems();
+      return value;
+    }
+    return entry.value;
+  }
+  async function getOrInsertAsync(cacheKey, val) {
+    const entry = cache.get(cacheKey);
+    if (entry && isPromise(entry.value)) {
+      return entry.value;
+    }
+    const now = Date.now();
+    if (entry && !isExpired(entry.timestamp, now)) {
+      return entry.value;
+    }
+    const promise = val().then((result) => {
+      cache.set(cacheKey, { value: result, timestamp: Date.now() });
+      return result;
+    }).catch((error) => {
+      cache.delete(cacheKey);
+      throw error;
+    });
+    cache.set(cacheKey, { value: promise, timestamp: now });
+    trimToSize();
+    checkExpiredItems();
+    return promise;
+  }
+  return {
+    getOrInsert,
+    getOrInsertAsync,
+    clear: () => cache.clear(),
+    /** @internal */
+    "~cache": cache
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cachedGetter,
+  createCache
+});

package/dist/cache.d.cts

@@ -0,0 +1,31 @@
+declare function cachedGetter<T>(getter: () => T): {
+    value: T;
+};
+type Options = {
+    /**
+     * The maximum number of items in the cache.
+     * @default 1000
+     */
+    maxCacheSize?: number;
+    /**
+     * The maximum age of items in the cache in seconds.
+     */
+    maxItemAge?: number;
+    /**
+     * The maximum number of items to check for expiration in a single call.
+     * @default 10_000
+     */
+    expirationThrottle?: number;
+};
+declare function createCache({ maxCacheSize, maxItemAge, expirationThrottle, }?: Options): {
+    getOrInsert: <T>(cacheKey: string, val: () => T) => T;
+    getOrInsertAsync: <T>(cacheKey: string, val: () => Promise<T>) => Promise<T>;
+    clear: () => void;
+    /** @internal */
+    '~cache': Map<string, {
+        value: unknown;
+        timestamp: number;
+    }>;
+};
+
+export { cachedGetter, createCache };

package/dist/cache.d.ts

@@ -0,0 +1,31 @@
+declare function cachedGetter<T>(getter: () => T): {
+    value: T;
+};
+type Options = {
+    /**
+     * The maximum number of items in the cache.
+     * @default 1000
+     */
+    maxCacheSize?: number;
+    /**
+     * The maximum age of items in the cache in seconds.
+     */
+    maxItemAge?: number;
+    /**
+     * The maximum number of items to check for expiration in a single call.
+     * @default 10_000
+     */
+    expirationThrottle?: number;
+};
+declare function createCache({ maxCacheSize, maxItemAge, expirationThrottle, }?: Options): {
+    getOrInsert: <T>(cacheKey: string, val: () => T) => T;
+    getOrInsertAsync: <T>(cacheKey: string, val: () => Promise<T>) => Promise<T>;
+    clear: () => void;
+    /** @internal */
+    '~cache': Map<string, {
+        value: unknown;
+        timestamp: number;
+    }>;
+};
+
+export { cachedGetter, createCache };

package/dist/cache.js

@@ -0,0 +1,93 @@
+import {
+  isPromise
+} from "./chunk-4UGSP3L3.js";
+
+// src/cache.ts
+function cachedGetter(getter) {
+  return {
+    get value() {
+      const value = getter();
+      Object.defineProperty(this, "value", { value });
+      return value;
+    }
+  };
+}
+function createCache({
+  maxCacheSize = 1e3,
+  maxItemAge,
+  expirationThrottle = 1e4
+} = {}) {
+  const cache = /* @__PURE__ */ new Map();
+  let lastExpirationCheck = 0;
+  function checkExpiredItems() {
+    const now = Date.now();
+    if (!maxItemAge || now - lastExpirationCheck < expirationThrottle) return;
+    lastExpirationCheck = now;
+    const maxAgeMs = maxItemAge * 1e3;
+    for (const [key, item] of cache.entries()) {
+      if (now - item.timestamp > maxAgeMs) {
+        cache.delete(key);
+      }
+    }
+  }
+  function trimToSize() {
+    const currentSize = cache.size;
+    if (currentSize > maxCacheSize) {
+      const keysToRemove = currentSize - maxCacheSize;
+      const iterator = cache.keys();
+      for (let i = 0; i < keysToRemove; i++) {
+        const { value: key } = iterator.next();
+        if (key) {
+          cache.delete(key);
+        }
+      }
+    }
+  }
+  function isExpired(timestamp, now) {
+    return maxItemAge !== void 0 && now - timestamp > maxItemAge * 1e3;
+  }
+  function getOrInsert(cacheKey, val) {
+    const now = Date.now();
+    const entry = cache.get(cacheKey);
+    if (!entry || isExpired(entry.timestamp, now)) {
+      const value = val();
+      cache.set(cacheKey, { value, timestamp: now });
+      trimToSize();
+      checkExpiredItems();
+      return value;
+    }
+    return entry.value;
+  }
+  async function getOrInsertAsync(cacheKey, val) {
+    const entry = cache.get(cacheKey);
+    if (entry && isPromise(entry.value)) {
+      return entry.value;
+    }
+    const now = Date.now();
+    if (entry && !isExpired(entry.timestamp, now)) {
+      return entry.value;
+    }
+    const promise = val().then((result) => {
+      cache.set(cacheKey, { value: result, timestamp: Date.now() });
+      return result;
+    }).catch((error) => {
+      cache.delete(cacheKey);
+      throw error;
+    });
+    cache.set(cacheKey, { value: promise, timestamp: now });
+    trimToSize();
+    checkExpiredItems();
+    return promise;
+  }
+  return {
+    getOrInsert,
+    getOrInsertAsync,
+    clear: () => cache.clear(),
+    /** @internal */
+    "~cache": cache
+  };
+}
+export {
+  cachedGetter,
+  createCache
+};

package/dist/main.d.ts

@@ -1,5 +1,6 @@
 ///<reference path="arrayUtils.d.ts" />
 ///<reference path="assertions.d.ts" />
+///<reference path="cache.d.ts" />
 ///<reference path="castValues.d.ts" />
 ///<reference path="consoleFmt.d.ts" />
 ///<reference path="conversions.d.ts" />
@@ -9,6 +10,7 @@
 ///<reference path="deepEqual.d.ts" />
 ///<reference path="enhancedMap.d.ts" />
 ///<reference path="exhaustiveMatch.d.ts" />
+///<reference path="internalUtils.d.ts" />
 ///<reference path="interpolate.d.ts" />
 ///<reference path="levenshtein.d.ts" />
 ///<reference path="main.d.ts" />
@@ -16,6 +18,7 @@
 ///<reference path="objUtils.d.ts" />
 ///<reference path="parallelAsyncCalls.d.ts" />
 ///<reference path="promiseUtils.d.ts" />
+///<reference path="retryOnError.d.ts" />
 ///<reference path="rsResult.d.ts" />
 ///<reference path="runShellCmd.d.ts" />
 ///<reference path="safeJson.d.ts" />

package/dist/parallelAsyncCalls.js

@@ -1,11 +1,11 @@
+import {
+  sleep
+} from "./chunk-5DZT3Z5Z.js";
 import {
   Result,
   unknownToError
 } from "./chunk-KBFP7INB.js";
 import "./chunk-VAAMRG4K.js";
-import {
-  sleep
-} from "./chunk-5DZT3Z5Z.js";
 import {
   invariant,
   isObject

package/dist/retryOnError.cjs

@@ -0,0 +1,76 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/retryOnError.ts
+var retryOnError_exports = {};
+__export(retryOnError_exports, {
+  retryOnError: () => retryOnError
+});
+module.exports = __toCommonJS(retryOnError_exports);
+
+// src/sleep.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+// src/retryOnError.ts
+async function retryOnError(fn, maxRetries, options = {}, retry = 0) {
+  const {
+    delayBetweenRetriesMs,
+    retryCondition,
+    maxErrorDurationMs = 400
+  } = options;
+  if (options.debugId) {
+    if (retry > 0) {
+      console.info(
+        `Retrying ${options.debugId} (retry ${retry}/${maxRetries}) after error`
+      );
+    }
+  }
+  const startTime = Date.now();
+  try {
+    return await fn();
+  } catch (error) {
+    if (maxRetries > 0) {
+      const errorDuration = Date.now() - startTime;
+      const shouldRetry = retryCondition ? retryCondition(error) : true;
+      let maxErrorDurationMsToUse = maxErrorDurationMs;
+      if (typeof shouldRetry === "boolean") {
+        if (!shouldRetry) throw error;
+      } else {
+        maxErrorDurationMsToUse = shouldRetry.maxErrorDurationMs;
+      }
+      if (errorDuration > maxErrorDurationMsToUse) {
+        throw error;
+      }
+      if (delayBetweenRetriesMs) {
+        await sleep(
+          typeof delayBetweenRetriesMs === "function" ? delayBetweenRetriesMs(retry) : delayBetweenRetriesMs
+        );
+      }
+      return retryOnError(fn, maxRetries - 1, options, retry + 1);
+    } else {
+      throw error;
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  retryOnError
+});

package/dist/retryOnError.d.cts

@@ -0,0 +1,10 @@
+declare function retryOnError<T>(fn: () => Promise<T>, maxRetries: number, options?: {
+    delayBetweenRetriesMs?: number | ((retry: number) => number);
+    retryCondition?: (error: unknown) => boolean | {
+        maxErrorDurationMs: number;
+    };
+    maxErrorDurationMs?: number;
+    debugId?: string;
+}, retry?: number): Promise<T>;
+
+export { retryOnError };

package/dist/retryOnError.d.ts

@@ -0,0 +1,10 @@
+declare function retryOnError<T>(fn: () => Promise<T>, maxRetries: number, options?: {
+    delayBetweenRetriesMs?: number | ((retry: number) => number);
+    retryCondition?: (error: unknown) => boolean | {
+        maxErrorDurationMs: number;
+    };
+    maxErrorDurationMs?: number;
+    debugId?: string;
+}, retry?: number): Promise<T>;
+
+export { retryOnError };

package/dist/retryOnError.js

@@ -0,0 +1,48 @@
+import {
+  sleep
+} from "./chunk-5DZT3Z5Z.js";
+
+// src/retryOnError.ts
+async function retryOnError(fn, maxRetries, options = {}, retry = 0) {
+  const {
+    delayBetweenRetriesMs,
+    retryCondition,
+    maxErrorDurationMs = 400
+  } = options;
+  if (options.debugId) {
+    if (retry > 0) {
+      console.info(
+        `Retrying ${options.debugId} (retry ${retry}/${maxRetries}) after error`
+      );
+    }
+  }
+  const startTime = Date.now();
+  try {
+    return await fn();
+  } catch (error) {
+    if (maxRetries > 0) {
+      const errorDuration = Date.now() - startTime;
+      const shouldRetry = retryCondition ? retryCondition(error) : true;
+      let maxErrorDurationMsToUse = maxErrorDurationMs;
+      if (typeof shouldRetry === "boolean") {
+        if (!shouldRetry) throw error;
+      } else {
+        maxErrorDurationMsToUse = shouldRetry.maxErrorDurationMs;
+      }
+      if (errorDuration > maxErrorDurationMsToUse) {
+        throw error;
+      }
+      if (delayBetweenRetriesMs) {
+        await sleep(
+          typeof delayBetweenRetriesMs === "function" ? delayBetweenRetriesMs(retry) : delayBetweenRetriesMs
+        );
+      }
+      return retryOnError(fn, maxRetries - 1, options, retry + 1);
+    } else {
+      throw error;
+    }
+  }
+}
+export {
+  retryOnError
+};

package/dist/testUtils.js

@@ -1,13 +1,13 @@
+import {
+  omit,
+  pick
+} from "./chunk-ZE3DLPMN.js";
 import {
   deepEqual
 } from "./chunk-JQFUKJU5.js";
 import {
   clampMin
 } from "./chunk-HTCYUMDR.js";
-import {
-  omit,
-  pick
-} from "./chunk-ZE3DLPMN.js";
 import {
   arrayWithPrevAndIndex,
   filterAndMap

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ls-stack/utils",
   "description": "Typescript utils",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "license": "MIT",
   "files": [
     "dist"
@@ -29,6 +29,11 @@
       "types": "./dist/assertions.d.ts",
       "require": "./dist/assertions.cjs"
     },
+    "./cache": {
+      "import": "./dist/cache.js",
+      "types": "./dist/cache.d.ts",
+      "require": "./dist/cache.cjs"
+    },
     "./castValues": {
       "import": "./dist/castValues.js",
       "types": "./dist/castValues.d.ts",
@@ -74,6 +79,11 @@
       "types": "./dist/exhaustiveMatch.d.ts",
       "require": "./dist/exhaustiveMatch.cjs"
     },
+    "./internalUtils": {
+      "import": "./dist/internalUtils.js",
+      "types": "./dist/internalUtils.d.ts",
+      "require": "./dist/internalUtils.cjs"
+    },
     "./interpolate": {
       "import": "./dist/interpolate.js",
       "types": "./dist/interpolate.d.ts",
@@ -109,6 +119,11 @@
       "types": "./dist/promiseUtils.d.ts",
       "require": "./dist/promiseUtils.cjs"
     },
+    "./retryOnError": {
+      "import": "./dist/retryOnError.js",
+      "types": "./dist/retryOnError.d.ts",
+      "require": "./dist/retryOnError.cjs"
+    },
     "./rsResult": {
       "import": "./dist/rsResult.js",
       "types": "./dist/rsResult.d.ts",
@@ -198,6 +213,9 @@
       "assertions": [
         "./dist/assertions.d.ts"
       ],
+      "cache": [
+        "./dist/cache.d.ts"
+      ],
       "castValues": [
         "./dist/castValues.d.ts"
       ],
@@ -225,6 +243,9 @@
       "exhaustiveMatch": [
         "./dist/exhaustiveMatch.d.ts"
       ],
+      "internalUtils": [
+        "./dist/internalUtils.d.ts"
+      ],
       "interpolate": [
         "./dist/interpolate.d.ts"
       ],
@@ -246,6 +267,9 @@
       "promiseUtils": [
         "./dist/promiseUtils.d.ts"
       ],
+      "retryOnError": [
+        "./dist/retryOnError.d.ts"
+      ],
       "rsResult": [
         "./dist/rsResult.d.ts"
       ],