@mablhq/mabl-cli 1.58.20 → 1.58.25

package/mablscript/MablAction.js

@@ -64,9 +64,8 @@ function argumentIsMablVariable(argument) {
 }
 exports.argumentIsMablVariable = argumentIsMablVariable;
 function parseArgument(arg) {
-    var _a;
     if (typeof arg === 'string') {
-        const name = (_a = MablSymbol_1.SINGLE_VARIABLE_PATTERN_REGEX.exec(arg)) === null || _a === void 0 ? void 0 : _a[1];
+        const name = MablSymbol_1.SINGLE_VARIABLE_PATTERN_REGEX.exec(arg)?.[1];
         if (name) {
             return new MablSymbol_1.MablSymbol(name);
         }
@@ -81,7 +80,7 @@ exports.distinctStrings = distinctStrings;
 function convertObjectToMablscriptArgs(objectArgs) {
     const mablArgs = Object.keys(objectArgs)
         .sort()
-        .filter((key) => (objectArgs === null || objectArgs === void 0 ? void 0 : objectArgs[key]) !== undefined)
+        .filter((key) => objectArgs?.[key] !== undefined)
         .map((key) => {
         switch (typeof objectArgs[key]) {
             case 'object':

package/mablscript/MablStep.js

@@ -47,8 +47,7 @@ class MablStep extends MablAction_1.MablAction {
         return this.stepSourceIndexInFlow;
     }
     getDescriptionForLogging() {
-        var _a;
-        return (((_a = this.annotation) === null || _a === void 0 ? void 0 : _a.description) || this.description || this.getStepName());
+        return (this.annotation?.description || this.description || this.getStepName());
     }
     substituteMablscriptVariable(argument) {
         if (argument instanceof MablSymbol_1.MablSymbol) {
@@ -70,8 +69,7 @@ class MablStep extends MablAction_1.MablAction {
         return formatted;
     }
     annotationsOnStep() {
-        var _a, _b;
-        return !!((_a = this.annotation) === null || _a === void 0 ? void 0 : _a.note) || !!((_b = this.annotation) === null || _b === void 0 ? void 0 : _b.description);
+        return !!this.annotation?.note || !!this.annotation?.description;
     }
     annotationsAsYml() {
         const result = {};

package/mablscript/MablSymbol.js

@@ -11,7 +11,7 @@ class MablSymbol {
     static fromString(formatted) {
         const regEx = '{{@(?<name>.*)}}';
         const found = formatted.match(regEx);
-        if (!found || !found.groups) {
+        if (!found?.groups) {
             throw new Error(`Invalid MablSymbol format: ${formatted}`);
         }
         const name = found.groups.name;

package/mablscript/actions/ConditionAction.js

@@ -30,7 +30,6 @@ class ConditionAction extends MablAction_1.MablAction {
         }
     }
     getEvaluateCondition() {
-        var _a;
         if (this.conditionValueAttribute === undefined) {
             throw new Error('Invalid equality condition. Missing value to compare.');
         }
@@ -38,7 +37,7 @@ class ConditionAction extends MablAction_1.MablAction {
             conditionType: ConditionDescriptor_1.ConditionType.Comparison,
             comparisonType: ConditionDescriptor_1.ComparisonType.fromString(this.conditionAttribute),
             comparatorValue: (0, MablAction_1.parseArgument)(this.conditionValueAttribute),
-            caseInsensitive: (_a = this.options) === null || _a === void 0 ? void 0 : _a.caseInsensitive,
+            caseInsensitive: this.options?.caseInsensitive,
         };
     }
     getEvaluatePresence() {
@@ -69,8 +68,7 @@ class ConditionAction extends MablAction_1.MablAction {
         return `${this.generateEvaluateConditionMablscript()}`;
     }
     getInputVariables() {
-        var _a;
-        return MablAction_1.MablAction.findUniqueVariableReferencesInValue((_a = this.conditionValueAttribute) !== null && _a !== void 0 ? _a : '');
+        return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.conditionValueAttribute ?? '');
     }
 }
 exports.ConditionAction = ConditionAction;

package/mablscript/actions/FindAction.js

@@ -132,7 +132,6 @@ class FindAction extends MablAction_1.MablAction {
         throw new Error('No selector found in yaml');
     }
     toYaml() {
-        var _a;
         const result = {};
         const find = this.toDescriptor();
         switch (find.findType) {
@@ -145,7 +144,7 @@ class FindAction extends MablAction_1.MablAction {
                 break;
             case domUtil_1.FindType.FIND_ONE:
                 result.selector = find.findTarget.selector;
-                if ((_a = find.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length) {
+                if (find.findTarget.auxiliaryDescriptors?.length) {
                     result.selectorAncestors = find.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
                 }
                 break;
@@ -158,13 +157,12 @@ class FindAction extends MablAction_1.MablAction {
         return this.generateFindMablscript();
     }
     generateFindMablscript() {
-        var _a;
         let action = this.findDescriptor.findType;
         let args = '';
         switch (this.findDescriptor.findType) {
             case domUtil_1.FindType.FIND_ONE:
                 const find = this.findDescriptor;
-                const selectors = ((_a = find.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length)
+                const selectors = find.findTarget.auxiliaryDescriptors?.length
                     ? '[' +
                         [find.findTarget, ...find.findTarget.auxiliaryDescriptors]
                             .map(mablscriptFind_1.buildFindDescriptorString)

package/mablscript/diffing/diffingUtil.js

@@ -46,7 +46,7 @@ function convertFlowToStepList(flow, flowConfig) {
     if (!flow.reusable && flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mablscript) {
         return (0, importer_1.parseMablScriptIntoSteps)(flow);
     }
-    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep(EvaluateFlowStep_1.EvaluateFlowStep.mablScriptStepNames[0], [{ invariant_id: flow === null || flow === void 0 ? void 0 : flow.invariant_id }, flowConfig], []);
+    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep(EvaluateFlowStep_1.EvaluateFlowStep.mablScriptStepNames[0], [{ invariant_id: flow?.invariant_id }, flowConfig], []);
     if (flow.description) {
         evaluateFlowStep.setDescription(flow.description);
     }
@@ -78,7 +78,7 @@ function convertStepListToFlow(steps) {
     const flow = {
         script: addTrailingNewline((0, importer_1.mablscriptTheLoadedSteps)(steps)),
         script_description: steps
-            .map((step) => { var _a; return (_a = step.getDescription()) !== null && _a !== void 0 ? _a : ''; })
+            .map((step) => step.getDescription() ?? '')
             .join('\n'),
         step_annotations: stepAnnotations,
     };
@@ -86,7 +86,7 @@ function convertStepListToFlow(steps) {
 }
 exports.convertStepListToFlow = convertStepListToFlow;
 function flattenTestFlowsIntoSteps(flows, flowConfigs) {
-    return flows.flatMap((flow, index) => convertFlowToStepList(flow, flowConfigs === null || flowConfigs === void 0 ? void 0 : flowConfigs[index]));
+    return flows.flatMap((flow, index) => convertFlowToStepList(flow, flowConfigs?.[index]));
 }
 exports.flattenTestFlowsIntoSteps = flattenTestFlowsIntoSteps;
 function constructTestFlowsFromSteps(steps) {
@@ -173,7 +173,6 @@ function diffTests(test1Flows, test1FlowConfig, test2Flows, test2FlowConfig) {
 }
 exports.diffTests = diffTests;
 function diffFlows(flow1, flow2) {
-    var _a, _b;
     const flow1Steps = (0, importer_1.parseMablScriptIntoSteps)(flow1);
     const formattedFlow1Steps = addTrailingNewline(flow1Steps.map((step) => step.toLineDiffFormat()).join('\n'));
     const flow2Steps = (0, importer_1.parseMablScriptIntoSteps)(flow2);
@@ -181,7 +180,7 @@ function diffFlows(flow1, flow2) {
     const flattenedDiffs = lineModeDiff(formattedFlow1Steps, formattedFlow2Steps);
     const stepDiffs = convertDiffingFormatIntoDiffingSteps(flattenedDiffs, flow1Steps, flow2Steps);
     const parametersDiff = diffFlowVariables(flow1.parameters, flow2.parameters);
-    const inputVariablesDiff = diffFlowVariables((_a = flow1.variables) === null || _a === void 0 ? void 0 : _a.inputs, (_b = flow2.variables) === null || _b === void 0 ? void 0 : _b.inputs);
+    const inputVariablesDiff = diffFlowVariables(flow1.variables?.inputs, flow2.variables?.inputs);
     return { stepDiff: stepDiffs, parametersDiff, inputVariablesDiff };
 }
 exports.diffFlows = diffFlows;
@@ -200,8 +199,10 @@ function diffFlowVariables(flow1Variables, flow2Variables) {
     return flowVariablesDiff;
 }
 function flattenFlowVariables(flowVariables) {
-    var _a;
-    return ((_a = flowVariables === null || flowVariables === void 0 ? void 0 : flowVariables.sort((a, b) => a.name.localeCompare(b.name)).map((parameter) => (0, fast_json_stable_stringify_1.default)(parameter)).join('\n')) !== null && _a !== void 0 ? _a : '');
+    return (flowVariables
+        ?.sort((a, b) => a.name.localeCompare(b.name))
+        .map((parameter) => (0, fast_json_stable_stringify_1.default)(parameter))
+        .join('\n') ?? '');
 }
 function addTrailingNewline(text) {
     if (!text) {

package/mablscript/importer.js

@@ -371,9 +371,8 @@ function parseMablScriptIntoSteps(flow) {
     const parsed = parseMablScript(updatedScript);
     const loadedSteps = loadMablScriptIntoSteps(parsed);
     loadedSteps.forEach((step, index) => {
-        var _a;
         step.setDescription(flowDescriptions[index]);
-        if ((_a = flow === null || flow === void 0 ? void 0 : flow.step_annotations) === null || _a === void 0 ? void 0 : _a[index]) {
+        if (flow?.step_annotations?.[index]) {
             step.setAnnotation(flow.step_annotations[index]);
         }
         step.setDisabled(disabledIndices.includes(index));

package/mablscript/steps/AccessibilityCheck.js

@@ -28,7 +28,6 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
         return AccessibilityCheckStep.yamlMablScriptNames[0];
     }
     toStepDescriptor() {
-        var _a, _b, _c, _d;
         if (this.findAction) {
             const find = this.findAction.toDescriptor();
             switch (find.findType) {
@@ -46,10 +45,10 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
             }
         }
         return {
-            tags: (_a = this.checkConfig) === null || _a === void 0 ? void 0 : _a.tags,
-            rules: (_b = this.checkConfig) === null || _b === void 0 ? void 0 : _b.rules,
-            disabledRules: (_c = this.checkConfig) === null || _c === void 0 ? void 0 : _c.disabledRules,
-            failOn: (_d = this.checkConfig) === null || _d === void 0 ? void 0 : _d.failOn,
+            tags: this.checkConfig?.tags,
+            rules: this.checkConfig?.rules,
+            disabledRules: this.checkConfig?.disabledRules,
+            failOn: this.checkConfig?.failOn,
         };
     }
     getFormattedStep(_fullLocatorsOn) {
@@ -83,11 +82,10 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
         return new AccessibilityCheckStep(AccessibilityCheckStep.mablScriptStepNames[0], [checkConfig], actions);
     }
     toMablscript() {
-        var _a, _b, _c;
         let argString = '';
-        if (((_a = this.checkConfig) === null || _a === void 0 ? void 0 : _a.tags) ||
-            ((_b = this.checkConfig) === null || _b === void 0 ? void 0 : _b.disabledRules) ||
-            ((_c = this.checkConfig) === null || _c === void 0 ? void 0 : _c.rules)) {
+        if (this.checkConfig?.tags ||
+            this.checkConfig?.disabledRules ||
+            this.checkConfig?.rules) {
             argString = `{${(0, MablStep_1.buildObjectString)(this.checkConfig)}}`;
         }
         let findAction = '';

package/mablscript/steps/AssertStep.js

@@ -43,7 +43,6 @@ exports.fieldToAssertionStep = {};
 Object.entries(exports.assertionStepToField).forEach(([stepType, field]) => (exports.fieldToAssertionStep[field] = stepType));
 class AssertStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        var _a, _b;
         super(name, args, actions);
         const firstAction = actions[0];
         if (firstAction instanceof FindAction_1.FindAction ||
@@ -74,9 +73,9 @@ class AssertStep extends MablStep_1.MablStep {
                 ? args[0]
                 : undefined;
         this.onFailure =
-            ((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
+            this.assertArguments?.onFailure ||
                 OnFailure.FailImmediately;
-        this.observationScope = (_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope;
+        this.observationScope = this.assertArguments?.observationScope;
     }
     canContinueOnFailure() {
         return this.onFailure !== OnFailure.FailImmediately;
@@ -92,10 +91,9 @@ class AssertStep extends MablStep_1.MablStep {
         }
     }
     determineIfWaitUntilStep() {
-        var _a, _b;
         const find = this.primaryAction.toDescriptor();
         if ((0, domUtil_1.isFindElementDescriptor)(find)) {
-            if ((_b = (_a = find.findOptions) === null || _a === void 0 ? void 0 : _a.waitUntil) === null || _b === void 0 ? void 0 : _b.timeoutSeconds) {
+            if (find.findOptions?.waitUntil?.timeoutSeconds) {
                 return true;
             }
         }
@@ -108,7 +106,6 @@ class AssertStep extends MablStep_1.MablStep {
         return exports.fieldToAssertionStep[this.assertionType];
     }
     toStepDescriptor() {
-        var _a, _b;
         const find = this.primaryAction.toDescriptor();
         const descriptorToActionMap = new Map()
             .set(find, this.primaryAction)
@@ -121,9 +118,9 @@ class AssertStep extends MablStep_1.MablStep {
         }
         return {
             find,
-            extractDescriptor: (_a = this.extractAction) === null || _a === void 0 ? void 0 : _a.extractDescriptor,
+            extractDescriptor: this.extractAction?.extractDescriptor,
             conditionDescriptor: this.conditionAction.conditionDescriptor,
-            countDescriptor: (_b = this.countAction) === null || _b === void 0 ? void 0 : _b.countDescriptor,
+            countDescriptor: this.countAction?.countDescriptor,
             onFailure: this.onFailure,
             observationScope: this.observationScope,
             descriptorToActionMap,
@@ -219,14 +216,13 @@ class AssertStep extends MablStep_1.MablStep {
         ], actions);
     }
     toMablscript() {
-        var _a, _b, _c, _d;
-        const assertAction = `.assert(${!!(((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
-            ((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope))
+        const assertAction = `.assert(${!!(this.assertArguments?.onFailure ||
+            this.assertArguments?.observationScope)
             ? (0, MablAction_1.convertObjectToMablscriptArgs)({
                 ...this.assertArguments,
-                onFailure: ((_c = this.assertArguments) === null || _c === void 0 ? void 0 : _c.onFailure) === OnFailure.FailImmediately
+                onFailure: this.assertArguments?.onFailure === OnFailure.FailImmediately
                     ? undefined
-                    : (_d = this.assertArguments) === null || _d === void 0 ? void 0 : _d.onFailure,
+                    : this.assertArguments?.onFailure,
             })
             : ''})`;
         if (this.countAction) {
@@ -242,12 +238,11 @@ class AssertStep extends MablStep_1.MablStep {
         return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
     }
     getInputVariables() {
-        var _a, _b, _c, _d;
         return (0, MablAction_1.distinctStrings)([
             ...this.primaryAction.getInputVariables(),
-            ...((_b = (_a = this.countAction) === null || _a === void 0 ? void 0 : _a.getInputVariables()) !== null && _b !== void 0 ? _b : []),
+            ...(this.countAction?.getInputVariables() ?? []),
             ...this.conditionAction.getInputVariables(),
-            ...((_d = (_c = this.extractAction) === null || _c === void 0 ? void 0 : _c.getInputVariables()) !== null && _d !== void 0 ? _d : []),
+            ...(this.extractAction?.getInputVariables() ?? []),
         ]);
     }
 }

package/mablscript/steps/ClickAndHoldStep.js

@@ -7,10 +7,9 @@ const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class ClickAndHoldStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        var _a;
         super(name, args, actions);
         this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
-        this.clickArgs = (_a = this.parseArgs(args)) !== null && _a !== void 0 ? _a : { isHtml5: false };
+        this.clickArgs = this.parseArgs(args) ?? { isHtml5: false };
     }
     parseArgs(args) {
         if (args.length === 0) {

package/mablscript/steps/CookieUtils.js

@@ -3,19 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CookieUtils = void 0;
 var CookieUtils;
 (function (CookieUtils) {
-    const validCharacterRange = /^[\x21-\x7E]*$/;
-    const invalidCharaters = /[()<>@,;:\\"\\/\[\]?={}]/;
+    CookieUtils.validCookieNameCharacterRange = /^[\x21-\x7E]*$/;
+    CookieUtils.invalidCookieNameCharaters = /[()<>@,;:\\"\\/\[\]?={}]/;
+    CookieUtils.validCookieValueCharacters = /^(!|[\x23-\x2B]|[\x2D-\x3A]|[\x3C-\x5B]|[\x5D-\x7E])*$/;
+    function validateCookieName(name) {
+        const trimmed = name.trim();
+        if ('' === trimmed) {
+            return false;
+        }
+        if (!CookieUtils.validCookieNameCharacterRange.test(trimmed) ||
+            CookieUtils.invalidCookieNameCharaters.test(trimmed)) {
+            return false;
+        }
+        return true;
+    }
+    CookieUtils.validateCookieName = validateCookieName;
     function normalizeName(name) {
         const trimmed = name.trim();
         if ('' === trimmed) {
             throw new Error('Cookie name cannot be empty or include only whitespace characters');
         }
-        if (!validCharacterRange.test(trimmed) || invalidCharaters.test(trimmed)) {
-            throw new Error(`Invalid characters found in cookie name [${trimmed}]. Valid characters
-        include any US-ASCII character except control characters and separators.
-        `);
-        }
         return trimmed;
     }
     CookieUtils.normalizeName = normalizeName;
+    function validateCookieValue(value) {
+        const trimmed = value.trim();
+        if ('' === trimmed) {
+            return false;
+        }
+        if (!CookieUtils.validCookieValueCharacters.test(trimmed)) {
+            return false;
+        }
+        return true;
+    }
+    CookieUtils.validateCookieValue = validateCookieValue;
+    function normalizeValue(value) {
+        if (!value) {
+            throw new Error('Cookie value cannot be empty');
+        }
+        const trimmed = value.trim();
+        const bareValue = trimmed.startsWith('"') && trimmed.endsWith('"')
+            ? trimmed.substring(1, trimmed.length - 1)
+            : trimmed;
+        if ('' === bareValue) {
+            throw new Error('Cookie value cannot be empty or include only whitespace characters');
+        }
+        return trimmed;
+    }
+    CookieUtils.normalizeValue = normalizeValue;
 })(CookieUtils = exports.CookieUtils || (exports.CookieUtils = {}));

package/mablscript/steps/CreateVariableStep.js

@@ -101,7 +101,6 @@ class CreateVariableStep extends MablStep_1.MablStep {
         return step;
     }
     getFormattedStep() {
-        var _a;
         const step = this.toStepDescriptor();
         const stepName = this.getStepName();
         const formatted = {
@@ -128,7 +127,7 @@ class CreateVariableStep extends MablStep_1.MablStep {
                     generator: step.generator,
                     name: this.variableName,
                     selector: step.generator.find.findTarget.selector,
-                    selectorAncestors: ((_a = step.generator.find.findTarget.auxiliaryDescriptors) !== null && _a !== void 0 ? _a : []).map((descriptor) => descriptor.selector),
+                    selectorAncestors: (step.generator.find.findTarget.auxiliaryDescriptors ?? []).map((descriptor) => descriptor.selector),
                 };
                 break;
             case CreateVariableStepDescriptor_1.VariableGenerator.JAVASCRIPT:

package/mablscript/steps/DownloadStep.js

@@ -8,10 +8,9 @@ const AwaitPDFDownloadAction_1 = require("../actions/AwaitPDFDownloadAction");
 const domUtil_1 = require("../../domUtil");
 class DownloadStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        var _a;
         super(name, args, actions);
         this.validate();
-        this.fileAttributes = ((_a = this.getActionArgs()[0]) !== null && _a !== void 0 ? _a : {});
+        this.fileAttributes = (this.getActionArgs()[0] ?? {});
         this.awaitDownloadAction = this.actions[0];
     }
     validate() {

package/mablscript/steps/EnterTextStep.js

@@ -43,7 +43,6 @@ class EnterTextStep extends MablStep_1.MablStep {
         }
     }
     getFormattedStep() {
-        var _a;
         const step = this.toStepDescriptor();
         const stepName = this.getStepName();
         const formatted = {
@@ -57,7 +56,7 @@ class EnterTextStep extends MablStep_1.MablStep {
         }
         if (step.find.findType === domUtil_1.FindType.FIND_ONE) {
             formatted[stepName].selector = step.find.findTarget.selector;
-            if ((_a = step.find.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length) {
+            if (step.find.findTarget.auxiliaryDescriptors?.length) {
                 formatted[stepName].selectorAncestors =
                     step.find.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
             }

package/mablscript/steps/EvaluateFlowStep.js

@@ -43,6 +43,6 @@ exports.EvaluateFlowStep = EvaluateFlowStep;
 EvaluateFlowStep.mablScriptStepNames = ['evaluate_flow'];
 EvaluateFlowStep.yamlMablScriptNames = [exports.EVALUATE_FLOW_STEP_NAME];
 function isEvaluateFlowStep(step) {
-    return (step === null || step === void 0 ? void 0 : step.getStepName()) === exports.EVALUATE_FLOW_STEP_NAME;
+    return step?.getStepName() === exports.EVALUATE_FLOW_STEP_NAME;
 }
 exports.isEvaluateFlowStep = isEvaluateFlowStep;

package/mablscript/steps/IfConditionStep.js

@@ -33,14 +33,13 @@ class IfConditionStep extends MablStep_1.MablStep {
         return 'If';
     }
     toStepDescriptor() {
-        var _a, _b;
         const conditionDescriptor = this.conditionAction !== undefined
-            ? (_a = this.conditionAction) === null || _a === void 0 ? void 0 : _a.conditionDescriptor
+            ? this.conditionAction?.conditionDescriptor
             : { conditionType: ConditionDescriptor_1.ConditionType.Truthy };
         const find = this.primaryAction.toDescriptor();
         return {
             find,
-            extractDescriptor: (_b = this.extractAction) === null || _b === void 0 ? void 0 : _b.extractDescriptor,
+            extractDescriptor: this.extractAction?.extractDescriptor,
             conditionDescriptor,
             onFailure: AssertStep_1.OnFailure.FailImmediately,
             descriptorToActionMap: new Map().set(find, this.primaryAction),
@@ -137,11 +136,10 @@ class IfConditionStep extends MablStep_1.MablStep {
         return `${this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '')}conditional_if()`;
     }
     getInputVariables() {
-        var _a, _b, _c, _d;
         return (0, MablAction_1.distinctStrings)([
             ...this.primaryAction.getInputVariables(),
-            ...((_b = (_a = this.conditionAction) === null || _a === void 0 ? void 0 : _a.getInputVariables()) !== null && _b !== void 0 ? _b : []),
-            ...((_d = (_c = this.extractAction) === null || _c === void 0 ? void 0 : _c.getInputVariables()) !== null && _d !== void 0 ? _d : []),
+            ...(this.conditionAction?.getInputVariables() ?? []),
+            ...(this.extractAction?.getInputVariables() ?? []),
         ]);
     }
 }

package/mablscript/steps/ReleaseStep.js

@@ -8,10 +8,9 @@ const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class ReleaseStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        var _a;
         super(name, args, actions);
         this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
-        this.releaseArgs = (_a = this.parseArgs(args)) !== null && _a !== void 0 ? _a : { isHtml5: false };
+        this.releaseArgs = this.parseArgs(args) ?? { isHtml5: false };
     }
     parseArgs(args) {
         if (args.length === 0) {

package/mablscript/steps/SendHttpRequestStep.js

@@ -27,10 +27,9 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
         return formatted;
     }
     static fromYaml(_stepName, stepArgs) {
-        var _a;
         const formatted = stepArgs;
         if (formatted.assertions) {
-            formatted.assertions = (_a = formatted.assertions) === null || _a === void 0 ? void 0 : _a.map((assertion) => ({
+            formatted.assertions = formatted.assertions?.map((assertion) => ({
                 ...assertion,
                 assertion: AssertStep_1.assertionStepToField[`Assert${assertion.assertion}`],
             }));
@@ -47,8 +46,7 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
         return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.sendRequest);
     }
     getOutputVariables() {
-        var _a, _b;
-        return (_b = (_a = this.sendRequest.variables) === null || _a === void 0 ? void 0 : _a.map((variable) => variable.name)) !== null && _b !== void 0 ? _b : [];
+        return this.sendRequest.variables?.map((variable) => variable.name) ?? [];
     }
 }
 exports.SendHttpRequestStep = SendHttpRequestStep;

package/mablscript/steps/SendKeyStep.js

@@ -19,7 +19,7 @@ class SendKeyStep extends MablStep_1.MablStep {
             throw new Error(`Unexpected find action for ${name} step: ${JSON.stringify(this.actions[0])}`);
         }
         const keys = this.getActionArgs();
-        if (!(keys === null || keys === void 0 ? void 0 : keys.length)) {
+        if (!keys?.length) {
             throw new Error(`${name} step expects at least one key`);
         }
         if (keys.every(SendKeyStepDescriptor_1.isCrossPlatformKeyPress)) {

package/mablscript/steps/SetCookieStep.js

@@ -5,24 +5,54 @@ const MablStep_1 = require("../MablStep");
 const MablAction_1 = require("../MablAction");
 const CookieUtils_1 = require("./CookieUtils");
 const domUtil_1 = require("../../domUtil");
-const validValueCharacters = /^(!|[\x23-\x2B]|[\x2D-\x3A]|[\x3C-\x5B]|[\x5D-\x7E])*$/;
 class SetCookieStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
-        this.cookieName = CookieUtils_1.CookieUtils.normalizeName(this.getActionArgs()[0].name);
-        this.cookieValue = SetCookieStep.normalizeValue(this.getActionArgs()[0].value);
+        const cookieSelector = this.getActionArgs()[0];
+        this.cookieName = CookieUtils_1.CookieUtils.normalizeName(cookieSelector.name);
+        this.cookieValue = CookieUtils_1.CookieUtils.normalizeValue(cookieSelector.value);
+        const cookieOptions = {
+            domain: cookieSelector.domain,
+            path: cookieSelector.path,
+            expires: cookieSelector.expiry,
+            httpOnly: cookieSelector.http_only,
+            secure: cookieSelector.secure,
+            sameSite: cookieSelector.same_site,
+            url: cookieSelector.url,
+        };
+        if (Object.values(cookieOptions).filter((optionValue) => optionValue !== undefined).length > 0) {
+            this.cookieOptions = cookieOptions;
+        }
     }
     getStepName() {
         return 'SetCookie';
     }
     toStepDescriptor() {
-        return { name: this.cookieName, value: this.cookieValue };
+        return {
+            name: this.cookieName,
+            value: this.cookieValue,
+            options: this.cookieOptions,
+        };
     }
     static fromYaml(_stepName, stepArgs) {
         return new SetCookieStep('set_cookie', [stepArgs], []);
     }
     toMablscript() {
-        return `set_cookie({ name : "${(0, domUtil_1.escapeMablscriptString)(this.cookieName)}", value : "${(0, domUtil_1.escapeMablscriptString)(this.cookieValue)}" })`;
+        const cookieSelector = {
+            name: this.cookieName,
+            value: this.cookieValue,
+            domain: this.cookieOptions?.domain,
+            path: this.cookieOptions?.path,
+            expiry: this.cookieOptions?.expires,
+            http_only: this.cookieOptions?.httpOnly,
+            secure: this.cookieOptions?.secure,
+            same_site: this.cookieOptions?.sameSite,
+            url: this.cookieOptions?.url,
+        };
+        return `set_cookie(${(0, domUtil_1.buildStepArgumentString)({
+            params: cookieSelector,
+            legacy: false,
+        })})`;
     }
     getInputVariables() {
         return (0, MablAction_1.distinctStrings)([
@@ -30,21 +60,6 @@ class SetCookieStep extends MablStep_1.MablStep {
             ...MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.cookieValue),
         ]);
     }
-    static normalizeValue(value) {
-        const trimmed = value.trim();
-        const bareValue = trimmed.startsWith('"') && trimmed.endsWith('"')
-            ? trimmed.substring(1, trimmed.length - 1)
-            : trimmed;
-        if ('' === bareValue) {
-            throw new Error('Cookie value cannot be empty or include only whitespace characters');
-        }
-        if (!validValueCharacters.test(bareValue)) {
-            throw new Error(`Invalid characters found in cookie value [${bareValue}].
-        Valid characters include US-ASCII characters excluding control
-        characters, whitespace, double-quote, comma, semicolon, and backslash.`);
-        }
-        return trimmed;
-    }
 }
 exports.SetCookieStep = SetCookieStep;
 SetCookieStep.mablScriptStepNames = ['set_cookie'];

package/mablscript/steps/SetViewportStep.js

@@ -6,7 +6,7 @@ class SetViewportStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
         const viewportArg = this.getActionArgs()[0];
-        this.size = viewportArg === null || viewportArg === void 0 ? void 0 : viewportArg.size;
+        this.size = viewportArg?.size;
     }
     getStepName() {
         return 'SetViewport';

package/mablscript/steps/SwitchContextStep.js

@@ -60,7 +60,6 @@ class SwitchContextStep extends MablStep_1.MablStep {
         return this.switch;
     }
     getFormattedStep() {
-        var _a;
         const step = this.toStepDescriptor();
         const stepName = this.getStepName();
         const formatted = {
@@ -78,7 +77,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
         }
         if ((0, SwitchContextStepDescriptor_1.isSwitchFrame)(step)) {
             formatted[stepName].selector = step.frame.findTarget.selector;
-            if ((_a = step.frame.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length) {
+            if (step.frame.findTarget.auxiliaryDescriptors?.length) {
                 formatted[stepName].selectorAncestors =
                     step.frame.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
             }
@@ -95,15 +94,13 @@ class SwitchContextStep extends MablStep_1.MablStep {
         return new SwitchContextStep('switch_context_to', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        var _a;
         if ((0, SwitchContextStepDescriptor_1.isSwitchRoot)(this.switch) && this.switch.frame === 'root') {
             return 'switch_context_to("root")';
         }
-        return `${(_a = this.findAction) === null || _a === void 0 ? void 0 : _a.toMablscript()}.switch_context_to()`;
+        return `${this.findAction?.toMablscript()}.switch_context_to()`;
     }
     getInputVariables() {
-        var _a, _b;
-        return (_b = (_a = this.findAction) === null || _a === void 0 ? void 0 : _a.getInputVariables()) !== null && _b !== void 0 ? _b : [];
+        return this.findAction?.getInputVariables() ?? [];
     }
 }
 exports.SwitchContextStep = SwitchContextStep;