@qodalis/cli 2.0.0-rc.1 → 2.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qodalis/cli",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "Framework-agnostic CLI engine for @qodalis terminal applications.",
   "author": "Nicolae Lupei, Qodalis Solutions",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "./assets/*": "./assets/*"
   },
   "dependencies": {
-    "@qodalis/cli-core": "2.0.0-rc.1",
+    "@qodalis/cli-core": "2.0.0-rc.2",
     "@xterm/xterm": "^6.0.0",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-web-links": "^0.12.0",

package/public-api.d.mts

@@ -165,7 +165,7 @@ declare const CliKeyValueStore_TOKEN: any;
  */
 declare const SyntaxHighlighterRegistry_TOKEN: any;
 
-declare const LIBRARY_VERSION = "2.0.0-rc.1";
+declare const LIBRARY_VERSION = "2.0.0-rc.2";
 declare const API_VERSION = 2;
 
 declare class CliAliasCommandProcessor implements ICliCommandProcessor {
@@ -1609,6 +1609,14 @@ declare class CliCommandExecutor implements ICliCommandExecutorService {
      * The text after the word that selected `processor`, which may be its
      * command or one of its aliases (e.g. `pkg rm guid` -> `guid`).
      */
+    /**
+     * Reads the words of a command left to right, matching each against the
+     * sub-commands of the processor matched so far. A flag that takes a
+     * value (by the parameters of the processors matched so far, nearest
+     * first) consumes the word after it, so that word is neither a
+     * sub-command nor part of the command's value.
+     */
+    private commandWords;
     private extractPositionalValue;
     private guardDenial;
     private processorOwnsParameter;

package/public-api.d.ts

@@ -165,7 +165,7 @@ declare const CliKeyValueStore_TOKEN: any;
  */
 declare const SyntaxHighlighterRegistry_TOKEN: any;
 
-declare const LIBRARY_VERSION = "2.0.0-rc.1";
+declare const LIBRARY_VERSION = "2.0.0-rc.2";
 declare const API_VERSION = 2;
 
 declare class CliAliasCommandProcessor implements ICliCommandProcessor {
@@ -1609,6 +1609,14 @@ declare class CliCommandExecutor implements ICliCommandExecutorService {
      * The text after the word that selected `processor`, which may be its
      * command or one of its aliases (e.g. `pkg rm guid` -> `guid`).
      */
+    /**
+     * Reads the words of a command left to right, matching each against the
+     * sub-commands of the processor matched so far. A flag that takes a
+     * value (by the parameters of the processors matched so far, nearest
+     * first) consumes the word after it, so that word is neither a
+     * sub-command nor part of the command's value.
+     */
+    private commandWords;
     private extractPositionalValue;
     private guardDenial;
     private processorOwnsParameter;

package/public-api.js

@@ -293,6 +293,13 @@ function reconcileArgs(tokens, descriptors) {
   }
   return { args, commandParts };
 }
+function flagTakesNextWord(flag, descriptors) {
+  if (flag.hasEquals) return false;
+  const descriptor = findDescriptor(flag.name, descriptors);
+  if (descriptor) return descriptor.type !== "boolean";
+  const letters = flag.short ? expandShortFlags(flag.name, descriptors) : void 0;
+  return !!letters && letters[letters.length - 1].descriptor.type !== "boolean";
+}
 function findDescriptor(name, descriptors) {
   if (!descriptors) return void 0;
   return descriptors.find(
@@ -512,7 +519,7 @@ var CliKeyValueStore_TOKEN = cliCore.createCliToken("cli-key-value-store");
 var SyntaxHighlighterRegistry_TOKEN = cliCore.createCliToken("syntax-highlighter-registry");
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0-rc.1";
+var LIBRARY_VERSION = "2.0.0-rc.2";
 var API_VERSION = 2;
 var ANONYMOUS = "\0anonymous";
 function aliasOwner(context2) {
@@ -18285,19 +18292,20 @@ var CliCommandExecutor = class {
     const parsed = this.commandParser.parse(command2);
     let { commandName } = parsed;
     let parsedArgs = parsed.args;
-    const [mainCommand, ...other] = commandName.split(" ");
-    const chainCommands = other.map((c) => c.toLowerCase());
     const searchableProcessors = context2.contextProcessor ? context2.contextProcessor.processors ?? [] : this.registry.processors;
+    const { words, descriptors } = this.commandWords(
+      parsed.tokens,
+      searchableProcessors
+    );
+    const [mainCommand = "", ...other] = words.length ? words : commandName.split(" ");
+    const chainCommands = other.map((c) => c.toLowerCase());
     const processor = this.registry.findProcessorInCollection(
       mainCommand,
       chainCommands,
       searchableProcessors
     );
-    if (processor?.parameters?.length) {
-      const reconciled = reconcileArgs(
-        parsed.tokens,
-        processor.parameters
-      );
+    if (processor && descriptors.length) {
+      const reconciled = reconcileArgs(parsed.tokens, descriptors);
       parsedArgs = reconciled.args;
       commandName = reconciled.commandParts.join(" ");
     }
@@ -18591,6 +18599,37 @@ var CliCommandExecutor = class {
    * The text after the word that selected `processor`, which may be its
    * command or one of its aliases (e.g. `pkg rm guid` -> `guid`).
    */
+  /**
+   * Reads the words of a command left to right, matching each against the
+   * sub-commands of the processor matched so far. A flag that takes a
+   * value (by the parameters of the processors matched so far, nearest
+   * first) consumes the word after it, so that word is neither a
+   * sub-command nor part of the command's value.
+   */
+  commandWords(tokens, processors) {
+    const words = [];
+    let descriptors = [];
+    let candidates = processors;
+    for (let i = 0; i < tokens.length; i++) {
+      const token = tokens[i];
+      if (token.kind === "flag") {
+        if (tokens[i + 1]?.kind === "word" && flagTakesNextWord(token, descriptors)) {
+          i++;
+        }
+        continue;
+      }
+      words.push(token.value);
+      const name = token.value.toLowerCase();
+      const match = candidates?.find(
+        (p) => p.command.toLowerCase() === name || p.aliases?.some((a) => a.toLowerCase() === name)
+      );
+      if (match) {
+        descriptors = [...match.parameters ?? [], ...descriptors];
+      }
+      candidates = match?.processors?.length ? match.processors : void 0;
+    }
+    return { words, descriptors };
+  }
   extractPositionalValue(commandName, processor) {
     const names = new Set(
       [processor.command, ...processor.aliases ?? []].map(