Skip to content

feat(sexpr): count-compare + matches parse-time regex + accessor docs#196

Merged
avrabe merged 1 commit intomainfrom
feat/v043-sexpr-followups
Apr 22, 2026
Merged

feat(sexpr): count-compare + matches parse-time regex + accessor docs#196
avrabe merged 1 commit intomainfrom
feat/v043-sexpr-followups

Conversation

@avrabe
Copy link
Copy Markdown
Contributor

@avrabe avrabe commented Apr 22, 2026

Summary

Closes the three recommendations surfaced by the sexpr audit PR #194:

  1. Count comparisons: (> (count <scope>) N) and all 5 other comparison operators now lower to a new Expr::CountCompare variant. Previously (count …) had no lowering path as a numeric operand — it could only appear as a standalone predicate. Now authors can gate on artifact counts directly.

  2. Matches parse-time regex validation: invalid regex patterns in (matches field "…") produce a parse error with the compiler's complaint instead of silently matching nothing at runtime. Closes the "mysterious empty result" debugging footgun.

  3. Docs clarification: new sections in getting-started.md for count comparisons + regex validation + the scope of field accessors (dotted forms are not navigated — use the purpose-built link predicates).

Test plan

  • 5 new regression tests in sexpr_eval::tests covering the 3 shapes above
  • Existing test matches_invalid_regex_returns_false_safely renamed and updated to pin the new stricter behavior (parse error vs silent false)
  • cargo test --workspace — 40/40 test binaries green
  • rivet docs check — PASS (41 files, 0 violations)

Implements: REQ-004
Refs: DD-058

🤖 Generated with Claude Code

…+ doc clarifications

Three followups from the v0.4.3 sexpr audit:

1. `(> (count <scope>) N)` now lowers to a new `CountCompare` expr
   variant that evaluates the count against the store once and
   compares to an integer threshold. Previously the audit documented
   `(count ...)` as "meant for numeric comparisons" but no lowering
   existed — you could only use it as a standalone predicate
   (equivalent to `(exists <scope> true)`). Now every comparison
   operator (>, <, >=, <=, =, !=) accepts a `(count ...)` LHS with an
   integer RHS.

2. `(matches <field> "<regex>")` validates the regex at lower time
   instead of silently returning false at runtime on malformed
   patterns. Closes the "mysterious empty result" footgun the audit
   flagged — users typing `(matches id "[")` used to see nothing
   match and spend time debugging; now they get a parse error with
   the compiler's message. Non-literal patterns (rare; from field
   interpolation) still use the runtime-lenient path.

3. docs/getting-started.md gains dedicated sections for count
   comparisons and regex validation, plus a note that dotted
   accessors like `links.satisfies.target` are not supported — use
   the purpose-built `linked-by` / `linked-from` / `linked-to` /
   `links-count` predicates. Closes the doc drift where the filter
   language's scope was implicit.

Regression tests:
- count_compare_gt_threshold — basic shape lowers
- count_compare_requires_integer_rhs — string on the right errors
- count_compare_all_six_operators_lower — all six comparison ops
- matches_rejects_invalid_regex_at_lower_time — unclosed brackets
  produce parse error
- matches_accepts_valid_regex — good patterns still work

Updated sexpr_fuzz.rs expr_to_sexpr pretty-printer to handle the new
Expr::CountCompare variant (fuzz roundtrip stays equivalent).

Updated sexpr_predicate_matrix.rs test that pinned the old lenient
regex behavior to the new strict behavior.

Implements: REQ-004
Refs: DD-058

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@avrabe avrabe merged commit b5ccfbc into main Apr 22, 2026
2 checks passed
@avrabe avrabe deleted the feat/v043-sexpr-followups branch April 22, 2026 21:54
@github-actions
Copy link
Copy Markdown

📐 Rivet artifact delta

No artifact changes in this PR. Code-only changes (renderer, CLI wiring, tests) don't touch the artifact graph.

Copy link
Copy Markdown

@github-actions github-actions Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Rivet Criterion Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.20.

Benchmark suite Current: ab7bdc3 Previous: 2b94ece Ratio
link_graph_build/10000 36130531 ns/iter (± 3716078) 24522359 ns/iter (± 1869072) 1.47
query/10000 139143 ns/iter (± 497) 108848 ns/iter (± 726) 1.28

This comment was automatically generated by workflow using github-action-benchmark.

@avrabe avrabe mentioned this pull request Apr 23, 2026
3 tasks
avrabe added a commit that referenced this pull request Apr 23, 2026
* feat(variant): rivet variant explain for debugging solve outcomes

Answers "why did my variant pick/skip feature X?" — a dev/debug UX gap
called out in the v0.4.3 scope.

Two modes:

  # Full audit: every effective feature + origin, unselected features,
  # and the constraint list
  rivet variant explain --model fm.yaml --variant prod.yaml

  # Single-feature focus: origin, attribute values, and every
  # constraint that mentions the feature
  rivet variant explain --model fm.yaml --variant prod.yaml asil-c

Each effective feature carries an origin:
  - `selected`        — user listed it under `selects:`
  - `mandatory`       — parent group is mandatory, or is the root
  - `implied by <X>`  — a constraint forced it in once <X> was selected
  - `allowed`         — present but not proven mandatory

`--format json` emits a structured audit for scripts (dashboard uses
the same shape for the variant sidebar).

Coverage:
  - explain_single_feature_shows_origin_and_attrs (text mode)
  - explain_single_feature_json_mode
  - explain_full_variant_audit_lists_origins_and_unselected

Docs: new "Debugging" subsection in docs/getting-started.md under the
variant management chapter, with an origin table.

Implements: REQ-046
Refs: DD-050

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* test(variant): enrich eu-adas-c example + per-format smoke on realistic model

Adds realistic `attributes:` to examples/variant/feature-model.yaml
for every market (eu/us/cn with compliance+locale) and every ASIL
level (asil-numeric + required analysis techniques). These match the
worked examples in docs/getting-started.md so users can run the
snippets against the shipped fixture and see the same output.

New integration test `every_format_renders_realistic_example`
exercises all 7 --format values against the enriched example and
asserts each output contains the variant name and the asil-c marker
(in whatever casing the format uses). Catches regressions that pass
on toy models but break on constraint-driven inclusion, multi-attr
features, or non-trivial tree depth.

Implements: REQ-046
Refs: DD-050

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* chore(release): v0.4.3

Workspace version bump 0.4.2 → 0.4.3, CHANGELOG entry covering the
v0.4.3 changes that have already landed on main:

- rivet variant features/value/attr for 7 build systems (#197)
- docs: variant emitter walkthrough + exit-code contract (#198)
- rivet variant explain for debugging solve outcomes (#199)
- test: enrich eu-adas-c example + per-format smoke (#199)
- sexpr count-compare + matches parse-time regex (#196)
- SCRC Phase 1 clippy restriction lint escalation (#195)
- Rivet Delta SVG render for email/mobile (#193)
- stamp --missing-provenance filter + warn-skip (#192)

v043-artifacts.yaml gains five new entries matching the implementations:
  - DD-061  build-system emitters are namespaced and loud-on-failure
  - FEAT-130 rivet variant features/value/attr
  - FEAT-131 rivet variant explain
  - DD-062  matches regex + count-compare validated at lower time
  - FEAT-132 count-compare lowering + matches parse-time regex
  - FEAT-133 Rivet Delta SVG render for email/mobile
  - FEAT-134 rivet stamp filter + warn-skip

All 41 test binaries green. rivet validate: only pre-existing SPAR
aadl-component schema errors remain (unrelated to this release).

Implements: REQ-046
Refs: REQ-004, REQ-010, DD-050, DD-058

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant