feat: resolve-core

Author: dnbln

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["dir-structure", "dir-structure-macros", "dir-structure-tools"]
+members = ["dir-structure", "dir-structure-macros", "dir-structure-resolve-core", "dir-structure-tools"]
 resolver = "2"
 
 [workspace.package]
@@ -17,6 +17,7 @@ assert_eq_macros = { version = "=0.2.0" }
 assert_eq = { version = "0.2.0" }
 dir-structure-macros = { path = "dir-structure-macros", version = "=0.2.0", default-features = false }
 dir-structure-tools = { path = "dir-structure-tools", version = "=0.2.0", default-features = false }
+dir-structure-resolve-core = { path = "dir-structure-resolve-core", version = "=0.2.0", default-features = false }
 dir-structure = { path = "dir-structure", version = "=0.2.0", default-features = false }
 
 bumpalo = "3.6.0"

Cargo.toml

@@ -13,14 +13,14 @@ proc-macro = true
 
 [features]
 async = []
-resolve-path = []
-include_dir_vfs = ["dep:include_dir_macros"]
+resolve-path = ["dep:dir-structure-resolve-core"]
+include_dir_vfs = []
 
 [dependencies]
 quote.workspace = true
 syn.workspace = true
 proc-macro2.workspace = true
-include_dir_macros = { package = "include_dir_macros", version = "0.7", optional = true }
+dir-structure-resolve-core = { workspace = true, optional = true }
 
 [lints]
 workspace = true

dir-structure-macros/Cargo.toml

@@ -58,16 +58,6 @@ pub fn load_path(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     resolve_path::load_path(input)
 }
 
-#[cfg(feature = "resolve-path")]
-#[proc_macro]
-pub fn __resolve_max_len(_input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    // This macro is used to get the maximum length of a field name for the `HasField` trait.
-    // It is used in the `resolve_path` macro to ensure that field names do not exceed this length.
-    let max_len = resolve_path::MAX_LEN;
-    let output = quote::quote! { #max_len };
-    output.into()
-}
-
 #[cfg(feature = "include_dir_vfs")]
 #[proc_macro]
 pub fn include_dir_patched(input: proc_macro::TokenStream) -> proc_macro::TokenStream {

dir-structure-macros/src/lib.rs

@@ -1,5 +1,6 @@
 use std::iter;
 
+use dir_structure_resolve_core::MAX_LEN;
 use proc_macro2::TokenStream;
 use quote::format_ident;
 use quote::quote;
@@ -24,8 +25,6 @@ use crate::dir_structure_core::compile_attrs;
 // or
 // resolve_path!(["path/to/dir" as T].a."b".c.d.${e});
 
-pub const MAX_LEN: usize = 32;
-
 struct CoreTyExpression {
     path: syn::Expr,
     ty: syn::Type,

dir-structure-macros/src/resolve_path.rs

@@ -0,0 +1,14 @@
+[package]
+name = "dir-structure-resolve-core"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+license.workspace = true
+
+[dependencies]
+
+[lints]
+workspace = true

dir-structure-resolve-core/Cargo.toml

@@ -0,0 +1 @@
+pub const MAX_LEN: usize = 32;

dir-structure-resolve-core/src/lib.rs

@@ -21,7 +21,7 @@ include_dir = [
     "dir-structure-macros/include_dir_vfs", # need workaround until https://github.com/Michael-F-Bryan/include_dir/pull/115 for the include_dir_vfs! macro
 ]
 git = ["dep:git2"]
-resolve-path = ["derive", "dir-structure-macros/resolve-path"]
+resolve-path = ["derive", "dir-structure-macros/resolve-path", "dep:dir-structure-resolve-core"]
 assert_eq = ["dep:assert_eq"]
 derive = ["dep:dir-structure-macros"]
 
@@ -40,6 +40,7 @@ tokio = { version = "1", features = ["full"] }
 
 [dependencies]
 dir-structure-macros = { workspace = true, optional = true }
+dir-structure-resolve-core = { workspace = true, optional = true }
 futures = { version = "0.3", optional = true, default-features = false, features = [
     "io-compat",
 ] }

dir-structure/Cargo.toml

@@ -6,7 +6,7 @@
 use crate::traits::vfs::OwnedPathType;
 
 #[doc(hidden)]
-pub const HAS_FIELD_MAX_LEN: usize = dir_structure_macros::__resolve_max_len!();
+pub const HAS_FIELD_MAX_LEN: usize = dir_structure_resolve_core::MAX_LEN;
 
 /// A trait to declare that a type has a field with a specific name,
 /// and the type of the field is [`HasField::Inner`].