@mablhq/mabl-cli 1.17.0 → 1.19.3

package/execution/index.js.LICENSE.txt

@@ -168,6 +168,8 @@ PERFORMANCE OF THIS SOFTWARE.
  * code.
  */
 
+/*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT */
+
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /**
@@ -180,9 +182,9 @@ PERFORMANCE OF THIS SOFTWARE.
  */
 
 /**
- * @license Complex.js v2.0.12 11/02/2016
+ * @license Complex.js v2.0.15 12/05/2020
  *
- * Copyright (c) 2016, Robert Eisele (robert@xarg.org)
+ * Copyright (c) 2020, Robert Eisele (robert@xarg.org)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  **/
 
@@ -199,10 +201,10 @@ PERFORMANCE OF THIS SOFTWARE.
  */
 
 /**
- * @license Fraction.js v4.0.12 09/09/2015
- * http://www.xarg.org/2014/03/rational-numbers-in-javascript/
+ * @license Fraction.js v4.1.3 23/05/2021
+ * https://www.xarg.org/2014/03/rational-numbers-in-javascript/
  *
- * Copyright (c) 2015, Robert Eisele (robert@xarg.org)
+ * Copyright (c) 2021, Robert Eisele (robert@xarg.org)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  **/
 

package/index.d.ts

@@ -24,7 +24,6 @@ declare module '@mablhq/mabl-cli' {
   }
   export enum RunnerType {
     Playwright = 'playwright',
-    Puppeteer = 'puppeteer',
   }
   export interface HttpHeadersType {
     [key: string]: string;

package/mablscript/MablAction.js

@@ -23,7 +23,7 @@ class MablAction {
                 return matches[1];
             }
         }
-        return `"${argument}"`;
+        return `${argument}`;
     }
     getActionName() {
         return this.name;

package/mablscript/MablStep.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildObjectString = exports.buildSourceRepresentationOfObject = exports.MablStep = void 0;
+const domUtil_1 = require("../domUtil");
 const MablAction_1 = require("./MablAction");
-const SeleniumIdeStep_1 = require("./steps/SeleniumIdeStep");
 const MablSymbol_1 = require("./MablSymbol");
-const domUtil_1 = require("../domUtil");
+const SeleniumIdeStep_1 = require("./steps/SeleniumIdeStep");
+const fast_json_stable_stringify_1 = __importDefault(require("fast-json-stable-stringify"));
 class MablStep extends MablAction_1.MablAction {
     constructor(name, args, actions) {
         super(name, args);
@@ -25,9 +29,15 @@ class MablStep extends MablAction_1.MablAction {
     setAnnotation(annotation) {
         this.annotation = annotation;
     }
+    getAnnotation() {
+        return this.annotation;
+    }
     setDescription(description) {
         this.description = description;
     }
+    getDescription() {
+        return this.description;
+    }
     setStepSourceIndexInFlow(index) {
         this.stepSourceIndexInFlow = index;
     }
@@ -102,7 +112,7 @@ class MablStep extends MablAction_1.MablAction {
                 case 'number':
                     return `${key}: ${objectArgs[key]}`;
                 default:
-                    return `${key}: "${objectArgs[key]}"`;
+                    return `${key}: "${(0, domUtil_1.escapeMablscriptString)(objectArgs[key])}"`;
             }
         });
         return `{${mablArgs.join(', ')}}`;
@@ -110,6 +120,14 @@ class MablStep extends MablAction_1.MablAction {
     toMablscript() {
         return '';
     }
+    toLineDiffFormat() {
+        const lineDiffProperties = {
+            annotation: this.annotation,
+            disabled: this.isDisabled(),
+            mablscript: this.toMablscript(),
+        };
+        return (0, fast_json_stable_stringify_1.default)(lineDiffProperties);
+    }
 }
 exports.MablStep = MablStep;
 MablStep.mablScriptStepNames = ['mablStep'];

package/mablscript/actions/AwaitPDFDownloadAction.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitPDFDownloadAction = void 0;
 const AwaitDownloadAction_1 = require("./AwaitDownloadAction");
+const domUtil_1 = require("../../domUtil");
 class AwaitPDFDownloadAction extends AwaitDownloadAction_1.AwaitDownloadAction {
     constructor(name, args) {
         super(name, args);
         this.pdfUUID = this.getActionArgs()[0].uuid;
     }
     toMablscript() {
-        return `await_pdf({uuid: \"${this.pdfUUID}\"})`;
+        return `await_pdf(${(0, domUtil_1.buildStepArgumentString)({ uuid: this.pdfUUID })})`;
     }
 }
 exports.AwaitPDFDownloadAction = AwaitPDFDownloadAction;

package/mablscript/actions/ConditionAction.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConditionAction = void 0;
+const domUtil_1 = require("../../domUtil");
 const MablAction_1 = require("../MablAction");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 class ConditionAction extends MablAction_1.MablAction {
@@ -48,9 +49,16 @@ class ConditionAction extends MablAction_1.MablAction {
         };
     }
     generateEvaluateConditionMablscript() {
-        return `${this.name}("${this.conditionAttribute}"${this.conditionValueAttribute !== undefined
-            ? `, ${this.subVariable(this.conditionValueAttribute)}`
-            : ''})`;
+        let value = '';
+        if (this.conditionValueAttribute !== undefined) {
+            if (!(0, MablAction_1.argumentIsMablVariable)(this.conditionValueAttribute)) {
+                value = `, "${(0, domUtil_1.escapeMablscriptString)(this.conditionValueAttribute)}"`;
+            }
+            else {
+                value = `, ${this.subVariable(this.conditionValueAttribute)}`;
+            }
+        }
+        return `${this.name}("${this.conditionAttribute}"${value})`;
     }
     toMablscript() {
         return `${this.generateEvaluateConditionMablscript()}`;

package/mablscript/actions/ExtractAction.js

@@ -6,21 +6,26 @@ const ExtractDescriptor_1 = require("../types/ExtractDescriptor");
 class ExtractAction extends MablAction_1.MablAction {
     constructor(name, args) {
         super(name, args);
+        if (this.name === ExtractDescriptor_1.ExtractType.EXTRACT_INNER_TEXT) {
+            this.name = 'extract_attribute';
+            this.extractionAttribute = 'innerText';
+        }
+        else {
+            this.extractionAttribute = this.getActionArgs()[0];
+        }
         this.extractionType = this.name;
-        this.extractionAttribute = this.getActionArgs()[0];
         this.extractDescriptor = this.getExtractDescriptor();
     }
     getExtractDescriptor() {
-        const attributeName = this.args[0];
-        if (!attributeName) {
+        if (!this.extractionAttribute) {
             throw new Error(`Attribute name is required for extract attribute action.`);
         }
-        if (typeof attributeName !== 'string') {
-            throw new Error(`Invalid attribute provided for extract attribute extractor: ${attributeName}`);
+        if (typeof this.extractionAttribute !== 'string') {
+            throw new Error(`Invalid attribute provided for extract attribute extractor: ${this.extractionAttribute}`);
         }
         return {
             extractType: ExtractDescriptor_1.ExtractType.fromString(this.name),
-            attributeName,
+            attributeName: this.extractionAttribute,
         };
     }
     toMablscript() {
@@ -31,7 +36,11 @@ class ExtractAction extends MablAction_1.MablAction {
     }
 }
 exports.ExtractAction = ExtractAction;
-ExtractAction.mablScriptStepNames = ['extract_attribute', 'extract_email_attribute'];
+ExtractAction.mablScriptStepNames = [
+    'extract_attribute',
+    'extract_email_attribute',
+    'extract_inner_text',
+];
 ExtractAction.mablscriptToYamlType = {
     extract_attribute: 'ElementAttribute',
     extract_email_attribute: 'EmailAttribute',

package/mablscript/actions/FindAction.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalize = exports.isElementSelector = exports.FindAction = exports.findTypesToFormattedType = void 0;
+const domUtil_1 = require("../../domUtil");
 const mablscriptFind_1 = require("../../mablscriptFind");
 const MablAction_1 = require("../MablAction");
-const MablStep_1 = require("../MablStep");
 exports.findTypesToFormattedType = {
     find_all: 'FindAll',
     find_any: 'FindFirst',
@@ -12,6 +12,7 @@ exports.findTypesToFormattedType = {
     find_one: 'FindOne',
     find_email: 'FindEmail',
     find_tab: 'FindTab',
+    find_last: 'FindLast',
 };
 const formattedFindTypeToMablscript = {};
 Object.entries(exports.findTypesToFormattedType).forEach(([findType, field]) => (formattedFindTypeToMablscript[field] = findType));
@@ -19,14 +20,14 @@ class FindAction extends MablAction_1.MablAction {
     constructor(name, args) {
         super(name, args);
         const actionName = this.getActionName();
-        if (!(0, mablscriptFind_1.isFindType)(actionName)) {
+        if (!(0, domUtil_1.isFindType)(actionName)) {
             throw new Error(`Unknown find type for action: ${actionName}`);
         }
-        const findType = mablscriptFind_1.FindType.fromString(actionName);
-        const [selectors, options] = this.getActionArgs();
+        const findType = domUtil_1.FindType.fromString(actionName);
         this.isValid = true;
         switch (findType) {
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_ONE: {
+                const [selectors, options] = this.getActionArgs();
                 if (!isElementSelector(selectors)) {
                     this.isValid = false;
                 }
@@ -41,24 +42,35 @@ class FindAction extends MablAction_1.MablAction {
                     findType,
                     findTarget,
                 };
-                if ((0, mablscriptFind_1.isFindOptions)(options)) {
+                if ((0, domUtil_1.isFindOptions)(options)) {
                     this.findDescriptor.findOptions = options;
                 }
                 break;
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ALL:
-                if (!(0, mablscriptFind_1.isCssSelector)(selectors) && !(0, mablscriptFind_1.isXPathSelector)(selectors)) {
+            }
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ALL: {
+                const [primarySelector, foundSelector, findOptions] = this.getActionArgs();
+                if (!(0, domUtil_1.isCssSelector)(primarySelector) &&
+                    !(0, domUtil_1.isXPathSelector)(primarySelector)) {
                     this.isValid = false;
                 }
                 this.findDescriptor = {
                     findType,
-                    findTarget: selectors,
+                    findTarget: primarySelector,
+                    foundElementSelectors: foundSelector,
+                    primarySelectors: {
+                        ...primarySelector,
+                        uuid: primarySelector.uuid,
+                    },
+                    hints: findOptions === null || findOptions === void 0 ? void 0 : findOptions.hints,
                 };
                 break;
-            case mablscriptFind_1.FindType.FIND_COOKIE:
-                if (!(0, mablscriptFind_1.isCookieSelector)(selectors)) {
+            }
+            case domUtil_1.FindType.FIND_COOKIE: {
+                const [selectors] = this.getActionArgs();
+                if (!(0, domUtil_1.isCookieSelector)(selectors)) {
                     this.isValid = false;
                 }
                 this.findDescriptor = {
@@ -66,8 +78,10 @@ class FindAction extends MablAction_1.MablAction {
                     findTarget: selectors,
                 };
                 break;
-            case mablscriptFind_1.FindType.FIND_EMAIL:
-                if (!(0, mablscriptFind_1.isEmailSelector)(selectors)) {
+            }
+            case domUtil_1.FindType.FIND_EMAIL:
+                const [selectors] = this.getActionArgs();
+                if (!(0, domUtil_1.isEmailSelector)(selectors)) {
                     this.isValid = false;
                 }
                 this.findDescriptor = {
@@ -75,14 +89,16 @@ class FindAction extends MablAction_1.MablAction {
                     findTarget: selectors,
                 };
                 break;
-            case mablscriptFind_1.FindType.FIND_TAB:
-                if (selectors !== 'initial' && !(0, mablscriptFind_1.isTabSelector)(selectors)) {
+            case domUtil_1.FindType.FIND_TAB: {
+                const [selectors] = this.getActionArgs();
+                if (selectors !== 'initial' && !(0, domUtil_1.isTabSelector)(selectors)) {
                     this.isValid = false;
                 }
                 this.findDescriptor = {
                     findType,
                     findTarget: selectors,
                 };
+            }
         }
         Object.freeze(this.findDescriptor);
     }
@@ -119,14 +135,14 @@ class FindAction extends MablAction_1.MablAction {
         const result = {};
         const find = this.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_ALL:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ALL:
                 result.find_type = find.findType;
                 result.selector = find.findTarget;
                 break;
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_ONE:
                 result.selector = find.findTarget.selector;
                 if ((_a = find.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length) {
                     result.selectorAncestors = find.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
@@ -139,62 +155,86 @@ class FindAction extends MablAction_1.MablAction {
     }
     getSelIdeTarget() {
         switch (this.findDescriptor.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ALL:
-                if ((0, mablscriptFind_1.isCssSelector)(this.findDescriptor.findTarget)) {
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ALL:
+                if ((0, domUtil_1.isCssSelector)(this.findDescriptor.findTarget)) {
                     return `css=${this.findDescriptor.findTarget.css_query}`;
                 }
                 return `xpath=${this.findDescriptor.findTarget.xpath}`;
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_ONE:
                 return `xpath=${this.findDescriptor.findTarget.selector.xpath}`;
             default:
                 throw new Error(`Error generating SeleniumIDE target for ${this.getActionName()}: Unimplemented find type ${this.findDescriptor.findType}`);
         }
     }
     toMablscript() {
-        return this.generateMablscriptFindOne();
+        return this.generateFindMablscript();
     }
-    generateMablscriptFindOne() {
+    generateFindMablscript() {
         var _a;
+        let action = this.findDescriptor.findType;
+        let args = '';
         switch (this.findDescriptor.findType) {
-            case mablscriptFind_1.FindType.FIND_ONE: {
+            case domUtil_1.FindType.FIND_ONE:
                 const find = this.findDescriptor;
-                const action = find.findType;
                 const selectors = ((_a = find.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length)
                     ? '[' +
-                        [
-                            find.findTarget.selector,
-                            ...find.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector),
-                        ]
-                            .map(mablscriptFind_1.buildElementSelectorString)
+                        [find.findTarget, ...find.findTarget.auxiliaryDescriptors]
+                            .map(mablscriptFind_1.buildFindDescriptorString)
+                            .filter(Boolean)
                             .join(', ') +
                         ']'
-                    : (0, mablscriptFind_1.buildElementSelectorString)(find.findTarget.selector);
+                    : (0, mablscriptFind_1.buildFindDescriptorString)(find.findTarget);
                 const options = buildFindOptionsString(find.findOptions);
-                const args = [selectors, options].filter((str) => str).join(', ');
-                return `${action}(${args})`;
-            }
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ALL:
-            case mablscriptFind_1.FindType.FIND_COOKIE:
-            case mablscriptFind_1.FindType.FIND_EMAIL: {
+                args = [selectors, options].filter(Boolean).join(', ');
+                break;
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ALL:
+            case domUtil_1.FindType.FIND_FIRST: {
                 const find = this.findDescriptor;
-                const action = find.findType;
-                const args = (0, mablscriptFind_1.buildElementSelectorString)(find.findTarget);
-                return `${action}(${args})`;
-            }
-            case mablscriptFind_1.FindType.FIND_TAB:
-                if (this.findDescriptor.findTarget === 'initial') {
-                    return `${this.findDescriptor.findType}("${this.findDescriptor.findTarget}")`;
+                const selector = (0, mablscriptFind_1.buildElementSelectorString)(find.findTarget);
+                let foundElementSelectors;
+                if (find.foundElementSelectors) {
+                    if (Array.isArray(find.foundElementSelectors)) {
+                        foundElementSelectors = find.foundElementSelectors
+                            .map((selector) => (0, mablscriptFind_1.buildFindDescriptorString)({ selector }))
+                            .join(', ');
+                    }
+                    else {
+                        foundElementSelectors = (0, mablscriptFind_1.buildFindDescriptorString)({
+                            selector: find.foundElementSelectors,
+                        });
+                    }
+                }
+                else {
+                    foundElementSelectors = '{selector_type: "element"}';
+                }
+                args = [selector, foundElementSelectors].join(', ');
+                if (find.hints) {
+                    args += `, ${(0, mablscriptFind_1.buildFindHintsString)(find.hints)}`;
                 }
-                return `${this.findDescriptor.findType}(${(0, mablscriptFind_1.buildElementSelectorString)(this.findDescriptor.findTarget)})`;
+                if (find.findType === domUtil_1.FindType.FIND_ANY) {
+                    action = domUtil_1.FindType.FIND_FIRST;
+                }
+                break;
+            }
+            case domUtil_1.FindType.FIND_COOKIE:
+                args = (0, mablscriptFind_1.buildCookieSelectorString)(this.findDescriptor.findTarget);
+                break;
+            case domUtil_1.FindType.FIND_EMAIL: {
+                args = (0, mablscriptFind_1.buildEmailSelectorString)(this.findDescriptor.findTarget);
+                break;
+            }
+            case domUtil_1.FindType.FIND_TAB:
+                args = (0, mablscriptFind_1.buildTabSelectorString)(this.findDescriptor.findTarget);
+                break;
             default:
                 throw new Error(`Error generating mablscript: Unexpected find type in ${JSON.stringify(this.findDescriptor)}`);
         }
+        return `${action}(${args})`;
     }
     isValidDescriptor() {
         return this.isValid;
@@ -225,29 +265,21 @@ function buildFindOptionsString(findOptions) {
     if (!findOptions) {
         return '';
     }
-    let findOptionsFinal = '{';
-    if (findOptions.hints) {
-        findOptionsFinal += `hints: {${(0, MablStep_1.buildObjectString)(findOptions.hints).join(', ')}}`;
-    }
-    if (findOptions.waitUntil) {
-        findOptionsFinal += `waitUntil: {${(0, MablStep_1.buildObjectString)(findOptions.waitUntil)}}`;
-    }
-    findOptionsFinal += '}';
-    return findOptionsFinal;
+    return JSON.stringify(findOptions);
 }
 function isElementSelector(maybeSelectors) {
     const [target, ancestor] = Array.isArray(maybeSelectors)
         ? [...maybeSelectors]
         : [maybeSelectors];
-    const validTarget = (0, mablscriptFind_1.isStandardSelector)(target) || (0, mablscriptFind_1.isNormalizedFindDescriptor)(target);
+    const validTarget = (0, domUtil_1.isStandardSelector)(target) || (0, domUtil_1.isNormalizedFindDescriptor)(target);
     const validAncestor = !ancestor ||
-        (0, mablscriptFind_1.isStandardSelector)(ancestor) ||
-        (0, mablscriptFind_1.isNormalizedFindDescriptor)(ancestor);
+        (0, domUtil_1.isStandardSelector)(ancestor) ||
+        (0, domUtil_1.isNormalizedFindDescriptor)(ancestor);
     return !!(validTarget && validAncestor);
 }
 exports.isElementSelector = isElementSelector;
 function normalize(maybeFindDescriptor) {
-    if ((0, mablscriptFind_1.isNormalizedFindDescriptor)(maybeFindDescriptor)) {
+    if ((0, domUtil_1.isNormalizedFindDescriptor)(maybeFindDescriptor)) {
         return { ...maybeFindDescriptor };
     }
     return { selector: maybeFindDescriptor };

package/mablscript/actions/GenerateRandomStringAction.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateRandomStringAction = void 0;
 const MablAction_1 = require("../MablAction");
+const domUtil_1 = require("../../domUtil");
 class GenerateRandomStringAction extends MablAction_1.MablAction {
     constructor(name, args) {
         super(name, args);
         this.generateString = this.getActionArgs()[0];
     }
     toMablscript() {
-        return `generate_random_string(\"${this.generateString}\")`;
+        return `generate_random_string(\"${(0, domUtil_1.escapeMablscriptString)(this.generateString)}\")`;
     }
 }
 exports.GenerateRandomStringAction = GenerateRandomStringAction;

package/mablscript/actions/GetUrlAction.js

@@ -13,7 +13,7 @@ class GetUrlAction extends MablAction_1.MablAction {
     toDescriptor() {
         return (0, GetCurrentLocationDescriptor_1.newGetCurrentLocationDescriptor)();
     }
-    generateMablscriptFindOne() {
+    generateFindMablscript() {
         return 'get_current_location()';
     }
 }

package/mablscript/actions/GetVariableValue.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetVariableValue = void 0;
 const MablAction_1 = require("../MablAction");
-const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 const MablSymbol_1 = require("../MablSymbol");
+const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 class GetVariableValue extends MablAction_1.MablAction {
     constructor(name, args) {
         super(name, args);
@@ -19,7 +19,7 @@ class GetVariableValue extends MablAction_1.MablAction {
     toDescriptor() {
         return (0, GetVariableDescriptor_1.newGetVariableDescriptor)(this.variable);
     }
-    generateMablscriptFindOne() {
+    generateFindMablscript() {
         return `get_variable_value(${this.variable.name})`;
     }
 }