Skip to content
Merged
2 changes: 1 addition & 1 deletion .github/workflows/changesets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
uses: wevm/actions/.github/actions/pnpm@main

- name: Prepare
run: pnpm bun scripts/genJsrJson.ts && pnpm version:update && cd packages/abitype && cp ../../LICENSE LICENSE
run: pnpm node scripts/genJsrJson.ts && pnpm version:update && cd packages/abitype && cp ../../LICENSE LICENSE

- name: Publish to JSR
run: cd packages/abitype && pnpx jsr publish --allow-slow-types --allow-dirty
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bench": "vitest bench",
"bench:types": "TYPES=true vitest bench-d.ts",
"build": "pnpm run --r --filter \"./packages/**\" build",
"changeset:prepublish": "pnpm version:update && pnpm build && bun scripts/formatPackageJson.ts && bun scripts/generateProxyPackages.ts",
"changeset:prepublish": "pnpm version:update && pnpm build && node scripts/formatPackageJson.ts && node scripts/generateProxyPackages.ts",
"changeset:publish": "pnpm changeset:prepublish && changeset publish",
"changeset:version": "changeset version && pnpm version:update && pnpm format",
"check": "biome check --write",
Expand All @@ -18,7 +18,7 @@
"docs:dev": "pnpm -r --filter docs dev",
"format": "biome format --write",
"postinstall": "pnpm preconstruct",
"preconstruct": "bun scripts/preconstruct.ts",
"preconstruct": "node scripts/preconstruct.ts",
"preinstall": "pnpx only-allow pnpm",
"prepare": "pnpm simple-git-hooks",
"test": "vitest",
Expand All @@ -27,25 +27,24 @@
"test:update": "vitest --update",
"trace": "tsc --noEmit --generateTrace ./playgrounds/performance/out --incremental false --project playgrounds/performance/tsconfig.json && echo \"Open playgrounds/performance/out/trace.json in https://ui.perfetto.dev\"",
"typeperf": "pnpm run --r --parallel typeperf",
"version:update": "bun scripts/updateVersion.ts"
"version:update": "node scripts/updateVersion.ts"
},
"devDependencies": {
"@arktype/attest": "0.8.0",
"@biomejs/biome": "1.9.4",
"@changesets/cli": "^3.0.0-next.0",
"@ethersproject/abi": "^5.7.0",
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
"@types/bun": "^1.1.10",
"@vitest/coverage-v8": "^1.6.0",
"bun": "^1.1.29",
"@types/node": "^24.10.1",
"@vitest/coverage-v8": "^4.0.10",
"ethers": "^6.13.1",
"glob": "^10.4.2",
"knip": "^5.22.3",
"publint": "^0.2.12",
"sherif": "^0.9.0",
"simple-git-hooks": "^2.11.1",
"typescript": "5.7.2",
"vitest": "^1.6.0"
"vitest": "^4.0.10"
},
"packageManager": "pnpm@10.16.1",
"devEngines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/abitype/src/human-readable/formatAbiParameter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export function formatAbiParameter<
if (i < length - 1) type += ', '
}
const result = execTyped<{ array?: string }>(tupleRegex, abiParameter.type)
type += `)${result?.array ?? ''}`
type += `)${result?.array || ''}`
return formatAbiParameter({
...abiParameter,
type,
Expand Down
6 changes: 3 additions & 3 deletions packages/abitype/src/human-readable/runtime/structs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ const typeWithoutTupleRegex =
/^(?<type>[a-zA-Z$_][a-zA-Z0-9$_]*)(?<array>(?:\[\d*?\])+?)?$/

function resolveStructs(
abiParameters: readonly (AbiParameter & { indexed?: true })[],
structs: StructLookup,
abiParameters: readonly (AbiParameter & { indexed?: true })[] = [],
structs: StructLookup = {},
ancestors = new Set<string>(),
) {
const components: AbiParameter[] = []
Expand All @@ -81,7 +81,7 @@ function resolveStructs(
...abiParameter,
type: `tuple${array ?? ''}`,
components: resolveStructs(
structs[type] ?? [],
structs[type],
structs,
new Set([...ancestors, type]),
),
Expand Down
Loading
Loading