@oclif/core 2.10.1 → 2.11.1

package/lib/command.d.ts

@@ -124,6 +124,7 @@ export declare abstract class Command {
     protected toSuccessJson(result: unknown): any;
     protected toErrorJson(err: unknown): any;
     protected logJson(json: unknown): void;
+    private removeEnvVar;
 }
 export declare namespace Command {
     type Class = typeof Command & {

package/lib/command.js

@@ -112,7 +112,7 @@ class Command {
         let result;
         try {
             // remove redirected env var to allow subsessions to run autoupdated client
-            delete process.env[this.config.scopedEnvVarKey('REDIRECTED')];
+            this.removeEnvVar('REDIRECTED');
             await this.init();
             result = await this.run();
         }
@@ -256,6 +256,16 @@ class Command {
     logJson(json) {
         cli_ux_1.ux.styledJSON(json);
     }
+    removeEnvVar(envVar) {
+        const keys = [];
+        try {
+            keys.push(...this.config.scopedEnvVarKeys(envVar));
+        }
+        catch {
+            keys.push(this.config.scopedEnvVarKey(envVar));
+        }
+        keys.map(key => delete process.env[key]);
+    }
 }
 exports.Command = Command;
 Command._base = `${pjson.name}@${pjson.version}`;

package/lib/config/config.d.ts

@@ -50,7 +50,18 @@ export declare class Config implements IConfig {
     runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable | null): Promise<T>;
     scopedEnvVar(k: string): string | undefined;
     scopedEnvVarTrue(k: string): boolean;
+    /**
+     * this DOES NOT account for bin aliases, use scopedEnvVarKeys instead which will account for bin aliases
+     * @param {string} k, the unscoped key you want to get the value for
+     * @returns {string} returns the env var key
+     */
     scopedEnvVarKey(k: string): string;
+    /**
+     * gets the scoped env var keys for a given key, including bin aliases
+     * @param {string} k, the env key e.g. 'debug'
+     * @returns {string[]} e.g. ['SF_DEBUG', 'SFDX_DEBUG']
+     */
+    scopedEnvVarKeys(k: string): string[];
     findCommand(id: string, opts: {
         must: true;
     }): Command.Loadable;

package/lib/config/config.js

@@ -333,18 +333,31 @@ class Config {
         return result;
     }
     scopedEnvVar(k) {
-        return process.env[this.scopedEnvVarKey(k)];
+        return process.env[this.scopedEnvVarKeys(k).find(k => process.env[k])];
     }
     scopedEnvVarTrue(k) {
-        const v = process.env[this.scopedEnvVarKey(k)];
+        const v = process.env[this.scopedEnvVarKeys(k).find(k => process.env[k])];
         return v === '1' || v === 'true';
     }
+    /**
+     * this DOES NOT account for bin aliases, use scopedEnvVarKeys instead which will account for bin aliases
+     * @param {string} k, the unscoped key you want to get the value for
+     * @returns {string} returns the env var key
+     */
     scopedEnvVarKey(k) {
         return [this.bin, k]
             .map(p => p.replace(/@/g, '').replace(/[/-]/g, '_'))
             .join('_')
             .toUpperCase();
     }
+    /**
+     * gets the scoped env var keys for a given key, including bin aliases
+     * @param {string} k, the env key e.g. 'debug'
+     * @returns {string[]} e.g. ['SF_DEBUG', 'SFDX_DEBUG']
+     */
+    scopedEnvVarKeys(k) {
+        return [this.bin, ...this.binAliases ?? []].map(alias => [alias.replace(/@/g, '').replace(/[/-]/g, '_'), k].join('_').toUpperCase());
+    }
     findCommand(id, opts = {}) {
         const lookupId = this.getCmdLookupId(id);
         const command = this._commands.get(lookupId);

package/lib/interfaces/config.d.ts

@@ -130,6 +130,7 @@ export interface Config {
     findMatches(id: string, argv: string[]): Command.Loadable[];
     scopedEnvVar(key: string): string | undefined;
     scopedEnvVarKey(key: string): string;
+    scopedEnvVarKeys(key: string): string[];
     scopedEnvVarTrue(key: string): boolean;
     s3Url(key: string): string;
     s3Key(type: 'versioned' | 'unversioned', ext: '.tar.gz' | '.tar.xz', options?: Config.s3Key.Options): string;

package/package.json

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