From 672d207961320d890f15d962d605e9943737cd08 Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Tue, 29 Jun 2021 01:20:09 -0400
Subject: [PATCH] Update to stable rbx-dom libraries

---
 CHANGELOG.md                                  |  1 +
 Cargo.lock                                    | 24 +++++++-------
 Cargo.toml                                    | 10 +++---
 ...to_end__tests__serve__edit_init_all-2.snap |  5 +--
 ...d_to_end__tests__serve__edit_init_all.snap |  5 +--
 ...nd__tests__serve__edit_init_subscribe.snap |  5 +--
 ...ts__serve__move_folder_of_stuff_all-2.snap | 32 +++++++------------
 ...serve__move_folder_of_stuff_subscribe.snap | 32 +++++++------------
 ...to_end__tests__serve__remove_file_all.snap |  5 +--
 ...d_to_end__tests__serve__scripts_all-2.snap |  8 ++---
 ...end_to_end__tests__serve__scripts_all.snap |  8 ++---
 ..._end__tests__serve__scripts_subscribe.snap |  5 +--
 src/cli/build.rs                              |  4 +--
 src/cli/plugin.rs                             |  2 +-
 src/cli/upload.rs                             |  2 +-
 ...napshot__tests__apply__add_property-2.snap |  5 +--
 ..._snapshot__tests__apply__add_property.snap |  5 +--
 ...tests__apply__remove_property_initial.snap |  5 +--
 ...napshot__tests__compute__set_property.snap |  5 +--
 src/snapshot_middleware/project.rs            |  3 +-
 src/snapshot_middleware/rbxm.rs               |  2 +-
 ...t_middleware__csv__test__csv_from_vfs.snap |  5 +--
 ..._middleware__csv__test__csv_with_meta.snap |  5 +--
 ...leware__json__test__instance_from_vfs.snap |  5 +--
 ...are__json_model__test__model_from_vfs.snap |  5 +--
 ...iddleware__lua__test__client_from_vfs.snap |  5 +--
 ...iddleware__lua__test__module_from_vfs.snap |  5 +--
 ...ddleware__lua__test__module_with_meta.snap |  5 +--
 ...iddleware__lua__test__script_disabled.snap |  8 ++---
 ...ddleware__lua__test__script_with_meta.snap |  5 +--
 ...iddleware__lua__test__server_from_vfs.snap |  5 +--
 ...test__project_path_property_overrides.snap |  5 +--
 ...oject__test__project_with_path_to_txt.snap |  5 +--
 ...est__project_with_resolved_properties.snap |  5 +--
 ...t__project_with_unresolved_properties.snap |  5 +--
 ...dleware__txt__test__instance_from_vfs.snap |  5 +--
 36 files changed, 129 insertions(+), 122 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05786e29..109aad1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased Changes
 * Added the `fmt-project` subcommand for formatting Rojo project files.
 * Improved error output for many subcommands.
+* Updated to stable versions of rbx-dom libraries.
 
 ## [7.0.0-alpha.4][7.0.0-alpha.4] (May 5, 2021)
 * Added the `gameId` and `placeId` optional properties to project files.
diff --git a/Cargo.lock b/Cargo.lock
index fe1e17ed..feea5f5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1823,9 +1823,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_binary"
-version = "0.6.0-alpha.5"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7e87ab0f16f2a911b38d3761bf694743d1ea75638becd9ff355b462d33bbfa"
+checksum = "7e0d35abcd708d9db72594ec79f0740233d90783afc20104706e0215881f4d79"
 dependencies = [
  "log",
  "lz4",
@@ -1837,9 +1837,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_dom_weak"
-version = "2.0.0-alpha.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffa16d4ae69867cbe305d740790900193147ce5a904fc583f88dbfc7de43a95"
+checksum = "04a2953af06e505bfa8db053e658907a8450448d42920851aea0707f39bf58f7"
 dependencies = [
  "rbx_types",
  "serde",
@@ -1847,9 +1847,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_reflection"
-version = "4.0.0-alpha.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c43632d239190aad5b9406a6f0df2233ae3b46489957dd6d11c4d6daa9046c5"
+checksum = "7b25f6125c1e721194180ce2237218a346e553b85175f4caeb688fa8926cd687"
 dependencies = [
  "rbx_types",
  "serde",
@@ -1857,9 +1857,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_reflection_database"
-version = "0.1.1+roblox-478"
+version = "0.2.0+roblox-478"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027b05433fe77e2608b95524d61bdd5db51ec93a80f20e0b2ef1bcf8a43894ca"
+checksum = "9be227705c074a7741718a1b89a4970201634bf26fe48876a42b5fd0965d4f44"
 dependencies = [
  "lazy_static",
  "rbx_reflection",
@@ -1869,9 +1869,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_types"
-version = "0.3.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee26785b8236954e96d907ee0226a4c0761ebb5855ed115cc363979bd503331"
+checksum = "3ca80f18e1d5c2f1c29835c4be0af0e94ed7459fbb1196ec7b2343ab9bf7db00"
 dependencies = [
  "base64 0.11.0",
  "bitflags",
@@ -1883,9 +1883,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_xml"
-version = "0.12.0-alpha.4"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e2277d678ea30609e6f383a8f34eabab7bb2f9d62144cbe400d179acea2d47"
+checksum = "58e9a2ae17228c75672da28f9ddf896331eaf364c0aacf60bfacc17828a4cce2"
 dependencies = [
  "base64 0.11.0",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index 13e3e291..b33239c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,11 +54,11 @@ memofs = { version = "0.1.2", path = "memofs" }
 # rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database" }
 # rbx_xml = { path = "../rbx-dom/rbx_xml" }
 
-rbx_binary = "0.6.0-alpha.1"
-rbx_dom_weak = "2.0.0-alpha.1"
-rbx_reflection = "4.0.0-alpha.1"
-rbx_reflection_database = "0.1.0"
-rbx_xml = "0.12.0-alpha.1"
+rbx_binary = "0.6.0"
+rbx_dom_weak = "2.0.0"
+rbx_reflection = "4.0.0"
+rbx_reflection_database = "0.2.0"
+rbx_xml = "0.12.0"
 
 anyhow = "1.0.27"
 backtrace = "0.3"
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap
index 7218c9bf..0229179a 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+
 ---
 instances:
   id-2:
@@ -13,7 +14,7 @@ instances:
     Parent: "00000000000000000000000000000000"
     Properties:
       Source:
-        Type: String
-        Value: "-- Edited contents"
+        String: "-- Edited contents"
 messageCursor: 1
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap
index d0b1b97a..d3f50dbd 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+
 ---
 instances:
   id-2:
@@ -13,7 +14,7 @@ instances:
     Parent: "00000000000000000000000000000000"
     Properties:
       Source:
-        Type: String
-        Value: "-- Original contents"
+        String: "-- Original contents"
 messageCursor: 0
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap
index bb3f9990..cef27f2c 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "subscribe_response.intern_and_redact(&mut redactions, ())"
+
 ---
 messageCursor: 1
 messages:
@@ -12,7 +13,7 @@ messages:
         changedName: ~
         changedProperties:
           Source:
-            Type: String
-            Value: "-- Edited contents"
+            String: "-- Edited contents"
         id: id-2
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap
index c9b36434..9b4c47f7 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+
 ---
 instances:
   id-10:
@@ -13,8 +14,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #6"
+        String: "File #6"
   id-11:
     Children: []
     ClassName: StringValue
@@ -25,8 +25,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #7"
+        String: "File #7"
   id-12:
     Children: []
     ClassName: StringValue
@@ -37,8 +36,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #8"
+        String: "File #8"
   id-13:
     Children: []
     ClassName: StringValue
@@ -49,8 +47,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #9"
+        String: "File #9"
   id-2:
     Children:
       - id-3
@@ -90,8 +87,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #0"
+        String: "File #0"
   id-5:
     Children: []
     ClassName: StringValue
@@ -102,8 +98,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #1"
+        String: "File #1"
   id-6:
     Children: []
     ClassName: StringValue
@@ -114,8 +109,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #2"
+        String: "File #2"
   id-7:
     Children: []
     ClassName: StringValue
@@ -126,8 +120,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #3"
+        String: "File #3"
   id-8:
     Children: []
     ClassName: StringValue
@@ -138,8 +131,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #4"
+        String: "File #4"
   id-9:
     Children: []
     ClassName: StringValue
@@ -150,7 +142,7 @@ instances:
     Parent: id-3
     Properties:
       Value:
-        Type: String
-        Value: "File #5"
+        String: "File #5"
 messageCursor: 1
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap
index 9f544c5c..40afc888 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "subscribe_response.intern_and_redact(&mut redactions, ())"
+
 ---
 messageCursor: 1
 messages:
@@ -15,8 +16,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #6"
+            String: "File #6"
       id-11:
         Children: []
         ClassName: StringValue
@@ -27,8 +27,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #7"
+            String: "File #7"
       id-12:
         Children: []
         ClassName: StringValue
@@ -39,8 +38,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #8"
+            String: "File #8"
       id-13:
         Children: []
         ClassName: StringValue
@@ -51,8 +49,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #9"
+            String: "File #9"
       id-3:
         Children:
           - id-4
@@ -82,8 +79,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #0"
+            String: "File #0"
       id-5:
         Children: []
         ClassName: StringValue
@@ -94,8 +90,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #1"
+            String: "File #1"
       id-6:
         Children: []
         ClassName: StringValue
@@ -106,8 +101,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #2"
+            String: "File #2"
       id-7:
         Children: []
         ClassName: StringValue
@@ -118,8 +112,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #3"
+            String: "File #3"
       id-8:
         Children: []
         ClassName: StringValue
@@ -130,8 +123,7 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #4"
+            String: "File #4"
       id-9:
         Children: []
         ClassName: StringValue
@@ -142,8 +134,8 @@ messages:
         Parent: id-3
         Properties:
           Value:
-            Type: String
-            Value: "File #5"
+            String: "File #5"
     removed: []
     updated: []
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap
index 855c79ec..4ec6ce4c 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+
 ---
 instances:
   id-2:
@@ -23,7 +24,7 @@ instances:
     Parent: id-2
     Properties:
       Value:
-        Type: String
-        Value: This file will be removed!
+        String: This file will be removed!
 messageCursor: 0
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap
index 72ab9efc..78dcebea 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+
 ---
 instances:
   id-2:
@@ -24,8 +25,7 @@ instances:
     Parent: id-2
     Properties:
       Source:
-        Type: String
-        Value: "-- Hello, from bar!"
+        String: "-- Hello, from bar!"
   id-4:
     Children: []
     ClassName: ModuleScript
@@ -36,7 +36,7 @@ instances:
     Parent: id-2
     Properties:
       Source:
-        Type: String
-        Value: Updated foo!
+        String: Updated foo!
 messageCursor: 1
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap
index 1748f264..52efebac 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+
 ---
 instances:
   id-2:
@@ -24,8 +25,7 @@ instances:
     Parent: id-2
     Properties:
       Source:
-        Type: String
-        Value: "-- Hello, from bar!"
+        String: "-- Hello, from bar!"
   id-4:
     Children: []
     ClassName: ModuleScript
@@ -36,7 +36,7 @@ instances:
     Parent: id-2
     Properties:
       Source:
-        Type: String
-        Value: "-- Hello, from foo!"
+        String: "-- Hello, from foo!"
 messageCursor: 0
 sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap
index 4b373663..19bea59e 100644
--- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/tests/serve.rs
 expression: "subscribe_response.intern_and_redact(&mut redactions, ())"
+
 ---
 messageCursor: 1
 messages:
@@ -12,7 +13,7 @@ messages:
         changedName: ~
         changedProperties:
           Source:
-            Type: String
-            Value: Updated foo!
+            String: Updated foo!
         id: id-4
 sessionId: id-1
+
diff --git a/src/cli/build.rs b/src/cli/build.rs
index 89d15e2d..18798037 100644
--- a/src/cli/build.rs
+++ b/src/cli/build.rs
@@ -112,13 +112,13 @@ fn write_model(
 
     match output_kind {
         OutputKind::Rbxm => {
-            rbx_binary::to_writer_default(&mut file, tree.inner(), &[root_id])?;
+            rbx_binary::to_writer(&mut file, tree.inner(), &[root_id])?;
         }
         OutputKind::Rbxl => {
             let root_instance = tree.get_instance(root_id).unwrap();
             let top_level_ids = root_instance.children();
 
-            rbx_binary::to_writer_default(&mut file, tree.inner(), top_level_ids)?;
+            rbx_binary::to_writer(&mut file, tree.inner(), top_level_ids)?;
         }
         OutputKind::Rbxmx => {
             // Model files include the root instance of the tree and all its
diff --git a/src/cli/plugin.rs b/src/cli/plugin.rs
index 32f89dbb..5ab98e07 100644
--- a/src/cli/plugin.rs
+++ b/src/cli/plugin.rs
@@ -73,7 +73,7 @@ fn install_plugin() -> anyhow::Result<()> {
     let tree = session.tree();
     let root_id = tree.get_root_id();
 
-    rbx_binary::to_writer_default(&mut file, tree.inner(), &[root_id])?;
+    rbx_binary::to_writer(&mut file, tree.inner(), &[root_id])?;
 
     Ok(())
 }
diff --git a/src/cli/upload.rs b/src/cli/upload.rs
index c1d7217b..8c862618 100644
--- a/src/cli/upload.rs
+++ b/src/cli/upload.rs
@@ -53,7 +53,7 @@ impl UploadCommand {
         let mut buffer = Vec::new();
 
         log::trace!("Encoding binary model");
-        rbx_binary::to_writer_default(&mut buffer, tree.inner(), &encode_ids)?;
+        rbx_binary::to_writer(&mut buffer, tree.inner(), &encode_ids)?;
         do_upload(buffer, self.asset_id, &cookie)
     }
 }
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property-2.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property-2.snap
index 81500ec3..4fc4f9ab 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property-2.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property-2.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot/tests/apply.rs
 expression: applied_patch_value
+
 ---
 removed: []
 added: []
@@ -10,6 +11,6 @@ updated:
     changed_class_name: ~
     changed_properties:
       Foo:
-        Type: String
-        Value: Value of Foo
+        String: Value of Foo
     changed_metadata: ~
+
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property.snap
index fa57996d..9d5e9d77 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__add_property.snap
@@ -1,16 +1,17 @@
 ---
 source: src/snapshot/tests/apply.rs
 expression: tree_view
+
 ---
 id: id-1
 name: ROOT
 class_name: ROOT
 properties:
   Foo:
-    Type: String
-    Value: Value of Foo
+    String: Value of Foo
 metadata:
   ignore_unknown_instances: false
   relevant_paths: []
   context: {}
 children: []
+
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_initial.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_initial.snap
index 631eacdf..936658f1 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_initial.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_initial.snap
@@ -1,16 +1,17 @@
 ---
 source: src/snapshot/tests/apply.rs
 expression: tree_view
+
 ---
 id: id-1
 name: ROOT
 class_name: ROOT
 properties:
   Foo:
-    Type: String
-    Value: Should be removed
+    String: Should be removed
 metadata:
   ignore_unknown_instances: false
   relevant_paths: []
   context: {}
 children: []
+
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__set_property.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__set_property.snap
index 8c39d3fd..fbaae3b9 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__set_property.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__set_property.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot/tests/compute.rs
 expression: patch_value
+
 ---
 removed_instances: []
 added_instances: []
@@ -10,6 +11,6 @@ updated_instances:
     changed_class_name: ~
     changed_properties:
       PropertyName:
-        Type: String
-        Value: "Hello, world!"
+        String: "Hello, world!"
     changed_metadata: ~
+
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index b0a56483..2ee55bc2 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -360,8 +360,7 @@ mod test {
                             "$className": "StringValue",
                             "$properties": {
                                 "Value": {
-                                    "Type": "String",
-                                    "Value": "Hello, world!"
+                                    "String": "Hello, world!"
                                 }
                             }
                         }
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 938d14f8..868f863e 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -13,7 +13,7 @@ pub fn snapshot_rbxm(
     path: &Path,
     instance_name: &str,
 ) -> SnapshotInstanceResult {
-    let temp_tree = rbx_binary::from_reader_default(vfs.read(path)?.as_slice())
+    let temp_tree = rbx_binary::from_reader(vfs.read(path)?.as_slice())
         .with_context(|| format!("Malformed rbxm file: {}", path.display()))?;
 
     let root_instance = temp_tree.root();
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_from_vfs.snap
index ccb2de88..7a685efb 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/csv.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: LocalizationTable
 properties:
   Contents:
-    Type: String
-    Value: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
+    String: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_with_meta.snap
index def16559..70bae90d 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_with_meta.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/csv.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: LocalizationTable
 properties:
   Contents:
-    Type: String
-    Value: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
+    String: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__instance_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__instance_from_vfs.snap
index 59378750..75329b85 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__instance_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__instance_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/json.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: ModuleScript
 properties:
   Source:
-    Type: String
-    Value: "return {\n\t[\"1invalidident\"] = \"nice\",\n\tarray = {1, 2, 3},\n\t[\"false\"] = false,\n\tfloat = 1234.5452,\n\tint = 1234,\n\tnull = nil,\n\tobject = {\n\t\thello = \"world\",\n\t},\n\t[\"true\"] = true,\n}"
+    String: "return {\n\t[\"1invalidident\"] = \"nice\",\n\tarray = {1, 2, 3},\n\t[\"false\"] = false,\n\tfloat = 1234.5452,\n\tint = 1234,\n\tnull = nil,\n\tobject = {\n\t\thello = \"world\",\n\t},\n\t[\"true\"] = true,\n}"
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs.snap
index a00fa612..a6a0743e 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/json_model.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -14,8 +15,7 @@ name: foo
 class_name: IntValue
 properties:
   Value:
-    Type: Int64
-    Value: 5
+    Int64: 5
 children:
   - snapshot_id: ~
     metadata:
@@ -26,3 +26,4 @@ children:
     class_name: StringValue
     properties: {}
     children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap
index f0ce9fe1..f774f561 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: LocalScript
 properties:
   Source:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap
index 1fbc5638..ac9ac72a 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: ModuleScript
 properties:
   Source:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap
index 9c64cab8..f623955f 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: ModuleScript
 properties:
   Source:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_disabled.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_disabled.snap
index 329c7d99..8a9b4776 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_disabled.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_disabled.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,9 +16,8 @@ name: bar
 class_name: Script
 properties:
   Disabled:
-    Type: Bool
-    Value: true
+    Bool: true
   Source:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_with_meta.snap
index 34cdd503..1234b48a 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__script_with_meta.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: Script
 properties:
   Source:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap
index 357d89d6..76473c75 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/lua.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: Script
 properties:
   Source:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_path_property_overrides.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_path_property_overrides.snap
index 8fe66f62..49b3b506 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_path_property_overrides.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_path_property_overrides.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: path-property-override
 class_name: StringValue
 properties:
   Value:
-    Type: String
-    Value: Changed
+    String: Changed
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_txt.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_txt.snap
index 68802abb..38b797c3 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_txt.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_txt.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -16,6 +17,6 @@ name: path-project
 class_name: StringValue
 properties:
   Value:
-    Type: String
-    Value: "Hello, world!"
+    String: "Hello, world!"
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_resolved_properties.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_resolved_properties.snap
index 21159485..29a23a07 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_resolved_properties.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_resolved_properties.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -14,6 +15,6 @@ name: resolved-properties
 class_name: StringValue
 properties:
   Value:
-    Type: String
-    Value: "Hello, world!"
+    String: "Hello, world!"
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_unresolved_properties.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_unresolved_properties.snap
index d3cbb593..a422e9f8 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_unresolved_properties.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_unresolved_properties.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/project.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -14,6 +15,6 @@ name: unresolved-properties
 class_name: StringValue
 properties:
   Value:
-    Type: String
-    Value: Hi!
+    String: Hi!
 children: []
+
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__instance_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__instance_from_vfs.snap
index 38b62a6f..ad469490 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__instance_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__instance_from_vfs.snap
@@ -1,6 +1,7 @@
 ---
 source: src/snapshot_middleware/txt.rs
 expression: instance_snapshot
+
 ---
 snapshot_id: ~
 metadata:
@@ -15,6 +16,6 @@ name: foo
 class_name: StringValue
 properties:
   Value:
-    Type: String
-    Value: Hello there!
+    String: Hello there!
 children: []
+