Merge branch 'feature/init-name-resolution'

src/syncback/file_names.rs

@@ -36,23 +36,33 @@ pub fn name_for_inst<'a>(
             | Middleware::ServerScriptDir
             | Middleware::ClientScriptDir
             | Middleware::ModuleScriptDir => {
-                if validate_file_name(&new_inst.name).is_err() {
+                let name = if validate_file_name(&new_inst.name).is_err() {
                     Cow::Owned(slugify_name(&new_inst.name))
                 } else {
-                    Cow::Borrowed(&new_inst.name)
+                    Cow::Borrowed(new_inst.name.as_str())
+                };
+                // Prefix "init" to avoid colliding with reserved init files.
+                if name.to_lowercase() == "init" {
+                    Cow::Owned(format!("_{name}"))
+                } else {
+                    name
                 }
             }
             _ => {
                 let extension = extension_for_middleware(middleware);
                 let slugified;
-                let final_name = if validate_file_name(&new_inst.name).is_err() {
+                let stem: &str = if validate_file_name(&new_inst.name).is_err() {
                     slugified = slugify_name(&new_inst.name);
                     &slugified
                 } else {
                     &new_inst.name
                 };
-
-                Cow::Owned(format!("{final_name}.{extension}"))
+                // Prefix "init" stems to avoid colliding with reserved init files.
+                if stem.to_lowercase() == "init" {
+                    Cow::Owned(format!("_{stem}.{extension}"))
+                } else {
+                    Cow::Owned(format!("{stem}.{extension}"))
+                }
             }
         })
     }

src/syncback/snapshot.rs

@@ -238,6 +238,24 @@ pub fn inst_path(dom: &WeakDom, referent: Ref) -> String {
     path.join("/")
 }
 
+impl<'sync> SyncbackData<'sync> {
+    /// Constructs a `SyncbackData` for use in unit tests.
+    #[cfg(test)]
+    pub fn for_test(
+        vfs: &'sync Vfs,
+        old_tree: &'sync RojoTree,
+        new_tree: &'sync WeakDom,
+        project: &'sync Project,
+    ) -> Self {
+        Self {
+            vfs,
+            old_tree,
+            new_tree,
+            project,
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use rbx_dom_weak::{InstanceBuilder, WeakDom};