Repository navigation
Commit 935fefb
committed
feat: runner-evaluated let bindings with embedded-file ordering
Move EXPR `let` binding evaluation (RFC 0007) from the Session's action
entry points into the script runners, mirroring openjd-rs's runner
ordering: embedded-file *paths* are allocated first (a filename is a
plain string, so allocation cannot depend on `let`), then the script's
bindings evaluate — so they can reference Env.File.*/Task.File.* — and
file *contents* are written after, so `data` expressions can use
let-bound values. With the companion openjd-model and openjd-cli
changes, the Python CLI passes the full openjd-specifications
conformance suite (1145/1145), matching the Rust CLI.
- EmbeddedFiles.materialize is split into allocate_file_paths and
write_file_contents; the Env.File.*/Task.File.* symbols are typed as
host-format paths for EXPR evaluation (property access like
`.parent`/`.stem` works), matching openjd-rs.
- The shared apply_let_bindings helper lives in _runner_base; the
step/environment runners evaluate their script's bindings between the
two phases. The Session's wrap-interception branches evaluate the
wrapped script's bindings themselves before resolving the wrapped
action (embedded files are not materialized on the wrap path).
- An environment's `variables` resolve against the session symbol table
without the script's own bindings, matching the openjd-rs runtime.
- enter_environment gains extra_let_bindings: a step's environments are
entered with the step-level bindings (Step.let on the instantiated
Job) so their variables and actions can reference them — the v0
counterpart of the per-step resolved symbol table that openjd-rs
threads into enter_environment. The bindings are re-applied when the
environment exits so onExit resolves in the same scope.
The unit suite passes (639 passed; the two known-flaky timer tests in
test_runner_base.py pass serially), and mypy/black/ruff are clean.
Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com>1 parent ce06fa8 commit 935fefb
5 files changed
Lines changed: 200 additions & 91 deletions
File tree
- src/openjd/sessions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
212 | 229 | | |
213 | 230 | | |
214 | 231 | | |
| |||
222 | 239 | | |
223 | 240 | | |
224 | 241 | | |
225 | | - | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
226 | 247 | | |
227 | 248 | | |
| 249 | + | |
228 | 250 | | |
229 | 251 | | |
230 | 252 | | |
231 | 253 | | |
232 | 254 | | |
233 | 255 | | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
234 | 259 | | |
235 | | - | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
236 | 264 | | |
237 | 265 | | |
238 | 266 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
| 24 | + | |
23 | 25 | | |
24 | 26 | | |
25 | 27 | | |
| |||
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
| 39 | + | |
37 | 40 | | |
38 | 41 | | |
39 | 42 | | |
| |||
196 | 199 | | |
197 | 200 | | |
198 | 201 | | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
199 | 243 | | |
200 | 244 | | |
201 | 245 | | |
| |||
504 | 548 | | |
505 | 549 | | |
506 | 550 | | |
| 551 | + | |
507 | 552 | | |
508 | 553 | | |
509 | 554 | | |
510 | 555 | | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
511 | 562 | | |
512 | 563 | | |
513 | 564 | | |
| |||
516 | 567 | | |
517 | 568 | | |
518 | 569 | | |
519 | | - | |
520 | | - | |
521 | | - | |
522 | | - | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
523 | 578 | | |
524 | 579 | | |
525 | 580 | | |
| |||
532 | 587 | | |
533 | 588 | | |
534 | 589 | | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
535 | 607 | | |
536 | 608 | | |
537 | 609 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
126 | | - | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
127 | 135 | | |
128 | 136 | | |
129 | 137 | | |
| |||
135 | 143 | | |
136 | 144 | | |
137 | 145 | | |
| 146 | + | |
138 | 147 | | |
139 | 148 | | |
140 | 149 | | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
141 | 154 | | |
142 | 155 | | |
143 | 156 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
105 | | - | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
106 | 110 | | |
107 | 111 | | |
108 | 112 | | |
109 | 113 | | |
110 | 114 | | |
111 | 115 | | |
112 | 116 | | |
| 117 | + | |
113 | 118 | | |
114 | 119 | | |
115 | 120 | | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
116 | 125 | | |
117 | 126 | | |
118 | 127 | | |
| |||
0 commit comments