@redocly/cli 0.0.0-snapshot.1785229997 → 0.0.0-snapshot.1785230554

package/lib/chunks/{O5U7AESV.js → HV6PGCEU.js}

@@ -2,10 +2,10 @@ import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 import {
   RedoclyOAuthClient
-} from "./UIDQCTVI.js";
+} from "./MVYT2TYI.js";
 import "./Y6DTFCLS.js";
 import "./4FB5ZIPP.js";
-import "./3UGBCSN6.js";
+import "./R3N3E2X6.js";
 import "./XB6C62FW.js";
 import "./UUU33DK3.js";
 import "./Z3EJWJEX.js";

package/lib/chunks/{ADJRH7PP.js → JR2DXWZO.js}

@@ -3070,35 +3070,6 @@ var {
   bgWhiteBright
 } = createColors();
 
-// ../respect-core/lib/modules/context-parser/resolve-workflow-reference.js
-function parseSourceDescriptionWorkflowRef(ref) {
-  if (!ref.startsWith("$sourceDescriptions.")) {
-    return void 0;
-  }
-  const parts = ref.split(".");
-  if (parts.length === 3 && parts[1] && parts[2]) {
-    return { sourceDescriptionName: parts[1], workflowId: parts[2], isLegacyForm: false };
-  }
-  if (parts.length === 4 && parts[2] === "workflows" && parts[1] && parts[3]) {
-    return { sourceDescriptionName: parts[1], workflowId: parts[3], isLegacyForm: true };
-  }
-  return void 0;
-}
-function resolveWorkflowReference({ ref, ctx }) {
-  if (!ref) {
-    return void 0;
-  }
-  if (!ref.startsWith("$")) {
-    return "workflows" in ctx ? ctx.workflows?.find((workflow) => workflow.workflowId === ref) : void 0;
-  }
-  const parsedRef = parseSourceDescriptionWorkflowRef(ref);
-  if (!parsedRef) {
-    return void 0;
-  }
-  const workflows = ctx.$sourceDescriptions?.[parsedRef.sourceDescriptionName]?.workflows;
-  return Array.isArray(workflows) ? workflows.find((workflow) => workflow.workflowId === parsedRef.workflowId) : void 0;
-}
-
 // ../respect-core/lib/modules/context-parser/get-value-from-context.js
 var hasCurlyBraces = (input) => {
   return /\{.*?\}/.test(input);
@@ -3331,35 +3302,18 @@ var resolveValue = (value2, ctx, logger) => {
   if (path5.startsWith("$file(") && path5.endsWith(")")) {
     return path5.slice(7, -2);
   }
-  if (path5.startsWith("$sourceDescriptions.")) {
-    const parsedRef = parseSourceDescriptionWorkflowRef(path5);
-    if (parsedRef) {
-      const { sourceDescriptionName, workflowId: reference, isLegacyForm } = parsedRef;
-      const sourceDescriptions = getFrom(ctx)("$sourceDescriptions");
-      const sourceDescriptionDocument = sourceDescriptions?.[sourceDescriptionName];
-      if (!sourceDescriptionDocument) {
-        throw new Error(`Can't resolve ${red(path5)}: source description ${red(sourceDescriptionName)} is not found. Available source descriptions: ${Object.keys(sourceDescriptions ?? {}).join(", ")}.`);
-      }
-      const workflow = resolveWorkflowReference({ ref: path5, ctx });
-      if (workflow) {
-        return workflow;
-      }
-      if (!isLegacyForm) {
-        const sourceDescriptionObject = ("sourceDescriptions" in ctx ? ctx.sourceDescriptions : void 0)?.find(({ name }) => name === sourceDescriptionName);
-        if (sourceDescriptionObject && Object.prototype.hasOwnProperty.call(sourceDescriptionObject, reference)) {
-          return sourceDescriptionObject[reference];
-        }
-        if (Object.prototype.hasOwnProperty.call(sourceDescriptionDocument, reference)) {
-          return sourceDescriptionDocument[reference];
-        }
-      }
-      const availableWorkflows = (Array.isArray(sourceDescriptionDocument.workflows) ? sourceDescriptionDocument.workflows : []).map((workflow2) => workflow2.workflowId).join(", ");
-      const availableWorkflowsHint = availableWorkflows ? ` Available workflows: ${availableWorkflows}.` : "";
-      throw new Error(isLegacyForm ? `Can't resolve ${red(path5)}: workflow ${red(reference)} is not found in source description ${red(sourceDescriptionName)}.${availableWorkflowsHint}` : `Can't resolve ${red(path5)}: ${red(reference)} does not match a workflow or a field of source description ${red(sourceDescriptionName)}.${availableWorkflowsHint}`);
+  if (path5.startsWith("$sourceDescriptions.") && path5.includes(".workflows.")) {
+    const parts = path5.split(".");
+    const sourceDescriptionName = parts[1];
+    const workflowId = parts[3];
+    if (!sourceDescriptionName || !workflowId) {
+      return void 0;
     }
-    if (path5.split(".")[2] === "workflows") {
-      throw new Error(`Can't resolve ${red(path5)}: invalid workflow reference format. Use $sourceDescriptions.<name>.<workflowId> or $sourceDescriptions.<name>.workflows.<workflowId>.`);
+    const sourceDescriptions = getFrom(ctx)("$sourceDescriptions");
+    if (!sourceDescriptions[sourceDescriptionName]) {
+      return void 0;
     }
+    return sourceDescriptions[sourceDescriptionName].workflows.find((workflow) => workflow.workflowId === workflowId);
   }
   if (path5 && path5.trim().startsWith("faker.")) {
     return getFakeData({ pointer: path5, ctx, logger });
@@ -17282,7 +17236,7 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
   const successActionsToRun = (onSuccess || workflow?.successActions || []).map((action) => resolveReusableComponentItem(action, ctx));
   const resolvedParameters = parameters?.map((parameter) => resolveReusableComponentItem(parameter, ctx));
   if (targetWorkflowRef) {
-    const targetWorkflow = resolveWorkflowReference({ ref: targetWorkflowRef, ctx });
+    const targetWorkflow = ctx.workflows.find((w32) => w32.workflowId === targetWorkflowRef) || getValueFromContext({ value: targetWorkflowRef, ctx, logger: ctx.options.logger });
     if (!targetWorkflow) {
       const failedCall = {
         name: CHECKS.UNEXPECTED_ERROR,
@@ -17291,9 +17245,7 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
         severity: ctx.severity["UNEXPECTED_ERROR"]
       };
       step.checks.push(failedCall);
-      ctx.executedSteps.push(step);
-      printUnknownStep(step, ctx.options.logger);
-      return { shouldEnd: true };
+      return;
     }
     const workflowCtx = await resolveWorkflowContext(targetWorkflowRef, targetWorkflow, ctx, ctx.options.config);
     if (resolvedParameters && resolvedParameters.length > 0) {
@@ -17347,8 +17299,6 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
           severity: ctx.severity["UNEXPECTED_ERROR"]
         };
         step.checks.push(failedCall);
-        ctx.executedSteps.push(step);
-        printUnknownStep(step, ctx.options.logger);
       }
       ctx.$steps[stepId] = {
         outputs
@@ -17462,23 +17412,10 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
     }
   }
   async function runActions(actions = [], kind, executedStepsCount2) {
-    function failStepWithActionError(message) {
-      step.checks.push({
-        name: CHECKS.UNEXPECTED_ERROR,
-        message,
-        passed: false,
-        severity: ctx.severity["UNEXPECTED_ERROR"]
-      });
-      if (!ctx.executedSteps.includes(step)) {
-        ctx.executedSteps.push(step);
-        printUnknownStep(step, ctx.options.logger);
-      }
-      return { shouldEnd: true };
-    }
     for (const action of actions) {
       const { type, criteria } = action;
       if (action.workflowId && action.stepId) {
-        return failStepWithActionError(`Cannot use both workflowId: ${action.workflowId} and stepId: ${action.stepId} in ${action.type} action`);
+        throw new Error(`Cannot use both workflowId: ${action.workflowId} and stepId: ${action.stepId} in ${action.type} action`);
       }
       const matchesCriteria = checkCriteria({
         workflowId,
@@ -17487,10 +17424,11 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
         ctx
       }).every((check) => check.passed);
       if (matchesCriteria) {
-        const targetWorkflow = action.workflowId ? resolveWorkflowReference({ ref: action.workflowId, ctx }) : void 0;
-        if (action.workflowId && !targetWorkflow) {
-          return failStepWithActionError(`Workflow ${red(action.workflowId)} referenced in the ${type} action of step ${red(stepId)} is not found.`);
-        }
+        const targetWorkflow = action.workflowId ? getValueFromContext({
+          value: action.workflowId,
+          ctx,
+          logger: ctx.options.logger
+        }) : void 0;
         const targetCtx = action.workflowId && targetWorkflow ? await resolveWorkflowContext(action.workflowId, targetWorkflow, ctx, ctx.options.config) : { ...ctx, executedSteps: [] };
         const targetStep = action.stepId ? action.stepId : void 0;
         if (type === "retry") {
@@ -17524,7 +17462,7 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
           } else if (targetStep) {
             const stepToRun = workflow?.steps.find((s55) => s55.stepId === targetStep);
             if (!stepToRun) {
-              return failStepWithActionError(`Step ${targetStep} not found in workflow ${workflowId}`);
+              throw new Error(`Step ${targetStep} not found in workflow ${workflowId}`);
             }
             await runStep({
               step: stepToRun,
@@ -17550,7 +17488,7 @@ async function runStep({ step, ctx, workflowId, retriesLeft, executedStepsCount
           return { shouldEnd: true };
         } else if (type === "goto") {
           if (!targetWorkflow && !targetStep) {
-            return failStepWithActionError("Either workflowId or stepId must be provided in goto action");
+            throw new Error("Either workflowId or stepId must be provided in goto action");
           }
           if (targetWorkflow || targetStep) {
             printActionsSeparator({
@@ -17618,42 +17556,7 @@ async function runWorkflows({ testDescription, options, executedStepsCount }) {
   for (const workflow of workflows) {
     ctx.executedSteps = [];
     if (workflow.dependsOn?.length) {
-      try {
-        await handleDependsOn({ workflow, ctx, config: options.config, executedStepsCount });
-      } catch (error) {
-        if (!(error instanceof WorkflowDependencyError)) {
-          throw error;
-        }
-        const failureTime = performance.now();
-        const failedStep = {
-          stepId: "dependsOn",
-          checks: [
-            {
-              name: CHECKS.UNEXPECTED_ERROR,
-              message: error.message,
-              passed: false,
-              severity: ctx.severity["UNEXPECTED_ERROR"]
-            }
-          ]
-        };
-        printWorkflowSeparator({
-          fileName: basename3(ctx.options.filePath),
-          workflowName: workflow.workflowId,
-          logger: options.logger
-        });
-        printUnknownStep(failedStep, options.logger);
-        executedWorkflows.push({
-          type: "workflow",
-          workflowId: workflow.workflowId,
-          startTime: failureTime,
-          endTime: failureTime,
-          totalTimeMs: 0,
-          executedSteps: [failedStep],
-          ctx,
-          globalTimeoutError: false
-        });
-        continue;
-      }
+      await handleDependsOn({ workflow, ctx, config: options.config, executedStepsCount });
     }
     const workflowExecutionResult = await runWorkflow({
       workflowInput: workflow.workflowId,
@@ -17767,19 +17670,15 @@ async function runWorkflow({ workflowInput, ctx, fromStepId, skipLineSeparator,
     globalTimeoutError: hasFailedTimeoutSteps
   };
 }
-var WorkflowDependencyError = class extends Error {
-};
 async function handleDependsOn({ workflow, ctx, config, executedStepsCount }) {
   if (!workflow.dependsOn?.length)
     return;
-  const resolvedDependencies = workflow.dependsOn.map((workflowId) => {
-    const resolvedWorkflow = resolveWorkflowReference({ ref: workflowId, ctx });
-    if (!resolvedWorkflow) {
-      throw new WorkflowDependencyError(`Workflow ${red(workflowId)} from dependsOn of workflow ${red(workflow.workflowId)} is not found.`);
-    }
-    return { workflowId, resolvedWorkflow };
-  });
-  const dependenciesWorkflows = await Promise.all(resolvedDependencies.map(async ({ workflowId, resolvedWorkflow }) => {
+  const dependenciesWorkflows = await Promise.all(workflow.dependsOn.map(async (workflowId) => {
+    const resolvedWorkflow = getValueFromContext({
+      value: workflowId,
+      ctx,
+      logger: ctx.options.logger
+    });
     const workflowCtx = await resolveWorkflowContext(workflowId, resolvedWorkflow, ctx, config);
     printRequiredWorkflowSeparator(workflow.workflowId, ctx.options.logger);
     return runWorkflow({
@@ -17789,9 +17688,10 @@ async function handleDependsOn({ workflow, ctx, config, executedStepsCount }) {
       executedStepsCount
     });
   }));
-  const failedDependencies = dependenciesWorkflows.filter((dependencyWorkflow) => calculateTotals([dependencyWorkflow]).steps.failed > 0).map((dependencyWorkflow) => dependencyWorkflow.workflowId);
-  if (failedDependencies.length) {
-    throw new WorkflowDependencyError(`Dependent workflows of workflow ${red(workflow.workflowId)} have failed steps: ${red(failedDependencies.join(", "))}.`);
+  const totals = calculateTotals(dependenciesWorkflows);
+  const hasProblems = totals.steps.failed > 0;
+  if (hasProblems) {
+    throw new Error("Dependent workflows has failed steps");
   }
 }
 async function resolveWorkflowContext(workflowId, resolvedWorkflow, ctx, config) {

package/lib/chunks/{UIDQCTVI.js → MVYT2TYI.js}

@@ -8,7 +8,7 @@ import {
 } from "./4FB5ZIPP.js";
 import {
   version
-} from "./3UGBCSN6.js";
+} from "./R3N3E2X6.js";
 import {
   require_undici
 } from "./XB6C62FW.js";

package/lib/chunks/{WTUD47FM.js → N55G56UJ.js}

@@ -13,7 +13,7 @@ import {
 import {
   redocStandaloneSri,
   redocVersion
-} from "./3UGBCSN6.js";
+} from "./R3N3E2X6.js";
 import {
   require_json_pointer,
   require_openapi_sampler

package/lib/chunks/{DCWPEC35.js → QCELG3VF.js}

@@ -10,7 +10,7 @@ import {
 } from "./Y6DTFCLS.js";
 import {
   version
-} from "./3UGBCSN6.js";
+} from "./R3N3E2X6.js";
 import {
   diag,
   esm_exports,

package/lib/chunks/{3UGBCSN6.js → R3N3E2X6.js}

@@ -4,7 +4,7 @@ const require = __createRequire(import.meta.url);
 // package.json
 var package_default = {
   name: "@redocly/cli",
-  version: "0.0.0-snapshot.1785229997",
+  version: "0.0.0-snapshot.1785230554",
   description: "",
   license: "MIT",
   bin: {
@@ -49,8 +49,8 @@ var package_default = {
     "@opentelemetry/sdk-trace-node": "2.8.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@redocly/cli-otel": "0.3.4",
-    "@redocly/openapi-core": "0.0.0-snapshot.1785229997",
-    "@redocly/respect-core": "0.0.0-snapshot.1785229997",
+    "@redocly/openapi-core": "0.0.0-snapshot.1785230554",
+    "@redocly/respect-core": "0.0.0-snapshot.1785230554",
     "@types/cookie": "0.6.0",
     "@types/har-format": "^1.2.16",
     "@types/react": "^17.0.0 || ^18.2.21 || ^19.2.16",

package/lib/chunks/{T2IFVCFM.js → UV3RHVRI.js}

@@ -8,7 +8,7 @@ import {
   maskSecrets,
   parseRuntimeExpression,
   run
-} from "./ADJRH7PP.js";
+} from "./JR2DXWZO.js";
 import "./VXIQEZPR.js";
 import "./UUU33DK3.js";
 import "./Z3EJWJEX.js";

package/lib/index.js

@@ -47,7 +47,7 @@ import {
   getProxyUrl,
   getReuniteUrl,
   shouldBypassProxy
-} from "./chunks/UIDQCTVI.js";
+} from "./chunks/MVYT2TYI.js";
 import {
   ANONYMOUS_ID_CACHE_FILE,
   DEFAULT_FETCH_TIMEOUT,
@@ -58,7 +58,7 @@ import {
   engines,
   name,
   version
-} from "./chunks/3UGBCSN6.js";
+} from "./chunks/R3N3E2X6.js";
 import {
   require_undici
 } from "./chunks/XB6C62FW.js";
@@ -66,7 +66,7 @@ import {
   RESET_ESCAPE_CODE,
   calculateTotals,
   conditionallyMaskSecrets
-} from "./chunks/ADJRH7PP.js";
+} from "./chunks/JR2DXWZO.js";
 import "./chunks/VXIQEZPR.js";
 import "./chunks/UUU33DK3.js";
 import {
@@ -7715,7 +7715,7 @@ async function handleGenerateArazzo({
     config: config3
   };
   try {
-    const { generate } = await import("./chunks/T2IFVCFM.js");
+    const { generate } = await import("./chunks/UV3RHVRI.js");
     logger.info(gray("\n  Generating Arazzo description... \n"));
     const generatedArazzo = await generate(options);
     writeFileSync2(outputFile, stringifyYaml(generatedArazzo));
@@ -9072,14 +9072,14 @@ function mapJsonStep(step, workflowId, ctx) {
     stepId: step.stepId,
     workflowId,
     request: {
-      method: publicStep?.request?.method || "",
+      method: publicStep.request?.method || "",
       url: step.response?.requestUrl || "",
-      headers: publicStep?.request?.header || {},
-      body: publicStep?.request?.body
+      headers: publicStep.request?.header || {},
+      body: publicStep.request?.body
     },
     response: {
       statusCode: step.response?.statusCode || 0,
-      body: publicStep?.response?.body,
+      body: publicStep.response?.body,
       headers: step.response?.header || {},
       time: step.response?.time || 0,
       size: step.response?.responseSize
@@ -9088,7 +9088,7 @@ function mapJsonStep(step, workflowId, ctx) {
       ...check,
       status: calculateCheckStatus(check)
     })),
-    totalTimeMs: publicStep?.response?.time || 0,
+    totalTimeMs: publicStep.response?.time || 0,
     retriesLeft: step.retriesLeft,
     status: calculateStepStatus(step.checks)
   };
@@ -9167,7 +9167,7 @@ async function handleRespect({
   let mtlsCerts;
   let harLogs;
   try {
-    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/T2IFVCFM.js");
+    const { run, conditionallyMaskSecrets: conditionallyMaskSecrets2 } = await import("./chunks/UV3RHVRI.js");
     const workingDir = config3.configPath ? dirname4(config3.configPath) : process.cwd();
     if (argv.mtls) {
       mtlsCerts = resolveMtlsCertificates(argv.mtls, workingDir);
@@ -12643,7 +12643,7 @@ async function sendTelemetry({
       $0: _,
       ...args
     } = argv;
-    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/O5U7AESV.js");
+    const { RedoclyOAuthClient: RedoclyOAuthClient2 } = await import("./chunks/HV6PGCEU.js");
     const oauthClient = new RedoclyOAuthClient2();
     const reuniteUrl = getReuniteUrl(config3, args.residency);
     const logged_in = await oauthClient.isAuthorized(reuniteUrl);
@@ -12691,7 +12691,7 @@ async function sendTelemetry({
       category: "product",
       data: eventData
     });
-    const { otelTelemetry } = await import("./chunks/DCWPEC35.js");
+    const { otelTelemetry } = await import("./chunks/QCELG3VF.js");
     otelTelemetry.send(cloudEvent);
   } catch (err) {
   }
@@ -13525,7 +13525,7 @@ yargs_default(hideBin(process.argv)).version("version", "Show version number.",
     return true;
   }),
   async (argv) => {
-    const { handlerBuildCommand } = await import("./chunks/WTUD47FM.js");
+    const { handlerBuildCommand } = await import("./chunks/N55G56UJ.js");
     commandWrapper(handlerBuildCommand)(argv);
   }
 ).command(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "0.0.0-snapshot.1785229997",
+  "version": "0.0.0-snapshot.1785230554",
   "description": "",
   "license": "MIT",
   "type": "module",