Upgrade to rbx_dom_weak 2.0 (#377)

* Mostly mechanical port bits

* Almost there

* It builds again!

* Turn on all the code again

* Tests compiling but not passing

* Stub work for value resolution

* Implement resolution minus enums and derived properties

* Implement property descriptor resolution

* Update referent snapshots

* Update unions test project

Using a place file instead of a model yields better
error messages in Roblox Studio.

* Add easy shortcut to testing with local rbx-dom

* Update rbx-dom

* Add enum resolution

* Update init.meta.json to use UnresolvedValue

* Expand value resolution support, add test

* Filter SharedString values from web API

* Add 'property' builder method to InstanceSnapshot

* Change InstanceSnapshot/InstanceBuilder boundary

* Fix remove_file crash

* rustfmt

* Update to latest rbx_dom_lua

* Update dependencies, including rbx_dom_weak

* Update to latest rbx-dom

* Update dependencies

* Update rbx-dom, fixing more bugs

* Remove experimental warning on binary place builds

* Remove unused imports

src/snapshot_middleware/json_model.rs

@@ -2,11 +2,12 @@ use std::{borrow::Cow, collections::HashMap, path::Path};
 
 use anyhow::Context;
 use memofs::Vfs;
-use rbx_dom_weak::UnresolvedRbxValue;
-use rbx_reflection::try_resolve_value;
 use serde::Deserialize;
 
-use crate::snapshot::{InstanceContext, InstanceSnapshot};
+use crate::{
+    resolution::UnresolvedValue,
+    snapshot::{InstanceContext, InstanceSnapshot},
+};
 
 use super::middleware::SnapshotInstanceResult;
 
@@ -20,7 +21,10 @@ pub fn snapshot_json_model(
     let instance: JsonModel = serde_json::from_slice(&contents)
         .with_context(|| format!("File is not a valid JSON model: {}", path.display()))?;
 
-    let mut snapshot = instance.core.into_snapshot(instance_name.to_owned());
+    let mut snapshot = instance
+        .core
+        .into_snapshot(instance_name.to_owned())
+        .with_context(|| format!("Could not load JSON model: {}", path.display()))?;
 
     snapshot.metadata = snapshot
         .metadata
@@ -58,36 +62,32 @@ struct JsonModelCore {
     children: Vec<JsonModelInstance>,
 
     #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-    properties: HashMap<String, UnresolvedRbxValue>,
+    properties: HashMap<String, UnresolvedValue>,
 }
 
 impl JsonModelCore {
-    fn into_snapshot(self, name: String) -> InstanceSnapshot {
+    fn into_snapshot(self, name: String) -> anyhow::Result<InstanceSnapshot> {
         let class_name = self.class_name;
 
-        let children = self
-            .children
-            .into_iter()
-            .map(|child| child.core.into_snapshot(child.name))
-            .collect();
+        let mut children = Vec::with_capacity(self.children.len());
+        for child in self.children {
+            children.push(child.core.into_snapshot(child.name)?);
+        }
 
-        let properties = self
-            .properties
-            .into_iter()
-            .map(|(key, value)| {
-                try_resolve_value(&class_name, &key, &value).map(|resolved| (key, resolved))
-            })
-            .collect::<Result<HashMap<_, _>, _>>()
-            .expect("TODO: Handle rbx_reflection errors");
+        let mut properties = HashMap::with_capacity(self.properties.len());
+        for (key, unresolved) in self.properties {
+            let value = unresolved.resolve(&class_name, &key)?;
+            properties.insert(key, value);
+        }
 
-        InstanceSnapshot {
+        Ok(InstanceSnapshot {
             snapshot_id: None,
             metadata: Default::default(),
             name: Cow::Owned(name),
             class_name: Cow::Owned(class_name),
             properties,
             children,
-        }
+        })
     }
 }