@kiwiproject/kiwi-test-js 0.5.1 → 0.6.0

package/dist/waitForIt/waitForIt.d.ts

@@ -46,6 +46,6 @@ declare class WaitFor {
      * will be returned.
      * @param cb The function to check if the condition is true or false.
      */
-    until(cb: () => boolean): Promise<string>;
+    until(cb: () => boolean | Promise<boolean>): Promise<string>;
 }
 export {};

package/dist/waitForIt/waitForIt.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -71,37 +80,49 @@ class WaitFor {
      * @param cb The function to check if the condition is true or false.
      */
     until(cb) {
-        const totalTries = this.timeoutMs / this.pollIntervalMs;
-        const aliasText = this.alias ? `with alias ${this.alias} ` : "";
-        if (this.verbose) {
-            console.log(`Waiting for condition ${aliasText}for up to ${totalTries} attempts checking every ${this.pollIntervalMs} ms`);
-        }
-        return new Promise((resolve, reject) => {
-            let tries = 1;
-            const loop = () => {
-                if (cb.apply(this)) {
-                    if (this.verbose) {
-                        console.log(`Condition ${aliasText}met after ${tries} of ${totalTries} tries`);
+        return __awaiter(this, void 0, void 0, function* () {
+            const totalTries = this.timeoutMs / this.pollIntervalMs;
+            const aliasText = this.alias ? `with alias ${this.alias} ` : "";
+            if (this.verbose) {
+                console.log(`Waiting for condition ${aliasText}for up to ${totalTries} attempts checking every ${this.pollIntervalMs} ms`);
+            }
+            return new Promise((resolve, reject) => {
+                let tries = 1;
+                const processResult = (result) => {
+                    if (result) {
+                        if (this.verbose) {
+                            console.log(`Condition ${aliasText}met after ${tries} of ${totalTries} tries`);
+                        }
+                        resolve(`Condition ${aliasText}met after ${tries} of ${totalTries} tries`);
                     }
-                    resolve(`Condition ${aliasText}met after ${tries} of ${totalTries} tries`);
-                }
-                else if (tries > totalTries) {
-                    if (this.verbose) {
-                        console.log(`Condition ${aliasText}was not met after ${totalTries} tries`);
+                    else if (tries > totalTries) {
+                        if (this.verbose) {
+                            console.log(`Condition ${aliasText}was not met after ${totalTries} tries`);
+                        }
+                        reject(new Error(`Condition ${aliasText}was not met after ${totalTries} tries`));
+                    }
+                    else {
+                        tries += 1;
+                        setTimeout(loop, this.pollIntervalMs);
                     }
-                    reject(new Error(`Condition ${aliasText}was not met after ${totalTries} tries`));
+                };
+                const loop = () => __awaiter(this, void 0, void 0, function* () {
+                    const cbResult = cb.apply(this);
+                    if (typeof cbResult === "boolean") {
+                        processResult(cbResult);
+                    }
+                    else {
+                        const cbPromiseResult = yield cbResult;
+                        processResult(cbPromiseResult);
+                    }
+                });
+                if (this.pollDelayMs > 0) {
+                    setTimeout(loop, this.pollDelayMs);
                 }
                 else {
-                    tries += 1;
-                    setTimeout(loop, this.pollIntervalMs);
+                    loop();
                 }
-            };
-            if (this.pollDelayMs > 0) {
-                setTimeout(loop, this.pollDelayMs);
-            }
-            else {
-                loop();
-            }
+            });
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kiwiproject/kiwi-test-js",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "kiwi-test-js is a test utility library. Most of these utilities are ports from the Java Kiwi-test library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "@testcontainers/postgresql": "10.7.2",
     "convert": "5.0.0",
     "jest": "29.7.0",
-    "mongodb": "6.4.0",
+    "mongodb": "6.5.0",
     "pg": "8.11.3",
     "redis": "4.6.13",
     "testcontainers": "10.7.2"
@@ -38,13 +38,13 @@
     "@babel/core": "7.24.0",
     "@babel/preset-env": "7.24.0",
     "@babel/preset-typescript": "7.23.3",
-    "@types/node": "20.11.24",
+    "@types/node": "20.11.28",
     "@types/pg": "8.11.2",
-    "@typescript-eslint/eslint-plugin": "7.1.0",
-    "@typescript-eslint/parser": "7.0.2",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
+    "@typescript-eslint/parser": "7.2.0",
     "babel-jest": "29.7.0",
     "eslint": "8.57.0",
     "prettier": "3.2.5",
-    "typescript": "5.3.3"
+    "typescript": "5.4.2"
   }
 }