How does the new 'expiration' feature interact with caveats?

[spacecheeserocks]

Regarding the newly merged 'relationship expiration' feature #2152, does anyone know how this feature would interact with caveats at all?

I can see the example schema in the pull request:

use expiration

definition user {}

definition resource {
  relation viewer: user with expiration
}

And I can see that the expiration time is passed as a new parameter, as per the example.

However, if I wanted to combine this expiration with a caveat, is this possible, and how would it be represented in the schema? I would expect something like the following, but I don't believe there's currently a way to specify multiple with constraints...

use expiration

caveat has_valid_ip(user_ip ipaddress, allowed_range string) {
  user_ip.in_cidr(allowed_range)
}

definition user {}

definition resource {
  relation viewer: user with has_valid_ip with expiration
}

[josephschorr]

You use and:

use expiration

caveat has_valid_ip(user_ip ipaddress, allowed_range string) {
  user_ip.in_cidr(allowed_range)
}

definition user {}

definition resource {
  relation viewer: user with has_valid_ip and expiration
}

[spacecheeserocks]

Sounds good to me!