@gatling.io/core 3.14.400 → 3.14.600

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gatling.io/core",
-  "version": "3.14.400",
+  "version": "3.14.600",
   "license": "Apache-2.0",
   "homepage": "https://gatling.io",
   "repository": "github:gatling/gatling-js",
@@ -20,16 +20,16 @@
   "main": "target/index.js",
   "types": "target/index.d.ts",
   "dependencies": {
-    "@gatling.io/jvm-types": "3.14.400"
+    "@gatling.io/jvm-types": "3.14.600"
   },
   "devDependencies": {
     "@types/jest": "30.0.0",
-    "jest": "30.1.3",
+    "jest": "30.2.0",
     "prettier": "3.6.2",
     "rimraf": "6.0.1",
-    "ts-jest": "29.4.1",
+    "ts-jest": "29.4.5",
     "ts-node": "10.9.2",
-    "typescript": "5.9.2"
+    "typescript": "5.9.3"
   },
   "scripts": {
     "clean": "rimraf target",

package/target/checks/index.js

@@ -57,6 +57,7 @@ exports.bodyString = bodyString;
  */
 const bodyBytes = () => ({
     ...(0, find_1.wrapCheckBuilderFind)(jvm_types_1.CoreDsl.bodyBytes()),
+    // FIXME only is and not?
     is: (expected) => (0, final_1.wrapCheckBuilderFinal)(typeof expected === "function"
         ? jvm_types_1.CoreDsl.bodyBytes().is((0, byteArrays_1.asByteArrayFunction)((0, session_1.underlyingSessionTo)(expected)))
         : jvm_types_1.CoreDsl.bodyBytes().is((0, byteArrays_1.asByteArray)(expected))),

package/target/checks/validate.d.ts

@@ -27,10 +27,10 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
     /**
      * Provide a default value if the check wasn't able to extract anything
      *
-     * @param value - the default value
+     * @param value - the default value or a function returning the default value
      * @returns a new Validate
      */
-    withDefault(value: X): CheckBuilderValidate<X>;
+    withDefault(value: X | ((session: Session) => X)): CheckBuilderValidate<X>;
     /**
      * Provide a default Gatling Expression Language value if the check wasn't able to extract
      * anything
@@ -39,13 +39,6 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new Validate
      */
     withDefaultEL(value: string): CheckBuilderValidate<X>;
-    /**
-     * Provide a default value if the check wasn't able to extract anything
-     *
-     * @param value - the default value as a function
-     * @returns a new Validate
-     */
-    withDefault(value: SessionTo<X>): CheckBuilderValidate<X>;
     /**
      * Provide a custom validation strategy
      *
@@ -57,10 +50,10 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
     /**
      * Validate the extracted value is equal to an expected value
      *
-     * @param expected - the expected value
+     * @param expected - the expected value or a function returning the expected value
      * @returns a new CheckBuilderFinal
      */
-    is(expected: X): CheckBuilderFinal;
+    is(expected: X | ((session: Session) => X)): CheckBuilderFinal;
     /**
      * Validate the extracted value is equal to an expected value, passed as a Gatling Expression
      * Language String
@@ -69,13 +62,6 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     isEL(expected: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value is equal to an expected value, passed as a function
-     *
-     * @param expected - the expected value as a function
-     * @returns a new CheckBuilderFinal
-     */
-    is(expected: SessionTo<X>): CheckBuilderFinal;
     /**
      * Validate the extracted value is null
      *
@@ -85,10 +71,10 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
     /**
      * Validate the extracted value is not an expected value
      *
-     * @param expected - the unexpected value
+     * @param expected - the unexpected value or a function returning the unexpected value
      * @returns a new CheckBuilderFinal
      */
-    not(expected: X): CheckBuilderFinal;
+    not(expected: X | ((session: Session) => X)): CheckBuilderFinal;
     /**
      * Validate the extracted value is not an expected value, passed as a Gatling Expression
      * Language String
@@ -97,13 +83,6 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     notEL(expected: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value is not an expected value, passed as a function
-     *
-     * @param expected - the unexpected value as a function
-     * @returns a new CheckBuilderFinal
-     */
-    not(expected: SessionTo<X>): CheckBuilderFinal;
     /**
      * Validate the extracted value is not null
      *
@@ -113,10 +92,11 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
     /**
      * Validate the extracted value belongs to an expected set
      *
-     * @param expected - the set of possible values
+     * @param expectedOrFunction - either a single expected value or a function returning an array of expected values
+     * @param additionalValues - additional expected values (ignored if expectedOrFunction is a function)
      * @returns a new Final
      */
-    in(...expected: X[]): CheckBuilderFinal;
+    in(expectedOrFunction: X | SessionTo<X[]>, ...additionalValues: X[]): CheckBuilderFinal;
     /**
      * Validate the extracted value belongs to an expected set, passed as a Gatling Expression
      * Language String
@@ -125,13 +105,6 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     inEL(expected: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value belongs to an expected set, passed as a function
-     *
-     * @param expected - the set of possible values, as a function
-     * @returns a new CheckBuilderFinal
-     */
-    in(expected: SessionTo<X[]>): CheckBuilderFinal;
     /**
      * Validate the check was able to extract any value
      *
@@ -153,10 +126,10 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
     /**
      * Validate the extracted value is less than a given value
      *
-     * @param value - the value
+     * @param value - the value or a function returning the value
      * @returns a new CheckBuilderFinal
      */
-    lt(value: X): CheckBuilderFinal;
+    lt(value: X | ((session: Session) => X)): CheckBuilderFinal;
     /**
      * Validate the extracted value is less than a given value, passed as a Gatling Expression
      * Language String
@@ -165,20 +138,13 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     ltEL(value: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value is less than a given value, passed as a function
-     *
-     * @param value - the value, as a function
-     * @returns a new CheckBuilderFinal
-     */
-    lt(value: SessionTo<X>): CheckBuilderFinal;
     /**
      * Validate the extracted value is less than or equal to a given value
      *
-     * @param value - the value
+     * @param value - the value or a function returning the value
      * @returns a new CheckBuilderFinal
      */
-    lte(value: X): CheckBuilderFinal;
+    lte(value: X | ((session: Session) => X)): CheckBuilderFinal;
     /**
      * Validate the extracted value is less than or equal to a given value, passed as a Gatling
      * Expression Language String
@@ -187,20 +153,13 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     lteEL(value: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value is less than or equal to a given value, passed as a function
-     *
-     * @param value - the value, as a function
-     * @returns a new CheckBuilderFinal
-     */
-    lte(value: SessionTo<X>): CheckBuilderFinal;
     /**
      * Validate the extracted value is greater than a given value
      *
-     * @param value - the value
+     * @param value - the value or a function returning the value
      * @returns a new CheckBuilderFinal
      */
-    gt(value: X): CheckBuilderFinal;
+    gt(value: X | ((session: Session) => X)): CheckBuilderFinal;
     /**
      * Validate the extracted value is greater than a given value, passed as a Gatling Expression
      * Language String
@@ -209,20 +168,13 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     gtEL(value: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value is greater than a given value, passed as a function
-     *
-     * @param value - the value, as a function
-     * @returns a new CheckBuilderFinal
-     */
-    gt(value: SessionTo<X>): CheckBuilderFinal;
     /**
      * Validate the extracted value is greater than or equal to a given value
      *
-     * @param value - the value
+     * @param value - the value or a function returning the value
      * @returns a new CheckBuilderFinal
      */
-    gte(value: X): CheckBuilderFinal;
+    gte(value: X | ((session: Session) => X)): CheckBuilderFinal;
     /**
      * Validate the extracted value is greater than or equal to a given value, passed as a Gatling
      * Expression Language String
@@ -231,12 +183,5 @@ export interface CheckBuilderValidate<X> extends CheckBuilderFinal {
      * @returns a new CheckBuilderFinal
      */
     gteEL(value: string): CheckBuilderFinal;
-    /**
-     * Validate the extracted value is greater than or equal to a given value, passed as a function
-     *
-     * @param value - the value, as a function
-     * @returns a new CheckBuilderFinal
-     */
-    gte(value: SessionTo<X>): CheckBuilderFinal;
 }
 export declare const wrapCheckBuilderValidate: <X>(_underlying: JvmCheckBuilderValidate<X>) => CheckBuilderValidate<X>;

package/target/checks/validate.js

@@ -7,35 +7,29 @@ const wrapCheckBuilderValidate = (_underlying) => ({
     ...(0, final_1.wrapCheckBuilderFinal)(_underlying),
     transform: (f) => (0, exports.wrapCheckBuilderValidate)(_underlying.transform(f)),
     transformWithSession: (f) => (0, exports.wrapCheckBuilderValidate)(_underlying.transformWithSession((0, session_1.underlyingXWithSessionTo)(f))),
-    withDefault: (value) => (0, exports.wrapCheckBuilderValidate)(typeof value === "function"
-        ? _underlying.withDefault((0, session_1.underlyingSessionTo)(value))
-        : _underlying.withDefault(value)),
+    withDefault: (value) => (0, exports.wrapCheckBuilderValidate)((0, session_1.isSessionTo)(value) ? _underlying.withDefault((0, session_1.underlyingSessionTo)(value)) : _underlying.withDefault(value)),
     withDefaultEL: (value) => (0, exports.wrapCheckBuilderValidate)(_underlying.withDefaultEl(value)),
     validate: (name, f) => (0, final_1.wrapCheckBuilderFinal)(_underlying.validate(name, (0, session_1.underlyingXWithSessionTo)(f))),
-    is: (expected) => (0, final_1.wrapCheckBuilderFinal)(typeof expected === "function"
-        ? _underlying.is((0, session_1.underlyingSessionTo)(expected))
-        : _underlying.is(expected)),
+    is: (expected) => (0, final_1.wrapCheckBuilderFinal)((0, session_1.isSessionTo)(expected) ? _underlying.is((0, session_1.underlyingSessionTo)(expected)) : _underlying.is(expected)),
     isEL: (expected) => (0, final_1.wrapCheckBuilderFinal)(_underlying.isEL(expected)),
     isNull: () => (0, final_1.wrapCheckBuilderFinal)(_underlying.isNull()),
-    not: (expected) => (0, final_1.wrapCheckBuilderFinal)(typeof expected === "function"
-        ? _underlying.not((0, session_1.underlyingSessionTo)(expected))
-        : _underlying.not(expected)),
+    not: (expected) => (0, final_1.wrapCheckBuilderFinal)((0, session_1.isSessionTo)(expected) ? _underlying.not((0, session_1.underlyingSessionTo)(expected)) : _underlying.not(expected)),
     notEL: (expected) => (0, final_1.wrapCheckBuilderFinal)(_underlying.notEL(expected)),
     notNull: () => (0, final_1.wrapCheckBuilderFinal)(_underlying.notNull()),
-    in: (expected, ...rest) => (0, final_1.wrapCheckBuilderFinal)(typeof expected === "function"
-        ? _underlying.in((0, session_1.underlyingSessionTo)(expected))
-        : _underlying.in([expected, ...rest])),
+    in: (expectedOrFunction, ...additionalValues) => (0, final_1.wrapCheckBuilderFinal)(typeof expectedOrFunction === "function"
+        ? _underlying.in((0, session_1.underlyingSessionTo)(expectedOrFunction))
+        : _underlying.in([expectedOrFunction, ...additionalValues])),
     inEL: (expected) => (0, final_1.wrapCheckBuilderFinal)(_underlying.inEL(expected)),
     exists: () => (0, final_1.wrapCheckBuilderFinal)(_underlying.exists()),
     notExists: () => (0, final_1.wrapCheckBuilderFinal)(_underlying.notExists()),
     optional: () => (0, final_1.wrapCheckBuilderFinal)(_underlying.optional()),
-    lt: (value) => (0, final_1.wrapCheckBuilderFinal)(typeof value === "function" ? _underlying.lt((0, session_1.underlyingSessionTo)(value)) : _underlying.lt(value)),
+    lt: (value) => (0, final_1.wrapCheckBuilderFinal)((0, session_1.isSessionTo)(value) ? _underlying.lt((0, session_1.underlyingSessionTo)(value)) : _underlying.lt(value)),
     ltEL: (value) => (0, final_1.wrapCheckBuilderFinal)(_underlying.ltEL(value)),
-    lte: (value) => (0, final_1.wrapCheckBuilderFinal)(typeof value === "function" ? _underlying.lte((0, session_1.underlyingSessionTo)(value)) : _underlying.lte(value)),
+    lte: (value) => (0, final_1.wrapCheckBuilderFinal)((0, session_1.isSessionTo)(value) ? _underlying.lte((0, session_1.underlyingSessionTo)(value)) : _underlying.lte(value)),
     lteEL: (value) => (0, final_1.wrapCheckBuilderFinal)(_underlying.lteEL(value)),
-    gt: (value) => (0, final_1.wrapCheckBuilderFinal)(typeof value === "function" ? _underlying.gt((0, session_1.underlyingSessionTo)(value)) : _underlying.gt(value)),
+    gt: (value) => (0, final_1.wrapCheckBuilderFinal)((0, session_1.isSessionTo)(value) ? _underlying.gt((0, session_1.underlyingSessionTo)(value)) : _underlying.gt(value)),
     gtEL: (value) => (0, final_1.wrapCheckBuilderFinal)(_underlying.gtEL(value)),
-    gte: (value) => (0, final_1.wrapCheckBuilderFinal)(typeof value === "function" ? _underlying.gte((0, session_1.underlyingSessionTo)(value)) : _underlying.gte(value)),
+    gte: (value) => (0, final_1.wrapCheckBuilderFinal)((0, session_1.isSessionTo)(value) ? _underlying.gte((0, session_1.underlyingSessionTo)(value)) : _underlying.gte(value)),
     gteEL: (value) => (0, final_1.wrapCheckBuilderFinal)(_underlying.gteEL(value))
 });
 exports.wrapCheckBuilderValidate = wrapCheckBuilderValidate;

package/target/gatlingJvm/byteArrays.d.ts

@@ -2,4 +2,5 @@ import JvmSession = io.gatling.javaapi.core.Session;
 type JvmExpression<T> = (arg: JvmSession) => T;
 export declare const asByteArray: (v: number[]) => number[];
 export declare const asByteArrayFunction: (f: JvmExpression<number[]>) => JvmExpression<number[]>;
+export declare const asByteArrayMap: (map: Record<string, number[]>) => Record<string, number[]>;
 export {};

package/target/gatlingJvm/byteArrays.js

@@ -1,8 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asByteArrayFunction = exports.asByteArray = void 0;
+exports.asByteArrayMap = exports.asByteArrayFunction = exports.asByteArray = void 0;
 const ByteArrays = Java.type("io.gatling.js.callbacks.ByteArrays");
 const asByteArray = (v) => ByteArrays.asByteArray(v);
 exports.asByteArray = asByteArray;
 const asByteArrayFunction = (f) => ByteArrays.asByteArrayFunction(f);
 exports.asByteArrayFunction = asByteArrayFunction;
+const HashMap = Java.type("java.util.HashMap");
+const asByteArrayMap = (map) => {
+    const javaMap = new HashMap();
+    Object.entries(map).forEach(([key, value]) => {
+        javaMap.put(key, (0, exports.asByteArray)(value));
+    });
+    return javaMap;
+};
+exports.asByteArrayMap = asByteArrayMap;

package/target/index.d.ts

@@ -8,7 +8,7 @@ import { PopulationBuilder } from "./population";
 import { ProtocolBuilder } from "./protocol";
 import { ThrottleStep } from "./throttling";
 export { asJava } from "./gatlingJvm/collections";
-export { asByteArray, asByteArrayFunction } from "./gatlingJvm/byteArrays";
+export { asByteArray, asByteArrayFunction, asByteArrayMap } from "./gatlingJvm/byteArrays";
 export { readResourceAsBytes, readResourceAsString } from "./gatlingJvm/resources";
 export * from "./utils/duration";
 export * from "./assertions";

package/target/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simulation = exports.getEnvironmentVariable = exports.getOption = exports.getParameter = exports.GlobalStore = exports.dummy = exports.readResourceAsString = exports.readResourceAsBytes = exports.asByteArrayFunction = exports.asByteArray = exports.asJava = void 0;
+exports.simulation = exports.getEnvironmentVariable = exports.getOption = exports.getParameter = exports.GlobalStore = exports.dummy = exports.readResourceAsString = exports.readResourceAsBytes = exports.asByteArrayMap = exports.asByteArrayFunction = exports.asByteArray = exports.asJava = void 0;
 require("@gatling.io/jvm-types");
 const pauses_1 = require("./structure/pauses");
 const duration_1 = require("./utils/duration");
@@ -25,6 +25,7 @@ Object.defineProperty(exports, "asJava", { enumerable: true, get: function () {
 var byteArrays_1 = require("./gatlingJvm/byteArrays");
 Object.defineProperty(exports, "asByteArray", { enumerable: true, get: function () { return byteArrays_1.asByteArray; } });
 Object.defineProperty(exports, "asByteArrayFunction", { enumerable: true, get: function () { return byteArrays_1.asByteArrayFunction; } });
+Object.defineProperty(exports, "asByteArrayMap", { enumerable: true, get: function () { return byteArrays_1.asByteArrayMap; } });
 var resources_1 = require("./gatlingJvm/resources");
 Object.defineProperty(exports, "readResourceAsBytes", { enumerable: true, get: function () { return resources_1.readResourceAsBytes; } });
 Object.defineProperty(exports, "readResourceAsString", { enumerable: true, get: function () { return resources_1.readResourceAsString; } });

package/target/session.d.ts

@@ -110,8 +110,11 @@ export declare const wrapSession: (_underlying: JvmSession) => Session;
 export type Expression<T> = T | ((session: Session) => T);
 export type SessionTransform = (session: Session) => Session;
 export declare const underlyingSessionTransform: (f: SessionTransform) => ((jvmSession: JvmSession) => JvmSession);
+export type BiSessionTransform = (main: Session, forked: Session) => Session;
+export declare const underlyingBiSessionTransform: (f: BiSessionTransform) => ((jvmMain: JvmSession, jvmForked: JvmSession) => JvmSession);
 export type SessionTo<T> = (session: Session) => T;
 export declare const underlyingSessionTo: <T>(f: SessionTo<T>) => ((jvmSession: JvmSession) => T);
+export declare const isSessionTo: <T>(value: Expression<T>) => value is SessionTo<T>;
 export declare const underlyingSessionToJava: <T>(f: SessionTo<T>) => ((jvmSession: JvmSession) => unknown);
 export declare const underlyingSessionToDuration: (f: SessionTo<Duration>) => ((jvmSession: JvmSession) => java.time.Duration);
 export type XWithSessionTo<X, X2> = (x: X, session: Session) => X2;

package/target/session.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.underlyingJvmXToXWithSessionToSession = exports.underlyingXWithSessionToSession = exports.underlyingXWithSessionTo = exports.underlyingSessionToDuration = exports.underlyingSessionToJava = exports.underlyingSessionTo = exports.underlyingSessionTransform = exports.wrapSession = void 0;
+exports.underlyingJvmXToXWithSessionToSession = exports.underlyingXWithSessionToSession = exports.underlyingXWithSessionTo = exports.underlyingSessionToDuration = exports.underlyingSessionToJava = exports.isSessionTo = exports.underlyingSessionTo = exports.underlyingBiSessionTransform = exports.underlyingSessionTransform = exports.wrapSession = void 0;
 const byteArrays_1 = require("./gatlingJvm/byteArrays");
 const collections_1 = require("./gatlingJvm/collections");
 const duration_1 = require("./utils/duration");
 const wrapSession = (_underlying) => ({
     _underlying,
     get: (key) => _underlying.get(key),
+    // FIXME won't work on feeders
     set: (key, value) => {
         return (0, exports.wrapSession)(_underlying.set(key, (0, collections_1.asJava)(value)));
     },
+    // FIXME ???
     setByteArray: (key, value) => (0, exports.wrapSession)(_underlying.set(key, (0, byteArrays_1.asByteArray)(value))),
     setAll: (newAttributes) => {
         let session = _underlying;
@@ -33,8 +35,12 @@ const wrapSession = (_underlying) => ({
 exports.wrapSession = wrapSession;
 const underlyingSessionTransform = (f) => (jvmSession) => f((0, exports.wrapSession)(jvmSession))._underlying;
 exports.underlyingSessionTransform = underlyingSessionTransform;
+const underlyingBiSessionTransform = (f) => (jvmMain, jvmForked) => f((0, exports.wrapSession)(jvmMain), (0, exports.wrapSession)(jvmForked))._underlying;
+exports.underlyingBiSessionTransform = underlyingBiSessionTransform;
 const underlyingSessionTo = (f) => (jvmSession) => f((0, exports.wrapSession)(jvmSession));
 exports.underlyingSessionTo = underlyingSessionTo;
+const isSessionTo = (value) => typeof value === "function";
+exports.isSessionTo = isSessionTo;
 const underlyingSessionToJava = (f) => (jvmSession) => (0, collections_1.asJava)(f((0, exports.wrapSession)(jvmSession)));
 exports.underlyingSessionToJava = underlyingSessionToJava;
 const underlyingSessionToDuration = (f) => (jvmSession) => (0, duration_1.toJvmDuration)(f((0, exports.wrapSession)(jvmSession)));