xjs-common 11.0.1 → 11.0.2

package/README.md

@@ -1,4 +1,4 @@
-[![npm][npm-badge]][npm-url] [![CI][ci-badge]][ci-url]
+[![npm][npm-badge]][npm-url] [![CI][ci-badge]][ci-url] [![publish][publish-badge]][publish-url]
 
 # Overview
 Library modules for typescript that bundled general-purpose implementations.  
@@ -192,3 +192,5 @@ XJS throws error with `code` property which has one of the following numbers.
 [npm-badge]: https://badgen.net/npm/v/xjs-common
 [ci-url]: https://github.com/begyyal/xjs_commons/actions/workflows/test.yml
 [ci-badge]: https://github.com/begyyal/xjs_commons/actions/workflows/test.yml/badge.svg
+[publish-url]: https://github.com/begyyal/xjs_commons/actions/workflows/publish.yml
+[publish-badge]: https://github.com/begyyal/xjs_commons/actions/workflows/publish.yml/badge.svg

package/build/const/types.d.ts

@@ -1,5 +1,5 @@
 export type IndexSignature = string | number | symbol;
-export type NormalRecord = Record<IndexSignature, any>;
+export type NormalRecord<T = any> = Record<IndexSignature, T>;
 export type MaybeArray<T> = T | T[];
 export type Loggable = {
     log: (msg: any) => void;

package/build/func/u.d.ts

@@ -10,15 +10,21 @@ export interface RetryOption<T = void | Promise<void>> {
     errorCriterion?: (e: any) => boolean;
     intervalPredicate?: () => T;
 }
+export interface SyncRetryOption extends RetryOption<void> {
+}
+export interface AsyncRetryOption extends RetryOption {
+    intervalSec?: number;
+}
 /**
  * runs callback with customizable retry.
  * @param cb callback to be retried.
  * @param op.count number of retries. default is 1.
  * @param op.logger logger used for exceptions while retrying the process. default is `console` object.
  * @param op.errorCriterion distinguish whether retry is required form exceptions. default is none. (i.e. allways required.)
+ * @param op.intervalSec secounds to wait between callbacks. this wait occurs after `intervalPredicate`.
  * @param op.intervalPredicate predicate that runs between callbacks when retrying.
  */
-export declare function retry<T>(cb: () => T, op?: RetryOption<void>): T;
-export declare function retry<T>(cb: () => T, op?: RetryOption<Promise<void>>): Promise<T>;
-export declare function retry<T>(cb: () => Promise<T>, op?: RetryOption<void>): Promise<T>;
-export declare function retry<T>(cb: () => Promise<T>, op?: RetryOption<Promise<void>>): Promise<T>;
+export declare function retry<T>(cb: () => T, op?: SyncRetryOption): T;
+export declare function retry<T>(cb: () => T, op?: AsyncRetryOption): Promise<T>;
+export declare function retry<T>(cb: () => Promise<T>, op?: SyncRetryOption): Promise<T>;
+export declare function retry<T>(cb: () => Promise<T>, op?: AsyncRetryOption): Promise<T>;

package/build/func/u.js

@@ -27,6 +27,8 @@ export function bitor(...bit) {
     return bit.reduce((a, b) => a | b);
 }
 ;
+;
+;
 export function retry(cb, op) {
     const l = op?.logger ?? console;
     const initialCount = op?.count ?? 1;
@@ -59,9 +61,15 @@ export function retry(cb, op) {
             else
                 return ret;
         };
-        if (c < initialCount && op?.intervalPredicate)
-            ret = op?.intervalPredicate();
-        return ret instanceof Promise ? ret.then(() => innerPrcs()) : innerPrcs();
+        const chain = (c) => ret instanceof Promise ? ret.then(() => c()) : c();
+        if (c < initialCount) {
+            if (op?.intervalPredicate)
+                ret = op?.intervalPredicate();
+            const intervalSec = op?.intervalSec;
+            if (intervalSec)
+                ret = chain(() => delay(intervalSec));
+        }
+        return chain(innerPrcs);
     };
     return prcs(initialCount);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xjs-common",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "description": "library modules for typescript that bundled general-purpose implementations.",
   "repository": {
     "type": "git",