Skip to content

Commit

Permalink
Linter fixes for import statements
Browse files Browse the repository at this point in the history
  • Loading branch information
MajorLift committed Jun 6, 2024
1 parent 09369d3 commit a982011
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 14 deletions.
11 changes: 9 additions & 2 deletions src/JsonRpcRequest.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/KeyringClient.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/api/account.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/api/export.ts
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/api/request.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/api/response.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/btc/types.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
11 changes: 9 additions & 2 deletions src/internal/api.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/internal/events.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/rpc-handler.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
9 changes: 7 additions & 2 deletions src/superstruct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit a982011

Please sign in to comment.