fix: default option values with same names as args would not parse correctly (2)

Author: chenasraf

package.json

@@ -1,6 +1,6 @@
 {
   "name": "massarg",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Flexible, powerful, and simple command/argument parser for CLI applications",
   "keywords": [
     "shell",

src/index.ts

@@ -209,16 +209,16 @@ export class Massarg<Options> {
 
       const command = this._commands.find((o) => o.name === arg || o.aliases?.includes(arg))
 
+      let justFoundCommand = false
+
       if (command) {
-        if (this._runCommand) {
-          this.data.extras.push(arg)
-          // continue
-        } else {
+        if (!this._runCommand) {
           this._runCommand = command
+          justFoundCommand = true
         }
       }
 
-      if (!option && !command) {
+      if (!option && (!command || (command && !justFoundCommand))) {
         const defOpts = this._options.filter((o) => o.isDefault)
         if (defOpts.length) {
           for (const option of defOpts) {

tests/commands.test.ts

@@ -47,4 +47,66 @@ describe("Commands", () => {
     expect(opt).not.toHaveBeenCalled()
     expect(options.extras).toContain("opt")
   })
+
+  test("should consume the first command, then pass to default", () => {
+    const cmd1 = jest.fn()
+    const cmd2 = jest.fn()
+    const def = massarg<{ opt: string }>()
+      .command({
+        name: "cmd1",
+        aliases: ["c1"],
+        run: cmd1,
+      })
+      .command({
+        name: "cmd2",
+        aliases: ["c2"],
+        run: cmd2,
+      })
+      .option({
+        name: "opt",
+        isDefault: true,
+        aliases: ["o"],
+        commands: ["c1"],
+        required: true,
+      })
+
+    const options = def.parseArgs(["cmd1", "opt"])
+
+    def.parse(["cmd1", "opt"])
+
+    expect(cmd1).toHaveBeenCalledTimes(1)
+    expect(cmd2).not.toHaveBeenCalled()
+    expect(options.opt).toBe("opt")
+  })
+
+  test("should consume the first command, then pass to default when option name matches command name", () => {
+    const cmd1 = jest.fn()
+    const opt = jest.fn()
+    const def = massarg<{ opt: string }>()
+      .command({
+        name: "cmd1",
+        aliases: ["c1"],
+        run: cmd1,
+      })
+      .command({
+        name: "opt",
+        aliases: ["o"],
+        run: opt,
+      })
+      .option({
+        name: "opt",
+        isDefault: true,
+        aliases: ["o"],
+        commands: ["c1"],
+        required: true,
+      })
+
+    const options = def.parseArgs(["cmd1", "opt"])
+
+    def.parse(["cmd1", "opt"])
+
+    expect(cmd1).toHaveBeenCalledTimes(1)
+    expect(opt).not.toHaveBeenCalled()
+    expect(options.opt).toBe("opt")
+  })
 })