@ezez/utils 2.1.0 → 4.0.0

package/esm/trimStart.js

@@ -0,0 +1,9 @@
+const trimStart = (source, characters) => {
+    let s = source;
+    while (s.startsWith(characters)) {
+        s = s.slice(characters.length);
+    }
+    return s;
+};
+export { trimStart, };
+//# sourceMappingURL=trimStart.js.map

package/esm/trimStart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trimStart.js","sourceRoot":"","sources":["../src/trimStart.ts"],"names":[],"mappings":"AAWA,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,UAAkB,EAAE,EAAE;IACrD,IAAI,CAAC,GAAG,MAAM,CAAC;IACf,OAAO,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC7B,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAClC;IACD,OAAO,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,OAAO,EACH,SAAS,GACZ,CAAC"}

package/esm/utils/utils.d.ts

@@ -0,0 +1,6 @@
+declare class DataWrapper<T> {
+    data: T;
+    constructor(data: T);
+}
+export { DataWrapper, };
+//# sourceMappingURL=utils.d.ts.map

package/esm/utils/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAAA,cAAM,WAAW,CAAC,CAAC;IACR,IAAI,EAAE,CAAC,CAAC;gBAEI,IAAI,EAAE,CAAC;CAG7B;AAED,OAAO,EACH,WAAW,GACd,CAAC"}

package/esm/utils/utils.js

@@ -0,0 +1,7 @@
+class DataWrapper {
+    constructor(data) {
+        this.data = data;
+    }
+}
+export { DataWrapper, };
+//# sourceMappingURL=utils.js.map

package/esm/utils/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW;IAGb,YAAmB,IAAO;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAED,OAAO,EACH,WAAW,GACd,CAAC"}

package/esm/waitFor.d.ts

@@ -1,3 +1,9 @@
-declare const waitFor: <T>(fn: () => T, interval?: number, timeout?: number) => Promise<T>;
+type MaybePromise<T> = T | Promise<T>;
+type Options = {
+    interval?: number;
+    timeout?: number;
+    maxTries?: number;
+};
+declare const waitFor: <T>(fn: () => MaybePromise<T>, options?: Options) => Promise<T>;
 export { waitFor };
 //# sourceMappingURL=waitFor.d.ts.map

package/esm/waitFor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"waitFor.d.ts","sourceRoot":"","sources":["../src/waitFor.ts"],"names":[],"mappings":"AAcA,QAAA,MAAM,OAAO,qEA8BZ,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"waitFor.d.ts","sourceRoot":"","sources":["../src/waitFor.ts"],"names":[],"mappings":"AAKA,KAAK,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEtC,KAAK,OAAO,GAAG;IAIX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAIlB,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAqBF,QAAA,MAAM,OAAO,2CAA2C,OAAO,eAsD9D,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/esm/waitFor.js

@@ -1,30 +1,55 @@
+import { noop } from "./noop.js";
 const DEFAULT_INTERVAL = 50;
-const waitFor = (fn, interval = DEFAULT_INTERVAL, timeout = Infinity) => {
+const defaultOptions = {
+    interval: DEFAULT_INTERVAL,
+    timeout: Infinity,
+    maxTries: Infinity,
+};
+const waitFor = (fn, options = defaultOptions) => {
     return new Promise((resolve, reject) => {
         let intervalTimer, failTimer;
-        if (isFinite(timeout)) {
+        const opts = { ...defaultOptions, ...options };
+        if (typeof opts.maxTries === "number" && opts.maxTries < 1) {
+            reject(new TypeError("[waitFor] maxTries must be greater than 0"));
+            return;
+        }
+        if (Number.isFinite(opts.timeout)) {
             failTimer = setTimeout(() => {
                 reject(new Error("[waitFor] Timeout"));
-                clearInterval(intervalTimer);
-            }, timeout);
+                clearTimeout(intervalTimer);
+            }, opts.timeout);
         }
-        intervalTimer = setInterval(() => {
+        let tries = 0;
+        const tryFn = (async () => {
             try {
-                const result = fn();
-                if (result) {
+                tries++;
+                const result = await fn();
+                if (result != null && result !== false) {
                     clearTimeout(failTimer);
-                    clearInterval(intervalTimer);
+                    clearTimeout(intervalTimer);
                     resolve(result);
                 }
+                else {
+                    if (Number.isFinite(opts.maxTries) && tries >= opts.maxTries) {
+                        clearTimeout(failTimer);
+                        clearTimeout(intervalTimer);
+                        reject(new Error("[waitFor] Max tries reached"));
+                        return;
+                    }
+                    setTimeout(() => {
+                        tryFn().catch(noop);
+                    }, options.interval);
+                }
             }
             catch (error) {
                 clearTimeout(failTimer);
-                clearInterval(intervalTimer);
+                clearTimeout(intervalTimer);
                 const e = new Error("[waitFor] check function threw an error");
                 e.details = { error };
                 reject(e);
             }
-        }, interval);
+        });
+        tryFn().catch(noop);
     });
 };
 export { waitFor };

package/esm/waitFor.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitFor.js","sourceRoot":"","sources":["../src/waitFor.ts"],"names":[],"mappings":"AAAA,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAc5B,MAAM,OAAO,GAAG,CAAI,EAAW,EAAE,QAAQ,GAAG,gBAAgB,EAAE,OAAO,GAAG,QAAQ,EAAE,EAAE;IAChF,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,IAAI,aAAwB,EAAE,SAAmB,CAAC;QAElD,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE;YACnB,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBACxB,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;gBACvC,aAAa,CAAC,aAAa,CAAC,CAAC;YACjC,CAAC,EAAE,OAAO,CAAC,CAAC;SACf;QAED,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;YAC7B,IAAI;gBACA,MAAM,MAAM,GAAG,EAAE,EAAE,CAAC;gBACpB,IAAI,MAAM,EAAE;oBACR,YAAY,CAAC,SAAS,CAAC,CAAC;oBACxB,aAAa,CAAC,aAAa,CAAC,CAAC;oBAC7B,OAAO,CAAC,MAAM,CAAC,CAAC;iBACnB;aACJ;YACD,OAAO,KAAc,EAAE;gBACnB,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,aAAa,CAAC,aAAa,CAAC,CAAC;gBAE7B,MAAM,CAAC,GAAkC,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC9F,CAAC,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC;gBACtB,MAAM,CAAC,CAAC,CAAC,CAAC;aACb;QACL,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"waitFor.js","sourceRoot":"","sources":["../src/waitFor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAoB5B,MAAM,cAAc,GAAsB;IACtC,QAAQ,EAAE,gBAAgB;IAC1B,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,QAAQ;CACrB,CAAC;AAeF,MAAM,OAAO,GAAG,CAAI,EAAyB,EAAE,UAAmB,cAAc,EAAE,EAAE;IAChF,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,IAAI,aAAuB,EAAE,SAAmB,CAAC;QAEjD,MAAM,IAAI,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;QAC/C,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE;YACxD,MAAM,CAAC,IAAI,SAAS,CAAC,2CAA2C,CAAC,CAAC,CAAC;YACnE,OAAO;SACV;QAED,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/B,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBACxB,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;gBACvC,YAAY,CAAC,aAAa,CAAC,CAAC;YAChC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACpB;QAED,IAAI,KAAK,GAAG,CAAC,CAAC;QAGd,MAAM,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE;YACtB,IAAI;gBACA,KAAK,EAAE,CAAC;gBACR,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAC;gBAE1B,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,KAAK,KAAK,EAAE;oBACpC,YAAY,CAAC,SAAS,CAAC,CAAC;oBACxB,YAAY,CAAC,aAAa,CAAC,CAAC;oBAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;iBACnB;qBACI;oBACD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;wBAC1D,YAAY,CAAC,SAAS,CAAC,CAAC;wBACxB,YAAY,CAAC,aAAa,CAAC,CAAC;wBAC5B,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;wBACjD,OAAO;qBACV;oBAED,UAAU,CAAC,GAAG,EAAE;wBACZ,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;iBACxB;aACJ;YACD,OAAO,KAAc,EAAE;gBACnB,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,YAAY,CAAC,aAAa,CAAC,CAAC;gBAE5B,MAAM,CAAC,GAAkC,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC9F,CAAC,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC;gBACtB,MAAM,CAAC,CAAC,CAAC,CAAC;aACb;QACL,CAAC,CAAC,CAAC;QACH,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ezez/utils",
-  "version": "2.1.0",
+  "version": "4.0.0",
   "repository": "https://github.com/dzek69/bottom-line.git",
   "author": "Jacek Nowacki @dzek69 <git-public@dzek.eu>",
   "license": "MIT",
@@ -35,9 +35,9 @@
   "module": "./esm/index.js",
   "type": "module",
   "devDependencies": {
-    "@babel/core": "^7.22.20",
-    "@babel/preset-env": "^7.22.20",
-    "@babel/preset-typescript": "^7.22.15",
+    "@babel/core": "^7.24.3",
+    "@babel/preset-env": "^7.24.3",
+    "@babel/preset-typescript": "^7.24.1",
     "@dzek69/eslint-config-base": "^2.5.0",
     "@dzek69/eslint-config-import": "^1.3.0",
     "@dzek69/eslint-config-import-typescript": "^1.0.1",