@mablhq/mabl-cli 1.16.32 → 1.18.3

package/mablscript/steps/SendKeyStep.js

@@ -4,7 +4,7 @@ exports.SendKeyStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const SendKeyStepDescriptor_1 = require("../types/SendKeyStepDescriptor");
 const STEP_NAME = 'SendKeys';
 const SEL_IDE_KEYS = {
@@ -35,7 +35,7 @@ class SendKeyStep extends MablStep_1.MablStep {
         if (this.actions.length !== 1 && !(this.actions[0] instanceof FindAction_1.FindAction)) {
             throw new Error(`${name} step should have one sub-action and it should be a find`);
         }
-        if (mablscriptFind_1.isFindElementType(this.actions[0].getActionName())) {
+        if ((0, domUtil_1.isFindElementType)(this.actions[0].getActionName())) {
             this.findAction = this.actions[0];
         }
         else {
@@ -58,10 +58,10 @@ class SendKeyStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     keys: this.keys,
@@ -81,7 +81,7 @@ class SendKeyStep extends MablStep_1.MablStep {
         };
     }
     produceSelIdeFormattedSteps() {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('sendKeys', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('sendKeys', this);
         seleniumStep.target = this.findAction.getSelIdeTarget();
         seleniumStep.value = this.keys
             .map((keyPress) => {
@@ -100,8 +100,8 @@ class SendKeyStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         const keysToSend = this.keys
-            .map((key) => this.convertObjectToMablscriptArgs(key))
-            .join(', ');
+            .map((key) => (0, domUtil_1.buildStepArgumentString)(key))
+            .join();
         return `${this.findAction.toMablscript()}.send_keys(${keysToSend})`;
     }
 }

package/mablscript/steps/SetCookieStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetCookieStep = void 0;
 const MablStep_1 = require("../MablStep");
 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) {
@@ -20,10 +21,7 @@ class SetCookieStep extends MablStep_1.MablStep {
         return new SetCookieStep('set_cookie', [stepArgs], []);
     }
     toMablscript() {
-        return `set_cookie(${this.convertObjectToMablscriptArgs({
-            name: this.cookieName,
-            value: this.cookieValue,
-        })})`;
+        return `set_cookie({ name : "${(0, domUtil_1.escapeMablscriptString)(this.cookieName)}", value : "${(0, domUtil_1.escapeMablscriptString)(this.cookieValue)}" })`;
     }
     static normalizeValue(value) {
         const trimmed = value.trim();

package/mablscript/steps/SetFilesStep.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetFilesStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class SetFilesStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -24,10 +24,10 @@ class SetFilesStep extends MablStep_1.MablStep {
         formatted.files = this.files;
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 formatted.find = find;
                 formatted.descriptorToActionMap = new Map().set(find, this.findAction);
                 return formatted;

package/mablscript/steps/SetViewportStep.js

@@ -16,7 +16,7 @@ class SetViewportStep extends MablStep_1.MablStep {
         return { size: this.size };
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('setWindowSize', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('setWindowSize', this);
         const width = this.size.width || 1920;
         const height = this.size.height || 1080;
         seleniumStep.target = this.substituteSeleniumVariable(`${width}x${height}`);
@@ -28,7 +28,7 @@ class SetViewportStep extends MablStep_1.MablStep {
     toMablscript() {
         let sizeArg;
         if (this.size.height && this.size.width) {
-            sizeArg = `{ size : { width : ${this.size.width}, height: ${this.size.height} } }`;
+            sizeArg = `{ size : { width : ${this.size.width}, height : ${this.size.height} } }`;
         }
         else if (this.size.width) {
             sizeArg = `{ size : { width : ${this.size.width} } }`;

package/mablscript/steps/SwitchContextStep.js

@@ -5,7 +5,7 @@ const FindAction_1 = require("../actions/FindAction");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablStep_1 = require("../MablStep");
 const SwitchContextStepDescriptor_1 = require("../types/SwitchContextStepDescriptor");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class SwitchContextStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -28,7 +28,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
             this.findAction.setActionSourceIndexInStep(this.actions[0].actionSourceIndexInStep);
         }
         const findDescriptor = this.findAction.toDescriptor();
-        if (findDescriptor.findType === mablscriptFind_1.FindType.FIND_TAB) {
+        if (findDescriptor.findType === domUtil_1.FindType.FIND_TAB) {
             this.switch = {
                 tab: findDescriptor,
                 find: findDescriptor,
@@ -37,7 +37,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
             Object.freeze(this.switch);
             return;
         }
-        if (findDescriptor.findType === mablscriptFind_1.FindType.FIND_ONE) {
+        if (findDescriptor.findType === domUtil_1.FindType.FIND_ONE) {
             this.switch = {
                 frame: findDescriptor,
                 find: findDescriptor,
@@ -73,37 +73,37 @@ class SwitchContextStep extends MablStep_1.MablStep {
         if (this.description) {
             formatted[stepName].description = this.description;
         }
-        if (SwitchContextStepDescriptor_1.isSwitchTab(step)) {
+        if ((0, SwitchContextStepDescriptor_1.isSwitchTab)(step)) {
             formatted[stepName].findType = 'FindTab';
             formatted[stepName].selector = step.tab.findTarget;
         }
-        if (SwitchContextStepDescriptor_1.isSwitchFrame(step)) {
+        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) {
                 formatted[stepName].selectorAncestors =
                     step.frame.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
             }
         }
-        if (SwitchContextStepDescriptor_1.isSwitchRoot(step) && step.frame === 'root') {
+        if ((0, SwitchContextStepDescriptor_1.isSwitchRoot)(step) && step.frame === 'root') {
             formatted[stepName].switch = 'root';
         }
         return formatted;
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        if (SwitchContextStepDescriptor_1.isSwitchRoot(this.switch) && this.switch.frame === 'root') {
-            const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('selectWindow', this);
+        if ((0, SwitchContextStepDescriptor_1.isSwitchRoot)(this.switch) && this.switch.frame === 'root') {
+            const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('selectWindow', this);
             seleniumStep.target = 'window=0';
             return [seleniumStep];
         }
-        else if (SwitchContextStepDescriptor_1.isSwitchTab(this.switch)) {
-            const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('selectWindow', this);
+        else if ((0, SwitchContextStepDescriptor_1.isSwitchTab)(this.switch)) {
+            const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('selectWindow', this);
             seleniumStep.target =
                 this.switch.tab.findTarget === 'initial'
                     ? 'tab=0'
                     : `title="${this.switch.tab.findTarget.title}"`;
             return [seleniumStep];
         }
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('selectFrame', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('selectFrame', this);
         if (this.findAction) {
             seleniumStep.target = this.findAction.getSelIdeTarget();
         }
@@ -117,7 +117,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         var _a;
-        if (SwitchContextStepDescriptor_1.isSwitchRoot(this.switch) && this.switch.frame === 'root') {
+        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()`;

package/mablscript/steps/VisitUrlStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VisitUrlStep = void 0;
 const MablStep_1 = require("../MablStep");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
+const domUtil_1 = require("../../domUtil");
 class VisitUrlStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -20,7 +21,7 @@ class VisitUrlStep extends MablStep_1.MablStep {
         };
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('open', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('open', this);
         seleniumStep.target = this.substituteSeleniumVariable(this.url);
         return [seleniumStep];
     }
@@ -28,7 +29,7 @@ class VisitUrlStep extends MablStep_1.MablStep {
         return new VisitUrlStep('visit_url', [stepArgs.url], []);
     }
     toMablscript() {
-        const resolvedUrl = this.substituteMablscriptVariable(this.url.toString());
+        const resolvedUrl = this.substituteMablscriptVariable((0, domUtil_1.escapeMablscriptString)(this.url.toString()));
         if (VisitUrlStep.isInProduction() && VisitUrlStep.isFileUrl(resolvedUrl)) {
             throw new Error('Access to local files is not permitted');
         }

package/mablscript/steps/WaitStep.js

@@ -17,7 +17,7 @@ class WaitStep extends MablStep_1.MablStep {
         };
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('pause', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('pause', this);
         seleniumStep.target = `${this.milliseconds}`;
         return [seleniumStep];
     }
@@ -25,15 +25,12 @@ class WaitStep extends MablStep_1.MablStep {
         return new WaitStep('wait', [stepArgs.milliseconds], []);
     }
     toMablscript() {
-        return `wait("${this.milliseconds}")`;
+        return `wait(${this.milliseconds})`;
     }
     static validateWait(wait) {
         if (typeof wait !== 'number') {
             throw new Error(`Invalid wait argument [${wait}]`);
         }
-        if (wait < 1000 || wait > 900000) {
-            throw new Error('Wait must be between 1 and 900 seconds');
-        }
         return wait;
     }
 }

package/mablscript/steps/WaitUntilStep.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WaitUntilStep = void 0;
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class WaitUntilStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
-        if (mablscriptFind_1.isFindElementType(this.actions[0].getActionName())) {
+        if ((0, domUtil_1.isFindElementType)(this.actions[0].getActionName())) {
             this.findAction = this.actions[0];
         }
         else {
@@ -19,7 +19,7 @@ class WaitUntilStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),

package/mablscript/types/GetCurrentLocationDescriptor.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newGetCurrentLocationDescriptor = exports.isGetCurrentLocationDescriptor = void 0;
+exports.newGetCurrentLocationDescriptor = exports.isGetCurrentLocationDescriptor = exports.GET_CURRENT_LOCATION_KIND = void 0;
+exports.GET_CURRENT_LOCATION_KIND = 'Location';
 function isGetCurrentLocationDescriptor(value) {
-    return value.kind === 'Location';
+    return (value.kind === exports.GET_CURRENT_LOCATION_KIND);
 }
 exports.isGetCurrentLocationDescriptor = isGetCurrentLocationDescriptor;
 function newGetCurrentLocationDescriptor() {
-    return { kind: 'Location' };
+    return { kind: exports.GET_CURRENT_LOCATION_KIND };
 }
 exports.newGetCurrentLocationDescriptor = newGetCurrentLocationDescriptor;

package/mablscript/types/OperatingSystemDescriptor.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/mablscript/types/VariableNamespace.js

@@ -6,7 +6,7 @@ function isVariableNamespace(value) {
     return (value &&
         typeof value === 'object' &&
         !Array.isArray(value) &&
-        VariableDataType_1.isSimpleObject(value) &&
+        (0, VariableDataType_1.isSimpleObject)(value) &&
         Object.keys(value).every((key) => key) &&
         Object.values(value).every(VariableDataType_1.isVariableDataType));
 }