@mablhq/mabl-cli 2.0.3 → 2.1.0

package/mablscript/steps/SyntheticStep.js

@@ -5,7 +5,7 @@ const MablStep_1 = require("../MablStep");
 exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW = -1;
 class SyntheticStep extends MablStep_1.MablStep {
     constructor(name, args = [], actions = [], stepSourceIndexInFlow = exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW) {
-        super(name, args, actions);
+        super(name, args, actions, name);
         this.stepSourceIndexInFlow = stepSourceIndexInFlow;
         this.actionSourceIndexInStep = 0;
     }

package/mablscript/steps/VisitUrlStep.js

@@ -6,7 +6,7 @@ const MablAction_1 = require("../MablAction");
 const domUtil_1 = require("../../domUtil");
 class VisitUrlStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'visit_url');
         const arg = this.getActionArgs()[0];
         this.url = VisitUrlStep.normalizeUrl(arg);
     }
@@ -16,10 +16,13 @@ class VisitUrlStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         return {
             url: this.url,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new VisitUrlStep('visit_url', [stepArgs.url], []);
+        const step = new VisitUrlStep('visit_url', [stepArgs.url], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const resolvedUrl = this.substituteMablscriptVariable((0, domUtil_1.escapeMablscriptString)(this.url.toString()));

package/mablscript/steps/WaitStep.js

@@ -4,7 +4,7 @@ exports.WaitStep = void 0;
 const MablStep_1 = require("../MablStep");
 class WaitStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'wait');
         this.milliseconds = WaitStep.validateWait(this.getActionArgs()[0]);
     }
     getStepName() {
@@ -13,10 +13,13 @@ class WaitStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         return {
             milliseconds: this.milliseconds,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new WaitStep(WaitStep.stepName, [stepArgs.milliseconds], []);
+        const step = new WaitStep(WaitStep.stepName, [stepArgs.milliseconds], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `wait(${this.milliseconds})`;

package/mablscript/steps/WaitUntilStep.js

@@ -5,7 +5,7 @@ const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class WaitUntilStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'wait_until');
         if ((0, domUtil_1.isFindElementType)(this.actions[0].getActionName())) {
             this.findAction = this.actions[0];
         }
@@ -23,13 +23,16 @@ class WaitUntilStep extends MablStep_1.MablStep {
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
+                    actionCode: this.actionCode,
                 };
             default:
                 throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType} is not supported`);
         }
     }
-    static fromYaml(_stepName, _stepArgs) {
-        return new WaitUntilStep('wait', [], []);
+    static fromYaml(_stepName, stepArgs) {
+        const step = new WaitUntilStep('wait', [], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.findAction.toMablscript()}.evaluate_presence("present").assert()`;

package/observers/ObserverBase.js

@@ -1,2 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildObserverBaseOptions = exports.OBSERVER_TIMEOUT_MILLIS = void 0;
+exports.OBSERVER_TIMEOUT_MILLIS = 300000;
+function buildObserverBaseOptions(executionContext) {
+    return {
+        executionContext,
+        executionIndex: executionContext.executionIndexTracker.getExecutionIndex(),
+    };
+}
+exports.buildObserverBaseOptions = buildObserverBaseOptions;

package/observers/mockObserver.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FakeObserver = exports.noopPageLifecycleCallback = exports.noopObserveAfterFunction = exports.noopObserveDeferredFunction = void 0;
+exports.FakeBrowserObserver = exports.noopPageLifecycleCallback = exports.noopObserveAfterFunction = exports.noopObserveDeferredFunction = void 0;
 const noopObserveDeferredFunction = () => Promise.resolve();
 exports.noopObserveDeferredFunction = noopObserveDeferredFunction;
 const noopObserveAfterFunction = () => Promise.resolve();
@@ -9,7 +9,7 @@ exports.noopPageLifecycleCallback = {
     onPageCreated: () => { },
     onPageDestroyed: () => { },
 };
-class FakeObserver {
+class FakeBrowserObserver {
     constructor() {
         this.observationType = 'test';
         this._hitCount = 0;
@@ -44,4 +44,4 @@ class FakeObserver {
         this._sendObservationMessageHitCount += 1;
     }
 }
-exports.FakeObserver = FakeObserver;
+exports.FakeBrowserObserver = FakeBrowserObserver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -28,7 +28,7 @@
     "@types/serve-handler": "6.1.0",
     "@types/tmp": "0.2.0",
     "@types/tough-cookie": "4.0.2",
-    "agent-base": "7.1.0",
+    "agent-base": "6.0.2",
     "analytics-node": "3.5.0",
     "appium": "2.1.2",
     "async-mutex": "0.3.1",
@@ -58,7 +58,7 @@
     "glob": "7.1.6",
     "hpagent": "1.0.0",
     "http-mitm-proxy": "1.0.0",
-    "https-proxy-agent": "7.0.1",
+    "https-proxy-agent": "5.0.0",
     "humanize-duration": "3.23.0",
     "inquirer": "8.2.5",
     "js-yaml": "4.1.0",
@@ -88,7 +88,7 @@
     "serve-handler": "6.1.5",
     "set-cookie-parser": "2.5.1",
     "simple-update-notifier": "1.1.0",
-    "socks-proxy-agent": "8.0.1",
+    "socks-proxy-agent": "6.1.1",
     "stoppable": "1.1.0",
     "strip-ansi": "6.0.0",
     "tldts": "6.0.12",

package/util/javaScriptStepMigration.js

@@ -60,6 +60,7 @@ function migrateInlineDescriptor(descriptor) {
             parameters: [],
             snippet_type: mablApi_1.Snippet.SnippetTypeEnum.Javascript,
         },
+        actionCode: descriptor.actionCode,
         parameterOverrides: [],
     };
 }