WIP

Sajjon · Dec 15, 2023 · 4843b0f · 4843b0f
1 parent 0957a3b
commit 4843b0f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 14 deletions.
diff --git a/identified_vec_macros/src/lib.rs b/identified_vec_macros/src/lib.rs
@@ -1,20 +1,28 @@
 #[macro_export]
 macro_rules! newtype_identified_vec {
     (of: $item_ty: ty, named: $struct_name: ident) => {
-        use std::cell::RefMut;
-        // pub struct $struct_name<'a>(RefMut<'a, IdentifiedVecOf<$item_ty>>);
         pub struct $struct_name(IdentifiedVecOf<$item_ty>);
 
-        // impl<'a> ViaMarker for $struct_name<'a> {}
-        // impl<'a> IsIdentifiableVecOf<$item_ty> for $struct_name<'a> {}
-        // impl<'a> IsIdentifiableVecOfVia<$item_ty> for $struct_name<'a> {
-        //     fn via_mut(&self) -> RefMut<'a, IdentifiedVecOf<$item_ty>> {
-        //         // &self.0
-        //         todo!()
-        //     }
-        //     fn from_identified_vec_of(identified_vec_of: IdentifiedVecOf<$item_ty>) -> Self {
-        //         Self(RefMut::new(identified_vec_of))
-        //     }
-        // }
+        impl ViaMarker for $struct_name {}
+        impl IsIdentifiableVecOfVia<$item_ty> for $struct_name {
+            fn via_mut(&mut self) -> &mut IdentifiedVecOf<$item_ty> {
+                &mut self.0
+            }
+
+            fn via(&self) -> &IdentifiedVecOf<$item_ty> {
+                &self.0
+            }
+
+            fn from_identified_vec_of(identified_vec_of: IdentifiedVecOf<$item_ty>) -> Self {
+                Self(identified_vec_of)
+            }
+        }
+
+        impl $struct_name {
+            #[inline]
+            pub fn items(&self) -> Vec<$item_ty> {
+                self.0.items()
+            }
+        }
     };
 }
diff --git a/tests/tests.rs b/tests/tests.rs
@@ -577,9 +577,24 @@ fn isid() {
     assert_eq!(sut.items(), [User::blob_sr(), User::blob_jr()]);
 }
 
+#[test]
+fn test_macro() {
+    newtype_identified_vec!(of: User, named: CollectionOfUsers);
+
+    let mut sut = CollectionOfUsers::new();
+    sut.append(User::blob_jr());
+    assert_eq!(sut.items(), [User::blob_jr()]);
+    sut.remove_at(0);
+    assert_eq!(sut.len(), 0);
+    sut.update_or_append(User::blob_sr());
+    sut.update_or_append(User::blob_sr());
+    assert_eq!(sut.items(), [User::blob_sr()]);
+    sut.update_or_append(User::blob_jr());
+    assert_eq!(sut.items(), [User::blob_sr(), User::blob_jr()]);
+}
+
 // #[test]
 // fn test_macro() {
-//     newtype_identified_vec!(of: User, named: CollectionOfUsers);
 //     let mut users = CollectionOfUsers::new();
 //     users.0.append(User::blob());
 //     assert_eq!(users.0.items(), [User::blob()])