arkedge · kobkaz · May 7, 2024 · May 8, 2024
@@ -28,4 +28,4 @@ structpack = "1.0"
 gaia-stub = "1.0"
 gaia-ccsds-c2a = "1.0"
 gaia-tmtc = "1.0"
-c2a-devtools-frontend = "1.0"
+c2a-devtools-frontend = { path = "devtools-frontend" }
@@ -18,8 +18,8 @@ default = ["console_error_panic_hook"]
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 web-sys = { version = "0.3.69", features = ["console"] }
-opslang-ast = "0.2.1"
-opslang-parser = "0.2.1"
+opslang-ast = "0.3.0-alpha.1"
+opslang-parser = "0.3.0-alpha.1"
 async-recursion = "1.1.0"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by

@@ -12,6 +12,7 @@ export const asInt = asKind("integer");
 export const asDouble = asKind("double");
 export const asBool = asKind("bool");
 export const asArray = asKind("array");
+export const asBytes = asKind("bytes");
 export const asString = asKind("string");
 export const asDuration = asKind("duration");
 export const asDateTime = asKind("datetime");
@@ -29,6 +30,7 @@ export const makeInt = make("integer");
 export const makeDouble = make("double");
 export const makeBool = make("bool");
 export const makeArray = make("array");
+export const makeBytes = make("bytes");
 export const makeString = make("string");
 export const makeDuration = make("duration");
 export const makeDateTime = make("datetime");
@@ -225,6 +225,7 @@ impl Runner {
                 .collect::<Result<_, _>>()
                 .map(Value::Array),
             Numeric(num, s) => self.numeric(num, s),
+            Bytes(b) => Ok(Value::Bytes(b.clone())),
             String(s) => Ok(Value::String((*s).to_owned())),
             DateTime(d) => Ok(Value::DateTime(*d)),
             TlmId(tlm_id) => {
@@ -386,7 +387,7 @@ impl Runner {
                     Double(x) => Ok(Double(-x)),
                     Bool(x) => Ok(Bool(!x)),
                     Duration(x) => Ok(Duration(-x)),
-                    Array(_) | String(_) | DateTime(_) => {
+                    Array(_) | String(_) | DateTime(_) | Bytes(_) => {
                         type_err("numeric, bool, or duration", &v)
                     }
                 }
@@ -401,6 +402,7 @@ impl Runner {
             Double(x) => x.partial_cmp(&right.double()?),
             Bool(x) => Some(x.cmp(&right.bool()?)),
             Array(_) => return type_err("comparable", left),
+            Bytes(_) => return type_err("comparable", left),
             String(x) => Some(x[..].cmp(right.string()?)),
             Duration(x) => Some(x.cmp(&right.duration()?)),
             DateTime(x) => Some(x.cmp(&right.datetime()?)),

@@ -6,6 +6,7 @@ type Value =
   {kind : "double", value : number} |
   {kind : "bool", value : boolean } |
   {kind: "array", value : Value[] } |
+  {kind: "bytes", value : Uint8Array } |
   {kind: "string", value: string } |
   {kind: "duration", value: bigint } |
   {kind: "datetime", value: bigint }
@@ -24,6 +25,8 @@ extern "C" {
     fn as_bool(_: &UnionValue) -> Option<bool>;
     #[wasm_bindgen(js_name = "asArray")]
     fn as_array(_: &UnionValue) -> Option<Vec<UnionValue>>;
+    #[wasm_bindgen(js_name = "asBytes")]
+    fn as_bytes(_: &UnionValue) -> Option<Vec<u8>>;
     #[wasm_bindgen(js_name = "asString")]
     fn as_string(_: &UnionValue) -> Option<std::string::String>;
     #[wasm_bindgen(js_name = "asDuration")]
@@ -39,6 +42,8 @@ extern "C" {
     fn make_bool(_: bool) -> UnionValue;
     #[wasm_bindgen(js_name = "makeArray")]
     fn make_array(_: Vec<UnionValue>) -> UnionValue;
+    #[wasm_bindgen(js_name = "makeBytes")]
+    fn make_bytes(_: Vec<u8>) -> UnionValue;
     #[wasm_bindgen(js_name = "makeString")]
     fn make_string(_: std::string::String) -> UnionValue;
     #[wasm_bindgen(js_name = "makeDuration")]
@@ -61,6 +66,8 @@ impl From<UnionValue> for Value {
         } else if let Some(vs) = as_array(&v) {
             let vs = vs.into_iter().map(Into::into).collect();
             Array(vs)
+        } else if let Some(v) = as_bytes(&v) {
+            Bytes(v)
         } else if let Some(v) = as_string(&v) {
             String(v)
         } else if let Some(v) = as_duration(&v) {
@@ -83,6 +90,7 @@ impl From<Value> for UnionValue {
                 let vs = vs.into_iter().map(Into::into).collect();
                 make_array(vs)
             }
+            Bytes(v) => make_bytes(v),
             String(v) => make_string(v),
             Duration(v) => make_duration(v.num_milliseconds()),
             DateTime(v) => make_datetime(v.timestamp_millis()),

@@ -7,6 +7,7 @@ pub(crate) enum Value {
     Double(f64),
     Bool(bool),
     Array(Vec<Value>),
+    Bytes(Vec<u8>),
     String(String),
     Duration(chrono::Duration),
     DateTime(chrono::DateTime<chrono::Utc>),
@@ -50,6 +51,7 @@ impl Value {
             Double(_) => "double",
             Bool(_) => "bool",
             Array(_) => "array",
+            Bytes(_) => "bytes",
             String(_) => "string",
             Duration(_) => "duration",
             DateTime(_) => "datetime",
@@ -82,6 +84,13 @@ impl Value {
         }
     }
 
+    pub fn bytes(&self) -> Result<&[u8]> {
+        match self {
+            Value::Bytes(x) => Ok(x),
+            _ => type_err("bytes", self),
+        }
+    }
+
     pub fn duration(&self) -> Result<chrono::Duration> {
         self.cast()
     }

@@ -32,6 +32,7 @@
     "@protobuf-ts/grpcweb-transport": "^2.8.2",
     "@protobuf-ts/runtime": "^2.9.3",
     "@protobuf-ts/runtime-rpc": "^2.9.3",
+    "c2a-devtools": "link:",
     "monaco-editor": "^0.48.0",
     "react": "18.3.0",
     "react-dom": "18.3.0",

@@ -261,7 +261,7 @@ class Driver implements opslang.Driver {
         executorComponent,
         command,
       },
-      parameters: fullParams.map((arg): ParameterValue => {
+      parameters: fullParams.map((arg: opslang.Value): ParameterValue => {
         if (arg.kind === "integer") {
           return {
             type: "integer",
@@ -272,6 +272,12 @@ class Driver implements opslang.Driver {
             type: "double",
             double: arg.value,
           };
+        } else if (arg.kind === "bytes") {
+          return {
+            type: "bytes",
+            bytes: arg.value,
+            bigint: BigInt(0), // dummy ???
+          };
         } else if (arg.kind === "datetime") {
           const datetimeOrigin = this.datetimeOrigin.get(receiverComponent);
           if (datetimeOrigin === undefined) {