How do I set types properly in V7?

If I type it like this, I get red squiggly from query(... onwards
collectionData<BuyBackOffer>( query( collection(this.afs, "BuyBackOffers"), where(...)))

If I type it like this, I get red squiggly from collection(... onwards)
collectionData<BuyBackOffer>( query<BuyBackOffer>( collection(this.afs, "BuyBackOffers"), where(...)))

I tried all sorts of combinations but can't seem to get it right.

A also have the same problem typing data returned from httpsCallable
httpsCallable( this.functions, "name" )( someobject )
I have no idea how to type what the httpsCallable returns. Thanks in advance for any suggestions.