Skip to content

Commit

Permalink
feat: update biome
Browse files Browse the repository at this point in the history
  • Loading branch information
jxom committed Nov 28, 2023
1 parent 4517ae4 commit 99016a3
Show file tree
Hide file tree
Showing 42 changed files with 275 additions and 259 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"editor.codeActionsOnSave": {
"source.organizeImports.biome": true
"source.organizeImports.biome": "explicit"
},
"[json]": {
"editor.defaultFormatter": "biomejs.biome"
Expand Down
1 change: 1 addition & 0 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
".next",
".svelte-kit",
".vercel",
".vitepress",
"**/node_modules",
"CHANGELOG.md",
"cache",
Expand Down
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@actions/core": "^1.10.0",
"@actions/github": "^5.1.1",
"@biomejs/biome": "^1.3.3",
"@biomejs/biome": "^1.4.0",
"@changesets/changelog-github": "^0.4.5",
"@changesets/cli": "^2.23.2",
"@ethereumjs/rlp": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/accounts/utils/signTransaction.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ describe('with custom EIP2718 serializer', () => {

test('default', async () => {
const exampleSerializer: SerializeTransactionFn<ExampleTransaction> = vi.fn(
function (transaction) {
(transaction) => {
const {
chainId,
nonce,
Expand Down
6 changes: 4 additions & 2 deletions src/accounts/utils/signTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
import { type SignErrorType, sign } from './sign.js'

export type SignTransactionParameters<
TTransactionSerializable extends TransactionSerializable = TransactionSerializable,
TTransactionSerializable extends
TransactionSerializable = TransactionSerializable,
> = {
privateKey: Hex
transaction: TTransactionSerializable
Expand All @@ -27,7 +28,8 @@ export type SignTransactionParameters<
}

export type SignTransactionReturnType<
TTransactionSerializable extends TransactionSerializable = TransactionSerializable,
TTransactionSerializable extends
TransactionSerializable = TransactionSerializable,
> = TransactionSerialized<GetTransactionType<TTransactionSerializable>>

export type SignTransactionErrorType =
Expand Down
2 changes: 1 addition & 1 deletion src/actions/ens/getEnsAddress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export type GetEnsAddressErrorType =
* })
* // '0xd2135CfB216b74109775236E36d4b433F1DF507B'
*/
export async function getEnsAddress<TChain extends Chain | undefined,>(
export async function getEnsAddress<TChain extends Chain | undefined>(
client: Client<Transport, TChain>,
{
blockNumber,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/public/call.ts
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ export type ScheduleMulticallErrorType =
| RawContractErrorType
| ErrorType

async function scheduleMulticall<TChain extends Chain | undefined,>(
async function scheduleMulticall<TChain extends Chain | undefined>(
client: Client<Transport>,
args: ScheduleMulticallParameters<TChain>,
) {
Expand Down
20 changes: 11 additions & 9 deletions src/actions/public/createContractEventFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,17 @@ export type CreateContractEventFilterParameters<
args?: never
}
: MaybeExtractEventArgsFromAbi<
TAbi,
TEventName
> extends infer TEventFilterArgs
? {
args?: TEventFilterArgs | (TArgs extends TEventFilterArgs ? TArgs : never)
}
: {
args?: never
})
TAbi,
TEventName
> extends infer TEventFilterArgs
? {
args?:
| TEventFilterArgs
| (TArgs extends TEventFilterArgs ? TArgs : never)
}
: {
args?: never
})

export type CreateContractEventFilterReturnType<
TAbi extends Abi | readonly unknown[] = Abi,
Expand Down
4 changes: 3 additions & 1 deletion src/actions/public/estimateMaxPriorityFeePerGas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ export async function internal_estimateMaxPriorityFeePerGas<
client,
request,
} as ChainFeesFnParameters)
} else if (typeof chain?.fees?.defaultPriorityFee !== 'undefined')
}

if (typeof chain?.fees?.defaultPriorityFee !== 'undefined')
return chain?.fees?.defaultPriorityFee

try {
Expand Down
2 changes: 1 addition & 1 deletion src/actions/public/verifyHash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export type VerifyHashErrorType =
* @param parameters - {@link VerifyHashParameters}
* @returns Whether or not the signature is valid. {@link VerifyHashReturnType}
*/
export async function verifyHash<TChain extends Chain | undefined,>(
export async function verifyHash<TChain extends Chain | undefined>(
client: Client<Transport, TChain>,
{ address, hash, signature, ...callRequest }: VerifyHashParameters,
): Promise<VerifyHashReturnType> {
Expand Down
2 changes: 1 addition & 1 deletion src/actions/public/verifyMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export type VerifyMessageErrorType =
* @param parameters - {@link VerifyMessageParameters}
* @returns Whether or not the signature is valid. {@link VerifyMessageReturnType}
*/
export async function verifyMessage<TChain extends Chain | undefined,>(
export async function verifyMessage<TChain extends Chain | undefined>(
client: Client<Transport, TChain>,
{ address, message, signature, ...callRequest }: VerifyMessageParameters,
): Promise<VerifyMessageReturnType> {
Expand Down
2 changes: 1 addition & 1 deletion src/actions/public/verifyTypedData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export type VerifyTypedDataErrorType =
* @param parameters - {@link VerifyTypedDataParameters}
* @returns Whether or not the signature is valid. {@link VerifyTypedDataReturnType}
*/
export async function verifyTypedData<TChain extends Chain | undefined,>(
export async function verifyTypedData<TChain extends Chain | undefined>(
client: Client<Transport, TChain>,
{
address,
Expand Down
12 changes: 6 additions & 6 deletions src/actions/public/watchContractEvent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ describe('poll', () => {
const unwatch = watchContractEvent(publicClient, {
abi: usdcContractConfig.abi,
onLogs: (logs_) => {
assertType<typeof logs_[0]['args']>({
assertType<(typeof logs_)[0]['args']>({
owner: '0x',
spender: '0x',
value: 0n,
})
assertType<typeof logs_[0]['args']>({
assertType<(typeof logs_)[0]['args']>({
from: '0x',
to: '0x',
value: 0n,
Expand Down Expand Up @@ -172,7 +172,7 @@ describe('poll', () => {
...usdcContractConfig,
eventName: 'Transfer',
onLogs: (logs_) => {
assertType<typeof logs_[0]['args']>({
assertType<(typeof logs_)[0]['args']>({
from: '0x',
to: '0x',
value: 0n,
Expand Down Expand Up @@ -659,12 +659,12 @@ describe('subscribe', () => {
const unwatch = watchContractEvent(webSocketClient, {
...usdcContractConfig,
onLogs: (logs_) => {
assertType<typeof logs_[0]['args']>({
assertType<(typeof logs_)[0]['args']>({
owner: '0x',
spender: '0x',
value: 0n,
})
assertType<typeof logs_[0]['args']>({
assertType<(typeof logs_)[0]['args']>({
from: '0x',
to: '0x',
value: 0n,
Expand Down Expand Up @@ -721,7 +721,7 @@ describe('subscribe', () => {
...usdcContractConfig,
eventName: 'Transfer',
onLogs: (logs_) => {
assertType<typeof logs_[0]['args']>({
assertType<(typeof logs_)[0]['args']>({
from: '0x',
to: '0x',
value: 0n,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/wallet/sendRawTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export type SendRawTransactionErrorType = RequestErrorType | ErrorType
* serializedTransaction: '0x02f850018203118080825208808080c080a04012522854168b27e5dc3d5839bab5e6b39e1a0ffd343901ce1622e3d64b48f1a04e00902ae0502c4728cbf12156290df99c3ed7de85b1dbfe20b5c36931733a33'
* })
*/
export async function sendRawTransaction<TChain extends Chain | undefined,>(
export async function sendRawTransaction<TChain extends Chain | undefined>(
client: Client<Transport, TChain>,
{ serializedTransaction }: SendRawTransactionParameters,
): Promise<SendRawTransactionReturnType> {
Expand Down
10 changes: 3 additions & 7 deletions src/chains/celo/serializers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ import { isCIP42, isCIP64, isEmpty, isPresent } from './utils.js'
export const serializeTransactionCelo: SerializeTransactionFn<
CeloTransactionSerializable | TransactionSerializable
> = (tx, signature) => {
if (isCIP64(tx)) {
return serializeTransactionCIP64(tx, signature)
} else if (isCIP42(tx)) {
return serializeTransactionCIP42(tx, signature)
} else {
return serializeTransaction(tx as TransactionSerializable, signature)
}
if (isCIP64(tx)) return serializeTransactionCIP64(tx, signature)
if (isCIP42(tx)) return serializeTransactionCIP42(tx, signature)
return serializeTransaction(tx as TransactionSerializable, signature)
}

export const serializersCelo = {
Expand Down
4 changes: 2 additions & 2 deletions src/errors/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export class BaseError extends Error {
args.cause instanceof BaseError
? args.cause.details
: args.cause?.message
? args.cause.message
: args.details!
? args.cause.message
: args.details!
const docsPath =
args.cause instanceof BaseError
? args.cause.docsPath || args.docsPath
Expand Down
127 changes: 63 additions & 64 deletions src/types/contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ export type ContractFunctionResult<
> = true extends FailedToParseArgs
? unknown
: TArgs extends readonly []
? void
: TArgs extends readonly [infer Arg]
? Arg
: TArgs
? void
: TArgs extends readonly [infer Arg]
? Arg
: TArgs

export type GetValue<
TAbi extends Abi | readonly unknown[],
Expand All @@ -75,8 +75,8 @@ export type GetValue<
? TAbiFunction['stateMutability'] extends 'payable'
? { value?: NoUndefined<TValueType> }
: TAbiFunction['payable'] extends true
? { value?: NoUndefined<TValueType> }
: { value?: never }
? { value?: NoUndefined<TValueType> }
: { value?: never }
: { value?: TValueType }

export type MaybeAbiEventName<TAbiEvent extends AbiEvent | undefined> =
Expand Down Expand Up @@ -170,10 +170,10 @@ export type GetFunctionArgs<
args?: readonly unknown[]
}
: TArgs extends readonly []
? { args?: never }
: {
/** Arguments to pass contract method */ args: TArgs
}
? { args?: never }
: {
/** Arguments to pass contract method */ args: TArgs
}

export type GetConstructorArgs<
TAbi extends Abi | readonly unknown[],
Expand All @@ -194,10 +194,10 @@ export type GetConstructorArgs<
args?: readonly unknown[]
}
: TArgs extends readonly []
? { args?: never }
: {
/** Arguments to pass contract constructor */ args: TArgs
}
? { args?: never }
: {
/** Arguments to pass contract constructor */ args: TArgs
}

export type GetErrorArgs<
TAbi extends Abi | readonly unknown[],
Expand All @@ -219,10 +219,10 @@ export type GetErrorArgs<
args?: readonly unknown[]
}
: TArgs extends readonly []
? { args?: never }
: {
/** Arguments to pass contract method */ args: TArgs
}
? { args?: never }
: {
/** Arguments to pass contract method */ args: TArgs
}

export type GetEventArgs<
TAbi extends Abi | readonly unknown[],
Expand Down Expand Up @@ -296,10 +296,10 @@ export type LogTopicType<
> = TTopic extends Hex
? TPrimitiveType
: TTopic extends Hex[]
? TPrimitiveType[]
: TTopic extends null
? null
: never
? TPrimitiveType[]
: TTopic extends null
? null
: never

/**
* @internal
Expand Down Expand Up @@ -328,46 +328,45 @@ export type AbiEventParametersToPrimitiveTypes<
> = TAbiParameters extends readonly []
? readonly []
: Filter<
TAbiParameters,
Options['IndexedOnly'] extends true ? { indexed: true } : object
> extends infer Filtered extends readonly AbiParameter[]
? _HasUnnamedAbiParameter<Filtered> extends true
? // Has unnamed tuple parameters so return as array
| readonly [
...{
[K in keyof Filtered]: AbiEventParameterToPrimitiveType<
Filtered[K],
Options
>
},
]
// Distribute over tuple to represent optional parameters
| (Options['Required'] extends true
? never
: // Distribute over tuple to represent optional parameters
Filtered extends readonly [
...infer Head extends readonly AbiParameter[],
infer _,
]
? AbiEventParametersToPrimitiveTypes<
readonly [...{ [K in keyof Head]: Omit<Head[K], 'name'> }],
Options
>
: never)
: // All tuple parameters are named so return as object
{
[Parameter in
Filtered[number] as Parameter extends {
name: infer Name extends string
}
? Name
: never]?: AbiEventParameterToPrimitiveType<Parameter, Options>
} extends infer Mapped
? Prettify<
MaybeRequired<
Mapped,
Options['Required'] extends boolean ? Options['Required'] : false
>
>
TAbiParameters,
Options['IndexedOnly'] extends true ? { indexed: true } : object
> extends infer Filtered extends readonly AbiParameter[]
? _HasUnnamedAbiParameter<Filtered> extends true
? // Has unnamed tuple parameters so return as array
| readonly [
...{
[K in keyof Filtered]: AbiEventParameterToPrimitiveType<
Filtered[K],
Options
>
},
]
// Distribute over tuple to represent optional parameters
| (Options['Required'] extends true
? never
: // Distribute over tuple to represent optional parameters
Filtered extends readonly [
...infer Head extends readonly AbiParameter[],
infer _,
]
? AbiEventParametersToPrimitiveTypes<
readonly [...{ [K in keyof Head]: Omit<Head[K], 'name'> }],
Options
>
: never)
: // All tuple parameters are named so return as object
{
[Parameter in Filtered[number] as Parameter extends {
name: infer Name extends string
}
? Name
: never]?: AbiEventParameterToPrimitiveType<Parameter, Options>
} extends infer Mapped
? Prettify<
MaybeRequired<
Mapped,
Options['Required'] extends boolean ? Options['Required'] : false
>
>
: never
: never
: never
Loading

0 comments on commit 99016a3

Please sign in to comment.