removed unnecessary allocations and annotations

Author: JustJ01

node-graph/node-macro/src/destruct.rs

@@ -2,7 +2,7 @@ use convert_case::{Case, Casing};
 use proc_macro_crate::FoundCrate;
 use proc_macro2::{Span, TokenStream as TokenStream2};
 use quote::{format_ident, quote};
-use syn::{Data, DeriveInput, Error, LitStr, Meta, Type, spanned::Spanned};
+use syn::{Data, DeriveInput, Error, LitStr, Type, spanned::Spanned};
 
 pub fn derive(input: DeriveInput) -> syn::Result<TokenStream2> {
 	let struct_name = input.ident;
@@ -31,7 +31,7 @@ pub fn derive(input: DeriveInput) -> syn::Result<TokenStream2> {
 		};
 
 		let ty = field.ty;
-		let output_name = parse_output_name(&field.attrs)?.unwrap_or_else(|| field_name.to_string().to_case(Case::Title));
+		let output_name = field_name.to_string().to_case(Case::Title);
 		let output_name_lit = LitStr::new(&output_name, field_name.span());
 
 		let fn_name = format_ident!("extract_{}_{}", struct_name.to_string().to_case(Case::Snake), field_name);
@@ -52,63 +52,20 @@ pub fn derive(input: DeriveInput) -> syn::Result<TokenStream2> {
 
 		impl #impl_generics #core_types::registry::Destruct for #struct_name #ty_generics #where_clause {
 			fn fields() -> &'static [#core_types::registry::StructField] {
-				static FIELDS: std::sync::OnceLock<Vec<#core_types::registry::StructField>> = std::sync::OnceLock::new();
-				FIELDS.get_or_init(|| vec![
+				const FIELDS: &[#core_types::registry::StructField] = &[
 					#(#output_fields,)*
-				]).as_slice()
+				];
+				FIELDS
 			}
 		}
 	})
 }
 
 fn generate_extractor_node(core_types: &TokenStream2, fn_name: &syn::Ident, struct_name: &syn::Ident, field_name: &syn::Ident, ty: &Type, output_name: &LitStr) -> TokenStream2 {
 	quote! {
-		#[node_macro::node(category(""), name(#output_name))]
+		#[node_macro::node(category(""))]
 		fn #fn_name(_: impl #core_types::Ctx, data: #struct_name) -> #ty {
 			data.#field_name
 		}
 	}
 }
-
-fn parse_output_name(attrs: &[syn::Attribute]) -> syn::Result<Option<String>> {
-	let mut output_name = None;
-
-	for attr in attrs {
-		if !attr.path().is_ident("output") {
-			continue;
-		}
-
-		let mut this_output_name = None;
-		match &attr.meta {
-			Meta::Path(_) => {
-				return Err(Error::new_spanned(attr, "Expected output metadata like #[output(name = \"Result\")]"));
-			}
-			Meta::NameValue(_) => {
-				return Err(Error::new_spanned(attr, "Expected output metadata like #[output(name = \"Result\")]"));
-			}
-			Meta::List(_) => {
-				attr.parse_nested_meta(|meta| {
-					if meta.path.is_ident("name") {
-						if this_output_name.is_some() {
-							return Err(meta.error("Multiple output names provided for one field"));
-						}
-						let value = meta.value()?;
-						let lit: LitStr = value.parse()?;
-						this_output_name = Some(lit.value());
-						Ok(())
-					} else {
-						Err(meta.error("Unsupported output metadata. Supported syntax is #[output(name = \"...\")]"))
-					}
-				})?;
-			}
-		}
-
-		let this_output_name = this_output_name.ok_or_else(|| Error::new_spanned(attr, "Missing output name. Use #[output(name = \"...\")]"))?;
-		if output_name.is_some() {
-			return Err(Error::new_spanned(attr, "Multiple #[output(...)] attributes are not allowed on one field"));
-		}
-		output_name = Some(this_output_name);
-	}
-
-	Ok(output_name)
-}

node-graph/preprocessor/src/lib.rs

@@ -115,7 +115,7 @@ pub fn generate_node_substitutions() -> HashMap<ProtoNodeIdentifier, DocumentNod
 		let available_output_fields: Vec<_> = output_fields
 			.iter()
 			.filter_map(|field| {
-				let identifier = ProtoNodeIdentifier::with_owned_string(field.node_path.to_string());
+				let identifier = ProtoNodeIdentifier::new(field.node_path);
 				if node_registry.contains_key(&identifier) {
 					Some((field, identifier))
 				} else {
@@ -161,7 +161,6 @@ pub fn generate_node_substitutions() -> HashMap<ProtoNodeIdentifier, DocumentNod
 					inputs: vec![NodeInput::node(source_node_id, 0)],
 					call_argument: input_type.clone(),
 					implementation: DocumentNodeImplementation::ProtoNode(memo_node.clone()),
-					visible: false,
 					..Default::default()
 				},
 			);
@@ -191,7 +190,6 @@ pub fn generate_node_substitutions() -> HashMap<ProtoNodeIdentifier, DocumentNod
 							inputs: vec![NodeInput::node(output_source_node, 0)],
 							call_argument: accessor_call_argument,
 							implementation: DocumentNodeImplementation::ProtoNode(field_identifier.clone()),
-							visible: false,
 							..Default::default()
 						},
 					);