@mablhq/mabl-cli 2.82.10 → 2.82.11

package/mablscript/MablStep.js

@@ -111,7 +111,7 @@ class MablStep extends MablAction_1.MablAction {
     toMablscript() {
         return '';
     }
-    toLineDiffFormat() {
+    toLineDiffFormat(_omitStepId = false) {
         const lineDiffProperties = {
             annotation: this.annotation,
             disabled: this.isDisabled(),

package/mablscript/MablStepV2.js

@@ -80,11 +80,15 @@ class MablStepV2 extends MablStep_1.MablStep {
     getDescriptionForLogging() {
         return this.annotation?.description ?? this.getDescription();
     }
-    toLineDiffFormat() {
+    toLineDiffFormat(omitStepId = false) {
+        const descriptor = { ...this.toStepDescriptor() };
+        if (omitStepId) {
+            delete descriptor.id;
+        }
         const lineDiffProperties = {
             annotation: this.annotation,
             disabled: this.isDisabled(),
-            descriptor: this.toStepDescriptor(),
+            descriptor,
         };
         return this.stringify(lineDiffProperties);
     }

package/mablscript/diffing/diffingUtil.js

@@ -24,6 +24,12 @@ var DiffOperation;
     DiffOperation["EQUAL"] = "EQUAL";
     DiffOperation["INSERT"] = "INSERT";
 })(DiffOperation || (exports.DiffOperation = DiffOperation = {}));
+function isLegacyFlow(flow) {
+    return !!flow.script && !flow.json_steps?.steps;
+}
+function hasAnyLegacyFlows(flows) {
+    return flows.some(isLegacyFlow);
+}
 function lineModeDiff(text1, text2) {
     const dmp = new diffPatchMatch_1.default();
     const lineToCharDiff = dmp.diff_linesToChars(text1, text2);
@@ -155,9 +161,9 @@ function constructTestFlowsFromSteps(steps, flowType = mablApi_1.FlowTypeEnum.Ma
     }, output);
     return output;
 }
-function flattenTestFlowsIntoLineDiffingFormat(flows, flowConfig) {
+function flattenTestFlowsIntoLineDiffingFormat(flows, flowConfig, omitStepId = false) {
     const flattenedSteps = flattenTestFlowsIntoSteps(flows, flowConfig);
-    const diffingFormat = addTrailingNewline(flattenedSteps.map((step) => step.toLineDiffFormat()).join('\n'));
+    const diffingFormat = addTrailingNewline(flattenedSteps.map((step) => step.toLineDiffFormat(omitStepId)).join('\n'));
     return { flattenedSteps, diffingFormat };
 }
 function convertDiffingFormatIntoDiffingSteps(diffs, sourceSteps, targetSteps) {
@@ -193,16 +199,18 @@ function convertDiffingFormatIntoDiffingSteps(diffs, sourceSteps, targetSteps) {
     return stepDiffs;
 }
 function diffTests(test1Flows, test1FlowConfig, test2Flows, test2FlowConfig) {
-    const { flattenedSteps: flattenedTest1Steps, diffingFormat: test1DiffingFormat, } = flattenTestFlowsIntoLineDiffingFormat(test1Flows, test1FlowConfig);
-    const { flattenedSteps: flattenedTest2Steps, diffingFormat: test2DiffingFormat, } = flattenTestFlowsIntoLineDiffingFormat(test2Flows, test2FlowConfig);
+    const omitStepId = hasAnyLegacyFlows(test1Flows) || hasAnyLegacyFlows(test2Flows);
+    const { flattenedSteps: flattenedTest1Steps, diffingFormat: test1DiffingFormat, } = flattenTestFlowsIntoLineDiffingFormat(test1Flows, test1FlowConfig, omitStepId);
+    const { flattenedSteps: flattenedTest2Steps, diffingFormat: test2DiffingFormat, } = flattenTestFlowsIntoLineDiffingFormat(test2Flows, test2FlowConfig, omitStepId);
     const diffs = lineModeDiff(test1DiffingFormat, test2DiffingFormat);
     return convertDiffingFormatIntoDiffingSteps(diffs, flattenedTest1Steps, flattenedTest2Steps);
 }
 function diffFlows(flow1, flow2) {
+    const omitStepId = isLegacyFlow(flow1) || isLegacyFlow(flow2);
     const flow1Steps = parseFlowIntoStepList(flow1);
-    const formattedFlow1Steps = addTrailingNewline(flow1Steps.map((step) => step.toLineDiffFormat()).join('\n'));
+    const formattedFlow1Steps = addTrailingNewline(flow1Steps.map((step) => step.toLineDiffFormat(omitStepId)).join('\n'));
     const flow2Steps = parseFlowIntoStepList(flow2);
-    const formattedFlow2Steps = addTrailingNewline(flow2Steps.map((step) => step.toLineDiffFormat()).join('\n'));
+    const formattedFlow2Steps = addTrailingNewline(flow2Steps.map((step) => step.toLineDiffFormat(omitStepId)).join('\n'));
     const flattenedDiffs = lineModeDiff(formattedFlow1Steps, formattedFlow2Steps);
     const stepDiffs = convertDiffingFormatIntoDiffingSteps(flattenedDiffs, flow1Steps, flow2Steps);
     const parametersDiff = diffFlowVariables(flow1.parameters, flow2.parameters);

package/mablscript/steps/AssertStep.js

@@ -302,17 +302,6 @@ class AssertStep extends MablStepV2_1.MablStepV2 {
         }
         return `${primaryActionMablscriptPrefix}${this.conditionAction.toMablscript()}${assertAction}`;
     }
-    toLineDiffFormat() {
-        if (this.primaryAction instanceof MobileFindAction_1.MobileFindAction) {
-            const lineDiffProperties = {
-                annotation: this.annotation,
-                disabled: this.isDisabled(),
-                descriptor: this.toStepDescriptor(),
-            };
-            return this.stringify(lineDiffProperties);
-        }
-        return super.toLineDiffFormat();
-    }
     getInputVariables() {
         return (0, MablAction_1.distinctStrings)([
             ...this.primaryAction.getInputVariables(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.82.10",
+  "version": "2.82.11",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",