Merge pull request #115 from code0-tech/107-proto-json-rust

ProtoJSON Rust

Author: raphael-goetz

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/pkg-')
     defaults:
       run:
-        working-directory: "./reader/rust"
+        working-directory: "./crates/package"
     steps:
       - name: Checkout Code
         uses: actions/checkout@v5
@@ -69,7 +69,7 @@ jobs:
 
       - name: Build project
         run: cargo run bundle --path ../definitions --out ../bundles
-        working-directory: "./cli"
+        working-directory: "./crates/cli"
 
       - name: Archive definitions folder
         run: |
@@ -94,7 +94,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/cli-')
     defaults:
       run:
-        working-directory: "./cli"
+        working-directory: "./crates/cli"
     steps:
       - name: Checkout Code
         uses: actions/checkout@v5

Cargo.lock

@@ -1,15 +1,14 @@
 [workspace]
-members = ["cli", "reader/rust"]
+members = ["crates/cli", "crates/package"]
 resolver = "3"
 
 [workspace.package]
-version = "0.0.1"
 edition = "2024"
 
 [workspace.dependencies]
 serde = "1.0.219"
 serde_json = "1.0.140"
-tucana = "0.0.37"
+tucana = "0.0.38"
 clap = "4.5.41"
 colored = "3.0"
 tabled = "0.20"
@@ -19,5 +18,4 @@ tokio = "1.47.0"
 futures = "0.3.31"
 zip = "6.0.0"
 bytes = "1.10.1"
-prost = "0.14.1"
-code0-definition-reader= "0.0.13"
+prost = "0.14.1"

Cargo.toml

@@ -6,11 +6,10 @@ description = "The cli for managing the Code0-Definitions"
 repository = "https://github.com/code0-tech/code0-definitions"
 homepage = "https://code0.tech"
 license = "Apache-2.0"
-readme = "../README.md"
+readme = "../../README.md"
 
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
-code0-definition-reader = { workspace = true }
 tucana = { workspace = true }
 colored = { workspace = true }
 tabled = { workspace = true }
@@ -22,4 +21,4 @@ tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] }
 futures = { workspace = true }
 zip = { workspace = true }
 bytes = { workspace = true }
-prost = {workspace = true}
+prost = { workspace = true }

cli/Cargo.toml renamed to crates/cli/Cargo.toml

@@ -1,5 +1,5 @@
 use crate::formatter::{error, warning};
-use code0_definition_reader::reader::Meta;
+use crate::parser::Meta;
 use std::cmp::PartialEq;
 use std::path::Path;
 use std::process::exit;
@@ -66,13 +66,6 @@ impl Reporter {
             .filter(|p| p.kind.severity() == Severity::Warning)
             .collect()
     }
-
-    pub fn get_debug(&self) -> Vec<&Diagnose> {
-        self.diagnose
-            .iter()
-            .filter(|p| p.kind.severity() == Severity::Debug)
-            .collect()
-    }
 }
 
 pub enum Severity {

cli/src/analyser/diagnostics.rs renamed to crates/cli/src/analyser/diagnostics.rs

@@ -6,8 +6,8 @@ use crate::analyser::diagnostics::DiagnosticKind::{
     UndefinedGenericKey, UndefinedTranslation, UnusedGenericKey,
 };
 use crate::analyser::diagnostics::{Diagnose, DiagnosticKind, Reporter};
-use code0_definition_reader::parser::Parser;
-use code0_definition_reader::reader::{Meta, MetaType, Reader};
+use crate::parser::Parser;
+use crate::parser::{Meta, MetaType, Reader};
 use tucana::shared::data_type_identifier::Type;
 use tucana::shared::definition_data_type_rule::Config;
 use tucana::shared::{DataTypeIdentifier, DefinitionDataType, FlowType, RuntimeFunctionDefinition};

cli/src/analyser/mod.rs renamed to crates/cli/src/analyser/mod.rs

@@ -1,4 +1,4 @@
-use code0_definition_reader::parser::Parser;
+use crate::parser::Parser;
 use prost::Message;
 use std::fs;
 use std::io::Write;
@@ -23,7 +23,7 @@ pub fn bundle(path: Option<String>, out: Option<String>) {
     for feature in parser.features {
         feature.data_types.iter().for_each(|data_type| {
             let mut buf = Vec::new();
-            if let Ok(_) = data_type.encode(&mut buf) {
+            if data_type.encode(&mut buf).is_ok() {
                 let path = format!(
                     "{}/{}_{}_{}.pb",
                     &out_path,
@@ -40,7 +40,7 @@ pub fn bundle(path: Option<String>, out: Option<String>) {
 
         feature.flow_types.iter().for_each(|flow_type| {
             let mut buf = Vec::new();
-            if let Ok(_) = flow_type.encode(&mut buf) {
+            if flow_type.encode(&mut buf).is_ok() {
                 let path = format!(
                     "{}/{}_{}_{}.pb",
                     &out_path,
@@ -57,7 +57,7 @@ pub fn bundle(path: Option<String>, out: Option<String>) {
 
         feature.runtime_functions.iter().for_each(|function| {
             let mut buf = Vec::new();
-            if let Ok(_) = function.encode(&mut buf) {
+            if function.encode(&mut buf).is_ok() {
                 let path = format!(
                     "{}/{}_{}_{}.pb",
                     &out_path,

cli/src/command/bundle.rs renamed to crates/cli/src/command/bundle.rs

@@ -1,8 +1,6 @@
 use crate::formatter::{info, success};
-use code0_definition_reader::parser::Parser;
+use crate::parser::Parser;
 use colored::Colorize;
-use prost::Message;
-use tucana::shared::DefinitionDataType;
 
 pub fn search_definition(name: String, path: Option<String>) {
     let dir_path = path.unwrap_or_else(|| "./definitions".to_string());

cli/src/command/definition.rs renamed to crates/cli/src/command/definition.rs

@@ -1,7 +1,7 @@
 use crate::analyser::Analyser;
 use crate::formatter::{success, success_table};
+use crate::parser::{Feature, Parser};
 use crate::table::{feature_table, summary_table};
-use code0_definition_reader::parser::{Feature, Parser};
 
 pub fn search_feature(name: Option<String>, path: Option<String>) {
     let dir_path = path.unwrap_or_else(|| "./definitions".to_string());