@styx-api/core 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@styx-api/core",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Styx compiler core: parses CLI tool descriptors (e.g. Boutiques), optimizes an IR, solves typed parameter bindings, and generates type-safe wrappers (TypeScript, Python, JSON Schema). Part of the Styx/NiWrap ecosystem.",
   "keywords": [
     "styx",

package/src/backend/boutiques/boutiques.ts

@@ -297,7 +297,10 @@ class BoutiquesEmitter {
     }
     if (peeled.flag) {
       input["command-line-flag"] = peeled.flag;
-      if (peeled.flagSeparator) input["command-line-flag-separator"] = peeled.flagSeparator;
+      // Emit the separator whenever the flag is fused with its value, including
+      // the empty (direct-concatenation) case; absent means the default space.
+      if (peeled.flagSeparator !== undefined)
+        input["command-line-flag-separator"] = peeled.flagSeparator;
     }
     if (mapped.integer) input.integer = true;
     if (mapped.minimum !== undefined) input.minimum = mapped.minimum;
@@ -547,7 +550,10 @@ class BoutiquesEmitter {
     // Flag
     if (peeled.flag) {
       input["command-line-flag"] = peeled.flag;
-      if (peeled.flagSeparator) input["command-line-flag-separator"] = peeled.flagSeparator;
+      // Emit the separator whenever the flag is fused with its value, including
+      // the empty (direct-concatenation) case; absent means the default space.
+      if (peeled.flagSeparator !== undefined)
+        input["command-line-flag-separator"] = peeled.flagSeparator;
     }
 
     // Constraints from mapped type
@@ -650,9 +656,17 @@ class BoutiquesEmitter {
         const nodes = node.attrs.nodes;
         if (nodes.length === 2 && nodes[0]!.kind === "literal") {
           const flagLit = nodes[0]!.attrs.str;
-          const { flag, separator } = this.splitFlagLiteral(flagLit);
-          result.flag = flag;
-          if (separator) result.flagSeparator = separator;
+          if (node.attrs.join !== undefined) {
+            // Joined: flag + value form one argv token, so a trailing `=` (or an
+            // empty separator for direct concatenation) is the flag-separator.
+            const { flag, separator } = this.splitFlagLiteral(flagLit);
+            result.flag = flag;
+            result.flagSeparator = separator; // may be "" (direct concatenation)
+          } else {
+            // Not joined: flag and value are separate argv tokens, so the whole
+            // literal is the flag with no separator.
+            result.flag = flagLit;
+          }
           this.peelNodeInner(nodes[1]!, type, result);
         }
         // Otherwise don't peel further (it's a struct sequence or similar)

package/src/backend/python/arg-builder.ts

@@ -25,6 +25,14 @@ export function resultToStmt(r: ArgResult): string {
 }
 
 function appendLines(cb: CodeBuilder, code: string): void {
+  // Every caller emits `code` as an indented branch body (an `if`/`elif`/`else`
+  // or optional block). A union variant or optional can legitimately contribute
+  // no command-line arguments (e.g. an "off"/"none" mode), leaving `code` empty -
+  // emit `pass` so the block is valid Python instead of an empty, un-indented one.
+  if (code.trim() === "") {
+    cb.line("pass");
+    return;
+  }
   for (const line of code.split("\n")) cb.line(line);
 }
 

package/src/frontend/boutiques/parser.ts

@@ -510,13 +510,21 @@ export class BoutiquesParser implements Frontend {
     const flag = btInput["command-line-flag"];
     if (!isString(flag)) return node;
 
+    // A non-space separator (e.g. `=` or `""`) fuses the flag and value into a
+    // single argv token (`--flag=value` / `--flagvalue`), so the sequence is
+    // joined. The default/space separator keeps them as separate argv elements
+    // (`--flag value`).
     const flagSep = btInput["command-line-flag-separator"];
+    const fused = isString(flagSep) && flagSep !== " ";
     const prefix: Literal = {
       kind: "literal",
-      attrs: { str: flag + (flagSep ?? "") },
+      attrs: { str: fused ? flag + flagSep : flag },
     };
 
-    return { kind: "sequence", attrs: { nodes: [prefix, node] } };
+    return {
+      kind: "sequence",
+      attrs: { nodes: [prefix, node], ...(fused && { join: "" }) },
+    };
   }
 
   private wrapWithOptional(node: Expr): Optional {