@mablhq/mabl-cli 1.25.1 → 1.25.19

package/mablscript/diffing/diffingUtil.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.diffFlows = exports.diffTests = exports.convertDiffingFormatIntoDiffingSteps = exports.flattenTestFlowsIntoLineDiffingFormat = exports.convertFlowToStepList = exports.lineModeDiff = exports.DiffOperation = void 0;
+exports.diffFlows = exports.diffTests = exports.convertDiffingFormatIntoDiffingSteps = exports.flattenTestFlowsIntoLineDiffingFormat = exports.constructTestFlowsFromSteps = exports.flattenTestFlowsIntoSteps = exports.convertStepListToFlow = exports.convertFlowToStepList = exports.lineModeDiff = exports.DiffOperation = void 0;
 const mablApi_1 = require("../../mablApi");
 const importer_1 = require("../importer");
 const EvaluateFlowStep_1 = require("../steps/EvaluateFlowStep");
@@ -46,24 +46,89 @@ function convertFlowToStepList(flow, flowConfig) {
     if (!flow.reusable && flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mablscript) {
         return (0, importer_1.parseMablScriptIntoSteps)(flow);
     }
-    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep(EvaluateFlowStep_1.EvaluateFlowStep.mablScriptStepNames[0], [
-        {
-            invariant_id: flow === null || flow === void 0 ? void 0 : flow.invariant_id,
-        },
-        flowConfig,
-    ], []);
+    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep(EvaluateFlowStep_1.EvaluateFlowStep.mablScriptStepNames[0], [{ invariant_id: flow === null || flow === void 0 ? void 0 : flow.invariant_id }, flowConfig], []);
     if (flow.description) {
         evaluateFlowStep.setDescription(flow.description);
     }
     return [evaluateFlowStep];
 }
 exports.convertFlowToStepList = convertFlowToStepList;
-function flattenTestFlowsIntoSteps(flows, flowConfig) {
-    return flows.flatMap((flow, index) => convertFlowToStepList(flow, flowConfig === null || flowConfig === void 0 ? void 0 : flowConfig[index]));
+function convertStepListToFlow(steps) {
+    if (steps.length > 1 && steps.some((step) => (0, EvaluateFlowStep_1.isEvaluateFlowStep)(step))) {
+        throw new Error('EvaluateFlow step(s) cannot be combined with other steps in a flow');
+    }
+    if ((0, EvaluateFlowStep_1.isEvaluateFlowStep)(steps[0])) {
+        const evaluateFlowStep = steps[0];
+        const { flowDescriptor, config: flowConfig } = evaluateFlowStep;
+        const description = evaluateFlowStep.getDescription();
+        const flow = { ...flowDescriptor };
+        if (description) {
+            flow.description = description;
+        }
+        return { flow, flowConfig };
+    }
+    const stepAnnotations = steps.reduce((annotations, step, index) => {
+        const annotation = step.getAnnotation();
+        if (annotation) {
+            const key = Number(index).toString();
+            annotations[key] = annotation;
+        }
+        return annotations;
+    }, {});
+    const flow = {
+        script: addTrailingNewline((0, importer_1.mablscriptTheLoadedSteps)(steps)),
+        script_description: steps
+            .map((step) => { var _a; return (_a = step.getDescription()) !== null && _a !== void 0 ? _a : ''; })
+            .join('\n'),
+        step_annotations: stepAnnotations,
+    };
+    return { flow };
+}
+exports.convertStepListToFlow = convertStepListToFlow;
+function flattenTestFlowsIntoSteps(flows, flowConfigs) {
+    return flows.flatMap((flow, index) => convertFlowToStepList(flow, flowConfigs === null || flowConfigs === void 0 ? void 0 : flowConfigs[index]));
+}
+exports.flattenTestFlowsIntoSteps = flattenTestFlowsIntoSteps;
+function constructTestFlowsFromSteps(steps) {
+    const flowSteps = [];
+    let chunk = [];
+    for (const step of steps) {
+        if ((0, EvaluateFlowStep_1.isEvaluateFlowStep)(step)) {
+            if (chunk.length > 0) {
+                flowSteps.push(chunk);
+                flowSteps.push([step]);
+                chunk = [];
+            }
+            else {
+                flowSteps.push([step]);
+            }
+        }
+        else {
+            chunk.push(step);
+        }
+    }
+    if (chunk.length > 0) {
+        flowSteps.push(chunk);
+    }
+    const output = {
+        flows: [],
+        flowConfigs: {},
+    };
+    flowSteps.reduce((output, chunk, index) => {
+        const { flow, flowConfig } = convertStepListToFlow(chunk);
+        output.flows.push(flow);
+        if (flowConfig) {
+            const key = Number(index).toString();
+            output.flowConfigs[key] = flowConfig;
+        }
+        return output;
+    }, output);
+    return output;
 }
+exports.constructTestFlowsFromSteps = constructTestFlowsFromSteps;
 function flattenTestFlowsIntoLineDiffingFormat(flows, flowConfig) {
     const flattenedSteps = flattenTestFlowsIntoSteps(flows, flowConfig);
-    const diffingFormat = formatLineDiffString(flattenedSteps.map((step) => step.toLineDiffFormat()).join('\n'));
+    const diffingFormat = addTrailingNewline(flattenedSteps.map((step) => step.toLineDiffFormat()).join('\n'));
     return { flattenedSteps, diffingFormat };
 }
 exports.flattenTestFlowsIntoLineDiffingFormat = flattenTestFlowsIntoLineDiffingFormat;
@@ -110,9 +175,9 @@ exports.diffTests = diffTests;
 function diffFlows(flow1, flow2) {
     var _a, _b;
     const flow1Steps = (0, importer_1.parseMablScriptIntoSteps)(flow1);
-    const formattedFlow1Steps = formatLineDiffString(flow1Steps.map((step) => step.toLineDiffFormat()).join('\n'));
+    const formattedFlow1Steps = addTrailingNewline(flow1Steps.map((step) => step.toLineDiffFormat()).join('\n'));
     const flow2Steps = (0, importer_1.parseMablScriptIntoSteps)(flow2);
-    const formattedFlow2Steps = formatLineDiffString(flow2Steps.map((step) => step.toLineDiffFormat()).join('\n'));
+    const formattedFlow2Steps = addTrailingNewline(flow2Steps.map((step) => step.toLineDiffFormat()).join('\n'));
     const flattenedDiffs = lineModeDiff(formattedFlow1Steps, formattedFlow2Steps);
     const stepDiffs = convertDiffingFormatIntoDiffingSteps(flattenedDiffs, flow1Steps, flow2Steps);
     const parametersDiff = diffFlowVariables(flow1.parameters, flow2.parameters);
@@ -138,9 +203,9 @@ function flattenFlowVariables(flowVariables) {
     var _a;
     return ((_a = flowVariables === null || flowVariables === void 0 ? void 0 : flowVariables.sort((a, b) => a.name.localeCompare(b.name)).map((parameter) => (0, fast_json_stable_stringify_1.default)(parameter)).join('\n')) !== null && _a !== void 0 ? _a : '');
 }
-function formatLineDiffString(lineDiff) {
-    if (!lineDiff) {
-        return lineDiff;
+function addTrailingNewline(text) {
+    if (!text) {
+        return text;
     }
-    return lineDiff + '\n';
+    return text + '\n';
 }

package/mablscript/steps/EvaluateFlowStep.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EvaluateFlowStep = void 0;
+exports.isEvaluateFlowStep = exports.EvaluateFlowStep = exports.EVALUATE_FLOW_STEP_NAME = void 0;
 const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
+exports.EVALUATE_FLOW_STEP_NAME = 'EvaluateFlow';
 class EvaluateFlowStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -15,7 +16,7 @@ class EvaluateFlowStep extends MablStep_1.MablStep {
         }
     }
     getStepName() {
-        return EvaluateFlowStep.yamlMablScriptNames[0];
+        return exports.EVALUATE_FLOW_STEP_NAME;
     }
     toStepDescriptor() {
         return {
@@ -37,4 +38,8 @@ class EvaluateFlowStep extends MablStep_1.MablStep {
 }
 exports.EvaluateFlowStep = EvaluateFlowStep;
 EvaluateFlowStep.mablScriptStepNames = ['evaluate_flow'];
-EvaluateFlowStep.yamlMablScriptNames = ['EvaluateFlow'];
+EvaluateFlowStep.yamlMablScriptNames = [exports.EVALUATE_FLOW_STEP_NAME];
+function isEvaluateFlowStep(step) {
+    return (step === null || step === void 0 ? void 0 : step.getStepName()) === exports.EVALUATE_FLOW_STEP_NAME;
+}
+exports.isEvaluateFlowStep = isEvaluateFlowStep;