@sjawhar/pi-legion-envoy 5.17.5 → 5.17.6

package/dist/legion.js

@@ -33473,7 +33473,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "5.17.5",
+  version: "5.17.6",
   type: "module",
   omp: {
     extensions: [
@@ -42139,7 +42139,7 @@ function commandOutput(only, invocation, text, st, ctx) {
 function substitutionInvocation(node, st, ctx) {
   if (node?.type !== "Command" || node.name === undefined || node.prefix.length !== 0)
     return;
-  const argv = args([node.name, ...node.suffix], st, ctx);
+  const argv = commandArgs([node.name, ...node.suffix], st, ctx);
   const name = literalText(argv[0]?.exp);
   if (name === undefined)
     return;
@@ -42349,6 +42349,14 @@ function args(words, st, ctx) {
     });
   });
 }
+function commandArgs(words, st, ctx) {
+  const argv = args(words, st, ctx);
+  for (let index = argv.length - 1;index >= 0; index -= 1) {
+    if (argv[index]?.fields === "none")
+      argv.splice(index, 1);
+  }
+  return argv;
+}
 function positionalOf(list) {
   if (list.some((arg) => arg.fields === "unknown"))
     return;
@@ -43156,8 +43164,9 @@ function statementOutput(statement, st, ctx) {
   }
   if (command.name === undefined)
     return command.redirects.length === 0 ? "" : undefined;
-  const name = literalText(expandWord(command.name, st, ctx)[0]);
-  const rest = args(command.suffix, st, ctx);
+  const argv = commandArgs([command.name, ...command.suffix], st, ctx);
+  const name = literalText(argv[0]?.exp);
+  const rest = argv.slice(1);
   if (name === "cat" && rest.length === 0) {
     const [heredoc, ...others] = command.redirects;
     if (heredoc === undefined || others.length > 0)
@@ -43300,7 +43309,7 @@ function handleCommand(command, st, ctx, pipeIn) {
     checkRedirects(command.redirects, undefined, site, st, ctx);
     return;
   }
-  const argv = args(words, st, ctx);
+  const argv = commandArgs(words, st, ctx);
   checkRedirects(command.redirects, { name: literalText(argv[0]?.exp), args: argv.slice(1) }, site, st, ctx);
   dispatch({ args: argv, site, overlay, redirects: command.redirects, pipeIn }, st, ctx);
 }
@@ -43906,7 +43915,7 @@ function dispatch(invocation, outer, ctx) {
         "--remote-option",
         "--rsync-path",
         "--temp-dir"
-      ]).operands.filter(passesAnArgument).at(-1);
+      ]).operands.at(-1);
       if (destination !== undefined) {
         checkTargets("rsync", "synchronize and delete into", [destination], ACTS_THROUGH_LINK, st, ctx, site);
       }
@@ -44416,9 +44425,6 @@ var LN_OPTIONS = {
   "--verbose": false,
   ...GNU_INFORMATION
 };
-function passesAnArgument(arg) {
-  return arg.fields !== "none";
-}
 function writeArguments(rest, valued, long) {
   const names = Object.keys(long);
   const operands2 = [];
@@ -44429,14 +44435,13 @@ function writeArguments(rest, valued, long) {
     const arg = rest[i];
     const { text, whole } = readableWord(arg);
     if (whole && text === "--") {
-      operands2.push(...rest.slice(i + 1).filter(passesAnArgument));
+      operands2.push(...rest.slice(i + 1));
       break;
     }
     if (!whole || !text.startsWith("-") || text === "-") {
       if (!whole && mayBeSomeOption(text))
         uncertain = arg;
-      if (passesAnArgument(arg))
-        operands2.push(arg);
+      operands2.push(arg);
       continue;
     }
     let takesValue = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/pi-legion-envoy",
-  "version": "5.17.5",
+  "version": "5.17.6",
   "type": "module",
   "omp": {
     "extensions": [