diff --git a/src/JsonRpcRequest.ts b/src/JsonRpcRequest.ts index 3084eaad7..6da187c5a 100644 --- a/src/JsonRpcRequest.ts +++ b/src/JsonRpcRequest.ts @@ -1,6 +1,13 @@ -import { JsonStruct } from '@metamask/utils'; import type { Infer } from '@metamask/superstruct'; -import { array, literal, number, record, string, union } from '@metamask/superstruct'; +import { + array, + literal, + number, + record, + string, + union, +} from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; import { exactOptional, object } from './superstruct'; diff --git a/src/KeyringClient.ts b/src/KeyringClient.ts index a35df58df..3e7f2dd61 100644 --- a/src/KeyringClient.ts +++ b/src/KeyringClient.ts @@ -1,5 +1,5 @@ -import type { Json } from '@metamask/utils'; import { assert } from '@metamask/superstruct'; +import type { Json } from '@metamask/utils'; import { v4 as uuid } from 'uuid'; import type { diff --git a/src/api/account.ts b/src/api/account.ts index ff3a33759..28b7d1e14 100644 --- a/src/api/account.ts +++ b/src/api/account.ts @@ -1,6 +1,6 @@ -import { JsonStruct } from '@metamask/utils'; import type { Infer } from '@metamask/superstruct'; import { array, enums, record, string } from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; import { object } from '../superstruct'; import { UuidStruct } from '../utils'; diff --git a/src/api/export.ts b/src/api/export.ts index 5d3511921..86134e15f 100644 --- a/src/api/export.ts +++ b/src/api/export.ts @@ -1,6 +1,6 @@ -import { JsonStruct } from '@metamask/utils'; import type { Infer } from '@metamask/superstruct'; import { record, string } from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; export const KeyringAccountDataStruct = record(string(), JsonStruct); diff --git a/src/api/request.ts b/src/api/request.ts index ee07fb4e2..db2609af6 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -1,6 +1,6 @@ -import { JsonStruct } from '@metamask/utils'; import type { Infer } from '@metamask/superstruct'; import { array, record, string, union } from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; import { exactOptional, object } from '../superstruct'; import { UuidStruct } from '../utils'; diff --git a/src/api/response.ts b/src/api/response.ts index e0cb885df..dbe2e0b4a 100644 --- a/src/api/response.ts +++ b/src/api/response.ts @@ -1,6 +1,6 @@ -import { JsonStruct } from '@metamask/utils'; import type { Infer } from '@metamask/superstruct'; import { literal, string, union } from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; import { exactOptional, object } from '../superstruct'; diff --git a/src/btc/types.ts b/src/btc/types.ts index b74204d0b..01e131e12 100644 --- a/src/btc/types.ts +++ b/src/btc/types.ts @@ -1,6 +1,6 @@ -import { bech32 } from 'bech32'; import type { Infer } from '@metamask/superstruct'; import { string, array, enums, refine, literal } from '@metamask/superstruct'; +import { bech32 } from 'bech32'; import { KeyringAccountStruct, BtcAccountType } from '../api'; import { object } from '../superstruct'; diff --git a/src/internal/api.ts b/src/internal/api.ts index feedb4cb6..7e6bc9ba3 100644 --- a/src/internal/api.ts +++ b/src/internal/api.ts @@ -1,6 +1,13 @@ -import { JsonStruct } from '@metamask/utils'; import type { Infer } from '@metamask/superstruct'; -import { array, literal, number, record, string, union } from '@metamask/superstruct'; +import { + array, + literal, + number, + record, + string, + union, +} from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; import { BalanceStruct, diff --git a/src/internal/events.ts b/src/internal/events.ts index e04c12c31..9047ae26f 100644 --- a/src/internal/events.ts +++ b/src/internal/events.ts @@ -1,5 +1,5 @@ -import { JsonStruct } from '@metamask/utils'; import { boolean, literal, string } from '@metamask/superstruct'; +import { JsonStruct } from '@metamask/utils'; import { KeyringAccountStruct } from '../api'; import { KeyringEvent } from '../events'; diff --git a/src/rpc-handler.ts b/src/rpc-handler.ts index b0f79c02a..4edf59019 100644 --- a/src/rpc-handler.ts +++ b/src/rpc-handler.ts @@ -1,5 +1,5 @@ -import type { Json } from '@metamask/utils'; import { assert } from '@metamask/superstruct'; +import type { Json } from '@metamask/utils'; import type { Keyring } from './api'; import { diff --git a/src/superstruct.ts b/src/superstruct.ts index b7e0ba0f0..415d40313 100644 --- a/src/superstruct.ts +++ b/src/superstruct.ts @@ -5,9 +5,14 @@ import type { OmitBy, Optionalize, PickBy, - Simplify + Simplify, +} from '@metamask/superstruct'; +import { + Struct, + assert, + define, + object as stObject, } from '@metamask/superstruct'; -import { Struct, assert, define, object as stObject } from '@metamask/superstruct'; declare const ExactOptionalSymbol: unique symbol;