Make remove() return a value

Author: Muhtasim-Rasheed

src/utils/helpers.rs

@@ -654,9 +654,11 @@ fn pixmap_to_cpu_texture(pixmap: &resvg::tiny_skia::Pixmap) -> Result<CPUTexture
             buf.extend_from_slice(&[0, 0, 0, 0]);
         }
     }
-    Ok(
-        CPUTexture::load_from_bytes(buf.as_slice(), pixmap.width(), pixmap.height())?
-    )
+    Ok(CPUTexture::load_from_bytes(
+        buf.as_slice(),
+        pixmap.width(),
+        pixmap.height(),
+    )?)
 }
 
 fn get_mut_container<'a>(

src/utils/runtime.rs

@@ -5,8 +5,8 @@ use kira::{AudioManager, AudioManagerSettings, DefaultBackend};
 use serde::Deserialize;
 use std::collections::{HashMap, HashSet};
 
-use crate::utils::{core::*, rasterize_svg};
 use crate::utils::draw_sprite;
+use crate::utils::{core::*, rasterize_svg};
 
 use super::sprite::StopRequest;
 use super::{Parser, Project, Tokenizer, sprite::Sprite, sprite::SpriteSnapshot};

src/utils/sprite/builtins/misc.rs

@@ -495,17 +495,23 @@ pub fn insert(args: &[Value]) -> Result {
 
 pub fn remove(args: &[Value]) -> Result {
     if let [Value::Object(obj), Value::String(key)] = args {
+        if !obj.contains_key(key) {
+            return Err("remove() key not found in object".to_string());
+        }
         let mut obj = obj.clone();
-        obj.remove(key);
-        Ok(Value::Object(obj))
+        let val = obj.remove(key);
+        Ok(Value::List(vec![
+            Value::Object(obj),
+            val.unwrap_or(Value::Null),
+        ]))
     } else if let [Value::List(list), Value::Number(index)] = args {
         let index = *index as usize;
         if index >= list.len() {
             return Err("remove() index out of bounds".to_string());
         }
         let mut list = list.clone();
-        list.remove(index);
-        Ok(Value::List(list))
+        let val = list.remove(index);
+        Ok(Value::List(vec![Value::List(list), val]))
     } else {
         Err("remove() expects a list or an object, and a key or index".to_string())
     }