drop name, sid and skip_bigint_checks from Enum/Struct + wip: cleanup tests

Author: oscartbeaumont

examples/demo.rs

@@ -146,11 +146,11 @@ pub fn to_ast(schema: &Schema) -> Result<DataType, ()> {
                 // pub property_names: Option<Box<Schema>>,
 
                 let mut s = StructBuilder::named(
-                    obj.metadata
-                        .as_ref()
-                        .and_then(|v| v.title.as_ref().map(|v| v.to_class_case()))
-                        .unwrap_or_else(|| "Unnamed".to_string()),
-                ); // TODO: Remove fallback
+                    // obj.metadata
+                    //     .as_ref()
+                    //     .and_then(|v| v.title.as_ref().map(|v| v.to_class_case()))
+                    //     .unwrap_or_else(|| "Unnamed".to_string()),
+                );
                 for (k, v) in o.properties.iter() {
                     s.field_mut(k.clone(), FieldBuilder::new(to_ast(v)?));
                 }
@@ -182,7 +182,7 @@ pub fn to_ast(schema: &Schema) -> Result<DataType, ()> {
                         return Ok(match o.len() {
                             0 => DataType::List(List::new(from_instance_type(&o[0]), None, false)),
                             _ => {
-                                let mut e = EnumBuilder::new("todo");
+                                let mut e = EnumBuilder::new();
 
                                 for list in o {
                                     println!("{:?}", list);

examples/demo2.rs

@@ -18,16 +18,13 @@ pub struct EnumAttr {
     pub tag: Option<String>,
     pub content: Option<String>,
     pub untagged: bool,
-    // This property is not covered by sem-ver and *should* not be used.
-    pub unstable_skip_bigint_checks: bool,
 }
 
 impl_parse! {
     EnumAttr(attr, out) {
         // "tag" was already passed in the container so we don't need to do anything here
         "content" => out.content = out.content.take().or(Some(attr.parse_string()?)),
         "untagged" => out.untagged = attr.parse_bool().unwrap_or(true),
-        "unstable_skip_bigint_checks" => out.unstable_skip_bigint_checks = attr.parse_bool().unwrap_or(true),
     }
 }
 

specta-jsonschema/src/lib.rs

@@ -5,7 +5,6 @@ use quote::{quote, ToTokens};
 use syn::{spanned::Spanned, DataEnum, Fields};
 
 pub fn parse_enum(
-    name: &TokenStream,
     enum_attrs: &EnumAttr,
     container_attrs: &ContainerAttr,
     crate_ref: &TokenStream,
@@ -155,10 +154,8 @@ pub fn parse_enum(
         ),
     };
 
-    let skip_bigint_checs = enum_attrs.unstable_skip_bigint_checks;
-
     Ok((
-        quote!(#crate_ref::datatype::DataType::Enum(#crate_ref::internal::construct::r#enum(#name.into(), SID, #repr, #skip_bigint_checs, vec![#(#variant_types),*]))),
+        quote!(#crate_ref::datatype::DataType::Enum(#crate_ref::internal::construct::r#enum(#repr, vec![#(#variant_types),*]))),
         can_flatten,
     ))
 }

specta-macros/src/type/attr/enum.rs

@@ -46,7 +46,6 @@ pub fn derive(input: proc_macro::TokenStream) -> syn::Result<proc_macro::TokenSt
     let (inlines, can_flatten) = match data {
         Data::Struct(data) => parse_struct(&name, &container_attrs, &crate_ref, data),
         Data::Enum(data) => parse_enum(
-            &name,
             &EnumAttr::from_attrs(&container_attrs, &mut attrs)?,
             &container_attrs,
             &crate_ref,

specta-macros/src/type/enum.rs

@@ -145,7 +145,7 @@ pub fn parse_struct(
             Fields::Unit => quote!(#crate_ref::internal::construct::fields_unit()),
         };
 
-        quote!(#crate_ref::datatype::DataType::Struct(#crate_ref::internal::construct::r#struct(#name.into(), Some(SID), #fields)))
+        quote!(#crate_ref::datatype::DataType::Struct(#crate_ref::internal::construct::r#struct(#fields)))
     };
 
     Ok((definition, true))

specta-macros/src/type/mod.rs

@@ -120,7 +120,6 @@ pub fn to_openapi(typ: &DataType) -> ReferenceOr<Schema> {
         },
         DataType::Struct(s) => {
             let fields = s.fields();
-            let name = s.name();
 
             // match &fields[..] {
             //     [] => todo!(), // "null".to_string(),