refactor(account-api)!: move get/select in AccountGroup type (#343)

Moving the `get` and `select` methods on the `AccountGroup` type.
Allowing to make `AccountGroup` more generic.

We want to be able to query/select the underlying accounts even when
you're dealing with a "single-account group". This way you can handle
both single-account and multichain-account group the same way.

Author: ccharly

packages/account-api/CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add `assertIsBip44Account` ([#339](https://github.com/MetaMask/accounts/pull/339))
 
+### Changed
+
+- **BREAKING:** Move `get` and `select` methods to the `AccountGroup` type ([#343](https://github.com/MetaMask/accounts/pull/343))
+
 ## [0.7.0]
 
 ### Added

packages/account-api/src/api/group.ts

@@ -1,6 +1,7 @@
 import type { KeyringAccount } from '@metamask/keyring-api';
 
 // Circular import are allowed when using `import type`.
+import type { AccountSelector } from './selector';
 import type {
   AccountWallet,
   AccountWalletId,
@@ -67,6 +68,23 @@ export type AccountGroup<Account extends KeyringAccount> = {
    * @returns The account or undefined if not found.
    */
   getAccount(id: Account['id']): Account | undefined;
+
+  /**
+   * Query an account matching the selector.
+   *
+   * @param selector - Query selector.
+   * @returns The account matching the selector or undefined if not matching.
+   * @throws If multiple accounts match the selector.
+   */
+  get(selector: AccountSelector<Account>): Account | undefined;
+
+  /**
+   * Query accounts matching the selector.
+   *
+   * @param selector - Query selector.
+   * @returns The accounts matching the selector.
+   */
+  select(selector: AccountSelector<Account>): Account[];
 };
 
 /**

packages/account-api/src/api/multichain/group.ts

@@ -6,7 +6,6 @@ import type {
 } from './wallet';
 import type { Bip44Account } from '../bip44';
 import type { AccountGroup, AccountGroupType } from '../group';
-import type { AccountSelector } from '../selector';
 import { AccountWalletType } from '../wallet';
 
 const MULTICHAIN_ACCOUNT_GROUP_ID_REGEX = new RegExp(
@@ -44,23 +43,6 @@ export type MultichainAccountGroup<
    * Multichain account group index.
    */
   get index(): number;
-
-  /**
-   * Query an account matching the selector.
-   *
-   * @param selector - Query selector.
-   * @returns The account matching the selector or undefined if not matching.
-   * @throws If multiple accounts match the selector.
-   */
-  get(selector: AccountSelector<Account>): Account | undefined;
-
-  /**
-   * Query accounts matching the selector.
-   *
-   * @param selector - Query selector.
-   * @returns The accounts matching the selector.
-   */
-  select(selector: AccountSelector<Account>): Account[];
 };
 
 /**