Suggestion: variable to check if player is in water/waterlogged block

[Fenix5fire]

Issue is that %playerblock_inside% have no ability to check if block is waterlogged, so it only works for water itself.
There is no good way to check if player is actually inside water or waterlogged block. Not swimming or losing air, but just staying inside.
PAPI (including official extensions) also doesn't provide any alternatives