Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions calcit.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,10 @@
(:some raw-element) (element-scroll-to-bottom! raw-element)
:examples $ []
:ffi $ {} (:backend :js) (:target :browser)
:schema $ quote $ Fn Dynamic Dynamic (-> Unit) (:features :js-ffi)
:schema $ quote $ Fn respo.schema/RespoEvent
Fn *dispatch-op $ -> Unit
-> Unit
:features :js-ffi
:ns $ %{} 'NsEntry (:doc |)
:code $ quote $ ns app.comp.process-detail
:require
Expand Down Expand Up @@ -2168,19 +2171,16 @@
hint-fn $ Fn (JsNullish Number) (JsNullish String) (-> Unit)
js/console.warn |[EXIT] code signal
dispatch!
app.schema/Op :process/error $ assert-type
[] pid $ str &newline $ if (js-nullish? code) (str "|signal: " signal) (str "|exit: " code)
Tuple Number String
app.schema/Op :process/error $ app.schema/LogEvent :pid pid :data $ str &newline
if (js-nullish? code) (str "|signal: " signal) (str "|exit: " code)
, sid
dispatch! (app.schema/Op :process/finish pid) sid
swap! *registry dissoc pid
, &unit
.on-error! proc |error $ fn (event)
hint-fn $ Fn JsObject $ -> Unit
dispatch!
app.schema/Op :process/error $ assert-type
[] pid $ str-spaced |error: $ str event
Tuple Number String
app.schema/Op :process/error $ app.schema/LogEvent :pid pid :data $ str-spaced |error: (str event)
, sid
; dispatch! (app.schema/Op :process/finish pid) sid
js/console.error "|[TERMINA] process error" event
Expand All @@ -2189,14 +2189,14 @@
.on (.-stdout proc) |data $ fn (data)
hint-fn $ Fn String $ -> Unit
dispatch!
app.schema/Op :process/stdout $ assert-type ([] pid data) (Tuple Number String)
app.schema/Op :process/stdout $ app.schema/LogEvent :pid pid :data data
, sid
, &unit
.set-encoding! (.-stderr proc) |utf8
.on (.-stderr proc) |data $ fn (data)
hint-fn $ Fn String $ -> Unit
dispatch!
app.schema/Op :process/stderr $ assert-type ([] pid data) (Tuple Number String)
app.schema/Op :process/stderr $ app.schema/LogEvent :pid pid :data data
, sid
, &unit &unit
:examples $ []
Expand Down Expand Up @@ -2351,12 +2351,12 @@
:process/clear
:process/clear-history
:process/create Dynamic
:process/error $ Tuple Number String
:process/error app.schema/LogEvent
:process/finish Number
:process/remove-dead Number
:process/shorten-content Number
:process/stderr $ Tuple Number String
:process/stdout $ Tuple Number String
:process/stderr app.schema/LogEvent
:process/stdout app.schema/LogEvent
:router/change Dynamic
:session/add-message String
:session/enlarge Number
Expand Down Expand Up @@ -2501,13 +2501,27 @@
(:process/clear) (:: :process/clear nil)
(:process/clear-history) (:: :process/clear-history nil)
(:user/log-out) (:: :user/log-out nil)
(:process/error event)
:: :process/error $ [] (:pid event) (:data event)
(:process/stderr event)
:: :process/stderr $ [] (:pid event) (:data event)
(:process/stdout event)
:: :process/stdout $ [] (:pid event) (:data event)
_ $ :: (&enum:nth op 0) & $ &enum:params op
:examples $ []
:schema $ quote $ Fn Op (-> AnyEnum) (:open :reflect)
:tests $ [] $ %{} 'TestEntry (:name |keeps-legacy-process-output-payload)
:code $ quote $ assert=
:: :process/stdout $ [] 42 |ready
op-to-wire $ Op :process/stdout $ assert-type ([] 42 |ready) (Tuple Number String)
:code $ quote $ let
event $ LogEvent :pid 42 :data "|日志🐈"
assert=
:: :process/stdout $ [] 42 "|日志🐈"
op-to-wire $ Op :process/stdout event
assert=
:: :process/stderr $ [] 42 "|日志🐈"
op-to-wire $ Op :process/stderr event
assert=
:: :process/error $ [] 42 "|日志🐈"
op-to-wire $ Op :process/error event
'page $ %{} 'CodeEntry (:doc |)
:code $ quote $ def page
{} (:id nil) (:title |) (:time nil)
Expand Down
4 changes: 2 additions & 2 deletions tests/command-parser.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { tmpdir } from "node:os";
import { join } from "node:path";
import * as c from "../js-out/calcit.core.mjs";
import { parse_command, read_string_field, read_bool_field_or, create_process_$x_, _$s_registry } from "../js-out/app.manager.mjs";
import { database, encode_database } from "../js-out/app.schema.mjs";
import { database, encode_database, op_to_wire } from "../js-out/app.schema.mjs";
import { updater } from "../js-out/app.updater.mjs";

test("only leading assignments are environment and values retain equals signs", () => {
Expand Down Expand Up @@ -52,7 +52,7 @@ test("spawn and exec preserve synthetic stdout/stderr and completion", { timeout
await new Promise(resolve => {
create_process_$x_(data, (operation, sid) => {
const kind = c._$n_enum_$o_nth(operation, 0).value;
events.push({ kind, payload: c._$n_enum_$o_nth(operation, 1), sid });
events.push({ kind, payload: c._$n_enum_$o_nth(op_to_wire(operation), 1), sid });
if (["process/stdout", "process/stderr", "process/finish"].every(expected => events.some(event => event.kind === expected))) resolve();
return;
}, "synthetic-session");
Expand Down