@gatling.io/core 3.11.4-M2 → 3.11.5

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@gatling.io/core",
-  "version": "3.11.4-M2",
+  "version": "3.11.5",
   "license": "Apache-2.0",
   "main": "target/index.js",
   "types": "target/index.d.ts",
   "dependencies": {
-    "@gatling.io/jvm-types": "3.11.4-M2"
+    "@gatling.io/jvm-types": "3.11.5"
   },
   "devDependencies": {
     "@types/jest": "29.5.12",
     "jest": "29.7.0",
-    "prettier": "3.2.5",
+    "prettier": "3.3.2",
     "rimraf": "5.0.7",
-    "ts-jest": "29.1.2",
+    "ts-jest": "29.1.5",
     "ts-node": "10.9.2",
     "typescript": "5.4.5"
   },

package/target/body.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ByteArrayBody = exports.PebbleFileBody = exports.PebbleStringBody = exports.ElFileBody = exports.RawFileBody = exports.StringBody = void 0;
 const jvm_types_1 = require("@gatling.io/jvm-types");
+const byteArrays_1 = require("./gatlingJvm/byteArrays");
 const session_1 = require("./session");
 const wrapBodyWithBytes = (_underlying) => Object.assign((session) => _underlying.apply(session._underlying), { _underlying });
 const wrapBodyWithString = (_underlying) => Object.assign((session) => _underlying.apply(session._underlying), { _underlying });
@@ -22,7 +23,7 @@ const PebbleFileBody = (filePath) => wrapBodyWithString(typeof filePath === "fun
     : jvm_types_1.CoreDsl.PebbleFileBody(filePath));
 exports.PebbleFileBody = PebbleFileBody;
 const ByteArrayBody = (bytes) => wrapBodyWithBytes(typeof bytes === "function"
-    ? jvm_types_1.CoreDsl.ByteArrayBody((0, session_1.underlyingSessionTo)(bytes))
+    ? jvm_types_1.CoreDsl.ByteArrayBody((0, byteArrays_1.asByteArrayFunction)((0, session_1.underlyingSessionTo)(bytes)))
     : typeof bytes === "string"
         ? jvm_types_1.CoreDsl.ByteArrayBody(bytes)
         : jvm_types_1.CoreDsl.ByteArrayBody(bytes));

package/target/checks/index.js

@@ -18,6 +18,7 @@ exports.responseTimeInMillis = exports.sha1 = exports.md5 = exports.regex = expo
 const jvm_types_1 = require("@gatling.io/jvm-types");
 const session_1 = require("../session");
 const captureGroup_1 = require("./captureGroup");
+const byteArrays_1 = require("../gatlingJvm/byteArrays");
 const final_1 = require("./final");
 const find_1 = require("./find");
 const jsonOfTypeFind_1 = require("./jsonOfTypeFind");
@@ -57,11 +58,11 @@ exports.bodyString = bodyString;
 const bodyBytes = () => ({
     ...(0, find_1.wrapCheckBuilderFind)(jvm_types_1.CoreDsl.bodyBytes()),
     is: (expected) => (0, final_1.wrapCheckBuilderFinal)(typeof expected === "function"
-        ? jvm_types_1.CoreDsl.bodyBytes().is((0, session_1.underlyingSessionTo)(expected))
-        : jvm_types_1.CoreDsl.bodyBytes().is(expected)),
+        ? 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))),
     not: (expected) => (0, final_1.wrapCheckBuilderFinal)(typeof expected === "function"
-        ? jvm_types_1.CoreDsl.bodyBytes().not((0, session_1.underlyingSessionTo)(expected))
-        : jvm_types_1.CoreDsl.bodyBytes().not(expected))
+        ? jvm_types_1.CoreDsl.bodyBytes().not((0, byteArrays_1.asByteArrayFunction)((0, session_1.underlyingSessionTo)(expected)))
+        : jvm_types_1.CoreDsl.bodyBytes().not((0, byteArrays_1.asByteArray)(expected)))
 });
 exports.bodyBytes = bodyBytes;
 /**

package/target/gatlingJvm/byteArrays.d.ts

@@ -0,0 +1,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 {};

package/target/gatlingJvm/byteArrays.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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;

package/target/index.d.ts

@@ -7,6 +7,7 @@ import { Assertion } from "./assertions";
 import { PopulationBuilder } from "./population";
 import { ProtocolBuilder } from "./protocol";
 import { ThrottleStep } from "./throttling";
+export { asByteArray, asByteArrayFunction } from "./gatlingJvm/byteArrays";
 export * from "./utils/duration";
 export * from "./assertions";
 export * from "./body";
@@ -18,6 +19,7 @@ export * from "./filters";
 export { GlobalStore } from "./globalStore";
 export * from "./openInjection";
 export * from "./population";
+export { getOption, getEnvironmentVariable, GetWithDefault } from "./parameters";
 export * from "./protocol";
 export * from "./scenario";
 export * from "./session";

package/target/index.js

@@ -14,12 +14,15 @@ 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.GlobalStore = void 0;
+exports.simulation = exports.getEnvironmentVariable = exports.getOption = exports.GlobalStore = exports.asByteArrayFunction = exports.asByteArray = void 0;
 require("@gatling.io/jvm-types");
 const pauses_1 = require("./structure/pauses");
 const duration_1 = require("./utils/duration");
 const session_1 = require("./session");
 // FIXME no export *
+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; } });
 __exportStar(require("./utils/duration"), exports);
 __exportStar(require("./assertions"), exports);
 __exportStar(require("./body"), exports);
@@ -32,6 +35,9 @@ var globalStore_1 = require("./globalStore");
 Object.defineProperty(exports, "GlobalStore", { enumerable: true, get: function () { return globalStore_1.GlobalStore; } });
 __exportStar(require("./openInjection"), exports);
 __exportStar(require("./population"), exports);
+var parameters_1 = require("./parameters");
+Object.defineProperty(exports, "getOption", { enumerable: true, get: function () { return parameters_1.getOption; } });
+Object.defineProperty(exports, "getEnvironmentVariable", { enumerable: true, get: function () { return parameters_1.getEnvironmentVariable; } });
 __exportStar(require("./protocol"), exports);
 __exportStar(require("./scenario"), exports);
 __exportStar(require("./session"), exports);

package/target/parameters.d.ts

@@ -0,0 +1,23 @@
+export interface GetWithDefault {
+    (name: string): string | undefined;
+    (name: string, defaultValue: string): string;
+}
+/**
+ * Gets the option indicated by the specified name.
+ *
+ * Options can be specified in the `gatling run` command by passing arguments with the format `key=value`, e.g.
+ * `gatling run option1=foo option2=bar`.
+ *
+ * @param key - the key of the option.
+ * @param defaultValue - a default value
+ * @returns the string value of the option if it is defined, or else `defaultValue` if provided, or else `undefined`.
+ */
+export declare const getOption: GetWithDefault;
+/**
+ * Gets the environment variable indicated by the specified name.
+ *
+ * @param name - the name of the environment variable.
+ * @param defaultValue - a default value
+ * @returns the string value of the environment variable if it is defined, or else `defaultValue` if provided, or else `undefined`.
+ */
+export declare const getEnvironmentVariable: GetWithDefault;

package/target/parameters.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnvironmentVariable = exports.getOption = void 0;
+const jvm_types_1 = require("@gatling.io/jvm-types");
+/**
+ * Gets the option indicated by the specified name.
+ *
+ * Options can be specified in the `gatling run` command by passing arguments with the format `key=value`, e.g.
+ * `gatling run option1=foo option2=bar`.
+ *
+ * @param key - the key of the option.
+ * @param defaultValue - a default value
+ * @returns the string value of the option if it is defined, or else `defaultValue` if provided, or else `undefined`.
+ */
+const getOption = (key, defaultValue) => getOrElse(jvm_types_1.System.getProperty(key), defaultValue);
+exports.getOption = getOption;
+/**
+ * Gets the environment variable indicated by the specified name.
+ *
+ * @param name - the name of the environment variable.
+ * @param defaultValue - a default value
+ * @returns the string value of the environment variable if it is defined, or else `defaultValue` if provided, or else `undefined`.
+ */
+const getEnvironmentVariable = (name, defaultValue) => getOrElse(jvm_types_1.System.getenv(name), defaultValue);
+exports.getEnvironmentVariable = getEnvironmentVariable;
+const getOrElse = (value, defaultValue) => typeof value === "string" ? value : defaultValue;

package/target/session.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.underlyingXWithSessionTo = exports.underlyingSessionToDuration = exports.underlyingSessionToJava = exports.underlyingSessionTo = 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) => ({
@@ -9,7 +10,7 @@ const wrapSession = (_underlying) => ({
     set: (key, value) => {
         return (0, exports.wrapSession)(_underlying.set(key, (0, collections_1.asJava)(value)));
     },
-    setByteArray: (key, value) => (0, exports.wrapSession)(_underlying.set(key, value)),
+    setByteArray: (key, value) => (0, exports.wrapSession)(_underlying.set(key, (0, byteArrays_1.asByteArray)(value))),
     setAll: (newAttributes) => {
         let session = _underlying;
         for (const key in newAttributes) {