Parse .jsonproto files as JSON5

This lets us use advanced features like comments and trailing commas!
signalapp · Jun 26, 2024 · b502388 · b502388
1 parent 3fe5fdd
commit b502388
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/converter/Cargo.toml b/converter/Cargo.toml
@@ -24,6 +24,7 @@ clap = { version = "4.2.1", features = ["derive"] }
 clap-stdin = "0.3.0"
 displaydoc = "0.2.4"
 futures = "0.3.29"
+json5 = "0.4.1"
 protobuf = "3.3.0"
 protobuf-json-mapping = "3.3.0"
 serde_json = "1.0"

diff --git a/converter/src/bin/json_to_binproto.rs b/converter/src/bin/json_to_binproto.rs
@@ -22,7 +22,7 @@ fn main() {
     eprintln!("reading from {:?}", filename.source);
 
     let contents =
-        serde_json::from_str(&String::from_utf8(read_file(filename)).expect("not a string"))
+        json5::from_str(&String::from_utf8(read_file(filename)).expect("not a string"))
             .expect("invalid JSON");
 
     let contents = assert_matches!(contents, serde_json::Value::Array(contents) => contents);

diff --git a/test-cases/account-data.jsonproto b/test-cases/account-data.jsonproto
@@ -1,3 +1,4 @@
+// Minimal backup file that includes only an account data frame.
 [
   {
     "version": "1",