@mablhq/mabl-cli 1.58.20 → 1.58.28

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 === null || found === void 0 ? void 0 : found.groups)) {
             throw new Error(`Invalid MablSymbol format: ${formatted}`);
         }
         const name = found.groups.name;

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/SetCookieStep.js

@@ -5,24 +5,55 @@ 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)}" })`;
+        var _a, _b, _c, _d, _e, _f, _g;
+        const cookieSelector = {
+            name: this.cookieName,
+            value: this.cookieValue,
+            domain: (_a = this.cookieOptions) === null || _a === void 0 ? void 0 : _a.domain,
+            path: (_b = this.cookieOptions) === null || _b === void 0 ? void 0 : _b.path,
+            expiry: (_c = this.cookieOptions) === null || _c === void 0 ? void 0 : _c.expires,
+            http_only: (_d = this.cookieOptions) === null || _d === void 0 ? void 0 : _d.httpOnly,
+            secure: (_e = this.cookieOptions) === null || _e === void 0 ? void 0 : _e.secure,
+            same_site: (_f = this.cookieOptions) === null || _f === void 0 ? void 0 : _f.sameSite,
+            url: (_g = this.cookieOptions) === null || _g === void 0 ? void 0 : _g.url,
+        };
+        return `set_cookie(${(0, domUtil_1.buildStepArgumentString)({
+            params: cookieSelector,
+            legacy: false,
+        })})`;
     }
     getInputVariables() {
         return (0, MablAction_1.distinctStrings)([
@@ -30,21 +61,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'];