Follow-up for #2984964: JSON API + hook_node_grants() implementations: count queries still result in cacheability metadata leak

D'oh! 😞

Makes sense. Good find. Thanks for the detailed report and patch! 👏

The patch does exactly what I would propose! I only have obscenely nitpicky nitpicks:

1. +++ b/src/Controller/EntityResource.php
   @@ -396,10 +391,41 @@ class EntityResource {
   +   * Execute the query in a render context, to catch bubbled cacheability.
   

   Nit: s/Execute/Executes/

   (I know you c/p'ed this, but as soon as it's a method, Drupal CS mandate that this is a 3rd person singular verb.)

2. +++ b/src/Controller/EntityResource.php
   @@ -396,10 +391,41 @@ class EntityResource {
   +   *   Returns an integer for count queries or an array of ids. The values of
   +   *   the array are always entity ids. The keys will be revision ids if the
   +   *   entity supports revision and entity ids if not.
   

   Nit: s/ids/IDs/

All this needs is:

1. CS violation fixed
2. Two nits above fixed.
3. Test coverage

However, in this case, the test coverage would be for functionality that jsonapi_extras provides, not jsonapi. (That's a whole discussion too, see #2942426: [DISCUSSION] Remove query counting and collection counts?.) Given that, I think test coverage is not necessary. Even more so because it's just expanding/consistently applying a pre-existing pattern. So I think this can go in without test coverage.

That leaves only:

1. CS violation fixed
2. Two nits above fixed.

Looks like you're in the USA, so you must be sleeping right now. I'll get those small things done, so you wake up to a fixed issue 😃

Looks like #2 did introduce a small bug. Easy fix :)

And one more small mistake in #2.

Green!

👍🏽