@metamask-previews/json-rpc-engine 10.2.4-preview-45a82ea8e → 10.2.4-preview-d8ff44d

package/dist/v2/utils.cjs

@@ -1,8 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHandlerMessenger = exports.assertExpectedHooks = exports.selectHooks = exports.JsonRpcEngineError = exports.isInstance = exports.stringify = exports.isNotification = exports.isRequest = void 0;
-const messenger_1 = require("@metamask/messenger");
+exports.JsonRpcEngineError = exports.isInstance = exports.stringify = exports.isNotification = exports.isRequest = void 0;
 const utils_1 = require("@metamask/utils");
 const isRequest = (message) => (0, utils_1.hasProperty)(message, 'id');
 exports.isRequest = isRequest;
@@ -50,78 +49,4 @@ class JsonRpcEngineError extends Error {
 }
 exports.JsonRpcEngineError = JsonRpcEngineError;
 _a = JsonRpcEngineErrorSymbol;
-// Method middleware utils
-/**
- * Returns the subset of the specified `hooks` that are included in the
- * `hookNames` object. This is a Principle of Least Authority (POLA) measure
- * to ensure that each RPC method implementation only has access to the
- * API "hooks" it needs to do its job.
- *
- * @param hooks - The hooks to select from.
- * @param hookNames - The names of the hooks to select.
- * @returns The selected hooks, or `undefined` if `hookNames` is not provided.
- * @template Hooks - The hooks to select from.
- * @template HookName - The names of the hooks to select.
- */
-function selectHooks(hooks, hookNames) {
-    if (hookNames) {
-        return Object.keys(hookNames).reduce((subset, name) => {
-            const hookName = name;
-            subset[hookName] = hooks[hookName];
-            return subset;
-        }, {});
-    }
-    return undefined;
-}
-exports.selectHooks = selectHooks;
-/**
- * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.
- * Throws on any missing hooks, then on any extraneous hooks.
- *
- * @param hooks - The hooks object to validate.
- * @param expectedHookNames - The expected hook names.
- */
-function assertExpectedHooks(hooks, expectedHookNames) {
-    const missingHookNames = [];
-    expectedHookNames.forEach((hookName) => {
-        if (!(0, utils_1.hasProperty)(hooks, hookName)) {
-            missingHookNames.push(hookName);
-        }
-    });
-    if (missingHookNames.length > 0) {
-        throw new Error(`Missing expected hooks:\n\n${missingHookNames.join('\n')}\n`);
-    }
-    const extraneousHookNames = Object.getOwnPropertyNames(hooks).filter((hookName) => !expectedHookNames.has(hookName));
-    if (extraneousHookNames.length > 0) {
-        throw new Error(`Received unexpected hooks:\n\n${extraneousHookNames.join('\n')}\n`);
-    }
-}
-exports.assertExpectedHooks = assertExpectedHooks;
-/**
- * Creates a per-handler messenger namespaced to `namespace`, and delegates the
- * specified `actionNames` from `rootMessenger` to it. This lets each handler
- * call only the actions it declared, per POLA.
- *
- * @param options - The options.
- * @param options.namespace - The namespace for the handler messenger.
- * @param options.actionNames - Actions to delegate from the root messenger.
- * @param options.rootMessenger - The root messenger to delegate from. Required
- * when `actionNames` are provided.
- * @returns The per-handler messenger.
- */
-function createHandlerMessenger({ namespace, actionNames, rootMessenger, }) {
-    if (!actionNames) {
-        return undefined;
-    }
-    if (!rootMessenger) {
-        throw new Error('A messenger is required when a handler declares actionNames.');
-    }
-    const handlerMessenger = new messenger_1.Messenger({ namespace, parent: rootMessenger });
-    rootMessenger.delegate({
-        actions: actionNames,
-        messenger: handlerMessenger,
-    });
-    return handlerMessenger;
-}
-exports.createHandlerMessenger = createHandlerMessenger;
 //# sourceMappingURL=utils.cjs.map

package/dist/v2/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ActionConstraint } from '@metamask/messenger';\nimport { Messenger } from '@metamask/messenger';\nimport { hasProperty, isObject } from '@metamask/utils';\nimport type {\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from '@metamask/utils';\n\nexport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcNotification,\n} from '@metamask/utils';\n\nexport type JsonRpcCall<Params extends JsonRpcParams = JsonRpcParams> =\n  | JsonRpcNotification<Params>\n  | JsonRpcRequest<Params>;\n\nexport const isRequest = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params> | Readonly<JsonRpcCall<Params>>,\n): message is JsonRpcRequest<Params> => hasProperty(message, 'id');\n\nexport const isNotification = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params>,\n): message is JsonRpcNotification<Params> => !isRequest(message);\n\n/**\n * An unholy incantation that converts a union of object types into an\n * intersection of object types.\n *\n * @example\n * type A = { a: string } | { b: number };\n * type B = UnionToIntersection<A>; // { a: string } & { b: number }\n */\nexport type UnionToIntersection<Union> = (\n  Union extends never ? never : (k: Union) => void\n) extends (k: infer Args) => void\n  ? Args\n  : never;\n\n/**\n * JSON-stringifies a value.\n *\n * @param value - The value to stringify.\n * @returns The stringified value.\n */\nexport function stringify(value: unknown): string {\n  return JSON.stringify(value, null, 2);\n}\n\n/**\n * The implementation of static `isInstance` methods for classes that have them.\n *\n * @param value - The value to check.\n * @param symbol - The symbol property to check for.\n * @returns Whether the value has `{ [symbol]: true }` in its prototype chain.\n */\nexport const isInstance = (\n  value: unknown,\n  symbol: symbol,\n): value is { [key: symbol]: true } =>\n  isObject(value) && symbol in value && value[symbol] === true;\n\nconst JsonRpcEngineErrorSymbol = Symbol.for(\n  'json-rpc-engine#JsonRpcEngineError',\n);\n\nexport class JsonRpcEngineError extends Error {\n  // This is a computed property name, and it doesn't seem possible to make it\n  // hash private using `#`.\n  // eslint-disable-next-line no-restricted-syntax\n  private readonly [JsonRpcEngineErrorSymbol] = true;\n\n  constructor(message: string) {\n    super(message);\n    this.name = 'JsonRpcEngineError';\n  }\n\n  /**\n   * Check if a value is a {@link JsonRpcEngineError} instance.\n   * Works across different package versions in the same realm.\n   *\n   * @param value - The value to check.\n   * @returns Whether the value is a {@link JsonRpcEngineError} instance.\n   */\n  static isInstance(value: unknown): value is JsonRpcEngineError {\n    return isInstance(value, JsonRpcEngineErrorSymbol);\n  }\n}\n\n// Method middleware utils\n\n/**\n * Returns the subset of the specified `hooks` that are included in the\n * `hookNames` object. This is a Principle of Least Authority (POLA) measure\n * to ensure that each RPC method implementation only has access to the\n * API \"hooks\" it needs to do its job.\n *\n * @param hooks - The hooks to select from.\n * @param hookNames - The names of the hooks to select.\n * @returns The selected hooks, or `undefined` if `hookNames` is not provided.\n * @template Hooks - The hooks to select from.\n * @template HookName - The names of the hooks to select.\n */\nexport function selectHooks<Hooks, HookName extends keyof Hooks>(\n  hooks: Hooks,\n  hookNames?: Record<HookName, true>,\n): Pick<Hooks, HookName> | undefined {\n  if (hookNames) {\n    return Object.keys(hookNames).reduce<Partial<Pick<Hooks, HookName>>>(\n      (subset, name) => {\n        const hookName = name as HookName;\n        subset[hookName] = hooks[hookName];\n        return subset;\n      },\n      {},\n    ) as Pick<Hooks, HookName>;\n  }\n  return undefined;\n}\n\n/**\n * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.\n * Throws on any missing hooks, then on any extraneous hooks.\n *\n * @param hooks - The hooks object to validate.\n * @param expectedHookNames - The expected hook names.\n */\nexport function assertExpectedHooks(\n  hooks: Record<string, unknown>,\n  expectedHookNames: Set<string>,\n): void {\n  const missingHookNames: string[] = [];\n  expectedHookNames.forEach((hookName) => {\n    if (!hasProperty(hooks, hookName)) {\n      missingHookNames.push(hookName);\n    }\n  });\n  if (missingHookNames.length > 0) {\n    throw new Error(\n      `Missing expected hooks:\\n\\n${missingHookNames.join('\\n')}\\n`,\n    );\n  }\n\n  const extraneousHookNames = Object.getOwnPropertyNames(hooks).filter(\n    (hookName) => !expectedHookNames.has(hookName),\n  );\n  if (extraneousHookNames.length > 0) {\n    throw new Error(\n      `Received unexpected hooks:\\n\\n${extraneousHookNames.join('\\n')}\\n`,\n    );\n  }\n}\n\n/**\n * Creates a per-handler messenger namespaced to `namespace`, and delegates the\n * specified `actionNames` from `rootMessenger` to it. This lets each handler\n * call only the actions it declared, per POLA.\n *\n * @param options - The options.\n * @param options.namespace - The namespace for the handler messenger.\n * @param options.actionNames - Actions to delegate from the root messenger.\n * @param options.rootMessenger - The root messenger to delegate from. Required\n * when `actionNames` are provided.\n * @returns The per-handler messenger.\n */\nexport function createHandlerMessenger<Actions extends ActionConstraint>({\n  namespace,\n  actionNames,\n  rootMessenger,\n}: {\n  namespace: string;\n  actionNames: readonly Actions['type'][] | undefined;\n  rootMessenger?: Messenger<string, Actions> | undefined;\n}): Messenger<string, Actions> | undefined {\n  if (!actionNames) {\n    return undefined;\n  }\n\n  if (!rootMessenger) {\n    throw new Error(\n      'A messenger is required when a handler declares actionNames.',\n    );\n  }\n\n  const handlerMessenger = new Messenger<\n    string,\n    Actions,\n    never,\n    typeof rootMessenger\n  >({ namespace, parent: rootMessenger });\n\n  rootMessenger.delegate({\n    actions: actionNames as Actions['type'][],\n    messenger: handlerMessenger,\n  });\n\n  return handlerMessenger;\n}\n"]}
+{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AAkBjD,MAAM,SAAS,GAAG,CACvB,OAA4D,EACzB,EAAE,CAAC,IAAA,mBAAW,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAFtD,QAAA,SAAS,aAE6C;AAE5D,MAAM,cAAc,GAAG,CAC5B,OAA4B,EACY,EAAE,CAAC,CAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;AAFpD,QAAA,cAAc,kBAEsC;AAgBjE;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,KAAc;IACtC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,8BAEC;AAED;;;;;;GAMG;AACI,MAAM,UAAU,GAAG,CACxB,KAAc,EACd,MAAc,EACoB,EAAE,CACpC,IAAA,gBAAQ,EAAC,KAAK,CAAC,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;AAJlD,QAAA,UAAU,cAIwC;AAE/D,MAAM,wBAAwB,GAAG,MAAM,CAAC,GAAG,CACzC,oCAAoC,CACrC,CAAC;AAEF,MAAa,kBAAmB,SAAQ,KAAK;IAM3C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QANjB,4EAA4E;QAC5E,0BAA0B;QAC1B,gDAAgD;QAC/B,QAA0B,GAAG,IAAI,CAAC;QAIjD,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,KAAc;QAC9B,OAAO,IAAA,kBAAU,EAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;IACrD,CAAC;CACF;AArBD,gDAqBC;KAjBmB,wBAAwB","sourcesContent":["import { hasProperty, isObject } from '@metamask/utils';\nimport type {\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from '@metamask/utils';\n\nexport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcNotification,\n} from '@metamask/utils';\n\nexport type JsonRpcCall<Params extends JsonRpcParams = JsonRpcParams> =\n  | JsonRpcNotification<Params>\n  | JsonRpcRequest<Params>;\n\nexport const isRequest = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params> | Readonly<JsonRpcCall<Params>>,\n): message is JsonRpcRequest<Params> => hasProperty(message, 'id');\n\nexport const isNotification = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params>,\n): message is JsonRpcNotification<Params> => !isRequest(message);\n\n/**\n * An unholy incantation that converts a union of object types into an\n * intersection of object types.\n *\n * @example\n * type A = { a: string } | { b: number };\n * type B = UnionToIntersection<A>; // { a: string } & { b: number }\n */\nexport type UnionToIntersection<Union> = (\n  Union extends never ? never : (k: Union) => void\n) extends (k: infer Args) => void\n  ? Args\n  : never;\n\n/**\n * JSON-stringifies a value.\n *\n * @param value - The value to stringify.\n * @returns The stringified value.\n */\nexport function stringify(value: unknown): string {\n  return JSON.stringify(value, null, 2);\n}\n\n/**\n * The implementation of static `isInstance` methods for classes that have them.\n *\n * @param value - The value to check.\n * @param symbol - The symbol property to check for.\n * @returns Whether the value has `{ [symbol]: true }` in its prototype chain.\n */\nexport const isInstance = (\n  value: unknown,\n  symbol: symbol,\n): value is { [key: symbol]: true } =>\n  isObject(value) && symbol in value && value[symbol] === true;\n\nconst JsonRpcEngineErrorSymbol = Symbol.for(\n  'json-rpc-engine#JsonRpcEngineError',\n);\n\nexport class JsonRpcEngineError extends Error {\n  // This is a computed property name, and it doesn't seem possible to make it\n  // hash private using `#`.\n  // eslint-disable-next-line no-restricted-syntax\n  private readonly [JsonRpcEngineErrorSymbol] = true;\n\n  constructor(message: string) {\n    super(message);\n    this.name = 'JsonRpcEngineError';\n  }\n\n  /**\n   * Check if a value is a {@link JsonRpcEngineError} instance.\n   * Works across different package versions in the same realm.\n   *\n   * @param value - The value to check.\n   * @returns Whether the value is a {@link JsonRpcEngineError} instance.\n   */\n  static isInstance(value: unknown): value is JsonRpcEngineError {\n    return isInstance(value, JsonRpcEngineErrorSymbol);\n  }\n}\n"]}

package/dist/v2/utils.d.cts

@@ -1,5 +1,3 @@
-import type { ActionConstraint } from "@metamask/messenger";
-import { Messenger } from "@metamask/messenger";
 import type { JsonRpcNotification, JsonRpcParams, JsonRpcRequest } from "@metamask/utils";
 export type { Json, JsonRpcParams, JsonRpcRequest, JsonRpcNotification, } from "@metamask/utils";
 export type JsonRpcCall<Params extends JsonRpcParams = JsonRpcParams> = JsonRpcNotification<Params> | JsonRpcRequest<Params>;
@@ -44,42 +42,4 @@ export declare class JsonRpcEngineError extends Error {
      */
     static isInstance(value: unknown): value is JsonRpcEngineError;
 }
-/**
- * Returns the subset of the specified `hooks` that are included in the
- * `hookNames` object. This is a Principle of Least Authority (POLA) measure
- * to ensure that each RPC method implementation only has access to the
- * API "hooks" it needs to do its job.
- *
- * @param hooks - The hooks to select from.
- * @param hookNames - The names of the hooks to select.
- * @returns The selected hooks, or `undefined` if `hookNames` is not provided.
- * @template Hooks - The hooks to select from.
- * @template HookName - The names of the hooks to select.
- */
-export declare function selectHooks<Hooks, HookName extends keyof Hooks>(hooks: Hooks, hookNames?: Record<HookName, true>): Pick<Hooks, HookName> | undefined;
-/**
- * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.
- * Throws on any missing hooks, then on any extraneous hooks.
- *
- * @param hooks - The hooks object to validate.
- * @param expectedHookNames - The expected hook names.
- */
-export declare function assertExpectedHooks(hooks: Record<string, unknown>, expectedHookNames: Set<string>): void;
-/**
- * Creates a per-handler messenger namespaced to `namespace`, and delegates the
- * specified `actionNames` from `rootMessenger` to it. This lets each handler
- * call only the actions it declared, per POLA.
- *
- * @param options - The options.
- * @param options.namespace - The namespace for the handler messenger.
- * @param options.actionNames - Actions to delegate from the root messenger.
- * @param options.rootMessenger - The root messenger to delegate from. Required
- * when `actionNames` are provided.
- * @returns The per-handler messenger.
- */
-export declare function createHandlerMessenger<Actions extends ActionConstraint>({ namespace, actionNames, rootMessenger, }: {
-    namespace: string;
-    actionNames: readonly Actions['type'][] | undefined;
-    rootMessenger?: Messenger<string, Actions> | undefined;
-}): Messenger<string, Actions> | undefined;
 //# sourceMappingURL=utils.d.cts.map

package/dist/v2/utils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,4BAA4B;AAC5D,OAAO,EAAE,SAAS,EAAE,4BAA4B;AAEhD,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,cAAc,EACf,wBAAwB;AAEzB,YAAY,EACV,IAAI,EACJ,aAAa,EACb,cAAc,EACd,mBAAmB,GACpB,wBAAwB;AAEzB,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa,IAChE,mBAAmB,CAAC,MAAM,CAAC,GAC3B,cAAc,CAAC,MAAM,CAAC,CAAC;AAE3B,eAAO,MAAM,SAAS,mIAE4C,CAAC;AAEnE,eAAO,MAAM,cAAc,wGAEqC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,CAAC,KAAK,IAAI,CACvC,KAAK,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CACjD,SAAS,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,GAC7B,IAAI,GACJ,KAAK,CAAC;AAEV;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,UACd,OAAO,UACN,MAAM;;CAE8C,CAAC;AAE/D,QAAA,MAAM,wBAAwB,eAE7B,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;IAI3C,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,CAAQ;gBAEvC,OAAO,EAAE,MAAM;IAK3B;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D;AAID;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,SAAS,MAAM,KAAK,EAC7D,KAAK,EAAE,KAAK,EACZ,SAAS,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GACjC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,SAAS,CAYnC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC7B,IAAI,CAqBN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,gBAAgB,EAAE,EACvE,SAAS,EACT,WAAW,EACX,aAAa,GACd,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,SAAS,CAAC;IACpD,aAAa,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CACxD,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAwBzC"}
+{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,cAAc,EACf,wBAAwB;AAEzB,YAAY,EACV,IAAI,EACJ,aAAa,EACb,cAAc,EACd,mBAAmB,GACpB,wBAAwB;AAEzB,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa,IAChE,mBAAmB,CAAC,MAAM,CAAC,GAC3B,cAAc,CAAC,MAAM,CAAC,CAAC;AAE3B,eAAO,MAAM,SAAS,mIAE4C,CAAC;AAEnE,eAAO,MAAM,cAAc,wGAEqC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,CAAC,KAAK,IAAI,CACvC,KAAK,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CACjD,SAAS,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,GAC7B,IAAI,GACJ,KAAK,CAAC;AAEV;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,UACd,OAAO,UACN,MAAM;;CAE8C,CAAC;AAE/D,QAAA,MAAM,wBAAwB,eAE7B,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;IAI3C,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,CAAQ;gBAEvC,OAAO,EAAE,MAAM;IAK3B;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D"}

package/dist/v2/utils.d.mts

@@ -1,5 +1,3 @@
-import type { ActionConstraint } from "@metamask/messenger";
-import { Messenger } from "@metamask/messenger";
 import type { JsonRpcNotification, JsonRpcParams, JsonRpcRequest } from "@metamask/utils";
 export type { Json, JsonRpcParams, JsonRpcRequest, JsonRpcNotification, } from "@metamask/utils";
 export type JsonRpcCall<Params extends JsonRpcParams = JsonRpcParams> = JsonRpcNotification<Params> | JsonRpcRequest<Params>;
@@ -44,42 +42,4 @@ export declare class JsonRpcEngineError extends Error {
      */
     static isInstance(value: unknown): value is JsonRpcEngineError;
 }
-/**
- * Returns the subset of the specified `hooks` that are included in the
- * `hookNames` object. This is a Principle of Least Authority (POLA) measure
- * to ensure that each RPC method implementation only has access to the
- * API "hooks" it needs to do its job.
- *
- * @param hooks - The hooks to select from.
- * @param hookNames - The names of the hooks to select.
- * @returns The selected hooks, or `undefined` if `hookNames` is not provided.
- * @template Hooks - The hooks to select from.
- * @template HookName - The names of the hooks to select.
- */
-export declare function selectHooks<Hooks, HookName extends keyof Hooks>(hooks: Hooks, hookNames?: Record<HookName, true>): Pick<Hooks, HookName> | undefined;
-/**
- * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.
- * Throws on any missing hooks, then on any extraneous hooks.
- *
- * @param hooks - The hooks object to validate.
- * @param expectedHookNames - The expected hook names.
- */
-export declare function assertExpectedHooks(hooks: Record<string, unknown>, expectedHookNames: Set<string>): void;
-/**
- * Creates a per-handler messenger namespaced to `namespace`, and delegates the
- * specified `actionNames` from `rootMessenger` to it. This lets each handler
- * call only the actions it declared, per POLA.
- *
- * @param options - The options.
- * @param options.namespace - The namespace for the handler messenger.
- * @param options.actionNames - Actions to delegate from the root messenger.
- * @param options.rootMessenger - The root messenger to delegate from. Required
- * when `actionNames` are provided.
- * @returns The per-handler messenger.
- */
-export declare function createHandlerMessenger<Actions extends ActionConstraint>({ namespace, actionNames, rootMessenger, }: {
-    namespace: string;
-    actionNames: readonly Actions['type'][] | undefined;
-    rootMessenger?: Messenger<string, Actions> | undefined;
-}): Messenger<string, Actions> | undefined;
 //# sourceMappingURL=utils.d.mts.map

package/dist/v2/utils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,4BAA4B;AAC5D,OAAO,EAAE,SAAS,EAAE,4BAA4B;AAEhD,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,cAAc,EACf,wBAAwB;AAEzB,YAAY,EACV,IAAI,EACJ,aAAa,EACb,cAAc,EACd,mBAAmB,GACpB,wBAAwB;AAEzB,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa,IAChE,mBAAmB,CAAC,MAAM,CAAC,GAC3B,cAAc,CAAC,MAAM,CAAC,CAAC;AAE3B,eAAO,MAAM,SAAS,mIAE4C,CAAC;AAEnE,eAAO,MAAM,cAAc,wGAEqC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,CAAC,KAAK,IAAI,CACvC,KAAK,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CACjD,SAAS,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,GAC7B,IAAI,GACJ,KAAK,CAAC;AAEV;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,UACd,OAAO,UACN,MAAM;;CAE8C,CAAC;AAE/D,QAAA,MAAM,wBAAwB,eAE7B,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;IAI3C,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,CAAQ;gBAEvC,OAAO,EAAE,MAAM;IAK3B;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D;AAID;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,SAAS,MAAM,KAAK,EAC7D,KAAK,EAAE,KAAK,EACZ,SAAS,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,GACjC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,SAAS,CAYnC;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC7B,IAAI,CAqBN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,gBAAgB,EAAE,EACvE,SAAS,EACT,WAAW,EACX,aAAa,GACd,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,SAAS,CAAC;IACpD,aAAa,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CACxD,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAwBzC"}
+{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,cAAc,EACf,wBAAwB;AAEzB,YAAY,EACV,IAAI,EACJ,aAAa,EACb,cAAc,EACd,mBAAmB,GACpB,wBAAwB;AAEzB,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,aAAa,GAAG,aAAa,IAChE,mBAAmB,CAAC,MAAM,CAAC,GAC3B,cAAc,CAAC,MAAM,CAAC,CAAC;AAE3B,eAAO,MAAM,SAAS,mIAE4C,CAAC;AAEnE,eAAO,MAAM,cAAc,wGAEqC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,MAAM,mBAAmB,CAAC,KAAK,IAAI,CACvC,KAAK,SAAS,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CACjD,SAAS,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,GAC7B,IAAI,GACJ,KAAK,CAAC;AAEV;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;AAED;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,UACd,OAAO,UACN,MAAM;;CAE8C,CAAC;AAE/D,QAAA,MAAM,wBAAwB,eAE7B,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;IAI3C,OAAO,CAAC,QAAQ,CAAC,CAAC,wBAAwB,CAAC,CAAQ;gBAEvC,OAAO,EAAE,MAAM;IAK3B;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D"}

package/dist/v2/utils.mjs

@@ -1,5 +1,4 @@
 var _a;
-import { Messenger } from "@metamask/messenger";
 import { hasProperty, isObject } from "@metamask/utils";
 export const isRequest = (message) => hasProperty(message, 'id');
 export const isNotification = (message) => !isRequest(message);
@@ -42,75 +41,4 @@ export class JsonRpcEngineError extends Error {
     }
 }
 _a = JsonRpcEngineErrorSymbol;
-// Method middleware utils
-/**
- * Returns the subset of the specified `hooks` that are included in the
- * `hookNames` object. This is a Principle of Least Authority (POLA) measure
- * to ensure that each RPC method implementation only has access to the
- * API "hooks" it needs to do its job.
- *
- * @param hooks - The hooks to select from.
- * @param hookNames - The names of the hooks to select.
- * @returns The selected hooks, or `undefined` if `hookNames` is not provided.
- * @template Hooks - The hooks to select from.
- * @template HookName - The names of the hooks to select.
- */
-export function selectHooks(hooks, hookNames) {
-    if (hookNames) {
-        return Object.keys(hookNames).reduce((subset, name) => {
-            const hookName = name;
-            subset[hookName] = hooks[hookName];
-            return subset;
-        }, {});
-    }
-    return undefined;
-}
-/**
- * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.
- * Throws on any missing hooks, then on any extraneous hooks.
- *
- * @param hooks - The hooks object to validate.
- * @param expectedHookNames - The expected hook names.
- */
-export function assertExpectedHooks(hooks, expectedHookNames) {
-    const missingHookNames = [];
-    expectedHookNames.forEach((hookName) => {
-        if (!hasProperty(hooks, hookName)) {
-            missingHookNames.push(hookName);
-        }
-    });
-    if (missingHookNames.length > 0) {
-        throw new Error(`Missing expected hooks:\n\n${missingHookNames.join('\n')}\n`);
-    }
-    const extraneousHookNames = Object.getOwnPropertyNames(hooks).filter((hookName) => !expectedHookNames.has(hookName));
-    if (extraneousHookNames.length > 0) {
-        throw new Error(`Received unexpected hooks:\n\n${extraneousHookNames.join('\n')}\n`);
-    }
-}
-/**
- * Creates a per-handler messenger namespaced to `namespace`, and delegates the
- * specified `actionNames` from `rootMessenger` to it. This lets each handler
- * call only the actions it declared, per POLA.
- *
- * @param options - The options.
- * @param options.namespace - The namespace for the handler messenger.
- * @param options.actionNames - Actions to delegate from the root messenger.
- * @param options.rootMessenger - The root messenger to delegate from. Required
- * when `actionNames` are provided.
- * @returns The per-handler messenger.
- */
-export function createHandlerMessenger({ namespace, actionNames, rootMessenger, }) {
-    if (!actionNames) {
-        return undefined;
-    }
-    if (!rootMessenger) {
-        throw new Error('A messenger is required when a handler declares actionNames.');
-    }
-    const handlerMessenger = new Messenger({ namespace, parent: rootMessenger });
-    rootMessenger.delegate({
-        actions: actionNames,
-        messenger: handlerMessenger,
-    });
-    return handlerMessenger;
-}
 //# sourceMappingURL=utils.mjs.map

package/dist/v2/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ActionConstraint } from '@metamask/messenger';\nimport { Messenger } from '@metamask/messenger';\nimport { hasProperty, isObject } from '@metamask/utils';\nimport type {\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from '@metamask/utils';\n\nexport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcNotification,\n} from '@metamask/utils';\n\nexport type JsonRpcCall<Params extends JsonRpcParams = JsonRpcParams> =\n  | JsonRpcNotification<Params>\n  | JsonRpcRequest<Params>;\n\nexport const isRequest = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params> | Readonly<JsonRpcCall<Params>>,\n): message is JsonRpcRequest<Params> => hasProperty(message, 'id');\n\nexport const isNotification = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params>,\n): message is JsonRpcNotification<Params> => !isRequest(message);\n\n/**\n * An unholy incantation that converts a union of object types into an\n * intersection of object types.\n *\n * @example\n * type A = { a: string } | { b: number };\n * type B = UnionToIntersection<A>; // { a: string } & { b: number }\n */\nexport type UnionToIntersection<Union> = (\n  Union extends never ? never : (k: Union) => void\n) extends (k: infer Args) => void\n  ? Args\n  : never;\n\n/**\n * JSON-stringifies a value.\n *\n * @param value - The value to stringify.\n * @returns The stringified value.\n */\nexport function stringify(value: unknown): string {\n  return JSON.stringify(value, null, 2);\n}\n\n/**\n * The implementation of static `isInstance` methods for classes that have them.\n *\n * @param value - The value to check.\n * @param symbol - The symbol property to check for.\n * @returns Whether the value has `{ [symbol]: true }` in its prototype chain.\n */\nexport const isInstance = (\n  value: unknown,\n  symbol: symbol,\n): value is { [key: symbol]: true } =>\n  isObject(value) && symbol in value && value[symbol] === true;\n\nconst JsonRpcEngineErrorSymbol = Symbol.for(\n  'json-rpc-engine#JsonRpcEngineError',\n);\n\nexport class JsonRpcEngineError extends Error {\n  // This is a computed property name, and it doesn't seem possible to make it\n  // hash private using `#`.\n  // eslint-disable-next-line no-restricted-syntax\n  private readonly [JsonRpcEngineErrorSymbol] = true;\n\n  constructor(message: string) {\n    super(message);\n    this.name = 'JsonRpcEngineError';\n  }\n\n  /**\n   * Check if a value is a {@link JsonRpcEngineError} instance.\n   * Works across different package versions in the same realm.\n   *\n   * @param value - The value to check.\n   * @returns Whether the value is a {@link JsonRpcEngineError} instance.\n   */\n  static isInstance(value: unknown): value is JsonRpcEngineError {\n    return isInstance(value, JsonRpcEngineErrorSymbol);\n  }\n}\n\n// Method middleware utils\n\n/**\n * Returns the subset of the specified `hooks` that are included in the\n * `hookNames` object. This is a Principle of Least Authority (POLA) measure\n * to ensure that each RPC method implementation only has access to the\n * API \"hooks\" it needs to do its job.\n *\n * @param hooks - The hooks to select from.\n * @param hookNames - The names of the hooks to select.\n * @returns The selected hooks, or `undefined` if `hookNames` is not provided.\n * @template Hooks - The hooks to select from.\n * @template HookName - The names of the hooks to select.\n */\nexport function selectHooks<Hooks, HookName extends keyof Hooks>(\n  hooks: Hooks,\n  hookNames?: Record<HookName, true>,\n): Pick<Hooks, HookName> | undefined {\n  if (hookNames) {\n    return Object.keys(hookNames).reduce<Partial<Pick<Hooks, HookName>>>(\n      (subset, name) => {\n        const hookName = name as HookName;\n        subset[hookName] = hooks[hookName];\n        return subset;\n      },\n      {},\n    ) as Pick<Hooks, HookName>;\n  }\n  return undefined;\n}\n\n/**\n * Asserts that `hooks` contains exactly the hook names in `expectedHookNames`.\n * Throws on any missing hooks, then on any extraneous hooks.\n *\n * @param hooks - The hooks object to validate.\n * @param expectedHookNames - The expected hook names.\n */\nexport function assertExpectedHooks(\n  hooks: Record<string, unknown>,\n  expectedHookNames: Set<string>,\n): void {\n  const missingHookNames: string[] = [];\n  expectedHookNames.forEach((hookName) => {\n    if (!hasProperty(hooks, hookName)) {\n      missingHookNames.push(hookName);\n    }\n  });\n  if (missingHookNames.length > 0) {\n    throw new Error(\n      `Missing expected hooks:\\n\\n${missingHookNames.join('\\n')}\\n`,\n    );\n  }\n\n  const extraneousHookNames = Object.getOwnPropertyNames(hooks).filter(\n    (hookName) => !expectedHookNames.has(hookName),\n  );\n  if (extraneousHookNames.length > 0) {\n    throw new Error(\n      `Received unexpected hooks:\\n\\n${extraneousHookNames.join('\\n')}\\n`,\n    );\n  }\n}\n\n/**\n * Creates a per-handler messenger namespaced to `namespace`, and delegates the\n * specified `actionNames` from `rootMessenger` to it. This lets each handler\n * call only the actions it declared, per POLA.\n *\n * @param options - The options.\n * @param options.namespace - The namespace for the handler messenger.\n * @param options.actionNames - Actions to delegate from the root messenger.\n * @param options.rootMessenger - The root messenger to delegate from. Required\n * when `actionNames` are provided.\n * @returns The per-handler messenger.\n */\nexport function createHandlerMessenger<Actions extends ActionConstraint>({\n  namespace,\n  actionNames,\n  rootMessenger,\n}: {\n  namespace: string;\n  actionNames: readonly Actions['type'][] | undefined;\n  rootMessenger?: Messenger<string, Actions> | undefined;\n}): Messenger<string, Actions> | undefined {\n  if (!actionNames) {\n    return undefined;\n  }\n\n  if (!rootMessenger) {\n    throw new Error(\n      'A messenger is required when a handler declares actionNames.',\n    );\n  }\n\n  const handlerMessenger = new Messenger<\n    string,\n    Actions,\n    never,\n    typeof rootMessenger\n  >({ namespace, parent: rootMessenger });\n\n  rootMessenger.delegate({\n    actions: actionNames as Actions['type'][],\n    messenger: handlerMessenger,\n  });\n\n  return handlerMessenger;\n}\n"]}
+{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../../src/v2/utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,wBAAwB;AAkBxD,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,OAA4D,EACzB,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,OAA4B,EACY,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;AAgBjE;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACxC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,KAAc,EACd,MAAc,EACoB,EAAE,CACpC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;AAE/D,MAAM,wBAAwB,GAAG,MAAM,CAAC,GAAG,CACzC,oCAAoC,CACrC,CAAC;AAEF,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAM3C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QANjB,4EAA4E;QAC5E,0BAA0B;QAC1B,gDAAgD;QAC/B,QAA0B,GAAG,IAAI,CAAC;QAIjD,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,KAAc;QAC9B,OAAO,UAAU,CAAC,KAAK,EAAE,wBAAwB,CAAC,CAAC;IACrD,CAAC;CACF;KAjBmB,wBAAwB","sourcesContent":["import { hasProperty, isObject } from '@metamask/utils';\nimport type {\n  JsonRpcNotification,\n  JsonRpcParams,\n  JsonRpcRequest,\n} from '@metamask/utils';\n\nexport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  JsonRpcNotification,\n} from '@metamask/utils';\n\nexport type JsonRpcCall<Params extends JsonRpcParams = JsonRpcParams> =\n  | JsonRpcNotification<Params>\n  | JsonRpcRequest<Params>;\n\nexport const isRequest = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params> | Readonly<JsonRpcCall<Params>>,\n): message is JsonRpcRequest<Params> => hasProperty(message, 'id');\n\nexport const isNotification = <Params extends JsonRpcParams>(\n  message: JsonRpcCall<Params>,\n): message is JsonRpcNotification<Params> => !isRequest(message);\n\n/**\n * An unholy incantation that converts a union of object types into an\n * intersection of object types.\n *\n * @example\n * type A = { a: string } | { b: number };\n * type B = UnionToIntersection<A>; // { a: string } & { b: number }\n */\nexport type UnionToIntersection<Union> = (\n  Union extends never ? never : (k: Union) => void\n) extends (k: infer Args) => void\n  ? Args\n  : never;\n\n/**\n * JSON-stringifies a value.\n *\n * @param value - The value to stringify.\n * @returns The stringified value.\n */\nexport function stringify(value: unknown): string {\n  return JSON.stringify(value, null, 2);\n}\n\n/**\n * The implementation of static `isInstance` methods for classes that have them.\n *\n * @param value - The value to check.\n * @param symbol - The symbol property to check for.\n * @returns Whether the value has `{ [symbol]: true }` in its prototype chain.\n */\nexport const isInstance = (\n  value: unknown,\n  symbol: symbol,\n): value is { [key: symbol]: true } =>\n  isObject(value) && symbol in value && value[symbol] === true;\n\nconst JsonRpcEngineErrorSymbol = Symbol.for(\n  'json-rpc-engine#JsonRpcEngineError',\n);\n\nexport class JsonRpcEngineError extends Error {\n  // This is a computed property name, and it doesn't seem possible to make it\n  // hash private using `#`.\n  // eslint-disable-next-line no-restricted-syntax\n  private readonly [JsonRpcEngineErrorSymbol] = true;\n\n  constructor(message: string) {\n    super(message);\n    this.name = 'JsonRpcEngineError';\n  }\n\n  /**\n   * Check if a value is a {@link JsonRpcEngineError} instance.\n   * Works across different package versions in the same realm.\n   *\n   * @param value - The value to check.\n   * @returns Whether the value is a {@link JsonRpcEngineError} instance.\n   */\n  static isInstance(value: unknown): value is JsonRpcEngineError {\n    return isInstance(value, JsonRpcEngineErrorSymbol);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/json-rpc-engine",
-  "version": "10.2.4-preview-45a82ea8e",
+  "version": "10.2.4-preview-d8ff44d",
   "description": "A tool for processing JSON-RPC messages",
   "keywords": [
     "Ethereum",
@@ -70,7 +70,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/messenger": "^1.1.1",
+    "@metamask/messenger": "^1.2.0",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/safe-event-emitter": "^3.0.0",
     "@metamask/utils": "^11.9.0",

package/dist/createMethodMiddleware.cjs

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMethodMiddleware = void 0;
-const rpc_errors_1 = require("@metamask/rpc-errors");
-const utils_1 = require("./v2/utils.cjs");
-/**
- * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- * @param options The options.
- * @param options.handlers - The JSON-RPC method handler implementations.
- * @param options.messenger - The messenger to be used by the handlers.
- * @param options.hooks - The hooks to be used by the handlers.
- * @returns A JsonRpcEngineV2 middleware.
- */
-function createMethodMiddleware(options) {
-    const { messenger: rootMessenger, onError } = options;
-    const allHooks = options.hooks;
-    const expectedHookNames = new Set(Object.values(options.handlers).flatMap((handler) => handler.hookNames ? Object.getOwnPropertyNames(handler.hookNames) : []));
-    (0, utils_1.assertExpectedHooks)(allHooks, expectedHookNames);
-    const handlers = Object.entries(options.handlers).reduce((accumulator, [handlerName, handler]) => {
-        const handlerHooks = (0, utils_1.selectHooks)(allHooks, handler.hookNames) ?? {};
-        const handlerMessenger = (0, utils_1.createHandlerMessenger)({
-            namespace: handlerName,
-            actionNames: handler.actionNames,
-            rootMessenger,
-        });
-        accumulator[handlerName] = {
-            implementation: handler.implementation,
-            hooks: handlerHooks,
-            messenger: handlerMessenger,
-        };
-        return accumulator;
-    }, {});
-    // This should technically use createAsyncMiddleware, but we get around this by catching
-    // all handler errors.
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    return async (req, res, next, end) => {
-        const handler = handlers[req.method];
-        if (!handler) {
-            return next();
-        }
-        const { implementation, hooks: handlerHooks, messenger } = handler;
-        try {
-            return await implementation(req, res, next, end, handlerHooks, messenger);
-        }
-        catch (error) {
-            onError?.(error, req);
-            return end(error instanceof Error
-                ? error
-                : rpc_errors_1.rpcErrors.internal({ data: error }));
-        }
-    };
-}
-exports.createMethodMiddleware = createMethodMiddleware;
-//# sourceMappingURL=createMethodMiddleware.cjs.map

package/dist/createMethodMiddleware.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"createMethodMiddleware.cjs","sourceRoot":"","sources":["../src/createMethodMiddleware.ts"],"names":[],"mappings":";;;AAEA,qDAAiD;AAajD,0CAKoB;AA2HpB;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CAGpC,OAAgD;IAEhD,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAgC,CAAC;IAE1D,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAClD,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CACvE,CACF,CAAC;IACF,IAAA,2BAAmB,EAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAEtD,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;QACxC,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpE,MAAM,gBAAgB,GAAG,IAAA,8BAAsB,EAE7C;YACA,SAAS,EAAE,WAAW;YACtB,WAAW,EAAE,OAAO,CAAC,WAER;YACb,aAAa;SACd,CAAC,CAAC;QAEH,WAAW,CAAC,WAAW,CAAC,GAAG;YACzB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,gBAAgB;SAC5B,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,wFAAwF;IACxF,sBAAsB;IACtB,kEAAkE;IAClE,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QACnE,IAAI,CAAC;YACH,OAAO,MAAM,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACtB,OAAO,GAAG,CACR,KAAK,YAAY,KAAK;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,sBAAS,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAa,EAAE,CAAC,CAChD,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AA1DD,wDA0DC","sourcesContent":["import type { ActionConstraint } from '@metamask/messenger';\nimport type { Messenger } from '@metamask/messenger';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  Json,\n  JsonRpcParams,\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n} from '@metamask/utils';\n\nimport type {\n  JsonRpcEngineEndCallback,\n  JsonRpcEngineNextCallback,\n  JsonRpcMiddleware,\n} from './JsonRpcEngine';\nimport {\n  assertExpectedHooks,\n  createHandlerMessenger,\n  selectHooks,\n  UnionToIntersection,\n} from './v2/utils';\n\ntype HandlerActions<Handler> = Handler extends {\n  implementation: (...args: infer Args) => unknown;\n}\n  ? Args extends [\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      unknown,\n      infer HandlerMessenger,\n    ]\n    ? HandlerMessenger extends Messenger<string, infer Actions>\n      ? Actions\n      : never\n    : never\n  : never;\n\ntype HandlerHooks<Handler> = Handler extends {\n  implementation: (...args: infer Args) => unknown;\n}\n  ? Args extends [unknown, unknown, unknown, unknown, infer ArgHooks, unknown]\n    ? ArgHooks extends Record<string, unknown>\n      ? ArgHooks\n      : never\n    : never\n  : never;\n\n/**\n * A {@link MethodHandler} implementation.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type MethodHandlerImplementation<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Params extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  RequestExtras extends Record<string, unknown> = Record<string, unknown>,\n> = (\n  req: JsonRpcRequest<Params> & RequestExtras,\n  res: PendingJsonRpcResponse<Result>,\n  next: JsonRpcEngineNextCallback,\n  end: JsonRpcEngineEndCallback,\n  hooks: Hooks,\n  messenger: Messenger<string, MessengerActions>,\n) => Promise<void> | void;\n\n/**\n * A handler for {@link createMethodMiddleware}.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type MethodHandler<\n  Hooks extends Record<string, unknown> = never,\n  MessengerActions extends ActionConstraint = never,\n  Params extends JsonRpcParams = JsonRpcParams,\n  Result extends Json = Json,\n  RequestExtras extends Record<string, unknown> = Record<string, unknown>,\n> = {\n  implementation: MethodHandlerImplementation<\n    Hooks,\n    MessengerActions,\n    Params,\n    Result,\n    RequestExtras\n  >;\n} & ([Hooks] extends [never]\n  ? { hookNames?: undefined }\n  : { hookNames: { [Key in keyof Hooks]: true } }) &\n  ([MessengerActions] extends [never]\n    ? { actionNames?: undefined }\n    : { actionNames: readonly MessengerActions['type'][] });\n\ntype AnyMethodHandler = {\n  implementation(\n    this: void,\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n    next: JsonRpcEngineNextCallback,\n    end: JsonRpcEngineEndCallback,\n    hooks: unknown,\n    messenger: unknown,\n  ): Promise<void> | void;\n  hookNames?: Record<string, true>;\n  actionNames?: readonly string[];\n};\n\ntype CreateMethodMiddlewareBaseOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = {\n  handlers: Handlers;\n  hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;\n  /**\n   * Called when a handler throws, before the error is forwarded to `end`.\n   * Intended for logging; must not throw.\n   */\n  onError?: (error: unknown, request: JsonRpcRequest) => void;\n};\n\n/**\n * Options for {@link createMethodMiddleware}.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n */\nexport type CreateMethodMiddlewareOptions<\n  Handlers extends Record<string, AnyMethodHandler>,\n> = CreateMethodMiddlewareBaseOptions<Handlers> &\n  ([HandlerActions<Handlers[keyof Handlers]>] extends [never]\n    ? {\n        messenger?: undefined;\n      }\n    : {\n        messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;\n      });\n\ntype ResolvedHandler = {\n  implementation: AnyMethodHandler['implementation'];\n  hooks: Record<string, unknown>;\n  messenger?: Messenger<string, ActionConstraint> | undefined;\n};\n\n/**\n * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.\n *\n * @deprecated Use the v2 `createMethodMiddleware` instead.\n * @param options The options.\n * @param options.handlers - The JSON-RPC method handler implementations.\n * @param options.messenger - The messenger to be used by the handlers.\n * @param options.hooks - The hooks to be used by the handlers.\n * @returns A JsonRpcEngineV2 middleware.\n */\nexport function createMethodMiddleware<\n  Handlers extends Record<string, AnyMethodHandler>,\n>(\n  options: CreateMethodMiddlewareOptions<Handlers>,\n): JsonRpcMiddleware<JsonRpcParams, Json> {\n  const { messenger: rootMessenger, onError } = options;\n  const allHooks = options.hooks as Record<string, unknown>;\n\n  const expectedHookNames = new Set(\n    Object.values(options.handlers).flatMap((handler) =>\n      handler.hookNames ? Object.getOwnPropertyNames(handler.hookNames) : [],\n    ),\n  );\n  assertExpectedHooks(allHooks, expectedHookNames);\n\n  const handlers = Object.entries(options.handlers).reduce<\n    Record<string, ResolvedHandler>\n  >((accumulator, [handlerName, handler]) => {\n    const handlerHooks = selectHooks(allHooks, handler.hookNames) ?? {};\n    const handlerMessenger = createHandlerMessenger<\n      HandlerActions<Handlers[keyof Handlers]>\n    >({\n      namespace: handlerName,\n      actionNames: handler.actionNames as\n        | readonly HandlerActions<Handlers[keyof Handlers]>['type'][]\n        | undefined,\n      rootMessenger,\n    });\n\n    accumulator[handlerName] = {\n      implementation: handler.implementation,\n      hooks: handlerHooks,\n      messenger: handlerMessenger,\n    };\n    return accumulator;\n  }, {});\n\n  // This should technically use createAsyncMiddleware, but we get around this by catching\n  // all handler errors.\n  // eslint-disable-next-line @typescript-eslint/no-misused-promises\n  return async (req, res, next, end) => {\n    const handler = handlers[req.method];\n    if (!handler) {\n      return next();\n    }\n\n    const { implementation, hooks: handlerHooks, messenger } = handler;\n    try {\n      return await implementation(req, res, next, end, handlerHooks, messenger);\n    } catch (error) {\n      onError?.(error, req);\n      return end(\n        error instanceof Error\n          ? error\n          : rpcErrors.internal({ data: error as Json }),\n      );\n    }\n  };\n}\n"]}

package/dist/createMethodMiddleware.d.cts

@@ -1,79 +0,0 @@
-import type { ActionConstraint } from "@metamask/messenger";
-import type { Messenger } from "@metamask/messenger";
-import type { Json, JsonRpcParams, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
-import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, JsonRpcMiddleware } from "./JsonRpcEngine.cjs";
-import { UnionToIntersection } from "./v2/utils.cjs";
-type HandlerActions<Handler> = Handler extends {
-    implementation: (...args: infer Args) => unknown;
-} ? Args extends [
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    infer HandlerMessenger
-] ? HandlerMessenger extends Messenger<string, infer Actions> ? Actions : never : never : never;
-type HandlerHooks<Handler> = Handler extends {
-    implementation: (...args: infer Args) => unknown;
-} ? Args extends [unknown, unknown, unknown, unknown, infer ArgHooks, unknown] ? ArgHooks extends Record<string, unknown> ? ArgHooks : never : never : never;
-/**
- * A {@link MethodHandler} implementation.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- */
-export type MethodHandlerImplementation<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = (req: JsonRpcRequest<Params> & RequestExtras, res: PendingJsonRpcResponse<Result>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: Hooks, messenger: Messenger<string, MessengerActions>) => Promise<void> | void;
-/**
- * A handler for {@link createMethodMiddleware}.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- */
-export type MethodHandler<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = {
-    implementation: MethodHandlerImplementation<Hooks, MessengerActions, Params, Result, RequestExtras>;
-} & ([Hooks] extends [never] ? {
-    hookNames?: undefined;
-} : {
-    hookNames: {
-        [Key in keyof Hooks]: true;
-    };
-}) & ([MessengerActions] extends [never] ? {
-    actionNames?: undefined;
-} : {
-    actionNames: readonly MessengerActions['type'][];
-});
-type AnyMethodHandler = {
-    implementation(this: void, req: JsonRpcRequest, res: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: unknown, messenger: unknown): Promise<void> | void;
-    hookNames?: Record<string, true>;
-    actionNames?: readonly string[];
-};
-type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
-    handlers: Handlers;
-    hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
-    /**
-     * Called when a handler throws, before the error is forwarded to `end`.
-     * Intended for logging; must not throw.
-     */
-    onError?: (error: unknown, request: JsonRpcRequest) => void;
-};
-/**
- * Options for {@link createMethodMiddleware}.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- */
-export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = CreateMethodMiddlewareBaseOptions<Handlers> & ([HandlerActions<Handlers[keyof Handlers]>] extends [never] ? {
-    messenger?: undefined;
-} : {
-    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
-});
-/**
- * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- * @param options The options.
- * @param options.handlers - The JSON-RPC method handler implementations.
- * @param options.messenger - The messenger to be used by the handlers.
- * @param options.hooks - The hooks to be used by the handlers.
- * @returns A JsonRpcEngineV2 middleware.
- */
-export declare function createMethodMiddleware<Handlers extends Record<string, AnyMethodHandler>>(options: CreateMethodMiddlewareOptions<Handlers>): JsonRpcMiddleware<JsonRpcParams, Json>;
-export {};
-//# sourceMappingURL=createMethodMiddleware.d.cts.map

package/dist/createMethodMiddleware.d.cts.map

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

package/dist/createMethodMiddleware.d.mts

@@ -1,79 +0,0 @@
-import type { ActionConstraint } from "@metamask/messenger";
-import type { Messenger } from "@metamask/messenger";
-import type { Json, JsonRpcParams, JsonRpcRequest, PendingJsonRpcResponse } from "@metamask/utils";
-import type { JsonRpcEngineEndCallback, JsonRpcEngineNextCallback, JsonRpcMiddleware } from "./JsonRpcEngine.mjs";
-import { UnionToIntersection } from "./v2/utils.mjs";
-type HandlerActions<Handler> = Handler extends {
-    implementation: (...args: infer Args) => unknown;
-} ? Args extends [
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    infer HandlerMessenger
-] ? HandlerMessenger extends Messenger<string, infer Actions> ? Actions : never : never : never;
-type HandlerHooks<Handler> = Handler extends {
-    implementation: (...args: infer Args) => unknown;
-} ? Args extends [unknown, unknown, unknown, unknown, infer ArgHooks, unknown] ? ArgHooks extends Record<string, unknown> ? ArgHooks : never : never : never;
-/**
- * A {@link MethodHandler} implementation.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- */
-export type MethodHandlerImplementation<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = (req: JsonRpcRequest<Params> & RequestExtras, res: PendingJsonRpcResponse<Result>, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: Hooks, messenger: Messenger<string, MessengerActions>) => Promise<void> | void;
-/**
- * A handler for {@link createMethodMiddleware}.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- */
-export type MethodHandler<Hooks extends Record<string, unknown> = never, MessengerActions extends ActionConstraint = never, Params extends JsonRpcParams = JsonRpcParams, Result extends Json = Json, RequestExtras extends Record<string, unknown> = Record<string, unknown>> = {
-    implementation: MethodHandlerImplementation<Hooks, MessengerActions, Params, Result, RequestExtras>;
-} & ([Hooks] extends [never] ? {
-    hookNames?: undefined;
-} : {
-    hookNames: {
-        [Key in keyof Hooks]: true;
-    };
-}) & ([MessengerActions] extends [never] ? {
-    actionNames?: undefined;
-} : {
-    actionNames: readonly MessengerActions['type'][];
-});
-type AnyMethodHandler = {
-    implementation(this: void, req: JsonRpcRequest, res: PendingJsonRpcResponse, next: JsonRpcEngineNextCallback, end: JsonRpcEngineEndCallback, hooks: unknown, messenger: unknown): Promise<void> | void;
-    hookNames?: Record<string, true>;
-    actionNames?: readonly string[];
-};
-type CreateMethodMiddlewareBaseOptions<Handlers extends Record<string, AnyMethodHandler>> = {
-    handlers: Handlers;
-    hooks: UnionToIntersection<HandlerHooks<Handlers[keyof Handlers]>>;
-    /**
-     * Called when a handler throws, before the error is forwarded to `end`.
-     * Intended for logging; must not throw.
-     */
-    onError?: (error: unknown, request: JsonRpcRequest) => void;
-};
-/**
- * Options for {@link createMethodMiddleware}.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- */
-export type CreateMethodMiddlewareOptions<Handlers extends Record<string, AnyMethodHandler>> = CreateMethodMiddlewareBaseOptions<Handlers> & ([HandlerActions<Handlers[keyof Handlers]>] extends [never] ? {
-    messenger?: undefined;
-} : {
-    messenger: Messenger<string, HandlerActions<Handlers[keyof Handlers]>>;
-});
-/**
- * Create a JSON-RPC middleware that handles the passed JSON-RPC method handlers using the messenger and hooks.
- *
- * @deprecated Use the v2 `createMethodMiddleware` instead.
- * @param options The options.
- * @param options.handlers - The JSON-RPC method handler implementations.
- * @param options.messenger - The messenger to be used by the handlers.
- * @param options.hooks - The hooks to be used by the handlers.
- * @returns A JsonRpcEngineV2 middleware.
- */
-export declare function createMethodMiddleware<Handlers extends Record<string, AnyMethodHandler>>(options: CreateMethodMiddlewareOptions<Handlers>): JsonRpcMiddleware<JsonRpcParams, Json>;
-export {};
-//# sourceMappingURL=createMethodMiddleware.d.mts.map

package/dist/createMethodMiddleware.d.mts.map

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