refactor: restart implementing completer using shargs lexer

src/repl/completer/index.d.ts

@@ -1,5 +1,5 @@
 import {Err, Opt} from '../../index'
 
-export const completer: <A, B>(parser: (opt?: Opt) => (any?: A) => {errs: Err[], any: B}, commands: Opt) =>
+export const completer: <A, B>(lexer: (opt?: Opt) => (any?: A) => {errs: Err[], opts: B}, commands: Opt, opts?: {only?: boolean}) =>
                               (line: string) =>
                               string[]

src/repl/completer/index.js

@@ -1,29 +1,35 @@
-import {getMatches} from './getMatches'
-import {flatMap} from './flatMap'
+const {flatMap} = require('./flatMap')
 
-const completer = (parser, commands) => {
-  const parse = parser(commands)
+const completer = (lexer, cmd, {only = false} = {only: false}) => {
+  const lex = lexer(cmd)
 
   return line => {
-    if (line === '') {
-      const args = flatMap(commands.opts, cmd => cmd.args)
-      return [args, '']
-    }
-
-    const {args} = parse(line)
-
-    const {_, ...subcommands} = args
+    const {opts} = lex(line)
 
-    let matches = getMatches(commands.opts, subcommands, _)
-
-    if (line[line.length - 1] !== ' ' && matches.length === 1) {
-      matches = matches.map(m => ' ' + m)
-    }
+    const values = justValues(opts)
 
-    return [matches, '']
+    return [[], line]
   }
 }
 
 module.exports = {
   completer
+}
+
+function justValues (opts) {
+  return flatMap(opts, opt => {
+    if (Array.isArray(opt.values)) {
+      if (isSubcommand(opt)) {
+        return [{...opt, values: justValues(opt.values)}]
+      } else {
+        return [opt]
+      }
+    } else {
+      return []
+    }
+  })
+}
+
+function isSubcommand ({opts} = {opts: undefined}) {
+  return Array.isArray(opts)
 }

src/repl/index.d.ts

@@ -22,4 +22,4 @@ export interface Opt {
   [key: string]: any
 }
 
-export const repl: (parser: (opt?: Opt) => (any?: A) => {errs: Err[], any: B}, commands: Opt) => void
+export const repl: (parser: (opt?: Opt) => (any?: A) => {errs: Err[], args: B}, commands: Opt) => void

src/repl/index.js

@@ -2,14 +2,14 @@ const nodeRepl = require('repl')
 const {replEval} = require('./replEval')
 const {completer} = require('./completer')
 
-const repl = (parser, commands) => {
+const repl = (lexer, parser, commands, {only = false} = {only: false}) => {
   console.log(commands.desc ? commands.desc + '\n' : '')
 
   nodeRepl.start({
     prompt: `${commands.key}~$ `,
     ignoreUndefined: true,
-    completer: completer(parser, commands)
     eval: replEval(parser, commands),
+    completer: completer(lexer, commands, {only})
   })
 }