diff --git a/Cargo.lock b/Cargo.lock index 73dcffe..39a7bd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,10 +13,10 @@ name = "box" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -28,10 +28,10 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "glam", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -64,10 +64,10 @@ name = "float" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", ] @@ -84,11 +84,11 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "glam", - "macros", + "nodarium_macros", + "nodarium_utils", "noise", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -115,26 +115,15 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "macros" -version = "0.1.0" -dependencies = [ - "quote", - "serde", - "serde_json", - "syn 1.0.109", - "types", -] - [[package]] name = "math" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -145,10 +134,10 @@ name = "max-plantarium-triangle" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -159,26 +148,58 @@ name = "max-plantarium-vec3" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", ] +[[package]] +name = "nodarium_macros" +version = "0.1.0" +dependencies = [ + "nodarium_types", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + +[[package]] +name = "nodarium_types" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "nodarium_utils" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "glam", + "noise", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "nodes-noise" version = "0.1.0" dependencies = [ "console_error_panic_hook", "glam", - "macros", + "nodarium_macros", + "nodarium_utils", "noise", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -216,10 +237,10 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "glam", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde_json", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -272,10 +293,10 @@ name = "random" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", ] @@ -286,10 +307,10 @@ version = "0.1.0" dependencies = [ "console_error_panic_hook", "glam", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -354,10 +375,10 @@ name = "stem" version = "0.1.0" dependencies = [ "console_error_panic_hook", - "macros", + "nodarium_macros", + "nodarium_utils", "serde", "serde-wasm-bindgen", - "utils", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -385,33 +406,12 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "types" -version = "0.1.0" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "utils" -version = "0.1.0" -dependencies = [ - "console_error_panic_hook", - "glam", - "noise", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen" version = "0.2.92" diff --git a/nodes/max/plantarium/box/Cargo.toml b/nodes/max/plantarium/box/Cargo.toml index 7874227..3fad443 100644 --- a/nodes/max/plantarium/box/Cargo.toml +++ b/nodes/max/plantarium/box/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/box/src/lib.rs b/nodes/max/plantarium/box/src/lib.rs index 954edc0..bad2031 100644 --- a/nodes/max/plantarium/box/src/lib.rs +++ b/nodes/max/plantarium/box/src/lib.rs @@ -1,5 +1,5 @@ -use macros::include_definition_file; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ encode_float, evaluate_float, geometry::calculate_normals, set_panic_hook, split_args, wrap_arg, }; use wasm_bindgen::prelude::*; diff --git a/nodes/max/plantarium/branch/Cargo.toml b/nodes/max/plantarium/branch/Cargo.toml index a2f94b1..e627cf5 100644 --- a/nodes/max/plantarium/branch/Cargo.toml +++ b/nodes/max/plantarium/branch/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/branch/src/lib.rs b/nodes/max/plantarium/branch/src/lib.rs index 7d47ea0..9180467 100644 --- a/nodes/max/plantarium/branch/src/lib.rs +++ b/nodes/max/plantarium/branch/src/lib.rs @@ -1,12 +1,12 @@ -use macros::include_definition_file; -use std::f32::consts::PI; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ concat_arg_vecs, evaluate_float, evaluate_int, geometry::{ create_path, interpolate_along_path, rotate_vector_by_angle, wrap_path, wrap_path_mut, }, log, set_panic_hook, split_args, }; +use std::f32::consts::PI; use wasm_bindgen::prelude::*; include_definition_file!("src/input.json"); diff --git a/nodes/max/plantarium/float/Cargo.toml b/nodes/max/plantarium/float/Cargo.toml index 804bc5c..c1762ed 100644 --- a/nodes/max/plantarium/float/Cargo.toml +++ b/nodes/max/plantarium/float/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/float/src/lib.rs b/nodes/max/plantarium/float/src/lib.rs index 44838a6..5e6b39d 100644 --- a/nodes/max/plantarium/float/src/lib.rs +++ b/nodes/max/plantarium/float/src/lib.rs @@ -1,4 +1,4 @@ -use macros::include_definition_file; +use nodarium_macros::include_definition_file; use wasm_bindgen::prelude::*; include_definition_file!("src/input.json"); diff --git a/nodes/max/plantarium/gravity/Cargo.toml b/nodes/max/plantarium/gravity/Cargo.toml index 81378fe..332cbff 100644 --- a/nodes/max/plantarium/gravity/Cargo.toml +++ b/nodes/max/plantarium/gravity/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/gravity/src/lib.rs b/nodes/max/plantarium/gravity/src/lib.rs index b12e1f5..c779c4e 100644 --- a/nodes/max/plantarium/gravity/src/lib.rs +++ b/nodes/max/plantarium/gravity/src/lib.rs @@ -1,6 +1,6 @@ use glam::Vec3; -use macros::include_definition_file; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ concat_args, evaluate_float, evaluate_int, geometry::{wrap_path, wrap_path_mut}, log, reset_call_count, set_panic_hook, split_args, diff --git a/nodes/max/plantarium/math/Cargo.toml b/nodes/max/plantarium/math/Cargo.toml index cfea41c..aac8ae4 100644 --- a/nodes/max/plantarium/math/Cargo.toml +++ b/nodes/max/plantarium/math/Cargo.toml @@ -15,8 +15,8 @@ wasm-bindgen = "0.2.84" serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } web-sys = { version = "0.3.69", features = ["console"] } [dev-dependencies] diff --git a/nodes/max/plantarium/math/src/lib.rs b/nodes/max/plantarium/math/src/lib.rs index 64cd584..c97015f 100644 --- a/nodes/max/plantarium/math/src/lib.rs +++ b/nodes/max/plantarium/math/src/lib.rs @@ -1,5 +1,5 @@ -use macros::include_definition_file; -use utils::{concat_args, set_panic_hook, split_args}; +use nodarium_macros::include_definition_file; +use nodarium_utils::{concat_args, set_panic_hook, split_args}; use wasm_bindgen::prelude::*; include_definition_file!("src/input.json"); diff --git a/nodes/max/plantarium/noise/Cargo.toml b/nodes/max/plantarium/noise/Cargo.toml index d57b3cf..5ddf492 100644 --- a/nodes/max/plantarium/noise/Cargo.toml +++ b/nodes/max/plantarium/noise/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/noise/src/lib.rs b/nodes/max/plantarium/noise/src/lib.rs index ed8c1d0..bc89c18 100644 --- a/nodes/max/plantarium/noise/src/lib.rs +++ b/nodes/max/plantarium/noise/src/lib.rs @@ -1,9 +1,9 @@ -use macros::include_definition_file; -use noise::{HybridMulti, MultiFractal, NoiseFn, OpenSimplex}; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ concat_args, evaluate_float, evaluate_int, evaluate_vec3, geometry::wrap_path_mut, reset_call_count, set_panic_hook, split_args, }; +use noise::{HybridMulti, MultiFractal, NoiseFn, OpenSimplex}; use wasm_bindgen::prelude::*; include_definition_file!("src/input.json"); diff --git a/nodes/max/plantarium/output/Cargo.toml b/nodes/max/plantarium/output/Cargo.toml index 1f025df..2b8546d 100644 --- a/nodes/max/plantarium/output/Cargo.toml +++ b/nodes/max/plantarium/output/Cargo.toml @@ -18,10 +18,10 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } console_error_panic_hook = { version = "0.1.7", optional = true } web-sys = { version = "0.3.69", features = ["console"] } glam = "0.27.0" diff --git a/nodes/max/plantarium/output/src/lib.rs b/nodes/max/plantarium/output/src/lib.rs index 67e35f6..978b908 100644 --- a/nodes/max/plantarium/output/src/lib.rs +++ b/nodes/max/plantarium/output/src/lib.rs @@ -1,5 +1,5 @@ -use macros::include_definition_file; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ concat_args, evaluate_int, geometry::{extrude_path, wrap_path}, log, split_args, diff --git a/nodes/max/plantarium/random/Cargo.toml b/nodes/max/plantarium/random/Cargo.toml index 7086da7..219ed0a 100644 --- a/nodes/max/plantarium/random/Cargo.toml +++ b/nodes/max/plantarium/random/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/random/src/lib.rs b/nodes/max/plantarium/random/src/lib.rs index de8c164..1d77a36 100644 --- a/nodes/max/plantarium/random/src/lib.rs +++ b/nodes/max/plantarium/random/src/lib.rs @@ -1,5 +1,5 @@ -use macros::include_definition_file; -use utils::{concat_args, set_panic_hook, split_args}; +use nodarium_macros::include_definition_file; +use nodarium_utils::{concat_args, set_panic_hook, split_args}; use wasm_bindgen::prelude::*; include_definition_file!("src/definition.json"); diff --git a/nodes/max/plantarium/rotate/Cargo.toml b/nodes/max/plantarium/rotate/Cargo.toml index cd47799..ab87fb1 100644 --- a/nodes/max/plantarium/rotate/Cargo.toml +++ b/nodes/max/plantarium/rotate/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/rotate/src/lib.rs b/nodes/max/plantarium/rotate/src/lib.rs index 0eb885f..e9bdc45 100644 --- a/nodes/max/plantarium/rotate/src/lib.rs +++ b/nodes/max/plantarium/rotate/src/lib.rs @@ -1,6 +1,6 @@ use glam::{Mat4, Vec3}; -use macros::include_definition_file; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ concat_args, evaluate_float, evaluate_int, geometry::wrap_path_mut, log, set_panic_hook, split_args, }; @@ -69,4 +69,3 @@ pub fn execute(input: &[i32]) -> Vec { concat_args(output.iter().map(|x| x.as_slice()).collect()) } - diff --git a/nodes/max/plantarium/stem/Cargo.toml b/nodes/max/plantarium/stem/Cargo.toml index c8e7e67..93d8989 100644 --- a/nodes/max/plantarium/stem/Cargo.toml +++ b/nodes/max/plantarium/stem/Cargo.toml @@ -15,8 +15,8 @@ wasm-bindgen = "0.2.84" serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } web-sys = { version = "0.3.69", features = ["console"] } [dev-dependencies] diff --git a/nodes/max/plantarium/stem/src/lib.rs b/nodes/max/plantarium/stem/src/lib.rs index c9a90a9..4838b92 100644 --- a/nodes/max/plantarium/stem/src/lib.rs +++ b/nodes/max/plantarium/stem/src/lib.rs @@ -1,5 +1,5 @@ -use macros::include_definition_file; -use utils::{ +use nodarium_macros::include_definition_file; +use nodarium_utils::{ evaluate_float, evaluate_int, evaluate_vec3, geometry::{create_multiple_paths, wrap_multiple_paths}, log, reset_call_count, set_panic_hook, split_args, diff --git a/nodes/max/plantarium/triangle/Cargo.toml b/nodes/max/plantarium/triangle/Cargo.toml index 2f6518a..b554ba6 100644 --- a/nodes/max/plantarium/triangle/Cargo.toml +++ b/nodes/max/plantarium/triangle/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/triangle/src/lib.rs b/nodes/max/plantarium/triangle/src/lib.rs index 10040fe..818b4f7 100644 --- a/nodes/max/plantarium/triangle/src/lib.rs +++ b/nodes/max/plantarium/triangle/src/lib.rs @@ -1,5 +1,7 @@ -use macros::include_definition_file; -use utils::{decode_float, encode_float, evaluate_int, split_args, wrap_arg}; +use nodarium_macros::include_definition_file; +use nodarium_utils::{ + decode_float, encode_float, evaluate_int, set_panic_hook, split_args, wrap_arg, +}; use wasm_bindgen::prelude::*; use web_sys::console; @@ -9,7 +11,7 @@ include_definition_file!("src/input.json"); #[wasm_bindgen] pub fn execute(input: &[i32]) -> Vec { - utils::set_panic_hook(); + set_panic_hook(); let args = split_args(input); diff --git a/nodes/max/plantarium/vec3/Cargo.toml b/nodes/max/plantarium/vec3/Cargo.toml index fed1e0d..bb6287d 100644 --- a/nodes/max/plantarium/vec3/Cargo.toml +++ b/nodes/max/plantarium/vec3/Cargo.toml @@ -17,8 +17,8 @@ wasm-bindgen = "0.2.84" # logging them with `console.error`. This is great for development, but requires # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for # code size when deploying. -utils = { version = "0.1.0", path = "../../../../packages/utils" } -macros = { version = "0.1.0", path = "../../../../packages/macros" } +nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } +nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } serde = { version = "1.0", features = ["derive"] } serde-wasm-bindgen = "0.4" console_error_panic_hook = { version = "0.1.7", optional = true } diff --git a/nodes/max/plantarium/vec3/src/lib.rs b/nodes/max/plantarium/vec3/src/lib.rs index 272156c..c0ab226 100644 --- a/nodes/max/plantarium/vec3/src/lib.rs +++ b/nodes/max/plantarium/vec3/src/lib.rs @@ -1,5 +1,5 @@ -use macros::include_definition_file; -use utils::{concat_args, log, split_args}; +use nodarium_macros::include_definition_file; +use nodarium_utils::{concat_args, log, split_args}; use wasm_bindgen::prelude::*; include_definition_file!("src/input.json"); diff --git a/packages/macros/Cargo.toml b/packages/macros/Cargo.toml index 938e0e9..6ed39ac 100644 --- a/packages/macros/Cargo.toml +++ b/packages/macros/Cargo.toml @@ -15,4 +15,4 @@ syn = { version = "1.0", features = ["full"] } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", default-features = false, features = ["alloc"] } quote = "1.0" -types = { version = "0.1.0", path = "../types" } +nodarium_types = { version = "0.1.0", path = "../types" } diff --git a/packages/macros/src/lib.rs b/packages/macros/src/lib.rs index 3de018b..344a1c0 100644 --- a/packages/macros/src/lib.rs +++ b/packages/macros/src/lib.rs @@ -1,11 +1,11 @@ extern crate proc_macro; +use nodarium_types::NodeDefinition; use proc_macro::TokenStream; use quote::quote; use std::env; use std::fs; use std::path::Path; use syn::{parse_macro_input, LitStr}; -use types::NodeDefinition; #[proc_macro] pub fn node_definition(input: TokenStream) -> TokenStream { diff --git a/packages/types/Cargo.toml b/packages/types/Cargo.toml index 00025ca..c818a71 100644 --- a/packages/types/Cargo.toml +++ b/packages/types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "types" +name = "nodarium_types" version = "0.1.0" edition = "2021" diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index 08d1494..2af39c6 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "utils" +name = "nodarium_utils" version = "0.1.0" edition = "2021"