@metamask-previews/account-tree-controller 4.1.1-preview-567bc78af → 4.1.1-preview-0866a6f

package/CHANGELOG.md

@@ -7,10 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Expose missing public `AccountTreeController` methods through its messenger ([#7976](https://github.com/MetaMask/core/pull/7976/))
+  - The following actions are now available:
+    - `AccountTreeController:getAccountWalletObject`
+    - `AccountTreeController:getAccountWalletObjects`
+    - `AccountTreeController:getAccountGroupObject`
+    - `AccountTreeController:clearState`
+    - `AccountTreeController:syncWithUserStorage`
+    - `AccountTreeController:syncWithUserStorageAtLeastOnce`
+  - Corresponding action types (e.g. `AccountTreeControllerGetAccountWalletObjectAction`) are available as well.
+
 ### Changed
 
 - Bump `@metamask/accounts-controller` from `^36.0.0` to `^36.0.1` ([#7996](https://github.com/MetaMask/core/pull/7996))
 
+### Removed
+
+- **BREAKING:** Remove `resolveNameConflict` from `AccountTreeController` ([#7976](https://github.com/MetaMask/core/pull/7976))
+  - This method was only used internally.
+
 ## [4.1.1]
 
 ### Changed

package/dist/AccountTreeController-method-action-types.cjs

@@ -0,0 +1,7 @@
+"use strict";
+/**
+ * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * Do not edit manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=AccountTreeController-method-action-types.cjs.map

package/dist/AccountTreeController-method-action-types.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountTreeController-method-action-types.cjs","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated by `scripts/generate-method-action-types.ts`.\n * Do not edit manually.\n */\n\nimport type { AccountTreeController } from './AccountTreeController';\n\n/**\n * Gets the account wallet object from its ID.\n *\n * @param walletId - Account wallet ID.\n * @returns The account wallet object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountWalletObjectAction = {\n  type: `AccountTreeController:getAccountWalletObject`;\n  handler: AccountTreeController['getAccountWalletObject'];\n};\n\n/**\n * Gets all account wallet objects.\n *\n * @returns All account wallet objects.\n */\nexport type AccountTreeControllerGetAccountWalletObjectsAction = {\n  type: `AccountTreeController:getAccountWalletObjects`;\n  handler: AccountTreeController['getAccountWalletObjects'];\n};\n\n/**\n * Gets all underlying accounts from the currently selected account\n * group.\n *\n * It also support account selector, which allows to filter specific\n * accounts given some criterias (account type, address, scopes, etc...).\n *\n * @param selector - Optional account selector.\n * @returns Underlying accounts for the currently selected account (filtered\n * by the selector if provided).\n */\nexport type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {\n  type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;\n  handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];\n};\n\n/**\n * Gets the account group object from its ID.\n *\n * @param groupId - Account group ID.\n * @returns The account group object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountGroupObjectAction = {\n  type: `AccountTreeController:getAccountGroupObject`;\n  handler: AccountTreeController['getAccountGroupObject'];\n};\n\n/**\n * Gets the account's context which contains its wallet ID, group ID, and sort order.\n *\n * @param accountId - Account ID.\n * @returns The account context if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountContextAction = {\n  type: `AccountTreeController:getAccountContext`;\n  handler: AccountTreeController['getAccountContext'];\n};\n\n/**\n * Gets the currently selected account group ID.\n *\n * @returns The selected account group ID or empty string if none selected.\n */\nexport type AccountTreeControllerGetSelectedAccountGroupAction = {\n  type: `AccountTreeController:getSelectedAccountGroup`;\n  handler: AccountTreeController['getSelectedAccountGroup'];\n};\n\n/**\n * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n *\n * @param groupId - The account group ID to select.\n */\nexport type AccountTreeControllerSetSelectedAccountGroupAction = {\n  type: `AccountTreeController:setSelectedAccountGroup`;\n  handler: AccountTreeController['setSelectedAccountGroup'];\n};\n\n/**\n * Sets a custom name for an account group.\n *\n * @param groupId - The account group ID.\n * @param name - The custom name to set.\n * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.\n * @throws If the account group ID is not found in the current tree.\n * @throws If the account group name already exists and autoHandleConflict is false.\n */\nexport type AccountTreeControllerSetAccountGroupNameAction = {\n  type: `AccountTreeController:setAccountGroupName`;\n  handler: AccountTreeController['setAccountGroupName'];\n};\n\n/**\n * Sets a custom name for an account wallet.\n *\n * @param walletId - The account wallet ID.\n * @param name - The custom name to set.\n * @throws If the account wallet ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountWalletNameAction = {\n  type: `AccountTreeController:setAccountWalletName`;\n  handler: AccountTreeController['setAccountWalletName'];\n};\n\n/**\n * Toggles the pinned state of an account group.\n *\n * @param groupId - The account group ID.\n * @param pinned - Whether the group should be pinned.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupPinnedAction = {\n  type: `AccountTreeController:setAccountGroupPinned`;\n  handler: AccountTreeController['setAccountGroupPinned'];\n};\n\n/**\n * Toggles the hidden state of an account group.\n *\n * @param groupId - The account group ID.\n * @param hidden - Whether the group should be hidden.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupHiddenAction = {\n  type: `AccountTreeController:setAccountGroupHidden`;\n  handler: AccountTreeController['setAccountGroupHidden'];\n};\n\n/**\n * Clears the controller state and resets to default values.\n * Also clears the backup and sync service state.\n */\nexport type AccountTreeControllerClearStateAction = {\n  type: `AccountTreeController:clearState`;\n  handler: AccountTreeController['clearState'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will perform a full sync, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If a full sync is already in progress, it will return the ongoing promise.\n *\n * @returns A promise that resolves when the sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAction = {\n  type: `AccountTreeController:syncWithUserStorage`;\n  handler: AccountTreeController['syncWithUserStorage'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will ensure at least one full sync is ran, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If the first ever full sync is already in progress, it will return the ongoing promise.\n * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.\n *\n * @returns A promise that resolves when the first ever full sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {\n  type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;\n  handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];\n};\n\n/**\n * Union of all AccountTreeController action types.\n */\nexport type AccountTreeControllerMethodActions =\n  | AccountTreeControllerGetAccountWalletObjectAction\n  | AccountTreeControllerGetAccountWalletObjectsAction\n  | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetAccountContextAction\n  | AccountTreeControllerGetSelectedAccountGroupAction\n  | AccountTreeControllerSetSelectedAccountGroupAction\n  | AccountTreeControllerSetAccountGroupNameAction\n  | AccountTreeControllerSetAccountWalletNameAction\n  | AccountTreeControllerSetAccountGroupPinnedAction\n  | AccountTreeControllerSetAccountGroupHiddenAction\n  | AccountTreeControllerClearStateAction\n  | AccountTreeControllerSyncWithUserStorageAction\n  | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;\n"]}

package/dist/AccountTreeController-method-action-types.d.cts

@@ -0,0 +1,167 @@
+/**
+ * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * Do not edit manually.
+ */
+import type { AccountTreeController } from "./AccountTreeController.cjs";
+/**
+ * Gets the account wallet object from its ID.
+ *
+ * @param walletId - Account wallet ID.
+ * @returns The account wallet object if found, undefined otherwise.
+ */
+export type AccountTreeControllerGetAccountWalletObjectAction = {
+    type: `AccountTreeController:getAccountWalletObject`;
+    handler: AccountTreeController['getAccountWalletObject'];
+};
+/**
+ * Gets all account wallet objects.
+ *
+ * @returns All account wallet objects.
+ */
+export type AccountTreeControllerGetAccountWalletObjectsAction = {
+    type: `AccountTreeController:getAccountWalletObjects`;
+    handler: AccountTreeController['getAccountWalletObjects'];
+};
+/**
+ * Gets all underlying accounts from the currently selected account
+ * group.
+ *
+ * It also support account selector, which allows to filter specific
+ * accounts given some criterias (account type, address, scopes, etc...).
+ *
+ * @param selector - Optional account selector.
+ * @returns Underlying accounts for the currently selected account (filtered
+ * by the selector if provided).
+ */
+export type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {
+    type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;
+    handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];
+};
+/**
+ * Gets the account group object from its ID.
+ *
+ * @param groupId - Account group ID.
+ * @returns The account group object if found, undefined otherwise.
+ */
+export type AccountTreeControllerGetAccountGroupObjectAction = {
+    type: `AccountTreeController:getAccountGroupObject`;
+    handler: AccountTreeController['getAccountGroupObject'];
+};
+/**
+ * Gets the account's context which contains its wallet ID, group ID, and sort order.
+ *
+ * @param accountId - Account ID.
+ * @returns The account context if found, undefined otherwise.
+ */
+export type AccountTreeControllerGetAccountContextAction = {
+    type: `AccountTreeController:getAccountContext`;
+    handler: AccountTreeController['getAccountContext'];
+};
+/**
+ * Gets the currently selected account group ID.
+ *
+ * @returns The selected account group ID or empty string if none selected.
+ */
+export type AccountTreeControllerGetSelectedAccountGroupAction = {
+    type: `AccountTreeController:getSelectedAccountGroup`;
+    handler: AccountTreeController['getSelectedAccountGroup'];
+};
+/**
+ * Sets the selected account group and updates the AccountsController selectedAccount accordingly.
+ *
+ * @param groupId - The account group ID to select.
+ */
+export type AccountTreeControllerSetSelectedAccountGroupAction = {
+    type: `AccountTreeController:setSelectedAccountGroup`;
+    handler: AccountTreeController['setSelectedAccountGroup'];
+};
+/**
+ * Sets a custom name for an account group.
+ *
+ * @param groupId - The account group ID.
+ * @param name - The custom name to set.
+ * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.
+ * @throws If the account group ID is not found in the current tree.
+ * @throws If the account group name already exists and autoHandleConflict is false.
+ */
+export type AccountTreeControllerSetAccountGroupNameAction = {
+    type: `AccountTreeController:setAccountGroupName`;
+    handler: AccountTreeController['setAccountGroupName'];
+};
+/**
+ * Sets a custom name for an account wallet.
+ *
+ * @param walletId - The account wallet ID.
+ * @param name - The custom name to set.
+ * @throws If the account wallet ID is not found in the current tree.
+ */
+export type AccountTreeControllerSetAccountWalletNameAction = {
+    type: `AccountTreeController:setAccountWalletName`;
+    handler: AccountTreeController['setAccountWalletName'];
+};
+/**
+ * Toggles the pinned state of an account group.
+ *
+ * @param groupId - The account group ID.
+ * @param pinned - Whether the group should be pinned.
+ * @throws If the account group ID is not found in the current tree.
+ */
+export type AccountTreeControllerSetAccountGroupPinnedAction = {
+    type: `AccountTreeController:setAccountGroupPinned`;
+    handler: AccountTreeController['setAccountGroupPinned'];
+};
+/**
+ * Toggles the hidden state of an account group.
+ *
+ * @param groupId - The account group ID.
+ * @param hidden - Whether the group should be hidden.
+ * @throws If the account group ID is not found in the current tree.
+ */
+export type AccountTreeControllerSetAccountGroupHiddenAction = {
+    type: `AccountTreeController:setAccountGroupHidden`;
+    handler: AccountTreeController['setAccountGroupHidden'];
+};
+/**
+ * Clears the controller state and resets to default values.
+ * Also clears the backup and sync service state.
+ */
+export type AccountTreeControllerClearStateAction = {
+    type: `AccountTreeController:clearState`;
+    handler: AccountTreeController['clearState'];
+};
+/**
+ * Bi-directionally syncs the account tree with user storage.
+ * This will perform a full sync, including both pulling updates
+ * from user storage and pushing local changes to user storage.
+ * This also performs legacy account syncing if needed.
+ *
+ * IMPORTANT:
+ * If a full sync is already in progress, it will return the ongoing promise.
+ *
+ * @returns A promise that resolves when the sync is complete.
+ */
+export type AccountTreeControllerSyncWithUserStorageAction = {
+    type: `AccountTreeController:syncWithUserStorage`;
+    handler: AccountTreeController['syncWithUserStorage'];
+};
+/**
+ * Bi-directionally syncs the account tree with user storage.
+ * This will ensure at least one full sync is ran, including both pulling updates
+ * from user storage and pushing local changes to user storage.
+ * This also performs legacy account syncing if needed.
+ *
+ * IMPORTANT:
+ * If the first ever full sync is already in progress, it will return the ongoing promise.
+ * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.
+ *
+ * @returns A promise that resolves when the first ever full sync is complete.
+ */
+export type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {
+    type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;
+    handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];
+};
+/**
+ * Union of all AccountTreeController action types.
+ */
+export type AccountTreeControllerMethodActions = AccountTreeControllerGetAccountWalletObjectAction | AccountTreeControllerGetAccountWalletObjectsAction | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction | AccountTreeControllerGetAccountGroupObjectAction | AccountTreeControllerGetAccountContextAction | AccountTreeControllerGetSelectedAccountGroupAction | AccountTreeControllerSetSelectedAccountGroupAction | AccountTreeControllerSetAccountGroupNameAction | AccountTreeControllerSetAccountWalletNameAction | AccountTreeControllerSetAccountGroupPinnedAction | AccountTreeControllerSetAccountGroupHiddenAction | AccountTreeControllerClearStateAction | AccountTreeControllerSyncWithUserStorageAction | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;
+//# sourceMappingURL=AccountTreeController-method-action-types.d.cts.map

package/dist/AccountTreeController-method-action-types.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountTreeController-method-action-types.d.cts","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":"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"}

package/dist/AccountTreeController-method-action-types.d.mts

@@ -0,0 +1,167 @@
+/**
+ * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * Do not edit manually.
+ */
+import type { AccountTreeController } from "./AccountTreeController.mjs";
+/**
+ * Gets the account wallet object from its ID.
+ *
+ * @param walletId - Account wallet ID.
+ * @returns The account wallet object if found, undefined otherwise.
+ */
+export type AccountTreeControllerGetAccountWalletObjectAction = {
+    type: `AccountTreeController:getAccountWalletObject`;
+    handler: AccountTreeController['getAccountWalletObject'];
+};
+/**
+ * Gets all account wallet objects.
+ *
+ * @returns All account wallet objects.
+ */
+export type AccountTreeControllerGetAccountWalletObjectsAction = {
+    type: `AccountTreeController:getAccountWalletObjects`;
+    handler: AccountTreeController['getAccountWalletObjects'];
+};
+/**
+ * Gets all underlying accounts from the currently selected account
+ * group.
+ *
+ * It also support account selector, which allows to filter specific
+ * accounts given some criterias (account type, address, scopes, etc...).
+ *
+ * @param selector - Optional account selector.
+ * @returns Underlying accounts for the currently selected account (filtered
+ * by the selector if provided).
+ */
+export type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {
+    type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;
+    handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];
+};
+/**
+ * Gets the account group object from its ID.
+ *
+ * @param groupId - Account group ID.
+ * @returns The account group object if found, undefined otherwise.
+ */
+export type AccountTreeControllerGetAccountGroupObjectAction = {
+    type: `AccountTreeController:getAccountGroupObject`;
+    handler: AccountTreeController['getAccountGroupObject'];
+};
+/**
+ * Gets the account's context which contains its wallet ID, group ID, and sort order.
+ *
+ * @param accountId - Account ID.
+ * @returns The account context if found, undefined otherwise.
+ */
+export type AccountTreeControllerGetAccountContextAction = {
+    type: `AccountTreeController:getAccountContext`;
+    handler: AccountTreeController['getAccountContext'];
+};
+/**
+ * Gets the currently selected account group ID.
+ *
+ * @returns The selected account group ID or empty string if none selected.
+ */
+export type AccountTreeControllerGetSelectedAccountGroupAction = {
+    type: `AccountTreeController:getSelectedAccountGroup`;
+    handler: AccountTreeController['getSelectedAccountGroup'];
+};
+/**
+ * Sets the selected account group and updates the AccountsController selectedAccount accordingly.
+ *
+ * @param groupId - The account group ID to select.
+ */
+export type AccountTreeControllerSetSelectedAccountGroupAction = {
+    type: `AccountTreeController:setSelectedAccountGroup`;
+    handler: AccountTreeController['setSelectedAccountGroup'];
+};
+/**
+ * Sets a custom name for an account group.
+ *
+ * @param groupId - The account group ID.
+ * @param name - The custom name to set.
+ * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.
+ * @throws If the account group ID is not found in the current tree.
+ * @throws If the account group name already exists and autoHandleConflict is false.
+ */
+export type AccountTreeControllerSetAccountGroupNameAction = {
+    type: `AccountTreeController:setAccountGroupName`;
+    handler: AccountTreeController['setAccountGroupName'];
+};
+/**
+ * Sets a custom name for an account wallet.
+ *
+ * @param walletId - The account wallet ID.
+ * @param name - The custom name to set.
+ * @throws If the account wallet ID is not found in the current tree.
+ */
+export type AccountTreeControllerSetAccountWalletNameAction = {
+    type: `AccountTreeController:setAccountWalletName`;
+    handler: AccountTreeController['setAccountWalletName'];
+};
+/**
+ * Toggles the pinned state of an account group.
+ *
+ * @param groupId - The account group ID.
+ * @param pinned - Whether the group should be pinned.
+ * @throws If the account group ID is not found in the current tree.
+ */
+export type AccountTreeControllerSetAccountGroupPinnedAction = {
+    type: `AccountTreeController:setAccountGroupPinned`;
+    handler: AccountTreeController['setAccountGroupPinned'];
+};
+/**
+ * Toggles the hidden state of an account group.
+ *
+ * @param groupId - The account group ID.
+ * @param hidden - Whether the group should be hidden.
+ * @throws If the account group ID is not found in the current tree.
+ */
+export type AccountTreeControllerSetAccountGroupHiddenAction = {
+    type: `AccountTreeController:setAccountGroupHidden`;
+    handler: AccountTreeController['setAccountGroupHidden'];
+};
+/**
+ * Clears the controller state and resets to default values.
+ * Also clears the backup and sync service state.
+ */
+export type AccountTreeControllerClearStateAction = {
+    type: `AccountTreeController:clearState`;
+    handler: AccountTreeController['clearState'];
+};
+/**
+ * Bi-directionally syncs the account tree with user storage.
+ * This will perform a full sync, including both pulling updates
+ * from user storage and pushing local changes to user storage.
+ * This also performs legacy account syncing if needed.
+ *
+ * IMPORTANT:
+ * If a full sync is already in progress, it will return the ongoing promise.
+ *
+ * @returns A promise that resolves when the sync is complete.
+ */
+export type AccountTreeControllerSyncWithUserStorageAction = {
+    type: `AccountTreeController:syncWithUserStorage`;
+    handler: AccountTreeController['syncWithUserStorage'];
+};
+/**
+ * Bi-directionally syncs the account tree with user storage.
+ * This will ensure at least one full sync is ran, including both pulling updates
+ * from user storage and pushing local changes to user storage.
+ * This also performs legacy account syncing if needed.
+ *
+ * IMPORTANT:
+ * If the first ever full sync is already in progress, it will return the ongoing promise.
+ * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.
+ *
+ * @returns A promise that resolves when the first ever full sync is complete.
+ */
+export type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {
+    type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;
+    handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];
+};
+/**
+ * Union of all AccountTreeController action types.
+ */
+export type AccountTreeControllerMethodActions = AccountTreeControllerGetAccountWalletObjectAction | AccountTreeControllerGetAccountWalletObjectsAction | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction | AccountTreeControllerGetAccountGroupObjectAction | AccountTreeControllerGetAccountContextAction | AccountTreeControllerGetSelectedAccountGroupAction | AccountTreeControllerSetSelectedAccountGroupAction | AccountTreeControllerSetAccountGroupNameAction | AccountTreeControllerSetAccountWalletNameAction | AccountTreeControllerSetAccountGroupPinnedAction | AccountTreeControllerSetAccountGroupHiddenAction | AccountTreeControllerClearStateAction | AccountTreeControllerSyncWithUserStorageAction | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;
+//# sourceMappingURL=AccountTreeController-method-action-types.d.mts.map

package/dist/AccountTreeController-method-action-types.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountTreeController-method-action-types.d.mts","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":"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"}

package/dist/AccountTreeController-method-action-types.mjs

@@ -0,0 +1,6 @@
+/**
+ * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * Do not edit manually.
+ */
+export {};
+//# sourceMappingURL=AccountTreeController-method-action-types.mjs.map

package/dist/AccountTreeController-method-action-types.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountTreeController-method-action-types.mjs","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated by `scripts/generate-method-action-types.ts`.\n * Do not edit manually.\n */\n\nimport type { AccountTreeController } from './AccountTreeController';\n\n/**\n * Gets the account wallet object from its ID.\n *\n * @param walletId - Account wallet ID.\n * @returns The account wallet object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountWalletObjectAction = {\n  type: `AccountTreeController:getAccountWalletObject`;\n  handler: AccountTreeController['getAccountWalletObject'];\n};\n\n/**\n * Gets all account wallet objects.\n *\n * @returns All account wallet objects.\n */\nexport type AccountTreeControllerGetAccountWalletObjectsAction = {\n  type: `AccountTreeController:getAccountWalletObjects`;\n  handler: AccountTreeController['getAccountWalletObjects'];\n};\n\n/**\n * Gets all underlying accounts from the currently selected account\n * group.\n *\n * It also support account selector, which allows to filter specific\n * accounts given some criterias (account type, address, scopes, etc...).\n *\n * @param selector - Optional account selector.\n * @returns Underlying accounts for the currently selected account (filtered\n * by the selector if provided).\n */\nexport type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {\n  type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;\n  handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];\n};\n\n/**\n * Gets the account group object from its ID.\n *\n * @param groupId - Account group ID.\n * @returns The account group object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountGroupObjectAction = {\n  type: `AccountTreeController:getAccountGroupObject`;\n  handler: AccountTreeController['getAccountGroupObject'];\n};\n\n/**\n * Gets the account's context which contains its wallet ID, group ID, and sort order.\n *\n * @param accountId - Account ID.\n * @returns The account context if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountContextAction = {\n  type: `AccountTreeController:getAccountContext`;\n  handler: AccountTreeController['getAccountContext'];\n};\n\n/**\n * Gets the currently selected account group ID.\n *\n * @returns The selected account group ID or empty string if none selected.\n */\nexport type AccountTreeControllerGetSelectedAccountGroupAction = {\n  type: `AccountTreeController:getSelectedAccountGroup`;\n  handler: AccountTreeController['getSelectedAccountGroup'];\n};\n\n/**\n * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n *\n * @param groupId - The account group ID to select.\n */\nexport type AccountTreeControllerSetSelectedAccountGroupAction = {\n  type: `AccountTreeController:setSelectedAccountGroup`;\n  handler: AccountTreeController['setSelectedAccountGroup'];\n};\n\n/**\n * Sets a custom name for an account group.\n *\n * @param groupId - The account group ID.\n * @param name - The custom name to set.\n * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.\n * @throws If the account group ID is not found in the current tree.\n * @throws If the account group name already exists and autoHandleConflict is false.\n */\nexport type AccountTreeControllerSetAccountGroupNameAction = {\n  type: `AccountTreeController:setAccountGroupName`;\n  handler: AccountTreeController['setAccountGroupName'];\n};\n\n/**\n * Sets a custom name for an account wallet.\n *\n * @param walletId - The account wallet ID.\n * @param name - The custom name to set.\n * @throws If the account wallet ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountWalletNameAction = {\n  type: `AccountTreeController:setAccountWalletName`;\n  handler: AccountTreeController['setAccountWalletName'];\n};\n\n/**\n * Toggles the pinned state of an account group.\n *\n * @param groupId - The account group ID.\n * @param pinned - Whether the group should be pinned.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupPinnedAction = {\n  type: `AccountTreeController:setAccountGroupPinned`;\n  handler: AccountTreeController['setAccountGroupPinned'];\n};\n\n/**\n * Toggles the hidden state of an account group.\n *\n * @param groupId - The account group ID.\n * @param hidden - Whether the group should be hidden.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupHiddenAction = {\n  type: `AccountTreeController:setAccountGroupHidden`;\n  handler: AccountTreeController['setAccountGroupHidden'];\n};\n\n/**\n * Clears the controller state and resets to default values.\n * Also clears the backup and sync service state.\n */\nexport type AccountTreeControllerClearStateAction = {\n  type: `AccountTreeController:clearState`;\n  handler: AccountTreeController['clearState'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will perform a full sync, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If a full sync is already in progress, it will return the ongoing promise.\n *\n * @returns A promise that resolves when the sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAction = {\n  type: `AccountTreeController:syncWithUserStorage`;\n  handler: AccountTreeController['syncWithUserStorage'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will ensure at least one full sync is ran, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If the first ever full sync is already in progress, it will return the ongoing promise.\n * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.\n *\n * @returns A promise that resolves when the first ever full sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {\n  type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;\n  handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];\n};\n\n/**\n * Union of all AccountTreeController action types.\n */\nexport type AccountTreeControllerMethodActions =\n  | AccountTreeControllerGetAccountWalletObjectAction\n  | AccountTreeControllerGetAccountWalletObjectsAction\n  | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetAccountContextAction\n  | AccountTreeControllerGetSelectedAccountGroupAction\n  | AccountTreeControllerSetSelectedAccountGroupAction\n  | AccountTreeControllerSetAccountGroupNameAction\n  | AccountTreeControllerSetAccountWalletNameAction\n  | AccountTreeControllerSetAccountGroupPinnedAction\n  | AccountTreeControllerSetAccountGroupHiddenAction\n  | AccountTreeControllerClearStateAction\n  | AccountTreeControllerSyncWithUserStorageAction\n  | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;\n"]}

package/dist/AccountTreeController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_groupIdToWalletId, _AccountTreeController_backupAndSyncService, _AccountTreeController_rules, _AccountTreeController_trace, _AccountTreeController_backupAndSyncConfig, _AccountTreeController_accountOrderCallbacks, _AccountTreeController_initialized, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_applyAccountWalletMetadata, _AccountTreeController_getRuleForWallet, _AccountTreeController_getComputedAccountGroupName, _AccountTreeController_getDefaultAccountGroupName, _AccountTreeController_applyAccountGroupMetadata, _AccountTreeController_handleAccountAdded, _AccountTreeController_handleAccountRemoved, _AccountTreeController_pruneEmptyGroupAndWallet, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_assertAccountGroupExists, _AccountTreeController_assertAccountWalletExists, _AccountTreeController_assertAccountGroupNameIsUnique, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_handleMultichainAccountWalletStatusChange, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_registerMessageHandlers, _AccountTreeController_createBackupAndSyncContext;
+var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_groupIdToWalletId, _AccountTreeController_backupAndSyncService, _AccountTreeController_rules, _AccountTreeController_trace, _AccountTreeController_backupAndSyncConfig, _AccountTreeController_accountOrderCallbacks, _AccountTreeController_initialized, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_applyAccountWalletMetadata, _AccountTreeController_getRuleForWallet, _AccountTreeController_getComputedAccountGroupName, _AccountTreeController_getDefaultAccountGroupName, _AccountTreeController_applyAccountGroupMetadata, _AccountTreeController_handleAccountAdded, _AccountTreeController_handleAccountRemoved, _AccountTreeController_pruneEmptyGroupAndWallet, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_assertAccountGroupExists, _AccountTreeController_assertAccountWalletExists, _AccountTreeController_assertAccountGroupNameIsUnique, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_handleMultichainAccountWalletStatusChange, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_resolveNameConflict, _AccountTreeController_createBackupAndSyncContext;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountTreeController = exports.getDefaultAccountTreeControllerState = exports.controllerName = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -25,6 +25,22 @@ const entropy_1 = require("./rules/entropy.cjs");
 const keyring_1 = require("./rules/keyring.cjs");
 const snap_1 = require("./rules/snap.cjs");
 exports.controllerName = 'AccountTreeController';
+const MESSENGER_EXPOSED_METHODS = [
+    'getSelectedAccountGroup',
+    'setSelectedAccountGroup',
+    'getAccountsFromSelectedAccountGroup',
+    'getAccountContext',
+    'setAccountWalletName',
+    'setAccountGroupName',
+    'setAccountGroupPinned',
+    'setAccountGroupHidden',
+    'getAccountWalletObject',
+    'getAccountWalletObjects',
+    'getAccountGroupObject',
+    'clearState',
+    'syncWithUserStorage',
+    'syncWithUserStorageAtLeastOnce',
+];
 const accountTreeControllerMetadata = {
     accountTree: {
         includeInStateLogs: true,
@@ -151,7 +167,7 @@ class AccountTreeController extends base_controller_1.BaseController {
         this.messenger.subscribe('MultichainAccountService:walletStatusChange', (walletId, status) => {
             __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_handleMultichainAccountWalletStatusChange).call(this, walletId, status);
         });
-        __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_registerMessageHandlers).call(this);
+        this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
      * Initialize the controller's state.
@@ -364,25 +380,6 @@ class AccountTreeController extends base_controller_1.BaseController {
         // but our handler is idempotent so it won't cause infinite loop
         this.messenger.call('AccountsController:setSelectedAccount', accountToSelect);
     }
-    /**
-     * Resolves name conflicts by adding a suffix to make the name unique.
-     *
-     * @internal
-     * @param wallet - The wallet to check within.
-     * @param groupId - The account group ID to exclude from the check.
-     * @param name - The desired name that has a conflict.
-     * @returns A unique name with suffix added if necessary.
-     */
-    resolveNameConflict(wallet, groupId, name) {
-        let suffix = 2;
-        let candidateName = `${name} (${suffix})`;
-        // Keep incrementing suffix until we find a unique name
-        while (!(0, group_1.isAccountGroupNameUniqueFromWallet)(wallet, groupId, candidateName)) {
-            suffix += 1;
-            candidateName = `${name} (${suffix})`;
-        }
-        return candidateName;
-    }
     /**
      * Sets a custom name for an account group.
      *
@@ -402,7 +399,7 @@ class AccountTreeController extends base_controller_1.BaseController {
         // Handle name conflicts based on the autoHandleConflict flag
         if (autoHandleConflict &&
             !(0, group_1.isAccountGroupNameUniqueFromWallet)(wallet, groupId, name)) {
-            finalName = this.resolveNameConflict(wallet, groupId, name);
+            finalName = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_resolveNameConflict).call(this, wallet, groupId, name);
         }
         else {
             // Validate that the name is unique
@@ -628,7 +625,7 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
     // If this name already exists for whatever reason, we rename it to resolve this conflict.
     if (proposedName.length &&
         !(0, group_1.isAccountGroupNameUniqueFromWallet)(wallet, group.id, proposedName)) {
-        proposedName = this.resolveNameConflict(wallet, group.id, proposedName);
+        proposedName = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_resolveNameConflict).call(this, wallet, group.id, proposedName);
     }
     return proposedName;
 }, _AccountTreeController_getDefaultAccountGroupName = function _AccountTreeController_getDefaultAccountGroupName(state, wallet, group, nextNaturalNameIndex) {
@@ -999,15 +996,15 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         }
     }
     return candidate;
-}, _AccountTreeController_registerMessageHandlers = function _AccountTreeController_registerMessageHandlers() {
-    this.messenger.registerActionHandler(`${exports.controllerName}:getSelectedAccountGroup`, this.getSelectedAccountGroup.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:setSelectedAccountGroup`, this.setSelectedAccountGroup.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:getAccountsFromSelectedAccountGroup`, this.getAccountsFromSelectedAccountGroup.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:getAccountContext`, this.getAccountContext.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:setAccountWalletName`, this.setAccountWalletName.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:setAccountGroupName`, this.setAccountGroupName.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:setAccountGroupPinned`, this.setAccountGroupPinned.bind(this));
-    this.messenger.registerActionHandler(`${exports.controllerName}:setAccountGroupHidden`, this.setAccountGroupHidden.bind(this));
+}, _AccountTreeController_resolveNameConflict = function _AccountTreeController_resolveNameConflict(wallet, groupId, name) {
+    let suffix = 2;
+    let candidateName = `${name} (${suffix})`;
+    // Keep incrementing suffix until we find a unique name
+    while (!(0, group_1.isAccountGroupNameUniqueFromWallet)(wallet, groupId, candidateName)) {
+        suffix += 1;
+        candidateName = `${name} (${suffix})`;
+    }
+    return candidateName;
 }, _AccountTreeController_createBackupAndSyncContext = function _AccountTreeController_createBackupAndSyncContext() {
     return {
         ...__classPrivateFieldGet(this, _AccountTreeController_backupAndSyncConfig, "f"),