@metamask-previews/keyring-api 8.1.0-preview-46bb5ff → 8.1.3-84e4c35

package/dist/internal/types.d.ts

@@ -1,6 +1,6 @@
 import type { Infer, Struct } from '@metamask/superstruct';
 import { BtcAccountType, EthAccountType } from '../api';
-export declare type InternalAccountType = EthAccountType | BtcAccountType;
+export type InternalAccountType = EthAccountType | BtcAccountType;
 export declare const InternalAccountMetadataStruct: Struct<{
     metadata: {
         name: string;
@@ -32,8 +32,8 @@ export declare const InternalAccountMetadataStruct: Struct<{
         lastSelected?: number;
     }, {
         name: Struct<string, null>;
-        nameLastUpdatedAt: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-        snap: Struct<import("@metamask/keyring-utils").ExactOptionalTag | {
+        nameLastUpdatedAt: Struct<number | import("../superstruct").ExactOptionalTag, null>;
+        snap: Struct<import("../superstruct").ExactOptionalTag | {
             id: string;
             name: string;
             enabled: boolean;
@@ -42,7 +42,7 @@ export declare const InternalAccountMetadataStruct: Struct<{
             enabled: Struct<boolean, null>;
             name: Struct<string, null>;
         }>;
-        lastSelected: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
+        lastSelected: Struct<number | import("../superstruct").ExactOptionalTag, null>;
         importTime: Struct<number, null>;
         keyring: Struct<{
             type: string;
@@ -52,8 +52,8 @@ export declare const InternalAccountMetadataStruct: Struct<{
     }>;
 }>;
 export declare const InternalEthEoaAccountStruct: Struct<{
-    id: string;
     type: "eip155:eoa";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: ("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[];
@@ -72,19 +72,6 @@ export declare const InternalEthEoaAccountStruct: Struct<{
         lastSelected?: number;
     };
 }, {
-    address: Struct<string, null>;
-    type: Struct<"eip155:eoa", "eip155:eoa">;
-    methods: Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[], Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4", {
-        personal_sign: "personal_sign";
-        eth_sign: "eth_sign";
-        eth_signTransaction: "eth_signTransaction";
-        eth_signTypedData_v1: "eth_signTypedData_v1";
-        eth_signTypedData_v3: "eth_signTypedData_v3";
-        eth_signTypedData_v4: "eth_signTypedData_v4";
-    }>>;
-    id: Struct<string, null>;
-    options: Struct<Record<string, import("@metamask/utils").Json>, null>;
-} & {
     metadata: Struct<{
         name: string;
         importTime: number;
@@ -100,8 +87,8 @@ export declare const InternalEthEoaAccountStruct: Struct<{
         lastSelected?: number;
     }, {
         name: Struct<string, null>;
-        nameLastUpdatedAt: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-        snap: Struct<import("@metamask/keyring-utils").ExactOptionalTag | {
+        nameLastUpdatedAt: Struct<number | import("../superstruct").ExactOptionalTag, null>;
+        snap: Struct<import("../superstruct").ExactOptionalTag | {
             id: string;
             name: string;
             enabled: boolean;
@@ -110,7 +97,7 @@ export declare const InternalEthEoaAccountStruct: Struct<{
             enabled: Struct<boolean, null>;
             name: Struct<string, null>;
         }>;
-        lastSelected: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
+        lastSelected: Struct<number | import("../superstruct").ExactOptionalTag, null>;
         importTime: Struct<number, null>;
         keyring: Struct<{
             type: string;
@@ -118,10 +105,22 @@ export declare const InternalEthEoaAccountStruct: Struct<{
             type: Struct<string, null>;
         }>;
     }>;
+    address: Struct<string, null>;
+    type: Struct<"eip155:eoa", "eip155:eoa">;
+    methods: Struct<("personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4")[], Struct<"personal_sign" | "eth_sign" | "eth_signTransaction" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4", {
+        personal_sign: "personal_sign";
+        eth_sign: "eth_sign";
+        eth_signTransaction: "eth_signTransaction";
+        eth_signTypedData_v1: "eth_signTypedData_v1";
+        eth_signTypedData_v3: "eth_signTypedData_v3";
+        eth_signTypedData_v4: "eth_signTypedData_v4";
+    }>>;
+    id: Struct<string, null>;
+    options: Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
 export declare const InternalEthErc4337AccountStruct: Struct<{
-    id: string;
     type: "eip155:erc4337";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: ("personal_sign" | "eth_sign" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[];
@@ -140,21 +139,6 @@ export declare const InternalEthErc4337AccountStruct: Struct<{
         lastSelected?: number;
     };
 }, {
-    address: Struct<string, null>;
-    type: Struct<"eip155:erc4337", "eip155:erc4337">;
-    methods: Struct<("personal_sign" | "eth_sign" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[], Struct<"personal_sign" | "eth_sign" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation", {
-        personal_sign: "personal_sign";
-        eth_sign: "eth_sign";
-        eth_signTypedData_v1: "eth_signTypedData_v1";
-        eth_signTypedData_v3: "eth_signTypedData_v3";
-        eth_signTypedData_v4: "eth_signTypedData_v4";
-        eth_prepareUserOperation: "eth_prepareUserOperation";
-        eth_patchUserOperation: "eth_patchUserOperation";
-        eth_signUserOperation: "eth_signUserOperation";
-    }>>;
-    id: Struct<string, null>;
-    options: Struct<Record<string, import("@metamask/utils").Json>, null>;
-} & {
     metadata: Struct<{
         name: string;
         importTime: number;
@@ -170,8 +154,8 @@ export declare const InternalEthErc4337AccountStruct: Struct<{
         lastSelected?: number;
     }, {
         name: Struct<string, null>;
-        nameLastUpdatedAt: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-        snap: Struct<import("@metamask/keyring-utils").ExactOptionalTag | {
+        nameLastUpdatedAt: Struct<number | import("../superstruct").ExactOptionalTag, null>;
+        snap: Struct<import("../superstruct").ExactOptionalTag | {
             id: string;
             name: string;
             enabled: boolean;
@@ -180,7 +164,7 @@ export declare const InternalEthErc4337AccountStruct: Struct<{
             enabled: Struct<boolean, null>;
             name: Struct<string, null>;
         }>;
-        lastSelected: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
+        lastSelected: Struct<number | import("../superstruct").ExactOptionalTag, null>;
         importTime: Struct<number, null>;
         keyring: Struct<{
             type: string;
@@ -188,10 +172,24 @@ export declare const InternalEthErc4337AccountStruct: Struct<{
             type: Struct<string, null>;
         }>;
     }>;
+    address: Struct<string, null>;
+    type: Struct<"eip155:erc4337", "eip155:erc4337">;
+    methods: Struct<("personal_sign" | "eth_sign" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation")[], Struct<"personal_sign" | "eth_sign" | "eth_signTypedData_v1" | "eth_signTypedData_v3" | "eth_signTypedData_v4" | "eth_prepareUserOperation" | "eth_patchUserOperation" | "eth_signUserOperation", {
+        personal_sign: "personal_sign";
+        eth_sign: "eth_sign";
+        eth_signTypedData_v1: "eth_signTypedData_v1";
+        eth_signTypedData_v3: "eth_signTypedData_v3";
+        eth_signTypedData_v4: "eth_signTypedData_v4";
+        eth_prepareUserOperation: "eth_prepareUserOperation";
+        eth_patchUserOperation: "eth_patchUserOperation";
+        eth_signUserOperation: "eth_signUserOperation";
+    }>>;
+    id: Struct<string, null>;
+    options: Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
 export declare const InternalBtcP2wpkhAccountStruct: Struct<{
-    id: string;
     type: "bip122:p2wpkh";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: "btc_sendmany"[];
@@ -210,14 +208,6 @@ export declare const InternalBtcP2wpkhAccountStruct: Struct<{
         lastSelected?: number;
     };
 }, {
-    address: Struct<string, null>;
-    type: Struct<"bip122:p2wpkh", "bip122:p2wpkh">;
-    methods: Struct<"btc_sendmany"[], Struct<"btc_sendmany", {
-        btc_sendmany: "btc_sendmany";
-    }>>;
-    id: Struct<string, null>;
-    options: Struct<Record<string, import("@metamask/utils").Json>, null>;
-} & {
     metadata: Struct<{
         name: string;
         importTime: number;
@@ -233,8 +223,8 @@ export declare const InternalBtcP2wpkhAccountStruct: Struct<{
         lastSelected?: number;
     }, {
         name: Struct<string, null>;
-        nameLastUpdatedAt: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-        snap: Struct<import("@metamask/keyring-utils").ExactOptionalTag | {
+        nameLastUpdatedAt: Struct<number | import("../superstruct").ExactOptionalTag, null>;
+        snap: Struct<import("../superstruct").ExactOptionalTag | {
             id: string;
             name: string;
             enabled: boolean;
@@ -243,7 +233,7 @@ export declare const InternalBtcP2wpkhAccountStruct: Struct<{
             enabled: Struct<boolean, null>;
             name: Struct<string, null>;
         }>;
-        lastSelected: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
+        lastSelected: Struct<number | import("../superstruct").ExactOptionalTag, null>;
         importTime: Struct<number, null>;
         keyring: Struct<{
             type: string;
@@ -251,15 +241,22 @@ export declare const InternalBtcP2wpkhAccountStruct: Struct<{
             type: Struct<string, null>;
         }>;
     }>;
+    address: Struct<string, null>;
+    type: Struct<"bip122:p2wpkh", "bip122:p2wpkh">;
+    methods: Struct<"btc_sendmany"[], Struct<"btc_sendmany", {
+        btc_sendmany: "btc_sendmany";
+    }>>;
+    id: Struct<string, null>;
+    options: Struct<Record<string, import("@metamask/utils").Json>, null>;
 }>;
-export declare type InternalEthEoaAccount = Infer<typeof InternalEthEoaAccountStruct>;
-export declare type InternalEthErc4337Account = Infer<typeof InternalEthErc4337AccountStruct>;
-export declare type InternalBtcP2wpkhAccount = Infer<typeof InternalBtcP2wpkhAccountStruct>;
+export type InternalEthEoaAccount = Infer<typeof InternalEthEoaAccountStruct>;
+export type InternalEthErc4337Account = Infer<typeof InternalEthErc4337AccountStruct>;
+export type InternalBtcP2wpkhAccount = Infer<typeof InternalBtcP2wpkhAccountStruct>;
 export declare const InternalAccountStructs: Record<string, Struct<InternalEthEoaAccount> | Struct<InternalEthErc4337Account> | Struct<InternalBtcP2wpkhAccount>>;
-export declare type InternalAccountTypes = InternalEthEoaAccount | InternalEthErc4337Account | InternalBtcP2wpkhAccount;
+export type InternalAccountTypes = InternalEthEoaAccount | InternalEthErc4337Account | InternalBtcP2wpkhAccount;
 export declare const InternalAccountStruct: Struct<{
-    id: string;
     type: "eip155:eoa" | "eip155:erc4337" | "bip122:p2wpkh";
+    id: string;
     address: string;
     options: Record<string, import("@metamask/utils").Json>;
     methods: string[];
@@ -293,8 +290,8 @@ export declare const InternalAccountStruct: Struct<{
         lastSelected?: number;
     }, {
         name: Struct<string, null>;
-        nameLastUpdatedAt: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
-        snap: Struct<import("@metamask/keyring-utils").ExactOptionalTag | {
+        nameLastUpdatedAt: Struct<number | import("../superstruct").ExactOptionalTag, null>;
+        snap: Struct<import("../superstruct").ExactOptionalTag | {
             id: string;
             name: string;
             enabled: boolean;
@@ -303,7 +300,7 @@ export declare const InternalAccountStruct: Struct<{
             enabled: Struct<boolean, null>;
             name: Struct<string, null>;
         }>;
-        lastSelected: Struct<number | import("@metamask/keyring-utils").ExactOptionalTag, null>;
+        lastSelected: Struct<number | import("../superstruct").ExactOptionalTag, null>;
         importTime: Struct<number, null>;
         keyring: Struct<{
             type: string;
@@ -327,4 +324,4 @@ export declare const InternalAccountStruct: Struct<{
  * This type is used internally by MetaMask to add additional metadata to the
  * account object. It's should not be used by external applications.
  */
-export declare type InternalAccount = Infer<typeof InternalAccountStruct>;
+export type InternalAccount = Infer<typeof InternalAccountStruct>;

package/dist/internal/types.js

@@ -5,44 +5,41 @@ const superstruct_1 = require("@metamask/superstruct");
 const api_1 = require("../api");
 const types_1 = require("../btc/types");
 const types_2 = require("../eth/types");
-const keyring_utils_1 = require("@metamask/keyring-utils");
-exports.InternalAccountMetadataStruct = (0, keyring_utils_1.object)({
-    metadata: (0, keyring_utils_1.object)({
+const superstruct_2 = require("../superstruct");
+exports.InternalAccountMetadataStruct = (0, superstruct_2.object)({
+    metadata: (0, superstruct_2.object)({
         name: (0, superstruct_1.string)(),
-        nameLastUpdatedAt: (0, keyring_utils_1.exactOptional)((0, superstruct_1.number)()),
-        snap: (0, keyring_utils_1.exactOptional)((0, keyring_utils_1.object)({
+        nameLastUpdatedAt: (0, superstruct_2.exactOptional)((0, superstruct_1.number)()),
+        snap: (0, superstruct_2.exactOptional)((0, superstruct_2.object)({
             id: (0, superstruct_1.string)(),
             enabled: (0, superstruct_1.boolean)(),
             name: (0, superstruct_1.string)(),
         })),
-        lastSelected: (0, keyring_utils_1.exactOptional)((0, superstruct_1.number)()),
+        lastSelected: (0, superstruct_2.exactOptional)((0, superstruct_1.number)()),
         importTime: (0, superstruct_1.number)(),
-        keyring: (0, keyring_utils_1.object)({
+        keyring: (0, superstruct_2.object)({
             type: (0, superstruct_1.string)(),
         }),
     }),
 });
-/**
- * Creates an `InternalAccount` from an existing account `superstruct` object.
- *
- * @param accountStruct - An account `superstruct` object.
- * @returns The `InternalAccount` associated to `accountStruct`.
- */
-function asInternalAccountStruct(accountStruct) {
-    return (0, keyring_utils_1.object)({
-        ...accountStruct.schema,
-        ...exports.InternalAccountMetadataStruct.schema,
-    });
-}
-exports.InternalEthEoaAccountStruct = asInternalAccountStruct(types_2.EthEoaAccountStruct);
-exports.InternalEthErc4337AccountStruct = asInternalAccountStruct(types_2.EthErc4337AccountStruct);
-exports.InternalBtcP2wpkhAccountStruct = asInternalAccountStruct(types_1.BtcP2wpkhAccountStruct);
+exports.InternalEthEoaAccountStruct = (0, superstruct_2.object)({
+    ...types_2.EthEoaAccountStruct.schema,
+    ...exports.InternalAccountMetadataStruct.schema,
+});
+exports.InternalEthErc4337AccountStruct = (0, superstruct_2.object)({
+    ...types_2.EthErc4337AccountStruct.schema,
+    ...exports.InternalAccountMetadataStruct.schema,
+});
+exports.InternalBtcP2wpkhAccountStruct = (0, superstruct_2.object)({
+    ...types_1.BtcP2wpkhAccountStruct.schema,
+    ...exports.InternalAccountMetadataStruct.schema,
+});
 exports.InternalAccountStructs = {
     [`${api_1.EthAccountType.Eoa}`]: exports.InternalEthEoaAccountStruct,
     [`${api_1.EthAccountType.Erc4337}`]: exports.InternalEthErc4337AccountStruct,
     [`${api_1.BtcAccountType.P2wpkh}`]: exports.InternalBtcP2wpkhAccountStruct,
 };
-exports.InternalAccountStruct = (0, keyring_utils_1.object)({
+exports.InternalAccountStruct = (0, superstruct_2.object)({
     ...api_1.KeyringAccountStruct.schema,
     ...exports.InternalAccountMetadataStruct.schema,
 });

package/dist/internal/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/internal/types.ts"],"names":[],"mappings":";;;AACA,uDAAgE;AAEhE,gCAA8E;AAC9E,wCAAsD;AACtD,wCAA4E;AAC5E,2DAAgE;AAInD,QAAA,6BAA6B,GAAG,IAAA,sBAAM,EAAC;IAClD,QAAQ,EAAE,IAAA,sBAAM,EAAC;QACf,IAAI,EAAE,IAAA,oBAAM,GAAE;QACd,iBAAiB,EAAE,IAAA,6BAAa,EAAC,IAAA,oBAAM,GAAE,CAAC;QAC1C,IAAI,EAAE,IAAA,6BAAa,EACjB,IAAA,sBAAM,EAAC;YACL,EAAE,EAAE,IAAA,oBAAM,GAAE;YACZ,OAAO,EAAE,IAAA,qBAAO,GAAE;YAClB,IAAI,EAAE,IAAA,oBAAM,GAAE;SACf,CAAC,CACH;QACD,YAAY,EAAE,IAAA,6BAAa,EAAC,IAAA,oBAAM,GAAE,CAAC;QACrC,UAAU,EAAE,IAAA,oBAAM,GAAE;QACpB,OAAO,EAAE,IAAA,sBAAM,EAAC;YACd,IAAI,EAAE,IAAA,oBAAM,GAAE;SACf,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAS,uBAAuB,CAC9B,aAA6C;IAE7C,OAAO,IAAA,sBAAM,EAAC;QACZ,GAAG,aAAa,CAAC,MAAM;QACvB,GAAG,qCAA6B,CAAC,MAAM;KACxC,CAAC,CAAC;AACL,CAAC;AAEY,QAAA,2BAA2B,GACtC,uBAAuB,CAAC,2BAAmB,CAAC,CAAC;AAElC,QAAA,+BAA+B,GAAG,uBAAuB,CACpE,+BAAuB,CACxB,CAAC;AAEW,QAAA,8BAA8B,GAAG,uBAAuB,CACnE,8BAAsB,CACvB,CAAC;AAYW,QAAA,sBAAsB,GAK/B;IACF,CAAC,GAAG,oBAAc,CAAC,GAAG,EAAE,CAAC,EAAE,mCAA2B;IACtD,CAAC,GAAG,oBAAc,CAAC,OAAO,EAAE,CAAC,EAAE,uCAA+B;IAC9D,CAAC,GAAG,oBAAc,CAAC,MAAM,EAAE,CAAC,EAAE,sCAA8B;CAC7D,CAAC;AAOW,QAAA,qBAAqB,GAAG,IAAA,sBAAM,EAAC;IAC1C,GAAG,0BAAoB,CAAC,MAAM;IAC9B,GAAG,qCAA6B,CAAC,MAAM;CACxC,CAAC,CAAC","sourcesContent":["import type { Infer, Struct } from '@metamask/superstruct';\nimport { boolean, string, number } from '@metamask/superstruct';\n\nimport { BtcAccountType, EthAccountType, KeyringAccountStruct } from '../api';\nimport { BtcP2wpkhAccountStruct } from '../btc/types';\nimport { EthEoaAccountStruct, EthErc4337AccountStruct } from '../eth/types';\nimport { exactOptional, object } from '@metamask/keyring-utils';\n\nexport type InternalAccountType = EthAccountType | BtcAccountType;\n\nexport const InternalAccountMetadataStruct = object({\n  metadata: object({\n    name: string(),\n    nameLastUpdatedAt: exactOptional(number()),\n    snap: exactOptional(\n      object({\n        id: string(),\n        enabled: boolean(),\n        name: string(),\n      }),\n    ),\n    lastSelected: exactOptional(number()),\n    importTime: number(),\n    keyring: object({\n      type: string(),\n    }),\n  }),\n});\n\n/**\n * Creates an `InternalAccount` from an existing account `superstruct` object.\n *\n * @param accountStruct - An account `superstruct` object.\n * @returns The `InternalAccount` associated to `accountStruct`.\n */\nfunction asInternalAccountStruct<Account, AccountSchema>(\n  accountStruct: Struct<Account, AccountSchema>,\n) {\n  return object({\n    ...accountStruct.schema,\n    ...InternalAccountMetadataStruct.schema,\n  });\n}\n\nexport const InternalEthEoaAccountStruct =\n  asInternalAccountStruct(EthEoaAccountStruct);\n\nexport const InternalEthErc4337AccountStruct = asInternalAccountStruct(\n  EthErc4337AccountStruct,\n);\n\nexport const InternalBtcP2wpkhAccountStruct = asInternalAccountStruct(\n  BtcP2wpkhAccountStruct,\n);\n\nexport type InternalEthEoaAccount = Infer<typeof InternalEthEoaAccountStruct>;\n\nexport type InternalEthErc4337Account = Infer<\n  typeof InternalEthErc4337AccountStruct\n>;\n\nexport type InternalBtcP2wpkhAccount = Infer<\n  typeof InternalBtcP2wpkhAccountStruct\n>;\n\nexport const InternalAccountStructs: Record<\n  string,\n  | Struct<InternalEthEoaAccount>\n  | Struct<InternalEthErc4337Account>\n  | Struct<InternalBtcP2wpkhAccount>\n> = {\n  [`${EthAccountType.Eoa}`]: InternalEthEoaAccountStruct,\n  [`${EthAccountType.Erc4337}`]: InternalEthErc4337AccountStruct,\n  [`${BtcAccountType.P2wpkh}`]: InternalBtcP2wpkhAccountStruct,\n};\n\nexport type InternalAccountTypes =\n  | InternalEthEoaAccount\n  | InternalEthErc4337Account\n  | InternalBtcP2wpkhAccount;\n\nexport const InternalAccountStruct = object({\n  ...KeyringAccountStruct.schema,\n  ...InternalAccountMetadataStruct.schema,\n});\n\n/**\n * Internal account representation.\n *\n * This type is used internally by MetaMask to add additional metadata to the\n * account object. It's should not be used by external applications.\n */\nexport type InternalAccount = Infer<typeof InternalAccountStruct>;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/internal/types.ts"],"names":[],"mappings":";;;AACA,uDAAgE;AAEhE,gCAA8E;AAC9E,wCAAsD;AACtD,wCAA4E;AAC5E,gDAAuD;AAI1C,QAAA,6BAA6B,GAAG,IAAA,oBAAM,EAAC;IAClD,QAAQ,EAAE,IAAA,oBAAM,EAAC;QACf,IAAI,EAAE,IAAA,oBAAM,GAAE;QACd,iBAAiB,EAAE,IAAA,2BAAa,EAAC,IAAA,oBAAM,GAAE,CAAC;QAC1C,IAAI,EAAE,IAAA,2BAAa,EACjB,IAAA,oBAAM,EAAC;YACL,EAAE,EAAE,IAAA,oBAAM,GAAE;YACZ,OAAO,EAAE,IAAA,qBAAO,GAAE;YAClB,IAAI,EAAE,IAAA,oBAAM,GAAE;SACf,CAAC,CACH;QACD,YAAY,EAAE,IAAA,2BAAa,EAAC,IAAA,oBAAM,GAAE,CAAC;QACrC,UAAU,EAAE,IAAA,oBAAM,GAAE;QACpB,OAAO,EAAE,IAAA,oBAAM,EAAC;YACd,IAAI,EAAE,IAAA,oBAAM,GAAE;SACf,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAEU,QAAA,2BAA2B,GAAG,IAAA,oBAAM,EAAC;IAChD,GAAG,2BAAmB,CAAC,MAAM;IAC7B,GAAG,qCAA6B,CAAC,MAAM;CACxC,CAAC,CAAC;AAEU,QAAA,+BAA+B,GAAG,IAAA,oBAAM,EAAC;IACpD,GAAG,+BAAuB,CAAC,MAAM;IACjC,GAAG,qCAA6B,CAAC,MAAM;CACxC,CAAC,CAAC;AAEU,QAAA,8BAA8B,GAAG,IAAA,oBAAM,EAAC;IACnD,GAAG,8BAAsB,CAAC,MAAM;IAChC,GAAG,qCAA6B,CAAC,MAAM;CACxC,CAAC,CAAC;AAYU,QAAA,sBAAsB,GAK/B;IACF,CAAC,GAAG,oBAAc,CAAC,GAAG,EAAE,CAAC,EAAE,mCAA2B;IACtD,CAAC,GAAG,oBAAc,CAAC,OAAO,EAAE,CAAC,EAAE,uCAA+B;IAC9D,CAAC,GAAG,oBAAc,CAAC,MAAM,EAAE,CAAC,EAAE,sCAA8B;CAC7D,CAAC;AAOW,QAAA,qBAAqB,GAAG,IAAA,oBAAM,EAAC;IAC1C,GAAG,0BAAoB,CAAC,MAAM;IAC9B,GAAG,qCAA6B,CAAC,MAAM;CACxC,CAAC,CAAC","sourcesContent":["import type { Infer, Struct } from '@metamask/superstruct';\nimport { boolean, string, number } from '@metamask/superstruct';\n\nimport { BtcAccountType, EthAccountType, KeyringAccountStruct } from '../api';\nimport { BtcP2wpkhAccountStruct } from '../btc/types';\nimport { EthEoaAccountStruct, EthErc4337AccountStruct } from '../eth/types';\nimport { exactOptional, object } from '../superstruct';\n\nexport type InternalAccountType = EthAccountType | BtcAccountType;\n\nexport const InternalAccountMetadataStruct = object({\n  metadata: object({\n    name: string(),\n    nameLastUpdatedAt: exactOptional(number()),\n    snap: exactOptional(\n      object({\n        id: string(),\n        enabled: boolean(),\n        name: string(),\n      }),\n    ),\n    lastSelected: exactOptional(number()),\n    importTime: number(),\n    keyring: object({\n      type: string(),\n    }),\n  }),\n});\n\nexport const InternalEthEoaAccountStruct = object({\n  ...EthEoaAccountStruct.schema,\n  ...InternalAccountMetadataStruct.schema,\n});\n\nexport const InternalEthErc4337AccountStruct = object({\n  ...EthErc4337AccountStruct.schema,\n  ...InternalAccountMetadataStruct.schema,\n});\n\nexport const InternalBtcP2wpkhAccountStruct = object({\n  ...BtcP2wpkhAccountStruct.schema,\n  ...InternalAccountMetadataStruct.schema,\n});\n\nexport type InternalEthEoaAccount = Infer<typeof InternalEthEoaAccountStruct>;\n\nexport type InternalEthErc4337Account = Infer<\n  typeof InternalEthErc4337AccountStruct\n>;\n\nexport type InternalBtcP2wpkhAccount = Infer<\n  typeof InternalBtcP2wpkhAccountStruct\n>;\n\nexport const InternalAccountStructs: Record<\n  string,\n  | Struct<InternalEthEoaAccount>\n  | Struct<InternalEthErc4337Account>\n  | Struct<InternalBtcP2wpkhAccount>\n> = {\n  [`${EthAccountType.Eoa}`]: InternalEthEoaAccountStruct,\n  [`${EthAccountType.Erc4337}`]: InternalEthErc4337AccountStruct,\n  [`${BtcAccountType.P2wpkh}`]: InternalBtcP2wpkhAccountStruct,\n};\n\nexport type InternalAccountTypes =\n  | InternalEthEoaAccount\n  | InternalEthErc4337Account\n  | InternalBtcP2wpkhAccount;\n\nexport const InternalAccountStruct = object({\n  ...KeyringAccountStruct.schema,\n  ...InternalAccountMetadataStruct.schema,\n});\n\n/**\n * Internal account representation.\n *\n * This type is used internally by MetaMask to add additional metadata to the\n * account object. It's should not be used by external applications.\n */\nexport type InternalAccount = Infer<typeof InternalAccountStruct>;\n"]}

package/dist/rpc-handler.js

@@ -27,70 +27,70 @@ async function dispatchRequest(keyring, request) {
     // we can check its method name.
     (0, superstruct_1.assert)(request, JsonRpcRequest_1.JsonRpcRequestStruct);
     switch (request.method) {
-        case rpc_1.KeyringRpcMethod.ListAccounts: {
+        case `${rpc_1.KeyringRpcMethod.ListAccounts}`: {
             (0, superstruct_1.assert)(request, api_1.ListAccountsRequestStruct);
             return keyring.listAccounts();
         }
-        case rpc_1.KeyringRpcMethod.GetAccount: {
+        case `${rpc_1.KeyringRpcMethod.GetAccount}`: {
             (0, superstruct_1.assert)(request, api_1.GetAccountRequestStruct);
             return keyring.getAccount(request.params.id);
         }
-        case rpc_1.KeyringRpcMethod.CreateAccount: {
+        case `${rpc_1.KeyringRpcMethod.CreateAccount}`: {
             (0, superstruct_1.assert)(request, api_1.CreateAccountRequestStruct);
             return keyring.createAccount(request.params.options);
         }
-        case rpc_1.KeyringRpcMethod.GetAccountBalances: {
+        case `${rpc_1.KeyringRpcMethod.GetAccountBalances}`: {
             if (keyring.getAccountBalances === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.GetAccountBalancesRequestStruct);
             return keyring.getAccountBalances(request.params.id, request.params.assets);
         }
-        case rpc_1.KeyringRpcMethod.FilterAccountChains: {
+        case `${rpc_1.KeyringRpcMethod.FilterAccountChains}`: {
             (0, superstruct_1.assert)(request, api_1.FilterAccountChainsStruct);
             return keyring.filterAccountChains(request.params.id, request.params.chains);
         }
-        case rpc_1.KeyringRpcMethod.UpdateAccount: {
+        case `${rpc_1.KeyringRpcMethod.UpdateAccount}`: {
             (0, superstruct_1.assert)(request, api_1.UpdateAccountRequestStruct);
             return keyring.updateAccount(request.params.account);
         }
-        case rpc_1.KeyringRpcMethod.DeleteAccount: {
+        case `${rpc_1.KeyringRpcMethod.DeleteAccount}`: {
             (0, superstruct_1.assert)(request, api_1.DeleteAccountRequestStruct);
             return keyring.deleteAccount(request.params.id);
         }
-        case rpc_1.KeyringRpcMethod.ExportAccount: {
+        case `${rpc_1.KeyringRpcMethod.ExportAccount}`: {
             if (keyring.exportAccount === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.ExportAccountRequestStruct);
             return keyring.exportAccount(request.params.id);
         }
-        case rpc_1.KeyringRpcMethod.ListRequests: {
+        case `${rpc_1.KeyringRpcMethod.ListRequests}`: {
             if (keyring.listRequests === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.ListRequestsRequestStruct);
             return keyring.listRequests();
         }
-        case rpc_1.KeyringRpcMethod.GetRequest: {
+        case `${rpc_1.KeyringRpcMethod.GetRequest}`: {
             if (keyring.getRequest === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.GetRequestRequestStruct);
             return keyring.getRequest(request.params.id);
         }
-        case rpc_1.KeyringRpcMethod.SubmitRequest: {
+        case `${rpc_1.KeyringRpcMethod.SubmitRequest}`: {
             (0, superstruct_1.assert)(request, api_1.SubmitRequestRequestStruct);
             return keyring.submitRequest(request.params);
         }
-        case rpc_1.KeyringRpcMethod.ApproveRequest: {
+        case `${rpc_1.KeyringRpcMethod.ApproveRequest}`: {
             if (keyring.approveRequest === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }
             (0, superstruct_1.assert)(request, api_1.ApproveRequestRequestStruct);
             return keyring.approveRequest(request.params.id, request.params.data);
         }
-        case rpc_1.KeyringRpcMethod.RejectRequest: {
+        case `${rpc_1.KeyringRpcMethod.RejectRequest}`: {
             if (keyring.rejectRequest === undefined) {
                 throw new MethodNotSupportedError(request.method);
             }

package/dist/rpc-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-handler.js","sourceRoot":"","sources":["../src/rpc-handler.ts"],"names":[],"mappings":"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","sourcesContent":["import { assert } from '@metamask/superstruct';\nimport type { Json } from '@metamask/utils';\n\nimport type { Keyring } from './api';\nimport {\n  GetAccountRequestStruct,\n  CreateAccountRequestStruct,\n  ApproveRequestRequestStruct,\n  DeleteAccountRequestStruct,\n  ExportAccountRequestStruct,\n  GetRequestRequestStruct,\n  RejectRequestRequestStruct,\n  SubmitRequestRequestStruct,\n  UpdateAccountRequestStruct,\n  FilterAccountChainsStruct,\n  ListAccountsRequestStruct,\n  ListRequestsRequestStruct,\n  GetAccountBalancesRequestStruct,\n} from './internal/api';\nimport { KeyringRpcMethod } from './internal/rpc';\nimport type { JsonRpcRequest } from './JsonRpcRequest';\nimport { JsonRpcRequestStruct } from './JsonRpcRequest';\n\n/**\n * Error thrown when a keyring JSON-RPC method is not supported.\n */\nexport class MethodNotSupportedError extends Error {\n  constructor(method: string) {\n    super(`Method not supported: ${method}`);\n  }\n}\n\n/**\n * Inner function that dispatches JSON-RPC request to the associated Keyring\n * methods.\n *\n * @param keyring - Keyring instance.\n * @param request - Keyring JSON-RPC request.\n * @returns A promise that resolves to the keyring response.\n */\nasync function dispatchRequest(\n  keyring: Keyring,\n  request: JsonRpcRequest,\n): Promise<Json | void> {\n  // We first have to make sure that the request is a valid JSON-RPC request so\n  // we can check its method name.\n  assert(request, JsonRpcRequestStruct);\n\n  switch (request.method) {\n    case KeyringRpcMethod.ListAccounts: {\n      assert(request, ListAccountsRequestStruct);\n      return keyring.listAccounts();\n    }\n\n    case KeyringRpcMethod.GetAccount: {\n      assert(request, GetAccountRequestStruct);\n      return keyring.getAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.CreateAccount: {\n      assert(request, CreateAccountRequestStruct);\n      return keyring.createAccount(request.params.options);\n    }\n\n    case KeyringRpcMethod.GetAccountBalances: {\n      if (keyring.getAccountBalances === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, GetAccountBalancesRequestStruct);\n      return keyring.getAccountBalances(\n        request.params.id,\n        request.params.assets,\n      );\n    }\n\n    case KeyringRpcMethod.FilterAccountChains: {\n      assert(request, FilterAccountChainsStruct);\n      return keyring.filterAccountChains(\n        request.params.id,\n        request.params.chains,\n      );\n    }\n\n    case KeyringRpcMethod.UpdateAccount: {\n      assert(request, UpdateAccountRequestStruct);\n      return keyring.updateAccount(request.params.account);\n    }\n\n    case KeyringRpcMethod.DeleteAccount: {\n      assert(request, DeleteAccountRequestStruct);\n      return keyring.deleteAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.ExportAccount: {\n      if (keyring.exportAccount === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ExportAccountRequestStruct);\n      return keyring.exportAccount(request.params.id);\n    }\n\n    case KeyringRpcMethod.ListRequests: {\n      if (keyring.listRequests === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ListRequestsRequestStruct);\n      return keyring.listRequests();\n    }\n\n    case KeyringRpcMethod.GetRequest: {\n      if (keyring.getRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, GetRequestRequestStruct);\n      return keyring.getRequest(request.params.id);\n    }\n\n    case KeyringRpcMethod.SubmitRequest: {\n      assert(request, SubmitRequestRequestStruct);\n      return keyring.submitRequest(request.params);\n    }\n\n    case KeyringRpcMethod.ApproveRequest: {\n      if (keyring.approveRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ApproveRequestRequestStruct);\n      return keyring.approveRequest(request.params.id, request.params.data);\n    }\n\n    case KeyringRpcMethod.RejectRequest: {\n      if (keyring.rejectRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, RejectRequestRequestStruct);\n      return keyring.rejectRequest(request.params.id);\n    }\n\n    default: {\n      throw new MethodNotSupportedError(request.method);\n    }\n  }\n}\n\n/**\n * Handles a keyring JSON-RPC request.\n *\n * This function is meant to be used as a handler for Keyring JSON-RPC requests\n * in an Accounts Snap.\n *\n * @param keyring - Keyring instance.\n * @param request - Keyring JSON-RPC request.\n * @returns A promise that resolves to the keyring response.\n * @example\n * ```ts\n * export const onKeyringRequest: OnKeyringRequestHandler = async ({\n *   origin,\n *   request,\n * }) => {\n *   return await handleKeyringRequest(keyring, request);\n * };\n * ```\n */\nexport async function handleKeyringRequest(\n  keyring: Keyring,\n  request: JsonRpcRequest,\n): Promise<Json | void> {\n  try {\n    return await dispatchRequest(keyring, request);\n  } catch (error) {\n    const message =\n      error instanceof Error && typeof error.message === 'string'\n        ? error.message\n        : 'An unknown error occurred while handling the keyring request';\n\n    throw new Error(message);\n  }\n}\n"]}
+{"version":3,"file":"rpc-handler.js","sourceRoot":"","sources":["../src/rpc-handler.ts"],"names":[],"mappings":"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","sourcesContent":["import { assert } from '@metamask/superstruct';\nimport type { Json } from '@metamask/utils';\n\nimport type { Keyring } from './api';\nimport {\n  GetAccountRequestStruct,\n  CreateAccountRequestStruct,\n  ApproveRequestRequestStruct,\n  DeleteAccountRequestStruct,\n  ExportAccountRequestStruct,\n  GetRequestRequestStruct,\n  RejectRequestRequestStruct,\n  SubmitRequestRequestStruct,\n  UpdateAccountRequestStruct,\n  FilterAccountChainsStruct,\n  ListAccountsRequestStruct,\n  ListRequestsRequestStruct,\n  GetAccountBalancesRequestStruct,\n} from './internal/api';\nimport { KeyringRpcMethod } from './internal/rpc';\nimport type { JsonRpcRequest } from './JsonRpcRequest';\nimport { JsonRpcRequestStruct } from './JsonRpcRequest';\n\n/**\n * Error thrown when a keyring JSON-RPC method is not supported.\n */\nexport class MethodNotSupportedError extends Error {\n  constructor(method: string) {\n    super(`Method not supported: ${method}`);\n  }\n}\n\n/**\n * Inner function that dispatches JSON-RPC request to the associated Keyring\n * methods.\n *\n * @param keyring - Keyring instance.\n * @param request - Keyring JSON-RPC request.\n * @returns A promise that resolves to the keyring response.\n */\nasync function dispatchRequest(\n  keyring: Keyring,\n  request: JsonRpcRequest,\n): Promise<Json | void> {\n  // We first have to make sure that the request is a valid JSON-RPC request so\n  // we can check its method name.\n  assert(request, JsonRpcRequestStruct);\n\n  switch (request.method) {\n    case `${KeyringRpcMethod.ListAccounts}`: {\n      assert(request, ListAccountsRequestStruct);\n      return keyring.listAccounts();\n    }\n\n    case `${KeyringRpcMethod.GetAccount}`: {\n      assert(request, GetAccountRequestStruct);\n      return keyring.getAccount(request.params.id);\n    }\n\n    case `${KeyringRpcMethod.CreateAccount}`: {\n      assert(request, CreateAccountRequestStruct);\n      return keyring.createAccount(request.params.options);\n    }\n\n    case `${KeyringRpcMethod.GetAccountBalances}`: {\n      if (keyring.getAccountBalances === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, GetAccountBalancesRequestStruct);\n      return keyring.getAccountBalances(\n        request.params.id,\n        request.params.assets,\n      );\n    }\n\n    case `${KeyringRpcMethod.FilterAccountChains}`: {\n      assert(request, FilterAccountChainsStruct);\n      return keyring.filterAccountChains(\n        request.params.id,\n        request.params.chains,\n      );\n    }\n\n    case `${KeyringRpcMethod.UpdateAccount}`: {\n      assert(request, UpdateAccountRequestStruct);\n      return keyring.updateAccount(request.params.account);\n    }\n\n    case `${KeyringRpcMethod.DeleteAccount}`: {\n      assert(request, DeleteAccountRequestStruct);\n      return keyring.deleteAccount(request.params.id);\n    }\n\n    case `${KeyringRpcMethod.ExportAccount}`: {\n      if (keyring.exportAccount === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ExportAccountRequestStruct);\n      return keyring.exportAccount(request.params.id);\n    }\n\n    case `${KeyringRpcMethod.ListRequests}`: {\n      if (keyring.listRequests === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ListRequestsRequestStruct);\n      return keyring.listRequests();\n    }\n\n    case `${KeyringRpcMethod.GetRequest}`: {\n      if (keyring.getRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, GetRequestRequestStruct);\n      return keyring.getRequest(request.params.id);\n    }\n\n    case `${KeyringRpcMethod.SubmitRequest}`: {\n      assert(request, SubmitRequestRequestStruct);\n      return keyring.submitRequest(request.params);\n    }\n\n    case `${KeyringRpcMethod.ApproveRequest}`: {\n      if (keyring.approveRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, ApproveRequestRequestStruct);\n      return keyring.approveRequest(request.params.id, request.params.data);\n    }\n\n    case `${KeyringRpcMethod.RejectRequest}`: {\n      if (keyring.rejectRequest === undefined) {\n        throw new MethodNotSupportedError(request.method);\n      }\n      assert(request, RejectRequestRequestStruct);\n      return keyring.rejectRequest(request.params.id);\n    }\n\n    default: {\n      throw new MethodNotSupportedError(request.method);\n    }\n  }\n}\n\n/**\n * Handles a keyring JSON-RPC request.\n *\n * This function is meant to be used as a handler for Keyring JSON-RPC requests\n * in an Accounts Snap.\n *\n * @param keyring - Keyring instance.\n * @param request - Keyring JSON-RPC request.\n * @returns A promise that resolves to the keyring response.\n * @example\n * ```ts\n * export const onKeyringRequest: OnKeyringRequestHandler = async ({\n *   origin,\n *   request,\n * }) => {\n *   return await handleKeyringRequest(keyring, request);\n * };\n * ```\n */\nexport async function handleKeyringRequest(\n  keyring: Keyring,\n  request: JsonRpcRequest,\n): Promise<Json | void> {\n  try {\n    return await dispatchRequest(keyring, request);\n  } catch (error) {\n    const message =\n      error instanceof Error && typeof error.message === 'string'\n        ? error.message\n        : 'An unknown error occurred while handling the keyring request';\n\n    throw new Error(message);\n  }\n}\n"]}

package/dist/superstruct.d.ts

@@ -0,0 +1,83 @@
+import { Struct } from '@metamask/superstruct';
+import type { Infer, ObjectSchema, OmitBy, Optionalize, PickBy, Simplify } from '@metamask/superstruct';
+declare const ExactOptionalSymbol: unique symbol;
+export type ExactOptionalTag = {
+    type: typeof ExactOptionalSymbol;
+};
+/**
+ * Exclude type `Type` from the properties of `Obj`.
+ *
+ * ```ts
+ * type Foo = { a: string | null; b: number };
+ * type Bar = ExcludeType<Foo, null>;
+ * // Bar = { a: string, b: number }
+ * ```
+ */
+export type ExcludeType<Obj, Type> = {
+    [K in keyof Obj]: Exclude<Obj[K], Type>;
+};
+/**
+ * Make optional all properties that have the `ExactOptionalTag` type.
+ *
+ * ```ts
+ * type Foo = { a: string | ExactOptionalTag; b: number};
+ * type Bar = ExactOptionalize<Foo>;
+ * // Bar = { a?: string; b: number}
+ * ```
+ */
+export type ExactOptionalize<Schema extends object> = OmitBy<Schema, ExactOptionalTag> & Partial<ExcludeType<PickBy<Schema, ExactOptionalTag>, ExactOptionalTag>>;
+/**
+ * Infer a type from an superstruct object schema.
+ */
+export type ObjectType<Schema extends ObjectSchema> = Simplify<ExactOptionalize<Optionalize<{
+    [K in keyof Schema]: Infer<Schema[K]>;
+}>>>;
+/**
+ * Change the return type of a superstruct object struct to support exact
+ * optional properties.
+ *
+ * @param schema - The object schema.
+ * @returns A struct representing an object with a known set of properties.
+ */
+export declare function object<Schema extends ObjectSchema>(schema: Schema): Struct<ObjectType<Schema>, Schema>;
+/**
+ * Augment a struct to allow exact-optional values. Exact-optional values can
+ * be omitted but cannot be `undefined`.
+ *
+ * ```ts
+ * const foo = object({ bar: exactOptional(string()) });
+ * type Foo = Infer<typeof foo>;
+ * // Foo = { bar?: string }
+ * ```
+ *
+ * @param struct - The struct to augment.
+ * @returns The augmented struct.
+ */
+export declare function exactOptional<Type, Schema>(struct: Struct<Type, Schema>): Struct<Type | ExactOptionalTag, Schema>;
+/**
+ * Defines a new string-struct matching a regular expression.
+ *
+ * Example:
+ *
+ * ```ts
+ * const EthAddressStruct = definePattern('EthAddress', /^0x[0-9a-f]{40}$/iu);
+ * ```
+ *
+ * @param name - Type name.
+ * @param pattern - Regular expression to match.
+ * @returns A new string-struct that matches the given pattern.
+ */
+export declare function definePattern(name: string, pattern: RegExp): Struct<string, null>;
+/**
+ * Assert that a value is valid according to a struct.
+ *
+ * It is similar to superstruct's mask function, but it does not ignore extra
+ * properties.
+ *
+ * @param value - Value to check.
+ * @param struct - Struct to validate the value against.
+ * @param message - Error message to throw if the value is not valid.
+ * @returns The value if it is valid.
+ */
+export declare function strictMask<Type, Schema>(value: unknown, struct: Struct<Type, Schema>, message?: string): Type;
+export {};

package/dist/superstruct.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.strictMask = exports.definePattern = exports.exactOptional = exports.object = void 0;
+const superstruct_1 = require("@metamask/superstruct");
+/**
+ * Change the return type of a superstruct object struct to support exact
+ * optional properties.
+ *
+ * @param schema - The object schema.
+ * @returns A struct representing an object with a known set of properties.
+ */
+function object(schema) {
+    return (0, superstruct_1.object)(schema);
+}
+exports.object = object;
+/**
+ * Check if the current property is present in its parent object.
+ *
+ * @param ctx - The context to check.
+ * @returns `true` if the property is present, `false` otherwise.
+ */
+function hasOptional(ctx) {
+    const property = ctx.path[ctx.path.length - 1];
+    const parent = ctx.branch[ctx.branch.length - 2];
+    return property in parent;
+}
+/**
+ * Augment a struct to allow exact-optional values. Exact-optional values can
+ * be omitted but cannot be `undefined`.
+ *
+ * ```ts
+ * const foo = object({ bar: exactOptional(string()) });
+ * type Foo = Infer<typeof foo>;
+ * // Foo = { bar?: string }
+ * ```
+ *
+ * @param struct - The struct to augment.
+ * @returns The augmented struct.
+ */
+function exactOptional(struct) {
+    return new superstruct_1.Struct({
+        ...struct,
+        validator: (value, ctx) => !hasOptional(ctx) || struct.validator(value, ctx),
+        refiner: (value, ctx) => !hasOptional(ctx) || struct.refiner(value, ctx),
+    });
+}
+exports.exactOptional = exactOptional;
+/**
+ * Defines a new string-struct matching a regular expression.
+ *
+ * Example:
+ *
+ * ```ts
+ * const EthAddressStruct = definePattern('EthAddress', /^0x[0-9a-f]{40}$/iu);
+ * ```
+ *
+ * @param name - Type name.
+ * @param pattern - Regular expression to match.
+ * @returns A new string-struct that matches the given pattern.
+ */
+function definePattern(name, pattern) {
+    return (0, superstruct_1.define)(name, (value) => typeof value === 'string' && pattern.test(value));
+}
+exports.definePattern = definePattern;
+/**
+ * Assert that a value is valid according to a struct.
+ *
+ * It is similar to superstruct's mask function, but it does not ignore extra
+ * properties.
+ *
+ * @param value - Value to check.
+ * @param struct - Struct to validate the value against.
+ * @param message - Error message to throw if the value is not valid.
+ * @returns The value if it is valid.
+ */
+function strictMask(value, struct, message) {
+    (0, superstruct_1.assert)(value, struct, message);
+    return value;
+}
+exports.strictMask = strictMask;
+//# sourceMappingURL=superstruct.js.map