fix!: remove deprecated aliasAccessor methods

src/org/authInfo.ts

@@ -769,8 +769,7 @@ export class AuthInfo extends AsyncOptionalCreatable<AuthInfo.Options> {
    * @param alias alias to set
    */
   public async setAlias(alias: string): Promise<void> {
-    this.stateAggregator.aliases.set(alias, this.getUsername());
-    await this.stateAggregator.aliases.write();
+    return this.stateAggregator.aliases.setAndSave(alias, this.getUsername());
   }
 
   /**

src/org/authRemover.ts

@@ -182,7 +182,9 @@ export class AuthRemover extends AsyncOptionalCreatable {
     if (existingAliases.length === 0) return;
 
     this.logger.debug(`Found these aliases to remove: ${existingAliases.join(',')}`);
-    existingAliases.forEach((alias) => this.stateAggregator.aliases.unset(alias));
-    await this.stateAggregator.aliases.write();
+    for (const alias of existingAliases) {
+      // eslint-disable-next-line no-await-in-loop
+      await this.stateAggregator.aliases.unsetAndSave(alias);
+    }
   }
 }

src/stateAggregator/accessors/aliasAccessor.ts

@@ -8,8 +8,7 @@
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
-import { writeFileSync, readFileSync } from 'node:fs';
-import { lock, unlock, lockSync, unlockSync } from 'proper-lockfile';
+import { lock, unlock } from 'proper-lockfile';
 
 import { AsyncOptionalCreatable, ensureArray } from '@salesforce/kit';
 
@@ -18,7 +17,7 @@ import { Global } from '../../global';
 import { AuthFields } from '../../org/authInfo';
 import { ConfigContents } from '../../config/configStackTypes';
 import { SfError } from '../../sfError';
-import { lockRetryOptions, lockOptions } from '../../util/lockRetryOptions';
+import { lockRetryOptions } from '../../util/lockRetryOptions';
 
 export type Aliasable = string | Partial<AuthFields>;
 export const DEFAULT_GROUP = 'orgs';
@@ -109,20 +108,6 @@ export class AliasAccessor extends AsyncOptionalCreatable {
     return Array.from(this.aliasStore.entries()).find(([, value]) => value === usernameOrAlias)?.[0];
   }
 
-  /**
-   * Set an alias for the given aliasable entity.  Writes to the file
-   *
-   * @deprecated use setAndSave
-   * @param alias the alias you want to set
-   * @param entity the aliasable entity that's being aliased
-   */
-  public set(alias: string, entity: Aliasable): void {
-    // get a very fresh copy to merge with to avoid conflicts
-    this.readFileToAliasStoreSync();
-    this.aliasStore.set(alias, getNameOf(entity));
-    this.saveAliasStoreToFileSync();
-  }
-
   /**
    * Set an alias for the given aliasable entity.  Writes to the file
    *
@@ -136,18 +121,6 @@ export class AliasAccessor extends AsyncOptionalCreatable {
     return this.saveAliasStoreToFile();
   }
 
-  /**
-   * Unset the given alias.  Writes to the file
-   *
-   * @deprecated use unsetAndSave
-   *
-   */
-  public unset(alias: string): void {
-    this.readFileToAliasStoreSync();
-    this.aliasStore.delete(alias);
-    this.saveAliasStoreToFileSync();
-  }
-
   /**
    * Unset the given alias(es).  Writes to the file
    *
@@ -158,20 +131,6 @@ export class AliasAccessor extends AsyncOptionalCreatable {
     return this.saveAliasStoreToFile();
   }
 
-  /**
-   * Unsets all the aliases for the given entity.
-   *
-   * @deprecated use unsetValuesAndSave
-   *
-   * @param entity the aliasable entity for which you want to unset all aliases
-   */
-  public unsetAll(entity: Aliasable): void {
-    this.readFileToAliasStoreSync();
-    const aliases = this.getAll(entity);
-    aliases.forEach((a) => this.aliasStore.delete(a));
-    this.saveAliasStoreToFileSync();
-  }
-
   /**
    * Unset all the aliases for the given array of entity.
    *
@@ -185,13 +144,6 @@ export class AliasAccessor extends AsyncOptionalCreatable {
     return this.saveAliasStoreToFile();
   }
 
-  /**
-   * @deprecated the set/unset methods now write to the file when called.  Use (un)setAndSave instead of calling (un)set and then calling write()
-   */
-  public async write(): Promise<ConfigContents<string>> {
-    return Promise.resolve(this.getAll());
-  }
-
   /**
    * Returns true if the provided alias exists
    *
@@ -232,30 +184,6 @@ export class AliasAccessor extends AsyncOptionalCreatable {
     await writeFile(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
     return unlockIfLocked(this.fileLocation);
   }
-
-  /**
-   * @deprecated use the async version of this method instead
-   * provided for the legacy sync set/unset methods. */
-  private readFileToAliasStoreSync(): void {
-    // the file is guaranteed to exist because this init method ensures it
-    // put a lock in place.  This method is only used by legacy set/unset methods.
-    lockSync(this.fileLocation, lockOptions);
-    this.aliasStore = fileContentsRawToAliasStore(readFileSync(this.fileLocation, 'utf-8'));
-  }
-
-  /**
-   * @deprecated use the async version of this method instead
-   * provided for the legacy sync set/unset methods */
-  private saveAliasStoreToFileSync(): void {
-    writeFileSync(this.fileLocation, aliasStoreToRawFileContents(this.aliasStore));
-    try {
-      unlockSync(this.fileLocation);
-    } catch (e) {
-      // ignore the error.  If it wasn't locked, that's what we wanted
-      if (errorIsNotAcquired(e)) return;
-      throw e;
-    }
-  }
 }
 
 /**

test/unit/org/authInfoTest.ts

@@ -1329,10 +1329,10 @@ describe('AuthInfo', () => {
     const alias = 'MyAlias';
 
     it('should set alias', async () => {
-      const aliasAccessorSpy = spyMethod($$.SANDBOX, AliasAccessor.prototype, 'set');
+      const aliasAccessorSpy = spyMethod($$.SANDBOX, AliasAccessor.prototype, 'setAndSave');
       const authInfo = await AuthInfo.create({ username: testOrg.username });
       await authInfo.setAlias(alias);
-      expect(aliasAccessorSpy.calledOnce).to.be.true;
+      expect(aliasAccessorSpy.callCount).to.equal(1);
       expect(aliasAccessorSpy.firstCall.args).to.deep.equal([alias, testOrg.username]);
     });
   });

test/unit/org/authRemoverTest.ts

@@ -139,7 +139,7 @@ describe('AuthRemover', () => {
 
   describe('unsetAliases', () => {
     it('should unset aliases for provided username', async () => {
-      const aliasesSpy = spyMethod($$.SANDBOX, AliasAccessor.prototype, 'unset');
+      const aliasesSpy = spyMethod($$.SANDBOX, AliasAccessor.prototype, 'unsetAndSave');
       const alias1 = 'MyAlias';
       const alias2 = 'MyOtherAlias';
       $$.stubAliases({ [alias1]: username, [alias2]: username });

test/unit/org/orgTest.ts

@@ -518,7 +518,7 @@ describe('Org Tests', () => {
       const org = await createOrgViaAuthInfo();
 
       const stateAggregator = await StateAggregator.getInstance();
-      stateAggregator.aliases.set('foo', testData.username);
+      await stateAggregator.aliases.setAndSave('foo', testData.username);
 
       const user = stateAggregator.aliases.getUsername('foo');
       expect(user).eq(testData.username);
@@ -642,7 +642,7 @@ describe('Org Tests', () => {
       const org1Username = orgs[1].getUsername();
       assert(org1Username);
       const stateAggregator = await StateAggregator.getInstance();
-      stateAggregator.aliases.set('foo', org1Username);
+      await stateAggregator.aliases.setAndSave('foo', org1Username);
       const user = stateAggregator.aliases.getUsername('foo');
       expect(user).eq(org1Username);
 

test/unit/stateAggregator/accessors/aliasAccessorTest.ts

@@ -106,14 +106,14 @@ describe('AliasAccessor', () => {
   describe('set', () => {
     it('should set an alias for a username', async () => {
       const stateAggregator = await StateAggregator.getInstance();
-      stateAggregator.aliases.set('foobar', username1);
+      await stateAggregator.aliases.setAndSave('foobar', username1);
       const aliases = stateAggregator.aliases.getAll(username1);
       expect(aliases).to.include('foobar');
     });
 
     it('should set an alias for an org', async () => {
       const stateAggregator = await StateAggregator.getInstance();
-      stateAggregator.aliases.set('foobar', await org.getConfig());
+      await stateAggregator.aliases.setAndSave('foobar', await org.getConfig());
       const aliases = stateAggregator.aliases.getAll(org.username);
       expect(aliases).to.include('foobar');
     });
@@ -144,7 +144,7 @@ describe('AliasAccessor', () => {
   describe('unsetAll', () => {
     it('should unset all the aliases for a given username', async () => {
       const stateAggregator = await StateAggregator.getInstance();
-      stateAggregator.aliases.unsetAll(username1);
+      await stateAggregator.aliases.unsetValuesAndSave([username1]);
       const aliases = stateAggregator.aliases.getAll(username1);
       expect(aliases).to.deep.equal([]);
     });
@@ -184,7 +184,7 @@ describe('AliasAccessor', () => {
         const stateAggregator = await StateAggregator.getInstance();
         const testArray = Array(quantity).map((v, i) => i.toString());
         await Promise.all(
-          testArray.map((i) => Promise.resolve(stateAggregator.aliases.set(i.toString(), i.toString())))
+          testArray.map((i) => Promise.resolve(stateAggregator.aliases.setAndSave(i.toString(), i.toString())))
         );
         testArray.forEach((i) => {
           expect(stateAggregator.aliases.get(i)).to.equal(i);