@swmansion/argent 0.20.1-next.5 → 0.20.1-next.6

package/dist/tool-server.cjs

@@ -142717,6 +142717,12 @@ function selectorTree(sel) {
   walk(sel);
   return out;
 }
+function blockSteps(step) {
+  return isBlockStep(step) ? step.steps : void 0;
+}
+function isBlockStep(step) {
+  return isBlockDirectiveKey(step.kind);
+}
 function isE2eFlow(flow) {
   const first = flow.steps.find((s) => s.kind !== "echo");
   return first?.kind === "launch";
@@ -143381,6 +143387,10 @@ var STEP_DIRECTIVE_KEYS = [
   "rotate",
   "snapshot"
 ];
+var BLOCK_DIRECTIVE_KEYS = ["when"];
+function isBlockDirectiveKey(key2) {
+  return BLOCK_DIRECTIVE_KEYS.includes(key2);
+}
 function parseTapTimes(raw, entry) {
   if (raw === void 0) return void 0;
   if (typeof raw !== "number" || !Number.isInteger(raw) || raw < 1 || raw > 10) {
@@ -143573,14 +143583,26 @@ function parseWhenCondition(raw) {
   }
   return { kind: "ui", ...cond };
 }
-var MAX_WHEN_DEPTH = 20;
-function parseWhenStep(raw, depth) {
-  if (depth >= MAX_WHEN_DEPTH) {
+var MAX_BLOCK_DEPTH = 20;
+function assertBlockDepth(raw, depth) {
+  if (depth >= MAX_BLOCK_DEPTH) {
+    const directives = BLOCK_DIRECTIVE_KEYS.map((key2) => `\`${key2}:\``).join("/");
     badEntry(
       raw,
-      `when blocks nest deeper than ${MAX_WHEN_DEPTH} levels \u2014 check for a cyclic YAML alias (\`steps: &s \u2026 steps: *s\`)`
+      `${directives} blocks nest deeper than ${MAX_BLOCK_DEPTH} levels \u2014 check for a cyclic YAML alias (\`steps: &s \u2026 steps: *s\`)`
     );
   }
+}
+function parseBlockSteps(raw, depth, emptyDetail) {
+  assertBlockDepth(raw, depth);
+  if (!Array.isArray(raw.steps) || raw.steps.length === 0) badEntry(raw, emptyDetail);
+  return raw.steps.map((s) => {
+    if (s !== null && typeof s === "object") return fromYamlStep(s, depth + 1);
+    return badEntry(s, "step must be an object");
+  });
+}
+function parseWhenStep(raw, depth) {
+  assertBlockDepth(raw, depth);
   if ("else" in raw) {
     badEntry(
       raw,
@@ -143591,13 +143613,7 @@ function parseWhenStep(raw, depth) {
     badEntry(raw, "a when step takes exactly { when: <condition>, steps: [...] }");
   }
   const condition = parseWhenCondition(raw.when);
-  if (!Array.isArray(raw.steps) || raw.steps.length === 0) {
-    badEntry(raw, "when needs a non-empty steps list to guard");
-  }
-  const steps = raw.steps.map((s) => {
-    if (s !== null && typeof s === "object") return fromYamlStep(s, depth + 1);
-    return badEntry(s, "step must be an object");
-  });
+  const steps = parseBlockSteps(raw, depth, "when needs a non-empty steps list to guard");
   return { kind: "when", condition, steps };
 }
 function runTargetName(target) {
@@ -143636,7 +143652,7 @@ function completeRunExtension(value) {
   const candidate = `${value}.yaml`;
   return FLOW_FILE_NAME_PATTERN.test(path31.posix.basename(candidate)) ? candidate : value;
 }
-function fromYamlStep(raw, whenDepth = 0) {
+function fromYamlStep(raw, blockDepth = 0) {
   const entry = raw;
   if ("optional" in raw) {
     badEntry(
@@ -143659,7 +143675,7 @@ function fromYamlStep(raw, whenDepth = 0) {
     );
   }
   const kind = kinds[0];
-  if (kind !== "when") {
+  if (!isBlockDirectiveKey(kind)) {
     const siblings = kind === "tool" ? ["tool", "args", "delayMs"] : [kind];
     const extras = Object.keys(entry).filter((k) => !siblings.includes(k));
     if (extras.length > 0) {
@@ -143672,7 +143688,7 @@ function fromYamlStep(raw, whenDepth = 0) {
   if ("echo" in raw) return { kind: "echo", message: String(raw.echo) };
   if ("launch" in raw) return { kind: "launch", app: parseLaunch(raw.launch) };
   if ("run" in raw) return { kind: "run", flow: parseRunTarget(raw, raw.run) };
-  if ("when" in raw) return parseWhenStep(entry, whenDepth);
+  if ("when" in raw) return parseWhenStep(entry, blockDepth);
   if ("tap" in raw) return parseTap(raw.tap, raw);
   if ("long-press" in raw) {
     return parseLongPress(raw["long-press"], raw);
@@ -144388,11 +144404,13 @@ function stepRequiresDevice(registry2, step) {
   }
 }
 function flowRequiresDevice(registry2, steps) {
-  return steps.some((step) => stepRequiresDevice(registry2, step));
+  return steps.some(
+    (step) => stepRequiresDevice(registry2, step) || flowRequiresDevice(registry2, blockSteps(step) ?? [])
+  );
 }
 function flowScopesDevice(registry2, steps) {
   return steps.some(
-    (step) => step.kind === "tool" && declaresAny(registry2, step.name, DEVICE_BIND_LIST_KEYS)
+    (step) => step.kind === "tool" && declaresAny(registry2, step.name, DEVICE_BIND_LIST_KEYS) || flowScopesDevice(registry2, blockSteps(step) ?? [])
   );
 }
 function toolRequiresDevice(registry2, toolName) {
@@ -148662,7 +148680,8 @@ function displayFlowName(params) {
 function* walkSteps(steps) {
   for (const step of steps) {
     yield step;
-    if (step.kind === "when") yield* walkSteps(step.steps);
+    const inner = blockSteps(step);
+    if (inner) yield* walkSteps(inner);
   }
 }
 function assertUploadSelfContained(flow) {
@@ -149063,8 +149082,18 @@ function stepTarget(step) {
       return step.cropOn ? `"${step.name}" cropOn ${selectorLabel2(step.cropOn)}` : `"${step.name}"`;
     case "run":
       return step.flow;
-    default:
+    case "echo":
+    case "tool":
+      return void 0;
+    case "launch":
+      return void 0;
+    case "wait":
+      return void 0;
+    default: {
+      const unclassified = step;
+      void unclassified;
       return void 0;
+    }
   }
 }
 function scopeFlow(scope) {
@@ -149106,7 +149135,8 @@ async function execSteps(state3, steps, scope) {
         // line rather than vanishing — matching reportBlockSkipped.
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope));
+      const inner = blockSteps(step);
+      if (inner) reportBlockSkipped(state3, inner, childScope(scope));
       continue;
     }
     if (!state3.device && stepRequiresDevice(state3.registry, step)) {
@@ -149120,7 +149150,8 @@ async function execSteps(state3, steps, scope) {
         ...depthOf(scope),
         reason: `step needs a device but the flow was resolved as device-free \u2014 pass an explicit device`
       });
-      if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope));
+      const inner = blockSteps(step);
+      if (inner) reportBlockSkipped(state3, inner, childScope(scope));
       continue;
     }
     if (state3.signal?.aborted) {
@@ -149135,17 +149166,16 @@ async function execSteps(state3, steps, scope) {
         ...depthOf(scope),
         ...step.kind === "echo" ? { message: step.message } : {}
       });
-      if (step.kind === "when") {
-        reportBlockSkipped(state3, step.steps, childScope(scope), "run aborted");
-      }
+      const inner = blockSteps(step);
+      if (inner) reportBlockSkipped(state3, inner, childScope(scope), "run aborted");
       continue;
     }
     if (step.kind === "run") {
       await execRunStep(state3, step, scope);
       continue;
     }
-    if (step.kind === "when") {
-      await execWhenStep(state3, step, scope);
+    if (isBlockStep(step)) {
+      await execBlockStep(state3, step, scope);
       continue;
     }
     const report = await execLeafStep(state3, step, index, scope);
@@ -149169,7 +149199,18 @@ function reportBlockSkipped(state3, steps, scope, reason) {
       ...depthOf(scope),
       ...step.kind === "echo" ? { message: step.message } : {}
     });
-    if (step.kind === "when") reportBlockSkipped(state3, step.steps, childScope(scope), reason);
+    const inner = blockSteps(step);
+    if (inner) reportBlockSkipped(state3, inner, childScope(scope), reason);
+  }
+}
+async function execBlockStep(state3, step, scope) {
+  switch (step.kind) {
+    case "when":
+      return execWhenStep(state3, step, scope);
+    default: {
+      const unhandled = step.kind;
+      void unhandled;
+    }
   }
 }
 async function execWhenStep(state3, step, scope) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.20.1-next.5",
+  "version": "0.20.1-next.6",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",