chore(deps): replace superstruct imports with @metamask/superstruct

package.json

@@ -37,12 +37,16 @@
     "test:types": "tsd",
     "test:watch": "jest --watch"
   },
+  "resolutions": {
+    "@metamask/snaps-sdk": "github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=485c9699ddb0109068d7a07ecdd3539e510c8df6"
+  },
   "dependencies": {
+    "@metamask/providers": "17.0.0",
     "@metamask/snaps-sdk": "^6.0.0",
-    "@metamask/utils": "^8.4.0",
+    "@metamask/superstruct": "^3.1.0",
+    "@metamask/utils": "^9.0.0",
     "@types/uuid": "^9.0.8",
     "bech32": "^2.0.0",
-    "superstruct": "^1.0.3",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
@@ -53,7 +57,6 @@
     "@metamask/eslint-config-jest": "^12.1.0",
     "@metamask/eslint-config-nodejs": "^12.1.0",
     "@metamask/eslint-config-typescript": "^12.1.0",
-    "@metamask/providers": "^17.0.0",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.12.12",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
@@ -76,7 +79,7 @@
     "ts-node": "^10.9.2",
     "tsd": "^0.31.0",
     "typedoc": "^0.25.13",
-    "typescript": "~4.8.4"
+    "typescript": "~5.0.4"
   },
   "peerDependencies": {
     "@metamask/providers": ">=15 <18"

src/JsonRpcRequest.test.ts

@@ -1,4 +1,4 @@
-import { is } from 'superstruct';
+import { is } from '@metamask/superstruct';
 
 import { JsonRpcRequestStruct } from './JsonRpcRequest';
 

src/JsonRpcRequest.ts

@@ -1,6 +1,13 @@
+import type { Infer } from '@metamask/superstruct';
+import {
+  array,
+  literal,
+  number,
+  record,
+  string,
+  union,
+} from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import type { Infer } from 'superstruct';
-import { array, literal, number, record, string, union } from 'superstruct';
 
 import { exactOptional, object } from './superstruct';
 

src/KeyringClient.ts

@@ -1,5 +1,5 @@
+import { assert } from '@metamask/superstruct';
 import type { Json } from '@metamask/utils';
-import { assert } from 'superstruct';
 import { v4 as uuid } from 'uuid';
 
 import type {

src/api/account.test.ts

@@ -1,4 +1,4 @@
-import { assert } from 'superstruct';
+import { assert } from '@metamask/superstruct';
 
 import { KeyringAccountStruct } from './account';
 

src/api/account.ts

@@ -1,6 +1,6 @@
+import type { Infer } from '@metamask/superstruct';
+import { array, enums, record, string } from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import type { Infer } from 'superstruct';
-import { array, enums, record, string } from 'superstruct';
 
 import { object } from '../superstruct';
 import { UuidStruct } from '../utils';

src/api/balance.ts

@@ -1,5 +1,5 @@
-import type { Infer } from 'superstruct';
-import { string } from 'superstruct';
+import type { Infer } from '@metamask/superstruct';
+import { string } from '@metamask/superstruct';
 
 import { object } from '../superstruct';
 import { StringNumberStruct } from '../utils';

src/api/caip.ts

@@ -1,4 +1,4 @@
-import { is, type Infer } from 'superstruct';
+import { is, type Infer } from '@metamask/superstruct';
 
 import { definePattern } from '../superstruct';
 

src/api/export.ts

@@ -1,6 +1,6 @@
+import type { Infer } from '@metamask/superstruct';
+import { record, string } from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import type { Infer } from 'superstruct';
-import { record, string } from 'superstruct';
 
 export const KeyringAccountDataStruct = record(string(), JsonStruct);
 

src/api/request.ts

@@ -1,6 +1,6 @@
+import type { Infer } from '@metamask/superstruct';
+import { array, record, string, union } from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import type { Infer } from 'superstruct';
-import { array, record, string, union } from 'superstruct';
 
 import { exactOptional, object } from '../superstruct';
 import { UuidStruct } from '../utils';

src/api/response.ts

@@ -1,6 +1,6 @@
+import type { Infer } from '@metamask/superstruct';
+import { literal, string, union } from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import type { Infer } from 'superstruct';
-import { literal, string, union } from 'superstruct';
 
 import { exactOptional, object } from '../superstruct';
 

src/btc/types.ts

@@ -1,6 +1,6 @@
+import type { Infer } from '@metamask/superstruct';
+import { string, array, enums, refine, literal } from '@metamask/superstruct';
 import { bech32 } from 'bech32';
-import type { Infer } from 'superstruct';
-import { string, array, enums, refine, literal } from 'superstruct';
 
 import { KeyringAccountStruct, BtcAccountType } from '../api';
 import { object } from '../superstruct';

src/eth/erc4337/types.test.ts

@@ -1,4 +1,4 @@
-import { assert } from 'superstruct';
+import { assert } from '@metamask/superstruct';
 
 import { EthUserOperationStruct, EthBaseUserOperationStruct } from './types';
 

src/eth/erc4337/types.ts

@@ -1,4 +1,4 @@
-import { type Infer } from 'superstruct';
+import { type Infer } from '@metamask/superstruct';
 
 import { exactOptional, object } from '../../superstruct';
 import { UrlStruct } from '../../utils';

src/eth/types.ts

@@ -1,5 +1,5 @@
-import type { Infer } from 'superstruct';
-import { array, enums, literal } from 'superstruct';
+import type { Infer } from '@metamask/superstruct';
+import { array, enums, literal } from '@metamask/superstruct';
 
 import { EthAccountType, KeyringAccountStruct } from '../api';
 import { object, definePattern } from '../superstruct';

src/internal/api.ts

@@ -1,6 +1,13 @@
+import type { Infer } from '@metamask/superstruct';
+import {
+  array,
+  literal,
+  number,
+  record,
+  string,
+  union,
+} from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import type { Infer } from 'superstruct';
-import { array, literal, number, record, string, union } from 'superstruct';
 
 import {
   BalanceStruct,

src/internal/events.test.ts

@@ -1,4 +1,4 @@
-import { is } from 'superstruct';
+import { is } from '@metamask/superstruct';
 
 import { EthAccountType } from '../api';
 import { KeyringEvent } from '../events';

src/internal/events.ts

@@ -1,5 +1,5 @@
+import { boolean, literal, string } from '@metamask/superstruct';
 import { JsonStruct } from '@metamask/utils';
-import { boolean, literal, string } from 'superstruct';
 
 import { KeyringAccountStruct } from '../api';
 import { KeyringEvent } from '../events';

src/internal/types.test.ts

@@ -1,4 +1,4 @@
-import { assert } from 'superstruct';
+import { assert } from '@metamask/superstruct';
 
 import { InternalAccountStruct } from '.';
 

src/internal/types.ts

@@ -1,5 +1,5 @@
-import type { Infer, Struct } from 'superstruct';
-import { boolean, string, number } from 'superstruct';
+import type { Infer, Struct } from '@metamask/superstruct';
+import { boolean, string, number } from '@metamask/superstruct';
 
 import { BtcAccountType, EthAccountType, KeyringAccountStruct } from '../api';
 import { BtcP2wpkhAccountStruct } from '../btc/types';

src/rpc-handler.ts

@@ -1,5 +1,5 @@
+import { assert } from '@metamask/superstruct';
 import type { Json } from '@metamask/utils';
-import { assert } from 'superstruct';
 
 import type { Keyring } from './api';
 import {

src/superstruct.test-d.ts

@@ -1,5 +1,5 @@
-import type { Infer } from 'superstruct';
-import { boolean, number, optional, string } from 'superstruct';
+import type { Infer } from '@metamask/superstruct';
+import { boolean, number, optional, string } from '@metamask/superstruct';
 import { expectAssignable, expectNotAssignable } from 'tsd';
 
 import { exactOptional, object } from '.';

src/superstruct.test.ts

@@ -1,4 +1,4 @@
-import { is, literal, max, number, string, union } from 'superstruct';
+import { is, literal, max, number, string, union } from '@metamask/superstruct';
 
 import { exactOptional, object } from '.';
 

src/superstruct.ts

@@ -1,12 +1,18 @@
-import type { Infer, Context } from 'superstruct';
-import { Struct, assert, define, object as stObject } from 'superstruct';
 import type {
+  Context,
+  Infer,
   ObjectSchema,
   OmitBy,
   Optionalize,
   PickBy,
   Simplify,
-} from 'superstruct/dist/utils';
+} from '@metamask/superstruct';
+import {
+  Struct,
+  assert,
+  define,
+  object as stObject,
+} from '@metamask/superstruct';
 
 declare const ExactOptionalSymbol: unique symbol;
 

src/utils/types.test.ts

@@ -1,4 +1,4 @@
-import { is } from 'superstruct';
+import { is } from '@metamask/superstruct';
 
 import { StringNumberStruct } from './types';
 

src/utils/types.ts

@@ -1,4 +1,4 @@
-import { define, type Infer } from 'superstruct';
+import { define, type Infer } from '@metamask/superstruct';
 
 import { definePattern } from '../superstruct';
 

tsconfig.json

@@ -4,8 +4,8 @@
     "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "lib": ["ES2020", "DOM"],
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "noEmit": true,
     "noErrorTruncation": true,
     "noUncheckedIndexedAccess": true,