New owned map creation initilises api

Author: animafps

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "lldb.showDisassembly": "auto",
     "lldb.dereferencePointers": true,
-    "lldb.consoleMode": "commands"
+    "lldb.consoleMode": "commands",
+    "rust-analyzer.cargo.features": "all"
 }

rustsynth-derive/src/lib.rs

@@ -4,6 +4,9 @@ use syn::{self, parse_macro_input, DeriveInput, Ident, ItemMod};
 
 /// Derive macro generating an impl of `rustsynth::map::IntoOwnedMap`.
 ///
+/// This macro automatically generates an implementation that converts a struct
+/// into a VapourSynth map by storing each field as a map entry.
+///
 /// # Example
 /// ```
 /// use rustsynth::IntoOwnedMap;
@@ -43,10 +46,14 @@ fn impl_map_macro(ast: &syn::DeriveInput) -> TokenStream {
     };
     let gen = quote! {
         impl rustsynth::map::IntoOwnedMap for #name {
-            fn into_owned_map<'elem>(self) -> rustsynth::map::OwnedMap<'elem> {
-                let mut map = rustsynth::map::OwnedMap::new();
+            fn into_owned_map<'elem>(self) -> rustsynth::map::Map<'elem> {
+                // Ensure API is initialized before creating a map
+                // This is required for Map::new() to work correctly
+                let mut map = rustsynth::map::Map::new()
+                    .expect("Failed to create map - ensure VapourSynth API is initialized with init_api() or use within a VapourSynth plugin context");
                 #(
-                    map.set(stringify!(#fields), &self.#fields).unwrap();
+                    map.set(stringify!(#fields), &self.#fields)
+                        .expect(&format!("Failed to set field '{}' in map", stringify!(#fields)));
                 )*
                 map
             }

rustsynth/src/map/mod.rs

@@ -107,7 +107,7 @@ fn handle_append_prop_error(error: i32) -> MapResult<()> {
 impl<'elem> Map<'elem> {
     /// Creates a new owned map.
     pub fn new() -> MapResult<Self> {
-        let handle = unsafe { API::get_cached().create_map() };
+        let handle = API::get().ok_or(MapError::CreationFailed)?.create_map();
         let handle = NonNull::new(handle).ok_or(MapError::CreationFailed)?;
 
         Ok(Self {