Skip to content

Commit db8401f

Browse files
committed
feat: restructured crates so that cli is not dependent on the reader
1 parent 39f4969 commit db8401f

File tree

16 files changed

+99
-35
lines changed

16 files changed

+99
-35
lines changed

Cargo.lock

Lines changed: 82 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["cli", "reader/rust"]
2+
members = ["crates/cli", "crates/package", "crates/parser"]
33
resolver = "3"
44

55
[workspace.package]
@@ -9,7 +9,7 @@ edition = "2024"
99
[workspace.dependencies]
1010
serde = "1.0.219"
1111
serde_json = "1.0.140"
12-
tucana = "0.0.37"
12+
tucana = { path="../tucana/build/rust" }
1313
clap = "4.5.41"
1414
colored = "3.0"
1515
tabled = "0.20"
@@ -20,4 +20,6 @@ futures = "0.3.31"
2020
zip = "6.0.0"
2121
bytes = "1.10.1"
2222
prost = "0.14.1"
23-
code0-definition-reader= "0.0.13"
23+
24+
[workspace.dependencies.parser]
25+
path = "crates/parser"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ description = "The cli for managing the Code0-Definitions"
66
repository = "https://github.com/code0-tech/code0-definitions"
77
homepage = "https://code0.tech"
88
license = "Apache-2.0"
9-
readme = "../README.md"
9+
readme = "../../README.md"
1010

1111
[dependencies]
1212
clap = { workspace = true, features = ["derive"] }
13-
code0-definition-reader = { workspace = true }
13+
parser = { workspace = true }
1414
tucana = { workspace = true }
1515
colored = { workspace = true }
1616
tabled = { workspace = true }
@@ -22,4 +22,4 @@ tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] }
2222
futures = { workspace = true }
2323
zip = { workspace = true }
2424
bytes = { workspace = true }
25-
prost = {workspace = true}
25+
prost = { workspace = true }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::formatter::{error, warning};
2-
use code0_definition_reader::reader::Meta;
2+
use parser::reader::Meta;
33
use std::cmp::PartialEq;
44
use std::path::Path;
55
use std::process::exit;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use crate::analyser::diagnostics::DiagnosticKind::{
66
UndefinedGenericKey, UndefinedTranslation, UnusedGenericKey,
77
};
88
use crate::analyser::diagnostics::{Diagnose, DiagnosticKind, Reporter};
9-
use code0_definition_reader::parser::Parser;
10-
use code0_definition_reader::reader::{Meta, MetaType, Reader};
9+
use parser::parser::Parser;
10+
use parser::reader::{Meta, MetaType, Reader};
1111
use tucana::shared::data_type_identifier::Type;
1212
use tucana::shared::definition_data_type_rule::Config;
1313
use tucana::shared::{DataTypeIdentifier, DefinitionDataType, FlowType, RuntimeFunctionDefinition};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use code0_definition_reader::parser::Parser;
1+
use parser::parser::Parser;
22
use prost::Message;
33
use std::fs;
44
use std::io::Write;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use crate::formatter::{info, success};
2-
use code0_definition_reader::parser::Parser;
2+
use parser::parser::Parser;
33
use colored::Colorize;
4-
use prost::Message;
5-
use tucana::shared::DefinitionDataType;
64

75
pub fn search_definition(name: String, path: Option<String>) {
86
let dir_path = path.unwrap_or_else(|| "./definitions".to_string());
File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::analyser::Analyser;
22
use crate::formatter::{success, success_table};
33
use crate::table::{feature_table, summary_table};
4-
use code0_definition_reader::parser::{Feature, Parser};
4+
use parser::parser::{Feature, Parser};
55

66
pub fn search_feature(name: Option<String>, path: Option<String>) {
77
let dir_path = path.unwrap_or_else(|| "./definitions".to_string());
File renamed without changes.

0 commit comments

Comments
 (0)