fix: flag types when no global flags defined

oclif · Aug 3, 2022 · 5b54246 · 5b54246
1 parent c3afdd8
commit 5b54246
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/command.ts b/src/command.ts
@@ -128,25 +128,25 @@ export default abstract class Command {
     return cmd._run(argv)
   }
 
-  protected static _globalFlags: Interfaces.FlagInput<any>
+  protected static _globalFlags: Interfaces.FlagInput
 
-  static get globalFlags(): Interfaces.FlagInput<any> {
+  static get globalFlags(): Interfaces.FlagInput {
     return this._globalFlags
   }
 
-  static set globalFlags(flags: Interfaces.FlagInput<any>) {
+  static set globalFlags(flags: Interfaces.FlagInput) {
     this._globalFlags = Object.assign({}, this.globalFlags, flags)
     this.flags = {} // force the flags setter to run
   }
 
   /** A hash of flags for the command */
-  protected static _flags: Interfaces.FlagInput<any>
+  protected static _flags: Interfaces.FlagInput
 
-  static get flags(): Interfaces.FlagInput<any> {
+  static get flags(): Interfaces.FlagInput {
     return this._flags
   }
 
-  static set flags(flags: Interfaces.FlagInput<any>) {
+  static set flags(flags: Interfaces.FlagInput) {
     this._flags = Object.assign({}, this._flags ?? {}, this.globalFlags, flags)
   }
 

diff --git a/src/interfaces/parser.ts b/src/interfaces/parser.ts
@@ -49,6 +49,7 @@ export interface CLIParseErrorOptions {
 
 export type OutputArgs = { [name: string]: any }
 export type OutputFlags<T extends ParserInput['flags']> = { [P in keyof T]: any }
+
 export type ParserOutput<TFlags extends OutputFlags<any> = any, GFlags extends OutputFlags<any> = any, TArgs extends OutputArgs = any> = {
   // Add in global flags so that they show up in the types
   // This is necessary because there's no easy way to optionally return
@@ -200,4 +201,4 @@ export type CompletableOptionFlag<T> = OptionFlag<T> & {
 
 export type CompletableFlag<T> = BooleanFlag<T> | CompletableOptionFlag<T>
 
-export type FlagInput<T extends FlagOutput> = { [P in keyof T]: CompletableFlag<T[P]> }
+export type FlagInput<T extends FlagOutput = {[name: string]: unknown}> = { [P in keyof T]: CompletableFlag<T[P]> }
diff --git a/src/parser/index.ts b/src/parser/index.ts
@@ -1,10 +1,8 @@
-// tslint:disable interface-over-type-literal
-
 import * as args from './args'
 import Deps from './deps'
 import * as flags from './flags'
 import {Parser} from './parse'
-import {Input, ParserOutput} from '../interfaces'
+import {FlagInput, Input, ParserOutput} from '../interfaces'
 import * as Validate from './validate'
 export {args}
 export {flags}
@@ -23,8 +21,8 @@ export async function parse<TFlags, GFlags, TArgs extends { [name: string]: stri
     '--': options['--'],
     flags: {
       color: flags.defaultFlags.color,
-      ...((options.flags || {})) as any,
-    },
+      ...options.flags,
+    } as FlagInput<any>,
     strict: options.strict !== false,
   }
   const parser = new Parser(input)