fix: many typing improvements #9516
Conversation
Deploying agoric-sdk with
|
| Latest commit: |
777eb21
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://abfcc71e.agoric-sdk.pages.dev |
| Branch Preview URL: | https://mfig-loadvat.agoric-sdk.pages.dev |
michaelfig
changed the title
Producer<T> and work around generic BridgeHandler.register
| /** | ||
| * Helper to type the registered scoped bridge correctly. | ||
| * | ||
| * FIXME: This is needed because `register` is not an async function, so |
There was a problem hiding this comment.
interesting. it does seem like we would get it working without this but I agree it's not worth the time right now and this is an appropriate working solution
| @@ -103,13 +103,16 @@ type ClientProvider = { | |||
| }; | |||
|
|
|||
| type Producer<T> = { | |||
| resolve: (v: ERef<T>) => void; | |||
| resolve: (v: ERef<T | import('@endo/exo').Guarded<T>>) => void; | |||
There was a problem hiding this comment.
shouldn't T itself by the Guarded type?
There was a problem hiding this comment.
Good catch! This was a leftover attempt before I started typing KindFacet correctly. Reverted.
| const vatLoader = name => { | ||
| /** @type {VatLoader} */ | ||
| const vatLoader = async name => { | ||
| /** @typedef {Awaited<WellKnownVats[typeof name]>} VatRoot */ |
There was a problem hiding this comment.
inline typedef seems smelly, but I don't have a better solution. Consider naming it ThisVatRoot or something else to make clear it's just for this switch.
There was a problem hiding this comment.
I opted for ReturnedVat.
| @@ -117,13 +117,15 @@ export const makeMockTestSpace = async log => { | |||
| produce.zoe.resolve(zoe); | |||
| produce.feeMintAccess.resolve(feeMintAccessP); | |||
|
|
|||
| const vatLoader = name => { | |||
| /** @type {VatLoader} */ | |||
There was a problem hiding this comment.
a little loose since the type says it can load any vat and this handles just two of them
There was a problem hiding this comment.
I ended up restricting the loadable names.
| orchestration: ERef< | ||
| ReturnType< | ||
| typeof import('@agoric/orchestration/src/vat-orchestration.js').buildRootObject | ||
| > | ||
| >; |
There was a problem hiding this comment.
vat-orchestration exports this
| orchestration: ERef< | |
| ReturnType< | |
| typeof import('@agoric/orchestration/src/vat-orchestration.js').buildRootObject | |
| > | |
| >; | |
| orchestration: OrchestrationVat; |
| priceAuthority: PriceAuthorityVat; | ||
| provisioning: ProvisioningVat; | ||
| transfer: TransferVat; | ||
| zoe: ERef<ReturnType<typeof import('../vat-zoe.js').buildRootObject>>; |
There was a problem hiding this comment.
shall we have vat-zoe export this as vat-orchestration does?
michaelfig
added
the
automerge:no-update
refs: #9441
Description
Finish adopting
WellKnownVatsinVatLoaderas proposed by @turadg in #9441Accommodate
Guardedtypes in:Producer<T>.resolvepackages/swingset-liveslots:
KindFacetimpliesRemotableBrandCast the return type of
BridgeHandler.registerbecause it wasn't anasyncfunction, and there's no way I know using TypeScript to be able to transform the return type of a generic function toPromise<ReturnType<T>>without losingT's genericity.