@kiwiproject/kiwi-test-js 0.5.1 → 1.0.0

package/README.md

@@ -1,5 +1,5 @@
 ### KiwiTestJS
-[![Build](https://github.com/kiwiproject/kiwi-test-js/workflows/build/badge.svg)](https://github.com/kiwiproject/kiwi-test-js/actions?query=workflow%3Abuild)
+[![Build](https://github.com/kiwiproject/kiwi-test-js/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/kiwiproject/kiwi-test-js/actions/workflows/build.yml?query=branch%3Amain)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=kiwiproject_kiwi-test-js&metric=alert_status)](https://sonarcloud.io/dashboard?id=kiwiproject_kiwi-test-js)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=kiwiproject_kiwi-test-js&metric=coverage)](https://sonarcloud.io/dashboard?id=kiwiproject_kiwi-test-js)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)

package/dist/elasticsearch/elastic-search-extension.d.ts

@@ -1,7 +1,7 @@
 /**
  * Starts an Elastic search container and stores the container information in global.ELASTIC_SEARCH_CONTAINER.
  *
- * @param image The image name/version to use for elastic search. Defaults to elasticsearch:8.6.1.
+ * @param image The image name/version to use for elastic search. Defaults to elasticsearch:9.0.2.
  */
 declare function startElasticSearchContainer(image?: string): Promise<void>;
 /**

package/dist/elasticsearch/elastic-search-extension.js

@@ -16,10 +16,10 @@ const elasticsearch_2 = require("@elastic/elasticsearch");
 /**
  * Starts an Elastic search container and stores the container information in global.ELASTIC_SEARCH_CONTAINER.
  *
- * @param image The image name/version to use for elastic search. Defaults to elasticsearch:8.6.1.
+ * @param image The image name/version to use for elastic search. Defaults to elasticsearch:9.0.2.
  */
-function startElasticSearchContainer(image = "elasticsearch:8.6.1") {
-    return __awaiter(this, void 0, void 0, function* () {
+function startElasticSearchContainer() {
+    return __awaiter(this, arguments, void 0, function* (image = "elasticsearch:9.0.2") {
         const container = yield new elasticsearch_1.ElasticsearchContainer(image)
             .withEnvironment({ "xpack.security.enabled": "false" })
             .start();

package/dist/minio/minio-extension.js

@@ -19,8 +19,8 @@ const testcontainers_1 = require("testcontainers");
  * @param secretKey The secret key configured to connect. Defaults to keyboard cat.
  * @param image The image name/version to use for minio. Defaults to minio/minio:RELEASE.2023-08-09T23-30-22Z.
  */
-function startMinioContainer(accessKey = "minioadmin", secretKey = "keyboard cat", image = "minio/minio:RELEASE.2023-08-09T23-30-22Z") {
-    return __awaiter(this, void 0, void 0, function* () {
+function startMinioContainer() {
+    return __awaiter(this, arguments, void 0, function* (accessKey = "minioadmin", secretKey = "keyboard cat", image = "minio/minio:RELEASE.2023-08-09T23-30-22Z") {
         const container = yield new testcontainers_1.GenericContainer(image)
             .withEnvironment({
             MINIO_BROWSER: "off",

package/dist/mongo/mongo-extension.js

@@ -18,8 +18,8 @@ const mongodb_1 = require("mongodb");
  *
  * @param image The image name/version to use for mongo. Defaults to mongo:6.
  */
-function startMongoContainer(image = "mongo:6") {
-    return __awaiter(this, void 0, void 0, function* () {
+function startMongoContainer() {
+    return __awaiter(this, arguments, void 0, function* (image = "mongo:6") {
         const container = yield new testcontainers_1.GenericContainer(image)
             .withExposedPorts(27017)
             .start();

package/dist/postgres/postgres-extension.js

@@ -18,8 +18,8 @@ const pg_1 = require("pg");
  *
  * @param image The image name/version to use for postgres. Defaults to postgres:15.
  */
-function startPostgresContainer(image = "postgres:15") {
-    return __awaiter(this, void 0, void 0, function* () {
+function startPostgresContainer() {
+    return __awaiter(this, arguments, void 0, function* (image = "postgres:15") {
         const container = yield new postgresql_1.PostgreSqlContainer(image).start();
         process.env.POSTGRES_EXTENSION_BASE_URI = container.getConnectionUri();
         // NOTE: This will only work if tests are runInBand (i.e. not in parallel)

package/dist/redis/redis-extension.js

@@ -18,8 +18,8 @@ const redis_1 = require("redis");
  *
  * @param image The image name/version to use for redis. Defaults to redis:7.
  */
-function startRedisContainer(image = "redis:7") {
-    return __awaiter(this, void 0, void 0, function* () {
+function startRedisContainer() {
+    return __awaiter(this, arguments, void 0, function* (image = "redis:7") {
         const container = yield new testcontainers_1.GenericContainer(image)
             .withExposedPorts(6379)
             .start();

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,9 +1,18 @@
 "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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wait = void 0;
+exports.wait = wait;
 const convert_1 = __importDefault(require("convert"));
 /**
  * Creates a new wait condition with defaults.
@@ -13,7 +22,6 @@ const convert_1 = __importDefault(require("convert"));
 function wait() {
     return new WaitFor();
 }
-exports.wait = wait;
 class WaitFor {
     constructor() {
         this.timeoutMs = 4000;
@@ -71,37 +79,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`));
                     }
-                    reject(new Error(`Condition ${aliasText}was not met after ${totalTries} tries`));
+                    else {
+                        tries += 1;
+                        setTimeout(loop, this.pollIntervalMs);
+                    }
+                };
+                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,16 +1,25 @@
 {
   "name": "@kiwiproject/kiwi-test-js",
-  "version": "0.5.1",
+  "version": "1.0.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",
   "files": [
     "/dist"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kiwiproject/kiwi-test-js.git"
+  },
+  "publishConfig": {
+    "access": "public",
+    "provenance": true
+  },
   "scripts": {
-    "format": "node node_modules/.bin/prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\"",
-    "lint": "node node_modules/.bin/eslint --ext .js,.ts .",
-    "test": "node --experimental-vm-modules node_modules/.bin/jest --coverage --collectCoverageFrom=src/**/*.ts"
+    "build": "tsc",
+    "format": "npx prettier --ignore-path .gitignore --write \"**/*.+(ts|js|json)\"",
+    "lint": "npx eslint --fix src",
+    "test": "npx jest --coverage --collectCoverageFrom=src/**/*.ts"
   },
   "jest": {
     "testPathIgnorePatterns": [
@@ -22,29 +31,34 @@
     ]
   },
   "dependencies": {
-    "@elastic/elasticsearch": "8.12.2",
-    "@jest/globals": "29.7.0",
-    "@kiwiproject/kiwi-js": "0.10.0",
-    "@testcontainers/elasticsearch": "10.7.2",
-    "@testcontainers/postgresql": "10.7.2",
-    "convert": "5.0.0",
-    "jest": "29.7.0",
-    "mongodb": "6.4.0",
-    "pg": "8.11.3",
-    "redis": "4.6.13",
-    "testcontainers": "10.7.2"
+    "@elastic/elasticsearch": "9.2.0",
+    "@jest/globals": "30.2.0",
+    "@kiwiproject/kiwi-js": "1.0.0",
+    "@testcontainers/elasticsearch": "11.11.0",
+    "@testcontainers/postgresql": "11.11.0",
+    "convert": "6.0.0",
+    "jest": "30.2.0",
+    "mongodb": "7.0.0",
+    "pg": "8.17.1",
+    "redis": "5.10.0",
+    "testcontainers": "11.11.0"
   },
   "devDependencies": {
-    "@babel/core": "7.24.0",
-    "@babel/preset-env": "7.24.0",
-    "@babel/preset-typescript": "7.23.3",
-    "@types/node": "20.11.24",
-    "@types/pg": "8.11.2",
-    "@typescript-eslint/eslint-plugin": "7.1.0",
-    "@typescript-eslint/parser": "7.0.2",
-    "babel-jest": "29.7.0",
-    "eslint": "8.57.0",
-    "prettier": "3.2.5",
-    "typescript": "5.3.3"
+    "@babel/core": "7.28.6",
+    "semantic-release": "25.0.2",
+    "@babel/preset-env": "7.28.6",
+    "@babel/preset-typescript": "7.28.5",
+    "@eslint/eslintrc": "3.3.3",
+    "@eslint/js": "9.39.2",
+    "@types/node": "25.0.9",
+    "@types/pg": "8.16.0",
+    "babel-jest": "30.2.0",
+    "eslint": "9.39.2",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-prettier": "5.5.5",
+    "globals": "17.0.0",
+    "prettier": "3.8.0",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.53.0"
   }
 }