RequireForUpdate & SystemAPI.Query, [RequireMatchingQueriesForUpdate], IJobEntity

[plush garden]

Is there a practical way to set up a system's update requirements when mixing the various ways to iterate over entities and generate queries?

[RequireMatchingQueriesForUpdate] does the job for a bit, until for example you need to add a singleton to the list of required queries. I didn't find a way to just add something to that list (it seems RequireForUpdate overrides its behavior).

I have a similar problem when using IJobEntity and friends when using the implicitly generated queries (which are convenient for aspects).

[modest plaza]

state.RequireForUpdate allows you to specify specific queries for updating a system

and most of the time is the only tool for the job

as you point out, RequireMatchingQueriesForUpdate is a lot less useful these days with the addition of singletons

[plush garden]

Yes, but I can't add the queries generated by SystemAPI.Query and IJobEntity to that without duplicating the query, can I?

[modest plaza]

Nope and it's an annoyance I agree

Getting those queries out would be a good quality of life