From 71a11069379a4b19219a1509067c47597ff59020 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 15 Nov 2023 15:15:10 -0800
Subject: [PATCH 001/366] Initial implementation of diffing

---
 Cargo.toml                |   3 +
 src/snapshot/diff/hash.rs | 118 ++++++++++++++++++++++++++++++++++++++
 src/snapshot/diff/mod.rs  |   3 +
 src/snapshot/mod.rs       |   2 +
 4 files changed, 126 insertions(+)
 create mode 100644 src/snapshot/diff/hash.rs
 create mode 100644 src/snapshot/diff/mod.rs

diff --git a/Cargo.toml b/Cargo.toml
index 0b5ae9e68..0627184d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,6 +90,9 @@ clap = { version = "3.1.18", features = ["derive"] }
 profiling = "1.0.6"
 tracy-client = { version = "0.13.2", optional = true }
 
+blake3 = "1.5.0"
+float-cmp = "0.9.0"
+
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10.1"
 
diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
new file mode 100644
index 000000000..d60a56956
--- /dev/null
+++ b/src/snapshot/diff/hash.rs
@@ -0,0 +1,118 @@
+//! Hashing utility for a RojoTree
+
+use blake3::{Hash, Hasher};
+use rbx_dom_weak::{
+    types::{Ref, Variant},
+    Instance, WeakDom,
+};
+
+use crate::snapshot::RojoTree;
+
+use std::collections::{HashMap, VecDeque};
+
+pub fn hash_tree(tree: &RojoTree) -> HashMap<Ref, Hash> {
+    let dom = tree.inner();
+    let mut map: HashMap<Ref, Hash> = HashMap::new();
+    let mut order = descendants(dom);
+
+    let mut prop_list = Vec::with_capacity(2);
+
+    // function get_hash_id(inst)
+    // return hash({ sort(foreach(inst.properties, hash)), sort(foreach(inst.children, get_hash_id)) })
+    // end
+    while let Some(referent) = order.pop() {
+        log::info!("processing {referent}");
+        let inst = dom.get_by_ref(referent).unwrap();
+        let hash = hash_inst(&mut prop_list, &map, inst);
+
+        map.insert(referent, hash);
+    }
+
+    map
+}
+
+fn hash_inst<'map, 'inst>(
+    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
+    map: &'map HashMap<Ref, Hash>,
+    inst: &'inst Instance,
+) -> Hash {
+    let mut hasher = Hasher::new();
+    hasher.update(inst.class.as_bytes());
+    hasher.update(inst.name.as_bytes());
+
+    for (name, value) in &inst.properties {
+        prop_list.push((name, value))
+    }
+    prop_list.sort_unstable_by_key(|(key, _)| *key);
+    for (name, value) in prop_list.iter() {
+        hasher.update(name.as_bytes());
+        hash_variant(&mut hasher, value)
+    }
+
+    let mut child_list = Vec::with_capacity(inst.children().len());
+    for child in inst.children() {
+        if let Some(hash) = map.get(child) {
+            child_list.push(hash.as_bytes())
+        } else {
+            panic!("Invariant: child {} not hashed before its parent", child);
+        }
+    }
+    child_list.sort_unstable();
+    for hash in child_list {
+        hasher.update(hash);
+    }
+
+    prop_list.clear();
+
+    hasher.finalize()
+}
+
+fn descendants(dom: &WeakDom) -> Vec<Ref> {
+    let mut queue = VecDeque::new();
+    let mut ordered = Vec::new();
+    queue.push_front(dom.root_ref());
+
+    while let Some(referent) = queue.pop_front() {
+        let inst = dom
+            .get_by_ref(referent)
+            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
+        ordered.push(referent);
+        for child in inst.children() {
+            queue.push_back(*child)
+        }
+    }
+
+    ordered
+}
+
+macro_rules! n_hash {
+    ($hash:ident, $($num:expr),*) => {
+        {$(
+            $hash.update(&$num.to_le_bytes());
+        )*}
+    };
+}
+
+macro_rules! hash {
+    ($hash:ident, $value:expr) => {{
+        $hash.update($value);
+    }};
+}
+
+fn hash_variant(hasher: &mut Hasher, value: &Variant) {
+    // im da joker babeh
+    match value {
+        Variant::String(str) => hash!(hasher, str.as_bytes()),
+        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
+        Variant::Float32(n) => n_hash!(hasher, n),
+        Variant::Float64(n) => n_hash!(hasher, n),
+        Variant::Int32(n) => n_hash!(hasher, n),
+        Variant::Int64(n) => n_hash!(hasher, n),
+        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
+        Variant::Vector3(v3) => n_hash!(hasher, v3.x, v3.y, v3.z),
+        Variant::Vector2(v2) => n_hash!(hasher, v2.x, v2.y),
+
+        // TODO: Add the rest
+        _ => (),
+    }
+}
diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
new file mode 100644
index 000000000..b820cdbd8
--- /dev/null
+++ b/src/snapshot/diff/mod.rs
@@ -0,0 +1,3 @@
+mod hash;
+
+pub use hash::hash_tree;
diff --git a/src/snapshot/mod.rs b/src/snapshot/mod.rs
index 5aacdad6e..6a36b893b 100644
--- a/src/snapshot/mod.rs
+++ b/src/snapshot/mod.rs
@@ -48,6 +48,7 @@
 
 #![allow(dead_code)]
 
+mod diff;
 mod instance_snapshot;
 mod metadata;
 mod patch;
@@ -55,6 +56,7 @@ mod patch_apply;
 mod patch_compute;
 mod tree;
 
+pub use diff::*;
 pub use instance_snapshot::InstanceSnapshot;
 pub use metadata::*;
 pub use patch::*;

From da18517b0bcad5061ff1bf522263244cce33bd41 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 15 Nov 2023 15:18:09 -0800
Subject: [PATCH 002/366] I am not the joker, baby

---
 src/snapshot/diff/hash.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index d60a56956..95c45a607 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -99,8 +99,10 @@ macro_rules! hash {
     }};
 }
 
+/// Places `value` into the provided hasher.
 fn hash_variant(hasher: &mut Hasher, value: &Variant) {
-    // im da joker babeh
+    // We need to round floats, though I'm not sure to what degree we can
+    // realistically do that.
     match value {
         Variant::String(str) => hash!(hasher, str.as_bytes()),
         Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),

From 986e327c71278b3b912b738526b8f47daa1402a3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 20 Nov 2023 10:22:00 -0800
Subject: [PATCH 003/366] Updating hasher implementation

---
 src/snapshot/diff/hash.rs | 60 ++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index 95c45a607..3c9909ad8 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -2,16 +2,13 @@
 
 use blake3::{Hash, Hasher};
 use rbx_dom_weak::{
-    types::{Ref, Variant},
+    types::{Ref, Variant, Vector3},
     Instance, WeakDom,
 };
 
-use crate::snapshot::RojoTree;
-
 use std::collections::{HashMap, VecDeque};
 
-pub fn hash_tree(tree: &RojoTree) -> HashMap<Ref, Hash> {
-    let dom = tree.inner();
+pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
     let mut order = descendants(dom);
 
@@ -21,7 +18,6 @@ pub fn hash_tree(tree: &RojoTree) -> HashMap<Ref, Hash> {
     // return hash({ sort(foreach(inst.properties, hash)), sort(foreach(inst.children, get_hash_id)) })
     // end
     while let Some(referent) = order.pop() {
-        log::info!("processing {referent}");
         let inst = dom.get_by_ref(referent).unwrap();
         let hash = hash_inst(&mut prop_list, &map, inst);
 
@@ -88,7 +84,7 @@ fn descendants(dom: &WeakDom) -> Vec<Ref> {
 macro_rules! n_hash {
     ($hash:ident, $($num:expr),*) => {
         {$(
-            $hash.update(&$num.to_le_bytes());
+            $hash.update(&($num).to_le_bytes());
         )*}
     };
 }
@@ -106,15 +102,57 @@ fn hash_variant(hasher: &mut Hasher, value: &Variant) {
     match value {
         Variant::String(str) => hash!(hasher, str.as_bytes()),
         Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
-        Variant::Float32(n) => n_hash!(hasher, n),
+        Variant::Float32(n) => n_hash!(hasher, round(*n)),
         Variant::Float64(n) => n_hash!(hasher, n),
         Variant::Int32(n) => n_hash!(hasher, n),
         Variant::Int64(n) => n_hash!(hasher, n),
         Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
-        Variant::Vector3(v3) => n_hash!(hasher, v3.x, v3.y, v3.z),
-        Variant::Vector2(v2) => n_hash!(hasher, v2.x, v2.y),
+        Variant::Vector3(v3) => vector_hash(hasher, *v3),
+        Variant::Vector2(v2) => n_hash!(hasher, round(v2.x), round(v2.y)),
+        Variant::Axes(a) => hash!(hasher, &[a.bits()]),
+        Variant::BrickColor(color) => n_hash!(hasher, *color as u16),
+        Variant::CFrame(cf) => {
+            vector_hash(hasher, cf.position);
+            vector_hash(hasher, cf.orientation.x);
+            vector_hash(hasher, cf.orientation.y);
+            vector_hash(hasher, cf.orientation.z);
+        }
+        Variant::Color3(color) => n_hash!(hasher, round(color.r), round(color.g), round(color.b)),
+        Variant::Color3uint8(color) => hash!(hasher, &[color.r, color.b, color.g]),
+        Variant::ColorSequence(seq) => {
+            let mut new = Vec::with_capacity(seq.keypoints.len());
+            for keypoint in &seq.keypoints {
+                new.push(keypoint);
+            }
+            new.sort_unstable_by(|a, b| round(a.time).partial_cmp(&round(b.time)).unwrap());
+            for keypoint in new {
+                n_hash!(
+                    hasher,
+                    round(keypoint.time),
+                    round(keypoint.color.r),
+                    round(keypoint.color.g),
+                    round(keypoint.color.b)
+                )
+            }
+        }
+        // TODO: Make this more ergonomic
+        Variant::Content(content) => {
+            let s: &str = content.as_ref();
+            hash!(hasher, s.as_bytes())
+        }
+        Variant::Enum(e) => n_hash!(hasher, e.to_u32()),
+        Variant::Faces(f) => hash!(hasher, &[f.bits()]),
 
         // TODO: Add the rest
-        _ => (),
+        // Hashing UniqueId properties doesn't make sense
+        Variant::UniqueId(_) | _ => (),
     }
 }
+
+fn vector_hash(hasher: &mut Hasher, vector: Vector3) {
+    n_hash!(hasher, round(vector.x), round(vector.y), round(vector.z))
+}
+
+fn round(float: f32) -> f32 {
+    (float * 10.0).round() / 10.0
+}

From 7e7ef62c7a28ee358f803aa22bdb0ec34eda6c6e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 20 Nov 2023 11:32:19 -0800
Subject: [PATCH 004/366] ignore default properies for hashing

---
 src/snapshot/diff/hash.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index 3c9909ad8..aa814152a 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -36,9 +36,22 @@ fn hash_inst<'map, 'inst>(
     hasher.update(inst.class.as_bytes());
     hasher.update(inst.name.as_bytes());
 
+    let descriptor = rbx_reflection_database::get()
+        .classes
+        .get(inst.class.as_str())
+        .expect("class should be known to Rojo");
+
     for (name, value) in &inst.properties {
-        prop_list.push((name, value))
+        if let Some(default) = descriptor.default_properties.get(name.as_str()) {
+            // TODO: Float comparison
+            if value != default {
+                prop_list.push((name, value))
+            }
+        } else {
+            prop_list.push((name, value))
+        }
     }
+
     prop_list.sort_unstable_by_key(|(key, _)| *key);
     for (name, value) in prop_list.iter() {
         hasher.update(name.as_bytes());

From ddc85098cc2dd00d5d8443a4632fad604012fc60 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 20 Nov 2023 11:44:13 -0800
Subject: [PATCH 005/366] Move variant stuff to its own file

---
 src/snapshot/diff/hash.rs    | 80 ++---------------------------------
 src/snapshot/diff/mod.rs     |  2 +
 src/snapshot/diff/variant.rs | 81 ++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 77 deletions(-)
 create mode 100644 src/snapshot/diff/variant.rs

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index aa814152a..b0122214e 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -2,12 +2,14 @@
 
 use blake3::{Hash, Hasher};
 use rbx_dom_weak::{
-    types::{Ref, Variant, Vector3},
+    types::{Ref, Variant},
     Instance, WeakDom,
 };
 
 use std::collections::{HashMap, VecDeque};
 
+use super::hash_variant;
+
 pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
     let mut order = descendants(dom);
@@ -93,79 +95,3 @@ fn descendants(dom: &WeakDom) -> Vec<Ref> {
 
     ordered
 }
-
-macro_rules! n_hash {
-    ($hash:ident, $($num:expr),*) => {
-        {$(
-            $hash.update(&($num).to_le_bytes());
-        )*}
-    };
-}
-
-macro_rules! hash {
-    ($hash:ident, $value:expr) => {{
-        $hash.update($value);
-    }};
-}
-
-/// Places `value` into the provided hasher.
-fn hash_variant(hasher: &mut Hasher, value: &Variant) {
-    // We need to round floats, though I'm not sure to what degree we can
-    // realistically do that.
-    match value {
-        Variant::String(str) => hash!(hasher, str.as_bytes()),
-        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
-        Variant::Float32(n) => n_hash!(hasher, round(*n)),
-        Variant::Float64(n) => n_hash!(hasher, n),
-        Variant::Int32(n) => n_hash!(hasher, n),
-        Variant::Int64(n) => n_hash!(hasher, n),
-        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
-        Variant::Vector3(v3) => vector_hash(hasher, *v3),
-        Variant::Vector2(v2) => n_hash!(hasher, round(v2.x), round(v2.y)),
-        Variant::Axes(a) => hash!(hasher, &[a.bits()]),
-        Variant::BrickColor(color) => n_hash!(hasher, *color as u16),
-        Variant::CFrame(cf) => {
-            vector_hash(hasher, cf.position);
-            vector_hash(hasher, cf.orientation.x);
-            vector_hash(hasher, cf.orientation.y);
-            vector_hash(hasher, cf.orientation.z);
-        }
-        Variant::Color3(color) => n_hash!(hasher, round(color.r), round(color.g), round(color.b)),
-        Variant::Color3uint8(color) => hash!(hasher, &[color.r, color.b, color.g]),
-        Variant::ColorSequence(seq) => {
-            let mut new = Vec::with_capacity(seq.keypoints.len());
-            for keypoint in &seq.keypoints {
-                new.push(keypoint);
-            }
-            new.sort_unstable_by(|a, b| round(a.time).partial_cmp(&round(b.time)).unwrap());
-            for keypoint in new {
-                n_hash!(
-                    hasher,
-                    round(keypoint.time),
-                    round(keypoint.color.r),
-                    round(keypoint.color.g),
-                    round(keypoint.color.b)
-                )
-            }
-        }
-        // TODO: Make this more ergonomic
-        Variant::Content(content) => {
-            let s: &str = content.as_ref();
-            hash!(hasher, s.as_bytes())
-        }
-        Variant::Enum(e) => n_hash!(hasher, e.to_u32()),
-        Variant::Faces(f) => hash!(hasher, &[f.bits()]),
-
-        // TODO: Add the rest
-        // Hashing UniqueId properties doesn't make sense
-        Variant::UniqueId(_) | _ => (),
-    }
-}
-
-fn vector_hash(hasher: &mut Hasher, vector: Vector3) {
-    n_hash!(hasher, round(vector.x), round(vector.y), round(vector.z))
-}
-
-fn round(float: f32) -> f32 {
-    (float * 10.0).round() / 10.0
-}
diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
index b820cdbd8..0a1e6ec1f 100644
--- a/src/snapshot/diff/mod.rs
+++ b/src/snapshot/diff/mod.rs
@@ -1,3 +1,5 @@
 mod hash;
+mod variant;
 
 pub use hash::hash_tree;
+pub use variant::hash_variant;
diff --git a/src/snapshot/diff/variant.rs b/src/snapshot/diff/variant.rs
new file mode 100644
index 000000000..8ee7f7189
--- /dev/null
+++ b/src/snapshot/diff/variant.rs
@@ -0,0 +1,81 @@
+use blake3::Hasher;
+use rbx_dom_weak::types::{Variant, Vector3};
+
+macro_rules! round {
+    ($value:expr) => {
+        (($value * 10.0).round() / 10.0)
+    };
+}
+
+macro_rules! n_hash {
+    ($hash:ident, $($num:expr),*) => {
+        {$(
+            $hash.update(&($num).to_le_bytes());
+        )*}
+    };
+}
+
+macro_rules! hash {
+    ($hash:ident, $value:expr) => {{
+        $hash.update($value);
+    }};
+}
+
+/// Places `value` into the provided hasher.
+pub fn hash_variant(hasher: &mut Hasher, value: &Variant) {
+    // We need to round floats, though I'm not sure to what degree we can
+    // realistically do that.
+    match value {
+        Variant::String(str) => hash!(hasher, str.as_bytes()),
+        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
+        Variant::Float32(n) => n_hash!(hasher, round!(*n)),
+        Variant::Float64(n) => n_hash!(hasher, round!(n)),
+        Variant::Int32(n) => n_hash!(hasher, n),
+        Variant::Int64(n) => n_hash!(hasher, n),
+        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
+        Variant::Vector3(v3) => vector_hash(hasher, *v3),
+        Variant::Vector2(v2) => n_hash!(hasher, round!(v2.x), round!(v2.y)),
+        Variant::Axes(a) => hash!(hasher, &[a.bits()]),
+        Variant::BrickColor(color) => n_hash!(hasher, *color as u16),
+        Variant::CFrame(cf) => {
+            vector_hash(hasher, cf.position);
+            vector_hash(hasher, cf.orientation.x);
+            vector_hash(hasher, cf.orientation.y);
+            vector_hash(hasher, cf.orientation.z);
+        }
+        Variant::Color3(color) => {
+            n_hash!(hasher, round!(color.r), round!(color.g), round!(color.b))
+        }
+        Variant::Color3uint8(color) => hash!(hasher, &[color.r, color.b, color.g]),
+        Variant::ColorSequence(seq) => {
+            let mut new = Vec::with_capacity(seq.keypoints.len());
+            for keypoint in &seq.keypoints {
+                new.push(keypoint);
+            }
+            new.sort_unstable_by(|a, b| round!(a.time).partial_cmp(&round!(b.time)).unwrap());
+            for keypoint in new {
+                n_hash!(
+                    hasher,
+                    round!(keypoint.time),
+                    round!(keypoint.color.r),
+                    round!(keypoint.color.g),
+                    round!(keypoint.color.b)
+                )
+            }
+        }
+        Variant::Content(content) => {
+            let s: &str = content.as_ref();
+            hash!(hasher, s.as_bytes())
+        }
+        Variant::Enum(e) => n_hash!(hasher, e.to_u32()),
+        Variant::Faces(f) => hash!(hasher, &[f.bits()]),
+
+        // TODO: Add the rest
+        // Hashing UniqueId properties doesn't make sense
+        Variant::UniqueId(_) | _ => (),
+    }
+}
+
+fn vector_hash(hasher: &mut Hasher, vector: Vector3) {
+    n_hash!(hasher, round!(vector.x), round!(vector.y), round!(vector.z))
+}

From 1c70f1678dcad748443822642861c434ee6d40d0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 20 Nov 2023 12:06:52 -0800
Subject: [PATCH 006/366] Add a variant_eq function

---
 src/snapshot/diff/hash.rs    |  4 ++--
 src/snapshot/diff/mod.rs     |  4 ++--
 src/snapshot/diff/variant.rs | 45 ++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index b0122214e..2176d3958 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -8,7 +8,7 @@ use rbx_dom_weak::{
 
 use std::collections::{HashMap, VecDeque};
 
-use super::hash_variant;
+use super::{hash_variant, variant_eq};
 
 pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
@@ -46,7 +46,7 @@ fn hash_inst<'map, 'inst>(
     for (name, value) in &inst.properties {
         if let Some(default) = descriptor.default_properties.get(name.as_str()) {
             // TODO: Float comparison
-            if value != default {
+            if variant_eq(default, value) {
                 prop_list.push((name, value))
             }
         } else {
diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
index 0a1e6ec1f..28142c825 100644
--- a/src/snapshot/diff/mod.rs
+++ b/src/snapshot/diff/mod.rs
@@ -1,5 +1,5 @@
 mod hash;
 mod variant;
 
-pub use hash::hash_tree;
-pub use variant::hash_variant;
+pub use hash::*;
+pub use variant::*;
diff --git a/src/snapshot/diff/variant.rs b/src/snapshot/diff/variant.rs
index 8ee7f7189..ca54251ab 100644
--- a/src/snapshot/diff/variant.rs
+++ b/src/snapshot/diff/variant.rs
@@ -1,6 +1,8 @@
 use blake3::Hasher;
 use rbx_dom_weak::types::{Variant, Vector3};
 
+use float_cmp::approx_eq;
+
 macro_rules! round {
     ($value:expr) => {
         (($value * 10.0).round() / 10.0)
@@ -79,3 +81,46 @@ pub fn hash_variant(hasher: &mut Hasher, value: &Variant) {
 fn vector_hash(hasher: &mut Hasher, vector: Vector3) {
     n_hash!(hasher, round!(vector.x), round!(vector.y), round!(vector.z))
 }
+
+/// Compares to variants to determine if they're equal. This correctly takes
+/// float comparisons into account.
+pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
+    if variant_a.ty() != variant_b.ty() {
+        return false;
+    }
+
+    match (variant_a, variant_b) {
+        (Variant::Float32(a), Variant::Float32(b)) => {
+            approx_eq!(f32, *a, *b)
+        }
+        (Variant::Float64(a), Variant::Float64(b)) => {
+            approx_eq!(f64, *a, *b)
+        }
+        (Variant::Vector3(a), Variant::Vector3(b)) => vector_eq(a, b),
+        (Variant::CFrame(a), Variant::CFrame(b)) => {
+            vector_eq(&a.position, &b.position)
+                & vector_eq(&a.orientation.x, &b.orientation.x)
+                & vector_eq(&a.orientation.y, &b.orientation.y)
+                & vector_eq(&a.orientation.z, &b.orientation.z)
+        }
+
+        (Variant::String(a), Variant::String(b)) => a == b,
+        (Variant::BinaryString(a), Variant::BinaryString(b)) => a == b,
+        (Variant::Bool(a), Variant::Bool(b)) => a == b,
+        (Variant::Int32(a), Variant::Int32(b)) => a == b,
+        (Variant::Int64(a), Variant::Int64(b)) => a == b,
+        (Variant::Axes(a), Variant::Axes(b)) => a == b,
+        (Variant::Faces(a), Variant::Faces(b)) => a == b,
+
+        (a, b) => panic!(
+            "unsupport variant comparison: {:?} and {:?}",
+            a.ty(),
+            b.ty()
+        ),
+    }
+}
+
+#[inline(always)]
+fn vector_eq(a: &Vector3, b: &Vector3) -> bool {
+    approx_eq!(f32, a.x, b.x) & approx_eq!(f32, a.y, b.y) & approx_eq!(f32, a.z, b.z)
+}

From f879de4f51cf1228e6a64322adc78c5b37d8eba9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 21 Nov 2023 13:05:00 -0800
Subject: [PATCH 007/366] Support equality checks for every variant type

---
 src/snapshot/diff/variant.rs | 191 +++++++++++++++++++++++++++++++----
 1 file changed, 172 insertions(+), 19 deletions(-)

diff --git a/src/snapshot/diff/variant.rs b/src/snapshot/diff/variant.rs
index ca54251ab..48ea28078 100644
--- a/src/snapshot/diff/variant.rs
+++ b/src/snapshot/diff/variant.rs
@@ -1,7 +1,8 @@
 use blake3::Hasher;
-use rbx_dom_weak::types::{Variant, Vector3};
-
 use float_cmp::approx_eq;
+use rbx_dom_weak::types::{PhysicalProperties, Variant, Vector3};
+
+use std::collections::HashMap;
 
 macro_rules! round {
     ($value:expr) => {
@@ -90,28 +91,180 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
     }
 
     match (variant_a, variant_b) {
-        (Variant::Float32(a), Variant::Float32(b)) => {
-            approx_eq!(f32, *a, *b)
-        }
-        (Variant::Float64(a), Variant::Float64(b)) => {
-            approx_eq!(f64, *a, *b)
+        (Variant::Attributes(a), Variant::Attributes(b)) => {
+            // If they're not the same size, we can just abort
+            if a.iter().count() != b.iter().count() {
+                return false;
+            }
+            // Using a duplicated map, we can determine if we have
+            // mismatched keys between A and B
+            let mut b_dupe = HashMap::with_capacity(b.iter().count());
+            for (name, value) in b.iter() {
+                b_dupe.insert(name, value);
+            }
+            for (name, a_value) in a.iter() {
+                if let Some(b_value) = b.get(name.as_str()) {
+                    if variant_eq(a_value, b_value) {
+                        b_dupe.remove(name);
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return false;
+                }
+            }
+            b_dupe.is_empty()
         }
-        (Variant::Vector3(a), Variant::Vector3(b)) => vector_eq(a, b),
+        (Variant::Axes(a), Variant::Axes(b)) => a == b,
+        (Variant::BinaryString(a), Variant::BinaryString(b)) => a == b,
+        (Variant::Bool(a), Variant::Bool(b)) => a == b,
+        (Variant::BrickColor(a), Variant::BrickColor(b)) => a == b,
         (Variant::CFrame(a), Variant::CFrame(b)) => {
             vector_eq(&a.position, &b.position)
-                & vector_eq(&a.orientation.x, &b.orientation.x)
-                & vector_eq(&a.orientation.y, &b.orientation.y)
-                & vector_eq(&a.orientation.z, &b.orientation.z)
+                && vector_eq(&a.orientation.x, &b.orientation.x)
+                && vector_eq(&a.orientation.y, &b.orientation.y)
+                && vector_eq(&a.orientation.z, &b.orientation.z)
+        }
+        (Variant::Color3(a), Variant::Color3(b)) => {
+            approx_eq!(f32, a.r, b.r) && approx_eq!(f32, a.b, b.b) && approx_eq!(f32, a.g, b.g)
+        }
+        (Variant::Color3uint8(a), Variant::Color3uint8(b)) => a == b,
+        (Variant::ColorSequence(a), Variant::ColorSequence(b)) => {
+            if a.keypoints.len() != b.keypoints.len() {
+                return false;
+            }
+            let mut a_keypoints = Vec::with_capacity(a.keypoints.len());
+            let mut b_keypoints = Vec::with_capacity(b.keypoints.len());
+            for keypoint in &a.keypoints {
+                a_keypoints.push(keypoint)
+            }
+            for keypoint in &b.keypoints {
+                b_keypoints.push(keypoint)
+            }
+            a_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
+            b_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
+            for (a_kp, b_kp) in a_keypoints.iter().zip(b_keypoints) {
+                if !(approx_eq!(f32, a_kp.time, b_kp.time)
+                    && approx_eq!(f32, a_kp.color.r, b_kp.color.r)
+                    && approx_eq!(f32, a_kp.color.g, b_kp.color.g)
+                    && approx_eq!(f32, a_kp.color.b, b_kp.color.b))
+                {
+                    return false;
+                }
+            }
+            true
+        }
+        (Variant::Content(a), Variant::Content(b)) => a == b,
+        (Variant::Enum(a), Variant::Enum(b)) => a == b,
+        (Variant::Faces(a), Variant::Faces(b)) => a == b,
+        (Variant::Float32(a), Variant::Float32(b)) => approx_eq!(f32, *a, *b),
+        (Variant::Float64(a), Variant::Float64(b)) => approx_eq!(f64, *a, *b),
+        (Variant::Font(a), Variant::Font(b)) => {
+            a.weight == b.weight
+                && a.style == b.style
+                && a.family == b.family
+                && a.cached_face_id == b.cached_face_id
         }
-
-        (Variant::String(a), Variant::String(b)) => a == b,
-        (Variant::BinaryString(a), Variant::BinaryString(b)) => a == b,
-        (Variant::Bool(a), Variant::Bool(b)) => a == b,
         (Variant::Int32(a), Variant::Int32(b)) => a == b,
         (Variant::Int64(a), Variant::Int64(b)) => a == b,
-        (Variant::Axes(a), Variant::Axes(b)) => a == b,
-        (Variant::Faces(a), Variant::Faces(b)) => a == b,
-
+        (Variant::MaterialColors(a), Variant::MaterialColors(b)) => a.encode() == b.encode(),
+        (Variant::NumberRange(a), Variant::NumberRange(b)) => {
+            approx_eq!(f32, a.max, b.max) && approx_eq!(f32, a.min, a.max)
+        }
+        (Variant::NumberSequence(a), Variant::NumberSequence(b)) => {
+            if a.keypoints.len() != b.keypoints.len() {
+                return false;
+            }
+            let mut a_keypoints = Vec::with_capacity(a.keypoints.len());
+            let mut b_keypoints = Vec::with_capacity(b.keypoints.len());
+            for keypoint in &a.keypoints {
+                a_keypoints.push(keypoint)
+            }
+            for keypoint in &b.keypoints {
+                b_keypoints.push(keypoint)
+            }
+            a_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
+            b_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
+            for (a_kp, b_kp) in a_keypoints.iter().zip(b_keypoints) {
+                if !(approx_eq!(f32, a_kp.time, b_kp.time)
+                    && approx_eq!(f32, a_kp.value, b_kp.value)
+                    && approx_eq!(f32, a_kp.envelope, b_kp.envelope))
+                {
+                    return false;
+                }
+            }
+            true
+        }
+        (Variant::OptionalCFrame(a), Variant::OptionalCFrame(b)) => {
+            if let (Some(a2), Some(b2)) = (a, b) {
+                vector_eq(&a2.position, &b2.position)
+                    && vector_eq(&a2.orientation.x, &b2.orientation.x)
+                    && vector_eq(&a2.orientation.y, &b2.orientation.y)
+                    && vector_eq(&a2.orientation.z, &b2.orientation.z)
+            } else {
+                false
+            }
+        }
+        (Variant::PhysicalProperties(a), Variant::PhysicalProperties(b)) => match (a, b) {
+            (PhysicalProperties::Default, PhysicalProperties::Default) => true,
+            (PhysicalProperties::Custom(a2), PhysicalProperties::Custom(b2)) => {
+                approx_eq!(f32, a2.density, b2.density)
+                    && approx_eq!(f32, a2.elasticity, b2.elasticity)
+                    && approx_eq!(f32, a2.friction, b2.friction)
+                    && approx_eq!(f32, a2.elasticity_weight, b2.elasticity_weight)
+                    && approx_eq!(f32, a2.friction_weight, b2.friction_weight)
+            }
+            (_, _) => false,
+        },
+        (Variant::Ray(a), Variant::Ray(b)) => {
+            vector_eq(&a.direction, &b.direction) && vector_eq(&a.origin, &b.origin)
+        }
+        (Variant::Rect(a), Variant::Rect(b)) => {
+            approx_eq!(f32, a.max.x, b.max.x)
+                && approx_eq!(f32, a.max.y, b.max.y)
+                && approx_eq!(f32, a.min.x, b.min.x)
+                && approx_eq!(f32, a.min.y, b.min.y)
+        }
+        (Variant::Ref(a), Variant::Ref(b)) => a == b,
+        (Variant::Region3(a), Variant::Region3(b)) => {
+            vector_eq(&a.max, &b.max) && vector_eq(&a.min, &b.min)
+        }
+        (Variant::Region3int16(a), Variant::Region3int16(b)) => a == b,
+        (Variant::SecurityCapabilities(a), Variant::SecurityCapabilities(b)) => a == b,
+        (Variant::SharedString(a), Variant::SharedString(b)) => a == b,
+        (Variant::Tags(a), Variant::Tags(b)) => {
+            let mut a_sorted: Vec<&str> = a.iter().collect();
+            let mut b_sorted: Vec<&str> = b.iter().collect();
+            if a_sorted.len() == b_sorted.len() {
+                a_sorted.sort_unstable();
+                b_sorted.sort_unstable();
+                for (a_tag, b_tag) in a_sorted.into_iter().zip(b_sorted) {
+                    if a_tag != b_tag {
+                        return false;
+                    }
+                }
+                true
+            } else {
+                false
+            }
+        }
+        (Variant::UDim(a), Variant::UDim(b)) => {
+            approx_eq!(f32, a.scale, b.scale) && a.offset == b.offset
+        }
+        (Variant::UDim2(a), Variant::UDim2(b)) => {
+            approx_eq!(f32, a.x.scale, b.x.scale)
+                && a.x.offset == b.x.offset
+                && approx_eq!(f32, a.y.scale, b.y.scale)
+                && a.y.offset == b.y.offset
+        }
+        (Variant::UniqueId(a), Variant::UniqueId(b)) => a == b,
+        (Variant::String(a), Variant::String(b)) => a == b,
+        (Variant::Vector2(a), Variant::Vector2(b)) => {
+            approx_eq!(f32, a.x, b.x) && approx_eq!(f32, a.y, b.y)
+        }
+        (Variant::Vector2int16(a), Variant::Vector2int16(b)) => a == b,
+        (Variant::Vector3(a), Variant::Vector3(b)) => vector_eq(a, b),
+        (Variant::Vector3int16(a), Variant::Vector3int16(b)) => a == b,
         (a, b) => panic!(
             "unsupport variant comparison: {:?} and {:?}",
             a.ty(),
@@ -122,5 +275,5 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
 
 #[inline(always)]
 fn vector_eq(a: &Vector3, b: &Vector3) -> bool {
-    approx_eq!(f32, a.x, b.x) & approx_eq!(f32, a.y, b.y) & approx_eq!(f32, a.z, b.z)
+    approx_eq!(f32, a.x, b.x) && approx_eq!(f32, a.y, b.y) && approx_eq!(f32, a.z, b.z)
 }

From 77152f398bcc3a7b5932ed5040235cdc19a3c624 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 21 Nov 2023 15:10:30 -0800
Subject: [PATCH 008/366] Don't hash DataModels

---
 src/snapshot/diff/hash.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index 2176d3958..4ed2cb267 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -21,6 +21,10 @@ pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     // end
     while let Some(referent) = order.pop() {
         let inst = dom.get_by_ref(referent).unwrap();
+        // We don't really care about the equality of a DataModel.
+        if inst.class == "DataModel" {
+            continue;
+        }
         let hash = hash_inst(&mut prop_list, &map, inst);
 
         map.insert(referent, hash);

From cc06f271fb105bd3595c26f521efa7311df90ece Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 21 Nov 2023 15:13:56 -0800
Subject: [PATCH 009/366] Correctly only hash non-default properties

---
 src/snapshot/diff/hash.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index 4ed2cb267..a7e9a3391 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -49,8 +49,7 @@ fn hash_inst<'map, 'inst>(
 
     for (name, value) in &inst.properties {
         if let Some(default) = descriptor.default_properties.get(name.as_str()) {
-            // TODO: Float comparison
-            if variant_eq(default, value) {
+            if !variant_eq(default, value) {
                 prop_list.push((name, value))
             }
         } else {

From 75182ed316bab2c4151fcab7b3d5a0f159b2e711 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 21 Nov 2023 15:14:37 -0800
Subject: [PATCH 010/366] Implement hashing for all Variant types

---
 src/snapshot/diff/variant.rs | 135 ++++++++++++++++++++++++++++++++---
 1 file changed, 124 insertions(+), 11 deletions(-)

diff --git a/src/snapshot/diff/variant.rs b/src/snapshot/diff/variant.rs
index 48ea28078..2d1b3827a 100644
--- a/src/snapshot/diff/variant.rs
+++ b/src/snapshot/diff/variant.rs
@@ -29,16 +29,17 @@ pub fn hash_variant(hasher: &mut Hasher, value: &Variant) {
     // We need to round floats, though I'm not sure to what degree we can
     // realistically do that.
     match value {
-        Variant::String(str) => hash!(hasher, str.as_bytes()),
-        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
-        Variant::Float32(n) => n_hash!(hasher, round!(*n)),
-        Variant::Float64(n) => n_hash!(hasher, round!(n)),
-        Variant::Int32(n) => n_hash!(hasher, n),
-        Variant::Int64(n) => n_hash!(hasher, n),
-        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
-        Variant::Vector3(v3) => vector_hash(hasher, *v3),
-        Variant::Vector2(v2) => n_hash!(hasher, round!(v2.x), round!(v2.y)),
+        Variant::Attributes(attrs) => {
+            let mut sorted: Vec<(&String, &Variant)> = attrs.iter().collect();
+            sorted.sort_unstable_by_key(|(name, _)| *name);
+            for (name, attribute) in sorted {
+                hasher.update(name.as_bytes());
+                hash_variant(hasher, attribute);
+            }
+        }
         Variant::Axes(a) => hash!(hasher, &[a.bits()]),
+        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
+        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
         Variant::BrickColor(color) => n_hash!(hasher, *color as u16),
         Variant::CFrame(cf) => {
             vector_hash(hasher, cf.position);
@@ -72,10 +73,122 @@ pub fn hash_variant(hasher: &mut Hasher, value: &Variant) {
         }
         Variant::Enum(e) => n_hash!(hasher, e.to_u32()),
         Variant::Faces(f) => hash!(hasher, &[f.bits()]),
+        Variant::Float32(n) => n_hash!(hasher, round!(*n)),
+        Variant::Float64(n) => n_hash!(hasher, round!(n)),
+        Variant::Font(f) => {
+            n_hash!(hasher, f.weight as u16);
+            n_hash!(hasher, f.style as u8);
+            hash!(hasher, f.family.as_bytes());
+            if let Some(cache) = &f.cached_face_id {
+                hash!(hasher, &[0x01]);
+                hash!(hasher, cache.as_bytes());
+            } else {
+                hash!(hasher, &[0x00]);
+            }
+        }
+        Variant::Int32(n) => n_hash!(hasher, n),
+        Variant::Int64(n) => n_hash!(hasher, n),
+        Variant::MaterialColors(n) => hash!(hasher, n.encode().as_slice()),
+        Variant::NumberRange(nr) => n_hash!(hasher, round!(nr.max), round!(nr.min)),
+        Variant::NumberSequence(seq) => {
+            let mut new = Vec::with_capacity(seq.keypoints.len());
+            for keypoint in &seq.keypoints {
+                new.push(keypoint);
+            }
+            new.sort_unstable_by(|a, b| round!(a.time).partial_cmp(&round!(b.time)).unwrap());
+            for keypoint in new {
+                n_hash!(
+                    hasher,
+                    round!(keypoint.time),
+                    round!(keypoint.value),
+                    round!(keypoint.envelope)
+                )
+            }
+        }
+        Variant::OptionalCFrame(maybe_cf) => {
+            if let Some(cf) = maybe_cf {
+                hash!(hasher, &[0x01]);
+                vector_hash(hasher, cf.position);
+                vector_hash(hasher, cf.orientation.x);
+                vector_hash(hasher, cf.orientation.y);
+                vector_hash(hasher, cf.orientation.z);
+            } else {
+                hash!(hasher, &[0x00]);
+            }
+        }
+        Variant::PhysicalProperties(properties) => match properties {
+            PhysicalProperties::Default => hash!(hasher, &[0x00]),
+            PhysicalProperties::Custom(custom) => {
+                hash!(hasher, &[0x00]);
+                n_hash!(
+                    hasher,
+                    round!(custom.density),
+                    round!(custom.friction),
+                    round!(custom.elasticity),
+                    round!(custom.friction_weight),
+                    round!(custom.elasticity_weight)
+                )
+            }
+        },
+        Variant::Ray(ray) => {
+            vector_hash(hasher, ray.origin);
+            vector_hash(hasher, ray.direction);
+        }
+        Variant::Rect(rect) => n_hash!(
+            hasher,
+            round!(rect.max.x),
+            round!(rect.max.y),
+            round!(rect.min.x),
+            round!(rect.min.y)
+        ),
+        Variant::Ref(referent) => hash!(hasher, referent.to_string().as_bytes()),
+        Variant::Region3(region) => {
+            vector_hash(hasher, region.max);
+            vector_hash(hasher, region.min);
+        }
+        Variant::Region3int16(region) => {
+            n_hash!(
+                hasher,
+                region.max.x,
+                region.max.y,
+                region.max.z,
+                region.min.x,
+                region.min.y,
+                region.min.z
+            )
+        }
+        Variant::SecurityCapabilities(capabilities) => n_hash!(hasher, capabilities.bits()),
+        Variant::SharedString(sstr) => hash!(hasher, sstr.hash().as_bytes()),
+        Variant::String(str) => hash!(hasher, str.as_bytes()),
+        Variant::Tags(tags) => {
+            let mut dupe: Vec<&str> = tags.iter().collect();
+            dupe.sort_unstable();
+            for tag in dupe {
+                hash!(hasher, tag.as_bytes())
+            }
+        }
+        Variant::UDim(udim) => n_hash!(hasher, round!(udim.scale), udim.offset),
+        Variant::UDim2(udim) => n_hash!(
+            hasher,
+            round!(udim.y.scale),
+            udim.y.offset,
+            round!(udim.x.scale),
+            udim.x.offset
+        ),
+        Variant::Vector2(v2) => n_hash!(hasher, round!(v2.x), round!(v2.y)),
+        Variant::Vector2int16(v2) => n_hash!(hasher, v2.x, v2.y),
+        Variant::Vector3(v3) => vector_hash(hasher, *v3),
+        Variant::Vector3int16(v3) => n_hash!(hasher, v3.x, v3.y, v3.z),
 
-        // TODO: Add the rest
         // Hashing UniqueId properties doesn't make sense
-        Variant::UniqueId(_) | _ => (),
+        Variant::UniqueId(_) => (),
+
+        unknown => {
+            log::warn!(
+                "Encountered unknown Variant {:?} while hashing",
+                unknown.ty()
+            )
+        }
     }
 }
 

From d5635c2dc85c6e89726a6aa081103a74db6f53a7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 21 Nov 2023 15:16:31 -0800
Subject: [PATCH 011/366] Make `hash_inst` public

---
 src/snapshot/diff/hash.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index a7e9a3391..c91769331 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -33,7 +33,7 @@ pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     map
 }
 
-fn hash_inst<'map, 'inst>(
+pub fn hash_inst<'map, 'inst>(
     prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
     map: &'map HashMap<Ref, Hash>,
     inst: &'inst Instance,

From 77294d26db77e199f047f173e2458325a0d1eed2 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 21 Nov 2023 16:01:37 -0800
Subject: [PATCH 012/366] Abstract tree diffing to its own function

---
 src/snapshot/diff/mod.rs | 44 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
index 28142c825..1b049b4cd 100644
--- a/src/snapshot/diff/mod.rs
+++ b/src/snapshot/diff/mod.rs
@@ -3,3 +3,47 @@ mod variant;
 
 pub use hash::*;
 pub use variant::*;
+
+use rbx_dom_weak::{types::Ref, WeakDom};
+use std::{collections::HashMap, hash::Hash};
+
+pub fn diff_trees(dom_1: &WeakDom, dom_2: &WeakDom) -> Diff {
+    let list_1 = hash_tree(dom_1);
+    let mut list_2 = invert_map(hash_tree(dom_2));
+
+    let mut removals = Vec::new();
+
+    for (referent, hash) in list_1 {
+        // If it's in both lists, we'll pull it out of list_2 so that
+        // it doesn't get flagged as an addition.
+        if list_2.contains_key(&hash) {
+            list_2.remove(&hash);
+        } else {
+            removals.push(referent);
+        }
+    }
+
+    Diff {
+        removals,
+        additions: list_2.into_iter().map(|(_, referent)| referent).collect(),
+    }
+}
+
+fn invert_map<K: Hash + Eq, V: Hash + Eq>(map: HashMap<K, V>) -> HashMap<V, K> {
+    map.into_iter().map(|(key, value)| (value, key)).collect()
+}
+
+pub struct Diff {
+    /// Referents that were either removed or changed (in dom 1, not in dom 2)
+    pub removals: Vec<Ref>,
+    /// Referents that were added or changed (in dom 2, not in dom 1)
+    pub additions: Vec<Ref>,
+}
+
+impl Diff {
+    /// Returns the total number of diffs represented by this struct
+    #[inline]
+    pub fn total(&self) -> usize {
+        self.removals.len() + self.additions.len()
+    }
+}

From d052d20841175c5b4bfe9fceb097c2c2c6be831d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 28 Nov 2023 11:42:11 -0800
Subject: [PATCH 013/366] Track middleware in InstanceMetadata

---
 src/snapshot/metadata.rs       |  3 +++
 src/snapshot_middleware/mod.rs | 30 +++++++++++++++++-------------
 src/web/ui.rs                  |  1 +
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/snapshot/metadata.rs b/src/snapshot/metadata.rs
index 1578af230..6df36e082 100644
--- a/src/snapshot/metadata.rs
+++ b/src/snapshot/metadata.rs
@@ -58,6 +58,8 @@ pub struct InstanceMetadata {
     /// that instance's instigating source is snapshotted directly, the same
     /// context will be passed into it.
     pub context: InstanceContext,
+
+    pub middleware: Option<Middleware>,
 }
 
 impl InstanceMetadata {
@@ -67,6 +69,7 @@ impl InstanceMetadata {
             instigating_source: None,
             relevant_paths: Vec::new(),
             context: InstanceContext::default(),
+            middleware: None,
         }
     }
 
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 30ea57061..dd52fc2e4 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -161,23 +161,27 @@ fn snapshot_from_path(
     vfs: &Vfs,
     path: &Path,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
-    if let Some(rule) = context.get_user_sync_rule(path) {
-        return rule
-            .middleware
-            .snapshot(context, vfs, path, rule.file_name_for_path(path)?);
+    let mut rule = None;
+    if let Some(user_rule) = context.get_user_sync_rule(path) {
+        rule = Some(user_rule);
     } else {
-        for rule in default_sync_rules() {
-            if rule.matches(path) {
-                return rule.middleware.snapshot(
-                    context,
-                    vfs,
-                    path,
-                    rule.file_name_for_path(path)?,
-                );
+        for default_rule in default_sync_rules() {
+            if default_rule.matches(path) {
+                rule = Some(default_rule);
             }
         }
     }
-    Ok(None)
+    if let Some(rule) = rule {
+        Ok(rule
+            .middleware
+            .snapshot(context, vfs, path, rule.file_name_for_path(path)?)?
+            .and_then(|mut snapshot| {
+                snapshot.metadata.middleware = Some(rule.middleware);
+                Some(snapshot)
+            }))
+    } else {
+        Ok(None)
+    }
 }
 
 /// Represents a possible 'transformer' used by Rojo to turn a file system
diff --git a/src/web/ui.rs b/src/web/ui.rs
index 0199d58d7..6f9d0e077 100644
--- a/src/web/ui.rs
+++ b/src/web/ui.rs
@@ -165,6 +165,7 @@ impl UiService {
                 <>
                     <div>"ignore_unknown_instances: " { metadata.ignore_unknown_instances.to_string() }</div>
                     <div>"instigating source: " { format!("{:?}", metadata.instigating_source) }</div>
+                    <div>"middleware: " { format!("{:?}", metadata.middleware) }</div>
                     { relevant_paths }
                 </>
             };

From 41e95e624ad1b61946790c519760439ac2dc2500 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 28 Nov 2023 12:02:13 -0800
Subject: [PATCH 014/366] Only add actually relevant paths for dirs

---
 src/snapshot_middleware/csv.rs |  4 ++++
 src/snapshot_middleware/dir.rs | 15 +--------------
 src/snapshot_middleware/lua.rs |  4 ++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 52e8ab0fd..676dc853c 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -76,6 +76,10 @@ pub fn snapshot_csv_init(
 
     init_snapshot.children = dir_snapshot.children;
     init_snapshot.metadata = dir_snapshot.metadata;
+    init_snapshot
+        .metadata
+        .relevant_paths
+        .push(init_path.to_owned());
 
     if let Some(mut meta) = dir_meta(vfs, folder_path)? {
         meta.apply_all(&mut init_snapshot)?;
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 092641e7f..ac3e79efc 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -75,20 +75,7 @@ pub fn snapshot_dir_no_meta(
 
     let meta_path = path.join("init.meta.json");
 
-    let relevant_paths = vec![
-        path.to_path_buf(),
-        meta_path,
-        // TODO: We shouldn't need to know about Lua existing in this
-        // middleware. Should we figure out a way for that function to add
-        // relevant paths to this middleware?
-        path.join("init.lua"),
-        path.join("init.luau"),
-        path.join("init.server.lua"),
-        path.join("init.server.luau"),
-        path.join("init.client.lua"),
-        path.join("init.client.luau"),
-        path.join("init.csv"),
-    ];
+    let relevant_paths = vec![path.to_path_buf(), meta_path];
 
     let snapshot = InstanceSnapshot::new()
         .name(instance_name)
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index ab7f15a1f..6821dd84b 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -107,6 +107,10 @@ pub fn snapshot_lua_init(
 
     init_snapshot.children = dir_snapshot.children;
     init_snapshot.metadata = dir_snapshot.metadata;
+    init_snapshot
+        .metadata
+        .relevant_paths
+        .push(init_path.to_owned());
 
     if let Some(mut meta) = dir_meta(vfs, folder_path)? {
         meta.apply_all(&mut init_snapshot)?;

From 03644632e03c26472fc6ff109d528940e6e04170 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 28 Nov 2023 12:46:14 -0800
Subject: [PATCH 015/366] Move descendants function to diff module

---
 src/snapshot/diff/hash.rs | 22 ++--------------------
 src/snapshot/diff/mod.rs  | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index c91769331..c05db9a75 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -6,9 +6,9 @@ use rbx_dom_weak::{
     Instance, WeakDom,
 };
 
-use std::collections::{HashMap, VecDeque};
+use std::collections::HashMap;
 
-use super::{hash_variant, variant_eq};
+use super::{descendants, hash_variant, variant_eq};
 
 pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
@@ -80,21 +80,3 @@ pub fn hash_inst<'map, 'inst>(
 
     hasher.finalize()
 }
-
-fn descendants(dom: &WeakDom) -> Vec<Ref> {
-    let mut queue = VecDeque::new();
-    let mut ordered = Vec::new();
-    queue.push_front(dom.root_ref());
-
-    while let Some(referent) = queue.pop_front() {
-        let inst = dom
-            .get_by_ref(referent)
-            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
-        ordered.push(referent);
-        for child in inst.children() {
-            queue.push_back(*child)
-        }
-    }
-
-    ordered
-}
diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
index 1b049b4cd..14651ae8f 100644
--- a/src/snapshot/diff/mod.rs
+++ b/src/snapshot/diff/mod.rs
@@ -5,7 +5,10 @@ pub use hash::*;
 pub use variant::*;
 
 use rbx_dom_weak::{types::Ref, WeakDom};
-use std::{collections::HashMap, hash::Hash};
+use std::{
+    collections::{HashMap, VecDeque},
+    hash::Hash,
+};
 
 pub fn diff_trees(dom_1: &WeakDom, dom_2: &WeakDom) -> Diff {
     let list_1 = hash_tree(dom_1);
@@ -47,3 +50,21 @@ impl Diff {
         self.removals.len() + self.additions.len()
     }
 }
+
+pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
+    let mut queue = VecDeque::new();
+    let mut ordered = Vec::new();
+    queue.push_front(dom.root_ref());
+
+    while let Some(referent) = queue.pop_front() {
+        let inst = dom
+            .get_by_ref(referent)
+            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
+        ordered.push(referent);
+        for child in inst.children() {
+            queue.push_back(*child)
+        }
+    }
+
+    ordered
+}

From 8e72b42d81110c2db371e284a3acbbb194b7a21f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 5 Dec 2023 10:58:05 -0800
Subject: [PATCH 016/366] Use middleware for directories too!

---
 ..._snapshot__tests__apply__add_property.snap |   1 +
 ...s__apply__remove_property_after_patch.snap |   1 +
 ...tests__apply__remove_property_initial.snap |   1 +
 ...tests__apply__set_name_and_class_name.snap |   1 +
 ...__snapshot__tests__compute__add_child.snap |   1 +
 src/snapshot_middleware/csv.rs                |   3 +-
 src/snapshot_middleware/dir.rs                |  37 ++--
 src/snapshot_middleware/lua.rs                |   3 +-
 src/snapshot_middleware/mod.rs                | 166 ++++++++----------
 ...t_middleware__csv__test__csv_from_vfs.snap |   1 +
 ..._middleware__csv__test__csv_with_meta.snap |   1 +
 ...t_middleware__dir__test__empty_folder.snap |   8 +-
 ...ddleware__dir__test__folder_in_folder.snap |  16 +-
 ...leware__json__test__instance_from_vfs.snap |   1 +
 ...are__json_model__test__model_from_vfs.snap |   2 +
 ...on_model__test__model_from_vfs_legacy.snap |   2 +
 ...are__lua__test__class_client_from_vfs.snap |   1 +
 ...are__lua__test__class_module_from_vfs.snap |   1 +
 ...re__lua__test__class_module_with_meta.snap |   1 +
 ...are__lua__test__class_script_disabled.snap |   1 +
 ...re__lua__test__class_script_with_meta.snap |   1 +
 ...are__lua__test__class_server_from_vfs.snap |   1 +
 ...lua__test__runcontext_client_from_vfs.snap |   1 +
 ...lua__test__runcontext_module_from_vfs.snap |   1 +
 ...ua__test__runcontext_module_with_meta.snap |   1 +
 ...lua__test__runcontext_script_disabled.snap |   1 +
 ...ua__test__runcontext_script_with_meta.snap |   1 +
 ...lua__test__runcontext_server_from_vfs.snap |   1 +
 ...oject__test__project_from_direct_file.snap |   1 +
 ...test__project_path_property_overrides.snap |   1 +
 ..._project__test__project_with_children.snap |   2 +
 ...t__test__project_with_path_to_project.snap |   1 +
 ...ct_with_path_to_project_with_children.snap |   2 +
 ...oject__test__project_with_path_to_txt.snap |   1 +
 ...est__project_with_resolved_properties.snap |   1 +
 ...t__project_with_unresolved_properties.snap |   1 +
 ...leware__toml__test__instance_from_vfs.snap |   1 +
 ...dleware__txt__test__instance_from_vfs.snap |   1 +
 38 files changed, 139 insertions(+), 130 deletions(-)

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 0d594dbc0..3c751fdf4 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
@@ -13,5 +13,6 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  middleware: ~
 children: []
 
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap
index b6fcbbd08..c4af516ea 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap
@@ -11,5 +11,6 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  middleware: ~
 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 84b3c3d1e..8ed43ccd9 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
@@ -13,5 +13,6 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  middleware: ~
 children: []
 
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap
index 325c86f3c..5772090e1 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap
@@ -11,5 +11,6 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  middleware: ~
 children: []
 
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap
index 94ddf12fb..01ae237fa 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap
@@ -12,6 +12,7 @@ added_instances:
         relevant_paths: []
         context:
           emit_legacy_scripts: true
+        middleware: ~
       name: New
       class_name: Folder
       properties: {}
diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 676dc853c..594b5d53b 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -57,9 +57,10 @@ pub fn snapshot_csv_init(
     context: &InstanceContext,
     vfs: &Vfs,
     init_path: &Path,
+    name: &str,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
     let folder_path = init_path.parent().unwrap();
-    let dir_snapshot = snapshot_dir_no_meta(context, vfs, folder_path)?.unwrap();
+    let dir_snapshot = snapshot_dir_no_meta(context, vfs, folder_path, name)?.unwrap();
 
     if dir_snapshot.class_name != "Folder" {
         anyhow::bail!(
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index ac3e79efc..eea248a52 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -10,8 +10,9 @@ pub fn snapshot_dir(
     context: &InstanceContext,
     vfs: &Vfs,
     path: &Path,
+    name: &str,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
-    let mut snapshot = match snapshot_dir_no_meta(context, vfs, path)? {
+    let mut snapshot = match snapshot_dir_no_meta(context, vfs, path, name)? {
         Some(snapshot) => snapshot,
         None => return Ok(None),
     };
@@ -44,6 +45,7 @@ pub fn snapshot_dir_no_meta(
     context: &InstanceContext,
     vfs: &Vfs,
     path: &Path,
+    name: &str,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
     let passes_filter_rules = |child: &DirEntry| {
         context
@@ -66,19 +68,12 @@ pub fn snapshot_dir_no_meta(
         }
     }
 
-    let instance_name = path
-        .file_name()
-        .expect("Could not extract file name")
-        .to_str()
-        .ok_or_else(|| anyhow::anyhow!("File name was not valid UTF-8: {}", path.display()))?
-        .to_string();
-
     let meta_path = path.join("init.meta.json");
 
     let relevant_paths = vec![path.to_path_buf(), meta_path];
 
     let snapshot = InstanceSnapshot::new()
-        .name(instance_name)
+        .name(name)
         .class_name("Folder")
         .children(snapshot_children)
         .metadata(
@@ -106,10 +101,14 @@ mod test {
 
         let mut vfs = Vfs::new(imfs);
 
-        let instance_snapshot =
-            snapshot_dir(&InstanceContext::default(), &mut vfs, Path::new("/foo"))
-                .unwrap()
-                .unwrap();
+        let instance_snapshot = snapshot_dir(
+            &InstanceContext::default(),
+            &mut vfs,
+            Path::new("/foo"),
+            "foo",
+        )
+        .unwrap()
+        .unwrap();
 
         insta::assert_yaml_snapshot!(instance_snapshot);
     }
@@ -127,10 +126,14 @@ mod test {
 
         let mut vfs = Vfs::new(imfs);
 
-        let instance_snapshot =
-            snapshot_dir(&InstanceContext::default(), &mut vfs, Path::new("/foo"))
-                .unwrap()
-                .unwrap();
+        let instance_snapshot = snapshot_dir(
+            &InstanceContext::default(),
+            &mut vfs,
+            Path::new("/foo"),
+            "foo",
+        )
+        .unwrap()
+        .unwrap();
 
         insta::assert_yaml_snapshot!(instance_snapshot);
     }
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 6821dd84b..650a71eb7 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -85,10 +85,11 @@ pub fn snapshot_lua_init(
     context: &InstanceContext,
     vfs: &Vfs,
     init_path: &Path,
+    name: &str,
     script_type: ScriptType,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
     let folder_path = init_path.parent().unwrap();
-    let dir_snapshot = snapshot_dir_no_meta(context, vfs, folder_path)?.unwrap();
+    let dir_snapshot = snapshot_dir_no_meta(context, vfs, folder_path, name)?.unwrap();
 
     if dir_snapshot.class_name != "Folder" {
         anyhow::bail!(
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index dd52fc2e4..5be18eb36 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -61,33 +61,9 @@ pub fn snapshot_from_vfs(
     };
 
     if meta.is_dir() {
-        if let Some(init_path) = get_init_path(vfs, path)? {
-            // TODO: support user-defined init paths
-            for rule in default_sync_rules() {
-                if rule.matches(&init_path) {
-                    return match rule.middleware {
-                        Middleware::Project => snapshot_project(context, vfs, &init_path),
-
-                        Middleware::ModuleScript => {
-                            snapshot_lua_init(context, vfs, &init_path, ScriptType::Module)
-                        }
-                        Middleware::ServerScript => {
-                            snapshot_lua_init(context, vfs, &init_path, ScriptType::Server)
-                        }
-                        Middleware::ClientScript => {
-                            snapshot_lua_init(context, vfs, &init_path, ScriptType::Client)
-                        }
-
-                        Middleware::Csv => snapshot_csv_init(context, vfs, &init_path),
-
-                        _ => snapshot_dir(context, vfs, path),
-                    };
-                }
-            }
-            snapshot_dir(context, vfs, path)
-        } else {
-            snapshot_dir(context, vfs, path)
-        }
+        let (middleware, name) = get_dir_middleware(vfs, path)?;
+        // TODO: Support user defined init paths
+        middleware.snapshot(context, vfs, path, &name)
     } else {
         let file_name = path
             .file_name()
@@ -105,53 +81,39 @@ pub fn snapshot_from_vfs(
     }
 }
 
-/// Gets an `init` path for the given directory.
-/// This uses an intrinsic priority list and for compatibility,
-/// it should not be changed.
-fn get_init_path<P: AsRef<Path>>(vfs: &Vfs, dir: P) -> anyhow::Result<Option<PathBuf>> {
+/// Gets the appropriate middleware for a directory by checking for `init`
+/// files. This uses an intrinsic priority list and for compatibility,
+/// that order should be left unchanged.
+fn get_dir_middleware<P: AsRef<Path>>(vfs: &Vfs, dir: P) -> anyhow::Result<(Middleware, String)> {
     let path = dir.as_ref();
+    let dir_name = path
+        .file_name()
+        .expect("Could not extract directory name")
+        .to_str()
+        .ok_or_else(|| anyhow::anyhow!("File name was not valid UTF-8: {}", path.display()))?
+        .to_string();
 
-    let project_path = path.join("default.project.json");
-    if vfs.metadata(&project_path).with_not_found()?.is_some() {
-        return Ok(Some(project_path));
-    }
-
-    let init_path = path.join("init.luau");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
-    }
-
-    let init_path = path.join("init.lua");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
-    }
-
-    let init_path = path.join("init.server.luau");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
-    }
-
-    let init_path = path.join("init.server.lua");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
-    }
-
-    let init_path = path.join("init.client.luau");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
-    }
-
-    let init_path = path.join("init.client.lua");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
-    }
+    static INIT_PATHS: OnceLock<Vec<(Middleware, &str)>> = OnceLock::new();
+    let order = INIT_PATHS.get_or_init(|| {
+        vec![
+            (Middleware::Project, "default.project.json"),
+            (Middleware::ModuleScriptDir, "init.luau"),
+            (Middleware::ModuleScriptDir, "init.lua"),
+            (Middleware::ServerScriptDir, "init.server.luau"),
+            (Middleware::ServerScriptDir, "init.server.lua"),
+            (Middleware::ClientScriptDir, "init.client.luau"),
+            (Middleware::ClientScriptDir, "init.client.lua"),
+            (Middleware::CsvDir, "init.csv"),
+        ]
+    });
 
-    let init_path = path.join("init.csv");
-    if vfs.metadata(&init_path).with_not_found()?.is_some() {
-        return Ok(Some(init_path));
+    for (middleware, name) in order {
+        if vfs.metadata(path.join(name)).with_not_found()?.is_some() {
+            return Ok((*middleware, dir_name));
+        }
     }
 
-    Ok(None)
+    Ok((Middleware::Dir, dir_name))
 }
 
 /// Gets a snapshot for a path given an InstanceContext and Vfs, taking
@@ -161,33 +123,30 @@ fn snapshot_from_path(
     vfs: &Vfs,
     path: &Path,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
-    let mut rule = None;
-    if let Some(user_rule) = context.get_user_sync_rule(path) {
-        rule = Some(user_rule);
+    if let Some(rule) = context.get_user_sync_rule(path) {
+        return rule
+            .middleware
+            .snapshot(context, vfs, path, rule.file_name_for_path(path)?);
     } else {
-        for default_rule in default_sync_rules() {
-            if default_rule.matches(path) {
-                rule = Some(default_rule);
+        for rule in default_sync_rules() {
+            if rule.matches(path) {
+                return rule.middleware.snapshot(
+                    context,
+                    vfs,
+                    path,
+                    rule.file_name_for_path(path)?,
+                );
             }
         }
     }
-    if let Some(rule) = rule {
-        Ok(rule
-            .middleware
-            .snapshot(context, vfs, path, rule.file_name_for_path(path)?)?
-            .and_then(|mut snapshot| {
-                snapshot.metadata.middleware = Some(rule.middleware);
-                Some(snapshot)
-            }))
-    } else {
-        Ok(None)
-    }
+    Ok(None)
 }
 
 /// Represents a possible 'transformer' used by Rojo to turn a file system
-/// item into a Roblox Instance. Missing from this list are directories and
-/// metadata. This is deliberate, as metadata is not a snapshot middleware
-/// and directories do not make sense to turn into files.
+/// item into a Roblox Instance. Missing from this list is metadata.
+/// This is deliberate, as metadata is not a snapshot middleware.
+///
+/// Directories cannot be used for sync rules so they're ignored by Serde.
 #[derive(Debug, Clone, Copy, PartialEq, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum Middleware {
@@ -203,6 +162,17 @@ pub enum Middleware {
     Toml,
     Text,
     Ignore,
+
+    #[serde(skip_deserializing)]
+    Dir,
+    #[serde(skip_deserializing)]
+    ServerScriptDir,
+    #[serde(skip_deserializing)]
+    ClientScriptDir,
+    #[serde(skip_deserializing)]
+    ModuleScriptDir,
+    #[serde(skip_deserializing)]
+    CsvDir,
 }
 
 impl Middleware {
@@ -215,7 +185,7 @@ impl Middleware {
         path: &Path,
         name: &str,
     ) -> anyhow::Result<Option<InstanceSnapshot>> {
-        match self {
+        let mut output = match self {
             Self::Csv => snapshot_csv(context, vfs, path, name),
             Self::JsonModel => snapshot_json_model(context, vfs, path, name),
             Self::Json => snapshot_json(context, vfs, path, name),
@@ -230,7 +200,23 @@ impl Middleware {
             Self::Toml => snapshot_toml(context, vfs, path, name),
             Self::Text => snapshot_txt(context, vfs, path, name),
             Self::Ignore => Ok(None),
+
+            Self::Dir => snapshot_dir(context, vfs, path, name),
+            Self::ServerScriptDir => {
+                snapshot_lua_init(context, vfs, path, name, ScriptType::Server)
+            }
+            Self::ClientScriptDir => {
+                snapshot_lua_init(context, vfs, path, name, ScriptType::Client)
+            }
+            Self::ModuleScriptDir => {
+                snapshot_lua_init(context, vfs, path, name, ScriptType::Module)
+            }
+            Self::CsvDir => snapshot_csv_init(context, vfs, path, name),
+        };
+        if let Ok(Some(ref mut snapshot)) = output {
+            snapshot.metadata.middleware = Some(*self);
         }
+        output
     }
 }
 
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 50ce53c11..18b12d24b 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: LocalizationTable
 properties:
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 c91924f8c..1bddf74c1 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: LocalizationTable
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap
index 4c0dcbbf4..823106566 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap
@@ -10,15 +10,9 @@ metadata:
   relevant_paths:
     - /foo
     - /foo/init.meta.json
-    - /foo/init.lua
-    - /foo/init.luau
-    - /foo/init.server.lua
-    - /foo/init.server.luau
-    - /foo/init.client.lua
-    - /foo/init.client.luau
-    - /foo/init.csv
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: Folder
 properties: {}
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap
index 6238fe68f..936ec5176 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap
@@ -10,15 +10,9 @@ metadata:
   relevant_paths:
     - /foo
     - /foo/init.meta.json
-    - /foo/init.lua
-    - /foo/init.luau
-    - /foo/init.server.lua
-    - /foo/init.server.luau
-    - /foo/init.client.lua
-    - /foo/init.client.luau
-    - /foo/init.csv
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: Folder
 properties: {}
@@ -31,15 +25,9 @@ children:
       relevant_paths:
         - /foo/Child
         - /foo/Child/init.meta.json
-        - /foo/Child/init.lua
-        - /foo/Child/init.luau
-        - /foo/Child/init.server.lua
-        - /foo/Child/init.server.luau
-        - /foo/Child/init.client.lua
-        - /foo/Child/init.client.luau
-        - /foo/Child/init.csv
       context:
         emit_legacy_scripts: true
+      middleware: dir
     name: Child
     class_name: Folder
     properties: {}
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 9cc320ebb..e1b3b35a0 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: ModuleScript
 properties:
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 e3ee581e0..f573e51cb 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
@@ -11,6 +11,7 @@ metadata:
     - /foo.model.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: IntValue
 properties:
@@ -23,6 +24,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      middleware: ~
     name: The Child
     class_name: StringValue
     properties: {}
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap
index e3ee581e0..f573e51cb 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap
@@ -11,6 +11,7 @@ metadata:
     - /foo.model.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: IntValue
 properties:
@@ -23,6 +24,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      middleware: ~
     name: The Child
     class_name: StringValue
     properties: {}
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap
index 5f5f6e9a1..1484bc63c 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: LocalScript
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap
index de2471b9a..4e62485b9 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: ModuleScript
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap
index 32d70c708..f625bcece 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: ModuleScript
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap
index 2c5546a53..6b8c105bb 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap
@@ -12,6 +12,7 @@ metadata:
     - /bar.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: bar
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap
index e4e31ff96..3871314b9 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap
index b70b9cc2b..dc8377f27 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap
index 6ad72d084..c167a8209 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  middleware: ~
 name: foo
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap
index 83be811be..203e917a6 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  middleware: ~
 name: foo
 class_name: ModuleScript
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap
index 98a88ec7f..35ff43ff5 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  middleware: ~
 name: foo
 class_name: ModuleScript
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap
index c47b83dc3..d5f710971 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap
@@ -12,6 +12,7 @@ metadata:
     - /bar.meta.json
   context:
     emit_legacy_scripts: false
+  middleware: ~
 name: bar
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap
index 72d24206f..a9985c790 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  middleware: ~
 name: foo
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap
index 2b902f964..526166265 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  middleware: ~
 name: foo
 class_name: Script
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap
index bd5db23db..5d25824b3 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap
@@ -11,6 +11,7 @@ metadata:
     - /foo/hello.project.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: direct-project
 class_name: Model
 properties: {}
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 77cb44c96..5ecaa4477 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
@@ -12,6 +12,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  middleware: project
 name: path-property-override
 class_name: StringValue
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
index 914a2f95e..fa5a4d402 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
@@ -11,6 +11,7 @@ metadata:
     - /foo.project.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: children
 class_name: Folder
 properties: {}
@@ -27,6 +28,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      middleware: ~
     name: Child
     class_name: Model
     properties: {}
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap
index 02e6ee0ba..075867f12 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  middleware: project
 name: path-project
 class_name: Model
 properties: {}
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
index baf643653..e34f5a735 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  middleware: project
 name: path-child-project
 class_name: Folder
 properties: {}
@@ -28,6 +29,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      middleware: ~
     name: SomeChild
     class_name: Model
     properties: {}
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 223c366cd..7fce0d01c 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
@@ -13,6 +13,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  middleware: text
 name: path-project
 class_name: StringValue
 properties:
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 eddb4e040..30bc6655c 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
@@ -11,6 +11,7 @@ metadata:
     - /foo.project.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: resolved-properties
 class_name: StringValue
 properties:
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 8bd6e28b8..33c0bdaff 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
@@ -11,6 +11,7 @@ metadata:
     - /foo.project.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: unresolved-properties
 class_name: StringValue
 properties:
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap
index 329bdbcd3..6737442c1 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: ModuleScript
 properties:
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 aa3e0f067..961da5209 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  middleware: ~
 name: foo
 class_name: StringValue
 properties:

From 6824c2463c0f7af857aa8fffd5fc0ae37b1b60da Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 7 Dec 2023 12:07:13 -0800
Subject: [PATCH 017/366] Add `create_dir` to memofs

---
 crates/memofs/CHANGELOG.md        |  1 +
 crates/memofs/src/in_memory_fs.rs |  5 +++++
 crates/memofs/src/lib.rs          | 19 +++++++++++++++++++
 crates/memofs/src/noop_backend.rs |  7 +++++++
 crates/memofs/src/std_backend.rs  |  4 ++++
 5 files changed, 36 insertions(+)

diff --git a/crates/memofs/CHANGELOG.md b/crates/memofs/CHANGELOG.md
index c9961d0ed..c5ebd95ab 100644
--- a/crates/memofs/CHANGELOG.md
+++ b/crates/memofs/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased Changes
 * Changed `StdBackend` file watching component to use minimal recursive watches. [#830]
+* Added `create_dir` to allow creating directories.
 
 [#830]: https://github.com/rojo-rbx/rojo/pull/830
 
diff --git a/crates/memofs/src/in_memory_fs.rs b/crates/memofs/src/in_memory_fs.rs
index fc8cf2efe..217899dc4 100644
--- a/crates/memofs/src/in_memory_fs.rs
+++ b/crates/memofs/src/in_memory_fs.rs
@@ -176,6 +176,11 @@ impl VfsBackend for InMemoryFs {
         }
     }
 
+    fn create_dir(&mut self, path: &Path) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+        inner.load_snapshot(path.to_path_buf(), VfsSnapshot::empty_dir())
+    }
+
     fn remove_file(&mut self, path: &Path) -> io::Result<()> {
         let mut inner = self.inner.lock().unwrap();
 
diff --git a/crates/memofs/src/lib.rs b/crates/memofs/src/lib.rs
index 744ca60fc..1ead8d19f 100644
--- a/crates/memofs/src/lib.rs
+++ b/crates/memofs/src/lib.rs
@@ -71,6 +71,7 @@ pub trait VfsBackend: sealed::Sealed + Send + 'static {
     fn read(&mut self, path: &Path) -> io::Result<Vec<u8>>;
     fn write(&mut self, path: &Path, data: &[u8]) -> io::Result<()>;
     fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir>;
+    fn create_dir(&mut self, path: &Path) -> io::Result<()>;
     fn metadata(&mut self, path: &Path) -> io::Result<Metadata>;
     fn remove_file(&mut self, path: &Path) -> io::Result<()>;
     fn remove_dir_all(&mut self, path: &Path) -> io::Result<()>;
@@ -172,6 +173,11 @@ impl VfsInner {
         Ok(dir)
     }
 
+    fn create_dir<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.backend.create_dir(path)
+    }
+
     fn remove_file<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
         let path = path.as_ref();
         let _ = self.backend.unwatch(path);
@@ -281,6 +287,19 @@ impl Vfs {
         self.inner.lock().unwrap().read_dir(path)
     }
 
+    /// Creates a directory at the provided location.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir`][std::fs::create_dir].
+    /// Similiar to that function, this function will fail if the parent of the
+    /// path does not exist.
+    ///
+    /// [std::fs::create_dir]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir.html
+    #[inline]
+    pub fn create_dir<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().create_dir(path)
+    }
+
     /// Remove a file.
     ///
     /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].
diff --git a/crates/memofs/src/noop_backend.rs b/crates/memofs/src/noop_backend.rs
index efc8fd4ae..5a028d4be 100644
--- a/crates/memofs/src/noop_backend.rs
+++ b/crates/memofs/src/noop_backend.rs
@@ -35,6 +35,13 @@ impl VfsBackend for NoopBackend {
         ))
     }
 
+    fn create_dir(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
     fn remove_file(&mut self, _path: &Path) -> io::Result<()> {
         Err(io::Error::new(
             io::ErrorKind::Other,
diff --git a/crates/memofs/src/std_backend.rs b/crates/memofs/src/std_backend.rs
index 0a8fb3b79..359d023ae 100644
--- a/crates/memofs/src/std_backend.rs
+++ b/crates/memofs/src/std_backend.rs
@@ -78,6 +78,10 @@ impl VfsBackend for StdBackend {
         })
     }
 
+    fn create_dir(&mut self, path: &Path) -> io::Result<()> {
+        fs_err::create_dir(path)
+    }
+
     fn remove_file(&mut self, path: &Path) -> io::Result<()> {
         fs_err::remove_file(path)
     }

From 227865591654303f8d535f1fd6418e46d09fdc6e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 11 Dec 2023 14:19:57 -0800
Subject: [PATCH 018/366] Export ScriptType and metadata from middleware

---
 src/snapshot_middleware/mod.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 5be18eb36..cfab3af72 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -35,7 +35,7 @@ use self::{
     dir::snapshot_dir,
     json::snapshot_json,
     json_model::snapshot_json_model,
-    lua::{snapshot_lua, snapshot_lua_init, ScriptType},
+    lua::{snapshot_lua, snapshot_lua_init},
     project::snapshot_project,
     rbxm::snapshot_rbxm,
     rbxmx::snapshot_rbxmx,
@@ -43,7 +43,12 @@ use self::{
     txt::snapshot_txt,
 };
 
-pub use self::{project::snapshot_project_node, util::emit_legacy_scripts_default};
+pub use self::{
+    lua::ScriptType,
+    meta_file::{AdjacentMetadata, DirectoryMetadata},
+    project::snapshot_project_node,
+    util::emit_legacy_scripts_default,
+};
 
 /// Returns an `InstanceSnapshot` for the provided path.
 /// This will inspect the path and find the appropriate middleware for it,

From b4522e6842cd194995c1bcf7af50dd5103d9bbf8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 11 Dec 2023 14:20:45 -0800
Subject: [PATCH 019/366] Add function for producing InstanceSnapshot from an
 Instance

---
 src/snapshot/instance_snapshot.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/snapshot/instance_snapshot.rs b/src/snapshot/instance_snapshot.rs
index 0b3a4fca3..5337e529f 100644
--- a/src/snapshot/instance_snapshot.rs
+++ b/src/snapshot/instance_snapshot.rs
@@ -127,6 +127,17 @@ impl InstanceSnapshot {
             children,
         }
     }
+
+    pub fn from_instance(instance: &Instance) -> Self {
+        Self {
+            snapshot_id: instance.referent(),
+            metadata: InstanceMetadata::new(),
+            name: Cow::Owned(instance.name.clone()),
+            class_name: Cow::Owned(instance.class.clone()),
+            properties: instance.properties.clone(),
+            children: Vec::new(),
+        }
+    }
 }
 
 impl Default for InstanceSnapshot {

From 46cf2658037c8984f34b6257818c62000df657bc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 11 Dec 2023 14:22:24 -0800
Subject: [PATCH 020/366] Add framework for syncback implementation

---
 src/lib.rs                  |   1 +
 src/syncback/fs_snapshot.rs |  61 +++++++++++++++
 src/syncback/middleware.rs  | 130 ++++++++++++++++++++++++++++++
 src/syncback/mod.rs         | 152 ++++++++++++++++++++++++++++++++++++
 4 files changed, 344 insertions(+)
 create mode 100644 src/syncback/fs_snapshot.rs
 create mode 100644 src/syncback/middleware.rs
 create mode 100644 src/syncback/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index 51195b6c1..63f25d177 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,6 +20,7 @@ mod serve_session;
 mod session_id;
 mod snapshot;
 mod snapshot_middleware;
+mod syncback;
 mod web;
 
 pub use project::*;
diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
new file mode 100644
index 000000000..75796a015
--- /dev/null
+++ b/src/syncback/fs_snapshot.rs
@@ -0,0 +1,61 @@
+use std::{
+    collections::{HashMap, HashSet},
+    fmt, io,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+
+use memofs::Vfs;
+
+pub struct FsSnapshot {
+    files: HashMap<PathBuf, Arc<Vec<u8>>>,
+    dir: HashSet<PathBuf>,
+}
+
+impl FsSnapshot {
+    pub fn new() -> Self {
+        Self {
+            files: HashMap::new(),
+            dir: HashSet::new(),
+        }
+    }
+
+    pub fn with_file<P: AsRef<Path>>(mut self, path: P, data: Vec<u8>) -> Self {
+        self.files
+            .insert(path.as_ref().to_path_buf(), Arc::new(data));
+        self
+    }
+
+    pub fn with_dir<P: AsRef<Path>>(mut self, path: P) -> Self {
+        self.dir.insert(path.as_ref().to_path_buf());
+        self
+    }
+
+    pub fn push_file<P: AsRef<Path>>(&mut self, path: P, data: Vec<u8>) {
+        self.files
+            .insert(path.as_ref().to_path_buf(), Arc::new(data));
+    }
+
+    pub fn write_to_vfs(&self, vfs: &Vfs) -> io::Result<()> {
+        for dir_path in &self.dir {
+            vfs.create_dir(dir_path)?;
+        }
+        for (path, contents) in &self.files {
+            vfs.write(path, contents.as_slice())?;
+        }
+
+        Ok(())
+    }
+}
+
+impl fmt::Debug for FsSnapshot {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let files = self
+            .files
+            .iter()
+            .map(|(k, v)| format!("{}: {} bytes", k.display(), v.len()));
+        let dirs = self.dir.iter().map(|v| format!("{}", v.display()));
+
+        f.debug_list().entries(files).entries(dirs).finish()
+    }
+}
diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
new file mode 100644
index 000000000..0f44c843f
--- /dev/null
+++ b/src/syncback/middleware.rs
@@ -0,0 +1,130 @@
+use std::collections::{HashMap, HashSet};
+
+use rbx_dom_weak::{
+    types::{Ref, Variant},
+    Instance,
+};
+
+use crate::{
+    resolution::UnresolvedValue,
+    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta},
+    snapshot_middleware::{DirectoryMetadata, Middleware, ScriptType},
+};
+
+use super::{FsSnapshot, SyncbackSnapshot};
+
+#[derive(Debug)]
+pub struct SyncbackReturn<'new, 'old> {
+    pub inst_snapshot: InstanceSnapshot,
+    pub fs_snapshot: FsSnapshot,
+    pub children: Vec<SyncbackSnapshot<'new, 'old>>,
+    pub removed_children: Vec<InstanceWithMeta<'old>>,
+}
+
+pub fn syncback_middleware<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+    middleware: Middleware,
+) -> SyncbackReturn<'new, 'old> {
+    match middleware {
+        Middleware::ModuleScript => syncback_script(ScriptType::Module, snapshot),
+        Middleware::ClientScript => syncback_script(ScriptType::Client, snapshot),
+        Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
+        Middleware::Dir => syncback_dir(snapshot),
+        _ => panic!("unsupported instance middleware {:?}", middleware),
+    }
+}
+
+fn syncback_script<'new, 'old>(
+    script_type: ScriptType,
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> SyncbackReturn<'new, 'old> {
+    let inst = snapshot.new_inst();
+
+    let mut path = snapshot.parent_path.clone();
+    path.set_file_name(snapshot.name.clone());
+    path.set_extension(match script_type {
+        ScriptType::Module => "lua",
+        ScriptType::Client => "client.lua",
+        ScriptType::Server => "server.lua",
+    });
+    let contents = if let Some(Variant::String(source)) = inst.properties.get("Source") {
+        source.as_bytes().to_vec()
+    } else {
+        panic!("Source should be a string")
+    };
+
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst).metadata(InstanceMetadata::new()),
+        fs_snapshot: FsSnapshot::new().with_file(path, contents),
+        // Scripts don't have a child!
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    }
+}
+
+fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
+    let path = snapshot.parent_path.join(snapshot.name.clone());
+
+    let mut removed_children = Vec::new();
+    let mut children = Vec::new();
+
+    if let Some(old_inst) = snapshot.old_inst() {
+        let old_children: HashMap<&str, Ref> = old_inst
+            .children()
+            .iter()
+            .map(|old_ref| {
+                (
+                    snapshot.get_old_instance(*old_ref).unwrap().name(),
+                    *old_ref,
+                )
+            })
+            .collect();
+        let new_children: HashSet<&str> = snapshot
+            .new_inst()
+            .children()
+            .iter()
+            .map(|new_ref| snapshot.get_new_instance(*new_ref).unwrap().name.as_str())
+            .collect();
+
+        for child_ref in old_inst.children() {
+            let old_child = snapshot.get_old_instance(*child_ref).unwrap();
+            // If it exists in the old tree but not the new one, it was removed.
+            if !new_children.contains(old_child.name()) {
+                removed_children.push(old_child);
+            }
+        }
+
+        for child_ref in snapshot.new_inst().children() {
+            let new_child = snapshot.get_new_instance(*child_ref).unwrap();
+            // If it exists in the new tree but not the old one, it was added.
+            match old_children.get(new_child.name.as_str()) {
+                None => children.push(snapshot.from_parent(
+                    &new_child.name,
+                    new_child.name.clone(),
+                    *child_ref,
+                    None,
+                )),
+                Some(old_ref) => children.push(snapshot.from_parent(
+                    &new_child.name,
+                    new_child.name.clone(),
+                    *child_ref,
+                    Some(*old_ref),
+                )),
+            }
+        }
+    } else {
+        for child_ref in snapshot.new_inst().children() {
+            let child = snapshot.get_new_instance(*child_ref).unwrap();
+            children.push(snapshot.from_parent(&child.name, child.name.clone(), *child_ref, None))
+        }
+    }
+    let mut fs_snapshot = FsSnapshot::new().with_dir(&path);
+    // TODO metadata
+
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot,
+        children,
+        removed_children,
+    }
+}
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
new file mode 100644
index 000000000..351c1c855
--- /dev/null
+++ b/src/syncback/mod.rs
@@ -0,0 +1,152 @@
+mod fs_snapshot;
+mod middleware;
+
+use crate::{
+    snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot_middleware::Middleware,
+    Project,
+};
+use memofs::Vfs;
+use rbx_dom_weak::{types::Ref, Instance, WeakDom};
+use std::path::{Path, PathBuf};
+
+pub use fs_snapshot::FsSnapshot;
+
+use self::middleware::syncback_middleware;
+
+#[derive(Debug)]
+pub struct SyncbackSnapshot<'new, 'old> {
+    old_tree: &'old RojoTree,
+    new_tree: &'new WeakDom,
+    old: Option<Ref>,
+    new: Ref,
+    parent_path: PathBuf,
+    name: String,
+}
+
+impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
+    /// Constructs a SyncbackSnapshot from the provided refs
+    /// while inheriting the parent's trees and path
+    #[inline]
+    pub fn from_parent<P: AsRef<Path>>(
+        &self,
+        extension: P,
+        new_name: String,
+        new_ref: Ref,
+        old_ref: Option<Ref>,
+    ) -> Self {
+        Self {
+            old_tree: self.old_tree,
+            new_tree: self.new_tree,
+            old: old_ref,
+            new: new_ref,
+            parent_path: self.parent_path.join(extension.as_ref()),
+            name: new_name,
+        }
+    }
+
+    /// The 'old' Instance this snapshot is for, if it exists.
+    #[inline]
+    pub fn old_inst(&self) -> Option<InstanceWithMeta<'old>> {
+        self.old.and_then(|old| self.old_tree.get_instance(old))
+    }
+
+    /// The 'new' Instance this snapshot is for.
+    #[inline]
+    pub fn new_inst(&self) -> &'new Instance {
+        self.new_tree
+            .get_by_ref(self.new)
+            .expect("SyncbackSnapshot should not contain invalid referents")
+    }
+
+    /// Returns an Instance from the old tree with the provided referent, if it
+    /// exists.
+    #[inline]
+    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'old>> {
+        self.old_tree.get_instance(referent)
+    }
+
+    /// Returns an Instance from the new tree with the provided referent, if it
+    /// exists.
+    #[inline]
+    pub fn get_new_instance(&self, referent: Ref) -> Option<&'new Instance> {
+        self.new_tree.get_by_ref(referent)
+    }
+}
+
+pub fn syncback_loop(
+    vfs: &Vfs,
+    old_tree: &RojoTree,
+    new_tree: &WeakDom,
+    project: &Project,
+) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
+    let old_hashes = hash_tree(old_tree.inner());
+    let new_hashes = hash_tree(new_tree);
+    let mut snapshots = vec![SyncbackSnapshot {
+        old_tree,
+        new_tree,
+        old: Some(old_tree.get_root_id()),
+        new: new_tree.root_ref(),
+        parent_path: project.file_location.clone(),
+        name: project.name.clone(),
+    }];
+
+    let mut replacements = Vec::new();
+
+    while let Some(snapshot) = snapshots.pop() {
+        // We can quickly check that two subtrees are identical and if they are,
+        // skip reconciling them.
+        if let Some(old_ref) = snapshot.old {
+            if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
+                continue;
+            }
+        }
+
+        let middleware = snapshot
+            .old_inst()
+            .and_then(|inst| inst.metadata().middleware)
+            .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
+
+        let syncback = syncback_middleware(&snapshot, middleware);
+
+        if let Some(old_inst) = snapshot.old_inst() {
+            replacements.push((old_inst.parent(), syncback.inst_snapshot));
+        }
+
+        syncback.fs_snapshot.write_to_vfs(vfs)?;
+
+        // TODO handle children
+    }
+
+    Ok(replacements)
+}
+
+fn get_best_middleware(inst: &Instance) -> Middleware {
+    match inst.class.as_str() {
+        "Folder" => Middleware::Dir,
+        // TODO this should probably just be rbxm
+        "Model" => Middleware::Rbxmx,
+        "Script" => {
+            if inst.children().len() == 0 {
+                Middleware::ServerScript
+            } else {
+                Middleware::ServerScriptDir
+            }
+        }
+        "LocalScript" => {
+            if inst.children().len() == 0 {
+                Middleware::ClientScript
+            } else {
+                Middleware::ClientScriptDir
+            }
+        }
+        "ModuleScript" => {
+            if inst.children().len() == 0 {
+                Middleware::ModuleScript
+            } else {
+                Middleware::ModuleScriptDir
+            }
+        }
+        _ => Middleware::Rbxmx,
+    }
+}

From 262283b613e3da53d15f5de69f03663003978a0c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 11 Dec 2023 14:23:06 -0800
Subject: [PATCH 021/366] Add function for accessing root project to serve
 session

---
 src/serve_session.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/serve_session.rs b/src/serve_session.rs
index 85ae77934..a99f34c38 100644
--- a/src/serve_session.rs
+++ b/src/serve_session.rs
@@ -220,6 +220,10 @@ impl ServeSession {
     pub fn root_dir(&self) -> &Path {
         self.root_project.folder_location()
     }
+
+    pub fn root_project(&self) -> &Project {
+        &self.root_project
+    }
 }
 
 #[derive(Debug, Error)]

From 79ad94a02972ca5b7022fdb81d59c9f4c4ecf83c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 13 Dec 2023 11:55:40 -0800
Subject: [PATCH 022/366] Correctly update paths in dir middleware

---
 src/snapshot_middleware/mod.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index cfab3af72..70baa6616 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -19,6 +19,7 @@ mod txt;
 mod util;
 
 use std::{
+    borrow::Cow,
     path::{Path, PathBuf},
     sync::OnceLock,
 };
@@ -68,7 +69,13 @@ pub fn snapshot_from_vfs(
     if meta.is_dir() {
         let (middleware, name) = get_dir_middleware(vfs, path)?;
         // TODO: Support user defined init paths
-        middleware.snapshot(context, vfs, path, &name)
+        match middleware {
+            Middleware::Dir => middleware.snapshot(context, vfs, path, &name),
+            _ => {
+                let name_as_path: PathBuf = name.as_ref().into();
+                middleware.snapshot(context, vfs, &path.join(name_as_path), &name)
+            }
+        }
     } else {
         let file_name = path
             .file_name()
@@ -89,7 +96,10 @@ pub fn snapshot_from_vfs(
 /// Gets the appropriate middleware for a directory by checking for `init`
 /// files. This uses an intrinsic priority list and for compatibility,
 /// that order should be left unchanged.
-fn get_dir_middleware<P: AsRef<Path>>(vfs: &Vfs, dir: P) -> anyhow::Result<(Middleware, String)> {
+fn get_dir_middleware<P: AsRef<Path>>(
+    vfs: &Vfs,
+    dir: P,
+) -> anyhow::Result<(Middleware, Cow<'static, str>)> {
     let path = dir.as_ref();
     let dir_name = path
         .file_name()
@@ -114,11 +124,11 @@ fn get_dir_middleware<P: AsRef<Path>>(vfs: &Vfs, dir: P) -> anyhow::Result<(Midd
 
     for (middleware, name) in order {
         if vfs.metadata(path.join(name)).with_not_found()?.is_some() {
-            return Ok((*middleware, dir_name));
+            return Ok((*middleware, Cow::Borrowed(*name)));
         }
     }
 
-    Ok((Middleware::Dir, dir_name))
+    Ok((Middleware::Dir, Cow::Owned(dir_name)))
 }
 
 /// Gets a snapshot for a path given an InstanceContext and Vfs, taking

From 9a5384da392b0e15c49636c82399c6356138f521 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 13 Dec 2023 11:55:53 -0800
Subject: [PATCH 023/366] Hash datamodels

---
 src/snapshot/diff/hash.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/diff/hash.rs
index c05db9a75..baece8ceb 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/diff/hash.rs
@@ -21,10 +21,6 @@ pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     // end
     while let Some(referent) = order.pop() {
         let inst = dom.get_by_ref(referent).unwrap();
-        // We don't really care about the equality of a DataModel.
-        if inst.class == "DataModel" {
-            continue;
-        }
         let hash = hash_inst(&mut prop_list, &map, inst);
 
         map.insert(referent, hash);

From ccd4edcffa16149e5bdf6c489971b60c41c87247 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 13 Dec 2023 12:54:20 -0800
Subject: [PATCH 024/366] Change InstigatingSource::ProjectNode to be a struct
 variant

---
 src/change_processor.rs                       | 17 +++++++++-----
 src/snapshot/metadata.rs                      | 23 +++++++++++++------
 src/snapshot_middleware/project.rs            | 12 +++++-----
 ..._project__test__project_with_children.snap |  9 ++++----
 ...ct_with_path_to_project_with_children.snap |  9 ++++----
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/change_processor.rs b/src/change_processor.rs
index 497ba4e79..fc429190c 100644
--- a/src/change_processor.rs
+++ b/src/change_processor.rs
@@ -183,7 +183,7 @@ impl JobThreadContext {
                     if let Some(instigating_source) = &instance.metadata().instigating_source {
                         match instigating_source {
                             InstigatingSource::Path(path) => fs::remove_file(path).unwrap(),
-                            InstigatingSource::ProjectNode(_, _, _, _) => {
+                            InstigatingSource::ProjectNode { .. } => {
                                 log::warn!(
                                     "Cannot remove instance {:?}, it's from a project file",
                                     id
@@ -231,7 +231,7 @@ impl JobThreadContext {
                                             log::warn!("Cannot change Source to non-string value.");
                                         }
                                     }
-                                    InstigatingSource::ProjectNode(_, _, _, _) => {
+                                    InstigatingSource::ProjectNode { .. } => {
                                         log::warn!(
                                             "Cannot remove instance {:?}, it's from a project file",
                                             id
@@ -317,16 +317,21 @@ fn compute_and_apply_changes(tree: &mut RojoTree, vfs: &Vfs, id: Ref) -> Option<
             }
         },
 
-        InstigatingSource::ProjectNode(project_path, instance_name, project_node, parent_class) => {
+        InstigatingSource::ProjectNode {
+            path,
+            name,
+            node,
+            parent_class,
+        } => {
             // This instance is the direct subject of a project node. Since
             // there might be information associated with our instance from
             // the project file, we snapshot the entire project node again.
 
             let snapshot_result = snapshot_project_node(
                 &metadata.context,
-                project_path,
-                instance_name,
-                project_node,
+                path,
+                name,
+                node,
                 vfs,
                 parent_class.as_ref().map(|name| name.as_str()),
             );
diff --git a/src/snapshot/metadata.rs b/src/snapshot/metadata.rs
index 6df36e082..fbc70c112 100644
--- a/src/snapshot/metadata.rs
+++ b/src/snapshot/metadata.rs
@@ -206,22 +206,31 @@ impl PathIgnoreRule {
     }
 }
 
+/// Represents where a particular Instance or InstanceSnapshot came from.
 #[derive(Clone, PartialEq, Serialize, Deserialize)]
 pub enum InstigatingSource {
+    /// The path the Instance was made from.
     Path(#[serde(serialize_with = "path_serializer::serialize_absolute")] PathBuf),
-    ProjectNode(
-        #[serde(serialize_with = "path_serializer::serialize_absolute")] PathBuf,
-        String,
-        ProjectNode,
-        Option<String>,
-    ),
+    /// The node in a Project that the Instance was made from.
+    ProjectNode {
+        #[serde(serialize_with = "path_serializer::serialize_absolute")]
+        path: PathBuf,
+        name: String,
+        node: ProjectNode,
+        parent_class: Option<String>,
+    },
 }
 
 impl fmt::Debug for InstigatingSource {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             InstigatingSource::Path(path) => write!(formatter, "Path({})", path.display()),
-            InstigatingSource::ProjectNode(path, name, node, parent_class) => write!(
+            InstigatingSource::ProjectNode {
+                name,
+                node,
+                path,
+                parent_class,
+            } => write!(
                 formatter,
                 "ProjectNode({}: {:?}) from path {} and parent class {:?}",
                 name,
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index c92f42d8a..23b5b967b 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -277,12 +277,12 @@ pub fn snapshot_project_node(
         metadata.ignore_unknown_instances = true;
     }
 
-    metadata.instigating_source = Some(InstigatingSource::ProjectNode(
-        project_path.to_path_buf(),
-        instance_name.to_string(),
-        node.clone(),
-        parent_class.map(|name| name.to_owned()),
-    ));
+    metadata.instigating_source = Some(InstigatingSource::ProjectNode {
+        path: project_path.to_path_buf(),
+        name: instance_name.to_string(),
+        node: node.clone(),
+        parent_class: parent_class.map(|name| name.to_owned()),
+    });
 
     Ok(Some(InstanceSnapshot {
         snapshot_id: Ref::none(),
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
index fa5a4d402..2f3cd2547 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
@@ -21,10 +21,11 @@ children:
       ignore_unknown_instances: true
       instigating_source:
         ProjectNode:
-          - /foo.project.json
-          - Child
-          - $className: Model
-          - Folder
+          path: /foo.project.json
+          name: Child
+          node:
+            $className: Model
+          parent_class: Folder
       relevant_paths: []
       context:
         emit_legacy_scripts: true
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
index e34f5a735..ea628e4d9 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
@@ -22,10 +22,11 @@ children:
       ignore_unknown_instances: true
       instigating_source:
         ProjectNode:
-          - /foo/other.project.json
-          - SomeChild
-          - $className: Model
-          - Folder
+          path: /foo/other.project.json
+          name: SomeChild
+          node:
+            $className: Model
+          parent_class: Folder
       relevant_paths: []
       context:
         emit_legacy_scripts: true

From 4e71282a5c5058cc2a24d810a649a01c4919e986 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 12:46:29 -0800
Subject: [PATCH 025/366] Remove old diff code

---
 src/snapshot/diff/mod.rs | 46 +---------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
index 14651ae8f..9c08d23bf 100644
--- a/src/snapshot/diff/mod.rs
+++ b/src/snapshot/diff/mod.rs
@@ -5,51 +5,7 @@ pub use hash::*;
 pub use variant::*;
 
 use rbx_dom_weak::{types::Ref, WeakDom};
-use std::{
-    collections::{HashMap, VecDeque},
-    hash::Hash,
-};
-
-pub fn diff_trees(dom_1: &WeakDom, dom_2: &WeakDom) -> Diff {
-    let list_1 = hash_tree(dom_1);
-    let mut list_2 = invert_map(hash_tree(dom_2));
-
-    let mut removals = Vec::new();
-
-    for (referent, hash) in list_1 {
-        // If it's in both lists, we'll pull it out of list_2 so that
-        // it doesn't get flagged as an addition.
-        if list_2.contains_key(&hash) {
-            list_2.remove(&hash);
-        } else {
-            removals.push(referent);
-        }
-    }
-
-    Diff {
-        removals,
-        additions: list_2.into_iter().map(|(_, referent)| referent).collect(),
-    }
-}
-
-fn invert_map<K: Hash + Eq, V: Hash + Eq>(map: HashMap<K, V>) -> HashMap<V, K> {
-    map.into_iter().map(|(key, value)| (value, key)).collect()
-}
-
-pub struct Diff {
-    /// Referents that were either removed or changed (in dom 1, not in dom 2)
-    pub removals: Vec<Ref>,
-    /// Referents that were added or changed (in dom 2, not in dom 1)
-    pub additions: Vec<Ref>,
-}
-
-impl Diff {
-    /// Returns the total number of diffs represented by this struct
-    #[inline]
-    pub fn total(&self) -> usize {
-        self.removals.len() + self.additions.len()
-    }
-}
+use std::collections::VecDeque;
 
 pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
     let mut queue = VecDeque::new();

From 981829151bfd6a849fbab1a0fc718cb247d61711 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 12:47:37 -0800
Subject: [PATCH 026/366] Make a myriad of changes to syncback Implement
 project middleware

---
 src/syncback/middleware.rs | 134 ++++++++++++++++++++++++++++++++++++-
 src/syncback/mod.rs        | 128 ++++++++++++++++++++---------------
 2 files changed, 204 insertions(+), 58 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 0f44c843f..0daeb9269 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -7,13 +7,13 @@ use rbx_dom_weak::{
 
 use crate::{
     resolution::UnresolvedValue,
-    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta},
+    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta, InstigatingSource},
     snapshot_middleware::{DirectoryMetadata, Middleware, ScriptType},
+    Project, ProjectNode,
 };
 
 use super::{FsSnapshot, SyncbackSnapshot};
 
-#[derive(Debug)]
 pub struct SyncbackReturn<'new, 'old> {
     pub inst_snapshot: InstanceSnapshot,
     pub fs_snapshot: FsSnapshot,
@@ -26,6 +26,7 @@ pub fn syncback_middleware<'new, 'old>(
     middleware: Middleware,
 ) -> SyncbackReturn<'new, 'old> {
     match middleware {
+        Middleware::Project => syncback_project(snapshot),
         Middleware::ModuleScript => syncback_script(ScriptType::Module, snapshot),
         Middleware::ClientScript => syncback_script(ScriptType::Client, snapshot),
         Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
@@ -34,6 +35,36 @@ pub fn syncback_middleware<'new, 'old>(
     }
 }
 
+pub fn get_best_middleware(inst: &Instance) -> Middleware {
+    match inst.class.as_str() {
+        "Folder" => Middleware::Dir,
+        // TODO this should probably just be rbxm
+        "Model" => Middleware::Rbxmx,
+        "Script" => {
+            if inst.children().len() == 0 {
+                Middleware::ServerScript
+            } else {
+                Middleware::ServerScriptDir
+            }
+        }
+        "LocalScript" => {
+            if inst.children().len() == 0 {
+                Middleware::ClientScript
+            } else {
+                Middleware::ClientScriptDir
+            }
+        }
+        "ModuleScript" => {
+            if inst.children().len() == 0 {
+                Middleware::ModuleScript
+            } else {
+                Middleware::ModuleScriptDir
+            }
+        }
+        _ => Middleware::Rbxmx,
+    }
+}
+
 fn syncback_script<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
@@ -119,7 +150,7 @@ fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> Syncback
         }
     }
     let mut fs_snapshot = FsSnapshot::new().with_dir(&path);
-    // TODO metadata
+    // TODO metadata, including classname
 
     SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
@@ -128,3 +159,100 @@ fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> Syncback
         removed_children,
     }
 }
+
+fn syncback_project<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> SyncbackReturn<'new, 'old> {
+    // We need to build a 'new' project and serialize it using an FsSnapshot.
+    // It's convenient to start with the old one though, since it means we have
+    // a thing to iterate through.
+    let mut project = Project::load_from_slice(
+        &snapshot.vfs().read(&snapshot.parent_path).unwrap(),
+        &snapshot.parent_path,
+    )
+    .unwrap();
+
+    let mut children = Vec::new();
+    let mut removed_children = Vec::new();
+
+    // Projects are special. We won't be adding or removing things from them,
+    // so we'll simply match Instances on a per-node basis and rebuild the tree
+    // with the new instance's data. This matching will be done by class and name
+    // to simplify things.
+    let mut nodes = vec![(
+        &mut project.tree,
+        snapshot.new_inst(),
+        snapshot.old_inst().unwrap(),
+    )];
+    while let Some((node, new_inst, old_inst)) = nodes.pop() {
+        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
+        for child_ref in old_inst.children() {
+            let child = snapshot.get_old_instance(*child_ref).unwrap();
+            old_child_map.insert(child.name(), child);
+        }
+        let mut new_child_map = HashMap::with_capacity(new_inst.children().len());
+        for child_ref in new_inst.children() {
+            let child = snapshot.get_new_instance(*child_ref).unwrap();
+            new_child_map.insert(child.name.as_str(), child);
+        }
+        for (child_name, child_node) in &mut node.children {
+            if let Some(new_child) = new_child_map.get(child_name.as_str()) {
+                if let Some(old_child) = old_child_map.get(child_name.as_str()) {
+                    // TODO verify class names
+                    for (name, value) in &new_child.properties {
+                        if child_node.properties.contains_key(name) {
+                            child_node
+                                .properties
+                                .insert(name.clone(), UnresolvedValue::from(value.clone()));
+                        }
+                    }
+                    nodes.push((child_node, new_child, *old_child));
+                    new_child_map.remove(child_name.as_str());
+                    old_child_map.remove(child_name.as_str());
+                } else {
+                    log::error!(
+                        "Node {} was in new tree but not old. How did we get here?",
+                        child_name
+                    );
+                }
+            } else {
+                panic!("Cannot add or remove children from a project")
+            }
+        }
+        // From this point, both maps contain only children of the current
+        // instance that aren't in the project. So, we just do some quick and
+        // dirty matching to identify children that were:
+        // - added (in new but not old)
+        // - removed (in old but not new)
+        for (new_name, new_child) in new_child_map {
+            if let Some(old_inst) = old_child_map.get(new_name) {
+                children.push(snapshot.from_parent(
+                    new_name,
+                    new_name.to_string(),
+                    new_child.referent(),
+                    Some(old_inst.id()),
+                ));
+                old_child_map.remove(new_name);
+            } else {
+                // it's new
+                children.push(snapshot.from_parent(
+                    new_name,
+                    new_name.to_string(),
+                    new_child.referent(),
+                    None,
+                ));
+            }
+        }
+        removed_children.extend(old_child_map.into_values());
+    }
+
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot: FsSnapshot::new().with_file(
+            &project.file_location,
+            serde_json::to_vec(&project).unwrap(),
+        ),
+        children,
+        removed_children,
+    }
+}
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 351c1c855..5b6c6953d 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -3,21 +3,31 @@ mod middleware;
 
 use crate::{
     snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
-    snapshot_middleware::Middleware,
     Project,
 };
+use blake3::Hash;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
-use std::path::{Path, PathBuf};
+use std::{
+    collections::{HashMap, VecDeque},
+    path::{Path, PathBuf},
+    rc::Rc,
+};
 
 pub use fs_snapshot::FsSnapshot;
 
-use self::middleware::syncback_middleware;
+use self::middleware::{get_best_middleware, syncback_middleware};
 
-#[derive(Debug)]
-pub struct SyncbackSnapshot<'new, 'old> {
+struct SyncbackData<'new, 'old> {
+    vfs: &'old Vfs,
     old_tree: &'old RojoTree,
     new_tree: &'new WeakDom,
+
+    old_hashes: Rc<HashMap<Ref, Hash>>,
+    new_hashes: Rc<HashMap<Ref, Hash>>,
+}
+pub struct SyncbackSnapshot<'new, 'old> {
+    data: Rc<SyncbackData<'new, 'old>>,
     old: Option<Ref>,
     new: Ref,
     parent_path: PathBuf,
@@ -36,8 +46,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         old_ref: Option<Ref>,
     ) -> Self {
         Self {
-            old_tree: self.old_tree,
-            new_tree: self.new_tree,
+            data: Rc::clone(&self.data),
             old: old_ref,
             new: new_ref,
             parent_path: self.parent_path.join(extension.as_ref()),
@@ -45,46 +54,64 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         }
     }
 
+    /// Returns an Instance from the old tree with the provided referent, if it
+    /// exists.
+    #[inline]
+    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'old>> {
+        self.data.old_tree.get_instance(referent)
+    }
+
+    /// Returns an Instance from the new tree with the provided referent, if it
+    /// exists.
+    #[inline]
+    pub fn get_new_instance(&self, referent: Ref) -> Option<&'new Instance> {
+        self.data.new_tree.get_by_ref(referent)
+    }
+
     /// The 'old' Instance this snapshot is for, if it exists.
     #[inline]
     pub fn old_inst(&self) -> Option<InstanceWithMeta<'old>> {
-        self.old.and_then(|old| self.old_tree.get_instance(old))
+        self.old
+            .and_then(|old| self.data.old_tree.get_instance(old))
     }
 
     /// The 'new' Instance this snapshot is for.
     #[inline]
     pub fn new_inst(&self) -> &'new Instance {
-        self.new_tree
+        self.data
+            .new_tree
             .get_by_ref(self.new)
             .expect("SyncbackSnapshot should not contain invalid referents")
     }
 
-    /// Returns an Instance from the old tree with the provided referent, if it
-    /// exists.
-    #[inline]
-    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'old>> {
-        self.old_tree.get_instance(referent)
-    }
-
-    /// Returns an Instance from the new tree with the provided referent, if it
-    /// exists.
+    /// Returns the underlying VFS being used for syncback.
     #[inline]
-    pub fn get_new_instance(&self, referent: Ref) -> Option<&'new Instance> {
-        self.new_tree.get_by_ref(referent)
+    pub fn vfs(&self) -> &Vfs {
+        self.data.vfs
     }
 }
 
-pub fn syncback_loop(
-    vfs: &Vfs,
-    old_tree: &RojoTree,
-    new_tree: &WeakDom,
+pub fn syncback_loop<'old, 'new>(
+    vfs: &'old Vfs,
+    old_tree: &'old RojoTree,
+    new_tree: &'new WeakDom,
     project: &Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
-    let old_hashes = hash_tree(old_tree.inner());
-    let new_hashes = hash_tree(new_tree);
-    let mut snapshots = vec![SyncbackSnapshot {
+    log::debug!("Hashing project DOM");
+    let old_hashes = Rc::new(hash_tree(old_tree.inner()));
+    log::debug!("Hashing file DOM");
+    let new_hashes = Rc::new(hash_tree(new_tree));
+
+    let syncback_data = Rc::new(SyncbackData {
+        vfs,
         old_tree,
         new_tree,
+        old_hashes: Rc::clone(&old_hashes),
+        new_hashes: Rc::clone(&new_hashes),
+    });
+
+    let mut snapshots = vec![SyncbackSnapshot {
+        data: syncback_data,
         old: Some(old_tree.get_root_id()),
         new: new_tree.root_ref(),
         parent_path: project.file_location.clone(),
@@ -98,6 +125,11 @@ pub fn syncback_loop(
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
             if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
+                log::debug!(
+                    "Skipping {} due to it being identically hashed as {:?}",
+                    get_inst_path(new_tree, snapshot.new),
+                    old_hashes.get(&old_ref)
+                );
                 continue;
             }
         }
@@ -106,6 +138,11 @@ pub fn syncback_loop(
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
+        log::debug!(
+            "Middleware for {}: {:?}",
+            get_inst_path(new_tree, snapshot.new),
+            middleware
+        );
 
         let syncback = syncback_middleware(&snapshot, middleware);
 
@@ -113,40 +150,21 @@ pub fn syncback_loop(
             replacements.push((old_inst.parent(), syncback.inst_snapshot));
         }
 
+        log::debug!("Writing {} to vfs", get_inst_path(new_tree, snapshot.new));
         syncback.fs_snapshot.write_to_vfs(vfs)?;
 
-        // TODO handle children
+        snapshots.extend(syncback.children);
     }
 
     Ok(replacements)
 }
 
-fn get_best_middleware(inst: &Instance) -> Middleware {
-    match inst.class.as_str() {
-        "Folder" => Middleware::Dir,
-        // TODO this should probably just be rbxm
-        "Model" => Middleware::Rbxmx,
-        "Script" => {
-            if inst.children().len() == 0 {
-                Middleware::ServerScript
-            } else {
-                Middleware::ServerScriptDir
-            }
-        }
-        "LocalScript" => {
-            if inst.children().len() == 0 {
-                Middleware::ClientScript
-            } else {
-                Middleware::ClientScriptDir
-            }
-        }
-        "ModuleScript" => {
-            if inst.children().len() == 0 {
-                Middleware::ModuleScript
-            } else {
-                Middleware::ModuleScriptDir
-            }
-        }
-        _ => Middleware::Rbxmx,
+fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
+    let mut path: VecDeque<&str> = VecDeque::new();
+    let mut inst = dom.get_by_ref(referent);
+    while let Some(instance) = inst {
+        path.push_front(&instance.name);
+        inst = dom.get_by_ref(instance.parent());
     }
+    path.into_iter().collect::<Vec<&str>>().join(".")
 }

From f9c85fb257fa4c3c6c198554a57f7b7d196af5dc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 12:47:49 -0800
Subject: [PATCH 027/366] Add some logging to FsSnapshot

---
 src/syncback/fs_snapshot.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 75796a015..1bf37cce2 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -37,13 +37,18 @@ impl FsSnapshot {
     }
 
     pub fn write_to_vfs(&self, vfs: &Vfs) -> io::Result<()> {
+        let mut dirs = 0;
+        let mut files = 0;
         for dir_path in &self.dir {
             vfs.create_dir(dir_path)?;
+            dirs += 1;
         }
         for (path, contents) in &self.files {
             vfs.write(path, contents.as_slice())?;
+            files += 1;
         }
 
+        log::debug!("Wrote {dirs} directories and {files} files to the VFS");
         Ok(())
     }
 }

From 70a4bb38c5612244d6d3fd53a31509852f285096 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 12:48:04 -0800
Subject: [PATCH 028/366] Add a barebones syncback command

---
 src/cli/mod.rs      |  4 +++
 src/cli/syncback.rs | 79 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 src/cli/syncback.rs

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 065128fb6..37ab9af93 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -7,6 +7,7 @@ mod init;
 mod plugin;
 mod serve;
 mod sourcemap;
+mod syncback;
 mod upload;
 
 use std::{borrow::Cow, env, path::Path, str::FromStr};
@@ -21,6 +22,7 @@ pub use self::init::{InitCommand, InitKind};
 pub use self::plugin::{PluginCommand, PluginSubcommand};
 pub use self::serve::ServeCommand;
 pub use self::sourcemap::SourcemapCommand;
+pub use self::syncback::SyncbackCommand;
 pub use self::upload::UploadCommand;
 
 /// Command line options that Rojo accepts, defined using the clap crate.
@@ -46,6 +48,7 @@ impl Options {
             Subcommand::FmtProject(subcommand) => subcommand.run(),
             Subcommand::Doc(subcommand) => subcommand.run(),
             Subcommand::Plugin(subcommand) => subcommand.run(),
+            Subcommand::Syncback(subcommand) => subcommand.run(),
         }
     }
 }
@@ -119,6 +122,7 @@ pub enum Subcommand {
     FmtProject(FmtProjectCommand),
     Doc(DocCommand),
     Plugin(PluginCommand),
+    Syncback(SyncbackCommand),
 }
 
 pub(super) fn resolve_path(path: &Path) -> Cow<'_, Path> {
diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
new file mode 100644
index 000000000..f6ac43b35
--- /dev/null
+++ b/src/cli/syncback.rs
@@ -0,0 +1,79 @@
+use std::{
+    collections::HashMap,
+    fs,
+    hash::Hash,
+    path::{Path, PathBuf},
+    time::Instant,
+};
+
+use clap::Parser;
+use memofs::Vfs;
+use rbx_dom_weak::WeakDom;
+use rbx_xml::DecodeOptions;
+
+use crate::{serve_session::ServeSession, syncback::syncback_loop};
+
+use super::resolve_path;
+
+/// Performs syncback for a project file
+#[derive(Debug, Parser)]
+pub struct SyncbackCommand {
+    /// Path to the project to sync back to.
+    #[clap(default_value = "")]
+    pub project: PathBuf,
+
+    /// Path to the place to perform syncback on.
+    #[clap(long, short)]
+    pub input: PathBuf,
+}
+
+impl SyncbackCommand {
+    pub fn run(&self) -> anyhow::Result<()> {
+        let path_old = resolve_path(&self.project);
+        let path_new = resolve_path(&self.input);
+
+        log::info!("Opening project at {}", path_old.display());
+        let session_old = ServeSession::new(Vfs::new_default(), path_old.clone())?;
+
+        let dom_old = session_old.tree();
+        log::info!("Reading place file at {}", path_new.display());
+        let dom_new = read_dom(&path_new);
+
+        let start = Instant::now();
+        log::debug!("Beginning syncback...");
+        syncback_loop(
+            session_old.vfs(),
+            &dom_old,
+            &dom_new,
+            session_old.root_project(),
+        )?;
+        log::debug!(
+            "Syncback finished in {:.02}s!",
+            start.elapsed().as_secs_f32()
+        );
+
+        Ok(())
+    }
+}
+
+fn read_dom(path: &Path) -> WeakDom {
+    let content = fs::read(path).unwrap();
+    if &content[0..8] == b"<roblox!" {
+        log::debug!("Reading {} as a binary file", path.display());
+        rbx_binary::from_reader(content.as_slice()).unwrap()
+    } else if &content[0..7] == b"<roblox" {
+        log::debug!("Reading {} as an xml file", path.display());
+        rbx_xml::from_reader(
+            content.as_slice(),
+            DecodeOptions::new().property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown),
+        )
+        .unwrap()
+    } else {
+        panic!("invalid Roblox file at {}", path.display())
+    }
+}
+
+#[inline]
+fn invert_map<K: Hash + Eq, V: Hash + Eq>(map: HashMap<K, V>) -> HashMap<V, K> {
+    map.into_iter().map(|(key, value)| (value, key)).collect()
+}

From 44a15d815695c6d71eeab75132d7a8c3406f634f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 12:59:30 -0800
Subject: [PATCH 029/366] Use pretty JSON for project reserialization

---
 src/syncback/middleware.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 0daeb9269..9a6ac5669 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -250,7 +250,7 @@ fn syncback_project<'new, 'old>(
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot: FsSnapshot::new().with_file(
             &project.file_location,
-            serde_json::to_vec(&project).unwrap(),
+            serde_json::to_vec_pretty(&project).unwrap(),
         ),
         children,
         removed_children,

From fa093dfdf87622399ef83103efcb27df4efa520d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 12:59:42 -0800
Subject: [PATCH 030/366] Allow Variants to be converted into UnresolvedValue

---
 src/resolution.rs | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/resolution.rs b/src/resolution.rs
index 9a0219eeb..9e7cc3f41 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -190,6 +190,50 @@ impl AmbiguousValue {
     }
 }
 
+impl From<Variant> for UnresolvedValue {
+    fn from(value: Variant) -> Self {
+        Self::Ambiguous(match value {
+            Variant::Bool(bool) => AmbiguousValue::Bool(bool),
+            Variant::Float32(n) => AmbiguousValue::Number(n as f64),
+            Variant::Float64(n) => AmbiguousValue::Number(n),
+            Variant::Int32(n) => AmbiguousValue::Number(n as f64),
+            Variant::Int64(n) => AmbiguousValue::Number(n as f64),
+            Variant::String(str) => AmbiguousValue::String(str),
+            Variant::Tags(tags) => {
+                AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())
+            }
+            Variant::Content(content) => AmbiguousValue::String(content.into_string()),
+            Variant::Vector2(vector) => AmbiguousValue::Array2([vector.x as f64, vector.y as f64]),
+            Variant::Vector3(vector) => {
+                AmbiguousValue::Array3([vector.x as f64, vector.y as f64, vector.z as f64])
+            }
+            Variant::Color3(color) => {
+                AmbiguousValue::Array3([color.r as f64, color.g as f64, color.b as f64])
+            }
+            Variant::CFrame(cf) => AmbiguousValue::Array12([
+                cf.position.x as f64,
+                cf.position.y as f64,
+                cf.position.z as f64,
+                cf.orientation.x.x as f64,
+                cf.orientation.x.y as f64,
+                cf.orientation.x.z as f64,
+                cf.orientation.y.x as f64,
+                cf.orientation.y.y as f64,
+                cf.orientation.y.z as f64,
+                cf.orientation.z.x as f64,
+                cf.orientation.z.y as f64,
+                cf.orientation.z.z as f64,
+            ]),
+            Variant::Attributes(attr) => AmbiguousValue::Attributes(attr),
+            Variant::Font(font) => AmbiguousValue::Font(font),
+            Variant::MaterialColors(colors) => AmbiguousValue::MaterialColors(colors),
+            _ => {
+                return Self::FullyQualified(value);
+            }
+        })
+    }
+}
+
 fn find_descriptor(
     class_name: &str,
     prop_name: &str,

From 93604bd0ea9762b0afec0148ab72c79e757706a5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 13:51:06 -0800
Subject: [PATCH 031/366] Spin SyncbackSnapshot into its own module

---
 src/syncback/mod.rs      | 96 ++++------------------------------------
 src/syncback/snapshot.rs | 85 +++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 87 deletions(-)
 create mode 100644 src/syncback/snapshot.rs

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 5b6c6953d..95091bfea 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,95 +1,18 @@
 mod fs_snapshot;
 mod middleware;
+mod snapshot;
 
 use crate::{
-    snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot::{hash_tree, InstanceSnapshot, RojoTree},
     Project,
 };
-use blake3::Hash;
 use memofs::Vfs;
-use rbx_dom_weak::{types::Ref, Instance, WeakDom};
-use std::{
-    collections::{HashMap, VecDeque},
-    path::{Path, PathBuf},
-    rc::Rc,
-};
+use rbx_dom_weak::{types::Ref, WeakDom};
+use std::{collections::VecDeque, rc::Rc};
 
 pub use fs_snapshot::FsSnapshot;
-
-use self::middleware::{get_best_middleware, syncback_middleware};
-
-struct SyncbackData<'new, 'old> {
-    vfs: &'old Vfs,
-    old_tree: &'old RojoTree,
-    new_tree: &'new WeakDom,
-
-    old_hashes: Rc<HashMap<Ref, Hash>>,
-    new_hashes: Rc<HashMap<Ref, Hash>>,
-}
-pub struct SyncbackSnapshot<'new, 'old> {
-    data: Rc<SyncbackData<'new, 'old>>,
-    old: Option<Ref>,
-    new: Ref,
-    parent_path: PathBuf,
-    name: String,
-}
-
-impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
-    /// Constructs a SyncbackSnapshot from the provided refs
-    /// while inheriting the parent's trees and path
-    #[inline]
-    pub fn from_parent<P: AsRef<Path>>(
-        &self,
-        extension: P,
-        new_name: String,
-        new_ref: Ref,
-        old_ref: Option<Ref>,
-    ) -> Self {
-        Self {
-            data: Rc::clone(&self.data),
-            old: old_ref,
-            new: new_ref,
-            parent_path: self.parent_path.join(extension.as_ref()),
-            name: new_name,
-        }
-    }
-
-    /// Returns an Instance from the old tree with the provided referent, if it
-    /// exists.
-    #[inline]
-    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'old>> {
-        self.data.old_tree.get_instance(referent)
-    }
-
-    /// Returns an Instance from the new tree with the provided referent, if it
-    /// exists.
-    #[inline]
-    pub fn get_new_instance(&self, referent: Ref) -> Option<&'new Instance> {
-        self.data.new_tree.get_by_ref(referent)
-    }
-
-    /// The 'old' Instance this snapshot is for, if it exists.
-    #[inline]
-    pub fn old_inst(&self) -> Option<InstanceWithMeta<'old>> {
-        self.old
-            .and_then(|old| self.data.old_tree.get_instance(old))
-    }
-
-    /// The 'new' Instance this snapshot is for.
-    #[inline]
-    pub fn new_inst(&self) -> &'new Instance {
-        self.data
-            .new_tree
-            .get_by_ref(self.new)
-            .expect("SyncbackSnapshot should not contain invalid referents")
-    }
-
-    /// Returns the underlying VFS being used for syncback.
-    #[inline]
-    pub fn vfs(&self) -> &Vfs {
-        self.data.vfs
-    }
-}
+pub use middleware::{get_best_middleware, syncback_middleware};
+pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
 pub fn syncback_loop<'old, 'new>(
     vfs: &'old Vfs,
@@ -98,16 +21,14 @@ pub fn syncback_loop<'old, 'new>(
     project: &Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
     log::debug!("Hashing project DOM");
-    let old_hashes = Rc::new(hash_tree(old_tree.inner()));
+    let old_hashes = hash_tree(old_tree.inner());
     log::debug!("Hashing file DOM");
-    let new_hashes = Rc::new(hash_tree(new_tree));
+    let new_hashes = hash_tree(new_tree);
 
     let syncback_data = Rc::new(SyncbackData {
         vfs,
         old_tree,
         new_tree,
-        old_hashes: Rc::clone(&old_hashes),
-        new_hashes: Rc::clone(&new_hashes),
     });
 
     let mut snapshots = vec![SyncbackSnapshot {
@@ -150,6 +71,7 @@ pub fn syncback_loop<'old, 'new>(
             replacements.push((old_inst.parent(), syncback.inst_snapshot));
         }
 
+        // TODO: Check if file names are valid files
         log::debug!("Writing {} to vfs", get_inst_path(new_tree, snapshot.new));
         syncback.fs_snapshot.write_to_vfs(vfs)?;
 
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
new file mode 100644
index 000000000..98ac7db73
--- /dev/null
+++ b/src/syncback/snapshot.rs
@@ -0,0 +1,85 @@
+use memofs::Vfs;
+use std::{
+    path::{Path, PathBuf},
+    rc::Rc,
+};
+
+use crate::snapshot::{InstanceWithMeta, RojoTree};
+use rbx_dom_weak::{types::Ref, Instance, WeakDom};
+
+pub struct SyncbackData<'new, 'old> {
+    pub(super) vfs: &'old Vfs,
+    pub(super) old_tree: &'old RojoTree,
+    pub(super) new_tree: &'new WeakDom,
+}
+
+pub struct SyncbackSnapshot<'new, 'old> {
+    pub(super) data: Rc<SyncbackData<'new, 'old>>,
+    pub(super) old: Option<Ref>,
+    pub(super) new: Ref,
+    pub(super) parent_path: PathBuf,
+    pub(super) name: String,
+}
+
+impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
+    /// Constructs a SyncbackSnapshot from the provided refs
+    /// while inheriting the parent's trees and path
+    #[inline]
+    pub fn from_parent<P: AsRef<Path>>(
+        &self,
+        extension: P,
+        new_name: String,
+        new_ref: Ref,
+        old_ref: Option<Ref>,
+    ) -> Self {
+        Self {
+            data: Rc::clone(&self.data),
+            old: old_ref,
+            new: new_ref,
+            parent_path: self.parent_path.join(extension.as_ref()),
+            name: new_name,
+        }
+    }
+
+    /// Returns an Instance from the old tree with the provided referent, if it
+    /// exists.
+    #[inline]
+    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'old>> {
+        self.data.old_tree.get_instance(referent)
+    }
+
+    /// Returns an Instance from the new tree with the provided referent, if it
+    /// exists.
+    #[inline]
+    pub fn get_new_instance(&self, referent: Ref) -> Option<&'new Instance> {
+        self.data.new_tree.get_by_ref(referent)
+    }
+
+    /// The 'old' Instance this snapshot is for, if it exists.
+    #[inline]
+    pub fn old_inst(&self) -> Option<InstanceWithMeta<'old>> {
+        self.old
+            .and_then(|old| self.data.old_tree.get_instance(old))
+    }
+
+    /// The 'new' Instance this snapshot is for.
+    #[inline]
+    pub fn new_inst(&self) -> &'new Instance {
+        self.data
+            .new_tree
+            .get_by_ref(self.new)
+            .expect("SyncbackSnapshot should not contain invalid referents")
+    }
+
+    /// Returns the underlying VFS being used for syncback.
+    #[inline]
+    pub fn vfs(&self) -> &'old Vfs {
+        self.data.vfs
+    }
+
+    /// Returns the WeakDom used for the 'new' tree
+    #[inline]
+    pub fn new_tree(&self) -> &'new WeakDom {
+        self.data.new_tree
+    }
+}

From 5eb7adf2f01d8998eda0be14b3036f905f78b5ad Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 13:53:19 -0800
Subject: [PATCH 032/366] Support rbxmx middleware for syncback

---
 src/syncback/middleware.rs | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 9a6ac5669..9bc26105b 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -30,6 +30,7 @@ pub fn syncback_middleware<'new, 'old>(
         Middleware::ModuleScript => syncback_script(ScriptType::Module, snapshot),
         Middleware::ClientScript => syncback_script(ScriptType::Client, snapshot),
         Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
+        Middleware::Rbxmx => syncback_rbxmx(snapshot),
         Middleware::Dir => syncback_dir(snapshot),
         _ => panic!("unsupported instance middleware {:?}", middleware),
     }
@@ -221,9 +222,7 @@ fn syncback_project<'new, 'old>(
         }
         // From this point, both maps contain only children of the current
         // instance that aren't in the project. So, we just do some quick and
-        // dirty matching to identify children that were:
-        // - added (in new but not old)
-        // - removed (in old but not new)
+        // dirty matching to identify children that were added and removed.
         for (new_name, new_child) in new_child_map {
             if let Some(old_inst) = old_child_map.get(new_name) {
                 children.push(snapshot.from_parent(
@@ -256,3 +255,23 @@ fn syncback_project<'new, 'old>(
         removed_children,
     }
 }
+
+pub fn syncback_rbxmx<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> SyncbackReturn<'new, 'old> {
+    // If any of the children of this Instance are scripts, we don't want
+    // include them in the model. So instead, we'll check and then serialize.
+
+    let inst = snapshot.new_inst();
+    let mut path = snapshot.parent_path.join(&inst.name);
+    path.set_extension("rbxmx");
+    // Long-term, anyway. Right now we stay silly.
+    let mut serialized = Vec::new();
+    rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()]).unwrap();
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst),
+        fs_snapshot: FsSnapshot::new().with_file(&path, serialized),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    }
+}

From 5f82ce2bedbef4d117244c16bafc4add332f93ff Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 13:56:19 -0800
Subject: [PATCH 033/366] Add spacing to project syncback to make it easier to
 read

---
 src/syncback/middleware.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 9bc26105b..8e7910b9b 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -185,6 +185,7 @@ fn syncback_project<'new, 'old>(
         snapshot.new_inst(),
         snapshot.old_inst().unwrap(),
     )];
+
     while let Some((node, new_inst, old_inst)) = nodes.pop() {
         let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
         for child_ref in old_inst.children() {
@@ -196,6 +197,7 @@ fn syncback_project<'new, 'old>(
             let child = snapshot.get_new_instance(*child_ref).unwrap();
             new_child_map.insert(child.name.as_str(), child);
         }
+
         for (child_name, child_node) in &mut node.children {
             if let Some(new_child) = new_child_map.get(child_name.as_str()) {
                 if let Some(old_child) = old_child_map.get(child_name.as_str()) {
@@ -220,6 +222,7 @@ fn syncback_project<'new, 'old>(
                 panic!("Cannot add or remove children from a project")
             }
         }
+
         // From this point, both maps contain only children of the current
         // instance that aren't in the project. So, we just do some quick and
         // dirty matching to identify children that were added and removed.

From c770770ad5d3fe00dbb7d9e4b73560f481b8b5e7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 16:04:12 -0800
Subject: [PATCH 034/366] Support script directories

---
 src/syncback/middleware.rs | 87 +++++++++++++++++++++++++++++++-------
 1 file changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 8e7910b9b..4678ec1ab 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -7,9 +7,9 @@ use rbx_dom_weak::{
 
 use crate::{
     resolution::UnresolvedValue,
-    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta, InstigatingSource},
-    snapshot_middleware::{DirectoryMetadata, Middleware, ScriptType},
-    Project, ProjectNode,
+    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta},
+    snapshot_middleware::{Middleware, ScriptType},
+    Project,
 };
 
 use super::{FsSnapshot, SyncbackSnapshot};
@@ -32,6 +32,9 @@ pub fn syncback_middleware<'new, 'old>(
         Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
         Middleware::Rbxmx => syncback_rbxmx(snapshot),
         Middleware::Dir => syncback_dir(snapshot),
+        Middleware::ModuleScriptDir => syncback_script_dir(ScriptType::Module, snapshot),
+        Middleware::ClientScriptDir => syncback_script_dir(ScriptType::Client, snapshot),
+        Middleware::ServerScriptDir => syncback_script_dir(ScriptType::Server, snapshot),
         _ => panic!("unsupported instance middleware {:?}", middleware),
     }
 }
@@ -94,6 +97,38 @@ fn syncback_script<'new, 'old>(
     }
 }
 
+fn syncback_script_dir<'new, 'old>(
+    script_type: ScriptType,
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> SyncbackReturn<'new, 'old> {
+    let mut path = snapshot.parent_path.join("init");
+    path.set_extension(match script_type {
+        ScriptType::Module => "lua",
+        ScriptType::Client => "client.lua",
+        ScriptType::Server => "server.lua",
+    });
+    let contents =
+        if let Some(Variant::String(source)) = snapshot.new_inst().properties.get("Source") {
+            source.as_bytes().to_vec()
+        } else {
+            panic!("Source should be a string")
+        };
+
+    let dir_syncback = syncback_dir(snapshot);
+    let init_syncback = syncback_script(script_type, snapshot);
+
+    let mut fs_snapshot = FsSnapshot::new();
+    fs_snapshot.push_file(path, contents);
+    fs_snapshot.merge(dir_syncback.fs_snapshot);
+
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot,
+        children: dir_syncback.children,
+        removed_children: dir_syncback.removed_children,
+    }
+}
+
 fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
     let path = snapshot.parent_path.join(snapshot.name.clone());
 
@@ -186,7 +221,14 @@ fn syncback_project<'new, 'old>(
         snapshot.old_inst().unwrap(),
     )];
 
+    // A map of referents from the new tree to the Path that created it,
+    // if it exists. This is a roundabout way to locate the parents of
+    // Instances.
+    let mut ref_to_node = HashMap::new();
+
     while let Some((node, new_inst, old_inst)) = nodes.pop() {
+        ref_to_node.insert(new_inst.referent(), node.path.as_ref());
+
         let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
         for child_ref in old_inst.children() {
             let child = snapshot.get_old_instance(*child_ref).unwrap();
@@ -227,22 +269,37 @@ fn syncback_project<'new, 'old>(
         // instance that aren't in the project. So, we just do some quick and
         // dirty matching to identify children that were added and removed.
         for (new_name, new_child) in new_child_map {
+            let parent_path = match ref_to_node.get(&new_child.parent()) {
+                Some(Some(path)) => path.path().to_path_buf(),
+                Some(None) => {
+                    log::debug!("{new_name} was visited but has no path");
+                    continue;
+                }
+                None => {
+                    log::debug!("{new_name} does not currently exist on FS");
+                    continue;
+                }
+            };
             if let Some(old_inst) = old_child_map.get(new_name) {
-                children.push(snapshot.from_parent(
-                    new_name,
-                    new_name.to_string(),
-                    new_child.referent(),
-                    Some(old_inst.id()),
-                ));
+                // All children are descendants of a node of a project
+                // So we really just need to track which one is which.
+                children.push(SyncbackSnapshot {
+                    data: snapshot.data.clone(),
+                    old: Some(old_inst.id()),
+                    new: new_child.referent(),
+                    name: new_name.to_string(),
+                    parent_path,
+                });
                 old_child_map.remove(new_name);
             } else {
                 // it's new
-                children.push(snapshot.from_parent(
-                    new_name,
-                    new_name.to_string(),
-                    new_child.referent(),
-                    None,
-                ));
+                children.push(SyncbackSnapshot {
+                    data: snapshot.data.clone(),
+                    old: None,
+                    new: new_child.referent(),
+                    name: new_name.to_string(),
+                    parent_path,
+                });
             }
         }
         removed_children.extend(old_child_map.into_values());

From 343b97f34496c99b0598a0ae223819a3c3d4ffb0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 16:04:51 -0800
Subject: [PATCH 035/366] Add merge, pop_dir support to FsSnapshot Make
 write_to_vfs ignore existing directory errors

---
 src/syncback/fs_snapshot.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 1bf37cce2..dab1c6837 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -31,20 +31,34 @@ impl FsSnapshot {
         self
     }
 
+    pub fn merge(&mut self, other: Self) {
+        self.dir.extend(other.dir);
+        self.files.extend(other.files);
+    }
+
     pub fn push_file<P: AsRef<Path>>(&mut self, path: P, data: Vec<u8>) {
         self.files
             .insert(path.as_ref().to_path_buf(), Arc::new(data));
     }
 
-    pub fn write_to_vfs(&self, vfs: &Vfs) -> io::Result<()> {
+    pub fn pop_dir<P: AsRef<Path>>(&mut self, path: P) -> bool {
+        self.dir.remove(path.as_ref())
+    }
+
+    pub fn write_to_vfs<P: AsRef<Path>>(&self, base: P, vfs: &Vfs) -> io::Result<()> {
+        let base_path = base.as_ref();
         let mut dirs = 0;
         let mut files = 0;
         for dir_path in &self.dir {
-            vfs.create_dir(dir_path)?;
+            match vfs.create_dir(base_path.join(dir_path)) {
+                Ok(_) => (),
+                Err(err) if err.kind() == io::ErrorKind::AlreadyExists => (),
+                Err(err) => return Err(err),
+            };
             dirs += 1;
         }
         for (path, contents) in &self.files {
-            vfs.write(path, contents.as_slice())?;
+            vfs.write(base_path.join(path), contents.as_slice())?;
             files += 1;
         }
 

From ffcf0d612652181f619af13594d8b15afcdc0ff3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 16:14:52 -0800
Subject: [PATCH 036/366] Use project instigating source for syncback

---
 src/syncback/middleware.rs | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 4678ec1ab..da31bebfb 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -7,7 +7,7 @@ use rbx_dom_weak::{
 
 use crate::{
     resolution::UnresolvedValue,
-    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta},
+    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta, InstigatingSource},
     snapshot_middleware::{Middleware, ScriptType},
     Project,
 };
@@ -199,14 +199,23 @@ fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> Syncback
 fn syncback_project<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> SyncbackReturn<'new, 'old> {
+    let old_inst = snapshot
+        .old_inst()
+        .expect("project middleware shouldn't be used to make new files");
+    // This can never be None.
+    let source = old_inst.metadata().instigating_source.as_ref().unwrap();
+
+    let project_path = match source {
+        InstigatingSource::Path(path) => path.as_path(),
+        InstigatingSource::ProjectNode { path, .. } => path.as_path(),
+    };
+
     // We need to build a 'new' project and serialize it using an FsSnapshot.
     // It's convenient to start with the old one though, since it means we have
     // a thing to iterate through.
-    let mut project = Project::load_from_slice(
-        &snapshot.vfs().read(&snapshot.parent_path).unwrap(),
-        &snapshot.parent_path,
-    )
-    .unwrap();
+    let mut project =
+        Project::load_from_slice(&snapshot.vfs().read(project_path).unwrap(), project_path)
+            .unwrap();
 
     let mut children = Vec::new();
     let mut removed_children = Vec::new();
@@ -215,11 +224,7 @@ fn syncback_project<'new, 'old>(
     // so we'll simply match Instances on a per-node basis and rebuild the tree
     // with the new instance's data. This matching will be done by class and name
     // to simplify things.
-    let mut nodes = vec![(
-        &mut project.tree,
-        snapshot.new_inst(),
-        snapshot.old_inst().unwrap(),
-    )];
+    let mut nodes = vec![(&mut project.tree, snapshot.new_inst(), old_inst)];
 
     // A map of referents from the new tree to the Path that created it,
     // if it exists. This is a roundabout way to locate the parents of

From 46ee80faa4046df374d9c8a685ca04e988b1307e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 16:17:08 -0800
Subject: [PATCH 037/366] Write to VFS only once for syncback Start at actual
 project parent

---
 src/syncback/mod.rs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 95091bfea..fe7508fe4 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -35,18 +35,24 @@ pub fn syncback_loop<'old, 'new>(
         data: syncback_data,
         old: Some(old_tree.get_root_id()),
         new: new_tree.root_ref(),
-        parent_path: project.file_location.clone(),
+        parent_path: project.folder_location().to_path_buf(),
         name: project.name.clone(),
     }];
 
     let mut replacements = Vec::new();
+    let mut fs_snapshot = FsSnapshot::new();
 
     while let Some(snapshot) = snapshots.pop() {
+        log::debug!(
+            "instance {} parent is {}",
+            snapshot.name,
+            snapshot.parent_path.display()
+        );
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
             if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
-                log::debug!(
+                log::trace!(
                     "Skipping {} due to it being identically hashed as {:?}",
                     get_inst_path(new_tree, snapshot.new),
                     old_hashes.get(&old_ref)
@@ -59,7 +65,7 @@ pub fn syncback_loop<'old, 'new>(
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
-        log::debug!(
+        log::trace!(
             "Middleware for {}: {:?}",
             get_inst_path(new_tree, snapshot.new),
             middleware
@@ -72,12 +78,13 @@ pub fn syncback_loop<'old, 'new>(
         }
 
         // TODO: Check if file names are valid files
-        log::debug!("Writing {} to vfs", get_inst_path(new_tree, snapshot.new));
-        syncback.fs_snapshot.write_to_vfs(vfs)?;
+        fs_snapshot.merge(syncback.fs_snapshot);
 
         snapshots.extend(syncback.children);
     }
 
+    fs_snapshot.write_to_vfs(project.folder_location(), vfs)?;
+
     Ok(replacements)
 }
 

From 88b2b1c98f5fb12c0ad7edee84ba610b1ec65d8a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 16:18:31 -0800
Subject: [PATCH 038/366] Don't superfluously snapshot init.lua files

---
 src/syncback/middleware.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index da31bebfb..f85a80e6d 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -115,7 +115,6 @@ fn syncback_script_dir<'new, 'old>(
         };
 
     let dir_syncback = syncback_dir(snapshot);
-    let init_syncback = syncback_script(script_type, snapshot);
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.push_file(path, contents);

From 9166a19df23aae092b04acb7659911b14b3317c9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Dec 2023 16:22:19 -0800
Subject: [PATCH 039/366] Add syncback support for text middleware

---
 src/syncback/middleware.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index f85a80e6d..677a60922 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -30,6 +30,7 @@ pub fn syncback_middleware<'new, 'old>(
         Middleware::ModuleScript => syncback_script(ScriptType::Module, snapshot),
         Middleware::ClientScript => syncback_script(ScriptType::Client, snapshot),
         Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
+        Middleware::Text => syncback_text(snapshot),
         Middleware::Rbxmx => syncback_rbxmx(snapshot),
         Middleware::Dir => syncback_dir(snapshot),
         Middleware::ModuleScriptDir => syncback_script_dir(ScriptType::Module, snapshot),
@@ -339,3 +340,25 @@ pub fn syncback_rbxmx<'new, 'old>(
         removed_children: Vec::new(),
     }
 }
+
+fn syncback_text<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> SyncbackReturn<'new, 'old> {
+    let inst = snapshot.new_inst();
+
+    let mut path = snapshot.parent_path.clone();
+    path.set_file_name(snapshot.name.clone());
+    path.set_extension("txt");
+    let contents = if let Some(Variant::String(source)) = inst.properties.get("Value") {
+        source.as_bytes().to_vec()
+    } else {
+        panic!("Value should be a string")
+    };
+
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst).metadata(InstanceMetadata::new()),
+        fs_snapshot: FsSnapshot::new().with_file(path, contents),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    }
+}

From 3d37de1732a499de6f1d610f0f7133f56a6741cc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 18 Dec 2023 09:12:57 -0800
Subject: [PATCH 040/366] Add `path` method to InstigatingSource

---
 src/snapshot/metadata.rs   | 9 +++++++++
 src/syncback/middleware.rs | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/snapshot/metadata.rs b/src/snapshot/metadata.rs
index fbc70c112..27ec40213 100644
--- a/src/snapshot/metadata.rs
+++ b/src/snapshot/metadata.rs
@@ -221,6 +221,15 @@ pub enum InstigatingSource {
     },
 }
 
+impl InstigatingSource {
+    pub fn path(&self) -> &Path {
+        match self {
+            Self::Path(path) => path.as_path(),
+            Self::ProjectNode { path, .. } => path.as_path(),
+        }
+    }
+}
+
 impl fmt::Debug for InstigatingSource {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 677a60922..94a223d96 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -205,16 +205,11 @@ fn syncback_project<'new, 'old>(
     // This can never be None.
     let source = old_inst.metadata().instigating_source.as_ref().unwrap();
 
-    let project_path = match source {
-        InstigatingSource::Path(path) => path.as_path(),
-        InstigatingSource::ProjectNode { path, .. } => path.as_path(),
-    };
-
     // We need to build a 'new' project and serialize it using an FsSnapshot.
     // It's convenient to start with the old one though, since it means we have
     // a thing to iterate through.
     let mut project =
-        Project::load_from_slice(&snapshot.vfs().read(project_path).unwrap(), project_path)
+        Project::load_from_slice(&snapshot.vfs().read(source.path()).unwrap(), source.path())
             .unwrap();
 
     let mut children = Vec::new();

From 75e8844a9f99ceb807294a45db7bb7b0e37881b7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 18 Dec 2023 11:31:58 -0800
Subject: [PATCH 041/366] Make JsonModel public and add QoL methods to it

---
 src/snapshot_middleware/json_model.rs | 36 ++++++++++++++++++++++++---
 src/snapshot_middleware/mod.rs        |  1 +
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 93d566a2e..1fa8c5a37 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -3,7 +3,7 @@ use std::{borrow::Cow, collections::HashMap, path::Path, str};
 use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::types::{Attributes, Ref};
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     resolution::UnresolvedValue,
@@ -54,9 +54,9 @@ pub fn snapshot_json_model(
     Ok(Some(snapshot))
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-struct JsonModel {
+pub struct JsonModel {
     #[serde(alias = "Name")]
     name: Option<String>,
 
@@ -117,6 +117,36 @@ impl JsonModel {
             children,
         })
     }
+
+    /// Constructs an empty JSON model with the provided name and class.
+    #[inline]
+    pub fn new(name: &str, class_name: &str) -> Self {
+        Self {
+            name: Some(name.to_string()),
+            class_name: class_name.to_string(),
+            children: Vec::new(),
+            properties: HashMap::new(),
+            attributes: HashMap::new(),
+        }
+    }
+
+    /// Sets the properties of this `JsonModel`.
+    #[inline]
+    pub fn set_properties(&mut self, properties: HashMap<String, UnresolvedValue>) {
+        self.properties = properties;
+    }
+
+    /// Sets the attributes of this `JsonModel`.
+    #[inline]
+    pub fn set_attributes(&mut self, attributes: HashMap<String, UnresolvedValue>) {
+        self.attributes = attributes;
+    }
+
+    /// Pushes the provided `JsonModel` as a child of this one.
+    #[inline]
+    pub fn push_child(&mut self, child: Self) {
+        self.children.push(child);
+    }
 }
 
 #[cfg(test)]
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 70baa6616..2880ba9ff 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -45,6 +45,7 @@ use self::{
 };
 
 pub use self::{
+    json_model::JsonModel,
     lua::ScriptType,
     meta_file::{AdjacentMetadata, DirectoryMetadata},
     project::snapshot_project_node,

From 166f180a395a74fd63fd004d0d03e194de2139f5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 18 Dec 2023 11:32:17 -0800
Subject: [PATCH 042/366] Implement JsonModel syncback

---
 src/syncback/middleware.rs | 45 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 94a223d96..9d39cccf3 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -7,8 +7,8 @@ use rbx_dom_weak::{
 
 use crate::{
     resolution::UnresolvedValue,
-    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta, InstigatingSource},
-    snapshot_middleware::{Middleware, ScriptType},
+    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta},
+    snapshot_middleware::{JsonModel, Middleware, ScriptType},
     Project,
 };
 
@@ -31,6 +31,7 @@ pub fn syncback_middleware<'new, 'old>(
         Middleware::ClientScript => syncback_script(ScriptType::Client, snapshot),
         Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
         Middleware::Text => syncback_text(snapshot),
+        Middleware::JsonModel => syncback_json_model(snapshot),
         Middleware::Rbxmx => syncback_rbxmx(snapshot),
         Middleware::Dir => syncback_dir(snapshot),
         Middleware::ModuleScriptDir => syncback_script_dir(ScriptType::Module, snapshot),
@@ -130,6 +131,11 @@ fn syncback_script_dir<'new, 'old>(
 }
 
 fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
+    log::debug!(
+        "parent of {} is {}",
+        snapshot.name,
+        snapshot.parent_path.display()
+    );
     let path = snapshot.parent_path.join(snapshot.name.clone());
 
     let mut removed_children = Vec::new();
@@ -357,3 +363,38 @@ fn syncback_text<'new, 'old>(
         removed_children: Vec::new(),
     }
 }
+
+fn syncback_json_model<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> SyncbackReturn<'new, 'old> {
+    let mut path = snapshot.parent_path.clone();
+    path.set_file_name(snapshot.name.clone());
+    path.set_extension("model.json");
+
+    let new_inst = snapshot.new_inst();
+    let mut model = JsonModel::new(&new_inst.name, &new_inst.class);
+    let mut properties = HashMap::with_capacity(new_inst.properties.len());
+
+    // TODO handle attributes separately
+    if let Some(old_inst) = snapshot.old_inst() {
+        for (name, value) in &new_inst.properties {
+            if old_inst.properties().contains_key(name) {
+                properties.insert(name.clone(), UnresolvedValue::from(value.clone()));
+            }
+        }
+    } else {
+        for (name, value) in new_inst.properties.clone() {
+            properties.insert(name, UnresolvedValue::from(value));
+        }
+    }
+    model.set_properties(properties);
+
+    // TODO children
+
+    SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
+        fs_snapshot: FsSnapshot::new().with_file(&path, serde_json::to_vec_pretty(&model).unwrap()),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    }
+}

From c575a4700fc2e1e9c5008dcae6fc15bca1dc602e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 08:27:23 -0800
Subject: [PATCH 043/366] Correct directory syncback

---
 src/syncback/middleware.rs | 19 ++++++++-----------
 src/syncback/snapshot.rs   | 10 ++--------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index 9d39cccf3..a0adcf84f 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -131,12 +131,13 @@ fn syncback_script_dir<'new, 'old>(
 }
 
 fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
+    let path = snapshot.parent_path.join(snapshot.name.clone());
     log::debug!(
-        "parent of {} is {}",
+        "parent of {} is {}, writing to {}",
         snapshot.name,
-        snapshot.parent_path.display()
+        snapshot.parent_path.display(),
+        path.display()
     );
-    let path = snapshot.parent_path.join(snapshot.name.clone());
 
     let mut removed_children = Vec::new();
     let mut children = Vec::new();
@@ -171,14 +172,10 @@ fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> Syncback
             let new_child = snapshot.get_new_instance(*child_ref).unwrap();
             // If it exists in the new tree but not the old one, it was added.
             match old_children.get(new_child.name.as_str()) {
-                None => children.push(snapshot.from_parent(
-                    &new_child.name,
-                    new_child.name.clone(),
-                    *child_ref,
-                    None,
-                )),
+                None => {
+                    children.push(snapshot.from_parent(new_child.name.clone(), *child_ref, None))
+                }
                 Some(old_ref) => children.push(snapshot.from_parent(
-                    &new_child.name,
                     new_child.name.clone(),
                     *child_ref,
                     Some(*old_ref),
@@ -188,7 +185,7 @@ fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> Syncback
     } else {
         for child_ref in snapshot.new_inst().children() {
             let child = snapshot.get_new_instance(*child_ref).unwrap();
-            children.push(snapshot.from_parent(&child.name, child.name.clone(), *child_ref, None))
+            children.push(snapshot.from_parent(child.name.clone(), *child_ref, None))
         }
     }
     let mut fs_snapshot = FsSnapshot::new().with_dir(&path);
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 98ac7db73..a4cf86098 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -25,18 +25,12 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Constructs a SyncbackSnapshot from the provided refs
     /// while inheriting the parent's trees and path
     #[inline]
-    pub fn from_parent<P: AsRef<Path>>(
-        &self,
-        extension: P,
-        new_name: String,
-        new_ref: Ref,
-        old_ref: Option<Ref>,
-    ) -> Self {
+    pub fn from_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
             data: Rc::clone(&self.data),
             old: old_ref,
             new: new_ref,
-            parent_path: self.parent_path.join(extension.as_ref()),
+            parent_path: self.parent_path.join(&self.name),
             name: new_name,
         }
     }

From 38b1f9bdf08f309e546717ae91bd5730c53c6901 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 08:47:08 -0800
Subject: [PATCH 044/366] Correct path of project nodes

---
 src/syncback/middleware.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index a0adcf84f..d1090cdbd 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -132,12 +132,6 @@ fn syncback_script_dir<'new, 'old>(
 
 fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
     let path = snapshot.parent_path.join(snapshot.name.clone());
-    log::debug!(
-        "parent of {} is {}, writing to {}",
-        snapshot.name,
-        snapshot.parent_path.display(),
-        path.display()
-    );
 
     let mut removed_children = Vec::new();
     let mut children = Vec::new();
@@ -214,6 +208,7 @@ fn syncback_project<'new, 'old>(
     let mut project =
         Project::load_from_slice(&snapshot.vfs().read(source.path()).unwrap(), source.path())
             .unwrap();
+    let base_path = source.path().parent().unwrap();
 
     let mut children = Vec::new();
     let mut removed_children = Vec::new();
@@ -273,7 +268,7 @@ fn syncback_project<'new, 'old>(
         // dirty matching to identify children that were added and removed.
         for (new_name, new_child) in new_child_map {
             let parent_path = match ref_to_node.get(&new_child.parent()) {
-                Some(Some(path)) => path.path().to_path_buf(),
+                Some(Some(path)) => base_path.join(path.path()),
                 Some(None) => {
                     log::debug!("{new_name} was visited but has no path");
                     continue;

From e17984b0c9537c9a5696cb701c7126192ad4f0a5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 09:50:16 -0800
Subject: [PATCH 045/366] Validate file names (badly)

---
 src/syncback/middleware.rs | 31 ++++++++++++++++++++++---
 src/syncback/mod.rs        | 46 +++++++++++++++++++++++++++++++-------
 2 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index d1090cdbd..bfac0b04a 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -12,7 +12,7 @@ use crate::{
     Project,
 };
 
-use super::{FsSnapshot, SyncbackSnapshot};
+use super::{is_valid_file_name, FsSnapshot, SyncbackSnapshot};
 
 pub struct SyncbackReturn<'new, 'old> {
     pub inst_snapshot: InstanceSnapshot,
@@ -75,6 +75,10 @@ fn syncback_script<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> SyncbackReturn<'new, 'old> {
+    if !is_valid_file_name(&snapshot.name) {
+        panic!("cannot create a file with name {}", snapshot.name);
+    }
+
     let inst = snapshot.new_inst();
 
     let mut path = snapshot.parent_path.clone();
@@ -103,6 +107,10 @@ fn syncback_script_dir<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> SyncbackReturn<'new, 'old> {
+    if !is_valid_file_name(&snapshot.name) {
+        panic!("cannot create a directory with name {}", snapshot.name);
+    }
+
     let mut path = snapshot.parent_path.join("init");
     path.set_extension(match script_type {
         ScriptType::Module => "lua",
@@ -131,6 +139,10 @@ fn syncback_script_dir<'new, 'old>(
 }
 
 fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
+    if !is_valid_file_name(&snapshot.name) {
+        panic!("cannot create a directory with name {}", snapshot.name);
+    }
+
     let path = snapshot.parent_path.join(snapshot.name.clone());
 
     let mut removed_children = Vec::new();
@@ -303,6 +315,9 @@ fn syncback_project<'new, 'old>(
         removed_children.extend(old_child_map.into_values());
     }
 
+    // We don't need to validate any file names for the FsSnapshot
+    // because projects can't ever be made by syncback, so they must
+    // already exist on the file system
     SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot: FsSnapshot::new().with_file(
@@ -319,9 +334,12 @@ pub fn syncback_rbxmx<'new, 'old>(
 ) -> SyncbackReturn<'new, 'old> {
     // If any of the children of this Instance are scripts, we don't want
     // include them in the model. So instead, we'll check and then serialize.
+    if !is_valid_file_name(&snapshot.name) {
+        panic!("cannot create a file with name {}", snapshot.name);
+    }
 
     let inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.join(&inst.name);
+    let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("rbxmx");
     // Long-term, anyway. Right now we stay silly.
     let mut serialized = Vec::new();
@@ -337,8 +355,11 @@ pub fn syncback_rbxmx<'new, 'old>(
 fn syncback_text<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> SyncbackReturn<'new, 'old> {
-    let inst = snapshot.new_inst();
+    if !is_valid_file_name(&snapshot.name) {
+        panic!("cannot create a file with name {}", snapshot.name);
+    }
 
+    let inst = snapshot.new_inst();
     let mut path = snapshot.parent_path.clone();
     path.set_file_name(snapshot.name.clone());
     path.set_extension("txt");
@@ -359,6 +380,10 @@ fn syncback_text<'new, 'old>(
 fn syncback_json_model<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> SyncbackReturn<'new, 'old> {
+    if !is_valid_file_name(&snapshot.name) {
+        panic!("cannot create a file with name {}", snapshot.name);
+    }
+
     let mut path = snapshot.parent_path.clone();
     path.set_file_name(snapshot.name.clone());
     path.set_extension("model.json");
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index fe7508fe4..30eb023e4 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -43,11 +43,6 @@ pub fn syncback_loop<'old, 'new>(
     let mut fs_snapshot = FsSnapshot::new();
 
     while let Some(snapshot) = snapshots.pop() {
-        log::debug!(
-            "instance {} parent is {}",
-            snapshot.name,
-            snapshot.parent_path.display()
-        );
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
@@ -65,9 +60,10 @@ pub fn syncback_loop<'old, 'new>(
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
-        log::trace!(
-            "Middleware for {}: {:?}",
+        log::debug!(
+            "instance {} parent is {} (using middleware {:?})",
             get_inst_path(new_tree, snapshot.new),
+            snapshot.parent_path.display(),
             middleware
         );
 
@@ -77,7 +73,6 @@ pub fn syncback_loop<'old, 'new>(
             replacements.push((old_inst.parent(), syncback.inst_snapshot));
         }
 
-        // TODO: Check if file names are valid files
         fs_snapshot.merge(syncback.fs_snapshot);
 
         snapshots.extend(syncback.children);
@@ -97,3 +92,38 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     }
     path.into_iter().collect::<Vec<&str>>().join(".")
 }
+
+/// A list of file names that are not valid on Windows.
+const INVALID_WINDOWS_NAMES: [&str; 22] = [
+    "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8",
+    "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
+];
+
+/// A list of all characters that are outright forbidden to be included
+/// in a file's name.
+const FORBIDDEN_CHARS: [char; 9] = ['<', '>', ':', '"', '/', '|', '?', '*', '\\'];
+
+/// Returns whether a given name is a valid file name. This takes into account
+/// rules for Windows, MacOS, and Linux.
+///
+/// In practice however, these broadly overlap so the only unexpected behavior
+/// is Windows, where there are 22 reserved names.
+pub fn is_valid_file_name<S: AsRef<str>>(name: S) -> bool {
+    let str = name.as_ref();
+
+    if str.ends_with(' ') || str.ends_with('.') {
+        return false;
+    }
+    // TODO check control characters
+    for forbidden in FORBIDDEN_CHARS {
+        if str.contains(forbidden) {
+            return false;
+        }
+    }
+    for forbidden in INVALID_WINDOWS_NAMES {
+        if str == forbidden {
+            return false;
+        }
+    }
+    true
+}

From 97bbb203dd5003f0a47fb97513002b636469671e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 10:51:24 -0800
Subject: [PATCH 046/366] Extend paths correctly in syncback middleware

---
 src/syncback/middleware.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
index bfac0b04a..2c165f60d 100644
--- a/src/syncback/middleware.rs
+++ b/src/syncback/middleware.rs
@@ -81,8 +81,7 @@ fn syncback_script<'new, 'old>(
 
     let inst = snapshot.new_inst();
 
-    let mut path = snapshot.parent_path.clone();
-    path.set_file_name(snapshot.name.clone());
+    let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension(match script_type {
         ScriptType::Module => "lua",
         ScriptType::Client => "client.lua",
@@ -111,7 +110,8 @@ fn syncback_script_dir<'new, 'old>(
         panic!("cannot create a directory with name {}", snapshot.name);
     }
 
-    let mut path = snapshot.parent_path.join("init");
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.push("init");
     path.set_extension(match script_type {
         ScriptType::Module => "lua",
         ScriptType::Client => "client.lua",
@@ -360,9 +360,9 @@ fn syncback_text<'new, 'old>(
     }
 
     let inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.clone();
-    path.set_file_name(snapshot.name.clone());
+    let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("txt");
+
     let contents = if let Some(Variant::String(source)) = inst.properties.get("Value") {
         source.as_bytes().to_vec()
     } else {
@@ -384,8 +384,7 @@ fn syncback_json_model<'new, 'old>(
         panic!("cannot create a file with name {}", snapshot.name);
     }
 
-    let mut path = snapshot.parent_path.clone();
-    path.set_file_name(snapshot.name.clone());
+    let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("model.json");
 
     let new_inst = snapshot.new_inst();

From d69130d522cf83da5e97f4c0c584ef5864eb4fd3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 10:54:33 -0800
Subject: [PATCH 047/366] Skip serializing name field of JsonModel

---
 src/snapshot_middleware/json_model.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 1fa8c5a37..76acddca2 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -57,7 +57,7 @@ pub fn snapshot_json_model(
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JsonModel {
-    #[serde(alias = "Name")]
+    #[serde(alias = "Name", skip_serializing)]
     name: Option<String>,
 
     #[serde(alias = "ClassName")]

From 28e42325d42235186bab56383392cc9d3d54665a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 13:49:57 -0800
Subject: [PATCH 048/366] Move syncback middleware to the appropriate modules

---
 src/snapshot_middleware/dir.rs        |  80 ++++-
 src/snapshot_middleware/json_model.rs |  42 +++
 src/snapshot_middleware/lua.rs        |  76 ++++-
 src/snapshot_middleware/mod.rs        |  39 ++-
 src/snapshot_middleware/project.rs    | 120 ++++++++
 src/snapshot_middleware/rbxmx.rs      |  30 +-
 src/snapshot_middleware/txt.rs        |  31 +-
 src/syncback/middleware.rs            | 416 --------------------------
 src/syncback/mod.rs                   |  48 ++-
 src/syncback/snapshot.rs              |  17 +-
 10 files changed, 453 insertions(+), 446 deletions(-)
 delete mode 100644 src/syncback/middleware.rs

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index eea248a52..811510af5 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,8 +1,15 @@
-use std::path::Path;
+use std::{
+    collections::{HashMap, HashSet},
+    path::Path,
+};
 
 use memofs::{DirEntry, IoResultExt, Vfs};
+use rbx_dom_weak::types::Ref;
 
-use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
+use crate::{
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+};
 
 use super::{meta_file::DirectoryMetadata, snapshot_from_vfs};
 
@@ -86,6 +93,75 @@ pub fn snapshot_dir_no_meta(
     Ok(Some(snapshot))
 }
 
+pub fn syncback_dir<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a directory with name {}", snapshot.name);
+    }
+
+    let path = snapshot.parent_path.join(&snapshot.name);
+
+    let mut removed_children = Vec::new();
+    let mut children = Vec::new();
+
+    if let Some(old_inst) = snapshot.old_inst() {
+        let old_children: HashMap<&str, Ref> = old_inst
+            .children()
+            .iter()
+            .map(|old_ref| {
+                (
+                    snapshot.get_old_instance(*old_ref).unwrap().name(),
+                    *old_ref,
+                )
+            })
+            .collect();
+        let new_children: HashSet<&str> = snapshot
+            .new_inst()
+            .children()
+            .iter()
+            .map(|new_ref| snapshot.get_new_instance(*new_ref).unwrap().name.as_str())
+            .collect();
+
+        for child_ref in old_inst.children() {
+            let old_child = snapshot.get_old_instance(*child_ref).unwrap();
+            // If it exists in the old tree but not the new one, it was removed.
+            if !new_children.contains(old_child.name()) {
+                removed_children.push(old_child);
+            }
+        }
+
+        for child_ref in snapshot.new_inst().children() {
+            let new_child = snapshot.get_new_instance(*child_ref).unwrap();
+            // If it exists in the new tree but not the old one, it was added.
+            match old_children.get(new_child.name.as_str()) {
+                None => {
+                    children.push(snapshot.from_parent(new_child.name.clone(), *child_ref, None))
+                }
+                Some(old_ref) => children.push(snapshot.from_parent(
+                    new_child.name.clone(),
+                    *child_ref,
+                    Some(*old_ref),
+                )),
+            }
+        }
+    } else {
+        for child_ref in snapshot.new_inst().children() {
+            let child = snapshot.get_new_instance(*child_ref).unwrap();
+            children.push(snapshot.from_parent(child.name.clone(), *child_ref, None))
+        }
+    }
+    let fs_snapshot = FsSnapshot::new().with_dir(&path);
+    // TODO metadata, including classname
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot,
+        children,
+        removed_children,
+    })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 76acddca2..229b94318 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -8,6 +8,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceSnapshot},
+    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 pub fn snapshot_json_model(
@@ -54,6 +55,47 @@ pub fn snapshot_json_model(
     Ok(Some(snapshot))
 }
 
+pub fn syncback_json_model<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a file with name {}", snapshot.name);
+    }
+
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.set_extension("model.json");
+
+    let new_inst = snapshot.new_inst();
+    let mut model = JsonModel::new(&new_inst.name, &new_inst.class);
+    let mut properties = HashMap::with_capacity(new_inst.properties.len());
+
+    // TODO handle attributes separately
+    if let Some(old_inst) = snapshot.old_inst() {
+        for (name, value) in &new_inst.properties {
+            if old_inst.properties().contains_key(name) {
+                properties.insert(name.clone(), UnresolvedValue::from(value.clone()));
+            }
+        }
+    } else {
+        for (name, value) in new_inst.properties.clone() {
+            properties.insert(name, UnresolvedValue::from(value));
+        }
+    }
+    model.set_properties(properties);
+
+    // TODO children
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
+        fs_snapshot: FsSnapshot::new().with_file(
+            &path,
+            serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
+        ),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct JsonModel {
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 650a71eb7..2f7eb3457 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -2,12 +2,15 @@ use std::{collections::HashMap, path::Path, str};
 
 use anyhow::Context;
 use memofs::{IoResultExt, Vfs};
-use rbx_dom_weak::types::Enum;
+use rbx_dom_weak::types::{Enum, Variant};
 
-use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
+use crate::{
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+};
 
 use super::{
-    dir::{dir_meta, snapshot_dir_no_meta},
+    dir::{dir_meta, snapshot_dir_no_meta, syncback_dir},
     meta_file::AdjacentMetadata,
 };
 
@@ -120,6 +123,73 @@ pub fn snapshot_lua_init(
     Ok(Some(init_snapshot))
 }
 
+pub fn syncback_lua<'new, 'old>(
+    script_type: ScriptType,
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a file with name {}", snapshot.name);
+    }
+
+    let inst = snapshot.new_inst();
+
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.set_extension(match script_type {
+        ScriptType::Module => "lua",
+        ScriptType::Client => "client.lua",
+        ScriptType::Server => "server.lua",
+    });
+    let contents = if let Some(Variant::String(source)) = inst.properties.get("Source") {
+        source.as_bytes().to_vec()
+    } else {
+        anyhow::bail!("Scripts must have a `Source` property that is a String")
+    };
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst).metadata(InstanceMetadata::new()),
+        fs_snapshot: FsSnapshot::new().with_file(path, contents),
+        // Scripts don't have a child!
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
+pub fn syncback_lua_init<'new, 'old>(
+    script_type: ScriptType,
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a directory with name {}", snapshot.name);
+    }
+
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.push("init");
+    path.set_extension(match script_type {
+        ScriptType::Module => "lua",
+        ScriptType::Client => "client.lua",
+        ScriptType::Server => "server.lua",
+    });
+    let contents =
+        if let Some(Variant::String(source)) = snapshot.new_inst().properties.get("Source") {
+            source.as_bytes().to_vec()
+        } else {
+            anyhow::bail!("Scripts must have a `Source` property that is a String")
+        };
+
+    let dir_syncback = syncback_dir(snapshot)?;
+
+    let mut fs_snapshot = FsSnapshot::new();
+    fs_snapshot.push_file(path, contents);
+    fs_snapshot.merge(dir_syncback.fs_snapshot);
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot,
+        children: dir_syncback.children,
+        removed_children: dir_syncback.removed_children,
+    })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 2880ba9ff..34b1170e3 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -28,20 +28,23 @@ use anyhow::Context;
 use memofs::{IoResultExt, Vfs};
 use serde::{Deserialize, Serialize};
 
-use crate::glob::Glob;
 use crate::snapshot::{InstanceContext, InstanceSnapshot, SyncRule};
+use crate::{
+    glob::Glob,
+    syncback::{SyncbackReturn, SyncbackSnapshot},
+};
 
 use self::{
     csv::{snapshot_csv, snapshot_csv_init},
-    dir::snapshot_dir,
+    dir::{snapshot_dir, syncback_dir},
     json::snapshot_json,
-    json_model::snapshot_json_model,
-    lua::{snapshot_lua, snapshot_lua_init},
-    project::snapshot_project,
+    json_model::{snapshot_json_model, syncback_json_model},
+    lua::{snapshot_lua, snapshot_lua_init, syncback_lua, syncback_lua_init},
+    project::{snapshot_project, syncback_project},
     rbxm::snapshot_rbxm,
-    rbxmx::snapshot_rbxmx,
+    rbxmx::{snapshot_rbxmx, syncback_rbxmx},
     toml::snapshot_toml,
-    txt::snapshot_txt,
+    txt::{snapshot_txt, syncback_txt},
 };
 
 pub use self::{
@@ -234,6 +237,28 @@ impl Middleware {
         }
         output
     }
+
+    /// Runs the syncback mechanism for the provided middleware given a
+    /// SyncbackSnapshot.
+    pub fn syncback<'new, 'old>(
+        &self,
+        snapshot: &SyncbackSnapshot<'new, 'old>,
+    ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+        match self {
+            Middleware::Project => syncback_project(snapshot),
+            Middleware::ServerScript => syncback_lua(ScriptType::Server, snapshot),
+            Middleware::ClientScript => syncback_lua(ScriptType::Client, snapshot),
+            Middleware::ModuleScript => syncback_lua(ScriptType::Module, snapshot),
+            Middleware::Rbxmx => syncback_rbxmx(snapshot),
+            Middleware::Text => syncback_txt(snapshot),
+            Middleware::JsonModel => syncback_json_model(snapshot),
+            Middleware::Dir => syncback_dir(snapshot),
+            Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
+            Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
+            Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
+            _ => anyhow::bail!("cannot syncback with middleware {:?}", self),
+        }
+    }
 }
 
 /// A helper for easily defining a SyncRule. Arguments are passed literally
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 23b5b967b..47651009d 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -7,10 +7,12 @@ use rbx_reflection::ClassTag;
 
 use crate::{
     project::{PathNode, Project, ProjectNode},
+    resolution::UnresolvedValue,
     snapshot::{
         InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource, PathIgnoreRule,
         SyncRule,
     },
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 use super::{emit_legacy_scripts_default, snapshot_from_vfs};
@@ -294,6 +296,124 @@ pub fn snapshot_project_node(
     }))
 }
 
+pub fn syncback_project<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    let old_inst = snapshot
+        .old_inst()
+        .context("project middleware shouldn't be used to make new files")?;
+    // This can never be None.
+    let source = old_inst.metadata().instigating_source.as_ref().unwrap();
+
+    // We need to build a 'new' project and serialize it using an FsSnapshot.
+    // It's convenient to start with the old one though, since it means we have
+    // a thing to iterate through.
+    let mut project =
+        Project::load_from_slice(&snapshot.vfs().read(source.path()).unwrap(), source.path())
+            .context("could not syncback project due to fs error")?;
+
+    let base_path = source.path().parent().unwrap();
+
+    let mut children = Vec::new();
+    let mut removed_children = Vec::new();
+
+    // Projects are special. We won't be adding or removing things from them,
+    // so we'll simply match Instances on a per-node basis and rebuild the tree
+    // with the new instance's data. This matching will be done by class and name
+    // to simplify things.
+    let mut nodes = vec![(&mut project.tree, snapshot.new_inst(), old_inst)];
+
+    // A map of referents from the new tree to the Path that created it,
+    // if it exists. This is a roundabout way to locate the parents of
+    // Instances.
+    let mut ref_to_node = HashMap::new();
+
+    while let Some((node, new_inst, old_inst)) = nodes.pop() {
+        ref_to_node.insert(new_inst.referent(), node.path.as_ref());
+
+        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
+        for child_ref in old_inst.children() {
+            let child = snapshot.get_old_instance(*child_ref).unwrap();
+            old_child_map.insert(child.name(), child);
+        }
+        let mut new_child_map = HashMap::with_capacity(new_inst.children().len());
+        for child_ref in new_inst.children() {
+            let child = snapshot.get_new_instance(*child_ref).unwrap();
+            new_child_map.insert(child.name.as_str(), child);
+        }
+
+        for (child_name, child_node) in &mut node.children {
+            if let Some(new_child) = new_child_map.get(child_name.as_str()) {
+                if let Some(old_child) = old_child_map.get(child_name.as_str()) {
+                    // TODO verify class names
+                    for (name, value) in &new_child.properties {
+                        if child_node.properties.contains_key(name) {
+                            child_node
+                                .properties
+                                .insert(name.clone(), UnresolvedValue::from(value.clone()));
+                        }
+                    }
+                    nodes.push((child_node, new_child, *old_child));
+                    new_child_map.remove(child_name.as_str());
+                    old_child_map.remove(child_name.as_str());
+                }
+            } else {
+                anyhow::bail!("Cannot add or remove children from a project")
+            }
+        }
+
+        // From this point, both maps contain only children of the current
+        // instance that aren't in the project. So, we just do some quick and
+        // dirty matching to identify children that were added and removed.
+        for (new_name, new_child) in new_child_map {
+            let parent_path = match ref_to_node.get(&new_child.parent()) {
+                Some(Some(path)) => base_path.join(path.path()),
+                Some(None) => {
+                    continue;
+                }
+                None => {
+                    continue;
+                }
+            };
+            if let Some(old_inst) = old_child_map.get(new_name) {
+                // All children are descendants of a node of a project
+                // So we really just need to track which one is which.
+                children.push(SyncbackSnapshot {
+                    data: snapshot.data.clone(),
+                    old: Some(old_inst.id()),
+                    new: new_child.referent(),
+                    parent_path,
+                    name: new_name.to_string(),
+                });
+                old_child_map.remove(new_name);
+            } else {
+                // it's new
+                children.push(SyncbackSnapshot {
+                    data: snapshot.data.clone(),
+                    old: None,
+                    new: new_child.referent(),
+                    parent_path,
+                    name: new_name.to_string(),
+                });
+            }
+        }
+        removed_children.extend(old_child_map.into_values());
+    }
+
+    // We don't need to validate any file names for the FsSnapshot
+    // because projects can't ever be made by syncback, so they must
+    // already exist on the file system
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot: FsSnapshot::new().with_file(
+            &project.file_location,
+            serde_json::to_vec_pretty(&project).context("failed to serialize new project")?,
+        ),
+        children,
+        removed_children,
+    })
+}
+
 fn infer_class_name(name: &str, parent_class: Option<&str>) -> Option<Cow<'static, str>> {
     // If className wasn't defined from another source, we may be able
     // to infer one.
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 4266dc0d7..78bb24984 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -3,7 +3,10 @@ use std::path::Path;
 use anyhow::Context;
 use memofs::Vfs;
 
-use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
+use crate::{
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+};
 
 pub fn snapshot_rbxmx(
     context: &InstanceContext,
@@ -41,6 +44,31 @@ pub fn snapshot_rbxmx(
     }
 }
 
+pub fn syncback_rbxmx<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    // If any of the children of this Instance are scripts, we don't want
+    // include them in the model. So instead, we'll check and then serialize.
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a file with name {}", snapshot.name);
+    }
+
+    let inst = snapshot.new_inst();
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.set_extension("rbxmx");
+    // Long-term, anyway. Right now we stay silly.
+    let mut serialized = Vec::new();
+    rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()])
+        .context("failed to serialize new rbxmx")?;
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst),
+        fs_snapshot: FsSnapshot::new().with_file(&path, serialized),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 207243f9f..c24ee2a94 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -3,8 +3,12 @@ use std::{path::Path, str};
 use anyhow::Context;
 use maplit::hashmap;
 use memofs::{IoResultExt, Vfs};
+use rbx_dom_weak::types::Variant;
 
-use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
+use crate::{
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+};
 
 use super::meta_file::AdjacentMetadata;
 
@@ -44,6 +48,31 @@ pub fn snapshot_txt(
     Ok(Some(snapshot))
 }
 
+pub fn syncback_txt<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a file with name {}", snapshot.name);
+    }
+
+    let inst = snapshot.new_inst();
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.set_extension("txt");
+
+    let contents = if let Some(Variant::String(source)) = inst.properties.get("Value") {
+        source.as_bytes().to_vec()
+    } else {
+        anyhow::bail!("StringValues must have a `Value` property that is a String");
+    };
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst),
+        fs_snapshot: FsSnapshot::new().with_file(path, contents),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/syncback/middleware.rs b/src/syncback/middleware.rs
deleted file mode 100644
index 2c165f60d..000000000
--- a/src/syncback/middleware.rs
+++ /dev/null
@@ -1,416 +0,0 @@
-use std::collections::{HashMap, HashSet};
-
-use rbx_dom_weak::{
-    types::{Ref, Variant},
-    Instance,
-};
-
-use crate::{
-    resolution::UnresolvedValue,
-    snapshot::{InstanceMetadata, InstanceSnapshot, InstanceWithMeta},
-    snapshot_middleware::{JsonModel, Middleware, ScriptType},
-    Project,
-};
-
-use super::{is_valid_file_name, FsSnapshot, SyncbackSnapshot};
-
-pub struct SyncbackReturn<'new, 'old> {
-    pub inst_snapshot: InstanceSnapshot,
-    pub fs_snapshot: FsSnapshot,
-    pub children: Vec<SyncbackSnapshot<'new, 'old>>,
-    pub removed_children: Vec<InstanceWithMeta<'old>>,
-}
-
-pub fn syncback_middleware<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-    middleware: Middleware,
-) -> SyncbackReturn<'new, 'old> {
-    match middleware {
-        Middleware::Project => syncback_project(snapshot),
-        Middleware::ModuleScript => syncback_script(ScriptType::Module, snapshot),
-        Middleware::ClientScript => syncback_script(ScriptType::Client, snapshot),
-        Middleware::ServerScript => syncback_script(ScriptType::Server, snapshot),
-        Middleware::Text => syncback_text(snapshot),
-        Middleware::JsonModel => syncback_json_model(snapshot),
-        Middleware::Rbxmx => syncback_rbxmx(snapshot),
-        Middleware::Dir => syncback_dir(snapshot),
-        Middleware::ModuleScriptDir => syncback_script_dir(ScriptType::Module, snapshot),
-        Middleware::ClientScriptDir => syncback_script_dir(ScriptType::Client, snapshot),
-        Middleware::ServerScriptDir => syncback_script_dir(ScriptType::Server, snapshot),
-        _ => panic!("unsupported instance middleware {:?}", middleware),
-    }
-}
-
-pub fn get_best_middleware(inst: &Instance) -> Middleware {
-    match inst.class.as_str() {
-        "Folder" => Middleware::Dir,
-        // TODO this should probably just be rbxm
-        "Model" => Middleware::Rbxmx,
-        "Script" => {
-            if inst.children().len() == 0 {
-                Middleware::ServerScript
-            } else {
-                Middleware::ServerScriptDir
-            }
-        }
-        "LocalScript" => {
-            if inst.children().len() == 0 {
-                Middleware::ClientScript
-            } else {
-                Middleware::ClientScriptDir
-            }
-        }
-        "ModuleScript" => {
-            if inst.children().len() == 0 {
-                Middleware::ModuleScript
-            } else {
-                Middleware::ModuleScriptDir
-            }
-        }
-        _ => Middleware::Rbxmx,
-    }
-}
-
-fn syncback_script<'new, 'old>(
-    script_type: ScriptType,
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> SyncbackReturn<'new, 'old> {
-    if !is_valid_file_name(&snapshot.name) {
-        panic!("cannot create a file with name {}", snapshot.name);
-    }
-
-    let inst = snapshot.new_inst();
-
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension(match script_type {
-        ScriptType::Module => "lua",
-        ScriptType::Client => "client.lua",
-        ScriptType::Server => "server.lua",
-    });
-    let contents = if let Some(Variant::String(source)) = inst.properties.get("Source") {
-        source.as_bytes().to_vec()
-    } else {
-        panic!("Source should be a string")
-    };
-
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst).metadata(InstanceMetadata::new()),
-        fs_snapshot: FsSnapshot::new().with_file(path, contents),
-        // Scripts don't have a child!
-        children: Vec::new(),
-        removed_children: Vec::new(),
-    }
-}
-
-fn syncback_script_dir<'new, 'old>(
-    script_type: ScriptType,
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> SyncbackReturn<'new, 'old> {
-    if !is_valid_file_name(&snapshot.name) {
-        panic!("cannot create a directory with name {}", snapshot.name);
-    }
-
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.push("init");
-    path.set_extension(match script_type {
-        ScriptType::Module => "lua",
-        ScriptType::Client => "client.lua",
-        ScriptType::Server => "server.lua",
-    });
-    let contents =
-        if let Some(Variant::String(source)) = snapshot.new_inst().properties.get("Source") {
-            source.as_bytes().to_vec()
-        } else {
-            panic!("Source should be a string")
-        };
-
-    let dir_syncback = syncback_dir(snapshot);
-
-    let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.push_file(path, contents);
-    fs_snapshot.merge(dir_syncback.fs_snapshot);
-
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot,
-        children: dir_syncback.children,
-        removed_children: dir_syncback.removed_children,
-    }
-}
-
-fn syncback_dir<'new, 'old>(snapshot: &SyncbackSnapshot<'new, 'old>) -> SyncbackReturn<'new, 'old> {
-    if !is_valid_file_name(&snapshot.name) {
-        panic!("cannot create a directory with name {}", snapshot.name);
-    }
-
-    let path = snapshot.parent_path.join(snapshot.name.clone());
-
-    let mut removed_children = Vec::new();
-    let mut children = Vec::new();
-
-    if let Some(old_inst) = snapshot.old_inst() {
-        let old_children: HashMap<&str, Ref> = old_inst
-            .children()
-            .iter()
-            .map(|old_ref| {
-                (
-                    snapshot.get_old_instance(*old_ref).unwrap().name(),
-                    *old_ref,
-                )
-            })
-            .collect();
-        let new_children: HashSet<&str> = snapshot
-            .new_inst()
-            .children()
-            .iter()
-            .map(|new_ref| snapshot.get_new_instance(*new_ref).unwrap().name.as_str())
-            .collect();
-
-        for child_ref in old_inst.children() {
-            let old_child = snapshot.get_old_instance(*child_ref).unwrap();
-            // If it exists in the old tree but not the new one, it was removed.
-            if !new_children.contains(old_child.name()) {
-                removed_children.push(old_child);
-            }
-        }
-
-        for child_ref in snapshot.new_inst().children() {
-            let new_child = snapshot.get_new_instance(*child_ref).unwrap();
-            // If it exists in the new tree but not the old one, it was added.
-            match old_children.get(new_child.name.as_str()) {
-                None => {
-                    children.push(snapshot.from_parent(new_child.name.clone(), *child_ref, None))
-                }
-                Some(old_ref) => children.push(snapshot.from_parent(
-                    new_child.name.clone(),
-                    *child_ref,
-                    Some(*old_ref),
-                )),
-            }
-        }
-    } else {
-        for child_ref in snapshot.new_inst().children() {
-            let child = snapshot.get_new_instance(*child_ref).unwrap();
-            children.push(snapshot.from_parent(child.name.clone(), *child_ref, None))
-        }
-    }
-    let mut fs_snapshot = FsSnapshot::new().with_dir(&path);
-    // TODO metadata, including classname
-
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot,
-        children,
-        removed_children,
-    }
-}
-
-fn syncback_project<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> SyncbackReturn<'new, 'old> {
-    let old_inst = snapshot
-        .old_inst()
-        .expect("project middleware shouldn't be used to make new files");
-    // This can never be None.
-    let source = old_inst.metadata().instigating_source.as_ref().unwrap();
-
-    // We need to build a 'new' project and serialize it using an FsSnapshot.
-    // It's convenient to start with the old one though, since it means we have
-    // a thing to iterate through.
-    let mut project =
-        Project::load_from_slice(&snapshot.vfs().read(source.path()).unwrap(), source.path())
-            .unwrap();
-    let base_path = source.path().parent().unwrap();
-
-    let mut children = Vec::new();
-    let mut removed_children = Vec::new();
-
-    // Projects are special. We won't be adding or removing things from them,
-    // so we'll simply match Instances on a per-node basis and rebuild the tree
-    // with the new instance's data. This matching will be done by class and name
-    // to simplify things.
-    let mut nodes = vec![(&mut project.tree, snapshot.new_inst(), old_inst)];
-
-    // A map of referents from the new tree to the Path that created it,
-    // if it exists. This is a roundabout way to locate the parents of
-    // Instances.
-    let mut ref_to_node = HashMap::new();
-
-    while let Some((node, new_inst, old_inst)) = nodes.pop() {
-        ref_to_node.insert(new_inst.referent(), node.path.as_ref());
-
-        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
-        for child_ref in old_inst.children() {
-            let child = snapshot.get_old_instance(*child_ref).unwrap();
-            old_child_map.insert(child.name(), child);
-        }
-        let mut new_child_map = HashMap::with_capacity(new_inst.children().len());
-        for child_ref in new_inst.children() {
-            let child = snapshot.get_new_instance(*child_ref).unwrap();
-            new_child_map.insert(child.name.as_str(), child);
-        }
-
-        for (child_name, child_node) in &mut node.children {
-            if let Some(new_child) = new_child_map.get(child_name.as_str()) {
-                if let Some(old_child) = old_child_map.get(child_name.as_str()) {
-                    // TODO verify class names
-                    for (name, value) in &new_child.properties {
-                        if child_node.properties.contains_key(name) {
-                            child_node
-                                .properties
-                                .insert(name.clone(), UnresolvedValue::from(value.clone()));
-                        }
-                    }
-                    nodes.push((child_node, new_child, *old_child));
-                    new_child_map.remove(child_name.as_str());
-                    old_child_map.remove(child_name.as_str());
-                } else {
-                    log::error!(
-                        "Node {} was in new tree but not old. How did we get here?",
-                        child_name
-                    );
-                }
-            } else {
-                panic!("Cannot add or remove children from a project")
-            }
-        }
-
-        // From this point, both maps contain only children of the current
-        // instance that aren't in the project. So, we just do some quick and
-        // dirty matching to identify children that were added and removed.
-        for (new_name, new_child) in new_child_map {
-            let parent_path = match ref_to_node.get(&new_child.parent()) {
-                Some(Some(path)) => base_path.join(path.path()),
-                Some(None) => {
-                    log::debug!("{new_name} was visited but has no path");
-                    continue;
-                }
-                None => {
-                    log::debug!("{new_name} does not currently exist on FS");
-                    continue;
-                }
-            };
-            if let Some(old_inst) = old_child_map.get(new_name) {
-                // All children are descendants of a node of a project
-                // So we really just need to track which one is which.
-                children.push(SyncbackSnapshot {
-                    data: snapshot.data.clone(),
-                    old: Some(old_inst.id()),
-                    new: new_child.referent(),
-                    name: new_name.to_string(),
-                    parent_path,
-                });
-                old_child_map.remove(new_name);
-            } else {
-                // it's new
-                children.push(SyncbackSnapshot {
-                    data: snapshot.data.clone(),
-                    old: None,
-                    new: new_child.referent(),
-                    name: new_name.to_string(),
-                    parent_path,
-                });
-            }
-        }
-        removed_children.extend(old_child_map.into_values());
-    }
-
-    // We don't need to validate any file names for the FsSnapshot
-    // because projects can't ever be made by syncback, so they must
-    // already exist on the file system
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot: FsSnapshot::new().with_file(
-            &project.file_location,
-            serde_json::to_vec_pretty(&project).unwrap(),
-        ),
-        children,
-        removed_children,
-    }
-}
-
-pub fn syncback_rbxmx<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> SyncbackReturn<'new, 'old> {
-    // If any of the children of this Instance are scripts, we don't want
-    // include them in the model. So instead, we'll check and then serialize.
-    if !is_valid_file_name(&snapshot.name) {
-        panic!("cannot create a file with name {}", snapshot.name);
-    }
-
-    let inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("rbxmx");
-    // Long-term, anyway. Right now we stay silly.
-    let mut serialized = Vec::new();
-    rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()]).unwrap();
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_file(&path, serialized),
-        children: Vec::new(),
-        removed_children: Vec::new(),
-    }
-}
-
-fn syncback_text<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> SyncbackReturn<'new, 'old> {
-    if !is_valid_file_name(&snapshot.name) {
-        panic!("cannot create a file with name {}", snapshot.name);
-    }
-
-    let inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("txt");
-
-    let contents = if let Some(Variant::String(source)) = inst.properties.get("Value") {
-        source.as_bytes().to_vec()
-    } else {
-        panic!("Value should be a string")
-    };
-
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst).metadata(InstanceMetadata::new()),
-        fs_snapshot: FsSnapshot::new().with_file(path, contents),
-        children: Vec::new(),
-        removed_children: Vec::new(),
-    }
-}
-
-fn syncback_json_model<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> SyncbackReturn<'new, 'old> {
-    if !is_valid_file_name(&snapshot.name) {
-        panic!("cannot create a file with name {}", snapshot.name);
-    }
-
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("model.json");
-
-    let new_inst = snapshot.new_inst();
-    let mut model = JsonModel::new(&new_inst.name, &new_inst.class);
-    let mut properties = HashMap::with_capacity(new_inst.properties.len());
-
-    // TODO handle attributes separately
-    if let Some(old_inst) = snapshot.old_inst() {
-        for (name, value) in &new_inst.properties {
-            if old_inst.properties().contains_key(name) {
-                properties.insert(name.clone(), UnresolvedValue::from(value.clone()));
-            }
-        }
-    } else {
-        for (name, value) in new_inst.properties.clone() {
-            properties.insert(name, UnresolvedValue::from(value));
-        }
-    }
-    model.set_properties(properties);
-
-    // TODO children
-
-    SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_file(&path, serde_json::to_vec_pretty(&model).unwrap()),
-        children: Vec::new(),
-        removed_children: Vec::new(),
-    }
-}
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 30eb023e4..c1860fa0e 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,24 +1,23 @@
 mod fs_snapshot;
-mod middleware;
 mod snapshot;
 
 use crate::{
-    snapshot::{hash_tree, InstanceSnapshot, RojoTree},
+    snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot_middleware::Middleware,
     Project,
 };
 use memofs::Vfs;
-use rbx_dom_weak::{types::Ref, WeakDom};
+use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use std::{collections::VecDeque, rc::Rc};
 
 pub use fs_snapshot::FsSnapshot;
-pub use middleware::{get_best_middleware, syncback_middleware};
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
 pub fn syncback_loop<'old, 'new>(
     vfs: &'old Vfs,
     old_tree: &'old RojoTree,
     new_tree: &'new WeakDom,
-    project: &Project,
+    project: &'old Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
     log::debug!("Hashing project DOM");
     let old_hashes = hash_tree(old_tree.inner());
@@ -67,7 +66,7 @@ pub fn syncback_loop<'old, 'new>(
             middleware
         );
 
-        let syncback = syncback_middleware(&snapshot, middleware);
+        let syncback = middleware.syncback(&snapshot)?;
 
         if let Some(old_inst) = snapshot.old_inst() {
             replacements.push((old_inst.parent(), syncback.inst_snapshot));
@@ -83,6 +82,43 @@ pub fn syncback_loop<'old, 'new>(
     Ok(replacements)
 }
 
+pub struct SyncbackReturn<'new, 'old> {
+    pub inst_snapshot: InstanceSnapshot,
+    pub fs_snapshot: FsSnapshot,
+    pub children: Vec<SyncbackSnapshot<'new, 'old>>,
+    pub removed_children: Vec<InstanceWithMeta<'old>>,
+}
+
+pub fn get_best_middleware(inst: &Instance) -> Middleware {
+    match inst.class.as_str() {
+        "Folder" => Middleware::Dir,
+        // TODO this should probably just be rbxm
+        "Model" => Middleware::Rbxmx,
+        "Script" => {
+            if inst.children().len() == 0 {
+                Middleware::ServerScript
+            } else {
+                Middleware::ServerScriptDir
+            }
+        }
+        "LocalScript" => {
+            if inst.children().len() == 0 {
+                Middleware::ClientScript
+            } else {
+                Middleware::ClientScriptDir
+            }
+        }
+        "ModuleScript" => {
+            if inst.children().len() == 0 {
+                Middleware::ModuleScript
+            } else {
+                Middleware::ModuleScriptDir
+            }
+        }
+        _ => Middleware::Rbxmx,
+    }
+}
+
 fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     let mut path: VecDeque<&str> = VecDeque::new();
     let mut inst = dom.get_by_ref(referent);
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index a4cf86098..8590f1511 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,8 +1,5 @@
 use memofs::Vfs;
-use std::{
-    path::{Path, PathBuf},
-    rc::Rc,
-};
+use std::{path::PathBuf, rc::Rc};
 
 use crate::snapshot::{InstanceWithMeta, RojoTree};
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
@@ -14,11 +11,11 @@ pub struct SyncbackData<'new, 'old> {
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
-    pub(super) data: Rc<SyncbackData<'new, 'old>>,
-    pub(super) old: Option<Ref>,
-    pub(super) new: Ref,
-    pub(super) parent_path: PathBuf,
-    pub(super) name: String,
+    pub data: Rc<SyncbackData<'new, 'old>>,
+    pub old: Option<Ref>,
+    pub new: Ref,
+    pub parent_path: PathBuf,
+    pub name: String,
 }
 
 impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
@@ -71,7 +68,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         self.data.vfs
     }
 
-    /// Returns the WeakDom used for the 'new' tree
+    /// Returns the WeakDom used for the 'new' tree.
     #[inline]
     pub fn new_tree(&self) -> &'new WeakDom {
         self.data.new_tree

From 17f0b953e99ed854db68310643cf6b7d6c3fbae5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 15:15:09 -0800
Subject: [PATCH 049/366] Use binary models instead of XML

---
 src/snapshot_middleware/mod.rs  |  3 ++-
 src/snapshot_middleware/rbxm.rs | 30 +++++++++++++++++++++++++++++-
 src/syncback/mod.rs             |  4 ++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 34b1170e3..b9535c544 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -41,7 +41,7 @@ use self::{
     json_model::{snapshot_json_model, syncback_json_model},
     lua::{snapshot_lua, snapshot_lua_init, syncback_lua, syncback_lua_init},
     project::{snapshot_project, syncback_project},
-    rbxm::snapshot_rbxm,
+    rbxm::{snapshot_rbxm, syncback_rbxm},
     rbxmx::{snapshot_rbxmx, syncback_rbxmx},
     toml::snapshot_toml,
     txt::{snapshot_txt, syncback_txt},
@@ -250,6 +250,7 @@ impl Middleware {
             Middleware::ClientScript => syncback_lua(ScriptType::Client, snapshot),
             Middleware::ModuleScript => syncback_lua(ScriptType::Module, snapshot),
             Middleware::Rbxmx => syncback_rbxmx(snapshot),
+            Middleware::Rbxm => syncback_rbxm(snapshot),
             Middleware::Text => syncback_txt(snapshot),
             Middleware::JsonModel => syncback_json_model(snapshot),
             Middleware::Dir => syncback_dir(snapshot),
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 7983d0e71..31a22cee1 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -3,7 +3,10 @@ use std::path::Path;
 use anyhow::Context;
 use memofs::Vfs;
 
-use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
+use crate::{
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+};
 
 #[profiling::function]
 pub fn snapshot_rbxm(
@@ -39,6 +42,31 @@ pub fn snapshot_rbxm(
     }
 }
 
+pub fn syncback_rbxm<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    // If any of the children of this Instance are scripts, we don't want
+    // include them in the model. So instead, we'll check and then serialize.
+    if !is_valid_file_name(&snapshot.name) {
+        anyhow::bail!("cannot create a file with name {}", snapshot.name);
+    }
+
+    let inst = snapshot.new_inst();
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.set_extension("rbxm");
+    // Long-term, anyway. Right now we stay silly.
+    let mut serialized = Vec::new();
+    rbx_binary::to_writer(&mut serialized, snapshot.new_tree(), &[inst.referent()])
+        .context("failed to serialize new rbxm")?;
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(inst),
+        fs_snapshot: FsSnapshot::new().with_file(&path, serialized),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c1860fa0e..67543ceef 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -93,7 +93,7 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
     match inst.class.as_str() {
         "Folder" => Middleware::Dir,
         // TODO this should probably just be rbxm
-        "Model" => Middleware::Rbxmx,
+        "Model" => Middleware::Rbxm,
         "Script" => {
             if inst.children().len() == 0 {
                 Middleware::ServerScript
@@ -115,7 +115,7 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
                 Middleware::ModuleScriptDir
             }
         }
-        _ => Middleware::Rbxmx,
+        _ => Middleware::Rbxm,
     }
 }
 

From bfd59c5f76b534429ffaf508669f7db6d43ddd9f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 15:15:31 -0800
Subject: [PATCH 050/366] Emit how many files were written as info instead of
 debug

---
 src/syncback/fs_snapshot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index dab1c6837..d9d67afe5 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -62,7 +62,7 @@ impl FsSnapshot {
             files += 1;
         }
 
-        log::debug!("Wrote {dirs} directories and {files} files to the VFS");
+        log::info!("Wrote {dirs} directories and {files} files to the file system!");
         Ok(())
     }
 }

From 044e5144ea1bb69a07877e7e2d3bc48beace48c3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 19 Dec 2023 15:18:44 -0800
Subject: [PATCH 051/366] Add timers to syncback command

---
 src/cli/syncback.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index f6ac43b35..f3f943b69 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -1,7 +1,5 @@
 use std::{
-    collections::HashMap,
     fs,
-    hash::Hash,
     path::{Path, PathBuf},
     time::Instant,
 };
@@ -32,22 +30,33 @@ impl SyncbackCommand {
         let path_old = resolve_path(&self.project);
         let path_new = resolve_path(&self.input);
 
+        let project_start = Instant::now();
         log::info!("Opening project at {}", path_old.display());
         let session_old = ServeSession::new(Vfs::new_default(), path_old.clone())?;
+        log::info!(
+            "Finished opening project in {:0.02}s",
+            project_start.elapsed().as_secs_f32()
+        );
 
         let dom_old = session_old.tree();
+
+        let dom_start = Instant::now();
         log::info!("Reading place file at {}", path_new.display());
         let dom_new = read_dom(&path_new);
+        log::info!(
+            "Finished opening file in {:0.02}s",
+            dom_start.elapsed().as_secs_f32()
+        );
 
         let start = Instant::now();
-        log::debug!("Beginning syncback...");
+        log::info!("Beginning syncback...");
         syncback_loop(
             session_old.vfs(),
             &dom_old,
             &dom_new,
             session_old.root_project(),
         )?;
-        log::debug!(
+        log::info!(
             "Syncback finished in {:.02}s!",
             start.elapsed().as_secs_f32()
         );
@@ -72,8 +81,3 @@ fn read_dom(path: &Path) -> WeakDom {
         panic!("invalid Roblox file at {}", path.display())
     }
 }
-
-#[inline]
-fn invert_map<K: Hash + Eq, V: Hash + Eq>(map: HashMap<K, V>) -> HashMap<V, K> {
-    map.into_iter().map(|(key, value)| (value, key)).collect()
-}

From 029a6f6ce38fd6addff953c7ff874ebbd23e49b5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 11:36:17 -0800
Subject: [PATCH 052/366] Add `create_dir_all` to memofs

---
 crates/memofs/CHANGELOG.md        |  2 +-
 crates/memofs/src/in_memory_fs.rs | 10 ++++++++++
 crates/memofs/src/lib.rs          | 18 ++++++++++++++++++
 crates/memofs/src/noop_backend.rs |  7 +++++++
 crates/memofs/src/std_backend.rs  |  4 ++++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/crates/memofs/CHANGELOG.md b/crates/memofs/CHANGELOG.md
index c5ebd95ab..8a1d580ce 100644
--- a/crates/memofs/CHANGELOG.md
+++ b/crates/memofs/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased Changes
 * Changed `StdBackend` file watching component to use minimal recursive watches. [#830]
-* Added `create_dir` to allow creating directories.
+* Added `create_dir` and `create_dir_all` to allow creating directories.
 
 [#830]: https://github.com/rojo-rbx/rojo/pull/830
 
diff --git a/crates/memofs/src/in_memory_fs.rs b/crates/memofs/src/in_memory_fs.rs
index 217899dc4..2eb09b8a1 100644
--- a/crates/memofs/src/in_memory_fs.rs
+++ b/crates/memofs/src/in_memory_fs.rs
@@ -181,6 +181,16 @@ impl VfsBackend for InMemoryFs {
         inner.load_snapshot(path.to_path_buf(), VfsSnapshot::empty_dir())
     }
 
+    fn create_dir_all(&mut self, path: &Path) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+        let mut path_buf = path.to_path_buf();
+        while let Some(parent) = path_buf.parent() {
+            inner.load_snapshot(parent.to_path_buf(), VfsSnapshot::empty_dir())?;
+            path_buf.pop();
+        }
+        inner.load_snapshot(path.to_path_buf(), VfsSnapshot::empty_dir())
+    }
+
     fn remove_file(&mut self, path: &Path) -> io::Result<()> {
         let mut inner = self.inner.lock().unwrap();
 
diff --git a/crates/memofs/src/lib.rs b/crates/memofs/src/lib.rs
index 1ead8d19f..1dfa41b11 100644
--- a/crates/memofs/src/lib.rs
+++ b/crates/memofs/src/lib.rs
@@ -72,6 +72,7 @@ pub trait VfsBackend: sealed::Sealed + Send + 'static {
     fn write(&mut self, path: &Path, data: &[u8]) -> io::Result<()>;
     fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir>;
     fn create_dir(&mut self, path: &Path) -> io::Result<()>;
+    fn create_dir_all(&mut self, path: &Path) -> io::Result<()>;
     fn metadata(&mut self, path: &Path) -> io::Result<Metadata>;
     fn remove_file(&mut self, path: &Path) -> io::Result<()>;
     fn remove_dir_all(&mut self, path: &Path) -> io::Result<()>;
@@ -178,6 +179,11 @@ impl VfsInner {
         self.backend.create_dir(path)
     }
 
+    fn create_dir_all<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.backend.create_dir_all(path)
+    }
+
     fn remove_file<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
         let path = path.as_ref();
         let _ = self.backend.unwatch(path);
@@ -300,6 +306,18 @@ impl Vfs {
         self.inner.lock().unwrap().create_dir(path)
     }
 
+    /// Creates a directory at the provided location, recursively creating
+    /// all parent components if they are missing.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir_all`][std::fs::create_dir_all].
+    ///
+    /// [std::fs::create_dir_all]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir_all.html
+    #[inline]
+    pub fn create_dir_all<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().create_dir_all(path)
+    }
+
     /// Remove a file.
     ///
     /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].
diff --git a/crates/memofs/src/noop_backend.rs b/crates/memofs/src/noop_backend.rs
index 5a028d4be..8e5a24177 100644
--- a/crates/memofs/src/noop_backend.rs
+++ b/crates/memofs/src/noop_backend.rs
@@ -42,6 +42,13 @@ impl VfsBackend for NoopBackend {
         ))
     }
 
+    fn create_dir_all(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
     fn remove_file(&mut self, _path: &Path) -> io::Result<()> {
         Err(io::Error::new(
             io::ErrorKind::Other,
diff --git a/crates/memofs/src/std_backend.rs b/crates/memofs/src/std_backend.rs
index 359d023ae..fc2e1d208 100644
--- a/crates/memofs/src/std_backend.rs
+++ b/crates/memofs/src/std_backend.rs
@@ -82,6 +82,10 @@ impl VfsBackend for StdBackend {
         fs_err::create_dir(path)
     }
 
+    fn create_dir_all(&mut self, path: &Path) -> io::Result<()> {
+        fs_err::create_dir_all(path)
+    }
+
     fn remove_file(&mut self, path: &Path) -> io::Result<()> {
         fs_err::remove_file(path)
     }

From 9ae87dec8e5362b11c0fd82adc5795498230bb5d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 11:36:30 -0800
Subject: [PATCH 053/366] Switch to create_dir_all in fs_snapshot

---
 src/syncback/fs_snapshot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index d9d67afe5..a83dbe1c1 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -50,7 +50,7 @@ impl FsSnapshot {
         let mut dirs = 0;
         let mut files = 0;
         for dir_path in &self.dir {
-            match vfs.create_dir(base_path.join(dir_path)) {
+            match vfs.create_dir_all(base_path.join(dir_path)) {
                 Ok(_) => (),
                 Err(err) if err.kind() == io::ErrorKind::AlreadyExists => (),
                 Err(err) => return Err(err),

From dcccd76efeb6e6e701b0e8e24095e99fdf58e61f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 12:06:57 -0800
Subject: [PATCH 054/366] Support syncback filters

---
 src/project.rs      |  6 +++-
 src/syncback/mod.rs | 77 +++++++++++++++++++++++++++++++++++++++------
 2 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/project.rs b/src/project.rs
index 1095fba20..768ee045b 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -8,7 +8,9 @@ use std::{
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{glob::Glob, resolution::UnresolvedValue, snapshot::SyncRule};
+use crate::{
+    glob::Glob, resolution::UnresolvedValue, snapshot::SyncRule, syncback::SyncbackIgnoreRules,
+};
 
 static PROJECT_FILENAME: &str = "default.project.json";
 
@@ -84,6 +86,8 @@ pub struct Project {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub glob_ignore_paths: Vec<Glob>,
 
+    pub syncback_rules: Option<SyncbackIgnoreRules>,
+
     /// A list of mappings of globs to syncing rules. If a file matches a glob,
     /// it will be 'transformed' into an Instance following the rule provided.
     /// Globs are relative to the folder the project file is in.
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 67543ceef..786746bac 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,14 +1,23 @@
 mod fs_snapshot;
 mod snapshot;
 
+use memofs::Vfs;
+use rbx_dom_weak::{
+    types::{Ref, Variant},
+    Instance, WeakDom,
+};
+use serde::{Deserialize, Serialize};
+use std::{
+    collections::{HashMap, VecDeque},
+    rc::Rc,
+};
+
 use crate::{
+    resolution::UnresolvedValue,
     snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,
 };
-use memofs::Vfs;
-use rbx_dom_weak::{types::Ref, Instance, WeakDom};
-use std::{collections::VecDeque, rc::Rc};
 
 pub use fs_snapshot::FsSnapshot;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
@@ -55,16 +64,20 @@ pub fn syncback_loop<'old, 'new>(
             }
         }
 
+        if let Some(syncback_rules) = &project.syncback_rules {
+            if !syncback_rules.acceptable(new_tree, snapshot.new) {
+                log::error!(
+                    "Path {} is blocked by project",
+                    get_inst_path(new_tree, snapshot.new)
+                );
+                continue;
+            }
+        }
+
         let middleware = snapshot
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
-        log::debug!(
-            "instance {} parent is {} (using middleware {:?})",
-            get_inst_path(new_tree, snapshot.new),
-            snapshot.parent_path.display(),
-            middleware
-        );
 
         let syncback = middleware.syncback(&snapshot)?;
 
@@ -119,6 +132,50 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct SyncbackIgnoreRules {
+    #[serde(default)]
+    paths: Vec<String>,
+    #[serde(default, skip)]
+    classes: HashMap<String, HashMap<String, UnresolvedValue>>,
+}
+
+impl SyncbackIgnoreRules {
+    /// If possible, resolves all of the properties in the ignore rules so that
+    /// they're Variants.
+    pub fn resolve(&self) -> anyhow::Result<HashMap<&str, HashMap<&str, Variant>>> {
+        let mut resolved = HashMap::with_capacity(self.classes.capacity());
+
+        for (class_name, properties) in &self.classes {
+            let mut resolved_props = HashMap::with_capacity(properties.capacity());
+            for (prop_name, prop_value) in properties {
+                resolved_props.insert(
+                    prop_name.as_str(),
+                    prop_value.clone().resolve(class_name, prop_name)?,
+                );
+            }
+
+            resolved.insert(class_name.as_str(), resolved_props);
+        }
+
+        Ok(resolved)
+    }
+
+    /// Returns whether the provided Instance is allowed to be handled with
+    /// syncback.
+    #[inline]
+    pub fn acceptable(&self, dom: &WeakDom, inst: Ref) -> bool {
+        let path = get_inst_path(dom, inst);
+        for ignored in &self.paths {
+            if path.starts_with(ignored.as_str()) {
+                return false;
+            }
+        }
+        true
+    }
+}
+
 fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     let mut path: VecDeque<&str> = VecDeque::new();
     let mut inst = dom.get_by_ref(referent);
@@ -126,7 +183,7 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
         path.push_front(&instance.name);
         inst = dom.get_by_ref(instance.parent());
     }
-    path.into_iter().collect::<Vec<&str>>().join(".")
+    path.into_iter().collect::<Vec<&str>>().join("/")
 }
 
 /// A list of file names that are not valid on Windows.

From 563decaca0d91d975a61d6a1d8fa6916337a4c76 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 12:09:38 -0800
Subject: [PATCH 055/366] Change logging a bit

---
 src/syncback/mod.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 786746bac..67d623040 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -66,7 +66,7 @@ pub fn syncback_loop<'old, 'new>(
 
         if let Some(syncback_rules) = &project.syncback_rules {
             if !syncback_rules.acceptable(new_tree, snapshot.new) {
-                log::error!(
+                log::debug!(
                     "Path {} is blocked by project",
                     get_inst_path(new_tree, snapshot.new)
                 );
@@ -78,6 +78,11 @@ pub fn syncback_loop<'old, 'new>(
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
+        log::trace!(
+            "Middleware for {} is {:?}",
+            get_inst_path(new_tree, snapshot.new),
+            middleware
+        );
 
         let syncback = middleware.syncback(&snapshot)?;
 

From f63d60d332aada6978d28f7958bccc7f7732ed4c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 12:54:18 -0800
Subject: [PATCH 056/366] Abstract variant equality function to its own module
 Rename diff module to hash

---
 src/lib.rs                                    |   1 +
 src/snapshot/diff/mod.rs                      |  26 ---
 src/snapshot/{diff/hash.rs => hash/mod.rs}    |  26 ++-
 src/snapshot/hash/variant.rs                  | 194 +++++++++++++++++
 src/snapshot/mod.rs                           |   4 +-
 .../diff/variant.rs => variant_eq.rs}         | 199 +-----------------
 6 files changed, 223 insertions(+), 227 deletions(-)
 delete mode 100644 src/snapshot/diff/mod.rs
 rename src/snapshot/{diff/hash.rs => hash/mod.rs} (77%)
 create mode 100644 src/snapshot/hash/variant.rs
 rename src/{snapshot/diff/variant.rs => variant_eq.rs} (55%)

diff --git a/src/lib.rs b/src/lib.rs
index 63f25d177..5d4df344a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,6 +21,7 @@ mod session_id;
 mod snapshot;
 mod snapshot_middleware;
 mod syncback;
+mod variant_eq;
 mod web;
 
 pub use project::*;
diff --git a/src/snapshot/diff/mod.rs b/src/snapshot/diff/mod.rs
deleted file mode 100644
index 9c08d23bf..000000000
--- a/src/snapshot/diff/mod.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-mod hash;
-mod variant;
-
-pub use hash::*;
-pub use variant::*;
-
-use rbx_dom_weak::{types::Ref, WeakDom};
-use std::collections::VecDeque;
-
-pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
-    let mut queue = VecDeque::new();
-    let mut ordered = Vec::new();
-    queue.push_front(dom.root_ref());
-
-    while let Some(referent) = queue.pop_front() {
-        let inst = dom
-            .get_by_ref(referent)
-            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
-        ordered.push(referent);
-        for child in inst.children() {
-            queue.push_back(*child)
-        }
-    }
-
-    ordered
-}
diff --git a/src/snapshot/diff/hash.rs b/src/snapshot/hash/mod.rs
similarity index 77%
rename from src/snapshot/diff/hash.rs
rename to src/snapshot/hash/mod.rs
index baece8ceb..129a3819b 100644
--- a/src/snapshot/diff/hash.rs
+++ b/src/snapshot/hash/mod.rs
@@ -1,14 +1,16 @@
 //! Hashing utility for a RojoTree
+mod variant;
+
+pub use variant::*;
 
 use blake3::{Hash, Hasher};
 use rbx_dom_weak::{
     types::{Ref, Variant},
     Instance, WeakDom,
 };
+use std::collections::{HashMap, VecDeque};
 
-use std::collections::HashMap;
-
-use super::{descendants, hash_variant, variant_eq};
+use crate::variant_eq::variant_eq;
 
 pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
@@ -76,3 +78,21 @@ pub fn hash_inst<'map, 'inst>(
 
     hasher.finalize()
 }
+
+pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
+    let mut queue = VecDeque::new();
+    let mut ordered = Vec::new();
+    queue.push_front(dom.root_ref());
+
+    while let Some(referent) = queue.pop_front() {
+        let inst = dom
+            .get_by_ref(referent)
+            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
+        ordered.push(referent);
+        for child in inst.children() {
+            queue.push_back(*child)
+        }
+    }
+
+    ordered
+}
diff --git a/src/snapshot/hash/variant.rs b/src/snapshot/hash/variant.rs
new file mode 100644
index 000000000..6c41ee7d5
--- /dev/null
+++ b/src/snapshot/hash/variant.rs
@@ -0,0 +1,194 @@
+use blake3::Hasher;
+use rbx_dom_weak::types::{PhysicalProperties, Variant, Vector3};
+
+macro_rules! round {
+    ($value:expr) => {
+        (($value * 10.0).round() / 10.0)
+    };
+}
+
+macro_rules! n_hash {
+    ($hash:ident, $($num:expr),*) => {
+        {$(
+            $hash.update(&($num).to_le_bytes());
+        )*}
+    };
+}
+
+macro_rules! hash {
+    ($hash:ident, $value:expr) => {{
+        $hash.update($value);
+    }};
+}
+
+/// Places `value` into the provided hasher.
+pub fn hash_variant(hasher: &mut Hasher, value: &Variant) {
+    // We need to round floats, though I'm not sure to what degree we can
+    // realistically do that.
+    match value {
+        Variant::Attributes(attrs) => {
+            let mut sorted: Vec<(&String, &Variant)> = attrs.iter().collect();
+            sorted.sort_unstable_by_key(|(name, _)| *name);
+            for (name, attribute) in sorted {
+                hasher.update(name.as_bytes());
+                hash_variant(hasher, attribute);
+            }
+        }
+        Variant::Axes(a) => hash!(hasher, &[a.bits()]),
+        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
+        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
+        Variant::BrickColor(color) => n_hash!(hasher, *color as u16),
+        Variant::CFrame(cf) => {
+            vector_hash(hasher, cf.position);
+            vector_hash(hasher, cf.orientation.x);
+            vector_hash(hasher, cf.orientation.y);
+            vector_hash(hasher, cf.orientation.z);
+        }
+        Variant::Color3(color) => {
+            n_hash!(hasher, round!(color.r), round!(color.g), round!(color.b))
+        }
+        Variant::Color3uint8(color) => hash!(hasher, &[color.r, color.b, color.g]),
+        Variant::ColorSequence(seq) => {
+            let mut new = Vec::with_capacity(seq.keypoints.len());
+            for keypoint in &seq.keypoints {
+                new.push(keypoint);
+            }
+            new.sort_unstable_by(|a, b| round!(a.time).partial_cmp(&round!(b.time)).unwrap());
+            for keypoint in new {
+                n_hash!(
+                    hasher,
+                    round!(keypoint.time),
+                    round!(keypoint.color.r),
+                    round!(keypoint.color.g),
+                    round!(keypoint.color.b)
+                )
+            }
+        }
+        Variant::Content(content) => {
+            let s: &str = content.as_ref();
+            hash!(hasher, s.as_bytes())
+        }
+        Variant::Enum(e) => n_hash!(hasher, e.to_u32()),
+        Variant::Faces(f) => hash!(hasher, &[f.bits()]),
+        Variant::Float32(n) => n_hash!(hasher, round!(*n)),
+        Variant::Float64(n) => n_hash!(hasher, round!(n)),
+        Variant::Font(f) => {
+            n_hash!(hasher, f.weight as u16);
+            n_hash!(hasher, f.style as u8);
+            hash!(hasher, f.family.as_bytes());
+            if let Some(cache) = &f.cached_face_id {
+                hash!(hasher, &[0x01]);
+                hash!(hasher, cache.as_bytes());
+            } else {
+                hash!(hasher, &[0x00]);
+            }
+        }
+        Variant::Int32(n) => n_hash!(hasher, n),
+        Variant::Int64(n) => n_hash!(hasher, n),
+        Variant::MaterialColors(n) => hash!(hasher, n.encode().as_slice()),
+        Variant::NumberRange(nr) => n_hash!(hasher, round!(nr.max), round!(nr.min)),
+        Variant::NumberSequence(seq) => {
+            let mut new = Vec::with_capacity(seq.keypoints.len());
+            for keypoint in &seq.keypoints {
+                new.push(keypoint);
+            }
+            new.sort_unstable_by(|a, b| round!(a.time).partial_cmp(&round!(b.time)).unwrap());
+            for keypoint in new {
+                n_hash!(
+                    hasher,
+                    round!(keypoint.time),
+                    round!(keypoint.value),
+                    round!(keypoint.envelope)
+                )
+            }
+        }
+        Variant::OptionalCFrame(maybe_cf) => {
+            if let Some(cf) = maybe_cf {
+                hash!(hasher, &[0x01]);
+                vector_hash(hasher, cf.position);
+                vector_hash(hasher, cf.orientation.x);
+                vector_hash(hasher, cf.orientation.y);
+                vector_hash(hasher, cf.orientation.z);
+            } else {
+                hash!(hasher, &[0x00]);
+            }
+        }
+        Variant::PhysicalProperties(properties) => match properties {
+            PhysicalProperties::Default => hash!(hasher, &[0x00]),
+            PhysicalProperties::Custom(custom) => {
+                hash!(hasher, &[0x00]);
+                n_hash!(
+                    hasher,
+                    round!(custom.density),
+                    round!(custom.friction),
+                    round!(custom.elasticity),
+                    round!(custom.friction_weight),
+                    round!(custom.elasticity_weight)
+                )
+            }
+        },
+        Variant::Ray(ray) => {
+            vector_hash(hasher, ray.origin);
+            vector_hash(hasher, ray.direction);
+        }
+        Variant::Rect(rect) => n_hash!(
+            hasher,
+            round!(rect.max.x),
+            round!(rect.max.y),
+            round!(rect.min.x),
+            round!(rect.min.y)
+        ),
+        Variant::Ref(referent) => hash!(hasher, referent.to_string().as_bytes()),
+        Variant::Region3(region) => {
+            vector_hash(hasher, region.max);
+            vector_hash(hasher, region.min);
+        }
+        Variant::Region3int16(region) => {
+            n_hash!(
+                hasher,
+                region.max.x,
+                region.max.y,
+                region.max.z,
+                region.min.x,
+                region.min.y,
+                region.min.z
+            )
+        }
+        Variant::SecurityCapabilities(capabilities) => n_hash!(hasher, capabilities.bits()),
+        Variant::SharedString(sstr) => hash!(hasher, sstr.hash().as_bytes()),
+        Variant::String(str) => hash!(hasher, str.as_bytes()),
+        Variant::Tags(tags) => {
+            let mut dupe: Vec<&str> = tags.iter().collect();
+            dupe.sort_unstable();
+            for tag in dupe {
+                hash!(hasher, tag.as_bytes())
+            }
+        }
+        Variant::UDim(udim) => n_hash!(hasher, round!(udim.scale), udim.offset),
+        Variant::UDim2(udim) => n_hash!(
+            hasher,
+            round!(udim.y.scale),
+            udim.y.offset,
+            round!(udim.x.scale),
+            udim.x.offset
+        ),
+        Variant::Vector2(v2) => n_hash!(hasher, round!(v2.x), round!(v2.y)),
+        Variant::Vector2int16(v2) => n_hash!(hasher, v2.x, v2.y),
+        Variant::Vector3(v3) => vector_hash(hasher, *v3),
+        Variant::Vector3int16(v3) => n_hash!(hasher, v3.x, v3.y, v3.z),
+
+        // Hashing UniqueId properties doesn't make sense
+        Variant::UniqueId(_) => (),
+
+        unknown => {
+            log::warn!(
+                "Encountered unknown Variant {:?} while hashing",
+                unknown.ty()
+            )
+        }
+    }
+}
+
+fn vector_hash(hasher: &mut Hasher, vector: Vector3) {
+    n_hash!(hasher, round!(vector.x), round!(vector.y), round!(vector.z))
+}
diff --git a/src/snapshot/mod.rs b/src/snapshot/mod.rs
index 6a36b893b..ff6ddb5ba 100644
--- a/src/snapshot/mod.rs
+++ b/src/snapshot/mod.rs
@@ -48,7 +48,7 @@
 
 #![allow(dead_code)]
 
-mod diff;
+mod hash;
 mod instance_snapshot;
 mod metadata;
 mod patch;
@@ -56,7 +56,7 @@ mod patch_apply;
 mod patch_compute;
 mod tree;
 
-pub use diff::*;
+pub use hash::*;
 pub use instance_snapshot::InstanceSnapshot;
 pub use metadata::*;
 pub use patch::*;
diff --git a/src/snapshot/diff/variant.rs b/src/variant_eq.rs
similarity index 55%
rename from src/snapshot/diff/variant.rs
rename to src/variant_eq.rs
index 2d1b3827a..831f03929 100644
--- a/src/snapshot/diff/variant.rs
+++ b/src/variant_eq.rs
@@ -1,202 +1,9 @@
-use blake3::Hasher;
-use float_cmp::approx_eq;
-use rbx_dom_weak::types::{PhysicalProperties, Variant, Vector3};
-
 use std::collections::HashMap;
 
-macro_rules! round {
-    ($value:expr) => {
-        (($value * 10.0).round() / 10.0)
-    };
-}
-
-macro_rules! n_hash {
-    ($hash:ident, $($num:expr),*) => {
-        {$(
-            $hash.update(&($num).to_le_bytes());
-        )*}
-    };
-}
-
-macro_rules! hash {
-    ($hash:ident, $value:expr) => {{
-        $hash.update($value);
-    }};
-}
-
-/// Places `value` into the provided hasher.
-pub fn hash_variant(hasher: &mut Hasher, value: &Variant) {
-    // We need to round floats, though I'm not sure to what degree we can
-    // realistically do that.
-    match value {
-        Variant::Attributes(attrs) => {
-            let mut sorted: Vec<(&String, &Variant)> = attrs.iter().collect();
-            sorted.sort_unstable_by_key(|(name, _)| *name);
-            for (name, attribute) in sorted {
-                hasher.update(name.as_bytes());
-                hash_variant(hasher, attribute);
-            }
-        }
-        Variant::Axes(a) => hash!(hasher, &[a.bits()]),
-        Variant::BinaryString(bytes) => hash!(hasher, bytes.as_ref()),
-        Variant::Bool(bool) => hash!(hasher, &[*bool as u8]),
-        Variant::BrickColor(color) => n_hash!(hasher, *color as u16),
-        Variant::CFrame(cf) => {
-            vector_hash(hasher, cf.position);
-            vector_hash(hasher, cf.orientation.x);
-            vector_hash(hasher, cf.orientation.y);
-            vector_hash(hasher, cf.orientation.z);
-        }
-        Variant::Color3(color) => {
-            n_hash!(hasher, round!(color.r), round!(color.g), round!(color.b))
-        }
-        Variant::Color3uint8(color) => hash!(hasher, &[color.r, color.b, color.g]),
-        Variant::ColorSequence(seq) => {
-            let mut new = Vec::with_capacity(seq.keypoints.len());
-            for keypoint in &seq.keypoints {
-                new.push(keypoint);
-            }
-            new.sort_unstable_by(|a, b| round!(a.time).partial_cmp(&round!(b.time)).unwrap());
-            for keypoint in new {
-                n_hash!(
-                    hasher,
-                    round!(keypoint.time),
-                    round!(keypoint.color.r),
-                    round!(keypoint.color.g),
-                    round!(keypoint.color.b)
-                )
-            }
-        }
-        Variant::Content(content) => {
-            let s: &str = content.as_ref();
-            hash!(hasher, s.as_bytes())
-        }
-        Variant::Enum(e) => n_hash!(hasher, e.to_u32()),
-        Variant::Faces(f) => hash!(hasher, &[f.bits()]),
-        Variant::Float32(n) => n_hash!(hasher, round!(*n)),
-        Variant::Float64(n) => n_hash!(hasher, round!(n)),
-        Variant::Font(f) => {
-            n_hash!(hasher, f.weight as u16);
-            n_hash!(hasher, f.style as u8);
-            hash!(hasher, f.family.as_bytes());
-            if let Some(cache) = &f.cached_face_id {
-                hash!(hasher, &[0x01]);
-                hash!(hasher, cache.as_bytes());
-            } else {
-                hash!(hasher, &[0x00]);
-            }
-        }
-        Variant::Int32(n) => n_hash!(hasher, n),
-        Variant::Int64(n) => n_hash!(hasher, n),
-        Variant::MaterialColors(n) => hash!(hasher, n.encode().as_slice()),
-        Variant::NumberRange(nr) => n_hash!(hasher, round!(nr.max), round!(nr.min)),
-        Variant::NumberSequence(seq) => {
-            let mut new = Vec::with_capacity(seq.keypoints.len());
-            for keypoint in &seq.keypoints {
-                new.push(keypoint);
-            }
-            new.sort_unstable_by(|a, b| round!(a.time).partial_cmp(&round!(b.time)).unwrap());
-            for keypoint in new {
-                n_hash!(
-                    hasher,
-                    round!(keypoint.time),
-                    round!(keypoint.value),
-                    round!(keypoint.envelope)
-                )
-            }
-        }
-        Variant::OptionalCFrame(maybe_cf) => {
-            if let Some(cf) = maybe_cf {
-                hash!(hasher, &[0x01]);
-                vector_hash(hasher, cf.position);
-                vector_hash(hasher, cf.orientation.x);
-                vector_hash(hasher, cf.orientation.y);
-                vector_hash(hasher, cf.orientation.z);
-            } else {
-                hash!(hasher, &[0x00]);
-            }
-        }
-        Variant::PhysicalProperties(properties) => match properties {
-            PhysicalProperties::Default => hash!(hasher, &[0x00]),
-            PhysicalProperties::Custom(custom) => {
-                hash!(hasher, &[0x00]);
-                n_hash!(
-                    hasher,
-                    round!(custom.density),
-                    round!(custom.friction),
-                    round!(custom.elasticity),
-                    round!(custom.friction_weight),
-                    round!(custom.elasticity_weight)
-                )
-            }
-        },
-        Variant::Ray(ray) => {
-            vector_hash(hasher, ray.origin);
-            vector_hash(hasher, ray.direction);
-        }
-        Variant::Rect(rect) => n_hash!(
-            hasher,
-            round!(rect.max.x),
-            round!(rect.max.y),
-            round!(rect.min.x),
-            round!(rect.min.y)
-        ),
-        Variant::Ref(referent) => hash!(hasher, referent.to_string().as_bytes()),
-        Variant::Region3(region) => {
-            vector_hash(hasher, region.max);
-            vector_hash(hasher, region.min);
-        }
-        Variant::Region3int16(region) => {
-            n_hash!(
-                hasher,
-                region.max.x,
-                region.max.y,
-                region.max.z,
-                region.min.x,
-                region.min.y,
-                region.min.z
-            )
-        }
-        Variant::SecurityCapabilities(capabilities) => n_hash!(hasher, capabilities.bits()),
-        Variant::SharedString(sstr) => hash!(hasher, sstr.hash().as_bytes()),
-        Variant::String(str) => hash!(hasher, str.as_bytes()),
-        Variant::Tags(tags) => {
-            let mut dupe: Vec<&str> = tags.iter().collect();
-            dupe.sort_unstable();
-            for tag in dupe {
-                hash!(hasher, tag.as_bytes())
-            }
-        }
-        Variant::UDim(udim) => n_hash!(hasher, round!(udim.scale), udim.offset),
-        Variant::UDim2(udim) => n_hash!(
-            hasher,
-            round!(udim.y.scale),
-            udim.y.offset,
-            round!(udim.x.scale),
-            udim.x.offset
-        ),
-        Variant::Vector2(v2) => n_hash!(hasher, round!(v2.x), round!(v2.y)),
-        Variant::Vector2int16(v2) => n_hash!(hasher, v2.x, v2.y),
-        Variant::Vector3(v3) => vector_hash(hasher, *v3),
-        Variant::Vector3int16(v3) => n_hash!(hasher, v3.x, v3.y, v3.z),
-
-        // Hashing UniqueId properties doesn't make sense
-        Variant::UniqueId(_) => (),
-
-        unknown => {
-            log::warn!(
-                "Encountered unknown Variant {:?} while hashing",
-                unknown.ty()
-            )
-        }
-    }
-}
-
-fn vector_hash(hasher: &mut Hasher, vector: Vector3) {
-    n_hash!(hasher, round!(vector.x), round!(vector.y), round!(vector.z))
-}
+use float_cmp::approx_eq;
+use rbx_dom_weak::types::{PhysicalProperties, Variant, Vector3};
 
-/// Compares to variants to determine if they're equal. This correctly takes
+/// Compares two variants to determine if they're equal. This correctly takes
 /// float comparisons into account.
 pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
     if variant_a.ty() != variant_b.ty() {

From bbc926deeb79373ab4e161086ae88968cd6f33b0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 14:13:07 -0800
Subject: [PATCH 057/366] Filter default and ref properties out of json_models

---
 src/snapshot_middleware/json_model.rs | 34 ++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 229b94318..3d2173b93 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -2,13 +2,14 @@ use std::{borrow::Cow, collections::HashMap, path::Path, str};
 
 use anyhow::Context;
 use memofs::Vfs;
-use rbx_dom_weak::types::{Attributes, Ref};
+use rbx_dom_weak::types::{Attributes, Ref, Variant};
 use serde::{Deserialize, Serialize};
 
 use crate::{
     resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceSnapshot},
     syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    variant_eq::variant_eq,
 };
 
 pub fn snapshot_json_model(
@@ -69,16 +70,43 @@ pub fn syncback_json_model<'new, 'old>(
     let mut model = JsonModel::new(&new_inst.name, &new_inst.class);
     let mut properties = HashMap::with_capacity(new_inst.properties.len());
 
+    let class_data = rbx_reflection_database::get()
+        .classes
+        .get(model.class_name.as_str());
+
     // TODO handle attributes separately
     if let Some(old_inst) = snapshot.old_inst() {
         for (name, value) in &new_inst.properties {
+            // We do not currently support Ref properties.
+            if matches!(value, Variant::Ref(_)) {
+                continue;
+            }
             if old_inst.properties().contains_key(name) {
                 properties.insert(name.clone(), UnresolvedValue::from(value.clone()));
             }
         }
     } else {
-        for (name, value) in new_inst.properties.clone() {
-            properties.insert(name, UnresolvedValue::from(value));
+        if let Some(class_data) = class_data {
+            let default_properties = &class_data.default_properties;
+            for (name, value) in new_inst.properties.clone() {
+                // We do not currently support Ref properties.
+                if matches!(value, Variant::Ref(_)) {
+                    continue;
+                }
+                match default_properties.get(name.as_str()) {
+                    Some(default) if variant_eq(&value, default) => {}
+                    _ => {
+                        properties.insert(name, UnresolvedValue::from(value));
+                    }
+                }
+            }
+        } else {
+            for (name, value) in new_inst.properties.clone() {
+                if matches!(value, Variant::Ref(_)) {
+                    continue;
+                }
+                properties.insert(name, UnresolvedValue::from(value));
+            }
         }
     }
     model.set_properties(properties);

From 24e519253fdee333ed8dfac4301c849a405cffbb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 14:32:51 -0800
Subject: [PATCH 058/366] Revert making JsonModel public

---
 src/snapshot_middleware/json_model.rs | 42 ++++++---------------------
 src/snapshot_middleware/mod.rs        |  1 -
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 3d2173b93..1fa6b6aa4 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -67,7 +67,13 @@ pub fn syncback_json_model<'new, 'old>(
     path.set_extension("model.json");
 
     let new_inst = snapshot.new_inst();
-    let mut model = JsonModel::new(&new_inst.name, &new_inst.class);
+    let mut model = JsonModel {
+        name: Some(new_inst.name.clone()),
+        class_name: new_inst.class.clone(),
+        children: Vec::new(),
+        properties: HashMap::new(),
+        attributes: HashMap::new(),
+    };
     let mut properties = HashMap::with_capacity(new_inst.properties.len());
 
     let class_data = rbx_reflection_database::get()
@@ -109,7 +115,7 @@ pub fn syncback_json_model<'new, 'old>(
             }
         }
     }
-    model.set_properties(properties);
+    model.properties = properties;
 
     // TODO children
 
@@ -126,7 +132,7 @@ pub fn syncback_json_model<'new, 'old>(
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct JsonModel {
+struct JsonModel {
     #[serde(alias = "Name", skip_serializing)]
     name: Option<String>,
 
@@ -187,36 +193,6 @@ impl JsonModel {
             children,
         })
     }
-
-    /// Constructs an empty JSON model with the provided name and class.
-    #[inline]
-    pub fn new(name: &str, class_name: &str) -> Self {
-        Self {
-            name: Some(name.to_string()),
-            class_name: class_name.to_string(),
-            children: Vec::new(),
-            properties: HashMap::new(),
-            attributes: HashMap::new(),
-        }
-    }
-
-    /// Sets the properties of this `JsonModel`.
-    #[inline]
-    pub fn set_properties(&mut self, properties: HashMap<String, UnresolvedValue>) {
-        self.properties = properties;
-    }
-
-    /// Sets the attributes of this `JsonModel`.
-    #[inline]
-    pub fn set_attributes(&mut self, attributes: HashMap<String, UnresolvedValue>) {
-        self.attributes = attributes;
-    }
-
-    /// Pushes the provided `JsonModel` as a child of this one.
-    #[inline]
-    pub fn push_child(&mut self, child: Self) {
-        self.children.push(child);
-    }
 }
 
 #[cfg(test)]
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index b9535c544..febf4092c 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -48,7 +48,6 @@ use self::{
 };
 
 pub use self::{
-    json_model::JsonModel,
     lua::ScriptType,
     meta_file::{AdjacentMetadata, DirectoryMetadata},
     project::snapshot_project_node,

From cbb92204f1277f4db3881e900abb16ee7b3931fa Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 14:51:28 -0800
Subject: [PATCH 059/366] Validate file names in one place instead of in each
 middleware

---
 src/snapshot_middleware/dir.rs        |  6 +-----
 src/snapshot_middleware/json_model.rs |  6 +-----
 src/snapshot_middleware/lua.rs        | 10 +---------
 src/snapshot_middleware/mod.rs        | 11 ++++++++++-
 src/snapshot_middleware/rbxm.rs       |  6 +-----
 src/snapshot_middleware/rbxmx.rs      |  5 +----
 src/snapshot_middleware/txt.rs        |  6 +-----
 7 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 811510af5..496a09bda 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -8,7 +8,7 @@ use rbx_dom_weak::types::Ref;
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 use super::{meta_file::DirectoryMetadata, snapshot_from_vfs};
@@ -96,10 +96,6 @@ pub fn snapshot_dir_no_meta(
 pub fn syncback_dir<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a directory with name {}", snapshot.name);
-    }
-
     let path = snapshot.parent_path.join(&snapshot.name);
 
     let mut removed_children = Vec::new();
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 1fa6b6aa4..78b643054 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceSnapshot},
-    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
     variant_eq::variant_eq,
 };
 
@@ -59,10 +59,6 @@ pub fn snapshot_json_model(
 pub fn syncback_json_model<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a file with name {}", snapshot.name);
-    }
-
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("model.json");
 
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 2f7eb3457..744883bcd 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -6,7 +6,7 @@ use rbx_dom_weak::types::{Enum, Variant};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 use super::{
@@ -127,10 +127,6 @@ pub fn syncback_lua<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a file with name {}", snapshot.name);
-    }
-
     let inst = snapshot.new_inst();
 
     let mut path = snapshot.parent_path.join(&snapshot.name);
@@ -158,10 +154,6 @@ pub fn syncback_lua_init<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a directory with name {}", snapshot.name);
-    }
-
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.push("init");
     path.set_extension(match script_type {
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index febf4092c..b0d13a88d 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -28,11 +28,14 @@ use anyhow::Context;
 use memofs::{IoResultExt, Vfs};
 use serde::{Deserialize, Serialize};
 
-use crate::snapshot::{InstanceContext, InstanceSnapshot, SyncRule};
 use crate::{
     glob::Glob,
     syncback::{SyncbackReturn, SyncbackSnapshot},
 };
+use crate::{
+    snapshot::{InstanceContext, InstanceSnapshot, SyncRule},
+    syncback::is_valid_file_name,
+};
 
 use self::{
     csv::{snapshot_csv, snapshot_csv_init},
@@ -243,6 +246,12 @@ impl Middleware {
         &self,
         snapshot: &SyncbackSnapshot<'new, 'old>,
     ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+        if !is_valid_file_name(&snapshot.name) {
+            anyhow::bail!(
+                "cannot create a file or directory with name {}",
+                snapshot.name
+            );
+        }
         match self {
             Middleware::Project => syncback_project(snapshot),
             Middleware::ServerScript => syncback_lua(ScriptType::Server, snapshot),
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 31a22cee1..b8137b710 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -5,7 +5,7 @@ use memofs::Vfs;
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 #[profiling::function]
@@ -47,10 +47,6 @@ pub fn syncback_rbxm<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     // If any of the children of this Instance are scripts, we don't want
     // include them in the model. So instead, we'll check and then serialize.
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a file with name {}", snapshot.name);
-    }
-
     let inst = snapshot.new_inst();
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("rbxm");
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 78bb24984..1b7ecdca7 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -5,7 +5,7 @@ use memofs::Vfs;
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 pub fn snapshot_rbxmx(
@@ -49,9 +49,6 @@ pub fn syncback_rbxmx<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     // If any of the children of this Instance are scripts, we don't want
     // include them in the model. So instead, we'll check and then serialize.
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a file with name {}", snapshot.name);
-    }
 
     let inst = snapshot.new_inst();
     let mut path = snapshot.parent_path.join(&snapshot.name);
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index c24ee2a94..c6fa0b34e 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -7,7 +7,7 @@ use rbx_dom_weak::types::Variant;
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{is_valid_file_name, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 use super::meta_file::AdjacentMetadata;
@@ -51,10 +51,6 @@ pub fn snapshot_txt(
 pub fn syncback_txt<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    if !is_valid_file_name(&snapshot.name) {
-        anyhow::bail!("cannot create a file with name {}", snapshot.name);
-    }
-
     let inst = snapshot.new_inst();
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("txt");

From 25343a6233b410200fb5f12d1041a645fa8258dd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 14:53:49 -0800
Subject: [PATCH 060/366] Add more classes to get_best_middleware

---
 src/syncback/mod.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 67d623040..a4ae0d48b 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -110,8 +110,15 @@ pub struct SyncbackReturn<'new, 'old> {
 pub fn get_best_middleware(inst: &Instance) -> Middleware {
     match inst.class.as_str() {
         "Folder" => Middleware::Dir,
-        // TODO this should probably just be rbxm
-        "Model" => Middleware::Rbxm,
+        "Sound"
+        | "SoundGroup"
+        | "Sky"
+        | "Atmosphere"
+        | "BloomEffect"
+        | "BlurEffect"
+        | "ColorCorrectionEffect"
+        | "DepthOfFieldEffect"
+        | "SunRaysEffect" => Middleware::JsonModel,
         "Script" => {
             if inst.children().len() == 0 {
                 Middleware::ServerScript

From 78d5d3cea94f2643e9f6230ff69ee666968a5df6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 14:59:40 -0800
Subject: [PATCH 061/366] Check class names in Project syncback

---
 src/snapshot_middleware/project.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 47651009d..4a513cf22 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -345,7 +345,9 @@ pub fn syncback_project<'new, 'old>(
         for (child_name, child_node) in &mut node.children {
             if let Some(new_child) = new_child_map.get(child_name.as_str()) {
                 if let Some(old_child) = old_child_map.get(child_name.as_str()) {
-                    // TODO verify class names
+                    if &new_child.class != old_child.class_name() {
+                        anyhow::bail!("Cannot change the class of items in a project");
+                    }
                     for (name, value) in &new_child.properties {
                         if child_node.properties.contains_key(name) {
                             child_node

From b776b64632a999eb20b652d33e23061f8cc5a841 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 15:52:16 -0800
Subject: [PATCH 062/366] Fix init middleware when syncing

---
 src/snapshot_middleware/mod.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index b0d13a88d..0e6a427b3 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -19,7 +19,6 @@ mod txt;
 mod util;
 
 use std::{
-    borrow::Cow,
     path::{Path, PathBuf},
     sync::OnceLock,
 };
@@ -73,14 +72,11 @@ pub fn snapshot_from_vfs(
     };
 
     if meta.is_dir() {
-        let (middleware, name) = get_dir_middleware(vfs, path)?;
+        let (middleware, dir_name, init_path) = get_dir_middleware(vfs, path)?;
         // TODO: Support user defined init paths
         match middleware {
-            Middleware::Dir => middleware.snapshot(context, vfs, path, &name),
-            _ => {
-                let name_as_path: PathBuf = name.as_ref().into();
-                middleware.snapshot(context, vfs, &path.join(name_as_path), &name)
-            }
+            Middleware::Dir => middleware.snapshot(context, vfs, path, &dir_name),
+            _ => middleware.snapshot(context, vfs, &init_path, &dir_name),
         }
     } else {
         let file_name = path
@@ -102,10 +98,13 @@ pub fn snapshot_from_vfs(
 /// Gets the appropriate middleware for a directory by checking for `init`
 /// files. This uses an intrinsic priority list and for compatibility,
 /// that order should be left unchanged.
+///
+/// Returns the middleware, the name of the directory, and the path to
+/// the init location.
 fn get_dir_middleware<P: AsRef<Path>>(
     vfs: &Vfs,
     dir: P,
-) -> anyhow::Result<(Middleware, Cow<'static, str>)> {
+) -> anyhow::Result<(Middleware, String, PathBuf)> {
     let path = dir.as_ref();
     let dir_name = path
         .file_name()
@@ -129,12 +128,13 @@ fn get_dir_middleware<P: AsRef<Path>>(
     });
 
     for (middleware, name) in order {
-        if vfs.metadata(path.join(name)).with_not_found()?.is_some() {
-            return Ok((*middleware, Cow::Borrowed(*name)));
+        let test_path = path.join(name);
+        if vfs.metadata(&test_path).with_not_found()?.is_some() {
+            return Ok((*middleware, dir_name, test_path));
         }
     }
 
-    Ok((Middleware::Dir, Cow::Owned(dir_name)))
+    Ok((Middleware::Dir, dir_name, path.to_path_buf()))
 }
 
 /// Gets a snapshot for a path given an InstanceContext and Vfs, taking

From d7a6f13fe1204eb57768582fc86b00048ebc0e68 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Dec 2023 16:56:40 -0800
Subject: [PATCH 063/366] Move Variant -> UnresolvedValue Support ambiguous
 enum syntax

---
 src/resolution.rs                     | 103 +++++++++++++++-----------
 src/snapshot_middleware/json_model.rs |  17 ++++-
 src/snapshot_middleware/project.rs    |  11 ++-
 3 files changed, 80 insertions(+), 51 deletions(-)

diff --git a/src/resolution.rs b/src/resolution.rs
index 9e7cc3f41..9fcef34d3 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -35,6 +35,65 @@ impl UnresolvedValue {
             UnresolvedValue::Ambiguous(partial) => partial.resolve_unambiguous(),
         }
     }
+
+    pub fn from_variant(variant: Variant, class_name: &str, prop_name: &str) -> Self {
+        Self::Ambiguous(match variant {
+            Variant::Enum(rbx_enum) => {
+                if let Some(property) = find_descriptor(class_name, prop_name) {
+                    if let DataType::Enum(enum_name) = &property.data_type {
+                        let database = rbx_reflection_database::get();
+                        if let Some(enum_descriptor) = database.enums.get(enum_name) {
+                            for (variant_name, id) in &enum_descriptor.items {
+                                if *id == rbx_enum.to_u32() {
+                                    return Self::Ambiguous(AmbiguousValue::String(
+                                        variant_name.to_string(),
+                                    ));
+                                }
+                            }
+                        }
+                    }
+                }
+                return Self::FullyQualified(variant);
+            }
+            Variant::Bool(bool) => AmbiguousValue::Bool(bool),
+            Variant::Float32(n) => AmbiguousValue::Number(n as f64),
+            Variant::Float64(n) => AmbiguousValue::Number(n),
+            Variant::Int32(n) => AmbiguousValue::Number(n as f64),
+            Variant::Int64(n) => AmbiguousValue::Number(n as f64),
+            Variant::String(str) => AmbiguousValue::String(str),
+            Variant::Tags(tags) => {
+                AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())
+            }
+            Variant::Content(content) => AmbiguousValue::String(content.into_string()),
+            Variant::Vector2(vector) => AmbiguousValue::Array2([vector.x as f64, vector.y as f64]),
+            Variant::Vector3(vector) => {
+                AmbiguousValue::Array3([vector.x as f64, vector.y as f64, vector.z as f64])
+            }
+            Variant::Color3(color) => {
+                AmbiguousValue::Array3([color.r as f64, color.g as f64, color.b as f64])
+            }
+            Variant::CFrame(cf) => AmbiguousValue::Array12([
+                cf.position.x as f64,
+                cf.position.y as f64,
+                cf.position.z as f64,
+                cf.orientation.x.x as f64,
+                cf.orientation.x.y as f64,
+                cf.orientation.x.z as f64,
+                cf.orientation.y.x as f64,
+                cf.orientation.y.y as f64,
+                cf.orientation.y.z as f64,
+                cf.orientation.z.x as f64,
+                cf.orientation.z.y as f64,
+                cf.orientation.z.z as f64,
+            ]),
+            Variant::Attributes(attr) => AmbiguousValue::Attributes(attr),
+            Variant::Font(font) => AmbiguousValue::Font(font),
+            Variant::MaterialColors(colors) => AmbiguousValue::MaterialColors(colors),
+            _ => {
+                return Self::FullyQualified(variant);
+            }
+        })
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -190,50 +249,6 @@ impl AmbiguousValue {
     }
 }
 
-impl From<Variant> for UnresolvedValue {
-    fn from(value: Variant) -> Self {
-        Self::Ambiguous(match value {
-            Variant::Bool(bool) => AmbiguousValue::Bool(bool),
-            Variant::Float32(n) => AmbiguousValue::Number(n as f64),
-            Variant::Float64(n) => AmbiguousValue::Number(n),
-            Variant::Int32(n) => AmbiguousValue::Number(n as f64),
-            Variant::Int64(n) => AmbiguousValue::Number(n as f64),
-            Variant::String(str) => AmbiguousValue::String(str),
-            Variant::Tags(tags) => {
-                AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())
-            }
-            Variant::Content(content) => AmbiguousValue::String(content.into_string()),
-            Variant::Vector2(vector) => AmbiguousValue::Array2([vector.x as f64, vector.y as f64]),
-            Variant::Vector3(vector) => {
-                AmbiguousValue::Array3([vector.x as f64, vector.y as f64, vector.z as f64])
-            }
-            Variant::Color3(color) => {
-                AmbiguousValue::Array3([color.r as f64, color.g as f64, color.b as f64])
-            }
-            Variant::CFrame(cf) => AmbiguousValue::Array12([
-                cf.position.x as f64,
-                cf.position.y as f64,
-                cf.position.z as f64,
-                cf.orientation.x.x as f64,
-                cf.orientation.x.y as f64,
-                cf.orientation.x.z as f64,
-                cf.orientation.y.x as f64,
-                cf.orientation.y.y as f64,
-                cf.orientation.y.z as f64,
-                cf.orientation.z.x as f64,
-                cf.orientation.z.y as f64,
-                cf.orientation.z.z as f64,
-            ]),
-            Variant::Attributes(attr) => AmbiguousValue::Attributes(attr),
-            Variant::Font(font) => AmbiguousValue::Font(font),
-            Variant::MaterialColors(colors) => AmbiguousValue::MaterialColors(colors),
-            _ => {
-                return Self::FullyQualified(value);
-            }
-        })
-    }
-}
-
 fn find_descriptor(
     class_name: &str,
     prop_name: &str,
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 78b643054..2dbd5babb 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -84,13 +84,16 @@ pub fn syncback_json_model<'new, 'old>(
                 continue;
             }
             if old_inst.properties().contains_key(name) {
-                properties.insert(name.clone(), UnresolvedValue::from(value.clone()));
+                properties.insert(
+                    name.clone(),
+                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, &*name),
+                );
             }
         }
     } else {
         if let Some(class_data) = class_data {
             let default_properties = &class_data.default_properties;
-            for (name, value) in new_inst.properties.clone() {
+            for (name, value) in &new_inst.properties {
                 // We do not currently support Ref properties.
                 if matches!(value, Variant::Ref(_)) {
                     continue;
@@ -98,7 +101,10 @@ pub fn syncback_json_model<'new, 'old>(
                 match default_properties.get(name.as_str()) {
                     Some(default) if variant_eq(&value, default) => {}
                     _ => {
-                        properties.insert(name, UnresolvedValue::from(value));
+                        properties.insert(
+                            name.clone(),
+                            UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
+                        );
                     }
                 }
             }
@@ -107,7 +113,10 @@ pub fn syncback_json_model<'new, 'old>(
                 if matches!(value, Variant::Ref(_)) {
                     continue;
                 }
-                properties.insert(name, UnresolvedValue::from(value));
+                // Inserting `name` into the map takes ownership of it, so we
+                // have to make this first.
+                let value = UnresolvedValue::from_variant(value, &new_inst.class, &name);
+                properties.insert(name, value);
             }
         }
     }
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 4a513cf22..52c55616a 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -350,9 +350,14 @@ pub fn syncback_project<'new, 'old>(
                     }
                     for (name, value) in &new_child.properties {
                         if child_node.properties.contains_key(name) {
-                            child_node
-                                .properties
-                                .insert(name.clone(), UnresolvedValue::from(value.clone()));
+                            child_node.properties.insert(
+                                name.clone(),
+                                UnresolvedValue::from_variant(
+                                    value.clone(),
+                                    &new_child.class,
+                                    name.as_str(),
+                                ),
+                            );
                         }
                     }
                     nodes.push((child_node, new_child, *old_child));

From bfabceb560b3a4b36ddb8a422af9b6abef9389fb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 21 Dec 2023 14:45:00 -0800
Subject: [PATCH 064/366] Don't bail when project name isn't valid file name

---
 src/snapshot_middleware/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 0e6a427b3..818968b64 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -246,7 +246,8 @@ impl Middleware {
         &self,
         snapshot: &SyncbackSnapshot<'new, 'old>,
     ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-        if !is_valid_file_name(&snapshot.name) {
+        // We don't care about the names of projects
+        if !is_valid_file_name(&snapshot.name) && !matches!(self, Middleware::Project) {
             anyhow::bail!(
                 "cannot create a file or directory with name {}",
                 snapshot.name

From 8692d19b7f577828c673ae228ff401c71e849263 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 21 Dec 2023 14:48:45 -0800
Subject: [PATCH 065/366] Display child name in project errors

---
 src/snapshot_middleware/project.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 52c55616a..c02de3d69 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -346,7 +346,7 @@ pub fn syncback_project<'new, 'old>(
             if let Some(new_child) = new_child_map.get(child_name.as_str()) {
                 if let Some(old_child) = old_child_map.get(child_name.as_str()) {
                     if &new_child.class != old_child.class_name() {
-                        anyhow::bail!("Cannot change the class of items in a project");
+                        anyhow::bail!("Cannot change the class of {child_name} in a project");
                     }
                     for (name, value) in &new_child.properties {
                         if child_node.properties.contains_key(name) {
@@ -365,7 +365,7 @@ pub fn syncback_project<'new, 'old>(
                     old_child_map.remove(child_name.as_str());
                 }
             } else {
-                anyhow::bail!("Cannot add or remove children from a project")
+                anyhow::bail!("Cannot add or remove {child_name} from project")
             }
         }
 

From ede795abd1b7d875c3f70c5d06a68041100a839a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 21 Dec 2023 15:00:22 -0800
Subject: [PATCH 066/366] Don't serialize syncback_rules when it's None

---
 src/project.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/project.rs b/src/project.rs
index 768ee045b..fc9e4581d 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -86,6 +86,8 @@ pub struct Project {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub glob_ignore_paths: Vec<Glob>,
 
+    /// A list of rules for syncback with this project file.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub syncback_rules: Option<SyncbackIgnoreRules>,
 
     /// A list of mappings of globs to syncing rules. If a file matches a glob,

From 265c128641b096d68c724c7f744a427de91e7763 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 21 Dec 2023 15:27:39 -0800
Subject: [PATCH 067/366] Redo property serialization of json_model

---
 src/snapshot_middleware/json_model.rs | 102 ++++++++++++++------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 2dbd5babb..e7f4e5d70 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -63,64 +63,70 @@ pub fn syncback_json_model<'new, 'old>(
     path.set_extension("model.json");
 
     let new_inst = snapshot.new_inst();
-    let mut model = JsonModel {
-        name: Some(new_inst.name.clone()),
-        class_name: new_inst.class.clone(),
-        children: Vec::new(),
-        properties: HashMap::new(),
-        attributes: HashMap::new(),
-    };
-    let mut properties = HashMap::with_capacity(new_inst.properties.len());
 
     let class_data = rbx_reflection_database::get()
         .classes
-        .get(model.class_name.as_str());
-
-    // TODO handle attributes separately
-    if let Some(old_inst) = snapshot.old_inst() {
-        for (name, value) in &new_inst.properties {
-            // We do not currently support Ref properties.
-            if matches!(value, Variant::Ref(_)) {
-                continue;
-            }
-            if old_inst.properties().contains_key(name) {
-                properties.insert(
-                    name.clone(),
-                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, &*name),
-                );
-            }
-        }
+        .get(new_inst.class.as_str());
+
+    let filtered: HashMap<&String, &Variant> = if let Some(old_inst) = snapshot.old_inst() {
+        new_inst
+            .properties
+            .iter()
+            .filter(|(name, _)| old_inst.properties().contains_key(*name))
+            .collect()
     } else {
         if let Some(class_data) = class_data {
             let default_properties = &class_data.default_properties;
-            for (name, value) in &new_inst.properties {
-                // We do not currently support Ref properties.
-                if matches!(value, Variant::Ref(_)) {
-                    continue;
-                }
-                match default_properties.get(name.as_str()) {
-                    Some(default) if variant_eq(&value, default) => {}
-                    _ => {
-                        properties.insert(
-                            name.clone(),
-                            UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
-                        );
-                    }
-                }
-            }
+            new_inst
+                .properties
+                .iter()
+                .filter(
+                    |(name, value)| match default_properties.get(name.as_str()) {
+                        Some(default) => !variant_eq(value, default),
+                        None => true,
+                    },
+                )
+                .collect()
         } else {
-            for (name, value) in new_inst.properties.clone() {
-                if matches!(value, Variant::Ref(_)) {
-                    continue;
-                }
-                // Inserting `name` into the map takes ownership of it, so we
-                // have to make this first.
-                let value = UnresolvedValue::from_variant(value, &new_inst.class, &name);
-                properties.insert(name, value);
+            new_inst.properties.iter().collect()
+        }
+    };
+
+    let mut properties = HashMap::with_capacity(new_inst.properties.capacity());
+    let mut attributes = HashMap::new();
+    for (name, value) in filtered {
+        if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attr) = value {
+                attributes.extend(attr.iter().map(|(name, value)| {
+                    (
+                        name.clone(),
+                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
+                    )
+                }))
+            } else {
+                log::error!(
+                    "Property {name} should be Attributes but is {:?}",
+                    value.ty()
+                );
             }
+        } else if let Variant::Ref(_) = value {
+            // We do not currently support Ref properties
+            continue;
+        } else {
+            properties.insert(
+                name.clone(),
+                UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
+            );
         }
     }
-    model.properties = properties;
+
+    let model = JsonModel {
+        name: Some(new_inst.name.clone()),
+        class_name: new_inst.class.clone(),
+        children: Vec::new(),
+        properties,
+        attributes,
+    };
 
     // TODO children
 

From bd4e96d9a8cc08ada27a82e5bb99b3559af3ead1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 09:41:21 -0800
Subject: [PATCH 068/366] Handle SharedString appropriately

---
 src/resolution.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/resolution.rs b/src/resolution.rs
index 9fcef34d3..909e095c9 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -2,8 +2,8 @@ use std::borrow::Borrow;
 
 use anyhow::{bail, format_err};
 use rbx_dom_weak::types::{
-    Attributes, CFrame, Color3, Content, Enum, Font, MaterialColors, Matrix3, Tags, Variant,
-    VariantType, Vector2, Vector3,
+    Attributes, BinaryString, CFrame, Color3, Content, Enum, Font, MaterialColors, Matrix3, Tags,
+    Variant, VariantType, Vector2, Vector3,
 };
 use rbx_reflection::{DataType, PropertyDescriptor};
 use serde::{Deserialize, Serialize};
@@ -60,6 +60,15 @@ impl UnresolvedValue {
             Variant::Float64(n) => AmbiguousValue::Number(n),
             Variant::Int32(n) => AmbiguousValue::Number(n as f64),
             Variant::Int64(n) => AmbiguousValue::Number(n as f64),
+            Variant::SharedString(sstr) => {
+                if let Ok(str) = std::str::from_utf8(sstr.data()) {
+                    AmbiguousValue::String(str.to_string())
+                } else {
+                    return Self::FullyQualified(Variant::BinaryString(BinaryString::from(
+                        sstr.data(),
+                    )));
+                }
+            }
             Variant::String(str) => AmbiguousValue::String(str),
             Variant::Tags(tags) => {
                 AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())

From 75c3aaa7dde102e1f69a3fef351e4ed2d35018ce Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 09:41:53 -0800
Subject: [PATCH 069/366] Add `push_dir` to FsSnapshot

---
 src/syncback/fs_snapshot.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index a83dbe1c1..27fb272af 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -41,6 +41,10 @@ impl FsSnapshot {
             .insert(path.as_ref().to_path_buf(), Arc::new(data));
     }
 
+    pub fn push_dir<P: AsRef<Path>>(&mut self, path: P) {
+        self.dir.insert(path.as_ref().to_path_buf());
+    }
+
     pub fn pop_dir<P: AsRef<Path>>(&mut self, path: P) -> bool {
         self.dir.remove(path.as_ref())
     }

From 6f0028058c4c983ba9d7953f5b34643180d9ccc1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 09:42:09 -0800
Subject: [PATCH 070/366] Add method for checking if a meta file is 'empty'.

---
 src/snapshot_middleware/meta_file.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 72930e49e..ed5958627 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -174,4 +174,22 @@ impl DirectoryMetadata {
 
         Ok(())
     }
+
+    /// Returns whether the metadata is 'empty', meaning it doesn't have anything
+    /// worth persisting in it. Specifically:
+    ///
+    /// - The number of properties and attributes is 0
+    /// - `ignore_unknown_instances` is None
+    /// - `class_name` is either None or not Some("Folder")
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.attributes.len() == 0
+            && self.properties.len() == 0
+            && self.ignore_unknown_instances.is_none()
+            && if let Some(class) = &self.class_name {
+                class == "Folder"
+            } else {
+                true
+            }
+    }
 }

From 952770cf5d00477a24776db21cb5890108fa951c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 11:05:46 -0800
Subject: [PATCH 071/366] Move property filtering logic elsewhere

---
 src/snapshot_middleware/json_model.rs | 33 ++---------------
 src/syncback/snapshot.rs              | 53 +++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index e7f4e5d70..4a8dfafda 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -9,7 +9,6 @@ use crate::{
     resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
-    variant_eq::variant_eq,
 };
 
 pub fn snapshot_json_model(
@@ -64,33 +63,7 @@ pub fn syncback_json_model<'new, 'old>(
 
     let new_inst = snapshot.new_inst();
 
-    let class_data = rbx_reflection_database::get()
-        .classes
-        .get(new_inst.class.as_str());
-
-    let filtered: HashMap<&String, &Variant> = if let Some(old_inst) = snapshot.old_inst() {
-        new_inst
-            .properties
-            .iter()
-            .filter(|(name, _)| old_inst.properties().contains_key(*name))
-            .collect()
-    } else {
-        if let Some(class_data) = class_data {
-            let default_properties = &class_data.default_properties;
-            new_inst
-                .properties
-                .iter()
-                .filter(
-                    |(name, value)| match default_properties.get(name.as_str()) {
-                        Some(default) => !variant_eq(value, default),
-                        None => true,
-                    },
-                )
-                .collect()
-        } else {
-            new_inst.properties.iter().collect()
-        }
-    };
+    let filtered = snapshot.get_filtered_properties();
 
     let mut properties = HashMap::with_capacity(new_inst.properties.capacity());
     let mut attributes = HashMap::new();
@@ -99,7 +72,7 @@ pub fn syncback_json_model<'new, 'old>(
             if let Variant::Attributes(attr) = value {
                 attributes.extend(attr.iter().map(|(name, value)| {
                     (
-                        name.clone(),
+                        name.to_string(),
                         UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
                     )
                 }))
@@ -114,7 +87,7 @@ pub fn syncback_json_model<'new, 'old>(
             continue;
         } else {
             properties.insert(
-                name.clone(),
+                name.to_string(),
                 UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
             );
         }
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 8590f1511..b40a2b26c 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,8 +1,14 @@
 use memofs::Vfs;
-use std::{path::PathBuf, rc::Rc};
+use std::{collections::HashMap, path::PathBuf, rc::Rc};
 
-use crate::snapshot::{InstanceWithMeta, RojoTree};
-use rbx_dom_weak::{types::Ref, Instance, WeakDom};
+use crate::{
+    snapshot::{InstanceWithMeta, RojoTree},
+    variant_eq::variant_eq,
+};
+use rbx_dom_weak::{
+    types::{Ref, Variant},
+    Instance, WeakDom,
+};
 
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
@@ -32,6 +38,47 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         }
     }
 
+    /// Returns a map of properties for the 'new' Instance with filtering
+    /// done to avoid noise.
+    ///
+    /// Note that the returned map does not filter any properties by name, nor
+    /// does it clone the values. This is left to the consumer.
+    pub fn get_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
+        let new_inst = self.new_inst();
+        let mut properties: HashMap<&str, &Variant> =
+            HashMap::with_capacity(new_inst.properties.capacity());
+
+        if let Some(old_inst) = self.old_inst() {
+            for (name, value) in &new_inst.properties {
+                if old_inst.properties().contains_key(name) {
+                    properties.insert(name, value);
+                }
+            }
+        } else {
+            let class_data = rbx_reflection_database::get()
+                .classes
+                .get(new_inst.class.as_str());
+            if let Some(class_data) = class_data {
+                let defaults = &class_data.default_properties;
+                for (name, value) in &new_inst.properties {
+                    if let Some(default) = defaults.get(name.as_str()) {
+                        if !variant_eq(value, default) {
+                            properties.insert(name, value);
+                        }
+                    } else {
+                        properties.insert(name, value);
+                    }
+                }
+            } else {
+                for (name, value) in &new_inst.properties {
+                    properties.insert(name, value);
+                }
+            }
+        }
+
+        properties
+    }
+
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]

From b8488f6e129505d94bb3c76a96901848f068228c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 11:06:44 -0800
Subject: [PATCH 072/366] Swap dir syncback middleware to use new filtering
 logic

---
 src/snapshot_middleware/dir.rs | 68 ++++++++++++++++++++++++++++++----
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 496a09bda..700036be9 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -3,10 +3,12 @@ use std::{
     path::Path,
 };
 
+use anyhow::Context;
 use memofs::{DirEntry, IoResultExt, Vfs};
-use rbx_dom_weak::types::Ref;
+use rbx_dom_weak::types::{Ref, Variant};
 
 use crate::{
+    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
@@ -97,6 +99,60 @@ pub fn syncback_dir<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let path = snapshot.parent_path.join(&snapshot.name);
+    let new_inst = snapshot.new_inst();
+
+    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
+
+    let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
+        dir
+    } else {
+        DirectoryMetadata {
+            ignore_unknown_instances: None,
+            properties: HashMap::with_capacity(new_inst.properties.capacity()),
+            attributes: HashMap::new(),
+            class_name: if new_inst.class == "Folder" {
+                None
+            } else {
+                Some(new_inst.class.clone())
+            },
+            path: path.join("init.meta.json"),
+        }
+    };
+    for (name, value) in snapshot.get_filtered_properties() {
+        if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attrs) = value {
+                meta.attributes.extend(attrs.iter().map(|(name, value)| {
+                    (
+                        name.to_string(),
+                        UnresolvedValue::FullyQualified(value.clone()),
+                    )
+                }))
+            } else {
+                log::error!("Property {name} should be Attributes but is not");
+            }
+        } else {
+            meta.properties.insert(
+                name.to_string(),
+                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
+            );
+        }
+    }
+
+    if !meta.is_empty() {
+        dir_syncback.fs_snapshot.push_file(
+            &meta.path,
+            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+        );
+    }
+    Ok(dir_syncback)
+}
+
+pub fn syncback_dir_no_meta<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    let path = snapshot.parent_path.join(&snapshot.name);
+
+    let new_inst = snapshot.new_inst();
 
     let mut removed_children = Vec::new();
     let mut children = Vec::new();
@@ -127,7 +183,7 @@ pub fn syncback_dir<'new, 'old>(
             }
         }
 
-        for child_ref in snapshot.new_inst().children() {
+        for child_ref in new_inst.children() {
             let new_child = snapshot.get_new_instance(*child_ref).unwrap();
             // If it exists in the new tree but not the old one, it was added.
             match old_children.get(new_child.name.as_str()) {
@@ -142,17 +198,15 @@ pub fn syncback_dir<'new, 'old>(
             }
         }
     } else {
-        for child_ref in snapshot.new_inst().children() {
+        for child_ref in new_inst.children() {
             let child = snapshot.get_new_instance(*child_ref).unwrap();
             children.push(snapshot.from_parent(child.name.clone(), *child_ref, None))
         }
     }
-    let fs_snapshot = FsSnapshot::new().with_dir(&path);
-    // TODO metadata, including classname
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot,
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
+        fs_snapshot: FsSnapshot::new().with_dir(path),
         children,
         removed_children,
     })

From b6bc5b8da1e76f6730d4c100b6bd9b29a6354f56 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 11:17:31 -0800
Subject: [PATCH 073/366] Don't syncback Ref or SharedString properties

---
 src/resolution.rs        | 18 +++++++++---------
 src/syncback/snapshot.rs |  8 ++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/resolution.rs b/src/resolution.rs
index 909e095c9..379ccc057 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -60,15 +60,15 @@ impl UnresolvedValue {
             Variant::Float64(n) => AmbiguousValue::Number(n),
             Variant::Int32(n) => AmbiguousValue::Number(n as f64),
             Variant::Int64(n) => AmbiguousValue::Number(n as f64),
-            Variant::SharedString(sstr) => {
-                if let Ok(str) = std::str::from_utf8(sstr.data()) {
-                    AmbiguousValue::String(str.to_string())
-                } else {
-                    return Self::FullyQualified(Variant::BinaryString(BinaryString::from(
-                        sstr.data(),
-                    )));
-                }
-            }
+            // Variant::SharedString(sstr) => {
+            //     if let Ok(str) = std::str::from_utf8(sstr.data()) {
+            //         AmbiguousValue::String(str.to_string())
+            //     } else {
+            //         return Self::FullyQualified(Variant::BinaryString(BinaryString::from(
+            //             sstr.data(),
+            //         )));
+            //     }
+            // }
             Variant::String(str) => AmbiguousValue::String(str),
             Variant::Tags(tags) => {
                 AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index b40a2b26c..3a2db8634 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -61,6 +61,10 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             if let Some(class_data) = class_data {
                 let defaults = &class_data.default_properties;
                 for (name, value) in &new_inst.properties {
+                    // We don't currently support refs or shared strings
+                    if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+                        continue;
+                    }
                     if let Some(default) = defaults.get(name.as_str()) {
                         if !variant_eq(value, default) {
                             properties.insert(name, value);
@@ -71,6 +75,10 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                 }
             } else {
                 for (name, value) in &new_inst.properties {
+                    // We don't currently support refs or shared strings
+                    if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+                        continue;
+                    }
                     properties.insert(name, value);
                 }
             }

From 1b02e197f90b7b82cbf8e6cb6a7ea4d3206f8061 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 11:24:31 -0800
Subject: [PATCH 074/366] Update what classes sync back as what

---
 src/syncback/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index a4ae0d48b..00838232a 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -109,7 +109,7 @@ pub struct SyncbackReturn<'new, 'old> {
 
 pub fn get_best_middleware(inst: &Instance) -> Middleware {
     match inst.class.as_str() {
-        "Folder" => Middleware::Dir,
+        "Folder" | "Configuration" | "Tool" | "ScreenGui" => Middleware::Dir,
         "Sound"
         | "SoundGroup"
         | "Sky"
@@ -120,14 +120,14 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
         | "DepthOfFieldEffect"
         | "SunRaysEffect" => Middleware::JsonModel,
         "Script" => {
-            if inst.children().len() == 0 {
+            if inst.children().is_empty() {
                 Middleware::ServerScript
             } else {
                 Middleware::ServerScriptDir
             }
         }
         "LocalScript" => {
-            if inst.children().len() == 0 {
+            if inst.children().is_empty() {
                 Middleware::ClientScript
             } else {
                 Middleware::ClientScriptDir

From 0f79f414aa99ca222fe61f387e9dee4a477f3000 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 11:34:47 -0800
Subject: [PATCH 075/366] Support metadata for Lua dirs

---
 src/snapshot_middleware/lua.rs | 64 +++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 744883bcd..f57d39bcf 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -5,13 +5,15 @@ use memofs::{IoResultExt, Vfs};
 use rbx_dom_weak::types::{Enum, Variant};
 
 use crate::{
+    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 use super::{
-    dir::{dir_meta, snapshot_dir_no_meta, syncback_dir},
+    dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
     meta_file::AdjacentMetadata,
+    DirectoryMetadata,
 };
 
 #[derive(Debug)]
@@ -142,7 +144,7 @@ pub fn syncback_lua<'new, 'old>(
     };
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst).metadata(InstanceMetadata::new()),
+        inst_snapshot: InstanceSnapshot::from_instance(inst),
         fs_snapshot: FsSnapshot::new().with_file(path, contents),
         // Scripts don't have a child!
         children: Vec::new(),
@@ -154,6 +156,8 @@ pub fn syncback_lua_init<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    let new_inst = snapshot.new_inst();
+
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.push("init");
     path.set_extension(match script_type {
@@ -161,19 +165,61 @@ pub fn syncback_lua_init<'new, 'old>(
         ScriptType::Client => "client.lua",
         ScriptType::Server => "server.lua",
     });
-    let contents =
-        if let Some(Variant::String(source)) = snapshot.new_inst().properties.get("Source") {
-            source.as_bytes().to_vec()
-        } else {
-            anyhow::bail!("Scripts must have a `Source` property that is a String")
-        };
+    let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
+        source.as_bytes().to_vec()
+    } else {
+        anyhow::bail!("Scripts must have a `Source` property that is a String")
+    };
+
+    let dir_syncback = syncback_dir_no_meta(snapshot)?;
 
-    let dir_syncback = syncback_dir(snapshot)?;
+    let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
+        dir
+    } else {
+        DirectoryMetadata {
+            ignore_unknown_instances: None,
+            class_name: None,
+            properties: HashMap::with_capacity(new_inst.properties.capacity()),
+            attributes: HashMap::new(),
+            path: snapshot
+                .parent_path
+                .join(&snapshot.name)
+                .join("init.meta.json"),
+        }
+    };
+    for (name, value) in snapshot.get_filtered_properties() {
+        if name == "Source" {
+            continue;
+        } else if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attrs) = value {
+                meta.attributes.extend(attrs.iter().map(|(name, value)| {
+                    (
+                        name.to_string(),
+                        UnresolvedValue::FullyQualified(value.clone()),
+                    )
+                }))
+            } else {
+                log::error!("Property {name} should be Attributes but is not");
+            }
+        } else {
+            meta.properties.insert(
+                name.to_string(),
+                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
+            );
+        }
+    }
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.push_file(path, contents);
     fs_snapshot.merge(dir_syncback.fs_snapshot);
 
+    if !meta.is_empty() {
+        fs_snapshot.push_file(
+            &meta.path,
+            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+        );
+    }
+
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot,

From 6f7cac8439fc818295358cb9eba55fc94b7c0a8a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 12:06:54 -0800
Subject: [PATCH 076/366] Correct small clippy lint in get_best_middleware

---
 src/syncback/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 00838232a..9508ceb11 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -134,7 +134,7 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
             }
         }
         "ModuleScript" => {
-            if inst.children().len() == 0 {
+            if inst.children().is_empty() {
                 Middleware::ModuleScript
             } else {
                 Middleware::ModuleScriptDir

From 4238bc4a17fe1b6a1ceda148f52a38c7f1831396 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 12:07:14 -0800
Subject: [PATCH 077/366] Add functions in meta_file middleware for getting
 metadata

---
 src/snapshot_middleware/meta_file.rs | 37 +++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index ed5958627..9eb3559c2 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -1,6 +1,11 @@
-use std::{borrow::Cow, collections::HashMap, path::PathBuf};
+use std::{
+    borrow::Cow,
+    collections::HashMap,
+    path::{Path, PathBuf},
+};
 
 use anyhow::{format_err, Context};
+use memofs::{IoResultExt as _, Vfs};
 use rbx_dom_weak::types::Attributes;
 use serde::{Deserialize, Serialize};
 
@@ -193,3 +198,33 @@ impl DirectoryMetadata {
             }
     }
 }
+
+/// Retrieves the meta file that should be applied for the provided directory,
+/// if it exists.
+pub fn dir_meta(vfs: &Vfs, path: &Path) -> anyhow::Result<Option<DirectoryMetadata>> {
+    let meta_path = path.join("init.meta.json");
+
+    if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? {
+        let metadata = DirectoryMetadata::from_slice(&meta_contents, meta_path)?;
+        Ok(Some(metadata))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Retrieves the meta file that should be applied for the provided file,
+/// if it exists.
+///
+/// The `name` field should be the name the metadata should have.
+pub fn file_meta(vfs: &Vfs, path: &Path, name: &str) -> anyhow::Result<Option<AdjacentMetadata>> {
+    let mut meta_path = path.with_file_name(name);
+    meta_path.set_extension("meta.json");
+
+    log::debug!("metadata: {}", meta_path.display());
+    if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? {
+        let metadata = AdjacentMetadata::from_slice(&meta_contents, meta_path)?;
+        Ok(Some(metadata))
+    } else {
+        Ok(None)
+    }
+}

From 23b50696370f127a1550057e0219b50e8f41498c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 12:13:54 -0800
Subject: [PATCH 078/366] Minor cleanup to json_model syncback

---
 src/snapshot_middleware/json_model.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 4a8dfafda..6cb131ef4 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -63,17 +63,15 @@ pub fn syncback_json_model<'new, 'old>(
 
     let new_inst = snapshot.new_inst();
 
-    let filtered = snapshot.get_filtered_properties();
-
     let mut properties = HashMap::with_capacity(new_inst.properties.capacity());
     let mut attributes = HashMap::new();
-    for (name, value) in filtered {
+    for (name, value) in snapshot.get_filtered_properties() {
         if name == "Attributes" || name == "AttributesSerialize" {
             if let Variant::Attributes(attr) = value {
                 attributes.extend(attr.iter().map(|(name, value)| {
                     (
                         name.to_string(),
-                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
+                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
                     )
                 }))
             } else {
@@ -88,7 +86,7 @@ pub fn syncback_json_model<'new, 'old>(
         } else {
             properties.insert(
                 name.to_string(),
-                UnresolvedValue::from_variant(value.clone(), &new_inst.class, &name),
+                UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
             );
         }
     }

From ffafc713b493888aaa60243d8f5fc5c11f237798 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 12:15:38 -0800
Subject: [PATCH 079/366] Support non-dir metadata also

---
 src/snapshot_middleware/lua.rs | 42 ++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index f57d39bcf..a87ca3ee8 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -12,7 +12,7 @@ use crate::{
 
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
-    meta_file::AdjacentMetadata,
+    meta_file::{file_meta, AdjacentMetadata},
     DirectoryMetadata,
 };
 
@@ -129,7 +129,7 @@ pub fn syncback_lua<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let inst = snapshot.new_inst();
+    let new_inst = snapshot.new_inst();
 
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension(match script_type {
@@ -137,14 +137,48 @@ pub fn syncback_lua<'new, 'old>(
         ScriptType::Client => "client.lua",
         ScriptType::Server => "server.lua",
     });
-    let contents = if let Some(Variant::String(source)) = inst.properties.get("Source") {
+    let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
     } else {
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
 
+    let mut meta = if let Some(meta) = file_meta(snapshot.vfs(), &path, &snapshot.name)? {
+        meta
+    } else {
+        AdjacentMetadata {
+            ignore_unknown_instances: None,
+            properties: HashMap::with_capacity(new_inst.properties.capacity()),
+            attributes: HashMap::new(),
+            path: path
+                .with_file_name(&snapshot.name)
+                .with_extension("meta.json"),
+        }
+    };
+    for (name, value) in snapshot.get_filtered_properties() {
+        if name == "Source" {
+            continue;
+        } else if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attrs) = value {
+                meta.attributes.extend(attrs.iter().map(|(name, value)| {
+                    (
+                        name.to_string(),
+                        UnresolvedValue::FullyQualified(value.clone()),
+                    )
+                }))
+            } else {
+                log::error!("Property {name} should be Attributes but is not");
+            }
+        } else {
+            meta.properties.insert(
+                name.to_string(),
+                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
+            );
+        }
+    }
+
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst),
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot: FsSnapshot::new().with_file(path, contents),
         // Scripts don't have a child!
         children: Vec::new(),

From 01bcd76f81aa3234759fd95f0c22bf8d14cadf02 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 12:16:06 -0800
Subject: [PATCH 080/366] Remove logging from file_meta function

---
 src/snapshot_middleware/meta_file.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 9eb3559c2..c2969c06c 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -220,7 +220,6 @@ pub fn file_meta(vfs: &Vfs, path: &Path, name: &str) -> anyhow::Result<Option<Ad
     let mut meta_path = path.with_file_name(name);
     meta_path.set_extension("meta.json");
 
-    log::debug!("metadata: {}", meta_path.display());
     if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? {
         let metadata = AdjacentMetadata::from_slice(&meta_contents, meta_path)?;
         Ok(Some(metadata))

From 810244551a5153ac71dc8247c3d6775ac0f9e416 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Dec 2023 12:21:22 -0800
Subject: [PATCH 081/366] Why did I even have an Rc?

---
 src/snapshot_middleware/project.rs | 6 +++---
 src/syncback/mod.rs                | 9 +++------
 src/syncback/snapshot.rs           | 7 ++++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index c02de3d69..9a5cda0b9 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -345,7 +345,7 @@ pub fn syncback_project<'new, 'old>(
         for (child_name, child_node) in &mut node.children {
             if let Some(new_child) = new_child_map.get(child_name.as_str()) {
                 if let Some(old_child) = old_child_map.get(child_name.as_str()) {
-                    if &new_child.class != old_child.class_name() {
+                    if new_child.class != old_child.class_name() {
                         anyhow::bail!("Cannot change the class of {child_name} in a project");
                     }
                     for (name, value) in &new_child.properties {
@@ -386,7 +386,7 @@ pub fn syncback_project<'new, 'old>(
                 // All children are descendants of a node of a project
                 // So we really just need to track which one is which.
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data.clone(),
+                    data: snapshot.data,
                     old: Some(old_inst.id()),
                     new: new_child.referent(),
                     parent_path,
@@ -396,7 +396,7 @@ pub fn syncback_project<'new, 'old>(
             } else {
                 // it's new
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data.clone(),
+                    data: snapshot.data,
                     old: None,
                     new: new_child.referent(),
                     parent_path,
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 9508ceb11..59fa08d55 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -7,10 +7,7 @@ use rbx_dom_weak::{
     Instance, WeakDom,
 };
 use serde::{Deserialize, Serialize};
-use std::{
-    collections::{HashMap, VecDeque},
-    rc::Rc,
-};
+use std::collections::{HashMap, VecDeque};
 
 use crate::{
     resolution::UnresolvedValue,
@@ -33,11 +30,11 @@ pub fn syncback_loop<'old, 'new>(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(new_tree);
 
-    let syncback_data = Rc::new(SyncbackData {
+    let syncback_data = SyncbackData {
         vfs,
         old_tree,
         new_tree,
-    });
+    };
 
     let mut snapshots = vec![SyncbackSnapshot {
         data: syncback_data,
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 3a2db8634..cfe782730 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,5 +1,5 @@
 use memofs::Vfs;
-use std::{collections::HashMap, path::PathBuf, rc::Rc};
+use std::{collections::HashMap, path::PathBuf};
 
 use crate::{
     snapshot::{InstanceWithMeta, RojoTree},
@@ -10,6 +10,7 @@ use rbx_dom_weak::{
     Instance, WeakDom,
 };
 
+#[derive(Clone, Copy)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
@@ -17,7 +18,7 @@ pub struct SyncbackData<'new, 'old> {
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
-    pub data: Rc<SyncbackData<'new, 'old>>,
+    pub data: SyncbackData<'new, 'old>,
     pub old: Option<Ref>,
     pub new: Ref,
     pub parent_path: PathBuf,
@@ -30,7 +31,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     #[inline]
     pub fn from_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
-            data: Rc::clone(&self.data),
+            data: self.data,
             old: old_ref,
             new: new_ref,
             parent_path: self.parent_path.join(&self.name),

From 1b4e992482f2765c9a9b566b8636b8cef2e077c3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 11:09:53 -0800
Subject: [PATCH 082/366] Add method for checking if AdjacentMetadata is empty

---
 src/snapshot_middleware/meta_file.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index c2969c06c..3cd31ea4a 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -83,6 +83,18 @@ impl AdjacentMetadata {
         Ok(())
     }
 
+    /// Returns whether the metadata is 'empty', meaning it doesn't have anything
+    /// worth persisting in it. Specifically:
+    ///
+    /// - The number of properties and attributes is 0
+    /// - `ignore_unknown_instances` is None
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.attributes.is_empty()
+            && self.properties.is_empty()
+            && self.ignore_unknown_instances.is_none()
+    }
+
     // TODO: Add method to allow selectively applying parts of metadata and
     // throwing errors if invalid parts are specified.
 }
@@ -188,8 +200,8 @@ impl DirectoryMetadata {
     /// - `class_name` is either None or not Some("Folder")
     #[inline]
     pub fn is_empty(&self) -> bool {
-        self.attributes.len() == 0
-            && self.properties.len() == 0
+        self.attributes.is_empty()
+            && self.properties.is_empty()
             && self.ignore_unknown_instances.is_none()
             && if let Some(class) = &self.class_name {
                 class == "Folder"

From 1e29dfed72cd5d0bd2bb2950b552ee6a42c2aa51 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 11:10:22 -0800
Subject: [PATCH 083/366] Add (incomplete) implementation of CSV syncback

---
 src/snapshot_middleware/csv.rs | 141 +++++++++++++++++++++++++++++++--
 src/snapshot_middleware/mod.rs |   3 +-
 src/syncback/mod.rs            |   7 ++
 3 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 594b5d53b..05ae716b5 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -1,15 +1,23 @@
-use std::{collections::BTreeMap, path::Path};
+use std::{
+    collections::{BTreeMap, BTreeSet, HashMap},
+    path::Path,
+};
 
 use anyhow::Context;
 use maplit::hashmap;
 use memofs::{IoResultExt, Vfs};
-use serde::Serialize;
+use rbx_dom_weak::types::Variant;
+use serde::{Deserialize, Serialize};
 
-use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
+use crate::{
+    resolution::UnresolvedValue,
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+};
 
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta},
-    meta_file::AdjacentMetadata,
+    meta_file::{file_meta, AdjacentMetadata},
 };
 
 pub fn snapshot_csv(
@@ -89,11 +97,78 @@ pub fn snapshot_csv_init(
     Ok(Some(init_snapshot))
 }
 
+pub fn syncback_csv<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    let new_inst = snapshot.new_inst();
+
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.set_extension("csv");
+
+    let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
+        content.as_str()
+    } else {
+        anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
+    };
+
+    let mut meta = if let Some(meta) = file_meta(snapshot.vfs(), &path, &snapshot.name)? {
+        meta
+    } else {
+        AdjacentMetadata {
+            ignore_unknown_instances: None,
+            properties: HashMap::with_capacity(new_inst.properties.len()),
+            attributes: HashMap::new(),
+            path: path
+                .with_file_name(&snapshot.name)
+                .with_extension("meta.json"),
+        }
+    };
+    for (name, value) in snapshot.get_filtered_properties() {
+        log::debug!("property: {name}");
+        if name == "Contents" {
+            continue;
+        } else if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attrs) = value {
+                meta.attributes.extend(attrs.iter().map(|(name, value)| {
+                    (
+                        name.to_string(),
+                        UnresolvedValue::FullyQualified(value.clone()),
+                    )
+                }))
+            } else {
+                log::error!("Property {name} should be Attributes but is not");
+            }
+        } else {
+            meta.properties.insert(
+                name.to_string(),
+                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
+            );
+        }
+    }
+
+    // TODO tags don't work, why?
+    let mut fs_snapshot = FsSnapshot::new();
+    fs_snapshot.push_file(path, localization_to_csv(contents)?);
+    if !meta.is_empty() {
+        fs_snapshot.push_file(
+            &meta.path,
+            serde_json::to_vec_pretty(&meta).context("failed to reserialize metadata")?,
+        )
+    }
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
+        fs_snapshot,
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
 /// Struct that holds any valid row from a Roblox CSV translation table.
 ///
 /// We manually deserialize into this table from CSV, but let serde_json handle
 /// serialization.
-#[derive(Debug, Default, Serialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct LocalizationEntry<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -166,6 +241,62 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
     Ok(encoded)
 }
 
+/// Takes a localization table (as a string) and converts it into a CSV file.
+///
+/// The CSV file is ordered, so it should be deterministic.
+fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
+    let mut out = Vec::new();
+    let mut writer = csv::Writer::from_writer(&mut out);
+
+    // TODO deserialize this properly to dodge the bug listed above
+    let mut csv: Vec<LocalizationEntry> =
+        serde_json::from_str(csv_contents).context("cannot decode JSON from localization table")?;
+
+    // TODO sort this better
+    csv.sort_unstable_by_key(|entry| entry.source);
+
+    let mut headers = vec!["Key", "Source", "Context", "Example"];
+    // We want both order and a lack of duplicates, so we use a BTreeSet.
+    let mut extra_headers = BTreeSet::new();
+    for entry in &csv {
+        for lang in entry.values.keys() {
+            extra_headers.insert(*lang);
+        }
+    }
+    headers.extend(extra_headers.iter());
+
+    writer
+        .write_record(&headers)
+        .context("could not write headers for localization table")?;
+
+    let mut record = Vec::with_capacity(headers.len());
+    for entry in csv {
+        record.push(entry.key.unwrap_or_default());
+        record.push(entry.source.unwrap_or_default());
+        record.push(entry.context.unwrap_or_default());
+        record.push(entry.example.unwrap_or_default());
+
+        let values = entry.values;
+        for header in &extra_headers {
+            record.push(
+                values
+                    .get(header)
+                    .context("missing header for localization table record")?,
+            );
+        }
+
+        writer
+            .write_record(&record)
+            .context("cannot write record for localization table")?;
+        record.clear();
+    }
+
+    // We must drop `writer`` here to regain access to `out`.
+    drop(writer);
+
+    Ok(out)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 818968b64..bb1fd3688 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -37,7 +37,7 @@ use crate::{
 };
 
 use self::{
-    csv::{snapshot_csv, snapshot_csv_init},
+    csv::{snapshot_csv, snapshot_csv_init, syncback_csv},
     dir::{snapshot_dir, syncback_dir},
     json::snapshot_json,
     json_model::{snapshot_json_model, syncback_json_model},
@@ -254,6 +254,7 @@ impl Middleware {
             );
         }
         match self {
+            Middleware::Csv => syncback_csv(snapshot),
             Middleware::Project => syncback_project(snapshot),
             Middleware::ServerScript => syncback_lua(ScriptType::Server, snapshot),
             Middleware::ClientScript => syncback_lua(ScriptType::Client, snapshot),
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 59fa08d55..c704ecb3c 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -137,6 +137,13 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
                 Middleware::ModuleScriptDir
             }
         }
+        "LocalizationTable" => {
+            if inst.children().is_empty() {
+                Middleware::Csv
+            } else {
+                Middleware::CsvDir
+            }
+        }
         _ => Middleware::Rbxm,
     }
 }

From 37d9d727b2a803277f75a9c86dbc2c58e8aa1faa Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 11:29:21 -0800
Subject: [PATCH 084/366] Use dir middleware for json models with children

---
 src/syncback/mod.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c704ecb3c..7833c9721 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -115,7 +115,15 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
         | "BlurEffect"
         | "ColorCorrectionEffect"
         | "DepthOfFieldEffect"
-        | "SunRaysEffect" => Middleware::JsonModel,
+        | "SunRaysEffect" => {
+            if inst.children().is_empty() {
+                Middleware::JsonModel
+            } else {
+                // This begs the question of an init.model.json but we'll leave
+                // that for another day.
+                Middleware::Dir
+            }
+        }
         "Script" => {
             if inst.children().is_empty() {
                 Middleware::ServerScript

From 6e5c6b35256bae7f30e6c10a5f684e53e956dd3e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 11:33:54 -0800
Subject: [PATCH 085/366] Reorder and map out middleware matching

---
 src/snapshot_middleware/mod.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index bb1fd3688..82bd25848 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -255,19 +255,22 @@ impl Middleware {
         }
         match self {
             Middleware::Csv => syncback_csv(snapshot),
+            Middleware::JsonModel => syncback_json_model(snapshot),
+            Middleware::Json => unimplemented!(),
             Middleware::Project => syncback_project(snapshot),
             Middleware::ServerScript => syncback_lua(ScriptType::Server, snapshot),
             Middleware::ClientScript => syncback_lua(ScriptType::Client, snapshot),
             Middleware::ModuleScript => syncback_lua(ScriptType::Module, snapshot),
-            Middleware::Rbxmx => syncback_rbxmx(snapshot),
             Middleware::Rbxm => syncback_rbxm(snapshot),
+            Middleware::Rbxmx => syncback_rbxmx(snapshot),
+            Middleware::Toml => unimplemented!(),
             Middleware::Text => syncback_txt(snapshot),
-            Middleware::JsonModel => syncback_json_model(snapshot),
+            Middleware::Ignore => anyhow::bail!("cannot syncback Ignore middleware"),
             Middleware::Dir => syncback_dir(snapshot),
             Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
             Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
             Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
-            _ => anyhow::bail!("cannot syncback with middleware {:?}", self),
+            Middleware::CsvDir => unimplemented!(),
         }
     }
 }

From 27b4da48a6d585debf5e24eaec572c5754d8f3dd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 12:32:45 -0800
Subject: [PATCH 086/366] Use BTreeMaps instead of HashMaps when appropriate
 This ensures that the order of properties and attributes is consistent

---
 src/project.rs                        | 10 ++++-----
 src/snapshot_middleware/csv.rs        |  6 +++---
 src/snapshot_middleware/dir.rs        |  6 +++---
 src/snapshot_middleware/json_model.rs | 21 +++++++++++--------
 src/snapshot_middleware/lua.rs        | 14 ++++++++-----
 src/snapshot_middleware/meta_file.rs  | 29 +++++++++++++++------------
 6 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/project.rs b/src/project.rs
index fc9e4581d..660bfe31c 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -1,5 +1,5 @@
 use std::{
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{BTreeMap, HashSet},
     fs, io,
     net::IpAddr,
     path::{Path, PathBuf},
@@ -242,16 +242,16 @@ pub struct ProjectNode {
     #[serde(
         rename = "$properties",
         default,
-        skip_serializing_if = "HashMap::is_empty"
+        skip_serializing_if = "BTreeMap::is_empty"
     )]
-    pub properties: HashMap<String, UnresolvedValue>,
+    pub properties: BTreeMap<String, UnresolvedValue>,
 
     #[serde(
         rename = "$attributes",
         default,
-        skip_serializing_if = "HashMap::is_empty"
+        skip_serializing_if = "BTreeMap::is_empty"
     )]
-    pub attributes: HashMap<String, UnresolvedValue>,
+    pub attributes: BTreeMap<String, UnresolvedValue>,
 
     /// Defines the behavior when Rojo encounters unknown instances in Roblox
     /// Studio during live sync. `$ignoreUnknownInstances` should be considered
diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 05ae716b5..f5faa4fff 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -1,5 +1,5 @@
 use std::{
-    collections::{BTreeMap, BTreeSet, HashMap},
+    collections::{BTreeMap, BTreeSet},
     path::Path,
 };
 
@@ -116,8 +116,8 @@ pub fn syncback_csv<'new, 'old>(
     } else {
         AdjacentMetadata {
             ignore_unknown_instances: None,
-            properties: HashMap::with_capacity(new_inst.properties.len()),
-            attributes: HashMap::new(),
+            properties: BTreeMap::new(),
+            attributes: BTreeMap::new(),
             path: path
                 .with_file_name(&snapshot.name)
                 .with_extension("meta.json"),
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 700036be9..d276b85f7 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,5 +1,5 @@
 use std::{
-    collections::{HashMap, HashSet},
+    collections::{BTreeMap, HashMap, HashSet},
     path::Path,
 };
 
@@ -108,8 +108,8 @@ pub fn syncback_dir<'new, 'old>(
     } else {
         DirectoryMetadata {
             ignore_unknown_instances: None,
-            properties: HashMap::with_capacity(new_inst.properties.capacity()),
-            attributes: HashMap::new(),
+            properties: BTreeMap::new(),
+            attributes: BTreeMap::new(),
             class_name: if new_inst.class == "Folder" {
                 None
             } else {
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 6cb131ef4..261444977 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -1,4 +1,9 @@
-use std::{borrow::Cow, collections::HashMap, path::Path, str};
+use std::{
+    borrow::Cow,
+    collections::{BTreeMap, HashMap},
+    path::Path,
+    str,
+};
 
 use anyhow::Context;
 use memofs::Vfs;
@@ -63,8 +68,8 @@ pub fn syncback_json_model<'new, 'old>(
 
     let new_inst = snapshot.new_inst();
 
-    let mut properties = HashMap::with_capacity(new_inst.properties.capacity());
-    let mut attributes = HashMap::new();
+    let mut properties = BTreeMap::new();
+    let mut attributes = BTreeMap::new();
     for (name, value) in snapshot.get_filtered_properties() {
         if name == "Attributes" || name == "AttributesSerialize" {
             if let Variant::Attributes(attr) = value {
@@ -130,13 +135,13 @@ struct JsonModel {
 
     #[serde(
         alias = "Properties",
-        default = "HashMap::new",
-        skip_serializing_if = "HashMap::is_empty"
+        default = "BTreeMap::new",
+        skip_serializing_if = "BTreeMap::is_empty"
     )]
-    properties: HashMap<String, UnresolvedValue>,
+    properties: BTreeMap<String, UnresolvedValue>,
 
-    #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
-    attributes: HashMap<String, UnresolvedValue>,
+    #[serde(default = "BTreeMap::new", skip_serializing_if = "BTreeMap::is_empty")]
+    attributes: BTreeMap<String, UnresolvedValue>,
 }
 
 impl JsonModel {
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index a87ca3ee8..3fb5382c6 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -1,4 +1,8 @@
-use std::{collections::HashMap, path::Path, str};
+use std::{
+    collections::{BTreeMap, HashMap},
+    path::Path,
+    str,
+};
 
 use anyhow::Context;
 use memofs::{IoResultExt, Vfs};
@@ -148,8 +152,8 @@ pub fn syncback_lua<'new, 'old>(
     } else {
         AdjacentMetadata {
             ignore_unknown_instances: None,
-            properties: HashMap::with_capacity(new_inst.properties.capacity()),
-            attributes: HashMap::new(),
+            properties: BTreeMap::new(),
+            attributes: BTreeMap::new(),
             path: path
                 .with_file_name(&snapshot.name)
                 .with_extension("meta.json"),
@@ -213,8 +217,8 @@ pub fn syncback_lua_init<'new, 'old>(
         DirectoryMetadata {
             ignore_unknown_instances: None,
             class_name: None,
-            properties: HashMap::with_capacity(new_inst.properties.capacity()),
-            attributes: HashMap::new(),
+            properties: BTreeMap::new(),
+            attributes: BTreeMap::new(),
             path: snapshot
                 .parent_path
                 .join(&snapshot.name)
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 3cd31ea4a..058c10e11 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -1,6 +1,6 @@
 use std::{
     borrow::Cow,
-    collections::HashMap,
+    collections::BTreeMap,
     path::{Path, PathBuf},
 };
 
@@ -21,11 +21,11 @@ pub struct AdjacentMetadata {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ignore_unknown_instances: Option<bool>,
 
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, UnresolvedValue>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub properties: BTreeMap<String, UnresolvedValue>,
 
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub attributes: HashMap<String, UnresolvedValue>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub attributes: BTreeMap<String, UnresolvedValue>,
 
     #[serde(skip)]
     pub path: PathBuf,
@@ -53,7 +53,10 @@ impl AdjacentMetadata {
     pub fn apply_properties(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
         let path = &self.path;
 
-        for (key, unresolved) in self.properties.drain() {
+        // BTreeMaps don't have an equivalent to HashMap::drain, so the next
+        // best option is to take ownership of the entire map. Not free, but
+        // very cheap.
+        for (key, unresolved) in std::mem::take(&mut self.properties) {
             let value = unresolved
                 .resolve(&snapshot.class_name, &key)
                 .with_context(|| format!("error applying meta file {}", path.display()))?;
@@ -64,7 +67,7 @@ impl AdjacentMetadata {
         if !self.attributes.is_empty() {
             let mut attributes = Attributes::new();
 
-            for (key, unresolved) in self.attributes.drain() {
+            for (key, unresolved) in std::mem::take(&mut self.attributes) {
                 let value = unresolved.resolve_unambiguous()?;
                 attributes.insert(key, value);
             }
@@ -109,11 +112,11 @@ pub struct DirectoryMetadata {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ignore_unknown_instances: Option<bool>,
 
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, UnresolvedValue>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub properties: BTreeMap<String, UnresolvedValue>,
 
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub attributes: HashMap<String, UnresolvedValue>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub attributes: BTreeMap<String, UnresolvedValue>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub class_name: Option<String>,
@@ -168,7 +171,7 @@ impl DirectoryMetadata {
     fn apply_properties(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
         let path = &self.path;
 
-        for (key, unresolved) in self.properties.drain() {
+        for (key, unresolved) in std::mem::take(&mut self.properties) {
             let value = unresolved
                 .resolve(&snapshot.class_name, &key)
                 .with_context(|| format!("error applying meta file {}", path.display()))?;
@@ -179,7 +182,7 @@ impl DirectoryMetadata {
         if !self.attributes.is_empty() {
             let mut attributes = Attributes::new();
 
-            for (key, unresolved) in self.attributes.drain() {
+            for (key, unresolved) in std::mem::take(&mut self.attributes) {
                 let value = unresolved.resolve_unambiguous()?;
                 attributes.insert(key, value);
             }

From d6e7550643ee5a837a7864bd1683e945d6804726 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 16:31:39 -0800
Subject: [PATCH 087/366] Introduce cows to the CSV middleware syncback (moo)

---
 src/snapshot_middleware/csv.rs | 48 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index f5faa4fff..978169ba6 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -1,4 +1,5 @@
 use std::{
+    borrow::Cow,
     collections::{BTreeMap, BTreeSet},
     path::Path,
 };
@@ -172,19 +173,19 @@ pub fn syncback_csv<'new, 'old>(
 #[serde(rename_all = "camelCase")]
 struct LocalizationEntry<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
-    key: Option<&'a str>,
+    key: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    context: Option<&'a str>,
+    context: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    example: Option<&'a str>,
+    example: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    source: Option<&'a str>,
+    source: Option<Cow<'a, str>>,
 
     // We use a BTreeMap here to get deterministic output order.
-    values: BTreeMap<&'a str, &'a str>,
+    values: BTreeMap<Cow<'a, str>, Cow<'a, str>>,
 }
 
 /// Normally, we'd be able to let the csv crate construct our struct for us.
@@ -218,12 +219,14 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
             }
 
             match header {
-                "Key" => entry.key = Some(value),
-                "Source" => entry.source = Some(value),
-                "Context" => entry.context = Some(value),
-                "Example" => entry.example = Some(value),
+                "Key" => entry.key = Some(Cow::Borrowed(value)),
+                "Source" => entry.source = Some(Cow::Borrowed(value)),
+                "Context" => entry.context = Some(Cow::Borrowed(value)),
+                "Example" => entry.example = Some(Cow::Borrowed(value)),
                 _ => {
-                    entry.values.insert(header, value);
+                    entry
+                        .values
+                        .insert(Cow::Borrowed(value), Cow::Borrowed(value));
                 }
             }
         }
@@ -248,19 +251,18 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
     let mut out = Vec::new();
     let mut writer = csv::Writer::from_writer(&mut out);
 
-    // TODO deserialize this properly to dodge the bug listed above
     let mut csv: Vec<LocalizationEntry> =
         serde_json::from_str(csv_contents).context("cannot decode JSON from localization table")?;
 
     // TODO sort this better
-    csv.sort_unstable_by_key(|entry| entry.source);
+    csv.sort_unstable_by(|a, b| a.source.partial_cmp(&b.source).unwrap());
 
     let mut headers = vec!["Key", "Source", "Context", "Example"];
     // We want both order and a lack of duplicates, so we use a BTreeSet.
     let mut extra_headers = BTreeSet::new();
     for entry in &csv {
         for lang in entry.values.keys() {
-            extra_headers.insert(*lang);
+            extra_headers.insert(lang.as_ref());
         }
     }
     headers.extend(extra_headers.iter());
@@ -269,20 +271,16 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
         .write_record(&headers)
         .context("could not write headers for localization table")?;
 
-    let mut record = Vec::with_capacity(headers.len());
-    for entry in csv {
-        record.push(entry.key.unwrap_or_default());
-        record.push(entry.source.unwrap_or_default());
-        record.push(entry.context.unwrap_or_default());
-        record.push(entry.example.unwrap_or_default());
+    let mut record: Vec<&str> = Vec::with_capacity(headers.len());
+    for entry in &csv {
+        record.push(entry.key.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.source.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.context.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.example.as_ref().unwrap_or(&Cow::Borrowed("")));
 
-        let values = entry.values;
+        let values = &entry.values;
         for header in &extra_headers {
-            record.push(
-                values
-                    .get(header)
-                    .context("missing header for localization table record")?,
-            );
+            record.push(values.get(*header).unwrap_or(&Cow::Borrowed("")));
         }
 
         writer

From 869aa4bf66ba23d4c41565e0a08e21ab79ddc764 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 16:38:58 -0800
Subject: [PATCH 088/366] Support metadata for text middleware

---
 src/snapshot_middleware/txt.rs | 45 ++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index c6fa0b34e..53928d59c 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -1,4 +1,4 @@
-use std::{path::Path, str};
+use std::{collections::BTreeMap, path::Path, str};
 
 use anyhow::Context;
 use maplit::hashmap;
@@ -6,11 +6,12 @@ use memofs::{IoResultExt, Vfs};
 use rbx_dom_weak::types::Variant;
 
 use crate::{
+    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
-use super::meta_file::AdjacentMetadata;
+use super::meta_file::{file_meta, AdjacentMetadata};
 
 pub fn snapshot_txt(
     context: &InstanceContext,
@@ -51,18 +52,52 @@ pub fn snapshot_txt(
 pub fn syncback_txt<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let inst = snapshot.new_inst();
+    let new_inst = snapshot.new_inst();
     let mut path = snapshot.parent_path.join(&snapshot.name);
     path.set_extension("txt");
 
-    let contents = if let Some(Variant::String(source)) = inst.properties.get("Value") {
+    let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Value") {
         source.as_bytes().to_vec()
     } else {
         anyhow::bail!("StringValues must have a `Value` property that is a String");
     };
 
+    let mut meta = if let Some(meta) = file_meta(snapshot.vfs(), &path, &snapshot.name)? {
+        meta
+    } else {
+        AdjacentMetadata {
+            ignore_unknown_instances: None,
+            properties: BTreeMap::new(),
+            attributes: BTreeMap::new(),
+            path: path
+                .with_file_name(&snapshot.name)
+                .with_extension("meta.json"),
+        }
+    };
+    for (name, value) in snapshot.get_filtered_properties() {
+        if name == "Value" {
+            continue;
+        } else if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attrs) = value {
+                meta.attributes.extend(attrs.iter().map(|(name, value)| {
+                    (
+                        name.to_string(),
+                        UnresolvedValue::FullyQualified(value.clone()),
+                    )
+                }))
+            } else {
+                log::error!("Property {name} should be Attributes but is not");
+            }
+        } else {
+            meta.properties.insert(
+                name.to_string(),
+                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
+            );
+        }
+    }
+
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst),
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot: FsSnapshot::new().with_file(path, contents),
         children: Vec::new(),
         removed_children: Vec::new(),

From 408267c48a318b40ce4438c39169930bc252408d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Dec 2023 16:40:12 -0800
Subject: [PATCH 089/366] Add StringValue to get_best_middleware

---
 src/syncback/mod.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 7833c9721..c389389e1 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -124,6 +124,13 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
                 Middleware::Dir
             }
         }
+        "StringValue" => {
+            if inst.children().is_empty() {
+                Middleware::Text
+            } else {
+                Middleware::Dir
+            }
+        }
         "Script" => {
             if inst.children().is_empty() {
                 Middleware::ServerScript

From 003da67e9f1fca4ac439e5f290a0c021b7b3394d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 08:15:55 -0800
Subject: [PATCH 090/366] Add basic changelog entry for syncback

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70a7d5a81..7e4021a7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,30 @@
 # Rojo Changelog
 
 ## Unreleased Changes
+* A new command `rojo syncback` has been added. It can be used as `rojo syncback [path to project] --input [path to file]`.
+ 	This command takes a Roblox file and pulls Instances out of it and places them in the correct position in the provided project.
+    Syncback is primarily controlled by the project file. Any Instances who are either referenced in the project file or a descendant
+    of one that is will be placed in an appropriate location.
+
+    In addition, a new field has been added to project files, `syncbackRules` to control how it behaves:
+
+    ```json
+    {
+        "syncbackRules": {
+            "ignorePaths": [
+                "Workspace/Camera",
+                "ServerStorage/ImportantSecrets/**",
+            ],
+            "ignoreProperties": {
+                "Part": ["Color"]
+            },
+            "defaultOverrides": {
+                "Part":
+            }
+        }
+    }
+    ```
+
 * Added popout diff visualizer for table properties like Attributes and Tags ([#834])
 * Updated Theme to use Studio colors ([#838])
 * Projects may now specify rules for syncing files as if they had a different file extension. ([#813])

From da9a81489517f9dd847cdac5eb4dc6688a5d0eaa Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 09:44:45 -0800
Subject: [PATCH 091/366] Derive Default + document FsSnapshot

---
 src/syncback/fs_snapshot.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 27fb272af..6aa05e2cf 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -7,6 +7,12 @@ use std::{
 
 use memofs::Vfs;
 
+/// A simple representation of a subsection of a file system.
+///
+/// This is distinct from the snapshot provided by memofs (`VfsSnapshot`) due
+/// to the need to support writing to the file system instead of an in-memory
+/// file system.
+#[derive(Default)]
 pub struct FsSnapshot {
     files: HashMap<PathBuf, Arc<Vec<u8>>>,
     dir: HashSet<PathBuf>,

From d35c4bbebced5276e983cbac73e1424030d3a30f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 09:48:44 -0800
Subject: [PATCH 092/366] Implement CsvDir snapshot

---
 src/snapshot_middleware/csv.rs | 74 ++++++++++++++++++++++++++++++++--
 src/snapshot_middleware/mod.rs |  8 ++--
 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 978169ba6..c60c1d648 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -17,8 +17,9 @@ use crate::{
 };
 
 use super::{
-    dir::{dir_meta, snapshot_dir_no_meta},
+    dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
     meta_file::{file_meta, AdjacentMetadata},
+    DirectoryMetadata,
 };
 
 pub fn snapshot_csv(
@@ -125,7 +126,6 @@ pub fn syncback_csv<'new, 'old>(
         }
     };
     for (name, value) in snapshot.get_filtered_properties() {
-        log::debug!("property: {name}");
         if name == "Contents" {
             continue;
         } else if name == "Attributes" || name == "AttributesSerialize" {
@@ -165,6 +165,74 @@ pub fn syncback_csv<'new, 'old>(
     })
 }
 
+pub fn syncback_csv_init<'new, 'old>(
+    snapshot: &SyncbackSnapshot<'new, 'old>,
+) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    let new_inst = snapshot.new_inst();
+
+    let mut path = snapshot.parent_path.join(&snapshot.name);
+    path.push("init.csv");
+
+    let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
+        content.as_str()
+    } else {
+        anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
+    };
+
+    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
+    let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
+        dir
+    } else {
+        DirectoryMetadata {
+            ignore_unknown_instances: None,
+            class_name: None,
+            properties: BTreeMap::new(),
+            attributes: BTreeMap::new(),
+            path: snapshot
+                .parent_path
+                .join(&snapshot.name)
+                .join("init.meta.json"),
+        }
+    };
+    for (name, value) in snapshot.get_filtered_properties() {
+        if name == "Contents" {
+            continue;
+        } else if name == "Attributes" || name == "AttributesSerialize" {
+            if let Variant::Attributes(attrs) = value {
+                meta.attributes.extend(attrs.iter().map(|(name, value)| {
+                    (
+                        name.to_string(),
+                        UnresolvedValue::FullyQualified(value.clone()),
+                    )
+                }))
+            } else {
+                log::error!("Property {name} should be Attributes but is not");
+            }
+        } else {
+            meta.properties.insert(
+                name.to_string(),
+                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
+            );
+        }
+    }
+
+    let mut fs_snapshot = std::mem::take(&mut dir_syncback.fs_snapshot);
+    fs_snapshot.push_file(&path, localization_to_csv(contents)?);
+    if !meta.is_empty() {
+        fs_snapshot.push_file(
+            &meta.path,
+            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+        );
+    }
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
+        fs_snapshot,
+        children: dir_syncback.children,
+        removed_children: dir_syncback.removed_children,
+    })
+}
+
 /// Struct that holds any valid row from a Roblox CSV translation table.
 ///
 /// We manually deserialize into this table from CSV, but let serde_json handle
@@ -289,7 +357,7 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
         record.clear();
     }
 
-    // We must drop `writer`` here to regain access to `out`.
+    // We must drop `writer` here to regain access to `out`.
     drop(writer);
 
     Ok(out)
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 82bd25848..9e66991a4 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -37,7 +37,7 @@ use crate::{
 };
 
 use self::{
-    csv::{snapshot_csv, snapshot_csv_init, syncback_csv},
+    csv::{snapshot_csv, snapshot_csv_init, syncback_csv, syncback_csv_init},
     dir::{snapshot_dir, syncback_dir},
     json::snapshot_json,
     json_model::{snapshot_json_model, syncback_json_model},
@@ -50,9 +50,7 @@ use self::{
 };
 
 pub use self::{
-    lua::ScriptType,
-    meta_file::{AdjacentMetadata, DirectoryMetadata},
-    project::snapshot_project_node,
+    lua::ScriptType, meta_file::DirectoryMetadata, project::snapshot_project_node,
     util::emit_legacy_scripts_default,
 };
 
@@ -270,7 +268,7 @@ impl Middleware {
             Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
             Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
             Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
-            Middleware::CsvDir => unimplemented!(),
+            Middleware::CsvDir => syncback_csv_init(snapshot),
         }
     }
 }

From 5ffd7a067c051e634bfcb05544dfcb9f706fdc2e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 10:15:37 -0800
Subject: [PATCH 093/366] Properly handle Json and Toml for the moment

---
 src/snapshot_middleware/mod.rs | 4 ++--
 src/syncback/mod.rs            | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 9e66991a4..8e8022cfe 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -254,14 +254,14 @@ impl Middleware {
         match self {
             Middleware::Csv => syncback_csv(snapshot),
             Middleware::JsonModel => syncback_json_model(snapshot),
-            Middleware::Json => unimplemented!(),
+            Middleware::Json => unimplemented!("cannot syncback Json middleware"),
             Middleware::Project => syncback_project(snapshot),
             Middleware::ServerScript => syncback_lua(ScriptType::Server, snapshot),
             Middleware::ClientScript => syncback_lua(ScriptType::Client, snapshot),
             Middleware::ModuleScript => syncback_lua(ScriptType::Module, snapshot),
             Middleware::Rbxm => syncback_rbxm(snapshot),
             Middleware::Rbxmx => syncback_rbxmx(snapshot),
-            Middleware::Toml => unimplemented!(),
+            Middleware::Toml => unimplemented!("cannot syncback Toml middleware"),
             Middleware::Text => syncback_txt(snapshot),
             Middleware::Ignore => anyhow::bail!("cannot syncback Ignore middleware"),
             Middleware::Dir => syncback_dir(snapshot),
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c389389e1..2843bbaa2 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -81,6 +81,14 @@ pub fn syncback_loop<'old, 'new>(
             middleware
         );
 
+        if matches!(middleware, Middleware::Json | Middleware::Toml) {
+            log::warn!(
+                "Cannot syncback {middleware:?} at {}, skipping",
+                get_inst_path(new_tree, snapshot.new)
+            );
+            continue;
+        }
+
         let syncback = middleware.syncback(&snapshot)?;
 
         if let Some(old_inst) = snapshot.old_inst() {

From 18db6a1a6d1b05d1386043c5cf054c383445a5a8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 11:47:12 -0800
Subject: [PATCH 094/366] More properly handle syncbackRules

---
 src/project.rs           |  6 ++---
 src/syncback/mod.rs      | 47 +++++++++++++---------------------------
 src/syncback/snapshot.rs | 32 ++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/src/project.rs b/src/project.rs
index 660bfe31c..768335f64 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -8,9 +8,7 @@ use std::{
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{
-    glob::Glob, resolution::UnresolvedValue, snapshot::SyncRule, syncback::SyncbackIgnoreRules,
-};
+use crate::{glob::Glob, resolution::UnresolvedValue, snapshot::SyncRule, syncback::SyncbackRules};
 
 static PROJECT_FILENAME: &str = "default.project.json";
 
@@ -88,7 +86,7 @@ pub struct Project {
 
     /// A list of rules for syncback with this project file.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub syncback_rules: Option<SyncbackIgnoreRules>,
+    pub syncback_rules: Option<SyncbackRules>,
 
     /// A list of mappings of globs to syncing rules. If a file matches a glob,
     /// it will be 'transformed' into an Instance following the rule provided.
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 2843bbaa2..69fdd2731 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -2,15 +2,11 @@ mod fs_snapshot;
 mod snapshot;
 
 use memofs::Vfs;
-use rbx_dom_weak::{
-    types::{Ref, Variant},
-    Instance, WeakDom,
-};
+use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, VecDeque};
 
 use crate::{
-    resolution::UnresolvedValue,
     snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,
@@ -34,6 +30,10 @@ pub fn syncback_loop<'old, 'new>(
         vfs,
         old_tree,
         new_tree,
+        ignore_props: project
+            .syncback_rules
+            .as_ref()
+            .map(|rules| &rules.ignore_properties),
     };
 
     let mut snapshots = vec![SyncbackSnapshot {
@@ -172,41 +172,24 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SyncbackIgnoreRules {
+#[serde(deny_unknown_fields, rename_all = "camelCase")]
+pub struct SyncbackRules {
+    /// A list of paths in a file that will be ignored by Syncback.
+    #[serde(default)]
+    ignore_paths: Vec<String>,
+    /// A map of classes to properties to ignore for that class when doing
+    /// syncback.
     #[serde(default)]
-    paths: Vec<String>,
-    #[serde(default, skip)]
-    classes: HashMap<String, HashMap<String, UnresolvedValue>>,
+    ignore_properties: HashMap<String, Vec<String>>,
 }
 
-impl SyncbackIgnoreRules {
-    /// If possible, resolves all of the properties in the ignore rules so that
-    /// they're Variants.
-    pub fn resolve(&self) -> anyhow::Result<HashMap<&str, HashMap<&str, Variant>>> {
-        let mut resolved = HashMap::with_capacity(self.classes.capacity());
-
-        for (class_name, properties) in &self.classes {
-            let mut resolved_props = HashMap::with_capacity(properties.capacity());
-            for (prop_name, prop_value) in properties {
-                resolved_props.insert(
-                    prop_name.as_str(),
-                    prop_value.clone().resolve(class_name, prop_name)?,
-                );
-            }
-
-            resolved.insert(class_name.as_str(), resolved_props);
-        }
-
-        Ok(resolved)
-    }
-
+impl SyncbackRules {
     /// Returns whether the provided Instance is allowed to be handled with
     /// syncback.
     #[inline]
     pub fn acceptable(&self, dom: &WeakDom, inst: Ref) -> bool {
         let path = get_inst_path(dom, inst);
-        for ignored in &self.paths {
+        for ignored in &self.ignore_paths {
             if path.starts_with(ignored.as_str()) {
                 return false;
             }
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index cfe782730..1c473a298 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,5 +1,8 @@
 use memofs::Vfs;
-use std::{collections::HashMap, path::PathBuf};
+use std::{
+    collections::{BTreeSet, HashMap},
+    path::PathBuf,
+};
 
 use crate::{
     snapshot::{InstanceWithMeta, RojoTree},
@@ -15,6 +18,7 @@ pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
     pub(super) new_tree: &'new WeakDom,
+    pub(super) ignore_props: Option<&'old HashMap<String, Vec<String>>>,
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
@@ -42,13 +46,16 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Returns a map of properties for the 'new' Instance with filtering
     /// done to avoid noise.
     ///
-    /// Note that the returned map does not filter any properties by name, nor
-    /// does it clone the values. This is left to the consumer.
+    /// Note that while the returned map does filter based on the user's
+    /// `ignore_props` field, it does not do any other filtering and doesn't
+    /// clone any data. This is left to the consumer.
     pub fn get_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
         let new_inst = self.new_inst();
         let mut properties: HashMap<&str, &Variant> =
             HashMap::with_capacity(new_inst.properties.capacity());
 
+        let filter = self.get_property_filter();
+
         if let Some(old_inst) = self.old_inst() {
             for (name, value) in &new_inst.properties {
                 if old_inst.properties().contains_key(name) {
@@ -66,6 +73,11 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                     if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                         continue;
                     }
+                    if let Some(list) = &filter {
+                        if list.contains(name) {
+                            continue;
+                        }
+                    }
                     if let Some(default) = defaults.get(name.as_str()) {
                         if !variant_eq(value, default) {
                             properties.insert(name, value);
@@ -80,6 +92,11 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                     if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                         continue;
                     }
+                    if let Some(list) = &filter {
+                        if list.contains(name) {
+                            continue;
+                        }
+                    }
                     properties.insert(name, value);
                 }
             }
@@ -88,6 +105,15 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         properties
     }
 
+    /// Returns a set of properties that should not be written with syncback if
+    /// one exists.
+    fn get_property_filter(&self) -> Option<BTreeSet<&String>> {
+        self.data
+            .ignore_props
+            .and_then(|filter| filter.get(&self.new_inst().class))
+            .map(|list| list.iter().collect())
+    }
+
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]

From 858ea474fe9485a08a3a9681088dd3af77cb12a3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 11:47:36 -0800
Subject: [PATCH 095/366] Update changelog entry

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e4021a7a..8d6a254c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,9 +18,6 @@
             "ignoreProperties": {
                 "Part": ["Color"]
             },
-            "defaultOverrides": {
-                "Part":
-            }
         }
     }
     ```

From 13392ba27fdf21505058a6f79ea90d8d526eed96 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 12:19:06 -0800
Subject: [PATCH 096/366] Make `ignoreProperties` respect inheritance

---
 src/syncback/snapshot.rs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 1c473a298..0f668e108 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -108,10 +108,26 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Returns a set of properties that should not be written with syncback if
     /// one exists.
     fn get_property_filter(&self) -> Option<BTreeSet<&String>> {
-        self.data
-            .ignore_props
-            .and_then(|filter| filter.get(&self.new_inst().class))
-            .map(|list| list.iter().collect())
+        let filter = self.data.ignore_props?;
+        let mut set = BTreeSet::new();
+
+        let database = rbx_reflection_database::get();
+        let mut current_class_name = self.new_inst().class.as_str();
+
+        loop {
+            if let Some(list) = filter.get(current_class_name) {
+                set.extend(list)
+            }
+
+            let class = database.classes.get(current_class_name)?;
+            if let Some(super_class) = class.superclass.as_ref() {
+                current_class_name = &super_class;
+            } else {
+                break;
+            }
+        }
+
+        Some(set)
     }
 
     /// Returns an Instance from the old tree with the provided referent, if it

From 20af38292672d212ff48464364818798ca5b34bb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 12:40:12 -0800
Subject: [PATCH 097/366] Give FsSnapshot a facelift

---
 src/snapshot_middleware/csv.rs        |  8 +--
 src/snapshot_middleware/dir.rs        |  4 +-
 src/snapshot_middleware/json_model.rs |  2 +-
 src/snapshot_middleware/lua.rs        |  6 +--
 src/snapshot_middleware/project.rs    |  2 +-
 src/snapshot_middleware/rbxm.rs       |  2 +-
 src/snapshot_middleware/rbxmx.rs      |  2 +-
 src/snapshot_middleware/txt.rs        |  2 +-
 src/syncback/fs_snapshot.rs           | 70 +++++++++++++++------------
 9 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index c60c1d648..1867fe8f6 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -149,9 +149,9 @@ pub fn syncback_csv<'new, 'old>(
 
     // TODO tags don't work, why?
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.push_file(path, localization_to_csv(contents)?);
+    fs_snapshot.add_file(path, localization_to_csv(contents)?);
     if !meta.is_empty() {
-        fs_snapshot.push_file(
+        fs_snapshot.add_file(
             &meta.path,
             serde_json::to_vec_pretty(&meta).context("failed to reserialize metadata")?,
         )
@@ -217,9 +217,9 @@ pub fn syncback_csv_init<'new, 'old>(
     }
 
     let mut fs_snapshot = std::mem::take(&mut dir_syncback.fs_snapshot);
-    fs_snapshot.push_file(&path, localization_to_csv(contents)?);
+    fs_snapshot.add_file(&path, localization_to_csv(contents)?);
     if !meta.is_empty() {
-        fs_snapshot.push_file(
+        fs_snapshot.add_file(
             &meta.path,
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index d276b85f7..daff31ca6 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -139,7 +139,7 @@ pub fn syncback_dir<'new, 'old>(
     }
 
     if !meta.is_empty() {
-        dir_syncback.fs_snapshot.push_file(
+        dir_syncback.fs_snapshot.add_file(
             &meta.path,
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
@@ -206,7 +206,7 @@ pub fn syncback_dir_no_meta<'new, 'old>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_dir(path),
+        fs_snapshot: FsSnapshot::new().with_added_dir(path),
         children,
         removed_children,
     })
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 261444977..97a1ed97c 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -108,7 +108,7 @@ pub fn syncback_json_model<'new, 'old>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_file(
+        fs_snapshot: FsSnapshot::new().with_added_file(
             &path,
             serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
         ),
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 3fb5382c6..ead6ecb54 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -183,7 +183,7 @@ pub fn syncback_lua<'new, 'old>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_file(path, contents),
+        fs_snapshot: FsSnapshot::new().with_added_file(path, contents),
         // Scripts don't have a child!
         children: Vec::new(),
         removed_children: Vec::new(),
@@ -248,11 +248,11 @@ pub fn syncback_lua_init<'new, 'old>(
     }
 
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.push_file(path, contents);
+    fs_snapshot.add_file(path, contents);
     fs_snapshot.merge(dir_syncback.fs_snapshot);
 
     if !meta.is_empty() {
-        fs_snapshot.push_file(
+        fs_snapshot.add_file(
             &meta.path,
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 9a5cda0b9..b42a2a938 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -412,7 +412,7 @@ pub fn syncback_project<'new, 'old>(
     // already exist on the file system
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot: FsSnapshot::new().with_file(
+        fs_snapshot: FsSnapshot::new().with_added_file(
             &project.file_location,
             serde_json::to_vec_pretty(&project).context("failed to serialize new project")?,
         ),
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index b8137b710..5d392a5d2 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -57,7 +57,7 @@ pub fn syncback_rbxm<'new, 'old>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_file(&path, serialized),
+        fs_snapshot: FsSnapshot::new().with_added_file(&path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 1b7ecdca7..3aa3931fb 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -60,7 +60,7 @@ pub fn syncback_rbxmx<'new, 'old>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_file(&path, serialized),
+        fs_snapshot: FsSnapshot::new().with_added_file(&path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 53928d59c..b4827421d 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -98,7 +98,7 @@ pub fn syncback_txt<'new, 'old>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_file(path, contents),
+        fs_snapshot: FsSnapshot::new().with_added_file(path, contents),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 6aa05e2cf..22c4b6583 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -2,64 +2,74 @@ use std::{
     collections::{HashMap, HashSet},
     fmt, io,
     path::{Path, PathBuf},
-    sync::Arc,
 };
 
 use memofs::Vfs;
 
 /// A simple representation of a subsection of a file system.
-///
-/// This is distinct from the snapshot provided by memofs (`VfsSnapshot`) due
-/// to the need to support writing to the file system instead of an in-memory
-/// file system.
 #[derive(Default)]
 pub struct FsSnapshot {
-    files: HashMap<PathBuf, Arc<Vec<u8>>>,
-    dir: HashSet<PathBuf>,
+    /// Paths representing new files mapped to their contents.
+    add_files: HashMap<PathBuf, Vec<u8>>,
+    /// Paths representing new directories.
+    add_dirs: HashSet<PathBuf>,
+    /// Paths representing removed files.
+    removed_files: HashSet<PathBuf>,
+    /// Paths representing removed directories.
+    removed_dirs: HashSet<PathBuf>,
 }
 
 impl FsSnapshot {
+    /// Creates a new `FsSnapshot`.
     pub fn new() -> Self {
         Self {
-            files: HashMap::new(),
-            dir: HashSet::new(),
+            add_files: HashMap::new(),
+            add_dirs: HashSet::new(),
+            removed_files: HashSet::new(),
+            removed_dirs: HashSet::new(),
         }
     }
 
-    pub fn with_file<P: AsRef<Path>>(mut self, path: P, data: Vec<u8>) -> Self {
-        self.files
-            .insert(path.as_ref().to_path_buf(), Arc::new(data));
+    /// Adds the given path to the `FsSnapshot` as a file with the given
+    /// contents, then returns it.
+    pub fn with_added_file<P: AsRef<Path>>(mut self, path: P, data: Vec<u8>) -> Self {
+        self.add_files.insert(path.as_ref().to_path_buf(), data);
         self
     }
 
-    pub fn with_dir<P: AsRef<Path>>(mut self, path: P) -> Self {
-        self.dir.insert(path.as_ref().to_path_buf());
+    /// Adds the given path to the `FsSnapshot` as a file with the given
+    /// then returns it.
+    pub fn with_added_dir<P: AsRef<Path>>(mut self, path: P) -> Self {
+        self.add_dirs.insert(path.as_ref().to_path_buf());
         self
     }
 
+    /// Merges two `FsSnapshot`s together.
+    #[inline]
     pub fn merge(&mut self, other: Self) {
-        self.dir.extend(other.dir);
-        self.files.extend(other.files);
+        self.add_files.extend(other.add_files);
+        self.add_dirs.extend(other.add_dirs);
+        self.removed_files.extend(other.removed_files);
+        self.removed_dirs.extend(other.removed_dirs);
     }
 
-    pub fn push_file<P: AsRef<Path>>(&mut self, path: P, data: Vec<u8>) {
-        self.files
-            .insert(path.as_ref().to_path_buf(), Arc::new(data));
+    /// Adds the provided path as a file with the given contents.
+    pub fn add_file<P: AsRef<Path>>(&mut self, path: P, data: Vec<u8>) {
+        self.add_files.insert(path.as_ref().to_path_buf(), data);
     }
 
-    pub fn push_dir<P: AsRef<Path>>(&mut self, path: P) {
-        self.dir.insert(path.as_ref().to_path_buf());
-    }
-
-    pub fn pop_dir<P: AsRef<Path>>(&mut self, path: P) -> bool {
-        self.dir.remove(path.as_ref())
+    /// Adds the provided path as a directory.
+    pub fn add_dir<P: AsRef<Path>>(&mut self, path: P) {
+        self.add_dirs.insert(path.as_ref().to_path_buf());
     }
 
+    /// Writes the `FsSnapshot` to the provided VFS, using the provided `base`
+    /// as a root for the other paths in the `FsSnapshot`.
     pub fn write_to_vfs<P: AsRef<Path>>(&self, base: P, vfs: &Vfs) -> io::Result<()> {
         let base_path = base.as_ref();
         let mut dirs = 0;
         let mut files = 0;
-        for dir_path in &self.dir {
+        for dir_path in &self.add_dirs {
             match vfs.create_dir_all(base_path.join(dir_path)) {
                 Ok(_) => (),
                 Err(err) if err.kind() == io::ErrorKind::AlreadyExists => (),
@@ -67,8 +77,8 @@ impl FsSnapshot {
             };
             dirs += 1;
         }
-        for (path, contents) in &self.files {
-            vfs.write(base_path.join(path), contents.as_slice())?;
+        for (path, contents) in &self.add_files {
+            vfs.write(base_path.join(path), contents)?;
             files += 1;
         }
 
@@ -80,10 +90,10 @@ impl FsSnapshot {
 impl fmt::Debug for FsSnapshot {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let files = self
-            .files
+            .add_files
             .iter()
             .map(|(k, v)| format!("{}: {} bytes", k.display(), v.len()));
-        let dirs = self.dir.iter().map(|v| format!("{}", v.display()));
+        let dirs = self.add_dirs.iter().map(|v| format!("{}", v.display()));
 
         f.debug_list().entries(files).entries(dirs).finish()
     }

From fa6d295145ed659e77637a32cda28652caa94304 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 12:42:14 -0800
Subject: [PATCH 098/366] Actually write metadata for scripts and text
 middleware

---
 src/snapshot_middleware/lua.rs | 10 +++++++++-
 src/snapshot_middleware/txt.rs | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index ead6ecb54..d08a02267 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -180,10 +180,18 @@ pub fn syncback_lua<'new, 'old>(
             );
         }
     }
+    let mut fs_snapshot = FsSnapshot::new();
+    fs_snapshot.add_file(path, contents);
+    if !meta.is_empty() {
+        fs_snapshot.add_file(
+            &meta.path,
+            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+        );
+    }
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(path, contents),
+        fs_snapshot,
         // Scripts don't have a child!
         children: Vec::new(),
         removed_children: Vec::new(),
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index b4827421d..8bb110161 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -95,10 +95,18 @@ pub fn syncback_txt<'new, 'old>(
             );
         }
     }
+    let mut fs_snapshot = FsSnapshot::new();
+    fs_snapshot.add_file(path, contents);
+    if !meta.is_empty() {
+        fs_snapshot.add_file(
+            &meta.path,
+            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+        );
+    }
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(path, contents),
+        fs_snapshot,
         children: Vec::new(),
         removed_children: Vec::new(),
     })

From df1d0fb6894afaf1fc055aa006bb2f00cc9f2efd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jan 2024 12:56:58 -0800
Subject: [PATCH 099/366] Support removing things with FsSnapshot

---
 src/syncback/fs_snapshot.rs | 65 ++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 22c4b6583..ad9a6fca4 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -10,9 +10,9 @@ use memofs::Vfs;
 #[derive(Default)]
 pub struct FsSnapshot {
     /// Paths representing new files mapped to their contents.
-    add_files: HashMap<PathBuf, Vec<u8>>,
+    added_files: HashMap<PathBuf, Vec<u8>>,
     /// Paths representing new directories.
-    add_dirs: HashSet<PathBuf>,
+    added_dirs: HashSet<PathBuf>,
     /// Paths representing removed files.
     removed_files: HashSet<PathBuf>,
     /// Paths representing removed directories.
@@ -23,8 +23,8 @@ impl FsSnapshot {
     /// Creates a new `FsSnapshot`.
     pub fn new() -> Self {
         Self {
-            add_files: HashMap::new(),
-            add_dirs: HashSet::new(),
+            added_files: HashMap::new(),
+            added_dirs: HashSet::new(),
             removed_files: HashSet::new(),
             removed_dirs: HashSet::new(),
         }
@@ -33,56 +33,83 @@ impl FsSnapshot {
     /// Adds the given path to the `FsSnapshot` as a file with the given
     /// contents, then returns it.
     pub fn with_added_file<P: AsRef<Path>>(mut self, path: P, data: Vec<u8>) -> Self {
-        self.add_files.insert(path.as_ref().to_path_buf(), data);
+        self.added_files.insert(path.as_ref().to_path_buf(), data);
         self
     }
 
     /// Adds the given path to the `FsSnapshot` as a file with the given
     /// then returns it.
     pub fn with_added_dir<P: AsRef<Path>>(mut self, path: P) -> Self {
-        self.add_dirs.insert(path.as_ref().to_path_buf());
+        self.added_dirs.insert(path.as_ref().to_path_buf());
         self
     }
 
     /// Merges two `FsSnapshot`s together.
     #[inline]
     pub fn merge(&mut self, other: Self) {
-        self.add_files.extend(other.add_files);
-        self.add_dirs.extend(other.add_dirs);
+        self.added_files.extend(other.added_files);
+        self.added_dirs.extend(other.added_dirs);
         self.removed_files.extend(other.removed_files);
         self.removed_dirs.extend(other.removed_dirs);
     }
 
     /// Adds the provided path as a file with the given contents.
     pub fn add_file<P: AsRef<Path>>(&mut self, path: P, data: Vec<u8>) {
-        self.add_files.insert(path.as_ref().to_path_buf(), data);
+        self.added_files.insert(path.as_ref().to_path_buf(), data);
     }
 
     /// Adds the provided path as a directory.
     pub fn add_dir<P: AsRef<Path>>(&mut self, path: P) {
-        self.add_dirs.insert(path.as_ref().to_path_buf());
+        self.added_dirs.insert(path.as_ref().to_path_buf());
+    }
+
+    /// Removes the provided path, as a file.
+    pub fn remove_file<P: AsRef<Path>>(&mut self, path: P) {
+        self.removed_files.insert(path.as_ref().to_path_buf());
+    }
+
+    /// Removes the provided path, as a directory.
+    pub fn remove_dir<P: AsRef<Path>>(&mut self, path: P) {
+        self.removed_dirs.insert(path.as_ref().to_path_buf());
     }
 
     /// Writes the `FsSnapshot` to the provided VFS, using the provided `base`
     /// as a root for the other paths in the `FsSnapshot`.
+    ///
+    /// This includes removals, but makes no effort to minimize work done.
     pub fn write_to_vfs<P: AsRef<Path>>(&self, base: P, vfs: &Vfs) -> io::Result<()> {
         let base_path = base.as_ref();
-        let mut dirs = 0;
-        let mut files = 0;
-        for dir_path in &self.add_dirs {
+        for dir_path in &self.added_dirs {
             match vfs.create_dir_all(base_path.join(dir_path)) {
                 Ok(_) => (),
                 Err(err) if err.kind() == io::ErrorKind::AlreadyExists => (),
                 Err(err) => return Err(err),
             };
-            dirs += 1;
         }
-        for (path, contents) in &self.add_files {
+        for (path, contents) in &self.added_files {
             vfs.write(base_path.join(path), contents)?;
-            files += 1;
+        }
+        for dir_path in &self.removed_dirs {
+            vfs.remove_dir_all(base_path.join(dir_path))?;
+        }
+        for path in &self.removed_files {
+            vfs.remove_file(base_path.join(path))?;
         }
 
-        log::info!("Wrote {dirs} directories and {files} files to the file system!");
+        if self.added_dirs.len() + self.added_files.len() > 0 {
+            log::info!(
+                "Wrote {} directories and {} files to the file system!",
+                self.added_dirs.len(),
+                self.added_files.len()
+            );
+        }
+        if self.removed_dirs.len() + self.removed_files.len() > 0 {
+            log::info!(
+                "Removed {} directories and {} files from the file system. Yikes!",
+                self.removed_dirs.len(),
+                self.removed_files.len()
+            );
+        }
         Ok(())
     }
 }
@@ -90,10 +117,10 @@ impl FsSnapshot {
 impl fmt::Debug for FsSnapshot {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let files = self
-            .add_files
+            .added_files
             .iter()
             .map(|(k, v)| format!("{}: {} bytes", k.display(), v.len()));
-        let dirs = self.add_dirs.iter().map(|v| format!("{}", v.display()));
+        let dirs = self.added_dirs.iter().map(|v| format!("{}", v.display()));
 
         f.debug_list().entries(files).entries(dirs).finish()
     }

From fce6964741eb7eb760b94b991f151470b1808032 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Jan 2024 12:23:06 -0800
Subject: [PATCH 100/366] Actually remove files that are marked for removal

---
 src/syncback/mod.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 69fdd2731..1be73b318 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -15,10 +15,10 @@ use crate::{
 pub use fs_snapshot::FsSnapshot;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
-pub fn syncback_loop<'old, 'new>(
+pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
     old_tree: &'old RojoTree,
-    new_tree: &'new WeakDom,
+    new_tree: &WeakDom,
     project: &'old Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
     log::debug!("Hashing project DOM");
@@ -90,6 +90,21 @@ pub fn syncback_loop<'old, 'new>(
         }
 
         let syncback = middleware.syncback(&snapshot)?;
+        if !syncback.removed_children.is_empty() {
+            log::debug!(
+                "removed children for {}: {}",
+                get_inst_path(new_tree, snapshot.new),
+                syncback.removed_children.len()
+            );
+            for inst in &syncback.removed_children {
+                let path = inst.metadata().instigating_source.as_ref().unwrap().path();
+                if path.is_dir() {
+                    fs_snapshot.remove_dir(path)
+                } else {
+                    fs_snapshot.remove_file(path)
+                }
+            }
+        }
 
         if let Some(old_inst) = snapshot.old_inst() {
             replacements.push((old_inst.parent(), syncback.inst_snapshot));

From 7eaa362300eb48ffd018f4380c6f265c273ce68e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Jan 2024 12:24:53 -0800
Subject: [PATCH 101/366] Rename `from_parent` to `with_parent`

---
 src/snapshot_middleware/dir.rs | 6 +++---
 src/syncback/snapshot.rs       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index daff31ca6..c27e54803 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -188,9 +188,9 @@ pub fn syncback_dir_no_meta<'new, 'old>(
             // If it exists in the new tree but not the old one, it was added.
             match old_children.get(new_child.name.as_str()) {
                 None => {
-                    children.push(snapshot.from_parent(new_child.name.clone(), *child_ref, None))
+                    children.push(snapshot.with_parent(new_child.name.clone(), *child_ref, None))
                 }
-                Some(old_ref) => children.push(snapshot.from_parent(
+                Some(old_ref) => children.push(snapshot.with_parent(
                     new_child.name.clone(),
                     *child_ref,
                     Some(*old_ref),
@@ -200,7 +200,7 @@ pub fn syncback_dir_no_meta<'new, 'old>(
     } else {
         for child_ref in new_inst.children() {
             let child = snapshot.get_new_instance(*child_ref).unwrap();
-            children.push(snapshot.from_parent(child.name.clone(), *child_ref, None))
+            children.push(snapshot.with_parent(child.name.clone(), *child_ref, None))
         }
     }
 
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 0f668e108..c5a5928e4 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -33,7 +33,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Constructs a SyncbackSnapshot from the provided refs
     /// while inheriting the parent's trees and path
     #[inline]
-    pub fn from_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
+    pub fn with_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
             data: self.data,
             old: old_ref,

From 8ae087690dbefb4e3184589e32e68b3ff7336f77 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Jan 2024 12:40:22 -0800
Subject: [PATCH 102/366] Cleanup resolution.rs

---
 src/resolution.rs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/resolution.rs b/src/resolution.rs
index 379ccc057..9fcef34d3 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -2,8 +2,8 @@ use std::borrow::Borrow;
 
 use anyhow::{bail, format_err};
 use rbx_dom_weak::types::{
-    Attributes, BinaryString, CFrame, Color3, Content, Enum, Font, MaterialColors, Matrix3, Tags,
-    Variant, VariantType, Vector2, Vector3,
+    Attributes, CFrame, Color3, Content, Enum, Font, MaterialColors, Matrix3, Tags, Variant,
+    VariantType, Vector2, Vector3,
 };
 use rbx_reflection::{DataType, PropertyDescriptor};
 use serde::{Deserialize, Serialize};
@@ -60,15 +60,6 @@ impl UnresolvedValue {
             Variant::Float64(n) => AmbiguousValue::Number(n),
             Variant::Int32(n) => AmbiguousValue::Number(n as f64),
             Variant::Int64(n) => AmbiguousValue::Number(n as f64),
-            // Variant::SharedString(sstr) => {
-            //     if let Ok(str) = std::str::from_utf8(sstr.data()) {
-            //         AmbiguousValue::String(str.to_string())
-            //     } else {
-            //         return Self::FullyQualified(Variant::BinaryString(BinaryString::from(
-            //             sstr.data(),
-            //         )));
-            //     }
-            // }
             Variant::String(str) => AmbiguousValue::String(str),
             Variant::Tags(tags) => {
                 AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())

From 514f05d364faf514377a03a601a9dc01d7ad2220 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 8 Jan 2024 12:18:51 -0800
Subject: [PATCH 103/366] Correct CSV middleware

---
 src/snapshot_middleware/csv.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 1867fe8f6..1e7bf02c0 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -294,7 +294,7 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
                 _ => {
                     entry
                         .values
-                        .insert(Cow::Borrowed(value), Cow::Borrowed(value));
+                        .insert(Cow::Borrowed(header), Cow::Borrowed(value));
                 }
             }
         }

From 3e7f30773a7eb4673ff10db17e9955cc397e0c2a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Jan 2024 11:31:51 -0800
Subject: [PATCH 104/366] If a directory is empty, add a file so it gets
 preserved in source control

---
 src/snapshot_middleware/dir.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index c27e54803..ed4567f2b 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -15,6 +15,8 @@ use crate::{
 
 use super::{meta_file::DirectoryMetadata, snapshot_from_vfs};
 
+const EMPTY_DIR_KEEP_NAME: &str = ".gitkeep";
+
 pub fn snapshot_dir(
     context: &InstanceContext,
     vfs: &Vfs,
@@ -204,9 +206,15 @@ pub fn syncback_dir_no_meta<'new, 'old>(
         }
     }
 
+    let mut fs_snapshot = FsSnapshot::new();
+    fs_snapshot.add_dir(&path);
+    if new_inst.children().is_empty() {
+        fs_snapshot.add_file(path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
+    }
+
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_added_dir(path),
+        fs_snapshot,
         children,
         removed_children,
     })

From 93adc8d9ce93b08501394fac865c2900bbe3a05d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Jan 2024 13:52:34 -0800
Subject: [PATCH 105/366] Finally commit an updated Cargo.lock

---
 Cargo.lock | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 3e2556f20..c5c14d30d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -513,6 +513,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "float-cmp"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1836,12 +1845,14 @@ dependencies = [
  "anyhow",
  "backtrace",
  "bincode",
+ "blake3",
  "clap 3.2.25",
  "criterion",
  "crossbeam-channel",
  "csv",
  "embed-resource",
  "env_logger",
+ "float-cmp",
  "fs-err",
  "futures",
  "globset",

From 0d34cbbc786f5ad4b0c431eff05e669e36eb6abb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Jan 2024 14:02:01 -0800
Subject: [PATCH 106/366] Rename `get_filtered_properties` to
 `new_filtered_properties`

---
 src/snapshot_middleware/csv.rs        | 4 ++--
 src/snapshot_middleware/dir.rs        | 2 +-
 src/snapshot_middleware/json_model.rs | 2 +-
 src/snapshot_middleware/lua.rs        | 4 ++--
 src/snapshot_middleware/txt.rs        | 2 +-
 src/syncback/snapshot.rs              | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 1e7bf02c0..846c4edec 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -125,7 +125,7 @@ pub fn syncback_csv<'new, 'old>(
                 .with_extension("meta.json"),
         }
     };
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Contents" {
             continue;
         } else if name == "Attributes" || name == "AttributesSerialize" {
@@ -194,7 +194,7 @@ pub fn syncback_csv_init<'new, 'old>(
                 .join("init.meta.json"),
         }
     };
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Contents" {
             continue;
         } else if name == "Attributes" || name == "AttributesSerialize" {
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index ed4567f2b..408aedb5b 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -120,7 +120,7 @@ pub fn syncback_dir<'new, 'old>(
             path: path.join("init.meta.json"),
         }
     };
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Attributes" || name == "AttributesSerialize" {
             if let Variant::Attributes(attrs) = value {
                 meta.attributes.extend(attrs.iter().map(|(name, value)| {
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 97a1ed97c..f2a2a99fa 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -70,7 +70,7 @@ pub fn syncback_json_model<'new, 'old>(
 
     let mut properties = BTreeMap::new();
     let mut attributes = BTreeMap::new();
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Attributes" || name == "AttributesSerialize" {
             if let Variant::Attributes(attr) = value {
                 attributes.extend(attr.iter().map(|(name, value)| {
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index d08a02267..213bd10a4 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -159,7 +159,7 @@ pub fn syncback_lua<'new, 'old>(
                 .with_extension("meta.json"),
         }
     };
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Source" {
             continue;
         } else if name == "Attributes" || name == "AttributesSerialize" {
@@ -233,7 +233,7 @@ pub fn syncback_lua_init<'new, 'old>(
                 .join("init.meta.json"),
         }
     };
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Source" {
             continue;
         } else if name == "Attributes" || name == "AttributesSerialize" {
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 8bb110161..7db7c9873 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -74,7 +74,7 @@ pub fn syncback_txt<'new, 'old>(
                 .with_extension("meta.json"),
         }
     };
-    for (name, value) in snapshot.get_filtered_properties() {
+    for (name, value) in snapshot.new_filtered_properties() {
         if name == "Value" {
             continue;
         } else if name == "Attributes" || name == "AttributesSerialize" {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index c5a5928e4..3c40ece53 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -49,7 +49,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Note that while the returned map does filter based on the user's
     /// `ignore_props` field, it does not do any other filtering and doesn't
     /// clone any data. This is left to the consumer.
-    pub fn get_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
+    pub fn new_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
         let new_inst = self.new_inst();
         let mut properties: HashMap<&str, &Variant> =
             HashMap::with_capacity(new_inst.properties.capacity());

From 01551f6662e67da5d70f2662fa5555cbb1a97a02 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Jan 2024 14:04:34 -0800
Subject: [PATCH 107/366] Add `get_filtered_properties` to get filtered
 properties for any instance

---
 src/syncback/snapshot.rs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 3c40ece53..780b78eab 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -49,15 +49,29 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Note that while the returned map does filter based on the user's
     /// `ignore_props` field, it does not do any other filtering and doesn't
     /// clone any data. This is left to the consumer.
+    #[inline]
     pub fn new_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
-        let new_inst = self.new_inst();
+        self.get_filtered_properties(self.new).unwrap()
+    }
+
+    /// Returns a map of properties for an Instance from the 'new' tree
+    /// with filtering done to avoid noise.
+    ///
+    /// Note that while the returned map does filter based on the user's
+    /// `ignore_props` field, it does not do any other filtering and doesn't
+    /// clone any data. This is left to the consumer.
+    pub fn get_filtered_properties(
+        &self,
+        new_ref: Ref,
+    ) -> Option<HashMap<&'new str, &'new Variant>> {
+        let inst = self.get_new_instance(new_ref)?;
         let mut properties: HashMap<&str, &Variant> =
-            HashMap::with_capacity(new_inst.properties.capacity());
+            HashMap::with_capacity(inst.properties.capacity());
 
         let filter = self.get_property_filter();
 
         if let Some(old_inst) = self.old_inst() {
-            for (name, value) in &new_inst.properties {
+            for (name, value) in &inst.properties {
                 if old_inst.properties().contains_key(name) {
                     properties.insert(name, value);
                 }
@@ -65,10 +79,10 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         } else {
             let class_data = rbx_reflection_database::get()
                 .classes
-                .get(new_inst.class.as_str());
+                .get(inst.class.as_str());
             if let Some(class_data) = class_data {
                 let defaults = &class_data.default_properties;
-                for (name, value) in &new_inst.properties {
+                for (name, value) in &inst.properties {
                     // We don't currently support refs or shared strings
                     if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                         continue;
@@ -87,7 +101,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                     }
                 }
             } else {
-                for (name, value) in &new_inst.properties {
+                for (name, value) in &inst.properties {
                     // We don't currently support refs or shared strings
                     if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                         continue;
@@ -102,7 +116,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             }
         }
 
-        properties
+        Some(properties)
     }
 
     /// Returns a set of properties that should not be written with syncback if

From cc1d68d7bbe95725ddfb09bba85df377084a2f8e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Jan 2024 15:02:34 -0800
Subject: [PATCH 108/366] Optimistically serialize any non-default property in
 a ProjectNode

---
 src/snapshot_middleware/project.rs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index b42a2a938..73fff845c 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -348,17 +348,14 @@ pub fn syncback_project<'new, 'old>(
                     if new_child.class != old_child.class_name() {
                         anyhow::bail!("Cannot change the class of {child_name} in a project");
                     }
-                    for (name, value) in &new_child.properties {
-                        if child_node.properties.contains_key(name) {
-                            child_node.properties.insert(
-                                name.clone(),
-                                UnresolvedValue::from_variant(
-                                    value.clone(),
-                                    &new_child.class,
-                                    name.as_str(),
-                                ),
-                            );
-                        }
+                    let properties = snapshot
+                        .get_filtered_properties(new_child.referent())
+                        .expect("all project nodes should exist in the DOM");
+                    for (name, value) in properties {
+                        child_node.properties.insert(
+                            name.to_owned(),
+                            UnresolvedValue::from_variant(value.clone(), &new_child.class, name),
+                        );
                     }
                     nodes.push((child_node, new_child, *old_child));
                     new_child_map.remove(child_name.as_str());

From 4a83c4c13d6e656d0d9ebb64cc53a7b23b4dc445 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 12 Jan 2024 14:05:23 -0800
Subject: [PATCH 109/366] Rewrite syncback middleware for Project

---
 src/snapshot_middleware/project.rs | 144 +++++++++++++++--------------
 1 file changed, 75 insertions(+), 69 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 73fff845c..a2fd9b782 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -301,117 +301,123 @@ pub fn syncback_project<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let old_inst = snapshot
         .old_inst()
-        .context("project middleware shouldn't be used to make new files")?;
-    // This can never be None.
-    let source = old_inst.metadata().instigating_source.as_ref().unwrap();
+        .expect("projects should always exist in both trees");
+    // Project roots have to come from somewhere!
+    let path = old_inst
+        .metadata()
+        .instigating_source
+        .as_ref()
+        .unwrap()
+        .path();
+
+    let base_path = path.parent().expect("project did not have a parent");
 
-    // We need to build a 'new' project and serialize it using an FsSnapshot.
-    // It's convenient to start with the old one though, since it means we have
-    // a thing to iterate through.
-    let mut project =
-        Project::load_from_slice(&snapshot.vfs().read(source.path()).unwrap(), source.path())
-            .context("could not syncback project due to fs error")?;
+    let vfs = snapshot.vfs();
 
-    let base_path = source.path().parent().unwrap();
+    let mut project = Project::load_from_slice(&vfs.read(path)?, path)?;
 
     let mut children = Vec::new();
     let mut removed_children = Vec::new();
 
-    // Projects are special. We won't be adding or removing things from them,
-    // so we'll simply match Instances on a per-node basis and rebuild the tree
-    // with the new instance's data. This matching will be done by class and name
-    // to simplify things.
-    let mut nodes = vec![(&mut project.tree, snapshot.new_inst(), old_inst)];
-
-    // A map of referents from the new tree to the Path that created it,
-    // if it exists. This is a roundabout way to locate the parents of
-    // Instances.
-    let mut ref_to_node = HashMap::new();
-
-    while let Some((node, new_inst, old_inst)) = nodes.pop() {
-        ref_to_node.insert(new_inst.referent(), node.path.as_ref());
-
-        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
-        for child_ref in old_inst.children() {
-            let child = snapshot.get_old_instance(*child_ref).unwrap();
-            old_child_map.insert(child.name(), child);
-        }
-        let mut new_child_map = HashMap::with_capacity(new_inst.children().len());
-        for child_ref in new_inst.children() {
-            let child = snapshot.get_new_instance(*child_ref).unwrap();
-            new_child_map.insert(child.name.as_str(), child);
+    // A map of every node and the Instances they map to. This is fine because
+    // we don't add or remove from projects, so every node must map somewhere.
+    let mut project_nodes = vec![(&mut project.tree, snapshot.new_inst(), old_inst)];
+
+    // A map of refs to the path of a node they represent. This is used later to
+    // match children to their parent's path.
+    let mut ref_to_path = HashMap::new();
+
+    // These map children of a node by name to the actual Instance
+    let mut old_child_map = HashMap::new();
+    let mut new_child_map = HashMap::new();
+
+    while let Some((node, new_inst, old_inst)) = project_nodes.pop() {
+        log::trace!("Processing node '{}' of project", old_inst.name());
+        ref_to_path.insert(new_inst.referent(), node.path.as_ref());
+
+        old_child_map.extend(old_inst.children().iter().map(|referent| {
+            let child = snapshot.get_old_instance(*referent).unwrap();
+            (child.name(), child)
+        }));
+        new_child_map.extend(new_inst.children().iter().map(|referent| {
+            let child = snapshot.get_new_instance(*referent).unwrap();
+            (&child.name, child)
+        }));
+
+        let properties = &mut node.properties;
+
+        let filtered_properties = snapshot
+            .get_filtered_properties(new_inst.referent())
+            .expect("all project nodes should exist in both trees when in queue");
+        for (name, value) in filtered_properties {
+            properties.insert(
+                name.to_owned(),
+                UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+            );
         }
 
         for (child_name, child_node) in &mut node.children {
-            if let Some(new_child) = new_child_map.get(child_name.as_str()) {
-                if let Some(old_child) = old_child_map.get(child_name.as_str()) {
+            // There could be no old_child if the node is optional and not
+            // present on the file system, which is why this isn't an `unwrap`.
+            if let Some(old_child) = old_child_map.get(child_name.as_str()) {
+                if let Some(new_child) = new_child_map.get(child_name) {
                     if new_child.class != old_child.class_name() {
-                        anyhow::bail!("Cannot change the class of {child_name} in a project");
-                    }
-                    let properties = snapshot
-                        .get_filtered_properties(new_child.referent())
-                        .expect("all project nodes should exist in the DOM");
-                    for (name, value) in properties {
-                        child_node.properties.insert(
-                            name.to_owned(),
-                            UnresolvedValue::from_variant(value.clone(), &new_child.class, name),
-                        );
+                        anyhow::bail!("cannot change the class of {child_name} in project");
                     }
-                    nodes.push((child_node, new_child, *old_child));
-                    new_child_map.remove(child_name.as_str());
+                    project_nodes.push((child_node, new_child, *old_child));
                     old_child_map.remove(child_name.as_str());
+                    new_child_map.remove(child_name);
+                } else {
+                    anyhow::bail!("cannot add or remove {child_name} from project");
                 }
             } else {
-                anyhow::bail!("Cannot add or remove {child_name} from project")
+                log::warn!(
+                    "Project node '{child_name}' is optional and does not \
+                    exist on the file system. It will be skipped during syncback."
+                )
             }
         }
 
-        // From this point, both maps contain only children of the current
-        // instance that aren't in the project. So, we just do some quick and
-        // dirty matching to identify children that were added and removed.
-        for (new_name, new_child) in new_child_map {
-            let parent_path = match ref_to_node.get(&new_child.parent()) {
+        // After matching children above, the child maps only contain children
+        // of this node that aren't in the project file.
+        for (new_name, new_child) in new_child_map.drain() {
+            let parent_path = match ref_to_path.get(&new_child.parent()) {
                 Some(Some(path)) => base_path.join(path.path()),
-                Some(None) => {
-                    continue;
-                }
-                None => {
+                _ => {
+                    // For this to happen, the instance isn't a part of the
+                    // project at all, so we need to just skip it.
                     continue;
                 }
             };
-            if let Some(old_inst) = old_child_map.get(new_name) {
-                // All children are descendants of a node of a project
-                // So we really just need to track which one is which.
+            if let Some(old_inst) = old_child_map.get(new_name.as_str()) {
+                // This new instance represents an older one!
                 children.push(SyncbackSnapshot {
                     data: snapshot.data,
                     old: Some(old_inst.id()),
                     new: new_child.referent(),
                     parent_path,
-                    name: new_name.to_string(),
+                    name: new_name.to_owned(),
                 });
-                old_child_map.remove(new_name);
+                old_child_map.remove(new_name.as_str());
             } else {
-                // it's new
+                // This new instance is... new.
                 children.push(SyncbackSnapshot {
                     data: snapshot.data,
                     old: None,
                     new: new_child.referent(),
                     parent_path,
-                    name: new_name.to_string(),
+                    name: new_name.to_owned(),
                 });
             }
         }
-        removed_children.extend(old_child_map.into_values());
+        removed_children.extend(old_child_map.drain().map(|(_, inst)| inst));
     }
 
-    // We don't need to validate any file names for the FsSnapshot
-    // because projects can't ever be made by syncback, so they must
-    // already exist on the file system
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot: FsSnapshot::new().with_added_file(
             &project.file_location,
-            serde_json::to_vec_pretty(&project).context("failed to serialize new project")?,
+            serde_json::to_vec_pretty(&project).context("failed to serialize updated project")?,
         ),
         children,
         removed_children,

From 6f447ec35fdbe37ba410db4a6a27a3668414b886 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 12 Jan 2024 15:34:17 -0800
Subject: [PATCH 110/366] Properly warn and skip missing project nodes

---
 src/snapshot_middleware/project.rs | 40 +++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index a2fd9b782..7a724b6db 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -344,6 +344,9 @@ pub fn syncback_project<'new, 'old>(
             (&child.name, child)
         }));
 
+        // The fact we are not removing old properties might be a problem but
+        // removing them is worse! Consider a property that doesn't serialize,
+        // like HttpEnabled.
         let properties = &mut node.properties;
 
         let filtered_properties = snapshot
@@ -355,26 +358,33 @@ pub fn syncback_project<'new, 'old>(
                 UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
             );
         }
-
         for (child_name, child_node) in &mut node.children {
-            // There could be no old_child if the node is optional and not
-            // present on the file system, which is why this isn't an `unwrap`.
-            if let Some(old_child) = old_child_map.get(child_name.as_str()) {
-                if let Some(new_child) = new_child_map.get(child_name) {
-                    if new_child.class != old_child.class_name() {
-                        anyhow::bail!("cannot change the class of {child_name} in project");
-                    }
-                    project_nodes.push((child_node, new_child, *old_child));
+            if let Some(path_node) = &child_node.path {
+                if let Ok(false) = base_path.join(path_node.path()).try_exists() {
+                    log::warn!(
+                        "The project refers to '{child_name}' with path '{}' \
+                            which does not exist in the project directory.",
+                        path_node.path().display()
+                    );
                     old_child_map.remove(child_name.as_str());
                     new_child_map.remove(child_name);
-                } else {
-                    anyhow::bail!("cannot add or remove {child_name} from project");
+                    continue;
                 }
+            }
+            let old_child = old_child_map
+                .get(child_name.as_str())
+                .expect("all nodes in queue should have old instances");
+
+            if let Some(new_child) = new_child_map.get(child_name) {
+                if new_child.class != old_child.class_name() {
+                    anyhow::bail!("cannot change the class of {child_name} in project");
+                }
+
+                project_nodes.push((child_node, new_child, *old_child));
+                old_child_map.remove(child_name.as_str());
+                new_child_map.remove(child_name);
             } else {
-                log::warn!(
-                    "Project node '{child_name}' is optional and does not \
-                    exist on the file system. It will be skipped during syncback."
-                )
+                anyhow::bail!("cannot add or remove {child_name} from project");
             }
         }
 

From aad9b8a3b0589363dbd80842833befd7ded2b3a9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Jan 2024 10:50:33 -0800
Subject: [PATCH 111/366] Rewrite directory syncback middleware

---
 src/snapshot_middleware/dir.rs | 62 ++++++++++++----------------------
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 408aedb5b..46ff7bf16 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -153,59 +153,41 @@ pub fn syncback_dir_no_meta<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let path = snapshot.parent_path.join(&snapshot.name);
-
     let new_inst = snapshot.new_inst();
 
-    let mut removed_children = Vec::new();
     let mut children = Vec::new();
+    let mut removed_children = Vec::new();
 
     if let Some(old_inst) = snapshot.old_inst() {
-        let old_children: HashMap<&str, Ref> = old_inst
-            .children()
-            .iter()
-            .map(|old_ref| {
-                (
-                    snapshot.get_old_instance(*old_ref).unwrap().name(),
-                    *old_ref,
-                )
-            })
-            .collect();
-        let new_children: HashSet<&str> = snapshot
-            .new_inst()
-            .children()
-            .iter()
-            .map(|new_ref| snapshot.get_new_instance(*new_ref).unwrap().name.as_str())
-            .collect();
-
-        for child_ref in old_inst.children() {
-            let old_child = snapshot.get_old_instance(*child_ref).unwrap();
-            // If it exists in the old tree but not the new one, it was removed.
-            if !new_children.contains(old_child.name()) {
-                removed_children.push(old_child);
-            }
+        let mut old_child_map = HashMap::new();
+        for child in old_inst.children() {
+            let inst = snapshot.get_old_instance(*child).unwrap();
+            old_child_map.insert(inst.name(), inst);
         }
 
-        for child_ref in new_inst.children() {
-            let new_child = snapshot.get_new_instance(*child_ref).unwrap();
-            // If it exists in the new tree but not the old one, it was added.
-            match old_children.get(new_child.name.as_str()) {
-                None => {
-                    children.push(snapshot.with_parent(new_child.name.clone(), *child_ref, None))
-                }
-                Some(old_ref) => children.push(snapshot.with_parent(
+        for new_child_ref in new_inst.children() {
+            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
+            if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
+                // This child exists in both doms. Pass it on.
+                children.push(snapshot.with_parent(
                     new_child.name.clone(),
-                    *child_ref,
-                    Some(*old_ref),
-                )),
+                    *new_child_ref,
+                    Some(old_child.id()),
+                ));
+            } else {
+                // The child only exists in the the new dom
+                children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
             }
         }
+        // Any children that are in the old dom but not the new one are removed.
+        removed_children.extend(old_child_map.into_values());
     } else {
-        for child_ref in new_inst.children() {
-            let child = snapshot.get_new_instance(*child_ref).unwrap();
-            children.push(snapshot.with_parent(child.name.clone(), *child_ref, None))
+        // There is no old instance. Just add every child.
+        for new_child_ref in new_inst.children() {
+            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
+            children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
         }
     }
-
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_dir(&path);
     if new_inst.children().is_empty() {

From c04893673aa9f5cbc2343c089e7e516d2ff702e8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Jan 2024 11:47:50 -0800
Subject: [PATCH 112/366] Remove unnecessary use in dir middleware

---
 src/snapshot_middleware/dir.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 46ff7bf16..55f9922c9 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,11 +1,11 @@
 use std::{
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{BTreeMap, HashMap},
     path::Path,
 };
 
 use anyhow::Context;
 use memofs::{DirEntry, IoResultExt, Vfs};
-use rbx_dom_weak::types::{Ref, Variant};
+use rbx_dom_weak::types::Variant;
 
 use crate::{
     resolution::UnresolvedValue,

From a2f173976c470b47f8a39fcf0c63c4a679336411 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Jan 2024 11:48:09 -0800
Subject: [PATCH 113/366] Make syncback command less panic-y

---
 src/cli/syncback.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index f3f943b69..bb32b7f90 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -1,5 +1,4 @@
 use std::{
-    fs,
     path::{Path, PathBuf},
     time::Instant,
 };
@@ -42,7 +41,7 @@ impl SyncbackCommand {
 
         let dom_start = Instant::now();
         log::info!("Reading place file at {}", path_new.display());
-        let dom_new = read_dom(&path_new);
+        let dom_new = read_dom(&path_new)?;
         log::info!(
             "Finished opening file in {:0.02}s",
             dom_start.elapsed().as_secs_f32()
@@ -65,19 +64,18 @@ impl SyncbackCommand {
     }
 }
 
-fn read_dom(path: &Path) -> WeakDom {
-    let content = fs::read(path).unwrap();
-    if &content[0..8] == b"<roblox!" {
+fn read_dom(path: &Path) -> anyhow::Result<WeakDom> {
+    let content = fs_err::read(path)?;
+    Ok(if &content[0..8] == b"<roblox!" {
         log::debug!("Reading {} as a binary file", path.display());
-        rbx_binary::from_reader(content.as_slice()).unwrap()
+        rbx_binary::from_reader(content.as_slice())?
     } else if &content[0..7] == b"<roblox" {
         log::debug!("Reading {} as an xml file", path.display());
         rbx_xml::from_reader(
             content.as_slice(),
             DecodeOptions::new().property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown),
-        )
-        .unwrap()
+        )?
     } else {
-        panic!("invalid Roblox file at {}", path.display())
-    }
+        anyhow::bail!("invalid Roblox file at {}", path.display())
+    })
 }

From 92643281645d64cd5f4a3ed6663e504bd4b8b4dc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Jan 2024 12:19:36 -0800
Subject: [PATCH 114/366] Add context to error when syncback fails

---
 src/syncback/mod.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 1be73b318..85e067927 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,6 +1,7 @@
 mod fs_snapshot;
 mod snapshot;
 
+use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
@@ -89,7 +90,12 @@ pub fn syncback_loop<'old>(
             continue;
         }
 
-        let syncback = middleware.syncback(&snapshot)?;
+        let syncback = middleware.syncback(&snapshot).with_context(|| {
+            format!(
+                "Failed to syncback {}",
+                get_inst_path(new_tree, snapshot.new)
+            )
+        })?;
         if !syncback.removed_children.is_empty() {
             log::debug!(
                 "removed children for {}: {}",

From bd53ac96243d653f4cbf3478a9f5bbbfdd9a8bd2 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 16 Jan 2024 08:52:19 -0800
Subject: [PATCH 115/366] Overwrite existing file if it exists, supporting sync
 rules

---
 src/snapshot_middleware/csv.rs        | 25 ++++++++++++----
 src/snapshot_middleware/json_model.rs | 16 ++++++++--
 src/snapshot_middleware/lua.rs        | 42 ++++++++++++++++++---------
 src/snapshot_middleware/rbxm.rs       | 22 ++++++++++----
 src/snapshot_middleware/rbxmx.rs      | 25 +++++++++++-----
 src/snapshot_middleware/txt.rs        | 14 +++++++--
 6 files changed, 109 insertions(+), 35 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 846c4edec..2317927d2 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -103,9 +103,18 @@ pub fn syncback_csv<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
-
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("csv");
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(
+            || {
+                // Since Roblox instances may or may not a `.` character in
+                // their names, we can't just use `.set_file_name` and
+                // `.set_extension`.
+                snapshot.parent_path.join(format!("{}.csv", snapshot.name))
+            },
+            |source| source.path().to_path_buf(),
+        );
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
@@ -170,8 +179,14 @@ pub fn syncback_csv_init<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
 
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.push("init.csv");
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(|| snapshot.parent_path.as_path(), |source| source.path())
+        // Instigating source for 'init' middleware is the directory they point
+        // to, not the `init.*` file, which is good since that's what we rerun
+        // the snapshot middleware on, but it means we have to do this:
+        .join("init.csv");
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index f2a2a99fa..23ff61627 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -63,8 +63,20 @@ pub fn snapshot_json_model(
 pub fn syncback_json_model<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("model.json");
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(
+            || {
+                // Since Roblox instances may or may not a `.` character in
+                // their names, we can't just use `.set_file_name` and
+                // `.set_extension`.
+                snapshot
+                    .parent_path
+                    .join(format!("{}.model.json", snapshot.name))
+            },
+            |source| source.path().to_path_buf(),
+        );
 
     let new_inst = snapshot.new_inst();
 
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 213bd10a4..91e42c255 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -134,13 +134,24 @@ pub fn syncback_lua<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(
+            || {
+                // Since Roblox instances may or may not a `.` character in
+                // their names, we can't just use `.set_file_name` and
+                // `.set_extension`.
+                snapshot.parent_path.join(match script_type {
+                    ScriptType::Server => format!("{}.server.lua", snapshot.name),
+                    ScriptType::Client => format!("{}.client.lua", snapshot.name),
+                    ScriptType::Module => format!("{}.lua", snapshot.name),
+                })
+            },
+            |source| source.path().to_path_buf(),
+        );
+    log::debug!("Luau middleware: {}", path.display());
 
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension(match script_type {
-        ScriptType::Module => "lua",
-        ScriptType::Client => "client.lua",
-        ScriptType::Server => "server.lua",
-    });
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
     } else {
@@ -203,14 +214,19 @@ pub fn syncback_lua_init<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(|| snapshot.parent_path.as_path(), |source| source.path())
+        // Instigating source for 'init' middleware is the directory they point
+        // to, not the `init.*` file, which is good since that's what we rerun
+        // the snapshot middleware on, but it means we have to do this:
+        .join(match script_type {
+            ScriptType::Server => "init.server.lua",
+            ScriptType::Client => "init.client.lua",
+            ScriptType::Module => "init.lua",
+        });
 
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.push("init");
-    path.set_extension(match script_type {
-        ScriptType::Module => "lua",
-        ScriptType::Client => "client.lua",
-        ScriptType::Server => "server.lua",
-    });
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
     } else {
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 5d392a5d2..4606c604a 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -45,19 +45,29 @@ pub fn snapshot_rbxm(
 pub fn syncback_rbxm<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    // If any of the children of this Instance are scripts, we don't want
-    // include them in the model. So instead, we'll check and then serialize.
     let inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("rbxm");
-    // Long-term, anyway. Right now we stay silly.
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(
+            || {
+                // Since Roblox instances may or may not a `.` character in
+                // their names, we can't just use `.set_file_name` and
+                // `.set_extension`.
+                snapshot.parent_path.join(format!("{}.rbxm", snapshot.name))
+            },
+            |source| source.path().to_path_buf(),
+        );
+
+    // Long-term, we probably want to have some logic for if this contains a
+    // script. That's a future endeavor though.
     let mut serialized = Vec::new();
     rbx_binary::to_writer(&mut serialized, snapshot.new_tree(), &[inst.referent()])
         .context("failed to serialize new rbxm")?;
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(&path, serialized),
+        fs_snapshot: FsSnapshot::new().with_added_file(path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 3aa3931fb..053b444bb 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -47,20 +47,31 @@ pub fn snapshot_rbxmx(
 pub fn syncback_rbxmx<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    // If any of the children of this Instance are scripts, we don't want
-    // include them in the model. So instead, we'll check and then serialize.
-
     let inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("rbxmx");
-    // Long-term, anyway. Right now we stay silly.
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(
+            || {
+                // Since Roblox instances may or may not a `.` character in
+                // their names, we can't just use `.set_file_name` and
+                // `.set_extension`.
+                snapshot
+                    .parent_path
+                    .join(format!("{}.rbxmx", &snapshot.name))
+            },
+            |source| source.path().to_path_buf(),
+        );
+
+    // Long-term, we probably want to have some logic for if this contains a
+    // script. That's a future endeavor though.
     let mut serialized = Vec::new();
     rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()])
         .context("failed to serialize new rbxmx")?;
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(&path, serialized),
+        fs_snapshot: FsSnapshot::new().with_added_file(path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 7db7c9873..dd37648ee 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -53,8 +53,18 @@ pub fn syncback_txt<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
-    let mut path = snapshot.parent_path.join(&snapshot.name);
-    path.set_extension("txt");
+    let path = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().instigating_source.as_ref())
+        .map_or_else(
+            || {
+                // Since Roblox instances may or may not a `.` character in
+                // their names, we can't just use `.set_file_name` and
+                // `.set_extension`.
+                snapshot.parent_path.join(format!("{}.txt", &snapshot.name))
+            },
+            |source| source.path().to_path_buf(),
+        );
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Value") {
         source.as_bytes().to_vec()

From 2b57774eaaf152897af35af7b0a598950335a2cf Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 16 Jan 2024 14:58:33 -0800
Subject: [PATCH 116/366] Make syncback into .git illegal

---
 src/syncback/mod.rs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 85e067927..04572ba90 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -5,9 +5,13 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, VecDeque};
+use std::{
+    collections::{HashMap, VecDeque},
+    sync::OnceLock,
+};
 
 use crate::{
+    glob::Glob,
     snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,
@@ -16,6 +20,9 @@ use crate::{
 pub use fs_snapshot::FsSnapshot;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
+/// A glob that can be used to tell if a path contains a `.git` folder.
+static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
+
 pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
     old_tree: &'old RojoTree,
@@ -27,6 +34,9 @@ pub fn syncback_loop<'old>(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(new_tree);
 
+    let git_glob = GIT_IGNORE_GLOB.get_or_init(|| Glob::new(".git/**").unwrap());
+    let project_path = project.folder_location();
+
     let syncback_data = SyncbackData {
         vfs,
         old_tree,
@@ -49,6 +59,16 @@ pub fn syncback_loop<'old>(
     let mut fs_snapshot = FsSnapshot::new();
 
     while let Some(snapshot) = snapshots.pop() {
+        if let Ok(suffix) = snapshot.parent_path.strip_prefix(project_path) {
+            if git_glob.is_match(suffix) {
+                log::warn!(
+                    "Cannot syncback into `.git`, {} will be skipped.",
+                    get_inst_path(new_tree, snapshot.new)
+                );
+                continue;
+            }
+        }
+
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
@@ -96,6 +116,7 @@ pub fn syncback_loop<'old>(
                 get_inst_path(new_tree, snapshot.new)
             )
         })?;
+
         if !syncback.removed_children.is_empty() {
             log::debug!(
                 "removed children for {}: {}",

From d9580532a1d3db288c13f459d6302c2174b777f6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Jan 2024 13:06:15 -0800
Subject: [PATCH 117/366] Remove debug log in luau syncback middleware

---
 src/snapshot_middleware/lua.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 91e42c255..e452ab915 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -150,7 +150,6 @@ pub fn syncback_lua<'new, 'old>(
             },
             |source| source.path().to_path_buf(),
         );
-    log::debug!("Luau middleware: {}", path.display());
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()

From fb82551ee90ef6b9d7b4dce26332470c1635d271 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Jan 2024 14:23:02 -0800
Subject: [PATCH 118/366] Support ignoring via destination with globs

---
 src/syncback/mod.rs | 87 ++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 52 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 04572ba90..fb44a37d2 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -58,24 +58,14 @@ pub fn syncback_loop<'old>(
     let mut replacements = Vec::new();
     let mut fs_snapshot = FsSnapshot::new();
 
-    while let Some(snapshot) = snapshots.pop() {
-        if let Ok(suffix) = snapshot.parent_path.strip_prefix(project_path) {
-            if git_glob.is_match(suffix) {
-                log::warn!(
-                    "Cannot syncback into `.git`, {} will be skipped.",
-                    get_inst_path(new_tree, snapshot.new)
-                );
-                continue;
-            }
-        }
-
+    'syncback: while let Some(snapshot) = snapshots.pop() {
+        let inst_path = get_inst_path(new_tree, snapshot.new);
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
             if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
                 log::trace!(
-                    "Skipping {} due to it being identically hashed as {:?}",
-                    get_inst_path(new_tree, snapshot.new),
+                    "Skipping {inst_path} due to it being identically hashed as {:?}",
                     old_hashes.get(&old_ref)
                 );
                 continue;
@@ -83,11 +73,26 @@ pub fn syncback_loop<'old>(
         }
 
         if let Some(syncback_rules) = &project.syncback_rules {
-            if !syncback_rules.acceptable(new_tree, snapshot.new) {
-                log::debug!(
-                    "Path {} is blocked by project",
-                    get_inst_path(new_tree, snapshot.new)
-                );
+            // Ignore paths
+            if let Ok(suffix) = snapshot.parent_path.strip_prefix(project_path) {
+                for glob in &syncback_rules.ignore_paths {
+                    if glob.is_match(suffix) {
+                        log::debug!("Skipping {inst_path} because its path matches ignore pattern");
+                        continue 'syncback;
+                    }
+                }
+            }
+            // Ignore trees;
+            for ignored in &syncback_rules.ignore_trees {
+                if inst_path.starts_with(ignored.as_str()) {
+                    log::debug!("Tree {inst_path} is blocked by project");
+                    continue 'syncback;
+                }
+            }
+        }
+        if let Ok(suffix) = snapshot.parent_path.strip_prefix(project_path) {
+            if git_glob.is_match(suffix) {
+                log::warn!("Cannot syncback into `.git`, {inst_path} will be skipped.");
                 continue;
             }
         }
@@ -96,31 +101,20 @@ pub fn syncback_loop<'old>(
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
-        log::trace!(
-            "Middleware for {} is {:?}",
-            get_inst_path(new_tree, snapshot.new),
-            middleware
-        );
+        log::trace!("Middleware for {inst_path} is {:?}", middleware);
 
         if matches!(middleware, Middleware::Json | Middleware::Toml) {
-            log::warn!(
-                "Cannot syncback {middleware:?} at {}, skipping",
-                get_inst_path(new_tree, snapshot.new)
-            );
+            log::warn!("Cannot syncback {middleware:?} at {inst_path}, skipping");
             continue;
         }
 
-        let syncback = middleware.syncback(&snapshot).with_context(|| {
-            format!(
-                "Failed to syncback {}",
-                get_inst_path(new_tree, snapshot.new)
-            )
-        })?;
+        let syncback = middleware
+            .syncback(&snapshot)
+            .with_context(|| format!("Failed to syncback {inst_path}"))?;
 
         if !syncback.removed_children.is_empty() {
             log::debug!(
-                "removed children for {}: {}",
-                get_inst_path(new_tree, snapshot.new),
+                "removed children for {inst_path}: {}",
                 syncback.removed_children.len()
             );
             for inst in &syncback.removed_children {
@@ -216,30 +210,19 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct SyncbackRules {
-    /// A list of paths in a file that will be ignored by Syncback.
+    /// A list of subtrees in a file that will be ignored by Syncback.
+    #[serde(default)]
+    ignore_trees: Vec<String>,
+    /// A list of patterns to check against the path an Instance would serialize
+    /// to. If a path matches one of these, the Instance won't be syncbacked.
     #[serde(default)]
-    ignore_paths: Vec<String>,
+    ignore_paths: Vec<Glob>,
     /// A map of classes to properties to ignore for that class when doing
     /// syncback.
     #[serde(default)]
     ignore_properties: HashMap<String, Vec<String>>,
 }
 
-impl SyncbackRules {
-    /// Returns whether the provided Instance is allowed to be handled with
-    /// syncback.
-    #[inline]
-    pub fn acceptable(&self, dom: &WeakDom, inst: Ref) -> bool {
-        let path = get_inst_path(dom, inst);
-        for ignored in &self.ignore_paths {
-            if path.starts_with(ignored.as_str()) {
-                return false;
-            }
-        }
-        true
-    }
-}
-
 fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     let mut path: VecDeque<&str> = VecDeque::new();
     let mut inst = dom.get_by_ref(referent);

From 01eee8a14a96c729d39ea0ea1018a49c6beeb36a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Jan 2024 14:23:50 -0800
Subject: [PATCH 119/366] Move file name validation to own module Check if
 there are control characters in a name

---
 src/syncback/file_names.rs | 36 ++++++++++++++++++++++++++++++++++++
 src/syncback/mod.rs        | 37 ++-----------------------------------
 2 files changed, 38 insertions(+), 35 deletions(-)
 create mode 100644 src/syncback/file_names.rs

diff --git a/src/syncback/file_names.rs b/src/syncback/file_names.rs
new file mode 100644
index 000000000..2a7d5c72a
--- /dev/null
+++ b/src/syncback/file_names.rs
@@ -0,0 +1,36 @@
+/// A list of file names that are not valid on Windows.
+const INVALID_WINDOWS_NAMES: [&str; 22] = [
+    "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8",
+    "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
+];
+
+/// A list of all characters that are outright forbidden to be included
+/// in a file's name.
+const FORBIDDEN_CHARS: [char; 9] = ['<', '>', ':', '"', '/', '|', '?', '*', '\\'];
+
+/// Returns whether a given name is a valid file name. This takes into account
+/// rules for Windows, MacOS, and Linux.
+///
+/// In practice however, these broadly overlap so the only unexpected behavior
+/// is Windows, where there are 22 reserved names.
+pub fn is_valid_file_name<S: AsRef<str>>(name: S) -> bool {
+    let str = name.as_ref();
+
+    if str.ends_with(' ') || str.ends_with('.') {
+        return false;
+    }
+
+    for char in str.chars() {
+        if char.is_control() || FORBIDDEN_CHARS.contains(&char) {
+            return false;
+        }
+    }
+
+    for forbidden in INVALID_WINDOWS_NAMES {
+        if str == forbidden {
+            return false;
+        }
+    }
+
+    true
+}
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index fb44a37d2..b2940689a 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,3 +1,4 @@
+mod file_names;
 mod fs_snapshot;
 mod snapshot;
 
@@ -17,6 +18,7 @@ use crate::{
     Project,
 };
 
+pub use file_names::is_valid_file_name;
 pub use fs_snapshot::FsSnapshot;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
@@ -232,38 +234,3 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     }
     path.into_iter().collect::<Vec<&str>>().join("/")
 }
-
-/// A list of file names that are not valid on Windows.
-const INVALID_WINDOWS_NAMES: [&str; 22] = [
-    "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8",
-    "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9",
-];
-
-/// A list of all characters that are outright forbidden to be included
-/// in a file's name.
-const FORBIDDEN_CHARS: [char; 9] = ['<', '>', ':', '"', '/', '|', '?', '*', '\\'];
-
-/// Returns whether a given name is a valid file name. This takes into account
-/// rules for Windows, MacOS, and Linux.
-///
-/// In practice however, these broadly overlap so the only unexpected behavior
-/// is Windows, where there are 22 reserved names.
-pub fn is_valid_file_name<S: AsRef<str>>(name: S) -> bool {
-    let str = name.as_ref();
-
-    if str.ends_with(' ') || str.ends_with('.') {
-        return false;
-    }
-    // TODO check control characters
-    for forbidden in FORBIDDEN_CHARS {
-        if str.contains(forbidden) {
-            return false;
-        }
-    }
-    for forbidden in INVALID_WINDOWS_NAMES {
-        if str == forbidden {
-            return false;
-        }
-    }
-    true
-}

From dd4f614c21de3edac0ebe501850c00995c09d1bf Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Jan 2024 16:21:19 -0800
Subject: [PATCH 120/366] Add function for getting a file-system safe name for
 Instances

---
 src/syncback/file_names.rs | 73 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/src/syncback/file_names.rs b/src/syncback/file_names.rs
index 2a7d5c72a..ef20f3ed1 100644
--- a/src/syncback/file_names.rs
+++ b/src/syncback/file_names.rs
@@ -1,3 +1,76 @@
+//! Contains logic for generating new file names for Instances based on their
+//! middleware.
+
+use std::borrow::Cow;
+
+use anyhow::Context;
+use rbx_dom_weak::Instance;
+
+use crate::{snapshot::InstanceWithMeta, snapshot_middleware::Middleware};
+
+pub fn name_for_inst<'old>(
+    middleware: Middleware,
+    new_inst: &Instance,
+    old_inst: Option<InstanceWithMeta<'old>>,
+) -> anyhow::Result<Cow<'old, str>> {
+    if let Some(old_inst) = old_inst {
+        if let Some(source) = &old_inst.metadata().instigating_source {
+            source
+                .path()
+                .file_name()
+                .and_then(|s| s.to_str())
+                .map(Cow::Borrowed)
+                .context("sources on the file system should be valid unicode and not be stubs")
+        } else {
+            anyhow::bail!("members of 'old' trees should have an instigating source!");
+        }
+    } else {
+        Ok(match middleware {
+            Middleware::Dir
+            | Middleware::CsvDir
+            | Middleware::ServerScriptDir
+            | Middleware::ClientScriptDir
+            | Middleware::ModuleScriptDir => Cow::Owned(new_inst.name.clone()),
+            _ => {
+                let extension = extension_for_middleware(middleware);
+                let name = &new_inst.name;
+                if is_valid_file_name(name) {
+                    Cow::Owned(format!("{name}.{extension}"))
+                } else {
+                    anyhow::bail!("name '{name}' is not legal to write to the file system")
+                }
+            }
+        })
+    }
+}
+
+/// Returns the extension a provided piece of middleware is supposed to use.
+fn extension_for_middleware(middleware: Middleware) -> &'static str {
+    match middleware {
+        Middleware::Csv => "csv",
+        Middleware::JsonModel => "model.json",
+        Middleware::Json => "json",
+        Middleware::ServerScript => "server.luau",
+        Middleware::ClientScript => "client.luau",
+        Middleware::ModuleScript => "luau",
+        Middleware::Project => "project.json",
+        Middleware::Rbxm => "rbxm",
+        Middleware::Rbxmx => "rbxmx",
+        Middleware::Toml => "toml",
+        Middleware::Text => "txt",
+        // These are manually specified and not `_` to guard against future
+        // middleware additions missing this function.
+        Middleware::Ignore => unimplemented!("syncback does not work on Ignore middleware"),
+        Middleware::Dir
+        | Middleware::CsvDir
+        | Middleware::ServerScriptDir
+        | Middleware::ClientScriptDir
+        | Middleware::ModuleScriptDir => {
+            unimplemented!("directory middleware requires special treatment")
+        }
+    }
+}
+
 /// A list of file names that are not valid on Windows.
 const INVALID_WINDOWS_NAMES: [&str; 22] = [
     "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8",

From e4b37ee5f33bb0f1f7a7d7b783863071f32fc79e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Jan 2024 16:28:41 -0800
Subject: [PATCH 121/366] Store syncback rules in data struct

---
 src/syncback/mod.rs      |  5 +----
 src/syncback/snapshot.rs | 31 +++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index b2940689a..92a10a7e4 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -43,10 +43,7 @@ pub fn syncback_loop<'old>(
         vfs,
         old_tree,
         new_tree,
-        ignore_props: project
-            .syncback_rules
-            .as_ref()
-            .map(|rules| &rules.ignore_properties),
+        syncback_rules: project.syncback_rules.as_ref(),
     };
 
     let mut snapshots = vec![SyncbackSnapshot {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 780b78eab..ecac671c9 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -5,6 +5,7 @@ use std::{
 };
 
 use crate::{
+    glob::Glob,
     snapshot::{InstanceWithMeta, RojoTree},
     variant_eq::variant_eq,
 };
@@ -13,12 +14,14 @@ use rbx_dom_weak::{
     Instance, WeakDom,
 };
 
+use super::SyncbackRules;
+
 #[derive(Clone, Copy)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
     pub(super) new_tree: &'new WeakDom,
-    pub(super) ignore_props: Option<&'old HashMap<String, Vec<String>>>,
+    pub(super) syncback_rules: Option<&'old SyncbackRules>,
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
@@ -122,7 +125,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Returns a set of properties that should not be written with syncback if
     /// one exists.
     fn get_property_filter(&self) -> Option<BTreeSet<&String>> {
-        let filter = self.data.ignore_props?;
+        let filter = self.ignore_props()?;
         let mut set = BTreeSet::new();
 
         let database = rbx_reflection_database::get();
@@ -185,4 +188,28 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     pub fn new_tree(&self) -> &'new WeakDom {
         self.data.new_tree
     }
+
+    /// Returns user-specified property ignore rules.
+    #[inline]
+    pub fn ignore_props(&self) -> Option<&HashMap<String, Vec<String>>> {
+        self.data
+            .syncback_rules
+            .map(|rules| &rules.ignore_properties)
+    }
+
+    /// Returns user-specified ignore paths.
+    #[inline]
+    pub fn ignore_paths(&self) -> Option<&[Glob]> {
+        self.data
+            .syncback_rules
+            .map(|rules| rules.ignore_paths.as_slice())
+    }
+
+    /// Returns user-specified ignore tree.
+    #[inline]
+    pub fn ignore_tree(&self) -> Option<&[String]> {
+        self.data
+            .syncback_rules
+            .map(|rules| rules.ignore_trees.as_slice())
+    }
 }

From 3717034996b711b796c31d5fffa4ce9ccb3a2696 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 11:25:35 -0800
Subject: [PATCH 122/366] Add method for validating paths for syncback

---
 src/syncback/snapshot.rs | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index ecac671c9..110354167 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,7 +1,7 @@
 use memofs::Vfs;
 use std::{
     collections::{BTreeSet, HashMap},
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
 use crate::{
@@ -147,6 +147,33 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         Some(set)
     }
 
+    /// Returns whether a given path is allowed for syncback by matching `path`
+    /// against every user specified glob for ignoring.
+    ///
+    /// If the provided `path` is absolute, it has `base_path` stripped from it
+    /// to allow globs to operate as if it were local.
+    #[inline]
+    pub fn is_valid_path(&self, base_path: &Path, path: &Path) -> bool {
+        if let Some(ignore_paths) = self.ignore_paths() {
+            if path.is_absolute() {
+                if let Ok(suffix) = path.strip_prefix(base_path) {
+                    for glob in ignore_paths {
+                        if glob.is_match(suffix) {
+                            return false;
+                        }
+                    }
+                }
+            } else {
+                for glob in ignore_paths {
+                    if glob.is_match(path) {
+                        return false;
+                    }
+                }
+            }
+        }
+        true
+    }
+
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]

From 4d7142ce6faa1588d7a7d1bbe52fd8f54b7a283f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 11:39:35 -0800
Subject: [PATCH 123/366] Move .git filtering to `is_valid_path`

---
 src/syncback/snapshot.rs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 110354167..5c9a2e36a 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -2,6 +2,7 @@ use memofs::Vfs;
 use std::{
     collections::{BTreeSet, HashMap},
     path::{Path, PathBuf},
+    sync::OnceLock,
 };
 
 use crate::{
@@ -16,6 +17,9 @@ use rbx_dom_weak::{
 
 use super::SyncbackRules;
 
+/// A glob that can be used to tell if a path contains a `.git` folder.
+static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
+
 #[derive(Clone, Copy)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
@@ -154,20 +158,18 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// to allow globs to operate as if it were local.
     #[inline]
     pub fn is_valid_path(&self, base_path: &Path, path: &Path) -> bool {
+        let git_glob = GIT_IGNORE_GLOB.get_or_init(|| Glob::new(".git/**").unwrap());
+        let test_path = match path.strip_prefix(base_path) {
+            Ok(suffix) => suffix,
+            Err(_) => path,
+        };
+        if git_glob.is_match(test_path) {
+            return false;
+        }
         if let Some(ignore_paths) = self.ignore_paths() {
-            if path.is_absolute() {
-                if let Ok(suffix) = path.strip_prefix(base_path) {
-                    for glob in ignore_paths {
-                        if glob.is_match(suffix) {
-                            return false;
-                        }
-                    }
-                }
-            } else {
-                for glob in ignore_paths {
-                    if glob.is_match(path) {
-                        return false;
-                    }
+            for glob in ignore_paths {
+                if glob.is_match(test_path) {
+                    return false;
                 }
             }
         }

From 89deb6e6eabcf45966c139ce3b098cfea2f52f97 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 11:40:03 -0800
Subject: [PATCH 124/366] Filter project node paths

---
 src/snapshot_middleware/project.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 7a724b6db..48c8ac004 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -333,6 +333,16 @@ pub fn syncback_project<'new, 'old>(
 
     while let Some((node, new_inst, old_inst)) = project_nodes.pop() {
         log::trace!("Processing node '{}' of project", old_inst.name());
+        if let Some(node_path) = &node.path {
+            let node_path = node_path.path();
+            if !snapshot.is_valid_path(base_path, node_path) {
+                log::debug!(
+                    "Skipping {} because its path matches ignore pattern",
+                    new_inst.name,
+                );
+                continue;
+            }
+        }
         ref_to_path.insert(new_inst.referent(), node.path.as_ref());
 
         old_child_map.extend(old_inst.children().iter().map(|referent| {
@@ -379,7 +389,6 @@ pub fn syncback_project<'new, 'old>(
                 if new_child.class != old_child.class_name() {
                     anyhow::bail!("cannot change the class of {child_name} in project");
                 }
-
                 project_nodes.push((child_node, new_child, *old_child));
                 old_child_map.remove(child_name.as_str());
                 new_child_map.remove(child_name);

From 5888295f43fc93661791fba2ec231c9a1feef251 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 11:41:22 -0800
Subject: [PATCH 125/366] Use `is_valid_path` for filtering syncback middleware

---
 src/syncback/mod.rs | 54 +++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 92a10a7e4..8b63af61b 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -6,10 +6,7 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
-use std::{
-    collections::{HashMap, VecDeque},
-    sync::OnceLock,
-};
+use std::collections::{HashMap, VecDeque};
 
 use crate::{
     glob::Glob,
@@ -18,13 +15,10 @@ use crate::{
     Project,
 };
 
-pub use file_names::is_valid_file_name;
+pub use file_names::{is_valid_file_name, name_for_inst};
 pub use fs_snapshot::FsSnapshot;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
-/// A glob that can be used to tell if a path contains a `.git` folder.
-static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
-
 pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
     old_tree: &'old RojoTree,
@@ -36,7 +30,6 @@ pub fn syncback_loop<'old>(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(new_tree);
 
-    let git_glob = GIT_IGNORE_GLOB.get_or_init(|| Glob::new(".git/**").unwrap());
     let project_path = project.folder_location();
 
     let syncback_data = SyncbackData {
@@ -71,31 +64,6 @@ pub fn syncback_loop<'old>(
             }
         }
 
-        if let Some(syncback_rules) = &project.syncback_rules {
-            // Ignore paths
-            if let Ok(suffix) = snapshot.parent_path.strip_prefix(project_path) {
-                for glob in &syncback_rules.ignore_paths {
-                    if glob.is_match(suffix) {
-                        log::debug!("Skipping {inst_path} because its path matches ignore pattern");
-                        continue 'syncback;
-                    }
-                }
-            }
-            // Ignore trees;
-            for ignored in &syncback_rules.ignore_trees {
-                if inst_path.starts_with(ignored.as_str()) {
-                    log::debug!("Tree {inst_path} is blocked by project");
-                    continue 'syncback;
-                }
-            }
-        }
-        if let Ok(suffix) = snapshot.parent_path.strip_prefix(project_path) {
-            if git_glob.is_match(suffix) {
-                log::warn!("Cannot syncback into `.git`, {inst_path} will be skipped.");
-                continue;
-            }
-        }
-
         let middleware = snapshot
             .old_inst()
             .and_then(|inst| inst.metadata().middleware)
@@ -107,6 +75,24 @@ pub fn syncback_loop<'old>(
             continue;
         }
 
+        let appended_name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
+        let working_path = snapshot.parent_path.join(appended_name.as_ref());
+
+        if !snapshot.is_valid_path(project_path, &working_path) {
+            log::debug!("Skipping {inst_path} because its path matches ignore pattern");
+            continue;
+        }
+
+        if let Some(syncback_rules) = &project.syncback_rules {
+            // Ignore trees;
+            for ignored in &syncback_rules.ignore_trees {
+                if inst_path.starts_with(ignored.as_str()) {
+                    log::debug!("Tree {inst_path} is blocked by project");
+                    continue 'syncback;
+                }
+            }
+        }
+
         let syncback = middleware
             .syncback(&snapshot)
             .with_context(|| format!("Failed to syncback {inst_path}"))?;

From e0c8419196c8de093145af0366c013b7307bf8ec Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 12:54:49 -0800
Subject: [PATCH 126/366] Use a more reasonable method for getting file names

---
 src/snapshot_middleware/csv.rs        | 26 ++++--------------
 src/snapshot_middleware/dir.rs        |  8 +++---
 src/snapshot_middleware/json_model.rs | 16 ++---------
 src/snapshot_middleware/lua.rs        | 39 +++++++--------------------
 src/snapshot_middleware/mod.rs        | 35 +++++++++++++++---------
 src/snapshot_middleware/rbxm.rs       | 14 ++--------
 src/snapshot_middleware/rbxmx.rs      | 16 ++---------
 src/snapshot_middleware/txt.rs        | 14 ++--------
 src/syncback/mod.rs                   |  2 +-
 9 files changed, 50 insertions(+), 120 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 2317927d2..73296f39a 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -101,20 +101,10 @@ pub fn snapshot_csv_init(
 
 pub fn syncback_csv<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(
-            || {
-                // Since Roblox instances may or may not a `.` character in
-                // their names, we can't just use `.set_file_name` and
-                // `.set_extension`.
-                snapshot.parent_path.join(format!("{}.csv", snapshot.name))
-            },
-            |source| source.path().to_path_buf(),
-        );
+    let path = snapshot.parent_path.join(file_name);
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
@@ -176,17 +166,11 @@ pub fn syncback_csv<'new, 'old>(
 
 pub fn syncback_csv_init<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
 
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(|| snapshot.parent_path.as_path(), |source| source.path())
-        // Instigating source for 'init' middleware is the directory they point
-        // to, not the `init.*` file, which is good since that's what we rerun
-        // the snapshot middleware on, but it means we have to do this:
-        .join("init.csv");
+    let path = snapshot.parent_path.join(dir_name).join("init.csv");
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
@@ -194,7 +178,7 @@ pub fn syncback_csv_init<'new, 'old>(
         anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
     };
 
-    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
+    let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
     let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
         dir
     } else {
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 55f9922c9..be6ce1e25 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -99,11 +99,12 @@ pub fn snapshot_dir_no_meta(
 
 pub fn syncback_dir<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let path = snapshot.parent_path.join(&snapshot.name);
+    let path = snapshot.parent_path.join(&dir_name);
     let new_inst = snapshot.new_inst();
 
-    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
+    let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
 
     let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
         dir
@@ -151,8 +152,9 @@ pub fn syncback_dir<'new, 'old>(
 
 pub fn syncback_dir_no_meta<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let path = snapshot.parent_path.join(&snapshot.name);
+    let path = snapshot.parent_path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
     let mut children = Vec::new();
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 23ff61627..fce7c57ac 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -62,21 +62,9 @@ pub fn snapshot_json_model(
 
 pub fn syncback_json_model<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(
-            || {
-                // Since Roblox instances may or may not a `.` character in
-                // their names, we can't just use `.set_file_name` and
-                // `.set_extension`.
-                snapshot
-                    .parent_path
-                    .join(format!("{}.model.json", snapshot.name))
-            },
-            |source| source.path().to_path_buf(),
-        );
+    let path = snapshot.parent_path.join(file_name);
 
     let new_inst = snapshot.new_inst();
 
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index e452ab915..8a0743c85 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -130,26 +130,11 @@ pub fn snapshot_lua_init(
 }
 
 pub fn syncback_lua<'new, 'old>(
-    script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(
-            || {
-                // Since Roblox instances may or may not a `.` character in
-                // their names, we can't just use `.set_file_name` and
-                // `.set_extension`.
-                snapshot.parent_path.join(match script_type {
-                    ScriptType::Server => format!("{}.server.lua", snapshot.name),
-                    ScriptType::Client => format!("{}.client.lua", snapshot.name),
-                    ScriptType::Module => format!("{}.lua", snapshot.name),
-                })
-            },
-            |source| source.path().to_path_buf(),
-        );
+    let path = snapshot.parent_path.join(file_name);
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
@@ -211,20 +196,14 @@ pub fn syncback_lua<'new, 'old>(
 pub fn syncback_lua_init<'new, 'old>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(|| snapshot.parent_path.as_path(), |source| source.path())
-        // Instigating source for 'init' middleware is the directory they point
-        // to, not the `init.*` file, which is good since that's what we rerun
-        // the snapshot middleware on, but it means we have to do this:
-        .join(match script_type {
-            ScriptType::Server => "init.server.lua",
-            ScriptType::Client => "init.client.lua",
-            ScriptType::Module => "init.lua",
-        });
+    let path = snapshot.parent_path.join(dir_name).join(match script_type {
+        ScriptType::Server => "init.server.lua",
+        ScriptType::Client => "init.client.lua",
+        ScriptType::Module => "init.lua",
+    });
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
@@ -232,7 +211,7 @@ pub fn syncback_lua_init<'new, 'old>(
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
 
-    let dir_syncback = syncback_dir_no_meta(snapshot)?;
+    let dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
 
     let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
         dir
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 8e8022cfe..137fe5bb1 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -243,6 +243,7 @@ impl Middleware {
     pub fn syncback<'new, 'old>(
         &self,
         snapshot: &SyncbackSnapshot<'new, 'old>,
+        file_name: &str,
     ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
         // We don't care about the names of projects
         if !is_valid_file_name(&snapshot.name) && !matches!(self, Middleware::Project) {
@@ -252,23 +253,31 @@ impl Middleware {
             );
         }
         match self {
-            Middleware::Csv => syncback_csv(snapshot),
-            Middleware::JsonModel => syncback_json_model(snapshot),
+            Middleware::Csv => syncback_csv(snapshot, file_name),
+            Middleware::JsonModel => syncback_json_model(snapshot, file_name),
             Middleware::Json => unimplemented!("cannot syncback Json middleware"),
+            // Projects are only generated from files that already exist on the
+            // file system, so we don't need to pass a file name.
             Middleware::Project => syncback_project(snapshot),
-            Middleware::ServerScript => syncback_lua(ScriptType::Server, snapshot),
-            Middleware::ClientScript => syncback_lua(ScriptType::Client, snapshot),
-            Middleware::ModuleScript => syncback_lua(ScriptType::Module, snapshot),
-            Middleware::Rbxm => syncback_rbxm(snapshot),
-            Middleware::Rbxmx => syncback_rbxmx(snapshot),
+            Middleware::ServerScript => syncback_lua(snapshot, file_name),
+            Middleware::ClientScript => syncback_lua(snapshot, file_name),
+            Middleware::ModuleScript => syncback_lua(snapshot, file_name),
+            Middleware::Rbxm => syncback_rbxm(snapshot, file_name),
+            Middleware::Rbxmx => syncback_rbxmx(snapshot, file_name),
             Middleware::Toml => unimplemented!("cannot syncback Toml middleware"),
-            Middleware::Text => syncback_txt(snapshot),
+            Middleware::Text => syncback_txt(snapshot, file_name),
             Middleware::Ignore => anyhow::bail!("cannot syncback Ignore middleware"),
-            Middleware::Dir => syncback_dir(snapshot),
-            Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
-            Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
-            Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
-            Middleware::CsvDir => syncback_csv_init(snapshot),
+            Middleware::Dir => syncback_dir(snapshot, file_name),
+            Middleware::ServerScriptDir => {
+                syncback_lua_init(ScriptType::Server, snapshot, file_name)
+            }
+            Middleware::ClientScriptDir => {
+                syncback_lua_init(ScriptType::Client, snapshot, file_name)
+            }
+            Middleware::ModuleScriptDir => {
+                syncback_lua_init(ScriptType::Module, snapshot, file_name)
+            }
+            Middleware::CsvDir => syncback_csv_init(snapshot, file_name),
         }
     }
 }
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 4606c604a..4cbda433b 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -44,20 +44,10 @@ pub fn snapshot_rbxm(
 
 pub fn syncback_rbxm<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let inst = snapshot.new_inst();
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(
-            || {
-                // Since Roblox instances may or may not a `.` character in
-                // their names, we can't just use `.set_file_name` and
-                // `.set_extension`.
-                snapshot.parent_path.join(format!("{}.rbxm", snapshot.name))
-            },
-            |source| source.path().to_path_buf(),
-        );
+    let path = snapshot.parent_path.join(file_name);
 
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 053b444bb..feb9198fe 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -46,22 +46,10 @@ pub fn snapshot_rbxmx(
 
 pub fn syncback_rbxmx<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let inst = snapshot.new_inst();
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(
-            || {
-                // Since Roblox instances may or may not a `.` character in
-                // their names, we can't just use `.set_file_name` and
-                // `.set_extension`.
-                snapshot
-                    .parent_path
-                    .join(format!("{}.rbxmx", &snapshot.name))
-            },
-            |source| source.path().to_path_buf(),
-        );
+    let path = snapshot.parent_path.join(file_name);
 
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index dd37648ee..2c9b91c93 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -51,20 +51,10 @@ pub fn snapshot_txt(
 
 pub fn syncback_txt<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
+    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().instigating_source.as_ref())
-        .map_or_else(
-            || {
-                // Since Roblox instances may or may not a `.` character in
-                // their names, we can't just use `.set_file_name` and
-                // `.set_extension`.
-                snapshot.parent_path.join(format!("{}.txt", &snapshot.name))
-            },
-            |source| source.path().to_path_buf(),
-        );
+    let path = snapshot.parent_path.join(file_name);
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Value") {
         source.as_bytes().to_vec()
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 8b63af61b..78e433e9c 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -94,7 +94,7 @@ pub fn syncback_loop<'old>(
         }
 
         let syncback = middleware
-            .syncback(&snapshot)
+            .syncback(&snapshot, &appended_name)
             .with_context(|| format!("Failed to syncback {inst_path}"))?;
 
         if !syncback.removed_children.is_empty() {

From 10d81d65337fc04f480e38dd18ca492f98ad6654 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 12:59:08 -0800
Subject: [PATCH 127/366] Remove unnecessary borrow in dir syncback middleware

---
 src/snapshot_middleware/dir.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index be6ce1e25..7c1fa0ca3 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -101,7 +101,7 @@ pub fn syncback_dir<'new, 'old>(
     snapshot: &SyncbackSnapshot<'new, 'old>,
     dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
-    let path = snapshot.parent_path.join(&dir_name);
+    let path = snapshot.parent_path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;

From aaa422dc606907412716df8e680e2072df84f7e4 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 14:03:47 -0800
Subject: [PATCH 128/366] Enforce unique child names for folders

---
 src/snapshot_middleware/dir.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 7c1fa0ca3..4724d5d4f 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,5 +1,5 @@
 use std::{
-    collections::{BTreeMap, HashMap},
+    collections::{BTreeMap, HashMap, HashSet},
     path::Path,
 };
 
@@ -160,8 +160,17 @@ pub fn syncback_dir_no_meta<'new, 'old>(
     let mut children = Vec::new();
     let mut removed_children = Vec::new();
 
+    // We have to enforce unique child names for the file system.
+    let mut duplicate_check = HashSet::with_capacity(new_inst.children().len());
+    for child in new_inst.children() {
+        let child = snapshot.get_new_instance(*child).unwrap();
+        if !duplicate_check.insert(&child.name) {
+            anyhow::bail!("Instance has duplicate child {}", child.name);
+        }
+    }
+
     if let Some(old_inst) = snapshot.old_inst() {
-        let mut old_child_map = HashMap::new();
+        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
         for child in old_inst.children() {
             let inst = snapshot.get_old_instance(*child).unwrap();
             old_child_map.insert(inst.name(), inst);

From cd10c0d21ac27751f1d6e18ec3c4680895e1ee36 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Jan 2024 14:11:55 -0800
Subject: [PATCH 129/366] Make dedup checking case-insensitive

---
 src/snapshot_middleware/dir.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 4724d5d4f..6b18b757f 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -164,8 +164,8 @@ pub fn syncback_dir_no_meta<'new, 'old>(
     let mut duplicate_check = HashSet::with_capacity(new_inst.children().len());
     for child in new_inst.children() {
         let child = snapshot.get_new_instance(*child).unwrap();
-        if !duplicate_check.insert(&child.name) {
-            anyhow::bail!("Instance has duplicate child {}", child.name);
+        if !duplicate_check.insert(child.name.to_lowercase()) {
+            anyhow::bail!("Instance has duplicate child {}", child.name.to_lowercase());
         }
     }
 

From 5860a46b463d25fe509cd6f65264dfd69405be9e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Jan 2024 16:11:03 -0800
Subject: [PATCH 130/366] Correct filtering of properties to merge new and old
 properties

---
 src/snapshot_middleware/project.rs |  3 --
 src/syncback/snapshot.rs           | 57 +++++++++++++++---------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 48c8ac004..a40e8195a 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -354,9 +354,6 @@ pub fn syncback_project<'new, 'old>(
             (&child.name, child)
         }));
 
-        // The fact we are not removing old properties might be a problem but
-        // removing them is worse! Consider a property that doesn't serialize,
-        // like HttpEnabled.
         let properties = &mut node.properties;
 
         let filtered_properties = snapshot
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 5c9a2e36a..746cbb0d3 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -83,43 +83,42 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                     properties.insert(name, value);
                 }
             }
-        } else {
-            let class_data = rbx_reflection_database::get()
-                .classes
-                .get(inst.class.as_str());
-            if let Some(class_data) = class_data {
-                let defaults = &class_data.default_properties;
-                for (name, value) in &inst.properties {
-                    // We don't currently support refs or shared strings
-                    if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+        }
+        let class_data = rbx_reflection_database::get()
+            .classes
+            .get(inst.class.as_str());
+        if let Some(class_data) = class_data {
+            let defaults = &class_data.default_properties;
+            for (name, value) in &inst.properties {
+                // We don't currently support refs or shared strings
+                if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+                    continue;
+                }
+                if let Some(list) = &filter {
+                    if list.contains(name) {
                         continue;
                     }
-                    if let Some(list) = &filter {
-                        if list.contains(name) {
-                            continue;
-                        }
-                    }
-                    if let Some(default) = defaults.get(name.as_str()) {
-                        if !variant_eq(value, default) {
-                            properties.insert(name, value);
-                        }
-                    } else {
+                }
+                if let Some(default) = defaults.get(name.as_str()) {
+                    if !variant_eq(value, default) {
                         properties.insert(name, value);
                     }
+                } else {
+                    properties.insert(name, value);
                 }
-            } else {
-                for (name, value) in &inst.properties {
-                    // We don't currently support refs or shared strings
-                    if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+            }
+        } else {
+            for (name, value) in &inst.properties {
+                // We don't currently support refs or shared strings
+                if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+                    continue;
+                }
+                if let Some(list) = &filter {
+                    if list.contains(name) {
                         continue;
                     }
-                    if let Some(list) = &filter {
-                        if list.contains(name) {
-                            continue;
-                        }
-                    }
-                    properties.insert(name, value);
                 }
+                properties.insert(name, value);
             }
         }
 

From ffb3da9edc5574a5e40e706ee522278f2cc6cd55 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Jan 2024 16:23:46 -0800
Subject: [PATCH 131/366] Filter out properties by class and name matching

---
 src/syncback/snapshot.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 746cbb0d3..e4551ed1c 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -90,6 +90,9 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         if let Some(class_data) = class_data {
             let defaults = &class_data.default_properties;
             for (name, value) in &inst.properties {
+                if filter_out_property(inst, name.as_str()) {
+                    continue;
+                }
                 // We don't currently support refs or shared strings
                 if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                     continue;
@@ -109,6 +112,9 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             }
         } else {
             for (name, value) in &inst.properties {
+                if filter_out_property(inst, name.as_str()) {
+                    continue;
+                }
                 // We don't currently support refs or shared strings
                 if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                     continue;
@@ -241,3 +247,15 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             .map(|rules| rules.ignore_trees.as_slice())
     }
 }
+
+fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
+    // We don't need SourceAssetId.
+    if prop_name == "Tags" || prop_name == "Attributes" || prop_name == "SourceAssetId" {
+        return true;
+    }
+    match inst.class.as_str() {
+        "Script" | "LocalScript" | "ModuleScript" => prop_name == "Source",
+        "LocalizationTable" => prop_name == "Contents",
+        _ => false,
+    }
+}

From 2b0c4043767b36537232bdea9f2866c1d6883445 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Jan 2024 16:31:39 -0800
Subject: [PATCH 132/366] Remove unnecessary borrow in json_model syncback

---
 src/snapshot_middleware/json_model.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index fce7c57ac..4fca94fee 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -104,12 +104,13 @@ pub fn syncback_json_model<'new, 'old>(
         attributes,
     };
 
-    // TODO children
+    // TODO Do we want children to be included in a JSON model?
+    // Feels unlikely, since it could be very dense in the case of e.g. Tools
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot: FsSnapshot::new().with_added_file(
-            &path,
+            path,
             serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
         ),
         children: Vec::new(),

From 53355f0468f179d49d01ddf8ad1c2358af5e5b3b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Jan 2024 16:56:46 -0800
Subject: [PATCH 133/366] Move towards syncback command not sucking

---
 src/cli/syncback.rs | 105 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 84 insertions(+), 21 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index bb32b7f90..d8ffccb23 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -3,15 +3,18 @@ use std::{
     time::Instant,
 };
 
+use anyhow::Context;
 use clap::Parser;
 use memofs::Vfs;
-use rbx_dom_weak::WeakDom;
-use rbx_xml::DecodeOptions;
+use rbx_dom_weak::{InstanceBuilder, WeakDom};
 
 use crate::{serve_session::ServeSession, syncback::syncback_loop};
 
 use super::resolve_path;
 
+const UNKNOWN_INPUT_KIND_ERR: &str = "Could not detect what kind of file was inputted. \
+                                       Expected input file to end in .rbxl, .rbxlx, .rbxm, or .rbxmx.";
+
 /// Performs syncback for a project file
 #[derive(Debug, Parser)]
 pub struct SyncbackCommand {
@@ -29,6 +32,15 @@ impl SyncbackCommand {
         let path_old = resolve_path(&self.project);
         let path_new = resolve_path(&self.input);
 
+        let input_kind = FileKind::from_path(&path_new).context(UNKNOWN_INPUT_KIND_ERR)?;
+        let dom_start = Instant::now();
+        log::info!("Reading place file at {}", path_new.display());
+        let dom_new = read_dom(&path_new, input_kind)?;
+        log::info!(
+            "Finished opening file in {:0.02}s",
+            dom_start.elapsed().as_secs_f32()
+        );
+
         let project_start = Instant::now();
         log::info!("Opening project at {}", path_old.display());
         let session_old = ServeSession::new(Vfs::new_default(), path_old.clone())?;
@@ -39,13 +51,8 @@ impl SyncbackCommand {
 
         let dom_old = session_old.tree();
 
-        let dom_start = Instant::now();
-        log::info!("Reading place file at {}", path_new.display());
-        let dom_new = read_dom(&path_new)?;
-        log::info!(
-            "Finished opening file in {:0.02}s",
-            dom_start.elapsed().as_secs_f32()
-        );
+        log::debug!("Old root: {}", dom_old.inner().root().class);
+        log::debug!("New root: {}", dom_new.root().class);
 
         let start = Instant::now();
         log::info!("Beginning syncback...");
@@ -64,18 +71,74 @@ impl SyncbackCommand {
     }
 }
 
-fn read_dom(path: &Path) -> anyhow::Result<WeakDom> {
+fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
     let content = fs_err::read(path)?;
-    Ok(if &content[0..8] == b"<roblox!" {
-        log::debug!("Reading {} as a binary file", path.display());
-        rbx_binary::from_reader(content.as_slice())?
-    } else if &content[0..7] == b"<roblox" {
-        log::debug!("Reading {} as an xml file", path.display());
-        rbx_xml::from_reader(
-            content.as_slice(),
-            DecodeOptions::new().property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown),
-        )?
-    } else {
-        anyhow::bail!("invalid Roblox file at {}", path.display())
+    Ok(match file_kind {
+        FileKind::Rbxl => rbx_binary::from_reader(content.as_slice())?,
+        FileKind::Rbxlx => rbx_xml::from_reader(content.as_slice(), xml_decode_config())?,
+        FileKind::Rbxm => {
+            let temp_tree = rbx_binary::from_reader(content.as_slice())?;
+            let root_children = temp_tree.root().children();
+            if root_children.len() != 1 {
+                anyhow::bail!(
+                    "Rojo does not currently support models with more \
+                than one Instance at the Root!"
+                );
+            }
+            let real_root = temp_tree.get_by_ref(root_children[0]).unwrap();
+            let mut new_tree = WeakDom::new(InstanceBuilder::new(&real_root.class));
+            temp_tree.clone_multiple_into_external(real_root.children(), &mut new_tree);
+
+            new_tree
+        }
+        FileKind::Rbxmx => {
+            let temp_tree = rbx_xml::from_reader(content.as_slice(), xml_decode_config())?;
+            let root_children = temp_tree.root().children();
+            if root_children.len() != 1 {
+                anyhow::bail!(
+                    "Rojo does not currently support models with more \
+                than one Instance at the Root!"
+                );
+            }
+            let real_root = temp_tree.get_by_ref(root_children[0]).unwrap();
+            let mut new_tree = WeakDom::new(InstanceBuilder::new(&real_root.class));
+            temp_tree.clone_multiple_into_external(real_root.children(), &mut new_tree);
+
+            new_tree
+        }
     })
 }
+
+fn xml_decode_config() -> rbx_xml::DecodeOptions<'static> {
+    rbx_xml::DecodeOptions::new().property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown)
+}
+
+/// The different kinds of input that Rojo can syncback.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum FileKind {
+    /// An XML model file.
+    Rbxmx,
+
+    /// An XML place file.
+    Rbxlx,
+
+    /// A binary model file.
+    Rbxm,
+
+    /// A binary place file.
+    Rbxl,
+}
+
+impl FileKind {
+    fn from_path(output: &Path) -> Option<FileKind> {
+        let extension = output.extension()?.to_str()?;
+
+        match extension {
+            "rbxlx" => Some(FileKind::Rbxlx),
+            "rbxmx" => Some(FileKind::Rbxmx),
+            "rbxl" => Some(FileKind::Rbxl),
+            "rbxm" => Some(FileKind::Rbxm),
+            _ => None,
+        }
+    }
+}

From 8c1851f16ee00a8940fd33a5e2905fc3b4a7b08e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 24 Jan 2024 19:59:58 -0800
Subject: [PATCH 134/366] Add function for hashing a tree without using
 descendants

---
 src/snapshot/hash/mod.rs | 65 +++++++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/snapshot/hash/mod.rs b/src/snapshot/hash/mod.rs
index 129a3819b..82f17a295 100644
--- a/src/snapshot/hash/mod.rs
+++ b/src/snapshot/hash/mod.rs
@@ -1,4 +1,4 @@
-//! Hashing utility for a RojoTree
+//! Hashing utilities for a WeakDom.
 mod variant;
 
 pub use variant::*;
@@ -12,18 +12,45 @@ use std::collections::{HashMap, VecDeque};
 
 use crate::variant_eq::variant_eq;
 
+/// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
+/// `Instance` it points to, including the properties but not including the
+/// descendants of the Instance.
+///
+/// The hashes **do not** include the descendants of the Instances in them,
+/// so they should only be used for comparing Instances directly. To compare a
+/// subtree, use `hash_tree`.
+pub fn hash_tree_no_descendants(dom: &WeakDom) -> HashMap<Ref, Hash> {
+    let mut map: HashMap<Ref, Hash> = HashMap::new();
+    let mut order = descendants(dom);
+
+    let mut prop_list = Vec::with_capacity(2);
+
+    while let Some(referent) = order.pop() {
+        let inst = dom.get_by_ref(referent).unwrap();
+        let hash = hash_inst_no_descendants(inst, &mut prop_list);
+
+        map.insert(referent, hash.finalize());
+    }
+
+    map
+}
+
+/// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
+/// `Instance` it points to, including the properties and descendants of the
+/// `Instance`.
+///
+/// The hashes **do** include the descendants of the Instances in them,
+/// so they should only be used for comparing subtrees directly. To compare an
+/// `Instance` directly, use `hash_tree_no_descendants`.
 pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
     let mut order = descendants(dom);
 
     let mut prop_list = Vec::with_capacity(2);
 
-    // function get_hash_id(inst)
-    // return hash({ sort(foreach(inst.properties, hash)), sort(foreach(inst.children, get_hash_id)) })
-    // end
     while let Some(referent) = order.pop() {
         let inst = dom.get_by_ref(referent).unwrap();
-        let hash = hash_inst(&mut prop_list, &map, inst);
+        let hash = hash_inst(inst, &mut prop_list, &map);
 
         map.insert(referent, hash);
     }
@@ -31,11 +58,12 @@ pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
     map
 }
 
-pub fn hash_inst<'map, 'inst>(
-    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
-    map: &'map HashMap<Ref, Hash>,
+/// Hashes an Instance using its class, name, and properties. The passed
+/// `prop_list` is used to sort properties before hashing them.
+fn hash_inst_no_descendants<'inst>(
     inst: &'inst Instance,
-) -> Hash {
+    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
+) -> Hasher {
     let mut hasher = Hasher::new();
     hasher.update(inst.class.as_bytes());
     hasher.update(inst.name.as_bytes());
@@ -61,7 +89,24 @@ pub fn hash_inst<'map, 'inst>(
         hash_variant(&mut hasher, value)
     }
 
+    prop_list.clear();
+
+    hasher
+}
+
+/// Hashes an Instance using its class, name, properties, and descendants.
+/// The passed `prop_list` is used to sort properties before hashing them.
+///
+/// # Panics
+/// If any children of the Instance are inside `map`, this function will panic.
+fn hash_inst<'inst>(
+    inst: &'inst Instance,
+    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
+    map: &HashMap<Ref, Hash>,
+) -> Hash {
+    let mut hasher = hash_inst_no_descendants(inst, prop_list);
     let mut child_list = Vec::with_capacity(inst.children().len());
+
     for child in inst.children() {
         if let Some(hash) = map.get(child) {
             child_list.push(hash.as_bytes())
@@ -74,8 +119,6 @@ pub fn hash_inst<'map, 'inst>(
         hasher.update(hash);
     }
 
-    prop_list.clear();
-
     hasher.finalize()
 }
 

From 186a386ade38c4818e29c7b37a174c92e8d5aff8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 25 Jan 2024 11:21:27 -0800
Subject: [PATCH 135/366] Add function for doing both hash types at once, use
 it

---
 src/snapshot/hash/mod.rs           | 81 +++++++++++++++++++-----------
 src/snapshot_middleware/project.rs |  6 +--
 src/syncback/mod.rs                | 28 +++++------
 src/syncback/snapshot.rs           | 39 ++++++++++++--
 4 files changed, 104 insertions(+), 50 deletions(-)

diff --git a/src/snapshot/hash/mod.rs b/src/snapshot/hash/mod.rs
index 82f17a295..d9c87f67b 100644
--- a/src/snapshot/hash/mod.rs
+++ b/src/snapshot/hash/mod.rs
@@ -12,6 +12,42 @@ use std::collections::{HashMap, VecDeque};
 
 use crate::variant_eq::variant_eq;
 
+/// Returns a map of hashes for every Instance contained in the DOM.
+/// Hashes are mapped to the Instance's referent.
+///
+/// The first hash in each tuple is the Instance's hash with no descendants,
+/// the second is one using descendants.
+pub fn hash_tree_both(dom: &WeakDom) -> HashMap<Ref, (Hash, Hash)> {
+    let mut map: HashMap<Ref, (Hash, Hash)> = HashMap::new();
+    let mut order = descendants(dom);
+
+    let mut prop_list = Vec::with_capacity(2);
+
+    while let Some(referent) = order.pop() {
+        let inst = dom.get_by_ref(referent).unwrap();
+        let mut hasher = hash_inst_no_descendants(inst, &mut prop_list);
+        let no_descendants = hasher.finalize();
+
+        let mut child_list = Vec::with_capacity(inst.children().len());
+
+        for child in inst.children() {
+            if let Some((_, descendant)) = map.get(child) {
+                child_list.push(descendant.as_bytes())
+            } else {
+                panic!("Invariant: child {} not hashed before its parent", child);
+            }
+        }
+        child_list.sort_unstable();
+        for hash in child_list {
+            hasher.update(hash);
+        }
+
+        map.insert(referent, (no_descendants, hasher.finalize()));
+    }
+
+    map
+}
+
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
 /// `Instance` it points to, including the properties but not including the
 /// descendants of the Instance.
@@ -50,9 +86,22 @@ pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
 
     while let Some(referent) = order.pop() {
         let inst = dom.get_by_ref(referent).unwrap();
-        let hash = hash_inst(inst, &mut prop_list, &map);
+        let mut hasher = hash_inst_no_descendants(inst, &mut prop_list);
 
-        map.insert(referent, hash);
+        let mut child_list = Vec::with_capacity(inst.children().len());
+        for child in inst.children() {
+            if let Some(hash) = map.get(child) {
+                child_list.push(hash.as_bytes())
+            } else {
+                panic!("Invariant: child {} not hashed before its parent", child);
+            }
+        }
+        child_list.sort_unstable();
+        for hash in child_list {
+            hasher.update(hash);
+        }
+
+        map.insert(referent, hasher.finalize());
     }
 
     map
@@ -94,34 +143,6 @@ fn hash_inst_no_descendants<'inst>(
     hasher
 }
 
-/// Hashes an Instance using its class, name, properties, and descendants.
-/// The passed `prop_list` is used to sort properties before hashing them.
-///
-/// # Panics
-/// If any children of the Instance are inside `map`, this function will panic.
-fn hash_inst<'inst>(
-    inst: &'inst Instance,
-    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
-    map: &HashMap<Ref, Hash>,
-) -> Hash {
-    let mut hasher = hash_inst_no_descendants(inst, prop_list);
-    let mut child_list = Vec::with_capacity(inst.children().len());
-
-    for child in inst.children() {
-        if let Some(hash) = map.get(child) {
-            child_list.push(hash.as_bytes())
-        } else {
-            panic!("Invariant: child {} not hashed before its parent", child);
-        }
-    }
-    child_list.sort_unstable();
-    for hash in child_list {
-        hasher.update(hash);
-    }
-
-    hasher.finalize()
-}
-
 pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
     let mut queue = VecDeque::new();
     let mut ordered = Vec::new();
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index a40e8195a..d7295ad28 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, collections::HashMap, path::Path};
+use std::{borrow::Cow, collections::HashMap, path::Path, rc::Rc};
 
 use anyhow::{bail, Context};
 use memofs::Vfs;
@@ -408,7 +408,7 @@ pub fn syncback_project<'new, 'old>(
             if let Some(old_inst) = old_child_map.get(new_name.as_str()) {
                 // This new instance represents an older one!
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data,
+                    data: Rc::clone(&snapshot.data),
                     old: Some(old_inst.id()),
                     new: new_child.referent(),
                     parent_path,
@@ -418,7 +418,7 @@ pub fn syncback_project<'new, 'old>(
             } else {
                 // This new instance is... new.
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data,
+                    data: Rc::clone(&snapshot.data),
                     old: None,
                     new: new_child.referent(),
                     parent_path,
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 78e433e9c..30ab75901 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -6,11 +6,14 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, VecDeque};
+use std::{
+    collections::{HashMap, VecDeque},
+    rc::Rc,
+};
 
 use crate::{
     glob::Glob,
-    snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot::{hash_tree_both, InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,
 };
@@ -26,18 +29,20 @@ pub fn syncback_loop<'old>(
     project: &'old Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
     log::debug!("Hashing project DOM");
-    let old_hashes = hash_tree(old_tree.inner());
+    let old_hashes = hash_tree_both(old_tree.inner());
     log::debug!("Hashing file DOM");
-    let new_hashes = hash_tree(new_tree);
+    let new_hashes = hash_tree_both(new_tree);
 
     let project_path = project.folder_location();
 
-    let syncback_data = SyncbackData {
+    let syncback_data = Rc::new(SyncbackData {
         vfs,
         old_tree,
         new_tree,
         syncback_rules: project.syncback_rules.as_ref(),
-    };
+        old_hashes,
+        new_hashes,
+    });
 
     let mut snapshots = vec![SyncbackSnapshot {
         data: syncback_data,
@@ -54,14 +59,9 @@ pub fn syncback_loop<'old>(
         let inst_path = get_inst_path(new_tree, snapshot.new);
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
-        if let Some(old_ref) = snapshot.old {
-            if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
-                log::trace!(
-                    "Skipping {inst_path} due to it being identically hashed as {:?}",
-                    old_hashes.get(&old_ref)
-                );
-                continue;
-            }
+        if snapshot.trees_are_deep_eq() {
+            log::trace!("Skipping {inst_path} due to it being identically hashed");
+            continue;
         }
 
         let middleware = snapshot
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index e4551ed1c..d2ebf747e 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,7 +1,9 @@
+use blake3::Hash;
 use memofs::Vfs;
 use std::{
     collections::{BTreeSet, HashMap},
     path::{Path, PathBuf},
+    rc::Rc,
     sync::OnceLock,
 };
 
@@ -20,16 +22,17 @@ use super::SyncbackRules;
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
-#[derive(Clone, Copy)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
     pub(super) new_tree: &'new WeakDom,
     pub(super) syncback_rules: Option<&'old SyncbackRules>,
+    pub(super) new_hashes: HashMap<Ref, (Hash, Hash)>,
+    pub(super) old_hashes: HashMap<Ref, (Hash, Hash)>,
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
-    pub data: SyncbackData<'new, 'old>,
+    pub data: Rc<SyncbackData<'new, 'old>>,
     pub old: Option<Ref>,
     pub new: Ref,
     pub parent_path: PathBuf,
@@ -42,7 +45,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     #[inline]
     pub fn with_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
-            data: self.data,
+            data: Rc::clone(&self.data),
             old: old_ref,
             new: new_ref,
             parent_path: self.parent_path.join(&self.name),
@@ -181,6 +184,36 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         true
     }
 
+    /// Returns whether two Instances are equal, using their hash for O(1)
+    /// comparisons. This comparison **does not** take descendants into account.
+    #[inline]
+    pub fn trees_are_eq(&self) -> bool {
+        let old_hashes = self
+            .old
+            .and_then(|referent| self.data.old_hashes.get(&referent));
+        let new_hashes = self.data.new_hashes.get(&self.new);
+
+        match (old_hashes, new_hashes) {
+            (Some((old_hash, _)), Some((new_hash, _))) => old_hash == new_hash,
+            _ => false,
+        }
+    }
+
+    /// Returns whether two Instance trees are equal, using their hash for O(1)
+    /// comparisons. This comparison **does** take descendants into account.
+    #[inline]
+    pub fn trees_are_deep_eq(&self) -> bool {
+        let old_hashes = self
+            .old
+            .and_then(|referent| self.data.old_hashes.get(&referent));
+        let new_hashes = self.data.new_hashes.get(&self.new);
+
+        match (old_hashes, new_hashes) {
+            (Some((_, old_hash)), Some((_, new_hash))) => old_hash == new_hash,
+            _ => false,
+        }
+    }
+
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]

From 36b288ba00070a86bfbe75766aaad46178f43f1c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 25 Jan 2024 14:30:34 -0800
Subject: [PATCH 136/366] Slightly improve UX of duplicate name checking

---
 src/snapshot_middleware/dir.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 6b18b757f..7fb49267a 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -161,11 +161,22 @@ pub fn syncback_dir_no_meta<'new, 'old>(
     let mut removed_children = Vec::new();
 
     // We have to enforce unique child names for the file system.
-    let mut duplicate_check = HashSet::with_capacity(new_inst.children().len());
-    for child in new_inst.children() {
-        let child = snapshot.get_new_instance(*child).unwrap();
-        if !duplicate_check.insert(child.name.to_lowercase()) {
-            anyhow::bail!("Instance has duplicate child {}", child.name.to_lowercase());
+    let mut child_names = HashSet::with_capacity(new_inst.children().len());
+    let mut duplicate_set = HashSet::new();
+    for child_ref in new_inst.children() {
+        let child = snapshot.get_new_instance(*child_ref).unwrap();
+        if !child_names.insert(child.name.to_lowercase()) {
+            duplicate_set.insert(child.name.as_str());
+        }
+    }
+    if !duplicate_set.is_empty() {
+        if duplicate_set.len() <= 25 {
+            anyhow::bail!(
+                "Instance has children with duplicate name (case may not exactly match):\n {}",
+                duplicate_set.into_iter().collect::<Vec<&str>>().join(", ")
+            );
+        } else {
+            anyhow::bail!("Instance has more than 25 children with duplicate names");
         }
     }
 

From 09e8ac18dc75caeaf780397d7ebb9be4ecbc9d4e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 25 Jan 2024 14:31:40 -0800
Subject: [PATCH 137/366] Mildly improve performance of checking classes for
 JSON models Also add ParticleEmitter as modeljson and remove screengui
 exceptionalism

---
 src/syncback/mod.rs | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 30ab75901..c3a15d908 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -7,8 +7,9 @@ use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
 use std::{
-    collections::{HashMap, VecDeque},
+    collections::{HashMap, HashSet, VecDeque},
     rc::Rc,
+    sync::OnceLock,
 };
 
 use crate::{
@@ -134,25 +135,29 @@ pub struct SyncbackReturn<'new, 'old> {
 }
 
 pub fn get_best_middleware(inst: &Instance) -> Middleware {
-    match inst.class.as_str() {
-        "Folder" | "Configuration" | "Tool" | "ScreenGui" => Middleware::Dir,
-        "Sound"
-        | "SoundGroup"
-        | "Sky"
-        | "Atmosphere"
-        | "BloomEffect"
-        | "BlurEffect"
-        | "ColorCorrectionEffect"
-        | "DepthOfFieldEffect"
-        | "SunRaysEffect" => {
-            if inst.children().is_empty() {
-                Middleware::JsonModel
-            } else {
-                // This begs the question of an init.model.json but we'll leave
-                // that for another day.
-                Middleware::Dir
-            }
+    // At some point, we're better off using an O(1) method for checking
+    // equality for classes like this.
+    static JSON_MODEL_CLASSES: OnceLock<HashSet<&str>> = OnceLock::new();
+    let json_model_classes = JSON_MODEL_CLASSES.get_or_init(|| {
+        maplit::hashset! {
+            "Sound", "SoundGroup", "Sky", "Atmosphere", "BloomEffect",
+            "BlurEffect", "ColorCorrectionEffect", "DepthOfFieldEffect",
+            "SunRaysEffect", "ParticleEmitter"
         }
+    });
+
+    if json_model_classes.contains(inst.class.as_str()) {
+        if inst.children().is_empty() {
+            return Middleware::JsonModel;
+        } else {
+            // This begs the question of an init.model.json but we'll leave
+            // that for another day.
+            return Middleware::Dir;
+        }
+    }
+
+    match inst.class.as_str() {
+        "Folder" | "Configuration" | "Tool" => Middleware::Dir,
         "StringValue" => {
             if inst.children().is_empty() {
                 Middleware::Text

From 55354cfeaa1c6948e69688a42579da7460933e76 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 25 Jan 2024 14:51:25 -0800
Subject: [PATCH 138/366] Don't publicly export DirectoryMetadata

---
 src/snapshot_middleware/csv.rs | 3 +--
 src/snapshot_middleware/lua.rs | 3 +--
 src/snapshot_middleware/mod.rs | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 73296f39a..188dc5483 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -18,8 +18,7 @@ use crate::{
 
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
-    meta_file::{file_meta, AdjacentMetadata},
-    DirectoryMetadata,
+    meta_file::{file_meta, AdjacentMetadata, DirectoryMetadata},
 };
 
 pub fn snapshot_csv(
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 8a0743c85..ee3c5bea8 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -16,8 +16,7 @@ use crate::{
 
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
-    meta_file::{file_meta, AdjacentMetadata},
-    DirectoryMetadata,
+    meta_file::{file_meta, AdjacentMetadata, DirectoryMetadata},
 };
 
 #[derive(Debug)]
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 137fe5bb1..60587877e 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -50,8 +50,7 @@ use self::{
 };
 
 pub use self::{
-    lua::ScriptType, meta_file::DirectoryMetadata, project::snapshot_project_node,
-    util::emit_legacy_scripts_default,
+    lua::ScriptType, project::snapshot_project_node, util::emit_legacy_scripts_default,
 };
 
 /// Returns an `InstanceSnapshot` for the provided path.

From bbb59771868a7f7222a205feb1458806c37a5649 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 25 Jan 2024 14:58:05 -0800
Subject: [PATCH 139/366] Correct problem with using old_inst properties where
 we shouldn't

---
 src/snapshot_middleware/project.rs | 2 +-
 src/syncback/snapshot.rs           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index d7295ad28..59091308e 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -357,7 +357,7 @@ pub fn syncback_project<'new, 'old>(
         let properties = &mut node.properties;
 
         let filtered_properties = snapshot
-            .get_filtered_properties(new_inst.referent())
+            .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
             .expect("all project nodes should exist in both trees when in queue");
         for (name, value) in filtered_properties {
             properties.insert(
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index d2ebf747e..236d223b9 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -61,7 +61,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// clone any data. This is left to the consumer.
     #[inline]
     pub fn new_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
-        self.get_filtered_properties(self.new).unwrap()
+        self.get_filtered_properties(self.new, self.old).unwrap()
     }
 
     /// Returns a map of properties for an Instance from the 'new' tree
@@ -73,6 +73,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     pub fn get_filtered_properties(
         &self,
         new_ref: Ref,
+        old_ref: Option<Ref>,
     ) -> Option<HashMap<&'new str, &'new Variant>> {
         let inst = self.get_new_instance(new_ref)?;
         let mut properties: HashMap<&str, &Variant> =
@@ -80,7 +81,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
 
         let filter = self.get_property_filter();
 
-        if let Some(old_inst) = self.old_inst() {
+        if let Some(old_inst) = old_ref.and_then(|referent| self.get_old_instance(referent)) {
             for (name, value) in &inst.properties {
                 if old_inst.properties().contains_key(name) {
                     properties.insert(name, value);

From fae849e7ac1ef082480a13e1ba95d7dc4ea2bdd8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 25 Jan 2024 15:54:52 -0800
Subject: [PATCH 140/366] Add baseline for better metadata support

---
 src/snapshot_middleware/lua.rs       | 41 +++----------------
 src/snapshot_middleware/meta_file.rs | 59 +++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index ee3c5bea8..f8ef52753 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -141,45 +141,16 @@ pub fn syncback_lua<'new, 'old>(
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
 
-    let mut meta = if let Some(meta) = file_meta(snapshot.vfs(), &path, &snapshot.name)? {
-        meta
-    } else {
-        AdjacentMetadata {
-            ignore_unknown_instances: None,
-            properties: BTreeMap::new(),
-            attributes: BTreeMap::new(),
-            path: path
-                .with_file_name(&snapshot.name)
-                .with_extension("meta.json"),
-        }
-    };
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Source" {
-            continue;
-        } else if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attrs) = value {
-                meta.attributes.extend(attrs.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::FullyQualified(value.clone()),
-                    )
-                }))
-            } else {
-                log::error!("Property {name} should be Attributes but is not");
-            }
-        } else {
-            meta.properties.insert(
-                name.to_string(),
-                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
-            );
-        }
-    }
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, contents);
     if !meta.is_empty() {
         fs_snapshot.add_file(
-            &meta.path,
-            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+            snapshot
+                .parent_path
+                .join(format!("{}.meta.json", new_inst.name)),
+            serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
         );
     }
 
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 058c10e11..a3b8fdaa9 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -6,10 +6,10 @@ use std::{
 
 use anyhow::{format_err, Context};
 use memofs::{IoResultExt as _, Vfs};
-use rbx_dom_weak::types::Attributes;
+use rbx_dom_weak::types::{Attributes, Variant};
 use serde::{Deserialize, Serialize};
 
-use crate::{resolution::UnresolvedValue, snapshot::InstanceSnapshot};
+use crate::{resolution::UnresolvedValue, snapshot::InstanceSnapshot, syncback::SyncbackSnapshot};
 
 /// Represents metadata in a sibling file with the same basename.
 ///
@@ -44,6 +44,61 @@ impl AdjacentMetadata {
         Ok(meta)
     }
 
+    /// Constructs an `AdjacentMetadata` from the provided snapshot, assuming it
+    /// will be at the provided path.
+    pub fn from_syncback_snapshot(
+        snapshot: &SyncbackSnapshot,
+        path: PathBuf,
+    ) -> anyhow::Result<Self> {
+        let mut properties = BTreeMap::new();
+        let mut attributes = BTreeMap::new();
+
+        let ignore_unknown_instances = if let Some(old_inst) = snapshot.old_inst() {
+            if old_inst.metadata().ignore_unknown_instances {
+                Some(true)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        let class = &snapshot.new_inst().class;
+        for (name, value) in snapshot.new_filtered_properties() {
+            properties.insert(
+                name.to_owned(),
+                UnresolvedValue::from_variant(value.clone(), class, name),
+            );
+        }
+        if let Some(value) = snapshot.new_inst().properties.get("Attributes") {
+            if let Variant::Attributes(attrs) = value {
+                for (name, value) in attrs.iter() {
+                    let value = if let Variant::BinaryString(bstr) = value {
+                        match std::str::from_utf8(bstr.as_ref()) {
+                            Ok(str) => Variant::String(str.to_owned()),
+                            Err(_) => value.clone(),
+                        }
+                    } else {
+                        value.clone()
+                    };
+                    attributes.insert(name.to_owned(), UnresolvedValue::FullyQualified(value));
+                }
+            } else {
+                anyhow::bail!(
+                    "expected Attributes to be of type Attributes but it was {:?}",
+                    value.ty()
+                );
+            }
+        }
+
+        Ok(Self {
+            ignore_unknown_instances,
+            properties,
+            attributes,
+            path,
+        })
+    }
+
     pub fn apply_ignore_unknown_instances(&mut self, snapshot: &mut InstanceSnapshot) {
         if let Some(ignore) = self.ignore_unknown_instances.take() {
             snapshot.metadata.ignore_unknown_instances = ignore;

From e670d8f63bef8fe30117a9925c6721685797b3e6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 26 Jan 2024 11:47:26 -0800
Subject: [PATCH 141/366] Use convenience method for metadata when possible

---
 src/snapshot_middleware/csv.rs | 39 +++----------------------------
 src/snapshot_middleware/lua.rs |  2 +-
 src/snapshot_middleware/txt.rs | 42 ++++------------------------------
 src/syncback/snapshot.rs       |  1 +
 4 files changed, 10 insertions(+), 74 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 188dc5483..8afa4ade2 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -18,7 +18,7 @@ use crate::{
 
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
-    meta_file::{file_meta, AdjacentMetadata, DirectoryMetadata},
+    meta_file::{AdjacentMetadata, DirectoryMetadata},
 };
 
 pub fn snapshot_csv(
@@ -111,47 +111,14 @@ pub fn syncback_csv<'new, 'old>(
         anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
     };
 
-    let mut meta = if let Some(meta) = file_meta(snapshot.vfs(), &path, &snapshot.name)? {
-        meta
-    } else {
-        AdjacentMetadata {
-            ignore_unknown_instances: None,
-            properties: BTreeMap::new(),
-            attributes: BTreeMap::new(),
-            path: path
-                .with_file_name(&snapshot.name)
-                .with_extension("meta.json"),
-        }
-    };
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Contents" {
-            continue;
-        } else if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attrs) = value {
-                meta.attributes.extend(attrs.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::FullyQualified(value.clone()),
-                    )
-                }))
-            } else {
-                log::error!("Property {name} should be Attributes but is not");
-            }
-        } else {
-            meta.properties.insert(
-                name.to_string(),
-                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
-            );
-        }
-    }
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
 
-    // TODO tags don't work, why?
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, localization_to_csv(contents)?);
     if !meta.is_empty() {
         fs_snapshot.add_file(
             &meta.path,
-            serde_json::to_vec_pretty(&meta).context("failed to reserialize metadata")?,
+            serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
         )
     }
 
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index f8ef52753..664ba200c 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -16,7 +16,7 @@ use crate::{
 
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
-    meta_file::{file_meta, AdjacentMetadata, DirectoryMetadata},
+    meta_file::{AdjacentMetadata, DirectoryMetadata},
 };
 
 #[derive(Debug)]
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 2c9b91c93..f3d15fbb9 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, path::Path, str};
+use std::{path::Path, str};
 
 use anyhow::Context;
 use maplit::hashmap;
@@ -6,12 +6,11 @@ use memofs::{IoResultExt, Vfs};
 use rbx_dom_weak::types::Variant;
 
 use crate::{
-    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
-use super::meta_file::{file_meta, AdjacentMetadata};
+use super::meta_file::AdjacentMetadata;
 
 pub fn snapshot_txt(
     context: &InstanceContext,
@@ -62,45 +61,14 @@ pub fn syncback_txt<'new, 'old>(
         anyhow::bail!("StringValues must have a `Value` property that is a String");
     };
 
-    let mut meta = if let Some(meta) = file_meta(snapshot.vfs(), &path, &snapshot.name)? {
-        meta
-    } else {
-        AdjacentMetadata {
-            ignore_unknown_instances: None,
-            properties: BTreeMap::new(),
-            attributes: BTreeMap::new(),
-            path: path
-                .with_file_name(&snapshot.name)
-                .with_extension("meta.json"),
-        }
-    };
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Value" {
-            continue;
-        } else if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attrs) = value {
-                meta.attributes.extend(attrs.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::FullyQualified(value.clone()),
-                    )
-                }))
-            } else {
-                log::error!("Property {name} should be Attributes but is not");
-            }
-        } else {
-            meta.properties.insert(
-                name.to_string(),
-                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
-            );
-        }
-    }
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, contents);
     if !meta.is_empty() {
         fs_snapshot.add_file(
             &meta.path,
-            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
+            serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
         );
     }
 
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 236d223b9..e627e758e 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -290,6 +290,7 @@ fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
     match inst.class.as_str() {
         "Script" | "LocalScript" | "ModuleScript" => prop_name == "Source",
         "LocalizationTable" => prop_name == "Contents",
+        "StringValue" => prop_name == "Value",
         _ => false,
     }
 }

From ec7d4ed6bbab6d66c607a5d8aabf7d31bf852c3d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 26 Jan 2024 11:48:40 -0800
Subject: [PATCH 142/366] Make gitkeep file only in full dir syncback (not
 no_meta variant)

---
 src/snapshot_middleware/dir.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 7fb49267a..a3fa5f3ba 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -147,6 +147,12 @@ pub fn syncback_dir<'new, 'old>(
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
     }
+    if new_inst.children().is_empty() {
+        dir_syncback
+            .fs_snapshot
+            .add_file(path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
+    }
+
     Ok(dir_syncback)
 }
 
@@ -212,9 +218,6 @@ pub fn syncback_dir_no_meta<'new, 'old>(
     }
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_dir(&path);
-    if new_inst.children().is_empty() {
-        fs_snapshot.add_file(path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
-    }
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),

From 9ba191a7f74f781738f652ade7ad18ad0791c590 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 26 Jan 2024 11:58:45 -0800
Subject: [PATCH 143/366] Correct metadata location for text and csv

---
 src/snapshot_middleware/csv.rs | 4 +++-
 src/snapshot_middleware/txt.rs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 8afa4ade2..b372e24a3 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -117,7 +117,9 @@ pub fn syncback_csv<'new, 'old>(
     fs_snapshot.add_file(path, localization_to_csv(contents)?);
     if !meta.is_empty() {
         fs_snapshot.add_file(
-            &meta.path,
+            snapshot
+                .parent_path
+                .join(format!("{}.meta.json", new_inst.name)),
             serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
         )
     }
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index f3d15fbb9..d37782b8b 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -67,7 +67,9 @@ pub fn syncback_txt<'new, 'old>(
     fs_snapshot.add_file(path, contents);
     if !meta.is_empty() {
         fs_snapshot.add_file(
-            &meta.path,
+            snapshot
+                .parent_path
+                .join(format!("{}.meta.json", new_inst.name)),
             serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
         );
     }

From 80d19ca8050eec009d8e2f05dac15d7c72ec597b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 26 Jan 2024 13:10:54 -0800
Subject: [PATCH 144/366] Use DirectoryMeta for syncing dir metadata

---
 src/snapshot_middleware/csv.rs       | 39 +-----------------
 src/snapshot_middleware/dir.rs       | 44 +++------------------
 src/snapshot_middleware/lua.rs       | 45 ++-------------------
 src/snapshot_middleware/meta_file.rs | 59 ++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 117 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index b372e24a3..88b8620c7 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -11,7 +11,6 @@ use rbx_dom_weak::types::Variant;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
@@ -147,47 +146,13 @@ pub fn syncback_csv_init<'new, 'old>(
     };
 
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
-    let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
-        dir
-    } else {
-        DirectoryMetadata {
-            ignore_unknown_instances: None,
-            class_name: None,
-            properties: BTreeMap::new(),
-            attributes: BTreeMap::new(),
-            path: snapshot
-                .parent_path
-                .join(&snapshot.name)
-                .join("init.meta.json"),
-        }
-    };
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Contents" {
-            continue;
-        } else if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attrs) = value {
-                meta.attributes.extend(attrs.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::FullyQualified(value.clone()),
-                    )
-                }))
-            } else {
-                log::error!("Property {name} should be Attributes but is not");
-            }
-        } else {
-            meta.properties.insert(
-                name.to_string(),
-                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
-            );
-        }
-    }
+    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
 
     let mut fs_snapshot = std::mem::take(&mut dir_syncback.fs_snapshot);
     fs_snapshot.add_file(&path, localization_to_csv(contents)?);
     if !meta.is_empty() {
         fs_snapshot.add_file(
-            &meta.path,
+            snapshot.parent_path.join(dir_name).join("init.meta.json"),
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
     }
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index a3fa5f3ba..8da1061ae 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,14 +1,12 @@
 use std::{
-    collections::{BTreeMap, HashMap, HashSet},
+    collections::{HashMap, HashSet},
     path::Path,
 };
 
 use anyhow::Context;
 use memofs::{DirEntry, IoResultExt, Vfs};
-use rbx_dom_weak::types::Variant;
 
 use crate::{
-    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
@@ -106,48 +104,18 @@ pub fn syncback_dir<'new, 'old>(
 
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
 
-    let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
-        dir
-    } else {
-        DirectoryMetadata {
-            ignore_unknown_instances: None,
-            properties: BTreeMap::new(),
-            attributes: BTreeMap::new(),
-            class_name: if new_inst.class == "Folder" {
-                None
-            } else {
-                Some(new_inst.class.clone())
-            },
-            path: path.join("init.meta.json"),
-        }
-    };
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attrs) = value {
-                meta.attributes.extend(attrs.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::FullyQualified(value.clone()),
-                    )
-                }))
-            } else {
-                log::error!("Property {name} should be Attributes but is not");
-            }
-        } else {
-            meta.properties.insert(
-                name.to_string(),
-                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
-            );
-        }
+    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    if new_inst.class != "Folder" {
+        meta.class_name = Some(new_inst.class.clone());
     }
 
     if !meta.is_empty() {
         dir_syncback.fs_snapshot.add_file(
-            &meta.path,
+            path.join("init.meta.json"),
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
     }
-    if new_inst.children().is_empty() {
+    if new_inst.children().is_empty() && meta.is_empty() {
         dir_syncback
             .fs_snapshot
             .add_file(path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 664ba200c..195443e16 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -1,15 +1,10 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    path::Path,
-    str,
-};
+use std::{collections::HashMap, path::Path, str};
 
 use anyhow::Context;
 use memofs::{IoResultExt, Vfs};
 use rbx_dom_weak::types::{Enum, Variant};
 
 use crate::{
-    resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
@@ -183,41 +178,7 @@ pub fn syncback_lua_init<'new, 'old>(
 
     let dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
 
-    let mut meta = if let Some(dir) = dir_meta(snapshot.vfs(), &path)? {
-        dir
-    } else {
-        DirectoryMetadata {
-            ignore_unknown_instances: None,
-            class_name: None,
-            properties: BTreeMap::new(),
-            attributes: BTreeMap::new(),
-            path: snapshot
-                .parent_path
-                .join(&snapshot.name)
-                .join("init.meta.json"),
-        }
-    };
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Source" {
-            continue;
-        } else if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attrs) = value {
-                meta.attributes.extend(attrs.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::FullyQualified(value.clone()),
-                    )
-                }))
-            } else {
-                log::error!("Property {name} should be Attributes but is not");
-            }
-        } else {
-            meta.properties.insert(
-                name.to_string(),
-                UnresolvedValue::from_variant(value.to_owned(), &new_inst.class, name),
-            );
-        }
-    }
+    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, contents);
@@ -225,7 +186,7 @@ pub fn syncback_lua_init<'new, 'old>(
 
     if !meta.is_empty() {
         fs_snapshot.add_file(
-            &meta.path,
+            snapshot.parent_path.join(dir_name).join("init.meta.json"),
             serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
         );
     }
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index a3b8fdaa9..0f2519398 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -193,6 +193,65 @@ impl DirectoryMetadata {
         Ok(meta)
     }
 
+    /// Constructs a `DirectoryMetadata` from the provided snapshot, assuming it
+    /// will be at the provided path.
+    ///
+    /// This function does not set `ClassName` manually as most uses won't
+    /// want it set.
+    pub fn from_syncback_snapshot(
+        snapshot: &SyncbackSnapshot,
+        path: PathBuf,
+    ) -> anyhow::Result<Self> {
+        let mut properties = BTreeMap::new();
+        let mut attributes = BTreeMap::new();
+
+        let ignore_unknown_instances = if let Some(old_inst) = snapshot.old_inst() {
+            if old_inst.metadata().ignore_unknown_instances {
+                Some(true)
+            } else {
+                None
+            }
+        } else {
+            None
+        };
+
+        let class = &snapshot.new_inst().class;
+        for (name, value) in snapshot.new_filtered_properties() {
+            properties.insert(
+                name.to_owned(),
+                UnresolvedValue::from_variant(value.clone(), class, name),
+            );
+        }
+        if let Some(value) = snapshot.new_inst().properties.get("Attributes") {
+            if let Variant::Attributes(attrs) = value {
+                for (name, value) in attrs.iter() {
+                    let value = if let Variant::BinaryString(bstr) = value {
+                        match std::str::from_utf8(bstr.as_ref()) {
+                            Ok(str) => Variant::String(str.to_owned()),
+                            Err(_) => value.clone(),
+                        }
+                    } else {
+                        value.clone()
+                    };
+                    attributes.insert(name.to_owned(), UnresolvedValue::FullyQualified(value));
+                }
+            } else {
+                anyhow::bail!(
+                    "expected Attributes to be of type Attributes but it was {:?}",
+                    value.ty()
+                );
+            }
+        }
+
+        Ok(Self {
+            ignore_unknown_instances,
+            properties,
+            attributes,
+            class_name: None,
+            path,
+        })
+    }
+
     pub fn apply_all(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
         self.apply_ignore_unknown_instances(snapshot);
         self.apply_class_name(snapshot)?;

From 670e5413fad6a4f99318e4a29c02ccffcc760f8f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 26 Jan 2024 13:34:37 -0800
Subject: [PATCH 145/366] Filter old_inst properties too

---
 src/syncback/snapshot.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index e627e758e..21d9bd366 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -83,6 +83,9 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
 
         if let Some(old_inst) = old_ref.and_then(|referent| self.get_old_instance(referent)) {
             for (name, value) in &inst.properties {
+                if filter_out_property(inst, name.as_str()) {
+                    continue;
+                }
                 if old_inst.properties().contains_key(name) {
                     properties.insert(name, value);
                 }

From 7b97520d6cc0c88415028768e3d8d794a1a4a105 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jan 2024 08:25:52 -0800
Subject: [PATCH 146/366] Revert "Add function for doing both hash types at
 once, use it"

This reverts commit 186a386ade38c4818e29c7b37a174c92e8d5aff8.
---
 src/snapshot/hash/mod.rs           | 81 +++++++++++-------------------
 src/snapshot_middleware/project.rs |  6 +--
 src/syncback/mod.rs                | 29 ++++++-----
 src/syncback/snapshot.rs           | 39 ++------------
 4 files changed, 50 insertions(+), 105 deletions(-)

diff --git a/src/snapshot/hash/mod.rs b/src/snapshot/hash/mod.rs
index d9c87f67b..82f17a295 100644
--- a/src/snapshot/hash/mod.rs
+++ b/src/snapshot/hash/mod.rs
@@ -12,42 +12,6 @@ use std::collections::{HashMap, VecDeque};
 
 use crate::variant_eq::variant_eq;
 
-/// Returns a map of hashes for every Instance contained in the DOM.
-/// Hashes are mapped to the Instance's referent.
-///
-/// The first hash in each tuple is the Instance's hash with no descendants,
-/// the second is one using descendants.
-pub fn hash_tree_both(dom: &WeakDom) -> HashMap<Ref, (Hash, Hash)> {
-    let mut map: HashMap<Ref, (Hash, Hash)> = HashMap::new();
-    let mut order = descendants(dom);
-
-    let mut prop_list = Vec::with_capacity(2);
-
-    while let Some(referent) = order.pop() {
-        let inst = dom.get_by_ref(referent).unwrap();
-        let mut hasher = hash_inst_no_descendants(inst, &mut prop_list);
-        let no_descendants = hasher.finalize();
-
-        let mut child_list = Vec::with_capacity(inst.children().len());
-
-        for child in inst.children() {
-            if let Some((_, descendant)) = map.get(child) {
-                child_list.push(descendant.as_bytes())
-            } else {
-                panic!("Invariant: child {} not hashed before its parent", child);
-            }
-        }
-        child_list.sort_unstable();
-        for hash in child_list {
-            hasher.update(hash);
-        }
-
-        map.insert(referent, (no_descendants, hasher.finalize()));
-    }
-
-    map
-}
-
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
 /// `Instance` it points to, including the properties but not including the
 /// descendants of the Instance.
@@ -86,22 +50,9 @@ pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
 
     while let Some(referent) = order.pop() {
         let inst = dom.get_by_ref(referent).unwrap();
-        let mut hasher = hash_inst_no_descendants(inst, &mut prop_list);
+        let hash = hash_inst(inst, &mut prop_list, &map);
 
-        let mut child_list = Vec::with_capacity(inst.children().len());
-        for child in inst.children() {
-            if let Some(hash) = map.get(child) {
-                child_list.push(hash.as_bytes())
-            } else {
-                panic!("Invariant: child {} not hashed before its parent", child);
-            }
-        }
-        child_list.sort_unstable();
-        for hash in child_list {
-            hasher.update(hash);
-        }
-
-        map.insert(referent, hasher.finalize());
+        map.insert(referent, hash);
     }
 
     map
@@ -143,6 +94,34 @@ fn hash_inst_no_descendants<'inst>(
     hasher
 }
 
+/// Hashes an Instance using its class, name, properties, and descendants.
+/// The passed `prop_list` is used to sort properties before hashing them.
+///
+/// # Panics
+/// If any children of the Instance are inside `map`, this function will panic.
+fn hash_inst<'inst>(
+    inst: &'inst Instance,
+    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
+    map: &HashMap<Ref, Hash>,
+) -> Hash {
+    let mut hasher = hash_inst_no_descendants(inst, prop_list);
+    let mut child_list = Vec::with_capacity(inst.children().len());
+
+    for child in inst.children() {
+        if let Some(hash) = map.get(child) {
+            child_list.push(hash.as_bytes())
+        } else {
+            panic!("Invariant: child {} not hashed before its parent", child);
+        }
+    }
+    child_list.sort_unstable();
+    for hash in child_list {
+        hasher.update(hash);
+    }
+
+    hasher.finalize()
+}
+
 pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
     let mut queue = VecDeque::new();
     let mut ordered = Vec::new();
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 59091308e..d9144b65b 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, collections::HashMap, path::Path, rc::Rc};
+use std::{borrow::Cow, collections::HashMap, path::Path};
 
 use anyhow::{bail, Context};
 use memofs::Vfs;
@@ -408,7 +408,7 @@ pub fn syncback_project<'new, 'old>(
             if let Some(old_inst) = old_child_map.get(new_name.as_str()) {
                 // This new instance represents an older one!
                 children.push(SyncbackSnapshot {
-                    data: Rc::clone(&snapshot.data),
+                    data: snapshot.data,
                     old: Some(old_inst.id()),
                     new: new_child.referent(),
                     parent_path,
@@ -418,7 +418,7 @@ pub fn syncback_project<'new, 'old>(
             } else {
                 // This new instance is... new.
                 children.push(SyncbackSnapshot {
-                    data: Rc::clone(&snapshot.data),
+                    data: snapshot.data,
                     old: None,
                     new: new_child.referent(),
                     parent_path,
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c3a15d908..ea4484908 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -6,15 +6,11 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
-use std::{
-    collections::{HashMap, HashSet, VecDeque},
-    rc::Rc,
-    sync::OnceLock,
-};
+use std::collections::{HashMap, VecDeque};
 
 use crate::{
     glob::Glob,
-    snapshot::{hash_tree_both, InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,
 };
@@ -30,20 +26,18 @@ pub fn syncback_loop<'old>(
     project: &'old Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
     log::debug!("Hashing project DOM");
-    let old_hashes = hash_tree_both(old_tree.inner());
+    let old_hashes = hash_tree(old_tree.inner());
     log::debug!("Hashing file DOM");
-    let new_hashes = hash_tree_both(new_tree);
+    let new_hashes = hash_tree(new_tree);
 
     let project_path = project.folder_location();
 
-    let syncback_data = Rc::new(SyncbackData {
+    let syncback_data = SyncbackData {
         vfs,
         old_tree,
         new_tree,
         syncback_rules: project.syncback_rules.as_ref(),
-        old_hashes,
-        new_hashes,
-    });
+    };
 
     let mut snapshots = vec![SyncbackSnapshot {
         data: syncback_data,
@@ -60,9 +54,14 @@ pub fn syncback_loop<'old>(
         let inst_path = get_inst_path(new_tree, snapshot.new);
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
-        if snapshot.trees_are_deep_eq() {
-            log::trace!("Skipping {inst_path} due to it being identically hashed");
-            continue;
+        if let Some(old_ref) = snapshot.old {
+            if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
+                log::trace!(
+                    "Skipping {inst_path} due to it being identically hashed as {:?}",
+                    old_hashes.get(&old_ref)
+                );
+                continue;
+            }
         }
 
         let middleware = snapshot
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 21d9bd366..08e6ec669 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,9 +1,7 @@
-use blake3::Hash;
 use memofs::Vfs;
 use std::{
     collections::{BTreeSet, HashMap},
     path::{Path, PathBuf},
-    rc::Rc,
     sync::OnceLock,
 };
 
@@ -22,17 +20,16 @@ use super::SyncbackRules;
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
+#[derive(Clone, Copy)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
     pub(super) new_tree: &'new WeakDom,
     pub(super) syncback_rules: Option<&'old SyncbackRules>,
-    pub(super) new_hashes: HashMap<Ref, (Hash, Hash)>,
-    pub(super) old_hashes: HashMap<Ref, (Hash, Hash)>,
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
-    pub data: Rc<SyncbackData<'new, 'old>>,
+    pub data: SyncbackData<'new, 'old>,
     pub old: Option<Ref>,
     pub new: Ref,
     pub parent_path: PathBuf,
@@ -45,7 +42,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     #[inline]
     pub fn with_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
-            data: Rc::clone(&self.data),
+            data: self.data,
             old: old_ref,
             new: new_ref,
             parent_path: self.parent_path.join(&self.name),
@@ -188,36 +185,6 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         true
     }
 
-    /// Returns whether two Instances are equal, using their hash for O(1)
-    /// comparisons. This comparison **does not** take descendants into account.
-    #[inline]
-    pub fn trees_are_eq(&self) -> bool {
-        let old_hashes = self
-            .old
-            .and_then(|referent| self.data.old_hashes.get(&referent));
-        let new_hashes = self.data.new_hashes.get(&self.new);
-
-        match (old_hashes, new_hashes) {
-            (Some((old_hash, _)), Some((new_hash, _))) => old_hash == new_hash,
-            _ => false,
-        }
-    }
-
-    /// Returns whether two Instance trees are equal, using their hash for O(1)
-    /// comparisons. This comparison **does** take descendants into account.
-    #[inline]
-    pub fn trees_are_deep_eq(&self) -> bool {
-        let old_hashes = self
-            .old
-            .and_then(|referent| self.data.old_hashes.get(&referent));
-        let new_hashes = self.data.new_hashes.get(&self.new);
-
-        match (old_hashes, new_hashes) {
-            (Some((_, old_hash)), Some((_, new_hash))) => old_hash == new_hash,
-            _ => false,
-        }
-    }
-
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]

From 8478a9af1827c2fd8085735018adeb9a2d3f9a8c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jan 2024 08:28:08 -0800
Subject: [PATCH 147/366] Fix issue caused by bad revert

---
 src/syncback/mod.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index ea4484908..1ac992916 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -6,7 +6,10 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{types::Ref, Instance, WeakDom};
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, VecDeque};
+use std::{
+    collections::{HashMap, HashSet, VecDeque},
+    sync::OnceLock,
+};
 
 use crate::{
     glob::Glob,

From b3d2e3157bd6d3e36acb76220a0bcbf57492b1af Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jan 2024 08:56:58 -0800
Subject: [PATCH 148/366] Refactor json model middleware to handle children

---
 src/snapshot_middleware/json_model.rs | 91 +++++++++++++++++----------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 4fca94fee..b17a4c3aa 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -66,26 +66,29 @@ pub fn syncback_json_model<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let path = snapshot.parent_path.join(file_name);
 
-    let new_inst = snapshot.new_inst();
+    let model = json_model_from_pair(snapshot, snapshot.new, snapshot.old);
+
+    Ok(SyncbackReturn {
+        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
+        fs_snapshot: FsSnapshot::new().with_added_file(
+            path,
+            serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
+        ),
+        children: Vec::new(),
+        removed_children: Vec::new(),
+    })
+}
+
+fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>) -> JsonModel {
+    let new_inst = snapshot
+        .get_new_instance(new)
+        .expect("all new referents passed to json_model_from_pair should exist");
+    let old_inst = old.and_then(|r| snapshot.get_old_instance(r));
 
     let mut properties = BTreeMap::new();
     let mut attributes = BTreeMap::new();
-    for (name, value) in snapshot.new_filtered_properties() {
-        if name == "Attributes" || name == "AttributesSerialize" {
-            if let Variant::Attributes(attr) = value {
-                attributes.extend(attr.iter().map(|(name, value)| {
-                    (
-                        name.to_string(),
-                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
-                    )
-                }))
-            } else {
-                log::error!(
-                    "Property {name} should be Attributes but is {:?}",
-                    value.ty()
-                );
-            }
-        } else if let Variant::Ref(_) = value {
+    for (name, value) in snapshot.get_filtered_properties(new, old).unwrap() {
+        if let Variant::Ref(_) = value {
             // We do not currently support Ref properties
             continue;
         } else {
@@ -95,27 +98,49 @@ pub fn syncback_json_model<'new, 'old>(
             );
         }
     }
+    if let Some(Variant::Attributes(attrs)) = new_inst.properties.get("Attributes") {
+        for (attr_name, attr_value) in attrs.iter() {
+            attributes.insert(
+                attr_name.clone(),
+                UnresolvedValue::FullyQualified(attr_value.clone()),
+            );
+        }
+    }
+
+    let mut children = Vec::with_capacity(new_inst.children().len());
+
+    if let Some(old_inst) = old_inst {
+        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
+        for child_ref in old_inst.children() {
+            let inst = snapshot.get_old_instance(*child_ref).unwrap();
+            old_child_map.insert(inst.name(), *child_ref);
+        }
 
-    let model = JsonModel {
+        for new_child_ref in new_inst.children() {
+            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
+            if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
+                children.push(json_model_from_pair(
+                    snapshot,
+                    *new_child_ref,
+                    Some(old_child),
+                ))
+            } else {
+                children.push(json_model_from_pair(snapshot, new, None))
+            }
+        }
+    } else {
+        for new_child_ref in new_inst.children() {
+            children.push(json_model_from_pair(snapshot, *new_child_ref, None))
+        }
+    }
+
+    JsonModel {
         name: Some(new_inst.name.clone()),
         class_name: new_inst.class.clone(),
-        children: Vec::new(),
+        children,
         properties,
         attributes,
-    };
-
-    // TODO Do we want children to be included in a JSON model?
-    // Feels unlikely, since it could be very dense in the case of e.g. Tools
-
-    Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(
-            path,
-            serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
-        ),
-        children: Vec::new(),
-        removed_children: Vec::new(),
-    })
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize)]

From 3799e949535b15769e00d73158bdc22878981afa Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 5 Feb 2024 11:23:46 -0800
Subject: [PATCH 149/366] Merge branch 'syncback-refs' into
 syncback-incremental

---
 CHANGELOG.md                                  |  22 +++
 plugin/src/App/StatusPages/Settings/init.lua  |  35 +++--
 plugin/src/App/init.lua                       |  76 +++++++++-
 plugin/src/Settings.lua                       |   1 +
 ...d__tests__serve__ref_properties_all-2.snap | 141 ++++++++++++++++++
 ...end__tests__serve__ref_properties_all.snap | 121 +++++++++++++++
 ...nd__tests__serve__ref_properties_info.snap |  13 ++
 ...s__serve__ref_properties_remove_all-2.snap |  33 ++++
 ...sts__serve__ref_properties_remove_all.snap |  47 ++++++
 ...ts__serve__ref_properties_remove_info.snap |  13 ++
 ...erve__ref_properties_remove_subscribe.snap |  12 ++
 ...ests__serve__ref_properties_subscribe.snap |  46 ++++++
 .../FolderTarget/FolderPointer.model.json     |   6 +
 .../FolderTarget/init.meta.json               |   3 +
 .../ref_properties/ModelTarget.model.json     |  13 ++
 .../ref_properties/default.project.json       |  32 ++++
 .../default.project.json                      |   6 +
 .../src/pointer.model.json                    |   6 +
 .../src/target.model.json                     |   6 +
 src/cli/syncback.rs                           |   2 +-
 src/lib.rs                                    |   2 +
 src/multimap.rs                               |  32 +++-
 src/project.rs                                |   5 +
 src/resolution.rs                             |   6 +
 src/rojo_ref.rs                               |  40 +++++
 src/snapshot/metadata.rs                      |  12 ++
 src/snapshot/mod.rs                           |   2 -
 src/snapshot/patch_apply.rs                   |  79 ++++++++++
 ..._snapshot__tests__apply__add_property.snap |   1 +
 ...s__apply__remove_property_after_patch.snap |   1 +
 ...tests__apply__remove_property_initial.snap |   1 +
 ...tests__apply__set_name_and_class_name.snap |   1 +
 ...__snapshot__tests__compute__add_child.snap |   1 +
 src/snapshot/tree.rs                          |  39 ++++-
 src/snapshot_middleware/json_model.rs         |  10 +-
 src/snapshot_middleware/meta_file.rs          |  36 ++++-
 src/snapshot_middleware/project.rs            |   5 +
 ...t_middleware__csv__test__csv_from_vfs.snap |   1 +
 ..._middleware__csv__test__csv_with_meta.snap |   1 +
 ...t_middleware__dir__test__empty_folder.snap |   1 +
 ...ddleware__dir__test__folder_in_folder.snap |   2 +
 ...leware__json__test__instance_from_vfs.snap |   1 +
 ...are__json_model__test__model_from_vfs.snap |   2 +
 ...on_model__test__model_from_vfs_legacy.snap |   2 +
 ...are__lua__test__class_client_from_vfs.snap |   1 +
 ...are__lua__test__class_module_from_vfs.snap |   1 +
 ...re__lua__test__class_module_with_meta.snap |   1 +
 ...are__lua__test__class_script_disabled.snap |   1 +
 ...re__lua__test__class_script_with_meta.snap |   1 +
 ...are__lua__test__class_server_from_vfs.snap |   1 +
 ...lua__test__runcontext_client_from_vfs.snap |   1 +
 ...lua__test__runcontext_module_from_vfs.snap |   1 +
 ...ua__test__runcontext_module_with_meta.snap |   1 +
 ...lua__test__runcontext_script_disabled.snap |   1 +
 ...ua__test__runcontext_script_with_meta.snap |   1 +
 ...lua__test__runcontext_server_from_vfs.snap |   1 +
 ...oject__test__project_from_direct_file.snap |   1 +
 ...test__project_path_property_overrides.snap |   1 +
 ..._project__test__project_with_children.snap |   2 +
 ...t__test__project_with_path_to_project.snap |   1 +
 ...ct_with_path_to_project_with_children.snap |   2 +
 ...oject__test__project_with_path_to_txt.snap |   1 +
 ...est__project_with_resolved_properties.snap |   1 +
 ...t__project_with_unresolved_properties.snap |   1 +
 ...leware__toml__test__instance_from_vfs.snap |   1 +
 ...dleware__txt__test__instance_from_vfs.snap |   1 +
 src/{snapshot => syncback}/hash/mod.rs        |  21 +--
 src/{snapshot => syncback}/hash/variant.rs    |   0
 src/syncback/mod.rs                           |  37 ++++-
 src/syncback/ref_properties.rs                |  88 +++++++++++
 src/syncback/snapshot.rs                      |   4 +-
 src/web/ui.rs                                 |   3 +-
 tests/tests/serve.rs                          |  85 +++++++++++
 73 files changed, 1131 insertions(+), 48 deletions(-)
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all-2.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all-2.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap
 create mode 100644 rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap
 create mode 100644 rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json
 create mode 100644 rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json
 create mode 100644 rojo-test/serve-tests/ref_properties/ModelTarget.model.json
 create mode 100644 rojo-test/serve-tests/ref_properties/default.project.json
 create mode 100644 rojo-test/serve-tests/ref_properties_remove/default.project.json
 create mode 100644 rojo-test/serve-tests/ref_properties_remove/src/pointer.model.json
 create mode 100644 rojo-test/serve-tests/ref_properties_remove/src/target.model.json
 create mode 100644 src/rojo_ref.rs
 rename src/{snapshot => syncback}/hash/mod.rs (87%)
 rename src/{snapshot => syncback}/hash/variant.rs (100%)
 create mode 100644 src/syncback/ref_properties.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d6a254c4..9785f7963 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,8 +22,28 @@
     }
     ```
 
+* Projects may now manually link `Ref` properties together using `Attributes`. ([#843])
+ 	This has two parts: using `id` or `$id` in JSON files or a `Rojo_Target` attribute, an Instance
+    is given an ID. Then, that ID may be used elsewhere in the project to point to an Instance
+    using an attribute named `Rojo_Target_PROP_NAME`, where `PROP_NAME` is the name of a property.
+
+    As an example, here is a `model.json` for an ObjectValue that refers to itself:
+
+    ```json
+    {
+        "id": "arbitrary string",
+        "attributes": {
+            "Rojo_Target_Value": "arbitrary string"
+        }
+    }
+    ```
+
+    This is a very rough implementation and the usage will become more ergonomic
+    over time.
+
 * Added popout diff visualizer for table properties like Attributes and Tags ([#834])
 * Updated Theme to use Studio colors ([#838])
+* Added experimental setting for Auto Connect in playtests ([#840])
 * Projects may now specify rules for syncing files as if they had a different file extension. ([#813])
  	This is specified via a new field on project files, `syncRules`:
 
@@ -74,6 +94,8 @@
 [#813]: https://github.com/rojo-rbx/rojo/pull/813
 [#834]: https://github.com/rojo-rbx/rojo/pull/834
 [#838]: https://github.com/rojo-rbx/rojo/pull/838
+[#840]: https://github.com/rojo-rbx/rojo/pull/840
+[#843]: https://github.com/rojo-rbx/rojo/pull/843
 
 ## [7.4.0] - January 16, 2024
 * Improved the visualization for array properties like Tags ([#829])
diff --git a/plugin/src/App/StatusPages/Settings/init.lua b/plugin/src/App/StatusPages/Settings/init.lua
index 688be85a3..a33eb1b54 100644
--- a/plugin/src/App/StatusPages/Settings/init.lua
+++ b/plugin/src/App/StatusPages/Settings/init.lua
@@ -75,6 +75,12 @@ function SettingsPage:init()
 end
 
 function SettingsPage:render()
+	local layoutOrder = 0
+	local function layoutIncrement()
+		layoutOrder += 1
+		return layoutOrder
+	end
+
 	return Theme.with(function(theme)
 		theme = theme.Settings
 
@@ -86,7 +92,7 @@ function SettingsPage:render()
 			Navbar = e(Navbar, {
 				onBack = self.props.onBack,
 				transparency = self.props.transparency,
-				layoutOrder = 0,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			ShowNotifications = e(Setting, {
@@ -94,7 +100,7 @@ function SettingsPage:render()
 				name = "Show Notifications",
 				description = "Popup notifications in viewport",
 				transparency = self.props.transparency,
-				layoutOrder = 1,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			SyncReminder = e(Setting, {
@@ -103,7 +109,7 @@ function SettingsPage:render()
 				description = "Notify to sync when opening a place that has previously been synced",
 				transparency = self.props.transparency,
 				visible = Settings:getBinding("showNotifications"),
-				layoutOrder = 2,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			ConfirmationBehavior = e(Setting, {
@@ -111,7 +117,7 @@ function SettingsPage:render()
 				name = "Confirmation Behavior",
 				description = "When to prompt for confirmation before syncing",
 				transparency = self.props.transparency,
-				layoutOrder = 3,
+				layoutOrder = layoutIncrement(),
 
 				options = confirmationBehaviors,
 			}),
@@ -121,7 +127,7 @@ function SettingsPage:render()
 				name = "Confirmation Threshold",
 				description = "How many modified instances to be considered a large change",
 				transparency = self.props.transparency,
-				layoutOrder = 4,
+				layoutOrder = layoutIncrement(),
 				visible = Settings:getBinding("confirmationBehavior"):map(function(value)
 					return value == "Large Changes"
 				end),
@@ -152,7 +158,16 @@ function SettingsPage:render()
 				name = "Play Sounds",
 				description = "Toggle sound effects",
 				transparency = self.props.transparency,
-				layoutOrder = 5,
+				layoutOrder = layoutIncrement(),
+			}),
+
+			AutoConnectPlaytestServer = e(Setting, {
+				id = "autoConnectPlaytestServer",
+				name = "Auto Connect Playtest Server",
+				description = "Automatically connect game server to Rojo when playtesting while connected in Edit",
+				experimental = true,
+				transparency = self.props.transparency,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			OpenScriptsExternally = e(Setting, {
@@ -162,7 +177,7 @@ function SettingsPage:render()
 				locked = self.props.syncActive,
 				experimental = true,
 				transparency = self.props.transparency,
-				layoutOrder = 6,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			TwoWaySync = e(Setting, {
@@ -172,7 +187,7 @@ function SettingsPage:render()
 				locked = self.props.syncActive,
 				experimental = true,
 				transparency = self.props.transparency,
-				layoutOrder = 7,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			LogLevel = e(Setting, {
@@ -180,7 +195,7 @@ function SettingsPage:render()
 				name = "Log Level",
 				description = "Plugin output verbosity level",
 				transparency = self.props.transparency,
-				layoutOrder = 100,
+				layoutOrder = layoutIncrement(),
 
 				options = invertedLevels,
 				showReset = Settings:getBinding("logLevel"):map(function(value)
@@ -196,7 +211,7 @@ function SettingsPage:render()
 				name = "Typechecking",
 				description = "Toggle typechecking on the API surface",
 				transparency = self.props.transparency,
-				layoutOrder = 101,
+				layoutOrder = layoutIncrement(),
 			}),
 
 			Layout = e("UIListLayout", {
diff --git a/plugin/src/App/init.lua b/plugin/src/App/init.lua
index 22f277f9f..ecb807f05 100644
--- a/plugin/src/App/init.lua
+++ b/plugin/src/App/init.lua
@@ -158,11 +158,29 @@ function App:init()
 			},
 		})
 	end
+
+	if self:isAutoConnectPlaytestServerAvailable() then
+		self:useRunningConnectionInfo()
+		self:startSession()
+	end
+	self.autoConnectPlaytestServerListener = Settings:onChanged("autoConnectPlaytestServer", function(enabled)
+		if enabled then
+			if self:isAutoConnectPlaytestServerWriteable() and self.serveSession ~= nil then
+				-- Write the existing session
+				local baseUrl = self.serveSession.__apiContext.__baseUrl
+				self:setRunningConnectionInfo(baseUrl)
+			end
+		else
+			self:clearRunningConnectionInfo()
+		end
+	end)
 end
 
 function App:willUnmount()
 	self.waypointConnection:Disconnect()
 	self.confirmationBindable:Destroy()
+	self.autoConnectPlaytestServerListener()
+	self:clearRunningConnectionInfo()
 end
 
 function App:addNotification(
@@ -278,10 +296,7 @@ function App:getHostAndPort()
 	local host = self.host:getValue()
 	local port = self.port:getValue()
 
-	local host = if #host > 0 then host else Config.defaultHost
-	local port = if #port > 0 then port else Config.defaultPort
-
-	return host, port
+	return if #host > 0 then host else Config.defaultHost, if #port > 0 then port else Config.defaultPort
 end
 
 function App:isSyncLockAvailable()
@@ -349,6 +364,49 @@ function App:releaseSyncLock()
 	Log.trace("Could not relase sync lock because it is owned by {}", lock.Value)
 end
 
+function App:isAutoConnectPlaytestServerAvailable()
+	return RunService:IsRunMode()
+		and RunService:IsServer()
+		and Settings:get("autoConnectPlaytestServer")
+		and workspace:GetAttribute("__Rojo_ConnectionUrl")
+end
+
+function App:isAutoConnectPlaytestServerWriteable()
+	return RunService:IsEdit() and Settings:get("autoConnectPlaytestServer")
+end
+
+function App:setRunningConnectionInfo(baseUrl: string)
+	if not self:isAutoConnectPlaytestServerWriteable() then
+		return
+	end
+
+	Log.trace("Setting connection info for play solo auto-connect")
+	workspace:SetAttribute("__Rojo_ConnectionUrl", baseUrl)
+end
+
+function App:clearRunningConnectionInfo()
+	if not RunService:IsEdit() then
+		-- Only write connection info from edit mode
+		return
+	end
+
+	Log.trace("Clearing connection info for play solo auto-connect")
+	workspace:SetAttribute("__Rojo_ConnectionUrl", nil)
+end
+
+function App:useRunningConnectionInfo()
+	local connectionInfo = workspace:GetAttribute("__Rojo_ConnectionUrl")
+	if not connectionInfo then
+		return
+	end
+
+	Log.trace("Using connection info for play solo auto-connect")
+	local host, port = string.match(connectionInfo, "^(.+):(.-)$")
+
+	self.setHost(host)
+	self.setPort(port)
+end
+
 function App:startSession()
 	local claimedLock, priorOwner = self:claimSyncLock()
 	if not claimedLock then
@@ -441,6 +499,7 @@ function App:startSession()
 			self:addNotification("Connecting to session...")
 		elseif status == ServeSession.Status.Connected then
 			self.knownProjects[details] = true
+			self:setRunningConnectionInfo(baseUrl)
 
 			local address = ("%s:%s"):format(host, port)
 			self:setState({
@@ -453,6 +512,7 @@ function App:startSession()
 		elseif status == ServeSession.Status.Disconnected then
 			self.serveSession = nil
 			self:releaseSyncLock()
+			self:clearRunningConnectionInfo()
 			self:setState({
 				patchData = {
 					patch = PatchSet.newEmpty(),
@@ -488,6 +548,12 @@ function App:startSession()
 			return "Accept"
 		end
 
+		-- Play solo auto-connect does not require confirmation
+		if self:isAutoConnectPlaytestServerAvailable() then
+			Log.trace("Accepting patch without confirmation because play solo auto-connect is enabled")
+			return "Accept"
+		end
+
 		local confirmationBehavior = Settings:get("confirmationBehavior")
 		if confirmationBehavior == "Initial" then
 			-- Only confirm if we haven't synced this project yet this session
@@ -603,7 +669,7 @@ function App:render()
 		value = self.props.plugin,
 	}, {
 		e(Theme.StudioProvider, nil, {
-			e(Tooltip.Provider, nil, {
+			tooltip = e(Tooltip.Provider, nil, {
 				gui = e(StudioPluginGui, {
 					id = pluginName,
 					title = pluginName,
diff --git a/plugin/src/Settings.lua b/plugin/src/Settings.lua
index 194dd4c7a..b5be22a76 100644
--- a/plugin/src/Settings.lua
+++ b/plugin/src/Settings.lua
@@ -14,6 +14,7 @@ local defaultSettings = {
 	twoWaySync = false,
 	showNotifications = true,
 	syncReminder = true,
+	autoConnectPlaytestServer = false,
 	confirmationBehavior = "Initial",
 	largeChangesConfirmationThreshold = 5,
 	playSounds = true,
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all-2.snap
new file mode 100644
index 000000000..63f6c5504
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all-2.snap
@@ -0,0 +1,141 @@
+---
+source: tests/tests/serve.rs
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+---
+instances:
+  id-10:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-10
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: ProjectPointer
+    Parent: id-9
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: project target
+      Value:
+        Ref: id-9
+  id-11:
+    Children: []
+    ClassName: Model
+    Id: id-11
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ProjectPointer
+    Parent: id-7
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_PrimaryPart:
+            String: project target
+      PrimaryPart:
+        Ref: id-9
+  id-2:
+    Children:
+      - id-3
+    ClassName: DataModel
+    Id: id-2
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: ref_properties
+    Parent: "00000000000000000000000000000000"
+    Properties: {}
+  id-3:
+    Children:
+      - id-4
+      - id-5
+      - id-7
+      - id-9
+    ClassName: Workspace
+    Id: id-3
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: Workspace
+    Parent: id-2
+    Properties: {}
+  id-4:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-4
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: CrossFormatPointer
+    Parent: id-3
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: folder target
+      Value:
+        Ref: id-5
+  id-5:
+    Children:
+      - id-6
+    ClassName: Folder
+    Id: id-5
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: FolderTarget
+    Parent: id-3
+    Properties: {}
+  id-6:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-6
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: FolderPointer
+    Parent: id-5
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: folder target
+      Value:
+        Ref: id-5
+  id-7:
+    Children:
+      - id-8
+      - id-11
+    ClassName: Folder
+    Id: id-7
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ModelTarget
+    Parent: id-3
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Id:
+            String: model target 2
+  id-8:
+    Children: []
+    ClassName: Model
+    Id: id-8
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ModelPointer
+    Parent: id-7
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_PrimaryPart:
+            String: model target 2
+      PrimaryPart:
+        Ref: id-7
+  id-9:
+    Children:
+      - id-10
+    ClassName: Folder
+    Id: id-9
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: ProjectTarget
+    Parent: id-3
+    Properties: {}
+messageCursor: 1
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all.snap
new file mode 100644
index 000000000..7fe614cd8
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all.snap
@@ -0,0 +1,121 @@
+---
+source: tests/tests/serve.rs
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+---
+instances:
+  id-10:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-10
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: ProjectPointer
+    Parent: id-9
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: project target
+      Value:
+        Ref: id-9
+  id-2:
+    Children:
+      - id-3
+    ClassName: DataModel
+    Id: id-2
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: ref_properties
+    Parent: "00000000000000000000000000000000"
+    Properties: {}
+  id-3:
+    Children:
+      - id-4
+      - id-5
+      - id-7
+      - id-9
+    ClassName: Workspace
+    Id: id-3
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: Workspace
+    Parent: id-2
+    Properties: {}
+  id-4:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-4
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: CrossFormatPointer
+    Parent: id-3
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: folder target
+      Value:
+        Ref: id-5
+  id-5:
+    Children:
+      - id-6
+    ClassName: Folder
+    Id: id-5
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: FolderTarget
+    Parent: id-3
+    Properties: {}
+  id-6:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-6
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: FolderPointer
+    Parent: id-5
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: folder target
+      Value:
+        Ref: id-5
+  id-7:
+    Children:
+      - id-8
+    ClassName: Folder
+    Id: id-7
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ModelTarget
+    Parent: id-3
+    Properties: {}
+  id-8:
+    Children: []
+    ClassName: Model
+    Id: id-8
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ModelPointer
+    Parent: id-7
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_PrimaryPart:
+            String: model target
+      PrimaryPart:
+        Ref: id-7
+  id-9:
+    Children:
+      - id-10
+    ClassName: Folder
+    Id: id-9
+    Metadata:
+      ignoreUnknownInstances: true
+    Name: ProjectTarget
+    Parent: id-3
+    Properties: {}
+messageCursor: 0
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap
new file mode 100644
index 000000000..46ee7ea0a
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_info.snap
@@ -0,0 +1,13 @@
+---
+source: tests/tests/serve.rs
+expression: redactions.redacted_yaml(info)
+---
+expectedPlaceIds: ~
+gameId: ~
+placeId: ~
+projectName: ref_properties
+protocolVersion: 4
+rootInstanceId: id-2
+serverVersion: "[server-version]"
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all-2.snap
new file mode 100644
index 000000000..e548f0108
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all-2.snap
@@ -0,0 +1,33 @@
+---
+source: tests/tests/serve.rs
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+---
+instances:
+  id-2:
+    Children:
+      - id-3
+    ClassName: Folder
+    Id: id-2
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ref_properties_remove
+    Parent: "00000000000000000000000000000000"
+    Properties: {}
+  id-3:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-3
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: pointer
+    Parent: id-2
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: test pointer
+      Value:
+        Ref: id-4
+messageCursor: 1
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all.snap
new file mode 100644
index 000000000..407670daa
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all.snap
@@ -0,0 +1,47 @@
+---
+source: tests/tests/serve.rs
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
+---
+instances:
+  id-2:
+    Children:
+      - id-3
+      - id-4
+    ClassName: Folder
+    Id: id-2
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: ref_properties_remove
+    Parent: "00000000000000000000000000000000"
+    Properties: {}
+  id-3:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-3
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: pointer
+    Parent: id-2
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Target_Value:
+            String: test pointer
+      Value:
+        Ref: id-4
+  id-4:
+    Children: []
+    ClassName: ObjectValue
+    Id: id-4
+    Metadata:
+      ignoreUnknownInstances: false
+    Name: target
+    Parent: id-2
+    Properties:
+      Attributes:
+        Attributes:
+          Rojo_Id:
+            String: test pointer
+messageCursor: 0
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap
new file mode 100644
index 000000000..b51fd1f80
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap
@@ -0,0 +1,13 @@
+---
+source: tests/tests/serve.rs
+expression: redactions.redacted_yaml(info)
+---
+expectedPlaceIds: ~
+gameId: ~
+placeId: ~
+projectName: ref_properties_remove
+protocolVersion: 4
+rootInstanceId: id-2
+serverVersion: "[server-version]"
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap
new file mode 100644
index 000000000..92432570f
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_subscribe.snap
@@ -0,0 +1,12 @@
+---
+source: tests/tests/serve.rs
+expression: "subscribe_response.intern_and_redact(&mut redactions, ())"
+---
+messageCursor: 1
+messages:
+  - added: {}
+    removed:
+      - id-4
+    updated: []
+sessionId: id-1
+
diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap
new file mode 100644
index 000000000..4500894aa
--- /dev/null
+++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_subscribe.snap
@@ -0,0 +1,46 @@
+---
+source: tests/tests/serve.rs
+expression: "subscribe_response.intern_and_redact(&mut redactions, ())"
+---
+messageCursor: 1
+messages:
+  - added:
+      id-11:
+        Children: []
+        ClassName: Model
+        Id: id-11
+        Metadata:
+          ignoreUnknownInstances: false
+        Name: ProjectPointer
+        Parent: id-7
+        Properties:
+          Attributes:
+            Attributes:
+              Rojo_Target_PrimaryPart:
+                String: project target
+          PrimaryPart:
+            Ref: id-9
+    removed: []
+    updated:
+      - changedClassName: ~
+        changedMetadata:
+          ignoreUnknownInstances: false
+        changedName: ~
+        changedProperties:
+          Attributes:
+            Attributes:
+              Rojo_Id:
+                String: model target 2
+        id: id-7
+      - changedClassName: ~
+        changedMetadata: ~
+        changedName: ~
+        changedProperties:
+          Attributes:
+            Attributes:
+              Rojo_Target_PrimaryPart:
+                String: model target 2
+          PrimaryPart: ~
+        id: id-8
+sessionId: id-1
+
diff --git a/rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json b/rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json
new file mode 100644
index 000000000..a4543ff4d
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Target_Value": "folder target"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json b/rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json
new file mode 100644
index 000000000..1705a7be2
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json
@@ -0,0 +1,3 @@
+{
+  "id": "folder target"
+}
\ No newline at end of file
diff --git a/rojo-test/serve-tests/ref_properties/ModelTarget.model.json b/rojo-test/serve-tests/ref_properties/ModelTarget.model.json
new file mode 100644
index 000000000..367103658
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties/ModelTarget.model.json
@@ -0,0 +1,13 @@
+{
+  "id": "model target",
+  "className": "Folder",
+  "children": [
+    {
+      "name": "ModelPointer",
+      "className": "Model",
+      "attributes": {
+        "Rojo_Target_PrimaryPart": "model target"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/serve-tests/ref_properties/default.project.json b/rojo-test/serve-tests/ref_properties/default.project.json
new file mode 100644
index 000000000..8ffa1908f
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties/default.project.json
@@ -0,0 +1,32 @@
+{
+  "name": "ref_properties",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "ProjectTarget": {
+        "$className": "Folder",
+        "$id": "project target",
+        "ProjectPointer": {
+          "$className": "ObjectValue",
+          "$attributes": {
+            "Rojo_Target_Value": {
+              "String": "project target"
+            }
+          }
+        }
+      },
+      "ModelTarget": {
+        "$path": "ModelTarget.model.json"
+      },
+      "FolderTarget": {
+        "$path": "FolderTarget"
+      },
+      "CrossFormatPointer": {
+        "$className": "ObjectValue",
+        "$attributes": {
+          "Rojo_Target_Value": "folder target"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/serve-tests/ref_properties_remove/default.project.json b/rojo-test/serve-tests/ref_properties_remove/default.project.json
new file mode 100644
index 000000000..43f94765b
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties_remove/default.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "ref_properties_remove",
+  "tree": {
+    "$path": "src"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/serve-tests/ref_properties_remove/src/pointer.model.json b/rojo-test/serve-tests/ref_properties_remove/src/pointer.model.json
new file mode 100644
index 000000000..4add638b9
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties_remove/src/pointer.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Target_Value": "test pointer"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/serve-tests/ref_properties_remove/src/target.model.json b/rojo-test/serve-tests/ref_properties_remove/src/target.model.json
new file mode 100644
index 000000000..8069631e4
--- /dev/null
+++ b/rojo-test/serve-tests/ref_properties_remove/src/target.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Id": "test pointer"
+  }
+}
\ No newline at end of file
diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index d8ffccb23..5d56c56ca 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -59,7 +59,7 @@ impl SyncbackCommand {
         syncback_loop(
             session_old.vfs(),
             &dom_old,
-            &dom_new,
+            dom_new,
             session_old.root_project(),
         )?;
         log::info!(
diff --git a/src/lib.rs b/src/lib.rs
index 5d4df344a..19851a8a6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,6 +16,7 @@ mod multimap;
 mod path_serializer;
 mod project;
 mod resolution;
+mod rojo_ref;
 mod serve_session;
 mod session_id;
 mod snapshot;
@@ -25,5 +26,6 @@ mod variant_eq;
 mod web;
 
 pub use project::*;
+pub use rojo_ref::*;
 pub use session_id::SessionId;
 pub use web::interface as web_api;
diff --git a/src/multimap.rs b/src/multimap.rs
index 3a243af1a..9c399c24d 100644
--- a/src/multimap.rs
+++ b/src/multimap.rs
@@ -1,6 +1,6 @@
 use std::{
     borrow::Borrow,
-    collections::HashMap,
+    collections::{hash_map, HashMap},
     fmt::{self, Debug},
     hash::Hash,
 };
@@ -71,3 +71,33 @@ impl<K: Hash + Eq, V: Eq> PartialEq for MultiMap<K, V> {
         self.inner == other.inner
     }
 }
+
+impl<K, V> Default for MultiMap<K, V> {
+    fn default() -> Self {
+        Self {
+            inner: Default::default(),
+        }
+    }
+}
+
+impl<K: Hash + Eq, V: Eq> IntoIterator for MultiMap<K, V> {
+    type IntoIter = MultiMapIntoIter<K, V>;
+    type Item = (K, Vec<V>);
+    fn into_iter(self) -> Self::IntoIter {
+        Self::IntoIter {
+            inner: self.inner.into_iter(),
+        }
+    }
+}
+
+pub struct MultiMapIntoIter<K: Hash + Eq, V: Eq> {
+    inner: hash_map::IntoIter<K, Vec<V>>,
+}
+
+impl<K: Hash + Eq, V: Eq> Iterator for MultiMapIntoIter<K, V> {
+    type Item = (K, Vec<V>);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.inner.next()
+    }
+}
diff --git a/src/project.rs b/src/project.rs
index 768335f64..35d78426f 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -230,6 +230,11 @@ pub struct ProjectNode {
     #[serde(rename = "$className", skip_serializing_if = "Option::is_none")]
     pub class_name: Option<String>,
 
+    /// If set, defines an ID for the described Instance that can be used
+    /// to refer to it for the purpose of referent properties.
+    #[serde(rename = "$id", skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
+
     /// Contains all of the children of the described instance.
     #[serde(flatten)]
     pub children: BTreeMap<String, ProjectNode>,
diff --git a/src/resolution.rs b/src/resolution.rs
index 9fcef34d3..4c7fcaacd 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -8,6 +8,8 @@ use rbx_dom_weak::types::{
 use rbx_reflection::{DataType, PropertyDescriptor};
 use serde::{Deserialize, Serialize};
 
+use crate::REF_POINTER_ATTRIBUTE_PREFIX;
+
 /// A user-friendly version of `Variant` that supports specifying ambiguous
 /// values. Ambiguous values need a reflection database to be resolved to a
 /// usable value.
@@ -206,6 +208,10 @@ impl AmbiguousValue {
                     Ok(value.into())
                 }
 
+                (VariantType::Ref, AmbiguousValue::String(_)) => Err(format_err!(
+                    "Cannot resolve Ref properties as a String.\
+                    Use an attribute named `{REF_POINTER_ATTRIBUTE_PREFIX}{prop_name}"
+                )),
                 (_, unresolved) => Err(format_err!(
                     "Wrong type of value for property {}.{}. Expected {:?}, got {}",
                     class_name,
diff --git a/src/rojo_ref.rs b/src/rojo_ref.rs
new file mode 100644
index 000000000..c22fe6227
--- /dev/null
+++ b/src/rojo_ref.rs
@@ -0,0 +1,40 @@
+use std::{fmt, sync::Arc};
+
+use serde::{Deserialize, Serialize};
+
+pub const REF_ID_ATTRIBUTE_NAME: &str = "Rojo_Id";
+pub const REF_POINTER_ATTRIBUTE_PREFIX: &str = "Rojo_Target_";
+
+// TODO add an internment strategy for RojoRefs
+// Something like what rbx-dom does for SharedStrings probably works
+
+#[derive(Debug, Default, PartialEq, Hash, Clone, Serialize, Deserialize, Eq)]
+pub struct RojoRef(Arc<Vec<u8>>);
+
+impl RojoRef {
+    #[inline]
+    pub fn new(id: Vec<u8>) -> Self {
+        Self(Arc::from(id))
+    }
+
+    #[inline]
+    pub fn from_string(id: String) -> Self {
+        Self(Arc::from(id.into_bytes()))
+    }
+
+    #[inline]
+    pub fn as_str(&self) -> Option<&str> {
+        std::str::from_utf8(&self.0).ok()
+    }
+}
+
+impl fmt::Display for RojoRef {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.as_str() {
+            Some(str) => write!(f, "{str}"),
+            None => {
+                write!(f, "Binary({:?})", self.0.as_slice())
+            }
+        }
+    }
+}
diff --git a/src/snapshot/metadata.rs b/src/snapshot/metadata.rs
index 27ec40213..55158518a 100644
--- a/src/snapshot/metadata.rs
+++ b/src/snapshot/metadata.rs
@@ -12,6 +12,7 @@ use crate::{
     path_serializer,
     project::ProjectNode,
     snapshot_middleware::{emit_legacy_scripts_default, Middleware},
+    RojoRef,
 };
 
 /// Rojo-specific metadata that can be associated with an instance or a snapshot
@@ -59,6 +60,9 @@ pub struct InstanceMetadata {
     /// context will be passed into it.
     pub context: InstanceContext,
 
+    /// Indicates the ID used for Ref properties pointing to this Instance.
+    pub specified_id: Option<RojoRef>,
+
     pub middleware: Option<Middleware>,
 }
 
@@ -69,6 +73,7 @@ impl InstanceMetadata {
             instigating_source: None,
             relevant_paths: Vec::new(),
             context: InstanceContext::default(),
+            specified_id: None,
             middleware: None,
         }
     }
@@ -100,6 +105,13 @@ impl InstanceMetadata {
             ..self
         }
     }
+
+    pub fn specified_id(self, id: Option<RojoRef>) -> Self {
+        Self {
+            specified_id: id,
+            ..self
+        }
+    }
 }
 
 impl Default for InstanceMetadata {
diff --git a/src/snapshot/mod.rs b/src/snapshot/mod.rs
index ff6ddb5ba..5aacdad6e 100644
--- a/src/snapshot/mod.rs
+++ b/src/snapshot/mod.rs
@@ -48,7 +48,6 @@
 
 #![allow(dead_code)]
 
-mod hash;
 mod instance_snapshot;
 mod metadata;
 mod patch;
@@ -56,7 +55,6 @@ mod patch_apply;
 mod patch_compute;
 mod tree;
 
-pub use hash::*;
 pub use instance_snapshot::InstanceSnapshot;
 pub use metadata::*;
 pub use patch::*;
diff --git a/src/snapshot/patch_apply.rs b/src/snapshot/patch_apply.rs
index 572b8455e..b1cbb3567 100644
--- a/src/snapshot/patch_apply.rs
+++ b/src/snapshot/patch_apply.rs
@@ -11,6 +11,7 @@ use super::{
     patch::{AppliedPatchSet, AppliedPatchUpdate, PatchSet, PatchUpdate},
     InstanceSnapshot, RojoTree,
 };
+use crate::{multimap::MultiMap, RojoRef, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
 
 /// Consumes the input `PatchSet`, applying all of its prescribed changes to the
 /// tree and returns an `AppliedPatchSet`, which can be used to keep another
@@ -72,6 +73,11 @@ struct PatchApplyContext {
     /// to be rewritten.
     has_refs_to_rewrite: HashSet<Ref>,
 
+    /// Tracks all ref properties that were specified using attributes. This has
+    /// to be handled after everything else is done just like normal referent
+    /// properties.
+    attribute_refs_to_rewrite: MultiMap<Ref, (String, Vec<u8>)>,
+
     /// The current applied patch result, describing changes made to the tree.
     applied_patch_set: AppliedPatchSet,
 }
@@ -104,6 +110,22 @@ fn finalize_patch_application(context: PatchApplyContext, tree: &mut RojoTree) -
         }
     }
 
+    // This is to get around the fact that `RojoTre::get_specified_id` borrows
+    // the tree as immutable, but we need to hold a mutable reference to it.
+    // Not exactly elegant, but it does the job.
+    let mut real_rewrites = Vec::new();
+    for (id, map) in context.attribute_refs_to_rewrite {
+        for (prop_name, prop_value) in map {
+            if let Some(target) = tree.get_specified_id(&RojoRef::new(prop_value)) {
+                real_rewrites.push((prop_name, Variant::Ref(target)))
+            }
+        }
+        let mut instance = tree
+            .get_instance_mut(id)
+            .expect("Invalid instance ID in deferred attribute ref map");
+        instance.properties_mut().extend(real_rewrites.drain(..));
+    }
+
     context.applied_patch_set
 }
 
@@ -142,6 +164,8 @@ fn apply_add_child(
     for child in children {
         apply_add_child(context, tree, id, child);
     }
+
+    defer_ref_properties(tree, id, context);
 }
 
 fn apply_update_child(context: &mut PatchApplyContext, tree: &mut RojoTree, patch: PatchUpdate) {
@@ -208,9 +232,64 @@ fn apply_update_child(context: &mut PatchApplyContext, tree: &mut RojoTree, patc
         applied_patch.changed_properties.insert(key, property_entry);
     }
 
+    defer_ref_properties(tree, patch.id, context);
+
     context.applied_patch_set.updated.push(applied_patch)
 }
 
+/// Calculates manually-specified Ref properties and marks them in the provided
+/// `PatchApplyContext` to be rewritten at the end of the patch application
+/// process.
+///
+/// Currently, this only uses attributes but it can easily handle rewriting
+/// referents in other ways too!
+fn defer_ref_properties(tree: &mut RojoTree, id: Ref, context: &mut PatchApplyContext) {
+    let instance = tree
+        .get_instance(id)
+        .expect("Instances should exist when calculating deferred refs");
+    let attributes = match instance.properties().get("Attributes") {
+        Some(Variant::Attributes(attrs)) => attrs,
+        _ => return,
+    };
+
+    let mut attr_id = None;
+    for (attr_name, attr_value) in attributes.iter() {
+        if attr_name == REF_ID_ATTRIBUTE_NAME {
+            if let Variant::String(specified_id) = attr_value {
+                attr_id = Some(RojoRef::from_string(specified_id.clone()));
+            } else if let Variant::BinaryString(specified_id) = attr_value {
+                attr_id = Some(RojoRef::new(specified_id.clone().into_vec()))
+            } else {
+                log::warn!(
+                    "Attribute {attr_name} is of type {:?} when it was \
+                    expected to be a String",
+                    attr_value.ty()
+                )
+            }
+        }
+        if let Some(prop_name) = attr_name.strip_prefix(REF_POINTER_ATTRIBUTE_PREFIX) {
+            if let Variant::String(prop_value) = attr_value {
+                context
+                    .attribute_refs_to_rewrite
+                    .insert(id, (prop_name.to_owned(), prop_value.clone().into_bytes()));
+            } else if let Variant::BinaryString(specified_id) = attr_value {
+                context
+                    .attribute_refs_to_rewrite
+                    .insert(id, (prop_name.to_owned(), specified_id.clone().into_vec()));
+            } else {
+                log::warn!(
+                    "Attribute {attr_name} is of type {:?} when it was \
+                    expected to be a String",
+                    attr_value.ty()
+                )
+            }
+        }
+    }
+    if let Some(specified_id) = attr_id {
+        tree.set_specified_id(id, specified_id);
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
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 3c751fdf4..c4390b6da 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
@@ -13,6 +13,7 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 children: []
 
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap
index c4af516ea..fa4d3ebc2 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__remove_property_after_patch.snap
@@ -11,6 +11,7 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 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 8ed43ccd9..f07da090e 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
@@ -13,6 +13,7 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 children: []
 
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap
index 5772090e1..cc582633d 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__apply__set_name_and_class_name.snap
@@ -11,6 +11,7 @@ metadata:
   relevant_paths: []
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 children: []
 
diff --git a/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap b/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap
index 01ae237fa..4c4046047 100644
--- a/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap
+++ b/src/snapshot/tests/snapshots/librojo__snapshot__tests__compute__add_child.snap
@@ -12,6 +12,7 @@ added_instances:
         relevant_paths: []
         context:
           emit_legacy_scripts: true
+        specified_id: ~
         middleware: ~
       name: New
       class_name: Folder
diff --git a/src/snapshot/tree.rs b/src/snapshot/tree.rs
index e4379bc2d..14c6593ec 100644
--- a/src/snapshot/tree.rs
+++ b/src/snapshot/tree.rs
@@ -8,7 +8,7 @@ use rbx_dom_weak::{
     Instance, InstanceBuilder, WeakDom,
 };
 
-use crate::multimap::MultiMap;
+use crate::{multimap::MultiMap, RojoRef};
 
 use super::{InstanceMetadata, InstanceSnapshot};
 
@@ -33,6 +33,9 @@ pub struct RojoTree {
     /// appearing multiple times in the same Rojo project. This is sometimes
     /// called "path aliasing" in various Rojo documentation.
     path_to_ids: MultiMap<PathBuf, Ref>,
+
+    /// A map of specified RojoRefs to the actual underlying Ref they represent.
+    specified_id_to_refs: HashMap<RojoRef, Ref>,
 }
 
 impl RojoTree {
@@ -45,6 +48,7 @@ impl RojoTree {
             inner: WeakDom::new(root_builder),
             metadata_map: HashMap::new(),
             path_to_ids: MultiMap::new(),
+            specified_id_to_refs: HashMap::new(),
         };
 
         let root_ref = tree.inner.root_ref();
@@ -137,6 +141,14 @@ impl RojoTree {
                         self.path_to_ids.insert(new_path.clone(), id);
                     }
                 }
+                if existing_metadata.specified_id != metadata.specified_id {
+                    if let Some(old) = &existing_metadata.specified_id {
+                        self.specified_id_to_refs.remove(old);
+                    }
+                    if let Some(new) = &metadata.specified_id {
+                        self.specified_id_to_refs.insert(new.clone(), id);
+                    }
+                }
 
                 entry.insert(metadata);
             }
@@ -161,11 +173,32 @@ impl RojoTree {
         self.metadata_map.get(&id)
     }
 
+    pub fn get_specified_id(&self, specified: &RojoRef) -> Option<Ref> {
+        self.specified_id_to_refs.get(specified).copied()
+    }
+
+    pub fn set_specified_id(&mut self, id: Ref, specified: RojoRef) {
+        if let Some(metadata) = self.metadata_map.get_mut(&id) {
+            if let Some(old) = metadata.specified_id.replace(specified.clone()) {
+                self.specified_id_to_refs.remove(&old);
+            }
+        }
+        self.specified_id_to_refs.insert(specified, id);
+    }
+
     fn insert_metadata(&mut self, id: Ref, metadata: InstanceMetadata) {
         for path in &metadata.relevant_paths {
             self.path_to_ids.insert(path.clone(), id);
         }
 
+        if let Some(specified_id) = &metadata.specified_id {
+            if self.get_specified_id(specified_id).is_some() {
+                log::warn!("Duplicate user-specified referent {specified_id}")
+            } else {
+                self.set_specified_id(id, specified_id.clone());
+            }
+        }
+
         self.metadata_map.insert(id, metadata);
     }
 
@@ -174,6 +207,10 @@ impl RojoTree {
     fn remove_metadata(&mut self, id: Ref) {
         let metadata = self.metadata_map.remove(&id).unwrap();
 
+        if let Some(specified) = metadata.specified_id {
+            self.specified_id_to_refs.remove(&specified);
+        }
+
         for path in &metadata.relevant_paths {
             self.path_to_ids.remove(path, id);
         }
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index b17a4c3aa..07b1ca905 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -14,6 +14,7 @@ use crate::{
     resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceSnapshot},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    RojoRef,
 };
 
 pub fn snapshot_json_model(
@@ -47,6 +48,8 @@ pub fn snapshot_json_model(
 
     instance.name = Some(name.to_owned());
 
+    let id = instance.id.take().map(RojoRef::from_string);
+
     let mut snapshot = instance
         .into_snapshot()
         .with_context(|| format!("Could not load JSON model: {}", path.display()))?;
@@ -55,7 +58,8 @@ pub fn snapshot_json_model(
         .metadata
         .instigating_source(path)
         .relevant_paths(vec![path.to_path_buf()])
-        .context(context);
+        .context(context)
+        .specified_id(id);
 
     Ok(Some(snapshot))
 }
@@ -140,6 +144,7 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
         children,
         properties,
         attributes,
+        id: None,
     }
 }
 
@@ -152,6 +157,9 @@ struct JsonModel {
     #[serde(alias = "ClassName")]
     class_name: String,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    id: Option<String>,
+
     #[serde(
         alias = "Children",
         default = "Vec::new",
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 0f2519398..1ac4f84f4 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -9,7 +9,9 @@ use memofs::{IoResultExt as _, Vfs};
 use rbx_dom_weak::types::{Attributes, Variant};
 use serde::{Deserialize, Serialize};
 
-use crate::{resolution::UnresolvedValue, snapshot::InstanceSnapshot, syncback::SyncbackSnapshot};
+use crate::{
+    resolution::UnresolvedValue, snapshot::InstanceSnapshot, syncback::SyncbackSnapshot, RojoRef,
+};
 
 /// Represents metadata in a sibling file with the same basename.
 ///
@@ -18,6 +20,9 @@ use crate::{resolution::UnresolvedValue, snapshot::InstanceSnapshot, syncback::S
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct AdjacentMetadata {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ignore_unknown_instances: Option<bool>,
 
@@ -96,6 +101,7 @@ impl AdjacentMetadata {
             properties,
             attributes,
             path,
+            id: None,
         })
     }
 
@@ -135,9 +141,21 @@ impl AdjacentMetadata {
         Ok(())
     }
 
+    fn apply_id(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
+        if self.id.is_some() && snapshot.metadata.specified_id.is_some() {
+            anyhow::bail!(
+                "cannot specify an ID using {} (instance has an ID from somewhere else)",
+                self.path.display()
+            );
+        }
+        snapshot.metadata.specified_id = self.id.take().map(RojoRef::from_string);
+        Ok(())
+    }
+
     pub fn apply_all(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
         self.apply_ignore_unknown_instances(snapshot);
         self.apply_properties(snapshot)?;
+        self.apply_id(snapshot)?;
         Ok(())
     }
 
@@ -164,6 +182,9 @@ impl AdjacentMetadata {
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct DirectoryMetadata {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub id: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ignore_unknown_instances: Option<bool>,
 
@@ -249,6 +270,7 @@ impl DirectoryMetadata {
             attributes,
             class_name: None,
             path,
+            id: None,
         })
     }
 
@@ -256,6 +278,7 @@ impl DirectoryMetadata {
         self.apply_ignore_unknown_instances(snapshot);
         self.apply_class_name(snapshot)?;
         self.apply_properties(snapshot)?;
+        self.apply_id(snapshot)?;
 
         Ok(())
     }
@@ -309,6 +332,17 @@ impl DirectoryMetadata {
         Ok(())
     }
 
+    fn apply_id(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
+        if self.id.is_some() && snapshot.metadata.specified_id.is_some() {
+            anyhow::bail!(
+                "cannot specify an ID using {} (instance has an ID from somewhere else)",
+                self.path.display()
+            );
+        }
+        snapshot.metadata.specified_id = self.id.take().map(RojoRef::from_string);
+        Ok(())
+    }
+
     /// Returns whether the metadata is 'empty', meaning it doesn't have anything
     /// worth persisting in it. Specifically:
     ///
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index d9144b65b..643ea91e3 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -13,6 +13,7 @@ use crate::{
         SyncRule,
     },
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    RojoRef,
 };
 
 use super::{emit_legacy_scripts_default, snapshot_from_vfs};
@@ -279,6 +280,10 @@ pub fn snapshot_project_node(
         metadata.ignore_unknown_instances = true;
     }
 
+    if let Some(id) = &node.id {
+        metadata.specified_id = Some(RojoRef::from_string(id.clone()))
+    }
+
     metadata.instigating_source = Some(InstigatingSource::ProjectNode {
         path: project_path.to_path_buf(),
         name: instance_name.to_string(),
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 18b12d24b..df634792f 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: LocalizationTable
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 1bddf74c1..8e97b5050 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: LocalizationTable
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap
index 823106566..224bbfac7 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo/init.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Folder
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap
index 936ec5176..425b5bdad 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo/init.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Folder
@@ -27,6 +28,7 @@ children:
         - /foo/Child/init.meta.json
       context:
         emit_legacy_scripts: true
+      specified_id: ~
       middleware: dir
     name: Child
     class_name: Folder
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 e1b3b35a0..1ccc79b99 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: ModuleScript
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 f573e51cb..bf7689775 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
@@ -11,6 +11,7 @@ metadata:
     - /foo.model.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: IntValue
@@ -24,6 +25,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      specified_id: ~
       middleware: ~
     name: The Child
     class_name: StringValue
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap
index f573e51cb..bf7689775 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap
@@ -11,6 +11,7 @@ metadata:
     - /foo.model.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: IntValue
@@ -24,6 +25,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      specified_id: ~
       middleware: ~
     name: The Child
     class_name: StringValue
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap
index 1484bc63c..2977ec9a1 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_client_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: LocalScript
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap
index 4e62485b9..7f604b3a2 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: ModuleScript
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap
index f625bcece..1a621ecd7 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_module_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: ModuleScript
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap
index 6b8c105bb..fd50ee16f 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_disabled.snap
@@ -12,6 +12,7 @@ metadata:
     - /bar.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: bar
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap
index 3871314b9..8476359fd 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_script_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap
index dc8377f27..59f84aba8 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__class_server_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap
index c167a8209..28ddeef7c 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_client_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap
index 203e917a6..3645366e8 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: ModuleScript
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap
index 35ff43ff5..d1881f320 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_module_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: ModuleScript
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap
index d5f710971..b4f3a6c74 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_disabled.snap
@@ -12,6 +12,7 @@ metadata:
     - /bar.meta.json
   context:
     emit_legacy_scripts: false
+  specified_id: ~
   middleware: ~
 name: bar
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap
index a9985c790..a87dcf6b0 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_script_with_meta.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap
index 526166265..5bc36a9df 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__runcontext_server_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: false
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: Script
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap
index 5d25824b3..1b87aab8a 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_from_direct_file.snap
@@ -11,6 +11,7 @@ metadata:
     - /foo/hello.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: direct-project
 class_name: Model
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 5ecaa4477..cd32e81d0 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
@@ -12,6 +12,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: project
 name: path-property-override
 class_name: StringValue
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
index 2f3cd2547..f9d6e4a44 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_children.snap
@@ -11,6 +11,7 @@ metadata:
     - /foo.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: children
 class_name: Folder
@@ -29,6 +30,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      specified_id: ~
       middleware: ~
     name: Child
     class_name: Model
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap
index 075867f12..da28d1ce2 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: project
 name: path-project
 class_name: Model
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
index ea628e4d9..077ebb153 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__project_with_path_to_project_with_children.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: project
 name: path-child-project
 class_name: Folder
@@ -30,6 +31,7 @@ children:
       relevant_paths: []
       context:
         emit_legacy_scripts: true
+      specified_id: ~
       middleware: ~
     name: SomeChild
     class_name: Model
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 7fce0d01c..36e451fa2 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
@@ -13,6 +13,7 @@ metadata:
     - /foo/default.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: text
 name: path-project
 class_name: StringValue
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 30bc6655c..27d7004aa 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
@@ -11,6 +11,7 @@ metadata:
     - /foo.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: resolved-properties
 class_name: StringValue
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 33c0bdaff..c6349bae7 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
@@ -11,6 +11,7 @@ metadata:
     - /foo.project.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: unresolved-properties
 class_name: StringValue
diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap
index 6737442c1..9e72ad999 100644
--- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap
+++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__instance_from_vfs.snap
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: ModuleScript
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 961da5209..b9c07046a 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
@@ -12,6 +12,7 @@ metadata:
     - /foo.meta.json
   context:
     emit_legacy_scripts: true
+  specified_id: ~
   middleware: ~
 name: foo
 class_name: StringValue
diff --git a/src/snapshot/hash/mod.rs b/src/syncback/hash/mod.rs
similarity index 87%
rename from src/snapshot/hash/mod.rs
rename to src/syncback/hash/mod.rs
index 82f17a295..0cd187b78 100644
--- a/src/snapshot/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -8,8 +8,9 @@ use rbx_dom_weak::{
     types::{Ref, Variant},
     Instance, WeakDom,
 };
-use std::collections::{HashMap, VecDeque};
+use std::collections::HashMap;
 
+use super::descendants;
 use crate::variant_eq::variant_eq;
 
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
@@ -121,21 +122,3 @@ fn hash_inst<'inst>(
 
     hasher.finalize()
 }
-
-pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
-    let mut queue = VecDeque::new();
-    let mut ordered = Vec::new();
-    queue.push_front(dom.root_ref());
-
-    while let Some(referent) = queue.pop_front() {
-        let inst = dom
-            .get_by_ref(referent)
-            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
-        ordered.push(referent);
-        for child in inst.children() {
-            queue.push_back(*child)
-        }
-    }
-
-    ordered
-}
diff --git a/src/snapshot/hash/variant.rs b/src/syncback/hash/variant.rs
similarity index 100%
rename from src/snapshot/hash/variant.rs
rename to src/syncback/hash/variant.rs
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 1ac992916..ee2eecc1a 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,5 +1,7 @@
 mod file_names;
 mod fs_snapshot;
+mod hash;
+mod ref_properties;
 mod snapshot;
 
 use anyhow::Context;
@@ -13,32 +15,37 @@ use std::{
 
 use crate::{
     glob::Glob,
-    snapshot::{hash_tree, InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot::{InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,
 };
 
 pub use file_names::{is_valid_file_name, name_for_inst};
 pub use fs_snapshot::FsSnapshot;
+pub use hash::*;
+pub use ref_properties::link_referents;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
 pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
     old_tree: &'old RojoTree,
-    new_tree: &WeakDom,
+    mut new_tree: WeakDom,
     project: &'old Project,
 ) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
     log::debug!("Hashing project DOM");
     let old_hashes = hash_tree(old_tree.inner());
     log::debug!("Hashing file DOM");
-    let new_hashes = hash_tree(new_tree);
+    let new_hashes = hash_tree(&new_tree);
+
+    log::debug!("Linking referents for new DOM...");
+    link_referents(&mut new_tree)?;
 
     let project_path = project.folder_location();
 
     let syncback_data = SyncbackData {
         vfs,
         old_tree,
-        new_tree,
+        new_tree: &new_tree,
         syncback_rules: project.syncback_rules.as_ref(),
     };
 
@@ -54,7 +61,7 @@ pub fn syncback_loop<'old>(
     let mut fs_snapshot = FsSnapshot::new();
 
     'syncback: while let Some(snapshot) = snapshots.pop() {
-        let inst_path = get_inst_path(new_tree, snapshot.new);
+        let inst_path = get_inst_path(&new_tree, snapshot.new);
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
@@ -224,3 +231,23 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     }
     path.into_iter().collect::<Vec<&str>>().join("/")
 }
+
+/// Produces a list of descendants in the WeakDom such that all children come
+/// before their parents.
+pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
+    let mut queue = VecDeque::new();
+    let mut ordered = Vec::new();
+    queue.push_front(dom.root_ref());
+
+    while let Some(referent) = queue.pop_front() {
+        let inst = dom
+            .get_by_ref(referent)
+            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
+        ordered.push(referent);
+        for child in inst.children() {
+            queue.push_back(*child)
+        }
+    }
+
+    ordered
+}
diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
new file mode 100644
index 000000000..98c4a1b2b
--- /dev/null
+++ b/src/syncback/ref_properties.rs
@@ -0,0 +1,88 @@
+//! Implements iterating through an entire WeakDom and linking all Ref
+//! properties using attributes.
+
+use std::collections::VecDeque;
+
+use rbx_dom_weak::{
+    types::{Attributes, BinaryString, Variant},
+    Instance, WeakDom,
+};
+
+use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
+
+/// Iterates through a WeakDom and links referent properties using attributes.
+pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
+    let mut links = MultiMap::new();
+    let mut queue = VecDeque::new();
+
+    // Note that this is back-in, front-out. This is important because
+    // VecDeque::extend is the equivalent to using push_back.
+    queue.push_back(dom.root_ref());
+    while let Some(referent) = queue.pop_front() {
+        let instance = dom.get_by_ref(referent).unwrap();
+
+        queue.extend(instance.children().iter().copied());
+        for (name, value) in &instance.properties {
+            if let Variant::Ref(prop_value) = value {
+                if dom.get_by_ref(*prop_value).is_some() {
+                    links.insert(referent, (name.clone(), *prop_value))
+                }
+            }
+        }
+    }
+    let mut rewrites = Vec::new();
+
+    for (referent, ref_properties) in links {
+        for (prop_name, target_ref) in ref_properties {
+            log::debug!(
+                "Linking {} to {}.{prop_name}",
+                dom.get_by_ref(target_ref).unwrap().name,
+                dom.get_by_ref(referent).unwrap().name,
+            );
+            let target_inst = dom
+                .get_by_ref_mut(target_ref)
+                .expect("Ref properties that aren't in DOM should be filtered");
+
+            let attributes = get_or_insert_attributes(target_inst)?;
+            if attributes.get(REF_ID_ATTRIBUTE_NAME).is_none() {
+                attributes.insert(
+                    REF_ID_ATTRIBUTE_NAME.to_owned(),
+                    Variant::BinaryString(referent.to_string().into_bytes().into()),
+                );
+            }
+
+            let target_id = attributes
+                .get(REF_ID_ATTRIBUTE_NAME)
+                .expect("every Instance to have an ID");
+            if let Variant::BinaryString(target_id) = target_id {
+                rewrites.push((prop_name, target_id.clone()));
+            }
+        }
+
+        let inst = dom.get_by_ref_mut(referent).unwrap();
+        let attrs = get_or_insert_attributes(inst)?;
+        for (name, id) in rewrites.drain(..) {
+            attrs.insert(
+                format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
+                BinaryString::from(id.into_vec()).into(),
+            );
+        }
+    }
+
+    Ok(())
+}
+
+fn get_or_insert_attributes(inst: &mut Instance) -> anyhow::Result<&mut Attributes> {
+    if !inst.properties.contains_key("Attributes") {
+        inst.properties
+            .insert("Attributes".into(), Attributes::new().into());
+    }
+    match inst.properties.get_mut("Attributes") {
+        Some(Variant::Attributes(attrs)) => Ok(attrs),
+        Some(ty) => Err(anyhow::format_err!(
+            "expected property Attributes to be an Attributes but it was {:?}",
+            ty.ty()
+        )),
+        None => unreachable!(),
+    }
+}
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 08e6ec669..099a85f1f 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -97,7 +97,9 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                 if filter_out_property(inst, name.as_str()) {
                     continue;
                 }
-                // We don't currently support refs or shared strings
+                // We don't currently support refs or shared strings as properties.
+                // Technically, Refs are supported as attributes but we don't want
+                // those handled as properties.
                 if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
                     continue;
                 }
diff --git a/src/web/ui.rs b/src/web/ui.rs
index 6f9d0e077..a0b4f8826 100644
--- a/src/web/ui.rs
+++ b/src/web/ui.rs
@@ -163,6 +163,7 @@ impl UiService {
 
             let content = html! {
                 <>
+                    <div>"specified_id: " { format!("{:?}", metadata.specified_id) } </div>
                     <div>"ignore_unknown_instances: " { metadata.ignore_unknown_instances.to_string() }</div>
                     <div>"instigating source: " { format!("{:?}", metadata.instigating_source) }</div>
                     <div>"middleware: " { format!("{:?}", metadata.middleware) }</div>
@@ -193,7 +194,7 @@ impl UiService {
 
         html! {
             <div class="instance">
-                <label class="instance-title" for={ format!("instance-{:?}", id) }>
+                <label class="instance-title" for={ format!("instance-{:?}", id) } title={ format!("ref: {:?}", instance.id())}>
                     { instance.name().to_owned() }
                     { class_name_specifier }
                 </label>
diff --git a/tests/tests/serve.rs b/tests/tests/serve.rs
index 5d716b397..80b0897cf 100644
--- a/tests/tests/serve.rs
+++ b/tests/tests/serve.rs
@@ -306,3 +306,88 @@ fn sync_rule_no_extension() {
         );
     });
 }
+
+#[test]
+fn ref_properties() {
+    run_serve_test("ref_properties", |session, mut redactions| {
+        let info = session.get_api_rojo().unwrap();
+        let root_id = info.root_instance_id;
+
+        assert_yaml_snapshot!("ref_properties_info", redactions.redacted_yaml(info));
+
+        let read_response = session.get_api_read(root_id).unwrap();
+        assert_yaml_snapshot!(
+            "ref_properties_all",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
+
+        fs::write(
+            session.path().join("ModelTarget.model.json"),
+            r#"{
+                "className": "Folder",
+                "attributes": {
+                    "Rojo_Id": "model target 2"
+                },
+                "children": [
+                  {
+                    "name": "ModelPointer",
+                    "className": "Model",
+                    "attributes": {
+                      "Rojo_Target_PrimaryPart": "model target 2"
+                    }
+                  },
+                  {
+                    "name": "ProjectPointer",
+                    "className": "Model",
+                    "attributes": {
+                      "Rojo_Target_PrimaryPart": "project target"
+                    }
+                  }
+                ]
+              }"#,
+        )
+        .unwrap();
+
+        let subscribe_response = session.get_api_subscribe(0).unwrap();
+        assert_yaml_snapshot!(
+            "ref_properties_subscribe",
+            subscribe_response.intern_and_redact(&mut redactions, ())
+        );
+
+        let read_response = session.get_api_read(root_id).unwrap();
+        assert_yaml_snapshot!(
+            "ref_properties_all-2",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
+    });
+}
+
+#[test]
+fn ref_properties_remove() {
+    run_serve_test("ref_properties_remove", |session, mut redactions| {
+        let info = session.get_api_rojo().unwrap();
+        let root_id = info.root_instance_id;
+
+        assert_yaml_snapshot!("ref_properties_remove_info", redactions.redacted_yaml(info));
+
+        let read_response = session.get_api_read(root_id).unwrap();
+        assert_yaml_snapshot!(
+            "ref_properties_remove_all",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
+
+        fs::remove_file(session.path().join("src/target.model.json")).unwrap();
+
+        let subscribe_response = session.get_api_subscribe(0).unwrap();
+        assert_yaml_snapshot!(
+            "ref_properties_remove_subscribe",
+            subscribe_response.intern_and_redact(&mut redactions, ())
+        );
+
+        let read_response = session.get_api_read(root_id).unwrap();
+        assert_yaml_snapshot!(
+            "ref_properties_remove_all-2",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
+    });
+}

From bf9c683cf7b861fee28dfec5703f1e49b1549796 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 5 Feb 2024 11:24:54 -0800
Subject: [PATCH 150/366] Add fields for ignoring the current camera and
 ignoring unscriptable properties

---
 src/syncback/mod.rs      | 32 ++++++++++++++++++-
 src/syncback/snapshot.rs | 67 ++++++++++++++++++++++++----------------
 2 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index ee2eecc1a..ff9ea33e3 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -6,7 +6,10 @@ mod snapshot;
 
 use anyhow::Context;
 use memofs::Vfs;
-use rbx_dom_weak::{types::Ref, Instance, WeakDom};
+use rbx_dom_weak::{
+    types::{Ref, Variant},
+    Instance, WeakDom,
+};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{HashMap, HashSet, VecDeque},
@@ -37,6 +40,25 @@ pub fn syncback_loop<'old>(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(&new_tree);
 
+    if let Some(syncback_rules) = &project.syncback_rules {
+        // I think this is a neat way to handle `sync_current_camera` being
+        // Option<bool>!
+        if let Some(true) = syncback_rules.sync_current_camera {
+            let mut camera_ref = None;
+            for child_ref in new_tree.root().children() {
+                let inst = new_tree.get_by_ref(*child_ref).unwrap();
+                if inst.class == "Workspace" {
+                    camera_ref = inst.properties.get("CurrentCamera")
+                }
+            }
+            if let Some(Variant::Ref(camera_ref)) = camera_ref {
+                if new_tree.get_by_ref(*camera_ref).is_some() {
+                    new_tree.destroy(*camera_ref);
+                }
+            }
+        }
+    }
+
     log::debug!("Linking referents for new DOM...");
     link_referents(&mut new_tree)?;
 
@@ -220,6 +242,14 @@ pub struct SyncbackRules {
     /// syncback.
     #[serde(default)]
     ignore_properties: HashMap<String, Vec<String>>,
+    /// Whether or not the `CurrentCamera` of `Workspace` is included in the
+    /// syncback or not. Defaults to `false`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    sync_current_camera: Option<bool>,
+    /// Whether or not to sync properties that cannot be modified via scripts.
+    /// Defaults to `false`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    sync_unscriptable: Option<bool>,
 }
 
 fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 099a85f1f..11ab761bd 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,4 +1,5 @@
 use memofs::Vfs;
+use rbx_reflection::Scriptability;
 use std::{
     collections::{BTreeSet, HashMap},
     path::{Path, PathBuf},
@@ -77,10 +78,37 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             HashMap::with_capacity(inst.properties.capacity());
 
         let filter = self.get_property_filter();
+        let class_data = rbx_reflection_database::get()
+            .classes
+            .get(inst.class.as_str());
+
+        let predicate = |prop_name: &String, prop_value: &Variant| {
+            if matches!(prop_value, Variant::Ref(_) | Variant::SharedString(_)) {
+                return true;
+            }
+            if filter_out_property(inst, prop_name) {
+                return true;
+            }
+            if let Some(list) = &filter {
+                if list.contains(prop_name) {
+                    return true;
+                }
+            }
+            if !self.sync_unscriptable() {
+                if let Some(data) = class_data {
+                    if let Some(prop_data) = data.properties.get(prop_name.as_str()) {
+                        if matches!(prop_data.scriptability, Scriptability::None) {
+                            return true;
+                        }
+                    }
+                }
+            }
+            false
+        };
 
         if let Some(old_inst) = old_ref.and_then(|referent| self.get_old_instance(referent)) {
             for (name, value) in &inst.properties {
-                if filter_out_property(inst, name.as_str()) {
+                if predicate(name, value) {
                     continue;
                 }
                 if old_inst.properties().contains_key(name) {
@@ -88,26 +116,12 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
                 }
             }
         }
-        let class_data = rbx_reflection_database::get()
-            .classes
-            .get(inst.class.as_str());
         if let Some(class_data) = class_data {
             let defaults = &class_data.default_properties;
             for (name, value) in &inst.properties {
-                if filter_out_property(inst, name.as_str()) {
-                    continue;
-                }
-                // We don't currently support refs or shared strings as properties.
-                // Technically, Refs are supported as attributes but we don't want
-                // those handled as properties.
-                if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+                if predicate(name, value) {
                     continue;
                 }
-                if let Some(list) = &filter {
-                    if list.contains(name) {
-                        continue;
-                    }
-                }
                 if let Some(default) = defaults.get(name.as_str()) {
                     if !variant_eq(value, default) {
                         properties.insert(name, value);
@@ -118,18 +132,9 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             }
         } else {
             for (name, value) in &inst.properties {
-                if filter_out_property(inst, name.as_str()) {
-                    continue;
-                }
-                // We don't currently support refs or shared strings
-                if matches!(value, Variant::Ref(_) | Variant::SharedString(_)) {
+                if predicate(name, value) {
                     continue;
                 }
-                if let Some(list) = &filter {
-                    if list.contains(name) {
-                        continue;
-                    }
-                }
                 properties.insert(name, value);
             }
         }
@@ -252,6 +257,16 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             .syncback_rules
             .map(|rules| rules.ignore_trees.as_slice())
     }
+
+    /// Returns the user-defined setting to determine whether unscriptable
+    /// properties should be synced back or not.
+    #[inline]
+    pub fn sync_unscriptable(&self) -> bool {
+        self.data
+            .syncback_rules
+            .and_then(|sr| sr.sync_unscriptable)
+            .unwrap_or_default()
+    }
 }
 
 fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {

From 1d57be14d4f441e23939e27bb564b409427d6708 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 5 Feb 2024 11:32:02 -0800
Subject: [PATCH 151/366] Skip serializing syncback rule fields if they're
 empty

---
 src/syncback/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index ff9ea33e3..00a271946 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -232,15 +232,15 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
 #[serde(deny_unknown_fields, rename_all = "camelCase")]
 pub struct SyncbackRules {
     /// A list of subtrees in a file that will be ignored by Syncback.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     ignore_trees: Vec<String>,
     /// A list of patterns to check against the path an Instance would serialize
     /// to. If a path matches one of these, the Instance won't be syncbacked.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     ignore_paths: Vec<Glob>,
     /// A map of classes to properties to ignore for that class when doing
     /// syncback.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
     ignore_properties: HashMap<String, Vec<String>>,
     /// Whether or not the `CurrentCamera` of `Workspace` is included in the
     /// syncback or not. Defaults to `false`.

From 67e74d3cd605000b6798fb9c2605e492194cba69 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 5 Feb 2024 11:37:17 -0800
Subject: [PATCH 152/366] Update changelog entry for syncback

---
 CHANGELOG.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9785f7963..e7d7f8174 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,17 +11,29 @@
     ```json
     {
         "syncbackRules": {
+            "ignoreTrees": [
+                "DataModel/ServerStorage/ImportantSecrets",
+            ],
             "ignorePaths": [
-                "Workspace/Camera",
-                "ServerStorage/ImportantSecrets/**",
+                "src/ServerStorage/Secrets/*"
             ],
             "ignoreProperties": {
-                "Part": ["Color"]
+                "BasePart": ["Color"]
             },
+            "syncCurrentCamera": false,
+            "syncUnscriptable": true,
         }
     }
     ```
 
+    A brief explanation of each field:
+
+    - `ignoreTrees` is a list of paths in the **roblox file** that should be ignored
+    - `ignorePaths` is a list of paths in the **file system** that should be ignored
+    - `ignoreProperties` is a list of properties that won't be synced back
+    - `syncCurrentCamera` is a toggle for whether to sync back the Workspace's CurrentCamera. Defaults to `false`.
+    - `syncUnscriptable` is a toggle for whether to sync back properties that cannot be set by the Roblox Studio plugin. Defaults to `false`.
+
 * Projects may now manually link `Ref` properties together using `Attributes`. ([#843])
  	This has two parts: using `id` or `$id` in JSON files or a `Rojo_Target` attribute, an Instance
     is given an ID. Then, that ID may be used elsewhere in the project to point to an Instance

From d778905acda0e94bb83f87a8d28a0f2a2a0f2f28 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 6 Feb 2024 08:43:46 -0800
Subject: [PATCH 153/366] Write to Vfs in syncback command instead of loop

---
 src/cli/syncback.rs | 7 ++++++-
 src/syncback/mod.rs | 6 ++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 5d56c56ca..265d54fd4 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -56,12 +56,17 @@ impl SyncbackCommand {
 
         let start = Instant::now();
         log::info!("Beginning syncback...");
-        syncback_loop(
+        let snapshot = syncback_loop(
             session_old.vfs(),
             &dom_old,
             dom_new,
             session_old.root_project(),
         )?;
+
+        snapshot.write_to_vfs(
+            session_old.root_project().folder_location(),
+            session_old.vfs(),
+        )?;
         log::info!(
             "Syncback finished in {:.02}s!",
             start.elapsed().as_secs_f32()
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 00a271946..e176a5e2b 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -34,7 +34,7 @@ pub fn syncback_loop<'old>(
     old_tree: &'old RojoTree,
     mut new_tree: WeakDom,
     project: &'old Project,
-) -> anyhow::Result<Vec<(Ref, InstanceSnapshot)>> {
+) -> anyhow::Result<FsSnapshot> {
     log::debug!("Hashing project DOM");
     let old_hashes = hash_tree(old_tree.inner());
     log::debug!("Hashing file DOM");
@@ -153,9 +153,7 @@ pub fn syncback_loop<'old>(
         snapshots.extend(syncback.children);
     }
 
-    fs_snapshot.write_to_vfs(project.folder_location(), vfs)?;
-
-    Ok(replacements)
+    Ok(fs_snapshot)
 }
 
 pub struct SyncbackReturn<'new, 'old> {

From 10c3e6766b487f0297c3851665d647bdd6496c7f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 6 Feb 2024 09:49:55 -0800
Subject: [PATCH 154/366] Unimplement Debug for FsSnapshot

---
 src/syncback/fs_snapshot.rs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index ad9a6fca4..dbeeef9cf 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -1,6 +1,6 @@
 use std::{
     collections::{HashMap, HashSet},
-    fmt, io,
+    io,
     path::{Path, PathBuf},
 };
 
@@ -113,15 +113,3 @@ impl FsSnapshot {
         Ok(())
     }
 }
-
-impl fmt::Debug for FsSnapshot {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let files = self
-            .added_files
-            .iter()
-            .map(|(k, v)| format!("{}: {} bytes", k.display(), v.len()));
-        let dirs = self.added_dirs.iter().map(|v| format!("{}", v.display()));
-
-        f.debug_list().entries(files).entries(dirs).finish()
-    }
-}

From 0b1bd2b17e7ef39cd31d33b15ca84fee2f64e8ec Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 6 Feb 2024 10:32:44 -0800
Subject: [PATCH 155/366] Don't drop ServeSession in syncback

---
 src/cli/syncback.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 265d54fd4..615283c57 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -1,4 +1,5 @@
 use std::{
+    mem::forget,
     path::{Path, PathBuf},
     time::Instant,
 };
@@ -72,6 +73,12 @@ impl SyncbackCommand {
             start.elapsed().as_secs_f32()
         );
 
+        // It is potentially prohibitively expensive to drop a ServeSession,
+        // and the program is about to exit anyway so we're just going to forget
+        // about it.
+        drop(dom_old);
+        forget(session_old);
+
         Ok(())
     }
 }

From 1471eb43981ddc73b944c820a62dd848f7e59d1f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 09:23:08 -0800
Subject: [PATCH 156/366] Add flags to syncback command for dry-run and listing
 files

---
 src/cli/mod.rs              |  2 +-
 src/cli/syncback.rs         | 84 +++++++++++++++++++++++++++++++++----
 src/syncback/fs_snapshot.rs | 29 +++++++++++++
 3 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 37ab9af93..7d3d87b18 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -48,7 +48,7 @@ impl Options {
             Subcommand::FmtProject(subcommand) => subcommand.run(),
             Subcommand::Doc(subcommand) => subcommand.run(),
             Subcommand::Plugin(subcommand) => subcommand.run(),
-            Subcommand::Syncback(subcommand) => subcommand.run(),
+            Subcommand::Syncback(subcommand) => subcommand.run(self.global),
         }
     }
 }
diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 615283c57..6c618f8e5 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -1,4 +1,5 @@
 use std::{
+    io::{self, Write as _},
     mem::forget,
     path::{Path, PathBuf},
     time::Instant,
@@ -8,10 +9,14 @@ use anyhow::Context;
 use clap::Parser;
 use memofs::Vfs;
 use rbx_dom_weak::{InstanceBuilder, WeakDom};
+use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
 
-use crate::{serve_session::ServeSession, syncback::syncback_loop};
+use crate::{
+    serve_session::ServeSession,
+    syncback::{syncback_loop, FsSnapshot},
+};
 
-use super::resolve_path;
+use super::{resolve_path, GlobalOptions};
 
 const UNKNOWN_INPUT_KIND_ERR: &str = "Could not detect what kind of file was inputted. \
                                        Expected input file to end in .rbxl, .rbxlx, .rbxm, or .rbxmx.";
@@ -26,10 +31,20 @@ pub struct SyncbackCommand {
     /// Path to the place to perform syncback on.
     #[clap(long, short)]
     pub input: PathBuf,
+
+    /// If provided, syncback will list all of the changes it will make to the
+    /// file system before making them.
+    #[clap(long)]
+    pub list: bool,
+
+    /// If provided, syncback will not actually write anything to the file
+    /// system.
+    #[clap(long)]
+    pub dry_run: bool,
 }
 
 impl SyncbackCommand {
-    pub fn run(&self) -> anyhow::Result<()> {
+    pub fn run(&self, global: GlobalOptions) -> anyhow::Result<()> {
         let path_old = resolve_path(&self.project);
         let path_new = resolve_path(&self.input);
 
@@ -63,16 +78,23 @@ impl SyncbackCommand {
             dom_new,
             session_old.root_project(),
         )?;
-
-        snapshot.write_to_vfs(
-            session_old.root_project().folder_location(),
-            session_old.vfs(),
-        )?;
         log::info!(
             "Syncback finished in {:.02}s!",
             start.elapsed().as_secs_f32()
         );
 
+        let base_path = session_old.root_project().folder_location();
+        if self.list {
+            list_files(&snapshot, global.color.into(), base_path)?;
+        }
+
+        if !self.dry_run {
+            log::info!("Writing to the file system...");
+            snapshot.write_to_vfs(base_path, session_old.vfs())?;
+        } else {
+            log::info!("Aborting before writing to file system due to `--dry-run`");
+        }
+
         // It is potentially prohibitively expensive to drop a ServeSession,
         // and the program is about to exit anyway so we're just going to forget
         // about it.
@@ -154,3 +176,49 @@ impl FileKind {
         }
     }
 }
+
+fn list_files(snapshot: &FsSnapshot, color: ColorChoice, base_path: &Path) -> io::Result<()> {
+    let no_color = ColorSpec::new();
+    let mut add_color = ColorSpec::new();
+    add_color.set_fg(Some(Color::Green));
+    let mut remove_color = ColorSpec::new();
+    remove_color.set_fg(Some(Color::Red));
+
+    // We emit this to stderr because otherwise it'd be impossible
+    // to pipe it separately from normal output.
+    let writer = BufferWriter::stderr(color);
+    let mut buffer = writer.buffer();
+
+    if snapshot.is_empty() {
+        writeln!(&mut buffer, "No files/added would be removed or added.")?;
+    } else {
+        let added = snapshot.added_paths();
+        if !added.is_empty() {
+            writeln!(&mut buffer, "Writing files/folders:")?;
+            buffer.set_color(&add_color)?;
+            for path in added {
+                writeln!(
+                    &mut buffer,
+                    "{}",
+                    path.strip_prefix(base_path).unwrap_or(path).display()
+                )?;
+            }
+            buffer.set_color(&no_color)?;
+        }
+        let removed = snapshot.removed_paths();
+        if !removed.is_empty() {
+            writeln!(&mut buffer, "Removing files/folders:")?;
+            buffer.set_color(&remove_color)?;
+            for path in removed {
+                writeln!(
+                    &mut buffer,
+                    "{}",
+                    path.strip_prefix(base_path).unwrap_or(path).display()
+                )?;
+            }
+        }
+        buffer.set_color(&no_color)?;
+    }
+
+    writer.print(&buffer)
+}
diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index dbeeef9cf..caf8dd650 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -112,4 +112,33 @@ impl FsSnapshot {
         }
         Ok(())
     }
+
+    /// Returns whether this `FsSnapshot` is empty or not.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.added_files.is_empty()
+            && self.added_dirs.is_empty()
+            && self.removed_files.is_empty()
+            && self.removed_dirs.is_empty()
+    }
+
+    /// Returns a list of paths that would be added by this `FsSnapshot`.
+    #[inline]
+    pub fn added_paths(&self) -> Vec<&Path> {
+        let mut list = Vec::with_capacity(self.added_files.len() + self.added_dirs.len());
+        list.extend(self.added_files.keys().map(PathBuf::as_path));
+        list.extend(self.added_dirs.iter().map(PathBuf::as_path));
+
+        list
+    }
+
+    /// Returns a list of paths that would be removed by this `FsSnapshot`.
+    #[inline]
+    pub fn removed_paths(&self) -> Vec<&Path> {
+        let mut list = Vec::with_capacity(self.removed_files.len() + self.removed_dirs.len());
+        list.extend(self.removed_files.iter().map(PathBuf::as_path));
+        list.extend(self.removed_dirs.iter().map(PathBuf::as_path));
+
+        list
+    }
 }

From 3b04c481dbf3310986341ab9eecde53781d368fd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 09:53:45 -0800
Subject: [PATCH 157/366] Add prompt for confirming file writes

---
 src/cli/syncback.rs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 6c618f8e5..d3f7ee1d2 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -34,13 +34,17 @@ pub struct SyncbackCommand {
 
     /// If provided, syncback will list all of the changes it will make to the
     /// file system before making them.
-    #[clap(long)]
+    #[clap(long, short)]
     pub list: bool,
 
     /// If provided, syncback will not actually write anything to the file
     /// system.
     #[clap(long)]
     pub dry_run: bool,
+
+    /// If provided, the prompt for writing to the file system is skipped.
+    #[clap(long, short = 'y')]
+    pub non_interactive: bool,
 }
 
 impl SyncbackCommand {
@@ -89,6 +93,22 @@ impl SyncbackCommand {
         }
 
         if !self.dry_run {
+            if !self.non_interactive {
+                println!(
+                    "Would write {} files/folders and remove {} files/folders.",
+                    snapshot.added_paths().len(),
+                    snapshot.removed_paths().len()
+                );
+                print!("Is this okay? (Y/N): ");
+                io::stdout().flush()?;
+                let mut line = String::with_capacity(1);
+                io::stdin().read_line(&mut line)?;
+                line = line.trim().to_lowercase();
+                if line != "y" {
+                    println!("Aborting due to user input!");
+                    return Ok(());
+                }
+            }
             log::info!("Writing to the file system...");
             snapshot.write_to_vfs(base_path, session_old.vfs())?;
         } else {

From 69cd53e0124fd1991989229ae367279ef177f931 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 10:06:05 -0800
Subject: [PATCH 158/366] Emit error indicating why a file name is invalid

---
 src/snapshot_middleware/mod.rs | 14 ++++++++------
 src/syncback/file_names.rs     | 33 +++++++++++++++++++--------------
 src/syncback/mod.rs            |  2 +-
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 60587877e..ad2f79064 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -33,7 +33,7 @@ use crate::{
 };
 use crate::{
     snapshot::{InstanceContext, InstanceSnapshot, SyncRule},
-    syncback::is_valid_file_name,
+    syncback::validate_file_name,
 };
 
 use self::{
@@ -245,11 +245,13 @@ impl Middleware {
         file_name: &str,
     ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
         // We don't care about the names of projects
-        if !is_valid_file_name(&snapshot.name) && !matches!(self, Middleware::Project) {
-            anyhow::bail!(
-                "cannot create a file or directory with name {}",
-                snapshot.name
-            );
+        if !matches!(self, Middleware::Project) {
+            validate_file_name(&snapshot.name).with_context(|| {
+                format!(
+                    "cannot create a file or directory with name {}",
+                    snapshot.name
+                )
+            })?;
         }
         match self {
             Middleware::Csv => syncback_csv(snapshot, file_name),
diff --git a/src/syncback/file_names.rs b/src/syncback/file_names.rs
index ef20f3ed1..8fa65f5a8 100644
--- a/src/syncback/file_names.rs
+++ b/src/syncback/file_names.rs
@@ -34,11 +34,10 @@ pub fn name_for_inst<'old>(
             _ => {
                 let extension = extension_for_middleware(middleware);
                 let name = &new_inst.name;
-                if is_valid_file_name(name) {
-                    Cow::Owned(format!("{name}.{extension}"))
-                } else {
-                    anyhow::bail!("name '{name}' is not legal to write to the file system")
-                }
+                validate_file_name(name).with_context(|| {
+                    format!("name '{name}' is not legal to write to the file system")
+                })?;
+                Cow::Owned(format!("{name}.{extension}"))
             }
         })
     }
@@ -81,29 +80,35 @@ const INVALID_WINDOWS_NAMES: [&str; 22] = [
 /// in a file's name.
 const FORBIDDEN_CHARS: [char; 9] = ['<', '>', ':', '"', '/', '|', '?', '*', '\\'];
 
-/// Returns whether a given name is a valid file name. This takes into account
-/// rules for Windows, MacOS, and Linux.
+/// Validates a provided file name to ensure it's allowed on the file system. An
+/// error is returned if the name isn't allowed, indicating why.
+/// This takes into account rules for Windows, MacOS, and Linux.
 ///
 /// In practice however, these broadly overlap so the only unexpected behavior
 /// is Windows, where there are 22 reserved names.
-pub fn is_valid_file_name<S: AsRef<str>>(name: S) -> bool {
+pub fn validate_file_name<S: AsRef<str>>(name: S) -> anyhow::Result<()> {
     let str = name.as_ref();
 
-    if str.ends_with(' ') || str.ends_with('.') {
-        return false;
+    if str.ends_with(' ') {
+        anyhow::bail!("file names cannot end with a space")
+    }
+    if str.ends_with('.') {
+        anyhow::bail!("file names cannot end with '.'")
     }
 
     for char in str.chars() {
-        if char.is_control() || FORBIDDEN_CHARS.contains(&char) {
-            return false;
+        if FORBIDDEN_CHARS.contains(&char) {
+            anyhow::bail!("file names cannot contain <, >, :, \", /, |, ?, *, or \\")
+        } else if char.is_control() {
+            anyhow::bail!("file names cannot contain control characters")
         }
     }
 
     for forbidden in INVALID_WINDOWS_NAMES {
         if str == forbidden {
-            return false;
+            anyhow::bail!("files cannot be named {str}")
         }
     }
 
-    true
+    Ok(())
 }
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index e176a5e2b..5ad4cd088 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -23,7 +23,7 @@ use crate::{
     Project,
 };
 
-pub use file_names::{is_valid_file_name, name_for_inst};
+pub use file_names::{name_for_inst, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
 pub use ref_properties::link_referents;

From 81e855b9ddc87e90705fea400abe844d1b704bd7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 10:10:29 -0800
Subject: [PATCH 159/366] Bail instead of panicking in syncback method of
 middleware

---
 src/snapshot_middleware/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index ad2f79064..d4133e719 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -256,7 +256,7 @@ impl Middleware {
         match self {
             Middleware::Csv => syncback_csv(snapshot, file_name),
             Middleware::JsonModel => syncback_json_model(snapshot, file_name),
-            Middleware::Json => unimplemented!("cannot syncback Json middleware"),
+            Middleware::Json => anyhow::bail!("cannot syncback Json middleware"),
             // Projects are only generated from files that already exist on the
             // file system, so we don't need to pass a file name.
             Middleware::Project => syncback_project(snapshot),
@@ -265,7 +265,7 @@ impl Middleware {
             Middleware::ModuleScript => syncback_lua(snapshot, file_name),
             Middleware::Rbxm => syncback_rbxm(snapshot, file_name),
             Middleware::Rbxmx => syncback_rbxmx(snapshot, file_name),
-            Middleware::Toml => unimplemented!("cannot syncback Toml middleware"),
+            Middleware::Toml => anyhow::bail!("cannot syncback Toml middleware"),
             Middleware::Text => syncback_txt(snapshot, file_name),
             Middleware::Ignore => anyhow::bail!("cannot syncback Ignore middleware"),
             Middleware::Dir => syncback_dir(snapshot, file_name),

From 72d8dbeb57b053fe4f011d4bf07543ecf41e3c43 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 11:08:47 -0800
Subject: [PATCH 160/366] Only skip serializing JosnModel names if they're None

---
 src/snapshot_middleware/json_model.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 07b1ca905..6d626aa3a 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -70,7 +70,9 @@ pub fn syncback_json_model<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let path = snapshot.parent_path.join(file_name);
 
-    let model = json_model_from_pair(snapshot, snapshot.new, snapshot.old);
+    let mut model = json_model_from_pair(snapshot, snapshot.new, snapshot.old);
+    // We don't need the name on the root, but we do for children.
+    model.name = None;
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
@@ -151,7 +153,7 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 struct JsonModel {
-    #[serde(alias = "Name", skip_serializing)]
+    #[serde(alias = "Name", skip_serializing_if = "Option::is_none")]
     name: Option<String>,
 
     #[serde(alias = "ClassName")]

From 337f4fd84c1b840c3224c5ed0423e09e64e7f0f5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 11:31:56 -0800
Subject: [PATCH 161/366] Fix writing target IDs while referent linking

---
 src/syncback/ref_properties.rs | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 98c4a1b2b..83cce435a 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -4,12 +4,14 @@
 use std::collections::VecDeque;
 
 use rbx_dom_weak::{
-    types::{Attributes, BinaryString, Variant},
+    types::{Attributes, Variant},
     Instance, WeakDom,
 };
 
 use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
 
+use super::get_inst_path;
+
 /// Iterates through a WeakDom and links referent properties using attributes.
 pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
     let mut links = MultiMap::new();
@@ -25,6 +27,11 @@ pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
         for (name, value) in &instance.properties {
             if let Variant::Ref(prop_value) = value {
                 if dom.get_by_ref(*prop_value).is_some() {
+                    log::trace!(
+                        "{}.{name} -> {}",
+                        get_inst_path(dom, referent),
+                        get_inst_path(dom, *prop_value)
+                    );
                     links.insert(referent, (name.clone(), *prop_value))
                 }
             }
@@ -32,12 +39,12 @@ pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
     }
     let mut rewrites = Vec::new();
 
-    for (referent, ref_properties) in links {
+    for (pointer_ref, ref_properties) in links {
         for (prop_name, target_ref) in ref_properties {
             log::debug!(
-                "Linking {} to {}.{prop_name}",
+                "Linking {}.{prop_name} to {} ({pointer_ref} to {target_ref})",
+                dom.get_by_ref(pointer_ref).unwrap().name,
                 dom.get_by_ref(target_ref).unwrap().name,
-                dom.get_by_ref(referent).unwrap().name,
             );
             let target_inst = dom
                 .get_by_ref_mut(target_ref)
@@ -47,24 +54,26 @@ pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
             if attributes.get(REF_ID_ATTRIBUTE_NAME).is_none() {
                 attributes.insert(
                     REF_ID_ATTRIBUTE_NAME.to_owned(),
-                    Variant::BinaryString(referent.to_string().into_bytes().into()),
+                    Variant::String(target_ref.to_string()),
                 );
             }
 
             let target_id = attributes
                 .get(REF_ID_ATTRIBUTE_NAME)
                 .expect("every Instance to have an ID");
-            if let Variant::BinaryString(target_id) = target_id {
-                rewrites.push((prop_name, target_id.clone()));
+            if let Variant::String(value) = target_id {
+                rewrites.push((prop_name, value.clone().into_bytes()));
+            } else if let Variant::BinaryString(value) = target_id {
+                rewrites.push((prop_name, value.clone().into_vec()))
             }
         }
 
-        let inst = dom.get_by_ref_mut(referent).unwrap();
+        let inst = dom.get_by_ref_mut(pointer_ref).unwrap();
         let attrs = get_or_insert_attributes(inst)?;
         for (name, id) in rewrites.drain(..) {
             attrs.insert(
                 format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
-                BinaryString::from(id.into_vec()).into(),
+                String::from_utf8(id).unwrap().into(),
             );
         }
     }

From 43b4ddda66bc06dd44eb957303315e0cb025dd9b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 8 Feb 2024 15:57:12 -0800
Subject: [PATCH 162/366] Make rbxm and rbxmx filter properties

---
 src/snapshot_middleware/rbxm.rs  | 50 ++++++++++++++++++++++++++++++--
 src/snapshot_middleware/rbxmx.rs | 50 ++++++++++++++++++++++++++++++--
 2 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 4cbda433b..5c1d1c125 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -1,7 +1,11 @@
-use std::path::Path;
+use std::{
+    collections::{HashMap, VecDeque},
+    path::Path,
+};
 
 use anyhow::Context;
 use memofs::Vfs;
+use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
@@ -48,11 +52,12 @@ pub fn syncback_rbxm<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
-
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
+
+    let (dom, referent) = clone_and_filter(snapshot);
     let mut serialized = Vec::new();
-    rbx_binary::to_writer(&mut serialized, snapshot.new_tree(), &[inst.referent()])
+    rbx_binary::to_writer(&mut serialized, &dom, &[referent])
         .context("failed to serialize new rbxm")?;
 
     Ok(SyncbackReturn {
@@ -63,6 +68,45 @@ pub fn syncback_rbxm<'new, 'old>(
     })
 }
 
+fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
+    // We want to: filter an Instance's properties, insert it into a new DOM,
+    // then do the same for its children. The challenge is matching parents up.
+
+    let mut new_dom = WeakDom::new(InstanceBuilder::empty());
+    // A map of old referents to their parent referent in the new DOM.
+    let mut old_to_parent = HashMap::new();
+    old_to_parent.insert(snapshot.new, new_dom.root_ref());
+
+    let mut queue = VecDeque::new();
+    queue.push_back(snapshot.new);
+
+    // Note that this is back-in, front-out. This is important because
+    // VecDeque::extend is the equivalent to using push_back.
+    while let Some(referent) = queue.pop_front() {
+        let inst = snapshot
+            .new_tree()
+            .get_by_ref(referent)
+            .expect("all Instances should be in the new subtree");
+        let builder = InstanceBuilder::new(&inst.class).with_properties(
+            snapshot
+                .get_filtered_properties(referent, None)
+                .unwrap()
+                .into_iter()
+                .map(|(k, v)| (k.to_string(), v.clone())),
+        );
+        let parent = old_to_parent
+            .get(&referent)
+            .expect("children should come after parents");
+        let new = new_dom.insert(*parent, builder);
+
+        old_to_parent.extend(inst.children().iter().copied().map(|r| (r, new)));
+        queue.extend(inst.children());
+    }
+
+    let new_ref = new_dom.root().children()[0];
+    (new_dom, new_ref)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index feb9198fe..1857b6813 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -1,7 +1,11 @@
-use std::path::Path;
+use std::{
+    collections::{HashMap, VecDeque},
+    path::Path,
+};
 
 use anyhow::Context;
 use memofs::Vfs;
+use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
@@ -50,11 +54,12 @@ pub fn syncback_rbxmx<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
-
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
+
+    let (dom, referent) = clone_and_filter(snapshot);
     let mut serialized = Vec::new();
-    rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()])
+    rbx_xml::to_writer_default(&mut serialized, &dom, &[referent])
         .context("failed to serialize new rbxmx")?;
 
     Ok(SyncbackReturn {
@@ -65,6 +70,45 @@ pub fn syncback_rbxmx<'new, 'old>(
     })
 }
 
+fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
+    // We want to: filter an Instance's properties, insert it into a new DOM,
+    // then do the same for its children. The challenge is matching parents up.
+
+    let mut new_dom = WeakDom::new(InstanceBuilder::empty());
+    // A map of old referents to their parent referent in the new DOM.
+    let mut old_to_parent = HashMap::new();
+    old_to_parent.insert(snapshot.new, new_dom.root_ref());
+
+    let mut queue = VecDeque::new();
+    queue.push_back(snapshot.new);
+
+    // Note that this is back-in, front-out. This is important because
+    // VecDeque::extend is the equivalent to using push_back.
+    while let Some(referent) = queue.pop_front() {
+        let inst = snapshot
+            .new_tree()
+            .get_by_ref(referent)
+            .expect("all Instances should be in the new subtree");
+        let builder = InstanceBuilder::new(&inst.class).with_properties(
+            snapshot
+                .get_filtered_properties(referent, None)
+                .unwrap()
+                .into_iter()
+                .map(|(k, v)| (k.to_string(), v.clone())),
+        );
+        let parent = old_to_parent
+            .get(&referent)
+            .expect("children should come after parents");
+        let new = new_dom.insert(*parent, builder);
+
+        old_to_parent.extend(inst.children().iter().copied().map(|r| (r, new)));
+        queue.extend(inst.children());
+    }
+
+    let new_ref = new_dom.root().children()[0];
+    (new_dom, new_ref)
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

From a1009f2f3d5cec4d057705c503c33b4d94fb711e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 09:21:30 -0800
Subject: [PATCH 163/366] Allow specifying a subtree to hash

---
 src/syncback/hash/mod.rs | 31 +++++++++++++++++++++++++------
 src/syncback/mod.rs      | 24 ++----------------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/syncback/hash/mod.rs b/src/syncback/hash/mod.rs
index 0cd187b78..0e56dc82f 100644
--- a/src/syncback/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -8,9 +8,8 @@ use rbx_dom_weak::{
     types::{Ref, Variant},
     Instance, WeakDom,
 };
-use std::collections::HashMap;
+use std::collections::{HashMap, VecDeque};
 
-use super::descendants;
 use crate::variant_eq::variant_eq;
 
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
@@ -20,9 +19,9 @@ use crate::variant_eq::variant_eq;
 /// The hashes **do not** include the descendants of the Instances in them,
 /// so they should only be used for comparing Instances directly. To compare a
 /// subtree, use `hash_tree`.
-pub fn hash_tree_no_descendants(dom: &WeakDom) -> HashMap<Ref, Hash> {
+pub fn hash_tree_no_descendants(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
-    let mut order = descendants(dom);
+    let mut order = descendants(dom, root_ref);
 
     let mut prop_list = Vec::with_capacity(2);
 
@@ -43,9 +42,9 @@ pub fn hash_tree_no_descendants(dom: &WeakDom) -> HashMap<Ref, Hash> {
 /// The hashes **do** include the descendants of the Instances in them,
 /// so they should only be used for comparing subtrees directly. To compare an
 /// `Instance` directly, use `hash_tree_no_descendants`.
-pub fn hash_tree(dom: &WeakDom) -> HashMap<Ref, Hash> {
+pub fn hash_tree(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
-    let mut order = descendants(dom);
+    let mut order = descendants(dom, root_ref);
 
     let mut prop_list = Vec::with_capacity(2);
 
@@ -122,3 +121,23 @@ fn hash_inst<'inst>(
 
     hasher.finalize()
 }
+
+/// Produces a list of descendants in the WeakDom such that all children come
+/// before their parents.
+fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
+    let mut queue = VecDeque::new();
+    let mut ordered = Vec::new();
+    queue.push_front(root_ref);
+
+    while let Some(referent) = queue.pop_front() {
+        let inst = dom
+            .get_by_ref(referent)
+            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
+        ordered.push(referent);
+        for child in inst.children() {
+            queue.push_back(*child)
+        }
+    }
+
+    ordered
+}
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 5ad4cd088..a0cf23cf8 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -36,9 +36,9 @@ pub fn syncback_loop<'old>(
     project: &'old Project,
 ) -> anyhow::Result<FsSnapshot> {
     log::debug!("Hashing project DOM");
-    let old_hashes = hash_tree(old_tree.inner());
+    let old_hashes = hash_tree(old_tree.inner(), old_tree.get_root_id());
     log::debug!("Hashing file DOM");
-    let new_hashes = hash_tree(&new_tree);
+    let new_hashes = hash_tree(&new_tree, new_tree.root_ref());
 
     if let Some(syncback_rules) = &project.syncback_rules {
         // I think this is a neat way to handle `sync_current_camera` being
@@ -259,23 +259,3 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     }
     path.into_iter().collect::<Vec<&str>>().join("/")
 }
-
-/// Produces a list of descendants in the WeakDom such that all children come
-/// before their parents.
-pub(crate) fn descendants(dom: &WeakDom) -> Vec<Ref> {
-    let mut queue = VecDeque::new();
-    let mut ordered = Vec::new();
-    queue.push_front(dom.root_ref());
-
-    while let Some(referent) = queue.pop_front() {
-        let inst = dom
-            .get_by_ref(referent)
-            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
-        ordered.push(referent);
-        for child in inst.children() {
-            queue.push_back(*child)
-        }
-    }
-
-    ordered
-}

From a922190fa604fbc2389711019f4abc5c3553e1d6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 09:22:51 -0800
Subject: [PATCH 164/366] Hash rbxm and rbxmx files again post-property
 filtering

---
 src/snapshot_middleware/rbxm.rs  | 33 ++++++++++++++++++++++++--------
 src/snapshot_middleware/rbxmx.rs | 32 +++++++++++++++++++++++--------
 src/syncback/snapshot.rs         |  6 ++++++
 3 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 5c1d1c125..c7b0a9921 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -9,7 +9,7 @@ use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{hash_tree, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 #[profiling::function]
@@ -56,6 +56,21 @@ pub fn syncback_rbxm<'new, 'old>(
     // script. That's a future endeavor though.
 
     let (dom, referent) = clone_and_filter(snapshot);
+    if let Some(old_ref) = snapshot.old {
+        log::trace!("Comparing two rbxmx trees to avoid extra writes");
+        let new_hashes = hash_tree(&dom, referent);
+        let old_hashes = hash_tree(snapshot.old_tree(), old_ref);
+
+        if new_hashes.get(&referent) == old_hashes.get(&old_ref) {
+            return Ok(SyncbackReturn {
+                inst_snapshot: InstanceSnapshot::from_instance(dom.get_by_ref(referent).unwrap()),
+                fs_snapshot: FsSnapshot::new(),
+                children: Vec::new(),
+                removed_children: Vec::new(),
+            });
+        }
+    }
+
     let mut serialized = Vec::new();
     rbx_binary::to_writer(&mut serialized, &dom, &[referent])
         .context("failed to serialize new rbxm")?;
@@ -87,13 +102,15 @@ fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
             .new_tree()
             .get_by_ref(referent)
             .expect("all Instances should be in the new subtree");
-        let builder = InstanceBuilder::new(&inst.class).with_properties(
-            snapshot
-                .get_filtered_properties(referent, None)
-                .unwrap()
-                .into_iter()
-                .map(|(k, v)| (k.to_string(), v.clone())),
-        );
+        let builder = InstanceBuilder::new(&inst.class)
+            .with_properties(
+                snapshot
+                    .get_filtered_properties(referent, None)
+                    .unwrap()
+                    .into_iter()
+                    .map(|(k, v)| (k.to_string(), v.clone())),
+            )
+            .with_name(&inst.name);
         let parent = old_to_parent
             .get(&referent)
             .expect("children should come after parents");
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 1857b6813..4c1bc1d40 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -9,7 +9,7 @@ use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{hash_tree, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 pub fn snapshot_rbxmx(
@@ -58,6 +58,20 @@ pub fn syncback_rbxmx<'new, 'old>(
     // script. That's a future endeavor though.
 
     let (dom, referent) = clone_and_filter(snapshot);
+    if let Some(old_ref) = snapshot.old {
+        log::trace!("Comparing two rbxmx trees to avoid extra writes");
+        let new_hashes = hash_tree(&dom, referent);
+        let old_hashes = hash_tree(snapshot.old_tree(), old_ref);
+
+        if new_hashes.get(&referent) == old_hashes.get(&old_ref) {
+            return Ok(SyncbackReturn {
+                inst_snapshot: InstanceSnapshot::from_instance(dom.get_by_ref(referent).unwrap()),
+                fs_snapshot: FsSnapshot::new(),
+                children: Vec::new(),
+                removed_children: Vec::new(),
+            });
+        }
+    }
     let mut serialized = Vec::new();
     rbx_xml::to_writer_default(&mut serialized, &dom, &[referent])
         .context("failed to serialize new rbxmx")?;
@@ -89,13 +103,15 @@ fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
             .new_tree()
             .get_by_ref(referent)
             .expect("all Instances should be in the new subtree");
-        let builder = InstanceBuilder::new(&inst.class).with_properties(
-            snapshot
-                .get_filtered_properties(referent, None)
-                .unwrap()
-                .into_iter()
-                .map(|(k, v)| (k.to_string(), v.clone())),
-        );
+        let builder = InstanceBuilder::new(&inst.class)
+            .with_properties(
+                snapshot
+                    .get_filtered_properties(referent, None)
+                    .unwrap()
+                    .into_iter()
+                    .map(|(k, v)| (k.to_string(), v.clone())),
+            )
+            .with_name(&inst.name);
         let parent = old_to_parent
             .get(&referent)
             .expect("children should come after parents");
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 11ab761bd..7bd4bb8a4 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -234,6 +234,12 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         self.data.new_tree
     }
 
+    /// Returns the WeakDom used for the 'old' tree.
+    #[inline]
+    pub fn old_tree(&self) -> &'old WeakDom {
+        self.data.old_tree.inner()
+    }
+
     /// Returns user-specified property ignore rules.
     #[inline]
     pub fn ignore_props(&self) -> Option<&HashMap<String, Vec<String>>> {

From 4c5bdc57bdf7fc0bc0bbf4cdc0233c222984fb4c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 09:35:09 -0800
Subject: [PATCH 165/366] Remove hash_tree_no_descendants

---
 src/syncback/hash/mod.rs | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/syncback/hash/mod.rs b/src/syncback/hash/mod.rs
index 0e56dc82f..ce9a32db8 100644
--- a/src/syncback/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -12,36 +12,12 @@ use std::collections::{HashMap, VecDeque};
 
 use crate::variant_eq::variant_eq;
 
-/// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
-/// `Instance` it points to, including the properties but not including the
-/// descendants of the Instance.
-///
-/// The hashes **do not** include the descendants of the Instances in them,
-/// so they should only be used for comparing Instances directly. To compare a
-/// subtree, use `hash_tree`.
-pub fn hash_tree_no_descendants(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
-    let mut map: HashMap<Ref, Hash> = HashMap::new();
-    let mut order = descendants(dom, root_ref);
-
-    let mut prop_list = Vec::with_capacity(2);
-
-    while let Some(referent) = order.pop() {
-        let inst = dom.get_by_ref(referent).unwrap();
-        let hash = hash_inst_no_descendants(inst, &mut prop_list);
-
-        map.insert(referent, hash.finalize());
-    }
-
-    map
-}
-
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
 /// `Instance` it points to, including the properties and descendants of the
 /// `Instance`.
 ///
-/// The hashes **do** include the descendants of the Instances in them,
-/// so they should only be used for comparing subtrees directly. To compare an
-/// `Instance` directly, use `hash_tree_no_descendants`.
+/// The hashes include the descendants of the Instances in them, so they should
+/// only be used for comparing subtrees directly.
 pub fn hash_tree(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
     let mut order = descendants(dom, root_ref);

From e7de8f18ab816d06d5b157829ddbc3eb66ab1a9f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 12:14:44 -0800
Subject: [PATCH 166/366] Pre-filter properties of the new DOM

---
 src/syncback/hash/mod.rs        |  24 +------
 src/syncback/mod.rs             |  66 ++++++++++++++++++++
 src/syncback/property_filter.rs | 107 ++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+), 21 deletions(-)
 create mode 100644 src/syncback/property_filter.rs

diff --git a/src/syncback/hash/mod.rs b/src/syncback/hash/mod.rs
index ce9a32db8..b68064031 100644
--- a/src/syncback/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -8,10 +8,12 @@ use rbx_dom_weak::{
     types::{Ref, Variant},
     Instance, WeakDom,
 };
-use std::collections::{HashMap, VecDeque};
+use std::collections::HashMap;
 
 use crate::variant_eq::variant_eq;
 
+use super::descendants;
+
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
 /// `Instance` it points to, including the properties and descendants of the
 /// `Instance`.
@@ -97,23 +99,3 @@ fn hash_inst<'inst>(
 
     hasher.finalize()
 }
-
-/// Produces a list of descendants in the WeakDom such that all children come
-/// before their parents.
-fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
-    let mut queue = VecDeque::new();
-    let mut ordered = Vec::new();
-    queue.push_front(root_ref);
-
-    while let Some(referent) = queue.pop_front() {
-        let inst = dom
-            .get_by_ref(referent)
-            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
-        ordered.push(referent);
-        for child in inst.children() {
-            queue.push_back(*child)
-        }
-    }
-
-    ordered
-}
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index a0cf23cf8..15930d528 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -1,6 +1,7 @@
 mod file_names;
 mod fs_snapshot;
 mod hash;
+mod property_filter;
 mod ref_properties;
 mod snapshot;
 
@@ -26,6 +27,7 @@ use crate::{
 pub use file_names::{name_for_inst, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
+pub use property_filter::filter_properties;
 pub use ref_properties::link_referents;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
@@ -35,6 +37,20 @@ pub fn syncback_loop<'old>(
     mut new_tree: WeakDom,
     project: &'old Project,
 ) -> anyhow::Result<FsSnapshot> {
+    log::debug!("Mapping doms together");
+    let ref_map = match_descendants(old_tree.inner(), &new_tree);
+    log::debug!("Pre-filtering properties on new DOM");
+    for referent in descendants(&new_tree, new_tree.root_ref()) {
+        let new_inst = new_tree.get_by_ref(referent).unwrap();
+
+        let matching_old = ref_map
+            .get(&referent)
+            .and_then(|r| old_tree.get_instance(*r));
+        let prop_list = filter_properties(project.syncback_rules.as_ref(), new_inst, matching_old);
+
+        new_tree.get_by_ref_mut(referent).unwrap().properties = prop_list;
+    }
+
     log::debug!("Hashing project DOM");
     let old_hashes = hash_tree(old_tree.inner(), old_tree.get_root_id());
     log::debug!("Hashing file DOM");
@@ -259,3 +275,53 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     }
     path.into_iter().collect::<Vec<&str>>().join("/")
 }
+
+fn match_descendants(old_dom: &WeakDom, new_dom: &WeakDom) -> HashMap<Ref, Ref> {
+    let mut map = HashMap::new();
+    let mut queue = VecDeque::new();
+    queue.push_back((new_dom.root_ref(), old_dom.root_ref()));
+
+    let mut old_child_map = HashMap::new();
+    while let Some((new_ref, old_ref)) = queue.pop_front() {
+        let old_inst = old_dom.get_by_ref(old_ref).unwrap();
+        for child in old_inst.children() {
+            let inst = old_dom.get_by_ref(*child).unwrap();
+            old_child_map.insert(&inst.name, inst);
+        }
+
+        let inst = new_dom.get_by_ref(new_ref).unwrap();
+        for child_ref in inst.children() {
+            let new_child = new_dom.get_by_ref(*child_ref).unwrap();
+            if let Some(old_child) = old_child_map.get(&new_child.name) {
+                if old_child.class == new_child.class {
+                    queue.push_back((new_child.referent(), old_child.referent()));
+                }
+            }
+        }
+
+        old_child_map.clear();
+        map.insert(new_ref, old_ref);
+    }
+
+    map
+}
+
+/// Produces a list of descendants in the WeakDom such that all children come
+/// before their parents.
+fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
+    let mut queue = VecDeque::new();
+    let mut ordered = Vec::new();
+    queue.push_front(root_ref);
+
+    while let Some(referent) = queue.pop_front() {
+        let inst = dom
+            .get_by_ref(referent)
+            .expect("Invariant: WeakDom had a Ref that wasn't inside it");
+        ordered.push(referent);
+        for child in inst.children() {
+            queue.push_back(*child)
+        }
+    }
+
+    ordered
+}
diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
new file mode 100644
index 000000000..7d6f2ecdf
--- /dev/null
+++ b/src/syncback/property_filter.rs
@@ -0,0 +1,107 @@
+use std::collections::{HashMap, HashSet};
+
+use rbx_dom_weak::{types::Variant, Instance};
+use rbx_reflection::Scriptability;
+
+use crate::{snapshot::InstanceWithMeta, variant_eq::variant_eq};
+
+use super::SyncbackRules;
+
+pub fn filter_properties(
+    data: Option<&SyncbackRules>,
+    new_inst: &Instance,
+    old_inst: Option<InstanceWithMeta>,
+) -> HashMap<String, Variant> {
+    let sync_unscriptable = data.and_then(|s| s.sync_unscriptable).unwrap_or_default();
+    let mut properties: HashMap<String, Variant> =
+        HashMap::with_capacity(new_inst.properties.capacity());
+
+    let filter = get_property_filter(data, new_inst);
+    let class_data = rbx_reflection_database::get()
+        .classes
+        .get(new_inst.class.as_str());
+
+    let predicate = |prop_name: &String, prop_value: &Variant| {
+        if matches!(prop_value, Variant::Ref(_) | Variant::SharedString(_)) {
+            return true;
+        }
+        if let Some(list) = &filter {
+            if list.contains(prop_name) {
+                return true;
+            }
+        }
+        if !sync_unscriptable {
+            if let Some(data) = class_data {
+                if let Some(prop_data) = data.properties.get(prop_name.as_str()) {
+                    if matches!(prop_data.scriptability, Scriptability::None) {
+                        return true;
+                    }
+                }
+            }
+        }
+        false
+    };
+
+    if let Some(old_inst) = old_inst {
+        for (name, value) in &new_inst.properties {
+            if predicate(name, value) {
+                continue;
+            }
+            if old_inst.properties().contains_key(name) {
+                properties.insert(name.clone(), value.clone());
+            }
+        }
+    }
+    if let Some(class_data) = class_data {
+        let defaults = &class_data.default_properties;
+        for (name, value) in &new_inst.properties {
+            if predicate(name, value) {
+                continue;
+            }
+            if let Some(default) = defaults.get(name.as_str()) {
+                if !variant_eq(value, default) {
+                    properties.insert(name.clone(), value.clone());
+                }
+            } else {
+                properties.insert(name.clone(), value.clone());
+            }
+        }
+    } else {
+        for (name, value) in &new_inst.properties {
+            if predicate(name, value) {
+                continue;
+            }
+            properties.insert(name.clone(), value.clone());
+        }
+    }
+
+    properties
+}
+
+/// Returns a set of properties that should not be written with syncback if
+/// one exists.
+fn get_property_filter<'rules>(
+    rules: Option<&'rules SyncbackRules>,
+    new_inst: &Instance,
+) -> Option<HashSet<&'rules String>> {
+    let filter = &rules?.ignore_properties;
+    let mut set = HashSet::new();
+
+    let database = rbx_reflection_database::get();
+    let mut current_class_name = new_inst.class.as_str();
+
+    loop {
+        if let Some(list) = filter.get(current_class_name) {
+            set.extend(list)
+        }
+
+        let class = database.classes.get(current_class_name)?;
+        if let Some(super_class) = class.superclass.as_ref() {
+            current_class_name = &super_class;
+        } else {
+            break;
+        }
+    }
+
+    Some(set)
+}

From 1a6e354a1c3b505f9795ccd9c04f5c471c4587e9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 12:14:59 -0800
Subject: [PATCH 167/366] Revert "Hash rbxm and rbxmx files again post-property
 filtering"

This reverts commit a922190fa604fbc2389711019f4abc5c3553e1d6.
---
 src/snapshot_middleware/rbxm.rs  | 33 ++++++++------------------------
 src/snapshot_middleware/rbxmx.rs | 32 ++++++++-----------------------
 src/syncback/snapshot.rs         |  6 ------
 3 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index c7b0a9921..5c1d1c125 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -9,7 +9,7 @@ use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{hash_tree, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 #[profiling::function]
@@ -56,21 +56,6 @@ pub fn syncback_rbxm<'new, 'old>(
     // script. That's a future endeavor though.
 
     let (dom, referent) = clone_and_filter(snapshot);
-    if let Some(old_ref) = snapshot.old {
-        log::trace!("Comparing two rbxmx trees to avoid extra writes");
-        let new_hashes = hash_tree(&dom, referent);
-        let old_hashes = hash_tree(snapshot.old_tree(), old_ref);
-
-        if new_hashes.get(&referent) == old_hashes.get(&old_ref) {
-            return Ok(SyncbackReturn {
-                inst_snapshot: InstanceSnapshot::from_instance(dom.get_by_ref(referent).unwrap()),
-                fs_snapshot: FsSnapshot::new(),
-                children: Vec::new(),
-                removed_children: Vec::new(),
-            });
-        }
-    }
-
     let mut serialized = Vec::new();
     rbx_binary::to_writer(&mut serialized, &dom, &[referent])
         .context("failed to serialize new rbxm")?;
@@ -102,15 +87,13 @@ fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
             .new_tree()
             .get_by_ref(referent)
             .expect("all Instances should be in the new subtree");
-        let builder = InstanceBuilder::new(&inst.class)
-            .with_properties(
-                snapshot
-                    .get_filtered_properties(referent, None)
-                    .unwrap()
-                    .into_iter()
-                    .map(|(k, v)| (k.to_string(), v.clone())),
-            )
-            .with_name(&inst.name);
+        let builder = InstanceBuilder::new(&inst.class).with_properties(
+            snapshot
+                .get_filtered_properties(referent, None)
+                .unwrap()
+                .into_iter()
+                .map(|(k, v)| (k.to_string(), v.clone())),
+        );
         let parent = old_to_parent
             .get(&referent)
             .expect("children should come after parents");
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 4c1bc1d40..1857b6813 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -9,7 +9,7 @@ use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
-    syncback::{hash_tree, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 pub fn snapshot_rbxmx(
@@ -58,20 +58,6 @@ pub fn syncback_rbxmx<'new, 'old>(
     // script. That's a future endeavor though.
 
     let (dom, referent) = clone_and_filter(snapshot);
-    if let Some(old_ref) = snapshot.old {
-        log::trace!("Comparing two rbxmx trees to avoid extra writes");
-        let new_hashes = hash_tree(&dom, referent);
-        let old_hashes = hash_tree(snapshot.old_tree(), old_ref);
-
-        if new_hashes.get(&referent) == old_hashes.get(&old_ref) {
-            return Ok(SyncbackReturn {
-                inst_snapshot: InstanceSnapshot::from_instance(dom.get_by_ref(referent).unwrap()),
-                fs_snapshot: FsSnapshot::new(),
-                children: Vec::new(),
-                removed_children: Vec::new(),
-            });
-        }
-    }
     let mut serialized = Vec::new();
     rbx_xml::to_writer_default(&mut serialized, &dom, &[referent])
         .context("failed to serialize new rbxmx")?;
@@ -103,15 +89,13 @@ fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
             .new_tree()
             .get_by_ref(referent)
             .expect("all Instances should be in the new subtree");
-        let builder = InstanceBuilder::new(&inst.class)
-            .with_properties(
-                snapshot
-                    .get_filtered_properties(referent, None)
-                    .unwrap()
-                    .into_iter()
-                    .map(|(k, v)| (k.to_string(), v.clone())),
-            )
-            .with_name(&inst.name);
+        let builder = InstanceBuilder::new(&inst.class).with_properties(
+            snapshot
+                .get_filtered_properties(referent, None)
+                .unwrap()
+                .into_iter()
+                .map(|(k, v)| (k.to_string(), v.clone())),
+        );
         let parent = old_to_parent
             .get(&referent)
             .expect("children should come after parents");
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 7bd4bb8a4..11ab761bd 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -234,12 +234,6 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         self.data.new_tree
     }
 
-    /// Returns the WeakDom used for the 'old' tree.
-    #[inline]
-    pub fn old_tree(&self) -> &'old WeakDom {
-        self.data.old_tree.inner()
-    }
-
     /// Returns user-specified property ignore rules.
     #[inline]
     pub fn ignore_props(&self) -> Option<&HashMap<String, Vec<String>>> {

From 355b36f90cb171c2a304109cc27a0bb3c575d2f5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 12:34:33 -0800
Subject: [PATCH 168/366] Revert "Make rbxm and rbxmx filter properties"

This reverts commit 43b4ddda66bc06dd44eb957303315e0cb025dd9b.
---
 src/snapshot_middleware/rbxm.rs  | 50 ++------------------------------
 src/snapshot_middleware/rbxmx.rs | 50 ++------------------------------
 2 files changed, 6 insertions(+), 94 deletions(-)

diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 5c1d1c125..4cbda433b 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -1,11 +1,7 @@
-use std::{
-    collections::{HashMap, VecDeque},
-    path::Path,
-};
+use std::path::Path;
 
 use anyhow::Context;
 use memofs::Vfs;
-use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
@@ -52,12 +48,11 @@ pub fn syncback_rbxm<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
+
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
-
-    let (dom, referent) = clone_and_filter(snapshot);
     let mut serialized = Vec::new();
-    rbx_binary::to_writer(&mut serialized, &dom, &[referent])
+    rbx_binary::to_writer(&mut serialized, snapshot.new_tree(), &[inst.referent()])
         .context("failed to serialize new rbxm")?;
 
     Ok(SyncbackReturn {
@@ -68,45 +63,6 @@ pub fn syncback_rbxm<'new, 'old>(
     })
 }
 
-fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
-    // We want to: filter an Instance's properties, insert it into a new DOM,
-    // then do the same for its children. The challenge is matching parents up.
-
-    let mut new_dom = WeakDom::new(InstanceBuilder::empty());
-    // A map of old referents to their parent referent in the new DOM.
-    let mut old_to_parent = HashMap::new();
-    old_to_parent.insert(snapshot.new, new_dom.root_ref());
-
-    let mut queue = VecDeque::new();
-    queue.push_back(snapshot.new);
-
-    // Note that this is back-in, front-out. This is important because
-    // VecDeque::extend is the equivalent to using push_back.
-    while let Some(referent) = queue.pop_front() {
-        let inst = snapshot
-            .new_tree()
-            .get_by_ref(referent)
-            .expect("all Instances should be in the new subtree");
-        let builder = InstanceBuilder::new(&inst.class).with_properties(
-            snapshot
-                .get_filtered_properties(referent, None)
-                .unwrap()
-                .into_iter()
-                .map(|(k, v)| (k.to_string(), v.clone())),
-        );
-        let parent = old_to_parent
-            .get(&referent)
-            .expect("children should come after parents");
-        let new = new_dom.insert(*parent, builder);
-
-        old_to_parent.extend(inst.children().iter().copied().map(|r| (r, new)));
-        queue.extend(inst.children());
-    }
-
-    let new_ref = new_dom.root().children()[0];
-    (new_dom, new_ref)
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 1857b6813..feb9198fe 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -1,11 +1,7 @@
-use std::{
-    collections::{HashMap, VecDeque},
-    path::Path,
-};
+use std::path::Path;
 
 use anyhow::Context;
 use memofs::Vfs;
-use rbx_dom_weak::{types::Ref, InstanceBuilder, WeakDom};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
@@ -54,12 +50,11 @@ pub fn syncback_rbxmx<'new, 'old>(
 ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
     let inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
+
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
-
-    let (dom, referent) = clone_and_filter(snapshot);
     let mut serialized = Vec::new();
-    rbx_xml::to_writer_default(&mut serialized, &dom, &[referent])
+    rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()])
         .context("failed to serialize new rbxmx")?;
 
     Ok(SyncbackReturn {
@@ -70,45 +65,6 @@ pub fn syncback_rbxmx<'new, 'old>(
     })
 }
 
-fn clone_and_filter(snapshot: &SyncbackSnapshot) -> (WeakDom, Ref) {
-    // We want to: filter an Instance's properties, insert it into a new DOM,
-    // then do the same for its children. The challenge is matching parents up.
-
-    let mut new_dom = WeakDom::new(InstanceBuilder::empty());
-    // A map of old referents to their parent referent in the new DOM.
-    let mut old_to_parent = HashMap::new();
-    old_to_parent.insert(snapshot.new, new_dom.root_ref());
-
-    let mut queue = VecDeque::new();
-    queue.push_back(snapshot.new);
-
-    // Note that this is back-in, front-out. This is important because
-    // VecDeque::extend is the equivalent to using push_back.
-    while let Some(referent) = queue.pop_front() {
-        let inst = snapshot
-            .new_tree()
-            .get_by_ref(referent)
-            .expect("all Instances should be in the new subtree");
-        let builder = InstanceBuilder::new(&inst.class).with_properties(
-            snapshot
-                .get_filtered_properties(referent, None)
-                .unwrap()
-                .into_iter()
-                .map(|(k, v)| (k.to_string(), v.clone())),
-        );
-        let parent = old_to_parent
-            .get(&referent)
-            .expect("children should come after parents");
-        let new = new_dom.insert(*parent, builder);
-
-        old_to_parent.extend(inst.children().iter().copied().map(|r| (r, new)));
-        queue.extend(inst.children());
-    }
-
-    let new_ref = new_dom.root().children()[0];
-    (new_dom, new_ref)
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

From a43efbf38d8ae21cc42d0ebe38c3177560475b87 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 13:02:13 -0800
Subject: [PATCH 169/366] Revert "Remove hash_tree_no_descendants"

This reverts commit 4c5bdc57bdf7fc0bc0bbf4cdc0233c222984fb4c.
---
 src/syncback/hash/mod.rs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/syncback/hash/mod.rs b/src/syncback/hash/mod.rs
index b68064031..77c34e0d7 100644
--- a/src/syncback/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -14,12 +14,36 @@ use crate::variant_eq::variant_eq;
 
 use super::descendants;
 
+/// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
+/// `Instance` it points to, including the properties but not including the
+/// descendants of the Instance.
+///
+/// The hashes **do not** include the descendants of the Instances in them,
+/// so they should only be used for comparing Instances directly. To compare a
+/// subtree, use `hash_tree`.
+pub fn hash_tree_no_descendants(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
+    let mut map: HashMap<Ref, Hash> = HashMap::new();
+    let mut order = descendants(dom, root_ref);
+
+    let mut prop_list = Vec::with_capacity(2);
+
+    while let Some(referent) = order.pop() {
+        let inst = dom.get_by_ref(referent).unwrap();
+        let hash = hash_inst_no_descendants(inst, &mut prop_list);
+
+        map.insert(referent, hash.finalize());
+    }
+
+    map
+}
+
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
 /// `Instance` it points to, including the properties and descendants of the
 /// `Instance`.
 ///
-/// The hashes include the descendants of the Instances in them, so they should
-/// only be used for comparing subtrees directly.
+/// The hashes **do** include the descendants of the Instances in them,
+/// so they should only be used for comparing subtrees directly. To compare an
+/// `Instance` directly, use `hash_tree_no_descendants`.
 pub fn hash_tree(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
     let mut map: HashMap<Ref, Hash> = HashMap::new();
     let mut order = descendants(dom, root_ref);

From e4b530c58064b52f2e8138fe39052866819c36a6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 13:03:55 -0800
Subject: [PATCH 170/366] Remove redundant filtering of properties

---
 src/snapshot_middleware/csv.rs        |  6 ++-
 src/snapshot_middleware/json_model.rs | 22 ++++-----
 src/snapshot_middleware/lua.rs        |  6 ++-
 src/snapshot_middleware/meta_file.rs  | 70 +++++++++++----------------
 src/snapshot_middleware/txt.rs        |  3 +-
 5 files changed, 47 insertions(+), 60 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 88b8620c7..862fdc781 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -110,7 +110,8 @@ pub fn syncback_csv<'new, 'old>(
         anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
     };
 
-    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let mut meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    meta.properties.remove("Contents");
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, localization_to_csv(contents)?);
@@ -146,7 +147,8 @@ pub fn syncback_csv_init<'new, 'old>(
     };
 
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
-    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    meta.properties.remove("Contents");
 
     let mut fs_snapshot = std::mem::take(&mut dir_syncback.fs_snapshot);
     fs_snapshot.add_file(&path, localization_to_csv(contents)?);
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 6d626aa3a..acf648f8b 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -93,25 +93,21 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
 
     let mut properties = BTreeMap::new();
     let mut attributes = BTreeMap::new();
-    for (name, value) in snapshot.get_filtered_properties(new, old).unwrap() {
-        if let Variant::Ref(_) = value {
-            // We do not currently support Ref properties
-            continue;
+    for (name, value) in &new_inst.properties {
+        if let Variant::Attributes(attrs) = value {
+            for (attr_name, attr_value) in attrs.iter() {
+                attributes.insert(
+                    attr_name.clone(),
+                    UnresolvedValue::FullyQualified(attr_value.clone()),
+                );
+            }
         } else {
             properties.insert(
-                name.to_string(),
+                name.clone(),
                 UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
             );
         }
     }
-    if let Some(Variant::Attributes(attrs)) = new_inst.properties.get("Attributes") {
-        for (attr_name, attr_value) in attrs.iter() {
-            attributes.insert(
-                attr_name.clone(),
-                UnresolvedValue::FullyQualified(attr_value.clone()),
-            );
-        }
-    }
 
     let mut children = Vec::with_capacity(new_inst.children().len());
 
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 195443e16..8d9152c00 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -136,7 +136,8 @@ pub fn syncback_lua<'new, 'old>(
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
 
-    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let mut meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    meta.properties.remove("Source");
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, contents);
@@ -178,7 +179,8 @@ pub fn syncback_lua_init<'new, 'old>(
 
     let dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
 
-    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    meta.properties.remove("Source");
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, contents);
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 1ac4f84f4..02c328719 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -58,29 +58,18 @@ impl AdjacentMetadata {
         let mut properties = BTreeMap::new();
         let mut attributes = BTreeMap::new();
 
-        let ignore_unknown_instances = if let Some(old_inst) = snapshot.old_inst() {
-            if old_inst.metadata().ignore_unknown_instances {
-                Some(true)
-            } else {
-                None
-            }
-        } else {
-            None
-        };
+        let ignore_unknown_instances = snapshot
+            .old_inst()
+            .map(|inst| inst.metadata().ignore_unknown_instances)
+            .unwrap_or_default();
 
         let class = &snapshot.new_inst().class;
-        for (name, value) in snapshot.new_filtered_properties() {
-            properties.insert(
-                name.to_owned(),
-                UnresolvedValue::from_variant(value.clone(), class, name),
-            );
-        }
-        if let Some(value) = snapshot.new_inst().properties.get("Attributes") {
+        for (name, value) in &snapshot.new_inst().properties {
             if let Variant::Attributes(attrs) = value {
                 for (name, value) in attrs.iter() {
                     let value = if let Variant::BinaryString(bstr) = value {
                         match std::str::from_utf8(bstr.as_ref()) {
-                            Ok(str) => Variant::String(str.to_owned()),
+                            Ok(str) => Variant::String(str.to_string()),
                             Err(_) => value.clone(),
                         }
                     } else {
@@ -89,15 +78,19 @@ impl AdjacentMetadata {
                     attributes.insert(name.to_owned(), UnresolvedValue::FullyQualified(value));
                 }
             } else {
-                anyhow::bail!(
-                    "expected Attributes to be of type Attributes but it was {:?}",
-                    value.ty()
+                properties.insert(
+                    name.clone(),
+                    UnresolvedValue::from_variant(value.clone(), class, name),
                 );
             }
         }
 
         Ok(Self {
-            ignore_unknown_instances,
+            ignore_unknown_instances: if ignore_unknown_instances {
+                Some(true)
+            } else {
+                None
+            },
             properties,
             attributes,
             path,
@@ -226,29 +219,18 @@ impl DirectoryMetadata {
         let mut properties = BTreeMap::new();
         let mut attributes = BTreeMap::new();
 
-        let ignore_unknown_instances = if let Some(old_inst) = snapshot.old_inst() {
-            if old_inst.metadata().ignore_unknown_instances {
-                Some(true)
-            } else {
-                None
-            }
-        } else {
-            None
-        };
+        let ignore_unknown_instances = snapshot
+            .old_inst()
+            .map(|inst| inst.metadata().ignore_unknown_instances)
+            .unwrap_or_default();
 
         let class = &snapshot.new_inst().class;
-        for (name, value) in snapshot.new_filtered_properties() {
-            properties.insert(
-                name.to_owned(),
-                UnresolvedValue::from_variant(value.clone(), class, name),
-            );
-        }
-        if let Some(value) = snapshot.new_inst().properties.get("Attributes") {
+        for (name, value) in &snapshot.new_inst().properties {
             if let Variant::Attributes(attrs) = value {
                 for (name, value) in attrs.iter() {
                     let value = if let Variant::BinaryString(bstr) = value {
                         match std::str::from_utf8(bstr.as_ref()) {
-                            Ok(str) => Variant::String(str.to_owned()),
+                            Ok(str) => Variant::String(str.to_string()),
                             Err(_) => value.clone(),
                         }
                     } else {
@@ -257,15 +239,19 @@ impl DirectoryMetadata {
                     attributes.insert(name.to_owned(), UnresolvedValue::FullyQualified(value));
                 }
             } else {
-                anyhow::bail!(
-                    "expected Attributes to be of type Attributes but it was {:?}",
-                    value.ty()
+                properties.insert(
+                    name.clone(),
+                    UnresolvedValue::from_variant(value.clone(), class, name),
                 );
             }
         }
 
         Ok(Self {
-            ignore_unknown_instances,
+            ignore_unknown_instances: if ignore_unknown_instances {
+                Some(true)
+            } else {
+                None
+            },
             properties,
             attributes,
             class_name: None,
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index d37782b8b..5d0b5104f 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -61,7 +61,8 @@ pub fn syncback_txt<'new, 'old>(
         anyhow::bail!("StringValues must have a `Value` property that is a String");
     };
 
-    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let mut meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    meta.properties.remove("Value");
 
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_file(path, contents);

From 03330cfc4e3d71340dcef8e0de6a616343522b2f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 15:35:32 -0800
Subject: [PATCH 171/366] Store ref map in Syncback Data

---
 src/snapshot_middleware/dir.rs     | 47 +++++++++++-------------------
 src/snapshot_middleware/project.rs |  4 +--
 src/syncback/mod.rs                |  2 ++
 src/syncback/snapshot.rs           | 12 ++++++--
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 8da1061ae..9235ee655 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,7 +1,4 @@
-use std::{
-    collections::{HashMap, HashSet},
-    path::Path,
-};
+use std::{collections::HashSet, path::Path};
 
 use anyhow::Context;
 use memofs::{DirEntry, IoResultExt, Vfs};
@@ -154,36 +151,26 @@ pub fn syncback_dir_no_meta<'new, 'old>(
         }
     }
 
-    if let Some(old_inst) = snapshot.old_inst() {
-        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
-        for child in old_inst.children() {
-            let inst = snapshot.get_old_instance(*child).unwrap();
-            old_child_map.insert(inst.name(), inst);
+    let mut visited_children = HashSet::new();
+    for child_ref in new_inst.children() {
+        let new_child = snapshot.get_new_instance(*child_ref).unwrap();
+        if let Some(old_ref) = snapshot.old_ref_match(*child_ref) {
+            // This child exists in both DOMs. Pass it on.
+            children.push(snapshot.with_parent(new_child.name.clone(), *child_ref, Some(old_ref)));
+            visited_children.insert(old_ref);
+        } else {
+            children.push(snapshot.with_parent(new_child.name.clone(), *child_ref, None));
         }
-
-        for new_child_ref in new_inst.children() {
-            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
-            if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
-                // This child exists in both doms. Pass it on.
-                children.push(snapshot.with_parent(
-                    new_child.name.clone(),
-                    *new_child_ref,
-                    Some(old_child.id()),
-                ));
-            } else {
-                // The child only exists in the the new dom
-                children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
+    }
+    if let Some(old_inst) = snapshot.old_inst() {
+        for child_ref in old_inst.children() {
+            if !visited_children.contains(child_ref) {
+                // This child was removed
+                removed_children.push(snapshot.get_old_instance(*child_ref).unwrap());
             }
         }
-        // Any children that are in the old dom but not the new one are removed.
-        removed_children.extend(old_child_map.into_values());
-    } else {
-        // There is no old instance. Just add every child.
-        for new_child_ref in new_inst.children() {
-            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
-            children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
-        }
     }
+
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_dir(&path);
 
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 643ea91e3..f418b85c5 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -413,7 +413,7 @@ pub fn syncback_project<'new, 'old>(
             if let Some(old_inst) = old_child_map.get(new_name.as_str()) {
                 // This new instance represents an older one!
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data,
+                    data: snapshot.data.clone(),
                     old: Some(old_inst.id()),
                     new: new_child.referent(),
                     parent_path,
@@ -423,7 +423,7 @@ pub fn syncback_project<'new, 'old>(
             } else {
                 // This new instance is... new.
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data,
+                    data: snapshot.data.clone(),
                     old: None,
                     new: new_child.referent(),
                     parent_path,
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 15930d528..c8068ed24 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -14,6 +14,7 @@ use rbx_dom_weak::{
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{HashMap, HashSet, VecDeque},
+    rc::Rc,
     sync::OnceLock,
 };
 
@@ -85,6 +86,7 @@ pub fn syncback_loop<'old>(
         old_tree,
         new_tree: &new_tree,
         syncback_rules: project.syncback_rules.as_ref(),
+        ref_map: Rc::new(ref_map),
     };
 
     let mut snapshots = vec![SyncbackSnapshot {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 11ab761bd..8a43119d7 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -3,6 +3,7 @@ use rbx_reflection::Scriptability;
 use std::{
     collections::{BTreeSet, HashMap},
     path::{Path, PathBuf},
+    rc::Rc,
     sync::OnceLock,
 };
 
@@ -21,12 +22,13 @@ use super::SyncbackRules;
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
-#[derive(Clone, Copy)]
+#[derive(Clone)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
     pub(super) new_tree: &'new WeakDom,
     pub(super) syncback_rules: Option<&'old SyncbackRules>,
+    pub(super) ref_map: Rc<HashMap<Ref, Ref>>,
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
@@ -43,7 +45,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     #[inline]
     pub fn with_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
-            data: self.data,
+            data: self.data.clone(),
             old: old_ref,
             new: new_ref,
             parent_path: self.parent_path.join(&self.name),
@@ -222,6 +224,12 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             .expect("SyncbackSnapshot should not contain invalid referents")
     }
 
+    /// Returns the old tree equivalent to the provided Ref, if one exists.
+    #[inline]
+    pub fn old_ref_match(&self, referent: Ref) -> Option<Ref> {
+        self.data.ref_map.get(&referent).copied()
+    }
+
     /// Returns the underlying VFS being used for syncback.
     #[inline]
     pub fn vfs(&self) -> &'old Vfs {

From 0c4057ffd800290d7b16813709b0bb6d384bf756 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 9 Feb 2024 15:35:57 -0800
Subject: [PATCH 172/366] Use simplified filtering logic for projects

---
 src/snapshot_middleware/project.rs | 24 +++++++++++++++---------
 src/syncback/mod.rs                |  2 +-
 src/syncback/snapshot.rs           |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index f418b85c5..654305d8f 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -12,7 +12,7 @@ use crate::{
         InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource, PathIgnoreRule,
         SyncRule,
     },
-    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{filter_out_property, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
     RojoRef,
 };
 
@@ -361,14 +361,20 @@ pub fn syncback_project<'new, 'old>(
 
         let properties = &mut node.properties;
 
-        let filtered_properties = snapshot
-            .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
-            .expect("all project nodes should exist in both trees when in queue");
-        for (name, value) in filtered_properties {
-            properties.insert(
-                name.to_owned(),
-                UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
-            );
+        for (name, value) in &new_inst.properties {
+            if node.path.is_some() {
+                if !filter_out_property(new_inst, name) {
+                    properties.insert(
+                        name.to_owned(),
+                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                    );
+                }
+            } else {
+                properties.insert(
+                    name.to_owned(),
+                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                );
+            }
         }
         for (child_name, child_node) in &mut node.children {
             if let Some(path_node) = &child_node.path {
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c8068ed24..4573b0298 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -30,7 +30,7 @@ pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
 pub use property_filter::filter_properties;
 pub use ref_properties::link_referents;
-pub use snapshot::{SyncbackData, SyncbackSnapshot};
+pub use snapshot::{filter_out_property, SyncbackData, SyncbackSnapshot};
 
 pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 8a43119d7..985e05eee 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -277,7 +277,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     }
 }
 
-fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
+pub fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
     // We don't need SourceAssetId.
     if prop_name == "Tags" || prop_name == "Attributes" || prop_name == "SourceAssetId" {
         return true;

From 7a57b3cbb701ccb7bbe5a0d25951944a66c6373c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 15 Feb 2024 14:30:41 -0800
Subject: [PATCH 173/366] Link referents before filtering properties

---
 src/syncback/mod.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 4573b0298..7da4c1a2d 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -40,6 +40,10 @@ pub fn syncback_loop<'old>(
 ) -> anyhow::Result<FsSnapshot> {
     log::debug!("Mapping doms together");
     let ref_map = match_descendants(old_tree.inner(), &new_tree);
+
+    log::debug!("Linking referents for new DOM...");
+    link_referents(&mut new_tree)?;
+
     log::debug!("Pre-filtering properties on new DOM");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
         let new_inst = new_tree.get_by_ref(referent).unwrap();
@@ -76,9 +80,6 @@ pub fn syncback_loop<'old>(
         }
     }
 
-    log::debug!("Linking referents for new DOM...");
-    link_referents(&mut new_tree)?;
-
     let project_path = project.folder_location();
 
     let syncback_data = SyncbackData {

From 84a96ec1e350b50f708bfc13685033bf504a1851 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 15 Feb 2024 14:39:33 -0800
Subject: [PATCH 174/366] Use a proper deferred system for linking referents in
 syncback

---
 src/syncback/mod.rs            |  9 ++--
 src/syncback/ref_properties.rs | 87 ++++++++++++++++++++--------------
 2 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 7da4c1a2d..c89544692 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -29,7 +29,7 @@ pub use file_names::{name_for_inst, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
 pub use property_filter::filter_properties;
-pub use ref_properties::link_referents;
+pub use ref_properties::collect_referents;
 pub use snapshot::{filter_out_property, SyncbackData, SyncbackSnapshot};
 
 pub fn syncback_loop<'old>(
@@ -41,8 +41,8 @@ pub fn syncback_loop<'old>(
     log::debug!("Mapping doms together");
     let ref_map = match_descendants(old_tree.inner(), &new_tree);
 
-    log::debug!("Linking referents for new DOM...");
-    link_referents(&mut new_tree)?;
+    log::debug!("Collecting referents for new DOM...");
+    let deferred_referents = collect_referents(&new_tree)?;
 
     log::debug!("Pre-filtering properties on new DOM");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
@@ -61,6 +61,9 @@ pub fn syncback_loop<'old>(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(&new_tree, new_tree.root_ref());
 
+    log::debug!("Linking referents for new DOM");
+    deferred_referents.link(&mut new_tree)?;
+
     if let Some(syncback_rules) = &project.syncback_rules {
         // I think this is a neat way to handle `sync_current_camera` being
         // Option<bool>!
diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 83cce435a..b658995ff 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -4,7 +4,7 @@
 use std::collections::VecDeque;
 
 use rbx_dom_weak::{
-    types::{Attributes, Variant},
+    types::{Attributes, Ref, Variant},
     Instance, WeakDom,
 };
 
@@ -12,8 +12,15 @@ use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PRE
 
 use super::get_inst_path;
 
-/// Iterates through a WeakDom and links referent properties using attributes.
-pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
+pub struct RefRewrites {
+    links: MultiMap<Ref, (String, Ref)>,
+}
+
+/// Iterates through a WeakDom and collects referent properties.
+///
+/// They can be linked to a dom later using the `link` method on the returned
+/// struct.
+pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<RefRewrites> {
     let mut links = MultiMap::new();
     let mut queue = VecDeque::new();
 
@@ -37,48 +44,56 @@ pub fn link_referents(dom: &mut WeakDom) -> anyhow::Result<()> {
             }
         }
     }
-    let mut rewrites = Vec::new();
 
-    for (pointer_ref, ref_properties) in links {
-        for (prop_name, target_ref) in ref_properties {
-            log::debug!(
-                "Linking {}.{prop_name} to {} ({pointer_ref} to {target_ref})",
-                dom.get_by_ref(pointer_ref).unwrap().name,
-                dom.get_by_ref(target_ref).unwrap().name,
-            );
-            let target_inst = dom
-                .get_by_ref_mut(target_ref)
-                .expect("Ref properties that aren't in DOM should be filtered");
+    Ok(RefRewrites { links })
+}
 
-            let attributes = get_or_insert_attributes(target_inst)?;
-            if attributes.get(REF_ID_ATTRIBUTE_NAME).is_none() {
-                attributes.insert(
-                    REF_ID_ATTRIBUTE_NAME.to_owned(),
-                    Variant::String(target_ref.to_string()),
+impl RefRewrites {
+    /// Links referents for the provided DOM, using the links stored in this
+    /// struct.
+    pub fn link(self, dom: &mut WeakDom) -> anyhow::Result<()> {
+        let mut rewrites = Vec::new();
+        for (pointer_ref, ref_properties) in self.links {
+            for (prop_name, target_ref) in ref_properties {
+                log::debug!(
+                    "Linking {}.{prop_name} to {} ({pointer_ref} to {target_ref})",
+                    dom.get_by_ref(pointer_ref).unwrap().name,
+                    dom.get_by_ref(target_ref).unwrap().name,
                 );
+                let target_inst = dom
+                    .get_by_ref_mut(target_ref)
+                    .expect("Ref properties that aren't in DOM should be filtered");
+
+                let attributes = get_or_insert_attributes(target_inst)?;
+                if attributes.get(REF_ID_ATTRIBUTE_NAME).is_none() {
+                    attributes.insert(
+                        REF_ID_ATTRIBUTE_NAME.to_owned(),
+                        Variant::String(target_ref.to_string()),
+                    );
+                }
+
+                let target_id = attributes
+                    .get(REF_ID_ATTRIBUTE_NAME)
+                    .expect("every Instance to have an ID");
+                if let Variant::String(value) = target_id {
+                    rewrites.push((prop_name, value.clone().into_bytes()));
+                } else if let Variant::BinaryString(value) = target_id {
+                    rewrites.push((prop_name, value.clone().into_vec()))
+                }
             }
 
-            let target_id = attributes
-                .get(REF_ID_ATTRIBUTE_NAME)
-                .expect("every Instance to have an ID");
-            if let Variant::String(value) = target_id {
-                rewrites.push((prop_name, value.clone().into_bytes()));
-            } else if let Variant::BinaryString(value) = target_id {
-                rewrites.push((prop_name, value.clone().into_vec()))
+            let inst = dom.get_by_ref_mut(pointer_ref).unwrap();
+            let attrs = get_or_insert_attributes(inst)?;
+            for (name, id) in rewrites.drain(..) {
+                attrs.insert(
+                    format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
+                    String::from_utf8(id).unwrap().into(),
+                );
             }
         }
 
-        let inst = dom.get_by_ref_mut(pointer_ref).unwrap();
-        let attrs = get_or_insert_attributes(inst)?;
-        for (name, id) in rewrites.drain(..) {
-            attrs.insert(
-                format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
-                String::from_utf8(id).unwrap().into(),
-            );
-        }
+        Ok(())
     }
-
-    Ok(())
 }
 
 fn get_or_insert_attributes(inst: &mut Instance) -> anyhow::Result<&mut Attributes> {

From 9a25db65c8037f88ff7df1bd8e42dc9390653d38 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Feb 2024 10:42:49 -0800
Subject: [PATCH 175/366] Make ref properties use trace

---
 src/syncback/ref_properties.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index b658995ff..45de78bc9 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -35,7 +35,7 @@ pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<RefRewrites> {
             if let Variant::Ref(prop_value) = value {
                 if dom.get_by_ref(*prop_value).is_some() {
                     log::trace!(
-                        "{}.{name} -> {}",
+                        "Ref property: {}.{name} -> {}",
                         get_inst_path(dom, referent),
                         get_inst_path(dom, *prop_value)
                     );
@@ -55,7 +55,7 @@ impl RefRewrites {
         let mut rewrites = Vec::new();
         for (pointer_ref, ref_properties) in self.links {
             for (prop_name, target_ref) in ref_properties {
-                log::debug!(
+                log::trace!(
                     "Linking {}.{prop_name} to {} ({pointer_ref} to {target_ref})",
                     dom.get_by_ref(pointer_ref).unwrap().name,
                     dom.get_by_ref(target_ref).unwrap().name,

From 1ddac9b29f434655f76f15703923a1daee3843ac Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Feb 2024 10:57:30 -0800
Subject: [PATCH 176/366] Filter the properties of the old dom too

---
 src/cli/syncback.rs |  4 ++--
 src/syncback/mod.rs | 27 ++++++++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index d3f7ee1d2..6bcde4f5b 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -69,7 +69,7 @@ impl SyncbackCommand {
             project_start.elapsed().as_secs_f32()
         );
 
-        let dom_old = session_old.tree();
+        let mut dom_old = session_old.tree();
 
         log::debug!("Old root: {}", dom_old.inner().root().class);
         log::debug!("New root: {}", dom_new.root().class);
@@ -78,7 +78,7 @@ impl SyncbackCommand {
         log::info!("Beginning syncback...");
         let snapshot = syncback_loop(
             session_old.vfs(),
-            &dom_old,
+            &mut dom_old,
             dom_new,
             session_old.root_project(),
         )?;
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c89544692..16f41e218 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -34,26 +34,35 @@ pub use snapshot::{filter_out_property, SyncbackData, SyncbackSnapshot};
 
 pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
-    old_tree: &'old RojoTree,
+    old_tree: &'old mut RojoTree,
     mut new_tree: WeakDom,
     project: &'old Project,
 ) -> anyhow::Result<FsSnapshot> {
     log::debug!("Mapping doms together");
     let ref_map = match_descendants(old_tree.inner(), &new_tree);
-
     log::debug!("Collecting referents for new DOM...");
     let deferred_referents = collect_referents(&new_tree)?;
 
-    log::debug!("Pre-filtering properties on new DOM");
+    log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
-        let new_inst = new_tree.get_by_ref(referent).unwrap();
-
-        let matching_old = ref_map
+        let new_inst = new_tree.get_by_ref_mut(referent).unwrap();
+        let old_inst = ref_map
             .get(&referent)
             .and_then(|r| old_tree.get_instance(*r));
-        let prop_list = filter_properties(project.syncback_rules.as_ref(), new_inst, matching_old);
-
-        new_tree.get_by_ref_mut(referent).unwrap().properties = prop_list;
+        let filtered_props = filter_properties(project.syncback_rules.as_ref(), new_inst, old_inst);
+
+        if old_inst.is_some() {
+            // This can never be None.
+            let mut old_inst = old_tree
+                .get_instance_mut(*ref_map.get(&referent).unwrap())
+                .unwrap();
+            let old_properties = std::mem::take(old_inst.properties_mut())
+                .into_iter()
+                .filter(|(name, _)| filtered_props.contains_key(name))
+                .collect();
+            *old_inst.properties_mut() = old_properties;
+        }
+        new_inst.properties = filtered_props;
     }
 
     log::debug!("Hashing project DOM");

From f28a81b1e66088a5e5a3811d0b32a2a22933c555 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Feb 2024 11:03:25 -0800
Subject: [PATCH 177/366] Emit rbxmx if `ROJO_SYNCBACK_DEBUG` is set to `1` in
 env

---
 src/syncback/mod.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 16f41e218..2f38d6ef1 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -14,6 +14,7 @@ use rbx_dom_weak::{
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{HashMap, HashSet, VecDeque},
+    env,
     rc::Rc,
     sync::OnceLock,
 };
@@ -32,6 +33,8 @@ pub use property_filter::filter_properties;
 pub use ref_properties::collect_referents;
 pub use snapshot::{filter_out_property, SyncbackData, SyncbackSnapshot};
 
+const DEBUG_MODEL_FORMAT_VAR: &str = "ROJO_SYNCBACK_DEBUG";
+
 pub fn syncback_loop<'old>(
     vfs: &'old Vfs,
     old_tree: &'old mut RojoTree,
@@ -253,7 +256,10 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
                 Middleware::CsvDir
             }
         }
-        _ => Middleware::Rbxm,
+        _ => match env::var(DEBUG_MODEL_FORMAT_VAR) {
+            Ok(value) if value == "1" => Middleware::Rbxmx,
+            _ => Middleware::Rbxm,
+        },
     }
 }
 

From 28e213a6484dc2c912222dc58d4c35d91a635e38 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Feb 2024 11:10:12 -0800
Subject: [PATCH 178/366] Just use the file handle in syncback command

---
 src/cli/syncback.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 6bcde4f5b..f4fe01198 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -7,6 +7,7 @@ use std::{
 
 use anyhow::Context;
 use clap::Parser;
+use fs_err::File;
 use memofs::Vfs;
 use rbx_dom_weak::{InstanceBuilder, WeakDom};
 use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
@@ -126,12 +127,12 @@ impl SyncbackCommand {
 }
 
 fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
-    let content = fs_err::read(path)?;
+    let content = File::open(path)?;
     Ok(match file_kind {
-        FileKind::Rbxl => rbx_binary::from_reader(content.as_slice())?,
-        FileKind::Rbxlx => rbx_xml::from_reader(content.as_slice(), xml_decode_config())?,
+        FileKind::Rbxl => rbx_binary::from_reader(content)?,
+        FileKind::Rbxlx => rbx_xml::from_reader(content, xml_decode_config())?,
         FileKind::Rbxm => {
-            let temp_tree = rbx_binary::from_reader(content.as_slice())?;
+            let temp_tree = rbx_binary::from_reader(content)?;
             let root_children = temp_tree.root().children();
             if root_children.len() != 1 {
                 anyhow::bail!(
@@ -146,7 +147,7 @@ fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
             new_tree
         }
         FileKind::Rbxmx => {
-            let temp_tree = rbx_xml::from_reader(content.as_slice(), xml_decode_config())?;
+            let temp_tree = rbx_xml::from_reader(content, xml_decode_config())?;
             let root_children = temp_tree.root().children();
             if root_children.len() != 1 {
                 anyhow::bail!(

From 53ed6d77ac09bd360649244639a0fed6e4a92dc8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Feb 2024 11:16:32 -0800
Subject: [PATCH 179/366] Don't use file watcher for syncback

---
 src/cli/syncback.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index f4fe01198..c42996b4b 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -62,9 +62,12 @@ impl SyncbackCommand {
             dom_start.elapsed().as_secs_f32()
         );
 
+        let vfs = Vfs::new_default();
+        vfs.set_watch_enabled(false);
+
         let project_start = Instant::now();
         log::info!("Opening project at {}", path_old.display());
-        let session_old = ServeSession::new(Vfs::new_default(), path_old.clone())?;
+        let session_old = ServeSession::new(vfs, path_old.clone())?;
         log::info!(
             "Finished opening project in {:0.02}s",
             project_start.elapsed().as_secs_f32()

From bf5d0c9f5bdb79e74a6305a4145d21ed3ec98bd3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Feb 2024 14:36:42 -0800
Subject: [PATCH 180/366] Redo referent linking

---
 src/syncback/ref_properties.rs | 44 ++++++++++++++++------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 45de78bc9..2eb5b5cec 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -52,42 +52,40 @@ impl RefRewrites {
     /// Links referents for the provided DOM, using the links stored in this
     /// struct.
     pub fn link(self, dom: &mut WeakDom) -> anyhow::Result<()> {
-        let mut rewrites = Vec::new();
+        let mut id_prop_list = Vec::new();
+
         for (pointer_ref, ref_properties) in self.links {
             for (prop_name, target_ref) in ref_properties {
-                log::trace!(
-                    "Linking {}.{prop_name} to {} ({pointer_ref} to {target_ref})",
-                    dom.get_by_ref(pointer_ref).unwrap().name,
-                    dom.get_by_ref(target_ref).unwrap().name,
-                );
                 let target_inst = dom
                     .get_by_ref_mut(target_ref)
-                    .expect("Ref properties that aren't in DOM should be filtered");
-
-                let attributes = get_or_insert_attributes(target_inst)?;
-                if attributes.get(REF_ID_ATTRIBUTE_NAME).is_none() {
-                    attributes.insert(
+                    .expect("Ref properties that aren't in the DOM should be filtered out");
+                let target_attrs = get_or_insert_attributes(target_inst)?;
+                if target_attrs.get(REF_ID_ATTRIBUTE_NAME).is_none() {
+                    target_attrs.insert(
                         REF_ID_ATTRIBUTE_NAME.to_owned(),
                         Variant::String(target_ref.to_string()),
                     );
                 }
 
-                let target_id = attributes
-                    .get(REF_ID_ATTRIBUTE_NAME)
-                    .expect("every Instance to have an ID");
-                if let Variant::String(value) = target_id {
-                    rewrites.push((prop_name, value.clone().into_bytes()));
-                } else if let Variant::BinaryString(value) = target_id {
-                    rewrites.push((prop_name, value.clone().into_vec()))
+                match target_attrs.get(REF_ID_ATTRIBUTE_NAME) {
+                    Some(Variant::String(id)) => id_prop_list.push((prop_name, id.clone())),
+                    Some(Variant::BinaryString(id)) => match std::str::from_utf8(id.as_ref()) {
+                        Ok(str) => id_prop_list.push((prop_name, str.to_string())),
+                        Err(_) => anyhow::bail!("expected attribute {REF_ID_ATTRIBUTE_NAME} to be a UTF-8 string")
+                    },
+                    Some(value) => anyhow::bail!("expected attribute {REF_ID_ATTRIBUTE_NAME} to be a string but it was a {:?}", value.ty()),
+                    None => unreachable!("{} should always be inserted as an attribute if it's missing", REF_ID_ATTRIBUTE_NAME),
                 }
             }
 
-            let inst = dom.get_by_ref_mut(pointer_ref).unwrap();
-            let attrs = get_or_insert_attributes(inst)?;
-            for (name, id) in rewrites.drain(..) {
-                attrs.insert(
+            let pointer_inst = dom
+                .get_by_ref_mut(pointer_ref)
+                .expect("invalid referents shouldn't be in the DOM");
+            let pointer_attrs = get_or_insert_attributes(pointer_inst)?;
+            for (name, id) in id_prop_list.drain(..) {
+                pointer_attrs.insert(
                     format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
-                    String::from_utf8(id).unwrap().into(),
+                    Variant::BinaryString(id.into_bytes().into()),
                 );
             }
         }

From 5052abe497dbf22c0723d376c8765e27235fb2a0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 11:15:38 -0800
Subject: [PATCH 181/366] Revert "Store ref map in Syncback Data"

This reverts commit 03330cfc4e3d71340dcef8e0de6a616343522b2f.
---
 src/snapshot_middleware/dir.rs     | 47 +++++++++++++++++++-----------
 src/snapshot_middleware/project.rs |  4 +--
 src/syncback/mod.rs                |  2 --
 src/syncback/snapshot.rs           | 12 ++------
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 9235ee655..8da1061ae 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -1,4 +1,7 @@
-use std::{collections::HashSet, path::Path};
+use std::{
+    collections::{HashMap, HashSet},
+    path::Path,
+};
 
 use anyhow::Context;
 use memofs::{DirEntry, IoResultExt, Vfs};
@@ -151,26 +154,36 @@ pub fn syncback_dir_no_meta<'new, 'old>(
         }
     }
 
-    let mut visited_children = HashSet::new();
-    for child_ref in new_inst.children() {
-        let new_child = snapshot.get_new_instance(*child_ref).unwrap();
-        if let Some(old_ref) = snapshot.old_ref_match(*child_ref) {
-            // This child exists in both DOMs. Pass it on.
-            children.push(snapshot.with_parent(new_child.name.clone(), *child_ref, Some(old_ref)));
-            visited_children.insert(old_ref);
-        } else {
-            children.push(snapshot.with_parent(new_child.name.clone(), *child_ref, None));
-        }
-    }
     if let Some(old_inst) = snapshot.old_inst() {
-        for child_ref in old_inst.children() {
-            if !visited_children.contains(child_ref) {
-                // This child was removed
-                removed_children.push(snapshot.get_old_instance(*child_ref).unwrap());
+        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
+        for child in old_inst.children() {
+            let inst = snapshot.get_old_instance(*child).unwrap();
+            old_child_map.insert(inst.name(), inst);
+        }
+
+        for new_child_ref in new_inst.children() {
+            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
+            if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
+                // This child exists in both doms. Pass it on.
+                children.push(snapshot.with_parent(
+                    new_child.name.clone(),
+                    *new_child_ref,
+                    Some(old_child.id()),
+                ));
+            } else {
+                // The child only exists in the the new dom
+                children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
             }
         }
+        // Any children that are in the old dom but not the new one are removed.
+        removed_children.extend(old_child_map.into_values());
+    } else {
+        // There is no old instance. Just add every child.
+        for new_child_ref in new_inst.children() {
+            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
+            children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
+        }
     }
-
     let mut fs_snapshot = FsSnapshot::new();
     fs_snapshot.add_dir(&path);
 
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 654305d8f..d4b5d5c24 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -419,7 +419,7 @@ pub fn syncback_project<'new, 'old>(
             if let Some(old_inst) = old_child_map.get(new_name.as_str()) {
                 // This new instance represents an older one!
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data.clone(),
+                    data: snapshot.data,
                     old: Some(old_inst.id()),
                     new: new_child.referent(),
                     parent_path,
@@ -429,7 +429,7 @@ pub fn syncback_project<'new, 'old>(
             } else {
                 // This new instance is... new.
                 children.push(SyncbackSnapshot {
-                    data: snapshot.data.clone(),
+                    data: snapshot.data,
                     old: None,
                     new: new_child.referent(),
                     parent_path,
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 2f38d6ef1..ac80b2677 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -15,7 +15,6 @@ use serde::{Deserialize, Serialize};
 use std::{
     collections::{HashMap, HashSet, VecDeque},
     env,
-    rc::Rc,
     sync::OnceLock,
 };
 
@@ -102,7 +101,6 @@ pub fn syncback_loop<'old>(
         old_tree,
         new_tree: &new_tree,
         syncback_rules: project.syncback_rules.as_ref(),
-        ref_map: Rc::new(ref_map),
     };
 
     let mut snapshots = vec![SyncbackSnapshot {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 985e05eee..967653e26 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -3,7 +3,6 @@ use rbx_reflection::Scriptability;
 use std::{
     collections::{BTreeSet, HashMap},
     path::{Path, PathBuf},
-    rc::Rc,
     sync::OnceLock,
 };
 
@@ -22,13 +21,12 @@ use super::SyncbackRules;
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub struct SyncbackData<'new, 'old> {
     pub(super) vfs: &'old Vfs,
     pub(super) old_tree: &'old RojoTree,
     pub(super) new_tree: &'new WeakDom,
     pub(super) syncback_rules: Option<&'old SyncbackRules>,
-    pub(super) ref_map: Rc<HashMap<Ref, Ref>>,
 }
 
 pub struct SyncbackSnapshot<'new, 'old> {
@@ -45,7 +43,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     #[inline]
     pub fn with_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
-            data: self.data.clone(),
+            data: self.data,
             old: old_ref,
             new: new_ref,
             parent_path: self.parent_path.join(&self.name),
@@ -224,12 +222,6 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
             .expect("SyncbackSnapshot should not contain invalid referents")
     }
 
-    /// Returns the old tree equivalent to the provided Ref, if one exists.
-    #[inline]
-    pub fn old_ref_match(&self, referent: Ref) -> Option<Ref> {
-        self.data.ref_map.get(&referent).copied()
-    }
-
     /// Returns the underlying VFS being used for syncback.
     #[inline]
     pub fn vfs(&self) -> &'old Vfs {

From e3fc97fd9ae363b103a2b0cf9ade339c7da3f47b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 11:33:32 -0800
Subject: [PATCH 182/366] Fix regression caused by matching entire dom by name

---
 src/snapshot/tree.rs            | 12 +++++++
 src/syncback/mod.rs             | 55 ++++-----------------------------
 src/syncback/property_filter.rs | 23 ++++----------
 3 files changed, 24 insertions(+), 66 deletions(-)

diff --git a/src/snapshot/tree.rs b/src/snapshot/tree.rs
index 14c6593ec..bcfc56bbd 100644
--- a/src/snapshot/tree.rs
+++ b/src/snapshot/tree.rs
@@ -284,6 +284,10 @@ impl<'a> InstanceWithMeta<'a> {
     pub fn metadata(&self) -> &'a InstanceMetadata {
         self.metadata
     }
+
+    pub fn inner(&self) -> &Instance {
+        self.instance
+    }
 }
 
 /// RojoTree's equivalent of `&'a mut Instance`.
@@ -333,4 +337,12 @@ impl InstanceWithMetaMut<'_> {
     pub fn metadata(&self) -> &InstanceMetadata {
         self.metadata
     }
+
+    pub fn inner(&self) -> &Instance {
+        self.instance
+    }
+
+    pub fn inner_mut(&mut self) -> &mut Instance {
+        self.instance
+    }
 }
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index ac80b2677..bce8b16a9 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -40,31 +40,18 @@ pub fn syncback_loop<'old>(
     mut new_tree: WeakDom,
     project: &'old Project,
 ) -> anyhow::Result<FsSnapshot> {
-    log::debug!("Mapping doms together");
-    let ref_map = match_descendants(old_tree.inner(), &new_tree);
     log::debug!("Collecting referents for new DOM...");
     let deferred_referents = collect_referents(&new_tree)?;
 
     log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
         let new_inst = new_tree.get_by_ref_mut(referent).unwrap();
-        let old_inst = ref_map
-            .get(&referent)
-            .and_then(|r| old_tree.get_instance(*r));
-        let filtered_props = filter_properties(project.syncback_rules.as_ref(), new_inst, old_inst);
-
-        if old_inst.is_some() {
-            // This can never be None.
-            let mut old_inst = old_tree
-                .get_instance_mut(*ref_map.get(&referent).unwrap())
-                .unwrap();
-            let old_properties = std::mem::take(old_inst.properties_mut())
-                .into_iter()
-                .filter(|(name, _)| filtered_props.contains_key(name))
-                .collect();
-            *old_inst.properties_mut() = old_properties;
-        }
-        new_inst.properties = filtered_props;
+        new_inst.properties = filter_properties(project.syncback_rules.as_ref(), new_inst);
+    }
+    for referent in descendants(old_tree.inner(), old_tree.get_root_id()) {
+        let mut old_inst_rojo = old_tree.get_instance_mut(referent).unwrap();
+        let old_inst = old_inst_rojo.inner_mut();
+        old_inst.properties = filter_properties(project.syncback_rules.as_ref(), old_inst);
     }
 
     log::debug!("Hashing project DOM");
@@ -295,36 +282,6 @@ fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
     path.into_iter().collect::<Vec<&str>>().join("/")
 }
 
-fn match_descendants(old_dom: &WeakDom, new_dom: &WeakDom) -> HashMap<Ref, Ref> {
-    let mut map = HashMap::new();
-    let mut queue = VecDeque::new();
-    queue.push_back((new_dom.root_ref(), old_dom.root_ref()));
-
-    let mut old_child_map = HashMap::new();
-    while let Some((new_ref, old_ref)) = queue.pop_front() {
-        let old_inst = old_dom.get_by_ref(old_ref).unwrap();
-        for child in old_inst.children() {
-            let inst = old_dom.get_by_ref(*child).unwrap();
-            old_child_map.insert(&inst.name, inst);
-        }
-
-        let inst = new_dom.get_by_ref(new_ref).unwrap();
-        for child_ref in inst.children() {
-            let new_child = new_dom.get_by_ref(*child_ref).unwrap();
-            if let Some(old_child) = old_child_map.get(&new_child.name) {
-                if old_child.class == new_child.class {
-                    queue.push_back((new_child.referent(), old_child.referent()));
-                }
-            }
-        }
-
-        old_child_map.clear();
-        map.insert(new_ref, old_ref);
-    }
-
-    map
-}
-
 /// Produces a list of descendants in the WeakDom such that all children come
 /// before their parents.
 fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index 7d6f2ecdf..311a471b9 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -9,17 +9,16 @@ use super::SyncbackRules;
 
 pub fn filter_properties(
     data: Option<&SyncbackRules>,
-    new_inst: &Instance,
-    old_inst: Option<InstanceWithMeta>,
+    inst: &Instance,
 ) -> HashMap<String, Variant> {
     let sync_unscriptable = data.and_then(|s| s.sync_unscriptable).unwrap_or_default();
     let mut properties: HashMap<String, Variant> =
-        HashMap::with_capacity(new_inst.properties.capacity());
+        HashMap::with_capacity(inst.properties.capacity());
 
-    let filter = get_property_filter(data, new_inst);
+    let filter = get_property_filter(data, inst);
     let class_data = rbx_reflection_database::get()
         .classes
-        .get(new_inst.class.as_str());
+        .get(inst.class.as_str());
 
     let predicate = |prop_name: &String, prop_value: &Variant| {
         if matches!(prop_value, Variant::Ref(_) | Variant::SharedString(_)) {
@@ -42,19 +41,9 @@ pub fn filter_properties(
         false
     };
 
-    if let Some(old_inst) = old_inst {
-        for (name, value) in &new_inst.properties {
-            if predicate(name, value) {
-                continue;
-            }
-            if old_inst.properties().contains_key(name) {
-                properties.insert(name.clone(), value.clone());
-            }
-        }
-    }
     if let Some(class_data) = class_data {
         let defaults = &class_data.default_properties;
-        for (name, value) in &new_inst.properties {
+        for (name, value) in &inst.properties {
             if predicate(name, value) {
                 continue;
             }
@@ -67,7 +56,7 @@ pub fn filter_properties(
             }
         }
     } else {
-        for (name, value) in &new_inst.properties {
+        for (name, value) in &inst.properties {
             if predicate(name, value) {
                 continue;
             }

From b6199a427e667f1d3650d6e0cb6fbfd3bb9d34e0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 11:35:11 -0800
Subject: [PATCH 183/366] Remove import in property_filter

---
 src/syncback/property_filter.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index 311a471b9..e65763346 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use rbx_dom_weak::{types::Variant, Instance};
 use rbx_reflection::Scriptability;
 
-use crate::{snapshot::InstanceWithMeta, variant_eq::variant_eq};
+use crate::variant_eq::variant_eq;
 
 use super::SyncbackRules;
 

From 0e13a49594285cc3b68d460694ddcd1bc0363e31 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 11:48:47 -0800
Subject: [PATCH 184/366] Reduce lifetime usage to only one

---
 src/snapshot_middleware/csv.rs        | 12 +++++-----
 src/snapshot_middleware/dir.rs        | 12 +++++-----
 src/snapshot_middleware/json_model.rs |  6 ++---
 src/snapshot_middleware/lua.rs        | 12 +++++-----
 src/snapshot_middleware/mod.rs        |  6 ++---
 src/snapshot_middleware/project.rs    |  6 ++---
 src/snapshot_middleware/rbxm.rs       |  6 ++---
 src/snapshot_middleware/rbxmx.rs      |  6 ++---
 src/snapshot_middleware/txt.rs        |  6 ++---
 src/syncback/mod.rs                   | 14 ++++++------
 src/syncback/snapshot.rs              | 32 +++++++++++++--------------
 11 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 862fdc781..180b11c55 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -97,10 +97,10 @@ pub fn snapshot_csv_init(
     Ok(Some(init_snapshot))
 }
 
-pub fn syncback_csv<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_csv<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
 
@@ -132,10 +132,10 @@ pub fn syncback_csv<'new, 'old>(
     })
 }
 
-pub fn syncback_csv_init<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_csv_init<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     dir_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
 
     let path = snapshot.parent_path.join(dir_name).join("init.csv");
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 8da1061ae..a4d9bbe53 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -95,10 +95,10 @@ pub fn snapshot_dir_no_meta(
     Ok(Some(snapshot))
 }
 
-pub fn syncback_dir<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_dir<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     dir_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let path = snapshot.parent_path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
@@ -124,10 +124,10 @@ pub fn syncback_dir<'new, 'old>(
     Ok(dir_syncback)
 }
 
-pub fn syncback_dir_no_meta<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_dir_no_meta<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     dir_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let path = snapshot.parent_path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index acf648f8b..3917807c1 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -64,10 +64,10 @@ pub fn snapshot_json_model(
     Ok(Some(snapshot))
 }
 
-pub fn syncback_json_model<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_json_model<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let path = snapshot.parent_path.join(file_name);
 
     let mut model = json_model_from_pair(snapshot, snapshot.new, snapshot.old);
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 8d9152c00..e2c050f1a 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -123,10 +123,10 @@ pub fn snapshot_lua_init(
     Ok(Some(init_snapshot))
 }
 
-pub fn syncback_lua<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_lua<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
 
@@ -159,11 +159,11 @@ pub fn syncback_lua<'new, 'old>(
     })
 }
 
-pub fn syncback_lua_init<'new, 'old>(
+pub fn syncback_lua_init<'sync>(
     script_type: ScriptType,
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+    snapshot: &SyncbackSnapshot<'sync>,
     dir_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(dir_name).join(match script_type {
         ScriptType::Server => "init.server.lua",
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index d4133e719..0b1c80a8c 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -239,11 +239,11 @@ impl Middleware {
 
     /// Runs the syncback mechanism for the provided middleware given a
     /// SyncbackSnapshot.
-    pub fn syncback<'new, 'old>(
+    pub fn syncback<'sync>(
         &self,
-        snapshot: &SyncbackSnapshot<'new, 'old>,
+        snapshot: &SyncbackSnapshot<'sync>,
         file_name: &str,
-    ) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+    ) -> anyhow::Result<SyncbackReturn<'sync>> {
         // We don't care about the names of projects
         if !matches!(self, Middleware::Project) {
             validate_file_name(&snapshot.name).with_context(|| {
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index d4b5d5c24..dcab97d58 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -301,9 +301,9 @@ pub fn snapshot_project_node(
     }))
 }
 
-pub fn syncback_project<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+pub fn syncback_project<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let old_inst = snapshot
         .old_inst()
         .expect("projects should always exist in both trees");
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 4cbda433b..0975caf40 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -42,10 +42,10 @@ pub fn snapshot_rbxm(
     }
 }
 
-pub fn syncback_rbxm<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_rbxm<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
 
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index feb9198fe..66bddb748 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -44,10 +44,10 @@ pub fn snapshot_rbxmx(
     }
 }
 
-pub fn syncback_rbxmx<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_rbxmx<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
 
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 5d0b5104f..0d0d25204 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -48,10 +48,10 @@ pub fn snapshot_txt(
     Ok(Some(snapshot))
 }
 
-pub fn syncback_txt<'new, 'old>(
-    snapshot: &SyncbackSnapshot<'new, 'old>,
+pub fn syncback_txt<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
-) -> anyhow::Result<SyncbackReturn<'new, 'old>> {
+) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
     let path = snapshot.parent_path.join(file_name);
 
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index bce8b16a9..ae4d19f31 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -34,11 +34,11 @@ pub use snapshot::{filter_out_property, SyncbackData, SyncbackSnapshot};
 
 const DEBUG_MODEL_FORMAT_VAR: &str = "ROJO_SYNCBACK_DEBUG";
 
-pub fn syncback_loop<'old>(
-    vfs: &'old Vfs,
-    old_tree: &'old mut RojoTree,
+pub fn syncback_loop(
+    vfs: &Vfs,
+    old_tree: &mut RojoTree,
     mut new_tree: WeakDom,
-    project: &'old Project,
+    project: &Project,
 ) -> anyhow::Result<FsSnapshot> {
     log::debug!("Collecting referents for new DOM...");
     let deferred_referents = collect_referents(&new_tree)?;
@@ -175,11 +175,11 @@ pub fn syncback_loop<'old>(
     Ok(fs_snapshot)
 }
 
-pub struct SyncbackReturn<'new, 'old> {
+pub struct SyncbackReturn<'sync> {
     pub inst_snapshot: InstanceSnapshot,
     pub fs_snapshot: FsSnapshot,
-    pub children: Vec<SyncbackSnapshot<'new, 'old>>,
-    pub removed_children: Vec<InstanceWithMeta<'old>>,
+    pub children: Vec<SyncbackSnapshot<'sync>>,
+    pub removed_children: Vec<InstanceWithMeta<'sync>>,
 }
 
 pub fn get_best_middleware(inst: &Instance) -> Middleware {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 967653e26..aa8ffa1f8 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -22,22 +22,22 @@ use super::SyncbackRules;
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
 #[derive(Clone, Copy)]
-pub struct SyncbackData<'new, 'old> {
-    pub(super) vfs: &'old Vfs,
-    pub(super) old_tree: &'old RojoTree,
-    pub(super) new_tree: &'new WeakDom,
-    pub(super) syncback_rules: Option<&'old SyncbackRules>,
+pub struct SyncbackData<'sync> {
+    pub(super) vfs: &'sync Vfs,
+    pub(super) old_tree: &'sync RojoTree,
+    pub(super) new_tree: &'sync WeakDom,
+    pub(super) syncback_rules: Option<&'sync SyncbackRules>,
 }
 
-pub struct SyncbackSnapshot<'new, 'old> {
-    pub data: SyncbackData<'new, 'old>,
+pub struct SyncbackSnapshot<'sync> {
+    pub data: SyncbackData<'sync>,
     pub old: Option<Ref>,
     pub new: Ref,
     pub parent_path: PathBuf,
     pub name: String,
 }
 
-impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
+impl<'sync> SyncbackSnapshot<'sync> {
     /// Constructs a SyncbackSnapshot from the provided refs
     /// while inheriting the parent's trees and path
     #[inline]
@@ -58,7 +58,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// `ignore_props` field, it does not do any other filtering and doesn't
     /// clone any data. This is left to the consumer.
     #[inline]
-    pub fn new_filtered_properties(&self) -> HashMap<&'new str, &'new Variant> {
+    pub fn new_filtered_properties(&self) -> HashMap<&'sync str, &'sync Variant> {
         self.get_filtered_properties(self.new, self.old).unwrap()
     }
 
@@ -72,7 +72,7 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
         &self,
         new_ref: Ref,
         old_ref: Option<Ref>,
-    ) -> Option<HashMap<&'new str, &'new Variant>> {
+    ) -> Option<HashMap<&'sync str, &'sync Variant>> {
         let inst = self.get_new_instance(new_ref)?;
         let mut properties: HashMap<&str, &Variant> =
             HashMap::with_capacity(inst.properties.capacity());
@@ -195,27 +195,27 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]
-    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'old>> {
+    pub fn get_old_instance(&self, referent: Ref) -> Option<InstanceWithMeta<'sync>> {
         self.data.old_tree.get_instance(referent)
     }
 
     /// Returns an Instance from the new tree with the provided referent, if it
     /// exists.
     #[inline]
-    pub fn get_new_instance(&self, referent: Ref) -> Option<&'new Instance> {
+    pub fn get_new_instance(&self, referent: Ref) -> Option<&'sync Instance> {
         self.data.new_tree.get_by_ref(referent)
     }
 
     /// The 'old' Instance this snapshot is for, if it exists.
     #[inline]
-    pub fn old_inst(&self) -> Option<InstanceWithMeta<'old>> {
+    pub fn old_inst(&self) -> Option<InstanceWithMeta<'sync>> {
         self.old
             .and_then(|old| self.data.old_tree.get_instance(old))
     }
 
     /// The 'new' Instance this snapshot is for.
     #[inline]
-    pub fn new_inst(&self) -> &'new Instance {
+    pub fn new_inst(&self) -> &'sync Instance {
         self.data
             .new_tree
             .get_by_ref(self.new)
@@ -224,13 +224,13 @@ impl<'new, 'old> SyncbackSnapshot<'new, 'old> {
 
     /// Returns the underlying VFS being used for syncback.
     #[inline]
-    pub fn vfs(&self) -> &'old Vfs {
+    pub fn vfs(&self) -> &'sync Vfs {
         self.data.vfs
     }
 
     /// Returns the WeakDom used for the 'new' tree.
     #[inline]
-    pub fn new_tree(&self) -> &'new WeakDom {
+    pub fn new_tree(&self) -> &'sync WeakDom {
         self.data.new_tree
     }
 

From 48ee54fa8731108fcd67c06fe94c73914435ddda Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 12:52:44 -0800
Subject: [PATCH 185/366] Add fallback to rbxm when directories fail to
 syncback

---
 src/snapshot_middleware/mod.rs | 13 +++++++++
 src/syncback/mod.rs            | 49 +++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 0b1c80a8c..7492ecd87 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -281,6 +281,19 @@ impl Middleware {
             Middleware::CsvDir => syncback_csv_init(snapshot, file_name),
         }
     }
+
+    /// Returns whether this particular middleware would become a directory.
+    #[inline]
+    pub fn is_dir(&self) -> bool {
+        matches!(
+            self,
+            Middleware::Dir
+                | Middleware::ServerScriptDir
+                | Middleware::ClientScriptDir
+                | Middleware::ModuleScriptDir
+                | Middleware::CsvDir
+        )
+    }
 }
 
 /// A helper for easily defining a SyncRule. Arguments are passed literally
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index ae4d19f31..09433aff9 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -126,14 +126,6 @@ pub fn syncback_loop(
             continue;
         }
 
-        let appended_name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
-        let working_path = snapshot.parent_path.join(appended_name.as_ref());
-
-        if !snapshot.is_valid_path(project_path, &working_path) {
-            log::debug!("Skipping {inst_path} because its path matches ignore pattern");
-            continue;
-        }
-
         if let Some(syncback_rules) = &project.syncback_rules {
             // Ignore trees;
             for ignored in &syncback_rules.ignore_trees {
@@ -144,9 +136,37 @@ pub fn syncback_loop(
             }
         }
 
-        let syncback = middleware
-            .syncback(&snapshot, &appended_name)
-            .with_context(|| format!("Failed to syncback {inst_path}"))?;
+        let appended_name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
+        let working_path = snapshot.parent_path.join(appended_name.as_ref());
+
+        if !snapshot.is_valid_path(project_path, &working_path) {
+            log::debug!("Skipping {inst_path} because its path matches ignore pattern");
+            continue;
+        }
+
+        let mut syncback_res = middleware.syncback(&snapshot, &appended_name);
+        if syncback_res.is_err() && middleware.is_dir() {
+            let new_middleware = Middleware::Rbxm;
+            let appended_name =
+                name_for_inst(new_middleware, snapshot.new_inst(), snapshot.old_inst())?;
+            let working_path = snapshot.parent_path.join(appended_name.as_ref());
+
+            if !snapshot.is_valid_path(project_path, &working_path) {
+                log::warn!(
+                    "Skipping {inst_path} because it could not be syncbacked as a directory \
+                    and the new path matches an ignore pattern."
+                );
+                log::debug!("New path: {}", working_path.display());
+                continue;
+            }
+            log::warn!(
+                "Failed to syncback {inst_path} as a directory, it will \
+                instead be synced back as {}",
+                working_path.file_name().and_then(|s| s.to_str()).unwrap()
+            );
+            syncback_res = new_middleware.syncback(&snapshot, &appended_name);
+        }
+        let syncback = syncback_res.with_context(|| format!("Failed to syncback {inst_path}"))?;
 
         if !syncback.removed_children.is_empty() {
             log::debug!(
@@ -197,11 +217,10 @@ pub fn get_best_middleware(inst: &Instance) -> Middleware {
     if json_model_classes.contains(inst.class.as_str()) {
         if inst.children().is_empty() {
             return Middleware::JsonModel;
-        } else {
-            // This begs the question of an init.model.json but we'll leave
-            // that for another day.
-            return Middleware::Dir;
         }
+        // This begs the question of an init.model.json but we'll leave
+        // that for another day.
+        return Middleware::Dir;
     }
 
     match inst.class.as_str() {

From e8ee6ad1475b2985848d17ad1a94c4a7006d2262 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 20 Feb 2024 12:53:57 -0800
Subject: [PATCH 186/366] Use environment variable for fallback debugging

---
 src/syncback/mod.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 09433aff9..386427f0d 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -146,7 +146,10 @@ pub fn syncback_loop(
 
         let mut syncback_res = middleware.syncback(&snapshot, &appended_name);
         if syncback_res.is_err() && middleware.is_dir() {
-            let new_middleware = Middleware::Rbxm;
+            let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
+                Ok(value) if value == "1" => Middleware::Rbxmx,
+                _ => Middleware::Rbxm,
+            };
             let appended_name =
                 name_for_inst(new_middleware, snapshot.new_inst(), snapshot.old_inst())?;
             let working_path = snapshot.parent_path.join(appended_name.as_ref());

From a6ce3e0ab82ea5b8569027c8e32788d42e8c64b6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 27 Feb 2024 12:19:49 -0800
Subject: [PATCH 187/366] Add `PathNode::is_optional`

---
 src/project.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/project.rs b/src/project.rs
index 35d78426f..802e3961c 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -210,12 +210,21 @@ pub enum PathNode {
 }
 
 impl PathNode {
+    /// Returns the path of the `PathNode`, without regard for if it's optional
+    // or not.
+    #[inline]
     pub fn path(&self) -> &Path {
         match self {
             PathNode::Required(pathbuf) => pathbuf,
             PathNode::Optional(OptionalPathNode { optional }) => optional,
         }
     }
+
+    /// Returns whether this `PathNode` is optional or not.
+    #[inline]
+    pub fn is_optional(&self) -> bool {
+        matches!(self, PathNode::Optional(_))
+    }
 }
 
 /// Describes an instance and its descendants in a project.

From 041532e9f82098e391077fb1b4243a8599fa8afc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 11:03:50 -0800
Subject: [PATCH 188/366] Add function to Middleware for getting a middleware,
 file_name from path

---
 src/snapshot_middleware/mod.rs | 59 +++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 7492ecd87..b67b8ce58 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -72,8 +72,8 @@ pub fn snapshot_from_vfs(
         let (middleware, dir_name, init_path) = get_dir_middleware(vfs, path)?;
         // TODO: Support user defined init paths
         match middleware {
-            Middleware::Dir => middleware.snapshot(context, vfs, path, &dir_name),
-            _ => middleware.snapshot(context, vfs, &init_path, &dir_name),
+            Middleware::Dir => middleware.snapshot(context, vfs, path, dir_name),
+            _ => middleware.snapshot(context, vfs, &init_path, dir_name),
         }
     } else {
         let file_name = path
@@ -98,17 +98,15 @@ pub fn snapshot_from_vfs(
 ///
 /// Returns the middleware, the name of the directory, and the path to
 /// the init location.
-fn get_dir_middleware<P: AsRef<Path>>(
+fn get_dir_middleware<'path>(
     vfs: &Vfs,
-    dir: P,
-) -> anyhow::Result<(Middleware, String, PathBuf)> {
-    let path = dir.as_ref();
-    let dir_name = path
+    dir_path: &'path Path,
+) -> anyhow::Result<(Middleware, &'path str, PathBuf)> {
+    let dir_name = dir_path
         .file_name()
         .expect("Could not extract directory name")
         .to_str()
-        .ok_or_else(|| anyhow::anyhow!("File name was not valid UTF-8: {}", path.display()))?
-        .to_string();
+        .ok_or_else(|| anyhow::anyhow!("File name was not valid UTF-8: {}", dir_path.display()))?;
 
     static INIT_PATHS: OnceLock<Vec<(Middleware, &str)>> = OnceLock::new();
     let order = INIT_PATHS.get_or_init(|| {
@@ -125,13 +123,13 @@ fn get_dir_middleware<P: AsRef<Path>>(
     });
 
     for (middleware, name) in order {
-        let test_path = path.join(name);
+        let test_path = dir_path.join(name);
         if vfs.metadata(&test_path).with_not_found()?.is_some() {
             return Ok((*middleware, dir_name, test_path));
         }
     }
 
-    Ok((Middleware::Dir, dir_name, path.to_path_buf()))
+    Ok((Middleware::Dir, dir_name, dir_path.to_path_buf()))
 }
 
 /// Gets a snapshot for a path given an InstanceContext and Vfs, taking
@@ -294,6 +292,45 @@ impl Middleware {
                 | Middleware::CsvDir
         )
     }
+
+    /// Attempts to return a middleware for a given path, along with the name of
+    /// the file or directory that should be passed to either
+    /// [`Middleware::syncback`] or [`Middleware::snapshot`] and the path of
+    /// said file.
+    #[inline]
+    pub fn middleware_and_path<'path>(
+        vfs: &Vfs,
+        sync_rules: &[SyncRule],
+        path: &'path Path,
+    ) -> anyhow::Result<Option<(Self, &'path str, PathBuf)>> {
+        let meta = match vfs.metadata(path).with_not_found()? {
+            Some(meta) => meta,
+            None => return Ok(None),
+        };
+        if meta.is_dir() {
+            get_dir_middleware(vfs, path).map(Some)
+        } else {
+            for rule in sync_rules {
+                if rule.matches(path) {
+                    return Ok(Some((
+                        rule.middleware,
+                        rule.file_name_for_path(path)?,
+                        path.to_path_buf(),
+                    )));
+                }
+            }
+            for rule in default_sync_rules() {
+                if rule.matches(path) {
+                    return Ok(Some((
+                        rule.middleware,
+                        rule.file_name_for_path(path)?,
+                        path.to_path_buf(),
+                    )));
+                }
+            }
+            Ok(None)
+        }
+    }
 }
 
 /// A helper for easily defining a SyncRule. Arguments are passed literally

From 92f94bd04c8372dcf979560888c2176eacb33d1b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 11:04:39 -0800
Subject: [PATCH 189/366] Perform initial rewrite of project middleware

---
 src/snapshot_middleware/project.rs | 296 +++++++++++++++++++----------
 src/syncback/mod.rs                |   2 +-
 2 files changed, 196 insertions(+), 102 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index dcab97d58..de5710b4e 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -1,4 +1,8 @@
-use std::{borrow::Cow, collections::HashMap, path::Path};
+use std::{
+    borrow::Cow,
+    collections::{HashMap, VecDeque},
+    path::Path,
+};
 
 use anyhow::{bail, Context};
 use memofs::Vfs;
@@ -12,6 +16,7 @@ use crate::{
         InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource, PathIgnoreRule,
         SyncRule,
     },
+    snapshot_middleware::Middleware,
     syncback::{filter_out_property, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
     RojoRef,
 };
@@ -308,146 +313,235 @@ pub fn syncback_project<'sync>(
         .old_inst()
         .expect("projects should always exist in both trees");
     // Project roots have to come from somewhere!
-    let path = old_inst
-        .metadata()
-        .instigating_source
-        .as_ref()
-        .unwrap()
-        .path();
-
+    let path = &snapshot.parent_path;
+    log::debug!("Processing project {}", path.display());
     let base_path = path.parent().expect("project did not have a parent");
-
     let vfs = snapshot.vfs();
 
+    log::trace!("Reloading project from vfs");
     let mut project = Project::load_from_slice(&vfs.read(path)?, path)?;
 
-    let mut children = Vec::new();
-    let mut removed_children = Vec::new();
-
-    // A map of every node and the Instances they map to. This is fine because
-    // we don't add or remove from projects, so every node must map somewhere.
-    let mut project_nodes = vec![(&mut project.tree, snapshot.new_inst(), old_inst)];
+    let mut descendant_snapshots = Vec::new();
+    let mut removed_descendants = Vec::new();
+    let mut fs_snapshot = FsSnapshot::new();
 
-    // A map of refs to the path of a node they represent. This is used later to
-    // match children to their parent's path.
-    let mut ref_to_path = HashMap::new();
-
-    // These map children of a node by name to the actual Instance
+    let mut ref_to_path_map = HashMap::new();
     let mut old_child_map = HashMap::new();
     let mut new_child_map = HashMap::new();
 
-    while let Some((node, new_inst, old_inst)) = project_nodes.pop() {
-        log::trace!("Processing node '{}' of project", old_inst.name());
-        if let Some(node_path) = &node.path {
-            let node_path = node_path.path();
-            if !snapshot.is_valid_path(base_path, node_path) {
-                log::debug!(
-                    "Skipping {} because its path matches ignore pattern",
-                    new_inst.name,
+    let mut node_queue = VecDeque::with_capacity(1);
+    node_queue.push_back((&mut project.tree, old_inst, snapshot.new_inst()));
+
+    while let Some((node, old_inst, new_inst)) = node_queue.pop_front() {
+        log::debug!("Processing node {}", old_inst.name());
+        if old_inst.class_name() != new_inst.class {
+            anyhow::bail!(
+                "Cannot change the class of {} in project file at {}",
+                old_inst.name(),
+                path.display()
+            );
+        }
+
+        if node.path.is_none() {
+            // This node is entirely defined in the project
+            let filtered_properties = snapshot
+                .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
+                .unwrap();
+            let properties = &mut node.properties;
+            properties.clear();
+            for (name, value) in filtered_properties {
+                if filter_out_property(new_inst, name) {
+                    continue;
+                }
+                properties.insert(
+                    name.to_owned(),
+                    UnresolvedValue::from_variant(value.to_owned(), old_inst.class_name(), name),
                 );
-                continue;
             }
-        }
-        ref_to_path.insert(new_inst.referent(), node.path.as_ref());
-
-        old_child_map.extend(old_inst.children().iter().map(|referent| {
-            let child = snapshot.get_old_instance(*referent).unwrap();
-            (child.name(), child)
-        }));
-        new_child_map.extend(new_inst.children().iter().map(|referent| {
-            let child = snapshot.get_new_instance(*referent).unwrap();
-            (&child.name, child)
-        }));
-
-        let properties = &mut node.properties;
-
-        for (name, value) in &new_inst.properties {
-            if node.path.is_some() {
-                if !filter_out_property(new_inst, name) {
+        } else if node.properties.is_empty() {
+            // This node is entirely defined in a file
+            let node_path = node.path.as_ref().map(PathNode::path).expect(
+                "Project nodes with a path must have a path. \
+                If you see this message, something went seriously wrong. Please report it.",
+            );
+            let real_path = if node_path.is_absolute() {
+                node_path.to_path_buf()
+            } else {
+                base_path.join(node_path)
+            };
+
+            let (middleware, file_name, mut file_path) =
+                Middleware::middleware_and_path(vfs, &project.sync_rules, &real_path)?.expect(
+                    "Middleware::middleware_and_path should fail given an already loaded project node path",
+                );
+            if middleware.is_dir() && !file_path.pop() {
+                anyhow::bail!(
+                    "cannot syncback project node {} because it points to path {}",
+                    old_inst.name(),
+                    real_path.display()
+                )
+            }
+            let syncback_ret = middleware.syncback(
+                &SyncbackSnapshot {
+                    data: snapshot.data,
+                    old: Some(old_inst.id()),
+                    new: new_inst.referent(),
+                    parent_path: file_path,
+                    name: old_inst.name().to_owned(),
+                },
+                file_name,
+            )?;
+            descendant_snapshots.extend(syncback_ret.children.into_iter());
+            removed_descendants.extend(syncback_ret.removed_children.into_iter());
+            fs_snapshot.merge(syncback_ret.fs_snapshot);
+            continue;
+        } else {
+            // This node has both a path and properties set.
+            let filtered_properties = snapshot
+                .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
+                .unwrap();
+            let properties = &mut node.properties;
+            for (name, value) in filtered_properties {
+                if properties.contains_key(name) {
                     properties.insert(
                         name.to_owned(),
-                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                        UnresolvedValue::from_variant(
+                            value.to_owned(),
+                            old_inst.class_name(),
+                            name,
+                        ),
                     );
                 }
+            }
+            let node_path = node.path.as_ref().map(PathNode::path).expect(
+                "Project nodes with a path must have a path \
+                If you see this message, something went seriously wrong. Please report it.",
+            );
+            let real_path = if node_path.is_absolute() {
+                node_path.to_path_buf()
             } else {
-                properties.insert(
-                    name.to_owned(),
-                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                base_path.join(node_path)
+            };
+
+            log::debug!("Mixed node with path {}", real_path.display());
+            // descendant_snapshots.push(SyncbackSnapshot {
+            //     data: snapshot.data,
+            //     old: Some(old_inst.id()),
+            //     new: new_inst.referent(),
+            //     parent_path: real_path.clone(),
+            //     name: old_inst.name().to_owned(),
+            // });
+            ref_to_path_map.insert(new_inst.referent(), real_path);
+        }
+
+        for child_ref in new_inst.children() {
+            let child = snapshot
+                .get_new_instance(*child_ref)
+                .expect("all children of Instances should be in new DOM");
+            // As of writing (Feb 27 2024) Roblox serializes several Instances
+            // with the class 'Instance' that all have the same name. To avoid
+            // difficulties, we just ignore them. :-)
+            if child.class == "Instance" {
+                continue;
+            }
+            if new_child_map.insert(&child.name, child).is_some() {
+                anyhow::bail!(
+                    "Instances that are direct children of an Instance that is made by a project file \
+                    must have a unique name.\nThe child '{}' of '{}' is duplicated.", child.name, old_inst.name()
                 );
             }
         }
-        for (child_name, child_node) in &mut node.children {
-            if let Some(path_node) = &child_node.path {
-                if let Ok(false) = base_path.join(path_node.path()).try_exists() {
-                    log::warn!(
-                        "The project refers to '{child_name}' with path '{}' \
-                            which does not exist in the project directory.",
-                        path_node.path().display()
-                    );
-                    old_child_map.remove(child_name.as_str());
-                    new_child_map.remove(child_name);
-                    continue;
-                }
+        for child_ref in old_inst.children() {
+            let child = snapshot
+                .get_old_instance(*child_ref)
+                .expect("all children of Instances should be in old DOM");
+            if old_child_map.insert(child.name(), child).is_some() {
+                anyhow::bail!(
+                    "Instances that are direct children of an Instance that is made by a project file \
+                    must have a unique name. The child '{}' is duplicated.", child.name()
+                );
             }
-            let old_child = old_child_map
-                .get(child_name.as_str())
-                .expect("all nodes in queue should have old instances");
+        }
 
-            if let Some(new_child) = new_child_map.get(child_name) {
-                if new_child.class != old_child.class_name() {
-                    anyhow::bail!("cannot change the class of {child_name} in project");
+        for (child_name, child_node) in &mut node.children {
+            if let Some(path) = &child_node.path {
+                if path.is_optional() {
+                    let real_path = if path.path().is_absolute() {
+                        path.path().to_path_buf()
+                    } else {
+                        base_path.join(path.path())
+                    };
+                    if !real_path.exists() {
+                        log::debug!(
+                        "Skipping optional node '{child_name}' of project because it is optional \
+                        and not present on the disk."
+                        );
+                        continue;
+                    }
                 }
-                project_nodes.push((child_node, new_child, *old_child));
-                old_child_map.remove(child_name.as_str());
-                new_child_map.remove(child_name);
-            } else {
-                anyhow::bail!("cannot add or remove {child_name} from project");
+            }
+            let new_equivalent = new_child_map.remove(child_name);
+            let old_equivalent = old_child_map.remove(child_name.as_str());
+            // The panic below should never happen. If it does, something's gone
+            // wrong with the Instance matching for nodes.
+            match (new_equivalent, old_equivalent) {
+                (Some(new), Some(old)) => node_queue.push_back((child_node, old, new)),
+                (_, None) => anyhow::bail!(
+                    "The child '{child_name}' of Instance '{}' would be removed.\n\
+                    Syncback cannot add or remove Instances from project {}", old_inst.name(), path.display()),
+                (None, _) => panic!(
+                    "Invariant violated: the Instance matching of project nodes is flawed somehow.\n\
+                    Specifically, a child of the node did not exist in the old tree."
+                ),
             }
         }
-
-        // After matching children above, the child maps only contain children
-        // of this node that aren't in the project file.
-        for (new_name, new_child) in new_child_map.drain() {
-            let parent_path = match ref_to_path.get(&new_child.parent()) {
-                Some(Some(path)) => base_path.join(path.path()),
-                _ => {
-                    // For this to happen, the instance isn't a part of the
-                    // project at all, so we need to just skip it.
+        for (name, new_child) in new_child_map.drain() {
+            // All children must be a descendant of a node.
+            let parent_path = match ref_to_path_map.get(&new_child.parent()) {
+                Some(path) => path,
+                None => {
+                    log::trace!("Skipping new child {name}");
                     continue;
                 }
-            };
-            if let Some(old_inst) = old_child_map.get(new_name.as_str()) {
-                // This new instance represents an older one!
-                children.push(SyncbackSnapshot {
+            }
+            .to_owned();
+
+            if let Some(old_child) = old_child_map.remove(name.as_str()) {
+                log::debug!("child, old instance: {}", parent_path.display());
+                descendant_snapshots.push(SyncbackSnapshot {
                     data: snapshot.data,
-                    old: Some(old_inst.id()),
+                    old: Some(old_child.id()),
                     new: new_child.referent(),
                     parent_path,
-                    name: new_name.to_owned(),
-                });
-                old_child_map.remove(new_name.as_str());
+                    name: old_inst.name().to_string(),
+                })
             } else {
-                // This new instance is... new.
-                children.push(SyncbackSnapshot {
+                descendant_snapshots.push(SyncbackSnapshot {
                     data: snapshot.data,
                     old: None,
                     new: new_child.referent(),
                     parent_path,
-                    name: new_name.to_owned(),
-                });
+                    name: old_inst.name().to_string(),
+                })
             }
         }
-        removed_children.extend(old_child_map.drain().map(|(_, inst)| inst));
+        removed_descendants.extend(old_child_map.drain().map(|(_, v)| v));
     }
 
+    for snapshot in &descendant_snapshots {
+        log::debug!(
+            "returning snapshot at path {}",
+            snapshot.parent_path.display()
+        )
+    }
+
+    fs_snapshot.add_file(path, serde_json::to_vec_pretty(&project)?);
+
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot: FsSnapshot::new().with_added_file(
-            &project.file_location,
-            serde_json::to_vec_pretty(&project).context("failed to serialize updated project")?,
-        ),
-        children,
-        removed_children,
+        fs_snapshot,
+        children: descendant_snapshots,
+        removed_children: removed_descendants,
     })
 }
 
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 386427f0d..e87c91363 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -94,7 +94,7 @@ pub fn syncback_loop(
         data: syncback_data,
         old: Some(old_tree.get_root_id()),
         new: new_tree.root_ref(),
-        parent_path: project.folder_location().to_path_buf(),
+        parent_path: project.file_location.clone(),
         name: project.name.clone(),
     }];
 

From a3206e72903a7ff04d23898cf4b73ef9ea56ec16 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 12:25:57 -0800
Subject: [PATCH 190/366] Don't filter out Tags, Attributes, and SourceAssetId

---
 src/syncback/snapshot.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index aa8ffa1f8..0186453aa 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -270,10 +270,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
 }
 
 pub fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
-    // We don't need SourceAssetId.
-    if prop_name == "Tags" || prop_name == "Attributes" || prop_name == "SourceAssetId" {
-        return true;
-    }
     match inst.class.as_str() {
         "Script" | "LocalScript" | "ModuleScript" => prop_name == "Source",
         "LocalizationTable" => prop_name == "Contents",

From 4bd9d88385a2c039ca9fb7685c746ffed05de17c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 12:39:42 -0800
Subject: [PATCH 191/366] Remove unnecessary else-branch from dir syncback

---
 src/snapshot_middleware/dir.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index a4d9bbe53..765806f1e 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -149,9 +149,8 @@ pub fn syncback_dir_no_meta<'sync>(
                 "Instance has children with duplicate name (case may not exactly match):\n {}",
                 duplicate_set.into_iter().collect::<Vec<&str>>().join(", ")
             );
-        } else {
-            anyhow::bail!("Instance has more than 25 children with duplicate names");
         }
+        anyhow::bail!("Instance has more than 25 children with duplicate names");
     }
 
     if let Some(old_inst) = snapshot.old_inst() {

From 2fde18fde3430b51b12c22522482180e899ba993 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 15:17:06 -0800
Subject: [PATCH 192/366] Support overriding the middleware of snapshots

---
 src/syncback/mod.rs      | 10 +++++++---
 src/syncback/snapshot.rs | 31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index e87c91363..cb70ee45b 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -30,7 +30,7 @@ pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
 pub use property_filter::filter_properties;
 pub use ref_properties::collect_referents;
-pub use snapshot::{filter_out_property, SyncbackData, SyncbackSnapshot};
+pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
 const DEBUG_MODEL_FORMAT_VAR: &str = "ROJO_SYNCBACK_DEBUG";
 
@@ -96,6 +96,7 @@ pub fn syncback_loop(
         new: new_tree.root_ref(),
         parent_path: project.file_location.clone(),
         name: project.name.clone(),
+        middleware: Some(Middleware::Project),
     }];
 
     let mut replacements = Vec::new();
@@ -116,9 +117,12 @@ pub fn syncback_loop(
         }
 
         let middleware = snapshot
-            .old_inst()
-            .and_then(|inst| inst.metadata().middleware)
+            .middleware
+            .or(snapshot
+                .old_inst()
+                .and_then(|inst| inst.metadata().middleware))
             .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
+
         log::trace!("Middleware for {inst_path} is {:?}", middleware);
 
         if matches!(middleware, Middleware::Json | Middleware::Toml) {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 0186453aa..a89db1dc4 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -9,6 +9,7 @@ use std::{
 use crate::{
     glob::Glob,
     snapshot::{InstanceWithMeta, RojoTree},
+    snapshot_middleware::Middleware,
     variant_eq::variant_eq,
 };
 use rbx_dom_weak::{
@@ -35,6 +36,7 @@ pub struct SyncbackSnapshot<'sync> {
     pub new: Ref,
     pub parent_path: PathBuf,
     pub name: String,
+    pub middleware: Option<Middleware>,
 }
 
 impl<'sync> SyncbackSnapshot<'sync> {
@@ -48,9 +50,38 @@ impl<'sync> SyncbackSnapshot<'sync> {
             new: new_ref,
             parent_path: self.parent_path.join(&self.name),
             name: new_name,
+            middleware: None,
         }
     }
 
+    /// Constructs a SyncbackSnapshot from the provided refs and path, while
+    /// inheriting this snapshot's trees.
+    #[inline]
+    pub fn with_new_parent(
+        &self,
+        new_parent: PathBuf,
+        new_name: String,
+        new_ref: Ref,
+        old_ref: Option<Ref>,
+    ) -> Self {
+        Self {
+            data: self.data,
+            old: old_ref,
+            new: new_ref,
+            parent_path: new_parent,
+            name: new_name,
+            middleware: None,
+        }
+    }
+
+    /// Allows a middleware to be 'forced' onto a SyncbackSnapshot to override
+    /// the attempts to derive it.
+    #[inline]
+    pub fn middleware(mut self, middleware: Middleware) -> Self {
+        self.middleware = Some(middleware);
+        self
+    }
+
     /// Returns a map of properties for the 'new' Instance with filtering
     /// done to avoid noise.
     ///

From bf94eebd58ca32132e7f6194c93f1f248aefe65c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 15:57:22 -0800
Subject: [PATCH 193/366] Update documentation for
 SyncbackSnapshot::get_filtered_properties

---
 src/syncback/snapshot.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index a89db1dc4..9ea3d301f 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -94,7 +94,9 @@ impl<'sync> SyncbackSnapshot<'sync> {
     }
 
     /// Returns a map of properties for an Instance from the 'new' tree
-    /// with filtering done to avoid noise.
+    /// with filtering done to avoid noise. Returns `None` only if `new_ref`
+    /// instance is not in the new tree or if `old_ref` is provided and not in
+    /// the old tree.
     ///
     /// Note that while the returned map does filter based on the user's
     /// `ignore_props` field, it does not do any other filtering and doesn't

From 8eeaf9a369181c2953fd0277e252e552ff059b2e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 16:07:21 -0800
Subject: [PATCH 194/366] Finish up project middleware rewrite, mostly

---
 src/snapshot_middleware/project.rs | 206 +++++++++++++++--------------
 1 file changed, 104 insertions(+), 102 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index de5710b4e..3c950388f 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -6,18 +6,21 @@ use std::{
 
 use anyhow::{bail, Context};
 use memofs::Vfs;
-use rbx_dom_weak::types::{Attributes, Ref};
+use rbx_dom_weak::{
+    types::{Attributes, Ref},
+    Instance,
+};
 use rbx_reflection::ClassTag;
 
 use crate::{
     project::{PathNode, Project, ProjectNode},
     resolution::UnresolvedValue,
     snapshot::{
-        InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource, PathIgnoreRule,
-        SyncRule,
+        InstanceContext, InstanceMetadata, InstanceSnapshot, InstanceWithMeta, InstigatingSource,
+        PathIgnoreRule, SyncRule,
     },
     snapshot_middleware::Middleware,
-    syncback::{filter_out_property, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
     RojoRef,
 };
 
@@ -313,13 +316,27 @@ pub fn syncback_project<'sync>(
         .old_inst()
         .expect("projects should always exist in both trees");
     // Project roots have to come from somewhere!
-    let path = &snapshot.parent_path;
-    log::debug!("Processing project {}", path.display());
-    let base_path = path.parent().expect("project did not have a parent");
+    let project_path = old_inst
+        .metadata()
+        .instigating_source
+        .as_ref()
+        .unwrap()
+        .path();
     let vfs = snapshot.vfs();
 
-    log::trace!("Reloading project from vfs");
-    let mut project = Project::load_from_slice(&vfs.read(path)?, path)?;
+    log::debug!(
+        "Reloading project {} from vfs (name: {})",
+        project_path.display(),
+        snapshot.name
+    );
+    let mut project = Project::load_from_slice(&vfs.read(project_path)?, project_path)?;
+    let base_path = project.folder_location().to_path_buf();
+
+    // Sync rules for this project do not have their base rule set but it is
+    // important when performing syncback on other projects.
+    for rule in &mut project.sync_rules {
+        rule.base_path = base_path.clone()
+    }
 
     let mut descendant_snapshots = Vec::new();
     let mut removed_descendants = Vec::new();
@@ -336,71 +353,29 @@ pub fn syncback_project<'sync>(
         log::debug!("Processing node {}", old_inst.name());
         if old_inst.class_name() != new_inst.class {
             anyhow::bail!(
-                "Cannot change the class of {} in project file at {}",
+                "Cannot change the class of {} in project file {}",
                 old_inst.name(),
-                path.display()
+                project_path.display()
             );
         }
 
+        let filtered_properties = snapshot
+            .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
+            .unwrap();
+        let properties = &mut node.properties;
         if node.path.is_none() {
-            // This node is entirely defined in the project
-            let filtered_properties = snapshot
-                .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
-                .unwrap();
-            let properties = &mut node.properties;
+            // This node is entirely defined in the project, so we put all
+            // properties in the node.
             properties.clear();
             for (name, value) in filtered_properties {
-                if filter_out_property(new_inst, name) {
-                    continue;
-                }
                 properties.insert(
                     name.to_owned(),
                     UnresolvedValue::from_variant(value.to_owned(), old_inst.class_name(), name),
                 );
             }
-        } else if node.properties.is_empty() {
-            // This node is entirely defined in a file
-            let node_path = node.path.as_ref().map(PathNode::path).expect(
-                "Project nodes with a path must have a path. \
-                If you see this message, something went seriously wrong. Please report it.",
-            );
-            let real_path = if node_path.is_absolute() {
-                node_path.to_path_buf()
-            } else {
-                base_path.join(node_path)
-            };
-
-            let (middleware, file_name, mut file_path) =
-                Middleware::middleware_and_path(vfs, &project.sync_rules, &real_path)?.expect(
-                    "Middleware::middleware_and_path should fail given an already loaded project node path",
-                );
-            if middleware.is_dir() && !file_path.pop() {
-                anyhow::bail!(
-                    "cannot syncback project node {} because it points to path {}",
-                    old_inst.name(),
-                    real_path.display()
-                )
-            }
-            let syncback_ret = middleware.syncback(
-                &SyncbackSnapshot {
-                    data: snapshot.data,
-                    old: Some(old_inst.id()),
-                    new: new_inst.referent(),
-                    parent_path: file_path,
-                    name: old_inst.name().to_owned(),
-                },
-                file_name,
-            )?;
-            descendant_snapshots.extend(syncback_ret.children.into_iter());
-            removed_descendants.extend(syncback_ret.removed_children.into_iter());
-            fs_snapshot.merge(syncback_ret.fs_snapshot);
-            continue;
         } else {
-            // This node has both a path and properties set.
-            let filtered_properties = snapshot
-                .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
-                .unwrap();
-            let properties = &mut node.properties;
+            // This node has both a path so we only update properties. Adding
+            // new things is potentially destructive.
             for (name, value) in filtered_properties {
                 if properties.contains_key(name) {
                     properties.insert(
@@ -413,25 +388,28 @@ pub fn syncback_project<'sync>(
                     );
                 }
             }
+
+            // And since it has a path, we have to run syncback on that path.
             let node_path = node.path.as_ref().map(PathNode::path).expect(
                 "Project nodes with a path must have a path \
                 If you see this message, something went seriously wrong. Please report it.",
             );
-            let real_path = if node_path.is_absolute() {
+            let full_path = if node_path.is_absolute() {
                 node_path.to_path_buf()
             } else {
                 base_path.join(node_path)
             };
 
-            log::debug!("Mixed node with path {}", real_path.display());
-            // descendant_snapshots.push(SyncbackSnapshot {
-            //     data: snapshot.data,
-            //     old: Some(old_inst.id()),
-            //     new: new_inst.referent(),
-            //     parent_path: real_path.clone(),
-            //     name: old_inst.name().to_owned(),
-            // });
-            ref_to_path_map.insert(new_inst.referent(), real_path);
+            let snapshot = syncback_project_node(
+                snapshot,
+                &project.sync_rules,
+                &full_path,
+                new_inst,
+                old_inst,
+            )?;
+            descendant_snapshots.push(snapshot);
+
+            ref_to_path_map.insert(new_inst.referent(), full_path);
         }
 
         for child_ref in new_inst.children() {
@@ -458,12 +436,17 @@ pub fn syncback_project<'sync>(
             if old_child_map.insert(child.name(), child).is_some() {
                 anyhow::bail!(
                     "Instances that are direct children of an Instance that is made by a project file \
-                    must have a unique name. The child '{}' is duplicated.", child.name()
+                    must have a unique name.\nThe child '{}' is duplicated.", child.name()
                 );
             }
         }
 
+        // This loop does basic matching of Instance children to the node's
+        // children. It ensures that `new_child_map` and `old_child_map` will
+        // only contain Instances that don't belong to the project after this.
         for (child_name, child_node) in &mut node.children {
+            // If a node's path is optional, we want to skip it if the path
+            // doesn't exist since it isn't in the current old DOM.
             if let Some(path) = &child_node.path {
                 if path.is_optional() {
                     let real_path = if path.path().is_absolute() {
@@ -472,9 +455,9 @@ pub fn syncback_project<'sync>(
                         base_path.join(path.path())
                     };
                     if !real_path.exists() {
-                        log::debug!(
-                        "Skipping optional node '{child_name}' of project because it is optional \
-                        and not present on the disk."
+                        log::warn!(
+                            "Skipping node '{child_name}' of project because it is optional and not present on the disk.\n\
+                            If this is not deliberate, please create a file or directory at {}", real_path.display()
                         );
                         continue;
                     }
@@ -488,54 +471,45 @@ pub fn syncback_project<'sync>(
                 (Some(new), Some(old)) => node_queue.push_back((child_node, old, new)),
                 (_, None) => anyhow::bail!(
                     "The child '{child_name}' of Instance '{}' would be removed.\n\
-                    Syncback cannot add or remove Instances from project {}", old_inst.name(), path.display()),
+                    Syncback cannot add or remove Instances from project {}", old_inst.name(), project_path.display()),
                 (None, _) => panic!(
                     "Invariant violated: the Instance matching of project nodes is flawed somehow.\n\
                     Specifically, a child of the node did not exist in the old tree."
                 ),
             }
         }
+
+        // All of the children in this loop are by their nature not in the
+        // project, so we just need to run syncback on them.
         for (name, new_child) in new_child_map.drain() {
-            // All children must be a descendant of a node.
             let parent_path = match ref_to_path_map.get(&new_child.parent()) {
-                Some(path) => path,
+                Some(path) => path.clone(),
                 None => {
-                    log::trace!("Skipping new child {name}");
+                    log::debug!("Skipping child {name} of node because it has no parent_path");
                     continue;
                 }
-            }
-            .to_owned();
+            };
 
             if let Some(old_child) = old_child_map.remove(name.as_str()) {
-                log::debug!("child, old instance: {}", parent_path.display());
-                descendant_snapshots.push(SyncbackSnapshot {
-                    data: snapshot.data,
-                    old: Some(old_child.id()),
-                    new: new_child.referent(),
+                descendant_snapshots.push(snapshot.with_new_parent(
                     parent_path,
-                    name: old_inst.name().to_string(),
-                })
+                    old_child.name().to_string(),
+                    new_child.referent(),
+                    Some(old_child.id()),
+                ))
             } else {
-                descendant_snapshots.push(SyncbackSnapshot {
-                    data: snapshot.data,
-                    old: None,
-                    new: new_child.referent(),
+                descendant_snapshots.push(snapshot.with_new_parent(
                     parent_path,
-                    name: old_inst.name().to_string(),
-                })
+                    new_child.name.clone(),
+                    new_child.referent(),
+                    None,
+                ));
             }
         }
         removed_descendants.extend(old_child_map.drain().map(|(_, v)| v));
     }
 
-    for snapshot in &descendant_snapshots {
-        log::debug!(
-            "returning snapshot at path {}",
-            snapshot.parent_path.display()
-        )
-    }
-
-    fs_snapshot.add_file(path, serde_json::to_vec_pretty(&project)?);
+    fs_snapshot.add_file(project_path, serde_json::to_vec_pretty(&project)?);
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
@@ -545,6 +519,34 @@ pub fn syncback_project<'sync>(
     })
 }
 
+fn syncback_project_node<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
+    sync_rules: &[SyncRule],
+    node_path: &Path,
+    new_inst: &Instance,
+    old_inst: InstanceWithMeta,
+) -> anyhow::Result<SyncbackSnapshot<'sync>> {
+    let (middleware, _, mut file_path) =
+        Middleware::middleware_and_path(snapshot.vfs(), sync_rules, node_path)?
+            .context("middleware_and_path should not fail for project nodes that exist")?;
+
+    if middleware.is_dir() && !file_path.pop() {
+        anyhow::bail!(
+            "cannot syncback node {} using middleware {:?} because it is at the disk root",
+            old_inst.name(),
+            middleware
+        )
+    }
+    Ok(snapshot
+        .with_new_parent(
+            file_path,
+            old_inst.name().to_owned(),
+            new_inst.referent(),
+            Some(old_inst.id()),
+        )
+        .middleware(middleware))
+}
+
 fn infer_class_name(name: &str, parent_class: Option<&str>) -> Option<Cow<'static, str>> {
     // If className wasn't defined from another source, we may be able
     // to infer one.

From 04ba94eac64bab9ba650b1c5a9bcaf6e62af8efb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 28 Feb 2024 16:54:15 -0800
Subject: [PATCH 195/366] Update error message

---
 src/snapshot_middleware/project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 3c950388f..549d2770d 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -436,7 +436,7 @@ pub fn syncback_project<'sync>(
             if old_child_map.insert(child.name(), child).is_some() {
                 anyhow::bail!(
                     "Instances that are direct children of an Instance that is made by a project file \
-                    must have a unique name.\nThe child '{}' is duplicated.", child.name()
+                    must have a unique name.\nThe child '{}' of '{}' is duplicated.", child.name(), old_inst.name()
                 );
             }
         }

From 3a97f2ac7b05335fb77d6d53b1c5df8767a9a338 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Feb 2024 14:35:27 -0800
Subject: [PATCH 196/366] Don't be a weirdo with FsSnapshot in project
 middleware

---
 src/snapshot_middleware/project.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 549d2770d..d5db8ade2 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -340,7 +340,6 @@ pub fn syncback_project<'sync>(
 
     let mut descendant_snapshots = Vec::new();
     let mut removed_descendants = Vec::new();
-    let mut fs_snapshot = FsSnapshot::new();
 
     let mut ref_to_path_map = HashMap::new();
     let mut old_child_map = HashMap::new();
@@ -509,11 +508,10 @@ pub fn syncback_project<'sync>(
         removed_descendants.extend(old_child_map.drain().map(|(_, v)| v));
     }
 
-    fs_snapshot.add_file(project_path, serde_json::to_vec_pretty(&project)?);
-
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot,
+        fs_snapshot: FsSnapshot::new()
+            .with_added_file(project_path, serde_json::to_vec_pretty(&project)?),
         children: descendant_snapshots,
         removed_children: removed_descendants,
     })

From 1b110b9dcd30e2fd1b9ab0b36f9d0219ba5f4ab1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Feb 2024 14:37:58 -0800
Subject: [PATCH 197/366] Use relevant paths instead of instigating source for
 instance names

---
 src/snapshot_middleware/dir.rs |  7 +++++++
 src/syncback/file_names.rs     | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 765806f1e..23e805dcb 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -163,6 +163,13 @@ pub fn syncback_dir_no_meta<'sync>(
         for new_child_ref in new_inst.children() {
             let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
             if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
+                if old_child.metadata().relevant_paths.is_empty() {
+                    log::debug!(
+                        "Skipping instance {} because it doesn't exist on the disk",
+                        old_child.name()
+                    );
+                    continue;
+                }
                 // This child exists in both doms. Pass it on.
                 children.push(snapshot.with_parent(
                     new_child.name.clone(),
diff --git a/src/syncback/file_names.rs b/src/syncback/file_names.rs
index 8fa65f5a8..6424bcee3 100644
--- a/src/syncback/file_names.rs
+++ b/src/syncback/file_names.rs
@@ -14,15 +14,20 @@ pub fn name_for_inst<'old>(
     old_inst: Option<InstanceWithMeta<'old>>,
 ) -> anyhow::Result<Cow<'old, str>> {
     if let Some(old_inst) = old_inst {
-        if let Some(source) = &old_inst.metadata().instigating_source {
+        if let Some(source) = old_inst.metadata().relevant_paths.first() {
             source
-                .path()
                 .file_name()
                 .and_then(|s| s.to_str())
                 .map(Cow::Borrowed)
                 .context("sources on the file system should be valid unicode and not be stubs")
         } else {
-            anyhow::bail!("members of 'old' trees should have an instigating source!");
+            // This is technically not /always/ true, but we want to avoid
+            // running syncback on anything that has no instigating source
+            // anyway.
+            anyhow::bail!(
+                "members of 'old' trees should have an instigating source. Somehow, {} did not.",
+                old_inst.name(),
+            );
         }
     } else {
         Ok(match middleware {

From 9041e57797703a4446796b8eb6040b33adcec974 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Feb 2024 15:15:20 -0800
Subject: [PATCH 198/366] It turns out file_path is cringe for this

---
 src/snapshot_middleware/project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index d5db8ade2..6281a9552 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -528,7 +528,7 @@ fn syncback_project_node<'sync>(
         Middleware::middleware_and_path(snapshot.vfs(), sync_rules, node_path)?
             .context("middleware_and_path should not fail for project nodes that exist")?;
 
-    if middleware.is_dir() && !file_path.pop() {
+    if !file_path.pop() {
         anyhow::bail!(
             "cannot syncback node {} using middleware {:?} because it is at the disk root",
             old_inst.name(),

From 2423b3b71d9d2137ca8e3ce65b2412e0d4e21401 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Feb 2024 15:57:40 -0800
Subject: [PATCH 199/366] Don't clear all properties from pure nodes.

---
 src/snapshot_middleware/project.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 6281a9552..c0ad2bb2d 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -364,8 +364,8 @@ pub fn syncback_project<'sync>(
         let properties = &mut node.properties;
         if node.path.is_none() {
             // This node is entirely defined in the project, so we put all
-            // properties in the node.
-            properties.clear();
+            // properties in the node. We explicitly DO NOT clear old properties
+            // since it's likely people want them there.
             for (name, value) in filtered_properties {
                 properties.insert(
                     name.to_owned(),

From 84e06212465864e6a9c5a7fdb5d3a24c3f92dc86 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Feb 2024 16:24:14 -0800
Subject: [PATCH 200/366] Don't write metadata if instigating sources don't
 match

---
 src/snapshot_middleware/csv.rs       | 54 ++++++++++++++-------------
 src/snapshot_middleware/dir.rs       | 26 ++++++++-----
 src/snapshot_middleware/lua.rs       | 56 ++++++++++++++--------------
 src/snapshot_middleware/meta_file.rs | 46 ++++++++++++++++++++---
 src/snapshot_middleware/txt.rs       | 26 +++++++------
 5 files changed, 128 insertions(+), 80 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 180b11c55..dedfe548b 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -109,19 +109,21 @@ pub fn syncback_csv<'sync>(
     } else {
         anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
     };
-
-    let mut meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
-    meta.properties.remove("Contents");
-
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(path, localization_to_csv(contents)?);
-    if !meta.is_empty() {
-        fs_snapshot.add_file(
-            snapshot
-                .parent_path
-                .join(format!("{}.meta.json", new_inst.name)),
-            serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
-        )
+    fs_snapshot.add_file(&path, localization_to_csv(contents)?);
+
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    if let Some(mut meta) = meta {
+        meta.properties.remove("Contents");
+
+        if !meta.is_empty() {
+            fs_snapshot.add_file(
+                snapshot
+                    .parent_path
+                    .join(format!("{}.meta.json", new_inst.name)),
+                serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
+            )
+        }
     }
 
     Ok(SyncbackReturn {
@@ -147,23 +149,25 @@ pub fn syncback_csv_init<'sync>(
     };
 
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
-    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
-    meta.properties.remove("Contents");
-
-    let mut fs_snapshot = std::mem::take(&mut dir_syncback.fs_snapshot);
-    fs_snapshot.add_file(&path, localization_to_csv(contents)?);
-    if !meta.is_empty() {
-        fs_snapshot.add_file(
-            snapshot.parent_path.join(dir_name).join("init.meta.json"),
-            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
-        );
+    dir_syncback
+        .fs_snapshot
+        .add_file(&path, localization_to_csv(contents)?);
+
+    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    if let Some(mut meta) = meta {
+        meta.properties.remove("Contents");
+        if !meta.is_empty() {
+            dir_syncback.fs_snapshot.add_file(
+                snapshot.parent_path.join(dir_name).join("init.meta.json"),
+                serde_json::to_vec_pretty(&meta)
+                    .context("could not serialize new init.meta.json")?,
+            );
+        }
     }
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        fs_snapshot,
-        children: dir_syncback.children,
-        removed_children: dir_syncback.removed_children,
+        ..dir_syncback
     })
 }
 
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 23e805dcb..a01db04c9 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -105,17 +105,25 @@ pub fn syncback_dir<'sync>(
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
 
     let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
-    if new_inst.class != "Folder" {
-        meta.class_name = Some(new_inst.class.clone());
-    }
+    if let Some(meta) = &mut meta {
+        if new_inst.class != "Folder" {
+            meta.class_name = Some(new_inst.class.clone());
+        }
 
-    if !meta.is_empty() {
-        dir_syncback.fs_snapshot.add_file(
-            path.join("init.meta.json"),
-            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
-        );
+        if !meta.is_empty() {
+            dir_syncback.fs_snapshot.add_file(
+                path.join("init.meta.json"),
+                serde_json::to_vec_pretty(&meta)
+                    .context("could not serialize new init.meta.json")?,
+            );
+        }
     }
-    if new_inst.children().is_empty() && meta.is_empty() {
+
+    let metadata_empty = meta
+        .as_ref()
+        .map(DirectoryMetadata::is_empty)
+        .unwrap_or_default();
+    if new_inst.children().is_empty() && metadata_empty {
         dir_syncback
             .fs_snapshot
             .add_file(path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index e2c050f1a..ef7f1122c 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -135,19 +135,21 @@ pub fn syncback_lua<'sync>(
     } else {
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
-
-    let mut meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
-    meta.properties.remove("Source");
-
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(path, contents);
-    if !meta.is_empty() {
-        fs_snapshot.add_file(
-            snapshot
-                .parent_path
-                .join(format!("{}.meta.json", new_inst.name)),
-            serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
-        );
+    fs_snapshot.add_file(&path, contents);
+
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    if let Some(mut meta) = meta {
+        meta.properties.remove("Source");
+
+        if !meta.is_empty() {
+            fs_snapshot.add_file(
+                snapshot
+                    .parent_path
+                    .join(format!("{}.meta.json", new_inst.name)),
+                serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
+            );
+        }
     }
 
     Ok(SyncbackReturn {
@@ -177,27 +179,25 @@ pub fn syncback_lua_init<'sync>(
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
 
-    let dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
-
-    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
-    meta.properties.remove("Source");
+    let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
+    dir_syncback.fs_snapshot.add_file(&path, contents);
 
-    let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(path, contents);
-    fs_snapshot.merge(dir_syncback.fs_snapshot);
+    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    if let Some(mut meta) = meta {
+        meta.properties.remove("Source");
 
-    if !meta.is_empty() {
-        fs_snapshot.add_file(
-            snapshot.parent_path.join(dir_name).join("init.meta.json"),
-            serde_json::to_vec_pretty(&meta).context("could not serialize new init.meta.json")?,
-        );
+        if !meta.is_empty() {
+            dir_syncback.fs_snapshot.add_file(
+                snapshot.parent_path.join(dir_name).join("init.meta.json"),
+                serde_json::to_vec_pretty(&meta)
+                    .context("could not serialize new init.meta.json")?,
+            );
+        }
     }
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot,
-        children: dir_syncback.children,
-        removed_children: dir_syncback.removed_children,
+        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
+        ..dir_syncback
     })
 }
 
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 02c328719..9ca14356f 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -54,9 +54,26 @@ impl AdjacentMetadata {
     pub fn from_syncback_snapshot(
         snapshot: &SyncbackSnapshot,
         path: PathBuf,
-    ) -> anyhow::Result<Self> {
+    ) -> anyhow::Result<Option<Self>> {
         let mut properties = BTreeMap::new();
         let mut attributes = BTreeMap::new();
+        // TODO make this more granular.
+        // I am breaking the cycle of bad TODOs. This is in reference to the fact
+        // that right now, this will just not write any metadata at all for
+        // project nodes, which is not always desirable. We should try to be
+        // smarter about it.
+        if let Some(old_inst) = snapshot.old_inst() {
+            if let Some(source) = &old_inst.metadata().instigating_source {
+                let source = source.path();
+                if source != path {
+                    log::debug!(
+                        "Instance origin is mismatched so its metadata is being skipped. Path: {}",
+                        path.display()
+                    );
+                    return Ok(None);
+                }
+            }
+        }
 
         let ignore_unknown_instances = snapshot
             .old_inst()
@@ -85,7 +102,7 @@ impl AdjacentMetadata {
             }
         }
 
-        Ok(Self {
+        Ok(Some(Self {
             ignore_unknown_instances: if ignore_unknown_instances {
                 Some(true)
             } else {
@@ -95,7 +112,7 @@ impl AdjacentMetadata {
             attributes,
             path,
             id: None,
-        })
+        }))
     }
 
     pub fn apply_ignore_unknown_instances(&mut self, snapshot: &mut InstanceSnapshot) {
@@ -215,9 +232,26 @@ impl DirectoryMetadata {
     pub fn from_syncback_snapshot(
         snapshot: &SyncbackSnapshot,
         path: PathBuf,
-    ) -> anyhow::Result<Self> {
+    ) -> anyhow::Result<Option<Self>> {
         let mut properties = BTreeMap::new();
         let mut attributes = BTreeMap::new();
+        // TODO make this more granular.
+        // I am breaking the cycle of bad TODOs. This is in reference to the fact
+        // that right now, this will just not write any metadata at all for
+        // project nodes, which is not always desirable. We should try to be
+        // smarter about it.
+        if let Some(old_inst) = snapshot.old_inst() {
+            if let Some(source) = &old_inst.metadata().instigating_source {
+                let source = source.path();
+                if source != path {
+                    log::debug!(
+                        "Instance origin is mismatched so its metadata is being skipped. Path: {}",
+                        path.display()
+                    );
+                    return Ok(None);
+                }
+            }
+        }
 
         let ignore_unknown_instances = snapshot
             .old_inst()
@@ -246,7 +280,7 @@ impl DirectoryMetadata {
             }
         }
 
-        Ok(Self {
+        Ok(Some(Self {
             ignore_unknown_instances: if ignore_unknown_instances {
                 Some(true)
             } else {
@@ -257,7 +291,7 @@ impl DirectoryMetadata {
             class_name: None,
             path,
             id: None,
-        })
+        }))
     }
 
     pub fn apply_all(&mut self, snapshot: &mut InstanceSnapshot) -> anyhow::Result<()> {
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 0d0d25204..4b6a70e5f 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -60,19 +60,21 @@ pub fn syncback_txt<'sync>(
     } else {
         anyhow::bail!("StringValues must have a `Value` property that is a String");
     };
-
-    let mut meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
-    meta.properties.remove("Value");
-
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(path, contents);
-    if !meta.is_empty() {
-        fs_snapshot.add_file(
-            snapshot
-                .parent_path
-                .join(format!("{}.meta.json", new_inst.name)),
-            serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
-        );
+    fs_snapshot.add_file(&path, contents);
+
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    if let Some(mut meta) = meta {
+        meta.properties.remove("Value");
+
+        if !meta.is_empty() {
+            fs_snapshot.add_file(
+                snapshot
+                    .parent_path
+                    .join(format!("{}.meta.json", new_inst.name)),
+                serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
+            );
+        }
     }
 
     Ok(SyncbackReturn {

From 129f3801f039c618152865ba618056004cbd8dfd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Feb 2024 16:40:57 -0800
Subject: [PATCH 201/366] Insert properties even when there's a path as a
 stopgap

---
 src/snapshot_middleware/project.rs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index c0ad2bb2d..ae2dd1cf0 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -373,19 +373,22 @@ pub fn syncback_project<'sync>(
                 );
             }
         } else {
+            // TODO handle this in a way that doesn't suck.
+            // Due to an issue with middlewares not knowing they originate
+            // from a project with a path, we do not write metadata. This means
+            // that properties won't be written unless we update them in the
+            // path. So, while the below comment is left, it is not accurate
+            // at this time because we simply write all properties.
+
             // This node has both a path so we only update properties. Adding
             // new things is potentially destructive.
             for (name, value) in filtered_properties {
-                if properties.contains_key(name) {
-                    properties.insert(
-                        name.to_owned(),
-                        UnresolvedValue::from_variant(
-                            value.to_owned(),
-                            old_inst.class_name(),
-                            name,
-                        ),
-                    );
-                }
+                // if properties.contains_key(name) { // See TODO above
+                properties.insert(
+                    name.to_owned(),
+                    UnresolvedValue::from_variant(value.to_owned(), old_inst.class_name(), name),
+                );
+                // }
             }
 
             // And since it has a path, we have to run syncback on that path.

From 7ba44760b100e4902265a7fb2fa5d47afb8fb7e5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 4 Mar 2024 09:43:27 -0800
Subject: [PATCH 202/366] Use relevant paths instead of instigating source for
 projects

---
 src/snapshot_middleware/project.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index ae2dd1cf0..c60ef281d 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -315,13 +315,13 @@ pub fn syncback_project<'sync>(
     let old_inst = snapshot
         .old_inst()
         .expect("projects should always exist in both trees");
-    // Project roots have to come from somewhere!
+    // Generally, the path of a project is the first thing added to the relevant
+    // paths. So, we take the last one.
     let project_path = old_inst
         .metadata()
-        .instigating_source
-        .as_ref()
-        .unwrap()
-        .path();
+        .relevant_paths
+        .last()
+        .expect("all projects should have a relevant path");
     let vfs = snapshot.vfs();
 
     log::debug!(

From 77337cc8b019c5e0d15c870667fb4970af943aa9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 4 Mar 2024 10:19:35 -0800
Subject: [PATCH 203/366] Update output from dry-run for syncback

---
 src/cli/syncback.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index c42996b4b..dab91600b 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -116,7 +116,12 @@ impl SyncbackCommand {
             log::info!("Writing to the file system...");
             snapshot.write_to_vfs(base_path, session_old.vfs())?;
         } else {
-            log::info!("Aborting before writing to file system due to `--dry-run`");
+            println!(
+                "Would write {} files/folders and remove {} files/folders.",
+                snapshot.added_paths().len(),
+                snapshot.removed_paths().len()
+            );
+            println!("Aborting before writing to file system due to `--dry-run`");
         }
 
         // It is potentially prohibitively expensive to drop a ServeSession,

From 64df66740964c86efe74d542a90fc48518684bc2 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 4 Mar 2024 10:24:54 -0800
Subject: [PATCH 204/366] Don't double syncback old_inst children

---
 src/snapshot_middleware/project.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index c60ef281d..1069ddcff 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -492,14 +492,10 @@ pub fn syncback_project<'sync>(
                 }
             };
 
-            if let Some(old_child) = old_child_map.remove(name.as_str()) {
-                descendant_snapshots.push(snapshot.with_new_parent(
-                    parent_path,
-                    old_child.name().to_string(),
-                    new_child.referent(),
-                    Some(old_child.id()),
-                ))
-            } else {
+            // If a child also exists in the old tree, it will be caught in the
+            // syncback on the project node path above (or is itself a node).
+            // So the only things we need to run seperately is new children.
+            if old_child_map.remove(name.as_str()).is_none() {
                 descendant_snapshots.push(snapshot.with_new_parent(
                     parent_path,
                     new_child.name.clone(),

From 493e218f1250105ec7073dfb13f91bc00cde3011 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 4 Mar 2024 11:22:45 -0800
Subject: [PATCH 205/366] Add better attribute handling for json files

---
 src/resolution.rs                     | 19 +++++++++++
 src/snapshot_middleware/json_model.rs |  2 +-
 src/snapshot_middleware/meta_file.rs  | 26 +++++----------
 src/snapshot_middleware/project.rs    | 48 ++++++++++++++++++++-------
 4 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/src/resolution.rs b/src/resolution.rs
index 4c7fcaacd..ba10f115b 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -38,6 +38,8 @@ impl UnresolvedValue {
         }
     }
 
+    /// Creates an `UnresolvedValue` from a variant, using a class and property
+    /// name to potentially allow for ambiguous Enum variants.
     pub fn from_variant(variant: Variant, class_name: &str, prop_name: &str) -> Self {
         Self::Ambiguous(match variant {
             Variant::Enum(rbx_enum) => {
@@ -96,6 +98,23 @@ impl UnresolvedValue {
             }
         })
     }
+
+    /// Creates an `UnresolvedValue` from a variant, only returning ambiguous
+    /// values if they're able to be resolved in a context-free environment.
+    pub fn from_variant_unambiguous(variant: Variant) -> Self {
+        match variant {
+            Variant::String(str) => Self::Ambiguous(AmbiguousValue::String(str)),
+            Variant::Float64(number) => Self::Ambiguous(AmbiguousValue::Number(number)),
+            Variant::Bool(bool) => Self::Ambiguous(AmbiguousValue::Bool(bool)),
+            Variant::BinaryString(bstr) => match std::str::from_utf8(bstr.as_ref()) {
+                Ok(_) => Self::Ambiguous(AmbiguousValue::String(
+                    String::from_utf8(bstr.into_vec()).unwrap(),
+                )),
+                Err(_) => Self::FullyQualified(Variant::BinaryString(bstr)),
+            },
+            _ => Self::FullyQualified(variant),
+        }
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 3917807c1..66226cf0d 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -98,7 +98,7 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
             for (attr_name, attr_value) in attrs.iter() {
                 attributes.insert(
                     attr_name.clone(),
-                    UnresolvedValue::FullyQualified(attr_value.clone()),
+                    UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
                 );
             }
         } else {
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 9ca14356f..d0da4f8df 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -84,15 +84,10 @@ impl AdjacentMetadata {
         for (name, value) in &snapshot.new_inst().properties {
             if let Variant::Attributes(attrs) = value {
                 for (name, value) in attrs.iter() {
-                    let value = if let Variant::BinaryString(bstr) = value {
-                        match std::str::from_utf8(bstr.as_ref()) {
-                            Ok(str) => Variant::String(str.to_string()),
-                            Err(_) => value.clone(),
-                        }
-                    } else {
-                        value.clone()
-                    };
-                    attributes.insert(name.to_owned(), UnresolvedValue::FullyQualified(value));
+                    attributes.insert(
+                        name.to_owned(),
+                        UnresolvedValue::from_variant_unambiguous(value.clone()),
+                    );
                 }
             } else {
                 properties.insert(
@@ -262,15 +257,10 @@ impl DirectoryMetadata {
         for (name, value) in &snapshot.new_inst().properties {
             if let Variant::Attributes(attrs) = value {
                 for (name, value) in attrs.iter() {
-                    let value = if let Variant::BinaryString(bstr) = value {
-                        match std::str::from_utf8(bstr.as_ref()) {
-                            Ok(str) => Variant::String(str.to_string()),
-                            Err(_) => value.clone(),
-                        }
-                    } else {
-                        value.clone()
-                    };
-                    attributes.insert(name.to_owned(), UnresolvedValue::FullyQualified(value));
+                    attributes.insert(
+                        name.to_owned(),
+                        UnresolvedValue::from_variant_unambiguous(value.clone()),
+                    );
                 }
             } else {
                 properties.insert(
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 1069ddcff..1cc3ebec8 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -1,13 +1,13 @@
 use std::{
     borrow::Cow,
-    collections::{HashMap, VecDeque},
+    collections::{BTreeMap, HashMap, VecDeque},
     path::Path,
 };
 
 use anyhow::{bail, Context};
 use memofs::Vfs;
 use rbx_dom_weak::{
-    types::{Attributes, Ref},
+    types::{Attributes, Ref, Variant},
     Instance,
 };
 use rbx_reflection::ClassTag;
@@ -362,15 +362,25 @@ pub fn syncback_project<'sync>(
             .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
             .unwrap();
         let properties = &mut node.properties;
+        let mut attributes = BTreeMap::new();
         if node.path.is_none() {
             // This node is entirely defined in the project, so we put all
             // properties in the node. We explicitly DO NOT clear old properties
             // since it's likely people want them there.
             for (name, value) in filtered_properties {
-                properties.insert(
-                    name.to_owned(),
-                    UnresolvedValue::from_variant(value.to_owned(), old_inst.class_name(), name),
-                );
+                if let Variant::Attributes(attrs) = value {
+                    for (attr_name, attr_value) in attrs.iter() {
+                        attributes.insert(
+                            attr_name.clone(),
+                            UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
+                        );
+                    }
+                } else {
+                    properties.insert(
+                        name.to_string(),
+                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                    );
+                }
             }
         } else {
             // TODO handle this in a way that doesn't suck.
@@ -383,13 +393,27 @@ pub fn syncback_project<'sync>(
             // This node has both a path so we only update properties. Adding
             // new things is potentially destructive.
             for (name, value) in filtered_properties {
-                // if properties.contains_key(name) { // See TODO above
-                properties.insert(
-                    name.to_owned(),
-                    UnresolvedValue::from_variant(value.to_owned(), old_inst.class_name(), name),
-                );
-                // }
+                if let Variant::Attributes(attrs) = value {
+                    for (attr_name, attr_value) in attrs.iter() {
+                        attributes.insert(
+                            attr_name.clone(),
+                            UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
+                        );
+                    }
+                } else {
+                    // if properties.contains_key(name) { // See TODO above
+                    properties.insert(
+                        name.to_owned(),
+                        UnresolvedValue::from_variant(
+                            value.to_owned(),
+                            old_inst.class_name(),
+                            name,
+                        ),
+                    );
+                    // }
+                }
             }
+            node.attributes = attributes;
 
             // And since it has a path, we have to run syncback on that path.
             let node_path = node.path.as_ref().map(PathNode::path).expect(

From 3fcec37c5b57785067bc6e2a4f81b9f108786cbd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 7 Mar 2024 10:43:17 -0800
Subject: [PATCH 206/366] Move middleware resolution to `get_best_middleware`
 in its entirety

---
 src/syncback/mod.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index cb70ee45b..97b139581 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -9,7 +9,7 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{
     types::{Ref, Variant},
-    Instance, WeakDom,
+    WeakDom,
 };
 use serde::{Deserialize, Serialize};
 use std::{
@@ -116,12 +116,7 @@ pub fn syncback_loop(
             }
         }
 
-        let middleware = snapshot
-            .middleware
-            .or(snapshot
-                .old_inst()
-                .and_then(|inst| inst.metadata().middleware))
-            .unwrap_or_else(|| get_best_middleware(snapshot.new_inst()));
+        let middleware = get_best_middleware(&snapshot);
 
         log::trace!("Middleware for {inst_path} is {:?}", middleware);
 
@@ -209,7 +204,18 @@ pub struct SyncbackReturn<'sync> {
     pub removed_children: Vec<InstanceWithMeta<'sync>>,
 }
 
-pub fn get_best_middleware(inst: &Instance) -> Middleware {
+pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
+    if let Some(middleware) = snapshot.middleware {
+        return middleware;
+    };
+    let old_middleware = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().middleware);
+    if let Some(old_middleware) = old_middleware {
+        return old_middleware;
+    }
+
+    let inst = snapshot.new_inst();
     // At some point, we're better off using an O(1) method for checking
     // equality for classes like this.
     static JSON_MODEL_CLASSES: OnceLock<HashSet<&str>> = OnceLock::new();

From 3ed103e362f4b511d0d1c7d167ff94a9da45b202 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 7 Mar 2024 12:53:38 -0800
Subject: [PATCH 207/366] Don't filter out SharedString properties

---
 src/syncback/property_filter.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index e65763346..5d92348fb 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -21,7 +21,7 @@ pub fn filter_properties(
         .get(inst.class.as_str());
 
     let predicate = |prop_name: &String, prop_value: &Variant| {
-        if matches!(prop_value, Variant::Ref(_) | Variant::SharedString(_)) {
+        if matches!(prop_value, Variant::Ref(_)) {
             return true;
         }
         if let Some(list) = &filter {

From cb1e392533efbd04198fa6e1154bdd510e631a0b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 7 Mar 2024 12:54:32 -0800
Subject: [PATCH 208/366] Add `get_new_inst_path` to get a Roblox path using a
 snapshot

---
 src/syncback/snapshot.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 9ea3d301f..6be48e9b7 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -225,6 +225,29 @@ impl<'sync> SyncbackSnapshot<'sync> {
         true
     }
 
+    /// Returns a path to the provided Instance in the new DOM. This path is
+    /// where you would look for the object in Roblox Studio.
+    #[inline]
+    pub fn get_new_inst_path(&self, referent: Ref) -> String {
+        let mut path = Vec::new();
+        let mut path_capacity = 0;
+
+        let mut inst = self.get_new_instance(referent);
+        while let Some(instance) = inst {
+            path.push(&instance.name);
+            path_capacity += instance.name.len() + 1;
+            inst = self.get_new_instance(instance.parent());
+        }
+        let mut str = String::with_capacity(path_capacity);
+        while let Some(segment) = path.pop() {
+            str.push_str(segment);
+            str.push('/')
+        }
+        str.pop();
+
+        str
+    }
+
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]

From 03877c29bad5de89282ab9cd6b0b197af385402a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 7 Mar 2024 12:56:57 -0800
Subject: [PATCH 209/366] Do middleware resolution better

---
 src/syncback/mod.rs            | 108 +++++++++++++--------------------
 src/syncback/ref_properties.rs |   7 ---
 2 files changed, 42 insertions(+), 73 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 97b139581..acbfe7fd2 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -103,7 +103,7 @@ pub fn syncback_loop(
     let mut fs_snapshot = FsSnapshot::new();
 
     'syncback: while let Some(snapshot) = snapshots.pop() {
-        let inst_path = get_inst_path(&new_tree, snapshot.new);
+        let inst_path = snapshot.get_new_inst_path(snapshot.new);
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
@@ -205,17 +205,6 @@ pub struct SyncbackReturn<'sync> {
 }
 
 pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
-    if let Some(middleware) = snapshot.middleware {
-        return middleware;
-    };
-    let old_middleware = snapshot
-        .old_inst()
-        .and_then(|inst| inst.metadata().middleware);
-    if let Some(old_middleware) = old_middleware {
-        return old_middleware;
-    }
-
-    let inst = snapshot.new_inst();
     // At some point, we're better off using an O(1) method for checking
     // equality for classes like this.
     static JSON_MODEL_CLASSES: OnceLock<HashSet<&str>> = OnceLock::new();
@@ -227,57 +216,54 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
         }
     });
 
-    if json_model_classes.contains(inst.class.as_str()) {
-        if inst.children().is_empty() {
-            return Middleware::JsonModel;
+    let old_middleware = snapshot
+        .old_inst()
+        .and_then(|inst| inst.metadata().middleware);
+    let inst = snapshot.new_inst();
+
+    let mut middleware;
+
+    if let Some(override_middleware) = snapshot.middleware {
+        middleware = override_middleware;
+    } else if let Some(old_middleware) = old_middleware {
+        middleware = old_middleware;
+    } else if json_model_classes.contains(inst.class.as_str()) {
+        middleware = Middleware::JsonModel;
+    } else {
+        middleware = match inst.class.as_str() {
+            "Folder" | "Configuration" | "Tool" => Middleware::Dir,
+            "StringValue" => Middleware::Text,
+            "Script" => Middleware::ServerScript,
+            "LocalScript" => Middleware::ClientScript,
+            "ModuleScript" => Middleware::ModuleScript,
+            "LocalizationTable" => Middleware::Csv,
+            _ => match env::var(DEBUG_MODEL_FORMAT_VAR) {
+                Ok(value) if value == "1" => Middleware::Rbxmx,
+                _ => Middleware::Rbxm,
+            },
         }
-        // This begs the question of an init.model.json but we'll leave
-        // that for another day.
-        return Middleware::Dir;
     }
 
-    match inst.class.as_str() {
-        "Folder" | "Configuration" | "Tool" => Middleware::Dir,
-        "StringValue" => {
-            if inst.children().is_empty() {
-                Middleware::Text
-            } else {
-                Middleware::Dir
-            }
+    if !inst.children().is_empty() {
+        middleware = match middleware {
+            Middleware::ServerScript => Middleware::ServerScriptDir,
+            Middleware::ClientScript => Middleware::ClientScriptDir,
+            Middleware::ModuleScript => Middleware::ModuleScriptDir,
+            Middleware::Csv => Middleware::CsvDir,
+            Middleware::JsonModel | Middleware::Text => Middleware::Dir,
+            _ => middleware,
         }
-        "Script" => {
-            if inst.children().is_empty() {
-                Middleware::ServerScript
-            } else {
-                Middleware::ServerScriptDir
-            }
-        }
-        "LocalScript" => {
-            if inst.children().is_empty() {
-                Middleware::ClientScript
-            } else {
-                Middleware::ClientScriptDir
-            }
-        }
-        "ModuleScript" => {
-            if inst.children().is_empty() {
-                Middleware::ModuleScript
-            } else {
-                Middleware::ModuleScriptDir
-            }
-        }
-        "LocalizationTable" => {
-            if inst.children().is_empty() {
-                Middleware::Csv
-            } else {
-                Middleware::CsvDir
-            }
-        }
-        _ => match env::var(DEBUG_MODEL_FORMAT_VAR) {
+    }
+
+    if middleware == Middleware::Rbxm {
+        middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
             Ok(value) if value == "1" => Middleware::Rbxmx,
+            Ok(value) if value == "2" => Middleware::JsonModel,
             _ => Middleware::Rbxm,
-        },
+        }
     }
+
+    middleware
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -304,16 +290,6 @@ pub struct SyncbackRules {
     sync_unscriptable: Option<bool>,
 }
 
-fn get_inst_path(dom: &WeakDom, referent: Ref) -> String {
-    let mut path: VecDeque<&str> = VecDeque::new();
-    let mut inst = dom.get_by_ref(referent);
-    while let Some(instance) = inst {
-        path.push_front(&instance.name);
-        inst = dom.get_by_ref(instance.parent());
-    }
-    path.into_iter().collect::<Vec<&str>>().join("/")
-}
-
 /// Produces a list of descendants in the WeakDom such that all children come
 /// before their parents.
 fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 2eb5b5cec..1c43a6396 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -10,8 +10,6 @@ use rbx_dom_weak::{
 
 use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
 
-use super::get_inst_path;
-
 pub struct RefRewrites {
     links: MultiMap<Ref, (String, Ref)>,
 }
@@ -34,11 +32,6 @@ pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<RefRewrites> {
         for (name, value) in &instance.properties {
             if let Variant::Ref(prop_value) = value {
                 if dom.get_by_ref(*prop_value).is_some() {
-                    log::trace!(
-                        "Ref property: {}.{name} -> {}",
-                        get_inst_path(dom, referent),
-                        get_inst_path(dom, *prop_value)
-                    );
                     links.insert(referent, (name.clone(), *prop_value))
                 }
             }

From d5ac9123036860787cfde766f167a19fb59f2e22 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 7 Mar 2024 15:26:05 -0800
Subject: [PATCH 210/366] Do not write SharedString properties in JSON models

---
 src/snapshot_middleware/json_model.rs | 28 +++++++-----
 src/snapshot_middleware/meta_file.rs  | 21 +++++++++
 src/snapshot_middleware/project.rs    | 63 ++++++++++-----------------
 3 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 66226cf0d..ebce178c0 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -94,18 +94,26 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
     let mut properties = BTreeMap::new();
     let mut attributes = BTreeMap::new();
     for (name, value) in &new_inst.properties {
-        if let Variant::Attributes(attrs) = value {
-            for (attr_name, attr_value) in attrs.iter() {
-                attributes.insert(
-                    attr_name.clone(),
-                    UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
+        match value {
+            Variant::Attributes(attrs) => {
+                for (attr_name, attr_value) in attrs.iter() {
+                    attributes.insert(
+                        attr_name.clone(),
+                        UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
+                    );
+                }
+            }
+            Variant::SharedString(_) => {
+                log::warn!(
+                "Rojo cannot serialize the property {}.{name} in .model.json files.\n\
+                If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(new))
+            }
+            _ => {
+                properties.insert(
+                    name.clone(),
+                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
                 );
             }
-        } else {
-            properties.insert(
-                name.clone(),
-                UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
-            );
         }
     }
 
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index d0da4f8df..f9782fcb1 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -82,6 +82,27 @@ impl AdjacentMetadata {
 
         let class = &snapshot.new_inst().class;
         for (name, value) in &snapshot.new_inst().properties {
+            match value {
+                Variant::Attributes(attrs) => {
+                    for (attr_name, attr_value) in attrs.iter() {
+                        attributes.insert(
+                            attr_name.clone(),
+                            UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
+                        );
+                    }
+                }
+                Variant::SharedString(_) => {
+                    log::warn!(
+                    "Rojo cannot serialize the property {}.{name} in meta.json files.\n\
+                    If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", class, snapshot.get_new_inst_path(snapshot.new))
+                }
+                _ => {
+                    properties.insert(
+                        name.clone(),
+                        UnresolvedValue::from_variant(value.clone(), class, name),
+                    );
+                }
+            }
             if let Variant::Attributes(attrs) = value {
                 for (name, value) in attrs.iter() {
                     attributes.insert(
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 1cc3ebec8..fbc4874ea 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -363,59 +363,42 @@ pub fn syncback_project<'sync>(
             .unwrap();
         let properties = &mut node.properties;
         let mut attributes = BTreeMap::new();
-        if node.path.is_none() {
-            // This node is entirely defined in the project, so we put all
-            // properties in the node. We explicitly DO NOT clear old properties
-            // since it's likely people want them there.
-            for (name, value) in filtered_properties {
-                if let Variant::Attributes(attrs) = value {
+
+        // We would ideally have different behavior here based on whether a
+        // node has `$path` set. However, due to an issue with Middleware not
+        // knowing whether they originate from a project or not, we just skip
+        // writing metadata for things from projects. So to avoid properties
+        // being dropped, we don't filter them specially.
+        // TODO: We should handle this branching somehow so that meta.json files
+        // are respected.
+        for (name, value) in filtered_properties {
+            match value {
+                Variant::Attributes(attrs) => {
                     for (attr_name, attr_value) in attrs.iter() {
                         attributes.insert(
                             attr_name.clone(),
                             UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
                         );
                     }
-                } else {
-                    properties.insert(
-                        name.to_string(),
-                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                }
+                Variant::SharedString(_) => {
+                    log::warn!(
+                        "Rojo cannot serialize the property {}.{name} in project files.\n\
+                        If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(snapshot.new)
                     );
                 }
-            }
-        } else {
-            // TODO handle this in a way that doesn't suck.
-            // Due to an issue with middlewares not knowing they originate
-            // from a project with a path, we do not write metadata. This means
-            // that properties won't be written unless we update them in the
-            // path. So, while the below comment is left, it is not accurate
-            // at this time because we simply write all properties.
-
-            // This node has both a path so we only update properties. Adding
-            // new things is potentially destructive.
-            for (name, value) in filtered_properties {
-                if let Variant::Attributes(attrs) = value {
-                    for (attr_name, attr_value) in attrs.iter() {
-                        attributes.insert(
-                            attr_name.clone(),
-                            UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
-                        );
-                    }
-                } else {
-                    // if properties.contains_key(name) { // See TODO above
+                _ => {
                     properties.insert(
-                        name.to_owned(),
-                        UnresolvedValue::from_variant(
-                            value.to_owned(),
-                            old_inst.class_name(),
-                            name,
-                        ),
+                        name.to_string(),
+                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
                     );
-                    // }
                 }
             }
-            node.attributes = attributes;
+        }
+        node.attributes = attributes;
 
-            // And since it has a path, we have to run syncback on that path.
+        if node.path.is_some() {
+            // Since the node has a path, we have to run syncback on it.
             let node_path = node.path.as_ref().map(PathNode::path).expect(
                 "Project nodes with a path must have a path \
                 If you see this message, something went seriously wrong. Please report it.",

From fa7d73a8082fd5efbaefb52e215be26044bc1e36 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 8 Mar 2024 09:03:10 -0800
Subject: [PATCH 211/366] Actually use `sync_current_camera` correctly

---
 src/syncback/mod.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index acbfe7fd2..550812ea4 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -63,9 +63,7 @@ pub fn syncback_loop(
     deferred_referents.link(&mut new_tree)?;
 
     if let Some(syncback_rules) = &project.syncback_rules {
-        // I think this is a neat way to handle `sync_current_camera` being
-        // Option<bool>!
-        if let Some(true) = syncback_rules.sync_current_camera {
+        if !syncback_rules.sync_current_camera.unwrap_or_default() {
             let mut camera_ref = None;
             for child_ref in new_tree.root().children() {
                 let inst = new_tree.get_by_ref(*child_ref).unwrap();

From 1574246663b297002c524d2957192ac8fd176952 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 8 Mar 2024 10:16:02 -0800
Subject: [PATCH 212/366] Add 'root' method to RojoTree

---
 src/snapshot/tree.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/snapshot/tree.rs b/src/snapshot/tree.rs
index bcfc56bbd..d4f990f6d 100644
--- a/src/snapshot/tree.rs
+++ b/src/snapshot/tree.rs
@@ -70,6 +70,13 @@ impl RojoTree {
         self.inner.root_ref()
     }
 
+    /// Returns the root Instance of this tree.
+    #[inline]
+    pub fn root(&self) -> InstanceWithMeta {
+        self.get_instance(self.get_root_id())
+            .expect("RojoTrees should have a root")
+    }
+
     pub fn get_instance(&self, id: Ref) -> Option<InstanceWithMeta> {
         if let Some(instance) = self.inner.get_by_ref(id) {
             let metadata = self.metadata_map.get(&id).unwrap();

From b5657c511b95a1080e8831eb16828a7790a219bf Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 8 Mar 2024 10:16:42 -0800
Subject: [PATCH 213/366] Prune the new tree before running syncback

---
 src/syncback/mod.rs | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 550812ea4..c961bc4ba 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -43,6 +43,9 @@ pub fn syncback_loop(
     log::debug!("Collecting referents for new DOM...");
     let deferred_referents = collect_referents(&new_tree)?;
 
+    log::debug!("Pruning new tree");
+    strip_unknown_root_children(&mut new_tree, old_tree);
+
     log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
         let new_inst = new_tree.get_by_ref_mut(referent).unwrap();
@@ -307,3 +310,37 @@ fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
 
     ordered
 }
+
+/// Removes the children of `new`'s root that are not also children of `old`'s
+/// root.
+///
+/// This does not care about duplicates, and only filters based on names and
+/// class names.
+fn strip_unknown_root_children(new: &mut WeakDom, old: &RojoTree) {
+    let old_root = old.root();
+    let old_root_children: HashMap<&str, InstanceWithMeta> = old_root
+        .children()
+        .iter()
+        .map(|referent| {
+            let inst = old
+                .get_instance(*referent)
+                .expect("all children of a DOM's root should exist");
+            (inst.name(), inst)
+        })
+        .collect();
+
+    let root_children = new.root().children().to_vec();
+
+    for child_ref in root_children {
+        let child = new
+            .get_by_ref(child_ref)
+            .expect("all children of the root should exist in the DOM");
+        if let Some(old) = old_root_children.get(child.name.as_str()) {
+            if old.class_name() == child.class {
+                continue;
+            }
+        }
+        log::trace!("Pruning root child {} of class {}", child.name, child.class);
+        new.destroy(child_ref);
+    }
+}

From 71c17a272b89f8be95b26770a3e5b349ee5eac94 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 8 Mar 2024 10:32:32 -0800
Subject: [PATCH 214/366] Make debug messages in metadata middleware better

---
 src/snapshot_middleware/meta_file.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index f9782fcb1..615c5dfeb 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -67,7 +67,7 @@ impl AdjacentMetadata {
                 let source = source.path();
                 if source != path {
                     log::debug!(
-                        "Instance origin is mismatched so its metadata is being skipped. Path: {}",
+                        "Instigating source for Instance is mismatched so its metadata is being skipped.\nPath: {}",
                         path.display()
                     );
                     return Ok(None);
@@ -261,7 +261,7 @@ impl DirectoryMetadata {
                 let source = source.path();
                 if source != path {
                     log::debug!(
-                        "Instance origin is mismatched so its metadata is being skipped. Path: {}",
+                        "Instigating source for Instance is mismatched so its metadata is being skipped.\nPath: {}",
                         path.display()
                     );
                     return Ok(None);

From ec8658ce81df9b9e6bee8b788ad08692ff973261 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 12 Mar 2024 12:19:38 -0700
Subject: [PATCH 215/366] Actually update Rojo's version tag

---
 Cargo.lock         | 2 +-
 Cargo.toml         | 2 +-
 plugin/Version.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c5c14d30d..bc3385267 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1840,7 +1840,7 @@ dependencies = [
 
 [[package]]
 name = "rojo"
-version = "7.4.0"
+version = "7.4.0-uplift.syncback.rc.5"
 dependencies = [
  "anyhow",
  "backtrace",
diff --git a/Cargo.toml b/Cargo.toml
index 0627184d2..94dc35bd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rojo"
-version = "7.4.0"
+version = "7.4.0-uplift.syncback.rc.5"
 rust-version = "1.70.0"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "Enables professional-grade development tools for Roblox developers"
diff --git a/plugin/Version.txt b/plugin/Version.txt
index b61671799..eb77686a4 100644
--- a/plugin/Version.txt
+++ b/plugin/Version.txt
@@ -1 +1 @@
-7.4.0
\ No newline at end of file
+7.4.0-uplift.syncback.rc.5
\ No newline at end of file

From 29cbdf9ecbceec31616d80194917d9f3818d9d27 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 11:48:57 -0700
Subject: [PATCH 216/366] Filter user-restricted properties out before sync
 loop

---
 src/syncback/mod.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c961bc4ba..07ad0e9da 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -22,13 +22,13 @@ use crate::{
     glob::Glob,
     snapshot::{InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
+    syncback::property_filter::get_property_filter,
     Project,
 };
 
 pub use file_names::{name_for_inst, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
-pub use property_filter::filter_properties;
 pub use ref_properties::collect_referents;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
@@ -49,12 +49,20 @@ pub fn syncback_loop(
     log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
         let new_inst = new_tree.get_by_ref_mut(referent).unwrap();
-        new_inst.properties = filter_properties(project.syncback_rules.as_ref(), new_inst);
+        if let Some(filter) = get_property_filter(project, new_inst) {
+            for prop in filter {
+                new_inst.properties.remove(prop);
+            }
+        }
     }
     for referent in descendants(old_tree.inner(), old_tree.get_root_id()) {
         let mut old_inst_rojo = old_tree.get_instance_mut(referent).unwrap();
         let old_inst = old_inst_rojo.inner_mut();
-        old_inst.properties = filter_properties(project.syncback_rules.as_ref(), old_inst);
+        if let Some(filter) = get_property_filter(project, old_inst) {
+            for prop in filter {
+                old_inst.properties.remove(prop);
+            }
+        }
     }
 
     log::debug!("Hashing project DOM");

From 7c61eb348a0e472165b759ce32f570e47af50fa8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 12:10:02 -0700
Subject: [PATCH 217/366] Redo hashing and move filtering logic around

---
 src/syncback/hash/mod.rs        | 146 ++++++++++++++++----------------
 src/syncback/mod.rs             |  36 +++++++-
 src/syncback/property_filter.rs |  77 ++++++-----------
 3 files changed, 131 insertions(+), 128 deletions(-)

diff --git a/src/syncback/hash/mod.rs b/src/syncback/hash/mod.rs
index 77c34e0d7..914816eaf 100644
--- a/src/syncback/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -10,116 +10,112 @@ use rbx_dom_weak::{
 };
 use std::collections::HashMap;
 
-use crate::variant_eq::variant_eq;
+use crate::{variant_eq::variant_eq, Project};
 
-use super::descendants;
+use super::{descendants, property_filter::filter_properties_preallocated};
 
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
-/// `Instance` it points to, including the properties but not including the
-/// descendants of the Instance.
+/// `Instance` it points to, including the properties and descendants of the
+/// `Instance`.
 ///
-/// The hashes **do not** include the descendants of the Instances in them,
-/// so they should only be used for comparing Instances directly. To compare a
-/// subtree, use `hash_tree`.
-pub fn hash_tree_no_descendants(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
-    let mut map: HashMap<Ref, Hash> = HashMap::new();
+/// The hashes **do** include the descendants of the Instances in them,
+/// so they should only be used for comparing subtrees directly.
+pub fn hash_tree(project: &Project, dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
     let mut order = descendants(dom, root_ref);
+    let mut map: HashMap<Ref, Hash> = HashMap::with_capacity(order.len());
 
     let mut prop_list = Vec::with_capacity(2);
+    let mut child_hashes = Vec::new();
 
     while let Some(referent) = order.pop() {
         let inst = dom.get_by_ref(referent).unwrap();
-        let hash = hash_inst_no_descendants(inst, &mut prop_list);
+        let mut hasher = hash_inst_filtered(project, inst, &mut prop_list);
+        add_children(inst, &map, &mut child_hashes, &mut hasher);
 
-        map.insert(referent, hash.finalize());
+        map.insert(referent, hasher.finalize());
     }
 
     map
 }
 
-/// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
-/// `Instance` it points to, including the properties and descendants of the
-/// `Instance`.
+/// Hashes a single Instance from the provided WeakDom, if it exists.
 ///
-/// The hashes **do** include the descendants of the Instances in them,
-/// so they should only be used for comparing subtrees directly. To compare an
-/// `Instance` directly, use `hash_tree_no_descendants`.
-pub fn hash_tree(dom: &WeakDom, root_ref: Ref) -> HashMap<Ref, Hash> {
-    let mut map: HashMap<Ref, Hash> = HashMap::new();
-    let mut order = descendants(dom, root_ref);
-
+/// This function filters properties using user-provided syncing rules from
+/// the passed project.
+#[inline]
+pub fn hash_instance(project: &Project, dom: &WeakDom, referent: Ref) -> Option<Hash> {
     let mut prop_list = Vec::with_capacity(2);
+    let inst = dom.get_by_ref(referent)?;
 
-    while let Some(referent) = order.pop() {
-        let inst = dom.get_by_ref(referent).unwrap();
-        let hash = hash_inst(inst, &mut prop_list, &map);
+    Some(hash_inst_filtered(project, inst, &mut prop_list).finalize())
+}
 
-        map.insert(referent, hash);
+/// Adds the hashes of children for an Instance to the provided Hasher.
+fn add_children(
+    inst: &Instance,
+    map: &HashMap<Ref, Hash>,
+    child_hashes: &mut Vec<[u8; 32]>,
+    hasher: &mut Hasher,
+) {
+    for child_ref in inst.children() {
+        if let Some(hash) = map.get(child_ref) {
+            child_hashes.push(*hash.as_bytes())
+        } else {
+            panic!("Invariant violated: child not hashed before parent")
+        }
     }
+    child_hashes.sort_unstable();
 
-    map
+    for hash in child_hashes.drain(..) {
+        hasher.update(&hash);
+    }
+}
+
+/// Performs hashing on an Instance using a filtered property list.
+/// Does not include the hashes of any children.
+fn hash_inst_filtered<'inst>(
+    project: &Project,
+    inst: &'inst Instance,
+    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
+) -> Hasher {
+    filter_properties_preallocated(project, inst, prop_list);
+
+    hash_inst_prefilled(inst, prop_list)
 }
 
-/// Hashes an Instance using its class, name, and properties. The passed
-/// `prop_list` is used to sort properties before hashing them.
-fn hash_inst_no_descendants<'inst>(
+/// Performs hashing on an Instance using a pre-filled list of properties.
+/// It is assumed the property list is **not** sorted, so it is sorted in-line.
+fn hash_inst_prefilled<'inst>(
     inst: &'inst Instance,
     prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
 ) -> Hasher {
     let mut hasher = Hasher::new();
-    hasher.update(inst.class.as_bytes());
     hasher.update(inst.name.as_bytes());
+    hasher.update(inst.class.as_bytes());
+
+    prop_list.sort_unstable_by_key(|(name, _)| *name);
 
     let descriptor = rbx_reflection_database::get()
         .classes
-        .get(inst.class.as_str())
-        .expect("class should be known to Rojo");
-
-    for (name, value) in &inst.properties {
-        if let Some(default) = descriptor.default_properties.get(name.as_str()) {
-            if !variant_eq(default, value) {
-                prop_list.push((name, value))
+        .get(inst.class.as_str());
+
+    if let Some(descriptor) = descriptor {
+        for (name, value) in prop_list.drain(..) {
+            hasher.update(name.as_bytes());
+            if let Some(default) = descriptor.default_properties.get(name) {
+                if !variant_eq(default, value) {
+                    hash_variant(&mut hasher, value)
+                }
+            } else {
+                hash_variant(&mut hasher, value)
             }
-        } else {
-            prop_list.push((name, value))
         }
-    }
-
-    prop_list.sort_unstable_by_key(|(key, _)| *key);
-    for (name, value) in prop_list.iter() {
-        hasher.update(name.as_bytes());
-        hash_variant(&mut hasher, value)
-    }
-
-    prop_list.clear();
-
-    hasher
-}
-
-/// Hashes an Instance using its class, name, properties, and descendants.
-/// The passed `prop_list` is used to sort properties before hashing them.
-///
-/// # Panics
-/// If any children of the Instance are inside `map`, this function will panic.
-fn hash_inst<'inst>(
-    inst: &'inst Instance,
-    prop_list: &mut Vec<(&'inst str, &'inst Variant)>,
-    map: &HashMap<Ref, Hash>,
-) -> Hash {
-    let mut hasher = hash_inst_no_descendants(inst, prop_list);
-    let mut child_list = Vec::with_capacity(inst.children().len());
-
-    for child in inst.children() {
-        if let Some(hash) = map.get(child) {
-            child_list.push(hash.as_bytes())
-        } else {
-            panic!("Invariant: child {} not hashed before its parent", child);
+    } else {
+        for (name, value) in prop_list.drain(..) {
+            hasher.update(name.as_bytes());
+            hash_variant(&mut hasher, value)
         }
     }
-    child_list.sort_unstable();
-    for hash in child_list {
-        hasher.update(hash);
-    }
 
-    hasher.finalize()
+    hasher
 }
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 07ad0e9da..67c4d4c0c 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -9,7 +9,7 @@ use anyhow::Context;
 use memofs::Vfs;
 use rbx_dom_weak::{
     types::{Ref, Variant},
-    WeakDom,
+    Instance, WeakDom,
 };
 use serde::{Deserialize, Serialize};
 use std::{
@@ -22,7 +22,6 @@ use crate::{
     glob::Glob,
     snapshot::{InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
-    syncback::property_filter::get_property_filter,
     Project,
 };
 
@@ -66,9 +65,9 @@ pub fn syncback_loop(
     }
 
     log::debug!("Hashing project DOM");
-    let old_hashes = hash_tree(old_tree.inner(), old_tree.get_root_id());
+    let old_hashes = hash_tree(project, old_tree.inner(), old_tree.get_root_id());
     log::debug!("Hashing file DOM");
-    let new_hashes = hash_tree(&new_tree, new_tree.root_ref());
+    let new_hashes = hash_tree(project, &new_tree, new_tree.root_ref());
 
     log::debug!("Linking referents for new DOM");
     deferred_referents.link(&mut new_tree)?;
@@ -299,6 +298,35 @@ pub struct SyncbackRules {
     sync_unscriptable: Option<bool>,
 }
 
+/// Returns a set of properties that should not be written with syncback if
+/// one exists. This list is read directly from the Project and takes
+/// inheritance into effect.
+fn get_property_filter<'project>(
+    project: &'project Project,
+    new_inst: &Instance,
+) -> Option<HashSet<&'project String>> {
+    let filter = &project.syncback_rules.as_ref()?.ignore_properties;
+    let mut set = HashSet::new();
+
+    let database = rbx_reflection_database::get();
+    let mut current_class_name = new_inst.class.as_str();
+
+    loop {
+        if let Some(list) = filter.get(current_class_name) {
+            set.extend(list)
+        }
+
+        let class = database.classes.get(current_class_name)?;
+        if let Some(super_class) = class.superclass.as_ref() {
+            current_class_name = &super_class;
+        } else {
+            break;
+        }
+    }
+
+    Some(set)
+}
+
 /// Produces a list of descendants in the WeakDom such that all children come
 /// before their parents.
 fn descendants(dom: &WeakDom, root_ref: Ref) -> Vec<Ref> {
diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index 5d92348fb..f0de41e93 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -1,21 +1,35 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::HashMap;
 
 use rbx_dom_weak::{types::Variant, Instance};
 use rbx_reflection::Scriptability;
 
-use crate::variant_eq::variant_eq;
+use crate::{variant_eq::variant_eq, Project};
 
-use super::SyncbackRules;
+/// Returns a map of properties from `inst` that are allowed as per the filters
+/// in `project`.
+pub fn filter_properties<'inst>(
+    project: &Project,
+    inst: &'inst Instance,
+) -> HashMap<&'inst str, &'inst Variant> {
+    let mut map = Vec::with_capacity(inst.properties.len());
+    filter_properties_preallocated(project, inst, &mut map);
 
-pub fn filter_properties(
-    data: Option<&SyncbackRules>,
-    inst: &Instance,
-) -> HashMap<String, Variant> {
-    let sync_unscriptable = data.and_then(|s| s.sync_unscriptable).unwrap_or_default();
-    let mut properties: HashMap<String, Variant> =
-        HashMap::with_capacity(inst.properties.capacity());
+    map.into_iter().collect()
+}
+
+/// Fills `allocation` with a list of properties from `inst` that are allowed
+/// as per the filters in `project`.
+pub fn filter_properties_preallocated<'inst>(
+    project: &Project,
+    inst: &'inst Instance,
+    allocation: &mut Vec<(&'inst str, &'inst Variant)>,
+) {
+    let sync_unscriptable = project
+        .syncback_rules
+        .as_ref()
+        .and_then(|s| s.sync_unscriptable)
+        .unwrap_or_default();
 
-    let filter = get_property_filter(data, inst);
     let class_data = rbx_reflection_database::get()
         .classes
         .get(inst.class.as_str());
@@ -24,11 +38,6 @@ pub fn filter_properties(
         if matches!(prop_value, Variant::Ref(_)) {
             return true;
         }
-        if let Some(list) = &filter {
-            if list.contains(prop_name) {
-                return true;
-            }
-        }
         if !sync_unscriptable {
             if let Some(data) = class_data {
                 if let Some(prop_data) = data.properties.get(prop_name.as_str()) {
@@ -49,10 +58,10 @@ pub fn filter_properties(
             }
             if let Some(default) = defaults.get(name.as_str()) {
                 if !variant_eq(value, default) {
-                    properties.insert(name.clone(), value.clone());
+                    allocation.push((name, value));
                 }
             } else {
-                properties.insert(name.clone(), value.clone());
+                allocation.push((name, value));
             }
         }
     } else {
@@ -60,37 +69,7 @@ pub fn filter_properties(
             if predicate(name, value) {
                 continue;
             }
-            properties.insert(name.clone(), value.clone());
-        }
-    }
-
-    properties
-}
-
-/// Returns a set of properties that should not be written with syncback if
-/// one exists.
-fn get_property_filter<'rules>(
-    rules: Option<&'rules SyncbackRules>,
-    new_inst: &Instance,
-) -> Option<HashSet<&'rules String>> {
-    let filter = &rules?.ignore_properties;
-    let mut set = HashSet::new();
-
-    let database = rbx_reflection_database::get();
-    let mut current_class_name = new_inst.class.as_str();
-
-    loop {
-        if let Some(list) = filter.get(current_class_name) {
-            set.extend(list)
-        }
-
-        let class = database.classes.get(current_class_name)?;
-        if let Some(super_class) = class.superclass.as_ref() {
-            current_class_name = &super_class;
-        } else {
-            break;
+            allocation.push((name, value));
         }
     }
-
-    Some(set)
 }

From 7d0784cc904b5c0d63cfe2729d8d8f92acfb2317 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 12:14:43 -0700
Subject: [PATCH 218/366] Store Project in syncback snapshot instead of only
 the rules

---
 src/syncback/mod.rs      |  2 +-
 src/syncback/snapshot.rs | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 67c4d4c0c..7b911cedf 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -95,7 +95,7 @@ pub fn syncback_loop(
         vfs,
         old_tree,
         new_tree: &new_tree,
-        syncback_rules: project.syncback_rules.as_ref(),
+        project,
     };
 
     let mut snapshots = vec![SyncbackSnapshot {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 6be48e9b7..cd1957356 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -11,14 +11,13 @@ use crate::{
     snapshot::{InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     variant_eq::variant_eq,
+    Project,
 };
 use rbx_dom_weak::{
     types::{Ref, Variant},
     Instance, WeakDom,
 };
 
-use super::SyncbackRules;
-
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
@@ -27,7 +26,7 @@ pub struct SyncbackData<'sync> {
     pub(super) vfs: &'sync Vfs,
     pub(super) old_tree: &'sync RojoTree,
     pub(super) new_tree: &'sync WeakDom,
-    pub(super) syncback_rules: Option<&'sync SyncbackRules>,
+    pub(super) project: &'sync Project,
 }
 
 pub struct SyncbackSnapshot<'sync> {
@@ -294,7 +293,9 @@ impl<'sync> SyncbackSnapshot<'sync> {
     #[inline]
     pub fn ignore_props(&self) -> Option<&HashMap<String, Vec<String>>> {
         self.data
+            .project
             .syncback_rules
+            .as_ref()
             .map(|rules| &rules.ignore_properties)
     }
 
@@ -302,7 +303,9 @@ impl<'sync> SyncbackSnapshot<'sync> {
     #[inline]
     pub fn ignore_paths(&self) -> Option<&[Glob]> {
         self.data
+            .project
             .syncback_rules
+            .as_ref()
             .map(|rules| rules.ignore_paths.as_slice())
     }
 
@@ -310,7 +313,9 @@ impl<'sync> SyncbackSnapshot<'sync> {
     #[inline]
     pub fn ignore_tree(&self) -> Option<&[String]> {
         self.data
+            .project
             .syncback_rules
+            .as_ref()
             .map(|rules| rules.ignore_trees.as_slice())
     }
 
@@ -319,7 +324,9 @@ impl<'sync> SyncbackSnapshot<'sync> {
     #[inline]
     pub fn sync_unscriptable(&self) -> bool {
         self.data
+            .project
             .syncback_rules
+            .as_ref()
             .and_then(|sr| sr.sync_unscriptable)
             .unwrap_or_default()
     }

From 40d79ecc3560504d2a83f7564aa4fb401d1adf9c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 12:15:34 -0700
Subject: [PATCH 219/366] Don't double filter properties

---
 src/syncback/snapshot.rs | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index cd1957356..d9b8a5a99 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,7 +1,7 @@
 use memofs::Vfs;
 use rbx_reflection::Scriptability;
 use std::{
-    collections::{BTreeSet, HashMap},
+    collections::HashMap,
     path::{Path, PathBuf},
     sync::OnceLock,
 };
@@ -109,7 +109,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
         let mut properties: HashMap<&str, &Variant> =
             HashMap::with_capacity(inst.properties.capacity());
 
-        let filter = self.get_property_filter();
         let class_data = rbx_reflection_database::get()
             .classes
             .get(inst.class.as_str());
@@ -121,11 +120,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
             if filter_out_property(inst, prop_name) {
                 return true;
             }
-            if let Some(list) = &filter {
-                if list.contains(prop_name) {
-                    return true;
-                }
-            }
             if !self.sync_unscriptable() {
                 if let Some(data) = class_data {
                     if let Some(prop_data) = data.properties.get(prop_name.as_str()) {
@@ -174,31 +168,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
         Some(properties)
     }
 
-    /// Returns a set of properties that should not be written with syncback if
-    /// one exists.
-    fn get_property_filter(&self) -> Option<BTreeSet<&String>> {
-        let filter = self.ignore_props()?;
-        let mut set = BTreeSet::new();
-
-        let database = rbx_reflection_database::get();
-        let mut current_class_name = self.new_inst().class.as_str();
-
-        loop {
-            if let Some(list) = filter.get(current_class_name) {
-                set.extend(list)
-            }
-
-            let class = database.classes.get(current_class_name)?;
-            if let Some(super_class) = class.superclass.as_ref() {
-                current_class_name = &super_class;
-            } else {
-                break;
-            }
-        }
-
-        Some(set)
-    }
-
     /// Returns whether a given path is allowed for syncback by matching `path`
     /// against every user specified glob for ignoring.
     ///

From e64802a5b10868d9c9253a82dbe7c6cd98b3f828 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:25:41 -0700
Subject: [PATCH 220/366] Update `get_filtered_properties` to use property
 filtering

---
 src/syncback/snapshot.rs | 88 ++++++----------------------------------
 1 file changed, 12 insertions(+), 76 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index d9b8a5a99..ab504a13b 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -1,5 +1,4 @@
 use memofs::Vfs;
-use rbx_reflection::Scriptability;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
@@ -10,7 +9,6 @@ use crate::{
     glob::Glob,
     snapshot::{InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
-    variant_eq::variant_eq,
     Project,
 };
 use rbx_dom_weak::{
@@ -18,6 +16,8 @@ use rbx_dom_weak::{
     Instance, WeakDom,
 };
 
+use super::property_filter::filter_properties;
+
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
 
@@ -81,89 +81,25 @@ impl<'sync> SyncbackSnapshot<'sync> {
         self
     }
 
-    /// Returns a map of properties for the 'new' Instance with filtering
-    /// done to avoid noise.
-    ///
-    /// Note that while the returned map does filter based on the user's
-    /// `ignore_props` field, it does not do any other filtering and doesn't
-    /// clone any data. This is left to the consumer.
-    #[inline]
-    pub fn new_filtered_properties(&self) -> HashMap<&'sync str, &'sync Variant> {
-        self.get_filtered_properties(self.new, self.old).unwrap()
-    }
-
     /// Returns a map of properties for an Instance from the 'new' tree
     /// with filtering done to avoid noise. Returns `None` only if `new_ref`
-    /// instance is not in the new tree or if `old_ref` is provided and not in
-    /// the old tree.
+    /// instance is not in the new tree.
     ///
-    /// Note that while the returned map does filter based on the user's
-    /// `ignore_props` field, it does not do any other filtering and doesn't
-    /// clone any data. This is left to the consumer.
+    /// This method is not necessary or desired for blobs like RBXM or RBXMX.
+    #[inline]
+    #[must_use]
     pub fn get_filtered_properties(
         &self,
         new_ref: Ref,
-        old_ref: Option<Ref>,
     ) -> Option<HashMap<&'sync str, &'sync Variant>> {
         let inst = self.get_new_instance(new_ref)?;
-        let mut properties: HashMap<&str, &Variant> =
-            HashMap::with_capacity(inst.properties.capacity());
-
-        let class_data = rbx_reflection_database::get()
-            .classes
-            .get(inst.class.as_str());
-
-        let predicate = |prop_name: &String, prop_value: &Variant| {
-            if matches!(prop_value, Variant::Ref(_) | Variant::SharedString(_)) {
-                return true;
-            }
-            if filter_out_property(inst, prop_name) {
-                return true;
-            }
-            if !self.sync_unscriptable() {
-                if let Some(data) = class_data {
-                    if let Some(prop_data) = data.properties.get(prop_name.as_str()) {
-                        if matches!(prop_data.scriptability, Scriptability::None) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            false
-        };
 
-        if let Some(old_inst) = old_ref.and_then(|referent| self.get_old_instance(referent)) {
-            for (name, value) in &inst.properties {
-                if predicate(name, value) {
-                    continue;
-                }
-                if old_inst.properties().contains_key(name) {
-                    properties.insert(name, value);
-                }
-            }
-        }
-        if let Some(class_data) = class_data {
-            let defaults = &class_data.default_properties;
-            for (name, value) in &inst.properties {
-                if predicate(name, value) {
-                    continue;
-                }
-                if let Some(default) = defaults.get(name.as_str()) {
-                    if !variant_eq(value, default) {
-                        properties.insert(name, value);
-                    }
-                } else {
-                    properties.insert(name, value);
-                }
-            }
-        } else {
-            for (name, value) in &inst.properties {
-                if predicate(name, value) {
-                    continue;
-                }
-                properties.insert(name, value);
-            }
-        }
+        // The only filtering we have to do is filter out properties that are
+        // special-cased in some capacity.
+        let properties = filter_properties(self.data.project, inst)
+            .into_iter()
+            .filter(|(name, _)| !filter_out_property(inst, name))
+            .collect();
 
         Some(properties)
     }

From 914ed6ee0e6157c448741632f8bd454d7e77ef42 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:26:19 -0700
Subject: [PATCH 221/366] Update doc comments for property filtering functions

---
 src/syncback/property_filter.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index f0de41e93..b8012bcea 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -5,8 +5,8 @@ use rbx_reflection::Scriptability;
 
 use crate::{variant_eq::variant_eq, Project};
 
-/// Returns a map of properties from `inst` that are allowed as per the filters
-/// in `project`.
+/// Returns a map of properties from `inst` that are both allowed under the
+/// user-provided settings *and* not their default value.
 pub fn filter_properties<'inst>(
     project: &Project,
     inst: &'inst Instance,
@@ -17,8 +17,8 @@ pub fn filter_properties<'inst>(
     map.into_iter().collect()
 }
 
-/// Fills `allocation` with a list of properties from `inst` that are allowed
-/// as per the filters in `project`.
+/// Fills `allocation` with a list of properties from `inst` that are both
+/// allowed under the user-provided settings *and* not their default value.
 pub fn filter_properties_preallocated<'inst>(
     project: &Project,
     inst: &'inst Instance,

From 2fc6eca2ee18bf31d09c4b038ae7b274640a285a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:26:52 -0700
Subject: [PATCH 222/366] use `get_filtered_properties` where we should

---
 src/snapshot_middleware/meta_file.rs | 21 ++++-----------------
 src/snapshot_middleware/project.rs   |  2 +-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 615c5dfeb..7a1c22b11 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -81,7 +81,7 @@ impl AdjacentMetadata {
             .unwrap_or_default();
 
         let class = &snapshot.new_inst().class;
-        for (name, value) in &snapshot.new_inst().properties {
+        for (name, value) in snapshot.get_filtered_properties(snapshot.new).unwrap() {
             match value {
                 Variant::Attributes(attrs) => {
                     for (attr_name, attr_value) in attrs.iter() {
@@ -98,23 +98,10 @@ impl AdjacentMetadata {
                 }
                 _ => {
                     properties.insert(
-                        name.clone(),
-                        UnresolvedValue::from_variant(value.clone(), class, name),
-                    );
-                }
-            }
-            if let Variant::Attributes(attrs) = value {
-                for (name, value) in attrs.iter() {
-                    attributes.insert(
                         name.to_owned(),
-                        UnresolvedValue::from_variant_unambiguous(value.clone()),
+                        UnresolvedValue::from_variant(value.clone(), class, name),
                     );
                 }
-            } else {
-                properties.insert(
-                    name.clone(),
-                    UnresolvedValue::from_variant(value.clone(), class, name),
-                );
             }
         }
 
@@ -275,7 +262,7 @@ impl DirectoryMetadata {
             .unwrap_or_default();
 
         let class = &snapshot.new_inst().class;
-        for (name, value) in &snapshot.new_inst().properties {
+        for (name, value) in snapshot.get_filtered_properties(snapshot.new).unwrap() {
             if let Variant::Attributes(attrs) = value {
                 for (name, value) in attrs.iter() {
                     attributes.insert(
@@ -285,7 +272,7 @@ impl DirectoryMetadata {
                 }
             } else {
                 properties.insert(
-                    name.clone(),
+                    name.to_owned(),
                     UnresolvedValue::from_variant(value.clone(), class, name),
                 );
             }
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index fbc4874ea..e1ca28597 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -359,7 +359,7 @@ pub fn syncback_project<'sync>(
         }
 
         let filtered_properties = snapshot
-            .get_filtered_properties(new_inst.referent(), Some(old_inst.id()))
+            .get_filtered_properties(new_inst.referent())
             .unwrap();
         let properties = &mut node.properties;
         let mut attributes = BTreeMap::new();

From 848293d1ac98f046c288c98cb841ea6ec3be3d03 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:43:21 -0700
Subject: [PATCH 223/366] Add function for getting project from snapshot data

---
 src/syncback/snapshot.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index ab504a13b..b008f33ef 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -182,6 +182,12 @@ impl<'sync> SyncbackSnapshot<'sync> {
             .expect("SyncbackSnapshot should not contain invalid referents")
     }
 
+    /// Returns the root Project that was used to make this snapshot.
+    #[inline]
+    pub fn project(&self) -> &'sync Project {
+        self.data.project
+    }
+
     /// Returns the underlying VFS being used for syncback.
     #[inline]
     pub fn vfs(&self) -> &'sync Vfs {

From 2576a21066bd59e012c815151458574a4a6fd305 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:43:38 -0700
Subject: [PATCH 224/366] Export stuff from property_filter

---
 src/syncback/hash/mod.rs | 2 +-
 src/syncback/mod.rs      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/syncback/hash/mod.rs b/src/syncback/hash/mod.rs
index 914816eaf..f7a282b6a 100644
--- a/src/syncback/hash/mod.rs
+++ b/src/syncback/hash/mod.rs
@@ -12,7 +12,7 @@ use std::collections::HashMap;
 
 use crate::{variant_eq::variant_eq, Project};
 
-use super::{descendants, property_filter::filter_properties_preallocated};
+use super::{descendants, filter_properties_preallocated};
 
 /// Returns a map of every `Ref` in the `WeakDom` to a hashed version of the
 /// `Instance` it points to, including the properties and descendants of the
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 7b911cedf..f40813f0d 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -28,6 +28,7 @@ use crate::{
 pub use file_names::{name_for_inst, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
+pub use property_filter::{filter_properties, filter_properties_preallocated};
 pub use ref_properties::collect_referents;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 

From ebbf86f30aa0253c5245762baa56f2db3bc2c48e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:44:47 -0700
Subject: [PATCH 225/366] Use property filtering function for JsonModel
 syncback

---
 src/snapshot_middleware/json_model.rs | 44 +++++++++------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index ebce178c0..ff889e1e3 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     resolution::UnresolvedValue,
     snapshot::{InstanceContext, InstanceSnapshot},
-    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{filter_properties_preallocated, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
     RojoRef,
 };
 
@@ -70,7 +70,9 @@ pub fn syncback_json_model<'sync>(
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let path = snapshot.parent_path.join(file_name);
 
-    let mut model = json_model_from_pair(snapshot, snapshot.new, snapshot.old);
+    let mut property_buffer = Vec::with_capacity(snapshot.new_inst().properties.len());
+
+    let mut model = json_model_from_pair(snapshot, &mut property_buffer, snapshot.new);
     // We don't need the name on the root, but we do for children.
     model.name = None;
 
@@ -85,15 +87,20 @@ pub fn syncback_json_model<'sync>(
     })
 }
 
-fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>) -> JsonModel {
+fn json_model_from_pair<'sync>(
+    snapshot: &SyncbackSnapshot<'sync>,
+    prop_buffer: &mut Vec<(&'sync str, &'sync Variant)>,
+    new: Ref,
+) -> JsonModel {
     let new_inst = snapshot
         .get_new_instance(new)
         .expect("all new referents passed to json_model_from_pair should exist");
-    let old_inst = old.and_then(|r| snapshot.get_old_instance(r));
+
+    filter_properties_preallocated(snapshot.project(), new_inst, prop_buffer);
 
     let mut properties = BTreeMap::new();
     let mut attributes = BTreeMap::new();
-    for (name, value) in &new_inst.properties {
+    for (name, value) in prop_buffer.drain(..) {
         match value {
             Variant::Attributes(attrs) => {
                 for (attr_name, attr_value) in attrs.iter() {
@@ -110,7 +117,7 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
             }
             _ => {
                 properties.insert(
-                    name.clone(),
+                    name.to_owned(),
                     UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
                 );
             }
@@ -119,29 +126,8 @@ fn json_model_from_pair(snapshot: &SyncbackSnapshot, new: Ref, old: Option<Ref>)
 
     let mut children = Vec::with_capacity(new_inst.children().len());
 
-    if let Some(old_inst) = old_inst {
-        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
-        for child_ref in old_inst.children() {
-            let inst = snapshot.get_old_instance(*child_ref).unwrap();
-            old_child_map.insert(inst.name(), *child_ref);
-        }
-
-        for new_child_ref in new_inst.children() {
-            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
-            if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
-                children.push(json_model_from_pair(
-                    snapshot,
-                    *new_child_ref,
-                    Some(old_child),
-                ))
-            } else {
-                children.push(json_model_from_pair(snapshot, new, None))
-            }
-        }
-    } else {
-        for new_child_ref in new_inst.children() {
-            children.push(json_model_from_pair(snapshot, *new_child_ref, None))
-        }
+    for new_child_ref in new_inst.children() {
+        children.push(json_model_from_pair(snapshot, prop_buffer, *new_child_ref))
     }
 
     JsonModel {

From 4a8729c98a8e02a36eba330113848277fddedeaf Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 14:57:13 -0700
Subject: [PATCH 226/366] Make hashing check more resilient to failure

---
 src/syncback/mod.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index f40813f0d..710a92814 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -116,12 +116,16 @@ pub fn syncback_loop(
         // We can quickly check that two subtrees are identical and if they are,
         // skip reconciling them.
         if let Some(old_ref) = snapshot.old {
-            if old_hashes.get(&old_ref) == new_hashes.get(&snapshot.new) {
-                log::trace!(
-                    "Skipping {inst_path} due to it being identically hashed as {:?}",
-                    old_hashes.get(&old_ref)
-                );
-                continue;
+            match (old_hashes.get(&old_ref), new_hashes.get(&snapshot.new)) {
+                (Some(old), Some(new)) => {
+                    if old == new {
+                        log::trace!(
+                            "Skipping {inst_path} due to it being identically hashed as {old:?}"
+                        );
+                        continue;
+                    }
+                }
+                _ => unreachable!("All Instances in both DOMs should have hashes"),
             }
         }
 

From b7b6e8dc04d86b799b6c214f9e1613ced962e47d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 15:27:04 -0700
Subject: [PATCH 227/366] Update SharedString warning message in JsonModel

---
 src/snapshot_middleware/json_model.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index ff889e1e3..cc1e0723d 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -112,7 +112,7 @@ fn json_model_from_pair<'sync>(
             }
             Variant::SharedString(_) => {
                 log::warn!(
-                "Rojo cannot serialize the property {}.{name} in .model.json files.\n\
+                "Rojo cannot serialize the property {}.{name} in model.json files.\n\
                 If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(new))
             }
             _ => {

From 03697882a05b4a042a7f4124d632429dd76c9380 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 15:28:24 -0700
Subject: [PATCH 228/366] Handle SharedString in directory meta.json

---
 src/snapshot_middleware/meta_file.rs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 7a1c22b11..089fffa60 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -263,18 +263,26 @@ impl DirectoryMetadata {
 
         let class = &snapshot.new_inst().class;
         for (name, value) in snapshot.get_filtered_properties(snapshot.new).unwrap() {
-            if let Variant::Attributes(attrs) = value {
-                for (name, value) in attrs.iter() {
-                    attributes.insert(
+            match value {
+                Variant::Attributes(attrs) => {
+                    for (name, value) in attrs.iter() {
+                        attributes.insert(
+                            name.to_owned(),
+                            UnresolvedValue::from_variant_unambiguous(value.clone()),
+                        );
+                    }
+                }
+                Variant::SharedString(_) => {
+                    log::warn!(
+                    "Rojo cannot serialize the property {}.{name} in meta.json files.\n\
+                    If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", class, snapshot.get_new_inst_path(snapshot.new))
+                }
+                _ => {
+                    properties.insert(
                         name.to_owned(),
-                        UnresolvedValue::from_variant_unambiguous(value.clone()),
+                        UnresolvedValue::from_variant(value.clone(), class, name),
                     );
                 }
-            } else {
-                properties.insert(
-                    name.to_owned(),
-                    UnresolvedValue::from_variant(value.clone(), class, name),
-                );
             }
         }
 

From 2041b99c26df4e435579d3234c0bb64e4d3a4c5d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 14 Mar 2024 15:28:41 -0700
Subject: [PATCH 229/366] Actually use debug env var correctly

---
 src/syncback/mod.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 710a92814..c68616db8 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -32,6 +32,13 @@ pub use property_filter::{filter_properties, filter_properties_preallocated};
 pub use ref_properties::collect_referents;
 pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
+/// The name of an enviroment variable to use to override the behavior of
+/// syncback on model files.
+/// By default, syncabck will use `Rbxm` for model files.
+/// If this is set to `1`, it will instead use `Rbxmx`. If it is set to `2`,
+/// it will use `JsonModel`.
+///
+/// This will override existing `Rbxm` middleware too, not just new files.
 const DEBUG_MODEL_FORMAT_VAR: &str = "ROJO_SYNCBACK_DEBUG";
 
 pub fn syncback_loop(
@@ -160,6 +167,7 @@ pub fn syncback_loop(
         if syncback_res.is_err() && middleware.is_dir() {
             let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
                 Ok(value) if value == "1" => Middleware::Rbxmx,
+                Ok(value) if value == "2" => Middleware::JsonModel,
                 _ => Middleware::Rbxm,
             };
             let appended_name =
@@ -179,6 +187,7 @@ pub fn syncback_loop(
                 instead be synced back as {}",
                 working_path.file_name().and_then(|s| s.to_str()).unwrap()
             );
+            log::debug!("Reason: {:?}", syncback_res.err().unwrap());
             syncback_res = new_middleware.syncback(&snapshot, &appended_name);
         }
         let syncback = syncback_res.with_context(|| format!("Failed to syncback {inst_path}"))?;

From d9817ddfe390c055607179d8958488efdeb0189f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 18 Mar 2024 15:38:54 -0700
Subject: [PATCH 230/366] Properly emit an error if a project has a path
 missing in syncback

---
 src/snapshot_middleware/project.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index e1ca28597..6abc57f5b 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -531,8 +531,15 @@ fn syncback_project_node<'sync>(
     old_inst: InstanceWithMeta,
 ) -> anyhow::Result<SyncbackSnapshot<'sync>> {
     let (middleware, _, mut file_path) =
-        Middleware::middleware_and_path(snapshot.vfs(), sync_rules, node_path)?
-            .context("middleware_and_path should not fail for project nodes that exist")?;
+        match Middleware::middleware_and_path(snapshot.vfs(), sync_rules, node_path)? {
+            Some(stuff) => stuff,
+            // The only way this can happen at this point is if the path does
+            // not exist on the file system or there's no middleware for it.
+            None => anyhow::bail!(
+                "path does not exist or could not be turned into a file Rojo understands: {}",
+                node_path.display()
+            ),
+        };
 
     if !file_path.pop() {
         anyhow::bail!(

From 6138db8f7f36631e8b68c8e41b312fe29c90d099 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 14:09:19 -0700
Subject: [PATCH 231/366] Add support for ignoring referents during syncback

---
 src/syncback/mod.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c68616db8..9b9f2a8ca 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -77,8 +77,17 @@ pub fn syncback_loop(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(project, &new_tree, new_tree.root_ref());
 
-    log::debug!("Linking referents for new DOM");
-    deferred_referents.link(&mut new_tree)?;
+    let ignore_referents = project
+        .syncback_rules
+        .as_ref()
+        .and_then(|s| s.ignore_referents)
+        .unwrap_or_default();
+    if !ignore_referents {
+        log::debug!("Linking referents for new DOM");
+        deferred_referents.link(&mut new_tree)?;
+    } else {
+        log::debug!("Skipping referent linking as per project syncback rules");
+    }
 
     if let Some(syncback_rules) = &project.syncback_rules {
         if !syncback_rules.sync_current_camera.unwrap_or_default() {
@@ -310,6 +319,10 @@ pub struct SyncbackRules {
     /// Defaults to `false`.
     #[serde(skip_serializing_if = "Option::is_none")]
     sync_unscriptable: Option<bool>,
+    /// Whether to skip serializing referent properties like `Model.PrimaryPart`
+    /// during syncback. Defaults to `false`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    ignore_referents: Option<bool>,
 }
 
 /// Returns a set of properties that should not be written with syncback if

From 4564ebead3ebfb6dbbe9ffd94597b9097dee5045 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 14:10:02 -0700
Subject: [PATCH 232/366] Add basic test harness for syncback

---
 src/lib.rs                       |   8 +++
 tests/rojo_test/io_util.rs       |   2 +
 tests/rojo_test/mod.rs           |   1 +
 tests/rojo_test/syncback_util.rs | 114 +++++++++++++++++++++++++++++++
 4 files changed, 125 insertions(+)
 create mode 100644 tests/rojo_test/syncback_util.rs

diff --git a/src/lib.rs b/src/lib.rs
index 19851a8a6..2a4db7439 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,7 +25,15 @@ mod syncback;
 mod variant_eq;
 mod web;
 
+// TODO: Work out what we should expose publicly
+
 pub use project::*;
 pub use rojo_ref::*;
 pub use session_id::SessionId;
+pub use snapshot::{
+    InstanceContext, InstanceMetadata, InstanceSnapshot, InstanceWithMeta, InstanceWithMetaMut,
+    RojoDescendants, RojoTree,
+};
+pub use snapshot_middleware::{snapshot_from_vfs, Middleware, ScriptType};
+pub use syncback::{syncback_loop, FsSnapshot, SyncbackData, SyncbackSnapshot};
 pub use web::interface as web_api;
diff --git a/tests/rojo_test/io_util.rs b/tests/rojo_test/io_util.rs
index ce940f4ae..c18e457d4 100644
--- a/tests/rojo_test/io_util.rs
+++ b/tests/rojo_test/io_util.rs
@@ -10,6 +10,8 @@ use walkdir::WalkDir;
 pub static ROJO_PATH: &str = env!("CARGO_BIN_EXE_rojo");
 pub static BUILD_TESTS_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/rojo-test/build-tests");
 pub static SERVE_TESTS_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/rojo-test/serve-tests");
+pub static SYNCBACK_TESTS_PATH: &str =
+    concat!(env!("CARGO_MANIFEST_DIR"), "/rojo-test/syncback-tests");
 
 pub fn get_working_dir_path() -> PathBuf {
     let mut manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
diff --git a/tests/rojo_test/mod.rs b/tests/rojo_test/mod.rs
index fd0cda3a0..6ce465b4f 100644
--- a/tests/rojo_test/mod.rs
+++ b/tests/rojo_test/mod.rs
@@ -1,3 +1,4 @@
 pub mod internable;
 pub mod io_util;
 pub mod serve_util;
+pub mod syncback_util;
diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
new file mode 100644
index 000000000..df88c77f8
--- /dev/null
+++ b/tests/rojo_test/syncback_util.rs
@@ -0,0 +1,114 @@
+use std::{
+    collections::{HashMap, VecDeque},
+    path::{Path, PathBuf},
+};
+
+use anyhow::Context;
+use librojo::{snapshot_from_vfs, syncback_loop, InstanceContext, Project, RojoTree};
+use memofs::{InMemoryFs, IoResultExt, Vfs, VfsSnapshot};
+
+use crate::rojo_test::io_util::SYNCBACK_TESTS_PATH;
+
+const OUTPUT_DIR: &str = "output";
+const INPUT_FILE: &str = "input.rbxl";
+const EXPECTED_DIR: &str = "expected";
+
+pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
+    let _ = env_logger::try_init();
+    let test_path = Path::new(SYNCBACK_TESTS_PATH).join(name);
+    let output_path = test_path.join(OUTPUT_DIR);
+    let expected_path = test_path.join(EXPECTED_DIR);
+
+    let std_vfs = Vfs::new_default();
+    std_vfs.set_watch_enabled(false);
+
+    let im_vfs = {
+        let mut imfs = InMemoryFs::new();
+        imfs.load_snapshot(&output_path, to_vfs_snapshot(&std_vfs, &output_path)?)?;
+        Vfs::new(imfs)
+    };
+    im_vfs.set_watch_enabled(false);
+
+    let input_file_path = test_path.join(INPUT_FILE);
+    let input_dom = rbx_binary::from_reader(std_vfs.read(input_file_path)?.as_slice())?;
+
+    let output_project_path = output_path.join("default.project.json");
+    let (mut output_tree, output_project) = rojo_tree_from_path(&std_vfs, &output_project_path)?;
+
+    let fs_snapshot = syncback_loop(&std_vfs, &mut output_tree, input_dom, &output_project)?;
+    // We write to the in-memory VFS and not the file system!
+    fs_snapshot.write_to_vfs(test_path.join(OUTPUT_DIR), &im_vfs)?;
+
+    // And now the hard part: diffing two sub-trees.
+    let mut path_queue: VecDeque<PathBuf> = [expected_path.join("default.project.json")].into();
+
+    while let Some(path) = path_queue.pop_front() {
+        let path = path.strip_prefix(&expected_path)?;
+        let path_display = path.display();
+
+        let expected = expected_path.join(path);
+        let output = output_path.join(path);
+
+        let expected_meta = std_vfs.metadata(&expected).with_not_found()?;
+        let output_meta = im_vfs.metadata(&output).with_not_found()?;
+
+        match (expected_meta, output_meta) {
+            (Some(expected_meta), Some(emitted_meta)) => {
+                if expected_meta.is_dir() && emitted_meta.is_dir() {
+                    for item in std_vfs.read_dir(&expected)? {
+                        path_queue.push_back(item?.path().to_path_buf());
+                    }
+                } else if expected_meta.is_file() && emitted_meta.is_file() {
+                    let expected_contents = std_vfs.read(&expected)?;
+                    let output_contents = im_vfs.read(&output)?;
+                    if expected_contents != output_contents {
+                        anyhow::bail!("path {path_display} is not as expected.");
+                    }
+                } else if expected_meta.is_file() {
+                    anyhow::bail!("path {path_display} should be a file but was emitted as a directory");
+                } else {
+                    anyhow::bail!("path {path_display} should be a directory but was emitted as a file");
+                }
+            }
+            (Some(_), None) => anyhow::bail!(
+                "path {path_display} does not exist in actual output for syncback despite being expected"
+            ),
+            (None, _) => anyhow::bail!("Somehow, {} did not exist on the FS.", expected.display()),
+        }
+    }
+
+    Ok(())
+}
+
+fn rojo_tree_from_path(vfs: &Vfs, path: &Path) -> anyhow::Result<(RojoTree, Project)> {
+    let project = Project::load_fuzzy(path)?
+        .with_context(|| format!("no project file located at {}", path.display()))?;
+
+    let context = InstanceContext::with_emit_legacy_scripts(project.emit_legacy_scripts);
+
+    let snapshot = snapshot_from_vfs(&context, vfs, path)?.with_context(|| {
+        format!(
+            "could not load project at {} with snapshot middleware",
+            path.display()
+        )
+    })?;
+
+    Ok((RojoTree::new(snapshot), project))
+}
+
+fn to_vfs_snapshot(vfs: &Vfs, path: &Path) -> anyhow::Result<VfsSnapshot> {
+    if vfs.metadata(path)?.is_dir() {
+        let mut children = HashMap::new();
+        for item in vfs.read_dir(path)? {
+            let item = item?;
+            children.insert(
+                item.path().to_string_lossy().to_string(),
+                to_vfs_snapshot(vfs, item.path())?,
+            );
+        }
+        Ok(VfsSnapshot::dir(children))
+    } else {
+        let contents = vfs.read(path)?;
+        Ok(VfsSnapshot::file(contents.as_slice()))
+    }
+}

From dd688f1ac8aaefc1f9baed2155b9fca8efc2efd1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 14:22:56 -0700
Subject: [PATCH 233/366] Begin testing syncback

---
 .../expected/Lighting/Atmosphere.model.json   |  17 +++++++
 .../expected/Lighting/Bloom.model.json        |   7 +++
 .../expected/Lighting/DepthOfField.model.json |   8 +++
 .../expected/Lighting/Sky.model.json          |  15 ++++++
 .../expected/Lighting/SunRays.model.json      |   7 +++
 .../expected/Workspace/Baseplate.rbxm         | Bin 0 -> 3168 bytes
 .../baseplate/expected/Workspace/Camera.rbxm  | Bin 0 -> 874 bytes
 .../expected/Workspace/SpawnLocation.rbxm     | Bin 0 -> 3214 bytes
 .../baseplate/expected/Workspace/Terrain.rbxm | Bin 0 -> 3046 bytes
 .../baseplate/expected/default.project.json   |  46 ++++++++++++++++++
 rojo-test/syncback-tests/baseplate/input.rbxl | Bin 0 -> 53220 bytes
 .../baseplate/output/Lighting/.gitkeep        |   0
 .../baseplate/output/Workspace/.gitkeep       |   0
 .../baseplate/output/default.project.json     |  15 ++++++
 tests/rojo_test/syncback_util.rs              |   1 -
 tests/tests/mod.rs                            |   1 +
 tests/tests/syncback.rs                       |  16 ++++++
 17 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Lighting/Atmosphere.model.json
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Lighting/Bloom.model.json
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Lighting/DepthOfField.model.json
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Lighting/Sky.model.json
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Lighting/SunRays.model.json
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Workspace/Baseplate.rbxm
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Workspace/SpawnLocation.rbxm
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/Workspace/Terrain.rbxm
 create mode 100644 rojo-test/syncback-tests/baseplate/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/baseplate/input.rbxl
 create mode 100644 rojo-test/syncback-tests/baseplate/output/Lighting/.gitkeep
 create mode 100644 rojo-test/syncback-tests/baseplate/output/Workspace/.gitkeep
 create mode 100644 rojo-test/syncback-tests/baseplate/output/default.project.json
 create mode 100644 tests/tests/syncback.rs

diff --git a/rojo-test/syncback-tests/baseplate/expected/Lighting/Atmosphere.model.json b/rojo-test/syncback-tests/baseplate/expected/Lighting/Atmosphere.model.json
new file mode 100644
index 000000000..7f8221eca
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/expected/Lighting/Atmosphere.model.json
@@ -0,0 +1,17 @@
+{
+  "className": "Atmosphere",
+  "properties": {
+    "Color": [
+      0.7803921699523926,
+      0.7803921699523926,
+      0.7803921699523926
+    ],
+    "Decay": [
+      0.4156862795352936,
+      0.43921568989753723,
+      0.4901960790157318
+    ],
+    "Density": 0.30000001192092896,
+    "Offset": 0.25
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/expected/Lighting/Bloom.model.json b/rojo-test/syncback-tests/baseplate/expected/Lighting/Bloom.model.json
new file mode 100644
index 000000000..8bb51031e
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/expected/Lighting/Bloom.model.json
@@ -0,0 +1,7 @@
+{
+  "className": "BloomEffect",
+  "properties": {
+    "Intensity": 1.0,
+    "Threshold": 2.0
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/expected/Lighting/DepthOfField.model.json b/rojo-test/syncback-tests/baseplate/expected/Lighting/DepthOfField.model.json
new file mode 100644
index 000000000..10e8e0840
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/expected/Lighting/DepthOfField.model.json
@@ -0,0 +1,8 @@
+{
+  "className": "DepthOfFieldEffect",
+  "properties": {
+    "Enabled": false,
+    "FarIntensity": 0.10000000149011612,
+    "InFocusRadius": 30.0
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/expected/Lighting/Sky.model.json b/rojo-test/syncback-tests/baseplate/expected/Lighting/Sky.model.json
new file mode 100644
index 000000000..b09cfd38d
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/expected/Lighting/Sky.model.json
@@ -0,0 +1,15 @@
+{
+  "className": "Sky",
+  "properties": {
+    "MoonTextureId": "rbxassetid://6444320592",
+    "SkyboxBk": "rbxassetid://6444884337",
+    "SkyboxDn": "rbxassetid://6444884785",
+    "SkyboxFt": "rbxassetid://6444884337",
+    "SkyboxLf": "rbxassetid://6444884337",
+    "SkyboxRt": "rbxassetid://6444884337",
+    "SkyboxUp": "rbxassetid://6412503613",
+    "SourceAssetId": 332039975.0,
+    "SunAngularSize": 11.0,
+    "SunTextureId": "rbxassetid://6196665106"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/expected/Lighting/SunRays.model.json b/rojo-test/syncback-tests/baseplate/expected/Lighting/SunRays.model.json
new file mode 100644
index 000000000..38c7c8418
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/expected/Lighting/SunRays.model.json
@@ -0,0 +1,7 @@
+{
+  "className": "SunRaysEffect",
+  "properties": {
+    "Intensity": 0.009999999776482582,
+    "Spread": 0.10000000149011612
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Baseplate.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Baseplate.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..b992a7992e4c91eb0129e51a8e45d12423235a28
GIT binary patch
literal 3168
zcma)9TW=dh6ds#!X(1tj7HBBoBE$<qky3>Ms*n=5MwZ&t*lr%k(|C7WkGk2hW@c%^
zLsgY0c<O8UmBTN9^Ud13-b=h3X?E7L-<~;_@0?lR)oK!{^IL!ZyLol@Dr0Sy4w}65
zk4NK=>F)aCw|fgW8#D%7Th>}E1GY=|pDcd6D|qrYjj=eli55#_doX-7xJK(AERk>E
z<{cV`aWGR_gzXkEU(!m42E^^)`XP-&YqgvtR+y2{l1K7);Z49BH|RM`g*Yf=<PSUI
z!BaAopB-*IXUwZ^03HFzpt0x?G`_pgI7;-C2f{l6<QKI582}`13)gKL*n5HO$MeKy
z@K5O>tbjOJ$=;)Jq^wnEC1V?*xw$t<2TX=ISjskOq*}`c-=Zfl8scE9Pe=h<G#TDu
z1Bml62NSwIimcdfZ?hLKDY|%waC}5Fk_>Tg;tD6bJnpI}lA%abTu%c+{gMcM(SRAN
zB$%a`YVZ-wE}!#>jHH#qz*{ftj5BsL<Dq(%D*cM^;2^|-dJJjx_8Y0<pS4QnEfD;k
znDQjDm$RVwPCxX72fWHdB#q!o-%ey~zu!GQJq5683+k+!7|>;QVPwFgfmU;&;p`2c
zf@)CU1Q{!1VOC?)_Hd*ZRD(E#kD=!7$9xirUX;kNr*t4p8k>5eO_e_D@xUrQ<j*py
z*Vj-_tJs#9-h|AFUSAVlXPM_6^5SzE5cfW=@M{%Xq<J+bVD1AkEnC|F%#E#g3mVI|
zR#S$;TtOC1MTmXn(wtZ10~I`7_R#tQd&rH6gfVI2tIZv)^C7psztSEp&yTNZ5d-qi
z6<iU3CG3P#Gmh<Olf9yj9A<r>N)((N$J8=f&~e0#m`Ah~NRDD#)@gdmpc)49H)S79
zr$*TA_I37xmb~DN`p6E&G!lX3aUignxBe2Od@?JiwF#N$wVs4S=qx9;LuOP-xC$+1
z_7c@f*@2cyOM8*^5JU{>A!(;Y)P~BQh)4y5+`3i_T9p&%&t}Hw{xtIkWOaW;(okx*
z{-T>dXkbPTIy4tu!<jQu33ZD@Ls{#G&<63U(S-bIPP1!c8LG$piOEQV-i8AN;?Q9k
zxH4ArQomS_%M(>!sid!*CisyZad3m7VdTL7lccfcv6*u%;@~2q9~5U_2i|GaSeBuk
zVunx%9U2g~gRnGx`4k%m-dKA87JEJ5{wVk7j&J?6;spt=>Rx+}6!Qz+hyoo8IlGD_
zwuJbmu=2r(y^B0t`jvKrkxfGLI16zj^dy6J$e^6E(7K+o#U_^FvHw8mv5dsyjhCba
z7B^#0GHiXQ3Z?KZsr`lq#NEW!D-mj;b?eDFwR2%*_~YK*cen5C-#Iwg-~ZwA=oJY1
z{PpX<0maun%z?NK>;p#p+K)qVj#fio?Z;!BHOs#N2lPjw#a?+XQ)RdBAK#;=X{BPm
KyO;j2_~}1!4;R(|

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..c3edc75d49d348860b135e708f71f82c4e1f97e2
GIT binary patch
literal 874
zcmZuwOK;Oa5VoxVrBEmj@hG&U2QIy|CJ!2^atUoBB7s}QR<3C6U84;qu53p<gam5D
z0SSpK2QEOxU*H%Ct{gZbapMP|72*!_ZAx2IK51rlX1|@CnYEYFB#4s-v(JA|j8Bal
zhG~q1j7H1#{PVOryX~tnEDn;auzMn9`T#=f?X~p|SsxBTHK0$C)bl)*K|dFnCsN5`
z`AC>$isPz7B<-Y|+-`BJNNax8uJUTRwy?;fO0`xl*>)w0*p=F1wNi>IHg362ylW(Y
zvY~Z3&6En7G(xp7{QBaZ^Xb>+A#FX~dMlQ>``vkL)s~~~YbX6MGaNWSv(1k`UJdNA
zm&kaLh*L;JP)DFANJb5M{h%wt9F3UZ?jHtCZJX;q+z=<p)5Ew#b{Y;r9fLkfvcfi4
zAY++Jk<B6qAn$%Uu3Qz7?1^meDNEB)?m3(#sKd~xyD3G?*P@OT_Y2Qx8;NHqjs^jR
zzKr7}dziNpzFRdaz5o(Ip<v?xNizxi*`zg?D}CF1zx8=AZNEY4GqiOY9D)MRz$|VE
z#&0I!UBN9qF_Z}=pzz=Z>IKUSSu6@q$ov0f3$)|XtD3vt8;C^;qboq68U0*d(oaKC
z&oYs>_}><E0T|>7&<M(cMq;1c$?ys4yNhK1O^LobZC}QDy~o>095;F_h^Z&yyFT7i
Z&ywtyoqvEFv*E6i8TAOeG(Y;ooIk7MqjUfO

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/SpawnLocation.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/SpawnLocation.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..f4acc7f8064d9097f453ea4ff561b47bd0c46906
GIT binary patch
literal 3214
zcmb7HOK;mo5T+QnX&u|Oo45Oti=@Z;5Cmw8Ab>1Kg@8m>B_W62R@BNOLUD=ZvbK9@
zjofm}Z)nj!(qFX6A86+rTBP`p-3~C?CHLd(?7VjLM5}S2PWRsYv$?*z?l`WKG7U`K
z-f(n}W_K>0?ezxDJ|I4no(LQ~5xKxMY4RnWi0mi$-6S4H;v{^oJYjqlF7Qr&aMb^r
zR-42iy8}r#iCe~Kf1DT@52f}+;QuOl6MXR%t$#rbvRin)LEILR82f>5d>QXy2?RKx
zpYapHHvs>TxUB-EA8q_j(*@VdhBk+C>W4C3-oj<sSll57Sr@X`h&#fQpVHWX#H!r@
z>4~{)WCjGTNpEwzK@{6fCEAm%IF_b6S)799)^9x$$1%QT?Y^fG40_L|y-u@{JT-}y
zjfXVX<5L0IKkV<DyN+Fp_Y02tHVTiS8#caA46^Hx4~vhq2;)d-8G2_p6YqJOMyLj|
zYk<PqKX=24JiSIU7xIcer?(tgtsqb*BPr(XnFx>NQ8-eGH%kqDi!d-L$U=_u5pgT@
zW=hM6%ND6hg(8<l63%p&7-S*Pq2PB8g!ig1w3xTne!Fnu6~F@k`S`mu!s8(OF@A3l
zL*g*e(~G!ZWHE|?+%6)!VU!p?bJYca!vzP*7&R{`Tl7{9G*|a?T7}9W3r#ubQmJKy
z_h=PLgDiAqhZL|ym63SZ0Ax8RIq^DVS-I_QJLfPO2<Jm-fs;WNiNUUDi;xmE@Fy~L
zaeWvN>Ze5Nvnw!ZIB}>{jeltgS*2WThBGlyC+WryNNL0%$Z`&B(Tw$vsp|cxRT4Fj
zfmBXJ5*Qr2st7Dw{H8nMfCs!9hj3b2%Mw2{-|hbS$6o+ebwO0NlNjMLJBxiP+kLGf
zsZlTQuZTz-VrA_^;vm~W7M|slJWMp#_)O(u`2`FG^I0gyf$Ri{Kj|o{aB*rvY?#+m
zfMKr`e39k#Av;xiPG#39JrE~Z?XAzoj#i;5<;+#cJZ0*$i)EHGrb)WzC7mAlY|GGM
z!c@JBa`aqI%i3N6%$2P_79^H+tq;T{WKmU^m}>xyd2Z7M|B9+HM^k;OzM$(Ska3)1
z>O<&-Fns6J9t{@t4Q&Djz2l+^11w-K1vLnv8E!gnsY{q}p+O2X2~)IwcJWp^65#7&
zuO}0uMUaLkvKwU(l!iRgukZh&%+Yj8_vp5J+d0Q72tw-}Fp$$gdPanvgie<s{o`5L
z`zvH-$lU$)u{r><?EfaIQM4BFa2Z+*fEA*ZGJWkU?VGc#0>EMr4@yfrtTs^Qr3{ou
z$gNvNqg6u(7eYJ}QQlTn_lG58ih!-x=V?!eu|5#~PiI9^xv493R>h_c5QHW7F6b+9
zzQ3{c3Y>~c<>zu-?$G+gAE~J9PPj6=dvRO`t#}UnFV3v(?;tp9zFi1L-;{ZBXW5gz
j5lY13j(ALeD;myQ{)RH!ebzg~=WIEQPxjM)Ay5AWBkd(I

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Terrain.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Terrain.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..1b8ba7c5927eab56b4879ddd4a93498fdddc9db5
GIT binary patch
literal 3046
zcma)8&2Jk;6kj_oAEgN?w2+1`7a=%;6b>A!s*dv^mn3y!lfntcyR-4q&5koO8|tbF
zv_e5eNc7M{&LG5vKY}|*AnvFaIB{9Tg$tPXn~m3A?<VF+v$G$+dHX(o@6BA2qUDR5
z7w`2ZPtTsVtb!E}nvB%e8qHa{n>l)p9>>k2G@4vW<^^U2-qkm*)yp)$hzFABNnFp;
zsMtH9r#$V6V3q5(aGt^!;Lp))9%zmx@b)npmB4Nb$(>>Wn3w5InFb_+I_qf~6|JS$
z3N=>^E<NUZw>V5US})N2EFMTAD745iYo6IR>P)ijN@<^bgz7QCc>s;ZYy_S-(%1;4
z%WR%_^b);)fd(X+!gZPk{(Xe31)WeQ@aO0wtbjzY(mF$9UT7`0M~oc{9hmz(>43?Q
z2$outG-9no2A2?ni}VFXLn7E}5|YBEO@?>)0VFape}wL;OB7i?U7WT)!3PMmKSMK;
z42e$R3MZ>9s0!cr93H1Qp9X|l54r4)!8Ao^w_{8;_=skeby&;uiGN(dTO%hKr*xyu
z9Pv@C^cBK`gOCW+vyfI}zamC2OA&SoD2N5_ve4JioHYcIO|PjrhVX!Ad5EMDT*$f5
z3-nvFUw`!tfLU8mm(@^#F72-JZ06Uc=x_;VFPxBq1#Sz;P?E=m4z7|*Ucl9G1dB!~
zNB}}YA_UnK`eMLZK40=f&sh@E<|@{mUp-4w1bT$y<B$W2=U0Q#ImB>dYniOeHl<-`
zn&A0HEK8=;3J<n)yR`4RZhqdt?iKEi`jt&^3OH~p|KHF!>Qz3)hLCBe&~Z$4(>$o!
z6=C1#_u2d+TqUo4u2h_Mbk*}TAQ8&m^y^ioO%JAj6imcFpbr?3c*8)+^kIhAs<1d?
z6^d5$hS<OS?t7buhliiD+D|`x``rWIcHCco`~8o9dJk^D-|e*CzIyeGyY1dgwcczV
z9PIx1%fk;3uJn5U_Wt_*%ln@p53iDT49K5mgF?Xj|J!7=K?J%nY2Bw?!b!G?Y^+PP
zYK_{MDd(g84f<cB_kI0wKSh1U1*ev!=M>;yabh;z{LnS}4JVG4S?28uea&?h*VD!G
z=@nU%uwsL|KDRXsYz_-eh>t;fTkTQqjYAH|mtRvG&^gM!GMSOBsbOfEe#fX5Lf54y
zq^G+{GepFo9ujXECI&)pa$neloH~~d8th0mBy4nM2W#L6;iG%K)7g^D>C-%G31X^<
z8B_OqmUZyAWno6zvrtrRW1FmQo2(b<v2Y5|GTo))fpUtWo8l(-2UZ-@lVEs5gw!=F
zil|X@@OOwgsh}B~vk%P?erv(%Cfia8ov{;OyM;v9k1SL|Q*=gp?8&$R8}fS==^Nt0
z1bolNA1A*7@c%HODOsR8O!C0)CLD+2<Sb>J#$hg@!Pztoz#BA0NPLh%wyvW$nT~Vj
z)}1?_?yawH?CtDG*qz@&&4S^I`<S%krx*z_@Rap?b8~M3pMMB5`0H$!H;8ei+eg^!
sc8Z2Fz;-xyN_VfokhLa08Jg4lb8`Hqhr;680!?w^F<*K;KHXpb4_;$4ga7~l

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/baseplate/expected/default.project.json b/rojo-test/syncback-tests/baseplate/expected/default.project.json
new file mode 100644
index 000000000..9af61d5c1
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/expected/default.project.json
@@ -0,0 +1,46 @@
+{
+  "name": "Baseplate",
+  "tree": {
+    "$className": "DataModel",
+    "Lighting": {
+      "$properties": {
+        "Ambient": [
+          0.27450981736183167,
+          0.27450981736183167,
+          0.27450981736183167
+        ],
+        "Brightness": 3.0,
+        "EnvironmentDiffuseScale": 1.0,
+        "EnvironmentSpecularScale": 1.0,
+        "FogColor": [
+          0.7529412508010864,
+          0.7529412508010864,
+          0.7529412508010864
+        ],
+        "GeographicLatitude": 0.0,
+        "GlobalShadows": true,
+        "OutdoorAmbient": [
+          0.27450981736183167,
+          0.27450981736183167,
+          0.27450981736183167
+        ],
+        "Outlines": false,
+        "ShadowSoftness": 0.20000000298023224,
+        "TimeOfDay": "14:30:00"
+      },
+      "$path": "Lighting"
+    },
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "StreamingEnabled": true
+      },
+      "$path": "Workspace"
+    }
+  },
+  "syncbackRules": {
+    "ignoreReferents": true
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/input.rbxl b/rojo-test/syncback-tests/baseplate/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..98f213686840b8ecf20fc64695cfcf5283e55fe8
GIT binary patch
literal 53220
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
E7q(Q2I{*Lx

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/baseplate/output/Lighting/.gitkeep b/rojo-test/syncback-tests/baseplate/output/Lighting/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/baseplate/output/Workspace/.gitkeep b/rojo-test/syncback-tests/baseplate/output/Workspace/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/baseplate/output/default.project.json b/rojo-test/syncback-tests/baseplate/output/default.project.json
new file mode 100644
index 000000000..7dbee9702
--- /dev/null
+++ b/rojo-test/syncback-tests/baseplate/output/default.project.json
@@ -0,0 +1,15 @@
+{
+  "name": "Baseplate",
+  "tree": {
+    "$className": "DataModel",
+    "Lighting": {
+      "$path": "Lighting"
+    },
+    "Workspace": {
+      "$path": "Workspace"
+    }
+  },
+  "syncbackRules": {
+    "ignoreReferents": true
+  }
+}
\ No newline at end of file
diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index df88c77f8..a252b24e4 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -14,7 +14,6 @@ const INPUT_FILE: &str = "input.rbxl";
 const EXPECTED_DIR: &str = "expected";
 
 pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
-    let _ = env_logger::try_init();
     let test_path = Path::new(SYNCBACK_TESTS_PATH).join(name);
     let output_path = test_path.join(OUTPUT_DIR);
     let expected_path = test_path.join(EXPECTED_DIR);
diff --git a/tests/tests/mod.rs b/tests/tests/mod.rs
index a348e2289..bc7100164 100644
--- a/tests/tests/mod.rs
+++ b/tests/tests/mod.rs
@@ -1,2 +1,3 @@
 mod build;
 mod serve;
+mod syncback;
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
new file mode 100644
index 000000000..238590383
--- /dev/null
+++ b/tests/tests/syncback.rs
@@ -0,0 +1,16 @@
+use crate::rojo_test::syncback_util::basic_syncback_test;
+
+macro_rules! syncback_basic_test {
+    ($test_name:ident$(,)?) => {
+        #[test]
+        fn $test_name() {
+            let _ = env_logger::try_init();
+
+            basic_syncback_test(stringify!($test_name)).unwrap()
+        }
+    };
+}
+
+syncback_basic_test! {
+    baseplate,
+}

From 6ec800cb77c47e63de36a195af220b6f09c7b212 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 14:49:18 -0700
Subject: [PATCH 234/366] Don't override existing midleware if it exists unless
 an override is set

---
 src/syncback/mod.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 9b9f2a8ca..34b3fe29a 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -38,7 +38,8 @@ pub use snapshot::{SyncbackData, SyncbackSnapshot};
 /// If this is set to `1`, it will instead use `Rbxmx`. If it is set to `2`,
 /// it will use `JsonModel`.
 ///
-/// This will override existing `Rbxm` middleware too, not just new files.
+/// This will **not** override existing `Rbxm` middleware. It will only impact
+/// new files.
 const DEBUG_MODEL_FORMAT_VAR: &str = "ROJO_SYNCBACK_DEBUG";
 
 pub fn syncback_loop(
@@ -257,7 +258,7 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
     if let Some(override_middleware) = snapshot.middleware {
         middleware = override_middleware;
     } else if let Some(old_middleware) = old_middleware {
-        middleware = old_middleware;
+        return old_middleware;
     } else if json_model_classes.contains(inst.class.as_str()) {
         middleware = Middleware::JsonModel;
     } else {

From c187f70a21fd0544a4450fee579ab8f8172847af Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 14:53:53 -0700
Subject: [PATCH 235/366] Test the respecting of old middleware

---
 .../expected/Workspace/Baseplate.model.json   |  54 ++++++++++++++++++
 .../expected/Workspace/Terrain.rbxm           | Bin 0 -> 3046 bytes
 .../expected/default.project.json             |  21 +++++++
 .../respect_old_middleware/input.rbxl         | Bin 0 -> 49898 bytes
 .../output/Workspace/Baseplate.model.json     |   9 +++
 .../output/default.project.json               |  12 ++++
 tests/tests/syncback.rs                       |   5 +-
 7 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Baseplate.model.json
 create mode 100644 rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Terrain.rbxm
 create mode 100644 rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/respect_old_middleware/input.rbxl
 create mode 100644 rojo-test/syncback-tests/respect_old_middleware/output/Workspace/Baseplate.model.json
 create mode 100644 rojo-test/syncback-tests/respect_old_middleware/output/default.project.json

diff --git a/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Baseplate.model.json b/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Baseplate.model.json
new file mode 100644
index 000000000..3c407b8f2
--- /dev/null
+++ b/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Baseplate.model.json
@@ -0,0 +1,54 @@
+{
+  "className": "Part",
+  "children": [
+    {
+      "name": "Texture",
+      "className": "Texture",
+      "properties": {
+        "Color3": [
+          0.0,
+          0.0,
+          0.0
+        ],
+        "Face": "Top",
+        "StudsPerTileU": 8.0,
+        "StudsPerTileV": 8.0,
+        "Texture": "rbxassetid://6372755229",
+        "Transparency": 0.800000011920929
+      }
+    }
+  ],
+  "properties": {
+    "Anchored": true,
+    "BottomSurface": "Smooth",
+    "CFrame": [
+      0.0,
+      -8.0,
+      0.0,
+      1.0,
+      0.0,
+      0.0,
+      0.0,
+      1.0,
+      0.0,
+      0.0,
+      0.0,
+      1.0
+    ],
+    "Color": {
+      "Color3uint8": [
+        91,
+        91,
+        91
+      ]
+    },
+    "FormFactor": "Symmetric",
+    "Locked": true,
+    "Size": [
+      2048.0,
+      16.0,
+      2048.0
+    ],
+    "TopSurface": "Smooth"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Terrain.rbxm b/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Terrain.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..1b8ba7c5927eab56b4879ddd4a93498fdddc9db5
GIT binary patch
literal 3046
zcma)8&2Jk;6kj_oAEgN?w2+1`7a=%;6b>A!s*dv^mn3y!lfntcyR-4q&5koO8|tbF
zv_e5eNc7M{&LG5vKY}|*AnvFaIB{9Tg$tPXn~m3A?<VF+v$G$+dHX(o@6BA2qUDR5
z7w`2ZPtTsVtb!E}nvB%e8qHa{n>l)p9>>k2G@4vW<^^U2-qkm*)yp)$hzFABNnFp;
zsMtH9r#$V6V3q5(aGt^!;Lp))9%zmx@b)npmB4Nb$(>>Wn3w5InFb_+I_qf~6|JS$
z3N=>^E<NUZw>V5US})N2EFMTAD745iYo6IR>P)ijN@<^bgz7QCc>s;ZYy_S-(%1;4
z%WR%_^b);)fd(X+!gZPk{(Xe31)WeQ@aO0wtbjzY(mF$9UT7`0M~oc{9hmz(>43?Q
z2$outG-9no2A2?ni}VFXLn7E}5|YBEO@?>)0VFape}wL;OB7i?U7WT)!3PMmKSMK;
z42e$R3MZ>9s0!cr93H1Qp9X|l54r4)!8Ao^w_{8;_=skeby&;uiGN(dTO%hKr*xyu
z9Pv@C^cBK`gOCW+vyfI}zamC2OA&SoD2N5_ve4JioHYcIO|PjrhVX!Ad5EMDT*$f5
z3-nvFUw`!tfLU8mm(@^#F72-JZ06Uc=x_;VFPxBq1#Sz;P?E=m4z7|*Ucl9G1dB!~
zNB}}YA_UnK`eMLZK40=f&sh@E<|@{mUp-4w1bT$y<B$W2=U0Q#ImB>dYniOeHl<-`
zn&A0HEK8=;3J<n)yR`4RZhqdt?iKEi`jt&^3OH~p|KHF!>Qz3)hLCBe&~Z$4(>$o!
z6=C1#_u2d+TqUo4u2h_Mbk*}TAQ8&m^y^ioO%JAj6imcFpbr?3c*8)+^kIhAs<1d?
z6^d5$hS<OS?t7buhliiD+D|`x``rWIcHCco`~8o9dJk^D-|e*CzIyeGyY1dgwcczV
z9PIx1%fk;3uJn5U_Wt_*%ln@p53iDT49K5mgF?Xj|J!7=K?J%nY2Bw?!b!G?Y^+PP
zYK_{MDd(g84f<cB_kI0wKSh1U1*ev!=M>;yabh;z{LnS}4JVG4S?28uea&?h*VD!G
z=@nU%uwsL|KDRXsYz_-eh>t;fTkTQqjYAH|mtRvG&^gM!GMSOBsbOfEe#fX5Lf54y
zq^G+{GepFo9ujXECI&)pa$neloH~~d8th0mBy4nM2W#L6;iG%K)7g^D>C-%G31X^<
z8B_OqmUZyAWno6zvrtrRW1FmQo2(b<v2Y5|GTo))fpUtWo8l(-2UZ-@lVEs5gw!=F
zil|X@@OOwgsh}B~vk%P?erv(%Cfia8ov{;OyM;v9k1SL|Q*=gp?8&$R8}fS==^Nt0
z1bolNA1A*7@c%HODOsR8O!C0)CLD+2<Sb>J#$hg@!Pztoz#BA0NPLh%wyvW$nT~Vj
z)}1?_?yawH?CtDG*qz@&&4S^I`<S%krx*z_@Rap?b8~M3pMMB5`0H$!H;8ei+eg^!
sc8Z2Fz;-xyN_VfokhLa08Jg4lb8`Hqhr;680!?w^F<*K;KHXpb4_;$4ga7~l

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json b/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
new file mode 100644
index 000000000..a012b4a38
--- /dev/null
+++ b/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
@@ -0,0 +1,21 @@
+{
+  "name": "respect_old_middleware",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "StreamingEnabled": true
+      },
+      "$path": "Workspace"
+    }
+  },
+  "syncbackRules": {
+    "ignoreReferents": true
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/respect_old_middleware/input.rbxl b/rojo-test/syncback-tests/respect_old_middleware/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..4b27b3692af8a68cfdc9f4cd90e5f43f9803c988
GIT binary patch
literal 49898
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

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/respect_old_middleware/output/Workspace/Baseplate.model.json b/rojo-test/syncback-tests/respect_old_middleware/output/Workspace/Baseplate.model.json
new file mode 100644
index 000000000..9cc519cdb
--- /dev/null
+++ b/rojo-test/syncback-tests/respect_old_middleware/output/Workspace/Baseplate.model.json
@@ -0,0 +1,9 @@
+{
+  "className": "Part",
+  "children": [
+    {
+      "className": "Texture",
+      "name": "Texture"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/respect_old_middleware/output/default.project.json b/rojo-test/syncback-tests/respect_old_middleware/output/default.project.json
new file mode 100644
index 000000000..39de1647d
--- /dev/null
+++ b/rojo-test/syncback-tests/respect_old_middleware/output/default.project.json
@@ -0,0 +1,12 @@
+{
+  "name": "respect_old_middleware",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$path": "Workspace"
+    }
+  },
+  "syncbackRules": {
+    "ignoreReferents": true
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 238590383..5b904fc1e 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -1,16 +1,17 @@
 use crate::rojo_test::syncback_util::basic_syncback_test;
 
 macro_rules! syncback_basic_test {
-    ($test_name:ident$(,)?) => {
+    ($($test_name:ident$(,)?)*) => {$(
         #[test]
         fn $test_name() {
             let _ = env_logger::try_init();
 
             basic_syncback_test(stringify!($test_name)).unwrap()
         }
-    };
+    )*};
 }
 
 syncback_basic_test! {
     baseplate,
+    respect_old_middleware,
 }

From 308b4a927cd49ae5cf868984b466c2780a853473 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 15:33:55 -0700
Subject: [PATCH 236/366] Quietly continue of a referent is invalid in a DOM
 instead of panicking

---
 src/syncback/ref_properties.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 1c43a6396..b6bfed333 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -48,10 +48,17 @@ impl RefRewrites {
         let mut id_prop_list = Vec::new();
 
         for (pointer_ref, ref_properties) in self.links {
+            if dom.get_by_ref(pointer_ref).is_none() {
+                continue;
+            }
+
             for (prop_name, target_ref) in ref_properties {
-                let target_inst = dom
-                    .get_by_ref_mut(target_ref)
-                    .expect("Ref properties that aren't in the DOM should be filtered out");
+                let target_inst = match dom.get_by_ref_mut(target_ref) {
+                    Some(inst) => inst,
+                    None => {
+                        continue;
+                    }
+                };
                 let target_attrs = get_or_insert_attributes(target_inst)?;
                 if target_attrs.get(REF_ID_ATTRIBUTE_NAME).is_none() {
                     target_attrs.insert(
@@ -71,9 +78,7 @@ impl RefRewrites {
                 }
             }
 
-            let pointer_inst = dom
-                .get_by_ref_mut(pointer_ref)
-                .expect("invalid referents shouldn't be in the DOM");
+            let pointer_inst = dom.get_by_ref_mut(pointer_ref).unwrap();
             let pointer_attrs = get_or_insert_attributes(pointer_inst)?;
             for (name, id) in id_prop_list.drain(..) {
                 pointer_attrs.insert(

From 36afdd20e9ec8f35451e89b96835af8c84eb2b04 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 15:37:42 -0700
Subject: [PATCH 237/366] Test nested projects

---
 .../expected/default.project.json               |  11 +++++++++++
 .../expected/nested.project.json                |  15 +++++++++++++++
 .../nested_projects/expected/string_value.txt   |   1 +
 .../syncback-tests/nested_projects/input.rbxl   | Bin 0 -> 54180 bytes
 .../nested_projects/output/default.project.json |  11 +++++++++++
 .../nested_projects/output/nested.project.json  |  12 ++++++++++++
 .../nested_projects/output/string_value.txt     |   0
 tests/tests/syncback.rs                         |   1 +
 8 files changed, 51 insertions(+)
 create mode 100644 rojo-test/syncback-tests/nested_projects/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects/expected/nested.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects/expected/string_value.txt
 create mode 100644 rojo-test/syncback-tests/nested_projects/input.rbxl
 create mode 100644 rojo-test/syncback-tests/nested_projects/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects/output/nested.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects/output/string_value.txt

diff --git a/rojo-test/syncback-tests/nested_projects/expected/default.project.json b/rojo-test/syncback-tests/nested_projects/expected/default.project.json
new file mode 100644
index 000000000..edb89e3ca
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects/expected/default.project.json
@@ -0,0 +1,11 @@
+{
+  "name": "nested_projects",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "Nested": {
+        "$path": "nested.project.json"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects/expected/nested.project.json b/rojo-test/syncback-tests/nested_projects/expected/nested.project.json
new file mode 100644
index 000000000..fe7c844f4
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects/expected/nested.project.json
@@ -0,0 +1,15 @@
+{
+  "name": "Nested",
+  "tree": {
+    "$className": "Configuration",
+    "StringValue": {
+      "$path": "string_value.txt"
+    },
+    "BoolValue": {
+      "$className": "BoolValue",
+      "$properties": {
+        "Value": true
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects/expected/string_value.txt b/rojo-test/syncback-tests/nested_projects/expected/string_value.txt
new file mode 100644
index 000000000..cb6a6af21
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects/expected/string_value.txt
@@ -0,0 +1 @@
+effective cover predict pawn south
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects/input.rbxl b/rojo-test/syncback-tests/nested_projects/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..0e06df50595e12d335153a8525593467eaae2271
GIT binary patch
literal 54180
zcmcJYe~=u<b>H_6i=PBR{2~cbl(eKF{*pi*4j@R-6o|te4uFIor@I5FNG?l*-MPCZ
z_jXSE1He%v2$2#cxonHFWrub-j$%7;<Z`9Vl$|(#q#QX_DmzgsvQtULb~#qLl9Z)X
zTw|Mr97i_uK0Vtr`(|c)cjUOM2Dsh*zV6rWSHJG*>3OOZTy6x{?*07Rw{E+8Td8!q
zR4Sd5%a(<O#ra+G;hx?XbNoNHv9xWxWd1CjIlr*DU%tDq2MG7@$4<GXnqFhQQ?Irc
z{MMCv)gK#+AU`+;O+`MuEBc}o-o{Vc<(g`@{Z0!15rcoH{Q3@y-##vX3Ad%G&T7zJ
zTk%_dsaN~+R8GZ~<M7rE^63`2PBemG_2kl$U+q}*3!p*XEf*!cr7Zt$mFq+hG%k6K
zZd`K%?8EZQgK|;AyEe+dcgl65d--z1pI-4g(?N5ozT9njoqEu;tvm=NRQJn83Gdt_
z|L&D*dg0Vey$aZCt*1JEhw1oTf}#ydxMj2a3+=SG>bE@Gz&H);ldtcPixO_$BLC7A
zn6i@JXDWQ3d`mYd;XCLmO@KSoT<dmDc&*${+@I|}8h|xupQ$%%!PQ*K{ZPI~aNj2v
zCESZTFstdH(GYb=_fvhJ%`p-T<W@tJBjabYG6rj895g%rwa!#tJC{s5_X@Hi7v=a4
z`KMe8w@wGab9Fy$z4L}ZTl{T8fyK{w9dDr%wER?Oe%R1pV(5qxZUv7bXZ*{pdfRGf
z&LFiWkrReC<5#_g)%bS03l~<V$9KyIVSD?Gzt&l~uryou8#Qh0*P#JVcPZg+oE7d*
zi8;-A?R00)8+P6;0Njrf?m(ib?{ufLmg?t^8o2h<+Xaf9oLTjj{j=U>KkmZ&U<X#H
zpAzoGe9_vOX4`M2<G=?@?ZlZ!<f8m_8SBH+g`nd#CB|$N0e$)7`^U$}$0#(R-5c3L
zakjp^(y2F>t>ilf`+)p{rBcE>@Czh#HW10zpEo|8>hg)0sfqw8;Vu-75uFWc#v*k1
zyJ0AFzX@#g`)t>H#=o3uV$Bd}z0oK1cFybgt-9ApkyH%HV*)rN7bV<}T4?or(46<z
z8uhA>)?DFduc-tHqeDu#iNH!!ne$q43@syMA{*vN32#TE*yEhvTCKO+;@)Y?nlzQ8
z%!*u;a92hCMQ(E|>+S5YaoSKkB)_91O1O{yz}#HJTlZThSGx^Q+%F}J!-fzMqfbh>
zjfM%O5n=3pcN^$I`QcHyC}9P`BfGg)Q1#nwYiapRwoC<jkU%ULwp4JfzFP0B%O9(2
zY3qK?P--n>iD)^|*KEDjj>GvqhC~Ne^gzH!NC-&cde+WY43RcJ1d91BR9p27V;?pI
z+Nl}K7&sREUi7xLUp8Qvh`nedD#MFVi{Fac*k1ZZUq(>N;RzWUo+2vUi6uh-7r-cg
zvF*L`FV5Z5{-t`me!1QdaqlX9*|PVtp+gx&F-o|R;c$ao3(u|F;Ccm%uE=*uf^tAU
zG5#zB-DWLiU^`8%8c&Ea?5}xOo5YX)d|(^(Ya_wlaJ7Ywc$VLi5w+!2<&Q{QZOhqH
zQ0nYvLa4SSl&89N+uP%YFCD$HZK8LtojI@ioP{4VaBUfr0yW);*oxf65<FoDbjT#$
zAX{6%am-XFo}?4n^$!b4#8yjUa+G$B%Xd*ZdtbKO1h=T$-C8{$&RVvP<f!9_piMuz
z&3SLVt;fY{)UMO4#|6Jpu0`KljibYlnToZGJ|Q4nbWuEEEy#>nGloQu{6_^&>{;|%
zEw3IYiCf@8E9*%?A(chHoemdY%Hiev1sd^ktwTzdGSmBVczH@lB3`a_x=9kf30^Al
zTjBukmrpprVqFr?RLwg~%{mYr6D)yfG3ZuTOk$ZL`T;{!5lGU=)AGqQa@F_K8R5GO
zo?wdUP{KXO<zEu1i>Iciu80Yw8T&~?qeK6c;7I^3o|z6>O}}Mb>k;~_!`umhVPhB1
zoN9Tsy5Ee)yoUkn#9~^2#Kend=Db=>tk_mOk*#>9hrKkP63U`sSi96o0TVwj)oXq*
z?X97x6xr?^ve}rd)#-W-qk?l@Q-*?;^_15QneOwc9&678t>@ZnUNUVfjm^zpm}9hs
z8A@2@-%WB&t<^v1uaEH&koIl9g=DJJY1J=xJ0_);oTdJ}A5&<%hXON@&Uz+>OBzmG
zGKB`Ra2lBLm+DQw-A^U6)E+!G8e+Xs)aiO#MwRt5wRi6>ZLrf>;M&81)6w&iB9CEg
z>3J<A75P3fWBCw8o1ojO`esghriK+#j2K}T@1TU^{7Vyy-f}w@NtO#^waxk`y1wvS
zIz92z<KOz)k9@wm>(_qfYnOf$F0|aKshHfMC?I#+z(BcUSyt{h%fNAvMDF4tbMi%G
zG+L*CW2wVa|H?pC;=oOOA5r4AdWXb;q$U27Zi%DFViJeKDRCWRfHN$~v^i*Pzy5_U
zyk;*%l8<HDxW4_xuYBc~Ui|7;fAht+-nt1^OWQI&P?I`k0?w#0<2T!qV3l7ybm%aZ
zGVqi3Q$lg6h}lyOujQLi0Y+Os7=AkKJ)c0d*#L2vjgDTnKI5!}?qq?8#&z@pO!T_2
zv?Qxe<rn2oKo$8v@nt|oEX#7>uq+@c%Q|?|ZCM1ZVwMGk)3US$*aik#fYuvuEZ}6*
zlZCI^xCv@nZ$KP+(`y_Sd`4DkBAa?i$k9d?7l#Er!K~?J?TY%qEyy5Ke&t4<Vu2J<
ztgTWhHp?AdUR-JU?UkTWD@)6!7vCrU-zyg-+)Y(!1Ne^H0O(9H1AwA{0oVox8i3X=
zaEEpo?8tg4$HB_V)CS{}5XDQYS$6~L)(XR>9XfkezovAeWle=z)}>=-H*J4w@3;3%
zUVr0rH+~-;sE^E<5*ow7w#+mnGVO=u<AeMvC0h0+FQ2NBLHcoKaJswdHG_I>J_tIj
zkWlq~f~&|y33pNLFf~3PnD+pe65as?S;q;PsV%pdeVX8ZX!~`E<o2SWhXe#ECEN!Y
zK|3K^Y<W#d=vscWy1wzJe~R+2o`z6IPzYIsiI%iydMnxGm%kYqvJ2c^kbF@R-}0w!
zL|`3asJVba0!LH>4N^xW;F*Y&g<uY|vL4JZwVU2wlt1cnQQn@U7OVxxtR%k`l-|00
zO_oOe&XbQmx+LGXA6@cRWo5x{KYA+Ytaz&n3#*Sj+YXv<j+Nf?sN5X6zw|2y&iS=^
zclD8=vt&h#Ay96XX~f|>2ju7Xf|L^80~ke`HOOfGz0m2_+R>ners6_NdKwEcqu@F3
zTBOf*`NoY%H+oJA5Q`SzjHJaZrItVQ+8`}rkLT)5S<HIgkKvy_9>KG&g3OJNu)s0k
zRtdaU<mY7Ig(Y_+$k(ol1$y<;_HxmyH_ZA_!;jpX(2TKC!kt!Xi*nPT=WH+h_HX~Y
z7k=;ee*cAUee2t>s;86?U^Ngh;@DKb0#t`13%wZU@ui8C@?G0sdi6VB{q@gXedu*a
z@?*v&SrV63+eV-Ik*pbCGzCcw!Wn(W1w{ehv<(dOO+8oucNn}5cz|PzA*0M&qt2QO
zWJS!yHlxf%>k0^JO>}j7;s@NrG!bZ+<WC6ZxLlO*AQUt-J=>BA=FU<zocN9Z`olke
z?BBlmp5KtKZ~Vf~`A^r*|M9UG#*aR|^z6?ZYyHc2{l+WD{=EJ2Z~p1)uN>U+1tg&p
ze`-V$)8-c8Lih5sa)%A3Op>Mp1Xuz@gk4-;^G*Ivr8;;6EMOqOX>y=}=<oxa@MCUT
zU0AwQ_pg>eBe@lP5E1AgCA<|RBXuA0Tu@86*5easJZ?6qcH2A0UwQb@AH4iee&Oq{
zyz}5cqG~;>0gNn8`(90=?Q=G*)j1w0W6OeC5O4I$FUdF5rfojP#j6ZzwwqN$Z1ct%
zjP9tlBDE($ky?vbIe02|SUHfCl^^`ew3Sx`q`AN|FU>F38=a}9Bs`6VoeJc{BdQ<f
z6<Tpnkd!5(g{|Hgv9?XX1#HuDGtf4*B7r-CmmUcKW1eRNuO{_--G*6-jYb(g7y*rS
z&L1q<W;G71h{kQTO5+R<cKUHVLWJA;!<v^?xE@gG|1bq=ox~K~PEeKGT@AnED-}K<
zRlY|qN_YqG+${H#U;N^aee#Vr{`n_==XZV=;XEWjNGahy$cARQziqPIEPDk^#`b2Q
z$sio;l@g8v$E{R{b)pFbMf`tGG_gihM>$R#<<h?xu->NQDp(9xmT@l!UaKbmPxs>L
zqsaYz@*9~QCE7F++b*FD+s)lQ0_}qWxF13(;hnUEs3e!I`b?7LZWqg0GNbYRC3|HZ
z0lFfN5cNJ4`YKXM62~kni(YHl@0fIN#cMYG2I@3{Mkj{g86o--LxR7(;8}+Q2+(pm
zF}w$8z6Tg+rxiTs_oO1^ae?e1`IPm5giOuzBFb+X575btWi5#UrHN&CB1+eXMFHI@
zD82``hRosChfMiTIc^PM0k^gt8quwR4{>WCe+O=@vn3iKTRQEthsBkIfJD&)LVynP
zfKl)1pjCff=DA*Ds!?BVuF7pMl0xGT56d68GbOwWiZ~1~x)BC)HiBiH8OkEgY+F*J
zT16@$tW%Chh;Yluz6rsIz6lgFPMmBc--HY^PRK^|P0L!pZ!V>Mvm!Mop$rnDs+}Ze
zRYw|&jwn`IrDy83&Wg4mZ4}tqFrU{$D-;EM&^9p82X!_E++orC<!3wog?j+U_K9>v
zZF;+5)-s_fVwtuLWtlqE0>RP}b)KGh$(?W^z+qxX`3Q${90FNm-84PgEmK?nh*Agc
zkh-4CM6C3de3;Cfm+cFFEh}n(MMP~Yc8D5?7Io>^2h*#)+QQ*rn5eadLqS6$%Gx$C
zqO5^CWUU8Sz_Ep!#S#hJ>AkK<o*vj}aXg|5H_K+Gk?v31Rvdx{q6L3?;>X=K&e~-$
z!9!6%@V0>w1rOXIcqGV0`3Bfn?zfh{srL$JO&vTU8dc)9euu<?q$U1Yx5P>Che=$g
z8c@*CluYARJz0L7_dBiiXgaH%0%QT*SXM^V4RD8Uu<T@w2rwDTS%2B9uFJ}^+>=<S
zuK25dv>il8XV9@K8RgTvxU<@Xq=+_c6Ao<xNon)o|8Z**UWaK@>j;VhI<gIns3YJG
z9qH8%!1PycIGpMDtL+VvT7Lsc>#+n_tQ^LYXuEt?B>;=4#8&K3iDj{W*nZWm5^{`U
zDuKeO61^@4+^i2qGv=4%qrH%cR=4G5p#ESL5G5SvFJ#SquQ=h?*%uIpiuFpVt<T*0
zVHMUqz>rlPxFV{v^(xgJl}flMf4&O{Gc_`A*)2E5LQ~&eyw07ncdh-X+^$Ua=0394
zT!uG2fu|zW)1SB_BeTe<;|S2S2me*tT=WJMNYLg-&NOTOHF1H`I4tP=1XUEXDJYya
zrOm`PFrt|N@1F%5QD~`I24=lhvZ3RXKlM{TP4D#03ZN+8tkB2z5})s3we^8@SYLj{
zXPTz!dD*|&ZI@s9W~92T1mY-z<ochX8O-x}zrTOiZ$wpBgx+Ra;cd2mqYnJwVMQ6Y
zHZ&k<L;JsJLu28pA{XU2=ED<Bqu&pN!f8Tk^3kh*(?AQ-dIav!qc;Dj?%r&IQ8M+Y
z66&eQ*NMoXC=yR>3l5P3Nr`;oGii})zDdR*8(rp5IAyMl);2Jr(1AOIu19CU%vyQI
z%PwLYKi7#Cu-I=bzPB|ws~6Bk^kQpw=mkhhF9*My)(if^SWXGYh`_{Lo(8<qO9*wZ
zK+u_~W_2ZK%?0&l2ewV2S6a_DqPz60$3-a6GdXqd$+F%y1RcS^(Qur5v$cTE7)|JT
zAXxgCZ1?G{P`xBy+6(3x2?-~Za4%$o7g|wm&Om4RKM}N&wR^co^Q$j>=tJ`_eB~>@
zOglP_gM<~Th(z76&B`7pkAQS|u71sL#6zQY0n5qsphb_YKoQb(qrTRj@!M6uS@UE+
zPqImzI7JC}P&Mv5(7P<az{`BXyJqB3t7W!CMs@1AXF&s2V=-o<Uim-V0GOo7JU2Ne
ze;7?<Z4XN|m;nmUQXpSLF)#Z9qHRRVzAN&35>4TQpJNJ?G6YXvWAM3YQ@%HlDDcRW
z5uRCV)-zG~ps#1W^`P6ifazfsMk<Jz41^MH2N_2ttj@4v9zD$lCBU$Io~=9fX||c*
zY7^xfHY)Om7Donu)?Z3CSm;|u)Q?hC{qwBb#|`9rfFiiK7Nap~nxNb?Rzd)r3uGg<
zJZ8CBZ8FeV8LSX@=KZ$E4O!)e!~{%*ay*h?cnkX&dl5?J{y}pQ<;0xmAp;sXnGZS!
z8wZc9x^Wb<=B)Oc5QlI9O1P2g&|RdH#G`Wgj1_mnU-7QggBA*mBjso$=rAV9kCK^Y
zj2>g6tfwKW4AI54m?CT8thK}xr)0b5THcZc!a-Cq(pdNfz0oJ@6smIVLFm#3zyBGj
zU#b^RHwN`v^6PKmI|J$zoILp7?(jHUB1B^Kez_<&H&H46yC6><`_pny$#3mb#+pB3
z7`VPcQIT4-LlTZgO|Wg}R91oNtW$-CRZLknxA;Z|44~!G4f)p;B!N-I6uYSuie#yv
zbojrOzw|dJzuA1_g+JJR_`8r`4TKI#I1UNZD76ofFM&})GpOWD4|UVH4ceP(H01aN
z*_GOq8}V(~Du{bGdSjc8Ns!QzA&J1VE#JfgOQ3BT0@!lpIC^A;qChTd8yGm+Vt6(@
z-7Eul<gyj{IWZ8x@o->9vi`#bvLgccA_isaR|b{Ukv5Oh6Q53}sU&n0a#8+j2Pz#X
z^8UxBQ0@Dnk@EIt$g*-DE8R9{09nhm?c_=x8b}c4WmAE)Va{C0NdNJqfdhiPV$pkO
zAQnI7KPy|t<h&Mnh`M(x?)K7CbLMCcnnKCPEb$hIb96y}%<&FTfU%zVZQEL;jD9&S
z2+ZqM{MH6=S|eknU)k`Kln=iA%BMfGX{@w!yIgO{wO6ih%e6<YNx81e^@d!Z8!LVJ
z2IcoDR!j`fl<-!@Jsf;$^)gPm{l&ZPy4zm1rxp2~67B*$P~Y+!6gomeVRGsg*@Qgz
z*e>6=5dpO?0?gWkd`Y3+2j&0!%_rgHPT=Ut<dX|4^`*|oP6QoU{-=((K&MAZ=on%8
z=oW*u3{jRhx}9r&v;klH<)VbQ(*~+L*}PJ31!il)Onqso+xGPk0TtX)jzc7?A3OSp
z7S{Z#oE0HY*Y|JW)J_W-gY3y`Ye8EU5vOGrn>?GOlbdXBu&UW$*+^mg^-q23)Aph_
zI=<5a@m=62o3-*6Uj4FB2OR`R2{!@i)oGro$CnID$8=!i6{q}Qx#g{`)T?KOQ+ZGz
zd8{sLKDgGYMsQj7l&^SldQUsLv7>`6HD}yC@pheK0*<{Mw(T)1gYD%)w^Iv()*v_0
zvmz@EA!_ifZ!*nF@_#TU)iHfq2$mw}c%iqZSdpKT(E)HygpqHhnEW5}OonaSK^5(@
zlEpC>{pw0n*6EkmQOpJ;P?0}$+ens2>MtzKc<W<G?BL-i4^2EdF#$enksy*R<MhOT
zNDm`=<c70hVMW_86wYXog*zQs8xyrVj7fVt;MkaGq<=0laG43JA{w==D2-~t14#>h
z-7R=h`(lEJqJZFS0|O(c7Cdl=;I$V6js;K0<3n#UHVm|gv~AT6X#+`1`x|a)!+tSo
zLs3B5wt*3)4SZy210GS@K#NG*R_%~BkhHXaF)eL9){x_v1yVVA&uetd{XLWEM4t&<
zItoEhOg&JT<i=~;78of{n2$7ob;CL(+zuRhpJ>&q&&Br}%_qP*WC3=np577wD1Wg9
zI5MA>UD0N1w5fmV?$Vt3lwUu*3&ENnNeAAekHGiKr-$UC+`NVQcgi&_%U`SYDwEE(
zX+jpV=FBH($Y$Ov7v(#qza~eM<8@?_W+@@M^^QIwI>EGp^42yQV(o7_;IKkD`=S{=
zxq8dq(wzB3J38>iq6(VTmh9j+d|@pz-8Wx2SPNP$nSs{M`LdDJ(7~GdWZTJMO;!Nq
zxtp`z70-~sn)w7tR*TrwK#$Cq@=V=Z4VpFCeBSE~QZ}FRn?RAXo*dCvH4K?_&3puo
z0WvmFLL*;fGaJ;S4&&5(0GjVXax_A<?zc?Ucu?=NgFqhQt@k)L1kq;*@;yQhu4zZ+
zw2}Jx1UM^8I?94mvle$W`e^IMr71VdScN0HArW#|N@&~%PR~>$>)8<fO|8^uv-CH&
zQY&fOS>Ib)PuSkJr!*I{oi9b9=*SVEu@rlsX(Hd1&q~6T*gviu+kd`b&Ur0ynOHE<
zM=O|Y7)op&p~p6#FPL-PNa6@a{<eat$VW=J3&F(W0}h-z^bd-Bx1IB@$fl=e6oW8L
z`voNVJ)QFj4slPTkHGUqFP<ZNI}_3OJ`W-2ITL1K2<lY`^1W$Zp2RckAOb!B&G&60
zp-fnt%l#45e1aywzw>f(Yma|?JNh`7n*}=>!3`f=(4H$rP>DG`DWWS%GPEps&DsEa
z%=hYrIDBDX<`cE!OxZzVVO5s#S9*drq9hWF-dti|Xa-kfvGalYD^h<leZek^BqP?2
z9mxogbTaZ>IvL3-l5yZ-+n=16oV32t{_tuen$6~$)iXg5xgFZ!1O3YnNaoju*L*ID
zqXZ=L$x>9L21>XKWfjYFpm63Qy0f-{frB1^BvA9o5vUKz&y#Xdz6lmt7^UC4ReCe*
zoY1UAP)8Aqux&al0!Z2-KAN@&y+(kALK5A-w@>jRm5N-Ha2J?in$qDKiYOzM5G02)
zu1=M&_f`mo08aokOE%1GSU{kJTd9#WntS#O-PTfX+nqsbwSy!@>_eJ|?cy6r+Qxxn
zRME0sirJyigk8K5mMP&a)QWPWTGI^c;Q=hnDXeB02n|reTlr*?<mf5*alU<7#LNHK
z8H?;_nG$XU9c9=}S!Zj=xp<MQ=i9-w*Zfe|x4V`HV$4B>c{`hF&FQ0qn3F>r%@R~p
z>3*rkx@NeCN_(rN4LPYaXquaSV+@Jn+&ni-xAV=w^f{(EQzLUQQpy@4_GOkL4|V0%
z+!J?y^rIi8-YhSe<#bmDq1EVMTdyIf)UI*jgx|hvfJx#&&Par<QNrzXmkCR>nP|4r
zt=DD)dG?^U;+XFkv$Dj?IXeBmHVm0qZ@!_MI@88m5zgR{65eKc?T2dHB`8@{-YkQ6
zMA@uTFkNmpr@A%-nDi`P2Gp4DSib%AA$7lSS>g;O9HU?OWdB(R`QCF*W)+fi^;To`
z`Zcu>jqSiJZOCmIvBCT0OD@WvnP7+jEbNje$67Z#3%8bDle^2cI1prGQaos(16d%D
zv#n)rM+-VBh7sIhu6`xxZF|{i;*5M}3MBcWo%ffxS7lDc0qQ_<FD9ke0d>a6M6vlM
zYjzo=HCquj=n*9`*?y>2?SQH|sH!C!Cgc>qIErA|73!4|jg*K@_H|tH8$nf&#I3j>
zi;8^G%oNE2phSr(3m_g5S1I9UAgEVvD5Zq!#wDW7cP^<fEm)e;;}TP@1UQOVbGJQZ
ztud9?9Q^BaUXyiSNCv7Q>l>(HDQK<AmVP<vbl$rfXAD_KW+u^I@uCx8%$<*{&7h{X
z_~VWrl0RONi~q3zZ8PvaEW6Tu<CAlY&BC3d4_dSlIvj^sMd)3nvfMe6ZzJxRH=!O%
zxEFLBR1jG96#J~vLsZ1*Z6nI)wTS>pnaD(tHW4lOijWi&JQM{4ZyRt9`&RHb%fOZ3
z-%aqBFC)3@q_HC3#&Rdd=p**CGKZju%)w^@jg~o(w9Id~WlkrG$s7u&%(Yzj#Qor2
zdKSnADoM(sOsW>$0L4^DN+{tD%h5n3X``|5==BNmP6$~9l!yE{{$q>^5j+?gp@cj6
zgkx9=w&a_8a|wY?ksxr`!GrR%O$EX`0mpVg$7Q;meY-<8>OjYk(GQozS_w*fIur~H
zb8Wv{lRLFl4y86X_!ZH61@e$wl<;ndh_rG8GCIV%X2mdvYSzy*mx3{%S%ZbNh{1v%
zVz5Bc2Kx!O!J_?Q1`CDLVD+F09P^OVAflHTL_6KRS})tz)@s=qXsz0mfICbHc_fBv
zIgzIfBdd_tcgS+3yqIc(;GRN5Iy-|Pw!Pl^q}ZNWGk-vS!+t2?9Uw_Q=34%e9ON(0
zw;L-Rr2&&p`EnNL)h4(8%QtT184C>*F&4|ZV?+UxHkMl2Sh5nt2W5F}LH2jb0qe_C
za`2;Zl3u<~trfW_;V$B7G3$cDX<gc0Yy%_O3vh?MOvulV$VCa?4LDXmcISNQOV+`m
zFQPNso<nCq(mMO6X`N{m>=%+^DuAMZ3Ty)dRY2=Z_bK5xaD2%IRg+w5uLk1KQbm3y
z#!$lB08=|&ZC<6*?royoAYWF{3eg&OrG)#ym*p}`n`VT_eG^Ysoe&mLr)|igP9R#H
zrN@4}{ICDyXaD$DKlb?Ve({Z;gbS@sVoou2LQz1Swt<1_)Vc!h&{dZCSoX}Mk{1)1
zcNt}cPW45E4xSbqLI<LSetKfX?L(v^#e@z;0ioLlMie@5htM%A1WyU~0FH%@rzApO
zh+d?W6+1LV#BSSgh#g2;>|b_^9j7fOb|?yn-8L|y*nvC5u4l-AW3kim!P};Q7Lm5C
z+97QqX=(q2TiOo_Nik_dQ9#<Zff1z*+#zkfz5zIvHdOJ3@~m-#Eh27Pw?o`Ow#e1L
z8S@{w#r=@Li-{YG0^+s}j3{p4Tjd(?JR(sa1E+-B0TW6%*;Fz?$ph_hZYDbTIzfmM
z-VQj{4P9oprhS>&z@3{=715Gy#i1o2X)XP%TT2fMNii)!Q9w(!ff2O?e5+gov{aFw
zlGF%rEO;Z!{@3Sa9Rqw3k=yzmA_tNd`9E}voC$U@kwZ~H<hFr<BG;21;4DC$uGebu
zd&t^j2$q5vbxH(*Lr46KB~rq>`4sDjDP+$fk~bC(^bkmksLM9xP!|xbuF~XJ(vPm`
zoDLFFxn9=Y<5tT@Q@l^m#S{#MQ^6GhBz6y+CGBZ>s7N-pc#RW*ysxdjup$qF=H1h^
z3=K30tzX~{{p#fpz-F6P5HzQn%jP)~Su-!c{PD<i4$1Ea<)Vc5fkvh01l>EX=1gsj
zduaB+ntDxMJaOdk;lqa}CmuUGiS_9_&QuW_6muYXl_e<Vwfsg2-^pJnT7JA7Ts!ex
zej86barn@o$A?kRGzU^Y{={R$sAoF^sYhu0?9$(cdj4<K_QkclwhvA|HgV|4!9(=B
zA`;eSneVR;{KSs);Pw40bcCJpq>ovK6>Z+R22Kyg;0RC)-CPTsl%H7GpoI4V-Y%Db
zT?TgW=#e8w9y>U3gywKoMte#)P7N5CBa8siVdV6|zez`ZoxmLs5`@!x@@L+c4B;~C
zh9<!300OpH0D*#DPY*g9La!>>2AlyQ$%cTV0DEFlbc3yY<CorVw58_-mX(=cO&+^X
zJ#?l64Nym*$?_cgz0q*r%W2UfYe$T1lyEn76IbN<e|h|^6FrC7m&fJY^Rt|DzJIW^
zq#u{7NL`7k1HDzQQJ=#GKg6bhq-<*9LfWQu?1jV(O+ll(Dn}L8t5dul7OOJd(^f@*
zB$S#5p?TG-tXMaf{R_=#FOacAeWMf#SaR(x12fE4_3daVw#mi*uGIbQA;9DYw_eAl
z##?$drtffTBLcZoBVD(+fn#bT>@CZIChY1^02Jd<`^Dl=pp!GO{G_m&Wo;7>Y?7<@
zhLv&ovvi$*q~IlbFa?b+WY?HuZy6};z_qum4>NFY85n1j8pNDyZyA;DfI0TY#rwqE
zd&{7~3^dKay=B0$ul~JdKmT+87;)~GuW>U<xCbC(T#>zH(BMD=W3k?01RP!1ca@O=
z#W{KsvVk$AMbp;I7BoHL0p1*gd+#^Qcd_BS)Tj($CCJ1N^hf~`bLiiC7P~=3en{f2
z?M^>bdx0KVz&l2k{5Ugomm0O=Eio|ZS-!OT_MXKZ%MVC>NZl{!FjY!81_yX|Z<m@Q
zX1jK&Q42O?x1UKHdArnrAt?(Rv`eib7_F*!oF>evgD11;7Oh}>=l!nSa_enl*JC*l
zOsc?UHcK*mGh2*|x2Pq1o%6M7_MMrLE75<xW%ut;iw&S6J<;OAQTw6V0tQq)d^20z
zvynHmL19!j;!)Y)Gii-Z@`2!qCgI>5R}}f1n85(tkWFuKeLY;Ff_$e=_OitaK=_Qv
zl<-z6B#BCZqlkZmO>b0;m-Vfg9(+5U&}E|mBqMHmqXpEJ+4N?zzickIQLwH}Z`6l6
z&8D}PZ$xM5@jvR)$>gH~8<zIzzCqy}{IhW9u&4t*wL1bn%XAOQMG5Z$9ET`|S98{c
zyqU*t;aI4)>T4ad527MJC*BHW5eKm?Ip&f;Qf4w)N}GumKC|6o!iS=O@NEMFa}q6l
z;11yfPBIg~vG5s9d%{1}tz%|7{RPa144K9GooLUA;4U=Hm=Y~@WozF7L8rm=f1$g!
z7POL6x+?NhqD^Wi_KLcFzj>j>$u(xL2ce=2H#$^+=O-50W@G~22-bMuP&kTMsmO1-
z_9C`o1>>+4ASqj!xSF<=EEn|gQoYsbdX4FBs~xn|VR+iM4hpuIZ9!4Mwrm3<+7@t!
zZD|Doj%|y9re|AoOf^NF75OSr5a=Qbvb8%D1SGAXD`^F36Q2|kOguW$%siCRx92El
z9uL7V4e6W#irZ*H&S3pOcQrob)>QsJ`GN3A3Eu$}kD9vT$*SB3I1cvW+H%XQ`5%*&
z@7@-`-C&XDe)&I{{Xk1krp@adWxvWtf?(CI8I@lhg{IzAG}n7HdT6H|0!Oc%-izA|
zLwXDW=(J32`oIxvJPaVK=(SVjPksICU(bdoD0ZhQ=7Ot!tNiKLA`!70gKU-(?uCF!
zZrp@OX+gq>FH7h0a?Q`wBBFc?iHT%;8myUyqAjsm0>#!dUgJ4A1<J3LUy;V?N4`X7
zc(#0@v))Kf-pxuB5e;<S{O(GyjFfeuT5WWhq^k&&Z-NlXDO6qA!e})eJ>acq?-y<`
zLrQo%@?}8pqdgboP(36Vwh&OleNd6=3zb>Ba5SeUCJ>TlS;E}5@^uqU%xBh{9D~72
zSlejK=q5{mS49Np0y+MR+24gV&M1w>9i81+8L&@z!S8fr(X&0p8@<oW@UjCt5}T$*
zri4R9c|cftFC0q=@39ihX_J}lRBQEnCzcnRC}LVgf0XcUT4pAZ)AAh09V=22T#Stp
zz7tY@&LK6ku{77ksJ~~n<)Qvo=X+y&(f6~|Bg<<skla8uoVCQ=X?dA(f^W^s9PlYZ
z042O5PdD=iAB$JrATwhS!zOt!C9FWkDBZ6Yvlu_mdbQl^T<0iV++4~H^J2u|)|ga)
zDc^bMQ2S|1Ov_Y23ExHQ%ntKgkA{OgmzI{EURrw9w0%gxbbu1x2YE%Vd~zN$m3&k@
zSFu0bvJ&>qOYDUILoxsPqp)<d(OHq<cTKix$D^=)&Am?GVcL;oWrH5vvo|IllBU+y
z<oyslGZ=-WtkEG;MRJzs9OMCvhMd<RF>1H`ZemjY5OTKb#f`~%Jo3&^dAVIHCaMT=
zlG)LpvRq~ltV!`CnUQfMnn5uB<&XT}2T3g3f~k1Kl@iO5BX<On&K<ky+)>YVAlW6C
zBm}LKt3fAuP$nmD#7-HzM?cpV3TOVLlLOnpz~n$19dL)y=}-bV)+j@+&Fsx{2m|Nq
zkQGsrZN{M{ASpFXj-}P4vy#I?vPZ5#l9!*1<yYi?8$EAshAJ!l{wK=7Cq{2u$rZn;
zA1o$AdAkfgBmd2F=2u)qhegn_0uX6*l(Iy!(_VY!7WpFDCwIwfbj|a~j2(!9a&rsh
zIf{sSGiI!nm_njM2{+mHVomThY$5+7+yc|uD4i}%9veS5zUf=rzxLLT?EU<=t9y1$
z{@V4QdE;xJyL976&C#_V7os1OixOU-ij8s^&c|T+laC!dJT*Nv`NV;vkIz1S;PB++
zi33MZ%uXLTGBG*x_{@=`C!d%;{30R5Us{rz%kpZCN>$R#R%J~BTD{t-@U%;%El2mS
zWP{CPLg%suD70fik+lT*l9CUnfm}lXen5UCKvTkds2ycR31;L<4AI`@6YEk1r!!n=
z61kJ(N9~;NW*Op)5hXUH!xiAzhM2)E$dRq}fLGALRz<!^%o%Ww#mKi(jKR=Hq8}w3
zx0S~RLzQ~u0-}xO^h77^x_V?dA|%C>1w{d6*#-tGOZO5ucS|B=^={SaxC+Ff620th
z!8|F}l(#CZm#>}rXL}KyzV`txRviq;{+fAjJ!gp&q+4&d3xZxz!ZP?xaxIAOc(t;9
zaaOk5H1AL@^`w+Lxxua6$AzSra-k@oT-(4v<!a3VA6avNV~r5MxWkg84{&aMXi?jG
z9ij%37IoPz>L-Mxn5dyBAZpvdh@uAW5VejQfMZebln;xt@sd2gGH~xIBt@idn{Y@S
zNJ{DxFQ%nl5l|9CkIE+^<W%(&UD+GKyhG0CTM25r<x4Yi?3Mq`2l+qT0G=jX8-BnH
z)1+Qqf`Vv2bi+>unB3gc(Fh<ZN8b@qagX%S2@;L<AziokfMawcZ1~B6ChY1BKR_`C
zwTTCY%{>M^$p*_$3aeR0zsdbe2#BBk8-C=YDa7$R<S(>L2{(d97w!!|ps)kihMzvn
zzzsiOoIX5=IoF0CD&-bWyo@lyVN%dw2AXEzh9BVAm%xKo?=Y#{4L<<)0dyWFmETKw
zL1@r2x0|9VbJlQiGiN-ri#6eP7{Sw{ydbmRC*OUNEjoj?JXk>_$i&8J{4TjD;Wm({
zx_^gG?2{GwAsdzYq1wXp*)<2Fp7oo{ot5%+S%Ja2^#BSJj;Ic|cgjTxw*bZ!;@v!n
z5QYE~8RRqCx0xpvK~}riV;@pW06GAaa12)Q@!qx{ll|sLZr8RSYQd}RejaHf+V=B<
z^5w_nqP%G|iGNv`af0^PNdbow!S!Pw{(F~RfBp3z^3MFnfB%cW{G~><w)BVp{eS$g
zzkd5mFMMo$?eYgd@PQwGdFAbW({qc9ufBTa>%aR)&%S#6?YIBt?Z5apUwG}asEipF
z7v;~k!W81Rtqs~_l$CTmB9o3T%BckMJ|^maP(IrF!#k-TSMD9Ja;jCYjnTXD4f0Q1
zpwnZ1OgH)gT9#z^o}(B!bk9*1nHXQb1NLtuimk6AJ<U2`KUACFfU1Y@Ig0sp>^aJg
zU+^h6)my%K%|-8qV{dYkWyQ=K%`vY=o8v+}wh;|xdx?`oC&FF|<jsohxN4L9Wbs8(
zHoBUblQ0+%?kVABAjBitTa?=A?8YTJzDuaHAuHLdgyhW2HnKwHj&A}SMZY6#YNAKP
zkiJb#lN-}XXg1bCGH_E<HUUDz&v@MUV*uX%yu4WEMS0!ki=X&J3q5D+CsZ1Oe&2gZ
zzRWiZMoI%$J$~`fp~K+wlQ)BZM$VY#C28dsdRV={fpiEi3D(?neffCANY<3GAG6!)
z^KX|*ul{AJ#Q*T1S0SDh*sz>ij|Wg7bZ+_2cbmCq(SUJgXIjpdiGdl(-BKTRO$oOG
zC-Cy>QFc?w++&PivKj#i_b0E(dx|>#Gj;AkvoIu#=dC$`cZ~8`Hc-i#_Cmw=*UT;p
zdrGeM8LExP6gXd$hwJ(#cv&<acD}nRM`~YK>K%w<MisiK?_yB533BySc|xuu_hqYc
zE`R&1x6I7llzh1q2}rgBY7Uu|h8Zs9Bpz9v>@~jsIF0M^kIK@HzA5eK+DgA)NQPOd
zHYq5a7PwykG(rjY0LQ@OMo`Ciu8301YIgDBhx?v=d{7X{_zw*ZouXL`mSw|*T}3lS
zsU-!SnF2^#m*h+&X$J+G)Jq2}kSu9U%lcKv7w=%jRCX?`a?W{_+G}HgfVi#**sUf!
zHk-W0(6o{j)zJBX71hl$Z8&@+tGL+m&9D(M({KG1sSppKgtt+B5z_=u3(7RL!2!_*
zSK2UMzH9qSuYTvNzy7(a5510!YQCQml41r2h11}4JO{o>u4o<zVO-!wYshjlFh0U6
zBM&7U2aZVClM!2%p3VSqC{Y`%t<T)^j8fuj9eI-*jJ`uE!s005HjwlsdK)sKwtW#!
zj28@rUW%a=AxTVvTHPjbk09Wg65bNyX<rVV<gG3j%P-4sa6BA)DaPi@RhilWsrJ3J
zD<!;#ru!t6^OWnM$0r|u?6Jwoql2ZVQitok*R5%jrX6k4rzbb3W2jyYhXjlJ$eCu%
zzs6`{_El)Rf4_WP%<iFZ+PyYq+rU6m)^-ZqVW--p0AoVNPLa;wb7O$IO-ifYR;^U8
zRRScXl8MV{m1t=n6Ov-mhN6J9Z381p8@NN-`{idkKneE%j-^fTF>7^ZGSHXWROE+u
z$wdiogQkesZ5s};14)bh@4LnRw2%}NI}`=PZW|a;?7$sjf4BVnPPr)I4#2V4;c4-z
z>@XiFao|NHZmV}l97tN?&$=akTu6#Z9Et)Gw+)Oaao`S#YsUs0OPuN8#Z%MKCgy=s
zhop$q!PA68>Oi#AOHX`u<F%b9rXG0d;T=yul9R+t2}v=jLs3BLF+6BBeK{7pR`0eM
zVkrBvX^iD(L?r=tC`reDz_F5yoX$)eu3)1gKPEv4Xc6VusvXJ!l2Xp$KXM=bazaRo
zDF+Ita+sPhxuU!|2Ao-#$uRF2mo?V=Z#*p`8ZT|xS^D@5yx8PJ@0S0Q@M75-s3Ukz
zQcd9GJ8HT^ZTHDVxmgC{P$OVeNeQ<Dj@8Io&BZgaHZMoe$O|k)kz|_5niXKoEy^}g
zsVM*fk^WG^O#o4koV{<Rb+lmmUXlM3!vI#qFf6mmFi^rlxhUV=0>lJq*}y0V)wcX*
zb^Ug9@#RPXpx{?W9LsOA6jnO?hi-G4mWqm*6BJH!(uQFh7-$$;>%bja*GV|wSnE(-
zJTvFjYO-}R>%Cx6QV$T_%(OvgCwLS}{gm)l@XWS*cy5a*bheiWrH3}l*b1)AmCCWw
z9$eN$6}TclCFW&0AN6Dp@JL0O*Z0X6_sT^HcLPbqoul`Z|M!pl$%!KqkNn)ZqvjBm
z`vg>xixTddk$;OB3KR@`EcmU8|5VvA+`p|>&lZ8REEWxsr(~r|ri#5Ij<v8s7O+6e
z`9KTIc9iw<S+C~HYpyTV{i_$EqbOK$i55b%&C<ZgHVe2cmziupb!mQJIsmpvV6k;O
zG!H~;{`ABb-AUL<At|PLC<-XZHZV{@THL@L;=W&g-Y*v=yd7{^E+cMwaY^1*6-;|;
zSl2+oLsdlZwiSoqfoQ>(#@}+s=2;;rCU__c2;Md@qTqp#EO@{v!JEfD%|!2<*YuWU
z^Seadir|u12UQWl+g2Qc2ciXkdU8wJ;&p;>N=OLLQ}xzNZx3Sk$shZLEV}@?PY@ko
zBu~lI<fd9@U0zISBbSaX;D>1x+l7h}?ty}YB#MeMurJlCCKpkUoIN0j_sB&F?|{ZE
zN-vz6YOgn|y+^tvp^J{AVQnubg@ep#JOf&3kYz;=hz702l~&N{s4!1f!_I9=SfLdd
zh`BL)W!P{##$YivRw}<OWwY3%eG8i&^r-+7k>`dbE$T#1#vxR*EOkKsNS4*WVqCJZ
zMV7+b{<*rGo!?zWNj=3XG3sFkV(J~}9rw$RNu-J4^|qXQby;p3)p+8DHw<hPpea~T
zzD1m@)#YU9v$AhH+V0#xPU^&jb`apnYiqoTq+=eT<*C@-BK-sMTh<n4J$X2#NypoA
z`%9ixS?@hY`q?+5I|zC(rV+BAzHK|P)sRLYDN48#B))R05nT2f&(xbW2JyJiW4+l3
zg3WSCetw1By{~>QZ{G|kN33~BettkMO1KX&{Ga(??>QX#Px>gkFEWqY=iAa*9-Y6i
zG$ZfIt~cV2J}gx}C>JHXi$<7mob%f&$k99@In}I9Rpm8$@&vmacNtT{n$`jLFtD`-
z<byWG<uezP;Up$OMX1>@fm6g-ZV6`;0ZSx;lyEN{LN$g)9+i;Ix?*)F{1wqlkUYnf
zRX5$#M0|=npY26F4xrIzg4S~~rKy_R0QnwwUY-kXo1=Bk)t7r4(oDe0cAD5|-&54_
z*Vd#5sr{t+5h1!c8b80)^NCF7^PN>**|sV#Xk1xu*Q@P?pdrs$#J$h=BSX<z$8HEI
z=5AWnNC?{V{<HG@MjvAhpF4_)Z9O8O_sK;G--!|tVtm59UAyk}sQ0+-5ccN9@LS8$
zP~Ssu`5iG&{q;^;d`a5H6tnROYhS1@%X?m|L?_|EMCgkAkqr3okKqoU++^`ABSiKp
z`MGT%u0Lyjj4QEy+Z6|+f_#UFu{?sX%)9xleVctP`3?~i$rux@Xl;;YZ{)iwRvQy6
z8qvozTZ~Mx68cFA$B`0Fq|zKcr33;&Z`;{3exuf&tzWYn3$i^W<uOa|ep?>a)5CFZ
z+NCFrw2(@qZvSpNk-|eCkc;x>Eszj}#OE6|<Iu#gcgcGnqsOe6O`Tu-q##zu<sT_e
zm(Iy=|K&^L<*{;kZ0nBkvC?bh@$&fi_~wl}Zz<ioVbh(ZN_lK=Y2$e5Lz~7ojBR<K
z^w{{;?RS)(7R-^c|GZS*P};V2>`zO7yx%PHY@`!UmX7W#-FNnbTjU0AX{}KjtCvbw
hc9eE@H<n&A&GOI5^E2jef)wScM_a+=MsV%e{{sbzN<;tv

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/nested_projects/output/default.project.json b/rojo-test/syncback-tests/nested_projects/output/default.project.json
new file mode 100644
index 000000000..edb89e3ca
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects/output/default.project.json
@@ -0,0 +1,11 @@
+{
+  "name": "nested_projects",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "Nested": {
+        "$path": "nested.project.json"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects/output/nested.project.json b/rojo-test/syncback-tests/nested_projects/output/nested.project.json
new file mode 100644
index 000000000..8cc8ad1e7
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects/output/nested.project.json
@@ -0,0 +1,12 @@
+{
+  "name": "Nested",
+  "tree": {
+    "$className": "Configuration",
+    "StringValue": {
+      "$path": "string_value.txt"
+    },
+    "BoolValue": {
+      "$className": "BoolValue"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects/output/string_value.txt b/rojo-test/syncback-tests/nested_projects/output/string_value.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 5b904fc1e..e5a77cf74 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -14,4 +14,5 @@ macro_rules! syncback_basic_test {
 syncback_basic_test! {
     baseplate,
     respect_old_middleware,
+    nested_projects
 }

From 538271f4d40f9a87a234f823218381f7a2732287 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 16:01:21 -0700
Subject: [PATCH 238/366] Test for unscriptable property support

---
 .../expected/default.project.json             |  35 ++++++++++++++++++
 .../unscriptable_properties/input.rbxl        | Bin 0 -> 54063 bytes
 .../output/default.project.json               |  16 ++++++++
 tests/tests/syncback.rs                       |   3 +-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/unscriptable_properties/input.rbxl
 create mode 100644 rojo-test/syncback-tests/unscriptable_properties/output/default.project.json

diff --git a/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json b/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json
new file mode 100644
index 000000000..4350d908b
--- /dev/null
+++ b/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json
@@ -0,0 +1,35 @@
+{
+  "name": "unscriptable_properties",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "Model": {
+        "$className": "Model",
+        "$properties": {
+          "Scale": 1337.0,
+          "WorldPivotData": {
+            "OptionalCFrame": null
+          }
+        }
+      }
+    },
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
+      }
+    }
+  },
+  "syncbackRules": {
+    "syncUnscriptable": true,
+    "ignoreReferents": true
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/unscriptable_properties/input.rbxl b/rojo-test/syncback-tests/unscriptable_properties/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..cbb16d4e7bdca92bbc9e2e465fcf62789ff939dd
GIT binary patch
literal 54063
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

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/unscriptable_properties/output/default.project.json b/rojo-test/syncback-tests/unscriptable_properties/output/default.project.json
new file mode 100644
index 000000000..37bba6534
--- /dev/null
+++ b/rojo-test/syncback-tests/unscriptable_properties/output/default.project.json
@@ -0,0 +1,16 @@
+{
+  "name": "unscriptable_properties",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "Model": {
+        "$className": "Model"
+      }
+    },
+    "Workspace": {}
+  },
+  "syncbackRules": {
+    "syncUnscriptable": true,
+    "ignoreReferents": true
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index e5a77cf74..dec877164 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -14,5 +14,6 @@ macro_rules! syncback_basic_test {
 syncback_basic_test! {
     baseplate,
     respect_old_middleware,
-    nested_projects
+    nested_projects,
+    unscriptable_properties,
 }

From 752325caa79a7f400dd67db28da8a1d8bc969464 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 20 Mar 2024 16:02:08 -0700
Subject: [PATCH 239/366] Improve panic message in Project syncback

---
 src/snapshot_middleware/project.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 6abc57f5b..accd9d249 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -483,7 +483,8 @@ pub fn syncback_project<'sync>(
                     Syncback cannot add or remove Instances from project {}", old_inst.name(), project_path.display()),
                 (None, _) => panic!(
                     "Invariant violated: the Instance matching of project nodes is flawed somehow.\n\
-                    Specifically, a child of the node did not exist in the old tree."
+                    Specifically, a child named {} of the node {} did not exist in the old tree.",
+                    child_name, old_inst.name()
                 ),
             }
         }

From 4928ad7c6e47f9c4b46ccb9b3399304b291c677b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 25 Mar 2024 13:58:05 -0700
Subject: [PATCH 240/366] Rename snapeshot constructors and path field

---
 src/snapshot_middleware/csv.rs        | 10 ++++------
 src/snapshot_middleware/dir.rs        | 14 +++++++++-----
 src/snapshot_middleware/json_model.rs |  2 +-
 src/snapshot_middleware/lua.rs        | 10 ++++------
 src/snapshot_middleware/project.rs    |  4 ++--
 src/snapshot_middleware/rbxm.rs       |  2 +-
 src/snapshot_middleware/rbxmx.rs      |  2 +-
 src/snapshot_middleware/txt.rs        |  6 ++----
 src/syncback/mod.rs                   |  6 +++---
 src/syncback/snapshot.rs              | 15 ++++++++-------
 10 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index dedfe548b..932ce1ff7 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -102,7 +102,7 @@ pub fn syncback_csv<'sync>(
     file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.parent_path.join(file_name);
+    let path = snapshot.path.join(file_name);
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
@@ -118,9 +118,7 @@ pub fn syncback_csv<'sync>(
 
         if !meta.is_empty() {
             fs_snapshot.add_file(
-                snapshot
-                    .parent_path
-                    .join(format!("{}.meta.json", new_inst.name)),
+                snapshot.path.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
             )
         }
@@ -140,7 +138,7 @@ pub fn syncback_csv_init<'sync>(
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
 
-    let path = snapshot.parent_path.join(dir_name).join("init.csv");
+    let path = snapshot.path.join(dir_name).join("init.csv");
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
@@ -158,7 +156,7 @@ pub fn syncback_csv_init<'sync>(
         meta.properties.remove("Contents");
         if !meta.is_empty() {
             dir_syncback.fs_snapshot.add_file(
-                snapshot.parent_path.join(dir_name).join("init.meta.json"),
+                snapshot.path.join(dir_name).join("init.meta.json"),
                 serde_json::to_vec_pretty(&meta)
                     .context("could not serialize new init.meta.json")?,
             );
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index a01db04c9..9ce8e5425 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -99,7 +99,7 @@ pub fn syncback_dir<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
     dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
-    let path = snapshot.parent_path.join(dir_name);
+    let path = snapshot.path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
     let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
@@ -136,7 +136,7 @@ pub fn syncback_dir_no_meta<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
     dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
-    let path = snapshot.parent_path.join(dir_name);
+    let path = snapshot.path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
     let mut children = Vec::new();
@@ -179,14 +179,18 @@ pub fn syncback_dir_no_meta<'sync>(
                     continue;
                 }
                 // This child exists in both doms. Pass it on.
-                children.push(snapshot.with_parent(
+                children.push(snapshot.with_joined_path(
                     new_child.name.clone(),
                     *new_child_ref,
                     Some(old_child.id()),
                 ));
             } else {
                 // The child only exists in the the new dom
-                children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
+                children.push(snapshot.with_joined_path(
+                    new_child.name.clone(),
+                    *new_child_ref,
+                    None,
+                ));
             }
         }
         // Any children that are in the old dom but not the new one are removed.
@@ -195,7 +199,7 @@ pub fn syncback_dir_no_meta<'sync>(
         // There is no old instance. Just add every child.
         for new_child_ref in new_inst.children() {
             let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
-            children.push(snapshot.with_parent(new_child.name.clone(), *new_child_ref, None));
+            children.push(snapshot.with_joined_path(new_child.name.clone(), *new_child_ref, None));
         }
     }
     let mut fs_snapshot = FsSnapshot::new();
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index cc1e0723d..6fddc4f72 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -68,7 +68,7 @@ pub fn syncback_json_model<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
     file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
-    let path = snapshot.parent_path.join(file_name);
+    let path = snapshot.path.join(file_name);
 
     let mut property_buffer = Vec::with_capacity(snapshot.new_inst().properties.len());
 
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index ef7f1122c..c57497683 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -128,7 +128,7 @@ pub fn syncback_lua<'sync>(
     file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.parent_path.join(file_name);
+    let path = snapshot.path.join(file_name);
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
@@ -144,9 +144,7 @@ pub fn syncback_lua<'sync>(
 
         if !meta.is_empty() {
             fs_snapshot.add_file(
-                snapshot
-                    .parent_path
-                    .join(format!("{}.meta.json", new_inst.name)),
+                snapshot.path.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
             );
         }
@@ -167,7 +165,7 @@ pub fn syncback_lua_init<'sync>(
     dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.parent_path.join(dir_name).join(match script_type {
+    let path = snapshot.path.join(dir_name).join(match script_type {
         ScriptType::Server => "init.server.lua",
         ScriptType::Client => "init.client.lua",
         ScriptType::Module => "init.lua",
@@ -188,7 +186,7 @@ pub fn syncback_lua_init<'sync>(
 
         if !meta.is_empty() {
             dir_syncback.fs_snapshot.add_file(
-                snapshot.parent_path.join(dir_name).join("init.meta.json"),
+                snapshot.path.join(dir_name).join("init.meta.json"),
                 serde_json::to_vec_pretty(&meta)
                     .context("could not serialize new init.meta.json")?,
             );
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index accd9d249..c9f48f165 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -504,7 +504,7 @@ pub fn syncback_project<'sync>(
             // syncback on the project node path above (or is itself a node).
             // So the only things we need to run seperately is new children.
             if old_child_map.remove(name.as_str()).is_none() {
-                descendant_snapshots.push(snapshot.with_new_parent(
+                descendant_snapshots.push(snapshot.with_new_path(
                     parent_path,
                     new_child.name.clone(),
                     new_child.referent(),
@@ -550,7 +550,7 @@ fn syncback_project_node<'sync>(
         )
     }
     Ok(snapshot
-        .with_new_parent(
+        .with_new_path(
             file_path,
             old_inst.name().to_owned(),
             new_inst.referent(),
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 0975caf40..3c22d0c10 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -47,7 +47,7 @@ pub fn syncback_rbxm<'sync>(
     file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
-    let path = snapshot.parent_path.join(file_name);
+    let path = snapshot.path.join(file_name);
 
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 66bddb748..9a3e5584c 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -49,7 +49,7 @@ pub fn syncback_rbxmx<'sync>(
     file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
-    let path = snapshot.parent_path.join(file_name);
+    let path = snapshot.path.join(file_name);
 
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 4b6a70e5f..017e8b3b6 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -53,7 +53,7 @@ pub fn syncback_txt<'sync>(
     file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.parent_path.join(file_name);
+    let path = snapshot.path.join(file_name);
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Value") {
         source.as_bytes().to_vec()
@@ -69,9 +69,7 @@ pub fn syncback_txt<'sync>(
 
         if !meta.is_empty() {
             fs_snapshot.add_file(
-                snapshot
-                    .parent_path
-                    .join(format!("{}.meta.json", new_inst.name)),
+                snapshot.path.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
             );
         }
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 34b3fe29a..744aa94d2 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -120,7 +120,7 @@ pub fn syncback_loop(
         data: syncback_data,
         old: Some(old_tree.get_root_id()),
         new: new_tree.root_ref(),
-        parent_path: project.file_location.clone(),
+        path: project.file_location.clone(),
         name: project.name.clone(),
         middleware: Some(Middleware::Project),
     }];
@@ -166,7 +166,7 @@ pub fn syncback_loop(
         }
 
         let appended_name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
-        let working_path = snapshot.parent_path.join(appended_name.as_ref());
+        let working_path = snapshot.path.join(appended_name.as_ref());
 
         if !snapshot.is_valid_path(project_path, &working_path) {
             log::debug!("Skipping {inst_path} because its path matches ignore pattern");
@@ -182,7 +182,7 @@ pub fn syncback_loop(
             };
             let appended_name =
                 name_for_inst(new_middleware, snapshot.new_inst(), snapshot.old_inst())?;
-            let working_path = snapshot.parent_path.join(appended_name.as_ref());
+            let working_path = snapshot.path.join(appended_name.as_ref());
 
             if !snapshot.is_valid_path(project_path, &working_path) {
                 log::warn!(
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index b008f33ef..30413d18e 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -33,30 +33,31 @@ pub struct SyncbackSnapshot<'sync> {
     pub data: SyncbackData<'sync>,
     pub old: Option<Ref>,
     pub new: Ref,
-    pub parent_path: PathBuf,
+    pub path: PathBuf,
     pub name: String,
     pub middleware: Option<Middleware>,
 }
 
 impl<'sync> SyncbackSnapshot<'sync> {
     /// Constructs a SyncbackSnapshot from the provided refs
-    /// while inheriting the parent's trees and path
+    /// while inheriting this snapshot's path and data. This should be used for
+    /// directories.
     #[inline]
-    pub fn with_parent(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
+    pub fn with_joined_path(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
             data: self.data,
             old: old_ref,
             new: new_ref,
-            parent_path: self.parent_path.join(&self.name),
+            path: self.path.join(&self.name),
             name: new_name,
             middleware: None,
         }
     }
 
     /// Constructs a SyncbackSnapshot from the provided refs and path, while
-    /// inheriting this snapshot's trees.
+    /// inheriting this snapshot's data.
     #[inline]
-    pub fn with_new_parent(
+    pub fn with_new_path(
         &self,
         new_parent: PathBuf,
         new_name: String,
@@ -67,7 +68,7 @@ impl<'sync> SyncbackSnapshot<'sync> {
             data: self.data,
             old: old_ref,
             new: new_ref,
-            parent_path: new_parent,
+            path: new_parent,
             name: new_name,
             middleware: None,
         }

From 2f92fabec8b270ad1719224a207e99d4c3497b4e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 25 Mar 2024 15:32:27 -0700
Subject: [PATCH 241/366] Initial attempt at rewriting path logic for syncback

---
 src/snapshot_middleware/csv.rs        | 26 +++++++-------
 src/snapshot_middleware/dir.rs        | 29 +++++-----------
 src/snapshot_middleware/json_model.rs |  5 +--
 src/snapshot_middleware/lua.rs        | 17 +++++----
 src/snapshot_middleware/mod.rs        | 45 ++++++++++--------------
 src/snapshot_middleware/project.rs    | 23 ++----------
 src/snapshot_middleware/rbxm.rs       |  4 +--
 src/snapshot_middleware/rbxmx.rs      |  4 +--
 src/snapshot_middleware/txt.rs        | 11 +++---
 src/snapshot_middleware/util.rs       |  7 ++++
 src/syncback/mod.rs                   | 50 +++++++--------------------
 src/syncback/snapshot.rs              | 26 ++++++--------
 12 files changed, 88 insertions(+), 159 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 932ce1ff7..8902e3390 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -18,6 +18,7 @@ use crate::{
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
     meta_file::{AdjacentMetadata, DirectoryMetadata},
+    PathExt as _,
 };
 
 pub fn snapshot_csv(
@@ -99,10 +100,8 @@ pub fn snapshot_csv_init(
 
 pub fn syncback_csv<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.path.join(file_name);
 
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
@@ -110,15 +109,16 @@ pub fn syncback_csv<'sync>(
         anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
     };
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(&path, localization_to_csv(contents)?);
+    fs_snapshot.add_file(&snapshot.path, localization_to_csv(contents)?);
 
-    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, snapshot.path.clone())?;
     if let Some(mut meta) = meta {
         meta.properties.remove("Contents");
 
         if !meta.is_empty() {
+            let parent = snapshot.path.parent_err()?;
             fs_snapshot.add_file(
-                snapshot.path.join(format!("{}.meta.json", new_inst.name)),
+                parent.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
             )
         }
@@ -134,29 +134,27 @@ pub fn syncback_csv<'sync>(
 
 pub fn syncback_csv_init<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
 
-    let path = snapshot.path.join(dir_name).join("init.csv");
-
     let contents = if let Some(Variant::String(content)) = new_inst.properties.get("Contents") {
         content.as_str()
     } else {
         anyhow::bail!("LocalizationTables must have a `Contents` property that is a String")
     };
 
-    let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
-    dir_syncback
-        .fs_snapshot
-        .add_file(&path, localization_to_csv(contents)?);
+    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
+    dir_syncback.fs_snapshot.add_file(
+        &snapshot.path.join("init.csv"),
+        localization_to_csv(contents)?,
+    );
 
-    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, snapshot.path.clone())?;
     if let Some(mut meta) = meta {
         meta.properties.remove("Contents");
         if !meta.is_empty() {
             dir_syncback.fs_snapshot.add_file(
-                snapshot.path.join(dir_name).join("init.meta.json"),
+                snapshot.path.join("init.meta.json"),
                 serde_json::to_vec_pretty(&meta)
                     .context("could not serialize new init.meta.json")?,
             );
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 9ce8e5425..3ebfce618 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -97,14 +97,12 @@ pub fn snapshot_dir_no_meta(
 
 pub fn syncback_dir<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
-    let path = snapshot.path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
-    let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
+    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
 
-    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let mut meta = DirectoryMetadata::from_syncback_snapshot(snapshot, snapshot.path.clone())?;
     if let Some(meta) = &mut meta {
         if new_inst.class != "Folder" {
             meta.class_name = Some(new_inst.class.clone());
@@ -112,7 +110,7 @@ pub fn syncback_dir<'sync>(
 
         if !meta.is_empty() {
             dir_syncback.fs_snapshot.add_file(
-                path.join("init.meta.json"),
+                snapshot.path.join("init.meta.json"),
                 serde_json::to_vec_pretty(&meta)
                     .context("could not serialize new init.meta.json")?,
             );
@@ -126,7 +124,7 @@ pub fn syncback_dir<'sync>(
     if new_inst.children().is_empty() && metadata_empty {
         dir_syncback
             .fs_snapshot
-            .add_file(path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
+            .add_file(snapshot.path.join(EMPTY_DIR_KEEP_NAME), Vec::new())
     }
 
     Ok(dir_syncback)
@@ -134,9 +132,7 @@ pub fn syncback_dir<'sync>(
 
 pub fn syncback_dir_no_meta<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
-    let path = snapshot.path.join(dir_name);
     let new_inst = snapshot.new_inst();
 
     let mut children = Vec::new();
@@ -179,18 +175,10 @@ pub fn syncback_dir_no_meta<'sync>(
                     continue;
                 }
                 // This child exists in both doms. Pass it on.
-                children.push(snapshot.with_joined_path(
-                    new_child.name.clone(),
-                    *new_child_ref,
-                    Some(old_child.id()),
-                ));
+                children.push(snapshot.with_joined_path(*new_child_ref, Some(old_child.id()))?);
             } else {
                 // The child only exists in the the new dom
-                children.push(snapshot.with_joined_path(
-                    new_child.name.clone(),
-                    *new_child_ref,
-                    None,
-                ));
+                children.push(snapshot.with_joined_path(*new_child_ref, None)?);
             }
         }
         // Any children that are in the old dom but not the new one are removed.
@@ -198,12 +186,11 @@ pub fn syncback_dir_no_meta<'sync>(
     } else {
         // There is no old instance. Just add every child.
         for new_child_ref in new_inst.children() {
-            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
-            children.push(snapshot.with_joined_path(new_child.name.clone(), *new_child_ref, None));
+            children.push(snapshot.with_joined_path(*new_child_ref, None)?);
         }
     }
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_dir(&path);
+    fs_snapshot.add_dir(&snapshot.path);
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(new_inst),
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 6fddc4f72..8b479677e 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -66,10 +66,7 @@ pub fn snapshot_json_model(
 
 pub fn syncback_json_model<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
-    let path = snapshot.path.join(file_name);
-
     let mut property_buffer = Vec::with_capacity(snapshot.new_inst().properties.len());
 
     let mut model = json_model_from_pair(snapshot, &mut property_buffer, snapshot.new);
@@ -79,7 +76,7 @@ pub fn syncback_json_model<'sync>(
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot: FsSnapshot::new().with_added_file(
-            path,
+            &snapshot.path,
             serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
         ),
         children: Vec::new(),
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index c57497683..0fad6cf77 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -12,6 +12,7 @@ use crate::{
 use super::{
     dir::{dir_meta, snapshot_dir_no_meta, syncback_dir_no_meta},
     meta_file::{AdjacentMetadata, DirectoryMetadata},
+    PathExt as _,
 };
 
 #[derive(Debug)]
@@ -125,10 +126,8 @@ pub fn snapshot_lua_init(
 
 pub fn syncback_lua<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.path.join(file_name);
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {
         source.as_bytes().to_vec()
@@ -136,15 +135,16 @@ pub fn syncback_lua<'sync>(
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(&path, contents);
+    fs_snapshot.add_file(&snapshot.path, contents);
 
-    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, snapshot.path.clone())?;
     if let Some(mut meta) = meta {
         meta.properties.remove("Source");
 
         if !meta.is_empty() {
+            let parent_location = snapshot.path.parent_err()?;
             fs_snapshot.add_file(
-                snapshot.path.join(format!("{}.meta.json", new_inst.name)),
+                parent_location.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
             );
         }
@@ -162,10 +162,9 @@ pub fn syncback_lua<'sync>(
 pub fn syncback_lua_init<'sync>(
     script_type: ScriptType,
     snapshot: &SyncbackSnapshot<'sync>,
-    dir_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.path.join(dir_name).join(match script_type {
+    let path = snapshot.path.join(match script_type {
         ScriptType::Server => "init.server.lua",
         ScriptType::Client => "init.client.lua",
         ScriptType::Module => "init.lua",
@@ -177,7 +176,7 @@ pub fn syncback_lua_init<'sync>(
         anyhow::bail!("Scripts must have a `Source` property that is a String")
     };
 
-    let mut dir_syncback = syncback_dir_no_meta(snapshot, dir_name)?;
+    let mut dir_syncback = syncback_dir_no_meta(snapshot)?;
     dir_syncback.fs_snapshot.add_file(&path, contents);
 
     let meta = DirectoryMetadata::from_syncback_snapshot(snapshot, path.clone())?;
@@ -186,7 +185,7 @@ pub fn syncback_lua_init<'sync>(
 
         if !meta.is_empty() {
             dir_syncback.fs_snapshot.add_file(
-                snapshot.path.join(dir_name).join("init.meta.json"),
+                snapshot.path.join("init.meta.json"),
                 serde_json::to_vec_pretty(&meta)
                     .context("could not serialize new init.meta.json")?,
             );
diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index b67b8ce58..4d107c48f 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -51,6 +51,7 @@ use self::{
 
 pub use self::{
     lua::ScriptType, project::snapshot_project_node, util::emit_legacy_scripts_default,
+    util::PathExt,
 };
 
 /// Returns an `InstanceSnapshot` for the provided path.
@@ -240,43 +241,33 @@ impl Middleware {
     pub fn syncback<'sync>(
         &self,
         snapshot: &SyncbackSnapshot<'sync>,
-        file_name: &str,
     ) -> anyhow::Result<SyncbackReturn<'sync>> {
-        // We don't care about the names of projects
-        if !matches!(self, Middleware::Project) {
-            validate_file_name(&snapshot.name).with_context(|| {
-                format!(
-                    "cannot create a file or directory with name {}",
-                    snapshot.name
-                )
+        let file_name = snapshot.path.file_name().and_then(|s| s.to_str());
+        if let Some(file_name) = file_name {
+            validate_file_name(file_name).with_context(|| {
+                format!("cannot create a file or directory with name {file_name}")
             })?;
         }
         match self {
-            Middleware::Csv => syncback_csv(snapshot, file_name),
-            Middleware::JsonModel => syncback_json_model(snapshot, file_name),
+            Middleware::Csv => syncback_csv(snapshot),
+            Middleware::JsonModel => syncback_json_model(snapshot),
             Middleware::Json => anyhow::bail!("cannot syncback Json middleware"),
             // Projects are only generated from files that already exist on the
             // file system, so we don't need to pass a file name.
             Middleware::Project => syncback_project(snapshot),
-            Middleware::ServerScript => syncback_lua(snapshot, file_name),
-            Middleware::ClientScript => syncback_lua(snapshot, file_name),
-            Middleware::ModuleScript => syncback_lua(snapshot, file_name),
-            Middleware::Rbxm => syncback_rbxm(snapshot, file_name),
-            Middleware::Rbxmx => syncback_rbxmx(snapshot, file_name),
+            Middleware::ServerScript => syncback_lua(snapshot),
+            Middleware::ClientScript => syncback_lua(snapshot),
+            Middleware::ModuleScript => syncback_lua(snapshot),
+            Middleware::Rbxm => syncback_rbxm(snapshot),
+            Middleware::Rbxmx => syncback_rbxmx(snapshot),
             Middleware::Toml => anyhow::bail!("cannot syncback Toml middleware"),
-            Middleware::Text => syncback_txt(snapshot, file_name),
+            Middleware::Text => syncback_txt(snapshot),
             Middleware::Ignore => anyhow::bail!("cannot syncback Ignore middleware"),
-            Middleware::Dir => syncback_dir(snapshot, file_name),
-            Middleware::ServerScriptDir => {
-                syncback_lua_init(ScriptType::Server, snapshot, file_name)
-            }
-            Middleware::ClientScriptDir => {
-                syncback_lua_init(ScriptType::Client, snapshot, file_name)
-            }
-            Middleware::ModuleScriptDir => {
-                syncback_lua_init(ScriptType::Module, snapshot, file_name)
-            }
-            Middleware::CsvDir => syncback_csv_init(snapshot, file_name),
+            Middleware::Dir => syncback_dir(snapshot),
+            Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
+            Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
+            Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
+            Middleware::CsvDir => syncback_csv_init(snapshot),
         }
     }
 
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index c9f48f165..6e13dad59 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -324,11 +324,7 @@ pub fn syncback_project<'sync>(
         .expect("all projects should have a relevant path");
     let vfs = snapshot.vfs();
 
-    log::debug!(
-        "Reloading project {} from vfs (name: {})",
-        project_path.display(),
-        snapshot.name
-    );
+    log::debug!("Reloading project {} from vfs", project_path.display(),);
     let mut project = Project::load_from_slice(&vfs.read(project_path)?, project_path)?;
     let base_path = project.folder_location().to_path_buf();
 
@@ -506,7 +502,6 @@ pub fn syncback_project<'sync>(
             if old_child_map.remove(name.as_str()).is_none() {
                 descendant_snapshots.push(snapshot.with_new_path(
                     parent_path,
-                    new_child.name.clone(),
                     new_child.referent(),
                     None,
                 ));
@@ -531,7 +526,7 @@ fn syncback_project_node<'sync>(
     new_inst: &Instance,
     old_inst: InstanceWithMeta,
 ) -> anyhow::Result<SyncbackSnapshot<'sync>> {
-    let (middleware, _, mut file_path) =
+    let (middleware, _, file_path) =
         match Middleware::middleware_and_path(snapshot.vfs(), sync_rules, node_path)? {
             Some(stuff) => stuff,
             // The only way this can happen at this point is if the path does
@@ -542,20 +537,8 @@ fn syncback_project_node<'sync>(
             ),
         };
 
-    if !file_path.pop() {
-        anyhow::bail!(
-            "cannot syncback node {} using middleware {:?} because it is at the disk root",
-            old_inst.name(),
-            middleware
-        )
-    }
     Ok(snapshot
-        .with_new_path(
-            file_path,
-            old_inst.name().to_owned(),
-            new_inst.referent(),
-            Some(old_inst.id()),
-        )
+        .with_new_path(file_path, new_inst.referent(), Some(old_inst.id()))
         .middleware(middleware))
 }
 
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 3c22d0c10..75a53c717 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -44,10 +44,8 @@ pub fn snapshot_rbxm(
 
 pub fn syncback_rbxm<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
-    let path = snapshot.path.join(file_name);
 
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
@@ -57,7 +55,7 @@ pub fn syncback_rbxm<'sync>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(path, serialized),
+        fs_snapshot: FsSnapshot::new().with_added_file(&snapshot.path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 9a3e5584c..e86b5f430 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -46,10 +46,8 @@ pub fn snapshot_rbxmx(
 
 pub fn syncback_rbxmx<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
-    let path = snapshot.path.join(file_name);
 
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
@@ -59,7 +57,7 @@ pub fn syncback_rbxmx<'sync>(
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),
-        fs_snapshot: FsSnapshot::new().with_added_file(path, serialized),
+        fs_snapshot: FsSnapshot::new().with_added_file(&snapshot.path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
     })
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 017e8b3b6..6eb0cf53e 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -10,7 +10,7 @@ use crate::{
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
-use super::meta_file::AdjacentMetadata;
+use super::{meta_file::AdjacentMetadata, PathExt as _};
 
 pub fn snapshot_txt(
     context: &InstanceContext,
@@ -50,10 +50,8 @@ pub fn snapshot_txt(
 
 pub fn syncback_txt<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
-    file_name: &str,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
-    let path = snapshot.path.join(file_name);
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Value") {
         source.as_bytes().to_vec()
@@ -61,15 +59,16 @@ pub fn syncback_txt<'sync>(
         anyhow::bail!("StringValues must have a `Value` property that is a String");
     };
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_file(&path, contents);
+    fs_snapshot.add_file(&snapshot.path, contents);
 
-    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, path.clone())?;
+    let meta = AdjacentMetadata::from_syncback_snapshot(snapshot, snapshot.path.clone())?;
     if let Some(mut meta) = meta {
         meta.properties.remove("Value");
 
         if !meta.is_empty() {
+            let parent = snapshot.path.parent_err()?;
             fs_snapshot.add_file(
-                snapshot.path.join(format!("{}.meta.json", new_inst.name)),
+                parent.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
             );
         }
diff --git a/src/snapshot_middleware/util.rs b/src/snapshot_middleware/util.rs
index 625910b77..c16edcce6 100644
--- a/src/snapshot_middleware/util.rs
+++ b/src/snapshot_middleware/util.rs
@@ -16,6 +16,7 @@ pub fn match_trailing<'a>(input: &'a str, suffix: &str) -> Option<&'a str> {
 pub trait PathExt {
     fn file_name_ends_with(&self, suffix: &str) -> bool;
     fn file_name_trim_end<'a>(&'a self, suffix: &str) -> anyhow::Result<&'a str>;
+    fn parent_err(&self) -> anyhow::Result<&Path>;
 }
 
 impl<P> PathExt for P
@@ -40,6 +41,12 @@ where
         match_trailing(file_name, suffix)
             .with_context(|| format!("Path did not end in {}: {}", suffix, path.display()))
     }
+
+    fn parent_err(&self) -> anyhow::Result<&Path> {
+        let path = self.as_ref();
+        path.parent()
+            .with_context(|| format!("Path does not have a parent: {}", path.display()))
+    }
 }
 
 // TEMP function until rojo 8.0, when it can be replaced with bool::default (aka false)
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 744aa94d2..95b1e6498 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -121,7 +121,6 @@ pub fn syncback_loop(
         old: Some(old_tree.get_root_id()),
         new: new_tree.root_ref(),
         path: project.file_location.clone(),
-        name: project.name.clone(),
         middleware: Some(Middleware::Project),
     }];
 
@@ -146,15 +145,10 @@ pub fn syncback_loop(
             }
         }
 
-        let middleware = get_best_middleware(&snapshot);
-
-        log::trace!("Middleware for {inst_path} is {:?}", middleware);
-
-        if matches!(middleware, Middleware::Json | Middleware::Toml) {
-            log::warn!("Cannot syncback {middleware:?} at {inst_path}, skipping");
+        if !snapshot.is_valid_path(project_path, &snapshot.path) {
+            log::debug!("Skipping {inst_path} because its path matches ignore pattern");
             continue;
         }
-
         if let Some(syncback_rules) = &project.syncback_rules {
             // Ignore trees;
             for ignored in &syncback_rules.ignore_trees {
@@ -165,40 +159,22 @@ pub fn syncback_loop(
             }
         }
 
-        let appended_name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
-        let working_path = snapshot.path.join(appended_name.as_ref());
+        let middleware = get_best_middleware(&snapshot);
 
-        if !snapshot.is_valid_path(project_path, &working_path) {
-            log::debug!("Skipping {inst_path} because its path matches ignore pattern");
+        log::trace!(
+            "Middleware for {inst_path} is {:?} (path is {})",
+            middleware,
+            snapshot.path.display()
+        );
+
+        if matches!(middleware, Middleware::Json | Middleware::Toml) {
+            log::warn!("Cannot syncback {middleware:?} at {inst_path}, skipping");
             continue;
         }
 
-        let mut syncback_res = middleware.syncback(&snapshot, &appended_name);
+        let mut syncback_res = middleware.syncback(&snapshot);
         if syncback_res.is_err() && middleware.is_dir() {
-            let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
-                Ok(value) if value == "1" => Middleware::Rbxmx,
-                Ok(value) if value == "2" => Middleware::JsonModel,
-                _ => Middleware::Rbxm,
-            };
-            let appended_name =
-                name_for_inst(new_middleware, snapshot.new_inst(), snapshot.old_inst())?;
-            let working_path = snapshot.path.join(appended_name.as_ref());
-
-            if !snapshot.is_valid_path(project_path, &working_path) {
-                log::warn!(
-                    "Skipping {inst_path} because it could not be syncbacked as a directory \
-                    and the new path matches an ignore pattern."
-                );
-                log::debug!("New path: {}", working_path.display());
-                continue;
-            }
-            log::warn!(
-                "Failed to syncback {inst_path} as a directory, it will \
-                instead be synced back as {}",
-                working_path.file_name().and_then(|s| s.to_str()).unwrap()
-            );
-            log::debug!("Reason: {:?}", syncback_res.err().unwrap());
-            syncback_res = new_middleware.syncback(&snapshot, &appended_name);
+            todo!("Directory syncback failures will eventually result in an rbxm syncback");
         }
         let syncback = syncback_res.with_context(|| format!("Failed to syncback {inst_path}"))?;
 
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 30413d18e..dd2fc0f25 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -16,7 +16,7 @@ use rbx_dom_weak::{
     Instance, WeakDom,
 };
 
-use super::property_filter::filter_properties;
+use super::{get_best_middleware, name_for_inst, property_filter::filter_properties};
 
 /// A glob that can be used to tell if a path contains a `.git` folder.
 static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
@@ -34,7 +34,6 @@ pub struct SyncbackSnapshot<'sync> {
     pub old: Option<Ref>,
     pub new: Ref,
     pub path: PathBuf,
-    pub name: String,
     pub middleware: Option<Middleware>,
 }
 
@@ -43,33 +42,30 @@ impl<'sync> SyncbackSnapshot<'sync> {
     /// while inheriting this snapshot's path and data. This should be used for
     /// directories.
     #[inline]
-    pub fn with_joined_path(&self, new_name: String, new_ref: Ref, old_ref: Option<Ref>) -> Self {
-        Self {
+    pub fn with_joined_path(&self, new_ref: Ref, old_ref: Option<Ref>) -> anyhow::Result<Self> {
+        let mut snapshot = Self {
             data: self.data,
             old: old_ref,
             new: new_ref,
-            path: self.path.join(&self.name),
-            name: new_name,
+            path: PathBuf::new(),
             middleware: None,
-        }
+        };
+        let middleware = get_best_middleware(&snapshot);
+        let name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
+        snapshot.path = self.path.join(name.as_ref());
+
+        Ok(snapshot)
     }
 
     /// Constructs a SyncbackSnapshot from the provided refs and path, while
     /// inheriting this snapshot's data.
     #[inline]
-    pub fn with_new_path(
-        &self,
-        new_parent: PathBuf,
-        new_name: String,
-        new_ref: Ref,
-        old_ref: Option<Ref>,
-    ) -> Self {
+    pub fn with_new_path(&self, new_parent: PathBuf, new_ref: Ref, old_ref: Option<Ref>) -> Self {
         Self {
             data: self.data,
             old: old_ref,
             new: new_ref,
             path: new_parent,
-            name: new_name,
             middleware: None,
         }
     }

From 773c8a6d5d67a02b0a9f67a240e14dbd7f26d709 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 25 Mar 2024 16:14:00 -0700
Subject: [PATCH 242/366] Remove unnecessary Instance check

---
 src/snapshot_middleware/project.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 6e13dad59..42fafa578 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -421,12 +421,6 @@ pub fn syncback_project<'sync>(
             let child = snapshot
                 .get_new_instance(*child_ref)
                 .expect("all children of Instances should be in new DOM");
-            // As of writing (Feb 27 2024) Roblox serializes several Instances
-            // with the class 'Instance' that all have the same name. To avoid
-            // difficulties, we just ignore them. :-)
-            if child.class == "Instance" {
-                continue;
-            }
             if new_child_map.insert(&child.name, child).is_some() {
                 anyhow::bail!(
                     "Instances that are direct children of an Instance that is made by a project file \

From ebe318b9b78ba9de34cf2511c50f0f7bdfd32e5b Mon Sep 17 00:00:00 2001
From: Keanu <keanu@kiwi.industries>
Date: Tue, 26 Mar 2024 22:02:26 +0000
Subject: [PATCH 243/366] Ensures CurrentCamera ref is destroyed in new tree
 before referents are linked to new DOM (#5)

---
 src/syncback/mod.rs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 34b3fe29a..655ef9bde 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -78,20 +78,9 @@ pub fn syncback_loop(
     log::debug!("Hashing file DOM");
     let new_hashes = hash_tree(project, &new_tree, new_tree.root_ref());
 
-    let ignore_referents = project
-        .syncback_rules
-        .as_ref()
-        .and_then(|s| s.ignore_referents)
-        .unwrap_or_default();
-    if !ignore_referents {
-        log::debug!("Linking referents for new DOM");
-        deferred_referents.link(&mut new_tree)?;
-    } else {
-        log::debug!("Skipping referent linking as per project syncback rules");
-    }
-
     if let Some(syncback_rules) = &project.syncback_rules {
         if !syncback_rules.sync_current_camera.unwrap_or_default() {
+            log::debug!("Removing CurrentCamera from new DOM");
             let mut camera_ref = None;
             for child_ref in new_tree.root().children() {
                 let inst = new_tree.get_by_ref(*child_ref).unwrap();
@@ -107,6 +96,18 @@ pub fn syncback_loop(
         }
     }
 
+    let ignore_referents = project
+        .syncback_rules
+        .as_ref()
+        .and_then(|s| s.ignore_referents)
+        .unwrap_or_default();
+    if !ignore_referents {
+        log::debug!("Linking referents for new DOM");
+        deferred_referents.link(&mut new_tree)?;
+    } else {
+        log::debug!("Skipping referent linking as per project syncback rules");
+    }
+
     let project_path = project.folder_location();
 
     let syncback_data = SyncbackData {

From 2842f9817957462183047c0367a839f9085ce7c5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 11:33:26 -0700
Subject: [PATCH 244/366] Redo snapshot paths for project files

---
 src/snapshot_middleware/project.rs | 29 +++++++++++++++++++++--------
 src/syncback/snapshot.rs           | 25 +++++++++++++++++++------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 42fafa578..fefeb5437 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -494,11 +494,20 @@ pub fn syncback_project<'sync>(
             // syncback on the project node path above (or is itself a node).
             // So the only things we need to run seperately is new children.
             if old_child_map.remove(name.as_str()).is_none() {
-                descendant_snapshots.push(snapshot.with_new_path(
-                    parent_path,
-                    new_child.referent(),
-                    None,
-                ));
+                let (parent_middleware, _, _) =
+                    Middleware::middleware_and_path(vfs, &project.sync_rules, &parent_path)?
+                        .expect("project nodes should have a middleware if they have children.");
+                // If this node points directly to a project, it may still have
+                // children but they'll be handled by syncback. This isn't a
+                // concern with directories because they're singular things,
+                // files that contain their own children.
+                if parent_middleware != Middleware::Project {
+                    descendant_snapshots.push(snapshot.with_base_path(
+                        &parent_path,
+                        new_child.referent(),
+                        None,
+                    )?);
+                }
             }
         }
         removed_descendants.extend(old_child_map.drain().map(|(_, v)| v));
@@ -531,9 +540,13 @@ fn syncback_project_node<'sync>(
             ),
         };
 
-    Ok(snapshot
-        .with_new_path(file_path, new_inst.referent(), Some(old_inst.id()))
-        .middleware(middleware))
+    Ok(SyncbackSnapshot {
+        data: snapshot.data,
+        old: Some(old_inst.id()),
+        new: new_inst.referent(),
+        path: file_path,
+        middleware: Some(middleware),
+    })
 }
 
 fn infer_class_name(name: &str, parent_class: Option<&str>) -> Option<Cow<'static, str>> {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index dd2fc0f25..73fda1acc 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -57,17 +57,30 @@ impl<'sync> SyncbackSnapshot<'sync> {
         Ok(snapshot)
     }
 
-    /// Constructs a SyncbackSnapshot from the provided refs and path, while
-    /// inheriting this snapshot's data.
+    /// Constructs a SyncbackSnapshot from the provided refs and a base path,
+    /// while inheriting this snapshot's data.
+    ///
+    /// The actual path of the snapshot is made by getting a file name for the
+    /// snapshot and then appending it to the provided base path.
     #[inline]
-    pub fn with_new_path(&self, new_parent: PathBuf, new_ref: Ref, old_ref: Option<Ref>) -> Self {
-        Self {
+    pub fn with_base_path(
+        &self,
+        base_path: &Path,
+        new_ref: Ref,
+        old_ref: Option<Ref>,
+    ) -> anyhow::Result<Self> {
+        let mut snapshot = Self {
             data: self.data,
             old: old_ref,
             new: new_ref,
-            path: new_parent,
+            path: PathBuf::new(),
             middleware: None,
-        }
+        };
+        let middleware = get_best_middleware(&snapshot);
+        let name = name_for_inst(middleware, snapshot.new_inst(), snapshot.old_inst())?;
+        snapshot.path = base_path.join(name.as_ref());
+
+        Ok(snapshot)
     }
 
     /// Allows a middleware to be 'forced' onto a SyncbackSnapshot to override

From b1b388fe9d936a3023a30f70e71a40dbc2cf7398 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 11:39:54 -0700
Subject: [PATCH 245/366] Add test for "weird" nested projects

---
 .../expected/client-only.project.json           |   9 +++++++++
 .../expected/default.project.json               |  16 ++++++++++++++++
 .../expected/server-only.project.json           |   9 +++++++++
 .../expected/src/modules/ClientModule.lua       |   1 +
 .../expected/src/modules/ServerModule.lua       |   1 +
 .../nested_projects_weird/input.rbxl            | Bin 0 -> 54452 bytes
 .../output/client-only.project.json             |   9 +++++++++
 .../output/default.project.json                 |  16 ++++++++++++++++
 .../output/server-only.project.json             |   9 +++++++++
 .../output/src/modules/.gitkeep                 |   0
 tests/tests/syncback.rs                         |   1 +
 11 files changed, 71 insertions(+)
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/expected/client-only.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/expected/server-only.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.lua
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.lua
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/input.rbxl
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/output/client-only.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/output/server-only.project.json
 create mode 100644 rojo-test/syncback-tests/nested_projects_weird/output/src/modules/.gitkeep

diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/client-only.project.json b/rojo-test/syncback-tests/nested_projects_weird/expected/client-only.project.json
new file mode 100644
index 000000000..28468e74b
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/expected/client-only.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "client_only",
+  "tree": {
+    "$path": "src/modules"
+  },
+  "globIgnorePaths": [
+    "**Server**"
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/default.project.json b/rojo-test/syncback-tests/nested_projects_weird/expected/default.project.json
new file mode 100644
index 000000000..9fb46e6f4
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/expected/default.project.json
@@ -0,0 +1,16 @@
+{
+  "name": "nested_projects_but_weird",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "modules": {
+        "$path": "client-only.project.json"
+      }
+    },
+    "ServerStorage": {
+      "modules": {
+        "$path": "server-only.project.json"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/server-only.project.json b/rojo-test/syncback-tests/nested_projects_weird/expected/server-only.project.json
new file mode 100644
index 000000000..44532ba5b
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/expected/server-only.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "server_only",
+  "tree": {
+    "$path": "src/modules"
+  },
+  "globIgnorePaths": [
+    "**Client**"
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.lua b/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.lua
new file mode 100644
index 000000000..1e4560076
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.lua
@@ -0,0 +1 @@
+-- brake replace prevent interactive helpless
diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.lua b/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.lua
new file mode 100644
index 000000000..3b0cc280c
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.lua
@@ -0,0 +1 @@
+-- contempt preference dinner monarch combine
diff --git a/rojo-test/syncback-tests/nested_projects_weird/input.rbxl b/rojo-test/syncback-tests/nested_projects_weird/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..b0e5bbcd43cbc4151c92cf225ec72a3ffbdf94b8
GIT binary patch
literal 54452
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
PD33qV@D^&`)#LvUJ|2vl

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/nested_projects_weird/output/client-only.project.json b/rojo-test/syncback-tests/nested_projects_weird/output/client-only.project.json
new file mode 100644
index 000000000..28468e74b
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/output/client-only.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "client_only",
+  "tree": {
+    "$path": "src/modules"
+  },
+  "globIgnorePaths": [
+    "**Server**"
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects_weird/output/default.project.json b/rojo-test/syncback-tests/nested_projects_weird/output/default.project.json
new file mode 100644
index 000000000..9fb46e6f4
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/output/default.project.json
@@ -0,0 +1,16 @@
+{
+  "name": "nested_projects_but_weird",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "modules": {
+        "$path": "client-only.project.json"
+      }
+    },
+    "ServerStorage": {
+      "modules": {
+        "$path": "server-only.project.json"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects_weird/output/server-only.project.json b/rojo-test/syncback-tests/nested_projects_weird/output/server-only.project.json
new file mode 100644
index 000000000..44532ba5b
--- /dev/null
+++ b/rojo-test/syncback-tests/nested_projects_weird/output/server-only.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "server_only",
+  "tree": {
+    "$path": "src/modules"
+  },
+  "globIgnorePaths": [
+    "**Client**"
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/nested_projects_weird/output/src/modules/.gitkeep b/rojo-test/syncback-tests/nested_projects_weird/output/src/modules/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index dec877164..bc8ca407e 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -16,4 +16,5 @@ syncback_basic_test! {
     respect_old_middleware,
     nested_projects,
     unscriptable_properties,
+    nested_projects_weird,
 }

From ba440108fd87c41c412f51f9c4277f0493f6f8b1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 12:16:15 -0700
Subject: [PATCH 246/366] Actually sync current camera in baseplate test

---
 .../syncback-tests/baseplate/expected/default.project.json     | 1 +
 rojo-test/syncback-tests/baseplate/output/default.project.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rojo-test/syncback-tests/baseplate/expected/default.project.json b/rojo-test/syncback-tests/baseplate/expected/default.project.json
index 9af61d5c1..145546b98 100644
--- a/rojo-test/syncback-tests/baseplate/expected/default.project.json
+++ b/rojo-test/syncback-tests/baseplate/expected/default.project.json
@@ -41,6 +41,7 @@
     }
   },
   "syncbackRules": {
+    "syncCurrentCamera": true,
     "ignoreReferents": true
   }
 }
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/baseplate/output/default.project.json b/rojo-test/syncback-tests/baseplate/output/default.project.json
index 7dbee9702..880913a6e 100644
--- a/rojo-test/syncback-tests/baseplate/output/default.project.json
+++ b/rojo-test/syncback-tests/baseplate/output/default.project.json
@@ -10,6 +10,7 @@
     }
   },
   "syncbackRules": {
-    "ignoreReferents": true
+    "ignoreReferents": true,
+    "syncCurrentCamera": true
   }
 }
\ No newline at end of file

From bbb016f84e08e5628aa0d057468c59cdd6af6afe Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 12:16:45 -0700
Subject: [PATCH 247/366] Add methods to FsSnapshot for listing files and
 directories

---
 src/syncback/fs_snapshot.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index caf8dd650..314bca317 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -141,4 +141,28 @@ impl FsSnapshot {
 
         list
     }
+
+    /// Returns a list of file paths that would be added by this `FsSnapshot`
+    #[inline]
+    pub fn added_files(&self) -> Vec<&Path> {
+        self.added_files.keys().map(PathBuf::as_path).collect()
+    }
+
+    /// Returns a list of directory paths that would be added by this `FsSnapshot`
+    #[inline]
+    pub fn added_dirs(&self) -> Vec<&Path> {
+        self.added_dirs.iter().map(PathBuf::as_path).collect()
+    }
+
+    /// Returns a list of file paths that would be removed by this `FsSnapshot`
+    #[inline]
+    pub fn removed_files(&self) -> Vec<&Path> {
+        self.removed_files.iter().map(PathBuf::as_path).collect()
+    }
+
+    /// Returns a list of directory paths that would be removed by this `FsSnapshot`
+    #[inline]
+    pub fn removed_dirs(&self) -> Vec<&Path> {
+        self.removed_dirs.iter().map(PathBuf::as_path).collect()
+    }
 }

From 3341436fb5d00facd126fe0e99d483fea0f65470 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 12:19:52 -0700
Subject: [PATCH 248/366] Add snapshotting for what files are being changed by
 syncback

---
 ...__rojo_test__syncback_util__baseplate.snap | 22 +++++++
 ..._test__syncback_util__nested_projects.snap | 13 ++++
 ..._syncback_util__nested_projects_weird.snap | 16 +++++
 ...syncback_util__respect_old_middleware.snap | 14 +++++
 ...yncback_util__unscriptable_properties.snap | 11 ++++
 tests/rojo_test/syncback_util.rs              | 60 ++++++++++++++++++-
 6 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties.snap

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap
new file mode 100644
index 000000000..975ae5392
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap
@@ -0,0 +1,22 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - "Lighting\\Atmosphere.model.json"
+  - "Lighting\\Bloom.model.json"
+  - "Lighting\\DepthOfField.model.json"
+  - "Lighting\\Sky.model.json"
+  - "Lighting\\SunRays.model.json"
+  - "Workspace\\Baseplate.rbxm"
+  - "Workspace\\Camera.rbxm"
+  - "Workspace\\SpawnLocation.rbxm"
+  - "Workspace\\Terrain.rbxm"
+  - default.project.json
+added_dirs:
+  - Lighting
+  - Workspace
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap
new file mode 100644
index 000000000..af2306edb
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap
@@ -0,0 +1,13 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - nested.project.json
+  - string_value.txt
+added_dirs: []
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
new file mode 100644
index 000000000..51d45a951
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
@@ -0,0 +1,16 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - client-only.project.json
+  - default.project.json
+  - server-only.project.json
+  - "src/modules\\ClientModule.luau"
+  - "src/modules\\ServerModule.luau"
+added_dirs:
+  - src/modules
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap
new file mode 100644
index 000000000..716bb602f
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap
@@ -0,0 +1,14 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - "Workspace\\Baseplate.model.json"
+  - "Workspace\\Terrain.rbxm"
+  - default.project.json
+added_dirs:
+  - Workspace
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties.snap
new file mode 100644
index 000000000..4a16065a1
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties.snap
@@ -0,0 +1,11 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+added_dirs: []
+removed_files: []
+removed_dirs: []
+
diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index a252b24e4..9add07470 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -4,8 +4,10 @@ use std::{
 };
 
 use anyhow::Context;
-use librojo::{snapshot_from_vfs, syncback_loop, InstanceContext, Project, RojoTree};
+use insta::assert_yaml_snapshot;
+use librojo::{snapshot_from_vfs, syncback_loop, FsSnapshot, InstanceContext, Project, RojoTree};
 use memofs::{InMemoryFs, IoResultExt, Vfs, VfsSnapshot};
+use serde::Serialize;
 
 use crate::rojo_test::io_util::SYNCBACK_TESTS_PATH;
 
@@ -18,6 +20,13 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
     let output_path = test_path.join(OUTPUT_DIR);
     let expected_path = test_path.join(EXPECTED_DIR);
 
+    let mut settings = insta::Settings::new();
+    let snapshot_path = Path::new(SYNCBACK_TESTS_PATH)
+        .parent()
+        .unwrap()
+        .join("syncback-test-snapshots");
+    settings.set_snapshot_path(snapshot_path);
+
     let std_vfs = Vfs::new_default();
     std_vfs.set_watch_enabled(false);
 
@@ -33,10 +42,14 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
 
     let output_project_path = output_path.join("default.project.json");
     let (mut output_tree, output_project) = rojo_tree_from_path(&std_vfs, &output_project_path)?;
-
     let fs_snapshot = syncback_loop(&std_vfs, &mut output_tree, input_dom, &output_project)?;
+
+    settings.bind(|| {
+        assert_yaml_snapshot!(name, visualize_fs_snapshot(&fs_snapshot, &output_path));
+    });
+
     // We write to the in-memory VFS and not the file system!
-    fs_snapshot.write_to_vfs(test_path.join(OUTPUT_DIR), &im_vfs)?;
+    fs_snapshot.write_to_vfs(&output_path, &im_vfs)?;
 
     // And now the hard part: diffing two sub-trees.
     let mut path_queue: VecDeque<PathBuf> = [expected_path.join("default.project.json")].into();
@@ -111,3 +124,44 @@ fn to_vfs_snapshot(vfs: &Vfs, path: &Path) -> anyhow::Result<VfsSnapshot> {
         Ok(VfsSnapshot::file(contents.as_slice()))
     }
 }
+
+#[derive(Default, Debug, Serialize)]
+struct FsSnapshotVisual<'a> {
+    added_files: Vec<&'a Path>,
+    added_dirs: Vec<&'a Path>,
+    removed_files: Vec<&'a Path>,
+    removed_dirs: Vec<&'a Path>,
+}
+
+fn visualize_fs_snapshot<'a>(snapshot: &'a FsSnapshot, base_path: &Path) -> FsSnapshotVisual<'a> {
+    let map_closure = |p: &'a Path| p.strip_prefix(base_path).unwrap();
+
+    let mut added_files: Vec<_> = snapshot
+        .added_files()
+        .into_iter()
+        .map(map_closure)
+        .collect();
+    let mut added_dirs: Vec<_> = snapshot.added_dirs().into_iter().map(map_closure).collect();
+    let mut removed_files: Vec<_> = snapshot
+        .removed_files()
+        .into_iter()
+        .map(map_closure)
+        .collect();
+    let mut removed_dirs: Vec<_> = snapshot
+        .removed_dirs()
+        .into_iter()
+        .map(map_closure)
+        .collect();
+
+    added_files.sort_unstable();
+    added_dirs.sort_unstable();
+    removed_files.sort_unstable();
+    removed_dirs.sort_unstable();
+
+    FsSnapshotVisual {
+        added_files,
+        added_dirs,
+        removed_files,
+        removed_dirs,
+    }
+}

From e656d8dcdf440f6719932fde402a9a28b05e500b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 12:25:41 -0700
Subject: [PATCH 249/366] Add project_init test, which currently fails

---
 .../project_init/expected/default.project.json  |  11 +++++++++++
 .../project_init/expected/src/init.lua          |   1 +
 .../syncback-tests/project_init/input.rbxl      | Bin 0 -> 53842 bytes
 .../project_init/output/default.project.json    |  11 +++++++++++
 .../project_init/output/src/init.lua            |   0
 5 files changed, 23 insertions(+)
 create mode 100644 rojo-test/syncback-tests/project_init/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/project_init/expected/src/init.lua
 create mode 100644 rojo-test/syncback-tests/project_init/input.rbxl
 create mode 100644 rojo-test/syncback-tests/project_init/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/project_init/output/src/init.lua

diff --git a/rojo-test/syncback-tests/project_init/expected/default.project.json b/rojo-test/syncback-tests/project_init/expected/default.project.json
new file mode 100644
index 000000000..34530a847
--- /dev/null
+++ b/rojo-test/syncback-tests/project_init/expected/default.project.json
@@ -0,0 +1,11 @@
+{
+  "name": "project_init",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "script": {
+        "$path": "src"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_init/expected/src/init.lua b/rojo-test/syncback-tests/project_init/expected/src/init.lua
new file mode 100644
index 000000000..918a977f2
--- /dev/null
+++ b/rojo-test/syncback-tests/project_init/expected/src/init.lua
@@ -0,0 +1 @@
+-- crash voyage confine pump direction
diff --git a/rojo-test/syncback-tests/project_init/input.rbxl b/rojo-test/syncback-tests/project_init/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..6ff71a7a0b90f432774ffdd06fa37017d2da64fc
GIT binary patch
literal 53842
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
SpYctk#~x}1=j*|x$Nw)hV*yG4

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/project_init/output/default.project.json b/rojo-test/syncback-tests/project_init/output/default.project.json
new file mode 100644
index 000000000..34530a847
--- /dev/null
+++ b/rojo-test/syncback-tests/project_init/output/default.project.json
@@ -0,0 +1,11 @@
+{
+  "name": "project_init",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "script": {
+        "$path": "src"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_init/output/src/init.lua b/rojo-test/syncback-tests/project_init/output/src/init.lua
new file mode 100644
index 000000000..e69de29bb

From 95130295b29cd6d133df23d59b9804754d6c43d9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 28 Mar 2024 12:26:43 -0700
Subject: [PATCH 250/366] Start running project_init test

---
 ...end__rojo_test__syncback_util__project_init.snap | 13 +++++++++++++
 tests/tests/syncback.rs                             |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
new file mode 100644
index 000000000..117282699
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
@@ -0,0 +1,13 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - "src\\init.lua"
+added_dirs:
+  - "src"
+removed_files: []
+removed_dirs: []
+
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index bc8ca407e..4e9d210bc 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -17,4 +17,5 @@ syncback_basic_test! {
     nested_projects,
     unscriptable_properties,
     nested_projects_weird,
+    project_init,
 }

From 0766cb757b9c437e18ebf524889df56c699247ce Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Mar 2024 12:03:36 -0700
Subject: [PATCH 251/366] Update camera rbxm in baseplate test

---
 .../baseplate/expected/Workspace/Camera.rbxm    | Bin 874 -> 822 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm
index c3edc75d49d348860b135e708f71f82c4e1f97e2..583d9c50a9d4ed92033801521900056c77ba601c 100644
GIT binary patch
delta 33
icmaFGwvBCqFP{<v1A_t(gTM#DiP17FAlAn9yO{uXY6k=W

delta 85
zcmdnS_KIzSFJBk~149T9gTM#ZiP16^CO{S=5VHeuP<~c^yk`oN0+5|zZfKTbW@2ez
fk&<R=W@%z<XlR<2mS|*YVP<NaW@@;xdN&gQ-mMb5


From eb638091ea7a44fe5ab4f3cc926c7e785f2c9fcd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Mar 2024 12:14:47 -0700
Subject: [PATCH 252/366] Correct nested project test file

---
 .../nested_projects/expected/nested.project.json            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rojo-test/syncback-tests/nested_projects/expected/nested.project.json b/rojo-test/syncback-tests/nested_projects/expected/nested.project.json
index fe7c844f4..c71f3be96 100644
--- a/rojo-test/syncback-tests/nested_projects/expected/nested.project.json
+++ b/rojo-test/syncback-tests/nested_projects/expected/nested.project.json
@@ -2,14 +2,14 @@
   "name": "Nested",
   "tree": {
     "$className": "Configuration",
-    "StringValue": {
-      "$path": "string_value.txt"
-    },
     "BoolValue": {
       "$className": "BoolValue",
       "$properties": {
         "Value": true
       }
+    },
+    "StringValue": {
+      "$path": "string_value.txt"
     }
   }
 }
\ No newline at end of file

From 0b6f554e89fe89a731862599de1aa4b38ff9112b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Mar 2024 12:24:08 -0700
Subject: [PATCH 253/366] Update project_init snapshot

---
 .../end_to_end__rojo_test__syncback_util__project_init.snap     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
index 117282699..1d17d5029 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
@@ -7,7 +7,7 @@ added_files:
   - default.project.json
   - "src\\init.lua"
 added_dirs:
-  - "src"
+  - src
 removed_files: []
 removed_dirs: []
 

From 8358413cb5567b7b9485b3c935d5942b66911170 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Mar 2024 12:24:50 -0700
Subject: [PATCH 254/366] Use actual path for project nodes

---
 src/snapshot_middleware/mod.rs     | 35 ++++++++++--------------------
 src/snapshot_middleware/project.rs | 25 ++++++++++-----------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 4d107c48f..cd0ccb39f 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -284,39 +284,26 @@ impl Middleware {
         )
     }
 
-    /// Attempts to return a middleware for a given path, along with the name of
-    /// the file or directory that should be passed to either
-    /// [`Middleware::syncback`] or [`Middleware::snapshot`] and the path of
-    /// said file.
-    #[inline]
-    pub fn middleware_and_path<'path>(
+    /// Attempts to return a middleware that should be used for the given path.
+    ///
+    /// Returns `Err` only if the Vfs cannot read information about the path.
+    pub fn middleware_for_path(
         vfs: &Vfs,
         sync_rules: &[SyncRule],
-        path: &'path Path,
-    ) -> anyhow::Result<Option<(Self, &'path str, PathBuf)>> {
+        path: &Path,
+    ) -> anyhow::Result<Option<Self>> {
         let meta = match vfs.metadata(path).with_not_found()? {
             Some(meta) => meta,
             None => return Ok(None),
         };
+
         if meta.is_dir() {
-            get_dir_middleware(vfs, path).map(Some)
+            let (middleware, _, _) = get_dir_middleware(vfs, path)?;
+            Ok(Some(middleware))
         } else {
-            for rule in sync_rules {
-                if rule.matches(path) {
-                    return Ok(Some((
-                        rule.middleware,
-                        rule.file_name_for_path(path)?,
-                        path.to_path_buf(),
-                    )));
-                }
-            }
-            for rule in default_sync_rules() {
+            for rule in sync_rules.iter().chain(default_sync_rules()) {
                 if rule.matches(path) {
-                    return Ok(Some((
-                        rule.middleware,
-                        rule.file_name_for_path(path)?,
-                        path.to_path_buf(),
-                    )));
+                    return Ok(Some(rule.middleware));
                 }
             }
             Ok(None)
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index fefeb5437..19131c513 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -494,8 +494,8 @@ pub fn syncback_project<'sync>(
             // syncback on the project node path above (or is itself a node).
             // So the only things we need to run seperately is new children.
             if old_child_map.remove(name.as_str()).is_none() {
-                let (parent_middleware, _, _) =
-                    Middleware::middleware_and_path(vfs, &project.sync_rules, &parent_path)?
+                let parent_middleware =
+                    Middleware::middleware_for_path(vfs, &project.sync_rules, &parent_path)?
                         .expect("project nodes should have a middleware if they have children.");
                 // If this node points directly to a project, it may still have
                 // children but they'll be handled by syncback. This isn't a
@@ -529,22 +529,21 @@ fn syncback_project_node<'sync>(
     new_inst: &Instance,
     old_inst: InstanceWithMeta,
 ) -> anyhow::Result<SyncbackSnapshot<'sync>> {
-    let (middleware, _, file_path) =
-        match Middleware::middleware_and_path(snapshot.vfs(), sync_rules, node_path)? {
-            Some(stuff) => stuff,
-            // The only way this can happen at this point is if the path does
-            // not exist on the file system or there's no middleware for it.
-            None => anyhow::bail!(
-                "path does not exist or could not be turned into a file Rojo understands: {}",
-                node_path.display()
-            ),
-        };
+    let middleware = match Middleware::middleware_for_path(snapshot.vfs(), sync_rules, node_path)? {
+        Some(stuff) => stuff,
+        // The only way this can happen at this point is if the path does
+        // not exist on the file system or there's no middleware for it.
+        None => anyhow::bail!(
+            "path does not exist or could not be turned into a file Rojo understands: {}",
+            node_path.display()
+        ),
+    };
 
     Ok(SyncbackSnapshot {
         data: snapshot.data,
         old: Some(old_inst.id()),
         new: new_inst.referent(),
-        path: file_path,
+        path: node_path.to_path_buf(),
         middleware: Some(middleware),
     })
 }

From d190661eeb847d7f2b70c830f22f50a7560665c9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Mar 2024 13:12:30 -0700
Subject: [PATCH 255/366] Add test for every middleware

---
 .../expected/default.project.json               |   9 +++++++++
 .../all_middleware/expected/src/csv.csv         |   2 ++
 .../expected/src/csv_init/init.csv              |   2 ++
 .../expected/src/dir/client_script.client.lua   |   1 +
 .../src/dir/init_client_script/init.client.lua  |   1 +
 .../src/dir/init_module_script/init.lua         |   1 +
 .../src/dir/init_server_script/init.server.lua  |   1 +
 .../expected/src/dir/module_script.lua          |   1 +
 .../expected/src/dir/server_script.server.lua   |   1 +
 .../expected/src/dir_with_meta/init.meta.json   |   3 +++
 .../expected/src/model_json.model.json          |   6 ++++++
 .../expected/src/project_json.project.json      |  13 +++++++++++++
 .../all_middleware/expected/src/rbxm.rbxm       | Bin 0 -> 704 bytes
 .../all_middleware/expected/src/rbxmx.rbxmx     |  16 ++++++++++++++++
 .../all_middleware/expected/src/text.txt        |   1 +
 .../syncback-tests/all_middleware/input.rbxl    | Bin 0 -> 48870 bytes
 .../all_middleware/output/default.project.json  |   9 +++++++++
 .../all_middleware/output/src/csv_init/init.csv |   2 ++
 .../src/dir/init_client_script/init.client.lua  |   0
 .../output/src/dir/init_module_script/init.lua  |   0
 .../src/dir/init_server_script/init.server.lua  |   0
 .../output/src/dir_with_meta/init.meta.json     |   3 +++
 .../output/src/model_json.model.json            |   3 +++
 .../output/src/project_json.project.json        |   6 ++++++
 .../all_middleware/output/src/rbxmx.rbxmx       |   9 +++++++++
 .../all_middleware/output/src/text.txt          |   0
 26 files changed, 90 insertions(+)
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/csv.csv
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/csv_init/init.csv
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/dir_with_meta/init.meta.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/model_json.model.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/rbxm.rbxm
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
 create mode 100644 rojo-test/syncback-tests/all_middleware/expected/src/text.txt
 create mode 100644 rojo-test/syncback-tests/all_middleware/input.rbxl
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/csv_init/init.csv
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/dir/init_client_script/init.client.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/dir/init_module_script/init.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/dir/init_server_script/init.server.lua
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/dir_with_meta/init.meta.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/model_json.model.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/project_json.project.json
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx
 create mode 100644 rojo-test/syncback-tests/all_middleware/output/src/text.txt

diff --git a/rojo-test/syncback-tests/all_middleware/expected/default.project.json b/rojo-test/syncback-tests/all_middleware/expected/default.project.json
new file mode 100644
index 000000000..5a7eba6ce
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "all_middleware",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv b/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv
new file mode 100644
index 000000000..220cbe87b
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,es
+Ack,Ack!,,An exclamation of despair,¡Ay!
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/csv_init/init.csv b/rojo-test/syncback-tests/all_middleware/expected/src/csv_init/init.csv
new file mode 100644
index 000000000..61a49274e
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/csv_init/init.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,en
+Rojo,Rojo,,Rojo is a really cool program,Red
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.lua
new file mode 100644
index 000000000..7ad910d69
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.lua
@@ -0,0 +1 @@
+-- plan difficulty emphasis dorm describe
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.lua
new file mode 100644
index 000000000..7d476584b
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.lua
@@ -0,0 +1 @@
+-- city conflict lay soup body
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.lua
new file mode 100644
index 000000000..9b908cba2
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.lua
@@ -0,0 +1 @@
+-- absence wheel hay miracle director
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.lua
new file mode 100644
index 000000000..3eff9e2d2
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.lua
@@ -0,0 +1 @@
+-- systematic laser makeup soil loud
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.lua
new file mode 100644
index 000000000..ff12feb1c
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.lua
@@ -0,0 +1 @@
+-- solve bitter pollution jacket seal
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.lua
new file mode 100644
index 000000000..cca8b6f68
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.lua
@@ -0,0 +1 @@
+-- reliable warrant lost low empire
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir_with_meta/init.meta.json b/rojo-test/syncback-tests/all_middleware/expected/src/dir_with_meta/init.meta.json
new file mode 100644
index 000000000..d62029576
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/dir_with_meta/init.meta.json
@@ -0,0 +1,3 @@
+{
+  "className": "Configuration"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/model_json.model.json b/rojo-test/syncback-tests/all_middleware/expected/src/model_json.model.json
new file mode 100644
index 000000000..a235fc2c3
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/model_json.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "StringValue",
+  "properties": {
+    "Value": "culture glimpse stay chief onion"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json b/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json
new file mode 100644
index 000000000..3a898bc67
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json
@@ -0,0 +1,13 @@
+{
+  "name": "project_json",
+  "tree": {
+    "$className": "Color3Value",
+    "$properties": {
+      "Value": [
+        1,
+        0.5,
+        0
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxm.rbxm b/rojo-test/syncback-tests/all_middleware/expected/src/rbxm.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..1fc6714ae046dfc4206e3b2ffd9e2f8a1323f5bb
GIT binary patch
literal 704
zcmZuv%TB^T6m3c40|kS|7rwxSapw;Z6BH70Q5)L0Z{cbtDJ_{95^$p~UHWH!hRgW_
zy=O3u37q8I*W5dEXYRCQo}~G-`SDXJ*UOIMI&-qJ==ouE%vSx+Hybe4nce9)&6UVA
zTZ3rOe+bT5H{dW#4RVLs)>?{WqDh4$MVyKk!a=rTarX+Z+@!J6fh46SlDyCFJDZCx
z4p7K2Xu?4|Hn$%S#YB1U?4yq})+bEBR3SH+xA8bmL@Kl()kF|jo{qLV^dvG;|Eo$i
z{gM|iP|Gm;kcZ3;DJ}EaeJ(ORZzmu*piFzOyozI%-?ezjXf~#8PIZxsZFiY~S%LJJ
zemo)<hD@d-q@A)|T(rcFv&IZ~GMZ;otvPRq0myE!Mg?HDAo18?KH)ywN|Ejjj}T?p
zCh!V&imZ*@9cM@Jvnu9?dF(L(vkHm9L}EnYAWo^c`{GteeiTY1DV6v%Kf;{Q5Aaod
UD|Xzj-?33UbGBMn^M8B&3klnH#{d8T

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
new file mode 100644
index 000000000..cc5e4cb84
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
@@ -0,0 +1,16 @@
+<roblox version="4">
+	<Meta name="ExplicitAutoJoints">true</Meta>
+	<External>null</External>
+	<External>nil</External>
+	<Item class="ForceField" referent="0">
+		<Properties>
+			<BinaryString name="AttributesSerialize"></BinaryString>
+			<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
+			<bool name="DefinesCapabilities">false</bool>
+			<string name="Name">rbxmx</string>
+			<int64 name="SourceAssetId">-1</int64>
+			<BinaryString name="Tags"></BinaryString>
+			<bool name="Visible">true</bool>
+		</Properties>
+	</Item>
+</roblox>
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/text.txt b/rojo-test/syncback-tests/all_middleware/expected/src/text.txt
new file mode 100644
index 000000000..fbae9b2c2
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/text.txt
@@ -0,0 +1 @@
+represent slant majority dream proclaim
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/input.rbxl b/rojo-test/syncback-tests/all_middleware/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..0f42d8fd79aa155bc79d82af3269dd659b0e58c6
GIT binary patch
literal 48870
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
N2W#$p#l8IS{|BaF?c@Le

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/all_middleware/output/default.project.json b/rojo-test/syncback-tests/all_middleware/output/default.project.json
new file mode 100644
index 000000000..5a7eba6ce
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/output/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "all_middleware",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/csv_init/init.csv b/rojo-test/syncback-tests/all_middleware/output/src/csv_init/init.csv
new file mode 100644
index 000000000..24244d6c1
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/output/src/csv_init/init.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,en
+,,,,
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/dir/init_client_script/init.client.lua b/rojo-test/syncback-tests/all_middleware/output/src/dir/init_client_script/init.client.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/dir/init_module_script/init.lua b/rojo-test/syncback-tests/all_middleware/output/src/dir/init_module_script/init.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/dir/init_server_script/init.server.lua b/rojo-test/syncback-tests/all_middleware/output/src/dir/init_server_script/init.server.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/dir_with_meta/init.meta.json b/rojo-test/syncback-tests/all_middleware/output/src/dir_with_meta/init.meta.json
new file mode 100644
index 000000000..d62029576
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/output/src/dir_with_meta/init.meta.json
@@ -0,0 +1,3 @@
+{
+  "className": "Configuration"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/model_json.model.json b/rojo-test/syncback-tests/all_middleware/output/src/model_json.model.json
new file mode 100644
index 000000000..a095016a7
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/output/src/model_json.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "StringValue"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/project_json.project.json b/rojo-test/syncback-tests/all_middleware/output/src/project_json.project.json
new file mode 100644
index 000000000..ed8452050
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/output/src/project_json.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "project_json",
+  "tree": {
+    "$className": "Color3Value"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx
new file mode 100644
index 000000000..60700ee3d
--- /dev/null
+++ b/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx
@@ -0,0 +1,9 @@
+<roblox version="4">
+	<Meta name="ExplicitAutoJoints">true</Meta>
+	<External>null</External>
+	<External>nil</External>
+	<Item class="ForceField" referent="0">
+		<Properties>
+		</Properties>
+	</Item>
+</roblox>
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/output/src/text.txt b/rojo-test/syncback-tests/all_middleware/output/src/text.txt
new file mode 100644
index 000000000..e69de29bb

From a490f9359a3365145546b9352fb9ed6c5e6ce1aa Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 29 Mar 2024 13:17:37 -0700
Subject: [PATCH 256/366] Run all_middleware test

---
 tests/tests/syncback.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 4e9d210bc..7b3c600c9 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -18,4 +18,5 @@ syncback_basic_test! {
     unscriptable_properties,
     nested_projects_weird,
     project_init,
+    all_middleware,
 }

From 6d66bc853031d4a7d3f1a505583d55ccf8a629eb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 1 Apr 2024 12:01:57 -0700
Subject: [PATCH 257/366] Rename lua files to luau files

---
 .../expected/src/modules/{ClientModule.lua => ClientModule.luau}  | 0
 .../expected/src/modules/{ServerModule.lua => ServerModule.luau}  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/{ClientModule.lua => ClientModule.luau} (100%)
 rename rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/{ServerModule.lua => ServerModule.luau} (100%)

diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.lua b/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.luau
similarity index 100%
rename from rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.lua
rename to rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ClientModule.luau
diff --git a/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.lua b/rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.luau
similarity index 100%
rename from rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.lua
rename to rojo-test/syncback-tests/nested_projects_weird/expected/src/modules/ServerModule.luau

From f55a329ebbfb0f3d29cadd367b5bd9c57596999a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 1 Apr 2024 12:03:27 -0700
Subject: [PATCH 258/366] Rewrite test harness for syncback

---
 tests/rojo_test/syncback_util.rs | 99 ++++++++++++++++----------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 9add07470..34033f9c4 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -1,7 +1,4 @@
-use std::{
-    collections::{HashMap, VecDeque},
-    path::{Path, PathBuf},
-};
+use std::{collections::HashMap, path::Path};
 
 use anyhow::Context;
 use insta::assert_yaml_snapshot;
@@ -11,15 +8,11 @@ use serde::Serialize;
 
 use crate::rojo_test::io_util::SYNCBACK_TESTS_PATH;
 
-const OUTPUT_DIR: &str = "output";
 const INPUT_FILE: &str = "input.rbxl";
 const EXPECTED_DIR: &str = "expected";
+const OUTPUT_DIR: &str = "output";
 
 pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
-    let test_path = Path::new(SYNCBACK_TESTS_PATH).join(name);
-    let output_path = test_path.join(OUTPUT_DIR);
-    let expected_path = test_path.join(EXPECTED_DIR);
-
     let mut settings = insta::Settings::new();
     let snapshot_path = Path::new(SYNCBACK_TESTS_PATH)
         .parent()
@@ -27,9 +20,13 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
         .join("syncback-test-snapshots");
     settings.set_snapshot_path(snapshot_path);
 
+    let test_path = Path::new(SYNCBACK_TESTS_PATH).join(name);
+    let input_path = test_path.join(INPUT_FILE);
+    let expected_path = test_path.join(EXPECTED_DIR);
+    let output_path = test_path.join(OUTPUT_DIR);
+
     let std_vfs = Vfs::new_default();
     std_vfs.set_watch_enabled(false);
-
     let im_vfs = {
         let mut imfs = InMemoryFs::new();
         imfs.load_snapshot(&output_path, to_vfs_snapshot(&std_vfs, &output_path)?)?;
@@ -37,58 +34,60 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
     };
     im_vfs.set_watch_enabled(false);
 
-    let input_file_path = test_path.join(INPUT_FILE);
-    let input_dom = rbx_binary::from_reader(std_vfs.read(input_file_path)?.as_slice())?;
+    let input_dom = rbx_binary::from_reader(std_vfs.read(input_path)?.as_slice())?;
+    let (mut output_dom, project) =
+        rojo_tree_from_path(&std_vfs, &output_path.join("default.project.json"))?;
 
-    let output_project_path = output_path.join("default.project.json");
-    let (mut output_tree, output_project) = rojo_tree_from_path(&std_vfs, &output_project_path)?;
-    let fs_snapshot = syncback_loop(&std_vfs, &mut output_tree, input_dom, &output_project)?;
+    let fs_snapshot = syncback_loop(&std_vfs, &mut output_dom, input_dom, &project)?;
 
-    settings.bind(|| {
-        assert_yaml_snapshot!(name, visualize_fs_snapshot(&fs_snapshot, &output_path));
-    });
+    settings
+        .bind(|| assert_yaml_snapshot!(name, visualize_fs_snapshot(&fs_snapshot, &output_path)));
 
-    // We write to the in-memory VFS and not the file system!
     fs_snapshot.write_to_vfs(&output_path, &im_vfs)?;
+    let paths = fs_snapshot.added_paths();
 
-    // And now the hard part: diffing two sub-trees.
-    let mut path_queue: VecDeque<PathBuf> = [expected_path.join("default.project.json")].into();
-
-    while let Some(path) = path_queue.pop_front() {
-        let path = path.strip_prefix(&expected_path)?;
-        let path_display = path.display();
-
-        let expected = expected_path.join(path);
-        let output = output_path.join(path);
+    for path in paths {
+        let trimmed = path.strip_prefix(&output_path)?;
+        let expected = expected_path.join(trimmed);
 
         let expected_meta = std_vfs.metadata(&expected).with_not_found()?;
-        let output_meta = im_vfs.metadata(&output).with_not_found()?;
-
-        match (expected_meta, output_meta) {
-            (Some(expected_meta), Some(emitted_meta)) => {
-                if expected_meta.is_dir() && emitted_meta.is_dir() {
-                    for item in std_vfs.read_dir(&expected)? {
-                        path_queue.push_back(item?.path().to_path_buf());
-                    }
-                } else if expected_meta.is_file() && emitted_meta.is_file() {
-                    let expected_contents = std_vfs.read(&expected)?;
-                    let output_contents = im_vfs.read(&output)?;
-                    if expected_contents != output_contents {
-                        anyhow::bail!("path {path_display} is not as expected.");
+        let output_meta = match im_vfs.metadata(path).with_not_found()? {
+            Some(meta) => meta,
+            None => anyhow::bail!(
+                "Somehow, a path did not exist in the InMemoryVfs: {}",
+                trimmed.display()
+            ),
+        };
+
+        if let Some(expected_meta) = expected_meta {
+            match (expected_meta.is_dir(), output_meta.is_dir()) {
+                (true, true) => {}
+                (true, false) => anyhow::bail!(
+                    "A path was a file when it should be a directory: {}",
+                    trimmed.display()
+                ),
+                (false, true) => anyhow::bail!(
+                    "A path was a directory when it should be a file: {}",
+                    trimmed.display()
+                ),
+                (false, false) => {
+                    let output_contents = im_vfs.read(path).unwrap();
+                    let expected_contents = std_vfs.read(&expected).unwrap();
+                    if output_contents.as_slice() != expected_contents.as_slice() {
+                        anyhow::bail!(
+                            "The contents of a file did not match what was expected: {}. Expected {} bytes, got {}.",
+                            trimmed.display(), expected_contents.len(), output_contents.len()
+                        );
                     }
-                } else if expected_meta.is_file() {
-                    anyhow::bail!("path {path_display} should be a file but was emitted as a directory");
-                } else {
-                    anyhow::bail!("path {path_display} should be a directory but was emitted as a file");
                 }
             }
-            (Some(_), None) => anyhow::bail!(
-                "path {path_display} does not exist in actual output for syncback despite being expected"
-            ),
-            (None, _) => anyhow::bail!("Somehow, {} did not exist on the FS.", expected.display()),
+        } else {
+            anyhow::bail!(
+                "A path existed in the output when it shouldn't: {}",
+                trimmed.display()
+            )
         }
     }
-
     Ok(())
 }
 

From 1235f396b5c239e5b60413e7f956cc3d9ab86708 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 1 Apr 2024 12:15:00 -0700
Subject: [PATCH 259/366] Update all_middleware test

---
 ...o_test__syncback_util__all_middleware.snap |  30 ++++++++++++++++++
 ...t.client.lua => client_script.client.luau} |   0
 .../{module_script.lua => module_script.luau} |   0
 ...t.server.lua => server_script.server.luau} |   0
 .../all_middleware/expected/src/rbxmx.rbxmx   |  28 ++++++++--------
 .../syncback-tests/all_middleware/input.rbxl  | Bin 48870 -> 58975 bytes
 .../all_middleware/output/src/rbxmx.rbxmx     |  15 +++++----
 7 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
 rename rojo-test/syncback-tests/all_middleware/expected/src/dir/{client_script.client.lua => client_script.client.luau} (100%)
 rename rojo-test/syncback-tests/all_middleware/expected/src/dir/{module_script.lua => module_script.luau} (100%)
 rename rojo-test/syncback-tests/all_middleware/expected/src/dir/{server_script.server.lua => server_script.server.luau} (100%)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
new file mode 100644
index 000000000..fc1be6fe3
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
@@ -0,0 +1,30 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - "src\\csv.csv"
+  - "src\\csv_init\\init.csv"
+  - "src\\dir\\client_script.client.luau"
+  - "src\\dir\\init_client_script\\init.client.lua"
+  - "src\\dir\\init_module_script\\init.lua"
+  - "src\\dir\\init_server_script\\init.server.lua"
+  - "src\\dir\\module_script.luau"
+  - "src\\dir\\server_script.server.luau"
+  - "src\\model_json.model.json"
+  - "src\\project_json.project.json"
+  - "src\\rbxm.rbxm"
+  - "src\\rbxmx.rbxmx"
+  - "src\\text.txt"
+added_dirs:
+  - src
+  - "src\\csv_init"
+  - "src\\dir"
+  - "src\\dir\\init_client_script"
+  - "src\\dir\\init_module_script"
+  - "src\\dir\\init_server_script"
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.luau
similarity index 100%
rename from rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.lua
rename to rojo-test/syncback-tests/all_middleware/expected/src/dir/client_script.client.luau
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.luau
similarity index 100%
rename from rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.lua
rename to rojo-test/syncback-tests/all_middleware/expected/src/dir/module_script.luau
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.luau
similarity index 100%
rename from rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.lua
rename to rojo-test/syncback-tests/all_middleware/expected/src/dir/server_script.server.luau
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
index cc5e4cb84..9c7bf50f0 100644
--- a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
@@ -1,16 +1,16 @@
 <roblox version="4">
-	<Meta name="ExplicitAutoJoints">true</Meta>
-	<External>null</External>
-	<External>nil</External>
-	<Item class="ForceField" referent="0">
-		<Properties>
-			<BinaryString name="AttributesSerialize"></BinaryString>
-			<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
-			<bool name="DefinesCapabilities">false</bool>
-			<string name="Name">rbxmx</string>
-			<int64 name="SourceAssetId">-1</int64>
-			<BinaryString name="Tags"></BinaryString>
-			<bool name="Visible">true</bool>
-		</Properties>
-	</Item>
+  <Meta name="ExplicitAutoJoints">true</Meta>
+  <External>null</External>
+  <External>nil</External>
+  <Item class="Message" referent="0">
+    <Properties>
+      <BinaryString name="AttributesSerialize"></BinaryString>
+      <SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
+      <bool name="DefinesCapabilities">false</bool>
+      <string name="Name">rbxmx</string>
+      <int64 name="SourceAssetId">-1</int64>
+      <BinaryString name="Tags"></BinaryString>
+      <string name="Text">fireplace addicted army cow stock</string>
+    </Properties>
+  </Item>
 </roblox>
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/all_middleware/input.rbxl b/rojo-test/syncback-tests/all_middleware/input.rbxl
index 0f42d8fd79aa155bc79d82af3269dd659b0e58c6..2701e196d8088d0c5cf75af271fbd4f0250da18a 100644
GIT binary patch
delta 12939
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
blDC*QmHwu*BZ@b5djxM6((&L&*RuWx+nroK

delta 9081
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
He;N0Gn*ZhV

diff --git a/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx
index 60700ee3d..ca94c7e0c 100644
--- a/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/all_middleware/output/src/rbxmx.rbxmx
@@ -1,9 +1,10 @@
 <roblox version="4">
-	<Meta name="ExplicitAutoJoints">true</Meta>
-	<External>null</External>
-	<External>nil</External>
-	<Item class="ForceField" referent="0">
-		<Properties>
-		</Properties>
-	</Item>
+  <Meta name="ExplicitAutoJoints">true</Meta>
+  <External>null</External>
+  <External>nil</External>
+  <Item class="Message" referent="0">
+    <Properties>
+      <string name="Name">rbxmx</string>
+    </Properties>
+  </Item>
 </roblox>
\ No newline at end of file

From ce9c1d7bfd4c50c6329c9a11aef4bf6a14f655c5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 1 Apr 2024 12:28:46 -0700
Subject: [PATCH 260/366] Format project json in all_middleware test

---
 .../all_middleware/expected/src/project_json.project.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json b/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json
index 3a898bc67..cb0ce6a2e 100644
--- a/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/project_json.project.json
@@ -4,9 +4,9 @@
     "$className": "Color3Value",
     "$properties": {
       "Value": [
-        1,
+        1.0,
         0.5,
-        0
+        0.0
       ]
     }
   }

From d8362806184a387944a5a1c2233a386540680a0b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Apr 2024 10:36:26 -0700
Subject: [PATCH 261/366] remove cows from csv Middleware

---
 src/snapshot_middleware/csv.rs | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 8902e3390..2e03b08f2 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -1,5 +1,4 @@
 use std::{
-    borrow::Cow,
     collections::{BTreeMap, BTreeSet},
     path::Path,
 };
@@ -175,19 +174,19 @@ pub fn syncback_csv_init<'sync>(
 #[serde(rename_all = "camelCase")]
 struct LocalizationEntry<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
-    key: Option<Cow<'a, str>>,
+    key: Option<&'a str>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    context: Option<Cow<'a, str>>,
+    context: Option<&'a str>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    example: Option<Cow<'a, str>>,
+    example: Option<&'a str>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    source: Option<Cow<'a, str>>,
+    source: Option<&'a str>,
 
     // We use a BTreeMap here to get deterministic output order.
-    values: BTreeMap<Cow<'a, str>, Cow<'a, str>>,
+    values: BTreeMap<&'a str, &'a str>,
 }
 
 /// Normally, we'd be able to let the csv crate construct our struct for us.
@@ -221,14 +220,12 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
             }
 
             match header {
-                "Key" => entry.key = Some(Cow::Borrowed(value)),
-                "Source" => entry.source = Some(Cow::Borrowed(value)),
-                "Context" => entry.context = Some(Cow::Borrowed(value)),
-                "Example" => entry.example = Some(Cow::Borrowed(value)),
+                "Key" => entry.key = Some(value),
+                "Source" => entry.source = Some(value),
+                "Context" => entry.context = Some(value),
+                "Example" => entry.example = Some(value),
                 _ => {
-                    entry
-                        .values
-                        .insert(Cow::Borrowed(header), Cow::Borrowed(value));
+                    entry.values.insert(header, value);
                 }
             }
         }
@@ -275,14 +272,14 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
 
     let mut record: Vec<&str> = Vec::with_capacity(headers.len());
     for entry in &csv {
-        record.push(entry.key.as_ref().unwrap_or(&Cow::Borrowed("")));
-        record.push(entry.source.as_ref().unwrap_or(&Cow::Borrowed("")));
-        record.push(entry.context.as_ref().unwrap_or(&Cow::Borrowed("")));
-        record.push(entry.example.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.key.unwrap_or_default());
+        record.push(entry.source.unwrap_or_default());
+        record.push(entry.context.unwrap_or_default());
+        record.push(entry.example.unwrap_or_default());
 
         let values = &entry.values;
         for header in &extra_headers {
-            record.push(values.get(*header).unwrap_or(&Cow::Borrowed("")));
+            record.push(values.get(*header).copied().unwrap_or_default());
         }
 
         writer

From f3ff058b4ae1c7d7d6b010bf46c21712accad016 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Apr 2024 10:52:42 -0700
Subject: [PATCH 262/366] Serialize LocalizationTable.Contents example field
 correctly

---
 .../end_to_end__tests__build__csv_bug_145.snap              | 2 +-
 .../end_to_end__tests__build__csv_in_folder.snap            | 2 +-
 src/snapshot_middleware/csv.rs                              | 6 +++---
 ...brojo__snapshot_middleware__csv__test__csv_from_vfs.snap | 2 +-
 ...rojo__snapshot_middleware__csv__test__csv_with_meta.snap | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap
index ab7470b31..4bb0f95a5 100644
--- a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap
+++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap
@@ -10,7 +10,7 @@ expression: contents
     <Item class="LocalizationTable" referent="1">
       <Properties>
         <string name="Name">normal</string>
-        <string name="Contents">[{"key":"Count","example":"A number demonstrating issue 145","source":"3","values":{"es":"7"}}]</string>
+        <string name="Contents">[{"key":"Count","examples":"A number demonstrating issue 145","source":"3","values":{"es":"7"}}]</string>
       </Properties>
     </Item>
   </Item>
diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap
index d60fca025..42cbea1f5 100644
--- a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap
+++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap
@@ -10,7 +10,7 @@ expression: contents
     <Item class="LocalizationTable" referent="1">
       <Properties>
         <string name="Name">normal</string>
-        <string name="Contents">[{"key":"Ack","example":"An exclamation of despair","source":"Ack!","values":{"es":"¡Ay!"}}]</string>
+        <string name="Contents">[{"key":"Ack","examples":"An exclamation of despair","source":"Ack!","values":{"es":"¡Ay!"}}]</string>
       </Properties>
     </Item>
   </Item>
diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 2e03b08f2..206bbe49b 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -180,7 +180,7 @@ struct LocalizationEntry<'a> {
     context: Option<&'a str>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    example: Option<&'a str>,
+    examples: Option<&'a str>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     source: Option<&'a str>,
@@ -223,7 +223,7 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
                 "Key" => entry.key = Some(value),
                 "Source" => entry.source = Some(value),
                 "Context" => entry.context = Some(value),
-                "Example" => entry.example = Some(value),
+                "Example" => entry.examples = Some(value),
                 _ => {
                     entry.values.insert(header, value);
                 }
@@ -275,7 +275,7 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
         record.push(entry.key.unwrap_or_default());
         record.push(entry.source.unwrap_or_default());
         record.push(entry.context.unwrap_or_default());
-        record.push(entry.example.unwrap_or_default());
+        record.push(entry.examples.unwrap_or_default());
 
         let values = &entry.values;
         for header in &extra_headers {
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 df634792f..6ad72e733 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
@@ -18,6 +18,6 @@ name: foo
 class_name: LocalizationTable
 properties:
   Contents:
-    String: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
+    String: "[{\"key\":\"Ack\",\"examples\":\"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 8e97b5050..389a8a588 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
@@ -18,6 +18,6 @@ name: foo
 class_name: LocalizationTable
 properties:
   Contents:
-    String: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
+    String: "[{\"key\":\"Ack\",\"examples\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
 children: []
 

From 540a24b67c5f66e173f9d42aba5418fedd119e8e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Apr 2024 14:11:42 -0700
Subject: [PATCH 263/366] Update expected results for rbxm and csv middlewares

---
 rojo-test/syncback-tests/all_middleware/expected/src/csv.csv | 2 +-
 .../syncback-tests/all_middleware/expected/src/rbxmx.rbxmx   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv b/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv
index 220cbe87b..b7c422222 100644
--- a/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/csv.csv
@@ -1,2 +1,2 @@
 Key,Source,Context,Example,es
-Ack,Ack!,,An exclamation of despair,¡Ay!
\ No newline at end of file
+Ack,Ack!,,An exclamation of despair,¡Ay!
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
index 9c7bf50f0..6e43e0368 100644
--- a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
@@ -1,13 +1,10 @@
 <roblox version="4">
-  <Meta name="ExplicitAutoJoints">true</Meta>
-  <External>null</External>
-  <External>nil</External>
   <Item class="Message" referent="0">
     <Properties>
+      <string name="Name">rbxmx</string>
       <BinaryString name="AttributesSerialize"></BinaryString>
       <SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
       <bool name="DefinesCapabilities">false</bool>
-      <string name="Name">rbxmx</string>
       <int64 name="SourceAssetId">-1</int64>
       <BinaryString name="Tags"></BinaryString>
       <string name="Text">fireplace addicted army cow stock</string>

From 0ecfed112cfb119e429367ddc6a6846a2ccbcaed Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Apr 2024 14:12:04 -0700
Subject: [PATCH 264/366] Update input file to not suck

---
 .../syncback-tests/all_middleware/input.rbxl  | Bin 58975 -> 58972 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rojo-test/syncback-tests/all_middleware/input.rbxl b/rojo-test/syncback-tests/all_middleware/input.rbxl
index 2701e196d8088d0c5cf75af271fbd4f0250da18a..afb4a076a19a5d4f36a35c9c0c8bf3b44c5e1395 100644
GIT binary patch
delta 935
zcmZ{iOK1~87{_PRx=1DUQ7Bf7Xz)R`(`I&OXJ>uSKI#J>p_MB5tm$GKH7&LkwTbV8
z9t^^Qs0ivskP<8`UJNwop@+6U3I?lIg$jZfwf16ee$k5_@`v9r-^a(yf9Cr>jh0P}
zmJQqrNJ;N@pg}tC4+nNg(q+G<{EHO0Snf%3PKx_a<+>SCx&Lj}qs5iUw{j>K&1CcG
zLNGq)_t#yQDwFU3%WbLO8LUix_%HWh%~_}$`8Vf%UsvsKUbkZQT5$&C{+RkXElX%l
z2*?3ZAOmE9Jdg$oKu|*W;zbP><@ax6^7e>mbeK&UHf)n)Dg?)7#Imq144XTeYU`$*
zT8VyCtEO!jrlw#*3<Xm?qC%mgW2O>SVZ>1d*S-4YsfEep=yO>Pg>t!QG?U3@^Z9hT
zPzVN#*ZOOAeU>&nL<o%oMNKaX!8#MLIuku^qNiJGg<x-A_^5k2ygJ;}8Sf0&h22xF
z$GeWX-Sg0NmDk@=(*U{d&fXI-w-$B5{$%U1UIT6H3%iMGbjocDr&9Y5xM;PA9c@Fu
zDulPMW&XTFXe-1^4k2_GU4M38oL=I+Zn;oZygb%@@?b}zqo?fe-fQ3e1RgT+vE)P6
z@3{f38veH}{-n#LbM0`#5um84`Y@~&Ky&OwM_13L-i|hDIfQ+>!yF<sjuoa5OdW$@
zZZvAxR#na{qEg|oKi>|`5DM2+Y?%xSId!lwD8)9X#aeDSl%}FhJEMo;*cd|I%_CpH
z`HNR2o!@RBS>R=xDqUQ{o53uu5a_gR(nj#cOe`G7z?7*v5yXmc@^>U`iy0A(F{}}=
zMNOSx!C@p+YTI0oP)j(v_vX@f@bhx4q@T&lsa3VfWMKSVK$gFTLPNRSwP^HeCKJnM
z=jQW|)9E{f!cZ{S5|5_`2fZr;%a+=L6U(*~93cc|kw+|Sn9RW@wG@q6Cg-Z|j}4@?
E-`T4>&j0`b

delta 918
zcmZ{iO=uHA6vt;1U8K^qR;^T0NEeG#J9RfZv$JcP!0zlODp8@DDu_x<*4j2ErD=;&
z<5yJ_Vi6V!iUf1<QqaI6)^8N7pXf!1iqeB1c+uLEM<;l(hyLL=!+Q+8|9fw~y!Fn$
z^_H)CxU<eR&nE7I``WXE<4(9uOTKfS{#6dgKjBWhPx<zxT#fs4`R#x&{EGLNghDhP
zsua^HcdGpg=L^4CklWg^v(^`$S&+Ngd6K=G{y*pZ3N^Z0LhI|gyj@JO%EwQic@EV3
z86}3mC@`XoI3vWUFp3<wk*+FLl{*zv`0W}}Wig@{kOYGmB1|->=@dhSm=WDTMAjrR
zzX8lOsstf}U=31{5{PtaLfu3ZS}fGeAjTGsI32rw`@`XT_j%s$FO>wLP>4q3@ldEz
zDHf|`-Ok<LxKp<P03R7u%{4c(a~XqXGsAXfIL94e!M-tJz&<W)7WCwR&@R}=5=RHq
zc5VfjYsdubW65;lXkxf8n+aqO2U2!!Fwr-}p5?M5LrJ?8+(-_zuy8by9>E|mCh%Zd
zcvjMnw+Q+C{)F!k*w&rx&n5wA0Do$n{XI?fy#Ta<nqE-Ou$tX=%6Z>&W~G-IN#;hY
z=Gb+xFVi>dB=_8B9o~JhXouR~Nw&k6|L@EFYO7owD*>uhHQymPgX3#r)C>}884@%J
zHXsU`22>*&fe{iEO;J}=OwH=_S0idrQIes76&)hQKx|7$g|ey=Y#JKUEYZ2xJI|~=
zc(kas$s=#p)-JH&WX79fRH9N)5iKZLh<$;Gr9(ZUsZdo=(2}TW>e4?G)WWh!WGE??
z2@xR#>LMbL%0!Vw5$i~joDbu_n2Cpv7d0_^F2AuY9QHha?cw<!e*a9VbXgEC6$;5{
zbVWRVCltC~smv6MJ?ZpBD&?Fnx2{uks;QPNL#&zzB3V(Orm|6C326$kM55@}eOI2q
Fe*wmy7+3%R


From f9ead1d8fdc574f6f97dcb917c498fd989404a47 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Apr 2024 15:24:49 -0700
Subject: [PATCH 265/366] Add ref_property test

---
 ...ojo_test__syncback_util__ref_properties.snap |  12 ++++++++++++
 .../expected/default.project.json               |   9 +++++++++
 .../expected/src/pointer.model.json             |   6 ++++++
 .../expected/src/target.model.json              |   4 ++++
 .../syncback-tests/ref_properties/input.rbxl    | Bin 0 -> 54134 bytes
 .../ref_properties/output/default.project.json  |   9 +++++++++
 .../output/src/pointer.model.json               |   3 +++
 .../ref_properties/output/src/target.model.json |   3 +++
 tests/tests/syncback.rs                         |   1 +
 9 files changed, 47 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
 create mode 100644 rojo-test/syncback-tests/ref_properties/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ref_properties/expected/src/pointer.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties/expected/src/target.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ref_properties/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/ref_properties/output/src/pointer.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties/output/src/target.model.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
new file mode 100644
index 000000000..67b154234
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
@@ -0,0 +1,12 @@
+---
+source: tests/rojo_test/syncback_util.rs
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - "src\\pointer.model.json"
+added_dirs:
+  - src
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/ref_properties/expected/default.project.json b/rojo-test/syncback-tests/ref_properties/expected/default.project.json
new file mode 100644
index 000000000..c2dd62c30
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties/expected/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "ref_properties",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties/expected/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties/expected/src/pointer.model.json
new file mode 100644
index 000000000..56efa71c2
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties/expected/src/pointer.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Target_Value": "test referent id"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json b/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json
new file mode 100644
index 000000000..fa404ce5a
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json
@@ -0,0 +1,4 @@
+{
+  "className": "Folder",
+  "id": "test referent id"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties/input.rbxl b/rojo-test/syncback-tests/ref_properties/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..fd1e7ad0f7c4826d28975d96a24346229dfd22f2
GIT binary patch
literal 54134
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
C?Kva>

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ref_properties/output/default.project.json b/rojo-test/syncback-tests/ref_properties/output/default.project.json
new file mode 100644
index 000000000..c2dd62c30
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties/output/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "ref_properties",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties/output/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties/output/src/pointer.model.json
new file mode 100644
index 000000000..54160c22c
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties/output/src/pointer.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "ObjectValue"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties/output/src/target.model.json b/rojo-test/syncback-tests/ref_properties/output/src/target.model.json
new file mode 100644
index 000000000..f450e4126
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties/output/src/target.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "Folder"
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 7b3c600c9..6a3279bd9 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -19,4 +19,5 @@ syncback_basic_test! {
     nested_projects_weird,
     project_init,
     all_middleware,
+    ref_properties,
 }

From 0fad2d70586d6ac54c9fa5e36bd5930d7b4d050c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 09:42:06 -0700
Subject: [PATCH 266/366] Update test files for ref_properties test

---
 ...o_test__syncback_util__ref_properties.snap |   1 +
 .../expected/src/target.model.json            |   4 +++-
 .../syncback-tests/ref_properties/input.rbxl  | Bin 54134 -> 53706 bytes
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
index 67b154234..a4a353073 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
@@ -5,6 +5,7 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - default.project.json
   - "src\\pointer.model.json"
+  - "src\\target.model.json"
 added_dirs:
   - src
 removed_files: []
diff --git a/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json b/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json
index fa404ce5a..d76fa1791 100644
--- a/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json
+++ b/rojo-test/syncback-tests/ref_properties/expected/src/target.model.json
@@ -1,4 +1,6 @@
 {
   "className": "Folder",
-  "id": "test referent id"
+  "attributes": {
+    "Rojo_Id": "test referent id"
+  }
 }
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties/input.rbxl b/rojo-test/syncback-tests/ref_properties/input.rbxl
index fd1e7ad0f7c4826d28975d96a24346229dfd22f2..6599191dcb285b15bbd208a8e237cc1977bfcaf0 100644
GIT binary patch
delta 7546
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

delta 7768
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
VB(zUR;}kxArjy0k+1P%~^1tt(T%rH~


From 63540bfb74ee3a3d66b7864a58b3041918f21b27 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 09:42:55 -0700
Subject: [PATCH 267/366] Make syncback test emit file contents when they don't
 match if possible

---
 tests/rojo_test/syncback_util.rs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 34033f9c4..8a4d7cd17 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -74,10 +74,21 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
                     let output_contents = im_vfs.read(path).unwrap();
                     let expected_contents = std_vfs.read(&expected).unwrap();
                     if output_contents.as_slice() != expected_contents.as_slice() {
-                        anyhow::bail!(
-                            "The contents of a file did not match what was expected: {}. Expected {} bytes, got {}.",
-                            trimmed.display(), expected_contents.len(), output_contents.len()
-                        );
+                        let output_str = std::str::from_utf8(&output_contents);
+                        let expected_str = std::str::from_utf8(&output_contents);
+                        let display = trimmed.display();
+                        match (output_str, expected_str) {
+                            (Ok(output), Ok(expected)) => anyhow::bail!(
+                                "The contents of a file did not match what was expected: {display}.\n\
+                                Expected: {expected}\n\
+                                Actual: {output}"
+                            ),
+                            _ => anyhow::bail!(
+                                "The contents of a file did not match what was expected: {display}. \
+                                Expected {} bytes, got {}.",
+                                expected_contents.len(), output_contents.len()
+                            ),
+                        }
                     }
                 }
             }

From 9815c37d627a494b522a51ad3fd49c74fa61080f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 10:03:24 -0700
Subject: [PATCH 268/366] Normalize line endings for syncback tests

---
 tests/rojo_test/syncback_util.rs | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 8a4d7cd17..072d95b4d 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, path::Path};
+use std::{borrow::Cow, collections::HashMap, path::Path};
 
 use anyhow::Context;
 use insta::assert_yaml_snapshot;
@@ -73,9 +73,12 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
                 (false, false) => {
                     let output_contents = im_vfs.read(path).unwrap();
                     let expected_contents = std_vfs.read(&expected).unwrap();
-                    if output_contents.as_slice() != expected_contents.as_slice() {
-                        let output_str = std::str::from_utf8(&output_contents);
-                        let expected_str = std::str::from_utf8(&output_contents);
+
+                    let normalized_output = normalize_line_endings(&output_contents);
+                    let normalized_expected = normalize_line_endings(&expected_contents);
+                    if normalized_output.as_slice() != normalized_expected.as_slice() {
+                        let output_str = std::str::from_utf8(&normalized_output);
+                        let expected_str = std::str::from_utf8(&normalized_expected);
                         let display = trimmed.display();
                         match (output_str, expected_str) {
                             (Ok(output), Ok(expected)) => anyhow::bail!(
@@ -86,7 +89,7 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
                             _ => anyhow::bail!(
                                 "The contents of a file did not match what was expected: {display}. \
                                 Expected {} bytes, got {}.",
-                                expected_contents.len(), output_contents.len()
+                                normalized_output.len(), normalized_expected.len()
                             ),
                         }
                     }
@@ -135,6 +138,23 @@ fn to_vfs_snapshot(vfs: &Vfs, path: &Path) -> anyhow::Result<VfsSnapshot> {
     }
 }
 
+/// Normalizes the line endings of a vector if it's user-readable.
+/// If it isn't, the vector is returned unmodified.
+fn normalize_line_endings(input: &Vec<u8>) -> Cow<Vec<u8>> {
+    match std::str::from_utf8(input) {
+        Ok(str) => {
+            let mut new_str = Vec::with_capacity(input.len());
+            for line in str.lines() {
+                new_str.extend(line.as_bytes());
+                new_str.push(b'\n')
+            }
+            new_str.pop();
+            Cow::Owned(new_str)
+        }
+        Err(_) => Cow::Borrowed(input),
+    }
+}
+
 #[derive(Default, Debug, Serialize)]
 struct FsSnapshotVisual<'a> {
     added_files: Vec<&'a Path>,

From 04bd5545978ab648a73f444049f20b20c989f61a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 10:50:48 -0700
Subject: [PATCH 269/366] Add test for rbxm fallback

---
 ...rojo_test__syncback_util__rbxm_fallback.snap |  15 +++++++++++++++
 .../ReplicatedStorage/ChildWithDuplicates.rbxm  | Bin 0 -> 458 bytes
 .../ChildWithDuplicates/.gitkeep                |   0
 .../ChildWithoutDuplicates/Child/.gitkeep       |   0
 .../rbxm_fallback/expected/default.project.json |   9 +++++++++
 .../syncback-tests/rbxm_fallback/input.rbxl     | Bin 0 -> 53375 bytes
 .../ChildWithDuplicates/.gitkeep                |   0
 .../rbxm_fallback/output/default.project.json   |   9 +++++++++
 tests/tests/syncback.rs                         |   1 +
 9 files changed, 34 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates.rbxm
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithoutDuplicates/Child/.gitkeep
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/input.rbxl
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/output/ReplicatedStorage/ChildWithDuplicates/.gitkeep
 create mode 100644 rojo-test/syncback-tests/rbxm_fallback/output/default.project.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
new file mode 100644
index 000000000..ab189346c
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
@@ -0,0 +1,15 @@
+---
+source: tests/rojo_test/syncback_util.rs
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - "ReplicatedStorage\\ChildWithDuplicates.rbxm"
+  - "ReplicatedStorage\\ChildWithoutDuplicates\\Child\\.gitkeep"
+  - default.project.json
+added_dirs:
+  - ReplicatedStorage
+  - "ReplicatedStorage\\ChildWithoutDuplicates"
+  - "ReplicatedStorage\\ChildWithoutDuplicates\\Child"
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates.rbxm b/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..4cdc8efad70305326acc7eaa7472551a907d11d7
GIT binary patch
literal 458
zcmYjOO-sW-5S`tM(rQ9g6#T-*Ui47C_E3b<DE1PA33%Q#t6f-4$!<VAdG+7;Q~W8p
zc-EOUN(bJ|&YO9e+3ct+GF`j`@84c$zXQMkpoRFeX_TZrOpY6(rUqC=To*c*CA7Nm
z(bNDqkMC~dGt5sLuJ-7#jTl>7s;sioB(hXOt5?Ym;f=~<Bs{@5a2Y^NGhhQT5etzi
zt*nwJ*nxEpvFjm4fT#b}x<u2cP(G+<X_kc?X%Y-E-XO@n_Q<awBJm^{DJOHK^Lu6I
zVYSd|CU9FHX&+b*+FKC2I(?^)>^Xw0UL#KzO^T|V$+0ogPV<A^W>>}-Nobmzi18EQ
rCa2=jFmL%cMCm5hj;H}`h_At*&$&;xW*n}f&=uOw1B@<yU-0q=Wt2$m

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep b/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithoutDuplicates/Child/.gitkeep b/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithoutDuplicates/Child/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/rbxm_fallback/expected/default.project.json b/rojo-test/syncback-tests/rbxm_fallback/expected/default.project.json
new file mode 100644
index 000000000..d47484219
--- /dev/null
+++ b/rojo-test/syncback-tests/rbxm_fallback/expected/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "rbxm_fallback",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "ReplicatedStorage"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/rbxm_fallback/input.rbxl b/rojo-test/syncback-tests/rbxm_fallback/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..28e92a188eafabbf96831a7bf5a73714d105b055
GIT binary patch
literal 53375
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
H)uaCx9U!^0

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/rbxm_fallback/output/ReplicatedStorage/ChildWithDuplicates/.gitkeep b/rojo-test/syncback-tests/rbxm_fallback/output/ReplicatedStorage/ChildWithDuplicates/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/rbxm_fallback/output/default.project.json b/rojo-test/syncback-tests/rbxm_fallback/output/default.project.json
new file mode 100644
index 000000000..d47484219
--- /dev/null
+++ b/rojo-test/syncback-tests/rbxm_fallback/output/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "rbxm_fallback",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "ReplicatedStorage"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 6a3279bd9..c7b4c4c1c 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -20,4 +20,5 @@ syncback_basic_test! {
     project_init,
     all_middleware,
     ref_properties,
+    rbxm_fallback
 }

From 5094a6601160cd0da11cc8c0fed91acb23f67ff8 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 10:55:49 -0700
Subject: [PATCH 270/366] Reimplement rbxm as fallback behavior for directories

---
 src/snapshot_middleware/project.rs | 14 +++++++-------
 src/syncback/file_names.rs         |  2 +-
 src/syncback/mod.rs                | 28 +++++++++++++++++++++++++---
 src/syncback/snapshot.rs           | 13 +++++++++++++
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 19131c513..8f523bcbe 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -539,13 +539,13 @@ fn syncback_project_node<'sync>(
         ),
     };
 
-    Ok(SyncbackSnapshot {
-        data: snapshot.data,
-        old: Some(old_inst.id()),
-        new: new_inst.referent(),
-        path: node_path.to_path_buf(),
-        middleware: Some(middleware),
-    })
+    Ok(snapshot
+        .with_new_path(
+            node_path.to_path_buf(),
+            new_inst.referent(),
+            Some(old_inst.id()),
+        )
+        .middleware(middleware))
 }
 
 fn infer_class_name(name: &str, parent_class: Option<&str>) -> Option<Cow<'static, str>> {
diff --git a/src/syncback/file_names.rs b/src/syncback/file_names.rs
index 6424bcee3..d7c14011c 100644
--- a/src/syncback/file_names.rs
+++ b/src/syncback/file_names.rs
@@ -49,7 +49,7 @@ pub fn name_for_inst<'old>(
 }
 
 /// Returns the extension a provided piece of middleware is supposed to use.
-fn extension_for_middleware(middleware: Middleware) -> &'static str {
+pub fn extension_for_middleware(middleware: Middleware) -> &'static str {
     match middleware {
         Middleware::Csv => "csv",
         Middleware::JsonModel => "model.json",
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 545294c70..5c6020fd5 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -25,7 +25,7 @@ use crate::{
     Project,
 };
 
-pub use file_names::{name_for_inst, validate_file_name};
+pub use file_names::{extension_for_middleware, name_for_inst, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
 pub use property_filter::{filter_properties, filter_properties_preallocated};
@@ -174,8 +174,30 @@ pub fn syncback_loop(
         }
 
         let mut syncback_res = middleware.syncback(&snapshot);
-        if syncback_res.is_err() && middleware.is_dir() {
-            todo!("Directory syncback failures will eventually result in an rbxm syncback");
+        if syncback_res.is_err() && middleware == Middleware::Dir {
+            let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
+                Ok(value) if value == "1" => Middleware::Rbxmx,
+                Ok(value) if value == "2" => Middleware::JsonModel,
+                _ => Middleware::Rbxm,
+            };
+
+            let file_name = snapshot
+                .path
+                .file_name()
+                .and_then(|s| s.to_str())
+                .context("Directory middleware should have a name in its path")?;
+            let mut path = snapshot.path.clone();
+            path.set_file_name(format!(
+                "{file_name}.{}",
+                extension_for_middleware(new_middleware)
+            ));
+
+            let new_snapshot = snapshot.with_new_path(path, snapshot.new, snapshot.old);
+            log::warn!(
+                "Could not syncback {inst_path} as a Directory, it will \
+                instead be synced back as a {new_middleware:?}."
+            );
+            syncback_res = new_middleware.syncback(&new_snapshot);
         }
         let syncback = syncback_res.with_context(|| format!("Failed to syncback {inst_path}"))?;
 
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 73fda1acc..eade178cf 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -83,6 +83,19 @@ impl<'sync> SyncbackSnapshot<'sync> {
         Ok(snapshot)
     }
 
+    /// Constructs a SyncbackSnapshot with the provided path and refs while
+    /// inheriting the data of the this snapshot.
+    #[inline]
+    pub fn with_new_path(&self, path: PathBuf, new_ref: Ref, old_ref: Option<Ref>) -> Self {
+        Self {
+            data: self.data,
+            old: old_ref,
+            new: new_ref,
+            path,
+            middleware: None,
+        }
+    }
+
     /// Allows a middleware to be 'forced' onto a SyncbackSnapshot to override
     /// the attempts to derive it.
     #[inline]

From 7e13a18957912f2f869b31acff854ca5d64bfe90 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 11:21:37 -0700
Subject: [PATCH 271/366] Indicate which copy of the project a duplicate child
 is in when erroring

---
 src/snapshot_middleware/project.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 8f523bcbe..4009a0289 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -424,7 +424,7 @@ pub fn syncback_project<'sync>(
             if new_child_map.insert(&child.name, child).is_some() {
                 anyhow::bail!(
                     "Instances that are direct children of an Instance that is made by a project file \
-                    must have a unique name.\nThe child '{}' of '{}' is duplicated.", child.name, old_inst.name()
+                    must have a unique name.\nThe child '{}' of '{}' is duplicated in the place file.", child.name, old_inst.name()
                 );
             }
         }
@@ -435,7 +435,7 @@ pub fn syncback_project<'sync>(
             if old_child_map.insert(child.name(), child).is_some() {
                 anyhow::bail!(
                     "Instances that are direct children of an Instance that is made by a project file \
-                    must have a unique name.\nThe child '{}' of '{}' is duplicated.", child.name(), old_inst.name()
+                    must have a unique name.\nThe child '{}' of '{}' is duplicated on the file system.", child.name(), old_inst.name()
                 );
             }
         }

From c854f60eaa34dd2bbcebf5c07f41d342c0901a0c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 11:47:30 -0700
Subject: [PATCH 272/366] I lied, apparently. We still need Cows in CSV.

---
 src/snapshot_middleware/csv.rs | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 206bbe49b..85291039f 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -1,4 +1,5 @@
 use std::{
+    borrow::Cow,
     collections::{BTreeMap, BTreeSet},
     path::Path,
 };
@@ -174,19 +175,19 @@ pub fn syncback_csv_init<'sync>(
 #[serde(rename_all = "camelCase")]
 struct LocalizationEntry<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
-    key: Option<&'a str>,
+    key: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    context: Option<&'a str>,
+    context: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    examples: Option<&'a str>,
+    examples: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    source: Option<&'a str>,
+    source: Option<Cow<'a, str>>,
 
     // We use a BTreeMap here to get deterministic output order.
-    values: BTreeMap<&'a str, &'a str>,
+    values: BTreeMap<Cow<'a, str>, Cow<'a, str>>,
 }
 
 /// Normally, we'd be able to let the csv crate construct our struct for us.
@@ -220,12 +221,14 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
             }
 
             match header {
-                "Key" => entry.key = Some(value),
-                "Source" => entry.source = Some(value),
-                "Context" => entry.context = Some(value),
-                "Example" => entry.examples = Some(value),
+                "Key" => entry.key = Some(Cow::Borrowed(value)),
+                "Source" => entry.source = Some(Cow::Borrowed(value)),
+                "Context" => entry.context = Some(Cow::Borrowed(value)),
+                "Example" => entry.examples = Some(Cow::Borrowed(value)),
                 _ => {
-                    entry.values.insert(header, value);
+                    entry
+                        .values
+                        .insert(Cow::Borrowed(header), Cow::Borrowed(value));
                 }
             }
         }
@@ -272,14 +275,14 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
 
     let mut record: Vec<&str> = Vec::with_capacity(headers.len());
     for entry in &csv {
-        record.push(entry.key.unwrap_or_default());
-        record.push(entry.source.unwrap_or_default());
-        record.push(entry.context.unwrap_or_default());
-        record.push(entry.examples.unwrap_or_default());
+        record.push(entry.key.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.source.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.context.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.examples.as_ref().unwrap_or(&Cow::Borrowed("")));
 
         let values = &entry.values;
         for header in &extra_headers {
-            record.push(values.get(*header).copied().unwrap_or_default());
+            record.push(values.get(*header).unwrap_or(&Cow::Borrowed("")));
         }
 
         writer

From 627759c0869c5791a6d2675cc13ff155751b4c23 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 12:17:08 -0700
Subject: [PATCH 273/366] Optimize use of cows in CSV middleware

---
 src/snapshot_middleware/csv.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 85291039f..53f8eb7f0 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -275,14 +275,14 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
 
     let mut record: Vec<&str> = Vec::with_capacity(headers.len());
     for entry in &csv {
-        record.push(entry.key.as_ref().unwrap_or(&Cow::Borrowed("")));
-        record.push(entry.source.as_ref().unwrap_or(&Cow::Borrowed("")));
-        record.push(entry.context.as_ref().unwrap_or(&Cow::Borrowed("")));
-        record.push(entry.examples.as_ref().unwrap_or(&Cow::Borrowed("")));
+        record.push(entry.key.as_deref().unwrap_or_default());
+        record.push(entry.source.as_deref().unwrap_or_default());
+        record.push(entry.context.as_deref().unwrap_or_default());
+        record.push(entry.examples.as_deref().unwrap_or_default());
 
         let values = &entry.values;
         for header in &extra_headers {
-            record.push(values.get(*header).unwrap_or(&Cow::Borrowed("")));
+            record.push(values.get(*header).map(AsRef::as_ref).unwrap_or_default());
         }
 
         writer

From 7eff14b275c133bb43f061fae7bebb8e96e4307d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 12:17:43 -0700
Subject: [PATCH 274/366] Add `create_dir` and `create_dir_all` to VfsLock

---
 crates/memofs/src/lib.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/crates/memofs/src/lib.rs b/crates/memofs/src/lib.rs
index 1dfa41b11..37d6ba295 100644
--- a/crates/memofs/src/lib.rs
+++ b/crates/memofs/src/lib.rs
@@ -420,6 +420,31 @@ impl VfsLock<'_> {
         self.inner.read_dir(path)
     }
 
+    /// Creates a directory at the provided location.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir`][std::fs::create_dir].
+    /// Similiar to that function, this function will fail if the parent of the
+    /// path does not exist.
+    ///
+    /// [std::fs::create_dir]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir.html
+    #[inline]
+    pub fn create_dir<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.create_dir(path)
+    }
+
+    /// Creates a directory at the provided location, recursively creating
+    /// all parent components if they are missing.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir_all`][std::fs::create_dir_all].
+    ///
+    /// [std::fs::create_dir_all]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir_all.html
+    #[inline]
+    pub fn create_dir_all<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.create_dir_all(path)
+    }
+
     /// Remove a file.
     ///
     /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].

From fd315e8d5194422006f99d3cb40c5d68bb6a0b6e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 12:17:58 -0700
Subject: [PATCH 275/366] Lock Vfs when writing syncback to file system

---
 src/syncback/fs_snapshot.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 314bca317..424d1fef7 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -78,23 +78,26 @@ impl FsSnapshot {
     ///
     /// This includes removals, but makes no effort to minimize work done.
     pub fn write_to_vfs<P: AsRef<Path>>(&self, base: P, vfs: &Vfs) -> io::Result<()> {
+        let mut lock = vfs.lock();
+
         let base_path = base.as_ref();
         for dir_path in &self.added_dirs {
-            match vfs.create_dir_all(base_path.join(dir_path)) {
+            match lock.create_dir_all(base_path.join(dir_path)) {
                 Ok(_) => (),
                 Err(err) if err.kind() == io::ErrorKind::AlreadyExists => (),
                 Err(err) => return Err(err),
             };
         }
         for (path, contents) in &self.added_files {
-            vfs.write(base_path.join(path), contents)?;
+            lock.write(base_path.join(path), contents)?;
         }
         for dir_path in &self.removed_dirs {
-            vfs.remove_dir_all(base_path.join(dir_path))?;
+            lock.remove_dir_all(base_path.join(dir_path))?;
         }
         for path in &self.removed_files {
-            vfs.remove_file(base_path.join(path))?;
+            lock.remove_file(base_path.join(path))?;
         }
+        drop(lock);
 
         if self.added_dirs.len() + self.added_files.len() > 0 {
             log::info!(

From 545a7e3d9ce47369eefa4815558ecc7aa676151e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 4 Apr 2024 14:39:36 -0700
Subject: [PATCH 276/366] get rid of the RefRewrites struct

---
 src/syncback/mod.rs            |  3 +-
 src/syncback/ref_properties.rs | 95 ++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 5c6020fd5..51fb119ee 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -22,6 +22,7 @@ use crate::{
     glob::Glob,
     snapshot::{InstanceSnapshot, InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
+    syncback::ref_properties::link_referents,
     Project,
 };
 
@@ -103,7 +104,7 @@ pub fn syncback_loop(
         .unwrap_or_default();
     if !ignore_referents {
         log::debug!("Linking referents for new DOM");
-        deferred_referents.link(&mut new_tree)?;
+        link_referents(deferred_referents, &mut new_tree)?;
     } else {
         log::debug!("Skipping referent linking as per project syncback rules");
     }
diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index b6bfed333..85a1acca9 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -10,15 +10,11 @@ use rbx_dom_weak::{
 
 use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
 
-pub struct RefRewrites {
-    links: MultiMap<Ref, (String, Ref)>,
-}
-
 /// Iterates through a WeakDom and collects referent properties.
 ///
 /// They can be linked to a dom later using the `link` method on the returned
 /// struct.
-pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<RefRewrites> {
+pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, (String, Ref)>> {
     let mut links = MultiMap::new();
     let mut queue = VecDeque::new();
 
@@ -38,58 +34,65 @@ pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<RefRewrites> {
         }
     }
 
-    Ok(RefRewrites { links })
+    Ok(links)
 }
 
-impl RefRewrites {
-    /// Links referents for the provided DOM, using the links stored in this
-    /// struct.
-    pub fn link(self, dom: &mut WeakDom) -> anyhow::Result<()> {
-        let mut id_prop_list = Vec::new();
+pub fn link_referents(
+    link_list: MultiMap<Ref, (String, Ref)>,
+    dom: &mut WeakDom,
+) -> anyhow::Result<()> {
+    let mut id_prop_list = Vec::new();
 
-        for (pointer_ref, ref_properties) in self.links {
-            if dom.get_by_ref(pointer_ref).is_none() {
-                continue;
-            }
-
-            for (prop_name, target_ref) in ref_properties {
-                let target_inst = match dom.get_by_ref_mut(target_ref) {
-                    Some(inst) => inst,
-                    None => {
-                        continue;
-                    }
-                };
-                let target_attrs = get_or_insert_attributes(target_inst)?;
-                if target_attrs.get(REF_ID_ATTRIBUTE_NAME).is_none() {
-                    target_attrs.insert(
-                        REF_ID_ATTRIBUTE_NAME.to_owned(),
-                        Variant::String(target_ref.to_string()),
-                    );
-                }
+    for (pointer_ref, ref_properties) in link_list {
+        if dom.get_by_ref(pointer_ref).is_none() {
+            continue;
+        }
 
-                match target_attrs.get(REF_ID_ATTRIBUTE_NAME) {
-                    Some(Variant::String(id)) => id_prop_list.push((prop_name, id.clone())),
-                    Some(Variant::BinaryString(id)) => match std::str::from_utf8(id.as_ref()) {
-                        Ok(str) => id_prop_list.push((prop_name, str.to_string())),
-                        Err(_) => anyhow::bail!("expected attribute {REF_ID_ATTRIBUTE_NAME} to be a UTF-8 string")
-                    },
-                    Some(value) => anyhow::bail!("expected attribute {REF_ID_ATTRIBUTE_NAME} to be a string but it was a {:?}", value.ty()),
-                    None => unreachable!("{} should always be inserted as an attribute if it's missing", REF_ID_ATTRIBUTE_NAME),
+        for (prop_name, target_ref) in ref_properties {
+            let target_inst = match dom.get_by_ref_mut(target_ref) {
+                Some(inst) => inst,
+                None => {
+                    continue;
                 }
+            };
+            let target_attrs = get_or_insert_attributes(target_inst)?;
+            if target_attrs.get(REF_ID_ATTRIBUTE_NAME).is_none() {
+                target_attrs.insert(
+                    REF_ID_ATTRIBUTE_NAME.to_owned(),
+                    Variant::String(target_ref.to_string()),
+                );
             }
 
-            let pointer_inst = dom.get_by_ref_mut(pointer_ref).unwrap();
-            let pointer_attrs = get_or_insert_attributes(pointer_inst)?;
-            for (name, id) in id_prop_list.drain(..) {
-                pointer_attrs.insert(
-                    format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
-                    Variant::BinaryString(id.into_bytes().into()),
-                );
+            match target_attrs.get(REF_ID_ATTRIBUTE_NAME) {
+                Some(Variant::String(id)) => id_prop_list.push((prop_name, id.clone())),
+                Some(Variant::BinaryString(id)) => match std::str::from_utf8(id.as_ref()) {
+                    Ok(str) => id_prop_list.push((prop_name, str.to_string())),
+                    Err(_) => anyhow::bail!(
+                        "expected attribute {REF_ID_ATTRIBUTE_NAME} to be a UTF-8 string"
+                    ),
+                },
+                Some(value) => anyhow::bail!(
+                    "expected attribute {REF_ID_ATTRIBUTE_NAME} to be a string but it was a {:?}",
+                    value.ty()
+                ),
+                None => unreachable!(
+                    "{} should always be inserted as an attribute if it's missing",
+                    REF_ID_ATTRIBUTE_NAME
+                ),
             }
         }
 
-        Ok(())
+        let pointer_inst = dom.get_by_ref_mut(pointer_ref).unwrap();
+        let pointer_attrs = get_or_insert_attributes(pointer_inst)?;
+        for (name, id) in id_prop_list.drain(..) {
+            pointer_attrs.insert(
+                format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
+                Variant::BinaryString(id.into_bytes().into()),
+            );
+        }
     }
+
+    Ok(())
 }
 
 fn get_or_insert_attributes(inst: &mut Instance) -> anyhow::Result<&mut Attributes> {

From 30d894eab0175d8c26c79ff64f920985e7cc7b91 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 8 Apr 2024 09:52:27 -0700
Subject: [PATCH 277/366] Sort CSV by key instead of source (what was I
 cooking?)

---
 src/snapshot_middleware/csv.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 53f8eb7f0..8c0d5fa4d 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -257,7 +257,7 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
         serde_json::from_str(csv_contents).context("cannot decode JSON from localization table")?;
 
     // TODO sort this better
-    csv.sort_unstable_by(|a, b| a.source.partial_cmp(&b.source).unwrap());
+    csv.sort_unstable_by(|a, b| a.key.partial_cmp(&b.key).unwrap());
 
     let mut headers = vec!["Key", "Source", "Context", "Example"];
     // We want both order and a lack of duplicates, so we use a BTreeSet.

From 7ebb2b2e31807f747c7c55d15df550a754980083 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 9 Apr 2024 09:45:26 -0700
Subject: [PATCH 278/366] Add a shim to force UniqueId to deserialize

---
 src/cli/syncback.rs | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index dab91600b..fc35bf449 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -10,6 +10,7 @@ use clap::Parser;
 use fs_err::File;
 use memofs::Vfs;
 use rbx_dom_weak::{InstanceBuilder, WeakDom};
+use rbx_reflection::ReflectionDatabase;
 use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
 
 use crate::{
@@ -137,10 +138,19 @@ impl SyncbackCommand {
 fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
     let content = File::open(path)?;
     Ok(match file_kind {
-        FileKind::Rbxl => rbx_binary::from_reader(content)?,
+        FileKind::Rbxl => {
+            // HACK: A custom reflection database is used to deserialize UniqueId
+            let db = binary_db().expect("A custom ReflectionDatabase to deserialize UniqueId");
+            let binary_decoder = rbx_binary::Deserializer::new().reflection_database(&db);
+            binary_decoder.deserialize(content)?
+        }
         FileKind::Rbxlx => rbx_xml::from_reader(content, xml_decode_config())?,
         FileKind::Rbxm => {
-            let temp_tree = rbx_binary::from_reader(content)?;
+            // HACK: A custom reflection database is used to deserialize UniqueId
+            let db = binary_db().expect("A custom ReflectionDatabase to deserialize UniqueId");
+            let binary_decoder = rbx_binary::Deserializer::new().reflection_database(&db);
+            let temp_tree = binary_decoder.deserialize(content)?;
+
             let root_children = temp_tree.root().children();
             if root_children.len() != 1 {
                 anyhow::bail!(
@@ -176,6 +186,30 @@ fn xml_decode_config() -> rbx_xml::DecodeOptions<'static> {
     rbx_xml::DecodeOptions::new().property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown)
 }
 
+fn binary_db() -> Option<ReflectionDatabase<'static>> {
+    // HACK: UniqueId does not deserialize right now, so we force it to
+    use rbx_reflection::{PropertyKind, PropertySerialization};
+    use std::borrow::Cow;
+
+    let mut unique_id = rbx_reflection_database::get()
+        .classes
+        .get("Instance")?
+        .properties
+        .get("UniqueId")?
+        .clone();
+    unique_id.kind = PropertyKind::Canonical {
+        serialization: PropertySerialization::Serializes,
+    };
+
+    let mut db = rbx_reflection_database::get().clone();
+    let instance = db.classes.get_mut("Instance")?;
+    instance
+        .properties
+        .insert(Cow::Borrowed("UniqueId"), unique_id);
+
+    Some(db)
+}
+
 /// The different kinds of input that Rojo can syncback.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum FileKind {

From 2bc30356edae5b0397f0303d7d7909312a48a38f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 9 Apr 2024 09:46:02 -0700
Subject: [PATCH 279/366] Filter UniqueId out of JSON files

---
 src/syncback/property_filter.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index b8012bcea..4973eb3a7 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -35,7 +35,8 @@ pub fn filter_properties_preallocated<'inst>(
         .get(inst.class.as_str());
 
     let predicate = |prop_name: &String, prop_value: &Variant| {
-        if matches!(prop_value, Variant::Ref(_)) {
+        // We don't want to serialize Ref or UniqueId properties in JSON files
+        if matches!(prop_value, Variant::Ref(_) | Variant::UniqueId(_)) {
             return true;
         }
         if !sync_unscriptable {

From 8f363b2512a9c3f834d69bdea564f68a71a23f39 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 9 Apr 2024 09:46:37 -0700
Subject: [PATCH 280/366] Redo referent linking to prefer UniqueId to avoid
 spurious diffs

---
 src/syncback/ref_properties.rs | 92 ++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 85a1acca9..cc08267c3 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -1,7 +1,7 @@
 //! Implements iterating through an entire WeakDom and linking all Ref
 //! properties using attributes.
 
-use std::collections::VecDeque;
+use std::collections::{HashMap, VecDeque};
 
 use rbx_dom_weak::{
     types::{Attributes, Ref, Variant},
@@ -10,12 +10,21 @@ use rbx_dom_weak::{
 
 use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
 
+#[derive(PartialEq, Eq)]
+pub struct RefLink {
+    /// The name of a property
+    name: String,
+    /// The value of the property.
+    value: Ref,
+}
+
 /// Iterates through a WeakDom and collects referent properties.
 ///
 /// They can be linked to a dom later using the `link` method on the returned
 /// struct.
-pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, (String, Ref)>> {
+pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, RefLink>> {
     let mut links = MultiMap::new();
+
     let mut queue = VecDeque::new();
 
     // Note that this is back-in, front-out. This is important because
@@ -23,12 +32,18 @@ pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, (String,
     queue.push_back(dom.root_ref());
     while let Some(referent) = queue.pop_front() {
         let instance = dom.get_by_ref(referent).unwrap();
-
         queue.extend(instance.children().iter().copied());
+
         for (name, value) in &instance.properties {
             if let Variant::Ref(prop_value) = value {
                 if dom.get_by_ref(*prop_value).is_some() {
-                    links.insert(referent, (name.clone(), *prop_value))
+                    links.insert(
+                        referent,
+                        RefLink {
+                            name: name.clone(),
+                            value: *prop_value,
+                        },
+                    );
                 }
             }
         }
@@ -37,54 +52,28 @@ pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, (String,
     Ok(links)
 }
 
-pub fn link_referents(
-    link_list: MultiMap<Ref, (String, Ref)>,
-    dom: &mut WeakDom,
-) -> anyhow::Result<()> {
-    let mut id_prop_list = Vec::new();
-
+pub fn link_referents(link_list: MultiMap<Ref, RefLink>, dom: &mut WeakDom) -> anyhow::Result<()> {
+    let mut pointer_attributes = HashMap::new();
     for (pointer_ref, ref_properties) in link_list {
         if dom.get_by_ref(pointer_ref).is_none() {
             continue;
         }
 
-        for (prop_name, target_ref) in ref_properties {
-            let target_inst = match dom.get_by_ref_mut(target_ref) {
+        // In this loop, we need to add the `Rojo_Id` attributes to the
+        // Instances.
+        for ref_link in ref_properties {
+            let target_inst = match dom.get_by_ref_mut(ref_link.value) {
                 Some(inst) => inst,
                 None => {
                     continue;
                 }
             };
-            let target_attrs = get_or_insert_attributes(target_inst)?;
-            if target_attrs.get(REF_ID_ATTRIBUTE_NAME).is_none() {
-                target_attrs.insert(
-                    REF_ID_ATTRIBUTE_NAME.to_owned(),
-                    Variant::String(target_ref.to_string()),
-                );
-            }
-
-            match target_attrs.get(REF_ID_ATTRIBUTE_NAME) {
-                Some(Variant::String(id)) => id_prop_list.push((prop_name, id.clone())),
-                Some(Variant::BinaryString(id)) => match std::str::from_utf8(id.as_ref()) {
-                    Ok(str) => id_prop_list.push((prop_name, str.to_string())),
-                    Err(_) => anyhow::bail!(
-                        "expected attribute {REF_ID_ATTRIBUTE_NAME} to be a UTF-8 string"
-                    ),
-                },
-                Some(value) => anyhow::bail!(
-                    "expected attribute {REF_ID_ATTRIBUTE_NAME} to be a string but it was a {:?}",
-                    value.ty()
-                ),
-                None => unreachable!(
-                    "{} should always be inserted as an attribute if it's missing",
-                    REF_ID_ATTRIBUTE_NAME
-                ),
-            }
+            pointer_attributes.insert(ref_link.name, get_or_insert_id(target_inst)?);
         }
 
         let pointer_inst = dom.get_by_ref_mut(pointer_ref).unwrap();
         let pointer_attrs = get_or_insert_attributes(pointer_inst)?;
-        for (name, id) in id_prop_list.drain(..) {
+        for (name, id) in pointer_attributes.drain() {
             pointer_attrs.insert(
                 format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
                 Variant::BinaryString(id.into_bytes().into()),
@@ -109,3 +98,30 @@ fn get_or_insert_attributes(inst: &mut Instance) -> anyhow::Result<&mut Attribut
         None => unreachable!(),
     }
 }
+
+fn get_or_insert_id(inst: &mut Instance) -> anyhow::Result<String> {
+    let unique_id = match inst.properties.get("UniqueId") {
+        Some(Variant::UniqueId(id)) => Some(*id),
+        _ => None,
+    };
+    let referent = inst.referent();
+    let attributes = get_or_insert_attributes(inst)?;
+    match attributes.get(REF_ID_ATTRIBUTE_NAME) {
+        Some(Variant::String(str)) => return Ok(str.clone()),
+        Some(Variant::BinaryString(bytes)) => match std::str::from_utf8(bytes.as_ref()) {
+            Ok(str) => return Ok(str.to_string()),
+            Err(_) => {
+                anyhow::bail!("expected attribute {REF_ID_ATTRIBUTE_NAME} to be a UTF-8 string")
+            }
+        },
+        _ => {}
+    }
+    let id_string = unique_id
+        .map(|id| id.to_string())
+        .unwrap_or_else(|| referent.to_string());
+    attributes.insert(
+        REF_ID_ATTRIBUTE_NAME.to_string(),
+        Variant::BinaryString(id_string.clone().into_bytes().into()),
+    );
+    Ok(id_string)
+}

From 1be311d6443816ae1d9c971845c78d5b6a9c4649 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 11:32:11 -0700
Subject: [PATCH 281/366] Add shim reflection database to syncback tests for
 deserializing UniqueId

---
 tests/rojo_test/syncback_util.rs | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 072d95b4d..615015645 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -4,6 +4,7 @@ use anyhow::Context;
 use insta::assert_yaml_snapshot;
 use librojo::{snapshot_from_vfs, syncback_loop, FsSnapshot, InstanceContext, Project, RojoTree};
 use memofs::{InMemoryFs, IoResultExt, Vfs, VfsSnapshot};
+use rbx_reflection::ReflectionDatabase;
 use serde::Serialize;
 
 use crate::rojo_test::io_util::SYNCBACK_TESTS_PATH;
@@ -34,7 +35,10 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
     };
     im_vfs.set_watch_enabled(false);
 
-    let input_dom = rbx_binary::from_reader(std_vfs.read(input_path)?.as_slice())?;
+    let database = database_shim().unwrap();
+    let deserializer = rbx_binary::Deserializer::new().reflection_database(&database);
+    let input_dom = deserializer.deserialize(std_vfs.read(input_path)?.as_slice())?;
+
     let (mut output_dom, project) =
         rojo_tree_from_path(&std_vfs, &output_path.join("default.project.json"))?;
 
@@ -138,6 +142,30 @@ fn to_vfs_snapshot(vfs: &Vfs, path: &Path) -> anyhow::Result<VfsSnapshot> {
     }
 }
 
+fn database_shim() -> Option<ReflectionDatabase<'static>> {
+    // HACK: UniqueId does not deserialize right now, so we force it to
+    // Don't forget to change this in the syncback CLI when changing it here.
+    use rbx_reflection::{PropertyKind, PropertySerialization};
+
+    let mut unique_id = rbx_reflection_database::get()
+        .classes
+        .get("Instance")?
+        .properties
+        .get("UniqueId")?
+        .clone();
+    unique_id.kind = PropertyKind::Canonical {
+        serialization: PropertySerialization::Serializes,
+    };
+
+    let mut db = rbx_reflection_database::get().clone();
+    let instance = db.classes.get_mut("Instance")?;
+    instance
+        .properties
+        .insert(Cow::Borrowed("UniqueId"), unique_id);
+
+    Some(db)
+}
+
 /// Normalizes the line endings of a vector if it's user-readable.
 /// If it isn't, the vector is returned unmodified.
 fn normalize_line_endings(input: &Vec<u8>) -> Cow<Vec<u8>> {

From e76cb4925e859cbd02f10eacb2d22e1ae7b8a4a0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 11:32:45 -0700
Subject: [PATCH 282/366] Add note to syncback CLI file to update test shim
 when updating CLI shim

---
 src/cli/syncback.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index fc35bf449..d8782fac7 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -188,6 +188,7 @@ fn xml_decode_config() -> rbx_xml::DecodeOptions<'static> {
 
 fn binary_db() -> Option<ReflectionDatabase<'static>> {
     // HACK: UniqueId does not deserialize right now, so we force it to
+    // Don't forget to change this in the syncback test when changing it here.
     use rbx_reflection::{PropertyKind, PropertySerialization};
     use std::borrow::Cow;
 

From 80079ea2f741b2caa0710b25c5060297446ddad1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 11:33:23 -0700
Subject: [PATCH 283/366] Make Value objects syncback as JsonModel

---
 src/syncback/mod.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 51fb119ee..3432a9700 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -269,10 +269,9 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
             "LocalScript" => Middleware::ClientScript,
             "ModuleScript" => Middleware::ModuleScript,
             "LocalizationTable" => Middleware::Csv,
-            _ => match env::var(DEBUG_MODEL_FORMAT_VAR) {
-                Ok(value) if value == "1" => Middleware::Rbxmx,
-                _ => Middleware::Rbxm,
-            },
+            // This isn't the ideal way to handle this but it works.
+            name if name.ends_with("Value") => Middleware::JsonModel,
+            _ => Middleware::Rbxmx,
         }
     }
 

From 74c77197b9e0e63ac9bf4aac6d3c36c5a548bdd9 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 11:40:31 -0700
Subject: [PATCH 284/366] Correctly default to rbxm instead of rbxmx

---
 src/syncback/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 3432a9700..7269b05e5 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -271,7 +271,7 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
             "LocalizationTable" => Middleware::Csv,
             // This isn't the ideal way to handle this but it works.
             name if name.ends_with("Value") => Middleware::JsonModel,
-            _ => Middleware::Rbxmx,
+            _ => Middleware::Rbxm,
         }
     }
 

From 9dbab3a5a6536211b8b928742dedc3131393e13c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 11:56:05 -0700
Subject: [PATCH 285/366] Add test for generating ref properties from scratch
 using UniqueId

---
 ...__syncback_util__ref_properties_blank.snap |  17 ++++++++++++++
 .../expected/default.project.json             |  21 ++++++++++++++++++
 .../expected/src/Camera.rbxm                  | Bin 0 -> 866 bytes
 .../expected/src/Terrain.rbxm                 | Bin 0 -> 3046 bytes
 .../expected/src/pointer.model.json           |   6 +++++
 .../expected/src/target.meta.json             |   5 +++++
 .../expected/src/target.txt                   |   1 +
 .../ref_properties_blank/input.rbxl           | Bin 0 -> 46717 bytes
 .../output/default.project.json               |   9 ++++++++
 .../ref_properties_blank/output/src/.gitkeep  |   0
 tests/tests/syncback.rs                       |   1 +
 11 files changed, 60 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/expected/src/Camera.rbxm
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/expected/src/Terrain.rbxm
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/expected/src/pointer.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/expected/src/target.meta.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/expected/src/target.txt
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_blank/output/src/.gitkeep

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap
new file mode 100644
index 000000000..8c06e3f64
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap
@@ -0,0 +1,17 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - "src\\Camera.rbxm"
+  - "src\\Terrain.rbxm"
+  - "src\\pointer.model.json"
+  - "src\\target.meta.json"
+  - "src\\target.txt"
+added_dirs:
+  - src
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json b/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
new file mode 100644
index 000000000..d85e317e3
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
@@ -0,0 +1,21 @@
+{
+  "name": "ref_properties_blank",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "StreamingEnabled": true
+      },
+      "$attributes": {
+        "Rojo_Target_CurrentCamera": "62e89c49e4f800c20629c71b00003fcb"
+      },
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/Camera.rbxm b/rojo-test/syncback-tests/ref_properties_blank/expected/src/Camera.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..a232aadfb85c2cb7e85cdfa3f49e8affb0aaae28
GIT binary patch
literal 866
zcmZuw+iuf95M5g?mqKZQic5hu{Q^RWN+T+os7)Xeq*ZL?wX)Y6v}K8l?TE_@L5K&w
zieKO_c;R9H0M1z#T2ziSGdsJ-vvXN*<ym5~ck5q&EzGaX3*m`MU>y2`FuIM^&12tQ
z;Nl!)Cw{H+*nPmQ{o&sJ2sWYv*e>;TNT)1wolHwrgeupu(I1r8#6GV&4;f~M*+D<`
zYglhI)MiUITdFzUtk-3uzR_sOM-P%Z@Ng^>-tri{HiWQq)GnP~j)a!r&9;|?xF|#*
z-pu`Yx*hynTNZ8TZ#Y~Pv(IfIC=7KM^c4tUFHtW*s>;G?a;Rj<3OsVpb^+}==0@+2
z)HQf6=o;)jI)J@GeHpS7AH|6_y40#z=O)3pXX(6hSB>>V6{o-Q9i8dk;<tcBl|nG@
zo>nH^8;`Vl8+^er1FvGA1rnBZiABgM=8G&n$(qbNBmvfGwzikaX|d!liW#>)wX0U#
zz#2Vvs3yQxJX3M{Jd>|f>br(9OEL+|L31dM70TGC;3K^MH#We@0MqnN-WiECY_llB
zvKBY3Fq`I5b&5ij{q#=-E&=xODrtcAsTnwmUlx3N?(Q1wzad%IXc%czb|&dCGp0L<
i6N8$-A4D9dYbEUWzi%Io*B$J_R5j9W-LL+vC%*x4Wsv9q

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/Terrain.rbxm b/rojo-test/syncback-tests/ref_properties_blank/expected/src/Terrain.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..1b8ba7c5927eab56b4879ddd4a93498fdddc9db5
GIT binary patch
literal 3046
zcma)8&2Jk;6kj_oAEgN?w2+1`7a=%;6b>A!s*dv^mn3y!lfntcyR-4q&5koO8|tbF
zv_e5eNc7M{&LG5vKY}|*AnvFaIB{9Tg$tPXn~m3A?<VF+v$G$+dHX(o@6BA2qUDR5
z7w`2ZPtTsVtb!E}nvB%e8qHa{n>l)p9>>k2G@4vW<^^U2-qkm*)yp)$hzFABNnFp;
zsMtH9r#$V6V3q5(aGt^!;Lp))9%zmx@b)npmB4Nb$(>>Wn3w5InFb_+I_qf~6|JS$
z3N=>^E<NUZw>V5US})N2EFMTAD745iYo6IR>P)ijN@<^bgz7QCc>s;ZYy_S-(%1;4
z%WR%_^b);)fd(X+!gZPk{(Xe31)WeQ@aO0wtbjzY(mF$9UT7`0M~oc{9hmz(>43?Q
z2$outG-9no2A2?ni}VFXLn7E}5|YBEO@?>)0VFape}wL;OB7i?U7WT)!3PMmKSMK;
z42e$R3MZ>9s0!cr93H1Qp9X|l54r4)!8Ao^w_{8;_=skeby&;uiGN(dTO%hKr*xyu
z9Pv@C^cBK`gOCW+vyfI}zamC2OA&SoD2N5_ve4JioHYcIO|PjrhVX!Ad5EMDT*$f5
z3-nvFUw`!tfLU8mm(@^#F72-JZ06Uc=x_;VFPxBq1#Sz;P?E=m4z7|*Ucl9G1dB!~
zNB}}YA_UnK`eMLZK40=f&sh@E<|@{mUp-4w1bT$y<B$W2=U0Q#ImB>dYniOeHl<-`
zn&A0HEK8=;3J<n)yR`4RZhqdt?iKEi`jt&^3OH~p|KHF!>Qz3)hLCBe&~Z$4(>$o!
z6=C1#_u2d+TqUo4u2h_Mbk*}TAQ8&m^y^ioO%JAj6imcFpbr?3c*8)+^kIhAs<1d?
z6^d5$hS<OS?t7buhliiD+D|`x``rWIcHCco`~8o9dJk^D-|e*CzIyeGyY1dgwcczV
z9PIx1%fk;3uJn5U_Wt_*%ln@p53iDT49K5mgF?Xj|J!7=K?J%nY2Bw?!b!G?Y^+PP
zYK_{MDd(g84f<cB_kI0wKSh1U1*ev!=M>;yabh;z{LnS}4JVG4S?28uea&?h*VD!G
z=@nU%uwsL|KDRXsYz_-eh>t;fTkTQqjYAH|mtRvG&^gM!GMSOBsbOfEe#fX5Lf54y
zq^G+{GepFo9ujXECI&)pa$neloH~~d8th0mBy4nM2W#L6;iG%K)7g^D>C-%G31X^<
z8B_OqmUZyAWno6zvrtrRW1FmQo2(b<v2Y5|GTo))fpUtWo8l(-2UZ-@lVEs5gw!=F
zil|X@@OOwgsh}B~vk%P?erv(%Cfia8ov{;OyM;v9k1SL|Q*=gp?8&$R8}fS==^Nt0
z1bolNA1A*7@c%HODOsR8O!C0)CLD+2<Sb>J#$hg@!Pztoz#BA0NPLh%wyvW$nT~Vj
z)}1?_?yawH?CtDG*qz@&&4S^I`<S%krx*z_@Rap?b8~M3pMMB5`0H$!H;8ei+eg^!
sc8Z2Fz;-xyN_VfokhLa08Jg4lb8`Hqhr;680!?w^F<*K;KHXpb4_;$4ga7~l

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties_blank/expected/src/pointer.model.json
new file mode 100644
index 000000000..7e5a0daf4
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_blank/expected/src/pointer.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Target_Value": "62e89c49e4f800c20629c71b00003fc0"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/target.meta.json b/rojo-test/syncback-tests/ref_properties_blank/expected/src/target.meta.json
new file mode 100644
index 000000000..4c315c149
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_blank/expected/src/target.meta.json
@@ -0,0 +1,5 @@
+{
+  "attributes": {
+    "Rojo_Id": "62e89c49e4f800c20629c71b00003fc0"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/target.txt b/rojo-test/syncback-tests/ref_properties_blank/expected/src/target.txt
new file mode 100644
index 000000000..fbe2becee
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_blank/expected/src/target.txt
@@ -0,0 +1 @@
+monkey academy decade powder warn
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_blank/input.rbxl b/rojo-test/syncback-tests/ref_properties_blank/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..8cfa1a0801b58ccadec96161965f359e26593af0
GIT binary patch
literal 46717
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
X{yB4gLj8?HBE9%*;4d`&>o5Obdsn-D

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ref_properties_blank/output/default.project.json b/rojo-test/syncback-tests/ref_properties_blank/output/default.project.json
new file mode 100644
index 000000000..1fea24fa2
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_blank/output/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "ref_properties_blank",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_blank/output/src/.gitkeep b/rojo-test/syncback-tests/ref_properties_blank/output/src/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index c7b4c4c1c..c1a90cff9 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -21,4 +21,5 @@ syncback_basic_test! {
     all_middleware,
     ref_properties,
     rbxm_fallback
+    ref_properties_blank
 }

From 82fcbf0d2ec83da048f00dd5e7debb1ae74d32c7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 12:16:07 -0700
Subject: [PATCH 286/366] Reorganize test order

---
 tests/tests/syncback.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index c1a90cff9..c9a47ecc0 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -13,13 +13,13 @@ macro_rules! syncback_basic_test {
 
 syncback_basic_test! {
     baseplate,
+    all_middleware,
+    unscriptable_properties,
     respect_old_middleware,
+    rbxm_fallback
+    project_init,
     nested_projects,
-    unscriptable_properties,
     nested_projects_weird,
-    project_init,
-    all_middleware,
     ref_properties,
-    rbxm_fallback
-    ref_properties_blank
+    ref_properties_blank,
 }

From 6e3ed796bb812b4bf51c1c55b5d273810ddbd5ef Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 12:28:07 -0700
Subject: [PATCH 287/366] Add test for updating referent properties on files
 that already exists

---
 ...t__syncback_util__ref_properties_update.snap |  14 ++++++++++++++
 .../expected/default.project.json               |   9 +++++++++
 .../expected/src/pointer.model.json             |   6 ++++++
 .../expected/src/target.model.json              |   9 +++++++++
 .../ref_properties_update/input.rbxl            | Bin 0 -> 53629 bytes
 .../output/default.project.json                 |   9 +++++++++
 .../output/src/pointer.model.json               |   3 +++
 .../output/src/target.model.json                |   6 ++++++
 tests/tests/syncback.rs                         |   1 +
 9 files changed, 57 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/output/src/pointer.model.json
 create mode 100644 rojo-test/syncback-tests/ref_properties_update/output/src/target.model.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
new file mode 100644
index 000000000..b422e9982
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
@@ -0,0 +1,14 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - "src\\pointer.model.json"
+  - "src\\target.model.json"
+added_dirs:
+  - src
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/default.project.json b/rojo-test/syncback-tests/ref_properties_update/expected/default.project.json
new file mode 100644
index 000000000..e06128c37
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "ref_properties_update",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
new file mode 100644
index 000000000..f892b48e3
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Target_Value": "27fbd83abe5d90db0629ccfd00003f79"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json b/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
new file mode 100644
index 000000000..a8277ed4e
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
@@ -0,0 +1,9 @@
+{
+  "className": "BoolValue",
+  "properties": {
+    "Value": true
+  },
+  "attributes": {
+    "Rojo_Id": "27fbd83abe5d90db0629ccfd00003f79"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/input.rbxl b/rojo-test/syncback-tests/ref_properties_update/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..570317ee8c94e04275d8308210d5072a5a1310cd
GIT binary patch
literal 53629
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
I{43A?UpL=^XaE2J

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ref_properties_update/output/default.project.json b/rojo-test/syncback-tests/ref_properties_update/output/default.project.json
new file mode 100644
index 000000000..e06128c37
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_update/output/default.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "ref_properties_update",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/output/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties_update/output/src/pointer.model.json
new file mode 100644
index 000000000..54160c22c
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_update/output/src/pointer.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "ObjectValue"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/output/src/target.model.json b/rojo-test/syncback-tests/ref_properties_update/output/src/target.model.json
new file mode 100644
index 000000000..c8a885a33
--- /dev/null
+++ b/rojo-test/syncback-tests/ref_properties_update/output/src/target.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "BoolValue",
+  "properties": {
+    "Value": true
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index c9a47ecc0..6d4d74110 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -22,4 +22,5 @@ syncback_basic_test! {
     nested_projects_weird,
     ref_properties,
     ref_properties_blank,
+    ref_properties_update,
 }

From 7d242c632d094d7db76708de38cc3926cfabecba Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 12:28:34 -0700
Subject: [PATCH 288/366] Reorder referent linking so that hashing takes place
 after it happens

---
 src/syncback/mod.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 7269b05e5..9814fa78c 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -49,12 +49,12 @@ pub fn syncback_loop(
     mut new_tree: WeakDom,
     project: &Project,
 ) -> anyhow::Result<FsSnapshot> {
-    log::debug!("Collecting referents for new DOM...");
-    let deferred_referents = collect_referents(&new_tree)?;
-
     log::debug!("Pruning new tree");
     strip_unknown_root_children(&mut new_tree, old_tree);
 
+    log::debug!("Collecting referents for new DOM...");
+    let deferred_referents = collect_referents(&new_tree)?;
+
     log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
         let new_inst = new_tree.get_by_ref_mut(referent).unwrap();
@@ -73,12 +73,6 @@ pub fn syncback_loop(
             }
         }
     }
-
-    log::debug!("Hashing project DOM");
-    let old_hashes = hash_tree(project, old_tree.inner(), old_tree.get_root_id());
-    log::debug!("Hashing file DOM");
-    let new_hashes = hash_tree(project, &new_tree, new_tree.root_ref());
-
     if let Some(syncback_rules) = &project.syncback_rules {
         if !syncback_rules.sync_current_camera.unwrap_or_default() {
             log::debug!("Removing CurrentCamera from new DOM");
@@ -109,6 +103,11 @@ pub fn syncback_loop(
         log::debug!("Skipping referent linking as per project syncback rules");
     }
 
+    log::debug!("Hashing project DOM");
+    let old_hashes = hash_tree(project, old_tree.inner(), old_tree.get_root_id());
+    log::debug!("Hashing file DOM");
+    let new_hashes = hash_tree(project, &new_tree, new_tree.root_ref());
+
     let project_path = project.folder_location();
 
     let syncback_data = SyncbackData {

From ed748dcd44a80c0515a4a0a155e8210caab4fef6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 15:53:27 -0700
Subject: [PATCH 289/366] Add test for ignore_paths

---
 ...ojo_test__syncback_util__ignore_paths.snap |  13 ++++++++++
 .../expected/default.project.json             |  24 ++++++++++++++++++
 .../expected/src/integer.model.json           |   6 +++++
 .../syncback-tests/ignore_paths/input.rbxl    | Bin 0 -> 47445 bytes
 .../ignore_paths/output/default.project.json  |  15 +++++++++++
 .../expected/src/pointer.model.json           |   5 +---
 .../expected/src/target.model.json            |   3 ---
 tests/tests/syncback.rs                       |   1 +
 8 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap
 create mode 100644 rojo-test/syncback-tests/ignore_paths/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_paths/expected/src/integer.model.json
 create mode 100644 rojo-test/syncback-tests/ignore_paths/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ignore_paths/output/default.project.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap
new file mode 100644
index 000000000..8bc7e628c
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap
@@ -0,0 +1,13 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - "src\\integer.model.json"
+added_dirs:
+  - src
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/ignore_paths/expected/default.project.json b/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
new file mode 100644
index 000000000..cd71f0570
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
@@ -0,0 +1,24 @@
+{
+  "name": "ignore_paths",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "StreamingEnabled": true
+      },
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignorePaths": [
+      "src/*.rbxm",
+      "src/folder_name/**"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_paths/expected/src/integer.model.json b/rojo-test/syncback-tests/ignore_paths/expected/src/integer.model.json
new file mode 100644
index 000000000..2e88fdf43
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths/expected/src/integer.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "IntValue",
+  "properties": {
+    "Value": 1337.0
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_paths/input.rbxl b/rojo-test/syncback-tests/ignore_paths/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..028cbe82641aa8fe247f738ddfe100c8d59b8e46
GIT binary patch
literal 47445
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
G(*Ff4Fhk-1

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ignore_paths/output/default.project.json b/rojo-test/syncback-tests/ignore_paths/output/default.project.json
new file mode 100644
index 000000000..0fb6c0782
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths/output/default.project.json
@@ -0,0 +1,15 @@
+{
+  "name": "ignore_paths",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignorePaths": [
+      "src/*.rbxm",
+      "src/folder_name/**"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
index f892b48e3..54160c22c 100644
--- a/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
@@ -1,6 +1,3 @@
 {
-  "className": "ObjectValue",
-  "attributes": {
-    "Rojo_Target_Value": "27fbd83abe5d90db0629ccfd00003f79"
-  }
+  "className": "ObjectValue"
 }
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json b/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
index a8277ed4e..c8a885a33 100644
--- a/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
@@ -2,8 +2,5 @@
   "className": "BoolValue",
   "properties": {
     "Value": true
-  },
-  "attributes": {
-    "Rojo_Id": "27fbd83abe5d90db0629ccfd00003f79"
   }
 }
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 6d4d74110..529cf7e09 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -23,4 +23,5 @@ syncback_basic_test! {
     ref_properties,
     ref_properties_blank,
     ref_properties_update,
+    ignore_paths,
 }

From 7f091de96382da922f5bcd11c741c96b74a58ef7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 16:01:56 -0700
Subject: [PATCH 290/366] Add ignore_path UX to make globs also ignore a
 directory

---
 src/syncback/mod.rs      | 64 ++++++++++++++++++++++++++++++++++++++--
 src/syncback/snapshot.rs | 39 ------------------------
 2 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 9814fa78c..7242ba90e 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
 use std::{
     collections::{HashMap, HashSet, VecDeque},
     env,
+    path::Path,
     sync::OnceLock,
 };
 
@@ -43,12 +44,21 @@ pub use snapshot::{SyncbackData, SyncbackSnapshot};
 /// new files.
 const DEBUG_MODEL_FORMAT_VAR: &str = "ROJO_SYNCBACK_DEBUG";
 
+/// A glob that can be used to tell if a path contains a `.git` folder.
+static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
+
 pub fn syncback_loop(
     vfs: &Vfs,
     old_tree: &mut RojoTree,
     mut new_tree: WeakDom,
     project: &Project,
 ) -> anyhow::Result<FsSnapshot> {
+    let ignore_patterns = project
+        .syncback_rules
+        .as_ref()
+        .map(|rules| rules.compile_globs())
+        .transpose()?;
+
     log::debug!("Pruning new tree");
     strip_unknown_root_children(&mut new_tree, old_tree);
 
@@ -146,7 +156,7 @@ pub fn syncback_loop(
             }
         }
 
-        if !snapshot.is_valid_path(project_path, &snapshot.path) {
+        if !is_valid_path(&ignore_patterns, project_path, &snapshot.path) {
             log::debug!("Skipping {inst_path} because its path matches ignore pattern");
             continue;
         }
@@ -305,7 +315,7 @@ pub struct SyncbackRules {
     /// A list of patterns to check against the path an Instance would serialize
     /// to. If a path matches one of these, the Instance won't be syncbacked.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    ignore_paths: Vec<Glob>,
+    ignore_paths: Vec<String>,
     /// A map of classes to properties to ignore for that class when doing
     /// syncback.
     #[serde(default, skip_serializing_if = "HashMap::is_empty")]
@@ -322,6 +332,56 @@ pub struct SyncbackRules {
     /// during syncback. Defaults to `false`.
     #[serde(skip_serializing_if = "Option::is_none")]
     ignore_referents: Option<bool>,
+    /// Whether the globs specified in `ignore_paths` should be modified to also
+    /// match directories. Defaults to `true`.
+    ///
+    /// If this is `true`, it'll take ignore globs that end in `/**` and convert
+    /// them to also handle the directory they're referring to. This is
+    /// generally a better UX.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    create_ignore_dir_paths: Option<bool>,
+}
+
+impl SyncbackRules {
+    pub fn compile_globs(&self) -> anyhow::Result<Vec<Glob>> {
+        let mut globs = Vec::with_capacity(self.ignore_paths.len());
+        let dir_ignore_paths = self.create_ignore_dir_paths.unwrap_or(true);
+
+        for pattern in &self.ignore_paths {
+            let glob = Glob::new(pattern)
+                .with_context(|| format!("the pattern '{pattern}' is not a valid glob"))?;
+            globs.push(glob);
+
+            if dir_ignore_paths {
+                if let Some(dir_pattern) = pattern.strip_suffix("/**") {
+                    if let Ok(glob) = Glob::new(dir_pattern) {
+                        globs.push(glob)
+                    }
+                }
+            }
+        }
+
+        Ok(globs)
+    }
+}
+
+fn is_valid_path(globs: &Option<Vec<Glob>>, base_path: &Path, path: &Path) -> bool {
+    let git_glob = GIT_IGNORE_GLOB.get_or_init(|| Glob::new(".git/**").unwrap());
+    let test_path = match path.strip_prefix(base_path) {
+        Ok(suffix) => suffix,
+        Err(_) => path,
+    };
+    if git_glob.is_match(test_path) {
+        return false;
+    }
+    if let Some(ref ignore_paths) = globs {
+        for glob in ignore_paths {
+            if glob.is_match(test_path) {
+                return false;
+            }
+        }
+    }
+    true
 }
 
 /// Returns a set of properties that should not be written with syncback if
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index eade178cf..5fbdce738 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -2,7 +2,6 @@ use memofs::Vfs;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
-    sync::OnceLock,
 };
 
 use crate::{
@@ -18,9 +17,6 @@ use rbx_dom_weak::{
 
 use super::{get_best_middleware, name_for_inst, property_filter::filter_properties};
 
-/// A glob that can be used to tell if a path contains a `.git` folder.
-static GIT_IGNORE_GLOB: OnceLock<Glob> = OnceLock::new();
-
 #[derive(Clone, Copy)]
 pub struct SyncbackData<'sync> {
     pub(super) vfs: &'sync Vfs,
@@ -127,31 +123,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
         Some(properties)
     }
 
-    /// Returns whether a given path is allowed for syncback by matching `path`
-    /// against every user specified glob for ignoring.
-    ///
-    /// If the provided `path` is absolute, it has `base_path` stripped from it
-    /// to allow globs to operate as if it were local.
-    #[inline]
-    pub fn is_valid_path(&self, base_path: &Path, path: &Path) -> bool {
-        let git_glob = GIT_IGNORE_GLOB.get_or_init(|| Glob::new(".git/**").unwrap());
-        let test_path = match path.strip_prefix(base_path) {
-            Ok(suffix) => suffix,
-            Err(_) => path,
-        };
-        if git_glob.is_match(test_path) {
-            return false;
-        }
-        if let Some(ignore_paths) = self.ignore_paths() {
-            for glob in ignore_paths {
-                if glob.is_match(test_path) {
-                    return false;
-                }
-            }
-        }
-        true
-    }
-
     /// Returns a path to the provided Instance in the new DOM. This path is
     /// where you would look for the object in Roblox Studio.
     #[inline]
@@ -233,16 +204,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
             .map(|rules| &rules.ignore_properties)
     }
 
-    /// Returns user-specified ignore paths.
-    #[inline]
-    pub fn ignore_paths(&self) -> Option<&[Glob]> {
-        self.data
-            .project
-            .syncback_rules
-            .as_ref()
-            .map(|rules| rules.ignore_paths.as_slice())
-    }
-
     /// Returns user-specified ignore tree.
     #[inline]
     pub fn ignore_tree(&self) -> Option<&[String]> {

From ce8a93f0fa9344b66c7c0b2c4a9d1bb8eaa586fc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 11 Apr 2024 16:04:14 -0700
Subject: [PATCH 291/366] Update ref_properties_update expected result

---
 .../ref_properties_update/expected/src/pointer.model.json    | 5 ++++-
 .../ref_properties_update/expected/src/target.model.json     | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
index 54160c22c..f892b48e3 100644
--- a/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/src/pointer.model.json
@@ -1,3 +1,6 @@
 {
-  "className": "ObjectValue"
+  "className": "ObjectValue",
+  "attributes": {
+    "Rojo_Target_Value": "27fbd83abe5d90db0629ccfd00003f79"
+  }
 }
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json b/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
index c8a885a33..a8277ed4e 100644
--- a/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
+++ b/rojo-test/syncback-tests/ref_properties_update/expected/src/target.model.json
@@ -2,5 +2,8 @@
   "className": "BoolValue",
   "properties": {
     "Value": true
+  },
+  "attributes": {
+    "Rojo_Id": "27fbd83abe5d90db0629ccfd00003f79"
   }
 }
\ No newline at end of file

From 215879a1ce5e3b59d93b416023589f101c5fc41c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Apr 2024 15:42:05 -0700
Subject: [PATCH 292/366] Rename root of new_tree to use project name

---
 src/syncback/mod.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 7242ba90e..4faea9b5a 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -113,6 +113,8 @@ pub fn syncback_loop(
         log::debug!("Skipping referent linking as per project syncback rules");
     }
 
+    new_tree.root_mut().name = project.name.clone();
+
     log::debug!("Hashing project DOM");
     let old_hashes = hash_tree(project, old_tree.inner(), old_tree.get_root_id());
     log::debug!("Hashing file DOM");

From d3d0c537f996c9e52ec12648a1937bc2be2f6de6 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Apr 2024 15:42:56 -0700
Subject: [PATCH 293/366] Add test for project reserialization

---
 ...t__syncback_util__project_reserialize.snap |  10 +++++++++
 .../expected/default.project.json             |  20 ++++++++++++++++++
 .../project_reserialize/input.rbxl            | Bin 0 -> 52736 bytes
 .../output/default.project.json               |  20 ++++++++++++++++++
 tests/tests/syncback.rs                       |   1 +
 5 files changed, 51 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
 create mode 100644 rojo-test/syncback-tests/project_reserialize/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/project_reserialize/input.rbxl
 create mode 100644 rojo-test/syncback-tests/project_reserialize/output/default.project.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
new file mode 100644
index 000000000..064b7de16
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
@@ -0,0 +1,10 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files: []
+added_dirs: []
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
new file mode 100644
index 000000000..47f46558c
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
@@ -0,0 +1,20 @@
+{
+  "name": "project_reserialize",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "StreamingEnabled": true
+      },
+      "$attributes": {
+        "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/input.rbxl b/rojo-test/syncback-tests/project_reserialize/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..acf36f710acede17522dd082ee030414eab39d4d
GIT binary patch
literal 52736
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
E1$^1sJpcdz

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/project_reserialize/output/default.project.json b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
new file mode 100644
index 000000000..47f46558c
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
@@ -0,0 +1,20 @@
+{
+  "name": "project_reserialize",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "StreamingEnabled": true
+      },
+      "$attributes": {
+        "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 529cf7e09..5f080cb23 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -24,4 +24,5 @@ syncback_basic_test! {
     ref_properties_blank,
     ref_properties_update,
     ignore_paths,
+    project_reserialize,
 }

From d352cbfbb489fbd831c7b697dd7e41178dd88b0e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Apr 2024 11:45:30 -0700
Subject: [PATCH 294/366] Remove unnecesary import

---
 src/syncback/snapshot.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 5fbdce738..702c023f4 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -5,7 +5,6 @@ use std::{
 };
 
 use crate::{
-    glob::Glob,
     snapshot::{InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     Project,

From e84ce7aa07d02392bd6fd58f542f6cc2e6d5fa6b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Apr 2024 12:00:35 -0700
Subject: [PATCH 295/366] Initial attempt at preventing project files from
 reserializing when they don't have to

---
 src/snapshot_middleware/project.rs | 60 +++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 4009a0289..091e39519 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -21,6 +21,7 @@ use crate::{
     },
     snapshot_middleware::Middleware,
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    variant_eq::variant_eq,
     RojoRef,
 };
 
@@ -341,6 +342,7 @@ pub fn syncback_project<'sync>(
     let mut old_child_map = HashMap::new();
     let mut new_child_map = HashMap::new();
 
+    let mut node_changed_map = Vec::new();
     let mut node_queue = VecDeque::with_capacity(1);
     node_queue.push_back((&mut project.tree, old_inst, snapshot.new_inst()));
 
@@ -511,12 +513,20 @@ pub fn syncback_project<'sync>(
             }
         }
         removed_descendants.extend(old_child_map.drain().map(|(_, v)| v));
+        node_changed_map.push((&node.properties, &node.attributes, old_inst))
+    }
+    let mut fs_snapshot = FsSnapshot::new();
+
+    for (node_properties, node_attributes, old_inst) in node_changed_map {
+        if project_node_should_reserialize(node_properties, node_attributes, old_inst)? {
+            fs_snapshot.add_file(project_path, serde_json::to_vec_pretty(&project)?);
+            break;
+        }
     }
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
-        fs_snapshot: FsSnapshot::new()
-            .with_added_file(project_path, serde_json::to_vec_pretty(&project)?),
+        fs_snapshot,
         children: descendant_snapshots,
         removed_children: removed_descendants,
     })
@@ -548,6 +558,52 @@ fn syncback_project_node<'sync>(
         .middleware(middleware))
 }
 
+fn project_node_should_reserialize(
+    node_properties: &BTreeMap<String, UnresolvedValue>,
+    node_attributes: &BTreeMap<String, UnresolvedValue>,
+    instance: InstanceWithMeta,
+) -> anyhow::Result<bool> {
+    for (prop_name, unresolved_node_value) in node_properties {
+        if let Some(inst_value) = instance.properties().get(prop_name) {
+            let node_value = unresolved_node_value
+                .clone()
+                .resolve(instance.name(), prop_name)?;
+            if !variant_eq(inst_value, &node_value) {
+                return Ok(true);
+            }
+        } else {
+            return Ok(true);
+        }
+    }
+
+    match instance.properties().get("Attributes") {
+        Some(Variant::Attributes(inst_attributes)) => {
+            // This will also catch if one is empty but the other isn't
+            if node_attributes.len() != inst_attributes.len() {
+                Ok(true)
+            } else {
+                for (attr_name, unresolved_node_value) in node_attributes {
+                    if let Some(inst_value) = inst_attributes.get(attr_name.as_str()) {
+                        let node_value = unresolved_node_value.clone().resolve_unambiguous()?;
+                        if !variant_eq(inst_value, &node_value) {
+                            return Ok(true);
+                        }
+                    }
+                }
+                Ok(false)
+            }
+        }
+        Some(_) => Ok(true),
+        None => {
+            if !node_attributes.is_empty() {
+                Ok(true)
+            } else {
+                Ok(false)
+            }
+        }
+    }
+}
+
 fn infer_class_name(name: &str, parent_class: Option<&str>) -> Option<Cow<'static, str>> {
     // If className wasn't defined from another source, we may be able
     // to infer one.

From 3dd94f63bb0e07a7f8532ab7e14ace1ce6e8991c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Apr 2024 12:00:49 -0700
Subject: [PATCH 296/366] Update test snapshots

---
 .../end_to_end__rojo_test__syncback_util__all_middleware.snap  | 1 -
 .../end_to_end__rojo_test__syncback_util__nested_projects.snap | 1 -
 ...o_end__rojo_test__syncback_util__nested_projects_weird.snap | 3 ---
 .../end_to_end__rojo_test__syncback_util__project_init.snap    | 1 -
 .../end_to_end__rojo_test__syncback_util__rbxm_fallback.snap   | 2 +-
 .../end_to_end__rojo_test__syncback_util__ref_properties.snap  | 2 +-
 ...o_end__rojo_test__syncback_util__ref_properties_update.snap | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
index fc1be6fe3..5b10b4aec 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
@@ -4,7 +4,6 @@ assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - default.project.json
   - "src\\csv.csv"
   - "src\\csv_init\\init.csv"
   - "src\\dir\\client_script.client.luau"
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap
index af2306edb..3531a587d 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects.snap
@@ -4,7 +4,6 @@ assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - default.project.json
   - nested.project.json
   - string_value.txt
 added_dirs: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
index 51d45a951..b9eac53e3 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
@@ -4,9 +4,6 @@ assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - client-only.project.json
-  - default.project.json
-  - server-only.project.json
   - "src/modules\\ClientModule.luau"
   - "src/modules\\ServerModule.luau"
 added_dirs:
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
index 1d17d5029..dc907e7a1 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
@@ -4,7 +4,6 @@ assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - default.project.json
   - "src\\init.lua"
 added_dirs:
   - src
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
index ab189346c..7a29413b5 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
@@ -1,11 +1,11 @@
 ---
 source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
   - "ReplicatedStorage\\ChildWithDuplicates.rbxm"
   - "ReplicatedStorage\\ChildWithoutDuplicates\\Child\\.gitkeep"
-  - default.project.json
 added_dirs:
   - ReplicatedStorage
   - "ReplicatedStorage\\ChildWithoutDuplicates"
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
index a4a353073..69959cdc3 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
@@ -1,9 +1,9 @@
 ---
 source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - default.project.json
   - "src\\pointer.model.json"
   - "src\\target.model.json"
 added_dirs:
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
index b422e9982..69959cdc3 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
@@ -4,7 +4,6 @@ assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - default.project.json
   - "src\\pointer.model.json"
   - "src\\target.model.json"
 added_dirs:

From b1312ce7ca6017fdbf1f911547f1dc58e41eda7e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Apr 2024 12:07:44 -0700
Subject: [PATCH 297/366] Upgrade project_reserialize test to cover rules for
 it

---
 .../expected/attribute_mismatch.project.json  |   9 +++++++++
 .../expected/default.project.json             |  11 ++++++++++-
 .../expected/property_mismatch.project.json   |   9 +++++++++
 .../project_reserialize/input.rbxl            | Bin 52736 -> 43256 bytes
 .../output/attribute_mismatch.project.json    |   6 ++++++
 .../output/default.project.json               |   8 +++++++-
 .../output/property_mismatch.project.json     |   6 ++++++
 7 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json
 create mode 100644 rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json
 create mode 100644 rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json
 create mode 100644 rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json

diff --git a/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json
new file mode 100644
index 000000000..7ab5b8da8
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "attribute_mismatch",
+  "tree": {
+    "$className": "Folder",
+    "$attributes": {
+      "foo": "bar"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
index 47f46558c..85f85e252 100644
--- a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
@@ -3,6 +3,15 @@
   "tree": {
     "$className": "DataModel",
     "Workspace": {
+      "attribute_mismatch": {
+        "$attributes": {
+          "foo": "bar"
+        },
+        "$path": "attribute_mismatch.project.json"
+      },
+      "property_mismatch": {
+        "$path": "property_mismatch.project.json"
+      },
       "$properties": {
         "CSGAsyncDynamicCollision": {
           "Enum": 0
@@ -13,7 +22,7 @@
         "StreamingEnabled": true
       },
       "$attributes": {
-        "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
+        "Rojo_Target_CurrentCamera": "59453add28d8288f0631b41500003fd3"
       }
     }
   }
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json
new file mode 100644
index 000000000..d5936f04a
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json
@@ -0,0 +1,9 @@
+{
+  "name": "property_mismatch",
+  "tree": {
+    "$className": "StringValue",
+    "$properties": {
+      "Value": "apple dinner use transaction haunt"
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/input.rbxl b/rojo-test/syncback-tests/project_reserialize/input.rbxl
index acf36f710acede17522dd082ee030414eab39d4d..0c0f19c09c56c140663d8959afd9057fc3bd2135 100644
GIT binary patch
delta 7570
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
Dh|C7f

delta 11490
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
Ihv$?250XD``v3p{

diff --git a/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json
new file mode 100644
index 000000000..668e1fbf7
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "attribute_mismatch",
+  "tree": {
+    "$className": "Folder"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/output/default.project.json b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
index 47f46558c..52dacf979 100644
--- a/rojo-test/syncback-tests/project_reserialize/output/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
@@ -3,6 +3,12 @@
   "tree": {
     "$className": "DataModel",
     "Workspace": {
+      "attribute_mismatch": {
+        "$path": "attribute_mismatch.project.json"
+      },
+      "property_mismatch": {
+        "$path": "property_mismatch.project.json"
+      },
       "$properties": {
         "CSGAsyncDynamicCollision": {
           "Enum": 0
@@ -13,7 +19,7 @@
         "StreamingEnabled": true
       },
       "$attributes": {
-        "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
+        "Rojo_Target_CurrentCamera": "59453add28d8288f0631b41500003fd3"
       }
     }
   }
diff --git a/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json
new file mode 100644
index 000000000..471915b08
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "property_mismatch",
+  "tree": {
+    "$className": "StringValue"
+  }
+}
\ No newline at end of file

From 58b13f018c3604e6e4d1ce3f7156c491e8fc35c7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 17 Apr 2024 15:45:48 -0700
Subject: [PATCH 298/366] Reserialize project file when an attribute doesn't
 exist

---
 src/snapshot_middleware/project.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 091e39519..2ccfd2cec 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -588,6 +588,8 @@ fn project_node_should_reserialize(
                         if !variant_eq(inst_value, &node_value) {
                             return Ok(true);
                         }
+                    } else {
+                        return Ok(true);
                     }
                 }
                 Ok(false)

From f68995fb35fa1ef236ae77dd2acc9fb90cfbb08b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 18 Apr 2024 10:41:02 -0700
Subject: [PATCH 299/366] Document Middleware field of InstanceMetadata + add
 method for setting it

---
 src/snapshot/metadata.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/snapshot/metadata.rs b/src/snapshot/metadata.rs
index 55158518a..ffdaedbe4 100644
--- a/src/snapshot/metadata.rs
+++ b/src/snapshot/metadata.rs
@@ -63,6 +63,8 @@ pub struct InstanceMetadata {
     /// Indicates the ID used for Ref properties pointing to this Instance.
     pub specified_id: Option<RojoRef>,
 
+    /// The Middleware that was used to create this Instance. Should generally
+    /// not be `None` except if the snapshotting process is not completed.
     pub middleware: Option<Middleware>,
 }
 
@@ -106,6 +108,13 @@ impl InstanceMetadata {
         }
     }
 
+    pub fn middleware(self, middleware: Middleware) -> Self {
+        Self {
+            middleware: Some(middleware),
+            ..self
+        }
+    }
+
     pub fn specified_id(self, id: Option<RojoRef>) -> Self {
         Self {
             specified_id: id,

From 6e6b0ed7c69af99fcfbcef231b896701d89b7fe7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Apr 2024 14:57:29 -0700
Subject: [PATCH 300/366] Update project_reserialize test

---
 ...t__syncback_util__project_reserialize.snap |   4 +++-
 .../expected/attribute_mismatch.luau          |   1 +
 .../expected/attribute_mismatch.project.json  |   9 ---------
 .../expected/default.project.json             |   4 ++--
 .../expected/property_mismatch.project.json   |   6 ++++--
 .../project_reserialize/input.rbxl            | Bin 43256 -> 43772 bytes
 .../output/attribute_mismatch.luau            |   0
 .../output/attribute_mismatch.project.json    |   6 ------
 .../output/default.project.json               |   7 +++++--
 .../output/property_mismatch.project.json     |   2 +-
 10 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.luau
 delete mode 100644 rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json
 create mode 100644 rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.luau
 delete mode 100644 rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
index 064b7de16..e88330b24 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
@@ -3,7 +3,9 @@ source: tests/rojo_test/syncback_util.rs
 assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
-added_files: []
+added_files:
+  - attribute_mismatch.luau
+  - property_mismatch.project.json
 added_dirs: []
 removed_files: []
 removed_dirs: []
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.luau b/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.luau
new file mode 100644
index 000000000..b6c5da36f
--- /dev/null
+++ b/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.luau
@@ -0,0 +1 @@
+-- satellite beef psychology response supply
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json
deleted file mode 100644
index 7ab5b8da8..000000000
--- a/rojo-test/syncback-tests/project_reserialize/expected/attribute_mismatch.project.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "attribute_mismatch",
-  "tree": {
-    "$className": "Folder",
-    "$attributes": {
-      "foo": "bar"
-    }
-  }
-}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
index 85f85e252..bf56d2e07 100644
--- a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
@@ -7,7 +7,7 @@
         "$attributes": {
           "foo": "bar"
         },
-        "$path": "attribute_mismatch.project.json"
+        "$path": "attribute_mismatch.luau"
       },
       "property_mismatch": {
         "$path": "property_mismatch.project.json"
@@ -22,7 +22,7 @@
         "StreamingEnabled": true
       },
       "$attributes": {
-        "Rojo_Target_CurrentCamera": "59453add28d8288f0631b41500003fd3"
+        "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
       }
     }
   }
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json
index d5936f04a..1ca8b303e 100644
--- a/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json
@@ -1,9 +1,11 @@
 {
   "name": "property_mismatch",
   "tree": {
-    "$className": "StringValue",
+    "$className": "BrickColorValue",
     "$properties": {
-      "Value": "apple dinner use transaction haunt"
+      "Value": {
+        "BrickColor": 345
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/input.rbxl b/rojo-test/syncback-tests/project_reserialize/input.rbxl
index 0c0f19c09c56c140663d8959afd9057fc3bd2135..6d5da681819bce42ec7a9056bfb9a966cbd10a10 100644
GIT binary patch
delta 4698
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

delta 4693
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

diff --git a/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.luau b/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.luau
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json
deleted file mode 100644
index 668e1fbf7..000000000
--- a/rojo-test/syncback-tests/project_reserialize/output/attribute_mismatch.project.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "attribute_mismatch",
-  "tree": {
-    "$className": "Folder"
-  }
-}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_reserialize/output/default.project.json b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
index 52dacf979..bf56d2e07 100644
--- a/rojo-test/syncback-tests/project_reserialize/output/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
@@ -4,7 +4,10 @@
     "$className": "DataModel",
     "Workspace": {
       "attribute_mismatch": {
-        "$path": "attribute_mismatch.project.json"
+        "$attributes": {
+          "foo": "bar"
+        },
+        "$path": "attribute_mismatch.luau"
       },
       "property_mismatch": {
         "$path": "property_mismatch.project.json"
@@ -19,7 +22,7 @@
         "StreamingEnabled": true
       },
       "$attributes": {
-        "Rojo_Target_CurrentCamera": "59453add28d8288f0631b41500003fd3"
+        "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
       }
     }
   }
diff --git a/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json
index 471915b08..cb34ee96d 100644
--- a/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/output/property_mismatch.project.json
@@ -1,6 +1,6 @@
 {
   "name": "property_mismatch",
   "tree": {
-    "$className": "StringValue"
+    "$className": "BrickColorValue"
   }
 }
\ No newline at end of file

From e1311db29b6cf5c2ded82a44b5e4d678688bc9cd Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Apr 2024 14:58:59 -0700
Subject: [PATCH 301/366] Make it so project files only get properties and
 attributes when they need to

---
 src/snapshot_middleware/mod.rs     |  15 ++++
 src/snapshot_middleware/project.rs | 132 ++++++++++++++---------------
 2 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index cd0ccb39f..029f4f305 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -284,6 +284,21 @@ impl Middleware {
         )
     }
 
+    /// Returns whether this particular middleware sets its own properties.
+    /// This applies to things like `JsonModel` and `Project`, since they
+    /// set properties without needing a meta.json file.
+    ///
+    /// It does not cover middleware like `ServerScript` or `Csv` because they
+    /// need a meta.json file set properties that aren't their designated
+    /// 'special' properties.
+    #[inline]
+    pub fn handles_own_properties(&self) -> bool {
+        matches!(
+            self,
+            Middleware::JsonModel | Middleware::Project | Middleware::Rbxm | Middleware::Rbxmx
+        )
+    }
+
     /// Attempts to return a middleware that should be used for the given path.
     ///
     /// Returns `Err` only if the Vfs cannot read information about the path.
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 2ccfd2cec..e41b87966 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -356,45 +356,12 @@ pub fn syncback_project<'sync>(
             );
         }
 
-        let filtered_properties = snapshot
-            .get_filtered_properties(new_inst.referent())
-            .unwrap();
-        let properties = &mut node.properties;
-        let mut attributes = BTreeMap::new();
-
-        // We would ideally have different behavior here based on whether a
-        // node has `$path` set. However, due to an issue with Middleware not
-        // knowing whether they originate from a project or not, we just skip
-        // writing metadata for things from projects. So to avoid properties
-        // being dropped, we don't filter them specially.
-        // TODO: We should handle this branching somehow so that meta.json files
-        // are respected.
-        for (name, value) in filtered_properties {
-            match value {
-                Variant::Attributes(attrs) => {
-                    for (attr_name, attr_value) in attrs.iter() {
-                        attributes.insert(
-                            attr_name.clone(),
-                            UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
-                        );
-                    }
-                }
-                Variant::SharedString(_) => {
-                    log::warn!(
-                        "Rojo cannot serialize the property {}.{name} in project files.\n\
-                        If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(snapshot.new)
-                    );
-                }
-                _ => {
-                    properties.insert(
-                        name.to_string(),
-                        UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
-                    );
-                }
-            }
-        }
-        node.attributes = attributes;
-
+        // TODO handle meta.json files in this branch. Right now, we perform
+        // syncback if a node has `$path` set but the Middleware aren't aware
+        // that the Instances they're running on originate in a project.json.
+        // As a result, the `meta.json` syncback code is hardcoded to not work
+        // if the Instance originates from a project file. However, we should
+        // ideally use a .meta.json over the project node if it exists already.
         if node.path.is_some() {
             // Since the node has a path, we have to run syncback on it.
             let node_path = node.path.as_ref().map(PathNode::path).expect(
@@ -407,16 +374,34 @@ pub fn syncback_project<'sync>(
                 base_path.join(node_path)
             };
 
-            let snapshot = syncback_project_node(
-                snapshot,
+            let middleware = match Middleware::middleware_for_path(
+                snapshot.vfs(),
                 &project.sync_rules,
                 &full_path,
-                new_inst,
-                old_inst,
-            )?;
-            descendant_snapshots.push(snapshot);
+            )? {
+                Some(stuff) => stuff,
+                // The only way this can happen at this point is if the path does
+                // not exist on the file system or there's no middleware for it.
+                None => anyhow::bail!(
+                    "path does not exist or could not be turned into a file Rojo understands: {}",
+                    full_path.display()
+                ),
+            };
+
+            descendant_snapshots.push(
+                snapshot
+                    .with_new_path(full_path.clone(), new_inst.referent(), Some(old_inst.id()))
+                    .middleware(middleware),
+            );
 
             ref_to_path_map.insert(new_inst.referent(), full_path);
+
+            // We only want to set properties if it needs it.
+            if !middleware.handles_own_properties() {
+                project_node_property_syncback(snapshot, new_inst, node);
+            }
+        } else {
+            project_node_property_syncback(snapshot, new_inst, node);
         }
 
         for child_ref in new_inst.children() {
@@ -532,30 +517,41 @@ pub fn syncback_project<'sync>(
     })
 }
 
-fn syncback_project_node<'sync>(
-    snapshot: &SyncbackSnapshot<'sync>,
-    sync_rules: &[SyncRule],
-    node_path: &Path,
+fn project_node_property_syncback(
+    snapshot: &SyncbackSnapshot,
     new_inst: &Instance,
-    old_inst: InstanceWithMeta,
-) -> anyhow::Result<SyncbackSnapshot<'sync>> {
-    let middleware = match Middleware::middleware_for_path(snapshot.vfs(), sync_rules, node_path)? {
-        Some(stuff) => stuff,
-        // The only way this can happen at this point is if the path does
-        // not exist on the file system or there's no middleware for it.
-        None => anyhow::bail!(
-            "path does not exist or could not be turned into a file Rojo understands: {}",
-            node_path.display()
-        ),
-    };
-
-    Ok(snapshot
-        .with_new_path(
-            node_path.to_path_buf(),
-            new_inst.referent(),
-            Some(old_inst.id()),
-        )
-        .middleware(middleware))
+    node: &mut ProjectNode,
+) {
+    let properties = &mut node.properties;
+    let mut attributes = BTreeMap::new();
+    for (name, value) in snapshot
+        .get_filtered_properties(new_inst.referent())
+        .unwrap()
+    {
+        match value {
+            Variant::Attributes(attrs) => {
+                for (attr_name, attr_value) in attrs.iter() {
+                    attributes.insert(
+                        attr_name.clone(),
+                        UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
+                    );
+                }
+            }
+            Variant::SharedString(_) => {
+                log::warn!(
+                    "Rojo cannot serialize the property {}.{name} in project files.\n\
+                    If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(snapshot.new)
+                );
+            }
+            _ => {
+                properties.insert(
+                    name.to_string(),
+                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
+                );
+            }
+        }
+    }
+    node.attributes = attributes;
 }
 
 fn project_node_should_reserialize(

From 0fa5ab58b816d4a39579b2e13263e9553a060bfc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Apr 2024 15:18:33 -0700
Subject: [PATCH 302/366] Change folders to directories in syncback CLI output

---
 src/cli/syncback.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index d8782fac7..4ce557ffd 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -254,11 +254,14 @@ fn list_files(snapshot: &FsSnapshot, color: ColorChoice, base_path: &Path) -> io
     let mut buffer = writer.buffer();
 
     if snapshot.is_empty() {
-        writeln!(&mut buffer, "No files/added would be removed or added.")?;
+        writeln!(
+            &mut buffer,
+            "No files/directories would be removed or added."
+        )?;
     } else {
         let added = snapshot.added_paths();
         if !added.is_empty() {
-            writeln!(&mut buffer, "Writing files/folders:")?;
+            writeln!(&mut buffer, "Writing files/directories:")?;
             buffer.set_color(&add_color)?;
             for path in added {
                 writeln!(
@@ -271,7 +274,7 @@ fn list_files(snapshot: &FsSnapshot, color: ColorChoice, base_path: &Path) -> io
         }
         let removed = snapshot.removed_paths();
         if !removed.is_empty() {
-            writeln!(&mut buffer, "Removing files/folders:")?;
+            writeln!(&mut buffer, "Removing files/directories:")?;
             buffer.set_color(&remove_color)?;
             for path in removed {
                 writeln!(

From 77ffcacf3b1d6526012be052ee8e8f400fcd0864 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 22 Apr 2024 15:28:36 -0700
Subject: [PATCH 303/366] Add test for project files using every middleware

---
 ...syncback_util__project_all_middleware.snap |  26 +++++++++
 .../expected/default.project.json             |  53 ++++++++++++++++++
 .../expected/src/client_script.client.luau    |   1 +
 .../expected/src/csv.csv                      |   2 +
 .../expected/src/csv_init/init.csv            |   2 +
 .../expected/src/dir_with_meta/init.meta.json |   3 +
 .../src/init_client_script/init.client.lua    |   1 +
 .../expected/src/init_module_script/init.lua  |   1 +
 .../src/init_server_script/init.server.lua    |   1 +
 .../expected/src/model_json.model.json        |   6 ++
 .../expected/src/module_script.luau           |   1 +
 .../expected/src/project_json.project.json    |  13 +++++
 .../expected/src/rbxm.rbxm                    | Bin 0 -> 704 bytes
 .../expected/src/rbxmx.rbxmx                  |  13 +++++
 .../expected/src/server_script.server.luau    |   1 +
 .../expected/src/text.txt                     |   1 +
 .../project_all_middleware/input.rbxl         | Bin 0 -> 48437 bytes
 .../output/default.project.json               |  53 ++++++++++++++++++
 .../output/src/client_script.client.luau      |   0
 .../project_all_middleware/output/src/csv.csv |   2 +
 .../output/src/csv_init/init.csv              |   2 +
 .../output/src/dir_with_meta/init.meta.json   |   3 +
 .../src/init_client_script/init.client.lua    |   0
 .../output/src/init_module_script/init.lua    |   0
 .../src/init_server_script/init.server.lua    |   0
 .../output/src/model_json.model.json          |   3 +
 .../output/src/module_script.luau             |   0
 .../output/src/project_json.project.json      |   6 ++
 .../output/src/rbxm.rbxm                      | Bin 0 -> 704 bytes
 .../output/src/rbxmx.rbxmx                    |   7 +++
 .../output/src/server_script.server.luau      |   0
 .../output/src/text.txt                       |   0
 tests/tests/syncback.rs                       |   1 +
 33 files changed, 202 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/client_script.client.luau
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/csv.csv
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/csv_init/init.csv
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/dir_with_meta/init.meta.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.lua
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.lua
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.lua
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/model_json.model.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/module_script.luau
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/project_json.project.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/rbxm.rbxm
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/server_script.server.luau
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/text.txt
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/input.rbxl
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/client_script.client.luau
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/csv.csv
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/csv_init/init.csv
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/dir_with_meta/init.meta.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/init_client_script/init.client.lua
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/init_module_script/init.lua
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/init_server_script/init.server.lua
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/model_json.model.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/module_script.luau
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/project_json.project.json
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/rbxm.rbxm
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/rbxmx.rbxmx
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/server_script.server.luau
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/text.txt

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
new file mode 100644
index 000000000..119ed2573
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
@@ -0,0 +1,26 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - src/client_script.client.luau
+  - src/csv.csv
+  - "src/csv_init\\init.csv"
+  - "src/init_client_script\\init.client.lua"
+  - "src/init_module_script\\init.lua"
+  - "src/init_server_script\\init.server.lua"
+  - src/model_json.model.json
+  - src/module_script.luau
+  - src/project_json.project.json
+  - src/rbxmx.rbxmx
+  - src/server_script.server.luau
+  - src/text.txt
+added_dirs:
+  - src/csv_init
+  - src/init_client_script
+  - src/init_module_script
+  - src/init_server_script
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/default.project.json b/rojo-test/syncback-tests/project_all_middleware/expected/default.project.json
new file mode 100644
index 000000000..2fd8876cd
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/default.project.json
@@ -0,0 +1,53 @@
+{
+  "name": "project_all_middleware",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "client_script": {
+        "$path": "src/client_script.client.luau"
+      },
+      "csv": {
+        "$path": "src/csv.csv"
+      },
+      "csv_init": {
+        "$path": "src/csv_init"
+      },
+      "dir": {
+        "$path": "src/dir"
+      },
+      "dir_with_meta": {
+        "$path": "src/dir_with_meta"
+      },
+      "init_client_script": {
+        "$path": "src/init_client_script"
+      },
+      "init_module_script": {
+        "$path": "src/init_module_script"
+      },
+      "init_server_script": {
+        "$path": "src/init_server_script"
+      },
+      "model_json": {
+        "$path": "src/model_json.model.json"
+      },
+      "module_script": {
+        "$path": "src/module_script.luau"
+      },
+      "project_json": {
+        "$path": "src/project_json.project.json"
+      },
+      "rbxm": {
+        "$path": "src/rbxm.rbxm"
+      },
+      "rbxmx": {
+        "$path": "src/rbxmx.rbxmx"
+      },
+      "server_script": {
+        "$path": "src/server_script.server.luau"
+      },
+      "text": {
+        "$path": "src/text.txt"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/client_script.client.luau b/rojo-test/syncback-tests/project_all_middleware/expected/src/client_script.client.luau
new file mode 100644
index 000000000..1a6501120
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/client_script.client.luau
@@ -0,0 +1 @@
+-- ghostwriter notorious mutter restless punish
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/csv.csv b/rojo-test/syncback-tests/project_all_middleware/expected/src/csv.csv
new file mode 100644
index 000000000..b7c422222
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/csv.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,es
+Ack,Ack!,,An exclamation of despair,¡Ay!
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/csv_init/init.csv b/rojo-test/syncback-tests/project_all_middleware/expected/src/csv_init/init.csv
new file mode 100644
index 000000000..61a49274e
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/csv_init/init.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,en
+Rojo,Rojo,,Rojo is a really cool program,Red
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/dir_with_meta/init.meta.json b/rojo-test/syncback-tests/project_all_middleware/expected/src/dir_with_meta/init.meta.json
new file mode 100644
index 000000000..d62029576
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/dir_with_meta/init.meta.json
@@ -0,0 +1,3 @@
+{
+  "className": "Configuration"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.lua b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.lua
new file mode 100644
index 000000000..2330a0023
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.lua
@@ -0,0 +1 @@
+-- brag season coffin dilute flourish
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.lua b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.lua
new file mode 100644
index 000000000..e36c2d878
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.lua
@@ -0,0 +1 @@
+-- absorb dragon coat crowd effect
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.lua b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.lua
new file mode 100644
index 000000000..8518c74fe
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.lua
@@ -0,0 +1 @@
+-- rojo syncback very cool dekkonot
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/model_json.model.json b/rojo-test/syncback-tests/project_all_middleware/expected/src/model_json.model.json
new file mode 100644
index 000000000..a75990c38
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/model_json.model.json
@@ -0,0 +1,6 @@
+{
+  "className": "StringValue",
+  "properties": {
+    "Value": "i understand how person299 felt"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/module_script.luau b/rojo-test/syncback-tests/project_all_middleware/expected/src/module_script.luau
new file mode 100644
index 000000000..b5c15e2b1
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/module_script.luau
@@ -0,0 +1 @@
+-- hospitality publish accumulation onion shaft
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/project_json.project.json b/rojo-test/syncback-tests/project_all_middleware/expected/src/project_json.project.json
new file mode 100644
index 000000000..cb0ce6a2e
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/project_json.project.json
@@ -0,0 +1,13 @@
+{
+  "name": "project_json",
+  "tree": {
+    "$className": "Color3Value",
+    "$properties": {
+      "Value": [
+        1.0,
+        0.5,
+        0.0
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxm.rbxm b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxm.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..1fc6714ae046dfc4206e3b2ffd9e2f8a1323f5bb
GIT binary patch
literal 704
zcmZuv%TB^T6m3c40|kS|7rwxSapw;Z6BH70Q5)L0Z{cbtDJ_{95^$p~UHWH!hRgW_
zy=O3u37q8I*W5dEXYRCQo}~G-`SDXJ*UOIMI&-qJ==ouE%vSx+Hybe4nce9)&6UVA
zTZ3rOe+bT5H{dW#4RVLs)>?{WqDh4$MVyKk!a=rTarX+Z+@!J6fh46SlDyCFJDZCx
z4p7K2Xu?4|Hn$%S#YB1U?4yq})+bEBR3SH+xA8bmL@Kl()kF|jo{qLV^dvG;|Eo$i
z{gM|iP|Gm;kcZ3;DJ}EaeJ(ORZzmu*piFzOyozI%-?ezjXf~#8PIZxsZFiY~S%LJJ
zemo)<hD@d-q@A)|T(rcFv&IZ~GMZ;otvPRq0myE!Mg?HDAo18?KH)ywN|Ejjj}T?p
zCh!V&imZ*@9cM@Jvnu9?dF(L(vkHm9L}EnYAWo^c`{GteeiTY1DV6v%Kf;{Q5Aaod
UD|Xzj-?33UbGBMn^M8B&3klnH#{d8T

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
new file mode 100644
index 000000000..50a48b184
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
@@ -0,0 +1,13 @@
+<roblox version="4">
+  <Item class="Message" referent="0">
+    <Properties>
+      <string name="Name">rbxmx</string>
+      <BinaryString name="AttributesSerialize"></BinaryString>
+      <SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
+      <bool name="DefinesCapabilities">false</bool>
+      <int64 name="SourceAssetId">-1</int64>
+      <BinaryString name="Tags"></BinaryString>
+      <string name="Text">ripe alike review heart dry</string>
+    </Properties>
+  </Item>
+</roblox>
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/server_script.server.luau b/rojo-test/syncback-tests/project_all_middleware/expected/src/server_script.server.luau
new file mode 100644
index 000000000..ba51694c9
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/server_script.server.luau
@@ -0,0 +1 @@
+-- ostracize fraud consciousness seal architecture
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/text.txt b/rojo-test/syncback-tests/project_all_middleware/expected/src/text.txt
new file mode 100644
index 000000000..a4cb228b7
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/text.txt
@@ -0,0 +1 @@
+According to all known laws of aviation
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/input.rbxl b/rojo-test/syncback-tests/project_all_middleware/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..824960bac3d2640e7ec38c206f6d335113f50208
GIT binary patch
literal 48437
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
GUitr>79!37

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/project_all_middleware/output/default.project.json b/rojo-test/syncback-tests/project_all_middleware/output/default.project.json
new file mode 100644
index 000000000..2fd8876cd
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/default.project.json
@@ -0,0 +1,53 @@
+{
+  "name": "project_all_middleware",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "client_script": {
+        "$path": "src/client_script.client.luau"
+      },
+      "csv": {
+        "$path": "src/csv.csv"
+      },
+      "csv_init": {
+        "$path": "src/csv_init"
+      },
+      "dir": {
+        "$path": "src/dir"
+      },
+      "dir_with_meta": {
+        "$path": "src/dir_with_meta"
+      },
+      "init_client_script": {
+        "$path": "src/init_client_script"
+      },
+      "init_module_script": {
+        "$path": "src/init_module_script"
+      },
+      "init_server_script": {
+        "$path": "src/init_server_script"
+      },
+      "model_json": {
+        "$path": "src/model_json.model.json"
+      },
+      "module_script": {
+        "$path": "src/module_script.luau"
+      },
+      "project_json": {
+        "$path": "src/project_json.project.json"
+      },
+      "rbxm": {
+        "$path": "src/rbxm.rbxm"
+      },
+      "rbxmx": {
+        "$path": "src/rbxmx.rbxmx"
+      },
+      "server_script": {
+        "$path": "src/server_script.server.luau"
+      },
+      "text": {
+        "$path": "src/text.txt"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/client_script.client.luau b/rojo-test/syncback-tests/project_all_middleware/output/src/client_script.client.luau
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/csv.csv b/rojo-test/syncback-tests/project_all_middleware/output/src/csv.csv
new file mode 100644
index 000000000..c5f48af47
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/src/csv.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,es
+,,,,
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/csv_init/init.csv b/rojo-test/syncback-tests/project_all_middleware/output/src/csv_init/init.csv
new file mode 100644
index 000000000..24244d6c1
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/src/csv_init/init.csv
@@ -0,0 +1,2 @@
+Key,Source,Context,Example,en
+,,,,
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/dir_with_meta/init.meta.json b/rojo-test/syncback-tests/project_all_middleware/output/src/dir_with_meta/init.meta.json
new file mode 100644
index 000000000..d62029576
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/src/dir_with_meta/init.meta.json
@@ -0,0 +1,3 @@
+{
+  "className": "Configuration"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/init_client_script/init.client.lua b/rojo-test/syncback-tests/project_all_middleware/output/src/init_client_script/init.client.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/init_module_script/init.lua b/rojo-test/syncback-tests/project_all_middleware/output/src/init_module_script/init.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/init_server_script/init.server.lua b/rojo-test/syncback-tests/project_all_middleware/output/src/init_server_script/init.server.lua
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/model_json.model.json b/rojo-test/syncback-tests/project_all_middleware/output/src/model_json.model.json
new file mode 100644
index 000000000..a095016a7
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/src/model_json.model.json
@@ -0,0 +1,3 @@
+{
+  "className": "StringValue"
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/module_script.luau b/rojo-test/syncback-tests/project_all_middleware/output/src/module_script.luau
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/project_json.project.json b/rojo-test/syncback-tests/project_all_middleware/output/src/project_json.project.json
new file mode 100644
index 000000000..ed8452050
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/src/project_json.project.json
@@ -0,0 +1,6 @@
+{
+  "name": "project_json",
+  "tree": {
+    "$className": "Color3Value"
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/rbxm.rbxm b/rojo-test/syncback-tests/project_all_middleware/output/src/rbxm.rbxm
new file mode 100644
index 0000000000000000000000000000000000000000..1fc6714ae046dfc4206e3b2ffd9e2f8a1323f5bb
GIT binary patch
literal 704
zcmZuv%TB^T6m3c40|kS|7rwxSapw;Z6BH70Q5)L0Z{cbtDJ_{95^$p~UHWH!hRgW_
zy=O3u37q8I*W5dEXYRCQo}~G-`SDXJ*UOIMI&-qJ==ouE%vSx+Hybe4nce9)&6UVA
zTZ3rOe+bT5H{dW#4RVLs)>?{WqDh4$MVyKk!a=rTarX+Z+@!J6fh46SlDyCFJDZCx
z4p7K2Xu?4|Hn$%S#YB1U?4yq})+bEBR3SH+xA8bmL@Kl()kF|jo{qLV^dvG;|Eo$i
z{gM|iP|Gm;kcZ3;DJ}EaeJ(ORZzmu*piFzOyozI%-?ezjXf~#8PIZxsZFiY~S%LJJ
zemo)<hD@d-q@A)|T(rcFv&IZ~GMZ;otvPRq0myE!Mg?HDAo18?KH)ywN|Ejjj}T?p
zCh!V&imZ*@9cM@Jvnu9?dF(L(vkHm9L}EnYAWo^c`{GteeiTY1DV6v%Kf;{Q5Aaod
UD|Xzj-?33UbGBMn^M8B&3klnH#{d8T

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/rbxmx.rbxmx b/rojo-test/syncback-tests/project_all_middleware/output/src/rbxmx.rbxmx
new file mode 100644
index 000000000..81a52114b
--- /dev/null
+++ b/rojo-test/syncback-tests/project_all_middleware/output/src/rbxmx.rbxmx
@@ -0,0 +1,7 @@
+<roblox version="4">
+  <Item class="Message" referent="0">
+    <Properties>
+      <string name="Name">rbxmx</string>
+    </Properties>
+  </Item>
+</roblox>
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/server_script.server.luau b/rojo-test/syncback-tests/project_all_middleware/output/src/server_script.server.luau
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/text.txt b/rojo-test/syncback-tests/project_all_middleware/output/src/text.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 5f080cb23..d768f4607 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -25,4 +25,5 @@ syncback_basic_test! {
     ref_properties_update,
     ignore_paths,
     project_reserialize,
+    project_all_middleware,
 }

From 1b843e144979ad088bf1d1c28676c21afe72fe28 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 1 May 2024 14:14:54 -0700
Subject: [PATCH 304/366] Rename variable in project middleware

---
 src/snapshot_middleware/project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index e41b87966..b3b1c705b 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -379,7 +379,7 @@ pub fn syncback_project<'sync>(
                 &project.sync_rules,
                 &full_path,
             )? {
-                Some(stuff) => stuff,
+                Some(middleware) => middleware,
                 // The only way this can happen at this point is if the path does
                 // not exist on the file system or there's no middleware for it.
                 None => anyhow::bail!(

From 31976315c37cd3797c4ea0888ba834e057db853b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 1 May 2024 14:28:33 -0700
Subject: [PATCH 305/366] Add test for duplicate Rojo_Id attributes

---
 ...est__syncback_util__duplicate_rojo_id.snap |  11 +++++++++
 .../expected/container.model.json             |  21 ++++++++++++++++++
 .../expected/default.project.json             |  11 +++++++++
 .../duplicate_rojo_id/input.rbxl              | Bin 0 -> 53725 bytes
 .../output/container.model.json               |  13 +++++++++++
 .../output/default.project.json               |  11 +++++++++
 tests/tests/syncback.rs                       |   1 +
 7 files changed, 68 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id.snap
 create mode 100644 rojo-test/syncback-tests/duplicate_rojo_id/expected/container.model.json
 create mode 100644 rojo-test/syncback-tests/duplicate_rojo_id/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/duplicate_rojo_id/input.rbxl
 create mode 100644 rojo-test/syncback-tests/duplicate_rojo_id/output/container.model.json
 create mode 100644 rojo-test/syncback-tests/duplicate_rojo_id/output/default.project.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id.snap
new file mode 100644
index 000000000..407cd50fe
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id.snap
@@ -0,0 +1,11 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - container.model.json
+added_dirs: []
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/expected/container.model.json b/rojo-test/syncback-tests/duplicate_rojo_id/expected/container.model.json
new file mode 100644
index 000000000..aeb7b2b35
--- /dev/null
+++ b/rojo-test/syncback-tests/duplicate_rojo_id/expected/container.model.json
@@ -0,0 +1,21 @@
+{
+  "className": "Folder",
+  "children": [
+    {
+      "name": "value_1",
+      "className": "ObjectValue",
+      "attributes": {
+        "Rojo_Id": "value_1",
+        "Rojo_Target_Value": "value_1"
+      }
+    },
+    {
+      "name": "value_2",
+      "className": "ObjectValue",
+      "attributes": {
+        "Rojo_Id": "72bc28150ada2e6206442ee300004084",
+        "Rojo_Target_Value": "72bc28150ada2e6206442ee300004084"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/expected/default.project.json b/rojo-test/syncback-tests/duplicate_rojo_id/expected/default.project.json
new file mode 100644
index 000000000..3343677aa
--- /dev/null
+++ b/rojo-test/syncback-tests/duplicate_rojo_id/expected/default.project.json
@@ -0,0 +1,11 @@
+{
+  "name": "duplicate_rojo_id",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "container": {
+        "$path": "container.model.json"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/input.rbxl b/rojo-test/syncback-tests/duplicate_rojo_id/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..fba397a34f6b927416595fd3c2b9d14a7d38308e
GIT binary patch
literal 53725
zcmcJYdyHJyecxx7LyDwGiWEhWk|lX0(-K9!_|z+UaJkE+R$h|p-6iSTM&#kn-QAI9
z=dR~L?n)v}OS1f^Q7eH9*g;UZiQB?P5F~}rqJKGY@<-enXyTwilcI=gR|S#)#Z4@;
zMbT9Kea^k--uc~o=geHEJ;2?anfv{n$M1E1=iGD7eWvAKYWQpSe))s#TkqUjDxEHs
zO4D-LG&eUtyGy>@75y;7|B;QQt)nILu{3pdZoVSF-NOw@!7cpVCf8WI?RDn7*5&$w
zH!{MnrP42tfWKQleaL(l{5Eb$$)&N*ir-#c_F7&kLcb1}jBV+`_EGtEvs@<|zQ1y6
zanW1oSoAf}2j$)Yxk$ks8|3d^xlVR3U21sa%hk@f-(0LObz9X=-EUgT15iSBzg(nX
zZ(07{CfE4f>52LR;A(3<)tK8%W9|?XWsri+8|CjNxyGw2UaM*g7^Q%H^7HL-k%F55
zQ3#c?+_~Lk_^|v+Gf2UQZj!$g0dA_f+U=aIwsISBf42FXg^sF0d$HcE`B!o&_e1$n
z!F@z7QgGWA`HR@c{YFDrEX_}~ebQ7_^9&&xp83s=x7HcUqx+<xyHAi6xk$k-<hetx
zao>NX?zK}T%^HgRavv&Eup9N-Dc3}`Q=RMhEiXmWGBkGz0;ZFKE!*WUOrP*Bwd!rl
z@)?8FqM<Ixal%`uHmnG@WtoJg-)eBHo#k_jlXb6A(<*r#BCQ})n`%t@jhff8xi15R
z{rAd63T}n{lyF)!X{Opvv*oO*_=g36HIafHR0d|g(CMtEIMOk2ZFsu{ip-`~s!QH<
z^^zAi_F<|+Rmh(d>_o7zaH`q%T4}R>(d3SN9+ivqcjZ0u7X=i8PPHj6V52nlTl3G1
zj*gCyC<41iN~GXsj01}4`qFZz-dwUWx@@oy$Q_iF6x@zlQ~zmSWK@6Em~*PhC*w+0
z1V{>YA!x)q?bnR%Xz%ofq0sF{dbE4GTfOLAN)^#G1X^yi2f3Z8cDz=-+DMU949Rf;
z9F>a{?8g^U>RG=z>#a8G3qo3Rd7fKyng%Zs{<%vpi^X23Ho9I3ZyBbSjSGTn$b}Sa
zLK|>FGu2k?M9YZfe)$oDBL#bKz-ZQt*IKE!+u{q-x_Bg~I%p1@o>^XR*B8<hFBpmk
z<vwC11^X)Um&(mFs_S0s)JnHe71K_!@0cNkVF-p4Y=w2W$&fHM?K=(hu-te|E>ciI
zMQQd-%U|%?ZL6F4m0UF$=pF@Gqo<O=T79M7S(gtht7&_9%TQ{)fT8F`BH_t;s~!9P
zy9|l;!hFLGBqTUHF;;6Ci-t%mEW$%!=N4M^OvOHJ2(%kO0{HtmFLL!Z_X`G0ezDzc
z#N%Ukh{bD#Wo#?`aZeY2DW^^d+SDne(v7GY0y4I}-p{u330sY%f1%#4U#d5R-MdQP
zvekRr&>;+b6DipEko?^s*W4@X*0rvo(G~eEiBRZa=|blGZnKtBupK5>jekV2ruwVZ
zD@{C3Z}6~{{I!zc1TnR_j#!r0lJ2)vU62nUyV|y9&p@fe8#HxmLV3Ddx2-*4>ZSet
zAwgpDQ8_c!g;y;6IRn?4fhm|~gw+bo#S%Pe2(*(uA_VZ(=5Gu$)rhCFjli*m)oO_s
z4?WR{{3dBSi#{elhfVI*>ONlCR_XB^QQ$aD8@kQe>Uvvux37}B?rt9!{6@Lvz3NKr
z8NOsP*5>(yfH2Q_v4T}U)5A>|5*<-IDRBJGyw_?~>v1%>nObN;JtZhOGVit1uHq{>
zb$ME#VO`cb#BM1Sy)UOOza%7KUDi6?B!b>VT`F=fQT}J-8_GXlmk2eL^FEWac0$hz
z7AG|CcNdmT1ezlHj3KHBBq`)M`DO~a;(6)N@g9TM0p0V0Co(#JdVK7%s6e`6Uo|w^
z?Vk`l;llZ;alh3}VyQ=IvvzS~0z=2nPn~X6Yjv*~_jd;Y>oDY`0P%<Cr)H|PnrN`K
z*F)Ki$0O{8*%VVgVJfW6X+psG&I|RL=Z{xc5mbt7XAaq^n5@<5RvShHXR1x<23poq
z{*fWmZJvy(cF}LW(q645W3bZ5%<Q=tdculaqyYJvs*QCzt@@>I$3)>0ywqRyjO9Y1
zRT>H;EbXWo*DR6yz5GbZhtu{6Z?WF=+PzdVl8kbvPNV=AZe;L6y)B)^`c&=1x0W{8
zA*Y4YUQ$4uVIrBc5-X2TtKP9E@QVDFXs3J$orvFUEqDeyRYSQ*hC5W%Fh%|cqx@W!
zYreYFj@hBz2N0u-&H87%p43<Rp@~hE@9zHd|L_OD{lGgfeVSTmo|6;h49{~YoIKZx
z3>@DlgE+sn?b_GA_Kv-%Og@$|&-%8j-}%mWum1k;fB)*we|{s&ZCmlavebPta9q=b
z*KA7<UcP$t=rJ;-XCba61siN-PdBP94`v&!&~gC7trx1VCJ?m1D$b2E5R5lb9I@UR
z`60|tn~2TNs15!hnS!8#1fx`d6quYh$)|IRi!!fKzA7I9Rpfu7S>$NCry(`V*1(}z
zK+>A^dADYvu*EbB3a4gi<F^I$)c`Fw;Ap_9W>uzPYNN))wA_F=<faGc7Ca^M453ba
zPRNl)7KgqV`C<uX)(Bj-e&FWB-Id?Go+ns}EFxI&WT^z3tsPCCUv7ErWtk2rUzcyx
zPP-PeN-Mw{X$3eapaXJ|!g(*^jj<X%qi5Pr_xeJ2rP}oCwOQZqFzTbQ`{ehET%=$Z
zo_CPy=w1y9@;)ii=TeJ^+W4EJ+pdZ8uoneAC?H5l!9K|F6A9UTtJ;)~s^v8o);Ipz
zH%b5Ic?h-9LWsi;=kz9`sl4(VKMr~40=MU+ACwNg{Q2u4SZg&o7cc_guxdyn0G=@d
zt%pERnn{^J!!tfc>o3ZO6}d<s90P(f0GX6dy@KFdm)2y0$m=})*kg<Gd;77)>WYk(
zy!K-!yLG0S=7h74zTEbk?~jxoI9wXJ=|Jgs9y#OH>fMz`{m!CgGO9qjQKlG&IX)t{
z9|9>UxC=0%G;=ZGsA8_ut+hi>X*y?sBudf&I>fl%Gu5?FqV4ka>mg7_+W^sN0ZvF%
zz?4$?3-9!kBN}<8-jpHwt6mI$>qH388Vg)ER>H8Y&ulSuugLAh+f$_?P60e6DW^b*
z^faVklWpaEwcaqJ-i8;t%X{TE>PiZB0)uPwGS3>B+v`90!M}a|&;IPsU;oR${41)e
zgJlTN8whZ7HrhD=^doYE{7J#B7J9xXl=))X-{gCZ3o<n*vsaBC@zY)-c1^+0gZzxP
zPACdkr!Anbb?W{HxI^K4CqYhtElbpC6ox1!Z>lb<Es(jjg^1Heolz<8C|%KlBExjY
zu+uFlI>A9~KPi|Ka*=|=P!RTvPqrku-dS1*4t?)Ge)Tt>`-AsC`aSvi`nP|>d%kw|
zC(pe;`qcA_FaP>;t$%&b_uhQ&Z`*Ht|G$6Z&BL3&1|M{&NsjPg+&m(g>zesWDrLd~
z?H$0P=OK1}ebqA&BbjRL09ZgffKy~&?a;mlIKIbB@t<3~Q1`BszaYIi^}rp_KvJ+B
zBt!Qe<Qcz~)EcC<y%T^%k;;?)Lbtth^v#1u|I-`){M$c#^X|j{l$>=K4H#Cu;8knl
zX<xB%lnyFD89f%%oLHh){+#?mZd%`CTs**1adK7)D4S7uqYOrL<XVxR6NgByZWV{=
zR>gx+@MP>zav*6X@1~W!A|PE0%<{tQe7(^bYf8A&XxP{@#~0C}K}Mm&3Mgnr(o@*%
zjSg$o1YAHhZEgChrWPb{hvU+{0ARFp+OO6m|7y2k=9j`AMt4L&W0~`TiKwi^ffbRs
z&DJ4tAZdy3NlRS!Cd5^PB&dZFQ*=B2g3RDIypE@2NTm8vxk$n7z;lD#*M8+!e)YBA
z{oQ~0+MoQ%kKoRO0)&(l?1OAzkoyA@<Yuc^KxZh&>CRAAYj!6<mrL)c=ISUD1S0tV
z9A#3BLwB`j1&r=~%v-<YS6emtKOT8j6DL0`_XzAr;bZeyeeq_fZ|?JRq;^06_d_Tt
z*h@(;OG4QNkAay?;WLFILmJOpv{%*^petev;4|K@B0nas%vNQ-+FJ5DCfZxBHk)1p
zX&Yao<3jMMxDfwuFY2s40t84p9T)Bg`heWX+JJ#}TK+3u#1%os39@_}NXXPcFQojj
zu>l?4*sAr$p>MnW04*8h2Xv#L_yr6bGKXOwHR(@t3>(4%hHV?vw=<x%*06(7;IK`Z
z_67N2MK00_5arSb5C1>6Y#lIB3<1*%9?$Y!fe1*4572%dFfD$;Z`EIwk#4my)~GKv
zS7bt;xX>5`KHz{{q~H!HVn09+habpU3zM~GD2rILElKrk+B$&@uuj;ByCOxx3Py)8
zPO?Ui6Du3aI3Yui6SBU>i6rbG(bjBhuWf!IZJQOLNL(33p{aI^n3bFkIxVv<)@z+*
ztwCBT(4Ij?uX|T03K*d+psx|)QmGT^1n6?<U-g-Q-Y<78G}s+tqre*Gh|u(UtE^r^
zQ$#Oq8A>m;rv(DLd!>0iEltgI)VLVap(wy~TR>l?>o6EN&FI5+?eqc1PQeV|#h0X4
ztYtY5SrN|LVjP?YlIHwLH|KGy#W)W|0nXb3hU7eO2j{g11RQgonL)kgFUxZXityYP
z;NUrsG|!)P^BnFC;<@esp`d+ZGQL=;%B0w=*J-VX11)?a+DkeCQ04$OjSu%6)z)N4
z;Q)6CM@QIz=|-o$rRu`E4EANJd~RXcTk*n2wAyKe6_0!uT~B&3W>%Px6cMH^!XZo`
zX<;_p!lVX+gsJ-rC@5%18QB7clo4=;jP$S^FzuCD@Trcs(%v8e-yg$i-FX6w?Ti6+
zxat)kO|!l7i4YguBrBnYdJ=B)bx6e4u(vaL#w`&HrI<vZa7ska*8qnLQA}iqL;SZa
zu?89Ju(jzcKB}6;+`wTqPh;XBRCi8591_+ucs4&X*~aXbS%#c7CUEe2Skc*hmFS+5
z47f;ty9)@z2ckh)n=-=KujkoPXRpjvwjYy+Xvr$LM^~Fm)J=~n$q4cE29xl}a9g_(
zplJhsHLWiCNjxM-^OIA}nztqvP#UEQIzVBnpqNfU;nXSZ6l?)QstNGkp_yTY=9;a*
zWVMw%*?#St-~2UNr{~atB78G*96#TBHNtA`1MASf{EVlXChJ*QE!Az8-~4f&p^$Ox
zWZ>L{mn?+uU+1%4Z~LxY53{Zay>&~$Ew+8bDz~kQQf{qiK+=l#W?Ip-4$-R>(;+Ad
z=#VX-uMTNR0v}qEfMe-EwZMQ`7GJdxO+|i4*bTObFR^($*bOAb?h_j~O+5P3_ts_(
z?s@mqf0#8{d}=XvLs5X;wtyko4cx(Qtt)_IcB5;leH&S(Ls5k3wgd;$fuxwe;g{Sx
zPM1}T=};74x-DQxrUQ2{T}MNJ3Fq1HV&}Y!W7UBzuvj)0AFaI1$^~>0x!BwtasiT-
z%Su`<fUp`;FoI0z<k&@ZISRmat3c40vF5_E-<t93%?{NziB>W4s)S!lCjiSZV~cCC
zp^ihKK+KF_qFpx8QUu*&fTP@aq{H$8+F}Hu2i{<5VzTI`PeexKf%_%}w?Wo_wiU_d
z1QxdbC;e73fiI70-hKV!AD?~wJKy;&c%-9dNEnfaB<i_smi5?p2&BO?^);^%hax&s
zur(R)H^j>_6ef)~>Z|Puuf5<kYgJj*6Ar?th>caPR5$gtEgd*f5o~Kh_K+;G6fewD
zcQO{#XC_6j+5}9DYPOJ#$Oj_`?HR$Krv}qU-dPIRYba)AH&eKhNNIOP?!yaGa0_K{
zJElM;1MoOYgU^jp^NoSHjJ+I&d1ks<5BqIfr>pCJw{s57Ln#bbU^4+9DcA-w_DLw6
zsfyW!mvu>isqR@;@7QfR6aJMZH%v7u@<FpBgP-;mJ275Q%kVQMtMZ>^>OLmOHvmO&
zel<p;(G)?tv4Nj)e>1);0G9n@H>tG-ItT`f+nM#+RUXSKE8H(PP!&?J8z>6SYR1Sz
z$xMsioJTrwRdkPGt1|0%3^sNiS$ShAX5LvXJHZcO1EgRh*&)18D2YksS2PygNpHD&
zx$d_RVeBf0q(O`^O}?MZlw(906Cs$2TqNs4wq$6|uf_yf9cKs@Q=FDnpR0LOL~sXQ
z#Ym&$;ReN6K3TI+nQI$DnAZFKH?lx}*t$`vKawwhg!S~vQ*g2Yy4_*7PQpW+HM}R?
z*hHpyt2x<*>5a>SC9kzlscU|hVc_~HMMZMaCW%8Dc0^+vr=kjU-<nlms)||3Di_c2
zfccDa>AL(i2~OxS5SgaqkT0j>5I{H&QZULl#;s~GVzyh!8IS9t(F3G6)@aB!bXlC*
zl*jRHSucozH=@pswjmBuxaF9V3`q!{Y<b2bSOVQ|PzLpN1v$EFhN3_$YYXVx-=cWd
zLER_=cf_(4xt%BoV6@rH`<TA0cc*o>PXJ#;p=|z2p|UbctH;x6^&p}<Bp2y_?Xa4V
z%ktix7l`&*LnO<XZ-Ok#_mR>qGX|2?Tw6{q=b?cFW?nKGNEv1WdWQQ?Bn3Po$jcVJ
zn*w6?qyCe!c1+Hqko}?26S+O5XJ*Wi1{8&mpR>f9A<mHn?J;}Zp+Nbq?f#W5EfhvC
zpXLNsjWYiE25?#;Bc<Qj@T{bhfAQo0@{>&?rJWOUJu25v<$6!9HMwTwIw;p3x!xTq
zee2VtKO|W;(Ls}f?R01u_}I!NjB?x6JMOsCUbdwbxlamqfgWUH+CxHNg6bCWgzWul
zm#<$B<)v*AU{)vOM-nwTAph?--=rpcfg>jqQO+&b7dtPV^gHsjg*@T}o$e%|qlf9C
zoA*~UMA^F0>|FJu4C=LCE>f_EGLZMF=H+_JH|rB7>Whorwx_!YJvxGlFr<fSZq-|m
zeekk#xOXY1wpz$A?o(^4ep{w($7MO2Y>Uz1O}06x)ug{<*s$%|=Rg0Jy=V@4M|(*@
znG$gD0zcKPmB04(w~Rb!AwW{F2~d=$*)NPS8JKqJzz8f(d;U_Zy1HCnn3kH#c7bF^
zS5|+pt<w$vlB_IWuF5ec?Yu2S<eahh#N2h52{<-)s%;OQ=&vy6x}BQuxBA%$A}|q?
z{0}x*ZU|9>4Ufr4D;WZSF|m$m)11E;TF2|rEN(?^C*1?!92X<MN-{$L<dyW>wt>ps
zXE}>y&U*{XO<CZ!v`+muz=4W<&}G9}whW(JoT#pkz_G)}o<4f$=|hLWXEhQ;?<1gQ
zx*yS9H@ZXva{CeaokFw@L*aB6S-8`Jb=OVq4rS8j4megO3h5n<^qpsds)$5wDN3T6
z@j%jyKjdaS4yPF7p(wz3TR>mesTmL4!FX-OfMdqf@c2NFj1B`W!fl(igWEvT-1gnv
z#sG_P8;Szlwgn8yZQu@WSLAl$1^~z0hL`G0oUGdbUxej0e+SEfq**?fX1VTg7`&Qk
zQaM|!+US_@+Qd8IcdD&j5d_6#1ceE4s%={W-Q`L1l>$)l#P0)#=_gzDg;(Ooyyjch
z%>j1GpVs09NI%;Q9G;KM3Td-U+T_3G*3yjmmY+X$7lKtU<PLQYzXIPc-yW2UbmM07
z-znF)OoOe|7Z`fBO%dDnlxEB~Xo$ETl8f{|wn1YeH90>-=4uubA_+bdA{s$JMEdzw
zh?oN$_c^*vP623!+gNYDtu$l4QI7V0kQi3^&4re%=Qs62TV&90esEOHZ?$9`T07&(
zno>hY)yy|rPEOTiCQ!EFOjj>g4GC2<-yqSw4^=~_`kG}vmnZ7g6~9@Nh3HXh;IjFa
zUj%}jtjhUj3#LLQW;0)bYu8DQ;LW684;zeS^95+W1<BU@g}T==Sz|%bcL#y&=&eUJ
zHw58#2=XmLPUmQc>cph7`35-4OB%|wQ?nK~H2iAw#-vF%$~4sB;_xVRo20;)4>g@y
z2(@QJ_?cYE5xpk8zlB_h-KM?j;(Ai;t-DJzakcZgC=?wz<S^!9^qnH|O?g_Pu0;Pa
z<yimo8FQxE5|fD;6MnUf$-1FL=V5xR^ZAT9(+xQeW8|}COhvwuf?Y5s?j$ha)H!HS
z<eTkG^|CBAYlc1u)wDlAlHbx959biKH2exYpY>unZ5h+YtdG7AAc%|!wJ-$r1qkx3
zX;wDone1T!Ux4P@Hl9$1t<9xg4{E+ali%K1Ima@pKeioy?O&TY+Z$0EzPO-~DTPq+
zIT06;6)EXjWHWiKk3QyG^<3<}P%!h2+%cwXCo#7ov-!&rqYW$Z#3DBr+vl48m6+{(
zA^(cxp9C-HWszXS>aimj0g?_z?oJ0ISwYedoNs$a4jnmSZKM5(l}0$E%~z|7z8{($
z(%}p3%XdiTZll_KCG?{>B=gNuR3rydu#2LK#W_$oV-ek0TR`7VPe=a19gg~_+&&@~
z>BnH<g%SF_TckCEj!w*K1bGzE2wSE@BY>ne;+C{VToll+%S8(AWg@Ph6rPcLqjKST
zX8o7_m!@i?+e&X;=4{884)5Aqx*qNed+Ea7(&l?hx11;)m@&6(V{LzR<0gv9imrF!
zu_B1XTx_*+WoJg?#{_TX5tPAagcoc(QF={gjwa+-(4UsxE3L^%JO^dU=-tw%OJ*jL
z`dJ4P+(sU;P-%12(B$J08isGbUoO&(%@E~CF>Kk0nHZsaPv)s?DX|#IhkQ}6!+enx
z+y^WrN_kp#;<dLnZJL;P^wFRG^u71i)@Ei79^A9%-FKN>B@0G`OuUc+!*e{IIROtD
zOM2NXRn&7um;ptF3pwn*Zp^zP7b(~Urk|RCpmg11LlF*2q!*F{2v^3+*P@xC0l<?0
zO^$dt+C&PrkRu~0R&UI8TZ_?xSA*1+50X(r57O+tH1lIr6+@vGq+ly>lrx;aO;vUv
zG^s8!qspY<W^zR{!d%l8))4|&DyOiz%Gd@4kb><Hm~m2gECN<qdPCUDe;SAuAZ1dp
z5p+1nYRY_TL(YE-y?wqOj8~f<?|OE(KwpeGkT1+9%l)jao2s}gCx;W7smL(X{X&5f
zl7ihdA(}RC$Z4E@(>(PZ!8XN5u#=o-XDea`i?lhWnW_;y_R(1M%S=fh?aDLSC-3~!
zr#?l#*}9;X<6VhER>H$us|`7cb(Ql+y!IV^R1yQqb!Zep1JN~7u#InwS;JLjlZ|e@
zHtEX}`Do@j-!LX+uAg(2dTnhGGSS|AMK^h-mA4`_OMJDhYcEvmE(j~i8)d#_e04HW
zp6?x4c93e?0ASLxd>)Wvx?%bH(}UFQ!emh}QZPchu*u%jG4ieFj0`g+?2cyTb^kyv
zcw-xzNg2|ah=S1P*na14j5CA*7IvX3hdnntbK6Vr$TEXk><F?xDemHsfy@!fiO({;
zrvyDNq9T~XO#QMSt$^BT{EYl&5+wPoo%I%ZXlc$!0_s5WP%b6cK6%E-M6mfPYgU`2
zC0mhdWL35oszuu;YYr}J$;ufyNHF#yXg1lC!k!Yg$qJtfUc+AyBz`MS@S-B$bY*fv
zh>#-Z(F%e=h;al#mb&W)f_UZ0Vv4zLT*BIX<C6T+jLr5-jJgxxFl^0T0hiUrR6Mld
zayqolnlB`M#gMfP#IWeMR%A1coclRjy%I+ZSwkkYYA;vABY}*VvO0s9+G3A8z9Jvq
zl#Bm}OY00g928yYwn5?SW3%vqy-(ty$=%_hb=V9z_9^fydr*5;=OHSh^R^JB^IAiI
zq&4Kew1#ND!=z$-hoS)AZ2^6IeJXAF9*hE4eBV_n%adFAHPjj%G=h#9kB`yE$Y+@j
zK@q0g0vt>Sl4knjZl+g+q!`noa57!<1vulaC_M9JC7lFiVI)-xAB0nFd?YE@QIWq+
z>(E+b;o&O+<V^`O4=kH&ISnT6cC$6YGAspqGt4vEgn-&uMYvI>2&D)gCJ2xpLp?Yk
z|7|D`?5)VRSPy8p%(!IVV374X&@oQvg-c+q7^O`e3Oa_Fw%4u66Z-{DXf_Ky6wyNh
zc~CA=aA!sS;%VhUba<k3&9Y$z(X3B37yX!TfUyZua7#u07ExI6aKfRmK++1k->tC7
zvY5g`;Z#_fm<;BCqaJcLNO(|xxaXl-i=ut4t+qOSeTr5k;0{&dHu;l+owg>jy*Jbf
zc}0cHSU0O?Z^1L@kdDqEh;@&_SVRW$0r`slkb>Jm5`4_GyhS;%-s7o~Xz4Hom~hII
zvste+SprhNeqFMW0xFVSqAV0pL|JUr9m)bEtt@-f$^uAp5F3;k);U?|E2oVwjma^f
z#z>-gUwae271J&#oZ6-J#TGE6z5sXV%OSb_s9dDr!+>M)qj%01n`C7MeG!@2@*FY)
zl9t)|w9Eii<RS&Th$D)L0Ez-4um$uL0i`qCCk3Oxu_fzNO>n8L8i+$m6}g>Q24Hf>
zs?F<S+R<w24f10Jso<?KS5mMKd@NPdL*%|~CM!+|i-^+}<Pay2v^ZDY;@mGJ#l#6k
z0dd*_`ifJ_3b;d7S{DJA<uXqe7)d2B-!bp&$ub>^B22d>IG7G3&Gb9nOvlj|V>%QC
zm~IOglIg%5Os9n~o)qi`T$al)9ZN}=J{P_$D9d(eim=_5;b1$EG~3U(*-jK#jO|bq
zV7o0~NVWrauw9Rk0mp2o;r*A-0WHF9o3(@6K+@bEcXJyTS&Z9I6yUZkU`TEQcW_(J
zZvc+D4OP6eAgkP9i?G|~?O->MG`nAPv-^OM6k|6O1=wv17?Rz<9qh*Iqu``q8(>@s
zXWdF9C~=_e&Q0u!_Thv`!5+Y|Y-lp8cIDjs-gl^Fr36(GDcMpSQUbDBuHL27A9G9T
zL4g;O5)=ibWD6KlO2D_s)n@~7MQ$ab5#X5dhL^psh|97Zd=Zx0{2eR@l4kj|o8<?E
zq!`PgD8O=CKwp;YK@V^ypkAogYVrHF+9NQQ1RHfo1i==$`p8I6AOMbK#1JxC(w@AP
zukRXnNQ;Qe7Ud8Zkd(Nd`6q+LMJN|V-BE2de{>WG1BwY43a5Z80!Z{8I8)l=vb#*y
zHdPxZeR(fgdu~~F1m``|wH4~C5L&*#9rC3f$@B+c*mK7Bn`6x-v)@SO%*$_lCRClH
za__KQq~Jc#h!k{mP}EdyglA~>sHl2PUPSWvv17-M9yxUUDYIrnKMp60SfMt^7kOPH
zI?A~AVYx`b-JlS(+`QzkoqQ#~j3=KwcJ$~IgQzE(eW{;#^7tU?$xdJDA<CX!{QFSP
z{=LdRznWL};UmWn9ew=pQQBP*4r{f{x7P>$@s6|L_46xagr2eE%S^+HH21E8)15Im
z9MoJlSHq6TEhaWd!M%VnB>}q>?C?{MKmPdf!-pQHIE<Cvo)nCd0}AGFBS2DaWW(pu
zZbS!gs3y#bc7V-#5+Ph--q1K$?Lfd5b0ARA>hXT3gy>l%TY%FcB+(FX1Ypk!3m>qR
zuYdPhBP~5HuvMAxSLFnT)aFC&Xn;B#O}5Ul-ER|0*$f}QfE6h+*+9=m3T`ED{E8d}
zA=@B3;fCCvI4<XzpRGA>eDD_+^|r~1<dvv8(0o;w8#zyX!4J?WAZeZ2p4KVtdm%Ah
zli%pB$PuCSg)v@(idLCAXsvoge#VuW9r3)<RA#K3OWwI=xE9Fhp?**b1yypbEdw)1
zSM}p)D7MPQ`mWUT?E%2#0k@vVCdZqj9Mey@wGx5csgbTn+`zX1H+zFqmDOsW15K){
zT>;STajxkK>);G5@*H|?83dc;ie9-hDj!SN_#+7`(VZ!1WFf1@9Ba!!p$D$DWj&a_
zYs<jE&c0r%U*%kD%g7YxWa=NU6LYUEg9bIwG=0~W0Y|@j*OvX}Z~QaZxnF+9%t*m*
zfb?-i)|Nqo0rmC8dW8{iWMSW3M+6kd=!we)Mwb>2TQf`0bdLx4rWhQ(Vlm&u2Cq^h
zGnkbi6FbN^nck&magSJ$EE0cfo6`%`hO2uP@Q$7(-_HzOrADq;OAJg}md~x8wP$g|
z@*PqSQnw2_RFxErPy?(xTBYXj*{)S;<bn>_<!4ex-YPX<aLU5^tx~H9MvE%$r?<;3
zb>wR{+@che@2uCAM{dzh2HlqfL8S^TX0s%N7qi94c!^rF);V9QX5E?T3=;Y0Yj*Dn
zwO9cv(h|)s47C@kHK0${gBP>KEgO0<8x-5+8upwa@R_hi2l+s-L=$lEA{+$yebk^2
zZos0qIKK#&h#=pnleKKI0APMHfF(nMs026+`-fQcM#flK?`+(9I-tvX14xEk^hOEW
z<;pC2Gtpl*mfI*;*P=J_L!4&O+Z)%zSO4%Iap_=^(e|LQPqz&UXXl@VJG({g@X6ib
z@R|2HAQvgP190r3=w8j4Bl4mqyM!a0x^2_!irh}D6-qchtby2)9Ail!X*Ic;Ruj$q
z$AqL9^Pwofd|N=@m_#!lxP$qClgI>c%zS#&i20|xb@;8rU%)KLkWrl13D=wm?p)LK
zDdALCHuoJ6bQ%o*=enz_ek(byts=J)X_7m>SH$gk&2ue|FfwaBa1~{0qg@4fZZXj|
zAp`h^zsjCdsZm&!irmw=7ts~V7>BL^N$bkPX<f<If;L{Lw>sTwW4zmH`z>`YqSh^D
zQi|yo6a{q47BHl40e9$@77*ZAx9Dgh-I`&jnK5S2MFeDXcL)ebT0jq_1*BE{u#lkQ
z;n{X(Q%cX8qnvR(1cM}`V+JU0p$IvR_r>l?eA=<e{9(C)dn5%P0*XbAU9QTk+>4wG
ze13JQRjqk1$;@}O1TgMN_X{!^{n(a_n-_e_dX-Q5{)(M5D!(mQWZ<N!Hx<pbh(>qq
zl!N1l%8B0NXEN7)2tcQ1YSjl0W8-cBUWG3qD}VlnKm1|VJwX986vd2x#cP${dM9iy
z%L0gINx^LpFvyJwgiCYcMm(81m)EU+p%xP5Ye-Ba%hRZuDJWbLn<Y@yx>#+zBBz0Q
zwep)%IPJ(XikA1a$^2G`4-92+ZegL(W$djSOTK17B!`T3Wo4ojV7PT((cUk$K~qS<
z9@s`d-9vlE&!KuyFg&Uz1^b{Pf)^??CE+Mek2fGBda{JMW#zLx9B)soH#y*hx9zrL
zW62U=_94L;UygTUP<L*XLukY9L<cRF2P{9H^Ew@w%WRMF;`XTt-X3B*SR>t`DXF2N
zBm{g&E>dup<zP;k3|PlnE5A6gyeLQ!Q!4T!1$R<11B9HCXE@JVkrG0oY^30BNV%Ou
zY6e;9S{I}Kg{v*cHMBavSheRpFH1c%zvg}E@>RiEO+-l*zl{6mSF`09o5BT<g4^?C
zGkf@WJedZW=~@61vXFub-{`J;%Q188vrI$FBg}QqO2*73T{o}49ITB=2B`Ahqet7%
zTVhHk15$7gr8DTuFFo|~dlwfMpI=;j+mwA&zz~sw`}kCmE1#U*qY`F{<*Mor)~uxZ
z=1qlC|D$pJ^E*muW}~w#z3Qs0z>YiDFGRhKj?1aEBX-I<J!;RAm$;`HTV0hGuCNs_
zbV*sIgQtpQnuX!Auc9F*afpwK-CuqeBBy}Gg~>@v@@80hhhZxwsz~lhL`{3ja+#HW
zCUTP)Mf#C&U_iH)-=Tx=$FXb)CgUMrX=Q8V2nm6tL&AgUkWdd|AlW6C^z*G#D}E>0
z|B@399ueT6a8UR5P&mV)EZi9!Xr&`}htg?R0yvf^U9Jt-&Gv%6!*Ixoh{+b?5EGEJ
zm|jndNvjtgq8R6)D8PAJK;N)Ta~`;Z^A)+B*b?BF^YAh}BU@b93)S{Awv@#eVY$uU
z!EzvJmS0P={AmF_DHkbt5R#2@nNu-F2ohf#XEDODiSb8{J@xn#^5=<(M^2tRcIuJw
z<A)~351%^q)RE(duV#J2F`?Zp*YIbCLQz0?wt&9Edqna}LM`C*%V9hiYCb(`_0q|8
z$$~Qy&NXqg$ziZ|<aMJAu|x9Oy8w<Q&p2vM4$!Upyn!(*cECl%ZZmg?9Y|X22hw8K
zmUdi7iU|vf0>ZKd^c5DR<C00iC~%%xgu;p*m}z4K;t+|R{I+2BYc=IH7whG<)4zQi
z($G&Jz{R4Y0<y|wwz{4(Q3=v5w>^TORivN{ev@2tt1XG6%J#)^*=AF`L%8IV7VdSo
za32?vV#0-@fN*UAeTAzf2YhJB0gfetXW}_Wjy%A*<)K+^^L4NqNSf83b+h^jAt}ac
zC<?IJ7BD2Mfjd~O1605<t9Qzmd0GBQ*j?$nf)tV>T(?CyxDF)E^`mL7R|J%FwRB(j
zj<JQ$cI6}+h6!>|;<8`6Rem(%_1omX`6B;=4d5xlwd@AWAW7<3Gbr%(1DD-ofXO2^
z?TrB59Oal^#iBz<kVtIEBb|VwbVDq=$$=)-)yr;xq6}&&4O}-f{d!CcmRky|p9>=2
z<S8Nq_|M*DH}cga{P^wi2`Q6;ji8Z*d)W;r^uV?3rU%n^*$o({4fm^@YuOE%@}MOi
z^$&5R6EvuSrs=!v1~~d9aK9BD>6E+d2H-w`&Lf@jTPZKd^;_nlPdLKODlTT`^k;T%
zCD=wqu=Fr4$gH}_H=ksoOuvN(mJtau(QyjL&`H5okchf>olNXyDsm(1m3pCC!}F_a
zPN<#snoFJK@->+-LA!MaN+ld#J>M<GYibfE3;-rP$ggP6lA4$WS?QvWJxI*~=m3y{
z5!!`~M~iRFSUlfzyB6P&3s!Ac)kqoP;+tQVA3q}(>3t(f?90N85wu562{<_9UwiHo
z|KP$mzVVH(RHy#^zxx-z_4UR=ZSg<<*Z2PV?>_kY>o2XZUi#RJFMjon<q!6a&&<!i
z{r2S_{^&1We*44+AN-#We)fA`d*_RYjIk3J>2J1BDcEgG>$lV=%jvjBCLEoYvjODw
zSmb{|zS{hQz2uK6M~9r8Zq;iev~F~R{D~8Ey3dd4hCjy2k_=w?6C($%{K+B{<;yp~
z-sL>8_En^%Sp)2aYW3@r_2891aeW;tf3p1-^^`~3Ezi7kBzo)@4Q{ekF(XHF-ma16
zs1T2AM1t8?VkF_wycc|V(`7r(+5|sYe36iire?+@`{YO5Jt?>e2>wV`_@tKbx^an&
z^F2|rVhGNeSD$2=%5&EQIE;LUSXxAj@FBfRi`LRXXx7(3(syZ5HUL7x7ppv{qXXXd
zs=Vgss=WU6>SsS|-U6M?A6IDzdTsA>@?*YQ&{G<?YVp;hM~{Ke58e#^q8#?kJL}4?
zM_4_<0e5gN3D!LNeB(q|k*q4CKW5F-mp>?#-u|DZ691`#o`rZyV1r_A-5)>!(|Pbd
z+im8a2m{6$ooPPXO7x9Lw2KCg<K<Pbt-5)*I3izjBm$D!pIVc*Ms>W4_0DoQF(ehw
zn{xv1=;gE3KqOP`xrXPhnzau0tXgd|WE=M>)O=pHxb+P1vS=*qY<ES@Hb1u*9ZO?+
z6$GdsI*_+<a`hG2r`D0jsPbC#T6?;>#K_&GtfoR##39)Rs4--g8>YLI^Kj%%uTkOq
zPf)n-|Hv$D=&iJ&Yb||RNCs)CRw*c)8n|Bo6haDi1IKa7bDNH_Tw$dQX(#8;f1+mx
z;sHS<{XaAqbc$x)Uy@}Hb{5Sj<(+~ecT%tgIx_^2vM$JZLsAX`G@+MvSRk3w8khO2
zjwjZ^jHxU%SmD6=Ftpdo0Kpw;0@jR49h*(wDrri|vTERXz_RK_nKB$Uk`-L6`KH?l
zE7Pm}70D0_AO*LOeG%0JPYFsjwZZ{OE8IP9h5IETDW-5xI2BI&bKslg3deyE#tDnj
z60)`F>mR8qJr5}u1rAGCLJ@109?k%92=Pw2ohYo$&pe_GL*liLyjPEken^mL94Xie
zlD34er^eN`&r=g)1p}cMVrWH35|toVw@T=KHO5oEoc+k_b<UUHh^jFddm+Z=^Hr(Z
zBa-bya*=|&D7uG3IeSfyK5^uU<HwI2d8$A6ROoOmdikAJY062f^p&(q>)CKf(6~=d
zHEZ4)y@^={q3!h<`MH?hL*dkWt;)85zN)PC6u3iAKP0yk?E{Po89jwN{ZDTJ>Q*T&
zdYiQpy%q_Ov`Dt4MWVU=tdJDrHWUT8Z3`HZ+rS;%-Y>Ul04dlFIOaCa$IR84!9Y)F
zQ;{2qB|}q$?Y0aD+kvFne#*`E=Y*sf+o34Hc3Z%ZYzOXOyEY)eG25xr{1sW}-IwFQ
zi*Vd#@8CF)G{^69bNqQBDaLUq3UJ&OFeJx;J2<Wl8*t2VhJ)u%kB3W%`*IzUB3!pc
zIJgcZ&GojM>nDVy7}udF!1WmJx0;?DPF<^a+jKFcec3SPg#1i>h7=NThmf@I2OJB@
z@M&t?)QW0U<mNqck%C)J$loHu0Z-Nr;Q&bs=PPdEj0s6G;XvUO4nq@SUDEp_z!`;^
z2=n$)nPa{G`t#C`(bDFfrO#YPpG;WxVflYIUnB)PY_<Bzh&m^sCUD{%HQXUL+fUpm
z196BEFrp*{+W^O6WUl7?l+4Y`K``<f2@xcH{a(39!DhgyTNrI3Qj-7zBK#o*n*bsn
zIRW1c>nOpry(0e;#Q;`BF>Ga(VjzUWa*_VGsiJYxvffaRi*0$$h4nqi;#;8rKv7@q
zacq5ir^3GER;QDaQ89Ib!l_PLF>C>S6+=rMxI^l9$!!K1q~K=2vDBeDKQ&XW)nuh*
z)_TDrqzDi`%(PBtCwK%({-j_#ct+b1p2s2zooyvdiO^;mTfw!uk~vx$!DUWVfh%$=
zQ7>EbVfWdAhbv0Gw4wk>`<;L2R+MoeDW)h;(Csndw<7klzyjaiRj_)r2%KrLu!}q`
zGhH%Nj1C&s%m!IN18vRwYT$j6UqvobunRcz<&)K#CodhpQ1`B!3lD@~#wDBx(K-vo
z&^ilP>FkBszTp7aB96u8?T|c>wB*O!lAjQgVv>iVfPicPeFdc14cx)*`{nk2xk$kt
zz-772*p60QkatG;<JDEPt1siBD#CbMii7b$(v08XX8b83DaLpx3NYRlFeKxF56yVM
zDaM;kmu8@MrrNA7$y#;sx)s4Cz7DD)jJKsY7!M@P_)ePfIzX5d65R7xy)_Z7LF_*L
ztKZI67a-3G!efMFQ%g-As&&@o4WZU^Y2N~VkVN+j1}ajp8wvuF&?`#EzF1!{v549s
z_JANhDi<lZ9U3z!J$HJnz201ic3??B7rs1<xxJha4l<|m^eLr5lof8%^jq`GEjb@Z
zxp|@*_Meb~3Z+nixHe|33=3{Y=qyG?O63nE-6T3`--V_-eKJ5rWcRLwMV)XX8%#CR
zQjf@oWLga@$|Vb1WGcMvovF(S_T3eP6bV+bQFk*ClW$+^xL<A}EmE*2hS%G2`qU+P
zY*b@|4CnlB3^5_o^EKjBtuE&?PuJyPUifUPXSawBOehBio?2VweIOmPk(Irv(IkDo
zlqRdPm!wI<+w%BJwwA0%n>oMue)t4Icg7S#^wYC!C)S#K<##wm3U-3TR!%qkOV!53
zdb36+9w%%@FE)aJ&|l*7%dGBw`%8K2W<WW7&4Y5AhLVDPfT{n~$D(aB@=w|*t1mK}
z-t%>7nhosd7ANGT<@H9~(1ViY0l7%Q9TdWV<BTU;0)&rdL*rPpHnt!yvy*+~a_D4C
znUw+0FwnII<oy=L<yS5y!$?ek3RAOg0;7nrJQB_b0vGWSxk$lnGzifc8adck7VAoM
zcG6oGx%kPpqpY}TrY7QB-1uxO;(h>$Ui4e9$dG2iJO;?OxU;f5w`~r%Ia6PX7Ni-6
zm2EV>(Y`IH<E^er3sUPz^F2cNa5Ua-71>0l@%hFoFHT#L*CZ~lx9bb-Ilm#t7sjp6
zw<AN*T1RhiDduTfR!MN$v);>cL|;$E8Xiv+6Ww}LKo84B3hqXTFfl&o-OgP{EsA!>
z4yfL&D1K{63hMDX`3*6f^rABlKPTm)idp}Jw$Ig<<ZUaKqerNL@z53dkaYOeAI0rI
zxXI#~MhNv);&WR-oPSpR=vQL>wlfY!1o;LLW7&eR#2fOgew%eI`34aaNgor=Xl;;U
zujiX8S{oD08`j4(n+;FV652@$M&S}hq{19Mqyz#%wCwDn*Qm88>uYvlLAIrYJZ9?M
zYs=m`-5p26E_?;8B?Y%qLMo6djiv)BEYv#Y_iu&-FC;eKs2PLChutG@UkqOY#c1m6
z{8d4Cqw+`6^QCFI_orVUEsvDTBU^Tij+EXhkCsPAM{nA=^XAgM8#e7NRmvl`@j9{3
zY#QA#vRU3WHZQlgY};FUY;^R<$d4Aw8%kTZjQn-!C;QDb&qkW@bm^&mrTeBowz)Jq
pS~~G^X=G_@Y3JI;((hd{#fE=Qot-cra8smb9&7oR8vfdI{};(LnbZIP

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/output/container.model.json b/rojo-test/syncback-tests/duplicate_rojo_id/output/container.model.json
new file mode 100644
index 000000000..9c551865b
--- /dev/null
+++ b/rojo-test/syncback-tests/duplicate_rojo_id/output/container.model.json
@@ -0,0 +1,13 @@
+{
+  "className": "Folder",
+  "children": [
+    {
+      "name": "value_1",
+      "className": "ObjectValue"
+    },
+    {
+      "name": "value_2",
+      "className": "ObjectValue"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/output/default.project.json b/rojo-test/syncback-tests/duplicate_rojo_id/output/default.project.json
new file mode 100644
index 000000000..3343677aa
--- /dev/null
+++ b/rojo-test/syncback-tests/duplicate_rojo_id/output/default.project.json
@@ -0,0 +1,11 @@
+{
+  "name": "duplicate_rojo_id",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "container": {
+        "$path": "container.model.json"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index d768f4607..11e8a372e 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -26,4 +26,5 @@ syncback_basic_test! {
     ignore_paths,
     project_reserialize,
     project_all_middleware,
+    duplicate_rojo_id,
 }

From 2d570cbcce60a080d84d2a111a5d423e5a60f2f3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 1 May 2024 14:34:14 -0700
Subject: [PATCH 306/366] Actually listen to middleware overrides

---
 src/syncback/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 4faea9b5a..c9346c87a 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -267,7 +267,7 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
     let mut middleware;
 
     if let Some(override_middleware) = snapshot.middleware {
-        middleware = override_middleware;
+        return override_middleware;
     } else if let Some(old_middleware) = old_middleware {
         return old_middleware;
     } else if json_model_classes.contains(inst.class.as_str()) {

From e8ffba790d16b25d8907d50cb7dd41bb3ee6460a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 1 May 2024 14:34:33 -0700
Subject: [PATCH 307/366] Redo referent linking (again) to catch duplicates

---
 src/syncback/mod.rs            |   2 +-
 src/syncback/ref_properties.rs | 222 ++++++++++++++++++++++-----------
 2 files changed, 149 insertions(+), 75 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index c9346c87a..70ae56167 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -63,7 +63,7 @@ pub fn syncback_loop(
     strip_unknown_root_children(&mut new_tree, old_tree);
 
     log::debug!("Collecting referents for new DOM...");
-    let deferred_referents = collect_referents(&new_tree)?;
+    let deferred_referents = collect_referents(&new_tree);
 
     log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index cc08267c3..4c8f6f820 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -1,17 +1,25 @@
 //! Implements iterating through an entire WeakDom and linking all Ref
 //! properties using attributes.
 
-use std::collections::{HashMap, VecDeque};
+use std::collections::{hash_map::Entry, HashMap, VecDeque};
 
 use rbx_dom_weak::{
-    types::{Attributes, Ref, Variant},
+    types::{Attributes, Ref, UniqueId, Variant},
     Instance, WeakDom,
 };
 
 use crate::{multimap::MultiMap, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
 
+pub struct RefLinks {
+    /// A map of referents to each of their Ref properties.
+    prop_links: MultiMap<Ref, RefLink>,
+    /// A set of referents that need their ID rewritten. This includes
+    /// Instances that have no existing ID.
+    need_rewrite: Vec<Ref>,
+}
+
 #[derive(PartialEq, Eq)]
-pub struct RefLink {
+struct RefLink {
     /// The name of a property
     name: String,
     /// The value of the property.
@@ -22,7 +30,9 @@ pub struct RefLink {
 ///
 /// They can be linked to a dom later using the `link` method on the returned
 /// struct.
-pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, RefLink>> {
+pub fn collect_referents(dom: &WeakDom) -> RefLinks {
+    let mut existing_ids = HashMap::new();
+    let mut need_rewrite = Vec::new();
     let mut links = MultiMap::new();
 
     let mut queue = VecDeque::new();
@@ -30,53 +40,93 @@ pub fn collect_referents(dom: &WeakDom) -> anyhow::Result<MultiMap<Ref, RefLink>
     // Note that this is back-in, front-out. This is important because
     // VecDeque::extend is the equivalent to using push_back.
     queue.push_back(dom.root_ref());
-    while let Some(referent) = queue.pop_front() {
-        let instance = dom.get_by_ref(referent).unwrap();
+    while let Some(inst_ref) = queue.pop_front() {
+        let instance = dom.get_by_ref(inst_ref).unwrap();
         queue.extend(instance.children().iter().copied());
 
-        for (name, value) in &instance.properties {
-            if let Variant::Ref(prop_value) = value {
-                if dom.get_by_ref(*prop_value).is_some() {
-                    links.insert(
-                        referent,
-                        RefLink {
-                            name: name.clone(),
-                            value: *prop_value,
-                        },
-                    );
+        // Collect all referent properties for easy access later
+        for (property_name, prop_value) in &instance.properties {
+            if let Variant::Ref(prop_ref) = prop_value {
+                // Any Instance that's pointed to as a property needs an ID.
+                let existing_id = match dom.get_by_ref(*prop_ref) {
+                    Some(inst) => get_existing_id(inst),
+                    None => continue,
+                };
+                if let Some(existing_id) = existing_id {
+                    match existing_ids.entry(existing_id) {
+                        Entry::Occupied(entry) => {
+                            if entry.get() != prop_ref {
+                                need_rewrite.push(*prop_ref);
+                            }
+                        }
+                        Entry::Vacant(entry) => {
+                            entry.insert(*prop_ref);
+                        }
+                    }
+                } else {
+                    need_rewrite.push(*prop_ref);
                 }
+                // We also need a list of these properties for linking later
+                links.insert(
+                    inst_ref,
+                    RefLink {
+                        name: property_name.to_owned(),
+                        value: *prop_ref,
+                    },
+                );
             }
         }
     }
 
-    Ok(links)
+    RefLinks {
+        prop_links: links,
+        need_rewrite,
+    }
 }
 
-pub fn link_referents(link_list: MultiMap<Ref, RefLink>, dom: &mut WeakDom) -> anyhow::Result<()> {
-    let mut pointer_attributes = HashMap::new();
-    for (pointer_ref, ref_properties) in link_list {
-        if dom.get_by_ref(pointer_ref).is_none() {
-            continue;
-        }
+pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()> {
+    write_id_attributes(&links, dom)?;
 
-        // In this loop, we need to add the `Rojo_Id` attributes to the
-        // Instances.
-        for ref_link in ref_properties {
-            let target_inst = match dom.get_by_ref_mut(ref_link.value) {
+    let mut prop_list = Vec::new();
+    for (inst_id, properties) in links.prop_links {
+        for ref_link in properties {
+            let prop_inst = match dom.get_by_ref(ref_link.value) {
                 Some(inst) => inst,
-                None => {
-                    continue;
-                }
+                None => continue,
             };
-            pointer_attributes.insert(ref_link.name, get_or_insert_id(target_inst)?);
+            let id = get_existing_id(prop_inst)
+                .expect("all Instances that are pointed to should have an ID");
+            prop_list.push((ref_link.name, Variant::String(id.to_owned())));
         }
-
-        let pointer_inst = dom.get_by_ref_mut(pointer_ref).unwrap();
-        let pointer_attrs = get_or_insert_attributes(pointer_inst)?;
-        for (name, id) in pointer_attributes.drain() {
-            pointer_attrs.insert(
-                format!("{REF_POINTER_ATTRIBUTE_PREFIX}{name}"),
-                Variant::BinaryString(id.into_bytes().into()),
+        let inst = match dom.get_by_ref_mut(inst_id) {
+            Some(inst) => inst,
+            None => continue,
+        };
+        // Ideally, this method for getting attributes would be a function
+        // since the code is duplicated elsewhere. Alas, it runs into a problem
+        // with the borrow checker, so it can't easily be abstracted away.
+        let attributes = match inst.properties.get_mut("Attributes") {
+            Some(Variant::Attributes(attrs)) => attrs,
+            None => {
+                inst.properties
+                    .insert("Attributes".into(), Attributes::new().into());
+                match inst.properties.get_mut("Attributes") {
+                    Some(Variant::Attributes(attrs)) => attrs,
+                    _ => unreachable!(),
+                }
+            }
+            Some(value) => {
+                anyhow::bail!(
+                    "expected Attributes to be of type 'Attributes' but it was of type '{:?}'",
+                    value.ty()
+                );
+            }
+        };
+        for (prop_name, prop_value) in prop_list.drain(..) {
+            log::debug!("adding pointer for {prop_name} => {prop_value:?}");
+            attributes.insert(
+                format!("{REF_POINTER_ATTRIBUTE_PREFIX}{prop_name}"),
+                prop_value,
             );
         }
     }
@@ -84,44 +134,68 @@ pub fn link_referents(link_list: MultiMap<Ref, RefLink>, dom: &mut WeakDom) -> a
     Ok(())
 }
 
-fn get_or_insert_attributes(inst: &mut Instance) -> anyhow::Result<&mut Attributes> {
-    if !inst.properties.contains_key("Attributes") {
-        inst.properties
-            .insert("Attributes".into(), Attributes::new().into());
-    }
-    match inst.properties.get_mut("Attributes") {
-        Some(Variant::Attributes(attrs)) => Ok(attrs),
-        Some(ty) => Err(anyhow::format_err!(
-            "expected property Attributes to be an Attributes but it was {:?}",
-            ty.ty()
-        )),
-        None => unreachable!(),
+fn write_id_attributes(links: &RefLinks, dom: &mut WeakDom) -> anyhow::Result<()> {
+    for referent in &links.need_rewrite {
+        let inst = match dom.get_by_ref_mut(*referent) {
+            Some(inst) => inst,
+            None => continue,
+        };
+        let unique_id = match inst.properties.get("UniqueId") {
+            Some(Variant::UniqueId(id)) => Some(*id),
+            _ => None,
+        }
+        .unwrap_or_else(|| UniqueId::now().unwrap());
+
+        let attributes = match inst.properties.get_mut("Attributes") {
+            Some(Variant::Attributes(attrs)) => attrs,
+            None => {
+                inst.properties
+                    .insert("Attributes".into(), Attributes::new().into());
+                match inst.properties.get_mut("Attributes") {
+                    Some(Variant::Attributes(attrs)) => attrs,
+                    _ => unreachable!(),
+                }
+            }
+            Some(value) => {
+                anyhow::bail!(
+                    "expected Attributes to be of type 'Attributes' but it was of type '{:?}'",
+                    value.ty()
+                );
+            }
+        };
+        attributes.insert(
+            REF_ID_ATTRIBUTE_NAME.into(),
+            Variant::String(unique_id.to_string()),
+        );
     }
+    Ok(())
 }
 
-fn get_or_insert_id(inst: &mut Instance) -> anyhow::Result<String> {
-    let unique_id = match inst.properties.get("UniqueId") {
-        Some(Variant::UniqueId(id)) => Some(*id),
-        _ => None,
-    };
-    let referent = inst.referent();
-    let attributes = get_or_insert_attributes(inst)?;
-    match attributes.get(REF_ID_ATTRIBUTE_NAME) {
-        Some(Variant::String(str)) => return Ok(str.clone()),
-        Some(Variant::BinaryString(bytes)) => match std::str::from_utf8(bytes.as_ref()) {
-            Ok(str) => return Ok(str.to_string()),
-            Err(_) => {
-                anyhow::bail!("expected attribute {REF_ID_ATTRIBUTE_NAME} to be a UTF-8 string")
-            }
-        },
-        _ => {}
+fn get_existing_id(inst: &Instance) -> Option<&str> {
+    if let Variant::Attributes(attrs) = inst.properties.get("Attributes")? {
+        let id = attrs.get(REF_ID_ATTRIBUTE_NAME)?;
+        match id {
+            Variant::String(str) => Some(str),
+            Variant::BinaryString(bstr) => match std::str::from_utf8(bstr.as_ref()) {
+                Ok(str) => Some(str),
+                Err(_) => None,
+            },
+            _ => None,
+        }
+    } else {
+        None
     }
-    let id_string = unique_id
-        .map(|id| id.to_string())
-        .unwrap_or_else(|| referent.to_string());
-    attributes.insert(
-        REF_ID_ATTRIBUTE_NAME.to_string(),
-        Variant::BinaryString(id_string.clone().into_bytes().into()),
-    );
-    Ok(id_string)
 }
+
+/*
+When loading IDs we need to create a list and if there's a collision,
+cause it to have a stroke. If that works to catch the duplicates then we just
+need to re-serialize the IDs that collide. I think it's probably acceptable to
+just pick one of the two if we can't tell the difference between them and give
+the other a new ID. Maybe we emit a warning.
+
+This is gonna require a redo of the linking a bit, since it'll mean that we
+can't just blindly use the old IDs. The plus side is that it means we can
+collect these in a way that isn't awful via mapping an ID to a referent, so
+it may end up improving the overall quality of the above code.
+*/

From 11fef88666bd0d61f78cb537a99f9983d9ec322f Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 1 May 2024 16:30:24 -0700
Subject: [PATCH 308/366] Update ref_property linker to strip out unnecessary
 pointer attributes

---
 .../duplicate_rojo_id/input.rbxl              | Bin 53725 -> 53809 bytes
 src/syncback/ref_properties.rs                |  35 +++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/input.rbxl b/rojo-test/syncback-tests/duplicate_rojo_id/input.rbxl
index fba397a34f6b927416595fd3c2b9d14a7d38308e..8e3e83691e01b382e3dbb0e5fab595ce5acd1ad7 100644
GIT binary patch
delta 221
zcmcb+n0ez8<_)`?&F<X2cb|=sLBIuwGl4h~h$jMZ8W3j#u>cTv0P%iCh6T+aPyqs)
zKR7oFv#w@fVE8n-B3!k85|G6V#Oy#El%JI!@0r5H!%$F`m{Xb>Z)ncID9-SiJtVOx
zJ+&m>DL*GaJui{T3aB<SO@W``gP1~US!$6&YDH#oNwGpA5GfQC<rkzDl~gL^rz!X+
yWu+#UgatCRD0nIqmS&a+<}xscF)+$7aFjE|+W?K>V4B9j&hNm$x%omkZxsM=y*;`B

delta 136
zcmdnEg!%4b<_)`?&F(*V_=t^>LBIuw^?>*>5I+Ut3Lp*uVl5yR1>!A?3=3jF;0Oq8
z{@~m!%o@(Xz%XZWMYyW54UokI#Oy#El%JI!@0r5H!_ZQem{Xb>Zzw3v&=8VXl%84=
UA12Pgp~%4Rz@V{NC4#pK0BVdRp8x;=

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 4c8f6f820..26544d9b8 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -88,6 +88,8 @@ pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()>
     write_id_attributes(&links, dom)?;
 
     let mut prop_list = Vec::new();
+    let mut attribute_list = HashMap::new();
+
     for (inst_id, properties) in links.prop_links {
         for ref_link in properties {
             let prop_inst = match dom.get_by_ref(ref_link.value) {
@@ -102,19 +104,12 @@ pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()>
             Some(inst) => inst,
             None => continue,
         };
-        // Ideally, this method for getting attributes would be a function
-        // since the code is duplicated elsewhere. Alas, it runs into a problem
-        // with the borrow checker, so it can't easily be abstracted away.
-        let attributes = match inst.properties.get_mut("Attributes") {
+
+        // TODO: Replace this whole rigamarole with `Attributes::drain`
+        // eventually.
+        let attributes = match inst.properties.remove("Attributes") {
             Some(Variant::Attributes(attrs)) => attrs,
-            None => {
-                inst.properties
-                    .insert("Attributes".into(), Attributes::new().into());
-                match inst.properties.get_mut("Attributes") {
-                    Some(Variant::Attributes(attrs)) => attrs,
-                    _ => unreachable!(),
-                }
-            }
+            None => Attributes::new(),
             Some(value) => {
                 anyhow::bail!(
                     "expected Attributes to be of type 'Attributes' but it was of type '{:?}'",
@@ -122,13 +117,25 @@ pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()>
                 );
             }
         };
+        for (name, value) in attributes.into_iter() {
+            if !name.starts_with(REF_POINTER_ATTRIBUTE_PREFIX) {
+                attribute_list.insert(name, value);
+            }
+        }
+
         for (prop_name, prop_value) in prop_list.drain(..) {
-            log::debug!("adding pointer for {prop_name} => {prop_value:?}");
-            attributes.insert(
+            attribute_list.insert(
                 format!("{REF_POINTER_ATTRIBUTE_PREFIX}{prop_name}"),
                 prop_value,
             );
         }
+
+        // TODO: Same as above, when `Attributes::drain` is live, replace this
+        // with it.
+        inst.properties.insert(
+            "Attributes".into(),
+            Attributes::from_iter(attribute_list.drain()).into(),
+        );
     }
 
     Ok(())

From a5c2a1189b73ef3133bfa22770b20ff800234b01 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 2 May 2024 15:10:28 -0700
Subject: [PATCH 309/366] Rename `get_filtered_properties` to
 `get_path_filtered_properties`

---
 src/snapshot_middleware/meta_file.rs |  4 ++--
 src/snapshot_middleware/project.rs   |  2 +-
 src/syncback/snapshot.rs             | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 089fffa60..604de4500 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -81,7 +81,7 @@ impl AdjacentMetadata {
             .unwrap_or_default();
 
         let class = &snapshot.new_inst().class;
-        for (name, value) in snapshot.get_filtered_properties(snapshot.new).unwrap() {
+        for (name, value) in snapshot.get_path_filtered_properties(snapshot.new).unwrap() {
             match value {
                 Variant::Attributes(attrs) => {
                     for (attr_name, attr_value) in attrs.iter() {
@@ -262,7 +262,7 @@ impl DirectoryMetadata {
             .unwrap_or_default();
 
         let class = &snapshot.new_inst().class;
-        for (name, value) in snapshot.get_filtered_properties(snapshot.new).unwrap() {
+        for (name, value) in snapshot.get_path_filtered_properties(snapshot.new).unwrap() {
             match value {
                 Variant::Attributes(attrs) => {
                     for (name, value) in attrs.iter() {
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index b3b1c705b..6ef071e86 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -525,7 +525,7 @@ fn project_node_property_syncback(
     let properties = &mut node.properties;
     let mut attributes = BTreeMap::new();
     for (name, value) in snapshot
-        .get_filtered_properties(new_inst.referent())
+        .get_path_filtered_properties(new_inst.referent())
         .unwrap()
     {
         match value {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 702c023f4..178880931 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -100,13 +100,15 @@ impl<'sync> SyncbackSnapshot<'sync> {
     }
 
     /// Returns a map of properties for an Instance from the 'new' tree
-    /// with filtering done to avoid noise. Returns `None` only if `new_ref`
-    /// instance is not in the new tree.
+    /// with filtering done to avoid noise. This method filters out properties
+    /// that are not meant to be present in Instances that are represented
+    /// specially by a path, like `LocalScript.Source` and `StringValue.Value`.
     ///
-    /// This method is not necessary or desired for blobs like RBXM or RBXMX.
+    /// This method is not necessary or desired for blobs like Rbxm or non-path
+    /// middlewares like JsonModel.
     #[inline]
     #[must_use]
-    pub fn get_filtered_properties(
+    pub fn get_path_filtered_properties(
         &self,
         new_ref: Ref,
     ) -> Option<HashMap<&'sync str, &'sync Variant>> {

From 3434d0187d0a2d55ef7082fc3752d22ddf08edcc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 2 May 2024 15:12:36 -0700
Subject: [PATCH 310/366] Make error message for changing project node classes
 better

---
 src/snapshot_middleware/project.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 6ef071e86..f1917eb03 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -350,9 +350,12 @@ pub fn syncback_project<'sync>(
         log::debug!("Processing node {}", old_inst.name());
         if old_inst.class_name() != new_inst.class {
             anyhow::bail!(
-                "Cannot change the class of {} in project file {}",
+                "Cannot change the class of {} in project file {}.\n\
+                Current class is {}, it is a {} in the input file.",
                 old_inst.name(),
-                project_path.display()
+                project_path.display(),
+                old_inst.class_name(),
+                new_inst.class
             );
         }
 

From b9754c6cc10558ad71146c7a51bbda2bcebacce7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 2 May 2024 15:23:08 -0700
Subject: [PATCH 311/366] Don't filter properties for project nodes with no
 paths

---
 src/snapshot_middleware/project.rs | 34 +++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index f1917eb03..01e33282f 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -20,7 +20,7 @@ use crate::{
         PathIgnoreRule, SyncRule,
     },
     snapshot_middleware::Middleware,
-    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{filter_properties, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
     variant_eq::variant_eq,
     RojoRef,
 };
@@ -401,10 +401,10 @@ pub fn syncback_project<'sync>(
 
             // We only want to set properties if it needs it.
             if !middleware.handles_own_properties() {
-                project_node_property_syncback(snapshot, new_inst, node);
+                project_node_property_syncback_path(snapshot, new_inst, node);
             }
         } else {
-            project_node_property_syncback(snapshot, new_inst, node);
+            project_node_property_syncback_no_path(snapshot, new_inst, node);
         }
 
         for child_ref in new_inst.children() {
@@ -520,17 +520,15 @@ pub fn syncback_project<'sync>(
     })
 }
 
-fn project_node_property_syncback(
+fn project_node_property_syncback<'inst>(
     snapshot: &SyncbackSnapshot,
+    filtered_properties: HashMap<&'inst str, &'inst Variant>,
     new_inst: &Instance,
     node: &mut ProjectNode,
 ) {
     let properties = &mut node.properties;
     let mut attributes = BTreeMap::new();
-    for (name, value) in snapshot
-        .get_path_filtered_properties(new_inst.referent())
-        .unwrap()
-    {
+    for (name, value) in filtered_properties {
         match value {
             Variant::Attributes(attrs) => {
                 for (attr_name, attr_value) in attrs.iter() {
@@ -557,6 +555,26 @@ fn project_node_property_syncback(
     node.attributes = attributes;
 }
 
+fn project_node_property_syncback_path(
+    snapshot: &SyncbackSnapshot,
+    new_inst: &Instance,
+    node: &mut ProjectNode,
+) {
+    let filtered_properties = snapshot
+        .get_path_filtered_properties(new_inst.referent())
+        .unwrap();
+    project_node_property_syncback(snapshot, filtered_properties, new_inst, node)
+}
+
+fn project_node_property_syncback_no_path(
+    snapshot: &SyncbackSnapshot,
+    new_inst: &Instance,
+    node: &mut ProjectNode,
+) {
+    let filtered_properties = filter_properties(snapshot.project(), new_inst);
+    project_node_property_syncback(snapshot, filtered_properties, new_inst, node)
+}
+
 fn project_node_should_reserialize(
     node_properties: &BTreeMap<String, UnresolvedValue>,
     node_attributes: &BTreeMap<String, UnresolvedValue>,

From fb9e7373ab348c572f5a971819675b1254faed30 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 2 May 2024 15:23:45 -0700
Subject: [PATCH 312/366] Add test for project files that represent middleware
 with special properties

---
 ...__syncback_util__string_value_project.snap |  12 +++++++++++
 .../expected/default.project.json             |  20 ++++++++++++++++++
 .../expected/string_value.txt                 |   1 +
 .../string_value_project/input.rbxl           | Bin 0 -> 53028 bytes
 .../output/default.project.json               |  14 ++++++++++++
 .../output/string_value.txt                   |   0
 tests/tests/syncback.rs                       |   1 +
 7 files changed, 48 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project.snap
 create mode 100644 rojo-test/syncback-tests/string_value_project/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/string_value_project/expected/string_value.txt
 create mode 100644 rojo-test/syncback-tests/string_value_project/input.rbxl
 create mode 100644 rojo-test/syncback-tests/string_value_project/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/string_value_project/output/string_value.txt

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project.snap
new file mode 100644
index 000000000..fb423b5e7
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project.snap
@@ -0,0 +1,12 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - default.project.json
+  - string_value.txt
+added_dirs: []
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/string_value_project/expected/default.project.json b/rojo-test/syncback-tests/string_value_project/expected/default.project.json
new file mode 100644
index 000000000..7e717416c
--- /dev/null
+++ b/rojo-test/syncback-tests/string_value_project/expected/default.project.json
@@ -0,0 +1,20 @@
+{
+  "name": "string_value_project",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "inside_project_file": {
+        "$className": "StringValue",
+        "$properties": {
+          "Value": "imgettingverytiredofwritingthesetests2"
+        }
+      },
+      "on_file_system": {
+        "$attributes": {
+          "imgettingverytiredofwritingthesetests": "person299 was ahead of his time"
+        },
+        "$path": "string_value.txt"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/string_value_project/expected/string_value.txt b/rojo-test/syncback-tests/string_value_project/expected/string_value.txt
new file mode 100644
index 000000000..a29b38294
--- /dev/null
+++ b/rojo-test/syncback-tests/string_value_project/expected/string_value.txt
@@ -0,0 +1 @@
+shout out to the brown bug anthology in person299's admin commands
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/string_value_project/input.rbxl b/rojo-test/syncback-tests/string_value_project/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..cea6a4853c3cc88aa493c91f260bc482f5a210b4
GIT binary patch
literal 53028
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
anX;lkC(csKsJG$&(~q`;OU>ZwGyfN!Qb23~

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/string_value_project/output/default.project.json b/rojo-test/syncback-tests/string_value_project/output/default.project.json
new file mode 100644
index 000000000..00fa7c2d2
--- /dev/null
+++ b/rojo-test/syncback-tests/string_value_project/output/default.project.json
@@ -0,0 +1,14 @@
+{
+  "name": "string_value_project",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "on_file_system": {
+        "$path": "string_value.txt"
+      },
+      "inside_project_file": {
+        "$className": "StringValue"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/string_value_project/output/string_value.txt b/rojo-test/syncback-tests/string_value_project/output/string_value.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 11e8a372e..b51562953 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -27,4 +27,5 @@ syncback_basic_test! {
     project_reserialize,
     project_all_middleware,
     duplicate_rojo_id,
+    string_value_project,
 }

From 6075644b109a0d19733978b60d20fb3ecc46d7b5 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 13 May 2024 11:03:17 -0700
Subject: [PATCH 313/366] Accout for NaN in variant_eq

---
 src/variant_eq.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/variant_eq.rs b/src/variant_eq.rs
index 831f03929..0db78a5e8 100644
--- a/src/variant_eq.rs
+++ b/src/variant_eq.rs
@@ -1,8 +1,17 @@
 use std::collections::HashMap;
 
-use float_cmp::approx_eq;
 use rbx_dom_weak::types::{PhysicalProperties, Variant, Vector3};
 
+/// Accepts three argumets: a float type and two values to compare.
+///
+/// Returns a bool indicating whether they're equal. This accounts for NaN such
+/// that `approx_eq!(f32, f32::NAN, f32::NAN)` is `true`.
+macro_rules! approx_eq {
+    ($Ty:ty, $a:expr, $b:expr) => {
+        float_cmp::approx_eq!($Ty, $a, $b) || $a.is_nan() && $b.is_nan()
+    };
+}
+
 /// Compares two variants to determine if they're equal. This correctly takes
 /// float comparisons into account.
 pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {

From 4abac7867d2aee5e01e3f68347e4cd6cbdb26d71 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 29 May 2024 13:25:58 -0700
Subject: [PATCH 314/366] Fix clippy lints

---
 src/syncback/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 70ae56167..b34c00ed6 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -113,7 +113,7 @@ pub fn syncback_loop(
         log::debug!("Skipping referent linking as per project syncback rules");
     }
 
-    new_tree.root_mut().name = project.name.clone();
+    new_tree.root_mut().name.clone_from(&project.name);
 
     log::debug!("Hashing project DOM");
     let old_hashes = hash_tree(project, old_tree.inner(), old_tree.get_root_id());
@@ -406,7 +406,7 @@ fn get_property_filter<'project>(
 
         let class = database.classes.get(current_class_name)?;
         if let Some(super_class) = class.superclass.as_ref() {
-            current_class_name = &super_class;
+            current_class_name = super_class;
         } else {
             break;
         }

From ef56c39a64bb2f7e197a149081b30f7ed3cd1696 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 29 May 2024 13:31:36 -0700
Subject: [PATCH 315/366] Don't use macro, use array and `.into()` for
 JSON_MODEL_CLASSES

---
 src/syncback/mod.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index b34c00ed6..6e19bf9bf 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -252,11 +252,19 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
     // equality for classes like this.
     static JSON_MODEL_CLASSES: OnceLock<HashSet<&str>> = OnceLock::new();
     let json_model_classes = JSON_MODEL_CLASSES.get_or_init(|| {
-        maplit::hashset! {
-            "Sound", "SoundGroup", "Sky", "Atmosphere", "BloomEffect",
-            "BlurEffect", "ColorCorrectionEffect", "DepthOfFieldEffect",
-            "SunRaysEffect", "ParticleEmitter"
-        }
+        [
+            "Sound",
+            "SoundGroup",
+            "Sky",
+            "Atmosphere",
+            "BloomEffect",
+            "BlurEffect",
+            "ColorCorrectionEffect",
+            "DepthOfFieldEffect",
+            "SunRaysEffect",
+            "ParticleEmitter",
+        ]
+        .into()
     });
 
     let old_middleware = snapshot

From 7d8d3a38c00c375b40aa2dbb098a3ecf15501b76 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 29 May 2024 13:35:56 -0700
Subject: [PATCH 316/366] Make text chat related Instances become JSON models

---
 src/syncback/mod.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 6e19bf9bf..b3ab284ba 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -263,6 +263,11 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
             "DepthOfFieldEffect",
             "SunRaysEffect",
             "ParticleEmitter",
+            "TextChannel",
+            "TextChatCommand",
+            "ChatWindowConfiguration",
+            "ChatInputBarConfiguration",
+            "BubbleChatConfiguration",
         ]
         .into()
     });

From 40875b49983e59c3bfa69f13900c83c59b803e27 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 6 Jun 2024 08:29:39 -0700
Subject: [PATCH 317/366] Correctly label two OptionalCFrames as equal if both
 are null

---
 src/variant_eq.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/variant_eq.rs b/src/variant_eq.rs
index 0db78a5e8..d99addc62 100644
--- a/src/variant_eq.rs
+++ b/src/variant_eq.rs
@@ -124,16 +124,16 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
             }
             true
         }
-        (Variant::OptionalCFrame(a), Variant::OptionalCFrame(b)) => {
-            if let (Some(a2), Some(b2)) = (a, b) {
-                vector_eq(&a2.position, &b2.position)
-                    && vector_eq(&a2.orientation.x, &b2.orientation.x)
-                    && vector_eq(&a2.orientation.y, &b2.orientation.y)
-                    && vector_eq(&a2.orientation.z, &b2.orientation.z)
-            } else {
-                false
+        (Variant::OptionalCFrame(a), Variant::OptionalCFrame(b)) => match (a, b) {
+            (Some(a), Some(b)) => {
+                vector_eq(&a.position, &b.position)
+                    && vector_eq(&a.orientation.x, &b.orientation.x)
+                    && vector_eq(&a.orientation.y, &b.orientation.y)
+                    && vector_eq(&a.orientation.z, &b.orientation.z)
             }
-        }
+            (None, None) => true,
+            _ => false,
+        },
         (Variant::PhysicalProperties(a), Variant::PhysicalProperties(b)) => match (a, b) {
             (PhysicalProperties::Default, PhysicalProperties::Default) => true,
             (PhysicalProperties::Custom(a2), PhysicalProperties::Custom(b2)) => {
@@ -143,7 +143,7 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
                     && approx_eq!(f32, a2.elasticity_weight, b2.elasticity_weight)
                     && approx_eq!(f32, a2.friction_weight, b2.friction_weight)
             }
-            (_, _) => false,
+            _ => false,
         },
         (Variant::Ray(a), Variant::Ray(b)) => {
             vector_eq(&a.direction, &b.direction) && vector_eq(&a.origin, &b.origin)

From 0ebf3c4b8076aaef1401478f118852d0b858fa5c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 6 Jun 2024 10:05:36 -0700
Subject: [PATCH 318/366] Correct error message for when rbxmx fails to parse

---
 src/snapshot_middleware/rbxmx.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index e86b5f430..68795c302 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -18,7 +18,7 @@ pub fn snapshot_rbxmx(
         .property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown);
 
     let temp_tree = rbx_xml::from_reader(vfs.read(path)?.as_slice(), options)
-        .with_context(|| format!("Malformed rbxm file: {}", path.display()))?;
+        .with_context(|| format!("Malformed rbxmx file: {}", path.display()))?;
 
     let root_instance = temp_tree.root();
     let children = root_instance.children();

From 9c7a2beec12ec7f5b7b79bb7c53c51f540b87755 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 6 Jun 2024 11:11:55 -0700
Subject: [PATCH 319/366] Write unknown properties when running syncback on
 rbxmx files

---
 src/snapshot_middleware/rbxmx.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 68795c302..52551cd5e 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -2,6 +2,7 @@ use std::path::Path;
 
 use anyhow::Context;
 use memofs::Vfs;
+use rbx_xml::EncodeOptions;
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
@@ -49,11 +50,19 @@ pub fn syncback_rbxmx<'sync>(
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let inst = snapshot.new_inst();
 
+    let options =
+        EncodeOptions::new().property_behavior(rbx_xml::EncodePropertyBehavior::WriteUnknown);
+
     // Long-term, we probably want to have some logic for if this contains a
     // script. That's a future endeavor though.
     let mut serialized = Vec::new();
-    rbx_xml::to_writer_default(&mut serialized, snapshot.new_tree(), &[inst.referent()])
-        .context("failed to serialize new rbxmx")?;
+    rbx_xml::to_writer(
+        &mut serialized,
+        snapshot.new_tree(),
+        &[inst.referent()],
+        options,
+    )
+    .context("failed to serialize new rbxmx")?;
 
     Ok(SyncbackReturn {
         inst_snapshot: InstanceSnapshot::from_instance(inst),

From 6643ccbd2921d1399a1dc8a6ff7cb33275127966 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 6 Jun 2024 14:52:23 -0700
Subject: [PATCH 320/366] Add test for Instances with two potential paths

---
 ...rojo_test__syncback_util__child_but_not.snap |  14 ++++++++++++++
 .../expected/OnlyOneCopy/child_of_one.luau      |   1 +
 .../child_replicated_storage.luau               |   1 +
 .../child_but_not/expected/default.project.json |  12 ++++++++++++
 .../syncback-tests/child_but_not/input.rbxl     | Bin 0 -> 54036 bytes
 .../child_but_not/output/default.project.json   |  12 ++++++++++++
 tests/tests/syncback.rs                         |   1 +
 7 files changed, 41 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
 create mode 100644 rojo-test/syncback-tests/child_but_not/expected/OnlyOneCopy/child_of_one.luau
 create mode 100644 rojo-test/syncback-tests/child_but_not/expected/ReplicatedStorage/child_replicated_storage.luau
 create mode 100644 rojo-test/syncback-tests/child_but_not/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/child_but_not/input.rbxl
 create mode 100644 rojo-test/syncback-tests/child_but_not/output/default.project.json

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
new file mode 100644
index 000000000..c5b70248b
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
@@ -0,0 +1,14 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - "OnlyOneCopy\\child_of_one.luau"
+  - "ReplicatedStorage\\child_replicated_storage.luau"
+added_dirs:
+  - OnlyOneCopy
+  - ReplicatedStorage
+removed_files: []
+removed_dirs: []
+
diff --git a/rojo-test/syncback-tests/child_but_not/expected/OnlyOneCopy/child_of_one.luau b/rojo-test/syncback-tests/child_but_not/expected/OnlyOneCopy/child_of_one.luau
new file mode 100644
index 000000000..d23f92e7f
--- /dev/null
+++ b/rojo-test/syncback-tests/child_but_not/expected/OnlyOneCopy/child_of_one.luau
@@ -0,0 +1 @@
+-- displace personality beam leadership occupy
diff --git a/rojo-test/syncback-tests/child_but_not/expected/ReplicatedStorage/child_replicated_storage.luau b/rojo-test/syncback-tests/child_but_not/expected/ReplicatedStorage/child_replicated_storage.luau
new file mode 100644
index 000000000..dc3e15bf4
--- /dev/null
+++ b/rojo-test/syncback-tests/child_but_not/expected/ReplicatedStorage/child_replicated_storage.luau
@@ -0,0 +1 @@
+-- skate bottle vain nonsense tablet
diff --git a/rojo-test/syncback-tests/child_but_not/expected/default.project.json b/rojo-test/syncback-tests/child_but_not/expected/default.project.json
new file mode 100644
index 000000000..d23f524c2
--- /dev/null
+++ b/rojo-test/syncback-tests/child_but_not/expected/default.project.json
@@ -0,0 +1,12 @@
+{
+  "name": "child_but_not",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "ReplicatedStorage",
+      "OnlyOneCopy": {
+        "$path": "OnlyOneCopy"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/child_but_not/input.rbxl b/rojo-test/syncback-tests/child_but_not/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..9723a9142cfee59cb773dbe0e0bb5b722720b868
GIT binary patch
literal 54036
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
D7WCo;

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/child_but_not/output/default.project.json b/rojo-test/syncback-tests/child_but_not/output/default.project.json
new file mode 100644
index 000000000..d23f524c2
--- /dev/null
+++ b/rojo-test/syncback-tests/child_but_not/output/default.project.json
@@ -0,0 +1,12 @@
+{
+  "name": "child_but_not",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "ReplicatedStorage",
+      "OnlyOneCopy": {
+        "$path": "OnlyOneCopy"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index b51562953..f351426e0 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -28,4 +28,5 @@ syncback_basic_test! {
     project_all_middleware,
     duplicate_rojo_id,
     string_value_project,
+    child_but_not,
 }

From a6c206db54a73f8b3cf162859018fab1ddee48b2 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 6 Jun 2024 14:52:38 -0700
Subject: [PATCH 321/366] Fix child_but_not test

---
 src/snapshot_middleware/dir.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index 3ebfce618..e63ea5b4a 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -7,7 +7,7 @@ use anyhow::Context;
 use memofs::{DirEntry, IoResultExt, Vfs};
 
 use crate::{
-    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot},
+    snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource},
     syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
@@ -173,6 +173,15 @@ pub fn syncback_dir_no_meta<'sync>(
                         old_child.name()
                     );
                     continue;
+                } else if matches!(
+                    old_child.metadata().instigating_source,
+                    Some(InstigatingSource::ProjectNode { .. })
+                ) {
+                    log::debug!(
+                        "Skipping instance {} because it originates in a project file",
+                        old_child.name()
+                    );
+                    continue;
                 }
                 // This child exists in both doms. Pass it on.
                 children.push(snapshot.with_joined_path(*new_child_ref, Some(old_child.id()))?);

From deda13bba678d1f133eaf8067c4e938892a331e7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 20 Jun 2024 10:04:16 -0700
Subject: [PATCH 322/366] Correct misused function in
 `project_node_should_reserialize`

---
 src/snapshot_middleware/project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 01e33282f..b42c6cfd5 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -584,7 +584,7 @@ fn project_node_should_reserialize(
         if let Some(inst_value) = instance.properties().get(prop_name) {
             let node_value = unresolved_node_value
                 .clone()
-                .resolve(instance.name(), prop_name)?;
+                .resolve(instance.class_name(), prop_name)?;
             if !variant_eq(inst_value, &node_value) {
                 return Ok(true);
             }

From 3bb7560e57f5ece1070126e15cdaafb207dae3ee Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 20 Jun 2024 11:22:06 -0700
Subject: [PATCH 323/366] Check if properties serialize during filtering
 process

---
 src/snapshot_middleware/project.rs |  2 +-
 src/syncback/mod.rs                |  4 +++
 src/syncback/property_filter.rs    | 46 ++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index b42c6cfd5..b22da30dc 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -332,7 +332,7 @@ pub fn syncback_project<'sync>(
     // Sync rules for this project do not have their base rule set but it is
     // important when performing syncback on other projects.
     for rule in &mut project.sync_rules {
-        rule.base_path = base_path.clone()
+        rule.base_path.clone_from(&base_path)
     }
 
     let mut descendant_snapshots = Vec::new();
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index b3ab284ba..09b9c12a0 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -402,6 +402,10 @@ fn is_valid_path(globs: &Option<Vec<Glob>>, base_path: &Path, path: &Path) -> bo
 /// Returns a set of properties that should not be written with syncback if
 /// one exists. This list is read directly from the Project and takes
 /// inheritance into effect.
+///
+/// It **does not** handle properties that should not serialize for other
+/// reasons, such as being defaults or being marked as not serializing in the
+/// ReflectionDatabase.
 fn get_property_filter<'project>(
     project: &'project Project,
     new_inst: &Instance,
diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index 4973eb3a7..e4c00a6f2 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -1,24 +1,24 @@
 use std::collections::HashMap;
 
 use rbx_dom_weak::{types::Variant, Instance};
-use rbx_reflection::Scriptability;
+use rbx_reflection::{PropertyKind, PropertySerialization, Scriptability};
 
 use crate::{variant_eq::variant_eq, Project};
 
 /// Returns a map of properties from `inst` that are both allowed under the
-/// user-provided settings *and* not their default value.
+/// user-provided settings, are not their default value, and serialize.
 pub fn filter_properties<'inst>(
     project: &Project,
     inst: &'inst Instance,
 ) -> HashMap<&'inst str, &'inst Variant> {
-    let mut map = Vec::with_capacity(inst.properties.len());
+    let mut map: Vec<(&str, &Variant)> = Vec::with_capacity(inst.properties.len());
     filter_properties_preallocated(project, inst, &mut map);
 
     map.into_iter().collect()
 }
 
-/// Fills `allocation` with a list of properties from `inst` that are both
-/// allowed under the user-provided settings *and* not their default value.
+/// Fills `allocation` with a list of properties from `inst` that are
+/// user-provided settings, are not their default value, and serialize.
 pub fn filter_properties_preallocated<'inst>(
     project: &Project,
     inst: &'inst Instance,
@@ -39,6 +39,9 @@ pub fn filter_properties_preallocated<'inst>(
         if matches!(prop_value, Variant::Ref(_) | Variant::UniqueId(_)) {
             return true;
         }
+        if !should_property_serialize(&inst.class, prop_name) {
+            return true;
+        }
         if !sync_unscriptable {
             if let Some(data) = class_data {
                 if let Some(prop_data) = data.properties.get(prop_name.as_str()) {
@@ -74,3 +77,36 @@ pub fn filter_properties_preallocated<'inst>(
         }
     }
 }
+
+fn should_property_serialize(class_name: &str, prop_name: &str) -> bool {
+    let database = rbx_reflection_database::get();
+    let mut current_class_name = class_name;
+
+    loop {
+        let class_data = match database.classes.get(current_class_name) {
+            Some(data) => data,
+            None => return true,
+        };
+        if let Some(data) = class_data.properties.get(prop_name) {
+            log::trace!("found {class_name}.{prop_name} on {current_class_name}");
+            return match &data.kind {
+                // It's not really clear if this can ever happen but I want to
+                // support it just in case!
+                PropertyKind::Alias { alias_for } => {
+                    should_property_serialize(current_class_name, alias_for)
+                }
+                // Migrations and aliases are happily handled for us by parsers
+                // so we don't really need to handle them.
+                PropertyKind::Canonical { serialization } => {
+                    !matches!(serialization, PropertySerialization::DoesNotSerialize)
+                }
+                kind => unimplemented!("unknown property kind {kind:?}"),
+            };
+        } else if let Some(super_class) = class_data.superclass.as_ref() {
+            current_class_name = super_class;
+        } else {
+            break;
+        }
+    }
+    true
+}

From ef0f30c0945a29f5e98bcdcb5e3c7f1e3235c838 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 09:05:42 -0700
Subject: [PATCH 324/366] Use .luau for dir scripts in syncback

---
 src/snapshot_middleware/lua.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index 0fad6cf77..b705ae628 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -165,9 +165,9 @@ pub fn syncback_lua_init<'sync>(
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
     let new_inst = snapshot.new_inst();
     let path = snapshot.path.join(match script_type {
-        ScriptType::Server => "init.server.lua",
-        ScriptType::Client => "init.client.lua",
-        ScriptType::Module => "init.lua",
+        ScriptType::Server => "init.server.luau",
+        ScriptType::Client => "init.client.luau",
+        ScriptType::Module => "init.luau",
     });
 
     let contents = if let Some(Variant::String(source)) = new_inst.properties.get("Source") {

From 9bf3a78b22e7cd38a395a9f90355124613c6ecbc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 10:54:39 -0700
Subject: [PATCH 325/366] Update test files to use .luau instead of .lua

---
 ..._to_end__rojo_test__syncback_util__all_middleware.snap | 8 +++-----
 ..._rojo_test__syncback_util__project_all_middleware.snap | 8 +++-----
 ...nd_to_end__rojo_test__syncback_util__project_init.snap | 4 +---
 .../{init.client.lua => init.client.luau}                 | 0
 .../src/dir/init_module_script/{init.lua => init.luau}    | 0
 .../{init.server.lua => init.server.luau}                 | 0
 .../{init.client.lua => init.client.luau}                 | 0
 .../src/init_module_script/{init.lua => init.luau}        | 0
 .../{init.server.lua => init.server.luau}                 | 0
 .../project_init/expected/src/{init.lua => init.luau}     | 0
 10 files changed, 7 insertions(+), 13 deletions(-)
 rename rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/{init.client.lua => init.client.luau} (100%)
 rename rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/{init.lua => init.luau} (100%)
 rename rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/{init.server.lua => init.server.luau} (100%)
 rename rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/{init.client.lua => init.client.luau} (100%)
 rename rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/{init.lua => init.luau} (100%)
 rename rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/{init.server.lua => init.server.luau} (100%)
 rename rojo-test/syncback-tests/project_init/expected/src/{init.lua => init.luau} (100%)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
index 5b10b4aec..f4d242a62 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
@@ -1,15 +1,14 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
   - "src\\csv.csv"
   - "src\\csv_init\\init.csv"
   - "src\\dir\\client_script.client.luau"
-  - "src\\dir\\init_client_script\\init.client.lua"
-  - "src\\dir\\init_module_script\\init.lua"
-  - "src\\dir\\init_server_script\\init.server.lua"
+  - "src\\dir\\init_client_script\\init.client.luau"
+  - "src\\dir\\init_module_script\\init.luau"
+  - "src\\dir\\init_server_script\\init.server.luau"
   - "src\\dir\\module_script.luau"
   - "src\\dir\\server_script.server.luau"
   - "src\\model_json.model.json"
@@ -26,4 +25,3 @@ added_dirs:
   - "src\\dir\\init_server_script"
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
index 119ed2573..6757cc9a1 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
@@ -1,15 +1,14 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
   - src/client_script.client.luau
   - src/csv.csv
   - "src/csv_init\\init.csv"
-  - "src/init_client_script\\init.client.lua"
-  - "src/init_module_script\\init.lua"
-  - "src/init_server_script\\init.server.lua"
+  - "src/init_client_script\\init.client.luau"
+  - "src/init_module_script\\init.luau"
+  - "src/init_server_script\\init.server.luau"
   - src/model_json.model.json
   - src/module_script.luau
   - src/project_json.project.json
@@ -23,4 +22,3 @@ added_dirs:
   - src/init_server_script
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
index dc907e7a1..5eb051109 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
@@ -1,12 +1,10 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "src\\init.lua"
+  - "src\\init.luau"
 added_dirs:
   - src
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.luau
similarity index 100%
rename from rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.lua
rename to rojo-test/syncback-tests/all_middleware/expected/src/dir/init_client_script/init.client.luau
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.luau
similarity index 100%
rename from rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.lua
rename to rojo-test/syncback-tests/all_middleware/expected/src/dir/init_module_script/init.luau
diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.lua b/rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.luau
similarity index 100%
rename from rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.lua
rename to rojo-test/syncback-tests/all_middleware/expected/src/dir/init_server_script/init.server.luau
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.lua b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.luau
similarity index 100%
rename from rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.lua
rename to rojo-test/syncback-tests/project_all_middleware/expected/src/init_client_script/init.client.luau
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.lua b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.luau
similarity index 100%
rename from rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.lua
rename to rojo-test/syncback-tests/project_all_middleware/expected/src/init_module_script/init.luau
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.lua b/rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.luau
similarity index 100%
rename from rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.lua
rename to rojo-test/syncback-tests/project_all_middleware/expected/src/init_server_script/init.server.luau
diff --git a/rojo-test/syncback-tests/project_init/expected/src/init.lua b/rojo-test/syncback-tests/project_init/expected/src/init.luau
similarity index 100%
rename from rojo-test/syncback-tests/project_init/expected/src/init.lua
rename to rojo-test/syncback-tests/project_init/expected/src/init.luau

From 32753ab6cd7628cb1f373074e84a26af81d4c8b7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 11:02:53 -0700
Subject: [PATCH 326/366] Correct typos in a few comments

---
 src/snapshot_middleware/mod.rs | 2 +-
 src/syncback/mod.rs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs
index 029f4f305..f6b593bbc 100644
--- a/src/snapshot_middleware/mod.rs
+++ b/src/snapshot_middleware/mod.rs
@@ -289,7 +289,7 @@ impl Middleware {
     /// set properties without needing a meta.json file.
     ///
     /// It does not cover middleware like `ServerScript` or `Csv` because they
-    /// need a meta.json file set properties that aren't their designated
+    /// need a meta.json file to set properties that aren't their designated
     /// 'special' properties.
     #[inline]
     pub fn handles_own_properties(&self) -> bool {
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 09b9c12a0..bf93bd400 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -36,7 +36,7 @@ pub use snapshot::{SyncbackData, SyncbackSnapshot};
 
 /// The name of an enviroment variable to use to override the behavior of
 /// syncback on model files.
-/// By default, syncabck will use `Rbxm` for model files.
+/// By default, syncback will use `Rbxm` for model files.
 /// If this is set to `1`, it will instead use `Rbxmx`. If it is set to `2`,
 /// it will use `JsonModel`.
 ///

From d1f5a090fdf59d2f4bf06d50c898e17e26afacf3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 11:03:01 -0700
Subject: [PATCH 327/366] Remove comment I forgot I left

---
 src/syncback/ref_properties.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 26544d9b8..955072668 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -193,16 +193,3 @@ fn get_existing_id(inst: &Instance) -> Option<&str> {
         None
     }
 }
-
-/*
-When loading IDs we need to create a list and if there's a collision,
-cause it to have a stroke. If that works to catch the duplicates then we just
-need to re-serialize the IDs that collide. I think it's probably acceptable to
-just pick one of the two if we can't tell the difference between them and give
-the other a new ID. Maybe we emit a warning.
-
-This is gonna require a redo of the linking a bit, since it'll mean that we
-can't just blindly use the old IDs. The plus side is that it means we can
-collect these in a way that isn't awful via mapping an ID to a referent, so
-it may end up improving the overall quality of the above code.
-*/

From 444cf37c90c31c933834d1c7b64574b8f9c63f4b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 11:05:00 -0700
Subject: [PATCH 328/366] Cave and finally include UniqueId in the all
 middleware tests

---
 rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx | 1 +
 .../project_all_middleware/expected/src/rbxmx.rbxmx              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
index 6e43e0368..6c66a17ad 100644
--- a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
@@ -8,6 +8,7 @@
       <int64 name="SourceAssetId">-1</int64>
       <BinaryString name="Tags"></BinaryString>
       <string name="Text">fireplace addicted army cow stock</string>
+      <UniqueId name="UniqueId">56ddeac77c86b55f061dbf5000007cca</UniqueId>
     </Properties>
   </Item>
 </roblox>
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
index 50a48b184..e609d6ba4 100644
--- a/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
@@ -8,6 +8,7 @@
       <int64 name="SourceAssetId">-1</int64>
       <BinaryString name="Tags"></BinaryString>
       <string name="Text">ripe alike review heart dry</string>
+      <UniqueId name="UniqueId">288c54239308069206387a3a00004126</UniqueId>
     </Properties>
   </Item>
 </roblox>
\ No newline at end of file

From a3c78e460c55043bae63997120bbafca5942c4c1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 11:30:46 -0700
Subject: [PATCH 329/366] Remove superfluous instance snapshot creation from
 syncback

---
 src/snapshot/instance_snapshot.rs     | 11 -----------
 src/snapshot_middleware/csv.rs        |  6 +-----
 src/snapshot_middleware/dir.rs        |  1 -
 src/snapshot_middleware/json_model.rs |  1 -
 src/snapshot_middleware/lua.rs        |  6 +-----
 src/snapshot_middleware/project.rs    |  1 -
 src/snapshot_middleware/rbxm.rs       |  1 -
 src/snapshot_middleware/rbxmx.rs      |  1 -
 src/snapshot_middleware/txt.rs        |  1 -
 src/syncback/mod.rs                   |  8 ++------
 10 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/snapshot/instance_snapshot.rs b/src/snapshot/instance_snapshot.rs
index 5337e529f..0b3a4fca3 100644
--- a/src/snapshot/instance_snapshot.rs
+++ b/src/snapshot/instance_snapshot.rs
@@ -127,17 +127,6 @@ impl InstanceSnapshot {
             children,
         }
     }
-
-    pub fn from_instance(instance: &Instance) -> Self {
-        Self {
-            snapshot_id: instance.referent(),
-            metadata: InstanceMetadata::new(),
-            name: Cow::Owned(instance.name.clone()),
-            class_name: Cow::Owned(instance.class.clone()),
-            properties: instance.properties.clone(),
-            children: Vec::new(),
-        }
-    }
 }
 
 impl Default for InstanceSnapshot {
diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 8c0d5fa4d..290ec870e 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -125,7 +125,6 @@ pub fn syncback_csv<'sync>(
     }
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot,
         children: Vec::new(),
         removed_children: Vec::new(),
@@ -161,10 +160,7 @@ pub fn syncback_csv_init<'sync>(
         }
     }
 
-    Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        ..dir_syncback
-    })
+    Ok(dir_syncback)
 }
 
 /// Struct that holds any valid row from a Roblox CSV translation table.
diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index e63ea5b4a..aaaa4fa38 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -202,7 +202,6 @@ pub fn syncback_dir_no_meta<'sync>(
     fs_snapshot.add_dir(&snapshot.path);
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot,
         children,
         removed_children,
diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 8b479677e..25a6884de 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -74,7 +74,6 @@ pub fn syncback_json_model<'sync>(
     model.name = None;
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot: FsSnapshot::new().with_added_file(
             &snapshot.path,
             serde_json::to_vec_pretty(&model).context("failed to serialize new JSON Model")?,
diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs
index b705ae628..3477b35cc 100644
--- a/src/snapshot_middleware/lua.rs
+++ b/src/snapshot_middleware/lua.rs
@@ -151,7 +151,6 @@ pub fn syncback_lua<'sync>(
     }
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot,
         // Scripts don't have a child!
         children: Vec::new(),
@@ -192,10 +191,7 @@ pub fn syncback_lua_init<'sync>(
         }
     }
 
-    Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
-        ..dir_syncback
-    })
+    Ok(dir_syncback)
 }
 
 #[cfg(test)]
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index b22da30dc..214340091 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -513,7 +513,6 @@ pub fn syncback_project<'sync>(
     }
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(snapshot.new_inst()),
         fs_snapshot,
         children: descendant_snapshots,
         removed_children: removed_descendants,
diff --git a/src/snapshot_middleware/rbxm.rs b/src/snapshot_middleware/rbxm.rs
index 75a53c717..f94c4f5ef 100644
--- a/src/snapshot_middleware/rbxm.rs
+++ b/src/snapshot_middleware/rbxm.rs
@@ -54,7 +54,6 @@ pub fn syncback_rbxm<'sync>(
         .context("failed to serialize new rbxm")?;
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst),
         fs_snapshot: FsSnapshot::new().with_added_file(&snapshot.path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
diff --git a/src/snapshot_middleware/rbxmx.rs b/src/snapshot_middleware/rbxmx.rs
index 52551cd5e..0cc84d3e2 100644
--- a/src/snapshot_middleware/rbxmx.rs
+++ b/src/snapshot_middleware/rbxmx.rs
@@ -65,7 +65,6 @@ pub fn syncback_rbxmx<'sync>(
     .context("failed to serialize new rbxmx")?;
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(inst),
         fs_snapshot: FsSnapshot::new().with_added_file(&snapshot.path, serialized),
         children: Vec::new(),
         removed_children: Vec::new(),
diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs
index 6eb0cf53e..27e70496b 100644
--- a/src/snapshot_middleware/txt.rs
+++ b/src/snapshot_middleware/txt.rs
@@ -75,7 +75,6 @@ pub fn syncback_txt<'sync>(
     }
 
     Ok(SyncbackReturn {
-        inst_snapshot: InstanceSnapshot::from_instance(new_inst),
         fs_snapshot,
         children: Vec::new(),
         removed_children: Vec::new(),
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index bf93bd400..5e85c4d39 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -21,7 +21,7 @@ use std::{
 
 use crate::{
     glob::Glob,
-    snapshot::{InstanceSnapshot, InstanceWithMeta, RojoTree},
+    snapshot::{InstanceWithMeta, RojoTree},
     snapshot_middleware::Middleware,
     syncback::ref_properties::link_referents,
     Project,
@@ -137,7 +137,6 @@ pub fn syncback_loop(
         middleware: Some(Middleware::Project),
     }];
 
-    let mut replacements = Vec::new();
     let mut fs_snapshot = FsSnapshot::new();
 
     'syncback: while let Some(snapshot) = snapshots.pop() {
@@ -228,9 +227,7 @@ pub fn syncback_loop(
             }
         }
 
-        if let Some(old_inst) = snapshot.old_inst() {
-            replacements.push((old_inst.parent(), syncback.inst_snapshot));
-        }
+        // TODO provide replacement snapshots for e.g. two way sync
 
         fs_snapshot.merge(syncback.fs_snapshot);
 
@@ -241,7 +238,6 @@ pub fn syncback_loop(
 }
 
 pub struct SyncbackReturn<'sync> {
-    pub inst_snapshot: InstanceSnapshot,
     pub fs_snapshot: FsSnapshot,
     pub children: Vec<SyncbackSnapshot<'sync>>,
     pub removed_children: Vec<InstanceWithMeta<'sync>>,

From 3602555dd26e47cbe27907d254d96ba1e3ed4f69 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 16:17:55 -0700
Subject: [PATCH 330/366] Actually transfer children in model files correctly

---
 src/cli/syncback.rs | 88 ++++++++++++++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 29 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 4ce557ffd..78bd0f7cc 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -79,6 +79,19 @@ impl SyncbackCommand {
         log::debug!("Old root: {}", dom_old.inner().root().class);
         log::debug!("New root: {}", dom_new.root().class);
 
+        if log::log_enabled!(log::Level::Trace) {
+            log::trace!("Children of old root:");
+            for child in dom_old.inner().root().children() {
+                let inst = dom_old.get_instance(*child).unwrap();
+                log::trace!("{} (class: {})", inst.name(), inst.class_name());
+            }
+            log::trace!("Children of new root:");
+            for child in dom_new.root().children() {
+                let inst = dom_new.get_by_ref(*child).unwrap();
+                log::trace!("{} (class: {})", inst.name, inst.class);
+            }
+        }
+
         let start = Instant::now();
         log::info!("Beginning syncback...");
         let snapshot = syncback_loop(
@@ -137,49 +150,66 @@ impl SyncbackCommand {
 
 fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
     let content = File::open(path)?;
-    Ok(match file_kind {
+    match file_kind {
         FileKind::Rbxl => {
             // HACK: A custom reflection database is used to deserialize UniqueId
             let db = binary_db().expect("A custom ReflectionDatabase to deserialize UniqueId");
             let binary_decoder = rbx_binary::Deserializer::new().reflection_database(&db);
-            binary_decoder.deserialize(content)?
+            binary_decoder.deserialize(content).with_context(|| {
+                format!(
+                    "Could not deserialize binary place file at {}",
+                    path.display()
+                )
+            })
         }
-        FileKind::Rbxlx => rbx_xml::from_reader(content, xml_decode_config())?,
+        FileKind::Rbxlx => rbx_xml::from_reader(content, xml_decode_config())
+            .with_context(|| format!("Could not deserialize XML place file at {}", path.display())),
         FileKind::Rbxm => {
             // HACK: A custom reflection database is used to deserialize UniqueId
             let db = binary_db().expect("A custom ReflectionDatabase to deserialize UniqueId");
             let binary_decoder = rbx_binary::Deserializer::new().reflection_database(&db);
-            let temp_tree = binary_decoder.deserialize(content)?;
-
-            let root_children = temp_tree.root().children();
-            if root_children.len() != 1 {
-                anyhow::bail!(
-                    "Rojo does not currently support models with more \
-                than one Instance at the Root!"
-                );
-            }
-            let real_root = temp_tree.get_by_ref(root_children[0]).unwrap();
-            let mut new_tree = WeakDom::new(InstanceBuilder::new(&real_root.class));
-            temp_tree.clone_multiple_into_external(real_root.children(), &mut new_tree);
-
-            new_tree
+            let temp_tree = binary_decoder.deserialize(content).with_context(|| {
+                format!(
+                    "Could not deserialize binary model file at {}",
+                    path.display()
+                )
+            })?;
+
+            process_model_dom(temp_tree)
         }
         FileKind::Rbxmx => {
-            let temp_tree = rbx_xml::from_reader(content, xml_decode_config())?;
-            let root_children = temp_tree.root().children();
-            if root_children.len() != 1 {
-                anyhow::bail!(
-                    "Rojo does not currently support models with more \
-                than one Instance at the Root!"
-                );
-            }
-            let real_root = temp_tree.get_by_ref(root_children[0]).unwrap();
-            let mut new_tree = WeakDom::new(InstanceBuilder::new(&real_root.class));
-            temp_tree.clone_multiple_into_external(real_root.children(), &mut new_tree);
+            let temp_tree =
+                rbx_xml::from_reader(content, xml_decode_config()).with_context(|| {
+                    format!("Could not deserialize XML model file at {}", path.display())
+                })?;
+            process_model_dom(temp_tree)
+        }
+    }
+}
 
+fn process_model_dom(dom: WeakDom) -> anyhow::Result<WeakDom> {
+    let temp_children = dom.root().children();
+    if temp_children.len() == 1 {
+        let real_root = dom.get_by_ref(temp_children[0]).unwrap();
+        let mut new_tree = WeakDom::new(InstanceBuilder::new(&real_root.class));
+        for (name, property) in &real_root.properties {
             new_tree
+                .root_mut()
+                .properties
+                .insert(name.to_owned(), property.to_owned());
         }
-    })
+
+        let children = dom.clone_multiple_into_external(real_root.children(), &mut new_tree);
+        for child in children {
+            new_tree.transfer_within(child, new_tree.root_ref());
+        }
+        Ok(new_tree)
+    } else {
+        anyhow::bail!(
+            "Rojo does not currently support models with more \
+        than one Instance at the Root!"
+        );
+    }
 }
 
 fn xml_decode_config() -> rbx_xml::DecodeOptions<'static> {

From 933973c1be204404e9cbc3183c095805c0d096cb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 2 Jul 2024 16:40:12 -0700
Subject: [PATCH 331/366] Turn invariant into an error because it turns out it
 can just happen lol

---
 src/snapshot_middleware/project.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 214340091..a973d32bd 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -454,18 +454,19 @@ pub fn syncback_project<'sync>(
             }
             let new_equivalent = new_child_map.remove(child_name);
             let old_equivalent = old_child_map.remove(child_name.as_str());
-            // The panic below should never happen. If it does, something's gone
-            // wrong with the Instance matching for nodes.
             match (new_equivalent, old_equivalent) {
                 (Some(new), Some(old)) => node_queue.push_back((child_node, old, new)),
                 (_, None) => anyhow::bail!(
                     "The child '{child_name}' of Instance '{}' would be removed.\n\
-                    Syncback cannot add or remove Instances from project {}", old_inst.name(), project_path.display()),
-                (None, _) => panic!(
-                    "Invariant violated: the Instance matching of project nodes is flawed somehow.\n\
-                    Specifically, a child named {} of the node {} did not exist in the old tree.",
-                    child_name, old_inst.name()
+                    Syncback cannot add or remove Instances from project {}",
+                    old_inst.name(),
+                    project_path.display()
                 ),
+                (None, _) => anyhow::bail!(
+                    "The child '{child_name}' of Instance '{}' is present only in a project file,\n\
+                    and not the provided file. Syncback cannot add or remove Instances from project:\n{}.",
+                    old_inst.name(), project_path.display(),
+                )
             }
         }
 

From 8a890aa5395720a9d2544d908778e7d27575bbdf Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 8 Jul 2024 11:21:00 -0700
Subject: [PATCH 332/366] Revert changing CSV field to examples, add alias
 instead

---
 .../end_to_end__tests__build__csv_bug_145.snap      |  2 +-
 .../end_to_end__tests__build__csv_in_folder.snap    |  2 +-
 src/snapshot_middleware/csv.rs                      | 13 +++++++++----
 ...napshot_middleware__csv__test__csv_from_vfs.snap |  2 +-
 ...apshot_middleware__csv__test__csv_with_meta.snap |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap
index 4bb0f95a5..ab7470b31 100644
--- a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap
+++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap
@@ -10,7 +10,7 @@ expression: contents
     <Item class="LocalizationTable" referent="1">
       <Properties>
         <string name="Name">normal</string>
-        <string name="Contents">[{"key":"Count","examples":"A number demonstrating issue 145","source":"3","values":{"es":"7"}}]</string>
+        <string name="Contents">[{"key":"Count","example":"A number demonstrating issue 145","source":"3","values":{"es":"7"}}]</string>
       </Properties>
     </Item>
   </Item>
diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap
index 42cbea1f5..d60fca025 100644
--- a/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap
+++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap
@@ -10,7 +10,7 @@ expression: contents
     <Item class="LocalizationTable" referent="1">
       <Properties>
         <string name="Name">normal</string>
-        <string name="Contents">[{"key":"Ack","examples":"An exclamation of despair","source":"Ack!","values":{"es":"¡Ay!"}}]</string>
+        <string name="Contents">[{"key":"Ack","example":"An exclamation of despair","source":"Ack!","values":{"es":"¡Ay!"}}]</string>
       </Properties>
     </Item>
   </Item>
diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index 290ec870e..f1e2c833b 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -176,8 +176,13 @@ struct LocalizationEntry<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]
     context: Option<Cow<'a, str>>,
 
-    #[serde(skip_serializing_if = "Option::is_none")]
-    examples: Option<Cow<'a, str>>,
+    // Roblox writes `examples` for LocalizationTable's Content property, which
+    // causes it to not roundtrip correctly.
+    // This is reported here: https://devforum.roblox.com/t/2908720.
+    //
+    // To support their mistake, we support an alias named `examples`.
+    #[serde(skip_serializing_if = "Option::is_none", alias = "examples")]
+    example: Option<Cow<'a, str>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     source: Option<Cow<'a, str>>,
@@ -220,7 +225,7 @@ fn convert_localization_csv(contents: &[u8]) -> Result<String, csv::Error> {
                 "Key" => entry.key = Some(Cow::Borrowed(value)),
                 "Source" => entry.source = Some(Cow::Borrowed(value)),
                 "Context" => entry.context = Some(Cow::Borrowed(value)),
-                "Example" => entry.examples = Some(Cow::Borrowed(value)),
+                "Example" => entry.example = Some(Cow::Borrowed(value)),
                 _ => {
                     entry
                         .values
@@ -274,7 +279,7 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
         record.push(entry.key.as_deref().unwrap_or_default());
         record.push(entry.source.as_deref().unwrap_or_default());
         record.push(entry.context.as_deref().unwrap_or_default());
-        record.push(entry.examples.as_deref().unwrap_or_default());
+        record.push(entry.example.as_deref().unwrap_or_default());
 
         let values = &entry.values;
         for header in &extra_headers {
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 6ad72e733..df634792f 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
@@ -18,6 +18,6 @@ name: foo
 class_name: LocalizationTable
 properties:
   Contents:
-    String: "[{\"key\":\"Ack\",\"examples\":\"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 389a8a588..8e97b5050 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
@@ -18,6 +18,6 @@ name: foo
 class_name: LocalizationTable
 properties:
   Contents:
-    String: "[{\"key\":\"Ack\",\"examples\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
+    String: "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]"
 children: []
 

From 13af7090dec14d62f63911f3234997189c144653 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 10 Jul 2024 11:56:50 -0700
Subject: [PATCH 333/366] Add some comments to syncback core loop

---
 src/syncback/mod.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 5e85c4d39..2945b0c18 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -59,12 +59,18 @@ pub fn syncback_loop(
         .map(|rules| rules.compile_globs())
         .transpose()?;
 
+    // Strip out any objects from the new tree that aren't in the old tree. This
+    // is necessary so that hashing the roots of each tree won't always result
+    // in different hashes. Shout out to Roblox for serializing a bunch of
+    // Services nobody cares about.
     log::debug!("Pruning new tree");
     strip_unknown_root_children(&mut new_tree, old_tree);
 
     log::debug!("Collecting referents for new DOM...");
     let deferred_referents = collect_referents(&new_tree);
 
+    // Remove any properties that are manually blocked from syncback via the
+    // project file.
     log::debug!("Pre-filtering properties on DOMs");
     for referent in descendants(&new_tree, new_tree.root_ref()) {
         let new_inst = new_tree.get_by_ref_mut(referent).unwrap();
@@ -83,6 +89,8 @@ pub fn syncback_loop(
             }
         }
     }
+
+    // Handle removing the current camera.
     if let Some(syncback_rules) = &project.syncback_rules {
         if !syncback_rules.sync_current_camera.unwrap_or_default() {
             log::debug!("Removing CurrentCamera from new DOM");
@@ -90,7 +98,8 @@ pub fn syncback_loop(
             for child_ref in new_tree.root().children() {
                 let inst = new_tree.get_by_ref(*child_ref).unwrap();
                 if inst.class == "Workspace" {
-                    camera_ref = inst.properties.get("CurrentCamera")
+                    camera_ref = inst.properties.get("CurrentCamera");
+                    break;
                 }
             }
             if let Some(Variant::Ref(camera_ref)) = camera_ref {
@@ -113,6 +122,9 @@ pub fn syncback_loop(
         log::debug!("Skipping referent linking as per project syncback rules");
     }
 
+    // As with pruning the children of the new root, we need to ensure the roots
+    // for both DOMs have the same name otherwise their hashes will always be
+    // different.
     new_tree.root_mut().name.clone_from(&project.name);
 
     log::debug!("Hashing project DOM");

From 541fa3dd6298ec8a75dcb0cb459109918d119bdb Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 10 Jul 2024 11:57:04 -0700
Subject: [PATCH 334/366] Fix outdated comment in referent linking

---
 src/syncback/ref_properties.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index 955072668..e763f2e3c 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -28,8 +28,7 @@ struct RefLink {
 
 /// Iterates through a WeakDom and collects referent properties.
 ///
-/// They can be linked to a dom later using the `link` method on the returned
-/// struct.
+/// They can be linked to a dom later using `link_referents`.
 pub fn collect_referents(dom: &WeakDom) -> RefLinks {
     let mut existing_ids = HashMap::new();
     let mut need_rewrite = Vec::new();

From a85493911130a3007cfdc138b8a74c75df377ef2 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 10 Jul 2024 12:21:56 -0700
Subject: [PATCH 335/366] Optimistically attempt to normalize path displays

---
 tests/rojo_test/syncback_util.rs | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 615015645..381d0568a 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -184,38 +184,38 @@ fn normalize_line_endings(input: &Vec<u8>) -> Cow<Vec<u8>> {
 }
 
 #[derive(Default, Debug, Serialize)]
-struct FsSnapshotVisual<'a> {
-    added_files: Vec<&'a Path>,
-    added_dirs: Vec<&'a Path>,
-    removed_files: Vec<&'a Path>,
-    removed_dirs: Vec<&'a Path>,
+struct FsSnapshotVisual {
+    added_files: Vec<String>,
+    added_dirs: Vec<String>,
+    removed_files: Vec<String>,
+    removed_dirs: Vec<String>,
 }
 
-fn visualize_fs_snapshot<'a>(snapshot: &'a FsSnapshot, base_path: &Path) -> FsSnapshotVisual<'a> {
-    let map_closure = |p: &'a Path| p.strip_prefix(base_path).unwrap();
-
-    let mut added_files: Vec<_> = snapshot
-        .added_files()
-        .into_iter()
-        .map(map_closure)
-        .collect();
-    let mut added_dirs: Vec<_> = snapshot.added_dirs().into_iter().map(map_closure).collect();
-    let mut removed_files: Vec<_> = snapshot
-        .removed_files()
-        .into_iter()
-        .map(map_closure)
-        .collect();
-    let mut removed_dirs: Vec<_> = snapshot
-        .removed_dirs()
-        .into_iter()
-        .map(map_closure)
-        .collect();
+fn visualize_fs_snapshot(snapshot: &FsSnapshot, base_path: &Path) -> FsSnapshotVisual {
+    let mut added_files = Vec::new();
+    let mut added_dirs = Vec::new();
+    let mut removed_files = Vec::new();
+    let mut removed_dirs = Vec::new();
+
+    for file in snapshot.added_files() {
+        added_files.push(file.strip_prefix(base_path).unwrap().display().to_string())
+    }
+    for file in snapshot.added_dirs() {
+        added_dirs.push(file.strip_prefix(base_path).unwrap().display().to_string())
+    }
+    for file in snapshot.removed_dirs() {
+        removed_dirs.push(file.strip_prefix(base_path).unwrap().display().to_string())
+    }
+    for file in snapshot.removed_files() {
+        removed_files.push(file.strip_prefix(base_path).unwrap().display().to_string())
+    }
 
     added_files.sort_unstable();
     added_dirs.sort_unstable();
     removed_files.sort_unstable();
     removed_dirs.sort_unstable();
 
+    // Turns out that the debug display for Path isn't stable. Who knew!
     FsSnapshotVisual {
         added_files,
         added_dirs,

From 8555d79e8ac36c8129e291ad9bc47ec2f815a535 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 10 Jul 2024 12:35:47 -0700
Subject: [PATCH 336/366] Take the nuclear option to fix path normalization

---
 ...o_test__syncback_util__all_middleware.snap | 36 +++++++++----------
 ...__rojo_test__syncback_util__baseplate.snap | 20 +++++------
 ...jo_test__syncback_util__child_but_not.snap |  6 ++--
 ...ojo_test__syncback_util__ignore_paths.snap |  4 +--
 ..._syncback_util__nested_projects_weird.snap |  6 ++--
 ...syncback_util__project_all_middleware.snap |  8 ++---
 ...ojo_test__syncback_util__project_init.snap |  2 +-
 ...jo_test__syncback_util__rbxm_fallback.snap | 10 +++---
 ...o_test__syncback_util__ref_properties.snap |  6 ++--
 ...__syncback_util__ref_properties_blank.snap | 12 +++----
 ..._syncback_util__ref_properties_update.snap |  6 ++--
 ...syncback_util__respect_old_middleware.snap |  6 ++--
 tests/rojo_test/io_util.rs                    | 34 ++++++++++++++++++
 tests/rojo_test/syncback_util.rs              | 26 ++++++++------
 14 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
index f4d242a62..da8f827ed 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
@@ -3,25 +3,25 @@ source: tests/rojo_test/syncback_util.rs
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "src\\csv.csv"
-  - "src\\csv_init\\init.csv"
-  - "src\\dir\\client_script.client.luau"
-  - "src\\dir\\init_client_script\\init.client.luau"
-  - "src\\dir\\init_module_script\\init.luau"
-  - "src\\dir\\init_server_script\\init.server.luau"
-  - "src\\dir\\module_script.luau"
-  - "src\\dir\\server_script.server.luau"
-  - "src\\model_json.model.json"
-  - "src\\project_json.project.json"
-  - "src\\rbxm.rbxm"
-  - "src\\rbxmx.rbxmx"
-  - "src\\text.txt"
+  - src/csv.csv
+  - src/csv_init/init.csv
+  - src/dir/client_script.client.luau
+  - src/dir/init_client_script/init.client.luau
+  - src/dir/init_module_script/init.luau
+  - src/dir/init_server_script/init.server.luau
+  - src/dir/module_script.luau
+  - src/dir/server_script.server.luau
+  - src/model_json.model.json
+  - src/project_json.project.json
+  - src/rbxm.rbxm
+  - src/rbxmx.rbxmx
+  - src/text.txt
 added_dirs:
   - src
-  - "src\\csv_init"
-  - "src\\dir"
-  - "src\\dir\\init_client_script"
-  - "src\\dir\\init_module_script"
-  - "src\\dir\\init_server_script"
+  - src/csv_init
+  - src/dir
+  - src/dir/init_client_script
+  - src/dir/init_module_script
+  - src/dir/init_server_script
 removed_files: []
 removed_dirs: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap
index 975ae5392..41b39653b 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__baseplate.snap
@@ -1,22 +1,20 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "Lighting\\Atmosphere.model.json"
-  - "Lighting\\Bloom.model.json"
-  - "Lighting\\DepthOfField.model.json"
-  - "Lighting\\Sky.model.json"
-  - "Lighting\\SunRays.model.json"
-  - "Workspace\\Baseplate.rbxm"
-  - "Workspace\\Camera.rbxm"
-  - "Workspace\\SpawnLocation.rbxm"
-  - "Workspace\\Terrain.rbxm"
+  - Lighting/Atmosphere.model.json
+  - Lighting/Bloom.model.json
+  - Lighting/DepthOfField.model.json
+  - Lighting/Sky.model.json
+  - Lighting/SunRays.model.json
+  - Workspace/Baseplate.rbxm
+  - Workspace/Camera.rbxm
+  - Workspace/SpawnLocation.rbxm
+  - Workspace/Terrain.rbxm
   - default.project.json
 added_dirs:
   - Lighting
   - Workspace
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
index c5b70248b..280232eb3 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
@@ -1,14 +1,12 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "OnlyOneCopy\\child_of_one.luau"
-  - "ReplicatedStorage\\child_replicated_storage.luau"
+  - OnlyOneCopy/child_of_one.luau
+  - ReplicatedStorage/child_replicated_storage.luau
 added_dirs:
   - OnlyOneCopy
   - ReplicatedStorage
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap
index 8bc7e628c..186606b38 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths.snap
@@ -1,13 +1,11 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
   - default.project.json
-  - "src\\integer.model.json"
+  - src/integer.model.json
 added_dirs:
   - src
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
index b9eac53e3..a3a522539 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
@@ -1,13 +1,11 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "src/modules\\ClientModule.luau"
-  - "src/modules\\ServerModule.luau"
+  - src/modules/ClientModule.luau
+  - src/modules/ServerModule.luau
 added_dirs:
   - src/modules
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
index 6757cc9a1..4050efd19 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap
@@ -5,10 +5,10 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/client_script.client.luau
   - src/csv.csv
-  - "src/csv_init\\init.csv"
-  - "src/init_client_script\\init.client.luau"
-  - "src/init_module_script\\init.luau"
-  - "src/init_server_script\\init.server.luau"
+  - src/csv_init/init.csv
+  - src/init_client_script/init.client.luau
+  - src/init_module_script/init.luau
+  - src/init_server_script/init.server.luau
   - src/model_json.model.json
   - src/module_script.luau
   - src/project_json.project.json
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
index 5eb051109..320b704fe 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_init.snap
@@ -3,7 +3,7 @@ source: tests/rojo_test/syncback_util.rs
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "src\\init.luau"
+  - src/init.luau
 added_dirs:
   - src
 removed_files: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
index 7a29413b5..daf6a8e58 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
@@ -1,15 +1,13 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "ReplicatedStorage\\ChildWithDuplicates.rbxm"
-  - "ReplicatedStorage\\ChildWithoutDuplicates\\Child\\.gitkeep"
+  - ReplicatedStorage/ChildWithDuplicates.rbxm
+  - ReplicatedStorage/ChildWithoutDuplicates/Child/.gitkeep
 added_dirs:
   - ReplicatedStorage
-  - "ReplicatedStorage\\ChildWithoutDuplicates"
-  - "ReplicatedStorage\\ChildWithoutDuplicates\\Child"
+  - ReplicatedStorage/ChildWithoutDuplicates
+  - ReplicatedStorage/ChildWithoutDuplicates/Child
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
index 69959cdc3..a67fbf168 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
@@ -1,13 +1,11 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "src\\pointer.model.json"
-  - "src\\target.model.json"
+  - src/pointer.model.json
+  - src/target.model.json
 added_dirs:
   - src
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap
index 8c06e3f64..0df33662b 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_blank.snap
@@ -1,17 +1,15 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
   - default.project.json
-  - "src\\Camera.rbxm"
-  - "src\\Terrain.rbxm"
-  - "src\\pointer.model.json"
-  - "src\\target.meta.json"
-  - "src\\target.txt"
+  - src/Camera.rbxm
+  - src/Terrain.rbxm
+  - src/pointer.model.json
+  - src/target.meta.json
+  - src/target.txt
 added_dirs:
   - src
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
index 69959cdc3..a67fbf168 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
@@ -1,13 +1,11 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "src\\pointer.model.json"
-  - "src\\target.model.json"
+  - src/pointer.model.json
+  - src/target.model.json
 added_dirs:
   - src
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap
index 716bb602f..3ea2c20d9 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware.snap
@@ -1,14 +1,12 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
-  - "Workspace\\Baseplate.model.json"
-  - "Workspace\\Terrain.rbxm"
+  - Workspace/Baseplate.model.json
+  - Workspace/Terrain.rbxm
   - default.project.json
 added_dirs:
   - Workspace
 removed_files: []
 removed_dirs: []
-
diff --git a/tests/rojo_test/io_util.rs b/tests/rojo_test/io_util.rs
index c18e457d4..7b855e1ff 100644
--- a/tests/rojo_test/io_util.rs
+++ b/tests/rojo_test/io_util.rs
@@ -5,6 +5,7 @@ use std::{
     process::Child,
 };
 
+use serde::{ser::SerializeSeq, Serialize, Serializer};
 use walkdir::WalkDir;
 
 pub static ROJO_PATH: &str = env!("CARGO_BIN_EXE_rojo");
@@ -67,3 +68,36 @@ impl Drop for KillOnDrop {
         }
     }
 }
+
+// Stolen from librojo::path_serializer
+pub fn serialize_absolute<S, T>(path: T, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+    T: AsRef<Path>,
+{
+    let as_str = path
+        .as_ref()
+        .as_os_str()
+        .to_str()
+        .expect("Invalid Unicode in file path, cannot serialize");
+    let replaced = as_str.replace('\\', "/");
+
+    serializer.serialize_str(&replaced)
+}
+
+#[derive(Serialize)]
+struct WithAbsolute<'a>(#[serde(serialize_with = "serialize_absolute")] &'a Path);
+
+pub fn serialize_vec_absolute<S, T>(paths: &[T], serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+    T: AsRef<Path>,
+{
+    let mut seq = serializer.serialize_seq(Some(paths.len()))?;
+
+    for path in paths {
+        seq.serialize_element(&WithAbsolute(path.as_ref()))?;
+    }
+
+    seq.end()
+}
diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 381d0568a..f3f47e2fd 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -7,7 +7,7 @@ use memofs::{InMemoryFs, IoResultExt, Vfs, VfsSnapshot};
 use rbx_reflection::ReflectionDatabase;
 use serde::Serialize;
 
-use crate::rojo_test::io_util::SYNCBACK_TESTS_PATH;
+use crate::rojo_test::io_util::{serialize_vec_absolute, SYNCBACK_TESTS_PATH};
 
 const INPUT_FILE: &str = "input.rbxl";
 const EXPECTED_DIR: &str = "expected";
@@ -184,30 +184,34 @@ fn normalize_line_endings(input: &Vec<u8>) -> Cow<Vec<u8>> {
 }
 
 #[derive(Default, Debug, Serialize)]
-struct FsSnapshotVisual {
-    added_files: Vec<String>,
-    added_dirs: Vec<String>,
-    removed_files: Vec<String>,
-    removed_dirs: Vec<String>,
+struct FsSnapshotVisual<'a> {
+    #[serde(serialize_with = "serialize_vec_absolute")]
+    added_files: Vec<&'a Path>,
+    #[serde(serialize_with = "serialize_vec_absolute")]
+    added_dirs: Vec<&'a Path>,
+    #[serde(serialize_with = "serialize_vec_absolute")]
+    removed_files: Vec<&'a Path>,
+    #[serde(serialize_with = "serialize_vec_absolute")]
+    removed_dirs: Vec<&'a Path>,
 }
 
-fn visualize_fs_snapshot(snapshot: &FsSnapshot, base_path: &Path) -> FsSnapshotVisual {
+fn visualize_fs_snapshot<'a>(snapshot: &'a FsSnapshot, base_path: &Path) -> FsSnapshotVisual<'a> {
     let mut added_files = Vec::new();
     let mut added_dirs = Vec::new();
     let mut removed_files = Vec::new();
     let mut removed_dirs = Vec::new();
 
     for file in snapshot.added_files() {
-        added_files.push(file.strip_prefix(base_path).unwrap().display().to_string())
+        added_files.push(file.strip_prefix(base_path).unwrap())
     }
     for file in snapshot.added_dirs() {
-        added_dirs.push(file.strip_prefix(base_path).unwrap().display().to_string())
+        added_dirs.push(file.strip_prefix(base_path).unwrap())
     }
     for file in snapshot.removed_dirs() {
-        removed_dirs.push(file.strip_prefix(base_path).unwrap().display().to_string())
+        removed_dirs.push(file.strip_prefix(base_path).unwrap())
     }
     for file in snapshot.removed_files() {
-        removed_files.push(file.strip_prefix(base_path).unwrap().display().to_string())
+        removed_files.push(file.strip_prefix(base_path).unwrap())
     }
 
     added_files.sort_unstable();

From c283daf54f9fc35748aa3ea98be4564912f968b0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 10 Jul 2024 12:54:21 -0700
Subject: [PATCH 337/366] Add .gitkeep files I forgot

---
 .../syncback-tests/child_but_not/output/OnlyOneCopy/.gitkeep      | 0
 .../child_but_not/output/ReplicatedStorage/.gitkeep               | 0
 rojo-test/syncback-tests/ignore_paths/output/src/.gitkeep         | 0
 .../project_all_middleware/expected/src/dir/.gitkeep              | 0
 .../syncback-tests/project_all_middleware/output/src/dir/.gitkeep | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 rojo-test/syncback-tests/child_but_not/output/OnlyOneCopy/.gitkeep
 create mode 100644 rojo-test/syncback-tests/child_but_not/output/ReplicatedStorage/.gitkeep
 create mode 100644 rojo-test/syncback-tests/ignore_paths/output/src/.gitkeep
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/expected/src/dir/.gitkeep
 create mode 100644 rojo-test/syncback-tests/project_all_middleware/output/src/dir/.gitkeep

diff --git a/rojo-test/syncback-tests/child_but_not/output/OnlyOneCopy/.gitkeep b/rojo-test/syncback-tests/child_but_not/output/OnlyOneCopy/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/child_but_not/output/ReplicatedStorage/.gitkeep b/rojo-test/syncback-tests/child_but_not/output/ReplicatedStorage/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/ignore_paths/output/src/.gitkeep b/rojo-test/syncback-tests/ignore_paths/output/src/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/dir/.gitkeep b/rojo-test/syncback-tests/project_all_middleware/expected/src/dir/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/project_all_middleware/output/src/dir/.gitkeep b/rojo-test/syncback-tests/project_all_middleware/output/src/dir/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 87e930013ae65c8f1746086739381298ed118aa0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 15 Jul 2024 11:12:36 -0700
Subject: [PATCH 338/366] Make `sync_unscriptable` default to `true` Remove
 unused method from snapshot.rs

---
 .../baseplate/expected/default.project.json          |  6 +++++-
 .../ignore_paths/expected/default.project.json       |  5 ++++-
 .../expected/default.project.json                    |  5 ++++-
 .../project_reserialize/output/default.project.json  |  5 ++++-
 .../expected/default.project.json                    |  5 ++++-
 .../expected/default.project.json                    |  5 ++++-
 src/syncback/mod.rs                                  |  2 +-
 src/syncback/property_filter.rs                      |  2 +-
 src/syncback/snapshot.rs                             | 12 ------------
 9 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/rojo-test/syncback-tests/baseplate/expected/default.project.json b/rojo-test/syncback-tests/baseplate/expected/default.project.json
index 145546b98..1647ac23e 100644
--- a/rojo-test/syncback-tests/baseplate/expected/default.project.json
+++ b/rojo-test/syncback-tests/baseplate/expected/default.project.json
@@ -26,6 +26,7 @@
         ],
         "Outlines": false,
         "ShadowSoftness": 0.20000000298023224,
+        "Technology": "ShadowMap",
         "TimeOfDay": "14:30:00"
       },
       "$path": "Lighting"
@@ -35,7 +36,10 @@
         "CSGAsyncDynamicCollision": {
           "Enum": 0
         },
-        "StreamingEnabled": true
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
       },
       "$path": "Workspace"
     }
diff --git a/rojo-test/syncback-tests/ignore_paths/expected/default.project.json b/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
index cd71f0570..b0aa4992f 100644
--- a/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
+++ b/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
@@ -10,7 +10,10 @@
         "DecreaseMinimumPartDensityMode": {
           "Enum": 0
         },
-        "StreamingEnabled": true
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
       },
       "$path": "src"
     }
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
index bf56d2e07..d256f6078 100644
--- a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
@@ -19,7 +19,10 @@
         "DecreaseMinimumPartDensityMode": {
           "Enum": 0
         },
-        "StreamingEnabled": true
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
       },
       "$attributes": {
         "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
diff --git a/rojo-test/syncback-tests/project_reserialize/output/default.project.json b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
index bf56d2e07..d256f6078 100644
--- a/rojo-test/syncback-tests/project_reserialize/output/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
@@ -19,7 +19,10 @@
         "DecreaseMinimumPartDensityMode": {
           "Enum": 0
         },
-        "StreamingEnabled": true
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
       },
       "$attributes": {
         "Rojo_Target_CurrentCamera": "6d6ae1d713c82fae0620aa1300000375"
diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json b/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
index d85e317e3..e97713026 100644
--- a/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
+++ b/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
@@ -10,7 +10,10 @@
         "DecreaseMinimumPartDensityMode": {
           "Enum": 0
         },
-        "StreamingEnabled": true
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
       },
       "$attributes": {
         "Rojo_Target_CurrentCamera": "62e89c49e4f800c20629c71b00003fcb"
diff --git a/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json b/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
index a012b4a38..7a22f24cf 100644
--- a/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
+++ b/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
@@ -10,7 +10,10 @@
         "DecreaseMinimumPartDensityMode": {
           "Enum": 0
         },
-        "StreamingEnabled": true
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
       },
       "$path": "Workspace"
     }
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 93a51a99b..2d7a61637 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -348,7 +348,7 @@ pub struct SyncbackRules {
     #[serde(skip_serializing_if = "Option::is_none")]
     sync_current_camera: Option<bool>,
     /// Whether or not to sync properties that cannot be modified via scripts.
-    /// Defaults to `false`.
+    /// Defaults to `true`.
     #[serde(skip_serializing_if = "Option::is_none")]
     sync_unscriptable: Option<bool>,
     /// Whether to skip serializing referent properties like `Model.PrimaryPart`
diff --git a/src/syncback/property_filter.rs b/src/syncback/property_filter.rs
index e4c00a6f2..fdbcd1dad 100644
--- a/src/syncback/property_filter.rs
+++ b/src/syncback/property_filter.rs
@@ -28,7 +28,7 @@ pub fn filter_properties_preallocated<'inst>(
         .syncback_rules
         .as_ref()
         .and_then(|s| s.sync_unscriptable)
-        .unwrap_or_default();
+        .unwrap_or(true);
 
     let class_data = rbx_reflection_database::get()
         .classes
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 178880931..73ca620dd 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -214,18 +214,6 @@ impl<'sync> SyncbackSnapshot<'sync> {
             .as_ref()
             .map(|rules| rules.ignore_trees.as_slice())
     }
-
-    /// Returns the user-defined setting to determine whether unscriptable
-    /// properties should be synced back or not.
-    #[inline]
-    pub fn sync_unscriptable(&self) -> bool {
-        self.data
-            .project
-            .syncback_rules
-            .as_ref()
-            .and_then(|sr| sr.sync_unscriptable)
-            .unwrap_or_default()
-    }
 }
 
 pub fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {

From 6b1a12e2ad10fc606776710b578ccd618b0df1f7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jul 2024 14:33:08 -0700
Subject: [PATCH 339/366] Use more efficient implementation of
 `get_new_inst_path`

Co-authored-by: Kenneth Loeffler <kenloef@gmail.com>
---
 src/syncback/snapshot.rs | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 73ca620dd..c91e93c61 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -128,24 +128,17 @@ impl<'sync> SyncbackSnapshot<'sync> {
     /// where you would look for the object in Roblox Studio.
     #[inline]
     pub fn get_new_inst_path(&self, referent: Ref) -> String {
-        let mut path = Vec::new();
-        let mut path_capacity = 0;
-
-        let mut inst = self.get_new_instance(referent);
-        while let Some(instance) = inst {
-            path.push(&instance.name);
-            path_capacity += instance.name.len() + 1;
-            inst = self.get_new_instance(instance.parent());
-        }
-        let mut str = String::with_capacity(path_capacity);
-        while let Some(segment) = path.pop() {
-            str.push_str(segment);
-            str.push('/')
-        }
-        str.pop();
+       let mut path = Vec::new();
 
-        str
-    }
+       let mut inst = self.get_new_instance(referent);
+       while let Some(instance) = inst {
+           path.push(instance.name.as_str());
+           inst = self.get_new_instance(instance.parent());
+       }
+
+       path.reverse();
+       path.join("/")
+   }
 
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.

From 6e7fb8290dc2015f0684563ff66c562f55c070f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jul 2024 14:42:40 -0700
Subject: [PATCH 340/366] oh my bad rustfmt

---
 src/syncback/snapshot.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index c91e93c61..978cb1df8 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -128,17 +128,17 @@ impl<'sync> SyncbackSnapshot<'sync> {
     /// where you would look for the object in Roblox Studio.
     #[inline]
     pub fn get_new_inst_path(&self, referent: Ref) -> String {
-       let mut path = Vec::new();
+        let mut path = Vec::new();
 
-       let mut inst = self.get_new_instance(referent);
-       while let Some(instance) = inst {
-           path.push(instance.name.as_str());
-           inst = self.get_new_instance(instance.parent());
-       }
+        let mut inst = self.get_new_instance(referent);
+        while let Some(instance) = inst {
+            path.push(instance.name.as_str());
+            inst = self.get_new_instance(instance.parent());
+        }
 
-       path.reverse();
-       path.join("/")
-   }
+        path.reverse();
+        path.join("/")
+    }
 
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.

From 6c420391d6d12dca438e81f9bc36133cf419661b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jul 2024 15:00:04 -0700
Subject: [PATCH 341/366] Add test for ignoreTrees

---
 ..._rojo_test__syncback_util__ignore_trees.snap |  12 ++++++++++++
 .../ignore_trees/expected/default.project.json  |  14 ++++++++++++++
 .../expected/src/IncludeMe/.gitkeep             |   0
 .../syncback-tests/ignore_trees/input.rbxl      | Bin 0 -> 53275 bytes
 .../ignore_trees/output/default.project.json    |  14 ++++++++++++++
 .../ignore_trees/output/src/.gitkeep            |   0
 tests/tests/syncback.rs                         |   1 +
 7 files changed, 41 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap
 create mode 100644 rojo-test/syncback-tests/ignore_trees/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_trees/expected/src/IncludeMe/.gitkeep
 create mode 100644 rojo-test/syncback-tests/ignore_trees/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ignore_trees/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_trees/output/src/.gitkeep

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap
new file mode 100644
index 000000000..5c7968bb8
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap
@@ -0,0 +1,12 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - src/IncludeMe/.gitkeep
+added_dirs:
+  - src
+  - src/IncludeMe
+removed_files: []
+removed_dirs: []
diff --git a/rojo-test/syncback-tests/ignore_trees/expected/default.project.json b/rojo-test/syncback-tests/ignore_trees/expected/default.project.json
new file mode 100644
index 000000000..017ab2f63
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_trees/expected/default.project.json
@@ -0,0 +1,14 @@
+{
+  "name": "ignore_trees",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignoreTrees": [
+      "ignore_trees/ReplicatedStorage/IgnoreMe"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_trees/expected/src/IncludeMe/.gitkeep b/rojo-test/syncback-tests/ignore_trees/expected/src/IncludeMe/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/ignore_trees/input.rbxl b/rojo-test/syncback-tests/ignore_trees/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..afab040ad65aa197e1f1e4f518959d60cfd63034
GIT binary patch
literal 53275
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

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ignore_trees/output/default.project.json b/rojo-test/syncback-tests/ignore_trees/output/default.project.json
new file mode 100644
index 000000000..017ab2f63
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_trees/output/default.project.json
@@ -0,0 +1,14 @@
+{
+  "name": "ignore_trees",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignoreTrees": [
+      "ignore_trees/ReplicatedStorage/IgnoreMe"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_trees/output/src/.gitkeep b/rojo-test/syncback-tests/ignore_trees/output/src/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index f351426e0..2dafb9b5b 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -29,4 +29,5 @@ syncback_basic_test! {
     duplicate_rojo_id,
     string_value_project,
     child_but_not,
+    ignore_trees,
 }

From c3e90194b79b606158e2318a05a045cbd8d7e60b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jul 2024 15:20:32 -0700
Subject: [PATCH 342/366] Remove unused import in project.rs

---
 src/project.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/project.rs b/src/project.rs
index f880f3e94..ce408b466 100644
--- a/src/project.rs
+++ b/src/project.rs
@@ -10,10 +10,7 @@ use memofs::Vfs;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{
-    glob::Glob, resolution::UnresolvedValue, snapshot::SyncRule,
-    snapshot_middleware::default_sync_rules, syncback::SyncbackRules,
-};
+use crate::{glob::Glob, resolution::UnresolvedValue, snapshot::SyncRule, syncback::SyncbackRules};
 
 static PROJECT_FILENAME: &str = "default.project.json";
 

From 47c702b7990c4f541f74da49c1e262f98d5c699c Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jul 2024 15:24:38 -0700
Subject: [PATCH 343/366] Don't include DOM root name in inst_path

---
 .../expected/default.project.json             |  2 +-
 .../ignore_trees/output/default.project.json  |  2 +-
 src/syncback/snapshot.rs                      | 48 +++++++++++++++----
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/rojo-test/syncback-tests/ignore_trees/expected/default.project.json b/rojo-test/syncback-tests/ignore_trees/expected/default.project.json
index 017ab2f63..c659671eb 100644
--- a/rojo-test/syncback-tests/ignore_trees/expected/default.project.json
+++ b/rojo-test/syncback-tests/ignore_trees/expected/default.project.json
@@ -8,7 +8,7 @@
   },
   "syncbackRules": {
     "ignoreTrees": [
-      "ignore_trees/ReplicatedStorage/IgnoreMe"
+      "ReplicatedStorage/IgnoreMe"
     ]
   }
 }
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_trees/output/default.project.json b/rojo-test/syncback-tests/ignore_trees/output/default.project.json
index 017ab2f63..c659671eb 100644
--- a/rojo-test/syncback-tests/ignore_trees/output/default.project.json
+++ b/rojo-test/syncback-tests/ignore_trees/output/default.project.json
@@ -8,7 +8,7 @@
   },
   "syncbackRules": {
     "ignoreTrees": [
-      "ignore_trees/ReplicatedStorage/IgnoreMe"
+      "ReplicatedStorage/IgnoreMe"
     ]
   }
 }
\ No newline at end of file
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 978cb1df8..04bda6299 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -128,16 +128,7 @@ impl<'sync> SyncbackSnapshot<'sync> {
     /// where you would look for the object in Roblox Studio.
     #[inline]
     pub fn get_new_inst_path(&self, referent: Ref) -> String {
-        let mut path = Vec::new();
-
-        let mut inst = self.get_new_instance(referent);
-        while let Some(instance) = inst {
-            path.push(instance.name.as_str());
-            inst = self.get_new_instance(instance.parent());
-        }
-
-        path.reverse();
-        path.join("/")
+        inst_path(self.new_tree(), referent)
     }
 
     /// Returns an Instance from the old tree with the provided referent, if it
@@ -217,3 +208,40 @@ pub fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
         _ => false,
     }
 }
+
+pub fn inst_path(dom: &WeakDom, referent: Ref) -> String {
+    let mut path = Vec::new();
+
+    let mut inst = dom.get_by_ref(referent);
+    while let Some(instance) = inst {
+        path.push(instance.name.as_str());
+        inst = dom.get_by_ref(instance.parent());
+    }
+    // This is to avoid the root's name from appearing in the path. Not
+    // optimal, but should be fine.
+    path.pop();
+
+    path.reverse();
+    path.join("/")
+}
+
+#[cfg(test)]
+mod test {
+    use rbx_dom_weak::{InstanceBuilder, WeakDom};
+
+    use super::inst_path as inst_path_outer;
+
+    #[test]
+    fn inst_path() {
+        let mut new_tree = WeakDom::new(InstanceBuilder::new("ROOT"));
+
+        let child_1 = new_tree.insert(new_tree.root_ref(), InstanceBuilder::new("Child1"));
+        let child_2 = new_tree.insert(child_1, InstanceBuilder::new("Child2"));
+        let child_3 = new_tree.insert(child_2, InstanceBuilder::new("Child3"));
+
+        assert_eq!(inst_path_outer(&new_tree, new_tree.root_ref()), "");
+        assert_eq!(inst_path_outer(&new_tree, child_1), "Child1");
+        assert_eq!(inst_path_outer(&new_tree, child_2), "Child1/Child2");
+        assert_eq!(inst_path_outer(&new_tree, child_3), "Child1/Child2/Child3");
+    }
+}

From 7810428066c7dd88c68efa7dd4bab0b4453c5061 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 31 Jul 2024 15:24:47 -0700
Subject: [PATCH 344/366] Update changelog with new changes

---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92d732361..585c61a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
     {
         "syncbackRules": {
             "ignoreTrees": [
-                "DataModel/ServerStorage/ImportantSecrets",
+                "ServerStorage/ImportantSecrets",
             ],
             "ignorePaths": [
                 "src/ServerStorage/Secrets/*"
@@ -32,7 +32,11 @@
     - `ignorePaths` is a list of paths in the **file system** that should be ignored
     - `ignoreProperties` is a list of properties that won't be synced back
     - `syncCurrentCamera` is a toggle for whether to sync back the Workspace's CurrentCamera. Defaults to `false`.
-    - `syncUnscriptable` is a toggle for whether to sync back properties that cannot be set by the Roblox Studio plugin. Defaults to `false`.
+    - `syncUnscriptable` is a toggle for whether to sync back properties that cannot be set by the Roblox Studio plugin. Defaults to `true`.
+
+ 	If you are used to the `UpliftGames` version of this feature, there are a few notable differences:
+    - `syncUnscriptable` defaults to `true` instead of `false`
+    - `ignoreTrees` doesn't require the root of the project's name in it.
 
 * Projects may now manually link `Ref` properties together using `Attributes`. ([#843])
  	This has two parts: using `id` or `$id` in JSON files or a `Rojo_Target` attribute, an Instance

From f997c307a0d4be89b164d4d45400c5fac434e726 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 15 Aug 2024 09:27:11 -0700
Subject: [PATCH 345/366] Revisit logging in syncback command

---
 src/cli/syncback.rs         | 25 ++++++++++++-------------
 src/syncback/fs_snapshot.rs | 24 ++++++++++--------------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 78bd0f7cc..0857d8147 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -55,23 +55,21 @@ impl SyncbackCommand {
         let path_new = resolve_path(&self.input);
 
         let input_kind = FileKind::from_path(&path_new).context(UNKNOWN_INPUT_KIND_ERR)?;
-        let dom_start = Instant::now();
-        log::info!("Reading place file at {}", path_new.display());
+        let dom_start_timer = Instant::now();
         let dom_new = read_dom(&path_new, input_kind)?;
-        log::info!(
+        log::debug!(
             "Finished opening file in {:0.02}s",
-            dom_start.elapsed().as_secs_f32()
+            dom_start_timer.elapsed().as_secs_f32()
         );
 
         let vfs = Vfs::new_default();
         vfs.set_watch_enabled(false);
 
-        let project_start = Instant::now();
-        log::info!("Opening project at {}", path_old.display());
+        let project_start_timer = Instant::now();
         let session_old = ServeSession::new(vfs, path_old.clone())?;
-        log::info!(
+        log::debug!(
             "Finished opening project in {:0.02}s",
-            project_start.elapsed().as_secs_f32()
+            project_start_timer.elapsed().as_secs_f32()
         );
 
         let mut dom_old = session_old.tree();
@@ -92,17 +90,17 @@ impl SyncbackCommand {
             }
         }
 
-        let start = Instant::now();
-        log::info!("Beginning syncback...");
+        let syncback_timer = Instant::now();
+        println!("Beginning syncback...");
         let snapshot = syncback_loop(
             session_old.vfs(),
             &mut dom_old,
             dom_new,
             session_old.root_project(),
         )?;
-        log::info!(
+        log::debug!(
             "Syncback finished in {:.02}s!",
-            start.elapsed().as_secs_f32()
+            syncback_timer.elapsed().as_secs_f32()
         );
 
         let base_path = session_old.root_project().folder_location();
@@ -127,8 +125,9 @@ impl SyncbackCommand {
                     return Ok(());
                 }
             }
-            log::info!("Writing to the file system...");
+            println!("Writing to the file system...");
             snapshot.write_to_vfs(base_path, session_old.vfs())?;
+            println!("Finished syncback.")
         } else {
             println!(
                 "Would write {} files/folders and remove {} files/folders.",
diff --git a/src/syncback/fs_snapshot.rs b/src/syncback/fs_snapshot.rs
index 424d1fef7..50b867820 100644
--- a/src/syncback/fs_snapshot.rs
+++ b/src/syncback/fs_snapshot.rs
@@ -99,20 +99,16 @@ impl FsSnapshot {
         }
         drop(lock);
 
-        if self.added_dirs.len() + self.added_files.len() > 0 {
-            log::info!(
-                "Wrote {} directories and {} files to the file system!",
-                self.added_dirs.len(),
-                self.added_files.len()
-            );
-        }
-        if self.removed_dirs.len() + self.removed_files.len() > 0 {
-            log::info!(
-                "Removed {} directories and {} files from the file system. Yikes!",
-                self.removed_dirs.len(),
-                self.removed_files.len()
-            );
-        }
+        log::debug!(
+            "Wrote {} directories and {} files to the file system",
+            self.added_dirs.len(),
+            self.added_files.len()
+        );
+        log::debug!(
+            "Removed {} directories and {} files from the file system",
+            self.removed_dirs.len(),
+            self.removed_files.len()
+        );
         Ok(())
     }
 

From 39cd8c07e0151b87dd16d155ed63fad529a3058e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 15 Aug 2024 09:32:35 -0700
Subject: [PATCH 346/366] Simplify directory fallback and indicate why the
 fallback happens in log message

---
 src/syncback/mod.rs | 56 +++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 2d7a61637..bb7d8c886 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -196,33 +196,35 @@ pub fn syncback_loop(
             continue;
         }
 
-        let mut syncback_res = middleware.syncback(&snapshot);
-        if syncback_res.is_err() && middleware == Middleware::Dir {
-            let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
-                Ok(value) if value == "1" => Middleware::Rbxmx,
-                Ok(value) if value == "2" => Middleware::JsonModel,
-                _ => Middleware::Rbxm,
-            };
-
-            let file_name = snapshot
-                .path
-                .file_name()
-                .and_then(|s| s.to_str())
-                .context("Directory middleware should have a name in its path")?;
-            let mut path = snapshot.path.clone();
-            path.set_file_name(format!(
-                "{file_name}.{}",
-                extension_for_middleware(new_middleware)
-            ));
-
-            let new_snapshot = snapshot.with_new_path(path, snapshot.new, snapshot.old);
-            log::warn!(
-                "Could not syncback {inst_path} as a Directory, it will \
-                instead be synced back as a {new_middleware:?}."
-            );
-            syncback_res = new_middleware.syncback(&new_snapshot);
-        }
-        let syncback = syncback_res.with_context(|| format!("Failed to syncback {inst_path}"))?;
+        let syncback = match middleware.syncback(&snapshot) {
+            Ok(syncback) => syncback,
+            Err(err) if middleware == Middleware::Dir => {
+                let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
+                    Ok(value) if value == "1" => Middleware::Rbxmx,
+                    Ok(value) if value == "2" => Middleware::JsonModel,
+                    _ => Middleware::Rbxm,
+                };
+                let file_name = snapshot
+                    .path
+                    .file_name()
+                    .and_then(|s| s.to_str())
+                    .context("Directory middleware should have a name in its path")?;
+                let mut path = snapshot.path.clone();
+                path.set_file_name(format!(
+                    "{file_name}.{}",
+                    extension_for_middleware(new_middleware)
+                ));
+                let new_snapshot = snapshot.with_new_path(path, snapshot.new, snapshot.old);
+                log::warn!(
+                    "Could not syncback {inst_path} as a Directory because: {err}.\n\
+                    It will instead be synced back as a {new_middleware:?}."
+                );
+                new_middleware
+                    .syncback(&new_snapshot)
+                    .with_context(|| format!("Failed to syncback {inst_path}"))?
+            }
+            Err(err) => anyhow::bail!("Failed to syncback {inst_path} because {err}"),
+        };
 
         if !syncback.removed_children.is_empty() {
             log::debug!(

From f1ca6cbe279a0ca33ec7eaa6e57d41e68e6fbf39 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 15 Aug 2024 09:48:13 -0700
Subject: [PATCH 347/366] Use a BufReader when loading the Roblox file for
 syncback

---
 src/cli/syncback.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 0857d8147..db6c29c76 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -1,5 +1,5 @@
 use std::{
-    io::{self, Write as _},
+    io::{self, BufReader, Write as _},
     mem::forget,
     path::{Path, PathBuf},
     time::Instant,
@@ -148,7 +148,7 @@ impl SyncbackCommand {
 }
 
 fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
-    let content = File::open(path)?;
+    let content = BufReader::new(File::open(path)?);
     match file_kind {
         FileKind::Rbxl => {
             // HACK: A custom reflection database is used to deserialize UniqueId

From 5da5b05b8fb188022f31de310da35c0ddf4b5872 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 15 Aug 2024 10:51:20 -0700
Subject: [PATCH 348/366] Make removing files respect ignore_paths

---
 ..._syncback_util__ignore_paths_removing.snap |  10 ++++++
 .../expected/default.project.json             |  33 ++++++++++++++++++
 .../expected/src/not_in_place.luau            |   1 +
 .../ignore_paths_removing/input.rbxl          | Bin 0 -> 45248 bytes
 .../output/default.project.json               |  33 ++++++++++++++++++
 .../output/src/not_in_place.luau              |   1 +
 src/syncback/mod.rs                           |   7 ++++
 tests/tests/syncback.rs                       |   1 +
 8 files changed, 86 insertions(+)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths_removing.snap
 create mode 100644 rojo-test/syncback-tests/ignore_paths_removing/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_paths_removing/expected/src/not_in_place.luau
 create mode 100644 rojo-test/syncback-tests/ignore_paths_removing/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ignore_paths_removing/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_paths_removing/output/src/not_in_place.luau

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths_removing.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths_removing.snap
new file mode 100644
index 000000000..c2a0b917e
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths_removing.snap
@@ -0,0 +1,10 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 48
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files: []
+added_dirs:
+  - src
+removed_files: []
+removed_dirs: []
diff --git a/rojo-test/syncback-tests/ignore_paths_removing/expected/default.project.json b/rojo-test/syncback-tests/ignore_paths_removing/expected/default.project.json
new file mode 100644
index 000000000..deefcff22
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths_removing/expected/default.project.json
@@ -0,0 +1,33 @@
+{
+  "name": "ignore_paths",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "MoverConstraintRootBehavior": {
+          "Enum": 0
+        },
+        "RenderingCacheOptimizations": {
+          "Enum": 0
+        },
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
+      },
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignorePaths": [
+      "*.rbxm",
+      "*.luau"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_paths_removing/expected/src/not_in_place.luau b/rojo-test/syncback-tests/ignore_paths_removing/expected/src/not_in_place.luau
new file mode 100644
index 000000000..1ba9bedc9
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths_removing/expected/src/not_in_place.luau
@@ -0,0 +1 @@
+-- This script is not in the input place file.
diff --git a/rojo-test/syncback-tests/ignore_paths_removing/input.rbxl b/rojo-test/syncback-tests/ignore_paths_removing/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..78be118bc922583b904ea8093a88fd07ada0ccf6
GIT binary patch
literal 45248
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

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ignore_paths_removing/output/default.project.json b/rojo-test/syncback-tests/ignore_paths_removing/output/default.project.json
new file mode 100644
index 000000000..deefcff22
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths_removing/output/default.project.json
@@ -0,0 +1,33 @@
+{
+  "name": "ignore_paths",
+  "tree": {
+    "$className": "DataModel",
+    "Workspace": {
+      "$properties": {
+        "CSGAsyncDynamicCollision": {
+          "Enum": 0
+        },
+        "DecreaseMinimumPartDensityMode": {
+          "Enum": 0
+        },
+        "MoverConstraintRootBehavior": {
+          "Enum": 0
+        },
+        "RenderingCacheOptimizations": {
+          "Enum": 0
+        },
+        "SignalBehavior": "Deferred",
+        "StreamOutBehavior": "Opportunistic",
+        "StreamingEnabled": true,
+        "StreamingIntegrityMode": "PauseOutsideLoadedArea"
+      },
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignorePaths": [
+      "*.rbxm",
+      "*.luau"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_paths_removing/output/src/not_in_place.luau b/rojo-test/syncback-tests/ignore_paths_removing/output/src/not_in_place.luau
new file mode 100644
index 000000000..1ba9bedc9
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_paths_removing/output/src/not_in_place.luau
@@ -0,0 +1 @@
+-- This script is not in the input place file.
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index bb7d8c886..3858da767 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -233,6 +233,13 @@ pub fn syncback_loop(
             );
             for inst in &syncback.removed_children {
                 let path = inst.metadata().instigating_source.as_ref().unwrap().path();
+                if !is_valid_path(&ignore_patterns, project_path, path) {
+                    log::debug!(
+                        "Skipping removing {} because its matches an ignore pattern",
+                        path.display()
+                    );
+                    continue;
+                }
                 if path.is_dir() {
                     fs_snapshot.remove_dir(path)
                 } else {
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 2dafb9b5b..389501ab4 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -30,4 +30,5 @@ syncback_basic_test! {
     string_value_project,
     child_but_not,
     ignore_trees,
+    ignore_paths_removing,
 }

From db063976b8ffad766b49f90a4d0687a86681ee8a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Aug 2024 10:48:52 -0700
Subject: [PATCH 349/366] Clean up `variant_eq` - do attribute comparisons more
 reasonably - use iterators for sequence types - fix bug with NumberRange

---
 src/variant_eq.rs | 52 +++++++++++++++--------------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/src/variant_eq.rs b/src/variant_eq.rs
index d99addc62..6d80d1cc4 100644
--- a/src/variant_eq.rs
+++ b/src/variant_eq.rs
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use rbx_dom_weak::types::{PhysicalProperties, Variant, Vector3};
 
 /// Accepts three argumets: a float type and two values to compare.
@@ -22,27 +20,19 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
     match (variant_a, variant_b) {
         (Variant::Attributes(a), Variant::Attributes(b)) => {
             // If they're not the same size, we can just abort
-            if a.iter().count() != b.iter().count() {
+            if a.len() != b.len() {
                 return false;
             }
-            // Using a duplicated map, we can determine if we have
-            // mismatched keys between A and B
-            let mut b_dupe = HashMap::with_capacity(b.iter().count());
-            for (name, value) in b.iter() {
-                b_dupe.insert(name, value);
-            }
-            for (name, a_value) in a.iter() {
-                if let Some(b_value) = b.get(name.as_str()) {
-                    if variant_eq(a_value, b_value) {
-                        b_dupe.remove(name);
-                    } else {
-                        return false;
-                    }
-                } else {
+
+            // Since Attributes are stored with a BTreeMap, the keys are sorted
+            // and we can compare each map's keys in order.
+            for ((a_name, a_value), (b_name, b_value)) in a.iter().zip(b.iter()) {
+                if !(a_name == b_name && variant_eq(a_value, b_value)) {
                     return false;
                 }
             }
-            b_dupe.is_empty()
+
+            true
         }
         (Variant::Axes(a), Variant::Axes(b)) => a == b,
         (Variant::BinaryString(a), Variant::BinaryString(b)) => a == b,
@@ -55,23 +45,18 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
                 && vector_eq(&a.orientation.z, &b.orientation.z)
         }
         (Variant::Color3(a), Variant::Color3(b)) => {
-            approx_eq!(f32, a.r, b.r) && approx_eq!(f32, a.b, b.b) && approx_eq!(f32, a.g, b.g)
+            approx_eq!(f32, a.r, b.r) && approx_eq!(f32, a.g, b.g) && approx_eq!(f32, a.b, b.b)
         }
         (Variant::Color3uint8(a), Variant::Color3uint8(b)) => a == b,
         (Variant::ColorSequence(a), Variant::ColorSequence(b)) => {
             if a.keypoints.len() != b.keypoints.len() {
                 return false;
             }
-            let mut a_keypoints = Vec::with_capacity(a.keypoints.len());
-            let mut b_keypoints = Vec::with_capacity(b.keypoints.len());
-            for keypoint in &a.keypoints {
-                a_keypoints.push(keypoint)
-            }
-            for keypoint in &b.keypoints {
-                b_keypoints.push(keypoint)
-            }
+            let mut a_keypoints: Vec<_> = a.keypoints.iter().collect();
+            let mut b_keypoints: Vec<_> = b.keypoints.iter().collect();
             a_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
             b_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
+
             for (a_kp, b_kp) in a_keypoints.iter().zip(b_keypoints) {
                 if !(approx_eq!(f32, a_kp.time, b_kp.time)
                     && approx_eq!(f32, a_kp.color.r, b_kp.color.r)
@@ -98,22 +83,17 @@ pub fn variant_eq(variant_a: &Variant, variant_b: &Variant) -> bool {
         (Variant::Int64(a), Variant::Int64(b)) => a == b,
         (Variant::MaterialColors(a), Variant::MaterialColors(b)) => a.encode() == b.encode(),
         (Variant::NumberRange(a), Variant::NumberRange(b)) => {
-            approx_eq!(f32, a.max, b.max) && approx_eq!(f32, a.min, a.max)
+            approx_eq!(f32, a.max, b.max) && approx_eq!(f32, a.min, b.min)
         }
         (Variant::NumberSequence(a), Variant::NumberSequence(b)) => {
             if a.keypoints.len() != b.keypoints.len() {
                 return false;
             }
-            let mut a_keypoints = Vec::with_capacity(a.keypoints.len());
-            let mut b_keypoints = Vec::with_capacity(b.keypoints.len());
-            for keypoint in &a.keypoints {
-                a_keypoints.push(keypoint)
-            }
-            for keypoint in &b.keypoints {
-                b_keypoints.push(keypoint)
-            }
+            let mut a_keypoints: Vec<_> = a.keypoints.iter().collect();
+            let mut b_keypoints: Vec<_> = b.keypoints.iter().collect();
             a_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
             b_keypoints.sort_unstable_by(|k1, k2| k1.time.partial_cmp(&k2.time).unwrap());
+
             for (a_kp, b_kp) in a_keypoints.iter().zip(b_keypoints) {
                 if !(approx_eq!(f32, a_kp.time, b_kp.time)
                     && approx_eq!(f32, a_kp.value, b_kp.value)

From 5a7a65c6b9cd7eb95209345e1b940e26138edad3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Aug 2024 11:00:41 -0700
Subject: [PATCH 350/366] Redo docs for syncback command

---
 src/cli/syncback.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index db6c29c76..3eef69264 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -23,24 +23,29 @@ use super::{resolve_path, GlobalOptions};
 const UNKNOWN_INPUT_KIND_ERR: &str = "Could not detect what kind of file was inputted. \
                                        Expected input file to end in .rbxl, .rbxlx, .rbxm, or .rbxmx.";
 
-/// Performs syncback for a project file
+/// Performs 'syncback' for the provided project, using the `input` file
+/// given.
+///
+/// Syncback exists to convert Roblox files into a Rojo project automatically.
+/// It uses the project.json file provided to traverse the Roblox file passed as
+/// to serialize Instances to the file system in a format that Rojo understands.
 #[derive(Debug, Parser)]
 pub struct SyncbackCommand {
     /// Path to the project to sync back to.
     #[clap(default_value = "")]
     pub project: PathBuf,
 
-    /// Path to the place to perform syncback on.
+    /// Path to the Roblox file to pull Instances from.
     #[clap(long, short)]
     pub input: PathBuf,
 
-    /// If provided, syncback will list all of the changes it will make to the
-    /// file system before making them.
+    /// If provided, a list all of the files and directories that will be
+    /// added or removed is emitted.
     #[clap(long, short)]
     pub list: bool,
 
     /// If provided, syncback will not actually write anything to the file
-    /// system.
+    /// system. The command will otherwise run normally.
     #[clap(long)]
     pub dry_run: bool,
 

From ab24a85715184bab266c83ff94ae85cb07011dff Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Aug 2024 14:34:18 -0700
Subject: [PATCH 351/366] Use hashing to  determine if we should add
 directories

---
 src/snapshot_middleware/dir.rs | 21 +++++++++++++++++++--
 src/syncback/snapshot.rs       |  6 ++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/snapshot_middleware/dir.rs b/src/snapshot_middleware/dir.rs
index aaaa4fa38..4d84fab12 100644
--- a/src/snapshot_middleware/dir.rs
+++ b/src/snapshot_middleware/dir.rs
@@ -8,7 +8,7 @@ use memofs::{DirEntry, IoResultExt, Vfs};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource},
-    syncback::{FsSnapshot, SyncbackReturn, SyncbackSnapshot},
+    syncback::{hash_instance, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
 use super::{meta_file::DirectoryMetadata, snapshot_from_vfs};
@@ -199,7 +199,24 @@ pub fn syncback_dir_no_meta<'sync>(
         }
     }
     let mut fs_snapshot = FsSnapshot::new();
-    fs_snapshot.add_dir(&snapshot.path);
+
+    if let Some(old_ref) = snapshot.old {
+        let new_hash = hash_instance(snapshot.project(), snapshot.new_tree(), snapshot.new)
+            .expect("new Instance should be hashable");
+        let old_hash = hash_instance(snapshot.project(), snapshot.old_tree(), old_ref)
+            .expect("old Instance should be hashable");
+
+        if old_hash != new_hash {
+            fs_snapshot.add_dir(&snapshot.path);
+        } else {
+            log::debug!(
+                "Skipping reserializing directory {} because old and new tree hash the same",
+                new_inst.name
+            );
+        }
+    } else {
+        fs_snapshot.add_dir(&snapshot.path);
+    }
 
     Ok(SyncbackReturn {
         fs_snapshot,
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 04bda6299..b91a1e83d 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -179,6 +179,12 @@ impl<'sync> SyncbackSnapshot<'sync> {
         self.data.new_tree
     }
 
+    /// Returns the WeakDom used for the 'old' tree.
+    #[inline]
+    pub fn old_tree(&self) -> &'sync WeakDom {
+        self.data.old_tree.inner()
+    }
+
     /// Returns user-specified property ignore rules.
     #[inline]
     pub fn ignore_props(&self) -> Option<&HashMap<String, Vec<String>>> {

From f2c65fc8c88f2d4ff4699958480c0b75a6513de1 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 19 Aug 2024 15:30:00 -0700
Subject: [PATCH 352/366] Update test snapshots cuz I forgot

---
 .../end_to_end__rojo_test__syncback_util__all_middleware.snap | 2 --
 .../end_to_end__rojo_test__syncback_util__child_but_not.snap  | 4 +---
 .../end_to_end__rojo_test__syncback_util__ignore_trees.snap   | 2 --
 ..._end__rojo_test__syncback_util__nested_projects_weird.snap | 3 +--
 ...to_end__rojo_test__syncback_util__project_reserialize.snap | 2 --
 .../end_to_end__rojo_test__syncback_util__rbxm_fallback.snap  | 1 -
 .../end_to_end__rojo_test__syncback_util__ref_properties.snap | 3 +--
 ..._end__rojo_test__syncback_util__ref_properties_update.snap | 3 +--
 8 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
index da8f827ed..3db4bb1f6 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap
@@ -17,9 +17,7 @@ added_files:
   - src/rbxmx.rbxmx
   - src/text.txt
 added_dirs:
-  - src
   - src/csv_init
-  - src/dir
   - src/dir/init_client_script
   - src/dir/init_module_script
   - src/dir/init_server_script
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
index 280232eb3..06a661b0c 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap
@@ -5,8 +5,6 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - OnlyOneCopy/child_of_one.luau
   - ReplicatedStorage/child_replicated_storage.luau
-added_dirs:
-  - OnlyOneCopy
-  - ReplicatedStorage
+added_dirs: []
 removed_files: []
 removed_dirs: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap
index 5c7968bb8..dcdb221c8 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap
@@ -1,12 +1,10 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
   - src/IncludeMe/.gitkeep
 added_dirs:
-  - src
   - src/IncludeMe
 removed_files: []
 removed_dirs: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
index a3a522539..f45539f41 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap
@@ -5,7 +5,6 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/modules/ClientModule.luau
   - src/modules/ServerModule.luau
-added_dirs:
-  - src/modules
+added_dirs: []
 removed_files: []
 removed_dirs: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
index e88330b24..441e0b7b9 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize.snap
@@ -1,6 +1,5 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 48
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
@@ -9,4 +8,3 @@ added_files:
 added_dirs: []
 removed_files: []
 removed_dirs: []
-
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
index daf6a8e58..6b308f1d7 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
@@ -6,7 +6,6 @@ added_files:
   - ReplicatedStorage/ChildWithDuplicates.rbxm
   - ReplicatedStorage/ChildWithoutDuplicates/Child/.gitkeep
 added_dirs:
-  - ReplicatedStorage
   - ReplicatedStorage/ChildWithoutDuplicates
   - ReplicatedStorage/ChildWithoutDuplicates/Child
 removed_files: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
index a67fbf168..77d69e6e7 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties.snap
@@ -5,7 +5,6 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/pointer.model.json
   - src/target.model.json
-added_dirs:
-  - src
+added_dirs: []
 removed_files: []
 removed_dirs: []
diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
index a67fbf168..77d69e6e7 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap
@@ -5,7 +5,6 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/pointer.model.json
   - src/target.model.json
-added_dirs:
-  - src
+added_dirs: []
 removed_files: []
 removed_dirs: []

From 6aa8aa6f5130f91ef1225d06436ecae96ee46339 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 22 Aug 2024 11:34:42 -0700
Subject: [PATCH 353/366] Don't serialize `LuaSourceContainer.ScriptGuid` for
 scripts originating from `$path` or `.luau` files

---
 src/syncback/snapshot.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index b91a1e83d..7d19bf878 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -208,7 +208,11 @@ impl<'sync> SyncbackSnapshot<'sync> {
 
 pub fn filter_out_property(inst: &Instance, prop_name: &str) -> bool {
     match inst.class.as_str() {
-        "Script" | "LocalScript" | "ModuleScript" => prop_name == "Source",
+        "Script" | "LocalScript" | "ModuleScript" => {
+            // These properties shouldn't be set by scripts that are created via
+            // `$path` or via being on the file system.
+            prop_name == "Source" || prop_name == "ScriptGuid"
+        }
         "LocalizationTable" => prop_name == "Contents",
         "StringValue" => prop_name == "Value",
         _ => false,

From ba92d6d8002e5be01808b5463a53653c7ddd850e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Aug 2024 11:49:54 -0700
Subject: [PATCH 354/366] Remove database shim now that UniqueId deserializes

---
 src/cli/syncback.rs              | 50 +++++---------------------------
 tests/rojo_test/syncback_util.rs | 28 +-----------------
 2 files changed, 9 insertions(+), 69 deletions(-)

diff --git a/src/cli/syncback.rs b/src/cli/syncback.rs
index 3eef69264..9a3c1a4ac 100644
--- a/src/cli/syncback.rs
+++ b/src/cli/syncback.rs
@@ -10,7 +10,6 @@ use clap::Parser;
 use fs_err::File;
 use memofs::Vfs;
 use rbx_dom_weak::{InstanceBuilder, WeakDom};
-use rbx_reflection::ReflectionDatabase;
 use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
 
 use crate::{
@@ -155,26 +154,18 @@ impl SyncbackCommand {
 fn read_dom(path: &Path, file_kind: FileKind) -> anyhow::Result<WeakDom> {
     let content = BufReader::new(File::open(path)?);
     match file_kind {
-        FileKind::Rbxl => {
-            // HACK: A custom reflection database is used to deserialize UniqueId
-            let db = binary_db().expect("A custom ReflectionDatabase to deserialize UniqueId");
-            let binary_decoder = rbx_binary::Deserializer::new().reflection_database(&db);
-            binary_decoder.deserialize(content).with_context(|| {
-                format!(
-                    "Could not deserialize binary place file at {}",
-                    path.display()
-                )
-            })
-        }
+        FileKind::Rbxl => rbx_binary::from_reader(content).with_context(|| {
+            format!(
+                "Could not deserialize binary place file at {}",
+                path.display()
+            )
+        }),
         FileKind::Rbxlx => rbx_xml::from_reader(content, xml_decode_config())
             .with_context(|| format!("Could not deserialize XML place file at {}", path.display())),
         FileKind::Rbxm => {
-            // HACK: A custom reflection database is used to deserialize UniqueId
-            let db = binary_db().expect("A custom ReflectionDatabase to deserialize UniqueId");
-            let binary_decoder = rbx_binary::Deserializer::new().reflection_database(&db);
-            let temp_tree = binary_decoder.deserialize(content).with_context(|| {
+            let temp_tree = rbx_binary::from_reader(content).with_context(|| {
                 format!(
-                    "Could not deserialize binary model file at {}",
+                    "Could not deserialize binary place file at {}",
                     path.display()
                 )
             })?;
@@ -220,31 +211,6 @@ fn xml_decode_config() -> rbx_xml::DecodeOptions<'static> {
     rbx_xml::DecodeOptions::new().property_behavior(rbx_xml::DecodePropertyBehavior::ReadUnknown)
 }
 
-fn binary_db() -> Option<ReflectionDatabase<'static>> {
-    // HACK: UniqueId does not deserialize right now, so we force it to
-    // Don't forget to change this in the syncback test when changing it here.
-    use rbx_reflection::{PropertyKind, PropertySerialization};
-    use std::borrow::Cow;
-
-    let mut unique_id = rbx_reflection_database::get()
-        .classes
-        .get("Instance")?
-        .properties
-        .get("UniqueId")?
-        .clone();
-    unique_id.kind = PropertyKind::Canonical {
-        serialization: PropertySerialization::Serializes,
-    };
-
-    let mut db = rbx_reflection_database::get().clone();
-    let instance = db.classes.get_mut("Instance")?;
-    instance
-        .properties
-        .insert(Cow::Borrowed("UniqueId"), unique_id);
-
-    Some(db)
-}
-
 /// The different kinds of input that Rojo can syncback.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum FileKind {
diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 25a40f90a..8144c8f9c 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -35,9 +35,7 @@ pub fn basic_syncback_test(name: &str) -> anyhow::Result<()> {
     };
     im_vfs.set_watch_enabled(false);
 
-    let database = database_shim().unwrap();
-    let deserializer = rbx_binary::Deserializer::new().reflection_database(&database);
-    let input_dom = deserializer.deserialize(std_vfs.read(input_path)?.as_slice())?;
+    let input_dom = rbx_binary::from_reader(std_vfs.read(input_path)?.as_slice())?;
 
     let (mut output_dom, project) =
         rojo_tree_from_path(&std_vfs, &output_path.join("default.project.json"))?;
@@ -142,30 +140,6 @@ fn to_vfs_snapshot(vfs: &Vfs, path: &Path) -> anyhow::Result<VfsSnapshot> {
     }
 }
 
-fn database_shim() -> Option<ReflectionDatabase<'static>> {
-    // HACK: UniqueId does not deserialize right now, so we force it to
-    // Don't forget to change this in the syncback CLI when changing it here.
-    use rbx_reflection::{PropertyKind, PropertySerialization};
-
-    let mut unique_id = rbx_reflection_database::get()
-        .classes
-        .get("Instance")?
-        .properties
-        .get("UniqueId")?
-        .clone();
-    unique_id.kind = PropertyKind::Canonical {
-        serialization: PropertySerialization::Serializes,
-    };
-
-    let mut db = rbx_reflection_database::get().clone();
-    let instance = db.classes.get_mut("Instance")?;
-    instance
-        .properties
-        .insert(Cow::Borrowed("UniqueId"), unique_id);
-
-    Some(db)
-}
-
 /// Normalizes the line endings of a vector if it's user-readable.
 /// If it isn't, the vector is returned unmodified.
 fn normalize_line_endings(input: &Vec<u8>) -> Cow<Vec<u8>> {

From 4d864d91c5d79ee0c5517bae7b9f5c85687ca495 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Aug 2024 12:09:24 -0700
Subject: [PATCH 355/366] Update test files with new database

---
 .../all_middleware/expected/src/rbxm.rbxm     | Bin 704 -> 802 bytes
 .../all_middleware/expected/src/rbxmx.rbxmx   |   1 +
 .../expected/Workspace/Baseplate.rbxm         | Bin 3168 -> 3365 bytes
 .../baseplate/expected/Workspace/Camera.rbxm  | Bin 822 -> 920 bytes
 .../expected/Workspace/SpawnLocation.rbxm     | Bin 3214 -> 3412 bytes
 .../baseplate/expected/Workspace/Terrain.rbxm | Bin 3046 -> 3144 bytes
 .../baseplate/expected/default.project.json   |   2 +-
 .../expected/default.project.json             |   5 +----
 .../expected/src/rbxmx.rbxmx                  |   1 +
 .../expected/default.project.json             |   5 +----
 .../output/default.project.json               |   5 +----
 .../ChildWithDuplicates.rbxm                  | Bin 458 -> 626 bytes
 .../expected/default.project.json             |   5 +----
 .../expected/src/Camera.rbxm                  | Bin 866 -> 964 bytes
 .../expected/src/Terrain.rbxm                 | Bin 3046 -> 3144 bytes
 .../expected/Workspace/Terrain.rbxm           | Bin 3046 -> 3144 bytes
 .../expected/default.project.json             |   5 +----
 .../expected/default.project.json             |   5 +----
 18 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxm.rbxm b/rojo-test/syncback-tests/all_middleware/expected/src/rbxm.rbxm
index 1fc6714ae046dfc4206e3b2ffd9e2f8a1323f5bb..e981fedcb8002dc9c24ddcb694102eae929c9461 100644
GIT binary patch
delta 107
zcmX@Wx`=JVEJkg41_lNtAO?XC%pj5zh&?ikOY(~<JyYa`7?_zD0zl#nlczCW(N_jC
r6v14edLa;l1BgTOG7C#nfyx;eYVNYh?hjbI`)c1$-mHC-)0m<F8qpWs

delta 15
XcmZ3)c7S!mEXK(v881ve!xRPpG_eMq

diff --git a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
index 6c66a17ad..8f2d62241 100644
--- a/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/all_middleware/expected/src/rbxmx.rbxmx
@@ -5,6 +5,7 @@
       <BinaryString name="AttributesSerialize"></BinaryString>
       <SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
       <bool name="DefinesCapabilities">false</bool>
+      <UniqueId name="HistoryId">00000000000000000000000000000000</UniqueId>
       <int64 name="SourceAssetId">-1</int64>
       <BinaryString name="Tags"></BinaryString>
       <string name="Text">fireplace addicted army cow stock</string>
diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Baseplate.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Baseplate.rbxm
index b992a7992e4c91eb0129e51a8e45d12423235a28..c2f123906ea8cb779feca301313b28a0d93d98a6 100644
GIT binary patch
delta 981
zcmZuw&1(}u6yKTMY-Y1<Y@_K%Vhs7Pt+5(yts)c!KWd|pF0tlh3o&jr(7Nq*EA2%*
zSV4+ne0Wh26g)}`);~ay9@?Ye!9x*mMZqBGP4T^<6{{VX-@Nzc?fd=a&FsgP7m@p2
z1*Ry9hSMs!o<a@|p39#fjG)mXT}7!GWcYCo+SA^YYj0#KR$;)}f$<O};HasrdMgFb
zjC6G+$XNA52V<Zz!cMjavB>r#&aw>R0?WXVDc}=Jqvz+z<Ss0+Qx?Kf^(05fd9u$f
zjoA&HHsCCeV6x43BhK*@;yh2mJ0k%_j*P%n+UZcc5ihDlHm4H(qS_7FKmvqDS<PCf
zq&}w+^|(gT9!Y$wk+iQ`qBn+gN#exuLnATNhW^T==eRSu%W-UiMSHRdt++Nz50wiB
zaUYTPOPugg`NuvIv+PSCe({m;2E7gOh~9%ZrpMY-_<drdMu-SaoL1$!;|+|AOxoUh
z3l?;0!HP~*ze|k!$<FyRvS*F>RiSd_ss|;O3R9gria3sExfRE)crz-@8IdeiFF0P&
z9(BqX45IsIY;my<1c^?I3@|eZ<01&d0Rgu~6r;~YJL0m$Z-R~<HTJ=p8HOQ4WdA>y
zK%xuRDic#SHM0NUPrkNv_fEO-^^>LIJ$Pd@wNl2G%Bl|!!x<KW_dJ%Sw-Q~~T$8JO
zFV3jrcGqoFZc+%2vj}`vV_*e>a6^bgeWkKZ@0HOR<7jMLa!sZD&6gZfRF2mSt9k@x
z18p$R1iT8Q<hqJ$UL>JMYl5R@nkg`B?nR0)JT-&py)=7eo@La-FH@Y@+y>(Mrwv{H
ozuQ3a!kDz3GI7*21;TX)qFg<lKP4mbw?wNq>pGW4o#|u00S;BcF8}}l

delta 823
zcmZuvJ8u&~5Z>K;`_3<j9mm0lyK_toA+oT5hKB?q5(*?IV?sq?S!b{aIyjC98ZZ*2
zi<l`>K!fOj2JstEsGv&&qC%qJN<_uXMxkP)`R3;4o5$|#tLnGP=J5_gQBi|loG?xv
z%B7X7-74CO^cYJmiWsQf@L}>G4)>TM=&S})_<!FXQ(=>5K4_WxWIM;%WM|%?NCx$M
zuYVh!YBkPafj1G?_#&LKO&D`u+7D=dq5qxNF=`0Utzp^$%124%a5{cnSc-dh!h$HU
z5iE-;atC4#aV&hqcfyBL85gb#><@}Uk*3l{yrC>2j+J@D_evX{Bg;~WRZ$mY=gTT}
zzNgZ3TWV8I^+~0wsp{ruu=g~Lf|8mHu4q(gL*fgKaz1L*;kV`@R&~ldt2Yos{RHBc
zUTb)m>&gmPgAT)N)L^&~C98wM{V*wr5+3WTPRIJAQ_;FXxMJ*%^ThD8lvYIT3~$~_
zptpN{*E&&@1o1G6hsh&_D6|{ub%-34R3oH*ohVrg*P}i%b5m?Yze)bHOlX;OjIMbE
z!1my!nS)uUl&6PLmN{6~VDQ;IO!G?gEV`Cu>zKU0kyY{zB9m50k_ti-_1^?VJn&De
zI(c1(W+n$;ggZy<St6pO4sBj8K3b3BwtP?&05?;HABu}pm93>-Kcq*<p=gw0+HSyG
zZo);|m-a5&$EF7-)iP|`b<QERkHQ<X1T80r-Z|&A<c+K>Y&vGXgq8MF50q5pu;a7@
J7vN-P{sM|Xpt}G7

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Camera.rbxm
index 583d9c50a9d4ed92033801521900056c77ba601c..357bd98419723459b41105bce3aee7d968de9a9c 100644
GIT binary patch
delta 104
zcmdnSHiLabIFp7v0|SE+5QD%6W)R5<#2%T&CHX~_o+<J|49rXn0SpY21DKlim4Q-<
rAT>bnK?p>00C8wuW?^Y6P%VRp;SZ*l$9g-H1-H&Q7S=cUJX1OV$G;be

delta 15
WcmbQizKv}|IMd`drkcs7%*g;N^#v*b

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/SpawnLocation.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/SpawnLocation.rbxm
index f4acc7f8064d9097f453ea4ff561b47bd0c46906..de52151d2d2d9f829aa78bdeae10bdb28cfd9222 100644
GIT binary patch
delta 1014
zcmZWo%}W$v7@v2(_oG?YRLnGYcKv9}G_!)hB27i9)?v$q>a=aMIqcTpIEG&87zT;!
z1JNOZj$MQffl(27@Gl6u)FF^QKw?fEy4dr)+aA^)cz!eQyuauBnUw<{+g4Ac1r!B!
z%r4~10;40!ROZUn1U?VZ0VRmB%8hm=!lrn-vTnexY*xM)OsMSiL6d628D>CxM87zZ
zFW8O9XI6IF>cp2MS)&9JVF-27nfG09Y3f#IqacZbMc)OYx8k#fpOCHzP-4BX6CQ_8
z3<JS8HVH<wV>E>fv&N!Of{r?K*O^<e(Wfvu_(%M?^?11ufBkGLw?dAak+7ebD1j`%
zb+L;vcpwfUz7kWFM_uqzG4P;ChY^o+ye6fi)Qtwz(R`r<BXaXv)PR0bhc{A+Kewe6
z@^$$r;z>Dqmb%rBN)qfNYZdjvgqOc#H;DB0J^>1)MYT5Z6S5TsYjQXG*^tTSXE{}Q
zXF`IfHK5SNj536{tn?E}p+vtbL(s}hSkx)`F|`M=r1l{`Rg;KsRZ8r;nnsLkX`b?^
zM(&H6+1-JmYt#8HQ?m8b!CkNfc%if)|A|KNK5+b@r6aY*T(XNWr?tdr4%8@;0GT7Y
ziCEAn)<d20TGvk@ZtDZXWUHZO>;>P;mqorR^;0EE1l4lxx&CyqIB)ya_CY4phHjh?
zl>{8$hpL7B3Z?kG;%Jw3ZqHI)|K^p;x~^||j_W!865m5=Kh>T<B?;oSkXhHy*=4tY
zOrv^NMY5n_@r@%3iNW(Q)wdZw0&8qMR=>Us&PRIjc9!ER$BhV|TI3i`q9gZz$$J-h
qckd$84@F}m3Gk<=?tWdqa5>s@P?W|qW1K}JB^e&@+?!>0@!Vh9xWuRc

delta 779
zcmX|9JBSle6rFkV&*Zmell^3~WRe&+x~!kYLKn1fH|U~Ch|xl^h+(3U$Vf8&8r|AL
zoV_46f{oa1Ew~_-HVcZCAY!4_7Sq^h<2|Ez;hy*I_nmurpJpG=JULR6B}vj)SKVHB
zD8XV8XBy`_MZV0#VhK}HaCuIaXh-DexKa$Zl5|ybf-gx~4t5vmuI|t=IZ0c#Y1O+u
zcMsRd^w!SNbGbqf>^0H_r&3m&rWf%-D$DT<8nc9|OxvQu&A*Amj2WdIJgU$oCCSD>
zSzz3Z@QuQ3>ASK-SA<D<wH%#wwanfd>H)^5YRM^Z%ekmAw~pq~**aApb#J<9k(M^-
zvpUPUKh?dAc@5PkwQ{iS&<_<)ZfXd;)|MG}wI#;94ic;SGEK`4J=2l(O0P2R=!=ZM
z^%CQ}0SfB|Ncu)CBKOij`}c-JQzojaCOS1Eyl2+p;F)GU>-K#Lm23)&g9F0s>4WK{
za5q`cb;skOJElO-a%9Q^ffLqIM&CNPf-Hlz;okN~-Jy_M?PjaQ4hIpI5POhp*4E&T
z=QsQPvFoQrmN)X%!bW~spk9dq8?nCwJdBkSD4Sqy53XGY%V_Tx+MegPMgwm&@b4=~
z!FzbC2!kcWw~F3td;Udt==C@=IVo+x4MD*qpO_gEDiR&Cv9ON4pWex9scH7+q8LXF
yi9Xu<z%#;99QXD30w$8Mq>gv%AG<;c9~VCX5(*$T_@BiD51mO=g)C?#G4lt~ES!k|

diff --git a/rojo-test/syncback-tests/baseplate/expected/Workspace/Terrain.rbxm b/rojo-test/syncback-tests/baseplate/expected/Workspace/Terrain.rbxm
index 1b8ba7c5927eab56b4879ddd4a93498fdddc9db5..271861025d0ef0cafb25f9c4ac6f7e03d8639fd0 100644
GIT binary patch
delta 109
zcmaDRenMh{Evvdb0|SE+5QD%6W)R5<#2%T&CHX~_o+<J|49rXn0SuFCnWZ-Sv-+~?
wD+8q!LF$0ugAj=10OHWR%)-)Cpn3)mBUYxD$9g-H1-H&Q7S^|U2A3Zr0AWxU_y7O^

delta 21
dcmX>h@l1S!E$if|tn!<?Sshq6|Ksvv1OQwW2dV%7

diff --git a/rojo-test/syncback-tests/baseplate/expected/default.project.json b/rojo-test/syncback-tests/baseplate/expected/default.project.json
index 1647ac23e..a65e00581 100644
--- a/rojo-test/syncback-tests/baseplate/expected/default.project.json
+++ b/rojo-test/syncback-tests/baseplate/expected/default.project.json
@@ -33,7 +33,7 @@
     },
     "Workspace": {
       "$properties": {
-        "CSGAsyncDynamicCollision": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",
diff --git a/rojo-test/syncback-tests/ignore_paths/expected/default.project.json b/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
index b0aa4992f..950610ace 100644
--- a/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
+++ b/rojo-test/syncback-tests/ignore_paths/expected/default.project.json
@@ -4,10 +4,7 @@
     "$className": "DataModel",
     "Workspace": {
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",
diff --git a/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
index e609d6ba4..c17a0d974 100644
--- a/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
+++ b/rojo-test/syncback-tests/project_all_middleware/expected/src/rbxmx.rbxmx
@@ -5,6 +5,7 @@
       <BinaryString name="AttributesSerialize"></BinaryString>
       <SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
       <bool name="DefinesCapabilities">false</bool>
+      <UniqueId name="HistoryId">00000000000000000000000000000000</UniqueId>
       <int64 name="SourceAssetId">-1</int64>
       <BinaryString name="Tags"></BinaryString>
       <string name="Text">ripe alike review heart dry</string>
diff --git a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
index d256f6078..60605da23 100644
--- a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json
@@ -13,10 +13,7 @@
         "$path": "property_mismatch.project.json"
       },
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",
diff --git a/rojo-test/syncback-tests/project_reserialize/output/default.project.json b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
index d256f6078..60605da23 100644
--- a/rojo-test/syncback-tests/project_reserialize/output/default.project.json
+++ b/rojo-test/syncback-tests/project_reserialize/output/default.project.json
@@ -13,10 +13,7 @@
         "$path": "property_mismatch.project.json"
       },
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",
diff --git a/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates.rbxm b/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates.rbxm
index 4cdc8efad70305326acc7eaa7472551a907d11d7..401981c62aa38876825da59e4dba4ff010824cb4 100644
GIT binary patch
delta 259
zcmX@b{E214hk6$V1_mb}27wREAd(Y^Ju-_+@{1}xQ{;shKF9(E>=_t585r0Y7!(*7
z>KGXAF)%PPFi0^lJYrxt&%hANz|g?J@REUH3PV7Ue}E;(1Rw^1e*z$q1&I9;b5j}l
zfDD(?f}G6c#FA9!j7+JV6d?vjVW6lq!-Me5k_@<H@njRmxIq5^XP}%T5QD%6CJ@O1
z#G!eag{7%L_X&dCXK!!k>2;iqjZHy8p{}m}-n}D?jE|(GOdmbEdH#HQY-~|O!}XUh
V%ce~6nLL3}j+uplb@E0=NdPXtKP&(M

delta 112
zcmeywa*BDv2Nw$l1_lox27#}VAd&@${StFi8HIri=Zwspl<>@w442Y^oXq6JlGI{8
ypfDc;qXGk`5JLc1esU*c++-^z85u?<23J29pgaQuCzxblu+cBdPs+)!umb>Q0vBxn

diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json b/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
index e97713026..9b140b5df 100644
--- a/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
+++ b/rojo-test/syncback-tests/ref_properties_blank/expected/default.project.json
@@ -4,10 +4,7 @@
     "$className": "DataModel",
     "Workspace": {
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",
diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/Camera.rbxm b/rojo-test/syncback-tests/ref_properties_blank/expected/src/Camera.rbxm
index a232aadfb85c2cb7e85cdfa3f49e8affb0aaae28..88e15e017535a4dbd8f27e1255a63d363bc24fde 100644
GIT binary patch
delta 104
zcmaFFc7%OHGn0lq0|SE+5QD%6W)R5<#2%T&CHX~_o+<J|49rXn0SpY2YnYn#m4Q-<
rAT>bnK?p>00C8wuW?^Y6P%Q(4{b@GM<I+bjT1-Cqfw5)sZ>Dqr_DUCc

delta 15
WcmX@Y{)lZuGt=ZvOf{1enUeuDH3kL%

diff --git a/rojo-test/syncback-tests/ref_properties_blank/expected/src/Terrain.rbxm b/rojo-test/syncback-tests/ref_properties_blank/expected/src/Terrain.rbxm
index 1b8ba7c5927eab56b4879ddd4a93498fdddc9db5..61393150fe3b5ed395f526645feea0730afd3f3e 100644
GIT binary patch
delta 109
zcmaDRenMh{Evvdb0|SE+5QD%6W)R5<#2%T&CHX~_o+<J|49rXn0SuFCnWZ-Sv-+~?
wD+8q!LF$0ugAj=10OHWR%)-)Cpn3)d<_b22Rl>Kf9$u$DAwFjF3@$%L09D8rGXMYp

delta 21
dcmX>h@l1S!E$if|tn!<?Sshq6|Ksvv1OQwW2dV%7

diff --git a/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Terrain.rbxm b/rojo-test/syncback-tests/respect_old_middleware/expected/Workspace/Terrain.rbxm
index 1b8ba7c5927eab56b4879ddd4a93498fdddc9db5..271861025d0ef0cafb25f9c4ac6f7e03d8639fd0 100644
GIT binary patch
delta 109
zcmaDRenMh{Evvdb0|SE+5QD%6W)R5<#2%T&CHX~_o+<J|49rXn0SuFCnWZ-Sv-+~?
wD+8q!LF$0ugAj=10OHWR%)-)Cpn3)mBUYxD$9g-H1-H&Q7S^|U2A3Zr0AWxU_y7O^

delta 21
dcmX>h@l1S!E$if|tn!<?Sshq6|Ksvv1OQwW2dV%7

diff --git a/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json b/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
index 7a22f24cf..41a7477d1 100644
--- a/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
+++ b/rojo-test/syncback-tests/respect_old_middleware/expected/default.project.json
@@ -4,10 +4,7 @@
     "$className": "DataModel",
     "Workspace": {
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",
diff --git a/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json b/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json
index 4350d908b..e0992a012 100644
--- a/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json
+++ b/rojo-test/syncback-tests/unscriptable_properties/expected/default.project.json
@@ -15,10 +15,7 @@
     },
     "Workspace": {
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
+        "EditorLiveScripting": {
           "Enum": 0
         },
         "SignalBehavior": "Deferred",

From 65e02e7eaf146371277df5a8a29b66721ef5af2a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Aug 2024 13:15:46 -0700
Subject: [PATCH 356/366] In project files, use the right instance for
 generating warning for SharedString properties

---
 src/snapshot_middleware/project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 3276b9fa3..760e76655 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -546,7 +546,7 @@ fn project_node_property_syncback<'inst>(
             Variant::SharedString(_) => {
                 log::warn!(
                     "Rojo cannot serialize the property {}.{name} in project files.\n\
-                    If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(snapshot.new)
+                    If this is not acceptable, resave the Instance at '{}' manually as an RBXM or RBXMX.", new_inst.class, snapshot.get_new_inst_path(new_inst.referent())
                 );
             }
             _ => {

From b0fe238ca88a9458ee637a231448279355aa7a4b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Aug 2024 13:25:34 -0700
Subject: [PATCH 357/366] Filter out attributes that have names that start with
 `RBX_`

---
 src/snapshot_middleware/json_model.rs |  5 +++++
 src/snapshot_middleware/meta_file.rs  | 10 ++++++++++
 src/snapshot_middleware/project.rs    |  5 +++++
 3 files changed, 20 insertions(+)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 6f6746fa9..9ec85da47 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -100,6 +100,11 @@ fn json_model_from_pair<'sync>(
         match value {
             Variant::Attributes(attrs) => {
                 for (attr_name, attr_value) in attrs.iter() {
+                    // We (probably) don't want to preserve internal attributes,
+                    // only user defined ones.
+                    if attr_name.starts_with("RBX_") {
+                        continue;
+                    }
                     attributes.insert(
                         attr_name.clone(),
                         UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index f41e05098..08034d7c5 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -85,6 +85,11 @@ impl AdjacentMetadata {
             match value {
                 Variant::Attributes(attrs) => {
                     for (attr_name, attr_value) in attrs.iter() {
+                        // We (probably) don't want to preserve internal
+                        // attributes, only user defined ones.
+                        if attr_name.starts_with("RBX_") {
+                            continue;
+                        }
                         attributes.insert(
                             attr_name.clone(),
                             UnresolvedValue::from_variant_unambiguous(attr_value.clone()),
@@ -266,6 +271,11 @@ impl DirectoryMetadata {
             match value {
                 Variant::Attributes(attrs) => {
                     for (name, value) in attrs.iter() {
+                        // We (probably) don't want to preserve internal
+                        // attributes, only user defined ones.
+                        if name.starts_with("RBX_") {
+                            continue;
+                        }
                         attributes.insert(
                             name.to_owned(),
                             UnresolvedValue::from_variant_unambiguous(value.clone()),
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 760e76655..011dc92dd 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -537,6 +537,11 @@ fn project_node_property_syncback<'inst>(
         match value {
             Variant::Attributes(attrs) => {
                 for (attr_name, attr_value) in attrs.iter() {
+                    // We (probably) don't want to preserve internal attributes,
+                    // only user defined ones.
+                    if attr_name.starts_with("RBX_") {
+                        continue;
+                    }
                     attributes.insert(
                         attr_name.clone(),
                         UnresolvedValue::from_variant_unambiguous(attr_value.clone()),

From a2b5fdd2bc5fc93e270b7cd60e4ed6b1d4c566a0 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 29 Aug 2024 14:41:42 -0700
Subject: [PATCH 358/366] Correctly restrict Roblox attributes to be `RBX`
 rather than `RBX_`

Co-authored-by: Kenneth Loeffler <kenloef@gmail.com>
---
 src/snapshot_middleware/json_model.rs | 2 +-
 src/snapshot_middleware/meta_file.rs  | 4 ++--
 src/snapshot_middleware/project.rs    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/snapshot_middleware/json_model.rs b/src/snapshot_middleware/json_model.rs
index 9ec85da47..c176066c3 100644
--- a/src/snapshot_middleware/json_model.rs
+++ b/src/snapshot_middleware/json_model.rs
@@ -102,7 +102,7 @@ fn json_model_from_pair<'sync>(
                 for (attr_name, attr_value) in attrs.iter() {
                     // We (probably) don't want to preserve internal attributes,
                     // only user defined ones.
-                    if attr_name.starts_with("RBX_") {
+                    if attr_name.starts_with("RBX") {
                         continue;
                     }
                     attributes.insert(
diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs
index 08034d7c5..3004ad2aa 100644
--- a/src/snapshot_middleware/meta_file.rs
+++ b/src/snapshot_middleware/meta_file.rs
@@ -87,7 +87,7 @@ impl AdjacentMetadata {
                     for (attr_name, attr_value) in attrs.iter() {
                         // We (probably) don't want to preserve internal
                         // attributes, only user defined ones.
-                        if attr_name.starts_with("RBX_") {
+                        if attr_name.starts_with("RBX") {
                             continue;
                         }
                         attributes.insert(
@@ -273,7 +273,7 @@ impl DirectoryMetadata {
                     for (name, value) in attrs.iter() {
                         // We (probably) don't want to preserve internal
                         // attributes, only user defined ones.
-                        if name.starts_with("RBX_") {
+                        if name.starts_with("RBX") {
                             continue;
                         }
                         attributes.insert(
diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs
index 011dc92dd..0cd0e3599 100644
--- a/src/snapshot_middleware/project.rs
+++ b/src/snapshot_middleware/project.rs
@@ -539,7 +539,7 @@ fn project_node_property_syncback<'inst>(
                 for (attr_name, attr_value) in attrs.iter() {
                     // We (probably) don't want to preserve internal attributes,
                     // only user defined ones.
-                    if attr_name.starts_with("RBX_") {
+                    if attr_name.starts_with("RBX") {
                         continue;
                     }
                     attributes.insert(

From 0237edf396e3ed38413064223a74f0b312f21ff7 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Tue, 3 Sep 2024 16:11:28 -0700
Subject: [PATCH 359/366] Redo referent linking code where there was a TODO

---
 src/syncback/ref_properties.rs | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index e763f2e3c..a6bb519a8 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -87,7 +87,6 @@ pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()>
     write_id_attributes(&links, dom)?;
 
     let mut prop_list = Vec::new();
-    let mut attribute_list = HashMap::new();
 
     for (inst_id, properties) in links.prop_links {
         for ref_link in properties {
@@ -104,9 +103,7 @@ pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()>
             None => continue,
         };
 
-        // TODO: Replace this whole rigamarole with `Attributes::drain`
-        // eventually.
-        let attributes = match inst.properties.remove("Attributes") {
+        let mut attributes: Attributes = match inst.properties.remove("Attributes") {
             Some(Variant::Attributes(attrs)) => attrs,
             None => Attributes::new(),
             Some(value) => {
@@ -115,26 +112,20 @@ pub fn link_referents(links: RefLinks, dom: &mut WeakDom) -> anyhow::Result<()>
                     value.ty()
                 );
             }
-        };
-        for (name, value) in attributes.into_iter() {
-            if !name.starts_with(REF_POINTER_ATTRIBUTE_PREFIX) {
-                attribute_list.insert(name, value);
-            }
         }
+        .into_iter()
+        .filter(|(name, _)| !name.starts_with(REF_POINTER_ATTRIBUTE_PREFIX))
+        .collect();
 
         for (prop_name, prop_value) in prop_list.drain(..) {
-            attribute_list.insert(
+            attributes.insert(
                 format!("{REF_POINTER_ATTRIBUTE_PREFIX}{prop_name}"),
                 prop_value,
             );
         }
 
-        // TODO: Same as above, when `Attributes::drain` is live, replace this
-        // with it.
-        inst.properties.insert(
-            "Attributes".into(),
-            Attributes::from_iter(attribute_list.drain()).into(),
-        );
+        inst.properties
+            .insert("Attributes".into(), attributes.into());
     }
 
     Ok(())

From ead7158a51a287ee0fa61517b7883669d18e738a Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 11 Sep 2024 09:51:10 -0700
Subject: [PATCH 360/366] Respect ignoreTrees when removing Instances

---
 ...t__syncback_util__ignore_trees_removing.snap |   9 +++++++++
 .../expected/default.project.json               |  14 ++++++++++++++
 .../expected/src/KeepMe/.gitkeep                |   0
 .../ignore_trees_removing/input.rbxl            | Bin 0 -> 43090 bytes
 .../output/default.project.json                 |  14 ++++++++++++++
 .../output/src/KeepMe/.gitkeep                  |   0
 src/syncback/mod.rs                             |  11 ++++++++++-
 src/syncback/snapshot.rs                        |   7 +++++++
 tests/rojo_test/syncback_util.rs                |   1 -
 tests/tests/syncback.rs                         |   1 +
 10 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees_removing.snap
 create mode 100644 rojo-test/syncback-tests/ignore_trees_removing/expected/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_trees_removing/expected/src/KeepMe/.gitkeep
 create mode 100644 rojo-test/syncback-tests/ignore_trees_removing/input.rbxl
 create mode 100644 rojo-test/syncback-tests/ignore_trees_removing/output/default.project.json
 create mode 100644 rojo-test/syncback-tests/ignore_trees_removing/output/src/KeepMe/.gitkeep

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees_removing.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees_removing.snap
new file mode 100644
index 000000000..9fa9aa7a2
--- /dev/null
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees_removing.snap
@@ -0,0 +1,9 @@
+---
+source: tests/rojo_test/syncback_util.rs
+assertion_line: 45
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files: []
+added_dirs: []
+removed_files: []
+removed_dirs: []
diff --git a/rojo-test/syncback-tests/ignore_trees_removing/expected/default.project.json b/rojo-test/syncback-tests/ignore_trees_removing/expected/default.project.json
new file mode 100644
index 000000000..ec17e8f7d
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_trees_removing/expected/default.project.json
@@ -0,0 +1,14 @@
+{
+  "name": "ignore_trees_removing",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignoreTrees": [
+      "ReplicatedStorage/KeepMe"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_trees_removing/expected/src/KeepMe/.gitkeep b/rojo-test/syncback-tests/ignore_trees_removing/expected/src/KeepMe/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/rojo-test/syncback-tests/ignore_trees_removing/input.rbxl b/rojo-test/syncback-tests/ignore_trees_removing/input.rbxl
new file mode 100644
index 0000000000000000000000000000000000000000..422bbf3500ea00a47578b90fe54081c3784eb059
GIT binary patch
literal 43090
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

literal 0
HcmV?d00001

diff --git a/rojo-test/syncback-tests/ignore_trees_removing/output/default.project.json b/rojo-test/syncback-tests/ignore_trees_removing/output/default.project.json
new file mode 100644
index 000000000..ec17e8f7d
--- /dev/null
+++ b/rojo-test/syncback-tests/ignore_trees_removing/output/default.project.json
@@ -0,0 +1,14 @@
+{
+  "name": "ignore_trees_removing",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "$path": "src"
+    }
+  },
+  "syncbackRules": {
+    "ignoreTrees": [
+      "ReplicatedStorage/KeepMe"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/rojo-test/syncback-tests/ignore_trees_removing/output/src/KeepMe/.gitkeep b/rojo-test/syncback-tests/ignore_trees_removing/output/src/KeepMe/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index 3858da767..d3a459cba 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -231,8 +231,9 @@ pub fn syncback_loop(
                 "removed children for {inst_path}: {}",
                 syncback.removed_children.len()
             );
-            for inst in &syncback.removed_children {
+            'remove: for inst in &syncback.removed_children {
                 let path = inst.metadata().instigating_source.as_ref().unwrap().path();
+                let inst_path = snapshot.get_old_inst_path(inst.id());
                 if !is_valid_path(&ignore_patterns, project_path, path) {
                     log::debug!(
                         "Skipping removing {} because its matches an ignore pattern",
@@ -240,6 +241,14 @@ pub fn syncback_loop(
                     );
                     continue;
                 }
+                if let Some(syncback_rules) = &project.syncback_rules {
+                    for ignored in &syncback_rules.ignore_trees {
+                        if inst_path.starts_with(ignored.as_str()) {
+                            log::debug!("Skipping removing {inst_path} because its path is blocked by project");
+                            continue 'remove;
+                        }
+                    }
+                }
                 if path.is_dir() {
                     fs_snapshot.remove_dir(path)
                 } else {
diff --git a/src/syncback/snapshot.rs b/src/syncback/snapshot.rs
index 7d19bf878..b9f2d8342 100644
--- a/src/syncback/snapshot.rs
+++ b/src/syncback/snapshot.rs
@@ -131,6 +131,13 @@ impl<'sync> SyncbackSnapshot<'sync> {
         inst_path(self.new_tree(), referent)
     }
 
+    /// Returns a path to the provided Instance in the old DOM. This path is
+    /// where you would look for the object in Roblox Studio.
+    #[inline]
+    pub fn get_old_inst_path(&self, referent: Ref) -> String {
+        inst_path(self.old_tree(), referent)
+    }
+
     /// Returns an Instance from the old tree with the provided referent, if it
     /// exists.
     #[inline]
diff --git a/tests/rojo_test/syncback_util.rs b/tests/rojo_test/syncback_util.rs
index 8144c8f9c..969e8037a 100644
--- a/tests/rojo_test/syncback_util.rs
+++ b/tests/rojo_test/syncback_util.rs
@@ -4,7 +4,6 @@ use anyhow::Context;
 use insta::assert_yaml_snapshot;
 use librojo::{snapshot_from_vfs, syncback_loop, FsSnapshot, InstanceContext, Project, RojoTree};
 use memofs::{InMemoryFs, IoResultExt, Vfs, VfsSnapshot};
-use rbx_reflection::ReflectionDatabase;
 use serde::Serialize;
 
 use crate::rojo_test::io_util::{serialize_vec_absolute, SYNCBACK_TESTS_PATH};
diff --git a/tests/tests/syncback.rs b/tests/tests/syncback.rs
index 389501ab4..1d9e937c0 100644
--- a/tests/tests/syncback.rs
+++ b/tests/tests/syncback.rs
@@ -31,4 +31,5 @@ syncback_basic_test! {
     child_but_not,
     ignore_trees,
     ignore_paths_removing,
+    ignore_trees_removing,
 }

From 099643f5ae332a3b5d7134d185186a373f335e6e Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Mon, 23 Sep 2024 15:18:49 -0700
Subject: [PATCH 361/366] Actually handle duplicate Rojo_Ids during syncback

---
 src/syncback/ref_properties.rs | 57 ++++++++++++++++------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/syncback/ref_properties.rs b/src/syncback/ref_properties.rs
index a6bb519a8..dde9e0196 100644
--- a/src/syncback/ref_properties.rs
+++ b/src/syncback/ref_properties.rs
@@ -1,7 +1,7 @@
 //! Implements iterating through an entire WeakDom and linking all Ref
 //! properties using attributes.
 
-use std::collections::{hash_map::Entry, HashMap, VecDeque};
+use std::collections::{HashSet, VecDeque};
 
 use rbx_dom_weak::{
     types::{Attributes, Ref, UniqueId, Variant},
@@ -30,7 +30,7 @@ struct RefLink {
 ///
 /// They can be linked to a dom later using `link_referents`.
 pub fn collect_referents(dom: &WeakDom) -> RefLinks {
-    let mut existing_ids = HashMap::new();
+    let mut ids = HashSet::new();
     let mut need_rewrite = Vec::new();
     let mut links = MultiMap::new();
 
@@ -43,36 +43,33 @@ pub fn collect_referents(dom: &WeakDom) -> RefLinks {
         let instance = dom.get_by_ref(inst_ref).unwrap();
         queue.extend(instance.children().iter().copied());
 
-        // Collect all referent properties for easy access later
         for (property_name, prop_value) in &instance.properties {
-            if let Variant::Ref(prop_ref) = prop_value {
-                // Any Instance that's pointed to as a property needs an ID.
-                let existing_id = match dom.get_by_ref(*prop_ref) {
-                    Some(inst) => get_existing_id(inst),
-                    None => continue,
-                };
-                if let Some(existing_id) = existing_id {
-                    match existing_ids.entry(existing_id) {
-                        Entry::Occupied(entry) => {
-                            if entry.get() != prop_ref {
-                                need_rewrite.push(*prop_ref);
-                            }
-                        }
-                        Entry::Vacant(entry) => {
-                            entry.insert(*prop_ref);
-                        }
-                    }
-                } else {
-                    need_rewrite.push(*prop_ref);
+            let Variant::Ref(prop_ref) = prop_value else {
+                continue;
+            };
+            // Any ref property has to get a Target attribute, which is what the
+            // `link` map is for.
+            links.insert(
+                inst_ref,
+                RefLink {
+                    name: property_name.to_owned(),
+                    value: *prop_ref,
+                },
+            );
+            // Additionally, all ref properties need to have an ID attribute
+            let existing_id = match dom.get_by_ref(*prop_ref) {
+                Some(inst) => get_existing_id(inst),
+                None => continue,
+            };
+            if let Some(existing_id) = existing_id {
+                // If an ID is already on this Instance, we need to check if it
+                // is a duplicate. If it is, rewrite it.
+                if ids.contains(existing_id) {
+                    need_rewrite.push(*prop_ref)
                 }
-                // We also need a list of these properties for linking later
-                links.insert(
-                    inst_ref,
-                    RefLink {
-                        name: property_name.to_owned(),
-                        value: *prop_ref,
-                    },
-                );
+                ids.insert(existing_id);
+            } else {
+                need_rewrite.push(*prop_ref)
             }
         }
     }

From ff21a40d4e2c1da8505e510c1ef51ee728461841 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 26 Sep 2024 11:50:35 -0700
Subject: [PATCH 362/366] Stable sort  CSV by source instead of key

---
 src/snapshot_middleware/csv.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs
index f1e2c833b..e38856354 100644
--- a/src/snapshot_middleware/csv.rs
+++ b/src/snapshot_middleware/csv.rs
@@ -258,7 +258,7 @@ fn localization_to_csv(csv_contents: &str) -> anyhow::Result<Vec<u8>> {
         serde_json::from_str(csv_contents).context("cannot decode JSON from localization table")?;
 
     // TODO sort this better
-    csv.sort_unstable_by(|a, b| a.key.partial_cmp(&b.key).unwrap());
+    csv.sort_by(|a, b| a.source.partial_cmp(&b.source).unwrap());
 
     let mut headers = vec!["Key", "Source", "Context", "Example"];
     // We want both order and a lack of duplicates, so we use a BTreeSet.

From 6249d476c4122ee5ac27dafd2fe4afe68643961b Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Thu, 26 Sep 2024 12:35:34 -0700
Subject: [PATCH 363/366] Remove old file when rbxm fallback triggers

---
 .../end_to_end__rojo_test__syncback_util__rbxm_fallback.snap | 4 +++-
 .../expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep  | 0
 src/syncback/mod.rs                                          | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep

diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
index 6b308f1d7..4ac816b45 100644
--- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
+++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap
@@ -1,5 +1,6 @@
 ---
 source: tests/rojo_test/syncback_util.rs
+assertion_line: 45
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files:
@@ -9,4 +10,5 @@ added_dirs:
   - ReplicatedStorage/ChildWithoutDuplicates
   - ReplicatedStorage/ChildWithoutDuplicates/Child
 removed_files: []
-removed_dirs: []
+removed_dirs:
+  - ReplicatedStorage/ChildWithDuplicates
diff --git a/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep b/rojo-test/syncback-tests/rbxm_fallback/expected/ReplicatedStorage/ChildWithDuplicates/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index d3a459cba..bea586f15 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -199,6 +199,11 @@ pub fn syncback_loop(
         let syncback = match middleware.syncback(&snapshot) {
             Ok(syncback) => syncback,
             Err(err) if middleware == Middleware::Dir => {
+                if snapshot.old_inst().is_some() {
+                    // We need to remove the old FS representation if we're
+                    // reserializing it as an rbxm.
+                    fs_snapshot.remove_dir(&snapshot.path);
+                }
                 let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
                     Ok(value) if value == "1" => Middleware::Rbxmx,
                     Ok(value) if value == "2" => Middleware::JsonModel,

From 24c5878ed259542e84aac3af02e122712c4ec40d Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Wed, 13 Nov 2024 18:00:21 -0800
Subject: [PATCH 364/366] Make ChannelTabsConfiguration serialize as a JSON
 model

---
 src/syncback/mod.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index bea586f15..d0b3ff8bf 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -296,9 +296,11 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
             "ParticleEmitter",
             "TextChannel",
             "TextChatCommand",
+            // TODO: Implement a way to use inheritance for this
             "ChatWindowConfiguration",
             "ChatInputBarConfiguration",
             "BubbleChatConfiguration",
+            "ChannelTabsConfiguration",
         ]
         .into()
     });

From 70f5daee7794e17e78e02614031db330a53858a3 Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Nov 2024 09:52:14 -0800
Subject: [PATCH 365/366] Only delete the old file if serializing as an rbxm
 succeeds

---
 src/syncback/mod.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/syncback/mod.rs b/src/syncback/mod.rs
index d0b3ff8bf..e0529600c 100644
--- a/src/syncback/mod.rs
+++ b/src/syncback/mod.rs
@@ -199,11 +199,6 @@ pub fn syncback_loop(
         let syncback = match middleware.syncback(&snapshot) {
             Ok(syncback) => syncback,
             Err(err) if middleware == Middleware::Dir => {
-                if snapshot.old_inst().is_some() {
-                    // We need to remove the old FS representation if we're
-                    // reserializing it as an rbxm.
-                    fs_snapshot.remove_dir(&snapshot.path);
-                }
                 let new_middleware = match env::var(DEBUG_MODEL_FORMAT_VAR) {
                     Ok(value) if value == "1" => Middleware::Rbxmx,
                     Ok(value) if value == "2" => Middleware::JsonModel,
@@ -224,9 +219,15 @@ pub fn syncback_loop(
                     "Could not syncback {inst_path} as a Directory because: {err}.\n\
                     It will instead be synced back as a {new_middleware:?}."
                 );
-                new_middleware
+                let new_syncback_result = new_middleware
                     .syncback(&new_snapshot)
-                    .with_context(|| format!("Failed to syncback {inst_path}"))?
+                    .with_context(|| format!("Failed to syncback {inst_path}"));
+                if new_syncback_result.is_ok() && snapshot.old_inst().is_some() {
+                    // We need to remove the old FS representation if we're
+                    // reserializing it as an rbxm.
+                    fs_snapshot.remove_dir(&snapshot.path);
+                }
+                new_syncback_result?
             }
             Err(err) => anyhow::bail!("Failed to syncback {inst_path} because {err}"),
         };

From c788bbf1d526ceb7cee2034f90657f11db1813bc Mon Sep 17 00:00:00 2001
From: Micah <micah@uplift.games>
Date: Fri, 15 Nov 2024 10:49:45 -0800
Subject: [PATCH 366/366] Only use ambiguous syntax if a property exists in the
 database

---
 src/resolution.rs | 111 +++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 51 deletions(-)

diff --git a/src/resolution.rs b/src/resolution.rs
index ba10f115b..73b6575f9 100644
--- a/src/resolution.rs
+++ b/src/resolution.rs
@@ -41,62 +41,71 @@ impl UnresolvedValue {
     /// Creates an `UnresolvedValue` from a variant, using a class and property
     /// name to potentially allow for ambiguous Enum variants.
     pub fn from_variant(variant: Variant, class_name: &str, prop_name: &str) -> Self {
-        Self::Ambiguous(match variant {
-            Variant::Enum(rbx_enum) => {
-                if let Some(property) = find_descriptor(class_name, prop_name) {
-                    if let DataType::Enum(enum_name) = &property.data_type {
-                        let database = rbx_reflection_database::get();
-                        if let Some(enum_descriptor) = database.enums.get(enum_name) {
-                            for (variant_name, id) in &enum_descriptor.items {
-                                if *id == rbx_enum.to_u32() {
-                                    return Self::Ambiguous(AmbiguousValue::String(
-                                        variant_name.to_string(),
-                                    ));
+        let descriptor = find_descriptor(class_name, prop_name);
+        if descriptor.is_some() {
+            // We can only use an ambiguous syntax if the property is known
+            // to the reflection database.
+            Self::Ambiguous(match variant {
+                Variant::Enum(rbx_enum) => {
+                    if let Some(property) = descriptor {
+                        if let DataType::Enum(enum_name) = &property.data_type {
+                            let database = rbx_reflection_database::get();
+                            if let Some(enum_descriptor) = database.enums.get(enum_name) {
+                                for (variant_name, id) in &enum_descriptor.items {
+                                    if *id == rbx_enum.to_u32() {
+                                        return Self::Ambiguous(AmbiguousValue::String(
+                                            variant_name.to_string(),
+                                        ));
+                                    }
                                 }
                             }
                         }
                     }
+                    return Self::FullyQualified(variant);
                 }
-                return Self::FullyQualified(variant);
-            }
-            Variant::Bool(bool) => AmbiguousValue::Bool(bool),
-            Variant::Float32(n) => AmbiguousValue::Number(n as f64),
-            Variant::Float64(n) => AmbiguousValue::Number(n),
-            Variant::Int32(n) => AmbiguousValue::Number(n as f64),
-            Variant::Int64(n) => AmbiguousValue::Number(n as f64),
-            Variant::String(str) => AmbiguousValue::String(str),
-            Variant::Tags(tags) => {
-                AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())
-            }
-            Variant::Content(content) => AmbiguousValue::String(content.into_string()),
-            Variant::Vector2(vector) => AmbiguousValue::Array2([vector.x as f64, vector.y as f64]),
-            Variant::Vector3(vector) => {
-                AmbiguousValue::Array3([vector.x as f64, vector.y as f64, vector.z as f64])
-            }
-            Variant::Color3(color) => {
-                AmbiguousValue::Array3([color.r as f64, color.g as f64, color.b as f64])
-            }
-            Variant::CFrame(cf) => AmbiguousValue::Array12([
-                cf.position.x as f64,
-                cf.position.y as f64,
-                cf.position.z as f64,
-                cf.orientation.x.x as f64,
-                cf.orientation.x.y as f64,
-                cf.orientation.x.z as f64,
-                cf.orientation.y.x as f64,
-                cf.orientation.y.y as f64,
-                cf.orientation.y.z as f64,
-                cf.orientation.z.x as f64,
-                cf.orientation.z.y as f64,
-                cf.orientation.z.z as f64,
-            ]),
-            Variant::Attributes(attr) => AmbiguousValue::Attributes(attr),
-            Variant::Font(font) => AmbiguousValue::Font(font),
-            Variant::MaterialColors(colors) => AmbiguousValue::MaterialColors(colors),
-            _ => {
-                return Self::FullyQualified(variant);
-            }
-        })
+                Variant::Bool(bool) => AmbiguousValue::Bool(bool),
+                Variant::Float32(n) => AmbiguousValue::Number(n as f64),
+                Variant::Float64(n) => AmbiguousValue::Number(n),
+                Variant::Int32(n) => AmbiguousValue::Number(n as f64),
+                Variant::Int64(n) => AmbiguousValue::Number(n as f64),
+                Variant::String(str) => AmbiguousValue::String(str),
+                Variant::Tags(tags) => {
+                    AmbiguousValue::StringArray(tags.iter().map(|s| s.to_string()).collect())
+                }
+                Variant::Content(content) => AmbiguousValue::String(content.into_string()),
+                Variant::Vector2(vector) => {
+                    AmbiguousValue::Array2([vector.x as f64, vector.y as f64])
+                }
+                Variant::Vector3(vector) => {
+                    AmbiguousValue::Array3([vector.x as f64, vector.y as f64, vector.z as f64])
+                }
+                Variant::Color3(color) => {
+                    AmbiguousValue::Array3([color.r as f64, color.g as f64, color.b as f64])
+                }
+                Variant::CFrame(cf) => AmbiguousValue::Array12([
+                    cf.position.x as f64,
+                    cf.position.y as f64,
+                    cf.position.z as f64,
+                    cf.orientation.x.x as f64,
+                    cf.orientation.x.y as f64,
+                    cf.orientation.x.z as f64,
+                    cf.orientation.y.x as f64,
+                    cf.orientation.y.y as f64,
+                    cf.orientation.y.z as f64,
+                    cf.orientation.z.x as f64,
+                    cf.orientation.z.y as f64,
+                    cf.orientation.z.z as f64,
+                ]),
+                Variant::Attributes(attr) => AmbiguousValue::Attributes(attr),
+                Variant::Font(font) => AmbiguousValue::Font(font),
+                Variant::MaterialColors(colors) => AmbiguousValue::MaterialColors(colors),
+                _ => {
+                    return Self::FullyQualified(variant);
+                }
+            })
+        } else {
+            Self::FullyQualified(variant)
+        }
     }
 
     /// Creates an `UnresolvedValue` from a variant, only returning ambiguous