refactor: consolidate proto JSON and YAML serialization into yara-x-proto

Merges the `yara-x-proto-json` and `yara-x-proto-yaml` crates into the
main `yara-x-proto` crate.

This streamlines the project structure by reducing the number of top-level
crates and logically groups all protobuf-related functionalities under a
single crate. JSON and YAML serializers are now exposed as `yara_x_proto::json`
and `yara_x_proto::yaml` modules.

Author: plusvic

Cargo.lock

@@ -23,8 +23,6 @@ members = [
     "macros",
     "parser",
     "proto",
-    "proto-json",
-    "proto-yaml",
     "py",
     "ls",
 ]
@@ -113,8 +111,6 @@ yara-x-fmt = { path = "fmt", version = "1.17.0" }
 yara-x-macros = { path = "macros", version = "1.17.0" }
 yara-x-parser = { path = "parser", version = "1.17.0" }
 yara-x-proto = { path = "proto", version = "1.17.0"}
-yara-x-proto-yaml = { path = "proto-yaml", version = "1.17.0" }
-yara-x-proto-json = { path = "proto-json", version = "1.17.0" }
 zip = { version = "8.2.0", default-features = false }
 simd-adler32 = "0.3.9"
 simd_cesu8 = "1.1.1"

Cargo.toml

@@ -68,8 +68,7 @@ strum_macros = { workspace = true }
 yansi = { workspace = true }
 yara-x = { workspace = true, features = ["parallel-compilation"] }
 yara-x-parser = { workspace = true }
-yara-x-proto-yaml = { workspace = true }
-yara-x-proto-json = { workspace = true }
+yara-x-proto = { workspace = true }
 yara-x-fmt = { workspace = true }
 
 chardetng = "1.0.0"

cli/Cargo.toml

@@ -8,8 +8,8 @@ use std::path::PathBuf;
 use strum_macros::Display;
 
 use yara_x::mods::*;
-use yara_x_proto_json::Serializer as JsonSerializer;
-use yara_x_proto_yaml::Serializer as YamlSerializer;
+use yara_x_proto::json::Serializer as JsonSerializer;
+use yara_x_proto::yaml::Serializer as YamlSerializer;
 
 use crate::help;
 

cli/src/commands/dump.rs

@@ -350,7 +350,7 @@ goldenfile = { workspace = true }
 ihex = { workspace = true }
 pretty_assertions = { workspace = true }
 rayon = { workspace = true }
-yara-x-proto-yaml = { workspace = true }
+yara-x-proto = { workspace = true }
 zip = { workspace = true }
 
 [[bench]]

lib/Cargo.toml

@@ -167,7 +167,7 @@ fn test_modules() {
         let output_file = mint.new_goldenfile(out_path).unwrap();
 
         // Render the module's output as YAML.
-        let mut yaml = yara_x_proto_yaml::Serializer::new(output_file);
+        let mut yaml = yara_x_proto::yaml::Serializer::new(output_file);
 
         yaml.serialize(output).unwrap();
     });