@oclif/core 1.13.1 → 1.13.4

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.13.4](https://github.com/oclif/core/compare/v1.13.3...v1.13.4) (2022-08-08)
+
+
+### Bug Fixes
+
+* retain enable json flag get/set apply flag at parse ([#460](https://github.com/oclif/core/issues/460)) ([9812937](https://github.com/oclif/core/commit/9812937e43a573cf4a10d4b03fca47555de5a1d9))
+
+### [1.13.3](https://github.com/oclif/core/compare/v1.13.2...v1.13.3) (2022-08-06)
+
+
+### Bug Fixes
+
+* improve flag types ([6d0b4e1](https://github.com/oclif/core/commit/6d0b4e1f1761baba0e085ea8d342a7bc913e7e5d))
+
+### [1.13.2](https://github.com/oclif/core/compare/v1.13.1...v1.13.2) (2022-08-05)
+
+
+### Bug Fixes
+
+* flag types ([#454](https://github.com/oclif/core/issues/454)) ([2938ba4](https://github.com/oclif/core/commit/2938ba4082d1b0c603a55678fe47f5beed9acbb5))
+
 ### [1.13.1](https://github.com/oclif/core/compare/v1.13.0...v1.13.1) (2022-08-02)
 
 

package/lib/command.d.ts

@@ -65,13 +65,13 @@ export default abstract class Command {
      * @param {Interfaces.LoadOptions} opts options
      */
     static run: Interfaces.Command.Class['run'];
-    protected static _globalFlags: Interfaces.FlagInput<any>;
-    static get globalFlags(): Interfaces.FlagInput<any>;
-    static set globalFlags(flags: Interfaces.FlagInput<any>);
+    protected static _globalFlags: Interfaces.FlagInput;
+    static get globalFlags(): Interfaces.FlagInput;
+    static set globalFlags(flags: Interfaces.FlagInput);
     /** A hash of flags for the command */
-    protected static _flags: Interfaces.FlagInput<any>;
-    static get flags(): Interfaces.FlagInput<any>;
-    static set flags(flags: Interfaces.FlagInput<any>);
+    protected static _flags: Interfaces.FlagInput;
+    static get flags(): Interfaces.FlagInput;
+    static set flags(flags: Interfaces.FlagInput);
     id: string | undefined;
     protected debug: (...args: any[]) => void;
     constructor(argv: string[], config: Config);
@@ -95,9 +95,9 @@ export default abstract class Command {
      */
     abstract run(): PromiseLike<any>;
     protected init(): Promise<any>;
-    protected parse<F, A extends {
+    protected parse<F, G, A extends {
         [name: string]: any;
-    }>(options?: Interfaces.Input<F>, argv?: string[]): Promise<Interfaces.ParserOutput<F, A>>;
+    }>(options?: Interfaces.Input<F, G>, argv?: string[]): Promise<Interfaces.ParserOutput<F, G, A>>;
     protected catch(err: Error & {
         exitCode?: number;
     }): Promise<any>;

package/lib/command.js

@@ -44,8 +44,15 @@ class Command {
     }
     static set enableJsonFlag(value) {
         this._enableJsonFlag = value;
-        if (value)
+        if (value === true) {
             this.globalFlags = jsonFlag;
+        }
+        else {
+            // @ts-ignore
+            delete this.globalFlags.json;
+            // @ts-ignore
+            delete this.flags.json;
+        }
     }
     static get globalFlags() {
         return this._globalFlags;
@@ -129,7 +136,7 @@ class Command {
             options = this.constructor;
         const opts = { context: this, ...options };
         // the spread operator doesn't work with getters so we have to manually add it here
-        opts.flags = Object.assign({}, options?.flags, options?.globalFlags);
+        opts.flags = options?.flags;
         return Parser.parse(argv, opts);
     }
     async catch(err) {

package/lib/interfaces/parser.d.ts

@@ -37,7 +37,7 @@ export declare type ArgInput = Arg<any>[];
 export interface CLIParseErrorOptions {
     parse: {
         input?: ParserInput;
-        output?: ParserOutput<any, any>;
+        output?: ParserOutput;
     };
 }
 export declare type OutputArgs = {
@@ -46,8 +46,8 @@ export declare type OutputArgs = {
 export declare type OutputFlags<T extends ParserInput['flags']> = {
     [P in keyof T]: any;
 };
-export declare type ParserOutput<TFlags extends OutputFlags<any>, TArgs extends OutputArgs> = {
-    flags: TFlags & {
+export declare type ParserOutput<TFlags extends OutputFlags<any> = any, GFlags extends OutputFlags<any> = any, TArgs extends OutputArgs = any> = {
+    flags: TFlags & GFlags & {
         json: boolean | undefined;
     };
     args: TArgs;
@@ -158,9 +158,9 @@ export declare type EnumFlagOptions<T> = Partial<OptionFlag<T>> & {
     options: T[];
 };
 export declare type Flag<T> = BooleanFlag<T> | OptionFlag<T>;
-export declare type Input<TFlags extends FlagOutput> = {
+export declare type Input<TFlags extends FlagOutput, GFlags extends FlagOutput> = {
     flags?: FlagInput<TFlags>;
-    globalFlags?: FlagInput<TFlags>;
+    globalFlags?: FlagInput<GFlags>;
     args?: ArgInput;
     strict?: boolean;
     context?: any;
@@ -194,7 +194,7 @@ export declare type CompletableOptionFlag<T> = OptionFlag<T> & {
     completion?: Completion;
 };
 export declare type CompletableFlag<T> = BooleanFlag<T> | CompletableOptionFlag<T>;
-export declare type FlagInput<T extends FlagOutput> = {
+export declare type FlagInput<T extends FlagOutput = object> = {
     [P in keyof T]: CompletableFlag<T[P]>;
 };
 export {};

package/lib/parser/index.d.ts

@@ -5,9 +5,9 @@ import { Input, ParserOutput } from '../interfaces';
 export { args };
 export { flags };
 export { flagUsages } from './help';
-export declare function parse<TFlags, TArgs extends {
+export declare function parse<TFlags, GFlags, TArgs extends {
     [name: string]: string;
-}>(argv: string[], options: Input<TFlags>): Promise<ParserOutput<TFlags, TArgs>>;
+}>(argv: string[], options: Input<TFlags, GFlags>): Promise<ParserOutput<TFlags, GFlags, TArgs>>;
 declare const boolean: typeof flags.boolean, integer: (opts?: {
     min?: number | undefined;
     max?: number | undefined;

package/lib/parser/index.js

@@ -1,5 +1,4 @@
 "use strict";
-// tslint:disable interface-over-type-literal
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.file = exports.directory = exports.url = exports.integer = exports.boolean = exports.parse = exports.flagUsages = exports.flags = exports.args = void 0;
 const args = require("./args");
@@ -22,7 +21,7 @@ async function parse(argv, options) {
         '--': options['--'],
         flags: {
             color: flags.defaultFlags.color,
-            ...((options.flags || {})),
+            ...options.flags,
         },
         strict: options.strict !== false,
     };

package/lib/parser/validate.d.ts

@@ -1,5 +1,5 @@
 import { ParserInput, ParserOutput } from '../interfaces';
 export declare function validate(parse: {
     input: ParserInput;
-    output: ParserOutput<any, any>;
+    output: ParserOutput;
 }): void;

package/package.json

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