@metamask-previews/approval-controller 9.0.2-preview-8bfa290fb → 10.0.0-preview-0a30e47

package/CHANGELOG.md

@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.0.0]
+
 ### Changed
 
+- **BREAKING:** Drop CommonJS support ([#9536](https://github.com/MetaMask/core/pull/9536))
+  - This package is now ESM-only, but can still be used in CommonJS projects via `require(esm)` in modern Node.js versions (22+), or dynamic imports in older Node.js versions.
+- **BREAKING:** Bump minimum Node.js version to 22 ([#9976](https://github.com/MetaMask/core/pull/9976))
+- **BREAKING:** Bump TypeScript target to ES2022 ([#10019](https://github.com/MetaMask/core/pull/10019))
+  - This package now ships ES2022 code, requiring a compatible modern environment or bundler configuration to consume.
 - Bump `@metamask/utils` from `^11.9.0` to `^11.12.0` ([#9074](https://github.com/MetaMask/core/pull/9074), [#10076](https://github.com/MetaMask/core/pull/10076))
-- Bump `@metamask/messenger` from `^1.2.0` to `^2.0.0` ([#9392](https://github.com/MetaMask/core/pull/9392))
+- Bump `@metamask/messenger` from `^1.2.0` to `^3.0.0` ([#9392](https://github.com/MetaMask/core/pull/9392), [#10160](https://github.com/MetaMask/core/pull/10160))
+- Bump `@metamask/base-controller` from `^9.1.0` to `^10.0.0` ([#10160](https://github.com/MetaMask/core/pull/10160))
 
 ## [9.0.2]
 
@@ -333,7 +341,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@9.0.2...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@10.0.0...HEAD
+[10.0.0]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@9.0.2...@metamask/approval-controller@10.0.0
 [9.0.2]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@9.0.1...@metamask/approval-controller@9.0.2
 [9.0.1]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@9.0.0...@metamask/approval-controller@9.0.1
 [9.0.0]: https://github.com/MetaMask/core/compare/@metamask/approval-controller@8.0.0...@metamask/approval-controller@9.0.0

package/dist/{ApprovalController-method-action-types.d.mts → ApprovalController-method-action-types.d.ts}

@@ -2,7 +2,7 @@
  * This file is auto generated.
  * Do not edit manually.
  */
-import type { ApprovalController } from "./ApprovalController.mjs";
+import type { ApprovalController } from './ApprovalController.js';
 /**
  * Adds an approval request per the given arguments, optionally showing
  * the approval request to the user.
@@ -237,4 +237,4 @@ export type ApprovalControllerShowErrorAction = {
  * Union of all ApprovalController action types.
  */
 export type ApprovalControllerMethodActions = ApprovalControllerAddRequestAction | ApprovalControllerAddAndShowApprovalRequestAction | ApprovalControllerAddAction | ApprovalControllerGetAction | ApprovalControllerGetApprovalCountAction | ApprovalControllerGetTotalApprovalCountAction | ApprovalControllerHasRequestAction | ApprovalControllerAcceptRequestAction | ApprovalControllerRejectRequestAction | ApprovalControllerClearRequestsAction | ApprovalControllerUpdateRequestStateAction | ApprovalControllerStartFlowAction | ApprovalControllerEndFlowAction | ApprovalControllerSetFlowLoadingTextAction | ApprovalControllerShowSuccessAction | ApprovalControllerShowErrorAction;
-//# sourceMappingURL=ApprovalController-method-action-types.d.mts.map
+//# sourceMappingURL=ApprovalController-method-action-types.d.ts.map

package/dist/ApprovalController-method-action-types.d.ts.map

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

package/dist/{ApprovalController-method-action-types.mjs → ApprovalController-method-action-types.js}

@@ -3,4 +3,4 @@
  * Do not edit manually.
  */
 export {};
-//# sourceMappingURL=ApprovalController-method-action-types.mjs.map
+//# sourceMappingURL=ApprovalController-method-action-types.js.map

package/dist/ApprovalController-method-action-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ApprovalController-method-action-types.js","sourceRoot":"","sources":["../src/ApprovalController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { ApprovalController } from './ApprovalController.js';\n\n/**\n * Adds an approval request per the given arguments, optionally showing\n * the approval request to the user.\n *\n * @param opts - Options bag.\n * @param opts.id - The id of the approval request. A random id will be\n * generated if none is provided.\n * @param opts.origin - The origin of the approval request.\n * @param opts.type - The type associated with the approval request.\n * @param opts.requestData - Additional data associated with the request,\n * if any.\n * @param opts.requestState - Additional state associated with the request,\n * if any.\n * @param shouldShowRequest - Whether to show the approval request to the user.\n * @returns The approval promise.\n */\nexport type ApprovalControllerAddRequestAction = {\n  type: `ApprovalController:addRequest`;\n  handler: ApprovalController['addRequest'];\n};\n\n/**\n * Adds an approval request per the given arguments, calls the show approval\n * request function, and returns the associated approval promise resolving to\n * an AddResult object.\n *\n * There can only be one approval per origin and type. An error is thrown if\n * attempting to add an invalid or duplicate request.\n *\n * @param opts - Options bag.\n * @param opts.id - The id of the approval request. A random id will be\n * generated if none is provided.\n * @param opts.origin - The origin of the approval request.\n * @param opts.type - The type associated with the approval request.\n * @param opts.requestData - Additional data associated with the request,\n * @param opts.requestState - Additional state associated with the request,\n * if any.\n * @returns The approval promise resolving to an AddResult object.\n */\nexport type ApprovalControllerAddAndShowApprovalRequestAction = {\n  type: `ApprovalController:addAndShowApprovalRequest`;\n  handler: ApprovalController['addAndShowApprovalRequest'];\n};\n\n/**\n * Adds an approval request per the given arguments and returns the approval\n * promise resolving to an AddResult object.\n *\n * There can only be one approval per origin and type. An error is thrown if\n * attempting to add an invalid or duplicate request.\n *\n * @param opts - Options bag.\n * @param opts.id - The id of the approval request. A random id will be\n * generated if none is provided.\n * @param opts.origin - The origin of the approval request.\n * @param opts.type - The type associated with the approval request.\n * @param opts.requestData - Additional data associated with the request,\n * if any.\n * @returns The approval promise resolving to an AddResult object.\n */\nexport type ApprovalControllerAddAction = {\n  type: `ApprovalController:add`;\n  handler: ApprovalController['add'];\n};\n\n/**\n * Gets the info for the approval request with the given id.\n *\n * @param id - The id of the approval request.\n * @returns The approval request data associated with the id.\n */\nexport type ApprovalControllerGetAction = {\n  type: `ApprovalController:get`;\n  handler: ApprovalController['get'];\n};\n\n/**\n * Gets the number of pending approvals, by origin and/or type.\n *\n * If only `origin` is specified, all approvals for that origin will be\n * counted, regardless of type.\n * If only `type` is specified, all approvals for that type will be counted,\n * regardless of origin.\n * If both `origin` and `type` are specified, 0 or 1 will be returned.\n *\n * @param opts - The approval count options.\n * @param opts.origin - An approval origin.\n * @param opts.type - The type of the approval request.\n * @returns The current approval request count for the given origin and/or\n * type.\n */\nexport type ApprovalControllerGetApprovalCountAction = {\n  type: `ApprovalController:getApprovalCount`;\n  handler: ApprovalController['getApprovalCount'];\n};\n\n/**\n * Get the total count of all pending approval requests for all origins.\n *\n * @returns The total pending approval request count.\n */\nexport type ApprovalControllerGetTotalApprovalCountAction = {\n  type: `ApprovalController:getTotalApprovalCount`;\n  handler: ApprovalController['getTotalApprovalCount'];\n};\n\n/**\n * Checks if there's a pending approval request per the given parameters.\n * At least one parameter must be specified. An error will be thrown if the\n * parameters are invalid.\n *\n * If `id` is specified, all other parameters will be ignored.\n * If `id` is not specified, the method will check for requests that match\n * all of the specified parameters.\n *\n * @param opts - Options bag.\n * @param opts.id - The ID to check for.\n * @param opts.origin - The origin to check for.\n * @param opts.type - The type to check for.\n * @returns `true` if a matching approval is found, and `false` otherwise.\n */\nexport type ApprovalControllerHasRequestAction = {\n  type: `ApprovalController:hasRequest`;\n  handler: ApprovalController['hasRequest'];\n};\n\n/**\n * Resolves the promise of the approval with the given id, and deletes the\n * approval. Throws an error if no such approval exists.\n *\n * @param id - The id of the approval request.\n * @param value - The value to resolve the approval promise with.\n * @param options - Options bag.\n * @returns A promise that either resolves once a result is provided by\n * the creator of the approval request, or immediately if `options.waitForResult`\n * is `false` or `undefined`.\n */\nexport type ApprovalControllerAcceptRequestAction = {\n  type: `ApprovalController:acceptRequest`;\n  handler: ApprovalController['acceptRequest'];\n};\n\n/**\n * Rejects the promise of the approval with the given id, and deletes the\n * approval. Throws an error if no such approval exists.\n *\n * @param id - The id of the approval request.\n * @param error - The error to reject the approval promise with.\n */\nexport type ApprovalControllerRejectRequestAction = {\n  type: `ApprovalController:rejectRequest`;\n  handler: ApprovalController['rejectRequest'];\n};\n\n/**\n * Rejects and deletes all approval requests.\n *\n * @param rejectionError - The JsonRpcError to reject the approval\n * requests with.\n */\nexport type ApprovalControllerClearRequestsAction = {\n  type: `ApprovalController:clearRequests`;\n  handler: ApprovalController['clearRequests'];\n};\n\n/**\n * Updates the request state of the approval with the given id.\n *\n * @param opts - Options bag.\n * @param opts.id - The id of the approval request.\n * @param opts.requestState - Additional data associated with the request\n */\nexport type ApprovalControllerUpdateRequestStateAction = {\n  type: `ApprovalController:updateRequestState`;\n  handler: ApprovalController['updateRequestState'];\n};\n\n/**\n * Starts a new approval flow.\n *\n * @param opts - Options bag.\n * @param opts.id - The id of the approval flow.\n * @param opts.loadingText - The loading text that will be associated to the approval flow.\n * @param opts.show - A flag to determine whether the approval should show to the user.\n * @returns The object containing the approval flow id.\n */\nexport type ApprovalControllerStartFlowAction = {\n  type: `ApprovalController:startFlow`;\n  handler: ApprovalController['startFlow'];\n};\n\n/**\n * Ends the current approval flow.\n *\n * @param opts - Options bag.\n * @param opts.id - The id of the approval flow that will be finished.\n */\nexport type ApprovalControllerEndFlowAction = {\n  type: `ApprovalController:endFlow`;\n  handler: ApprovalController['endFlow'];\n};\n\n/**\n * Sets the loading text for the approval flow.\n *\n * @param opts - Options bag.\n * @param opts.id - The approval flow loading text that will be displayed.\n * @param opts.loadingText - The loading text that will be associated to the approval flow.\n */\nexport type ApprovalControllerSetFlowLoadingTextAction = {\n  type: `ApprovalController:setFlowLoadingText`;\n  handler: ApprovalController['setFlowLoadingText'];\n};\n\n/**\n * Show a success page.\n *\n * @param opts - Options bag.\n * @param opts.message - The message text or components to display in the page.\n * @param opts.header - The text or components to display in the header of the page.\n * @param opts.flowToEnd - The ID of the approval flow to end once the success page is approved.\n * @param opts.title - The title to display above the message. Shown by default but can be hidden with `null`.\n * @param opts.icon - The icon to display in the page. Shown by default but can be hidden with `null`.\n * @returns Empty object to support future additions.\n */\nexport type ApprovalControllerShowSuccessAction = {\n  type: `ApprovalController:showSuccess`;\n  handler: ApprovalController['showSuccess'];\n};\n\n/**\n * Show an error page.\n *\n * @param opts - Options bag.\n * @param opts.message - The message text or components to display in the page.\n * @param opts.header - The text or components to display in the header of the page.\n * @param opts.flowToEnd - The ID of the approval flow to end once the error page is approved.\n * @param opts.title - The title to display above the message. Shown by default but can be hidden with `null`.\n * @param opts.icon - The icon to display in the page. Shown by default but can be hidden with `null`.\n * @returns Empty object to support future additions.\n */\nexport type ApprovalControllerShowErrorAction = {\n  type: `ApprovalController:showError`;\n  handler: ApprovalController['showError'];\n};\n\n/**\n * Union of all ApprovalController action types.\n */\nexport type ApprovalControllerMethodActions =\n  | ApprovalControllerAddRequestAction\n  | ApprovalControllerAddAndShowApprovalRequestAction\n  | ApprovalControllerAddAction\n  | ApprovalControllerGetAction\n  | ApprovalControllerGetApprovalCountAction\n  | ApprovalControllerGetTotalApprovalCountAction\n  | ApprovalControllerHasRequestAction\n  | ApprovalControllerAcceptRequestAction\n  | ApprovalControllerRejectRequestAction\n  | ApprovalControllerClearRequestsAction\n  | ApprovalControllerUpdateRequestStateAction\n  | ApprovalControllerStartFlowAction\n  | ApprovalControllerEndFlowAction\n  | ApprovalControllerSetFlowLoadingTextAction\n  | ApprovalControllerShowSuccessAction\n  | ApprovalControllerShowErrorAction;\n"]}

package/dist/{ApprovalController.d.mts → ApprovalController.d.ts}

@@ -1,10 +1,10 @@
-import { BaseController } from "@metamask/base-controller";
-import type { ControllerGetStateAction } from "@metamask/base-controller";
-import type { ControllerStateChangeEvent } from "@metamask/base-controller";
-import type { Messenger } from "@metamask/messenger";
-import type { JsonRpcError, DataWithOptionalCause } from "@metamask/rpc-errors";
-import type { Json, OptionalField } from "@metamask/utils";
-import type { ApprovalControllerMethodActions } from "./ApprovalController-method-action-types.mjs";
+import { BaseController } from '@metamask/base-controller';
+import type { ControllerGetStateAction } from '@metamask/base-controller';
+import type { ControllerStateChangeEvent } from '@metamask/base-controller';
+import type { Messenger } from '@metamask/messenger';
+import type { JsonRpcError, DataWithOptionalCause } from '@metamask/rpc-errors';
+import type { Json, OptionalField } from '@metamask/utils';
+import type { ApprovalControllerMethodActions } from './ApprovalController-method-action-types.js';
 export declare const ORIGIN_METAMASK = "metamask";
 export declare const APPROVAL_TYPE_RESULT_ERROR = "result_error";
 export declare const APPROVAL_TYPE_RESULT_SUCCESS = "result_success";
@@ -413,4 +413,4 @@ export declare class ApprovalController extends BaseController<typeof controller
     showError(opts?: ErrorOptions): Promise<ErrorResult>;
 }
 export default ApprovalController;
-//# sourceMappingURL=ApprovalController.d.mts.map
+//# sourceMappingURL=ApprovalController.d.ts.map

package/dist/ApprovalController.d.ts.map

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

package/dist/{ApprovalController.mjs → ApprovalController.js}

@@ -1,19 +1,7 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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 _ApprovalController_instances, _ApprovalController_approvals, _ApprovalController_origins, _ApprovalController_showApprovalRequest, _ApprovalController_typesExcludedFromRateLimiting, _ApprovalController_add, _ApprovalController_validateAddParams, _ApprovalController_addPendingApprovalOrigin, _ApprovalController_addToStore, _ApprovalController_delete, _ApprovalController_getCallbacks, _ApprovalController_result;
-import { BaseController } from "@metamask/base-controller";
-import { rpcErrors } from "@metamask/rpc-errors";
-import { nanoid } from "nanoid";
-import { ApprovalRequestNotFoundError, ApprovalRequestNoResultSupportError, EndInvalidFlowError, NoApprovalFlowsError, MissingApprovalFlowError } from "./errors.mjs";
+import { BaseController } from '@metamask/base-controller';
+import { rpcErrors } from '@metamask/rpc-errors';
+import { nanoid } from 'nanoid';
+import { ApprovalRequestNotFoundError, ApprovalRequestNoResultSupportError, EndInvalidFlowError, NoApprovalFlowsError, MissingApprovalFlowError, } from './errors.js';
 // Constants
 // Avoiding dependency on controller-utils
 export const ORIGIN_METAMASK = 'metamask';
@@ -77,6 +65,10 @@ const MESSENGER_EXPOSED_METHODS = [
  * is approved or denied, respectively.
  */
 export class ApprovalController extends BaseController {
+    #approvals;
+    #origins;
+    #showApprovalRequest;
+    #typesExcludedFromRateLimiting;
     /**
      * Construct an Approval controller.
      *
@@ -94,17 +86,12 @@ export class ApprovalController extends BaseController {
             messenger,
             state: { ...getDefaultState(), ...state },
         });
-        _ApprovalController_instances.add(this);
-        _ApprovalController_approvals.set(this, void 0);
-        _ApprovalController_origins.set(this, void 0);
-        _ApprovalController_showApprovalRequest.set(this, void 0);
-        _ApprovalController_typesExcludedFromRateLimiting.set(this, void 0);
-        __classPrivateFieldSet(this, _ApprovalController_approvals, new Map(), "f");
-        __classPrivateFieldSet(this, _ApprovalController_origins, new Map(), "f");
+        this.#approvals = new Map();
+        this.#origins = new Map();
         // TODO: Either fix this lint violation or explain why it's necessary to ignore.
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        __classPrivateFieldSet(this, _ApprovalController_showApprovalRequest, showApprovalRequest, "f");
-        __classPrivateFieldSet(this, _ApprovalController_typesExcludedFromRateLimiting, typesExcludedFromRateLimiting, "f");
+        this.#showApprovalRequest = showApprovalRequest;
+        this.#typesExcludedFromRateLimiting = typesExcludedFromRateLimiting;
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
@@ -130,12 +117,12 @@ export class ApprovalController extends BaseController {
         return this.add(opts);
     }
     addAndShowApprovalRequest(opts) {
-        const promise = __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_add).call(this, opts.origin, opts.type, opts.id, opts.requestData, opts.requestState, opts.expectsResult);
-        __classPrivateFieldGet(this, _ApprovalController_showApprovalRequest, "f").call(this);
+        const promise = this.#add(opts.origin, opts.type, opts.id, opts.requestData, opts.requestState, opts.expectsResult);
+        this.#showApprovalRequest();
         return promise;
     }
     add(opts) {
-        return __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_add).call(this, opts.origin, opts.type, opts.id, opts.requestData, opts.requestState, opts.expectsResult);
+        return this.#add(opts.origin, opts.type, opts.id, opts.requestData, opts.requestState, opts.expectsResult);
     }
     /**
      * Gets the info for the approval request with the given id.
@@ -167,10 +154,10 @@ export class ApprovalController extends BaseController {
         }
         const { origin, type: _type } = opts;
         if (origin && _type) {
-            return __classPrivateFieldGet(this, _ApprovalController_origins, "f").get(origin)?.get(_type) || 0;
+            return this.#origins.get(origin)?.get(_type) || 0;
         }
         if (origin) {
-            return Array.from((__classPrivateFieldGet(this, _ApprovalController_origins, "f").get(origin) || new Map()).values()).reduce((total, value) => total + value, 0);
+            return Array.from((this.#origins.get(origin) || new Map()).values()).reduce((total, value) => total + value, 0);
         }
         // Only "type" was specified
         let count = 0;
@@ -210,7 +197,7 @@ export class ApprovalController extends BaseController {
             if (typeof id !== 'string') {
                 throw new Error('May not specify non-string id.');
             }
-            return __classPrivateFieldGet(this, _ApprovalController_approvals, "f").has(id);
+            return this.#approvals.has(id);
         }
         if (_type && typeof _type !== 'string') {
             throw new Error('May not specify non-string type.');
@@ -221,9 +208,9 @@ export class ApprovalController extends BaseController {
             }
             // Check origin and type pair if type also specified
             if (_type) {
-                return Boolean(__classPrivateFieldGet(this, _ApprovalController_origins, "f").get(origin)?.get(_type));
+                return Boolean(this.#origins.get(origin)?.get(_type));
             }
-            return __classPrivateFieldGet(this, _ApprovalController_origins, "f").has(origin);
+            return this.#origins.has(origin);
         }
         if (_type) {
             for (const approval of Object.values(this.state.pendingApprovals)) {
@@ -249,10 +236,10 @@ export class ApprovalController extends BaseController {
     acceptRequest(id, value, options) {
         // Safe to cast as the delete method below will throw if the ID is not found
         const approval = this.get(id);
-        const requestPromise = __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_getCallbacks).call(this, id);
+        const requestPromise = this.#getCallbacks(id);
         let requestDeleted = false;
         if (!options?.deleteAfterResult || !options.waitForResult) {
-            __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_delete).call(this, id);
+            this.#delete(id);
             requestDeleted = true;
         }
         return new Promise((resolve, reject) => {
@@ -274,7 +261,7 @@ export class ApprovalController extends BaseController {
             }
         }).finally(() => {
             if (!requestDeleted) {
-                __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_delete).call(this, id);
+                this.#delete(id);
             }
         });
     }
@@ -286,8 +273,8 @@ export class ApprovalController extends BaseController {
      * @param error - The error to reject the approval promise with.
      */
     rejectRequest(id, error) {
-        const callbacks = __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_getCallbacks).call(this, id);
-        __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_delete).call(this, id);
+        const callbacks = this.#getCallbacks(id);
+        this.#delete(id);
         callbacks.reject(error);
     }
     /**
@@ -297,10 +284,10 @@ export class ApprovalController extends BaseController {
      * requests with.
      */
     clearRequests(rejectionError) {
-        for (const id of __classPrivateFieldGet(this, _ApprovalController_approvals, "f").keys()) {
+        for (const id of this.#approvals.keys()) {
             this.rejectRequest(id, rejectionError);
         }
-        __classPrivateFieldGet(this, _ApprovalController_origins, "f").clear();
+        this.#origins.clear();
         this.update((draftState) => {
             draftState.pendingApprovals = {};
             draftState.pendingApprovalCount = 0;
@@ -339,7 +326,7 @@ export class ApprovalController extends BaseController {
         });
         // By default, if nothing else is specified, we always show the approval.
         if (opts.show !== false) {
-            __classPrivateFieldGet(this, _ApprovalController_showApprovalRequest, "f").call(this);
+            this.#showApprovalRequest();
         }
         return { id, loadingText };
     }
@@ -389,7 +376,7 @@ export class ApprovalController extends BaseController {
      * @returns Empty object to support future additions.
      */
     async showSuccess(opts = {}) {
-        await __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_result).call(this, APPROVAL_TYPE_RESULT_SUCCESS, opts, {
+        await this.#result(APPROVAL_TYPE_RESULT_SUCCESS, opts, {
             message: opts.message,
             header: opts.header,
             title: opts.title,
@@ -409,7 +396,7 @@ export class ApprovalController extends BaseController {
      * @returns Empty object to support future additions.
      */
     async showError(opts = {}) {
-        await __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_result).call(this, APPROVAL_TYPE_RESULT_ERROR, opts, {
+        await this.#result(APPROVAL_TYPE_RESULT_ERROR, opts, {
             error: opts.error,
             header: opts.header,
             title: opts.title,
@@ -417,112 +404,164 @@ export class ApprovalController extends BaseController {
         });
         return {};
     }
-}
-_ApprovalController_approvals = new WeakMap(), _ApprovalController_origins = new WeakMap(), _ApprovalController_showApprovalRequest = new WeakMap(), _ApprovalController_typesExcludedFromRateLimiting = new WeakMap(), _ApprovalController_instances = new WeakSet(), _ApprovalController_add = function _ApprovalController_add(origin, type, id = nanoid(), requestData, requestState, expectsResult) {
-    __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_validateAddParams).call(this, id, origin, type, requestData, requestState);
-    if (!__classPrivateFieldGet(this, _ApprovalController_typesExcludedFromRateLimiting, "f").includes(type) &&
-        this.hasRequest({ origin, type })) {
-        throw rpcErrors.resourceUnavailable(getAlreadyPendingMessage(origin, type));
-    }
-    // add pending approval
-    return new Promise((resolve, reject) => {
-        __classPrivateFieldGet(this, _ApprovalController_approvals, "f").set(id, { resolve, reject });
-        __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_addPendingApprovalOrigin).call(this, origin, type);
-        __classPrivateFieldGet(this, _ApprovalController_instances, "m", _ApprovalController_addToStore).call(this, id, origin, type, requestData, requestState, expectsResult);
-    });
-}, _ApprovalController_validateAddParams = function _ApprovalController_validateAddParams(id, origin, type, requestData, requestState) {
-    let errorMessage = null;
-    if (!id || typeof id !== 'string') {
-        errorMessage = 'Must specify non-empty string id.';
-    }
-    else if (__classPrivateFieldGet(this, _ApprovalController_approvals, "f").has(id)) {
-        errorMessage = `Approval request with id '${id}' already exists.`;
-    }
-    else if (!origin || typeof origin !== 'string') {
-        errorMessage = 'Must specify non-empty string origin.';
-    }
-    else if (!type || typeof type !== 'string') {
-        errorMessage = 'Must specify non-empty string type.';
-    }
-    else if (requestData &&
-        (typeof requestData !== 'object' || Array.isArray(requestData))) {
-        errorMessage = 'Request data must be a plain object if specified.';
-    }
-    else if (requestState &&
-        (typeof requestState !== 'object' || Array.isArray(requestState))) {
-        errorMessage = 'Request state must be a plain object if specified.';
-    }
-    if (errorMessage) {
-        throw rpcErrors.internal(errorMessage);
-    }
-}, _ApprovalController_addPendingApprovalOrigin = function _ApprovalController_addPendingApprovalOrigin(origin, type) {
-    let originMap = __classPrivateFieldGet(this, _ApprovalController_origins, "f").get(origin);
-    if (!originMap) {
-        originMap = new Map();
-        __classPrivateFieldGet(this, _ApprovalController_origins, "f").set(origin, originMap);
-    }
-    const currentValue = originMap.get(type) || 0;
-    originMap.set(type, currentValue + 1);
-}, _ApprovalController_addToStore = function _ApprovalController_addToStore(id, origin, type, requestData, requestState, expectsResult) {
-    const approval = {
-        id,
-        origin,
-        type,
-        time: Date.now(),
-        requestData: requestData || null,
-        requestState: requestState || null,
-        expectsResult: expectsResult || false,
-    };
-    this.update((draftState) => {
-        draftState.pendingApprovals[id] = approval;
-        draftState.pendingApprovalCount = Object.keys(draftState.pendingApprovals).length;
-    });
-}, _ApprovalController_delete = function _ApprovalController_delete(id) {
-    if (!__classPrivateFieldGet(this, _ApprovalController_approvals, "f").has(id)) {
-        throw new ApprovalRequestNotFoundError(id);
-    }
-    __classPrivateFieldGet(this, _ApprovalController_approvals, "f").delete(id);
-    const { origin, type } = this.state.pendingApprovals[id];
-    const originMap = __classPrivateFieldGet(this, _ApprovalController_origins, "f").get(origin);
-    const originTotalCount = this.getApprovalCount({ origin });
-    const originTypeCount = originMap.get(type);
-    if (originTotalCount === 1) {
-        __classPrivateFieldGet(this, _ApprovalController_origins, "f").delete(origin);
+    /**
+     * Implementation of add operation.
+     *
+     * @param origin - The origin of the approval request.
+     * @param type - The type associated with the approval request.
+     * @param id - The id of the approval request.
+     * @param requestData - The request data associated with the approval request.
+     * @param requestState - The request state associated with the approval request.
+     * @param expectsResult - Whether the approval request expects a result object to be returned.
+     * @returns The approval promise.
+     */
+    #add(origin, type, id = nanoid(), requestData, requestState, expectsResult) {
+        this.#validateAddParams(id, origin, type, requestData, requestState);
+        if (!this.#typesExcludedFromRateLimiting.includes(type) &&
+            this.hasRequest({ origin, type })) {
+            throw rpcErrors.resourceUnavailable(getAlreadyPendingMessage(origin, type));
+        }
+        // add pending approval
+        return new Promise((resolve, reject) => {
+            this.#approvals.set(id, { resolve, reject });
+            this.#addPendingApprovalOrigin(origin, type);
+            this.#addToStore(id, origin, type, requestData, requestState, expectsResult);
+        });
     }
-    else {
-        originMap.set(type, originTypeCount - 1);
+    /**
+     * Validates parameters to the add method.
+     *
+     * @param id - The id of the approval request.
+     * @param origin - The origin of the approval request.
+     * @param type - The type associated with the approval request.
+     * @param requestData - The request data associated with the approval request.
+     * @param requestState - The request state associated with the approval request.
+     */
+    #validateAddParams(id, origin, type, requestData, requestState) {
+        let errorMessage = null;
+        if (!id || typeof id !== 'string') {
+            errorMessage = 'Must specify non-empty string id.';
+        }
+        else if (this.#approvals.has(id)) {
+            errorMessage = `Approval request with id '${id}' already exists.`;
+        }
+        else if (!origin || typeof origin !== 'string') {
+            errorMessage = 'Must specify non-empty string origin.';
+        }
+        else if (!type || typeof type !== 'string') {
+            errorMessage = 'Must specify non-empty string type.';
+        }
+        else if (requestData &&
+            (typeof requestData !== 'object' || Array.isArray(requestData))) {
+            errorMessage = 'Request data must be a plain object if specified.';
+        }
+        else if (requestState &&
+            (typeof requestState !== 'object' || Array.isArray(requestState))) {
+            errorMessage = 'Request state must be a plain object if specified.';
+        }
+        if (errorMessage) {
+            throw rpcErrors.internal(errorMessage);
+        }
     }
-    this.update((draftState) => {
-        delete draftState.pendingApprovals[id];
-        draftState.pendingApprovalCount = Object.keys(draftState.pendingApprovals).length;
-    });
-}, _ApprovalController_getCallbacks = function _ApprovalController_getCallbacks(id) {
-    const callbacks = __classPrivateFieldGet(this, _ApprovalController_approvals, "f").get(id);
-    if (!callbacks) {
-        throw new ApprovalRequestNotFoundError(id);
+    /**
+     * Adds an entry to _origins.
+     * Performs no validation.
+     *
+     * @param origin - The origin of the approval request.
+     * @param type - The type associated with the approval request.
+     */
+    #addPendingApprovalOrigin(origin, type) {
+        let originMap = this.#origins.get(origin);
+        if (!originMap) {
+            originMap = new Map();
+            this.#origins.set(origin, originMap);
+        }
+        const currentValue = originMap.get(type) || 0;
+        originMap.set(type, currentValue + 1);
     }
-    return callbacks;
-}, _ApprovalController_result = async function _ApprovalController_result(type, opts, requestData) {
-    try {
-        await this.addAndShowApprovalRequest({
-            origin: ORIGIN_METAMASK,
+    /**
+     * Adds an entry to the store.
+     * Performs no validation.
+     *
+     * @param id - The id of the approval request.
+     * @param origin - The origin of the approval request.
+     * @param type - The type associated with the approval request.
+     * @param requestData - The request data associated with the approval request.
+     * @param requestState - The request state associated with the approval request.
+     * @param expectsResult - Whether the request expects a result object to be returned.
+     */
+    #addToStore(id, origin, type, requestData, requestState, expectsResult) {
+        const approval = {
+            id,
+            origin,
             type,
-            requestData,
+            time: Date.now(),
+            requestData: requestData || null,
+            requestState: requestState || null,
+            expectsResult: expectsResult || false,
+        };
+        this.update((draftState) => {
+            draftState.pendingApprovals[id] = approval;
+            draftState.pendingApprovalCount = Object.keys(draftState.pendingApprovals).length;
         });
     }
-    catch (error) {
-        console.info('Failed to display result page', error);
+    /**
+     * Deletes the approval with the given id.
+     *
+     * Deletion is an internal operation because approval state is solely
+     * managed by this controller.
+     *
+     * @param id - The id of the approval request to be deleted.
+     */
+    #delete(id) {
+        if (!this.#approvals.has(id)) {
+            throw new ApprovalRequestNotFoundError(id);
+        }
+        this.#approvals.delete(id);
+        const { origin, type } = this.state.pendingApprovals[id];
+        const originMap = this.#origins.get(origin);
+        const originTotalCount = this.getApprovalCount({ origin });
+        const originTypeCount = originMap.get(type);
+        if (originTotalCount === 1) {
+            this.#origins.delete(origin);
+        }
+        else {
+            originMap.set(type, originTypeCount - 1);
+        }
+        this.update((draftState) => {
+            delete draftState.pendingApprovals[id];
+            draftState.pendingApprovalCount = Object.keys(draftState.pendingApprovals).length;
+        });
     }
-    finally {
-        if (opts.flowToEnd) {
-            try {
-                this.endFlow({ id: opts.flowToEnd });
-            }
-            catch (error) {
-                console.info('Failed to end flow', { id: opts.flowToEnd, error });
+    #getCallbacks(id) {
+        const callbacks = this.#approvals.get(id);
+        if (!callbacks) {
+            throw new ApprovalRequestNotFoundError(id);
+        }
+        return callbacks;
+    }
+    async #result(type, opts, requestData) {
+        try {
+            await this.addAndShowApprovalRequest({
+                origin: ORIGIN_METAMASK,
+                type,
+                requestData,
+            });
+        }
+        catch (error) {
+            console.info('Failed to display result page', error);
+        }
+        finally {
+            if (opts.flowToEnd) {
+                try {
+                    this.endFlow({ id: opts.flowToEnd });
+                }
+                catch (error) {
+                    console.info('Failed to end flow', { id: opts.flowToEnd, error });
+                }
             }
         }
     }
-};
+}
 export default ApprovalController;
-//# sourceMappingURL=ApprovalController.mjs.map
+//# sourceMappingURL=ApprovalController.js.map