apply suggestions

Author: AmirSa12

src/commander.ts

@@ -4,7 +4,6 @@ import t, {
   type RootCommand,
   type OptionHandler,
 } from './t';
-import { setOptionLookupMode } from './option-scope';
 
 // rawArgs is available on (just) the Commander root command, but is not included in the TypeScript types.
 interface CommandWithRawArgs extends CommanderCommand {
@@ -23,7 +22,7 @@ export default function tab(
   const programName = instance.name();
   const positionalOptions = (instance as CommandWithPositionalOptions)
     ._enablePositionalOptions;
-  setOptionLookupMode(t, positionalOptions ? 'local' : 'parent-first');
+  t.optionLookupMode = positionalOptions ? 'local' : 'parent-first';
 
   // Make a `completion` command with a required command-argument.
   const completionCommandName =

src/option-scope.ts

@@ -135,12 +135,12 @@ import * as bash from './bash';
 import * as fish from './fish';
 import * as powershell from './powershell';
 import assert from 'node:assert';
-import { getOptionLookupMode } from './option-scope';
 
 export class RootCommand extends Command {
   commands = new Map<string, Command>();
   completions: Completion[] = [];
   directive = ShellCompDirective.ShellCompDirectiveDefault;
+  optionLookupMode?: 'parent-first' | 'local';
 
   constructor() {
     super('', '');
@@ -154,10 +154,6 @@ export class RootCommand extends Command {
     return c;
   }
 
-  private get optionLookupMode() {
-    return getOptionLookupMode(this);
-  }
-
   private scanArguments(args: string[]): {
     command: Command;
     parts: string[];

src/t.ts

@@ -39,10 +39,10 @@ describe('Commander option scope', () => {
       ]);
     });
 
-    it('keeps a non-conflicting leaf long option available', async () => {
+    it('keeps a non-conflicting serve long option available', async () => {
       await expect(
-        complete(['serve', '--leaf-choice', ''], false)
-      ).resolves.toEqual(['leaf', 'local']);
+        complete(['serve', '--serve-choice', ''], false)
+      ).resolves.toEqual(['serve', 'local']);
     });
 
     it('keeps root option values available after a subcommand', async () => {
@@ -74,7 +74,7 @@ describe('Commander option scope', () => {
   describe('positional options', () => {
     it('uses the subcommand option when it reuses a root short flag', async () => {
       await expect(complete(['serve', '-c', ''], true)).resolves.toEqual([
-        'leaf',
+        'serve',
         'local',
       ]);
     });
@@ -92,10 +92,10 @@ describe('Commander option scope', () => {
     it('still accepts root options before the subcommand', async () => {
       await expect(
         complete(['--root-choice', 'top', 'serve', '-c', ''], true)
-      ).resolves.toEqual(['leaf', 'local']);
+      ).resolves.toEqual(['serve', 'local']);
     });
 
-    it('uses leaf option arity for a colliding short flag', async () => {
+    it('uses serve option arity for a colliding short flag', async () => {
       await expect(complete(['serve', '-b', ''], true)).resolves.toEqual([
         'blue',
         'green',

tests/commander-option-scope.test.ts

@@ -20,13 +20,13 @@ const serve = program
   .command('serve')
   .description('Serve the app')
   .addOption(
-    new Option('-c, --leaf-choice <value>', 'Leaf choice').choices([
-      'leaf',
+    new Option('-c, --serve-choice <value>', 'Serve choice').choices([
+      'serve',
       'local',
     ])
   )
   .addOption(
-    new Option('-b, --leaf-value <value>', 'Leaf value').choices([
+    new Option('-b, --serve-value <value>', 'Serve value').choices([
       'blue',
       'green',
     ])