fix: builder methods visibility must not always be public

Author: vrurg

fieldx/tests/plain_builder_generics.rs

@@ -4,13 +4,13 @@ use std::{
     marker::PhantomData,
 };
 
-trait Newish {
+pub trait Newish {
     fn new() -> Self;
 }
 
 #[fxstruct(builder, into)]
 #[derive(Debug)]
-struct Plain<'a, 'b, T>
+pub struct Plain<'a, 'b, T>
 where
     T: Display + Debug + Default + Newish,
     'b: 'a,

fieldx_derive/src/codegen.rs

@@ -305,16 +305,6 @@ impl FXRewriter {
         }
     }
 
-    fn builder_struct_visibility(&self) -> TokenStream {
-        let ctx = self.ctx();
-        self.ctx()
-            .args()
-            .get_helper(FXHelperKind::Builder)
-            .and_then(|builder| builder.public_mode().map(|pm| pm.to_token_stream()))
-            .or_else(|| Some(ctx.input().vis().to_token_stream()))
-            .unwrap()
-    }
-
     fn builder_field_ctxs(&self) -> Vec<darling::Result<Ref<FXFieldCtx>>> {
         let ctx = self.ctx();
         let builder_field_idents = ctx.builder_field_ident().borrow();
@@ -326,7 +316,7 @@ impl FXRewriter {
 
     fn builder_impl(&self) -> TokenStream {
         let ctx = self.ctx();
-        let vis = self.builder_struct_visibility();
+        let vis = ctx.builder_struct_visibility();
         let builder_ident = ctx.builder_ident();
         let builders = ctx.builders_combined();
         let input_ident = ctx.input_ident();
@@ -432,7 +422,7 @@ impl FXRewriter {
             let generics = ctx.input().generics();
             let where_clause = &generics.where_clause;
             let span = ctx.helper_span(FXHelperKind::Builder);
-            let vis = self.builder_struct_visibility();
+            let vis = ctx.builder_struct_visibility();
             let attributes = args.builder_attributes();
             let builder_ident = ctx.builder_ident();
 

fieldx_derive/src/codegen/codegen_trait.rs

@@ -358,6 +358,7 @@ pub trait FXCodeGenContextual {
         if fctx.forced_builder() || fctx.needs_builder() {
             let ident = fctx.ident_tok();
             let mut builder_name = self.helper_name(fctx, FXHelperKind::Builder)?;
+            let vis = fctx.builder_method_visibility();
             // .builder_name(fctx)?;
             // .unwrap_or(format_ident!("{}", fctx.helper_base_name().expect("Field name")).to_token_stream());
             let span = fctx.helper_span(FXHelperKind::Builder);
@@ -366,7 +367,7 @@ pub trait FXCodeGenContextual {
             builder_name.set_span(span);
             Ok(quote_spanned![span=>
                 #attributes
-                pub fn #builder_name #gen_params(mut self, value: #val_type) -> Self {
+                #vis fn #builder_name #gen_params(mut self, value: #val_type) -> Self {
                     self.#ident = ::std::option::Option::Some(value #into_tok);
                     self
                 }

fieldx_derive/src/ctx/codegen.rs

@@ -450,6 +450,14 @@ impl FXCodeGenCtx {
         })
     }
 
+    pub fn builder_struct_visibility(&self) -> TokenStream {
+        self.args()
+            .get_helper(FXHelperKind::Builder)
+            .and_then(|builder| builder.public_mode().map(|pm| pm.to_token_stream()))
+            .or_else(|| Some(self.input().vis().to_token_stream()))
+            .unwrap()
+    }
+
     #[inline(always)]
     pub fn builder_has_post_build(&self) -> bool {
         self.args.builder().as_ref().map_or(false, |b| b.has_post_build())

fieldx_derive/src/ctx/field.rs

@@ -429,6 +429,13 @@ impl FXFieldCtx {
         self.attrs().iter().cloned().collect()
     }
 
+    pub fn builder_method_visibility(&self) -> TokenStream {
+        self.builder().as_ref().and_then(|b| b.public_mode()).map_or_else(
+            || self.codegen_ctx().builder_struct_visibility(),
+            |pub_mode| pub_mode.to_token_stream(),
+        )
+    }
+
     pub fn set_builder_checker(&self, bc: TokenStream) {
         *self.builder_checker.borrow_mut() = Some(bc);
     }

makefile.ds

@@ -8,7 +8,6 @@ fn <scope> ask_user
     return ${reply}
 end
 
-
 # Function to generate the power set of an array
 fn <scope> generate_power_set
     input = set ${1}