refactor(ts): group type definitions and helpers (#1632)

* Group all type definitions and helpers in using modules
* Move .d.ts to typings directory
* Get rid of types directory

lib/apply-extends.ts

@@ -1,7 +1,7 @@
 
+import { Dictionary } from './common-types'
 import * as fs from 'fs'
 import * as path from 'path'
-import { Dictionary } from './types'
 import { YError } from './yerror'
 
 let previouslyVisitedConfigs: string[] = []

lib/argsert.ts

@@ -1,6 +1,5 @@
 import { YError } from './yerror'
-import { parseCommand } from './parse-command'
-import { ParsedCommand } from './types'
+import { parseCommand, ParsedCommand } from './parse-command'
 
 const positionName = ['first', 'second', 'third', 'fourth', 'fifth', 'sixth']
 export function argsert (callerArguments: any[], length?: number): void

lib/command-types.ts

@@ -0,0 +1,23 @@
+import { Dictionary } from './common-types'
+import { YargsInstance } from './yargs-types'
+
+/** Instance of the command module. */
+export interface CommandInstance {
+  getCommandHandlers (): Dictionary<CommandHandler>
+  getCommands (): string[]
+}
+
+interface CommandHandler {
+  builder: CommandBuilder
+}
+
+// To be completed later with other CommandBuilder flavours
+type CommandBuilder = FunctionCommandBuilder
+
+interface FunctionCommandBuilder {
+  (y: YargsInstance): YargsInstance
+}
+
+export function isFunctionCommandBuilder (builder: CommandBuilder): builder is FunctionCommandBuilder {
+  return typeof builder === 'function'
+}

lib/completion.ts

@@ -1,16 +1,11 @@
-import * as path from 'path'
+import { CommandInstance, isFunctionCommandBuilder } from './command-types'
 import * as templates from './completion-templates'
 import { isPromise } from './is-promise'
 import { parseCommand } from './parse-command'
-import {
-  CommandInstance,
-  CompletionFunction,
-  CompletionInstance,
-  UsageInstance,
-  YargsInstance
-} from './types'
-import { isSyncCompletionFunction, isFunctionCommandBuilder } from './type-helpers'
-import { DetailedArguments } from 'yargs-parser'
+import * as path from 'path'
+import { UsageInstance } from './usage'
+import { YargsInstance } from './yargs-types'
+import { Arguments, DetailedArguments } from 'yargs-parser'
 
 // add bash completions to your
 //  yargs-powered applications.
@@ -140,3 +135,26 @@ export function completion (yargs: YargsInstance, usage: UsageInstance, command:
 
   return self
 }
+
+/** Instance of the completion module. */
+interface CompletionInstance {
+  completionKey: string
+  generateCompletionScript($0: string, cmd: string): string
+  getCompletion(args: string[], done: (completions: string[]) => any): any
+  registerFunction(fn: CompletionFunction): void
+  setParsed(parsed: DetailedArguments): void
+}
+
+type CompletionFunction = SyncCompletionFunction | AsyncCompletionFunction
+
+interface SyncCompletionFunction {
+  (current: string, argv: Arguments): string[] | Promise<string[]>
+}
+
+interface AsyncCompletionFunction {
+  (current: string, argv: Arguments, done: (completions: string[]) => any): any
+}
+
+function isSyncCompletionFunction (completionFunction: CompletionFunction): completionFunction is SyncCompletionFunction {
+  return completionFunction.length < 3
+}

lib/obj-filter.ts

@@ -1,4 +1,4 @@
-import { Dictionary } from './types'
+import { Dictionary } from './common-types'
 
 export function objFilter<T = any> (original: Dictionary<T>, filter: (k: string, v: T) => boolean = () => true) {
   const obj: Dictionary<T> = {}

lib/parse-command.ts

@@ -1,5 +1,3 @@
-import { ParsedCommand } from './types'
-
 export function parseCommand (cmd: string) {
   const extraSpacesStrippedCommand = cmd.replace(/\s{2,}/g, ' ')
   const splitCommand = extraSpacesStrippedCommand.split(/\s+(?![^[]*]|[^<]*>)/)
@@ -31,3 +29,14 @@ export function parseCommand (cmd: string) {
   })
   return parsedCommand
 }
+
+export interface ParsedCommand {
+  cmd: string
+  demanded: Positional[]
+  optional: Positional[]
+}
+
+interface Positional {
+  cmd: string[]
+  variadic: boolean
+}

lib/process-argv.ts

@@ -1,5 +1,3 @@
-import { ElectronProcess } from './types'
-
 function getProcessArgvBinIndex () {
   // The binary name is the first command line argument for:
   // - bundled Electron apps: bin argv1 argv2 ... argvn
@@ -29,3 +27,10 @@ export function getProcessArgvWithoutBin () {
 export function getProcessArgvBin () {
   return process.argv[getProcessArgvBinIndex()]
 }
+
+interface ElectronProcess extends NodeJS.Process {
+  defaultApp?: boolean
+  versions: NodeJS.ProcessVersions & {
+    electron: string
+  }
+}