fix object impl

Author: TroyKomodo

Cargo.lock

@@ -19,6 +19,7 @@ bytestring = "1.4.0"
 document-features = { optional = true, version = "0.2" }
 num-derive = "0.4"
 num-traits = "0.2"
+indexmap = { version = "2.4.0", optional = true }
 scuffle-bytes-util = { path = "../bytes-util", version = ">=0.1.4" }
 scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
 scuffle-workspace-hack.workspace = true
@@ -33,6 +34,8 @@ serde_derive = "1"
 serde = ["dep:serde", "scuffle-bytes-util/serde"]
 ## Enables changelog and documentation of feature flags
 docs = ["dep:scuffle-changelog", "dep:document-features"]
+## Use an index map instead of a btree-map for Amf0Objects
+preserve_order = ["dep:indexmap"]
 
 [package.metadata.docs.rs]
 all-features = true

crates/amf0/Cargo.toml

@@ -7,7 +7,7 @@ use num_traits::FromPrimitive;
 use scuffle_bytes_util::StringCow;
 use scuffle_bytes_util::zero_copy::ZeroCopyReader;
 
-use crate::{Amf0Array, Amf0Error, Amf0Marker, Amf0Object, Amf0Value};
+use crate::{Amf0Error, Amf0Marker, Amf0Object, Amf0Value};
 
 /// AMF0 decoder.
 ///
@@ -294,7 +294,7 @@ where
     }
 
     /// Decode a strict array from the buffer.
-    pub fn decode_strict_array(&mut self) -> Result<Amf0Array<'a>, Amf0Error> {
+    pub fn decode_strict_array(&mut self) -> Result<Vec<Amf0Value<'a>>, Amf0Error> {
         let size = self.decode_strict_array_header()? as usize;
 
         let mut array = Vec::with_capacity(size);
@@ -304,7 +304,7 @@ where
             array.push(value);
         }
 
-        Ok(Amf0Array::from(array))
+        Ok(array)
     }
 }
 
@@ -334,6 +334,8 @@ impl<'de, R> std::iter::FusedIterator for Amf0DecoderStream<'_, 'de, R> where R:
 #[cfg(test)]
 #[cfg_attr(all(test, coverage_nightly), coverage(off))]
 mod tests {
+    use scuffle_bytes_util::StringCow;
+
     use super::Amf0Decoder;
     use crate::{Amf0Marker, Amf0Value};
 
@@ -373,8 +375,11 @@ mod tests {
         let mut decoder = Amf0Decoder::from_slice(&bytes);
         let object = decoder.decode_object().unwrap();
         assert_eq!(object.len(), 2);
-        assert_eq!(*object.get(&"abc".into()).unwrap(), Amf0Value::String("val".into()));
-        assert_eq!(*object.get(&"defg".into()).unwrap(), Amf0Value::Boolean(true));
+        assert_eq!(
+            *object.get(&StringCow::from_static("abc")).unwrap(),
+            Amf0Value::String("val".into())
+        );
+        assert_eq!(*object.get("defg").unwrap(), Amf0Value::Boolean(true));
     }
 
     #[test]

crates/amf0/src/decoder.rs

@@ -1,10 +1,11 @@
 //! AMF0 encoder
 
+use std::borrow::Borrow;
 use std::io;
 
 use byteorder::{BigEndian, WriteBytesExt};
 
-use crate::{Amf0Array, Amf0Error, Amf0Marker, Amf0Object};
+use crate::{Amf0Error, Amf0Marker, Amf0Object, Amf0Value};
 
 /// AMF0 encoder.
 ///
@@ -83,11 +84,17 @@ where
     }
 
     /// Encode an [`Amf0Array`] as an AMF0 StrictArray value.
-    pub fn encode_array(&mut self, values: &Amf0Array) -> Result<(), Amf0Error> {
-        self.encode_array_header(values.len().try_into()?)?;
+    pub fn encode_array<'a, I, B>(&mut self, values: I) -> Result<(), Amf0Error>
+    where
+        B: Borrow<Amf0Value<'a>>,
+        I: IntoIterator<Item = B>,
+        I::IntoIter: ExactSizeIterator,
+    {
+        let iter = values.into_iter();
+        self.encode_array_header(iter.len().try_into()?)?;
 
-        for value in values.iter() {
-            value.encode(self)?;
+        for value in iter {
+            value.borrow().encode(self)?;
         }
 
         Ok(())

crates/amf0/src/encoder.rs

@@ -51,21 +51,20 @@ pub mod de;
 pub mod decoder;
 pub mod encoder;
 pub mod error;
+pub mod object;
 #[cfg(feature = "serde")]
 pub mod ser;
 pub mod value;
-pub mod map;
 
 #[cfg(feature = "serde")]
 pub use de::{from_buf, from_reader, from_slice};
 pub use decoder::Amf0Decoder;
 pub use encoder::Amf0Encoder;
 pub use error::{Amf0Error, Result};
+pub use object::Amf0Object;
 #[cfg(feature = "serde")]
 pub use ser::{to_bytes, to_writer};
-pub use value::{Amf0Array, Amf0Object, Amf0Value};
-
-extern crate alloc;
+pub use value::Amf0Value;
 
 /// AMF0 marker types.
 ///