@augment-vir/common 31.46.1 → 31.48.0

package/dist/augments/function/retry.d.ts

@@ -24,7 +24,9 @@ import { type IsEqual } from 'type-fest';
  *
  * @package [`@augment-vir/common`](https://www.npmjs.com/package/@augment-vir/common)
  */
-export declare function retry<const T, const Duration extends AtLeastOneDuration | undefined = undefined>(maxRetries: number, callback: () => T, options?: PartialWithUndefined<{
+export declare function retry<const T, const Duration extends AtLeastOneDuration | undefined = undefined>(maxRetries: number, callback: (
+/** This will be `0` for the first execution, then increment with each retry. */
+retryCount: number) => T, options?: PartialWithUndefined<{
     /**
      * Wait this duration between each retry.
      *

package/dist/augments/function/retry.js

@@ -23,18 +23,21 @@ import { ensureErrorAndPrependMessage, wait } from '@augment-vir/core';
  * @package [`@augment-vir/common`](https://www.npmjs.com/package/@augment-vir/common)
  */
 export function retry(maxRetries, callback, options = {}) {
+    return internalRetry(0, maxRetries, callback, options);
+}
+function internalRetry(currentRetry, maxRetries, callback, options = {}) {
     try {
-        const result = callback();
+        const result = callback(currentRetry);
         if (result instanceof Promise) {
             return result.catch(async (error) => {
-                if (maxRetries <= 1) {
+                if (currentRetry >= maxRetries) {
                     throw ensureErrorAndPrependMessage(error, 'Retry max reached');
                 }
                 else {
                     if (options.interval) {
                         await wait(options.interval);
                     }
-                    return retry(maxRetries - 1, callback, options);
+                    return internalRetry(currentRetry + 1, maxRetries, callback, options);
                 }
             });
         }
@@ -43,14 +46,14 @@ export function retry(maxRetries, callback, options = {}) {
         }
     }
     catch (error) {
-        if (maxRetries <= 1) {
+        if (currentRetry >= maxRetries) {
             throw ensureErrorAndPrependMessage(error, 'Retry max reached');
         }
         else if (options.interval) {
-            return wait(options.interval).then(() => retry(maxRetries - 1, callback, options));
+            return wait(options.interval).then(() => internalRetry(currentRetry + 1, maxRetries, callback, options));
         }
         else {
-            return retry(maxRetries - 1, callback, options);
+            return internalRetry(currentRetry + 1, maxRetries, callback, options);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "31.46.1",
+    "version": "31.48.0",
     "description": "A collection of augments, helpers types, functions, and classes for any JavaScript environment.",
     "keywords": [
         "augment",
@@ -40,13 +40,13 @@
         "test:web": "virmator --no-deps test web"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.46.1",
-        "@augment-vir/core": "^31.46.1",
+        "@augment-vir/assert": "^31.48.0",
+        "@augment-vir/core": "^31.48.0",
         "@date-vir/duration": "^8.0.0",
         "ansi-styles": "^6.2.3",
         "deepcopy-esm": "^2.1.1",
         "json5": "^2.2.3",
-        "type-fest": "^5.1.0",
+        "type-fest": "^5.2.0",
         "typed-event-target": "^4.1.0"
     },
     "devDependencies": {