fix(stackable-versioned): Remove minor errors in generated code

Author: Techassi

crates/stackable-versioned-macros/src/codegen/container/struct/conversion.rs

@@ -432,7 +432,7 @@ impl Struct {
                 for object in objects {
                     // This clone is required because in the noop case we move the object into
                     // the converted objects vec.
-                    let current_object = Self::from_json_value(object.clone())
+                    let current_object = Self::from_json_object(object.clone())
                         .map_err(|source| #convert_object_error::Parse { source })?;
 
                     match (current_object, desired_api_version) {
@@ -513,7 +513,7 @@ impl Struct {
         })
     }
 
-    pub(super) fn generate_from_json_value_fn(
+    pub(super) fn generate_from_json_object_fn(
         &self,
         mod_gen_ctx: ModuleGenerationContext<'_>,
         spec_gen_ctx: &SpecGenerationContext<'_>,
@@ -540,7 +540,7 @@ impl Struct {
         });
 
         Some(quote! {
-            fn from_json_value(object_value: #serde_json_path::Value) -> ::std::result::Result<Self, #parse_object_error> {
+            fn from_json_object(object_value: #serde_json_path::Value) -> ::std::result::Result<Self, #parse_object_error> {
                 let kind = object_value
                     .get("kind")
                     .ok_or_else(|| #parse_object_error::FieldNotPresent {

crates/stackable-versioned-macros/src/codegen/container/struct/mod.rs

@@ -318,7 +318,7 @@ impl Struct {
 
         let merged_crd_fn = self.generate_merged_crd_fn(mod_gen_ctx, spec_gen_ctx);
         let try_convert_fn = self.generate_try_convert_fn(versions, mod_gen_ctx, spec_gen_ctx);
-        let from_json_value_fn = self.generate_from_json_value_fn(mod_gen_ctx, spec_gen_ctx);
+        let from_json_object_fn = self.generate_from_json_object_fn(mod_gen_ctx, spec_gen_ctx);
         let into_json_value_fn = self.generate_into_json_value_fn(mod_gen_ctx, spec_gen_ctx);
 
         let automatically_derived = mod_gen_ctx.automatically_derived_attr();
@@ -328,7 +328,7 @@ impl Struct {
             impl #enum_ident {
                 #merged_crd_fn
                 #try_convert_fn
-                #from_json_value_fn
+                #from_json_object_fn
                 #into_json_value_fn
             }
         }

crates/stackable-versioned-macros/src/codegen/module.rs

@@ -137,7 +137,6 @@ impl Module {
         }
 
         let preserve_module = self.options.common.preserve_module.is_present();
-        let allow_unsorted = self.options.common.allow_unsorted.is_present();
 
         let module_ident = &self.ident;
         let module_vis = &self.vis;
@@ -146,7 +145,7 @@ impl Module {
         // of version modules (eg. 'v1alpha1') to be public, so that they are accessible inside the
         // preserved (wrapping) module. Otherwise, we can inherit the visibility from the module
         // which will be erased.
-        let version_module_vis = if allow_unsorted {
+        let version_module_vis = if preserve_module {
             &Visibility::Public(Pub::default())
         } else {
             &self.vis