Filter default properties in json middlewares instead of filter fn

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__all_middleware.snap

@@ -11,15 +11,19 @@ added_files:
   - src/dir/init_server_script/init.server.luau
   - src/dir/module_script.luau
   - src/dir/server_script.server.luau
+  - src/dir_with_meta/init.meta.json
   - 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/dir_with_meta
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__child_but_not.snap

@@ -5,6 +5,8 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - OnlyOneCopy/child_of_one.luau
   - ReplicatedStorage/child_replicated_storage.luau
-added_dirs: []
+added_dirs:
+  - OnlyOneCopy
+  - ReplicatedStorage
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_paths_removing.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: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees.snap

@@ -5,6 +5,7 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/IncludeMe/.gitkeep
 added_dirs:
+  - src
   - src/IncludeMe
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ignore_trees_removing.snap

@@ -1,9 +1,9 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 45
 expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 ---
 added_files: []
-added_dirs: []
+added_dirs:
+  - src
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects_weird.snap

@@ -5,6 +5,7 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/modules/ClientModule.luau
   - src/modules/ServerModule.luau
-added_dirs: []
+added_dirs:
+  - src/modules
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_all_middleware.snap

@@ -17,6 +17,8 @@ added_files:
   - src/text.txt
 added_dirs:
   - src/csv_init
+  - src/dir
+  - src/dir_with_meta
   - src/init_client_script
   - src/init_module_script
   - src/init_server_script

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback.snap

@@ -6,6 +6,7 @@ added_files:
   - ReplicatedStorage/ChildWithDuplicates.rbxm
   - ReplicatedStorage/ChildWithoutDuplicates/Child/.gitkeep
 added_dirs:
+  - ReplicatedStorage
   - ReplicatedStorage/ChildWithoutDuplicates
   - ReplicatedStorage/ChildWithoutDuplicates/Child
 removed_files: []

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:
   - src/pointer.model.json
   - src/target.model.json
-added_dirs: []
+added_dirs:
+  - src
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_update.snap

@@ -5,6 +5,7 @@ expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
 added_files:
   - src/pointer.model.json
   - src/target.model.json
-added_dirs: []
+added_dirs:
+  - src
 removed_files: []
 removed_dirs: []

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__remove_default_props.snap

@@ -0,0 +1,16 @@
+---
+source: tests/rojo_test/syncback_util.rs
+expression: "visualize_fs_snapshot(&fs_snapshot, &output_path)"
+---
+added_files:
+  - AdjacentMetadataScript/AdjacentMetadataScript.meta.json
+  - AdjacentMetadataScript/AdjacentMetadataScript.server.lua
+  - DirectoryMetadataPart/Part/init.meta.json
+  - Part.model.json
+  - default.project.json
+added_dirs:
+  - AdjacentMetadataScript
+  - DirectoryMetadataPart
+  - DirectoryMetadataPart/Part
+removed_files: []
+removed_dirs: []

rojo-test/syncback-tests/ignore_paths_removing/expected/default.project.json

@@ -4,18 +4,6 @@
     "$className": "DataModel",
     "Workspace": {
       "$properties": {
-        "CSGAsyncDynamicCollision": {
-          "Enum": 0
-        },
-        "DecreaseMinimumPartDensityMode": {
-          "Enum": 0
-        },
-        "MoverConstraintRootBehavior": {
-          "Enum": 0
-        },
-        "RenderingCacheOptimizations": {
-          "Enum": 0
-        },
         "SignalBehavior": "Deferred",
         "StreamOutBehavior": "Opportunistic",
         "StreamingEnabled": true,

rojo-test/syncback-tests/remove_default_props/expected/AdjacentMetadataScript/AdjacentMetadataScript.meta.json

@@ -0,0 +1,5 @@
+{
+  "properties": {
+    "Disabled": true
+  }
+}

rojo-test/syncback-tests/remove_default_props/expected/DirectoryMetadataPart/Part/init.meta.json

@@ -0,0 +1,6 @@
+{
+  "properties": {
+    "Anchored": true
+  },
+  "className": "Part"
+}

rojo-test/syncback-tests/remove_default_props/expected/Part.model.json

@@ -0,0 +1,10 @@
+{
+  "className": "Part",
+  "properties": {
+    "Size": [
+      1.0,
+      2.0,
+      3.0
+    ]
+  }
+}

rojo-test/syncback-tests/remove_default_props/expected/default.project.json

@@ -0,0 +1,23 @@
+{
+  "name": "remove_default_props",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "AdjacentMetadataScript": {
+        "$path": "AdjacentMetadataScript"
+      },
+      "DirectoryMetadataPart": {
+        "$path": "DirectoryMetadataPart"
+      },
+      "JsonModelPart": {
+        "$path": "Part.model.json"
+      },
+      "ProjectFilePart": {
+        "$className": "Part",
+        "$properties": {
+          "Transparency": 1.0
+        }
+      }
+    }
+  }
+}

rojo-test/syncback-tests/remove_default_props/output/AdjacentMetadataScript/AdjacentMetadataScript.meta.json

@@ -0,0 +1,7 @@
+{
+  "properties": {
+    "Disabled": true,
+    "RunContext": "Client",
+    "Archivable": false
+  }
+}

rojo-test/syncback-tests/remove_default_props/output/DirectoryMetadataPart/Part/init.meta.json

@@ -0,0 +1,8 @@
+{
+  "properties": {
+    "CanCollide": false,
+    "Massless": false,
+    "Anchored": true
+  },
+  "className": "Part"
+}

rojo-test/syncback-tests/remove_default_props/output/Part.model.json

@@ -0,0 +1,12 @@
+{
+  "className": "Part",
+  "properties": {
+    "Size": [
+      1.0,
+      2.0,
+      3.0
+    ],
+    "Anchored": true,
+    "Massless": true
+  }
+}

rojo-test/syncback-tests/remove_default_props/output/default.project.json

@@ -0,0 +1,29 @@
+{
+  "name": "remove_default_props",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "AdjacentMetadataScript": {
+        "$path": "AdjacentMetadataScript"
+      },
+      "DirectoryMetadataPart": {
+        "$path": "DirectoryMetadataPart"
+      },
+      "JsonModelPart": {
+        "$path": "Part.model.json"
+      },
+      "ProjectFilePart": {
+        "$className": "Part",
+        "$properties": {
+          "Size": [
+            1.0,
+            2.0,
+            3.0
+          ],
+          "Transparency": 1.0,
+          "CanCollide": false
+        }
+      }
+    }
+  }
+}

src/snapshot_middleware/json_model.rs

@@ -17,6 +17,8 @@ use crate::{
     RojoRef,
 };
 
+use super::populate_unresolved_properties;
+
 pub fn snapshot_json_model(
     context: &InstanceContext,
     vfs: &Vfs,
@@ -94,36 +96,12 @@ fn json_model_from_pair<'sync>(
 
     filter_properties_preallocated(snapshot.project(), new_inst, prop_buffer);
 
-    let mut properties = BTreeMap::new();
-    let mut attributes = BTreeMap::new();
-    for (name, value) in prop_buffer.drain(..) {
-        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()),
-                    );
-                }
-            }
-            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.to_owned(),
-                    UnresolvedValue::from_variant(value.clone(), &new_inst.class, name),
-                );
-            }
-        }
-    }
+    let (properties, attributes) = {
+        let prop_buffer: &_ = prop_buffer;
+        populate_unresolved_properties(snapshot, new_inst, prop_buffer.into_iter().copied())
+    };
+
+    prop_buffer.clear();
 
     let mut children = Vec::with_capacity(new_inst.children().len());