@oclif/core 2.0.5 → 2.0.6

package/lib/interfaces/parser.d.ts

@@ -58,8 +58,8 @@ export type DefaultContext<T> = {
     options: T;
     flags: Record<string, string>;
 };
-export type FlagDefault<T, P = CustomOptions> = T | ((context: DefaultContext<OptionFlag<T, P> & P>) => Promise<T>);
-export type FlagDefaultHelp<T, P = CustomOptions> = T | ((context: DefaultContext<OptionFlag<T, P> & P>) => Promise<string | undefined>);
+export type FlagDefault<T, P = CustomOptions> = T | ((context: DefaultContext<P & OptionFlag<T, P>>) => Promise<T>);
+export type FlagDefaultHelp<T, P = CustomOptions> = T | ((context: DefaultContext<P & OptionFlag<T, P>>) => Promise<string | undefined>);
 export type ArgDefault<T, P = CustomOptions> = T | ((context: DefaultContext<Arg<T, P>>) => Promise<T>);
 export type ArgDefaultHelp<T, P = CustomOptions> = T | ((context: DefaultContext<Arg<T, P>>) => Promise<string | undefined>);
 export type FlagRelationship = string | {
@@ -199,13 +199,13 @@ export type BooleanFlag<T> = FlagProps & BooleanFlagProps & {
     parse: (input: boolean, context: Command, opts: FlagProps & BooleanFlagProps) => Promise<T>;
 };
 export type OptionFlagDefaults<T, P = CustomOptions, M = false> = FlagProps & OptionFlagProps & {
-    parse: FlagParser<T, string, P & OptionFlag<T, P>>;
+    parse: FlagParser<T, string, P>;
     defaultHelp?: FlagDefaultHelp<T>;
     input: string[];
     default?: M extends true ? FlagDefault<T[] | undefined, P> : FlagDefault<T | undefined, P>;
 };
 export type OptionFlag<T, P = CustomOptions> = FlagProps & OptionFlagProps & {
-    parse: FlagParser<T, string, P & OptionFlag<T, P>>;
+    parse: FlagParser<T, string, P>;
     defaultHelp?: FlagDefaultHelp<T, P>;
     input: string[];
 } & ({
@@ -225,13 +225,13 @@ export type FlagDefinition<T, P = CustomOptions> = {
     }) & Partial<OptionFlag<T, P>>): OptionFlag<T[]>;
     (options: P & {
         multiple: true;
-    } & Partial<OptionFlag<T>>): OptionFlag<T[] | undefined, P>;
+    } & Partial<OptionFlag<T>>): OptionFlag<T[] | undefined>;
     (options: P & ({
         required: true;
     } | {
         default: FlagDefault<T>;
-    }) & Partial<OptionFlag<T>>): OptionFlag<T, P>;
-    (options?: P & Partial<OptionFlag<T>>): OptionFlag<T | undefined, P>;
+    }) & Partial<OptionFlag<T>>): OptionFlag<T>;
+    (options?: P & Partial<OptionFlag<T>>): OptionFlag<T | undefined>;
 };
 export type Flag<T> = BooleanFlag<T> | OptionFlag<T>;
 export type Input<TFlags extends FlagOutput, BFlags extends FlagOutput, AFlags extends ArgOutput> = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {