@cordfuse/crosstalk 7.0.0-alpha.8 → 7.0.0-alpha.9

package/commands/run.js

@@ -10,7 +10,7 @@
 import { readFileSync, existsSync, statSync } from 'fs';
 import { apiFor } from '../lib/api-client.js';
 import { reportAndExit } from '../lib/errors.js';
-import { flag, has } from '../lib/argv.js';
+import { flag, has, positionals } from '../lib/argv.js';
 
 const FLAGS_WITH_VALUE = new Set(['--type', '--to', '--as', '--fanout', '--channel', '--from', '--containername', '-c']);
 
@@ -56,18 +56,11 @@ export async function run(argv) {
   const type = flag(argv, '--type');
   if (type !== 'primitive' && type !== 'workflow') usage(1);
 
-  // The body is the last non-flag arg. Walk argv backwards skipping
-  // flag values.
-  let bodyArg;
-  for (let i = argv.length - 1; i >= 0; i--) {
-    const a = argv[i];
-    if (a.startsWith('-')) break;
-    // Make sure we're not the value of a flag like `--to <value>`
-    const prev = argv[i - 1];
-    if (prev && FLAGS_WITH_VALUE.has(prev)) continue;
-    bodyArg = a;
-    break;
-  }
+  // Body is the last positional. positionals() skips flag values so the
+  // body resolves regardless of flag order — `--containername a8 hello`
+  // and `hello --containername a8` both work.
+  const pos = positionals(argv, [...FLAGS_WITH_VALUE]);
+  const bodyArg = pos[pos.length - 1];
 
   const body = resolveBody(bodyArg);
   if (body == null || body.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cordfuse/crosstalk",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0-alpha.9",
   "description": "Crosstalk client — host-side CLI that talks to the crosstalkd daemon running inside the crosstalk-server container.",
   "type": "module",
   "license": "MIT",