mirror of
https://github.com/priyanshujain/sanderling.git
synced 2026-10-02 11:07:10 +00:00
* feat(trace): extend Step/Action/Meta schema for inspect UI
Add Step.Hierarchy, Step.Residuals, Action.Selector/ResolvedBounds/TapPoint,
Meta.EndedAt and JSON tags on hierarchy.Element/Bounds/Tree so trace.jsonl
can drive the upcoming uatu inspect web UI.
* test(trace): cover EndedAt + new step fields round-trip
* feat(ltl): MarshalJSON for Formula AST + Evaluator.Residual()
Each Formula concrete type now serializes to a closed-set residual node
(true/false/not/and/or/implies/always/now/next/eventually/predicate/error)
that mirrors the TS spec API surface. Evaluator.Residual() folds pending
obligations into a single Formula so the runner can stamp one residual
per property per step into trace.jsonl.
* feat(runner): stamp residuals, hierarchy, selector targets, ended_at
Each Step now carries the captured hierarchy, per-property residual ASTs,
and (for Tap/InputText) the selector + resolved bounds + tap point. The
test_run command writes meta.ended_at on graceful shutdown so the inspect
UI can distinguish completed runs from in-progress ones.
* feat(inspect): scaffold embed dist for SPA assets
Stage 2 stub for the inspect server. Real web bundle gets wired in
Stage 4 (Makefile copies web/dist into internal/inspect/dist).
* chore(web): ignore web/ build output in root .gitignore
* chore(web): add bun + vite + vitest scaffold config
* feat(web): monochrome design tokens, typography, app shell CSS
* chore(web): placeholder for self-hosted JetBrains Mono fonts
* feat(web): index.html entry with style links and root mount
* feat(web): typescript types mirroring run/step trace schema
* feat(web): typed fetchers for runs/steps/screenshots
* feat(web): App shell with router and run/step routes
* feat(inspect): runs scan, lazy step parse, mtime-aware cache
* feat(web): RunList route with table, loading, and error states
* feat(web): RunDetail route shell with three placeholder panels
* feat(inspect): fsnotify-backed runs watcher with debounce
* fix(web): use jest-dom/vitest entry so matchers register
* test(web): cover listRuns happy path and error response
* test(web): render RunList with mocked fetch and assert row
* chore(web): commit bun lockfile
* feat(inspect): http handlers for runs/steps/screenshots/SSE
* test(inspect): cover handlers, screenshot whitelist, SSE, dev proxy
* feat(cmd): add 'uatu inspect' subcommand
* fix(web): align TS types with snake_case wire format
Go inspect server serializes RunSummary, StepSummary, Step, Meta with
snake_case JSON tags (matching the on-disk trace.jsonl/meta.json). Update
the TS types and consumers to match so API responses parse without
runtime undefined fields. Action keeps resolvedBounds/tapPoint as camelCase
because those keys were defined that way in the trace schema.
* feat(web): add ActionList panel for run-detail step navigation
* feat(web): add SnapshotTable panel with diff highlighting
Renders snapshots dictionary as a flat sorted dotted-path tree.
Changed leaves get data-changed plus a hover title with the previous value.
* test(web): cover SnapshotTable rendering and diff behavior
Eight cases: empty state, sort order, dotted-path expansion,
changed/unchanged/missing-previous flagging, and inline-vs-expanded arrays.
* feat(web): add Screenshot panel with bounds and tap overlays
Center column of run-detail page. Renders the device screenshot
scaled to fit, with an SVG overlay drawing resolvedBounds as a
violation-colored rect, tapPoint as a contrast ring, and swipes
as an arrow. Falls back to a placeholder when src is missing or
the image fails to load.
* fix(web): guard scrollIntoView call for jsdom compatibility
* test(web): cover Screenshot panel rendering and overlays
* test(web): cover ActionList rendering, selection, keyboard, and markers
* feat(web): add ExceptionsPanel component
* test(web): add ExceptionsPanel tests
* feat(web): add Timeline panel with property swimlanes
Renders SVG swimlanes per property with violated/pending/holds cells,
action-marker dots, click-to-seek, and a selected-step highlight bar.
* test(web): cover Timeline empty state, cells, status, click, highlight
* feat(web): add ResidualNode recursive AST renderer
* test(web): cover ResidualNode operators, predicate, and error chip
* feat(web): add ViolationsPanel with status badges and jump button
* test(web): cover ViolationsPanel rows, status grouping, and jump button
* test(web): register testing-library cleanup globally
All six panel test files added local afterEach(cleanup); centralize it in
the shared setup so future tests inherit DOM isolation by default.
* feat(web): hooks for url/keyboard/theme/sse
* feat(web): wire all panels into run-detail with phone-dominant grid
ActionList left, Screenshot center, Snapshots/Properties/Exceptions
stacked right, Timeline bottom. URL-synced step index (useStep), keyboard
shortcuts (j/k/arrows/g/G/.), light+dark theme toggle stored in
localStorage, SSE auto-refresh on the run index.
* test(web): add three reference run fixtures (clean, violation, exception)
* build: web targets in Makefile + bun in CI; docs(inspect)
- Makefile: web-build/web-dev/inspect-dev/test-web targets; uatu and
install now depend on web-build so the binary embeds the latest SPA.
- ci.yml: setup-bun + cache; existing make test now runs web typecheck +
vitest as part of the full suite.
- docs/manual/inspect.md: panel reference, keyboard shortcuts, URLs.
- docs/manual/cli.md: document uatu inspect.
- README: link to inspect docs.
* feat(runner): capture a screenshot per step
The driver already exposes Screenshot(ctx), but the runner never called
it. Each step now writes <run>/screenshots/step-NNNNN.png right after
the trace line, using the same failure-is-a-warning posture as other
best-effort observability hooks. Makes the inspect UI's center panel
actually useful.
* feat(inspect): include action_label in StepSummary
Tap/InputText/Swipe/PressKey/Wait each get a short human-readable
label (selector, quoted text, swipe direction, key name, duration) so
the action list panel can render readable rows instead of just 'Tap'
with no target.
* test(inspect): accept either #app or #root in SPA shell fallback
* feat(web): render action_label and screen in ActionList rows
Step rows now show 'Tap id:save', 'InputText "alice"', 'Swipe up',
'PressKey back', etc. Steps with no action fall back to
'observe @ <screen>' so the list reads as a flow instead of a wall
of '--' placeholders.
* feat(sidecar): implement screencap for android driver backend
Was stubbed to return an empty byte array, which made the runner's
per-step screenshot capture a no-op. Shell out to 'adb exec-out
screencap -p' and stream the PNG bytes back. Width/height stay zero
because the PNG header carries them; the Go side can parse if needed.
* feat(proto): add Metrics RPC for per-step CPU and memory capture
* feat(driver): Metrics(bundleID) returns cpu_percent + heap/total bytes
* feat(sidecar): implement Metrics RPC via adb top + /proc/<pid>/status
* feat(runner): capture metrics + before/after screenshots per step
Each step now writes step-NNNNN.png (before applyAction) and
step-NNNNN-after.png (after the action + wait-for-idle). The runner
samples Driver.Metrics(bundleID) before writing the trace line and
stamps Step.Metrics with cpu_percent, heap_bytes, total_memory_bytes
so the inspect UI can chart CPU and heap over the run.
* fix(runner,sidecar): measure CPU across step via /proc stat delta
'top -d 0.3 -n 2' measures CPU in a 300ms window that coincides with
the SDK-paused app, always reporting 0%. Switch to reading
/proc/<pid>/stat utime+stime and computing the delta between successive
calls; the natural step cadence gives a 2-5s measurement window that
captures the action response and render cycle. Also moved the sample
to before snapshotStep so the delta starts before the SDK pause.
* feat(web): add Metrics type for per-step cpu and memory
* refactor(web): replace --accent-change with --accent-positive token
* refactor(web): recolor chip-progress as neutral outlined chip
* refactor(web): use neutral border for changed snapshot rows
* feat(web): add MetricsChart panel with HEAP and CPU lanes
SVG-based time-series chart rendering heap bytes and CPU percent per
step across two stacked lanes, with a shared step axis below. Lines are
monochrome; a vertical highlight marks the selected step; per-step hit
rects make any click seek to that step.
* feat(web): revamp ActionList with tag targets, elapsed time, and expandable rows
Render selector-based Tap actions as <tag/> markup, show zero-padded MM:SS.mmm
elapsed time per row, and expand the active row with Position/Content sub-rows
when a full Step is available. Adds formatActionRow/formatElapsed helpers and
covers both with unit tests.
* fix(runner): stop copying Tap selector into action.text
The 'Content' inspect row should show the user-supplied text for
InputText actions and stay empty for Taps. Previously the runner copied
action.On into traceAction.Text for both, so the inspect UI showed the
selector as the tap's 'Content'.
* fix(web): use text-muted for swipe arrow after accent-change removal
* fix(web): snapshot values truncate with ellipsis + title tooltip
Long JSON values were breaking one character per line due to
overflow-wrap:anywhere in a narrow column. Switch to single-line ellipsis
with the full value exposed via the title attribute on hover.
* feat(web): state-before/after columns + metrics chart at bottom
RunDetail now renders a four-column grid:
actions | state-before | state-after | side (exceptions + timeline)
with MetricsChart spanning the bottom row. Each state column shows its
own screenshot (step-NNNNN.png vs step-NNNNN-after.png), snapshot table,
and violations panel. ActionList now receives runStartMillis and the
selected Step so the active row can expand Position/Content sub-rows.
* fix(web): skip zero-value ticks + add exception markers to metrics
HEAP '0B' and CPU '100%' labels overlapped at the lane boundary. Drop
the bottom-of-range tick on both lanes (baseline is implied) and widen
LANE_GAP so the remaining labels have breathing room. Accept an
exceptionStepIndices prop and draw a dashed red vertical line at each
to surface exception spikes directly on the CPU/heap chart.
* fix(web): let action body column shrink below its content
Required minmax(0, 1fr) so the row grid honours the column's min-size of
0 instead of the implicit 'auto', preventing the action-list from
overflowing its parent when the target string is long.
* feat(web): bigger state screenshots + single properties row
Collapse snapshots into a summary chip ('SNAPSHOTS · N violations') so
the screenshot fills its state card. Deduplicate ViolationsPanel —
show it once in a new full-width 'properties' row between the state
cards and the timeline. Drop the right sidebar; exceptions now surface
as dashed markers on the metrics chart with the ExceptionsPanel only
rendering when there are actual exceptions to report.
* feat(web): add minimal Tabs component
Monochrome tab strip with underline-on-active. Used by state-before
and state-after cards to swap between Screenshot, Snapshots, Properties.
Pane scrolls internally so the outer grid stays fixed-height.
* feat(web): fold timeline into MetricsChart as STEPS lane
Adds a thin per-step status row above HEAP showing violated (red),
pending (dim gray) or holds (green-tinted). Extends highlight +
exception markers to span the status lane. Frees a whole row in the
detail grid so the page can fit in 100vh.
* refactor(web): tabbed state cards, drop standalone Timeline panel
State-before/after now use Tabs (Screenshot / Snapshots / Properties,
default Screenshot). Removes the dedicated timeline row; status lane
lives on the metrics chart. Banner is gone from the shell.
* feat(web): lock app shell to 100vh with no page scroll
html/body/#root fill the viewport, body gets overflow:hidden, and the
detail grid uses minmax(0, 1fr) rows so inner panels own their scroll.
Tightens toolbar + panel padding for a denser feel.
* feat(web): arrow-key nav + badges on Tabs (WAI-ARIA tablist)
Roving tabindex, ArrowLeft/Right/Up/Down/Home/End navigation, explicit
aria-selected/aria-controls/id wiring, and support for an optional
badge inside each tab (used for violation counts).
* feat(web): ViolationsPanel supports violationsOnly filter
* feat(web): ActionList arrow-key nav + listbox semantics + smaller font
Promote the list to role=listbox with role=option rows; roving tabindex
lets ArrowUp/Down (and Home/End) seek between steps with focus. Font
size dropped to 11px and padding tightened so long selector-tag labels
fit in the 340px actions column.
* fix(web): useKeyboardNav yields arrow keys to tablist/listbox targets
Previously pressing ArrowRight on a focused tab switched tabs AND
advanced the step. Skip arrow handling when the event target is inside
an element with an arrow-owning ARIA role.
* feat(web): fourth 'Violations' tab + wider actions + shorter metrics
Adds a Violations tab to each state card showing only violated properties
(with count badge on the tab label when > 0). Actions column widened
from 280px to 340px, bottom metrics strip trimmed from 220px to 140px
with tighter lane heights, so the whole page still fits in 100vh with
no scrollbar.
* feat(web): compact RunDetail layout using 1px borders instead of panel padding
* refactor(inspect): simplify MetricsChart to HEAP+CPU with time axis
Drop the STEPS status lane and per-sample circle markers, switch the
x-axis from step indices to mm:ss clock time, trim y-axis ticks to
min/max with compact units, rotate lane labels into the left gutter,
and replace the thin playhead line with a wider dotted red band.
Traces stay grayscale; red appears only on the playhead pattern.
* fix(web): RunList rows no longer stretch to fill viewport height
Tables inherited flex: 1 1 auto from .app-main > * and distributed extra
vertical space across rows. Override with flex: 0 0 auto + align-self.
* misc changes
* fix(web): hoist useState above early return in MetricsChart
Calling useState after an unconditional early return violates React's
Rules of Hooks: the empty-samples branch renders 0 hooks while the
populated branch calls 1. On the initial null->loaded transition of
history the hook count changes and React throws.
* fix(web): subscribe to named SSE event instead of 'message'
Server emits 'event: runs.changed' frames; the WHATWG EventSource spec
dispatches those as events of type 'runs.changed', not 'message'. The
listener registered on 'message' was never fired, so RunList never
auto-refreshed on run create/finish/delete.
* fix(inspect): unsubscribe SSE clients on disconnect
Watcher.Subscribe appended to a slice with no matching removal path,
so every closed EventSource connection leaked its channel. Over a
long-running server the slice grew unbounded and every fs event paid
O(N) iterating dead channels. Add Unsubscribe + defer it in
handleEvents.
Unsubscribe does not close the channel: broadcast snapshots the
slice without holding the mutex, so a concurrent close would race
with its non-blocking send.
* fix(trace): rename resolvedBounds/tapPoint to snake_case
Every other json tag in the trace schema (from_x, duration_millis,
bundle_sha256, etc.) uses snake_case. The two new Action fields
introduced with the inspect UI broke that pattern. Rename them
before the format ships to external consumers.
* chore(web): drop vitest and remove UI tests from CI
No UI tests wanted in web. Removes vitest, jsdom, testing-library
devDeps and the vitest.setup.ts + vite.config.ts test block.
Makefile test-web becomes web-typecheck (typecheck only).
Fixes CI failure where `vitest run` exits 1 with no test files.
* chore(make): dedupe sidecar embed and drop recursive make
Make $(SIDECAR_JAR) the real recipe and $(SIDECAR_EMBED) a file
target, so uatu/install/inspect-dev share one copy step and
sidecar/release-cli just depend on the jar instead of re-invoking make.
271 lines
7.7 KiB
Go
271 lines
7.7 KiB
Go
package ltl
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// Formula is the AST of a temporal logic property.
|
|
type Formula interface {
|
|
isFormula()
|
|
describe() string
|
|
}
|
|
|
|
// PredicateLabel lets a ThunkFormula carry a human-readable name for the
|
|
// closure it wraps. Verifier wires this in when the spec gives the predicate
|
|
// a property name; otherwise it stays empty and serializes without a name.
|
|
type PredicateLabel interface {
|
|
PredicateName() string
|
|
}
|
|
|
|
// ErrorFormula represents a thunk that threw during evaluation. The verifier
|
|
// substitutes one of these into the residual when MarshalJSON would otherwise
|
|
// have to encode an opaque thunk that already errored. It exists so that the
|
|
// inspect UI can render "predicate threw" inline.
|
|
type ErrorFormula struct {
|
|
Message string
|
|
}
|
|
|
|
func (ErrorFormula) isFormula() {}
|
|
func (e ErrorFormula) describe() string {
|
|
return fmt.Sprintf("Error(%q)", e.Message)
|
|
}
|
|
|
|
type AlwaysFormula struct {
|
|
Inner Formula
|
|
}
|
|
|
|
type PureFormula struct {
|
|
Value bool
|
|
}
|
|
|
|
type ThunkFormula struct {
|
|
Func func() bool
|
|
}
|
|
|
|
// NowFormula marks its inner formula for evaluation at the current step only.
|
|
// Primarily used so that now(...).implies(...) parses unambiguously.
|
|
type NowFormula struct {
|
|
Inner Formula
|
|
}
|
|
|
|
// NextFormula obliges its inner formula to hold at the next step (not this one).
|
|
type NextFormula struct {
|
|
Inner Formula
|
|
}
|
|
|
|
// EventuallyFormula obliges its inner formula to hold at some step within the
|
|
// given bound. An unbounded eventually never triggers a violation within a
|
|
// finite run.
|
|
//
|
|
// When Duration is non-zero and Deadline is the zero time, the evaluator
|
|
// resolves the absolute deadline on first reduction using the observation
|
|
// time. This matches the "within N seconds of obligation instantiation"
|
|
// semantics used by nested Always(Eventually(...).within(...)) formulas.
|
|
type EventuallyFormula struct {
|
|
Inner Formula
|
|
StepBound int
|
|
HasStepBound bool
|
|
Duration time.Duration
|
|
Deadline time.Time
|
|
HasDeadline bool
|
|
}
|
|
|
|
type ImpliesFormula struct {
|
|
Antecedent Formula
|
|
Consequent Formula
|
|
}
|
|
|
|
type OrFormula struct {
|
|
Left Formula
|
|
Right Formula
|
|
}
|
|
|
|
type AndFormula struct {
|
|
Left Formula
|
|
Right Formula
|
|
}
|
|
|
|
type NotFormula struct {
|
|
Inner Formula
|
|
}
|
|
|
|
func Always(inner Formula) Formula { return AlwaysFormula{Inner: inner} }
|
|
|
|
func Pure(value bool) Formula { return PureFormula{Value: value} }
|
|
|
|
func Thunk(function func() bool) Formula { return ThunkFormula{Func: function} }
|
|
|
|
func Now(inner Formula) Formula { return NowFormula{Inner: inner} }
|
|
|
|
func Next(inner Formula) Formula { return NextFormula{Inner: inner} }
|
|
|
|
func Eventually(inner Formula) Formula { return EventuallyFormula{Inner: inner} }
|
|
|
|
func EventuallyWithinSteps(inner Formula, steps int) Formula {
|
|
return EventuallyFormula{Inner: inner, StepBound: steps, HasStepBound: true}
|
|
}
|
|
|
|
func EventuallyBefore(inner Formula, deadline time.Time) Formula {
|
|
return EventuallyFormula{Inner: inner, Deadline: deadline, HasDeadline: true}
|
|
}
|
|
|
|
func EventuallyWithin(inner Formula, duration time.Duration) Formula {
|
|
return EventuallyFormula{Inner: inner, Duration: duration}
|
|
}
|
|
|
|
func Implies(antecedent, consequent Formula) Formula {
|
|
return ImpliesFormula{Antecedent: antecedent, Consequent: consequent}
|
|
}
|
|
|
|
func Or(left, right Formula) Formula { return OrFormula{Left: left, Right: right} }
|
|
|
|
func And(left, right Formula) Formula { return AndFormula{Left: left, Right: right} }
|
|
|
|
func Not(inner Formula) Formula { return NotFormula{Inner: inner} }
|
|
|
|
func (AlwaysFormula) isFormula() {}
|
|
func (PureFormula) isFormula() {}
|
|
func (ThunkFormula) isFormula() {}
|
|
func (NowFormula) isFormula() {}
|
|
func (NextFormula) isFormula() {}
|
|
func (EventuallyFormula) isFormula() {}
|
|
func (ImpliesFormula) isFormula() {}
|
|
func (OrFormula) isFormula() {}
|
|
func (AndFormula) isFormula() {}
|
|
func (NotFormula) isFormula() {}
|
|
|
|
func (a AlwaysFormula) describe() string { return "Always(" + a.Inner.describe() + ")" }
|
|
func (p PureFormula) describe() string { return fmt.Sprintf("Pure(%t)", p.Value) }
|
|
func (ThunkFormula) describe() string { return "Thunk(...)" }
|
|
func (n NowFormula) describe() string { return "Now(" + n.Inner.describe() + ")" }
|
|
func (n NextFormula) describe() string { return "Next(" + n.Inner.describe() + ")" }
|
|
func (e EventuallyFormula) describe() string {
|
|
parts := []string{e.Inner.describe()}
|
|
if e.HasStepBound {
|
|
parts = append(parts, fmt.Sprintf("steps=%d", e.StepBound))
|
|
}
|
|
if e.HasDeadline {
|
|
parts = append(parts, "deadline="+e.Deadline.Format(time.RFC3339Nano))
|
|
} else if e.Duration > 0 {
|
|
parts = append(parts, "within="+e.Duration.String())
|
|
}
|
|
return "Eventually(" + strings.Join(parts, ", ") + ")"
|
|
}
|
|
func (i ImpliesFormula) describe() string {
|
|
return "Implies(" + i.Antecedent.describe() + ", " + i.Consequent.describe() + ")"
|
|
}
|
|
func (o OrFormula) describe() string {
|
|
return "Or(" + o.Left.describe() + ", " + o.Right.describe() + ")"
|
|
}
|
|
func (a AndFormula) describe() string {
|
|
return "And(" + a.Left.describe() + ", " + a.Right.describe() + ")"
|
|
}
|
|
func (n NotFormula) describe() string { return "Not(" + n.Inner.describe() + ")" }
|
|
|
|
// Describe returns a debug-friendly representation of the formula.
|
|
func Describe(formula Formula) string { return formula.describe() }
|
|
|
|
// withinNode mirrors the optional `within` clause attached to bounded
|
|
// Eventually nodes in the JSON AST.
|
|
type withinNode struct {
|
|
Amount int64 `json:"amount"`
|
|
Unit string `json:"unit"`
|
|
}
|
|
|
|
func (a AlwaysFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Arg Formula `json:"arg"`
|
|
}{"always", a.Inner})
|
|
}
|
|
|
|
func (n NowFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Arg Formula `json:"arg"`
|
|
}{"now", n.Inner})
|
|
}
|
|
|
|
func (n NextFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Arg Formula `json:"arg"`
|
|
}{"next", n.Inner})
|
|
}
|
|
|
|
func (n NotFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Arg Formula `json:"arg"`
|
|
}{"not", n.Inner})
|
|
}
|
|
|
|
func (e EventuallyFormula) MarshalJSON() ([]byte, error) {
|
|
payload := struct {
|
|
Op string `json:"op"`
|
|
Arg Formula `json:"arg"`
|
|
Within *withinNode `json:"within,omitempty"`
|
|
}{Op: "eventually", Arg: e.Inner}
|
|
switch {
|
|
case e.HasStepBound:
|
|
payload.Within = &withinNode{Amount: int64(e.StepBound), Unit: "steps"}
|
|
case e.Duration > 0:
|
|
payload.Within = &withinNode{Amount: e.Duration.Milliseconds(), Unit: "milliseconds"}
|
|
case e.HasDeadline:
|
|
payload.Within = &withinNode{Amount: e.Deadline.UnixMilli(), Unit: "deadline"}
|
|
}
|
|
return json.Marshal(payload)
|
|
}
|
|
|
|
func (a AndFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Left Formula `json:"left"`
|
|
Right Formula `json:"right"`
|
|
}{"and", a.Left, a.Right})
|
|
}
|
|
|
|
func (o OrFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Left Formula `json:"left"`
|
|
Right Formula `json:"right"`
|
|
}{"or", o.Left, o.Right})
|
|
}
|
|
|
|
func (i ImpliesFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Left Formula `json:"left"`
|
|
Right Formula `json:"right"`
|
|
}{"implies", i.Antecedent, i.Consequent})
|
|
}
|
|
|
|
func (p PureFormula) MarshalJSON() ([]byte, error) {
|
|
if p.Value {
|
|
return []byte(`{"op":"true"}`), nil
|
|
}
|
|
return []byte(`{"op":"false"}`), nil
|
|
}
|
|
|
|
func (t ThunkFormula) MarshalJSON() ([]byte, error) {
|
|
payload := struct {
|
|
Op string `json:"op"`
|
|
Name string `json:"name,omitempty"`
|
|
}{Op: "predicate"}
|
|
if labeled, ok := any(t).(PredicateLabel); ok {
|
|
payload.Name = labeled.PredicateName()
|
|
}
|
|
return json.Marshal(payload)
|
|
}
|
|
|
|
func (e ErrorFormula) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(struct {
|
|
Op string `json:"op"`
|
|
Message string `json:"message"`
|
|
}{"error", e.Message})
|
|
}
|