@redocly/respect-core 0.0.0-snapshot.1739981736 → 0.0.0-snapshot.1740152436

package/lib/modules/cli-output/json-logs.js

@@ -1,27 +1,75 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.composeJsonLogs = composeJsonLogs;
+exports.composeJsonLogsFiles = composeJsonLogsFiles;
 const mask_secrets_1 = require("./mask-secrets");
-function composeJsonLogs(ctx) {
-    const { secretFields } = ctx;
-    const jsonLogs = { ...ctx.$workflows };
-    for (const workflow of ctx.workflows) {
-        const workflowId = workflow.workflowId;
-        jsonLogs[workflowId].time = workflow.time;
-        for (const step of workflow.steps) {
-            const stepId = step.stepId;
-            if (jsonLogs[workflowId] && jsonLogs[workflowId].steps[stepId]) {
-                jsonLogs[workflowId].steps[stepId].checks = step.checks;
-                if (step.verboseLog) {
-                    const { host, path } = step.verboseLog;
-                    // Log resolved url
-                    if (jsonLogs[workflowId].steps[stepId]?.request) {
-                        jsonLogs[workflowId].steps[stepId].request.url = `${host}${path}`;
-                    }
-                }
-            }
+function composeJsonLogsFiles(filesResult) {
+    const files = {};
+    for (const fileResult of filesResult) {
+        const { executedWorkflows } = fileResult;
+        const { secretFields } = fileResult.ctx;
+        files[fileResult.file] = (0, mask_secrets_1.maskSecrets)(executedWorkflows.map((workflow) => {
+            const steps = workflow.executedSteps.map((step) => composeJsonSteps(step, workflow.workflowId, fileResult.ctx));
+            const result = {
+                ...workflow,
+                executedSteps: steps,
+                status: fileResult.hasProblems ? 'error' : fileResult.hasWarnings ? 'warn' : 'success',
+                totalTimeMs: fileResult.totalTimeMs,
+                totalRequests: fileResult.totalRequests,
+            };
+            return result;
+        }), secretFields || new Set());
+    }
+    return files;
+}
+function composeJsonSteps(step, workflowId, ctx) {
+    if ('executedSteps' in step) {
+        return step;
+    }
+    const publicStep = ctx.$workflows[workflowId].steps[step.stepId];
+    return {
+        type: 'step',
+        stepId: step.stepId,
+        workflowId,
+        request: {
+            method: publicStep.request?.method || '',
+            url: step.response?.requestUrl || '',
+            headers: publicStep.request?.header || {},
+            body: publicStep.request?.body || {},
+        },
+        response: {
+            statusCode: step.response?.statusCode || 0,
+            body: publicStep.response?.body || {},
+            headers: step.response?.header || {},
+            time: step.response?.time || 0,
+        },
+        checks: step.checks.map((check) => ({
+            ...check,
+            status: calculateCheckStatus(check),
+        })),
+        totalTimeMs: publicStep.response?.time || 0,
+        retriesLeft: step.retriesLeft,
+        status: calculateStepStatus(step.checks),
+    };
+}
+function calculateCheckStatus(check) {
+    if (check.pass) {
+        return 'success';
+    }
+    if (check.severity === 'error') {
+        return 'error';
+    }
+    return 'warn';
+}
+function calculateStepStatus(checks) {
+    let hasWarning = false;
+    for (const check of checks) {
+        if (!check.pass && check.severity === 'error') {
+            return 'error';
+        }
+        if (!check.pass && check.severity === 'warn') {
+            hasWarning = true;
         }
     }
-    return (0, mask_secrets_1.maskSecrets)(jsonLogs, secretFields || new Set());
+    return hasWarning ? 'warn' : 'success';
 }
 //# sourceMappingURL=json-logs.js.map

package/lib/modules/cli-output/json-logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-logs.js","sourceRoot":"","sources":["../../../src/modules/cli-output/json-logs.ts"],"names":[],"mappings":";;AAIA,0CA0BC;AA9BD,iDAA6C;AAI7C,SAAgB,eAAe,CAAC,GAAgB;IAC9C,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC;IAC7B,MAAM,QAAQ,GAAG,EAAE,GAAG,GAAG,CAAC,UAAU,EAAc,CAAC;IAEnD,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACvC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAE1C,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAE3B,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC/D,QAAQ,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAExD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;oBACvC,mBAAmB;oBACnB,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;wBAChD,QAAQ,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;oBACpE,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAA,0BAAW,EAAC,QAAQ,EAAE,YAAY,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"json-logs.js","sourceRoot":"","sources":["../../../src/modules/cli-output/json-logs.ts"],"names":[],"mappings":"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"}

package/lib/modules/description-parser/get-request-data-from-openapi.d.ts

@@ -4,6 +4,7 @@ export interface OpenApiRequestData {
     requestBody?: Record<string, unknown>;
     contentType?: string;
     parameters: ParameterWithIn[];
+    contentTypeParameters: ParameterWithIn[];
 }
 export declare function getRequestDataFromOpenApi(operation: OperationDetails & Record<string, any>): OpenApiRequestData;
 //# sourceMappingURL=get-request-data-from-openapi.d.ts.map

package/lib/modules/description-parser/get-request-data-from-openapi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-request-data-from-openapi.d.ts","sourceRoot":"","sources":["../../../src/modules/description-parser/get-request-data-from-openapi.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;CAC/B;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChD,kBAAkB,CAsBpB"}
+{"version":3,"file":"get-request-data-from-openapi.d.ts","sourceRoot":"","sources":["../../../src/modules/description-parser/get-request-data-from-openapi.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,qBAAqB,EAAE,eAAe,EAAE,CAAC;CAC1C;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAChD,kBAAkB,CAwBpB"}

package/lib/modules/description-parser/get-request-data-from-openapi.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRequestDataFromOpenApi = getRequestDataFromOpenApi;
 const utils_1 = require("@redocly/openapi-core/lib/utils");
-const test_config_generator_1 = require("../test-config-generator");
+const arazzo_description_generator_1 = require("../arazzo-description-generator");
 const extract_first_example_1 = require("./extract-first-example");
 const config_parser_1 = require("../config-parser");
 function getRequestDataFromOpenApi(operation) {
@@ -10,16 +10,18 @@ function getRequestDataFromOpenApi(operation) {
     const [contentType, contentItem] = Object.entries(content)[0] || [];
     const requestBody = contentItem?.example ||
         (0, extract_first_example_1.extractFirstExample)(contentItem?.examples) ||
-        (0, test_config_generator_1.generateTestDataFromJsonSchema)(contentItem?.schema);
+        (0, arazzo_description_generator_1.generateTestDataFromJsonSchema)(contentItem?.schema);
     const accept = getAcceptHeader(operation);
     const parameters = getUniqueParameters([
         ...transformParameters(operation.pathParameters),
-        { name: 'content-type', in: 'header', value: contentType },
-        ...(accept ? [{ name: 'accept', in: 'header', value: accept }] : []),
         ...transformParameters(operation.parameters),
     ]).filter(({ value }) => value);
     return {
         parameters,
+        contentTypeParameters: [
+            ...(contentType ? [{ name: 'content-type', in: 'header', value: contentType }] : []),
+            ...(accept ? [{ name: 'accept', in: 'header', value: accept }] : []),
+        ],
         requestBody,
         contentType,
     };
@@ -42,7 +44,7 @@ function transformParameters(params) {
             return {
                 name: parameter.name,
                 in: parameter.in,
-                value: (0, test_config_generator_1.generateExampleValue)(parameter),
+                value: (0, arazzo_description_generator_1.generateExampleValue)(parameter),
             };
         }
         // Return undefined for non-matching parameters

package/lib/modules/description-parser/get-request-data-from-openapi.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-request-data-from-openapi.js","sourceRoot":"","sources":["../../../src/modules/description-parser/get-request-data-from-openapi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-request-data-from-openapi.js","sourceRoot":"","sources":["../../../src/modules/description-parser/get-request-data-from-openapi.ts"],"names":[],"mappings":"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"}

package/lib/modules/flow-runner/call-api-and-analyze-results.d.ts

@@ -1,25 +1,8 @@
 import type { RequestData } from './prepare-request';
 import type { TestContext, Step } from '../../types';
-import type { OperationDetails } from '../description-parser';
-import type { ParameterWithIn } from '../config-parser';
-export type ResultObject = {
+export declare function callAPIAndAnalyzeResults({ ctx, workflowId, step, requestData, }: {
     ctx: TestContext;
-    workflowName: string;
-    step: Step;
-    requestData: {
-        serverUrl?: {
-            url: string;
-        };
-        path: string;
-        method: string;
-        parameters: ParameterWithIn[];
-        requestBody: any;
-        openapiOperation?: OperationDetails & Record<string, string>;
-    };
-};
-export declare function callAPIAndAnalyzeResults({ ctx, workflowName, step, requestData, }: {
-    ctx: TestContext;
-    workflowName: string;
+    workflowId: string;
     step: Step;
     requestData: RequestData;
 }): Promise<{

package/lib/modules/flow-runner/call-api-and-analyze-results.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"call-api-and-analyze-results.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/call-api-and-analyze-results.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,WAAW,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE;QACX,SAAS,CAAC,EAAE;YACV,GAAG,EAAE,MAAM,CAAC;SAEb,CAAC;QACF,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,eAAe,EAAE,CAAC;QAC9B,WAAW,EAAE,GAAG,CAAC;QACjB,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9D,CAAC;CACH,CAAC;AAGF,wBAAsB,wBAAwB,CAAC,EAC7C,GAAG,EACH,YAAY,EACZ,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,WAAW,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,WAAW,CAAC;CAC1B;;;;GAoGA"}
+{"version":3,"file":"call-api-and-analyze-results.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/call-api-and-analyze-results.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAGrD,wBAAsB,wBAAwB,CAAC,EAC7C,GAAG,EACH,UAAU,EACV,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,WAAW,CAAC;CAC1B;;;;GA6FA"}

package/lib/modules/flow-runner/call-api-and-analyze-results.js

@@ -7,7 +7,7 @@ const checks_1 = require("../checks");
 const context_1 = require("./context");
 const runtime_expressions_1 = require("../runtime-expressions");
 // TODO: split into two functions
-async function callAPIAndAnalyzeResults({ ctx, workflowName, step, requestData, }) {
+async function callAPIAndAnalyzeResults({ ctx, workflowId, step, requestData, }) {
     // clear checks in case of retry
     step.checks = [];
     const checksResult = {
@@ -28,43 +28,18 @@ async function callAPIAndAnalyzeResults({ ctx, workflowName, step, requestData,
         checksResult.networkCheck = false;
         return checksResult;
     }
-    const request = ctx.$workflows[workflowName].steps[step.stepId].request;
-    // store step level outputs
-    if (step.outputs) {
-        const runtimeExpressionContext = (0, context_1.createRuntimeExpressionCtx)({
-            ctx: {
-                ...ctx,
-                ...{
-                    $request: request,
-                    $response: step.response,
-                    $inputs: ctx.$workflows[workflowName].inputs,
-                },
-            },
-            workflowId: workflowName,
-            step,
-        });
-        if (step.outputs) {
-            for (const outputKey of Object.keys(step.outputs)) {
-                step.outputs[outputKey] = (0, runtime_expressions_1.evaluateRuntimeExpressionPayload)({
-                    payload: step.outputs[outputKey],
-                    context: runtimeExpressionContext,
-                });
-            }
-        }
-    }
+    const request = ctx.$workflows[workflowId].steps[step.stepId].request;
     step.verboseLog = ctx.apiClient.getVerboseResponseLogs();
     if (step.successCriteria) {
         const successCriteriaChecks = (0, success_criteria_1.checkCriteria)({
-            workflowId: workflowName,
+            workflowId,
             step,
             criteria: step.successCriteria,
             ctx: {
                 ...ctx,
-                ...{
-                    $request: request,
-                    $response: step.response,
-                    $inputs: ctx.$workflows[workflowName].inputs,
-                },
+                $request: request,
+                $response: step.response,
+                $inputs: ctx.$workflows[workflowId].inputs,
             },
         });
         checksResult.successCriteriaCheck = successCriteriaChecks.every((check) => check.pass);
@@ -74,7 +49,7 @@ async function callAPIAndAnalyzeResults({ ctx, workflowName, step, requestData,
         stepCallCtx: {
             $request: request,
             $response: step.response,
-            $inputs: ctx.$workflows[workflowName].inputs,
+            $inputs: ctx.$workflows[workflowId].inputs,
         },
         descriptionOperation: requestData.openapiOperation,
         ctx,
@@ -83,15 +58,33 @@ async function callAPIAndAnalyzeResults({ ctx, workflowName, step, requestData,
         checksResult.expectCheck = schemaChecks.every((check) => check.pass);
         step.checks.push(...schemaChecks);
     }
+    // store step level outputs
+    const outputs = {};
+    if (step.outputs) {
+        const runtimeExpressionContext = (0, context_1.createRuntimeExpressionCtx)({
+            ctx: {
+                ...ctx,
+                $request: request,
+                $response: step.response,
+                $inputs: ctx.$workflows[workflowId].inputs,
+            },
+            workflowId,
+            step,
+        });
+        for (const outputKey of Object.keys(step.outputs)) {
+            outputs[outputKey] = (0, runtime_expressions_1.evaluateRuntimeExpressionPayload)({
+                payload: step.outputs[outputKey],
+                context: runtimeExpressionContext,
+            });
+        }
+    }
     // save local $steps context
     ctx.$steps[step.stepId] = {
-        outputs: ctx.$steps[step.stepId].outputs
-            ? { ...ctx.$steps[step.stepId].outputs, ...step.outputs }
-            : step.outputs,
+        outputs: { ...ctx.$steps[step.stepId].outputs, ...outputs },
     };
     // save $workflows context
-    ctx.$workflows[workflowName].steps[step.stepId] = {
-        outputs: ctx.$steps[step.stepId].outputs,
+    ctx.$workflows[workflowId].steps[step.stepId] = {
+        outputs: { ...ctx.$steps[step.stepId].outputs, ...outputs },
         request,
         response: step.response,
     };

package/lib/modules/flow-runner/call-api-and-analyze-results.js.map

@@ -1 +1 @@
-{"version":3,"file":"call-api-and-analyze-results.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/call-api-and-analyze-results.ts"],"names":[],"mappings":";;AA8BA,4DA8GC;AA5ID,yDAAmD;AACnD,qCAAuC;AACvC,sCAAmC;AACnC,uCAAuD;AACvD,gEAA0E;AAyB1E,iCAAiC;AAC1B,KAAK,UAAU,wBAAwB,CAAC,EAC7C,GAAG,EACH,YAAY,EACZ,IAAI,EACJ,WAAW,GAMZ;IACC,gCAAgC;IAChC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IAEjB,MAAM,YAAY,GAAG;QACnB,oBAAoB,EAAE,IAAI;QAC1B,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,IAAI;KACnB,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,eAAM,CAAC,aAAa;YAC1B,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC;SACxC,CAAC,CAAC;QACH,YAAY,CAAC,YAAY,GAAG,KAAK,CAAC;QAClC,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;IAExE,2BAA2B;IAC3B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,MAAM,wBAAwB,GAAG,IAAA,oCAA0B,EAAC;YAC1D,GAAG,EAAE;gBACH,GAAG,GAAG;gBACN,GAAG;oBACD,QAAQ,EAAE,OAAO;oBACjB,SAAS,EAAE,IAAI,CAAC,QAAQ;oBACxB,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM;iBAC7C;aACF;YACD,UAAU,EAAE,YAAY;YACxB,IAAI;SACL,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,IAAA,sDAAgC,EAAC;oBACzD,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;oBAChC,OAAO,EAAE,wBAAwB;iBAClC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,sBAAsB,EAAE,CAAC;IAEzD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,qBAAqB,GAAG,IAAA,gCAAa,EAAC;YAC1C,UAAU,EAAE,YAAY;YACxB,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,eAAe;YAC9B,GAAG,EAAE;gBACH,GAAG,GAAG;gBACN,GAAG;oBACD,QAAQ,EAAE,OAAO;oBACjB,SAAS,EAAE,IAAI,CAAC,QAAQ;oBACxB,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM;iBAC7C;aACF;SACF,CAAC,CAAC;QAEH,YAAY,CAAC,oBAAoB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,oBAAW,EAAC;QAC/B,WAAW,EAAE;YACX,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,MAAM;SAC7C;QACD,oBAAoB,EAAE,WAAW,CAAC,gBAAgB;QAClD,GAAG;KACJ,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,YAAY,CAAC,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;IACpC,CAAC;IAED,4BAA4B;IAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;QACxB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO;YACtC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;YACzD,CAAC,CAAC,IAAI,CAAC,OAAO;KACjB,CAAC;IACF,0BAA0B;IAC1B,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG;QAChD,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO;QACxC,OAAO;QACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"call-api-and-analyze-results.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/call-api-and-analyze-results.ts"],"names":[],"mappings":"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"}

package/lib/modules/flow-runner/context/create-test-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-test-context.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/context/create-test-context.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAkB7D,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,UAAU,GACpB,OAAO,CAAC,WAAW,CAAC,CAqEtB;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACvC,IAAI,GAAE,MAAM,EAAO,QAgBpB"}
+{"version":3,"file":"create-test-context.d.ts","sourceRoot":"","sources":["../../../../src/modules/flow-runner/context/create-test-context.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAkB7D,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,UAAU,GACpB,OAAO,CAAC,WAAW,CAAC,CAuEtB;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EACvC,IAAI,GAAE,MAAM,EAAO,QAgBpB"}

package/lib/modules/flow-runner/context/create-test-context.js

@@ -5,7 +5,7 @@ exports.collectSecretFields = collectSecretFields;
 const node_path_1 = require("node:path");
 const description_parser_1 = require("../../description-parser");
 const faker_1 = require("../../faker");
-const test_config_generator_1 = require("../../test-config-generator");
+const arazzo_description_generator_1 = require("../../arazzo-description-generator");
 const inputs_1 = require("../inputs");
 const get_test_description_from_file_1 = require("../get-test-description-from-file");
 const read_env_variables_1 = require("../read-env-variables");
@@ -49,16 +49,17 @@ async function createTestContext(testDescription, options, apiClient) {
         $steps: {},
         $components: testDescription.components || {},
         $outputs: {},
+        executedSteps: [],
         workflows: testDescription.workflows || [],
         harLogs: {},
         options,
         testDescription,
-        info: testDescription.info || test_config_generator_1.infoSubstitute,
+        info: testDescription.info || arazzo_description_generator_1.infoSubstitute,
         arazzo: testDescription.arazzo || '',
         sourceDescriptions: testDescription.sourceDescriptions || [],
         secretFields: new Set(),
         mtlsCerts: options.mutualTls?.clientCert || options.mutualTls?.clientKey || options.mutualTls?.caCert
-            ? (0, resolve_mtls_certificates_1.resolveMtlsCertificates)(options.mutualTls)
+            ? (0, resolve_mtls_certificates_1.resolveMtlsCertificates)(options.mutualTls, options.workflowPath)
             : undefined,
         severity: (0, checks_1.resolveSeverityConfiguration)(options.severity),
         apiClient,

package/lib/modules/flow-runner/context/create-test-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-test-context.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/context/create-test-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-test-context.js","sourceRoot":"","sources":["../../../../src/modules/flow-runner/context/create-test-context.ts"],"names":[],"mappings":"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"}

package/lib/modules/flow-runner/get-server-url.d.ts

@@ -6,6 +6,15 @@ export type GetServerUrlInput = {
     openapiOperation?: (OperationDetails & Record<string, any>) | undefined;
     xOperation?: ExtendedOperation;
 };
+export type ServerObject = {
+    url: string;
+    description?: string;
+    variables?: Record<string, {
+        default: string;
+        enum?: string[];
+        description?: string;
+    }>;
+};
 export declare function getServerUrl({ ctx, descriptionName, openapiOperation, xOperation, }: GetServerUrlInput): {
     url: string;
 } | undefined;

package/lib/modules/flow-runner/get-server-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-server-url.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-server-url.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,WAAW,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;IACxE,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAEF,wBAAgB,YAAY,CAAC,EAC3B,GAAG,EACH,eAAe,EACf,gBAAgB,EAChB,UAAU,GACX,EAAE,iBAAiB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CA4EjD"}
+{"version":3,"file":"get-server-url.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-server-url.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,WAAW,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;IACxE,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAChB,MAAM,EACN;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CACF,CAAC;CACH,CAAC;AAEF,wBAAgB,YAAY,CAAC,EAC3B,GAAG,EACH,eAAe,EACf,gBAAgB,EAChB,UAAU,GACX,EAAE,iBAAiB,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAiFjD"}

package/lib/modules/flow-runner/get-server-url.js

@@ -23,9 +23,7 @@ function getServerUrl({ ctx, descriptionName, openapiOperation, xOperation, }) {
                 url: sourceDescription['x-serverUrl'],
             };
         }
-        return {
-            url: (0, config_parser_1.getValueFromContext)('$' + `sourceDescriptions.${descriptionName}.servers.0.url`, ctx),
-        };
+        return resolveOpenApiServerUrlWithVariables((0, config_parser_1.getValueFromContext)('$' + `sourceDescriptions.${descriptionName}.servers.0`, ctx));
     }
     if (openapiOperation?.servers?.[0]) {
         const activeSourceDescription = ctx.sourceDescriptions?.find((sd) => sd.name === openapiOperation.sourceDescriptionName);
@@ -42,18 +40,18 @@ function getServerUrl({ ctx, descriptionName, openapiOperation, xOperation, }) {
                     ? activeSourceDescription['x-serverUrl']
                     : undefined;
         }
-        return serverUrlOverride ? { url: serverUrlOverride } : openapiOperation.servers[0];
+        return serverUrlOverride
+            ? { url: serverUrlOverride }
+            : resolveOpenApiServerUrlWithVariables(openapiOperation.servers[0]);
     }
     if (!descriptionName && ctx?.sourceDescriptions && ctx.sourceDescriptions.length === 1) {
         const sourceDescription = ctx.sourceDescriptions[0];
-        let serverUrl = '';
         if ('x-serverUrl' in sourceDescription && sourceDescription['x-serverUrl']) {
-            serverUrl = sourceDescription['x-serverUrl'];
+            return { url: sourceDescription['x-serverUrl'] };
         }
         else {
-            serverUrl = ctx.$sourceDescriptions[sourceDescription.name]?.servers[0]?.url || undefined;
+            return (resolveOpenApiServerUrlWithVariables(ctx.$sourceDescriptions[sourceDescription.name]?.servers[0]) || undefined);
         }
-        return serverUrl ? { url: serverUrl } : undefined;
     }
     if (!descriptionName ||
         !ctx.$sourceDescriptions ||
@@ -62,6 +60,21 @@ function getServerUrl({ ctx, descriptionName, openapiOperation, xOperation, }) {
         return undefined;
     }
     // Get first available server url from the description
-    return ctx.$sourceDescriptions[descriptionName].servers[0];
+    return resolveOpenApiServerUrlWithVariables(ctx.$sourceDescriptions[descriptionName].servers?.[0]);
+}
+function resolveOpenApiServerUrlWithVariables(server) {
+    if (!server) {
+        return undefined;
+    }
+    return {
+        url: server.url,
+        parameters: Object.entries(server.variables || {})
+            .map(([key, value]) => ({
+            in: 'path',
+            name: key,
+            value: value.default,
+        }))
+            .filter(({ value }) => !!value),
+    };
 }
 //# sourceMappingURL=get-server-url.js.map

package/lib/modules/flow-runner/get-server-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-server-url.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-server-url.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-server-url.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-server-url.ts"],"names":[],"mappings":"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"}

package/lib/modules/flow-runner/get-test-description-from-file.d.ts

@@ -1,5 +1,6 @@
 import { type TestDescription } from '../../types';
 export declare function bundleArazzo(filePath: string): Promise<Partial<Pick<import("../../types").RuntimeExpressionContext & {
+    executedSteps: (import("../../types").Step | import("../../types").WorkflowExecutionResult)[];
     arazzo: string;
     info: import("../../types").InfoObject & Record<string, any>;
     sourceDescriptions?: import("../../types").SourceDescription[];

package/lib/modules/flow-runner/get-test-description-from-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-test-description-from-file.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-test-description-from-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAMnD,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM;;;;;;;;;;;;kBAwD07H,CAAC;iBAAuB,CAAC;cAAoB,CAAC;;;+KAD1hI"}
+{"version":3,"file":"get-test-description-from-file.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/get-test-description-from-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAMnD,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM;;;;;;;;;;;;;kBAwDw9J,CAAC;iBAAuB,CAAC;cAAoB,CAAC;;;+KADxjK"}

package/lib/modules/flow-runner/prepare-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-request.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAyB,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KAEb,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9D,CAAC;AAEF,wBAAsB,cAAc,CAClC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,WAAW,CAAC,CAwItB"}
+{"version":3,"file":"prepare-request.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAyB,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KAEb,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9D,CAAC;AAEF,wBAAsB,cAAc,CAClC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,WAAW,CAAC,CA4ItB"}

package/lib/modules/flow-runner/prepare-request.js

@@ -51,7 +51,9 @@ async function prepareRequest(ctx, step, workflowName) {
     // order is important here, the last one wins
     typeof requestBody === 'object'
         ? [{ in: 'header', name: 'content-type', value: 'application/json' }]
-        : [], requestDataFromOpenAPI?.parameters || [], resolveParameters(workflowLevelParameters, ctx), stepRequestBodyContentType
+        : [], serverUrl?.parameters || [], requestDataFromOpenAPI?.contentTypeParameters || [], 
+    // if step.parameters is defined, we do not auto-populate parameters from the openapi operation
+    step.parameters ? [] : requestDataFromOpenAPI?.parameters || [], resolveParameters(workflowLevelParameters, ctx), stepRequestBodyContentType
         ? [{ in: 'header', name: 'content-type', value: stepRequestBodyContentType }]
         : [], resolveParameters(step.parameters || [], ctx));
     // save local $steps context before evaluating runtime expressions

package/lib/modules/flow-runner/prepare-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-request.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare-request.js","sourceRoot":"","sources":["../../../src/modules/flow-runner/prepare-request.ts"],"names":[],"mappings":"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"}

package/lib/modules/flow-runner/run-step.d.ts

@@ -1,10 +1,8 @@
 import type { Step, TestContext } from '../../types';
-export declare function runStep({ step, ctx, workflowName, parentStepId, parentWorkflowId, retriesLeft, }: {
+export declare function runStep({ step, ctx, workflowId, retriesLeft, }: {
     step: Step;
     ctx: TestContext;
-    workflowName: string | undefined;
-    parentStepId?: string;
-    parentWorkflowId?: string;
+    workflowId: string | undefined;
     retriesLeft?: number;
 }): Promise<{
     shouldEnd: boolean;

package/lib/modules/flow-runner/run-step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-step.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/run-step.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAEV,IAAI,EACJ,WAAW,EAMZ,MAAM,aAAa,CAAC;AAKrB,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,GAAG,EACH,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,WAAW,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAAC,CAyRzC"}
+{"version":3,"file":"run-step.d.ts","sourceRoot":"","sources":["../../../src/modules/flow-runner/run-step.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAEV,IAAI,EACJ,WAAW,EAMZ,MAAM,aAAa,CAAC;AAKrB,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,GAAG,EACH,UAAU,EACV,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,WAAW,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAAC,CA8RzC"}