Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cargo/config.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
datex-core = { path = "../datex/crates/datex-core", default-features = false, features = [
"target_native", "decompiler", "syntax_highlighting_legacy", "compiler", "allow_unsigned_blocks"
] }
datex-macro-utils = { path = "../datex/crates/datex-macro-utils" }
datex-macro-utils = { path = "../datex/crates/datex-macro-utils" }
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
target/
.idea
.cargo/config.toml
.cargo/config.toml
.DS_Store
115 changes: 80 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions crates/datex-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = [
]
license-file = "../../LICENSE"

version = "0.0.11"
version = "0.0.12"
edition = "2024"
build = "build.rs"

Expand All @@ -16,15 +16,15 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
clap = { version = "4.0.23", features = ["derive"] }
datex-core = { version = "0.0.12", default-features = false, features = [
datex-core = { version = "0.0.13", default-features = false, features = [
"target_native",
"decompiler",
"syntax_highlighting_legacy",
"compiler",
"lsp_tokio",
"allow_unsigned_blocks",
] }
datex-native = { path = "../datex-native", version = "0.0.11" }
datex-native = { path = "../datex-native", version = "0.0.12" }

tokio = { version = "1.17.0", features = ["full"] }
serde = { version = "1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/datex-cli/src/utils/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub fn create_new_config_file(
let mut config_path = base_path.clone();
config_path.push(".datex");
config_path.push(format!("{endpoint}.dx"));
let config = config.to_value_container();
let config = config.to_value_container_without_cache();
let datex_script = decompile_value(
&config,
DecompileOptions {
Expand Down
3 changes: 2 additions & 1 deletion crates/datex-native-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ pub fn main(attr: TokenStream, item: TokenStream) -> TokenStream {
func: original_function,
datex_core_namespace: "datex::core",
setup: None,
init: Some(quote! {
init_scoped: Some(quote! {
datex::flexi_logger::Logger::try_with_env_or_str("warn")
.unwrap_or_else(|_e| datex::flexi_logger::Logger::with(datex::flexi_logger::LogSpecification::warn()))
.log_to_stderr()
.start()
.ok();
datex::com_interfaces::register_native_interface_factories(&runtime.com_hub());
}),
init_unscoped: None,
pre_body: None,
additional_attributes: vec![parse_quote! {#[tokio::main]}],
custom_main_inputs: vec![],
Expand Down
4 changes: 2 additions & 2 deletions crates/datex-native/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "datex-native"
version = "0.0.11"
version = "0.0.12"
description = "DATEX Native Extensions"
authors = [
"Benedikt Strehle <benedikt@unyt.org>",
Expand All @@ -14,7 +14,7 @@ license-file = "../../LICENSE"
crate-type = ["cdylib", "rlib"]

[dependencies]
datex-core = { version = "0.0.12", default-features = false, features = [
datex-core = { version = "0.0.13", default-features = false, features = [
"target_native",
"decompiler",
"syntax_highlighting_legacy",
Expand Down
1 change: 1 addition & 0 deletions crates/datex-native/src/com_interfaces/http/http_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use datex_core::{
};

#[derive(Datex)]
#[datex(structural_recursive)]
pub struct HTTPClientInterfaceSetupDataNative(pub HTTPClientInterfaceSetupData);
impl Deref for HTTPClientInterfaceSetupDataNative {
type Target = HTTPClientInterfaceSetupData;
Expand Down
Loading
Loading