fix: split suggested command from passed command to get varargs

Author: WillieRuemmele

.gitignore

@@ -6,3 +6,5 @@
 /lib
 /node_modules
 /tmp
+/.idea
+/.vscode

src/index.ts

@@ -29,14 +29,16 @@ const hook: Hook.CommandNotFound = async function (opts) {
 
   let response = ''
   try {
-    response = await ux.prompt(`Did you mean ${color.blueBright(readableSuggestion)}? [y/n]`, {timeout: 4900})
+    response = await ux.prompt(`Did you mean ${color.blueBright(readableSuggestion)}? [y/n]`, {timeout: 10_000})
   } catch (error) {
     this.log('')
     this.debug(error)
   }
 
   if (response === 'y') {
-    const argv = opts.argv || process.argv.slice(3, process.argv.length)
+    // this will split the original command from the suggested replacement, and gather the remaining args as varargs to help with situations like:
+    // confit set foo-bar -> confit:set:foo-bar -> config:set:foo-bar -> config:set foo-bar
+    const argv = opts.argv?.length ? opts.argv : opts.id.split(':').slice(suggestion.split(':').length)
     return this.config.runCommand(suggestion, argv)
   }
 

test/hooks/not-found.test.ts

@@ -21,6 +21,19 @@ describe('command_not_found', () => {
     expect(ctx.stdout).to.match(/commands.+?\n.*?help/)
   })
 
+  test
+  .stub(ux, 'prompt', yes)
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  .stub(process, 'argv', ['username'])
+  .stdout()
+  .stderr()
+  .hook('command_not_found', {id: 'commans get'})
+  .end('runs hook with suggested command on yes with varargs passed', (ctx: any) => {
+    expect(ctx.stderr).to.be.contain('Warning: commans get is not a @oclif/plugin-not-found command.\n')
+    expect(ctx.stdout).to.match(/commands.+?\n.*?help/)
+  })
+
   test
   .stderr()
   .stub(ux, 'prompt', yes)