diff --git a/build.rs b/build.rs index 4deb93ea..caec33c5 100644 --- a/build.rs +++ b/build.rs @@ -75,7 +75,7 @@ fn main() -> Result<(), anyhow::Error> { let template_snapshot = snapshot_from_fs_path(&templates_dir)?; let plugin_snapshot = VfsSnapshot::dir(hashmap! { - "default.project.json" => snapshot_from_fs_path(&root_dir.join("plugin.project.json"))?, + "default.project.json5" => snapshot_from_fs_path(&root_dir.join("plugin.project.json5"))?, "plugin" => VfsSnapshot::dir(hashmap! { "fmt" => snapshot_from_fs_path(&plugin_dir.join("fmt"))?, "http" => snapshot_from_fs_path(&plugin_dir.join("http"))?, diff --git a/plugin.project.json b/plugin.project.json5 similarity index 100% rename from plugin.project.json rename to plugin.project.json5 diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap index d8bfe9ed..9dc71e7e 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap @@ -3,11 +3,9 @@ source: tests/tests/build.rs expression: contents --- - + client_init - 2 - return "From folder/init.client.lua" diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap index 338493fd..4866596c 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap @@ -11,23 +11,11 @@ expression: contents src - - - outer.spec - -- This file should be included. - - - + subproject - - - inner - -- This file should be included. - - diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap index 7d6b063d..81366675 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap @@ -7,11 +7,5 @@ expression: contents ignore_glob_nested - - - include - -- This file must be present. - - diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap index 4d427f15..bc3bbd05 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap @@ -7,11 +7,5 @@ expression: contents ignore_glob_spec - - - shouldBeIncluded - -- this file should be present - - diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap index 09346fe4..6c41eda2 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap @@ -3,16 +3,9 @@ source: tests/tests/build.rs expression: contents --- - + init_with_children - -- init.lua - - - other - -- other.lua - - diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap index 91a79007..4e3b1448 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap @@ -7,11 +7,5 @@ expression: contents module_in_folder - - - aModule - -- This is a Lua module - - diff --git a/rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap index 52737a9e..1f4c6190 100644 --- a/rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap @@ -3,10 +3,9 @@ source: tests/tests/build.rs expression: contents --- - + module_init - return "From folder/init.lua" diff --git a/rojo-test/build-tests/attributes/default.project.json b/rojo-test/build-tests/attributes/default.project.json5 similarity index 100% rename from rojo-test/build-tests/attributes/default.project.json rename to rojo-test/build-tests/attributes/default.project.json5 diff --git a/rojo-test/build-tests/client_in_folder/default.project.json b/rojo-test/build-tests/client_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/client_in_folder/default.project.json rename to rojo-test/build-tests/client_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/client_init/default.project.json b/rojo-test/build-tests/client_init/default.project.json5 similarity index 100% rename from rojo-test/build-tests/client_init/default.project.json rename to rojo-test/build-tests/client_init/default.project.json5 diff --git a/rojo-test/build-tests/csv_bug_145/default.project.json b/rojo-test/build-tests/csv_bug_145/default.project.json5 similarity index 100% rename from rojo-test/build-tests/csv_bug_145/default.project.json rename to rojo-test/build-tests/csv_bug_145/default.project.json5 diff --git a/rojo-test/build-tests/csv_bug_147/default.project.json b/rojo-test/build-tests/csv_bug_147/default.project.json5 similarity index 100% rename from rojo-test/build-tests/csv_bug_147/default.project.json rename to rojo-test/build-tests/csv_bug_147/default.project.json5 diff --git a/rojo-test/build-tests/csv_in_folder/default.project.json b/rojo-test/build-tests/csv_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/csv_in_folder/default.project.json rename to rojo-test/build-tests/csv_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/deep_nesting/default.project.json b/rojo-test/build-tests/deep_nesting/default.project.json5 similarity index 100% rename from rojo-test/build-tests/deep_nesting/default.project.json rename to rojo-test/build-tests/deep_nesting/default.project.json5 diff --git a/rojo-test/build-tests/gitkeep/default.project.json b/rojo-test/build-tests/gitkeep/default.project.json5 similarity index 100% rename from rojo-test/build-tests/gitkeep/default.project.json rename to rojo-test/build-tests/gitkeep/default.project.json5 diff --git a/rojo-test/build-tests/ignore_glob_inner/default.project.json b/rojo-test/build-tests/ignore_glob_inner/default.project.json5 similarity index 100% rename from rojo-test/build-tests/ignore_glob_inner/default.project.json rename to rojo-test/build-tests/ignore_glob_inner/default.project.json5 diff --git a/rojo-test/build-tests/ignore_glob_inner/subproject/default.project.json b/rojo-test/build-tests/ignore_glob_inner/subproject/default.project.json5 similarity index 100% rename from rojo-test/build-tests/ignore_glob_inner/subproject/default.project.json rename to rojo-test/build-tests/ignore_glob_inner/subproject/default.project.json5 diff --git a/rojo-test/build-tests/ignore_glob_nested/default.project.json b/rojo-test/build-tests/ignore_glob_nested/default.project.json5 similarity index 100% rename from rojo-test/build-tests/ignore_glob_nested/default.project.json rename to rojo-test/build-tests/ignore_glob_nested/default.project.json5 diff --git a/rojo-test/build-tests/ignore_glob_nested/subproject/default.project.json b/rojo-test/build-tests/ignore_glob_nested/subproject/default.project.json5 similarity index 100% rename from rojo-test/build-tests/ignore_glob_nested/subproject/default.project.json rename to rojo-test/build-tests/ignore_glob_nested/subproject/default.project.json5 diff --git a/rojo-test/build-tests/ignore_glob_spec/default.project.json b/rojo-test/build-tests/ignore_glob_spec/default.project.json5 similarity index 100% rename from rojo-test/build-tests/ignore_glob_spec/default.project.json rename to rojo-test/build-tests/ignore_glob_spec/default.project.json5 diff --git a/rojo-test/build-tests/infer_service_name/default.project.json b/rojo-test/build-tests/infer_service_name/default.project.json5 similarity index 100% rename from rojo-test/build-tests/infer_service_name/default.project.json rename to rojo-test/build-tests/infer_service_name/default.project.json5 diff --git a/rojo-test/build-tests/infer_starter_player/default.project.json b/rojo-test/build-tests/infer_starter_player/default.project.json5 similarity index 100% rename from rojo-test/build-tests/infer_starter_player/default.project.json rename to rojo-test/build-tests/infer_starter_player/default.project.json5 diff --git a/rojo-test/build-tests/init_csv_with_children/default.project.json b/rojo-test/build-tests/init_csv_with_children/default.project.json5 similarity index 100% rename from rojo-test/build-tests/init_csv_with_children/default.project.json rename to rojo-test/build-tests/init_csv_with_children/default.project.json5 diff --git a/rojo-test/build-tests/init_meta_class_name/default.project.json b/rojo-test/build-tests/init_meta_class_name/default.project.json5 similarity index 100% rename from rojo-test/build-tests/init_meta_class_name/default.project.json rename to rojo-test/build-tests/init_meta_class_name/default.project.json5 diff --git a/rojo-test/build-tests/init_meta_class_name/should-be-a-model/init.meta.json b/rojo-test/build-tests/init_meta_class_name/should-be-a-model/init.meta.json5 similarity index 100% rename from rojo-test/build-tests/init_meta_class_name/should-be-a-model/init.meta.json rename to rojo-test/build-tests/init_meta_class_name/should-be-a-model/init.meta.json5 diff --git a/rojo-test/build-tests/init_meta_properties/Lighting/init.meta.json b/rojo-test/build-tests/init_meta_properties/Lighting/init.meta.json5 similarity index 100% rename from rojo-test/build-tests/init_meta_properties/Lighting/init.meta.json rename to rojo-test/build-tests/init_meta_properties/Lighting/init.meta.json5 diff --git a/rojo-test/build-tests/init_meta_properties/default.project.json b/rojo-test/build-tests/init_meta_properties/default.project.json5 similarity index 100% rename from rojo-test/build-tests/init_meta_properties/default.project.json rename to rojo-test/build-tests/init_meta_properties/default.project.json5 diff --git a/rojo-test/build-tests/init_with_children/default.project.json b/rojo-test/build-tests/init_with_children/default.project.json5 similarity index 100% rename from rojo-test/build-tests/init_with_children/default.project.json rename to rojo-test/build-tests/init_with_children/default.project.json5 diff --git a/rojo-test/build-tests/issue_546/README.md b/rojo-test/build-tests/issue_546/README.md index 7ccd95fa..96b03d11 100644 --- a/rojo-test/build-tests/issue_546/README.md +++ b/rojo-test/build-tests/issue_546/README.md @@ -1,2 +1,2 @@ # Issue #546 (https://github.com/rojo-rbx/rojo/issues/546) -Regression from Rojo 6.2.0 to Rojo 7.0.0. Meta files named as init.meta.json should apply after init.client.lua and other init files. \ No newline at end of file +Regression from Rojo 6.2.0 to Rojo 7.0.0. Meta files named as init.meta.json5 should apply after init.client.luau and other init files. \ No newline at end of file diff --git a/rojo-test/build-tests/issue_546/default.project.json b/rojo-test/build-tests/issue_546/default.project.json5 similarity index 100% rename from rojo-test/build-tests/issue_546/default.project.json rename to rojo-test/build-tests/issue_546/default.project.json5 diff --git a/rojo-test/build-tests/issue_546/hello/init.meta.json b/rojo-test/build-tests/issue_546/hello/init.meta.json5 similarity index 100% rename from rojo-test/build-tests/issue_546/hello/init.meta.json rename to rojo-test/build-tests/issue_546/hello/init.meta.json5 diff --git a/rojo-test/build-tests/json_as_lua/default.project.json b/rojo-test/build-tests/json_as_lua/default.project.json5 similarity index 100% rename from rojo-test/build-tests/json_as_lua/default.project.json rename to rojo-test/build-tests/json_as_lua/default.project.json5 diff --git a/rojo-test/build-tests/json_model_in_folder/default.project.json b/rojo-test/build-tests/json_model_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/json_model_in_folder/default.project.json rename to rojo-test/build-tests/json_model_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/json_model_in_folder/folder/simple-model.model.json b/rojo-test/build-tests/json_model_in_folder/folder/simple-model.model.json5 similarity index 100% rename from rojo-test/build-tests/json_model_in_folder/folder/simple-model.model.json rename to rojo-test/build-tests/json_model_in_folder/folder/simple-model.model.json5 diff --git a/rojo-test/build-tests/json_model_legacy_name/default.project.json b/rojo-test/build-tests/json_model_legacy_name/default.project.json5 similarity index 100% rename from rojo-test/build-tests/json_model_legacy_name/default.project.json rename to rojo-test/build-tests/json_model_legacy_name/default.project.json5 diff --git a/rojo-test/build-tests/json_model_legacy_name/folder/Expected Name.model.json b/rojo-test/build-tests/json_model_legacy_name/folder/Expected Name.model.json5 similarity index 100% rename from rojo-test/build-tests/json_model_legacy_name/folder/Expected Name.model.json rename to rojo-test/build-tests/json_model_legacy_name/folder/Expected Name.model.json5 diff --git a/rojo-test/build-tests/module_in_folder/default.project.json b/rojo-test/build-tests/module_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/module_in_folder/default.project.json rename to rojo-test/build-tests/module_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/module_init/default.project.json b/rojo-test/build-tests/module_init/default.project.json5 similarity index 100% rename from rojo-test/build-tests/module_init/default.project.json rename to rojo-test/build-tests/module_init/default.project.json5 diff --git a/rojo-test/build-tests/no_name_default_project/default.project.json b/rojo-test/build-tests/no_name_default_project/default.project.json5 similarity index 100% rename from rojo-test/build-tests/no_name_default_project/default.project.json rename to rojo-test/build-tests/no_name_default_project/default.project.json5 diff --git a/rojo-test/build-tests/no_name_default_project/src/third-level/default.project.json b/rojo-test/build-tests/no_name_default_project/src/third-level/default.project.json5 similarity index 100% rename from rojo-test/build-tests/no_name_default_project/src/third-level/default.project.json rename to rojo-test/build-tests/no_name_default_project/src/third-level/default.project.json5 diff --git a/rojo-test/build-tests/no_name_project/default.project.json b/rojo-test/build-tests/no_name_project/default.project.json5 similarity index 100% rename from rojo-test/build-tests/no_name_project/default.project.json rename to rojo-test/build-tests/no_name_project/default.project.json5 diff --git a/rojo-test/build-tests/no_name_project/src/bool_value.project.json b/rojo-test/build-tests/no_name_project/src/bool_value.project.json5 similarity index 100% rename from rojo-test/build-tests/no_name_project/src/bool_value.project.json rename to rojo-test/build-tests/no_name_project/src/bool_value.project.json5 diff --git a/rojo-test/build-tests/no_name_top_level_project/default.project.json b/rojo-test/build-tests/no_name_top_level_project/default.project.json5 similarity index 100% rename from rojo-test/build-tests/no_name_top_level_project/default.project.json rename to rojo-test/build-tests/no_name_top_level_project/default.project.json5 diff --git a/rojo-test/build-tests/optional/default.project.json b/rojo-test/build-tests/optional/default.project.json5 similarity index 100% rename from rojo-test/build-tests/optional/default.project.json rename to rojo-test/build-tests/optional/default.project.json5 diff --git a/rojo-test/build-tests/project_composed_default/default.project.json b/rojo-test/build-tests/project_composed_default/default.project.json5 similarity index 100% rename from rojo-test/build-tests/project_composed_default/default.project.json rename to rojo-test/build-tests/project_composed_default/default.project.json5 diff --git a/rojo-test/build-tests/project_composed_default/folder/default.project.json b/rojo-test/build-tests/project_composed_default/folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/project_composed_default/folder/default.project.json rename to rojo-test/build-tests/project_composed_default/folder/default.project.json5 diff --git a/rojo-test/build-tests/project_composed_file/default.project.json b/rojo-test/build-tests/project_composed_file/default.project.json5 similarity index 100% rename from rojo-test/build-tests/project_composed_file/default.project.json rename to rojo-test/build-tests/project_composed_file/default.project.json5 diff --git a/rojo-test/build-tests/project_composed_file/folder/child-filename.project.json b/rojo-test/build-tests/project_composed_file/folder/child-filename.project.json5 similarity index 100% rename from rojo-test/build-tests/project_composed_file/folder/child-filename.project.json rename to rojo-test/build-tests/project_composed_file/folder/child-filename.project.json5 diff --git a/rojo-test/build-tests/project_root_name/default.project.json b/rojo-test/build-tests/project_root_name/default.project.json5 similarity index 100% rename from rojo-test/build-tests/project_root_name/default.project.json rename to rojo-test/build-tests/project_root_name/default.project.json5 diff --git a/rojo-test/build-tests/rbxm_in_folder/default.project.json b/rojo-test/build-tests/rbxm_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/rbxm_in_folder/default.project.json rename to rojo-test/build-tests/rbxm_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/rbxmx_in_folder/default.project.json b/rojo-test/build-tests/rbxmx_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/rbxmx_in_folder/default.project.json rename to rojo-test/build-tests/rbxmx_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/rbxmx_ref/default.project.json b/rojo-test/build-tests/rbxmx_ref/default.project.json5 similarity index 100% rename from rojo-test/build-tests/rbxmx_ref/default.project.json rename to rojo-test/build-tests/rbxmx_ref/default.project.json5 diff --git a/rojo-test/build-tests/script_meta_disabled/default.project.json b/rojo-test/build-tests/script_meta_disabled/default.project.json5 similarity index 100% rename from rojo-test/build-tests/script_meta_disabled/default.project.json rename to rojo-test/build-tests/script_meta_disabled/default.project.json5 diff --git a/rojo-test/build-tests/script_meta_disabled/folder/hello.meta.json b/rojo-test/build-tests/script_meta_disabled/folder/hello.meta.json5 similarity index 100% rename from rojo-test/build-tests/script_meta_disabled/folder/hello.meta.json rename to rojo-test/build-tests/script_meta_disabled/folder/hello.meta.json5 diff --git a/rojo-test/build-tests/server_in_folder/default.project.json b/rojo-test/build-tests/server_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/server_in_folder/default.project.json rename to rojo-test/build-tests/server_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/server_init/default.project.json b/rojo-test/build-tests/server_init/default.project.json5 similarity index 100% rename from rojo-test/build-tests/server_init/default.project.json rename to rojo-test/build-tests/server_init/default.project.json5 diff --git a/rojo-test/build-tests/sync_rule_alone/default.project.json b/rojo-test/build-tests/sync_rule_alone/default.project.json5 similarity index 100% rename from rojo-test/build-tests/sync_rule_alone/default.project.json rename to rojo-test/build-tests/sync_rule_alone/default.project.json5 diff --git a/rojo-test/build-tests/sync_rule_complex/default.project.json b/rojo-test/build-tests/sync_rule_complex/default.project.json5 similarity index 100% rename from rojo-test/build-tests/sync_rule_complex/default.project.json rename to rojo-test/build-tests/sync_rule_complex/default.project.json5 diff --git a/rojo-test/build-tests/sync_rule_nested_projects/default.project.json b/rojo-test/build-tests/sync_rule_nested_projects/default.project.json5 similarity index 79% rename from rojo-test/build-tests/sync_rule_nested_projects/default.project.json rename to rojo-test/build-tests/sync_rule_nested_projects/default.project.json5 index 1b6193bb..7bf8edf0 100644 --- a/rojo-test/build-tests/sync_rule_nested_projects/default.project.json +++ b/rojo-test/build-tests/sync_rule_nested_projects/default.project.json5 @@ -1,7 +1,7 @@ { "name": "sync_rule_nested_projects", "tree": { - "$path": "nested.project.json" + "$path": "nested.project.json5" }, "syncRules": [ { diff --git a/rojo-test/build-tests/sync_rule_nested_projects/nested.project.json b/rojo-test/build-tests/sync_rule_nested_projects/nested.project.json5 similarity index 100% rename from rojo-test/build-tests/sync_rule_nested_projects/nested.project.json rename to rojo-test/build-tests/sync_rule_nested_projects/nested.project.json5 diff --git a/rojo-test/build-tests/txt/default.project.json b/rojo-test/build-tests/txt/default.project.json5 similarity index 100% rename from rojo-test/build-tests/txt/default.project.json rename to rojo-test/build-tests/txt/default.project.json5 diff --git a/rojo-test/build-tests/txt_in_folder/default.project.json b/rojo-test/build-tests/txt_in_folder/default.project.json5 similarity index 100% rename from rojo-test/build-tests/txt_in_folder/default.project.json rename to rojo-test/build-tests/txt_in_folder/default.project.json5 diff --git a/rojo-test/build-tests/unresolved_values/default.project.json b/rojo-test/build-tests/unresolved_values/default.project.json5 similarity index 100% rename from rojo-test/build-tests/unresolved_values/default.project.json rename to rojo-test/build-tests/unresolved_values/default.project.json5 diff --git a/rojo-test/build-tests/weldconstraint/default.project.json b/rojo-test/build-tests/weldconstraint/default.project.json5 similarity index 100% rename from rojo-test/build-tests/weldconstraint/default.project.json rename to rojo-test/build-tests/weldconstraint/default.project.json5 diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap index d3f50dbd..4548d5dc 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap @@ -1,20 +1,16 @@ --- source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" - --- instances: id-2: Children: [] - ClassName: ModuleScript + ClassName: Folder Id: id-2 Metadata: ignoreUnknownInstances: false Name: edit_init Parent: "00000000000000000000000000000000" - Properties: - Source: - String: "-- Original contents" + Properties: {} messageCursor: 0 sessionId: id-1 - diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_all.snap index cd654f22..e0e2fbb6 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_all.snap @@ -4,53 +4,13 @@ expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: id-2: - Children: - - id-3 - ClassName: DataModel + Children: [] + ClassName: Folder Id: id-2 Metadata: - ignoreUnknownInstances: true - Name: meshpart + ignoreUnknownInstances: false + Name: empty_folder Parent: "00000000000000000000000000000000" Properties: {} - id-3: - Children: - - id-4 - - id-5 - ClassName: Workspace - Id: id-3 - Metadata: - ignoreUnknownInstances: true - Name: Workspace - Parent: id-2 - Properties: - NeedsPivotMigration: - Bool: false - id-4: - Children: [] - ClassName: ObjectValue - Id: id-4 - Metadata: - ignoreUnknownInstances: true - Name: ObjectValue - Parent: id-3 - Properties: - Attributes: - Attributes: {} - Value: - Ref: id-5 - id-5: - Children: [] - ClassName: MeshPart - Id: id-5 - Metadata: - ignoreUnknownInstances: true - Name: Sword - Parent: id-3 - Properties: - MeshId: - ContentId: "rbxasset://fonts/sword.mesh" - TextureID: - ContentId: "rbxasset://textures/SwordTexture.png" messageCursor: 0 sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap index 15867978..f484c766 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_info.snap @@ -2,7 +2,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(&info) --- -projectName: meshpart +projectName: empty_folder protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap index 08cc4e31..4548d5dc 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap @@ -9,7 +9,7 @@ instances: Id: id-2 Metadata: ignoreUnknownInstances: false - Name: move_folder_of_stuff + Name: edit_init Parent: "00000000000000000000000000000000" Properties: {} messageCursor: 0 diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap index e0602de4..74bd1bdf 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap @@ -2,7 +2,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- -projectName: move_folder_of_stuff +projectName: edit_init protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" 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 index c40cd6ca..1acb38e8 100644 --- 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 @@ -3,40 +3,114 @@ 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: + id-10: Children: [] ClassName: ObjectValue - Id: id-3 + Id: id-10 Metadata: - ignoreUnknownInstances: false - Name: pointer - Parent: id-2 + ignoreUnknownInstances: true + Name: ProjectPointer + Parent: id-9 Properties: Attributes: Attributes: {} Value: - Ref: id-4 + 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: + NeedsPivotMigration: + Bool: false id-4: Children: [] ClassName: ObjectValue Id: id-4 Metadata: - ignoreUnknownInstances: false - Name: target - Parent: id-2 + ignoreUnknownInstances: true + Name: CrossFormatPointer + Parent: id-3 Properties: Attributes: Attributes: {} + 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: {} + 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: {} + NeedsPivotMigration: + Bool: false + 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_remove_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_info.snap index 34441dd8..22534808 100644 --- 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 @@ -2,7 +2,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- -projectName: ref_properties_remove +projectName: ref_properties protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap index 2671f94b..83f6380a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap @@ -4,9 +4,7 @@ expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: id-2: - Children: - - id-3 - - id-4 + Children: [] ClassName: Folder Id: id-2 Metadata: @@ -14,29 +12,5 @@ instances: Name: scripts Parent: "00000000000000000000000000000000" Properties: {} - id-3: - Children: [] - ClassName: Script - Id: id-3 - Metadata: - ignoreUnknownInstances: false - Name: bar - Parent: id-2 - Properties: - RunContext: - Enum: 1 - Source: - String: "-- Hello, from bar!" - id-4: - Children: [] - ClassName: ModuleScript - Id: id-4 - Metadata: - ignoreUnknownInstances: false - Name: foo - Parent: id-2 - Properties: - Source: - String: "-- Hello, from foo!" messageCursor: 0 sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_all.snap index e4fa4adf..83f6380a 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_all.snap @@ -1,30 +1,16 @@ --- source: tests/tests/serve.rs -assertion_line: 268 expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: id-2: - Children: - - id-3 + Children: [] ClassName: Folder Id: id-2 Metadata: ignoreUnknownInstances: false - Name: sync_rule_alone + Name: scripts Parent: "00000000000000000000000000000000" Properties: {} - id-3: - Children: [] - ClassName: StringValue - Id: id-3 - Metadata: - ignoreUnknownInstances: false - Name: foo - Parent: id-2 - Properties: - Value: - String: "Hello, world!" messageCursor: 0 sessionId: id-1 - diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap index df3b55c1..6a23eb3e 100644 --- a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_info.snap @@ -2,7 +2,7 @@ source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- -projectName: sync_rule_alone +projectName: scripts protocolVersion: 5 rootInstanceId: id-2 serverVersion: "[server-version]" diff --git a/rojo-test/serve-tests/add_folder/default.project.json b/rojo-test/serve-tests/add_folder/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/add_folder/default.project.json rename to rojo-test/serve-tests/add_folder/default.project.json5 diff --git a/rojo-test/serve-tests/add_optional_folder/default.project.json b/rojo-test/serve-tests/add_optional_folder/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/add_optional_folder/default.project.json rename to rojo-test/serve-tests/add_optional_folder/default.project.json5 diff --git a/rojo-test/serve-tests/edit_init/default.project.json b/rojo-test/serve-tests/edit_init/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/edit_init/default.project.json rename to rojo-test/serve-tests/edit_init/default.project.json5 diff --git a/rojo-test/serve-tests/empty/default.project.json b/rojo-test/serve-tests/empty/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/empty/default.project.json rename to rojo-test/serve-tests/empty/default.project.json5 diff --git a/rojo-test/serve-tests/empty_json_model/default.project.json b/rojo-test/serve-tests/empty_json_model/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/empty_json_model/default.project.json rename to rojo-test/serve-tests/empty_json_model/default.project.json5 diff --git a/rojo-test/serve-tests/empty_json_model/src/test.model.json b/rojo-test/serve-tests/empty_json_model/src/test.model.json5 similarity index 100% rename from rojo-test/serve-tests/empty_json_model/src/test.model.json rename to rojo-test/serve-tests/empty_json_model/src/test.model.json5 diff --git a/rojo-test/serve-tests/forced_parent/default.project.json b/rojo-test/serve-tests/forced_parent/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/forced_parent/default.project.json rename to rojo-test/serve-tests/forced_parent/default.project.json5 diff --git a/rojo-test/serve-tests/meshpart_with_id/default.project.json b/rojo-test/serve-tests/meshpart_with_id/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/meshpart_with_id/default.project.json rename to rojo-test/serve-tests/meshpart_with_id/default.project.json5 diff --git a/rojo-test/serve-tests/move_folder_of_stuff/default.project.json b/rojo-test/serve-tests/move_folder_of_stuff/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/move_folder_of_stuff/default.project.json rename to rojo-test/serve-tests/move_folder_of_stuff/default.project.json5 diff --git a/rojo-test/serve-tests/no_name_default_project/default.project.json b/rojo-test/serve-tests/no_name_default_project/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/no_name_default_project/default.project.json rename to rojo-test/serve-tests/no_name_default_project/default.project.json5 diff --git a/rojo-test/serve-tests/no_name_default_project/src/third-level/default.project.json b/rojo-test/serve-tests/no_name_default_project/src/third-level/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/no_name_default_project/src/third-level/default.project.json rename to rojo-test/serve-tests/no_name_default_project/src/third-level/default.project.json5 diff --git a/rojo-test/serve-tests/no_name_project/default.project.json b/rojo-test/serve-tests/no_name_project/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/no_name_project/default.project.json rename to rojo-test/serve-tests/no_name_project/default.project.json5 diff --git a/rojo-test/serve-tests/no_name_project/src/bool_value.project.json b/rojo-test/serve-tests/no_name_project/src/bool_value.project.json5 similarity index 100% rename from rojo-test/serve-tests/no_name_project/src/bool_value.project.json rename to rojo-test/serve-tests/no_name_project/src/bool_value.project.json5 diff --git a/rojo-test/serve-tests/no_name_top_level_project/default.project.json b/rojo-test/serve-tests/no_name_top_level_project/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/no_name_top_level_project/default.project.json rename to rojo-test/serve-tests/no_name_top_level_project/default.project.json5 diff --git a/rojo-test/serve-tests/pivot_migration/Tool.model.json b/rojo-test/serve-tests/pivot_migration/Tool.model.json5 similarity index 100% rename from rojo-test/serve-tests/pivot_migration/Tool.model.json rename to rojo-test/serve-tests/pivot_migration/Tool.model.json5 diff --git a/rojo-test/serve-tests/pivot_migration/default.project.json b/rojo-test/serve-tests/pivot_migration/default.project.json5 similarity index 83% rename from rojo-test/serve-tests/pivot_migration/default.project.json rename to rojo-test/serve-tests/pivot_migration/default.project.json5 index 7a2c548f..6461db0f 100644 --- a/rojo-test/serve-tests/pivot_migration/default.project.json +++ b/rojo-test/serve-tests/pivot_migration/default.project.json5 @@ -7,7 +7,7 @@ "$className": "Model" }, "Tool": { - "$path": "Tool.model.json" + "$path": "Tool.model.json5" } } } diff --git a/rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json b/rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json5 similarity index 100% rename from rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json rename to rojo-test/serve-tests/ref_properties/FolderTarget/FolderPointer.model.json5 diff --git a/rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json b/rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json5 similarity index 100% rename from rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json rename to rojo-test/serve-tests/ref_properties/FolderTarget/init.meta.json5 diff --git a/rojo-test/serve-tests/ref_properties/ModelTarget.model.json b/rojo-test/serve-tests/ref_properties/ModelTarget.model.json5 similarity index 100% rename from rojo-test/serve-tests/ref_properties/ModelTarget.model.json rename to rojo-test/serve-tests/ref_properties/ModelTarget.model.json5 diff --git a/rojo-test/serve-tests/ref_properties/default.project.json b/rojo-test/serve-tests/ref_properties/default.project.json5 similarity index 93% rename from rojo-test/serve-tests/ref_properties/default.project.json rename to rojo-test/serve-tests/ref_properties/default.project.json5 index 8ffa1908..198733fb 100644 --- a/rojo-test/serve-tests/ref_properties/default.project.json +++ b/rojo-test/serve-tests/ref_properties/default.project.json5 @@ -16,7 +16,7 @@ } }, "ModelTarget": { - "$path": "ModelTarget.model.json" + "$path": "ModelTarget.model.json5" }, "FolderTarget": { "$path": "FolderTarget" diff --git a/rojo-test/serve-tests/ref_properties_remove/default.project.json b/rojo-test/serve-tests/ref_properties_remove/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/ref_properties_remove/default.project.json rename to rojo-test/serve-tests/ref_properties_remove/default.project.json5 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.json5 similarity index 100% rename from rojo-test/serve-tests/ref_properties_remove/src/pointer.model.json rename to rojo-test/serve-tests/ref_properties_remove/src/pointer.model.json5 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.json5 similarity index 100% rename from rojo-test/serve-tests/ref_properties_remove/src/target.model.json rename to rojo-test/serve-tests/ref_properties_remove/src/target.model.json5 diff --git a/rojo-test/serve-tests/remove_file/default.project.json b/rojo-test/serve-tests/remove_file/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/remove_file/default.project.json rename to rojo-test/serve-tests/remove_file/default.project.json5 diff --git a/rojo-test/serve-tests/scripts/default.project.json b/rojo-test/serve-tests/scripts/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/scripts/default.project.json rename to rojo-test/serve-tests/scripts/default.project.json5 diff --git a/rojo-test/serve-tests/sync_rule_alone/default.project.json b/rojo-test/serve-tests/sync_rule_alone/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/sync_rule_alone/default.project.json rename to rojo-test/serve-tests/sync_rule_alone/default.project.json5 diff --git a/rojo-test/serve-tests/sync_rule_complex/default.project.json b/rojo-test/serve-tests/sync_rule_complex/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/sync_rule_complex/default.project.json rename to rojo-test/serve-tests/sync_rule_complex/default.project.json5 diff --git a/rojo-test/serve-tests/sync_rule_no_extension/default.project.json b/rojo-test/serve-tests/sync_rule_no_extension/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/sync_rule_no_extension/default.project.json rename to rojo-test/serve-tests/sync_rule_no_extension/default.project.json5 diff --git a/rojo-test/serve-tests/sync_rule_no_name_project/default.project.json b/rojo-test/serve-tests/sync_rule_no_name_project/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/sync_rule_no_name_project/default.project.json rename to rojo-test/serve-tests/sync_rule_no_name_project/default.project.json5 diff --git a/rojo-test/serve-tests/syncback_write/default.project.json b/rojo-test/serve-tests/syncback_write/default.project.json5 similarity index 100% rename from rojo-test/serve-tests/syncback_write/default.project.json rename to rojo-test/serve-tests/syncback_write/default.project.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id-stdout.snap index 11b5f72c..b30a753c 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__duplicate_rojo_id-stdout.snap @@ -2,4 +2,4 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing container.model.json +Writing container.model.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__json_middlewares-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__json_middlewares-stdout.snap index 80d5caf9..d017a9ae 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__json_middlewares-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__json_middlewares-stdout.snap @@ -3,6 +3,6 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- Writing src/dir_with_meta/init.meta.json5 -Writing src/model_json.model.json -Writing src/project_json.project.json +Writing src/model_json.model.json5 +Writing src/project_json.project.json5 Writing src/dir_with_meta diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects-stdout.snap index eab1bd54..581968e9 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__nested_projects-stdout.snap @@ -2,5 +2,5 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing nested.project.json +Writing nested.project.json5 Writing string_value.txt diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize-stdout.snap index d6e4238a..c441e44b 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__project_reserialize-stdout.snap @@ -3,4 +3,4 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- Writing attribute_mismatch.luau -Writing property_mismatch.project.json +Writing property_mismatch.project.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties-stdout.snap index 774fe9d6..c8e9ec4d 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties-stdout.snap @@ -2,5 +2,5 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing src/pointer.model.json -Writing src/target.model.json +Writing src/pointer.model.json5 +Writing src/target.model.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_conflict-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_conflict-stdout.snap index 38d25be9..d5db8835 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_conflict-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_conflict-stdout.snap @@ -2,7 +2,7 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing src/Pointer_1.model.json -Writing src/Pointer_2.model.json -Writing src/Target_1.model.json -Writing src/Target_2.model.json +Writing src/Pointer_1.model.json5 +Writing src/Pointer_2.model.json5 +Writing src/Target_1.model.json5 +Writing src/Target_2.model.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_duplicate-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_duplicate-stdout.snap index 5191a06e..20ef2edd 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_duplicate-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__ref_properties_duplicate-stdout.snap @@ -2,6 +2,6 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing src/Pointer_1.model.json -Writing src/Pointer_2.model.json -Writing src/Target.model.json +Writing src/Pointer_1.model.json5 +Writing src/Pointer_2.model.json5 +Writing src/Target.model.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware-stdout.snap index 05dbd817..baaff4cc 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__respect_old_middleware-stdout.snap @@ -2,7 +2,7 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing default.project.json -Writing src/model_json.model.json +Writing default.project.json5 +Writing src/model_json.model.json5 Writing src/rbxm.rbxm Writing src/rbxmx.rbxmx diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__schema_roundtrip-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__schema_roundtrip-stdout.snap index 2fad6de2..a414f22f 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__schema_roundtrip-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__schema_roundtrip-stdout.snap @@ -2,9 +2,9 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing default.project.json +Writing default.project.json5 Writing src/adjacent.luau Writing src/adjacent.meta.json5 Writing src/init/init.meta.json5 -Writing src/model.model.json +Writing src/model.model.json5 Writing src/init diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project-stdout.snap index fc49a162..fd7f3aaa 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__string_value_project-stdout.snap @@ -2,5 +2,5 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing default.project.json +Writing default.project.json5 Writing string_value.txt diff --git a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties-stdout.snap b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties-stdout.snap index 3ef76951..eabf9b6c 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties-stdout.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__unscriptable_properties-stdout.snap @@ -2,4 +2,4 @@ source: tests/rojo_test/syncback_util.rs expression: "String::from_utf8_lossy(&output.stdout)" --- -Writing default.project.json +Writing default.project.json5 diff --git a/rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__respect_old_middleware-src__model_json.model.json.snap b/rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__respect_old_middleware-src__model_json.model.json5.snap similarity index 51% rename from rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__respect_old_middleware-src__model_json.model.json.snap rename to rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__respect_old_middleware-src__model_json.model.json5.snap index 1b95a942..e5d5e3fd 100644 --- a/rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__respect_old_middleware-src__model_json.model.json.snap +++ b/rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__respect_old_middleware-src__model_json.model.json5.snap @@ -1,10 +1,10 @@ --- source: tests/tests/syncback.rs -expression: src/model_json.model.json +expression: src/model_json.model.json5 --- { className: "StringValue", properties: { - Value: "This should be a .model.json file", + Value: "This should be a .model.json5 file", }, } diff --git a/rojo-test/syncback-tests/child_but_not/input-project/default.project.json b/rojo-test/syncback-tests/child_but_not/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/child_but_not/input-project/default.project.json rename to rojo-test/syncback-tests/child_but_not/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/csv/input-project/default.project.json b/rojo-test/syncback-tests/csv/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/csv/input-project/default.project.json rename to rojo-test/syncback-tests/csv/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/input-project/container.model.json b/rojo-test/syncback-tests/duplicate_rojo_id/input-project/container.model.json5 similarity index 100% rename from rojo-test/syncback-tests/duplicate_rojo_id/input-project/container.model.json rename to rojo-test/syncback-tests/duplicate_rojo_id/input-project/container.model.json5 diff --git a/rojo-test/syncback-tests/duplicate_rojo_id/input-project/default.project.json b/rojo-test/syncback-tests/duplicate_rojo_id/input-project/default.project.json5 similarity index 77% rename from rojo-test/syncback-tests/duplicate_rojo_id/input-project/default.project.json rename to rojo-test/syncback-tests/duplicate_rojo_id/input-project/default.project.json5 index 3343677a..dedfc986 100644 --- a/rojo-test/syncback-tests/duplicate_rojo_id/input-project/default.project.json +++ b/rojo-test/syncback-tests/duplicate_rojo_id/input-project/default.project.json5 @@ -4,7 +4,7 @@ "$className": "DataModel", "ReplicatedStorage": { "container": { - "$path": "container.model.json" + "$path": "container.model.json5" } } } diff --git a/rojo-test/syncback-tests/ignore_paths_adding/input-project/default.project.json b/rojo-test/syncback-tests/ignore_paths_adding/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ignore_paths_adding/input-project/default.project.json rename to rojo-test/syncback-tests/ignore_paths_adding/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ignore_paths_init/input-project/default.project.json b/rojo-test/syncback-tests/ignore_paths_init/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ignore_paths_init/input-project/default.project.json rename to rojo-test/syncback-tests/ignore_paths_init/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ignore_paths_removing/input-project/default.project.json b/rojo-test/syncback-tests/ignore_paths_removing/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ignore_paths_removing/input-project/default.project.json rename to rojo-test/syncback-tests/ignore_paths_removing/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ignore_trees_adding/input-project/default.project.json b/rojo-test/syncback-tests/ignore_trees_adding/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ignore_trees_adding/input-project/default.project.json rename to rojo-test/syncback-tests/ignore_trees_adding/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ignore_trees_removing/input-project/default.project.json b/rojo-test/syncback-tests/ignore_trees_removing/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ignore_trees_removing/input-project/default.project.json rename to rojo-test/syncback-tests/ignore_trees_removing/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/json_middlewares/input-project/default.project.json b/rojo-test/syncback-tests/json_middlewares/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/json_middlewares/input-project/default.project.json rename to rojo-test/syncback-tests/json_middlewares/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/json_middlewares/input-project/src/dir_with_meta/init.meta.json b/rojo-test/syncback-tests/json_middlewares/input-project/src/dir_with_meta/init.meta.json5 similarity index 100% rename from rojo-test/syncback-tests/json_middlewares/input-project/src/dir_with_meta/init.meta.json rename to rojo-test/syncback-tests/json_middlewares/input-project/src/dir_with_meta/init.meta.json5 diff --git a/rojo-test/syncback-tests/json_middlewares/input-project/src/model_json.model.json b/rojo-test/syncback-tests/json_middlewares/input-project/src/model_json.model.json5 similarity index 100% rename from rojo-test/syncback-tests/json_middlewares/input-project/src/model_json.model.json rename to rojo-test/syncback-tests/json_middlewares/input-project/src/model_json.model.json5 diff --git a/rojo-test/syncback-tests/json_middlewares/input-project/src/project_json.project.json b/rojo-test/syncback-tests/json_middlewares/input-project/src/project_json.project.json5 similarity index 100% rename from rojo-test/syncback-tests/json_middlewares/input-project/src/project_json.project.json rename to rojo-test/syncback-tests/json_middlewares/input-project/src/project_json.project.json5 diff --git a/rojo-test/syncback-tests/nested_projects/input-project/default.project.json b/rojo-test/syncback-tests/nested_projects/expected/default.project.json5 similarity index 77% rename from rojo-test/syncback-tests/nested_projects/input-project/default.project.json rename to rojo-test/syncback-tests/nested_projects/expected/default.project.json5 index edb89e3c..e1ecbb64 100644 --- a/rojo-test/syncback-tests/nested_projects/input-project/default.project.json +++ b/rojo-test/syncback-tests/nested_projects/expected/default.project.json5 @@ -4,7 +4,7 @@ "$className": "DataModel", "ReplicatedStorage": { "Nested": { - "$path": "nested.project.json" + "$path": "nested.project.json5" } } } diff --git a/rojo-test/syncback-tests/nested_projects/expected/nested.project.json b/rojo-test/syncback-tests/nested_projects/expected/nested.project.json5 similarity index 100% rename from rojo-test/syncback-tests/nested_projects/expected/nested.project.json rename to rojo-test/syncback-tests/nested_projects/expected/nested.project.json5 diff --git a/rojo-test/syncback-tests/nested_projects/expected/default.project.json b/rojo-test/syncback-tests/nested_projects/input-project/default.project.json5 similarity index 77% rename from rojo-test/syncback-tests/nested_projects/expected/default.project.json rename to rojo-test/syncback-tests/nested_projects/input-project/default.project.json5 index edb89e3c..e1ecbb64 100644 --- a/rojo-test/syncback-tests/nested_projects/expected/default.project.json +++ b/rojo-test/syncback-tests/nested_projects/input-project/default.project.json5 @@ -4,7 +4,7 @@ "$className": "DataModel", "ReplicatedStorage": { "Nested": { - "$path": "nested.project.json" + "$path": "nested.project.json5" } } } diff --git a/rojo-test/syncback-tests/nested_projects/input-project/nested.project.json b/rojo-test/syncback-tests/nested_projects/input-project/nested.project.json5 similarity index 100% rename from rojo-test/syncback-tests/nested_projects/input-project/nested.project.json rename to rojo-test/syncback-tests/nested_projects/input-project/nested.project.json5 diff --git a/rojo-test/syncback-tests/nested_projects_weird/input-project/client-only.project.json b/rojo-test/syncback-tests/nested_projects_weird/input-project/client-only.project.json5 similarity index 100% rename from rojo-test/syncback-tests/nested_projects_weird/input-project/client-only.project.json rename to rojo-test/syncback-tests/nested_projects_weird/input-project/client-only.project.json5 diff --git a/rojo-test/syncback-tests/nested_projects_weird/input-project/default.project.json b/rojo-test/syncback-tests/nested_projects_weird/input-project/default.project.json5 similarity index 69% rename from rojo-test/syncback-tests/nested_projects_weird/input-project/default.project.json rename to rojo-test/syncback-tests/nested_projects_weird/input-project/default.project.json5 index 9fb46e6f..1dd69945 100644 --- a/rojo-test/syncback-tests/nested_projects_weird/input-project/default.project.json +++ b/rojo-test/syncback-tests/nested_projects_weird/input-project/default.project.json5 @@ -4,12 +4,12 @@ "$className": "DataModel", "ReplicatedStorage": { "modules": { - "$path": "client-only.project.json" + "$path": "client-only.project.json5" } }, "ServerStorage": { "modules": { - "$path": "server-only.project.json" + "$path": "server-only.project.json5" } } } diff --git a/rojo-test/syncback-tests/nested_projects_weird/input-project/server-only.project.json b/rojo-test/syncback-tests/nested_projects_weird/input-project/server-only.project.json5 similarity index 100% rename from rojo-test/syncback-tests/nested_projects_weird/input-project/server-only.project.json rename to rojo-test/syncback-tests/nested_projects_weird/input-project/server-only.project.json5 diff --git a/rojo-test/syncback-tests/project_init/input-project/default.project.json b/rojo-test/syncback-tests/project_init/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/project_init/input-project/default.project.json rename to rojo-test/syncback-tests/project_init/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json5 similarity index 92% rename from rojo-test/syncback-tests/project_reserialize/expected/default.project.json rename to rojo-test/syncback-tests/project_reserialize/expected/default.project.json5 index 60605da2..316b4090 100644 --- a/rojo-test/syncback-tests/project_reserialize/expected/default.project.json +++ b/rojo-test/syncback-tests/project_reserialize/expected/default.project.json5 @@ -10,7 +10,7 @@ "$path": "attribute_mismatch.luau" }, "property_mismatch": { - "$path": "property_mismatch.project.json" + "$path": "property_mismatch.project.json5" }, "$properties": { "EditorLiveScripting": { 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.json5 similarity index 100% rename from rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json rename to rojo-test/syncback-tests/project_reserialize/expected/property_mismatch.project.json5 diff --git a/rojo-test/syncback-tests/project_reserialize/input-project/default.project.json b/rojo-test/syncback-tests/project_reserialize/input-project/default.project.json5 similarity index 83% rename from rojo-test/syncback-tests/project_reserialize/input-project/default.project.json rename to rojo-test/syncback-tests/project_reserialize/input-project/default.project.json5 index 1991bb91..ddb75329 100644 --- a/rojo-test/syncback-tests/project_reserialize/input-project/default.project.json +++ b/rojo-test/syncback-tests/project_reserialize/input-project/default.project.json5 @@ -9,7 +9,7 @@ "$path": "attribute_mismatch.luau" }, "property_mismatch": { - "$path": "property_mismatch.project.json" + "$path": "property_mismatch.project.json5" } } } \ No newline at end of file diff --git a/rojo-test/syncback-tests/project_reserialize/input-project/property_mismatch.project.json b/rojo-test/syncback-tests/project_reserialize/input-project/property_mismatch.project.json5 similarity index 100% rename from rojo-test/syncback-tests/project_reserialize/input-project/property_mismatch.project.json rename to rojo-test/syncback-tests/project_reserialize/input-project/property_mismatch.project.json5 diff --git a/rojo-test/syncback-tests/rbxm_fallback/input-project/default.project.json b/rojo-test/syncback-tests/rbxm_fallback/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/rbxm_fallback/input-project/default.project.json rename to rojo-test/syncback-tests/rbxm_fallback/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ref_properties/input-project/default.project.json b/rojo-test/syncback-tests/ref_properties/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties/input-project/default.project.json rename to rojo-test/syncback-tests/ref_properties/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ref_properties/input-project/src/pointer.model.json b/rojo-test/syncback-tests/ref_properties/input-project/src/pointer.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties/input-project/src/pointer.model.json rename to rojo-test/syncback-tests/ref_properties/input-project/src/pointer.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties/input-project/src/target.model.json b/rojo-test/syncback-tests/ref_properties/input-project/src/target.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties/input-project/src/target.model.json rename to rojo-test/syncback-tests/ref_properties/input-project/src/target.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_blank/input-project/default.project.json b/rojo-test/syncback-tests/ref_properties_blank/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_blank/input-project/default.project.json rename to rojo-test/syncback-tests/ref_properties_blank/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ref_properties_conflict/input-project/default.project.json b/rojo-test/syncback-tests/ref_properties_conflict/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_conflict/input-project/default.project.json rename to rojo-test/syncback-tests/ref_properties_conflict/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_1.model.json b/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_1.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_1.model.json rename to rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_1.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_2.model.json b/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_2.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_2.model.json rename to rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Pointer_2.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_1.model.json b/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_1.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_1.model.json rename to rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_1.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_2.model.json b/rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_2.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_2.model.json rename to rojo-test/syncback-tests/ref_properties_conflict/input-project/src/Target_2.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_duplicate/input-project/default.project.json b/rojo-test/syncback-tests/ref_properties_duplicate/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_duplicate/input-project/default.project.json rename to rojo-test/syncback-tests/ref_properties_duplicate/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_1.model.json b/rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_1.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_1.model.json rename to rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_1.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_2.model.json b/rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_2.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_2.model.json rename to rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Pointer_2.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Target.model.json b/rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Target.model.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Target.model.json rename to rojo-test/syncback-tests/ref_properties_duplicate/input-project/src/Target.model.json5 diff --git a/rojo-test/syncback-tests/ref_properties_pruned/input-project/default.project.json b/rojo-test/syncback-tests/ref_properties_pruned/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/ref_properties_pruned/input-project/default.project.json rename to rojo-test/syncback-tests/ref_properties_pruned/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/respect_old_middleware/input-project/default.project.json b/rojo-test/syncback-tests/respect_old_middleware/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/respect_old_middleware/input-project/default.project.json rename to rojo-test/syncback-tests/respect_old_middleware/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/respect_old_middleware/input-project/src/model_json.model.json b/rojo-test/syncback-tests/respect_old_middleware/input-project/src/model_json.model.json5 similarity index 100% rename from rojo-test/syncback-tests/respect_old_middleware/input-project/src/model_json.model.json rename to rojo-test/syncback-tests/respect_old_middleware/input-project/src/model_json.model.json5 diff --git a/rojo-test/syncback-tests/schema_roundtrip/input-project/default.project.json b/rojo-test/syncback-tests/schema_roundtrip/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/schema_roundtrip/input-project/default.project.json rename to rojo-test/syncback-tests/schema_roundtrip/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/schema_roundtrip/input-project/src/adjacent.meta.json b/rojo-test/syncback-tests/schema_roundtrip/input-project/src/adjacent.meta.json5 similarity index 100% rename from rojo-test/syncback-tests/schema_roundtrip/input-project/src/adjacent.meta.json rename to rojo-test/syncback-tests/schema_roundtrip/input-project/src/adjacent.meta.json5 diff --git a/rojo-test/syncback-tests/schema_roundtrip/input-project/src/init/init.meta.json b/rojo-test/syncback-tests/schema_roundtrip/input-project/src/init/init.meta.json5 similarity index 100% rename from rojo-test/syncback-tests/schema_roundtrip/input-project/src/init/init.meta.json rename to rojo-test/syncback-tests/schema_roundtrip/input-project/src/init/init.meta.json5 diff --git a/rojo-test/syncback-tests/schema_roundtrip/input-project/src/model.model.json b/rojo-test/syncback-tests/schema_roundtrip/input-project/src/model.model.json5 similarity index 100% rename from rojo-test/syncback-tests/schema_roundtrip/input-project/src/model.model.json rename to rojo-test/syncback-tests/schema_roundtrip/input-project/src/model.model.json5 diff --git a/rojo-test/syncback-tests/string_value_project/input-project/default.project.json b/rojo-test/syncback-tests/string_value_project/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/string_value_project/input-project/default.project.json rename to rojo-test/syncback-tests/string_value_project/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/sync_rules/input-project/default.project.json b/rojo-test/syncback-tests/sync_rules/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/sync_rules/input-project/default.project.json rename to rojo-test/syncback-tests/sync_rules/input-project/default.project.json5 diff --git a/rojo-test/syncback-tests/unscriptable_properties/input-project/default.project.json b/rojo-test/syncback-tests/unscriptable_properties/input-project/default.project.json5 similarity index 100% rename from rojo-test/syncback-tests/unscriptable_properties/input-project/default.project.json rename to rojo-test/syncback-tests/unscriptable_properties/input-project/default.project.json5 diff --git a/src/project.rs b/src/project.rs index 0e432147..220b9e35 100644 --- a/src/project.rs +++ b/src/project.rs @@ -16,11 +16,7 @@ use crate::{ }; /// Represents 'default' project names that act as `init` files -pub static DEFAULT_PROJECT_NAMES: [&str; 3] = [ - "default.project.json", - "default.project.jsonc", - "default.project.json5", -]; +pub static DEFAULT_PROJECT_NAMES: [&str; 1] = ["default.project.json5"]; /// Error type returned by any function that handles projects. #[derive(Debug, Error)] @@ -60,7 +56,7 @@ enum Error { /// Contains all of the configuration for a Rojo-managed project. /// -/// Project files are stored in `.project.json` files. +/// Project files are stored in `.project.json5` files. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[serde(deny_unknown_fields, rename_all = "camelCase")] pub struct Project { @@ -144,18 +140,14 @@ impl Project { pub fn is_project_file(path: &Path) -> bool { path.file_name() .and_then(|name| name.to_str()) - .map(|name| { - name.ends_with(".project.json") - || name.ends_with(".project.jsonc") - || name.ends_with(".project.json5") - }) + .map(|name| name.ends_with(".project.json5")) .unwrap_or(false) } /// Attempt to locate a project represented by the given path. /// - /// This will find a project if the path refers to a `.project.json` file, - /// or is a folder that contains a `default.project.json` file. + /// This will find a project if the path refers to a `.project.json5` file, + /// or is a folder that contains a `default.project.json5` file. fn locate(path: &Path) -> Option { let meta = fs::metadata(path).ok()?; @@ -184,7 +176,7 @@ impl Project { /// Sets the name of a project. The order it handles is as follows: /// - /// - If the project is a `default.project.json`, uses the folder's name + /// - If the project is a `default.project.json5`, uses the folder's name /// - If a fallback is specified, uses that blindly /// - Otherwise, loops through sync rules (including the default ones!) and /// uses the name of the first one that matches and is a project file @@ -222,7 +214,7 @@ impl Project { // If you're adding this codepath, make sure a test for it exists // and that it handles sync rules appropriately. todo!( - "set_file_name doesn't support loading project files that aren't default.project.json without a fallback provided" + "set_file_name doesn't support loading project files that aren't default.project.json5 without a fallback provided" ); } @@ -250,8 +242,8 @@ impl Project { } /// Loads a Project from a path. This will find the project if it refers to - /// a `.project.json` file or if it refers to a directory that contains a - /// file named `default.project.json`. + /// a `.project.json5` file or if it refers to a directory that contains a + /// file named `default.project.json5`. pub fn load_fuzzy( vfs: &Vfs, fuzzy_project_location: &Path, @@ -421,8 +413,8 @@ pub struct ProjectNode { pub ignore_unknown_instances: Option, /// Defines that this instance should come from the given file path. This - /// path can point to any file type supported by Rojo, including Lua files - /// (`.lua`), Roblox models (`.rbxm`, `.rbxmx`), and localization table + /// path can point to any file type supported by Rojo, including Luau files + /// (`.luau`), Roblox models (`.rbxm`, `.rbxmx`), and localization table /// spreadsheets (`.csv`). #[serde(rename = "$path", skip_serializing_if = "Option::is_none")] pub path: Option, @@ -569,16 +561,16 @@ mod test { "servePort": 34567, // Test glob parsing with comments "globIgnorePaths": [ - "**/*.spec.lua", // Ignore test files - "**/*.test.lua", + "**/*.spec.luau", // Ignore test files + "**/*.test.luau", ], "syncRules": [ { - "pattern": "*.data.json", + "pattern": "*.data.json5", "use": "json", // Trailing comma in object }, { - "pattern": "*.module.lua", + "pattern": "*.module.luau", "use": "moduleScript", }, // Trailing comma in array ], // Another trailing comma @@ -586,7 +578,7 @@ mod test { let project = Project::load_from_slice( project_json.as_bytes(), - PathBuf::from("/test/default.project.jsonc"), + PathBuf::from("/test/default.project.json5"), None, ) .expect("Failed to parse project with JSONC features"); @@ -597,12 +589,12 @@ mod test { // Verify glob_ignore_paths were parsed correctly assert_eq!(project.glob_ignore_paths.len(), 2); - assert!(project.glob_ignore_paths[0].is_match("test/foo.spec.lua")); - assert!(project.glob_ignore_paths[1].is_match("test/bar.test.lua")); + assert!(project.glob_ignore_paths[0].is_match("test/foo.spec.luau")); + assert!(project.glob_ignore_paths[1].is_match("test/bar.test.luau")); // Verify sync_rules were parsed correctly assert_eq!(project.sync_rules.len(), 2); - assert!(project.sync_rules[0].include.is_match("data.data.json")); - assert!(project.sync_rules[1].include.is_match("init.module.lua")); + assert!(project.sync_rules[0].include.is_match("data.data.json5")); + assert!(project.sync_rules[1].include.is_match("init.module.luau")); } } diff --git a/src/serve_session.rs b/src/serve_session.rs index 143187ec..f44ab762 100644 --- a/src/serve_session.rs +++ b/src/serve_session.rs @@ -53,9 +53,9 @@ pub struct ServeSession { /// The root project for the serve session. /// - /// This will be defined if a folder with a `default.project.json` file was + /// This will be defined if a folder with a `default.project.json5` file was /// used for starting the serve session, or if the user specified a full - /// path to a `.project.json` file. + /// path to a `.project.json5` file. root_project: Project, /// A randomly generated ID for this serve session. It's used to ensure that diff --git a/src/snapshot/metadata.rs b/src/snapshot/metadata.rs index 9214fdb7..eb82f8a5 100644 --- a/src/snapshot/metadata.rs +++ b/src/snapshot/metadata.rs @@ -30,9 +30,9 @@ pub struct InstanceMetadata { /// even if they don't exist, since the presence of a file can change the /// outcome of a snapshot function. /// - /// For example, a file named foo.lua might have these relevant paths: - /// - foo.lua - /// - foo.meta.json (even if this file doesn't exist!) + /// For example, a file named foo.luau might have these relevant paths: + /// - foo.luau + /// - foo.meta.json5 (even if this file doesn't exist!) /// /// A directory named bar/ might have these: /// - bar/ diff --git a/src/snapshot_middleware/csv.rs b/src/snapshot_middleware/csv.rs index c98a4a7c..95b9b15a 100644 --- a/src/snapshot_middleware/csv.rs +++ b/src/snapshot_middleware/csv.rs @@ -345,7 +345,7 @@ Ack,Ack!,,An exclamation of despair,¡Ay!"#, ) .unwrap(); imfs.load_snapshot( - "/foo.meta.json", + "/foo.meta.json5", VfsSnapshot::file(r#"{ "ignoreUnknownInstances": true }"#), ) .unwrap(); @@ -411,7 +411,7 @@ Ack,Ack!,,An exclamation of despair,¡Ay!"#, ), ), ( - "init.meta.json", + "init.meta.json5", VfsSnapshot::file(r#"{"id": "manually specified"}"#), ), ]), diff --git a/src/snapshot_middleware/json.rs b/src/snapshot_middleware/json.rs index 1a9537ad..1f38c681 100644 --- a/src/snapshot_middleware/json.rs +++ b/src/snapshot_middleware/json.rs @@ -122,7 +122,7 @@ mod test { ) .unwrap(); imfs.load_snapshot( - "/foo.meta.json", + "/foo.meta.json5", VfsSnapshot::file( r#"{ "id": "manually specified" diff --git a/src/snapshot_middleware/lua.rs b/src/snapshot_middleware/lua.rs index 849d0dc3..8a6292e7 100644 --- a/src/snapshot_middleware/lua.rs +++ b/src/snapshot_middleware/lua.rs @@ -238,7 +238,7 @@ mod test { #[test] fn module_from_vfs() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.luau", VfsSnapshot::file("Hello there!")) .unwrap(); let vfs = Vfs::new(imfs); @@ -246,7 +246,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.lua"), + Path::new("/foo.luau"), "foo", ScriptType::Module, ) @@ -261,7 +261,7 @@ mod test { #[test] fn plugin_from_vfs() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.plugin.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.plugin.luau", VfsSnapshot::file("Hello there!")) .unwrap(); let vfs = Vfs::new(imfs); @@ -269,7 +269,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.plugin.lua"), + Path::new("/foo.plugin.luau"), "foo", ScriptType::Plugin, ) @@ -284,7 +284,7 @@ mod test { #[test] fn server_from_vfs() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.server.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.server.luau", VfsSnapshot::file("Hello there!")) .unwrap(); let vfs = Vfs::new(imfs); @@ -292,7 +292,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.server.lua"), + Path::new("/foo.server.luau"), "foo", ScriptType::Server, ) @@ -307,7 +307,7 @@ mod test { #[test] fn client_from_vfs() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.client.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.client.luau", VfsSnapshot::file("Hello there!")) .unwrap(); let vfs = Vfs::new(imfs); @@ -315,7 +315,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.client.lua"), + Path::new("/foo.client.luau"), "foo", ScriptType::Client, ) @@ -330,7 +330,7 @@ mod test { #[test] fn local_from_vfs() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.local.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.local.luau", VfsSnapshot::file("Hello there!")) .unwrap(); let vfs = Vfs::new(imfs); @@ -338,7 +338,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.local.lua"), + Path::new("/foo.local.luau"), "foo", ScriptType::Local, ) @@ -353,7 +353,7 @@ mod test { #[test] fn legacy_from_vfs() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.legacy.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.legacy.luau", VfsSnapshot::file("Hello there!")) .unwrap(); let vfs = Vfs::new(imfs); @@ -361,7 +361,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.legacy.lua"), + Path::new("/foo.legacy.luau"), "foo", ScriptType::Legacy, ) @@ -378,7 +378,7 @@ mod test { let mut imfs = InMemoryFs::new(); imfs.load_snapshot( "/root", - VfsSnapshot::dir([("init.lua", VfsSnapshot::file("Hello!"))]), + VfsSnapshot::dir([("init.luau", VfsSnapshot::file("Hello!"))]), ) .unwrap(); @@ -387,7 +387,7 @@ mod test { let instance_snapshot = snapshot_lua_init( &InstanceContext::new(), &vfs, - Path::new("/root/init.lua"), + Path::new("/root/init.luau"), "root", ScriptType::Module, ) @@ -405,9 +405,9 @@ mod test { imfs.load_snapshot( "/root", VfsSnapshot::dir([ - ("init.lua", VfsSnapshot::file("Hello!")), + ("init.luau", VfsSnapshot::file("Hello!")), ( - "init.meta.json", + "init.meta.json5", VfsSnapshot::file(r#"{"id": "manually specified"}"#), ), ]), @@ -419,7 +419,7 @@ mod test { let instance_snapshot = snapshot_lua_init( &InstanceContext::new(), &vfs, - Path::new("/root/init.lua"), + Path::new("/root/init.luau"), "root", ScriptType::Module, ) @@ -434,10 +434,10 @@ mod test { #[test] fn module_with_meta() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.luau", VfsSnapshot::file("Hello there!")) .unwrap(); imfs.load_snapshot( - "/foo.meta.json", + "/foo.meta.json5", VfsSnapshot::file( r#" { @@ -453,7 +453,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.lua"), + Path::new("/foo.luau"), "foo", ScriptType::Module, ) @@ -468,10 +468,10 @@ mod test { #[test] fn server_with_meta() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/foo.server.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/foo.server.luau", VfsSnapshot::file("Hello there!")) .unwrap(); imfs.load_snapshot( - "/foo.meta.json", + "/foo.meta.json5", VfsSnapshot::file( r#" { @@ -487,7 +487,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/foo.server.lua"), + Path::new("/foo.server.luau"), "foo", ScriptType::Server, ) @@ -502,10 +502,10 @@ mod test { #[test] fn server_disabled() { let mut imfs = InMemoryFs::new(); - imfs.load_snapshot("/bar.server.lua", VfsSnapshot::file("Hello there!")) + imfs.load_snapshot("/bar.server.luau", VfsSnapshot::file("Hello there!")) .unwrap(); imfs.load_snapshot( - "/bar.meta.json", + "/bar.meta.json5", VfsSnapshot::file( r#" { @@ -523,7 +523,7 @@ mod test { let instance_snapshot = snapshot_lua( &InstanceContext::new(), &vfs, - Path::new("/bar.server.lua"), + Path::new("/bar.server.luau"), "bar", ScriptType::Server, ) diff --git a/src/snapshot_middleware/meta_file.rs b/src/snapshot_middleware/meta_file.rs index e81212e0..b60dbf9a 100644 --- a/src/snapshot_middleware/meta_file.rs +++ b/src/snapshot_middleware/meta_file.rs @@ -16,8 +16,8 @@ use crate::{ /// Represents metadata in a sibling file with the same basename. /// -/// As an example, hello.meta.json next to hello.lua would allow assigning -/// additional metadata to the instance resulting from hello.lua. +/// As an example, hello.meta.json5 next to hello.luau would allow assigning +/// additional metadata to the instance resulting from hello.luau. #[derive(Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct AdjacentMetadata { @@ -64,29 +64,15 @@ impl AdjacentMetadata { .or_else(|| file_stem.strip_suffix(".local")) .or_else(|| file_stem.strip_suffix(".legacy")) .unwrap_or(file_stem); - let meta_path_json = path.with_file_name(format!("{base_name}.meta.json")); - let meta_path_jsonc = path.with_file_name(format!("{base_name}.meta.jsonc")); - let meta_path_json5 = path.with_file_name(format!("{base_name}.meta.json5")); + let meta_path = path.with_file_name(format!("{base_name}.meta.json5")); - if let Some(meta_contents) = vfs.read(&meta_path_json).with_not_found()? { - let mut metadata = Self::from_slice(&meta_contents, meta_path_json.clone())?; - metadata.apply_all(snapshot)?; - } - - if let Some(meta_contents) = vfs.read(&meta_path_jsonc).with_not_found()? { - let mut metadata = Self::from_slice(&meta_contents, meta_path_jsonc.clone())?; - metadata.apply_all(snapshot)?; - } - - if let Some(meta_contents) = vfs.read(&meta_path_json5).with_not_found()? { - let mut metadata = Self::from_slice(&meta_contents, meta_path_json5.clone())?; + if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? { + let mut metadata = Self::from_slice(&meta_contents, meta_path.clone())?; metadata.apply_all(snapshot)?; } // Rather than pushing these in the snapshot middleware, we can just do it here. - snapshot.metadata.relevant_paths.push(meta_path_json); - snapshot.metadata.relevant_paths.push(meta_path_jsonc); - snapshot.metadata.relevant_paths.push(meta_path_json5); + snapshot.metadata.relevant_paths.push(meta_path); Ok(()) } @@ -94,7 +80,7 @@ impl AdjacentMetadata { fn from_slice(slice: &[u8], path: PathBuf) -> anyhow::Result { let mut meta: Self = json::from_slice_with_context(slice, || { format!( - "File contained malformed .meta.json data: {}", + "File contained malformed .meta.json5 data: {}", path.display() ) })?; @@ -259,7 +245,7 @@ impl AdjacentMetadata { /// Represents metadata that affects the instance resulting from the containing /// folder. /// -/// This is always sourced from a file named init.meta.json. +/// This is always sourced from a file named init.meta.json5. #[derive(Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct DirectoryMetadata { @@ -286,7 +272,7 @@ pub struct DirectoryMetadata { } impl DirectoryMetadata { - /// Attempts to read an `init.meta`` file for the provided path, and if + /// Attempts to read an `init.meta.json5` file for the provided path, and if /// one exists applies it. /// /// Also inserts the potential metadata paths into the snapshot's relevant @@ -296,29 +282,15 @@ impl DirectoryMetadata { path: &Path, snapshot: &mut InstanceSnapshot, ) -> anyhow::Result<()> { - let meta_path_json = path.join("init.meta.json"); - let meta_path_jsonc = path.join("init.meta.jsonc"); - let meta_path_json5 = path.join("init.meta.json5"); + let meta_path = path.join("init.meta.json5"); - if let Some(meta_contents) = vfs.read(&meta_path_json).with_not_found()? { - let mut metadata = Self::from_slice(&meta_contents, meta_path_json.clone())?; - metadata.apply_all(snapshot)?; - } - - if let Some(meta_contents) = vfs.read(&meta_path_jsonc).with_not_found()? { - let mut metadata = Self::from_slice(&meta_contents, meta_path_jsonc.clone())?; - metadata.apply_all(snapshot)?; - } - - if let Some(meta_contents) = vfs.read(&meta_path_json5).with_not_found()? { - let mut metadata = Self::from_slice(&meta_contents, meta_path_json5.clone())?; + if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? { + let mut metadata = Self::from_slice(&meta_contents, meta_path.clone())?; metadata.apply_all(snapshot)?; } // Rather than pushing these in the snapshot middleware, we can just do it here. - snapshot.metadata.relevant_paths.push(meta_path_json); - snapshot.metadata.relevant_paths.push(meta_path_jsonc); - snapshot.metadata.relevant_paths.push(meta_path_json5); + snapshot.metadata.relevant_paths.push(meta_path); Ok(()) } @@ -326,7 +298,7 @@ impl DirectoryMetadata { fn from_slice(slice: &[u8], path: PathBuf) -> anyhow::Result { let mut meta: Self = json::from_slice_with_context(slice, || { format!( - "File contained malformed init.meta.json data: {}", + "File contained malformed init.meta.json5 data: {}", path.display() ) })?; @@ -428,7 +400,7 @@ impl DirectoryMetadata { if snapshot.class_name != "Folder" { // TODO: Turn into error type return Err(format_err!( - "className in init.meta.json can only be specified if the \ + "className in init.meta.json5 can only be specified if the \ affected directory would turn into a Folder instance." )); } @@ -510,32 +482,26 @@ impl DirectoryMetadata { } /// Retrieves the meta file that should be applied for the provided directory, -/// if it exists. Checks for .json5, .jsonc, and .json in that order. +/// if it exists. pub fn dir_meta(vfs: &Vfs, path: &Path) -> anyhow::Result> { - // Check json5 first (preferred), then jsonc, then json - for ext in ["init.meta.json5", "init.meta.jsonc", "init.meta.json"] { - let meta_path = path.join(ext); - if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? { - let metadata = DirectoryMetadata::from_slice(&meta_contents, meta_path)?; - return Ok(Some(metadata)); - } + let meta_path = path.join("init.meta.json5"); + if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? { + let metadata = DirectoryMetadata::from_slice(&meta_contents, meta_path)?; + return Ok(Some(metadata)); } Ok(None) } /// Retrieves the meta file that should be applied for the provided file, -/// if it exists. Checks for .json5, .jsonc, and .json in that order. +/// 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> { - // Check json5 first (preferred), then jsonc, then json - for ext in ["meta.json5", "meta.jsonc", "meta.json"] { - let mut meta_path = path.with_file_name(name); - meta_path.set_extension(ext); - if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? { - let metadata = AdjacentMetadata::from_slice(&meta_contents, meta_path)?; - return Ok(Some(metadata)); - } + let mut meta_path = path.with_file_name(name); + meta_path.set_extension("meta.json5"); + if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? { + let metadata = AdjacentMetadata::from_slice(&meta_contents, meta_path)?; + return Ok(Some(metadata)); } Ok(None) } @@ -547,10 +513,10 @@ mod test { use super::*; #[test] - fn adjacent_read_json() { + fn adjacent_read_json5() { let mut imfs = InMemoryFs::new(); imfs.load_snapshot( - "/foo/bar.meta.json", + "/foo/bar.meta.json5", VfsSnapshot::file(r#"{"id": "manually specified"}"#), ) .unwrap(); @@ -565,46 +531,10 @@ mod test { } #[test] - fn adjacent_read_jsonc() { + fn directory_read_json5() { let mut imfs = InMemoryFs::new(); imfs.load_snapshot( - "/foo/bar.meta.jsonc", - VfsSnapshot::file(r#"{"id": "manually specified"}"#), - ) - .unwrap(); - - let vfs = Vfs::new(imfs); - let path = Path::new("/foo/bar.rojo"); - let mut snapshot = InstanceSnapshot::new(); - - AdjacentMetadata::read_and_apply_all(&vfs, path, "bar", &mut snapshot).unwrap(); - - insta::assert_yaml_snapshot!(snapshot); - } - - #[test] - fn directory_read_json() { - let mut imfs = InMemoryFs::new(); - imfs.load_snapshot( - "/foo/init.meta.json", - VfsSnapshot::file(r#"{"id": "manually specified"}"#), - ) - .unwrap(); - - let vfs = Vfs::new(imfs); - let path = Path::new("/foo/"); - let mut snapshot = InstanceSnapshot::new(); - - DirectoryMetadata::read_and_apply_all(&vfs, path, &mut snapshot).unwrap(); - - insta::assert_yaml_snapshot!(snapshot); - } - - #[test] - fn directory_read_jsonc() { - let mut imfs = InMemoryFs::new(); - imfs.load_snapshot( - "/foo/init.meta.jsonc", + "/foo/init.meta.json5", VfsSnapshot::file(r#"{"id": "manually specified"}"#), ) .unwrap(); diff --git a/src/snapshot_middleware/mod.rs b/src/snapshot_middleware/mod.rs index 0dc7984c..3208bb05 100644 --- a/src/snapshot_middleware/mod.rs +++ b/src/snapshot_middleware/mod.rs @@ -81,7 +81,7 @@ pub fn snapshot_from_vfs( // TODO: Support user defined init paths // If and when we do, make sure to go support it in // `Project::set_file_name`, as right now it special-cases - // `default.project.json` as an `init` path. + // `default.project.json5` as an `init` path. match middleware { Middleware::Dir => middleware.snapshot(context, vfs, path, &decoded_name), _ => middleware.snapshot(context, vfs, &init_path, &decoded_name), @@ -94,9 +94,8 @@ pub fn snapshot_from_vfs( // TODO: Is this even necessary anymore? match file_name { - "init.server.luau" | "init.server.lua" | "init.client.luau" | "init.client.lua" - | "init.local.luau" | "init.local.lua" | "init.legacy.luau" | "init.legacy.lua" - | "init.luau" | "init.lua" | "init.csv" => return Ok(None), + "init.server.luau" | "init.client.luau" | "init.local.luau" | "init.legacy.luau" + | "init.luau" | "init.csv" => return Ok(None), _ => {} } @@ -124,15 +123,10 @@ fn get_dir_middleware<'path>( let order = INIT_PATHS.get_or_init(|| { vec![ (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::LocalScriptDir, "init.local.luau"), - (Middleware::LocalScriptDir, "init.local.lua"), (Middleware::LegacyScriptDir, "init.legacy.luau"), - (Middleware::LegacyScriptDir, "init.legacy.lua"), (Middleware::CsvDir, "init.csv"), ] }); @@ -333,10 +327,10 @@ 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. + /// set properties without needing a meta.json5 file. /// /// It does not cover middleware like `ServerScript` or `Csv` because they - /// need a meta.json file to set properties that aren't their designated + /// need a meta.json5 file to set properties that aren't their designated /// 'special' properties. #[inline] pub fn handles_own_properties(&self) -> bool { @@ -418,25 +412,14 @@ pub fn default_sync_rules() -> &'static [SyncRule] { DEFAULT_SYNC_RULES.get_or_init(|| { vec![ - sync_rule!("*.server.lua", ServerScript, ".server.lua"), sync_rule!("*.server.luau", ServerScript, ".server.luau"), - sync_rule!("*.client.lua", ClientScript, ".client.lua"), sync_rule!("*.client.luau", ClientScript, ".client.luau"), - sync_rule!("*.plugin.lua", PluginScript, ".plugin.lua"), sync_rule!("*.plugin.luau", PluginScript, ".plugin.luau"), - sync_rule!("*.legacy.lua", LegacyScript, ".legacy.lua"), sync_rule!("*.legacy.luau", LegacyScript, ".legacy.luau"), - sync_rule!("*.local.lua", LocalScript, ".local.lua"), sync_rule!("*.local.luau", LocalScript, ".local.luau"), - sync_rule!("*.{lua,luau}", ModuleScript), - sync_rule!("*.project.json", Project, ".project.json"), - sync_rule!("*.project.jsonc", Project, ".project.jsonc"), + sync_rule!("*.luau", ModuleScript), sync_rule!("*.project.json5", Project, ".project.json5"), - sync_rule!("*.model.json", JsonModel, ".model.json"), - sync_rule!("*.model.jsonc", JsonModel, ".model.jsonc"), sync_rule!("*.model.json5", JsonModel, ".model.json5"), - sync_rule!("*.json", Json, ".json", "*.meta.json"), - sync_rule!("*.jsonc", Json, ".jsonc", "*.meta.jsonc"), sync_rule!("*.json5", Json, ".json5", "*.meta.json5"), sync_rule!("*.toml", Toml), sync_rule!("*.csv", Csv), diff --git a/src/snapshot_middleware/project.rs b/src/snapshot_middleware/project.rs index 82d9185b..6d6504b1 100644 --- a/src/snapshot_middleware/project.rs +++ b/src/snapshot_middleware/project.rs @@ -692,7 +692,7 @@ mod test { imfs.load_snapshot( "/foo", VfsSnapshot::dir([( - "default.project.json", + "default.project.json5", VfsSnapshot::file( r#" { @@ -729,7 +729,7 @@ mod test { imfs.load_snapshot( "/foo", VfsSnapshot::dir([( - "hello.project.json", + "hello.project.json5", VfsSnapshot::file( r#" { @@ -749,7 +749,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo/hello.project.json"), + Path::new("/foo/hello.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -764,7 +764,7 @@ mod test { let mut imfs = InMemoryFs::new(); imfs.load_snapshot( - "/foo.project.json", + "/foo.project.json5", VfsSnapshot::file( r#" { @@ -788,7 +788,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo.project.json"), + Path::new("/foo.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -803,7 +803,7 @@ mod test { let mut imfs = InMemoryFs::new(); imfs.load_snapshot( - "/foo.project.json", + "/foo.project.json5", VfsSnapshot::file( r#" { @@ -825,7 +825,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo.project.json"), + Path::new("/foo.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -840,7 +840,7 @@ mod test { let mut imfs = InMemoryFs::new(); imfs.load_snapshot( - "/foo.project.json", + "/foo.project.json5", VfsSnapshot::file( r#" { @@ -863,7 +863,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo.project.json"), + Path::new("/foo.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -881,7 +881,7 @@ mod test { "/foo", VfsSnapshot::dir([ ( - "default.project.json", + "default.project.json5", VfsSnapshot::file( r#" { @@ -903,7 +903,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo/default.project.json"), + Path::new("/foo/default.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -921,20 +921,20 @@ mod test { "/foo", VfsSnapshot::dir([ ( - "default.project.json", + "default.project.json5", VfsSnapshot::file( r#" { "name": "path-project", "tree": { - "$path": "other.project.json" + "$path": "other.project.json5" } } "#, ), ), ( - "other.project.json", + "other.project.json5", VfsSnapshot::file( r#" { @@ -955,7 +955,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo/default.project.json"), + Path::new("/foo/default.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -973,20 +973,20 @@ mod test { "/foo", VfsSnapshot::dir([ ( - "default.project.json", + "default.project.json5", VfsSnapshot::file( r#" { "name": "path-child-project", "tree": { - "$path": "other.project.json" + "$path": "other.project.json5" } } "#, ), ), ( - "other.project.json", + "other.project.json5", VfsSnapshot::file( r#" { @@ -1011,7 +1011,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo/default.project.json"), + Path::new("/foo/default.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -1032,13 +1032,13 @@ mod test { "/foo", VfsSnapshot::dir([ ( - "default.project.json", + "default.project.json5", VfsSnapshot::file( r#" { "name": "path-property-override", "tree": { - "$path": "other.project.json", + "$path": "other.project.json5", "$properties": { "Value": "Changed" } @@ -1048,7 +1048,7 @@ mod test { ), ), ( - "other.project.json", + "other.project.json5", VfsSnapshot::file( r#" { @@ -1072,7 +1072,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo/default.project.json"), + Path::new("/foo/default.project.json5"), "NOT_IN_SNAPSHOT", ) .expect("snapshot error") @@ -1089,7 +1089,7 @@ mod test { imfs.load_snapshot( "/foo", VfsSnapshot::dir([( - "default.project.json", + "default.project.json5", VfsSnapshot::file( r#" { @@ -1108,7 +1108,7 @@ mod test { let instance_snapshot = snapshot_project( &InstanceContext::default(), &vfs, - Path::new("/foo/default.project.json"), + Path::new("/foo/default.project.json5"), "no_name_project", ) .expect("snapshot error") 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 283d222e..49ba1e21 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 @@ -9,8 +9,6 @@ metadata: Path: /foo.csv relevant_paths: - /foo.csv - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init.snap index 12fcb651..6a15b7d3 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init.snap @@ -16,8 +16,6 @@ metadata: - /root/init.client.lua - /root/init.client.luau - /root/init.csv - - /root/init.meta.json - - /root/init.meta.jsonc - /root/init.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init_with_meta.snap index c8c71fcc..cc915ba1 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init_with_meta.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__csv__test__csv_init_with_meta.snap @@ -16,8 +16,6 @@ metadata: - /root/init.client.lua - /root/init.client.luau - /root/init.csv - - /root/init.meta.json - - /root/init.meta.jsonc - /root/init.meta.json5 context: decode_windows_invalid_chars: true 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 fccb39f4..ae282829 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 @@ -9,8 +9,6 @@ metadata: Path: /foo.csv relevant_paths: - /foo.csv - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true 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 d0fae6f5..563ee633 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 @@ -16,8 +16,6 @@ metadata: - /foo/init.client.lua - /foo/init.client.luau - /foo/init.csv - - /foo/init.meta.json - - /foo/init.meta.jsonc - /foo/init.meta.json5 context: decode_windows_invalid_chars: true 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 7d43c462..6b281281 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 @@ -16,8 +16,6 @@ metadata: - /foo/init.client.lua - /foo/init.client.luau - /foo/init.csv - - /foo/init.meta.json - - /foo/init.meta.jsonc - /foo/init.meta.json5 context: decode_windows_invalid_chars: true @@ -42,8 +40,6 @@ children: - /foo/Child/init.client.lua - /foo/Child/init.client.luau - /foo/Child/init.csv - - /foo/Child/init.meta.json - - /foo/Child/init.meta.jsonc - /foo/Child/init.meta.json5 context: decode_windows_invalid_chars: true 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 ec8f79ec..bedcfcce 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 @@ -9,8 +9,6 @@ metadata: Path: /foo.json relevant_paths: - /foo.json - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__with_metadata.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__with_metadata.snap index 50aa332e..2805fd71 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__with_metadata.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json__test__with_metadata.snap @@ -9,8 +9,6 @@ metadata: Path: /foo.json relevant_paths: - /foo.json - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap index f00ca340..60e211ad 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__client_from_vfs.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo.client.lua + Path: /foo.client.luau relevant_paths: - - /foo.client.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.client.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs.snap index 48b9c2b6..b66511f7 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs.snap @@ -6,7 +6,7 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /root/init.lua + Path: /root/init.luau relevant_paths: - /root - /root/init.lua @@ -16,8 +16,6 @@ metadata: - /root/init.client.lua - /root/init.client.luau - /root/init.csv - - /root/init.meta.json - - /root/init.meta.jsonc - /root/init.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs_with_meta.snap index a08bc42a..1d3f1ded 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs_with_meta.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__init_module_from_vfs_with_meta.snap @@ -6,7 +6,7 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /root/init.lua + Path: /root/init.luau relevant_paths: - /root - /root/init.lua @@ -16,8 +16,6 @@ metadata: - /root/init.client.lua - /root/init.client.luau - /root/init.csv - - /root/init.meta.json - - /root/init.meta.jsonc - /root/init.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__legacy_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__legacy_from_vfs.snap index f6cd0dcc..0c98cf63 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__legacy_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__legacy_from_vfs.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo.legacy.lua + Path: /foo.legacy.luau relevant_paths: - - /foo.legacy.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.legacy.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__local_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__local_from_vfs.snap index 1744921b..ab97b74c 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__local_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__local_from_vfs.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo.local.lua + Path: /foo.local.luau relevant_paths: - - /foo.local.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.local.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap index 9cce5a73..a9312d8a 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_from_vfs.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo.lua + Path: /foo.luau relevant_paths: - - /foo.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap index 081fdba5..3f40a281 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__module_with_meta.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo.lua + Path: /foo.luau relevant_paths: - - /foo.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__plugin_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__plugin_from_vfs.snap index 4f54e477..5f3414cc 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__plugin_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__plugin_from_vfs.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo.plugin.lua + Path: /foo.plugin.luau relevant_paths: - - /foo.plugin.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.plugin.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_disabled.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_disabled.snap index 075c0f92..585120e6 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_disabled.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_disabled.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /bar.server.lua + Path: /bar.server.luau relevant_paths: - - /bar.server.lua - - /bar.meta.json - - /bar.meta.jsonc + - /bar.server.luau - /bar.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap index 20f64505..6c272e47 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_from_vfs.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo.server.lua + Path: /foo.server.luau relevant_paths: - - /foo.server.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.server.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_with_meta.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_with_meta.snap index 702e47da..90a0788b 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_with_meta.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__lua__test__server_with_meta.snap @@ -6,11 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo.server.lua + Path: /foo.server.luau relevant_paths: - - /foo.server.lua - - /foo.meta.json - - /foo.meta.jsonc + - /foo.server.luau - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__meta_file__test__adjacent_read_json5.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__meta_file__test__adjacent_read_json5.snap new file mode 100644 index 00000000..107603bd --- /dev/null +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__meta_file__test__adjacent_read_json5.snap @@ -0,0 +1,18 @@ +--- +source: src/snapshot_middleware/meta_file.rs +expression: snapshot +--- +snapshot_id: "00000000000000000000000000000000" +metadata: + ignore_unknown_instances: false + relevant_paths: + - /foo/bar.meta.json5 + context: + decode_windows_invalid_chars: true + specified_id: manually specified + middleware: ~ + schema: ~ +name: DEFAULT +class_name: DEFAULT +properties: {} +children: [] diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__meta_file__test__directory_read_json5.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__meta_file__test__directory_read_json5.snap new file mode 100644 index 00000000..1f5d141b --- /dev/null +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__meta_file__test__directory_read_json5.snap @@ -0,0 +1,18 @@ +--- +source: src/snapshot_middleware/meta_file.rs +expression: snapshot +--- +snapshot_id: "00000000000000000000000000000000" +metadata: + ignore_unknown_instances: false + relevant_paths: + - /foo/init.meta.json5 + context: + decode_windows_invalid_chars: true + specified_id: manually specified + middleware: ~ + schema: ~ +name: DEFAULT +class_name: DEFAULT +properties: {} +children: [] diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__no_name_project.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__no_name_project.snap index 576ed53d..151f7990 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__no_name_project.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__project__test__no_name_project.snap @@ -6,9 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo/default.project.json + Path: /foo/default.project.json5 relevant_paths: - - /foo/default.project.json + - /foo/default.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 0abd172a..ce488a4c 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 @@ -6,9 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo/hello.project.json + Path: /foo/hello.project.json5 relevant_paths: - - /foo/hello.project.json + - /foo/hello.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 0cefd978..124e588a 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 @@ -6,10 +6,10 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo/default.project.json + Path: /foo/default.project.json5 relevant_paths: - - /foo/other.project.json - - /foo/default.project.json + - /foo/other.project.json5 + - /foo/default.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 a999b54c..6250d397 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 @@ -6,9 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo.project.json + Path: /foo.project.json5 relevant_paths: - - /foo.project.json + - /foo.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ @@ -23,7 +23,7 @@ children: ignore_unknown_instances: true instigating_source: ProjectNode: - path: /foo.project.json + path: /foo.project.json5 name: Child node: $className: 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 ed1b8b73..e2be0084 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 @@ -6,10 +6,10 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo/default.project.json + Path: /foo/default.project.json5 relevant_paths: - - /foo/other.project.json - - /foo/default.project.json + - /foo/other.project.json5 + - /foo/default.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 9d4a6a30..5f24e8ef 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 @@ -6,10 +6,10 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo/default.project.json + Path: /foo/default.project.json5 relevant_paths: - - /foo/other.project.json - - /foo/default.project.json + - /foo/other.project.json5 + - /foo/default.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ @@ -24,7 +24,7 @@ children: ignore_unknown_instances: true instigating_source: ProjectNode: - path: /foo/other.project.json + path: /foo/other.project.json5 name: SomeChild node: $className: 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 0c4403af..eb10ca84 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 @@ -6,13 +6,11 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: false instigating_source: - Path: /foo/default.project.json + Path: /foo/default.project.json5 relevant_paths: - /foo/other.txt - - /foo/other.meta.json - - /foo/other.meta.jsonc - /foo/other.meta.json5 - - /foo/default.project.json + - /foo/default.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 588c5560..c9615222 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 @@ -6,9 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo.project.json + Path: /foo.project.json5 relevant_paths: - - /foo.project.json + - /foo.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 c90a2906..d3506cd6 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 @@ -6,9 +6,9 @@ snapshot_id: "00000000000000000000000000000000" metadata: ignore_unknown_instances: true instigating_source: - Path: /foo.project.json + Path: /foo.project.json5 relevant_paths: - - /foo.project.json + - /foo.project.json5 context: decode_windows_invalid_chars: true specified_id: ~ 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 6cd888d4..979aba72 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 @@ -9,8 +9,6 @@ metadata: Path: /foo.toml relevant_paths: - /foo.toml - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__with_metadata.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__with_metadata.snap index ffd1ebea..6bd178df 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__with_metadata.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__toml__test__with_metadata.snap @@ -9,8 +9,6 @@ metadata: Path: foo.toml relevant_paths: - foo.toml - - foo.meta.json - - foo.meta.jsonc - foo.meta.json5 context: decode_windows_invalid_chars: true 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 1a96f8c8..40bb1f5f 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 @@ -9,8 +9,6 @@ metadata: Path: /foo.txt relevant_paths: - /foo.txt - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__with_metadata.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__with_metadata.snap index a462fa94..a732b1f5 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__with_metadata.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__txt__test__with_metadata.snap @@ -9,8 +9,6 @@ metadata: Path: /foo.txt relevant_paths: - /foo.txt - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__instance_from_vfs.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__instance_from_vfs.snap index 53f642f6..3ae974c1 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__instance_from_vfs.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__instance_from_vfs.snap @@ -9,8 +9,6 @@ metadata: Path: /foo.yaml relevant_paths: - /foo.yaml - - /foo.meta.json - - /foo.meta.jsonc - /foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__with_metadata.snap b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__with_metadata.snap index 5d6f6bd0..4d87863b 100644 --- a/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__with_metadata.snap +++ b/src/snapshot_middleware/snapshots/librojo__snapshot_middleware__yaml__test__with_metadata.snap @@ -9,8 +9,6 @@ metadata: Path: foo.yaml relevant_paths: - foo.yaml - - foo.meta.json - - foo.meta.jsonc - foo.meta.json5 context: decode_windows_invalid_chars: true diff --git a/src/snapshot_middleware/toml.rs b/src/snapshot_middleware/toml.rs index 2b23164b..ab1ef412 100644 --- a/src/snapshot_middleware/toml.rs +++ b/src/snapshot_middleware/toml.rs @@ -130,7 +130,7 @@ mod test { ) .unwrap(); imfs.load_snapshot( - "foo.meta.json", + "foo.meta.json5", VfsSnapshot::file( r#"{ "id": "manually specified" diff --git a/src/snapshot_middleware/txt.rs b/src/snapshot_middleware/txt.rs index 4a14a49c..48216a0b 100644 --- a/src/snapshot_middleware/txt.rs +++ b/src/snapshot_middleware/txt.rs @@ -110,7 +110,7 @@ mod test { imfs.load_snapshot("/foo.txt", VfsSnapshot::file("Hello there!")) .unwrap(); imfs.load_snapshot( - "/foo.meta.json", + "/foo.meta.json5", VfsSnapshot::file( r#"{ "id": "manually specified" diff --git a/src/snapshot_middleware/yaml.rs b/src/snapshot_middleware/yaml.rs index 10f744bc..044993ae 100644 --- a/src/snapshot_middleware/yaml.rs +++ b/src/snapshot_middleware/yaml.rs @@ -240,7 +240,7 @@ value: 9007199254740993 ) .unwrap(); imfs.load_snapshot( - "foo.meta.json", + "foo.meta.json5", VfsSnapshot::file( r#"{ "id": "manually specified", diff --git a/src/web/api.rs b/src/web/api.rs index 80b8416f..da23f2fd 100644 --- a/src/web/api.rs +++ b/src/web/api.rs @@ -32,7 +32,7 @@ use crate::{ web_api::{InstanceUpdate, RefPatchResponse, SerializeResponse}, }; -/// Convert a Variant to a JSON-compatible value for .model.json files +/// Convert a Variant to a JSON-compatible value for .model.json5 files fn variant_to_json(variant: &Variant) -> Option { use serde_json::{json, Value}; @@ -1240,7 +1240,7 @@ impl ApiService { } } -/// If this instance is represented by a script, try to find the correct .lua or .luau +/// If this instance is represented by a script, try to find the correct .luau /// file to open to edit it. fn pick_script_path(instance: InstanceWithMeta<'_>) -> Option { match instance.class_name().as_str() { @@ -1248,16 +1248,15 @@ fn pick_script_path(instance: InstanceWithMeta<'_>) -> Option { _ => return None, } - // Pick the first listed relevant path that has an extension of .lua or .luau that + // Pick the first listed relevant path that has an extension of .luau that // exists. instance .metadata() .relevant_paths .iter() .find(|path| { - // We should only ever open Lua or Luau files to be safe. + // We should only ever open Luau files to be safe. match path.extension().and_then(|ext| ext.to_str()) { - Some("lua") => {} Some("luau") => {} _ => return false, } @@ -1708,7 +1707,7 @@ mod tests { let file_name = match class_name { "ModuleScript" => format!("{}.luau", name), "LocalScript" => format!("{}.local.luau", name), - _ => format!("{}.model.json", name), + _ => format!("{}.model.json5", name), }; assert_eq!( file_name, expected, @@ -1720,7 +1719,7 @@ mod tests { #[test] fn test_folder_creates_directory() { - // Folders should not create .model.json files + // Folders should not create .model.json5 files let class_name = "Folder"; let should_create_file = class_name != "Folder"; assert!( @@ -1791,7 +1790,7 @@ mod tests { } } - // Tests for model.json structure + // Tests for model.json5 structure mod model_json_structure_tests { use serde_json::json;