Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ts: Narrow AccountClient to it's appropriate type #2440

Merged
merged 1 commit into from
Mar 24, 2023
Merged

ts: Narrow AccountClient to it's appropriate type #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The minor version will be incremented upon a breaking change and the patch versi
- spl: Add metadata wrappers `approve_collection_authority`, `bubblegum_set_collection_size`, `burn_edition_nft`, `burn_nft`, `revoke_collection_authority`, `set_token_standard`, `utilize`, `unverify_sized_collection_item`, `unverify_collection` ([#2430](https://github.com/coral-xyz/anchor/pull/2430))

### Fixes
- ts: Narrowed `AccountClient` type to it's appropriate account type ([#2440](https://github.com/coral-xyz/anchor/pull/2440))

### Breaking

Expand Down
15 changes: 7 additions & 8 deletions ts/packages/anchor/src/program/namespace/account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Provider, { getProvider } from "../../provider.js";
import { Idl, IdlAccountDef } from "../../idl.js";
import { Coder, BorshCoder } from "../../coder/index.js";
import { Subscription, Address, translateAddress } from "../common.js";
import { AllAccountsMap, IdlTypes, TypeDef } from "./types.js";
import { AllAccountsMap, IdlAccounts } from "./types.js";
import * as pubkeyUtil from "../../utils/pubkey.js";
import * as rpcUtil from "../../utils/rpc.js";

Expand All @@ -26,7 +26,7 @@ export default class AccountFactory {
programId: PublicKey,
provider?: Provider
): AccountNamespace<IDL> {
const accountFns: AccountNamespace = {};
const accountFns = {} as AccountNamespace<IDL>;

idl.accounts?.forEach((idlAccount) => {
const name = camelCase(idlAccount.name);
Expand All @@ -39,7 +39,7 @@ export default class AccountFactory {
);
});

return accountFns as AccountNamespace<IDL>;
return accountFns;
}
}

Expand Down Expand Up @@ -68,15 +68,14 @@ type NullableIdlAccount<IDL extends Idl> = IDL["accounts"] extends undefined
* For the full API, see the [[AccountClient]] reference.
*/
export type AccountNamespace<IDL extends Idl = Idl> = {
[M in keyof AllAccountsMap<IDL>]: AccountClient<IDL>;
[N in keyof AllAccountsMap<IDL>]: AccountClient<IDL, N>;
};

export class AccountClient<
IDL extends Idl = Idl,
A extends NullableIdlAccount<IDL> = IDL["accounts"] extends undefined
? IdlAccountDef
: NonNullable<IDL["accounts"]>[number],
T = TypeDef<A, IdlTypes<IDL>>
N extends keyof IdlAccounts<IDL> = keyof IdlAccounts<IDL>,
A extends NullableIdlAccount<IDL> = NullableIdlAccount<IDL>,
T = IdlAccounts<IDL>[N]
> {
/**
* Returns the number of bytes in this account.
Expand Down