feat: overwriting configStore unset

forcedotcom · Jul 29, 2020 · 6095dd6 · 6095dd6
1 parent b0550f3
commit 6095dd6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -232,6 +232,21 @@ export class Config extends ConfigFile<ConfigFile.Options> {
     return this.getContents();
   }
 
+  /**
+   * Unsets a value for a property.
+   *
+   * **Throws** *{@link SfdxError}{ name: 'UnknownConfigKey' }* If the input validator fails.
+   * @param key The property to unset.
+   */
+  public unset(key: string): boolean {
+    const property = Config.allowedProperties.find(allowedProp => allowedProp.key === key);
+
+    if (!property) {
+      throw SfdxError.create('@salesforce/core', 'config', 'UnknownConfigKey', [key]);
+    }
+    return super.unset(property.key);
+  }
+
   /**
    * Initializer for supported config types.
    */

diff --git a/src/config/configStore.ts b/src/config/configStore.ts
@@ -6,9 +6,16 @@
  */
 
 import { AsyncCreatable, set } from '@salesforce/kit';
-import { AnyJson, definiteEntriesOf, definiteValuesOf, Dictionary, get, getAnyJson, JsonMap, Optional } from '@salesforce/ts-types';
-import { SfdxError } from '../sfdxError';
-import { Config } from './config';
+import {
+  AnyJson,
+  definiteEntriesOf,
+  definiteValuesOf,
+  Dictionary,
+  get,
+  getAnyJson,
+  JsonMap,
+  Optional
+} from '@salesforce/ts-types';
 
 /**
  * The allowed types stored in a config store.
@@ -129,11 +136,6 @@ export abstract class BaseConfigStore<T extends BaseConfigStore.Options> extends
    * @param key The key.
    */
   public unset(key: string): boolean {
-    const property = Config.getAllowedProperties().find(allowedProp => allowedProp.key === key);
-
-    if (!property) {
-      throw SfdxError.create('@salesforce/core', 'config', 'UnknownConfigKey', [key]);
-    }
     return delete this.contents[key];
   }