memofs: Add description

* vroom

* Port dir middleware

* Filter rules

* Directory metadata

* Project support

* Enable Lua support

* StringValue support

* CSV

* rbxm, rbxmx, and rbxlx

* JSON models

* Clean up some warnings

* Strip out PathMap

* Unwatch paths when they're reported as removed

* Fix 'rojo upload' behavior

* Upgrade to Insta 0.13.1

* Update dependencies

* Release 0.6.0-alpha.2

* Fix bad merge

* Replace MemoryBackend with InMemoryFs

* Sledgehammer tests into passing for now

* Txt middleware

* Update easy snapshot tests

* Lua tests

* Project middleware tests

* Try to fix test failures by sorting

* Port first set of serve session tests

* Add InMemoryFs::raise_event

* Finish porting serve session tests

* Remove UI code for introspecting VFS for now

* VFS docs

.cargo/config

@@ -0,0 +1,2 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]

.editorconfig

@@ -3,16 +3,24 @@ root = true
 [*]
 end_of_line = lf
 charset = utf-8
-insert_final_newline = false
 trim_trailing_whitespace = true
+insert_final_newline = false
 
 [*.{json,js,css}]
 indent_style = space
 indent_size = 2
 
-[*.{md,rs}]
+[*.md]
 indent_style = space
 indent_size = 4
 
+[*.{rs,toml}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+
+[*.snap]
+insert_final_newline = true
+
 [*.lua]
 indent_style = tab

.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        rust_version: [stable, "1.40.0"]
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Setup Rust toolchain
+      run: rustup default ${{ matrix.rust_version }}
+
+    - name: Build
+      run: cargo build --locked --verbose
+
+    - name: Run tests
+      run: cargo test --locked --verbose
+
+    - name: Rustfmt and Clippy
+      run: |
+        cargo fmt -- --check
+        cargo clippy
+      if: matrix.rust_version == 'stable'
+
+    - name: Build (All Features)
+      run: cargo build --locked --verbose --all-features
+
+    - name: Run tests (All Features)
+      run: cargo test --locked --verbose --all-features

.github/workflows/release.yml

@@ -0,0 +1,60 @@
+name: Release
+
+on:
+  push:
+    tags: ["*"]
+
+jobs:
+  windows:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Build release binary
+      run: cargo build --verbose --locked --release
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: rojo-win64
+        path: target/release/rojo.exe
+
+  macos:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Install Rust
+      run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+    - name: Build release binary
+      run: |
+        source $HOME/.cargo/env
+        cargo build --verbose --locked --release
+      env:
+        OPENSSL_STATIC: 1
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: rojo-macos
+        path: target/release/rojo
+
+  linux:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Build
+      run: cargo build --locked --verbose --release
+      env:
+        OPENSSL_STATIC: 1
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: rojo-linux
+        path: target/release/rojo

.gitignore

@@ -1,5 +1,18 @@
-/site
+# Rust output directory
 /target
-/scratch-project
-**/*.rs.bk
-/generate-docs.run
+
+# Headers for clibrojo
+/include
+
+# Roblox model and place files in the root, used for debugging
+/*.rbxm
+/*.rbxmx
+/*.rbxl
+/*.rbxlx
+
+# Roblox Studio holds 'lock' files on places
+*.rbxl.lock
+*.rbxlx.lock
+
+# Snapshot files from the 'insta' Rust crate
+**/*.snap.new

.gitmodules

@@ -1,18 +1,15 @@
 [submodule "plugin/modules/roact"]
 	path = plugin/modules/roact
 	url = https://github.com/Roblox/roact.git
-[submodule "plugin/modules/rodux"]
-	path = plugin/modules/rodux
-	url = https://github.com/Roblox/rodux.git
-[submodule "plugin/modules/roact-rodux"]
-	path = plugin/modules/roact-rodux
-	url = https://github.com/Roblox/roact-rodux.git
 [submodule "plugin/modules/testez"]
 	path = plugin/modules/testez
 	url = https://github.com/Roblox/testez.git
-[submodule "plugin/modules/lemur"]
-	path = plugin/modules/lemur
-	url = https://github.com/LPGhatguy/lemur.git
 [submodule "plugin/modules/promise"]
 	path = plugin/modules/promise
 	url = https://github.com/LPGhatguy/roblox-lua-promise.git
+[submodule "plugin/modules/t"]
+	path = plugin/modules/t
+	url = https://github.com/osyrisrblx/t.git
+[submodule "plugin/modules/rbx-dom"]
+	path = plugin/modules/rbx-dom
+	url = http://github.com/rojo-rbx/rbx-dom

.luacheckrc

@@ -13,12 +13,14 @@ stds.roblox = {
 
 		-- Types
 		"Vector2", "Vector3",
+		"Vector2int16", "Vector3int16",
 		"Color3",
 		"UDim", "UDim2",
 		"Rect",
 		"CFrame",
 		"Enum",
 		"Instance",
+		"DockWidgetPluginGuiInfo",
 	}
 }
 

.travis.yml

@@ -1,38 +0,0 @@
-matrix:
-  include:
-    - language: python
-      env:
-        - LUA="lua=5.1"
-
-      before_install:
-        - pip install hererocks
-        - hererocks lua_install -r^ --$LUA
-        - export PATH=$PATH:$PWD/lua_install/bin
-
-      install:
-        - luarocks install luafilesystem
-        - luarocks install busted
-        - luarocks install luacov
-        - luarocks install luacov-coveralls
-        - luarocks install luacheck
-
-      script:
-        - cd plugin
-        - luacheck src
-        - lua -lluacov spec.lua
-
-      after_success:
-        - cd plugin
-        - luacov-coveralls -e $TRAVIS_BUILD_DIR/lua_install
-
-    - language: rust
-      rust: stable
-
-      script:
-        - cargo test --verbose
-
-    - language: rust
-      rust: beta
-
-      script:
-        - cargo test --verbose

CHANGELOG.md

@@ -1,23 +1,167 @@
 # Rojo Changelog
 
-## [Unreleased]
+## Unreleased Changes for 0.6.x
+* Added `--watch` argument to `rojo build`. ([#284](https://github.com/rojo-rbx/rojo/pull/284))
+* Added dark theme support to plugin. ([#241](https://github.com/rojo-rbx/rojo/issues/241))
 
-## [0.5.0 Alpha 3](https://github.com/LPGhatguy/rojo/releases/tag/v0.5.0-alpha.3) (February 1, 2019)
-* Changed default project file name from `roblox-project.json` to `default.project.json` ([#120](https://github.com/LPGhatguy/rojo/pull/120))
+## [0.6.0 Alpha 2](https://github.com/rojo-rbx/rojo/releases/tag/v0.6.0-alpha.2) (March 6, 2020)
+* Fixed `rojo upload` command always uploading models.
+* Removed `--kind` parameter to `rojo upload`; Rojo now automatically uploads the correct kind of asset based on your project file.
+
+## [0.5.4](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.4) (February 26, 2020)
+This is a general maintenance release for the Rojo 0.5.x release series.
+
+* Updated reflection database and other dependencies.
+* First stable release with binaries for macOS and Linux.
+
+## [0.6.0 Alpha 1](https://github.com/rojo-rbx/rojo/releases/tag/v0.6.0-alpha.1) (January 22, 2020)
+
+### General
+* Added support for nested project files. ([#95](https://github.com/rojo-rbx/rojo/issues/95))
+* Added project file hot-reloading. ([#10](https://github.com/rojo-rbx/rojo/issues/10)])
+* Fixed Rojo dropping Ref properties ([#142](https://github.com/rojo-rbx/rojo/issues/142))
+    * This means that properties like `PrimaryPart` now work!
+* Improved live sync protocol to reduce round-trips and improve syncing consistency.
+* Improved support for binary model files and places.
+
+### Command Line
+* Added `--verbose`/`-v` flag, which can be specified multiple times to increase verbosity.
+* Added support for automatically finding Roblox Studio's auth cookie for `rojo upload` on Windows.
+* Added support for building, serving and uploading sources that aren't Rojo projects.
+* Improved feedback from `rojo serve`.
+* Removed support for legacy `roblox-project.json` projects, deprecated in an early Rojo 0.5.0 alpha.
+* Rojo no longer traverses directories upwards looking for project files.
+    * Though undocumented, Rojo 0.5.x will search for a project file contained in any ancestor folders. This feature was removed to better support other 0.6.x features.
+
+### Roblox Studio Plugin
+* Added "connecting" state to improve experience when live syncing.
+* Added "error" state to show errors in a place that isn't the output panel.
+* Improved diagnostics for when the Rojo plugin cannot create an instance.
+
+## [0.5.3](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.3) (October 15, 2019)
+* Fixed an issue where Rojo would throw an error when encountering recently-added instance classes.
+
+## [0.5.2](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.2) (October 14, 2019)
+* Fixed an issue where `LocalizationTable` instances would have their column order randomized. ([#173](https://github.com/rojo-rbx/rojo/issues/173))
+
+## [0.5.1](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.1) (October 4, 2019)
+* Fixed an issue where Rojo would drop changes if they happened too quickly ([#252](https://github.com/rojo-rbx/rojo/issues/252))
+* Improved diagnostics for when the Rojo plugin cannot create an instance.
+* Updated dependencies
+    * This brings Rojo's reflection database from client release 395 to client release 404.
+
+## [0.5.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0) (August 27, 2019)
+* Changed `.model.json` naming, which may require projects to migrate ambiguous cases:
+    * The file name now takes precedence over the `Name` field in the model, like Rojo 0.4.x.
+    * The `Name` field of the top-level instance is now optional. It's recommended that you remove it from your models.
+    * Rojo will emit a warning when `Name` is specified and does not match the name from the file.
+* Fixed `Rect` values being set to `0, 0, 0, 0` when synced with the Rojo plugin. ([#201](https://github.com/rojo-rbx/rojo/issues/201))
+* Fixed live-syncing of `PhysicalProperties`, `NumberSequence`, and `ColorSequence` values
+
+## [0.5.0 Alpha 13](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.13) (August 2, 2019)
+* Bumped minimum Rust version to 1.34.0.
+* Fixed default port documentation in `rojo serve --help` ([#219](https://github.com/rojo-rbx/rojo/issues/219))
+* Fixed BrickColor support by upgrading Roblox-related dependencies
+
+## [0.5.0 Alpha 12](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.12) (July 2, 2019)
+* Added `.meta.json` files
+    * `init.meta.json` files replace `init.model.json` files from Rojo 0.4.x ([#183](https://github.com/rojo-rbx/rojo/pull/183))
+    * Other `.meta.json` files allow attaching extra data to other files ([#189](https://github.com/rojo-rbx/rojo/pull/189))
+* Added support for infinite and NaN values in types like `Vector2` when building models and places.
+    * These types aren't supported for live-syncing yet due to limitations around JSON encoding.
+* Added support for using `SharedString` values when building XML models and places.
+* Added support for live-syncing `CollectionService` tags.
+* Added a warning when building binary place files, since they're still experimental and have bugs.
+* Added a warning when trying to use Rojo 0.5.x with a Rojo 0.4.x-only project.
+* Added a warning when a Rojo project contains keys that start with `$`, which are reserved names. ([#191](https://github.com/rojo-rbx/rojo/issues/191))
+* Rojo now throws an error if unknown keys are found most files.
+* Added an icon to the plugin's toolbar button
+* Changed the plugin to use a docking widget for all UI.
+* Changed the plugin to ignore unknown properties when live-syncing.
+    * Rojo's approach to this problem might change later, like with a strict model mode ([#190](https://github.com/rojo-rbx/rojo/issues/190)) or another approach.
+* Upgraded to reflection database from client release 388.
+* Updated Rojo's branding to shift the color palette to make it work better on dark backgrounds
+
+## [0.5.0 Alpha 11](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.11) (May 29, 2019)
+* Added support for implicit property values in JSON model files ([#154](https://github.com/rojo-rbx/rojo/pull/154))
+* `Content` propertyes can now be specified in projects and model files as regular string literals.
+* Added support for `BrickColor` properties.
+* Added support for properties added in client release 384, like `Lighting.Technology` being set to `"ShadowMap"`.
+* Improved performance when working with XML models and places
+* Fixed serializing empty `Content` properties as XML
+* Fixed serializing infinite and NaN floating point properties in XML
+* Improved compatibility with XML models
+* Plugin should now be able to live-sync more properties, and ignore ones it can't, like `Lighting.Technology`.
+
+## 0.5.0 Alpha 10
+* This release was a dud due to [issue #176](https://github.com/rojo-rbx/rojo/issues/176) and was rolled back.
+
+## [0.5.0 Alpha 9](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.9) (April 4, 2019)
+* Changed `rojo build` to use buffered I/O, which can make it up to 2x faster in some cases.
+    * Building [*Road Not Taken*](https://github.com/rojo-rbx/roads) to an `rbxlx` file dropped from 150ms to 70ms on my machine
+* Fixed `LocalizationTable` instances being made from `csv` files incorrectly interpreting empty rows and columns. ([#149](https://github.com/rojo-rbx/rojo/pull/149))
+* Fixed CSV files with entries that parse as numbers causing Rojo to panic. ([#152](https://github.com/rojo-rbx/rojo/pull/152))
+* Improved error messages when malformed CSV files are found in a Rojo project.
+
+## [0.5.0 Alpha 8](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.8) (March 29, 2019)
+* Added support for a bunch of new types when dealing with XML model/place files:
+    * `ColorSequence`
+    * `Float64`
+    * `Int64`
+    * `NumberRange`
+    * `NumberSequence`
+    * `PhysicalProperties`
+    * `Ray`
+    * `Rect`
+    * `Ref`
+* Improved server instance ordering behavior when files are added during a live session ([#135](https://github.com/rojo-rbx/rojo/pull/135))
+* Fixed error being thrown when trying to unload the Rojo plugin.
+* Added partial fix for [issue #141](https://github.com/rojo-rbx/rojo/issues/141) for `Lighting.Technology`, which should restore live sync functionality for the default project file.
+
+## [0.5.0 Alpha 6](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.6) (March 19, 2019)
+* Fixed `rojo init` giving unexpected results by upgrading to `rbx_dom_weak` 1.1.0
+* Fixed live server not responding when the Rojo plugin is connected ([#133](https://github.com/rojo-rbx/rojo/issues/133))
+* Updated default place file:
+    * Improved default properties to be closer to Studio's built-in 'Baseplate' template
+    * Added a baseplate to the project file (Thanks, [@AmaranthineCodices](https://github.com/AmaranthineCodices/)!)
+* Added more type support to Rojo plugin
+* Fixed some cases where the Rojo plugin would leave around objects that it knows should be deleted
+* Updated plugin to correctly listen to `Plugin.Unloading` when installing or uninstalling new plugins
+
+## [0.5.0 Alpha 5](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.5) (March 1, 2019)
+* Upgraded core dependencies, which improves compatibility for lots of instance types
+    * Upgraded from `rbx_tree` 0.2.0 to `rbx_dom_weak` 1.0.0
+    * Upgraded from `rbx_xml` 0.2.0 to `rbx_xml` 0.4.0
+    * Upgraded from `rbx_binary` 0.2.0 to `rbx_binary` 0.4.0
+* Added support for non-primitive types in the Rojo plugin.
+    * Types like `Color3` and `CFrame` can now be updated live!
+* Fixed plugin assets flashing in on first load ([#121](https://github.com/rojo-rbx/rojo/issues/121))
+* Changed Rojo's HTTP server from Rouille to Hyper, which reduced the release size by around a megabyte.
+* Added property type inference to projects, which makes specifying services a lot easier ([#130](https://github.com/rojo-rbx/rojo/pull/130))
+* Made error messages from invalid and missing files more user-friendly
+
+## [0.5.0 Alpha 4](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.4) (February 8, 2019)
+* Added support for nested partitions ([#102](https://github.com/rojo-rbx/rojo/issues/102))
+* Added support for 'transmuting' partitions ([#112](https://github.com/rojo-rbx/rojo/issues/112))
+* Added support for aliasing filesystem paths ([#105](https://github.com/rojo-rbx/rojo/issues/105))
+* Changed Windows builds to statically link the CRT ([#89](https://github.com/rojo-rbx/rojo/issues/89))
+
+## [0.5.0 Alpha 3](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.3) (February 1, 2019)
+* Changed default project file name from `roblox-project.json` to `default.project.json` ([#120](https://github.com/rojo-rbx/rojo/pull/120))
     * The old file name will still be supported until 0.5.0 is fully released.
 * Added warning when loading project files that don't end in `.project.json`
     * This new extension enables Rojo to distinguish project files from random JSON files, which is necessary to support nested projects.
 * Added new (empty) diagnostic page served from the server
 * Added better error messages for when a file is missing that's referenced by a Rojo project
 * Added support for visualization endpoints returning GraphViz source when Dot is not available
-* Fixed an in-memory filesystem regression introduced recently ([#119](https://github.com/LPGhatguy/rojo/pull/119))
+* Fixed an in-memory filesystem regression introduced recently ([#119](https://github.com/rojo-rbx/rojo/pull/119))
 
-## [0.5.0 Alpha 2](https://github.com/LPGhatguy/rojo/releases/tag/v0.5.0-alpha.2) (January 28, 2019)
+## [0.5.0 Alpha 2](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.2) (January 28, 2019)
 * Added support for `.model.json` files, compatible with 0.4.x
 * Fixed in-memory filesystem not handling out-of-order filesystem change events
-* Fixed long-polling error caused by a promise mixup ([#110](https://github.com/LPGhatguy/rojo/issues/110))
+* Fixed long-polling error caused by a promise mixup ([#110](https://github.com/rojo-rbx/rojo/issues/110))
 
-## [0.5.0 Alpha 1](https://github.com/LPGhatguy/rojo/releases/tag/v0.5.0-alpha.1) (January 25, 2019)
+## [0.5.0 Alpha 1](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.1) (January 25, 2019)
 * Changed plugin UI to be way prettier
     * Thanks to [Reselim](https://github.com/Reselim) for the design!
 * Changed plugin error messages to be a little more useful
@@ -25,7 +169,7 @@
 * Fixed bug where bad server responses could cause the plugin to be in a bad state
 * Upgraded to rbx\_tree, rbx\_xml, and rbx\_binary 0.2.0, which dramatically expands the kinds of properties that Rojo can handle, especially in XML.
 
-## [0.5.0 Alpha 0](https://github.com/LPGhatguy/rojo/releases/tag/v0.5.0-alpha.0) (January 14, 2019)
+## [0.5.0 Alpha 0](https://github.com/rojo-rbx/rojo/releases/tag/v0.5.0-alpha.0) (January 14, 2019)
 * "Epiphany" rewrite, in progress since the beginning of time
 * New live sync protocol
     * Uses HTTP long polling to reduce request count and improve responsiveness
@@ -50,105 +194,105 @@
     * Multiple places can be specified, like when building a multi-place game
 * Added support for specifying properties on services in project files
 
-## [0.4.13](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.13) (November 12, 2018)
+## [0.4.13](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.13) (November 12, 2018)
 * When `rojo.json` points to a file or directory that does not exist, Rojo now issues a warning instead of throwing an error and exiting
 
-## [0.4.12](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.12) (June 21, 2018)
-* Fixed obscure assertion failure when renaming or deleting files ([#78](https://github.com/LPGhatguy/rojo/issues/78))
-* Added a `PluginAction` for the sync in command, which should help with some automation scripts ([#80](https://github.com/LPGhatguy/rojo/pull/80))
+## [0.4.12](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.12) (June 21, 2018)
+* Fixed obscure assertion failure when renaming or deleting files ([#78](https://github.com/rojo-rbx/rojo/issues/78))
+* Added a `PluginAction` for the sync in command, which should help with some automation scripts ([#80](https://github.com/rojo-rbx/rojo/pull/80))
 
-## [0.4.11](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.11) (June 10, 2018)
+## [0.4.11](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.11) (June 10, 2018)
 * Defensively insert existing instances into RouteMap; should fix most duplication cases when syncing into existing trees.
 * Fixed incorrect synchronization from `Plugin:_pull` that would cause polling to create issues
 * Fixed incorrect file routes being assigned to `init.lua` and `init.model.json` files
 * Untangled route handling-internals slightly
 
-## [0.4.10](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.10) (June 2, 2018)
-* Added support for `init.model.json` files, which enable versioning `Tool` instances (among other things) with Rojo. ([#66](https://github.com/LPGhatguy/rojo/issues/66))
+## [0.4.10](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.10) (June 2, 2018)
+* Added support for `init.model.json` files, which enable versioning `Tool` instances (among other things) with Rojo. ([#66](https://github.com/rojo-rbx/rojo/issues/66))
 * Fixed obscure error when syncing into an invalid service.
 * Fixed multiple sync processes occurring when a server ID mismatch is detected.
 
-## [0.4.9](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.9) (May 26, 2018)
-* Fixed warning when renaming or removing files that would sometimes corrupt the instance cache ([#72](https://github.com/LPGhatguy/rojo/pull/72))
+## [0.4.9](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.9) (May 26, 2018)
+* Fixed warning when renaming or removing files that would sometimes corrupt the instance cache ([#72](https://github.com/rojo-rbx/rojo/pull/72))
 * JSON models are no longer as strict -- `Children` and `Properties` are now optional.
 
-## [0.4.8](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.8) (May 26, 2018)
+## [0.4.8](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.8) (May 26, 2018)
 * Hotfix to prevent errors from being thrown when objects managed by Rojo are deleted
 
-## [0.4.7](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.7) (May 25, 2018)
-* Added icons to the Rojo plugin, made by [@Vorlias](https://github.com/Vorlias)! ([#70](https://github.com/LPGhatguy/rojo/pull/70))
-* Server will now issue a warning if no partitions are specified in `rojo serve` ([#40](https://github.com/LPGhatguy/rojo/issues/40))
+## [0.4.7](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.7) (May 25, 2018)
+* Added icons to the Rojo plugin, made by [@Vorlias](https://github.com/Vorlias)! ([#70](https://github.com/rojo-rbx/rojo/pull/70))
+* Server will now issue a warning if no partitions are specified in `rojo serve` ([#40](https://github.com/rojo-rbx/rojo/issues/40))
 
-## [0.4.6](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.6) (May 21, 2018)
-* Rojo handles being restarted by Roblox Studio more gracefully ([#67](https://github.com/LPGhatguy/rojo/issues/67))
+## [0.4.6](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.6) (May 21, 2018)
+* Rojo handles being restarted by Roblox Studio more gracefully ([#67](https://github.com/rojo-rbx/rojo/issues/67))
 * Folders should no longer get collapsed when syncing occurs.
 * **Significant** robustness improvements with regards to caching.
     * **This should catch all existing script duplication bugs.**
     * If there are any bugs with script duplication or caching in the future, restarting the Rojo server process will fix them for that session.
 * Fixed message in plugin not being prefixed with `Rojo: `.
 
-## [0.4.5](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.5) (May 1, 2018)
+## [0.4.5](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.5) (May 1, 2018)
 * Rojo messages are now prefixed with `Rojo: ` to make them stand out in the output more.
 * Fixed server to notice file changes *much* more quickly. (200ms vs 1000ms)
 * Server now lists name of project when starting up.
-* Rojo now throws an error if no project file is found. ([#63](https://github.com/LPGhatguy/rojo/issues/63))
-* Fixed multiple sync operations occuring at the same time. ([#61](https://github.com/LPGhatguy/rojo/issues/61))
-* Partitions targeting files directly now work as expected. ([#57](https://github.com/LPGhatguy/rojo/issues/57))
+* Rojo now throws an error if no project file is found. ([#63](https://github.com/rojo-rbx/rojo/issues/63))
+* Fixed multiple sync operations occuring at the same time. ([#61](https://github.com/rojo-rbx/rojo/issues/61))
+* Partitions targeting files directly now work as expected. ([#57](https://github.com/rojo-rbx/rojo/issues/57))
 
-## [0.4.4](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.4) (April 7, 2018)
+## [0.4.4](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.4) (April 7, 2018)
 * Fix small regression introduced in 0.4.3
 
-## [0.4.3](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.3) (April 7, 2018)
-* Plugin now automatically selects `HttpService` if it determines that HTTP isn't enabled ([#58](https://github.com/LPGhatguy/rojo/pull/58))
+## [0.4.3](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.3) (April 7, 2018)
+* Plugin now automatically selects `HttpService` if it determines that HTTP isn't enabled ([#58](https://github.com/rojo-rbx/rojo/pull/58))
 * Plugin now has much more robust handling and will wipe all state when the server changes.
     * This should fix issues that would otherwise be solved by restarting Roblox Studio.
 
-## [0.4.2](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.2) (April 4, 2018)
+## [0.4.2](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.2) (April 4, 2018)
 * Fixed final case of duplicated instance insertion, caused by reconciled instances not being inserted into `RouteMap`.
     * The reconciler is still not a perfect solution, especially if script instances get moved around without being destroyed. I don't think this can be fixed before a big refactor.
 
-## [0.4.1](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.1) (April 1, 2018)
+## [0.4.1](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.1) (April 1, 2018)
 * Merged plugin repository into main Rojo repository for easier tracking.
 * Improved `RouteMap` object tracking; this should fix some cases of duplicated instances being synced into the tree.
 
-## [0.4.0](https://github.com/LPGhatguy/rojo/releases/tag/v0.4.0) (March 27, 2018)
+## [0.4.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.4.0) (March 27, 2018)
 * Protocol version 1, which shifts more responsibility onto the server
     * This is a **major breaking** change!
     * The server now has a content of 'filter plugins', which transform data at various stages in the pipeline
     * The server now exposes Roblox instance objects instead of file contents, which lines up with how `rojo pack` will work, and paves the way for more robust syncing.
 * Added `*.model.json` files, which let you embed small Roblox objects into your Rojo tree.
-* Improved error messages in some cases ([#46](https://github.com/LPGhatguy/rojo/issues/46))
+* Improved error messages in some cases ([#46](https://github.com/rojo-rbx/rojo/issues/46))
 
-## [0.3.2](https://github.com/LPGhatguy/rojo/releases/tag/v0.3.2) (December 20, 2017)
+## [0.3.2](https://github.com/rojo-rbx/rojo/releases/tag/v0.3.2) (December 20, 2017)
 * Fixed `rojo serve` failing to correctly construct an absolute root path when passed as an argument
 * Fixed intense CPU usage when running `rojo serve`
 
-## [0.3.1](https://github.com/LPGhatguy/rojo/releases/tag/v0.3.1) (December 14, 2017)
+## [0.3.1](https://github.com/rojo-rbx/rojo/releases/tag/v0.3.1) (December 14, 2017)
 * Improved error reporting when invalid JSON is found in a `rojo.json` project
     * These messages are passed on from Serde
 
-## [0.3.0](https://github.com/LPGhatguy/rojo/releases/tag/v0.3.0) (December 12, 2017)
+## [0.3.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.3.0) (December 12, 2017)
 * Factored out the plugin into a separate repository
 * Fixed server when using a file as a partition
     * Previously, trailing slashes were put on the end of a partition even if the read request was an empty string. This broke file reading on Windows when a partition pointed to a file instead of a directory!
 * Started running automatic tests on Travis CI (#9)
 
-## [0.2.3](https://github.com/LPGhatguy/rojo/releases/tag/v0.2.3) (December 4, 2017)
+## [0.2.3](https://github.com/rojo-rbx/rojo/releases/tag/v0.2.3) (December 4, 2017)
 * Plugin only release
 * Tightened `init` file rules to only match script files
     * Previously, Rojo would sometimes pick up the wrong file when syncing
 
-## [0.2.2](https://github.com/LPGhatguy/rojo/releases/tag/v0.2.2) (December 1, 2017)
+## [0.2.2](https://github.com/rojo-rbx/rojo/releases/tag/v0.2.2) (December 1, 2017)
 * Plugin only release
 * Fixed broken reconciliation behavior with `init` files
 
-## [0.2.1](https://github.com/LPGhatguy/rojo/releases/tag/v0.2.1) (December 1, 2017)
+## [0.2.1](https://github.com/rojo-rbx/rojo/releases/tag/v0.2.1) (December 1, 2017)
 * Plugin only release
 * Changes default port to 8000
 
-## [0.2.0](https://github.com/LPGhatguy/rojo/releases/tag/v0.2.0) (December 1, 2017)
+## [0.2.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.2.0) (December 1, 2017)
 * Support for `init.lua` like rbxfs and rbxpacker
 * More robust syncing with a new reconciler
 
-## [0.1.0](https://github.com/LPGhatguy/rojo/releases/tag/v0.1.0) (November 29, 2017)
-* Initial release, functionally very similar to [rbxfs](https://github.com/LPGhatguy/rbxfs)
+## [0.1.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.1.0) (November 29, 2017)
+* Initial release, functionally very similar to [rbxfs](https://github.com/rojo-rbx/rbxfs)

CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# Contributing to the Rojo Project
+Rojo is a big project and can always use more help! This guide covers all repositories underneath the [rojo-rbx organization on GitHub](https://github.com/rojo-rbx).
+
+Some of the repositories covered are:
+
+* https://github.com/rojo-rbx/rojo
+* https://github.com/rojo-rbx/rbx-dom
+* https://github.com/rojo-rbx/vscode-rojo
+* https://github.com/rojo-rbx/rbxlx-to-rojo
+
+## Code
+Code contributions are welcome for features and bugs that have been reported in the project's bug tracker. We want to make sure that no one wastes their time, so be sure to talk with maintainers about what changes would be accepted before doing any work!
+
+You'll want these tools to work on Rojo:
+
+* Latest stable Rust compiler
+* Latest stable [Rojo](https://github.com/rojo-rbx/rojo)
+* Latest stable [Remodel](https://github.com/rojo-rbx/remodel)
+* Latest stable [run-in-roblox](https://github.com/rojo-rbx/run-in-roblox)
+
+## Documentation
+Documentation impacts way more people than the individual lines of code we write.
+
+If you find any problems in documentation, including typos, bad grammar, misleading phrasing, or missing content, feel free to file issues and pull requests to fix them.
+
+## Bug Reports and Feature Requests
+Most of the tools around Rojo try to be clear when an issue is a bug. Even if they aren't, sometimes things don't work quite right.
+
+Sometimes there's something that Rojo doesn't do that it probably should.
+
+Please file issues and we'll try to help figure out what the best way forward is.
+
+## Pushing a Rojo Release
+The Rojo release process is pretty manual right now. If you need to do it, here's how:
+
+1. Bump server version in [`server/Cargo.toml`](server/Cargo.toml)
+2. Bump plugin version in [`plugin/src/Config.lua`](plugin/src/Config.lua)
+3. Run `cargo test` to update `Cargo.lock` and double-check tests
+4. Update [`CHANGELOG.md`](CHANGELOG.md)
+5. Commit!
+    * `git add . && git commit -m "Release vX.Y.Z"`
+6. Tag the commit with the version from `Cargo.toml` prepended with a v, like `v0.4.13`
+7. Build Windows release build of CLI
+    * `cargo build --release`
+7. Publish the CLI
+    * `cargo publish`
+8. Build and upload the plugin
+    * `rojo build plugin -o Rojo.rbxm`
+    * Upload `Rojo.rbxm` to Roblox.com, keep it for later
+9. Push commits and tags
+    * `git push && git push --tags`
+10. Copy GitHub release content from previous release
+    * Update the leading text with a summary about the release
+    * Paste the changelog notes (as-is!) from [`CHANGELOG.md`](CHANGELOG.md)
+    * Write a small summary of each major feature

Cargo.toml

@@ -1,5 +1,100 @@
+[package]
+name = "rojo"
+version = "0.6.0-alpha.2"
+authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+description = "Enables professional-grade development tools for Roblox developers"
+license = "MPL-2.0"
+homepage = "https://rojo.space"
+documentation = "https://rojo.space/docs"
+repository = "https://github.com/rojo-rbx/rojo"
+readme = "README.md"
+edition = "2018"
+
+exclude = [
+    "/plugin/**",
+    "/test-projects/**",
+]
+
+[features]
+default = []
+
+# Turn on support for specifying glob ignore path rules in the project format.
+unstable_glob_ignore_paths = []
+
+# Turn on the server half of Rojo's unstable two-way sync feature.
+unstable_two_way_sync = []
+
+# Enable this feature to live-reload assets from the web UI.
+dev_live_assets = []
+
 [workspace]
 members = [
-	"server",
-	"rojo-e2e",
-]
+    "rojo-test",
+    "rojo-insta-ext",
+    "clibrojo",
+    "memofs",
+]
+
+default-members = [
+    ".",
+    "rojo-test",
+    "rojo-insta-ext",
+    "memofs",
+]
+
+[lib]
+name = "librojo"
+path = "src/lib.rs"
+
+[[bin]]
+name = "rojo"
+path = "src/bin.rs"
+
+[[bench]]
+name = "build"
+harness = false
+
+[dependencies]
+crossbeam-channel = "0.4.0"
+csv = "1.1.1"
+env_logger = "0.7.1"
+futures = "0.1.29"
+globset = "0.4.4"
+humantime = "1.3.0"
+hyper = "0.12.35"
+jod-thread = "0.1.0"
+lazy_static = "1.4.0"
+log = "0.4.8"
+maplit = "1.0.1"
+notify = "4.0.14"
+rbx_binary = "0.5.0"
+rbx_dom_weak = "1.10.1"
+rbx_reflection = "3.3.408"
+rbx_xml = "0.11.3"
+regex = "1.3.1"
+reqwest = "0.9.20"
+ritz = "0.1.0"
+rlua = "0.17.0"
+serde = { version = "1.0", features = ["derive", "rc"] }
+serde_json = "1.0"
+snafu = "0.6.0"
+structopt = "0.3.5"
+termcolor = "1.0.5"
+tokio = "0.1.22"
+uuid = { version = "0.8.1", features = ["v4", "serde"] }
+memofs = { path = "memofs" }
+
+[target.'cfg(windows)'.dependencies]
+winreg = "0.6.2"
+
+[dev-dependencies]
+rojo-insta-ext = { path = "rojo-insta-ext" }
+
+criterion = "0.3"
+insta = { version = "0.13.1", features = ["redactions"] }
+lazy_static = "1.2"
+paste = "0.1"
+pretty_assertions = "0.6.1"
+serde_yaml = "0.8.9"
+tempfile = "3.0"
+walkdir = "2.1"

README.md

@@ -1,68 +1,55 @@
 <div align="center">
-    <img src="assets/rojo-logo.png" alt="Rojo" height="217" />
+    <a href="https://rojo.space">
+        <img src="assets/logo-512.png" alt="Rojo" height="217" />
+    </a>
 </div>
 
 <div>&nbsp;</div>
 
 <div align="center">
-    <a href="https://travis-ci.org/LPGhatguy/rojo">
-        <img src="https://api.travis-ci.org/LPGhatguy/rojo.svg?branch=master" alt="Travis-CI Build Status" />
+    <a href="https://github.com/rojo-rbx/rojo/actions">
+        <img src="https://github.com/rojo-rbx/rojo/workflows/CI/badge.svg" alt="Actions status" />
     </a>
     <a href="https://crates.io/crates/rojo">
-        <img src="https://img.shields.io/crates/v/rojo.svg?label=version" alt="Latest server version" />
+        <img src="https://img.shields.io/crates/v/rojo.svg?label=latest%20release" alt="Latest server version" />
     </a>
-    <a href="https://lpghatguy.github.io/rojo/0.4.x">
-        <img src="https://img.shields.io/badge/docs-0.4.x-brightgreen.svg" alt="Rojo Documentation" />
-    </a>
-    <a href="https://lpghatguy.github.io/rojo/0.5.x">
-        <img src="https://img.shields.io/badge/docs-0.5.x-brightgreen.svg" alt="Rojo Documentation" />
+    <a href="https://rojo.space/docs/0.5.x">
+        <img src="https://img.shields.io/badge/docs-0.5.x-brightgreen.svg" alt="Rojo 0.5.x Documentation" />
     </a>
 </div>
 
 <hr />
 
-**Rojo** is a flexible multi-tool designed for creating robust Roblox projects.
+**Rojo** is a tool designed to enable Roblox developers to use professional-grade software engineering tools.
 
-It lets Roblox developers use industry-leading tools like Git and VS Code, and crucial utilities like Luacheck.
+With Rojo, it's possible to use industry-leading tools like **Visual Studio Code** and **Git**.
 
-Rojo is designed for **power users** who want to use the **best tools available** for building games, libraries, and plugins.
+Rojo is designed for power users who want to use the best tools available for building games, libraries, and plugins.
 
 ## Features
-Rojo lets you:
+Rojo enables:
 
-* Work on scripts from the filesystem, in your favorite editor
-* Version your place, model, or plugin using Git or another VCS
-* Sync `rbxmx` and `rbxm` models into your game in real time
-* Package and deploy your project to Roblox.com from the command line
+* Working on scripts and models from the filesystem, in your favorite editor
+* Versioning your game, library, or plugin using Git or another VCS
+* Streaming `rbxmx` and `rbxm` models into your game in real time
+* Packaging and deploying your project to Roblox.com from the command line
 
 Soon, Rojo will be able to:
 
+* Automatically convert your existing game to work with Rojo
 * Sync instances from Roblox Studio to the filesystem
-* Compile MoonScript and other custom things for your project
+* Automatically manage your assets on Roblox.com, like images and sounds
+* Import custom instances like MoonScript code
 
-## [Documentation](https://lpghatguy.github.io/rojo)
-You can also view the documentation by browsing the [docs](https://github.com/LPGhatguy/rojo/tree/master/docs) folder of the repository, but because it uses a number of Markdown extensions, it may not be very readable.
-
-## Inspiration and Alternatives
-There are lots of other tools that sync scripts into Roblox or provide other tools for working with Roblox places.
-
-Here are a few, if you're looking for alternatives or supplements to Rojo:
-
-* [rbxmk by Anaminus](https://github.com/anaminus/rbxmk)
-* [Rofresh by Osyris](https://github.com/osyrisrblx/rofresh)
-* [RbxRefresh by Osyris](https://github.com/osyrisrblx/RbxRefresh)
-* [Studio Bridge by Vocksel](https://github.com/vocksel/studio-bridge)
-* [Elixir by Vocksel](https://github.com/vocksel/elixir)
-* [RbxSync by evaera](https://github.com/evaera/RbxSync)
-* [CodeSync by MemoryPenguin](https://github.com/MemoryPenguin/CodeSync)
-* [rbx-exteditor by MemoryPenguin](https://github.com/MemoryPenguin/rbx-exteditor)
-
-If you use a plugin that _isn't_ Rojo for syncing code, open an issue and let me know why! I'd like Rojo to be the end-all tool so that people stop reinventing solutions to this problem.
+## [Documentation](https://rojo.space/docs)
+Documentation is hosted in the [rojo.space repository](https://github.com/rojo-rbx/rojo.space).
 
 ## Contributing
+Check out our [contribution guide](CONTRIBUTING.md) for detailed instructions for helping work on Rojo!
+
 Pull requests are welcome!
 
-All pull requests are run against a test suite on Travis CI. That test suite should always pass!
+Rojo supports Rust 1.40.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has.
 
 ## License
 Rojo is available under the terms of the Mozilla Public License, Version 2.0. See [LICENSE.txt](LICENSE.txt) for details.

assets/index.css

@@ -0,0 +1,181 @@
+* {
+  margin: 0;
+  padding: 0;
+  border: none;
+  text-decoration: inherit;
+  color: inherit;
+  font: inherit;
+  box-sizing: inherit;
+  line-height: inherit;
+}
+
+html {
+  box-sizing: border-box;
+  font-family: sans-serif;
+  font-size: 18px;
+  text-decoration: none;
+  line-height: 1.4;
+}
+
+img {
+  max-width:100%;
+  max-height:100%;
+  height: auto;
+}
+
+.path-list > li {
+  margin-left: 1.2em;
+  font-family: monospace;
+}
+
+.root {
+  display: flex;
+  flex-direction: column;
+  margin: 0.5rem auto;
+  width: 100%;
+  max-width: 50rem;
+  background-color: #efefef;
+  border: 1px solid #666;
+  border-radius: 4px;
+}
+
+.header {
+  flex: 0 0;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  border-bottom: 1px solid #666;
+}
+
+.main {
+  padding: 1rem;
+}
+
+.main-logo {
+  flex: 0 0 10rem;
+  margin: 1rem;
+}
+
+.stats {
+  flex: 0 0 20rem;
+  margin: 1rem;
+}
+
+.stat {
+  display: block;
+}
+
+.stat-name {
+  display: inline;
+  font-weight: bold;
+}
+
+.main-section:not(:last-of-type) {
+  margin-bottom: 1rem;
+}
+
+.section-title {
+  font-size: 1.8rem;
+}
+
+.button-list {
+  flex: 0 0;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  margin: -1rem;
+}
+
+.button {
+  display: inline-block;
+  border: 1px solid #666;
+  padding: 0.3em 1em;
+  margin: 1rem;
+}
+
+.instance {
+  margin-bottom: 0.5rem;
+}
+
+.instance-title {
+  font-size: 1.2rem;
+  padding: 0.5rem;
+}
+
+.expandable-section {
+  margin: 0.25rem 0.5rem;
+}
+
+.expandable-items {
+  padding: 0.5rem 1rem;
+}
+
+.expandable-input {
+  display: none;
+}
+
+.expandable-label > label {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  align-content: center;
+}
+
+.expandable-input ~ .expandable-label .expandable-visualizer {
+  font-family: monospace;
+  display: inline-flex;
+  align-items: center;
+  align-content: center;
+  text-align: center;
+  width: 1rem;
+  height: 1rem;
+  font-size: 2rem;
+  margin: 0 0.5rem;
+  transition: transform 100ms ease-in-out;
+  transform-origin: 60% 60%;
+}
+
+.expandable-visualizer::before {
+  content: "›";
+  font-weight: bold;
+}
+
+.expandable-input:checked ~ .expandable-label {
+  border-bottom: 1px solid #bbb;
+}
+
+.expandable-input:checked ~ .expandable-label .expandable-visualizer {
+  transform: rotate(90deg);
+}
+
+.expandable-input:not(:checked) ~ .expandable-items {
+  display: none;
+}
+
+.vfs-entry {
+}
+
+.vfs-entry-name {
+  position: relative;
+  font-family: monospace;
+}
+
+.vfs-entry-children .vfs-entry-name::before {
+  content: "";
+  width: 0.6em;
+  height: 1px;
+  background-color: #999;
+  position: absolute;
+  top: 50%;
+  left: -0.8em;
+}
+
+.vfs-entry-note {
+  font-style: italic;
+}
+
+.vfs-entry-children {
+  padding-left: 0.8em;
+  margin-left: 0.2em;
+  border-left: 1px solid #999;
+}

assets/kenney-ui-gray-sheet.xml

@@ -1,41 +0,0 @@
-<TextureAtlas imagePath="sheet.png">
-	<SubTexture name="grey_arrowDownGrey.png" x="78" y="498" width="15" height="10"/>
-	<SubTexture name="grey_arrowDownWhite.png" x="123" y="496" width="15" height="10"/>
-	<SubTexture name="grey_arrowUpGrey.png" x="108" y="498" width="15" height="10"/>
-	<SubTexture name="grey_arrowUpWhite.png" x="93" y="498" width="15" height="10"/>
-	<SubTexture name="grey_box.png" x="147" y="433" width="38" height="36"/>
-	<SubTexture name="grey_boxCheckmark.png" x="147" y="469" width="38" height="36"/>
-	<SubTexture name="grey_boxCross.png" x="185" y="433" width="38" height="36"/>
-	<SubTexture name="grey_boxTick.png" x="190" y="198" width="36" height="36"/>
-	<SubTexture name="grey_button00.png" x="0" y="143" width="190" height="45"/>
-	<SubTexture name="grey_button01.png" x="0" y="188" width="190" height="49"/>
-	<SubTexture name="grey_button02.png" x="0" y="98" width="190" height="45"/>
-	<SubTexture name="grey_button03.png" x="0" y="331" width="190" height="49"/>
-	<SubTexture name="grey_button04.png" x="0" y="286" width="190" height="45"/>
-	<SubTexture name="grey_button05.png" x="0" y="0" width="195" height="49"/>
-	<SubTexture name="grey_button06.png" x="0" y="49" width="191" height="49"/>
-	<SubTexture name="grey_button07.png" x="195" y="0" width="49" height="49"/>
-	<SubTexture name="grey_button08.png" x="240" y="49" width="49" height="49"/>
-	<SubTexture name="grey_button09.png" x="98" y="433" width="49" height="45"/>
-	<SubTexture name="grey_button10.png" x="191" y="49" width="49" height="49"/>
-	<SubTexture name="grey_button11.png" x="0" y="433" width="49" height="45"/>
-	<SubTexture name="grey_button12.png" x="244" y="0" width="49" height="49"/>
-	<SubTexture name="grey_button13.png" x="49" y="433" width="49" height="45"/>
-	<SubTexture name="grey_button14.png" x="0" y="384" width="190" height="49"/>
-	<SubTexture name="grey_button15.png" x="0" y="237" width="190" height="49"/>
-	<SubTexture name="grey_checkmarkGrey.png" x="99" y="478" width="21" height="20"/>
-	<SubTexture name="grey_checkmarkWhite.png" x="78" y="478" width="21" height="20"/>
-	<SubTexture name="grey_circle.png" x="185" y="469" width="36" height="36"/>
-	<SubTexture name="grey_crossGrey.png" x="120" y="478" width="18" height="18"/>
-	<SubTexture name="grey_crossWhite.png" x="190" y="318" width="18" height="18"/>
-	<SubTexture name="grey_panel.png" x="190" y="98" width="100" height="100"/>
-	<SubTexture name="grey_sliderDown.png" x="190" y="234" width="28" height="42"/>
-	<SubTexture name="grey_sliderEnd.png" x="138" y="478" width="8" height="10"/>
-	<SubTexture name="grey_sliderHorizontal.png" x="0" y="380" width="190" height="4"/>
-	<SubTexture name="grey_sliderLeft.png" x="0" y="478" width="39" height="31"/>
-	<SubTexture name="grey_sliderRight.png" x="39" y="478" width="39" height="31"/>
-	<SubTexture name="grey_sliderUp.png" x="190" y="276" width="28" height="42"/>
-	<SubTexture name="grey_sliderVertical.png" x="208" y="318" width="4" height="100"/>
-	<SubTexture name="grey_tickGrey.png" x="190" y="336" width="17" height="17"/>
-	<SubTexture name="grey_tickWhite.png" x="190" y="353" width="17" height="17"/>
-</TextureAtlas>

assets/place.project.json

@@ -0,0 +1,66 @@
+{
+  "name": "[placeholder]",
+  "tree": {
+    "$className": "DataModel",
+    "HttpService": {
+      "$className": "HttpService",
+      "$properties": {
+        "HttpEnabled": true
+      }
+    },
+    "Lighting": {
+      "$className": "Lighting",
+      "$properties": {
+        "Ambient": [
+          0,
+          0,
+          0
+        ],
+        "Brightness": 2,
+        "GlobalShadows": true,
+        "Outlines": false,
+        "Technology": "Voxel"
+      }
+    },
+    "ReplicatedStorage": {
+      "$className": "ReplicatedStorage",
+      "Source": {
+        "$path": "src"
+      }
+    },
+    "SoundService": {
+      "$className": "SoundService",
+      "$properties": {
+        "RespectFilteringEnabled": true
+      }
+    },
+    "Workspace": {
+      "$className": "Workspace",
+      "$properties": {
+        "FilteringEnabled": true
+      },
+      "Baseplate": {
+        "$className": "Part",
+        "$properties": {
+          "Anchored": true,
+          "Color": [
+            0.38823,
+            0.37254,
+            0.38823
+          ],
+          "Locked": true,
+          "Position": [
+            0,
+            -10,
+            0
+          ],
+          "Size": [
+            512,
+            20,
+            512
+          ]
+        }
+      }
+    }
+  }
+}

benches/build.rs

@@ -0,0 +1,42 @@
+use std::path::Path;
+
+use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
+use tempfile::{tempdir, TempDir};
+
+use librojo::cli::{build, BuildCommand};
+
+pub fn benchmark_small_place(c: &mut Criterion) {
+    bench_build_place(c, "Small Place", "test-projects/benchmark_small_place")
+}
+
+criterion_group!(benches, benchmark_small_place);
+criterion_main!(benches);
+
+fn bench_build_place(c: &mut Criterion, name: &str, path: &str) {
+    let mut group = c.benchmark_group(name);
+
+    // 'rojo build' generally takes a fair bit of time to execute.
+    group.sample_size(10);
+    group.bench_function("build", |b| {
+        b.iter_batched(
+            || place_setup(path),
+            |(_dir, options)| build(options).unwrap(),
+            BatchSize::SmallInput,
+        )
+    });
+
+    group.finish();
+}
+
+fn place_setup<P: AsRef<Path>>(input_path: P) -> (TempDir, BuildCommand) {
+    let dir = tempdir().unwrap();
+    let input = input_path.as_ref().to_path_buf();
+    let output = dir.path().join("output.rbxlx");
+
+    let options = BuildCommand {
+        project: input,
+        output,
+    };
+
+    (dir, options)
+}

bin/dev-plugin.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+watchexec -c -w plugin "sh -c './bin/install-dev-plugin.sh'"

bin/install-dev-plugin.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+DIR="$( mktemp -d )"
+PLUGIN_FILE="$DIR/Rojo.rbxm"
+TESTEZ_FILE="$DIR/TestEZ.rbxm"
+
+rojo build plugin -o "$PLUGIN_FILE"
+rojo build plugin/testez.project.json -o "$TESTEZ_FILE"
+remodel bin/mark-plugin-as-dev.lua "$PLUGIN_FILE" "$TESTEZ_FILE" 2>/dev/null
+
+cp "$PLUGIN_FILE" "$LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm"

bin/install-release-plugin.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+rojo build plugin -o "$LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm"

bin/mark-plugin-as-dev.lua

@@ -0,0 +1,12 @@
+local pluginPath, testezPath = ...
+
+local plugin = remodel.readModelFile(pluginPath)[1]
+local testez = remodel.readModelFile(testezPath)[1]
+
+local marker = Instance.new("Folder")
+marker.Name = "ROJO_DEV_BUILD"
+marker.Parent = plugin
+
+testez.Parent = plugin
+
+remodel.writeModelFile(plugin, pluginPath)

bin/put-plugin-in-test-place.lua

@@ -0,0 +1,8 @@
+local pluginPath, placePath = ...
+
+local plugin = remodel.readModelFile(pluginPath)[1]
+local place = remodel.readPlaceFile(placePath)
+
+plugin.Parent = place:GetService("ReplicatedStorage")
+
+remodel.writePlaceFile(place, placePath)

bin/run-all-tests.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+./bin/run-cli-tests.sh
+./bin/run-plugin-tests.sh

bin/run-cli-tests.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+cargo test --all --locked
+cargo fmt -- --check
+
+touch src/lib.rs # Nudge Rust source to make Clippy actually check things
+cargo clippy

bin/run-plugin-tests.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+DIR="$( mktemp -d )"
+PLUGIN_FILE="$DIR/Rojo.rbxmx"
+PLACE_FILE="$DIR/RojoTestPlace.rbxlx"
+
+rojo build plugin -o "$PLUGIN_FILE"
+rojo build plugin/place.project.json -o "$PLACE_FILE"
+
+remodel bin/put-plugin-in-test-place.lua "$PLUGIN_FILE" "$PLACE_FILE"
+
+run-in-roblox -s plugin/testBootstrap.server.lua "$PLACE_FILE"
+
+luacheck plugin/src plugin/log plugin/http

clibrojo/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "clibrojo"
+version = "0.1.0"
+authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rojo = { path = ".." }

clibrojo/README.md

@@ -0,0 +1,19 @@
+# Rojo as a C Library
+This is an experiment to expose a C API for Rojo that would be suitable for embedding it into an existing C/C++ application.
+
+I'm hoping to expand it to drop the HTTP layer and communicate through a channel, which could make it feasible to embed into an existing Roblox IDE with minimal changes or additional code.
+
+## Building
+This project is currently not built by default and could break/disappear at any time.
+
+```bash
+cargo build -p clibrojo
+```
+
+On Windows, Cargo will generate a `clibrojo.dll` and associated `.lib` file. Link these into your project.
+
+To generate the associated C header file to include in the project, use [cbindgen](https://github.com/eqrion/cbindgen):
+
+```bash
+cbindgen --crate clibrojo --output include/rojo.h
+```

clibrojo/src/lib.rs

@@ -0,0 +1,14 @@
+use std::{ffi::CStr, os::raw::c_char, path::PathBuf};
+
+use librojo::commands::{serve, ServeOptions};
+
+#[no_mangle]
+pub extern "C" fn rojo_serve(path: *const c_char) {
+    let path = unsafe { PathBuf::from(CStr::from_ptr(path).to_str().unwrap()) };
+
+    serve(&ServeOptions {
+        fuzzy_project_path: path,
+        port: None,
+    })
+    .unwrap();
+}

design.gv

@@ -1,39 +1,30 @@
-digraph G {
-	graph [
-		ranksep = "0.7",
-		nodesep = "1.0",
-	];
-	node [
-		fontname = "Hack",
-		shape = "record",
-	];
+digraph Rojo {
+	concentrate = true;
+	node [fontname = "sans-serif"];
 
-	roblox_studio -> plugin [dir = "both"];
-	plugin -> web_server [style = "dashed", dir = "both"];
+	plugin [label="Roblox Studio Plugin"]
+	session [label="Session"]
+	rbx_tree [label="Instance Tree"]
+	imfs [label="In-Memory Filesystem"]
+	fs_impl [label="Filesystem Implementation\n(stubbed in tests)"]
+	fs [label="Real Filesystem"]
+	snapshot_subsystem [label="Snapshot Subsystem\n(reconciler)"]
+	snapshot_generator [label="Snapshot Generator"]
+	user_middleware [label="User Middleware\n(MoonScript, etc.)"]
+	builtin_middleware [label="Built-in Middleware\n(.lua, .rbxm, etc.)"]
+	api [label="Web API"]
+	file_watcher [label="File Watcher"]
 
-	web_server -> session;
-
-	session -> rbx_session;
-	session -> fs_watcher;
-	session -> message_queue;
-
-	fs_watcher -> imfs [weight = "10"];
-	fs_watcher -> rbx_session [constraint = "false"];
-
-	imfs -> fs;
-
-	rbx_session -> imfs;
-	rbx_session -> middlewares [weight = "10"];
-	rbx_session -> message_queue [constraint = "false"];
-
-	plugin [label = "Studio Plugin"];
-	roblox_studio [label = "Roblox Studio"];
-	fs [label = "Filesystem"];
-	fs_watcher [label = "Filesystem Watcher"];
-	session [label = "Session"];
-	web_server [label = "Web API"];
-	imfs [label = "In-Memory Filesystem"];
-	rbx_session [label = "RbxSession"];
-	message_queue [label = "MessageQueue"];
-	middlewares [label = "Middlewares"];
+	session -> imfs
+	session -> rbx_tree
+	session -> snapshot_subsystem
+	session -> snapshot_generator
+	session -> file_watcher [dir="both"]
+	file_watcher -> imfs
+	snapshot_generator -> user_middleware
+	snapshot_generator -> builtin_middleware
+	plugin -> api [style="dotted"; dir="both"; minlen=2]
+	api -> session
+	imfs -> fs_impl
+	fs_impl -> fs
 }

docs/extra.css

@@ -1,3 +0,0 @@
-.md-typeset__table {
-  width: 100%;
-}

docs/getting-started/creating-a-place.md

@@ -1,64 +0,0 @@
-To use Rojo to build a place, you'll need to create a new project file, which tells Rojo how your project is structured on-disk and in Roblox.
-
-Create a new folder, then run `rojo init` inside that folder to initialize an empty project.
-
-```sh
-mkdir my-new-project
-cd my-new-project
-
-rojo init
-```
-
-Rojo will make a small project file in your directory, named `roblox-project.json`. It'll make sure that any code in the directory `src` will get put into `ReplicatedStorage.Source`.
-
-Speaking of, let's make sure we create a directory named `src`, and maybe a Lua file inside of it:
-
-```sh
-mkdir src
-echo 'print("Hello, world!")' > src/hello.lua
-```
-
-## Building Your Place
-Now that we have a project, one thing we can do is build a Roblox place file for our project. This is a great way to get started with a project quickly with no fuss.
-
-All we have to do is call `rojo build`:
-
-```sh
-rojo build -o MyNewProject.rbxl
-```
-
-If you open `MyNewProject.rbxl` in Roblox Studio now, you should see a `Folder` containing a `ModuleScript` under `ReplicatedStorage`!
-
-!!! info
-    To generate an XML place file instead, like if you're checking the place file into version control, just use `rbxlx` as the extension on the output file instead.
-
-## Live-Syncing into Studio
-Building a place file is great for the initial build, but for actively working on your place, you'll want something quicker.
-
-In Roblox Studio, make sure the Rojo plugin is installed. If you need it, check out [the installation guide](installation) to learn how to install it.
-
-To expose your project to the plugin, you'll need to _serve_ it from the command line:
-
-```sh
-rojo serve
-```
-
-This will start up a web server that tells Roblox Studio what instances are in your project and sends notifications if any of them change.
-
-Note the port number, then switch into Roblox Studio and press the Rojo **Connect** button in the plugins tab. Type in the port number, if necessary, and press **Start**.
-
-If everything went well, you should now be able to change files in the `src` directory and watch them sync into Roblox Studio in real time!
-
-## Uploading Your Place
-Aimed at teams that want serious levels of automation, Rojo can upload places to Roblox.com automatically.
-
-You'll need an existing place on Roblox.com as well as the `.ROBLOSECURITY` cookie of an account that has write access to that place.
-
-!!! warning
-    It's recommended that you set up a Roblox account dedicated to deploying your place instead of your personal account in case your security cookie is compromised.
-
-Generating and uploading your place file is as simple as:
-
-```sh
-rojo upload --asset_id [PLACE ID] --cookie "[SECURITY COOKIE]"
-```

docs/getting-started/installation.md

@@ -1,25 +0,0 @@
-Rojo has two components:
-
-* The server, a binary written in Rust
-* The plugin, a Roblox Studio plugin written in Lua
-
-It's important that the plugin and server are compatible. The plugin will show errors in the Roblox Studio Output window if there is a version mismatch.
-
-## Installing the Server
-To install the server, either:
-
-* If you have Rust installed, use `cargo install rojo`
-* Or, download a pre-built Windows binary from [the GitHub releases page](https://github.com/LPGhatguy/rojo/releases)
-
-**The Rojo binary must be run from the command line, like Terminal on MacOS or `cmd.exe` on Windows. It's recommended that you put the Rojo binary on your `PATH` to make this easier.**
-
-## Installing the Plugin
-To install the plugin, either:
-
-* Install the plugin from the [Roblox plugin page](https://www.roblox.com/library/1211549683/Rojo).
-  * This gives you less control over what version you install -- you will always have the latest version.
-* Or, download the latest release from [the GitHub releases section](https://github.com/LPGhatguy/rojo/releases) and install it into your Roblox plugins folder
-  * You can open this folder by clicking the "Plugins Folder" button from the Plugins toolbar in Roblox Studio
-
-## Visual Studio Code Extension
-If you use Visual Studio Code on Windows, you can install [Evaera's unofficial Rojo extension](https://marketplace.visualstudio.com/items?itemName=evaera.vscode-rojo), which will install both halves of Rojo for you. It even has a nifty UI to add partitions and start/stop the Rojo server!

docs/images/sync-example-files.gv

@@ -1,17 +0,0 @@
-digraph "Sync Files" {
-	graph [
-	    ranksep = "0.7",
-	    nodesep = "0.5",
-	];
-	node [
-	    fontname = "monospace",
-	    shape = "record",
-	];
-
-	my_model [label = "MyModel"]
-	init_server [label = "init.server.lua"]
-	foo [label = "foo.lua"]
-
-	my_model -> init_server
-	my_model -> foo
-}

docs/images/sync-example-files.svg

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.38.0 (20140413.2041)
- -->
-<!-- Title: Sync Files Pages: 1 -->
-<svg width="258pt" height="132pt"
- viewBox="0.00 0.00 258.00 132.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 128)">
-<title>Sync Files</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-128 254,-128 254,4 -4,4"/>
-<!-- my_model -->
-<g id="node1" class="node"><title>my_model</title>
-<polygon fill="none" stroke="black" points="104,-87.5 104,-123.5 178,-123.5 178,-87.5 104,-87.5"/>
-<text text-anchor="middle" x="141" y="-101.8" font-family="monospace" font-size="14.00">MyModel</text>
-</g>
-<!-- init_server -->
-<g id="node2" class="node"><title>init_server</title>
-<polygon fill="none" stroke="black" points="0,-0.5 0,-36.5 140,-36.5 140,-0.5 0,-0.5"/>
-<text text-anchor="middle" x="70" y="-14.8" font-family="monospace" font-size="14.00">init.server.lua</text>
-</g>
-<!-- my_model&#45;&gt;init_server -->
-<g id="edge1" class="edge"><title>my_model&#45;&gt;init_server</title>
-<path fill="none" stroke="black" d="M126.632,-87.299C116.335,-74.9713 102.308,-58.1787 90.7907,-44.3902"/>
-<polygon fill="black" stroke="black" points="93.4435,-42.1065 84.3465,-36.6754 88.0711,-46.594 93.4435,-42.1065"/>
-</g>
-<!-- foo -->
-<g id="node3" class="node"><title>foo</title>
-<polygon fill="none" stroke="black" points="176,-0.5 176,-36.5 250,-36.5 250,-0.5 176,-0.5"/>
-<text text-anchor="middle" x="213" y="-14.8" font-family="monospace" font-size="14.00">foo.lua</text>
-</g>
-<!-- my_model&#45;&gt;foo -->
-<g id="edge2" class="edge"><title>my_model&#45;&gt;foo</title>
-<path fill="none" stroke="black" d="M155.57,-87.299C166.013,-74.9713 180.237,-58.1787 191.917,-44.3902"/>
-<polygon fill="black" stroke="black" points="194.659,-46.5681 198.451,-36.6754 189.317,-42.0437 194.659,-46.5681"/>
-</g>
-</g>
-</svg>

docs/images/sync-example-instances.gv

@@ -1,15 +0,0 @@
-digraph "Sync Files" {
-	graph [
-	    ranksep = "0.7",
-	    nodesep = "0.5",
-	];
-	node [
-	    fontname = "monospace",
-	    shape = "record",
-	];
-
-	my_model [label = "MyModel (Script)"]
-	foo [label = "foo (ModuleScript)"]
-
-	my_model -> foo
-}

docs/images/sync-example-instances.svg

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.38.0 (20140413.2041)
- -->
-<!-- Title: Sync Files Pages: 1 -->
-<svg width="173pt" height="132pt"
- viewBox="0.00 0.00 173.00 132.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 128)">
-<title>Sync Files</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-128 169,-128 169,4 -4,4"/>
-<!-- my_model -->
-<g id="node1" class="node"><title>my_model</title>
-<polygon fill="none" stroke="black" points="8,-87.5 8,-123.5 157,-123.5 157,-87.5 8,-87.5"/>
-<text text-anchor="middle" x="82.5" y="-101.8" font-family="monospace" font-size="14.00">MyModel (Script)</text>
-</g>
-<!-- foo -->
-<g id="node2" class="node"><title>foo</title>
-<polygon fill="none" stroke="black" points="0,-0.5 0,-36.5 165,-36.5 165,-0.5 0,-0.5"/>
-<text text-anchor="middle" x="82.5" y="-14.8" font-family="monospace" font-size="14.00">foo (ModuleScript)</text>
-</g>
-<!-- my_model&#45;&gt;foo -->
-<g id="edge1" class="edge"><title>my_model&#45;&gt;foo</title>
-<path fill="none" stroke="black" d="M82.5,-87.299C82.5,-75.6626 82.5,-60.0479 82.5,-46.7368"/>
-<polygon fill="black" stroke="black" points="86.0001,-46.6754 82.5,-36.6754 79.0001,-46.6755 86.0001,-46.6754"/>
-</g>
-</g>
-</svg>

docs/images/sync-example-json-model.gv

@@ -1,17 +0,0 @@
-digraph "Sync Files" {
-	graph [
-	    ranksep = "0.7",
-	    nodesep = "0.5",
-	];
-	node [
-	    fontname = "monospace",
-	    shape = "record",
-	];
-
-	model [label = "My Cool Model (Folder)"]
-	root_part [label = "RootPart (Part)"]
-	send_money [label = "SendMoney (RemoteEvent)"]
-
-	model -> root_part
-	model -> send_money
-}

docs/images/sync-example-json-model.svg

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.38.0 (20140413.2041)
- -->
-<!-- Title: Sync Files Pages: 1 -->
-<svg width="390pt" height="132pt"
- viewBox="0.00 0.00 390.00 132.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 128)">
-<title>Sync Files</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-128 386,-128 386,4 -4,4"/>
-<!-- model -->
-<g id="node1" class="node"><title>model</title>
-<polygon fill="none" stroke="black" points="75,-87.5 75,-123.5 273,-123.5 273,-87.5 75,-87.5"/>
-<text text-anchor="middle" x="174" y="-101.8" font-family="monospace" font-size="14.00">My Cool Model (Folder)</text>
-</g>
-<!-- root_part -->
-<g id="node2" class="node"><title>root_part</title>
-<polygon fill="none" stroke="black" points="0,-0.5 0,-36.5 140,-36.5 140,-0.5 0,-0.5"/>
-<text text-anchor="middle" x="70" y="-14.8" font-family="monospace" font-size="14.00">RootPart (Part)</text>
-</g>
-<!-- model&#45;&gt;root_part -->
-<g id="edge1" class="edge"><title>model&#45;&gt;root_part</title>
-<path fill="none" stroke="black" d="M152.954,-87.299C137.448,-74.6257 116.168,-57.2335 99.0438,-43.2377"/>
-<polygon fill="black" stroke="black" points="100.972,-40.2938 91.0147,-36.6754 96.5426,-45.7138 100.972,-40.2938"/>
-</g>
-<!-- send_money -->
-<g id="node3" class="node"><title>send_money</title>
-<polygon fill="none" stroke="black" points="176,-0.5 176,-36.5 382,-36.5 382,-0.5 176,-0.5"/>
-<text text-anchor="middle" x="279" y="-14.8" font-family="monospace" font-size="14.00">SendMoney (RemoteEvent)</text>
-</g>
-<!-- model&#45;&gt;send_money -->
-<g id="edge2" class="edge"><title>model&#45;&gt;send_money</title>
-<path fill="none" stroke="black" d="M195.248,-87.299C210.904,-74.6257 232.388,-57.2335 249.677,-43.2377"/>
-<polygon fill="black" stroke="black" points="252.213,-45.6878 257.783,-36.6754 247.809,-40.2471 252.213,-45.6878"/>
-</g>
-</g>
-</svg>

docs/index.md

@@ -1,11 +0,0 @@
-This is the documentation home for Rojo.
-
-Available versions of these docs:
-
-* [Latest version (currently 0.5.x)](https://lpghatguy.github.io/rojo)
-* [0.5.x](https://lpghatguy.github.io/rojo/0.5.x)
-* [0.4.x](https://lpghatguy.github.io/rojo/0.4.x)
-
-**Rojo** is a flexible multi-tool designed for creating robust Roblox projects.
-
-This documentation is a continual work in progress. If you find any issues, please file an issue on [Rojo's issue tracker](https://github.com/LPGhatguy/rojo/issues)!

docs/migrating-to-epiphany.md

@@ -1,56 +0,0 @@
-Rojo underwent a large refactor during most of 2018 to enable a bunch of new features and lay groundwork for lots more in 2019. As such, Rojo **0.5.x** projects are not compatible with Rojo **0.4.x** projects.
-
-## Supporting Both 0.4.x and 0.5.x
-Rojo 0.5.x uses a different name for its project format. While 0.4.x used `rojo.json`, 0.5.x uses `roblox-project.json`, which allows them to coexist.
-
-If you aren't sure about upgrading or want to upgrade gradually, it's possible to keep both files in the same project without causing problems.
-
-## Upgrading Your Project File
-Project files in 0.5.x are more explicit and flexible than they were in 0.4.x. Project files can now describe models and plugins in addition to places.
-
-This new project file format also guards against two of the biggest pitfalls when writing a config file:
-
-* Using a service as a partition target directly, which often wiped away extra instances
-* Defining two partitions that overlapped, which made Rojo act unpredictably
-
-The biggest change is that the `partitions` field has been replaced with a new field, `tree`, that describes the entire hierarchy of your project from the top-down.
-
-A project for 0.4.x that syncs from the `src` directory into `ReplicatedStorage.Source` would look like this:
-
-```json
-{
-    "name": "Rojo 0.4.x Example",
-    "partitions": {
-        "path": "src",
-        "target": "ReplicatedStorage.Source"
-    }
-}
-```
-
-In 0.5.x, the project format is more explicit:
-
-```json
-{
-    "name": "Rojo 0.5.x Example",
-    "tree": {
-        "$className": "DataModel",
-        "ReplicatedStorage": {
-            "$className": "ReplicatedStorage",
-            "Source": {
-                "$path": "src"
-            }
-        }
-    }
-}
-```
-
-For each object in the tree, we define *metadata* and *children*.
-
-Metadata begins with a dollar sign (`$`), like `$className`. This is so that children and metadata can coexist without creating too many nested layers.
-
-All other values are considered children, where the key is the instance's name, and the value is an object, repeating the process.
-
-## Migrating Unknown Files
-If you used Rojo to sync in files as `StringValue` objects, you'll need to make sure those files end with the `txt` extension to preserve this in Rojo 0.5.x.
-
-Unknown files are now ignored in Rojo instead of being converted to `StringValue` objects.

docs/requirements.txt

@@ -1,3 +0,0 @@
-mkdocs
-mkdocs-material
-pymdown-extensions

docs/sync-details.md

@@ -1,101 +0,0 @@
-This page aims to describe how Rojo turns files on the filesystem into Roblox objects.
-
-## Overview
-| File Name      | Instance Type       |
-| -------------- | ------------------- |
-| any directory  | `Folder`            |
-| `*.server.lua` | `Script`            |
-| `*.client.lua` | `LocalScript`       |
-| `*.lua`        | `ModuleScript`      |
-| `*.csv`        | `LocalizationTable` |
-| `*.txt`        | `StringValue`       |
-| `*.model.json` | Any                 |
-| `*.rbxm`       | Any                 |
-| `*.rbxmx`      | Any                 |
-
-## Limitations
-Not all property types can be synced by Rojo in real-time due to limitations of the Roblox Studio plugin API. In these cases, you can usually generate a place file and open it when you start working on a project.
-
-Some common cases you might hit are:
-
-* Binary data (Terrain, CSG, CollectionService tags)
-* `MeshPart.MeshId`
-* `HttpService.HttpEnabled`
-
-For a list of all property types that Rojo can reason about, both when live-syncing and when building place files, look at [rbx_tree's type coverage documentation](https://github.com/LPGhatguy/rbx-tree/tree/master/rbx_tree#coverage).
-
-## Folders
-Any directory on the filesystem will turn into a `Folder` instance unless it contains an 'init' script, described below.
-
-## Scripts
-The default script type in Rojo projects is `ModuleScript`, since most scripts in well-structued Roblox projects will be modules.
-
-If a directory contains a file named `init.server.lua`, `init.client.lua`, or `init.lua`, that folder will be transformed into a `*Script` instance with the contents of the 'init' file. This can be used to create scripts inside of scripts.
-
-For example, these files:
-
-<div align="center">
-    <a href="../images/sync-example-files.svg">
-        <img src="../images/sync-example-files.svg" alt="Tree of files on disk" />
-    </a>
-</div>
-
-Will turn into these instances in Roblox:
-
-<div align="center">
-    <a href="../images/sync-example-instances.svg">
-        <img src="../images/sync-example-instances.svg" alt="Tree of instances in Roblox" />
-    </a>
-</div>
-
-## Localization Tables
-Any CSV files are transformed into `LocalizationTable` instances. Rojo expects these files to follow the same format that Roblox does when importing and exporting localization information.
-
-## Plain Text Files
-Plain text files (`.txt`) files are transformed into `StringValue` instances. This is useful for bringing in text data that can be read by scripts at runtime.
-
-## JSON Models
-Files ending in `.model.json` can be used to describe simple models. They're designed to be hand-written and are useful for instances like `RemoteEvent`.
-
-A JSON model describing a folder containing a `Part` and a `RemoteEvent` could be described as:
-
-```json
-{
-    "Name": "My Cool Model",
-    "ClassName": "Folder",
-    "Children": [
-        {
-            "Name": "RootPart",
-            "ClassName": "Part",
-            "Properties": {
-                "Size": {
-                    "Type": "Vector3",
-                    "Value": [4, 4, 4]
-                }
-            }
-        },
-        {
-            "Name": "SendMoney",
-            "ClassName": "RemoteEvent"
-        }
-    ]
-}
-```
-
-It would turn into instances in this shape:
-
-<div align="center">
-    <a href="../images/sync-example-json-model.svg">
-        <img src="../images/sync-example-json-model.svg" alt="Tree of instances in Roblox" />
-    </a>
-</div>
-
-## Binary and XML Models
-Rojo supports both binary (`.rbxm`) and XML (`.rbxmx`) models generated by Roblox Studio or another tool.
-
-Not all property types are supported!
-
-For a rundown of supported types, see:
-
-* [rbxm Type Coverage](https://github.com/LPGhatguy/rbx-tree/tree/master/rbx_binary#coverage)
-* [rbxmx Type Coverage](https://github.com/LPGhatguy/rbx-tree/tree/master/rbx_xml#coverage)

docs/why-rojo.md

@@ -1,20 +0,0 @@
-There are a number of existing plugins for Roblox that move code from the filesystem into Roblox.
-
-Besides Rojo, there is:
-
-* [Studio Bridge](https://github.com/vocksel/studio-bridge) by [Vocksel](https://github.com/vocksel)
-* [RbxRefresh](https://github.com/osyrisrblx/RbxRefresh) by [Osyris](https://github.com/osyrisrblx)
-* [RbxSync](https://github.com/evaera/RbxSync) by [evaera](https://github.com/evaera)
-* [CodeSync](https://github.com/MemoryPenguin/CodeSync) and [rbx-exteditor](https://github.com/MemoryPenguin/rbx-exteditor) by [MemoryPenguin](https://github.com/MemoryPenguin)
-* [rbxmk](https://github.com/anaminus/rbxmk) by [Anaminus](https://github.com/anaminus)
-
-So why did I build Rojo?
-
-Each of these tools solves what is essentially the same problem from a few different angles. The goal of Rojo is to take all of the lessons and ideas learned from these projects and build a tool that can solve the problem for good.
-
-Additionally:
-
-* I think that this tool needs to be built in a compiled language without a runtime, for easy distribution and good performance.
-* I think that the conventions promoted by other sync plugins (`.module.lua` for modules, as well a single sync point) are sub-optimal.
-* I think that I have a good enough understanding of the problem to build something robust.
-* I think that Rojo should be able to do more than just sync code.

generate-docs

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# Kludged documentation generator to support multiple versions.
-# Make sure the `site` folder is a checkout of this repository's `gh-pages`
-# branch.
-
-set -e
-
-REMOTE=$(git remote get-url origin)
-CHECKOUT="$(mktemp -d)"
-OUTPUT="$(pwd)/site"
-
-if [ -d site ]
-then
-	cd site
-	git pull
-else
-	git clone "$REMOTE" site
-	cd site
-	git checkout gh-pages
-fi
-
-git clone "$REMOTE" "$CHECKOUT"
-cd "$CHECKOUT"
-
-echo "Building master"
-git checkout master
-mkdocs build --site-dir "$OUTPUT"
-
-echo "Building 0.5.x"
-mkdocs build --site-dir "$OUTPUT/0.5.x"
-
-echo "Building 0.4.x"
-git checkout v0.4.x
-mkdocs build --site-dir "$OUTPUT/0.4.x"

memofs/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "memofs"
+description = "Virtual filesystem with configurable backends."
+version = "0.1.0"
+authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+edition = "2018"
+readme = "README.md"
+license = "MIT"
+homepage = "https://github.com/rojo-rbx/rojo/tree/master/memofs"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+notify = "4.0.15"
+crossbeam-channel = "0.4.0"

memofs/LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright 2020 The Rojo Developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

memofs/README.md

@@ -0,0 +1,22 @@
+# memofs
+[![Crates.io](https://img.shields.io/crates/v/memofs.svg)](https://crates.io/crates/memofs)
+
+Implementation of a virtual filesystem with a configurable backend and file
+watching.
+
+memofs is currently an unstable minimum viable library. Its primary consumer is
+[Rojo](https://github.com/rojo-rbx/rojo), a build system for Roblox.
+
+### Current Features
+* API similar to `std::fs`
+* Configurable backends
+    * `StdBackend`, which uses `std::fs` and the `notify` crate
+    * `NoopBackend`, which always throws errors
+    * `InMemoryFs`, a simple in-memory filesystem useful for testing
+
+### Future Features
+* Hash-based hierarchical memoization keys (hence the name)
+* Configurable caching (write-through, write-around, write-back)
+
+## License
+memofs is available under the terms of the MIT license. See [LICENSE.txt](LICENSE.txt) or <https://opensource.org/licenses/MIT> for more details.

memofs/README.tpl

@@ -0,0 +1,7 @@
+# {{crate}}
+[![Crates.io](https://img.shields.io/crates/v/memofs.svg)](https://crates.io/crates/memofs)
+
+{{readme}}
+
+## License
+memofs is available under the terms of the MIT license. See [LICENSE.txt](LICENSE.txt) or <https://opensource.org/licenses/MIT> for more details.

memofs/src/in_memory_fs.rs

@@ -0,0 +1,249 @@
+use std::collections::{BTreeSet, HashMap, VecDeque};
+use std::io;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex};
+
+use crossbeam_channel::{Receiver, Sender};
+
+use crate::{DirEntry, Metadata, ReadDir, VfsBackend, VfsEvent, VfsSnapshot};
+
+/// In-memory filesystem that can be used as a VFS backend.
+///
+/// Internally reference counted to enable giving a copy to
+/// [`Vfs`](struct.Vfs.html) and keeping the original to mutate the filesystem's
+/// state with.
+#[derive(Debug, Clone)]
+pub struct InMemoryFs {
+    inner: Arc<Mutex<InMemoryFsInner>>,
+}
+
+impl InMemoryFs {
+    /// Create a new empty `InMemoryFs`.
+    pub fn new() -> Self {
+        Self {
+            inner: Arc::new(Mutex::new(InMemoryFsInner::new())),
+        }
+    }
+
+    /// Load a [`VfsSnapshot`](enum.VfsSnapshot.html) into a subtree of the
+    /// in-memory filesystem.
+    ///
+    /// This function will return an error if the operations required to apply
+    /// the snapshot result in errors, like trying to create a file inside a
+    /// file.
+    pub fn load_snapshot<P: Into<PathBuf>>(
+        &mut self,
+        path: P,
+        snapshot: VfsSnapshot,
+    ) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+        inner.load_snapshot(path.into(), snapshot)
+    }
+
+    /// Raises a filesystem change event.
+    ///
+    /// If this `InMemoryFs` is being used as the backend of a
+    /// [`Vfs`](struct.Vfs.html), then any listeners be notified of this event.
+    pub fn raise_event(&mut self, event: VfsEvent) {
+        let inner = self.inner.lock().unwrap();
+        inner.event_sender.send(event).unwrap();
+    }
+}
+
+#[derive(Debug)]
+struct InMemoryFsInner {
+    entries: HashMap<PathBuf, Entry>,
+    orphans: BTreeSet<PathBuf>,
+
+    event_receiver: Receiver<VfsEvent>,
+    event_sender: Sender<VfsEvent>,
+}
+
+impl InMemoryFsInner {
+    fn new() -> Self {
+        let (event_sender, event_receiver) = crossbeam_channel::unbounded();
+
+        Self {
+            entries: HashMap::new(),
+            orphans: BTreeSet::new(),
+            event_receiver,
+            event_sender,
+        }
+    }
+
+    fn load_snapshot(&mut self, path: PathBuf, snapshot: VfsSnapshot) -> io::Result<()> {
+        if let Some(parent_path) = path.parent() {
+            if let Some(parent_entry) = self.entries.get_mut(parent_path) {
+                if let Entry::Dir { children } = parent_entry {
+                    children.insert(path.clone());
+                } else {
+                    return must_be_dir(parent_path);
+                }
+            } else {
+                self.orphans.insert(path.clone());
+            }
+        } else {
+            self.orphans.insert(path.clone());
+        }
+
+        match snapshot {
+            VfsSnapshot::File { contents } => {
+                self.entries.insert(path, Entry::File { contents });
+            }
+            VfsSnapshot::Dir { children } => {
+                self.entries.insert(
+                    path.clone(),
+                    Entry::Dir {
+                        children: BTreeSet::new(),
+                    },
+                );
+
+                for (child_name, child) in children {
+                    let full_path = path.join(child_name);
+                    self.load_snapshot(full_path, child)?;
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn remove(&mut self, root_path: PathBuf) {
+        self.orphans.remove(&root_path);
+
+        let mut to_remove = VecDeque::new();
+        to_remove.push_back(root_path);
+
+        while let Some(path) = to_remove.pop_front() {
+            if let Some(Entry::Dir { children }) = self.entries.remove(&path) {
+                to_remove.extend(children);
+            }
+        }
+    }
+}
+
+#[derive(Debug)]
+enum Entry {
+    File { contents: Vec<u8> },
+
+    Dir { children: BTreeSet<PathBuf> },
+}
+
+impl VfsBackend for InMemoryFs {
+    fn read(&mut self, path: &Path) -> io::Result<Vec<u8>> {
+        let inner = self.inner.lock().unwrap();
+
+        match inner.entries.get(path) {
+            Some(Entry::File { contents }) => Ok(contents.clone()),
+            Some(Entry::Dir { .. }) => must_be_file(path),
+            None => not_found(path),
+        }
+    }
+
+    fn write(&mut self, path: &Path, data: &[u8]) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+
+        inner.load_snapshot(
+            path.to_path_buf(),
+            VfsSnapshot::File {
+                contents: data.to_owned(),
+            },
+        )
+    }
+
+    fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir> {
+        let inner = self.inner.lock().unwrap();
+
+        match inner.entries.get(path) {
+            Some(Entry::Dir { children }) => {
+                let iter = children
+                    .clone()
+                    .into_iter()
+                    .map(|path| Ok(DirEntry { path }));
+
+                Ok(ReadDir {
+                    inner: Box::new(iter),
+                })
+            }
+            Some(Entry::File { .. }) => must_be_dir(path),
+            None => not_found(path),
+        }
+    }
+
+    fn remove_file(&mut self, path: &Path) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+
+        match inner.entries.get(path) {
+            Some(Entry::File { .. }) => {
+                inner.remove(path.to_owned());
+                Ok(())
+            }
+            Some(Entry::Dir { .. }) => must_be_file(path),
+            None => not_found(path),
+        }
+    }
+
+    fn remove_dir_all(&mut self, path: &Path) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+
+        match inner.entries.get(path) {
+            Some(Entry::Dir { .. }) => {
+                inner.remove(path.to_owned());
+                Ok(())
+            }
+            Some(Entry::File { .. }) => must_be_dir(path),
+            None => not_found(path),
+        }
+    }
+
+    fn metadata(&mut self, path: &Path) -> io::Result<Metadata> {
+        let inner = self.inner.lock().unwrap();
+
+        match inner.entries.get(path) {
+            Some(Entry::File { .. }) => Ok(Metadata { is_file: true }),
+            Some(Entry::Dir { .. }) => Ok(Metadata { is_file: false }),
+            None => not_found(path),
+        }
+    }
+
+    fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
+        let inner = self.inner.lock().unwrap();
+
+        inner.event_receiver.clone()
+    }
+
+    fn watch(&mut self, _path: &Path) -> io::Result<()> {
+        Ok(())
+    }
+
+    fn unwatch(&mut self, _path: &Path) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+fn must_be_file<T>(path: &Path) -> io::Result<T> {
+    Err(io::Error::new(
+        io::ErrorKind::Other,
+        format!(
+            "path {} was a directory, but must be a file",
+            path.display()
+        ),
+    ))
+}
+
+fn must_be_dir<T>(path: &Path) -> io::Result<T> {
+    Err(io::Error::new(
+        io::ErrorKind::Other,
+        format!(
+            "path {} was a file, but must be a directory",
+            path.display()
+        ),
+    ))
+}
+
+fn not_found<T>(path: &Path) -> io::Result<T> {
+    Err(io::Error::new(
+        io::ErrorKind::NotFound,
+        format!("path {} not found", path.display()),
+    ))
+}

memofs/src/lib.rs

@@ -0,0 +1,404 @@
+/*!
+Implementation of a virtual filesystem with a configurable backend and file
+watching.
+
+memofs is currently an unstable minimum viable library. Its primary consumer is
+[Rojo](https://github.com/rojo-rbx/rojo), a build system for Roblox.
+
+## Current Features
+* API similar to `std::fs`
+* Configurable backends
+    * `StdBackend`, which uses `std::fs` and the `notify` crate
+    * `NoopBackend`, which always throws errors
+    * `InMemoryFs`, a simple in-memory filesystem useful for testing
+
+## Future Features
+* Hash-based hierarchical memoization keys (hence the name)
+* Configurable caching (write-through, write-around, write-back)
+*/
+
+mod in_memory_fs;
+mod noop_backend;
+mod snapshot;
+mod std_backend;
+
+use std::io;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex, MutexGuard};
+
+pub use in_memory_fs::InMemoryFs;
+pub use noop_backend::NoopBackend;
+pub use snapshot::VfsSnapshot;
+pub use std_backend::StdBackend;
+
+mod sealed {
+    use super::*;
+
+    /// Sealing trait for VfsBackend.
+    pub trait Sealed {}
+
+    impl Sealed for NoopBackend {}
+    impl Sealed for StdBackend {}
+    impl Sealed for InMemoryFs {}
+}
+
+/// Trait that transforms `io::Result<T>` into `io::Result<Option<T>>`.
+///
+/// `Ok(None)` takes the place of IO errors whose `io::ErrorKind` is `NotFound`.
+pub trait IoResultExt<T> {
+    fn with_not_found(self) -> io::Result<Option<T>>;
+}
+
+impl<T> IoResultExt<T> for io::Result<T> {
+    fn with_not_found(self) -> io::Result<Option<T>> {
+        match self {
+            Ok(v) => Ok(Some(v)),
+            Err(err) => {
+                if err.kind() == io::ErrorKind::NotFound {
+                    Ok(None)
+                } else {
+                    Err(err)
+                }
+            }
+        }
+    }
+}
+
+/// Backend that can be used to create a `Vfs`.
+///
+/// This trait is sealed and cannot not be implemented outside this crate.
+pub trait VfsBackend: sealed::Sealed + Send + 'static {
+    fn read(&mut self, path: &Path) -> io::Result<Vec<u8>>;
+    fn write(&mut self, path: &Path, data: &[u8]) -> io::Result<()>;
+    fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir>;
+    fn metadata(&mut self, path: &Path) -> io::Result<Metadata>;
+    fn remove_file(&mut self, path: &Path) -> io::Result<()>;
+    fn remove_dir_all(&mut self, path: &Path) -> io::Result<()>;
+
+    fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent>;
+    fn watch(&mut self, path: &Path) -> io::Result<()>;
+    fn unwatch(&mut self, path: &Path) -> io::Result<()>;
+}
+
+/// Vfs equivalent to [`std::fs::DirEntry`][std::fs::DirEntry].
+///
+/// [std::fs::DirEntry]: https://doc.rust-lang.org/stable/std/fs/struct.DirEntry.html
+pub struct DirEntry {
+    pub(crate) path: PathBuf,
+}
+
+impl DirEntry {
+    pub fn path(&self) -> &Path {
+        &self.path
+    }
+}
+
+/// Vfs equivalent to [`std::fs::ReadDir`][std::fs::ReadDir].
+///
+/// [std::fs::ReadDir]: https://doc.rust-lang.org/stable/std/fs/struct.ReadDir.html
+pub struct ReadDir {
+    pub(crate) inner: Box<dyn Iterator<Item = io::Result<DirEntry>>>,
+}
+
+impl Iterator for ReadDir {
+    type Item = io::Result<DirEntry>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.inner.next()
+    }
+}
+
+/// Vfs equivalent to [`std::fs::Metadata`][std::fs::Metadata].
+///
+/// [std::fs::Metadata]: https://doc.rust-lang.org/stable/std/fs/struct.Metadata.html
+#[derive(Debug)]
+pub struct Metadata {
+    pub(crate) is_file: bool,
+}
+
+impl Metadata {
+    pub fn is_file(&self) -> bool {
+        self.is_file
+    }
+
+    pub fn is_dir(&self) -> bool {
+        !self.is_file
+    }
+}
+
+/// Represents an event that a filesystem can raise that might need to be
+/// handled.
+#[derive(Debug)]
+#[non_exhaustive]
+pub enum VfsEvent {
+    Create(PathBuf),
+    Write(PathBuf),
+    Remove(PathBuf),
+}
+
+/// Contains implementation details of the Vfs, wrapped by `Vfs` and `VfsLock`,
+/// the public interfaces to this type.
+struct VfsInner {
+    backend: Box<dyn VfsBackend>,
+}
+
+impl VfsInner {
+    fn read<P: AsRef<Path>>(&mut self, path: P) -> io::Result<Arc<Vec<u8>>> {
+        let path = path.as_ref();
+        let contents = self.backend.read(path)?;
+        self.backend.watch(path)?;
+        Ok(Arc::new(contents))
+    }
+
+    fn write<P: AsRef<Path>, C: AsRef<[u8]>>(&mut self, path: P, contents: C) -> io::Result<()> {
+        let path = path.as_ref();
+        let contents = contents.as_ref();
+        self.backend.write(path, contents)
+    }
+
+    fn read_dir<P: AsRef<Path>>(&mut self, path: P) -> io::Result<ReadDir> {
+        let path = path.as_ref();
+        let dir = self.backend.read_dir(path)?;
+        self.backend.watch(path)?;
+        Ok(dir)
+    }
+
+    fn remove_file<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        let _ = self.backend.unwatch(path);
+        self.backend.remove_file(path)
+    }
+
+    fn remove_dir_all<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        let _ = self.backend.unwatch(path);
+        self.backend.remove_dir_all(path)
+    }
+
+    fn metadata<P: AsRef<Path>>(&mut self, path: P) -> io::Result<Metadata> {
+        let path = path.as_ref();
+        self.backend.metadata(path)
+    }
+
+    fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
+        self.backend.event_receiver()
+    }
+
+    fn commit_event(&mut self, event: &VfsEvent) -> io::Result<()> {
+        match event {
+            VfsEvent::Remove(path) => {
+                let _ = self.backend.unwatch(&path);
+            }
+            _ => {}
+        }
+
+        Ok(())
+    }
+}
+
+/// A virtual filesystem with a configurable backend.
+///
+/// All operations on the Vfs take a lock on an internal backend. For performing
+/// large batches of operations, it might be more performant to call `lock()`
+/// and use [`VfsLock`](struct.VfsLock.html) instead.
+pub struct Vfs {
+    inner: Mutex<VfsInner>,
+}
+
+impl Vfs {
+    /// Creates a new `Vfs` with the default backend, `StdBackend`.
+    pub fn new_default() -> Self {
+        Self::new(StdBackend::new())
+    }
+
+    /// Creates a new `Vfs` with the given backend.
+    pub fn new<B: VfsBackend>(backend: B) -> Self {
+        let lock = VfsInner {
+            backend: Box::new(backend),
+        };
+
+        Self {
+            inner: Mutex::new(lock),
+        }
+    }
+
+    /// Manually lock the Vfs, useful for large batches of operations.
+    pub fn lock(&self) -> VfsLock<'_> {
+        VfsLock {
+            inner: self.inner.lock().unwrap(),
+        }
+    }
+
+    /// Read a file from the VFS, or the underlying backend if it isn't
+    /// resident.
+    ///
+    /// Roughly equivalent to [`std::fs::read`][std::fs::read].
+    ///
+    /// [std::fs::read]: https://doc.rust-lang.org/stable/std/fs/fn.read.html
+    #[inline]
+    pub fn read<P: AsRef<Path>>(&self, path: P) -> io::Result<Arc<Vec<u8>>> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().read(path)
+    }
+
+    /// Write a file to the VFS and the underlying backend.
+    ///
+    /// Roughly equivalent to [`std::fs::write`][std::fs::write].
+    ///
+    /// [std::fs::write]: https://doc.rust-lang.org/stable/std/fs/fn.write.html
+    #[inline]
+    pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(&self, path: P, contents: C) -> io::Result<()> {
+        let path = path.as_ref();
+        let contents = contents.as_ref();
+        self.inner.lock().unwrap().write(path, contents)
+    }
+
+    /// Read all of the children of a directory.
+    ///
+    /// Roughly equivalent to [`std::fs::read_dir`][std::fs::read_dir].
+    ///
+    /// [std::fs::read_dir]: https://doc.rust-lang.org/stable/std/fs/fn.read_dir.html
+    #[inline]
+    pub fn read_dir<P: AsRef<Path>>(&self, path: P) -> io::Result<ReadDir> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().read_dir(path)
+    }
+
+    /// Remove a file.
+    ///
+    /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].
+    ///
+    /// [std::fs::remove_file]: https://doc.rust-lang.org/stable/std/fs/fn.remove_file.html
+    #[inline]
+    pub fn remove_file<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().remove_file(path)
+    }
+
+    /// Remove a directory and all of its descendants.
+    ///
+    /// Roughly equivalent to [`std::fs::remove_dir_all`][std::fs::remove_dir_all].
+    ///
+    /// [std::fs::remove_dir_all]: https://doc.rust-lang.org/stable/std/fs/fn.remove_dir_all.html
+    #[inline]
+    pub fn remove_dir_all<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().remove_dir_all(path)
+    }
+
+    /// Query metadata about the given path.
+    ///
+    /// Roughly equivalent to [`std::fs::metadata`][std::fs::metadata].
+    ///
+    /// [std::fs::metadata]: https://doc.rust-lang.org/stable/std/fs/fn.metadata.html
+    #[inline]
+    pub fn metadata<P: AsRef<Path>>(&self, path: P) -> io::Result<Metadata> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().metadata(path)
+    }
+
+    /// Retrieve a handle to the event receiver for this `Vfs`.
+    #[inline]
+    pub fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
+        self.inner.lock().unwrap().event_receiver()
+    }
+
+    /// Commit an event to this `Vfs`.
+    #[inline]
+    pub fn commit_event(&self, event: &VfsEvent) -> io::Result<()> {
+        self.inner.lock().unwrap().commit_event(event)
+    }
+}
+
+/// A locked handle to a [`Vfs`](struct.Vfs.html), created by `Vfs::lock`.
+///
+/// Implements roughly the same API as [`Vfs`](struct.Vfs.html).
+pub struct VfsLock<'a> {
+    inner: MutexGuard<'a, VfsInner>,
+}
+
+impl VfsLock<'_> {
+    /// Read a file from the VFS, or the underlying backend if it isn't
+    /// resident.
+    ///
+    /// Roughly equivalent to [`std::fs::read`][std::fs::read].
+    ///
+    /// [std::fs::read]: https://doc.rust-lang.org/stable/std/fs/fn.read.html
+    #[inline]
+    pub fn read<P: AsRef<Path>>(&mut self, path: P) -> io::Result<Arc<Vec<u8>>> {
+        let path = path.as_ref();
+        self.inner.read(path)
+    }
+
+    /// Write a file to the VFS and the underlying backend.
+    ///
+    /// Roughly equivalent to [`std::fs::write`][std::fs::write].
+    ///
+    /// [std::fs::write]: https://doc.rust-lang.org/stable/std/fs/fn.write.html
+    #[inline]
+    pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(
+        &mut self,
+        path: P,
+        contents: C,
+    ) -> io::Result<()> {
+        let path = path.as_ref();
+        let contents = contents.as_ref();
+        self.inner.write(path, contents)
+    }
+
+    /// Read all of the children of a directory.
+    ///
+    /// Roughly equivalent to [`std::fs::read_dir`][std::fs::read_dir].
+    ///
+    /// [std::fs::read_dir]: https://doc.rust-lang.org/stable/std/fs/fn.read_dir.html
+    #[inline]
+    pub fn read_dir<P: AsRef<Path>>(&mut self, path: P) -> io::Result<ReadDir> {
+        let path = path.as_ref();
+        self.inner.read_dir(path)
+    }
+
+    /// Remove a file.
+    ///
+    /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].
+    ///
+    /// [std::fs::remove_file]: https://doc.rust-lang.org/stable/std/fs/fn.remove_file.html
+    #[inline]
+    pub fn remove_file<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.remove_file(path)
+    }
+
+    /// Remove a directory and all of its descendants.
+    ///
+    /// Roughly equivalent to [`std::fs::remove_dir_all`][std::fs::remove_dir_all].
+    ///
+    /// [std::fs::remove_dir_all]: https://doc.rust-lang.org/stable/std/fs/fn.remove_dir_all.html
+    #[inline]
+    pub fn remove_dir_all<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.remove_dir_all(path)
+    }
+
+    /// Query metadata about the given path.
+    ///
+    /// Roughly equivalent to [`std::fs::metadata`][std::fs::metadata].
+    ///
+    /// [std::fs::metadata]: https://doc.rust-lang.org/stable/std/fs/fn.metadata.html
+    #[inline]
+    pub fn metadata<P: AsRef<Path>>(&mut self, path: P) -> io::Result<Metadata> {
+        let path = path.as_ref();
+        self.inner.metadata(path)
+    }
+
+    /// Retrieve a handle to the event receiver for this `Vfs`.
+    #[inline]
+    pub fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
+        self.inner.event_receiver()
+    }
+
+    /// Commit an event to this `Vfs`.
+    #[inline]
+    pub fn commit_event(&mut self, event: &VfsEvent) -> io::Result<()> {
+        self.inner.commit_event(event)
+    }
+}

memofs/src/noop_backend.rs

@@ -0,0 +1,76 @@
+use std::io;
+use std::path::Path;
+
+use crate::{Metadata, ReadDir, VfsBackend, VfsEvent};
+
+/// `VfsBackend` that returns an error on every operation.
+#[non_exhaustive]
+pub struct NoopBackend;
+
+impl NoopBackend {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+impl VfsBackend for NoopBackend {
+    fn read(&mut self, _path: &Path) -> io::Result<Vec<u8>> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn write(&mut self, _path: &Path, _data: &[u8]) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn read_dir(&mut self, _path: &Path) -> io::Result<ReadDir> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn remove_file(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn remove_dir_all(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn metadata(&mut self, _path: &Path) -> io::Result<Metadata> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
+        crossbeam_channel::never()
+    }
+
+    fn watch(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+
+    fn unwatch(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::new(
+            io::ErrorKind::Other,
+            "NoopBackend doesn't do anything",
+        ))
+    }
+}

memofs/src/snapshot.rs

@@ -0,0 +1,44 @@
+use std::collections::BTreeMap;
+
+/// A slice of a tree of files. Can be loaded into an
+/// [`InMemoryFs`](struct.InMemoryFs.html).
+#[derive(Debug)]
+#[non_exhaustive]
+pub enum VfsSnapshot {
+    File {
+        contents: Vec<u8>,
+    },
+
+    Dir {
+        children: BTreeMap<String, VfsSnapshot>,
+    },
+}
+
+impl VfsSnapshot {
+    pub fn file<C: Into<Vec<u8>>>(contents: C) -> Self {
+        Self::File {
+            contents: contents.into(),
+        }
+    }
+
+    pub fn dir<K: Into<String>, I: IntoIterator<Item = (K, VfsSnapshot)>>(children: I) -> Self {
+        Self::Dir {
+            children: children
+                .into_iter()
+                .map(|(key, value)| (key.into(), value))
+                .collect(),
+        }
+    }
+
+    pub fn empty_file() -> Self {
+        Self::File {
+            contents: Vec::new(),
+        }
+    }
+
+    pub fn empty_dir() -> Self {
+        Self::Dir {
+            children: BTreeMap::new(),
+        }
+    }
+}

memofs/src/std_backend.rs

@@ -0,0 +1,111 @@
+use std::fs;
+use std::io;
+use std::path::Path;
+use std::sync::mpsc;
+use std::thread;
+use std::time::Duration;
+
+use crossbeam_channel::Receiver;
+use notify::{watcher, DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
+
+use crate::{DirEntry, Metadata, ReadDir, VfsBackend, VfsEvent};
+
+/// `VfsBackend` that uses `std::fs` and the `notify` crate.
+pub struct StdBackend {
+    watcher: RecommendedWatcher,
+    watcher_receiver: Receiver<VfsEvent>,
+}
+
+impl StdBackend {
+    pub fn new() -> StdBackend {
+        let (notify_tx, notify_rx) = mpsc::channel();
+        let watcher = watcher(notify_tx, Duration::from_millis(50)).unwrap();
+
+        let (tx, rx) = crossbeam_channel::unbounded();
+
+        thread::spawn(move || {
+            for event in notify_rx {
+                match event {
+                    DebouncedEvent::Create(path) => {
+                        tx.send(VfsEvent::Create(path))?;
+                    }
+                    DebouncedEvent::Write(path) => {
+                        tx.send(VfsEvent::Write(path))?;
+                    }
+                    DebouncedEvent::Remove(path) => {
+                        tx.send(VfsEvent::Remove(path))?;
+                    }
+                    DebouncedEvent::Rename(from, to) => {
+                        tx.send(VfsEvent::Remove(from))?;
+                        tx.send(VfsEvent::Create(to))?;
+                    }
+                    _ => {}
+                }
+            }
+
+            Result::<(), crossbeam_channel::SendError<VfsEvent>>::Ok(())
+        });
+
+        Self {
+            watcher,
+            watcher_receiver: rx,
+        }
+    }
+}
+
+impl VfsBackend for StdBackend {
+    fn read(&mut self, path: &Path) -> io::Result<Vec<u8>> {
+        fs::read(path)
+    }
+
+    fn write(&mut self, path: &Path, data: &[u8]) -> io::Result<()> {
+        fs::write(path, data)
+    }
+
+    fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir> {
+        let entries: Result<Vec<_>, _> = fs::read_dir(path)?.collect();
+        let mut entries = entries?;
+
+        entries.sort_by_cached_key(|entry| entry.file_name());
+
+        let inner = entries
+            .into_iter()
+            .map(|entry| Ok(DirEntry { path: entry.path() }));
+
+        Ok(ReadDir {
+            inner: Box::new(inner),
+        })
+    }
+
+    fn remove_file(&mut self, path: &Path) -> io::Result<()> {
+        fs::remove_file(path)
+    }
+
+    fn remove_dir_all(&mut self, path: &Path) -> io::Result<()> {
+        fs::remove_dir_all(path)
+    }
+
+    fn metadata(&mut self, path: &Path) -> io::Result<Metadata> {
+        let inner = fs::metadata(path)?;
+
+        Ok(Metadata {
+            is_file: inner.is_file(),
+        })
+    }
+
+    fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
+        self.watcher_receiver.clone()
+    }
+
+    fn watch(&mut self, path: &Path) -> io::Result<()> {
+        self.watcher
+            .watch(path, RecursiveMode::NonRecursive)
+            .map_err(|inner| io::Error::new(io::ErrorKind::Other, inner))
+    }
+
+    fn unwatch(&mut self, path: &Path) -> io::Result<()> {
+        self.watcher
+            .unwatch(path)
+            .map_err(|inner| io::Error::new(io::ErrorKind::Other, inner))
+    }
+}

mkdocs.yml

@@ -1,29 +0,0 @@
-site_name: Rojo Documentation
-repo_name: LPGhatguy/rojo
-repo_url: https://github.com/LPGhatguy/rojo
-
-theme:
-  name: material
-  palette:
-    primary: 'Red'
-    accent: 'Red'
-
-nav:
-  - Home: index.md
-  - Why Rojo?: why-rojo.md
-  - Getting Started:
-    - Installation: getting-started/installation.md
-    - Creating a Place with Rojo: getting-started/creating-a-place.md
-  - Sync Details: sync-details.md
-  - Migrating from 0.4.x to 0.5.x: migrating-to-epiphany.md
-
-extra_css:
-  - extra.css
-
-markdown_extensions:
-  - attr_list
-  - admonition
-  - codehilite:
-      guess_lang: false
-  - toc:
-      permalink: true

plugin/.gitignore

@@ -1 +0,0 @@
-/luacov.*

plugin/.luacov

@@ -1,8 +0,0 @@
-return {
-	include = {
-		"^src",
-	},
-	exclude = {
-		"%.spec$",
-	},
-}

plugin/README.md

@@ -1,5 +0,0 @@
-# Rojo Plugin
-
-This is the source to the Rojo Roblox Studio plugin.
-
-Documentation is WIP.

plugin/default.project.json

@@ -5,17 +5,26 @@
     "Plugin": {
       "$path": "src"
     },
+    "Log": {
+      "$path": "log"
+    },
+    "Http": {
+      "$path": "http"
+    },
+    "Fmt": {
+      "$path": "fmt"
+    },
     "Roact": {
-      "$path": "modules/roact/lib"
-    },
-    "Rodux": {
-      "$path": "modules/rodux/lib"
-    },
-    "RoactRodux": {
-      "$path": "modules/roact-rodux/lib"
+      "$path": "modules/roact/src"
     },
     "Promise": {
       "$path": "modules/promise/lib"
+    },
+    "t": {
+      "$path": "modules/t/lib"
+    },
+    "RbxDom": {
+      "$path": "modules/rbx-dom/rbx_dom_lua/src"
     }
   }
 }

plugin/fmt/init.lua

@@ -0,0 +1,245 @@
+--[[
+	This library describes a formatting mechanism akin to Rust's std::fmt.
+
+	It has a couple building blocks:
+
+	* A new syntax for formatting strings, taken verbatim from Rust. It'd also
+	  be possible to use printf-style formatting specifiers to integrate with
+	  the existing string.format utility.
+
+	* An equivalent to Rust's `Display` trait. We're mapping the semantics of
+	  tostring and the __tostring metamethod onto this trait. A lot of types
+	  should already have __tostring implementations, too!
+
+	* An equivalent to Rust's `Debug` trait. This library Lua-ifies that idea by
+	  inventing a new metamethod, `__fmtDebug`. We pass along the "extended
+	  form" attribute which is the equivalent of the "alternate mode" in Rust's
+	  Debug trait since it's the author's opinion that treating it as a
+	  verbosity flag is semantically accurate.
+]]
+
+--[[
+	The default implementation of __fmtDebug for tables when the extended option
+	is not set.
+]]
+local function defaultTableDebug(buffer, input)
+	buffer:writeRaw("{")
+
+	for key, value in pairs(input) do
+		buffer:write("[{:?}] = {:?}", key, value)
+
+		if next(input, key) ~= nil then
+			buffer:writeRaw(", ")
+		end
+	end
+
+	buffer:writeRaw("}")
+end
+
+--[[
+	The default implementation of __fmtDebug for tables with the extended option
+	set.
+]]
+local function defaultTableDebugExtended(buffer, input)
+	-- Special case for empty tables.
+	if next(input) == nil then
+		buffer:writeRaw("{}")
+		return
+	end
+
+	buffer:writeLineRaw("{")
+	buffer:indent()
+
+	for key, value in pairs(input) do
+		buffer:writeLine("[{:?}] = {:#?},", key, value)
+	end
+
+	buffer:unindent()
+	buffer:writeRaw("}")
+end
+
+--[[
+	The default debug representation for all types.
+]]
+local function debugImpl(buffer, value, extendedForm)
+	local valueType = typeof(value)
+
+	if valueType == "string" then
+		local formatted = string.format("%q", value)
+		buffer:writeRaw(formatted)
+	elseif valueType == "table" then
+		local valueMeta = getmetatable(value)
+
+		if valueMeta ~= nil and  valueMeta.__fmtDebug ~= nil then
+			-- This type implement's the metamethod we made up to line up with
+			-- Rust's 'Debug' trait.
+
+			valueMeta.__fmtDebug(value, buffer, extendedForm)
+		else
+			if extendedForm then
+				defaultTableDebugExtended(buffer, value)
+			else
+				defaultTableDebug(buffer, value)
+			end
+		end
+	elseif valueType == "Instance" then
+		buffer:writeRaw(value:GetFullName())
+	else
+		buffer:writeRaw(tostring(value))
+	end
+end
+
+--[[
+	Defines and implements the library's template syntax.
+]]
+local function writeFmt(buffer, template, ...)
+	local currentArg = 0
+	local i = 1
+	local len = #template
+
+	while i <= len do
+		local openBrace = template:find("{", i)
+
+		if openBrace == nil then
+			-- There are no remaining open braces in this string, so we can
+			-- write the rest of the string to the buffer.
+
+			buffer:writeRaw(template:sub(i))
+			break
+		else
+			-- We found an open brace! This could be:
+			-- - A literal '{', written as '{{'
+			-- - The beginning of an interpolation, like '{}'
+			-- - An error, if there's no matching '}'
+
+			local charAfterBrace = template:sub(openBrace + 1, openBrace + 1)
+			if charAfterBrace == "{" then
+				-- This is a literal brace, so we'll write everything up to this
+				-- point (including the first brace), and then skip over the
+				-- second brace.
+
+				buffer:writeRaw(template:sub(i, openBrace))
+				i = openBrace + 2
+			else
+				-- This SHOULD be an interpolation. We'll find our matching
+				-- brace and treat the contents as the formatting specifier.
+
+				-- If there were any unwritten characters before this
+				-- interpolation, write them to the buffer.
+				if openBrace - i > 0 then
+					buffer:writeRaw(template:sub(i, openBrace - 1))
+				end
+
+				local closeBrace = template:find("}", openBrace + 1)
+				assert(closeBrace ~= nil, "Unclosed formatting specifier. Use '{{' to write an open brace.")
+
+				local formatSpecifier = template:sub(openBrace + 1, closeBrace - 1)
+				currentArg = currentArg + 1
+				local arg = select(currentArg, ...)
+
+				if formatSpecifier == "" then
+					-- This should use the equivalent of Rust's 'Display', ie
+					-- tostring and the __tostring metamethod.
+
+					buffer:writeRaw(tostring(arg))
+				elseif formatSpecifier == ":?" then
+					-- This should use the equivalent of Rust's 'Debug',
+					-- invented for this library as __fmtDebug.
+
+					debugImpl(buffer, arg, false)
+				elseif formatSpecifier == ":#?" then
+					-- This should use the equivlant of Rust's 'Debug' with the
+					-- 'alternate' (ie expanded) flag set.
+
+					debugImpl(buffer, arg, true)
+				else
+					error("unsupported format specifier " .. formatSpecifier, 2)
+				end
+
+				i = closeBrace + 1
+			end
+		end
+	end
+end
+
+local function debugOutputBuffer()
+	local buffer = {}
+	local startOfLine = true
+	local indentLevel = 0
+	local indentation = ""
+
+	function buffer:writeLine(template, ...)
+		writeFmt(self, template, ...)
+		self:nextLine()
+	end
+
+	function buffer:writeLineRaw(value)
+		self:writeRaw(value)
+		self:nextLine()
+	end
+
+	function buffer:write(template, ...)
+		return writeFmt(self, template, ...)
+	end
+
+	function buffer:writeRaw(value)
+		if #value > 0 then
+			if startOfLine and #indentation > 0 then
+				startOfLine = false
+				table.insert(self, indentation)
+			end
+
+			table.insert(self, value)
+			startOfLine = false
+		end
+	end
+
+	function buffer:nextLine()
+		table.insert(self, "\n")
+		startOfLine = true
+	end
+
+	function buffer:indent()
+		indentLevel = indentLevel + 1
+		indentation = string.rep("    ", indentLevel)
+	end
+
+	function buffer:unindent()
+		indentLevel = math.max(0, indentLevel - 1)
+		indentation = string.rep("    ", indentLevel)
+	end
+
+	function buffer:finish()
+		return table.concat(self, "")
+	end
+
+	return buffer
+end
+
+local function fmt(template, ...)
+	local buffer = debugOutputBuffer()
+	writeFmt(buffer, template, ...)
+	return buffer:finish()
+end
+
+--[[
+	Wrap the given object in a type that implements the given function as its
+	Debug implementation, and forwards __tostring to the type's underlying
+	tostring implementation.
+]]
+local function debugify(object, fmtFunc)
+	return setmetatable({}, {
+		__fmtDebug = function(_, ...)
+			return fmtFunc(object, ...)
+		end,
+		__tostring = function()
+			return tostring(object)
+		end,
+	})
+end
+
+return {
+	debugOutputBuffer = debugOutputBuffer,
+	fmt = fmt,
+	debugify = debugify,
+}

plugin/http/Error.lua

@@ -1,9 +1,7 @@
-local Logging = require(script.Parent.Logging)
+local Error = {}
+Error.__index = Error
 
-local HttpError = {}
-HttpError.__index = HttpError
-
-HttpError.Error = {
+Error.Kind = {
 	HttpNotEnabled = {
 		message = "Rojo requires HTTP access, which is not enabled.\n" ..
 			"Check your game settings, located in the 'Home' tab of Studio.",
@@ -13,20 +11,20 @@ HttpError.Error = {
 			"Make sure the server is running -- use 'rojo serve' to run it!",
 	},
 	Timeout = {
-		message = "Request timed out.",
+		message = "HTTP request timed out.",
 	},
 	Unknown = {
-		message = "Unknown error: {{message}}",
+		message = "Unknown HTTP error: {{message}}",
 	},
 }
 
-setmetatable(HttpError.Error, {
+setmetatable(Error.Kind, {
 	__index = function(_, key)
-		error(("%q is not a valid member of HttpError.Error"):format(tostring(key)), 2)
+		error(("%q is not a valid member of Http.Error.Kind"):format(tostring(key)), 2)
 	end,
 })
 
-function HttpError.new(type, extraMessage)
+function Error.new(type, extraMessage)
 	extraMessage = extraMessage or ""
 	local message = type.message:gsub("{{message}}", extraMessage)
 
@@ -35,38 +33,34 @@ function HttpError.new(type, extraMessage)
 		message = message,
 	}
 
-	setmetatable(err, HttpError)
+	setmetatable(err, Error)
 
 	return err
 end
 
-function HttpError:__tostring()
+function Error:__tostring()
 	return self.message
 end
 
 --[[
 	This method shouldn't have to exist. Ugh.
 ]]
-function HttpError.fromErrorString(message)
+function Error.fromRobloxErrorString(message)
 	local lower = message:lower()
 
 	if lower:find("^http requests are not enabled") then
-		return HttpError.new(HttpError.Error.HttpNotEnabled)
+		return Error.new(Error.Kind.HttpNotEnabled)
 	end
 
 	if lower:find("^httperror: timedout") then
-		return HttpError.new(HttpError.Error.Timeout)
+		return Error.new(Error.Kind.Timeout)
 	end
 
 	if lower:find("^httperror: connectfail") then
-		return HttpError.new(HttpError.Error.ConnectFailed)
+		return Error.new(Error.Kind.ConnectFailed)
 	end
 
-	return HttpError.new(HttpError.Error.Unknown, message)
+	return Error.new(Error.Kind.Unknown, message)
 end
 
-function HttpError:report()
-	Logging.warn(self.message)
-end
-
-return HttpError
+return Error

plugin/http/Response.lua

@@ -1,34 +1,34 @@
 local HttpService = game:GetService("HttpService")
 
 local stringTemplate = [[
-HttpResponse {
+Http.Response {
 	code: %d
 	body: %s
 }]]
 
-local HttpResponse = {}
-HttpResponse.__index = HttpResponse
+local Response = {}
+Response.__index = Response
 
-function HttpResponse:__tostring()
+function Response:__tostring()
 	return stringTemplate:format(self.code, self.body)
 end
 
-function HttpResponse.fromRobloxResponse(response)
+function Response.fromRobloxResponse(response)
 	local self = {
 		body = response.Body,
 		code = response.StatusCode,
 		headers = response.Headers,
 	}
 
-	return setmetatable(self, HttpResponse)
+	return setmetatable(self, Response)
 end
 
-function HttpResponse:isSuccess()
+function Response:isSuccess()
 	return self.code >= 200 and self.code < 300
 end
 
-function HttpResponse:json()
+function Response:json()
 	return HttpService:JSONDecode(self.body)
 end
 
-return HttpResponse
+return Response

plugin/http/init.lua

@@ -0,0 +1,66 @@
+local HttpService = game:GetService("HttpService")
+
+local Promise = require(script.Parent.Promise)
+local Log = require(script.Parent.Log)
+
+local HttpError = require(script.Error)
+local HttpResponse = require(script.Response)
+
+local lastRequestId = 0
+
+local Http = {}
+
+Http.Error = HttpError
+Http.Response = HttpResponse
+
+local function performRequest(requestParams)
+	local requestId = lastRequestId + 1
+	lastRequestId = requestId
+
+	Log.trace("HTTP {}({}) {}", requestParams.Method, requestId, requestParams.Url)
+
+	if requestParams.Body ~= nil then
+		Log.trace("{}", requestParams.Body)
+	end
+
+	return Promise.new(function(resolve, reject)
+		coroutine.wrap(function()
+			local success, response = pcall(function()
+				return HttpService:RequestAsync(requestParams)
+			end)
+
+			if success then
+				Log.trace("Request {} success, status code {}", requestId, response.StatusCode)
+				resolve(HttpResponse.fromRobloxResponse(response))
+			else
+				Log.trace("Request {} failure: {:?}", requestId, response)
+				reject(HttpError.fromRobloxErrorString(response))
+			end
+		end)()
+	end)
+end
+
+function Http.get(url)
+	return performRequest({
+		Url = url,
+		Method = "GET",
+	})
+end
+
+function Http.post(url, body)
+	return performRequest({
+		Url = url,
+		Method = "POST",
+		Body = body,
+	})
+end
+
+function Http.jsonEncode(object)
+	return HttpService:JSONEncode(object)
+end
+
+function Http.jsonDecode(source)
+	return HttpService:JSONDecode(source)
+end
+
+return Http

plugin/http/init.spec.lua

@@ -0,0 +1,5 @@
+return function()
+	it("should load", function()
+		require(script.Parent)
+	end)
+end

plugin/loadEnvironment.lua

@@ -1,37 +0,0 @@
---[[
-	Loads the Rojo plugin and all of its dependencies.
-]]
-
-local function loadEnvironment()
-	-- If you add any dependencies, add them to this table so they'll be loaded!
-	local LOAD_MODULES = {
-		{"src", "Rojo"},
-		{"modules/promise/lib", "Promise"},
-		{"modules/testez/lib", "TestEZ"},
-	}
-
-	-- This makes sure we can load Lemur and other libraries that depend on init.lua
-	package.path = package.path .. ";?/init.lua"
-
-	-- If this fails, make sure you've run `lua bin/install-dependencies.lua` first!
-	local lemur = require("modules.lemur")
-
-	-- Create a virtual Roblox tree
-	local habitat = lemur.Habitat.new()
-
-	-- We'll put all of our library code and dependencies here
-	local modules = lemur.Instance.new("Folder")
-	modules.Name = "Modules"
-	modules.Parent = habitat.game:GetService("ReplicatedStorage")
-
-	-- Load all of the modules specified above
-	for _, module in ipairs(LOAD_MODULES) do
-		local container = habitat:loadFromFs(module[1])
-		container.Name = module[2]
-		container.Parent = modules
-	end
-
-	return habitat, modules
-end
-
-return loadEnvironment

plugin/log/init.lua

@@ -1,49 +1,55 @@
-local DevSettings = require(script.Parent.DevSettings)
+local Fmt = require(script.Parent.Fmt)
 
 local Level = {
 	Error = 0,
 	Warning = 1,
 	Info = 2,
-	Trace = 3,
+	Debug = 3,
+	Trace = 4,
 }
 
-local testLogLevel = nil
-
 local function getLogLevel()
-	if testLogLevel ~= nil then
-		return testLogLevel
-	end
-
-	return DevSettings:getLogLevel()
+	return Level.Info
 end
 
 local function addTags(tag, message)
 	return tag .. message:gsub("\n", "\n" .. tag)
 end
 
-local INFO_TAG = (" "):rep(15) .. "[Rojo-Info] "
 local TRACE_TAG = (" "):rep(15) .. "[Rojo-Trace] "
+local INFO_TAG = (" "):rep(15) .. "[Rojo-Info] "
+local DEBUG_TAG = (" "):rep(15) .. "[Rojo-Debug] "
 local WARN_TAG = "[Rojo-Warn] "
 
 local Log = {}
 
 Log.Level = Level
 
+function Log.setLogLevelThunk(thunk)
+	getLogLevel = thunk
+end
+
 function Log.trace(template, ...)
 	if getLogLevel() >= Level.Trace then
-		print(addTags(TRACE_TAG, string.format(template, ...)))
+		print(addTags(TRACE_TAG, Fmt.fmt(template, ...)))
 	end
 end
 
 function Log.info(template, ...)
 	if getLogLevel() >= Level.Info then
-		print(addTags(INFO_TAG, string.format(template, ...)))
+		print(addTags(INFO_TAG, Fmt.fmt(template, ...)))
+	end
+end
+
+function Log.debug(template, ...)
+	if getLogLevel() >= Level.Debug then
+		print(addTags(DEBUG_TAG, Fmt.fmt(template, ...)))
 	end
 end
 
 function Log.warn(template, ...)
 	if getLogLevel() >= Level.Warning then
-		warn(addTags(WARN_TAG, string.format(template, ...)))
+		warn(addTags(WARN_TAG, Fmt.fmt(template, ...)))
 	end
 end
 

plugin/log/init.spec.lua

@@ -0,0 +1,5 @@
+return function()
+	it("should load", function()
+		require(script.Parent)
+	end)
+end

plugin/place.project.json

@@ -1,51 +0,0 @@
-{
-  "name": "rojo",
-  "tree": {
-    "$className": "DataModel",
-
-    "ReplicatedStorage": {
-      "$className": "ReplicatedStorage",
-
-      "Rojo": {
-        "$className": "Folder",
-
-        "Plugin": {
-          "$path": "src"
-        },
-        "Roact": {
-          "$path": "modules/roact/lib"
-        },
-        "Rodux": {
-          "$path": "modules/rodux/lib"
-        },
-        "RoactRodux": {
-          "$path": "modules/roact-rodux/lib"
-        },
-        "Promise": {
-          "$path": "modules/promise/lib"
-        }
-      },
-      "TestEZ": {
-        "$path": "modules/testez/lib"
-      }
-    },
-
-    "HttpService": {
-      "$className": "HttpService",
-      "$properties": {
-        "HttpEnabled": {
-          "Type": "Bool",
-          "Value": true
-        }
-      }
-    },
-
-    "TestService": {
-      "$className": "TestService",
-
-      "TestBootstrap": {
-        "$path": "testBootstrap.server.lua"
-      }
-    }
-  }
-}

plugin/rojo.json

@@ -1,34 +0,0 @@
-{
-  "name": "rojo",
-  "servePort": 8000,
-  "partitions": {
-    "plugin": {
-      "path": "src",
-      "target": "ReplicatedStorage.Rojo.Plugin"
-    },
-    "modules/roact": {
-      "path": "modules/roact/lib",
-      "target": "ReplicatedStorage.Rojo.Roact"
-    },
-    "modules/rodux": {
-      "path": "modules/rodux/lib",
-      "target": "ReplicatedStorage.Rojo.Rodux"
-    },
-    "modules/roact-rodux": {
-      "path": "modules/roact-rodux/lib",
-      "target": "ReplicatedStorage.Rojo.RoactRodux"
-    },
-    "modules/promise": {
-      "path": "modules/promise/lib",
-      "target": "ReplicatedStorage.Rojo.Promise"
-    },
-    "modules/testez": {
-      "path": "modules/testez/lib",
-      "target": "ReplicatedStorage.TestEZ"
-    },
-    "tests": {
-      "path": "testBootstrap.server.lua",
-      "target": "TestService.testBootstrap"
-    }
-  }
-}

plugin/runTest.lua

@@ -1,15 +0,0 @@
-local loadEnvironment = require("loadEnvironment")
-
-local testPath = assert((...), "Please specify a path to a test file.")
-
-local habitat = loadEnvironment()
-
-local testModule = habitat:loadFromFs(testPath)
-
-if testModule == nil then
-	error("Couldn't find test file at " .. testPath)
-end
-
-print("Starting test module.")
-
-habitat:require(testModule)

plugin/spec.lua

@@ -1,17 +0,0 @@
---[[
-	Loads our library and all of its dependencies, then runs tests using TestEZ.
-]]
-
-local loadEnvironment = require("loadEnvironment")
-
-local habitat, modules = loadEnvironment()
-
--- Load TestEZ and run our tests
-local TestEZ = habitat:require(modules.TestEZ)
-
-local results = TestEZ.TestBootstrap:run({modules.Rojo}, TestEZ.Reporters.TextReporter)
-
--- Did something go wrong?
-if results.failureCount > 0 then
-	os.exit(1)
-end

plugin/src/ApiContext.lua

@@ -1,150 +1,216 @@
+local Http = require(script.Parent.Parent.Http)
+local Log = require(script.Parent.Parent.Log)
 local Promise = require(script.Parent.Parent.Promise)
 
 local Config = require(script.Parent.Config)
+local Types = require(script.Parent.Types)
 local Version = require(script.Parent.Version)
-local Http = require(script.Parent.Http)
-local HttpError = require(script.Parent.HttpError)
 
-local ApiContext = {}
-ApiContext.__index = ApiContext
+local validateApiInfo = Types.ifEnabled(Types.ApiInfoResponse)
+local validateApiRead = Types.ifEnabled(Types.ApiReadResponse)
+local validateApiSubscribe = Types.ifEnabled(Types.ApiSubscribeResponse)
 
--- TODO: Audit cases of errors and create enum values for each of them.
-ApiContext.Error = {
-	ServerIdMismatch = "ServerIdMismatch",
-
-	-- The server gave an unexpected 400-category error, which may be the
-	-- client's fault.
-	ClientError = "ClientError",
-
-	-- The server gave an unexpected 500-category error, which may be the
-	-- server's fault.
-	ServerError = "ServerError",
-}
-
-setmetatable(ApiContext.Error, {
-	__index = function(_, key)
-		error("Invalid ApiContext.Error name " .. key, 2)
-	end
-})
+--[[
+	Returns a promise that will never resolve nor reject.
+]]
+local function hangingPromise()
+	return Promise.new(function() end)
+end
 
 local function rejectFailedRequests(response)
 	if response.code >= 400 then
-		if response.code < 500 then
-			return Promise.reject(ApiContext.Error.ClientError)
-		else
-			return Promise.reject(ApiContext.Error.ServerError)
-		end
+		local message = string.format("HTTP %s:\n%s", tostring(response.code), response.body)
+
+		return Promise.reject(message)
 	end
 
 	return response
 end
 
+local function rejectWrongProtocolVersion(infoResponseBody)
+	if infoResponseBody.protocolVersion ~= Config.protocolVersion then
+		local message = (
+			"Found a Rojo dev server, but it's using a different protocol version, and is incompatible." ..
+			"\nMake sure you have matching versions of both the Rojo plugin and server!" ..
+			"\n\nYour client is version %s, with protocol version %s. It expects server version %s." ..
+			"\nYour server is version %s, with protocol version %s." ..
+			"\n\nGo to https://github.com/rojo-rbx/rojo for more details."
+		):format(
+			Version.display(Config.version), Config.protocolVersion,
+			Config.expectedServerVersionString,
+			infoResponseBody.serverVersion, infoResponseBody.protocolVersion
+		)
+
+		return Promise.reject(message)
+	end
+
+	return Promise.resolve(infoResponseBody)
+end
+
+local function rejectWrongPlaceId(infoResponseBody)
+	if infoResponseBody.expectedPlaceIds ~= nil then
+		local foundId = false
+
+		for _, id in ipairs(infoResponseBody.expectedPlaceIds) do
+			if id == game.PlaceId then
+				foundId = true
+				break
+			end
+		end
+
+		if not foundId then
+			local idList = {}
+			for _, id in ipairs(infoResponseBody.expectedPlaceIds) do
+				table.insert(idList, "- " .. tostring(id))
+			end
+
+			local message = (
+				"Found a Rojo server, but its project is set to only be used with a specific list of places." ..
+				"\nYour place ID is %s, but needs to be one of these:" ..
+				"\n%s" ..
+				"\n\nTo change this list, edit 'servePlaceIds' in your .project.json file."
+			):format(
+				tostring(game.PlaceId),
+				table.concat(idList, "\n")
+			)
+
+			return Promise.reject(message)
+		end
+	end
+
+	return Promise.resolve(infoResponseBody)
+end
+
+local ApiContext = {}
+ApiContext.__index = ApiContext
+
 function ApiContext.new(baseUrl)
 	assert(type(baseUrl) == "string")
 
 	local self = {
-		baseUrl = baseUrl,
-		serverId = nil,
-		rootInstanceId = nil,
-		messageCursor = -1,
-		partitionRoutes = nil,
+		__baseUrl = baseUrl,
+		__sessionId = nil,
+		__messageCursor = -1,
+		__connected = true,
 	}
 
-	setmetatable(self, ApiContext)
-
-	return self
+	return setmetatable(self, ApiContext)
 end
 
-function ApiContext:onMessage(callback)
-	self.onMessageCallback = callback
+function ApiContext:__fmtDebug(output)
+	output:writeLine("ApiContext {{")
+	output:indent()
+
+	output:writeLine("Connected: {}", self.__connected)
+	output:writeLine("Base URL: {}", self.__baseUrl)
+	output:writeLine("Session ID: {}", self.__sessionId)
+	output:writeLine("Message Cursor: {}", self.__messageCursor)
+
+	output:unindent()
+	output:write("}")
+end
+
+function ApiContext:disconnect()
+	self.__connected = false
+end
+
+function ApiContext:setMessageCursor(index)
+	self.__messageCursor = index
 end
 
 function ApiContext:connect()
-	local url = ("%s/api/rojo"):format(self.baseUrl)
+	local url = ("%s/api/rojo"):format(self.__baseUrl)
 
 	return Http.get(url)
 		:andThen(rejectFailedRequests)
-		:andThen(function(response)
-			local body = response:json()
+		:andThen(Http.Response.json)
+		:andThen(rejectWrongProtocolVersion)
+		:andThen(function(body)
+			assert(validateApiInfo(body))
 
-			if body.protocolVersion ~= Config.protocolVersion then
-				local message = (
-					"Found a Rojo dev server, but it's using a different protocol version, and is incompatible." ..
-					"\nMake sure you have matching versions of both the Rojo plugin and server!" ..
-					"\n\nYour client is version %s, with protocol version %s. It expects server version %s." ..
-					"\nYour server is version %s, with protocol version %s." ..
-					"\n\nGo to https://github.com/LPGhatguy/rojo for more details."
-				):format(
-					Version.display(Config.version), Config.protocolVersion,
-					Config.expectedApiContextVersionString,
-					body.serverVersion, body.protocolVersion
-				)
+			return body
+		end)
+		:andThen(rejectWrongPlaceId)
+		:andThen(function(body)
+			self.__sessionId = body.sessionId
 
-				return Promise.reject(message)
-			end
-
-			if body.expectedPlaceIds ~= nil then
-				local foundId = false
-
-				for _, id in ipairs(body.expectedPlaceIds) do
-					if id == game.PlaceId then
-						foundId = true
-						break
-					end
-				end
-
-				if not foundId then
-					local idList = {}
-					for _, id in ipairs(body.expectedPlaceIds) do
-						table.insert(idList, "- " .. tostring(id))
-					end
-
-					local message = (
-						"Found a Rojo server, but its project is set to only be used with a specific list of places." ..
-						"\nYour place ID is %s, but needs to be one of these:" ..
-						"\n%s" ..
-						"\n\nTo change this list, edit 'servePlaceIds' in roblox-project.json"
-					):format(
-						tostring(game.PlaceId),
-						table.concat(idList, "\n")
-					)
-
-					return Promise.reject(message)
-				end
-			end
-
-			self.serverId = body.serverId
-			self.partitionRoutes = body.partitions
-			self.rootInstanceId = body.rootInstanceId
+			return body
 		end)
 end
 
 function ApiContext:read(ids)
-	local url = ("%s/api/read/%s"):format(self.baseUrl, table.concat(ids, ","))
+	local url = ("%s/api/read/%s"):format(self.__baseUrl, table.concat(ids, ","))
 
 	return Http.get(url)
 		:andThen(rejectFailedRequests)
-		:andThen(function(response)
-			local body = response:json()
-
-			if body.serverId ~= self.serverId then
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			if body.sessionId ~= self.__sessionId then
 				return Promise.reject("Server changed ID")
 			end
 
-			self.messageCursor = body.messageCursor
+			assert(validateApiRead(body))
+
+			return body
+		end)
+end
+
+function ApiContext:write(patch)
+	local url = ("%s/api/write"):format(self.__baseUrl)
+
+	local updated = {}
+	for _, update in ipairs(patch.updated) do
+		local fixedUpdate = {
+			id = update.id,
+			changedName = update.changedName,
+		}
+
+		if next(update.changedProperties) ~= nil then
+			fixedUpdate.changedProperties = update.changedProperties
+		end
+
+		table.insert(updated, fixedUpdate)
+	end
+
+	-- Only add the 'added' field if the table is non-empty, or else Roblox's
+	-- JSON implementation will turn the table into an array instead of an
+	-- object, causing API validation to fail.
+	local added
+	if next(patch.added) ~= nil then
+		added = patch.added
+	end
+
+	local body = {
+		sessionId = self.__sessionId,
+		removed = patch.removed,
+		updated = updated,
+		added = added,
+	}
+
+	body = Http.jsonEncode(body)
+
+	return Http.post(url, body)
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			Log.info("Write response: {:?}", body)
 
 			return body
 		end)
 end
 
 function ApiContext:retrieveMessages()
-	local url = ("%s/api/subscribe/%s"):format(self.baseUrl, self.messageCursor)
+	local url = ("%s/api/subscribe/%s"):format(self.__baseUrl, self.__messageCursor)
 
 	local function sendRequest()
 		return Http.get(url)
 			:catch(function(err)
-				if err.type == HttpError.Error.Timeout then
-					return sendRequest()
+				if err.type == Http.Error.Kind.Timeout then
+					if self.__connected then
+						return sendRequest()
+					else
+						return hangingPromise()
+					end
 				end
 
 				return Promise.reject(err)
@@ -153,14 +219,15 @@ function ApiContext:retrieveMessages()
 
 	return sendRequest()
 		:andThen(rejectFailedRequests)
-		:andThen(function(response)
-			local body = response:json()
-
-			if body.serverId ~= self.serverId then
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			if body.sessionId ~= self.__sessionId then
 				return Promise.reject("Server changed ID")
 			end
 
-			self.messageCursor = body.messageCursor
+			assert(validateApiSubscribe(body))
+
+			self:setMessageCursor(body.messageCursor)
 
 			return body.messages
 		end)

plugin/src/Assets.lua

@@ -1,13 +1,7 @@
-local sheetAsset = "rbxassetid://2738712459"
+local strict = require(script.Parent.strict)
 
 local Assets = {
-	Sprites = {
-		WhiteCross = {
-			asset = sheetAsset,
-			offset = Vector2.new(190, 318),
-			size = Vector2.new(18, 18),
-		},
-	},
+	Sprites = {},
 	Slices = {
 		RoundBox = {
 			asset = "rbxassetid://2773204550",
@@ -17,7 +11,8 @@ local Assets = {
 		},
 	},
 	Images = {
-		Logo = "rbxassetid://2773210620",
+		Logo = "rbxassetid://3405346157",
+		Icon = "rbxassetid://3405341609",
 	},
 	StartSession = "",
 	SessionActive = "",
@@ -25,11 +20,7 @@ local Assets = {
 }
 
 local function guardForTypos(name, map)
-	setmetatable(map, {
-		__index = function(_, key)
-			error(("%q is not a valid member of %s"):format(tostring(key), name), 2)
-		end
-	})
+	strict(name, map)
 
 	for key, child in pairs(map) do
 		if type(child) == "table" then

plugin/src/Components/App.lua

@@ -1,16 +1,23 @@
-local Roact = require(script:FindFirstAncestor("Rojo").Roact)
+local Rojo = script:FindFirstAncestor("Rojo")
+local Plugin = Rojo.Plugin
 
-local Plugin = script:FindFirstAncestor("Plugin")
+local Roact = require(Rojo.Roact)
+local Log = require(Rojo.Log)
 
+local ApiContext = require(Plugin.ApiContext)
 local Assets = require(Plugin.Assets)
-local Session = require(Plugin.Session)
 local Config = require(Plugin.Config)
-local Version = require(Plugin.Version)
-local Logging = require(Plugin.Logging)
 local DevSettings = require(Plugin.DevSettings)
+local ServeSession = require(Plugin.ServeSession)
+local Version = require(Plugin.Version)
+local preloadAssets = require(Plugin.preloadAssets)
+local strict = require(Plugin.strict)
 
+local Theme = require(Plugin.Components.Theme)
 local ConnectPanel = require(Plugin.Components.ConnectPanel)
+local ConnectingPanel = require(Plugin.Components.ConnectingPanel)
 local ConnectionActivePanel = require(Plugin.Components.ConnectionActivePanel)
+local ErrorPanel = require(Plugin.Components.ErrorPanel)
 
 local e = Roact.createElement
 
@@ -24,7 +31,7 @@ local function showUpgradeMessage(lastVersion)
 		Version.display(Config.version), Config.expectedServerVersionString
 	)
 
-	Logging.info(message)
+	Log.info(message)
 end
 
 --[[
@@ -50,145 +57,171 @@ local function checkUpgrade(plugin)
 	plugin:SetSetting("LastRojoVersion", Config.version)
 end
 
-local SessionStatus = {
-	Disconnected = "Disconnected",
+local AppStatus = strict("AppStatus", {
+	NotStarted = "NotStarted",
+	Connecting = "Connecting",
 	Connected = "Connected",
-	ConfiguringSession = "ConfiguringSession",
-	-- TODO: Error?
-}
-
-setmetatable(SessionStatus, {
-	__index = function(_, key)
-		error(("%q is not a valid member of SessionStatus"):format(tostring(key)), 2)
-	end,
+	Error = "Error",
 })
 
 local App = Roact.Component:extend("App")
 
 function App:init()
 	self:setState({
-		sessionStatus = SessionStatus.Disconnected,
+		appStatus = AppStatus.NotStarted,
+		errorMessage = nil,
 	})
 
-	self.connectButton = nil
-	self.currentSession = nil
+	self.signals = {}
+	self.serveSession = nil
 
 	self.displayedVersion = DevSettings:isEnabled()
 		and Config.codename
 		or Version.display(Config.version)
+
+	local toolbar = self.props.plugin:CreateToolbar("Rojo " .. self.displayedVersion)
+
+	self.toggleButton = toolbar:CreateButton(
+		"Rojo",
+		"Show or hide the Rojo panel",
+		Assets.Images.Icon)
+	self.toggleButton.ClickableWhenViewportHidden = true
+	self.toggleButton.Click:Connect(function()
+		self.dockWidget.Enabled = not self.dockWidget.Enabled
+	end)
+
+	local widgetInfo = DockWidgetPluginGuiInfo.new(
+		Enum.InitialDockState.Right,
+		false, -- Initially enabled state
+		false, -- Whether to override the widget's previous state
+		360, 190, -- Floating size
+		360, 190 -- Minimum size
+	)
+
+	self.dockWidget = self.props.plugin:CreateDockWidgetPluginGui("Rojo-" .. self.displayedVersion, widgetInfo)
+	self.dockWidget.Name = "Rojo " .. self.displayedVersion
+	self.dockWidget.Title = "Rojo " .. self.displayedVersion
+	self.dockWidget.AutoLocalize = false
+	self.dockWidget.ZIndexBehavior = Enum.ZIndexBehavior.Sibling
+
+	self.signals.dockWidgetEnabled = self.dockWidget:GetPropertyChangedSignal("Enabled"):Connect(function()
+		self.toggleButton:SetActive(self.dockWidget.Enabled)
+	end)
+end
+
+function App:startSession(address, port)
+	Log.trace("Starting new session")
+
+	local baseUrl = ("http://%s:%s"):format(address, port)
+	self.serveSession = ServeSession.new({
+		apiContext = ApiContext.new(baseUrl),
+	})
+
+	self.serveSession:onStatusChanged(function(status, details)
+		if status == ServeSession.Status.Connecting then
+			self:setState({
+				appStatus = AppStatus.Connecting,
+			})
+		elseif status == ServeSession.Status.Connected then
+			self:setState({
+				appStatus = AppStatus.Connected,
+			})
+		elseif status == ServeSession.Status.Disconnected then
+			self.serveSession = nil
+
+			-- Details being present indicates that this
+			-- disconnection was from an error.
+			if details ~= nil then
+				Log.warn("Disconnected from an error: {}", details)
+
+				self:setState({
+					appStatus = AppStatus.Error,
+					errorMessage = tostring(details),
+				})
+			else
+				self:setState({
+					appStatus = AppStatus.NotStarted,
+				})
+			end
+		end
+	end)
+
+	self.serveSession:start()
 end
 
 function App:render()
 	local children
 
-	if self.state.sessionStatus == SessionStatus.Connected then
-		children = {
-			ConnectionActivePanel = e(ConnectionActivePanel, {
-				stopSession = function()
-					Logging.trace("Disconnecting session")
-
-					self.currentSession:disconnect()
-					self.currentSession = nil
-					self:setState({
-						sessionStatus = SessionStatus.Disconnected,
-					})
-
-					Logging.trace("Session terminated by user")
-				end,
-			}),
-		}
-	elseif self.state.sessionStatus == SessionStatus.ConfiguringSession then
+	if self.state.appStatus == AppStatus.NotStarted then
 		children = {
 			ConnectPanel = e(ConnectPanel, {
 				startSession = function(address, port)
-					Logging.trace("Starting new session")
-
-					local success, session = Session.new({
-						address = address,
-						port = port,
-						onError = function(message)
-							Logging.warn("Rojo session terminated because of an error:\n%s", tostring(message))
-							self.currentSession = nil
-
-							self:setState({
-								sessionStatus = SessionStatus.Disconnected,
-							})
-						end
-					})
-
-					if success then
-						self.currentSession = session
-						self:setState({
-							sessionStatus = SessionStatus.Connected,
-						})
-					end
+					self:startSession(address, port)
 				end,
 				cancel = function()
-					Logging.trace("Canceling session configuration")
+					Log.trace("Canceling session configuration")
 
 					self:setState({
-						sessionStatus = SessionStatus.Disconnected,
+						appStatus = AppStatus.NotStarted,
+					})
+				end,
+			}),
+		}
+	elseif self.state.appStatus == AppStatus.Connecting then
+		children = {
+			ConnectingPanel = Roact.createElement(ConnectingPanel),
+		}
+	elseif self.state.appStatus == AppStatus.Connected then
+		children = {
+			ConnectionActivePanel = e(ConnectionActivePanel, {
+				stopSession = function()
+					Log.trace("Disconnecting session")
+
+					self.serveSession:stop()
+					self.serveSession = nil
+					self:setState({
+						appStatus = AppStatus.NotStarted,
+					})
+
+					Log.trace("Session terminated by user")
+				end,
+			}),
+		}
+	elseif self.state.appStatus == AppStatus.Error then
+		children = {
+			ErrorPanel = Roact.createElement(ErrorPanel, {
+				errorMessage = self.state.errorMessage,
+				onDismiss = function()
+					self:setState({
+						appStatus = AppStatus.NotStarted,
 					})
 				end,
 			}),
 		}
 	end
 
-	return e("ScreenGui", {
-		AutoLocalize = false,
-		ZIndexBehavior = Enum.ZIndexBehavior.Sibling,
-	}, children)
+	return Roact.createElement(Theme.StudioProvider, nil, {
+		UI = Roact.createElement(Roact.Portal, {
+			target = self.dockWidget,
+		}, children),
+	})
 end
 
 function App:didMount()
-	Logging.trace("Rojo %s initializing", self.displayedVersion)
+	Log.trace("Rojo {} initializing", self.displayedVersion)
 
-	local toolbar = self.props.plugin:CreateToolbar("Rojo " .. self.displayedVersion)
-
-	self.connectButton = toolbar:CreateButton(
-		"Connect",
-		"Connect to a running Rojo session",
-		Assets.StartSession)
-	self.connectButton.ClickableWhenViewportHidden = false
-	self.connectButton.Click:Connect(function()
-		checkUpgrade(self.props.plugin)
-
-		if self.state.sessionStatus == SessionStatus.Connected then
-			Logging.trace("Disconnecting session")
-
-			self.currentSession:disconnect()
-			self.currentSession = nil
-			self:setState({
-				sessionStatus = SessionStatus.Disconnected,
-			})
-
-			Logging.trace("Session terminated by user")
-		elseif self.state.sessionStatus == SessionStatus.Disconnected then
-			Logging.trace("Starting session configuration")
-
-			self:setState({
-				sessionStatus = SessionStatus.ConfiguringSession,
-			})
-		elseif self.state.sessionStatus == SessionStatus.ConfiguringSession then
-			Logging.trace("Canceling session configuration")
-
-			self:setState({
-				sessionStatus = SessionStatus.Disconnected,
-			})
-		end
-	end)
+	checkUpgrade(self.props.plugin)
+	preloadAssets()
 end
 
-function App:didUpdate()
-	local connectActive = self.state.sessionStatus == SessionStatus.ConfiguringSession
-		or self.state.sessionStatus == SessionStatus.Connected
+function App:willUnmount()
+	if self.serveSession ~= nil then
+		self.serveSession:stop()
+		self.serveSession = nil
+	end
 
-	self.connectButton:SetActive(connectActive)
-
-	if self.state.sessionStatus == SessionStatus.Connected then
-		self.connectButton.Icon = Assets.SessionActive
-	else
-		self.connectButton.Icon = Assets.StartSession
+	for _, signal in pairs(self.signals) do
+		signal:Disconnect()
 	end
 end
 

plugin/src/Components/ConnectPanel.lua

@@ -4,39 +4,19 @@ local Plugin = Rojo.Plugin
 local Roact = require(Rojo.Roact)
 
 local Config = require(Plugin.Config)
-local Version = require(Plugin.Version)
-local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.Theme)
-local joinBindings = require(Plugin.joinBindings)
 
+local Theme = require(Plugin.Components.Theme)
+local Panel = require(Plugin.Components.Panel)
 local FitList = require(Plugin.Components.FitList)
 local FitText = require(Plugin.Components.FitText)
 local FormButton = require(Plugin.Components.FormButton)
 local FormTextInput = require(Plugin.Components.FormTextInput)
 
-local RoundBox = Assets.Slices.RoundBox
-
 local e = Roact.createElement
 
 local ConnectPanel = Roact.Component:extend("ConnectPanel")
 
 function ConnectPanel:init()
-	self.footerSize, self.setFooterSize = Roact.createBinding(Vector2.new())
-	self.footerVersionSize, self.setFooterVersionSize = Roact.createBinding(Vector2.new())
-
-	-- This is constructed in init because 'joinBindings' is a hack and we'd
-	-- leak memory constructing it every render. When this kind of feature lands
-	-- in Roact properly, we can do this inline in render without fear.
-	self.footerRestSize = joinBindings(
-		{
-			self.footerSize,
-			self.footerVersionSize,
-		},
-		function(container, other)
-			return UDim2.new(0, container.X - other.X - 16, 0, 32)
-		end
-	)
-
 	self:setState({
 		address = "",
 		port = "",
@@ -45,217 +25,139 @@ end
 
 function ConnectPanel:render()
 	local startSession = self.props.startSession
-	local cancel = self.props.cancel
 
-	return e(FitList, {
-		containerKind = "ImageLabel",
-		containerProps = {
-			Image = RoundBox.asset,
-			ImageRectOffset = RoundBox.offset,
-			ImageRectSize = RoundBox.size,
-			SliceCenter = RoundBox.center,
-			ScaleType = Enum.ScaleType.Slice,
-			BackgroundTransparency = 1,
-			Position = UDim2.new(0.5, 0, 0.5, 0),
-			AnchorPoint = Vector2.new(0.5, 0.5),
-		},
-		layoutProps = {
-			HorizontalAlignment = Enum.HorizontalAlignment.Center,
-		},
-	}, {
-		Inputs = e(FitList, {
-			containerProps = {
-				BackgroundTransparency = 1,
-				LayoutOrder = 1,
-			},
-			layoutProps = {
-				FillDirection = Enum.FillDirection.Horizontal,
-				Padding = UDim.new(0, 8),
-			},
-			paddingProps = {
-				PaddingTop = UDim.new(0, 20),
-				PaddingBottom = UDim.new(0, 10),
-				PaddingLeft = UDim.new(0, 24),
-				PaddingRight = UDim.new(0, 24),
-			},
-		}, {
-			Address = e(FitList, {
-				containerProps = {
-					LayoutOrder = 1,
-					BackgroundTransparency = 1,
-				},
-				layoutProps = {
-					Padding = UDim.new(0, 4),
-				},
-			}, {
-				Label = e(FitText, {
-					Kind = "TextLabel",
-					LayoutOrder = 1,
-					BackgroundTransparency = 1,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					Font = Theme.TitleFont,
-					TextSize = 20,
-					Text = "Address",
-					TextColor3 = Theme.AccentColor,
-				}),
-
-				Input = e(FormTextInput, {
-					layoutOrder = 2,
-					width = UDim.new(0, 220),
-					value = self.state.address,
-					placeholderValue = Config.defaultHost,
-					onValueChange = function(newValue)
-						self:setState({
-							address = newValue,
-						})
-					end,
-				}),
-			}),
-
-			Port = e(FitList, {
-				containerProps = {
-					LayoutOrder = 2,
-					BackgroundTransparency = 1,
-				},
-				layoutProps = {
-					Padding = UDim.new(0, 4),
-				},
-			}, {
-				Label = e(FitText, {
-					Kind = "TextLabel",
-					LayoutOrder = 1,
-					BackgroundTransparency = 1,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					Font = Theme.TitleFont,
-					TextSize = 20,
-					Text = "Port",
-					TextColor3 = Theme.AccentColor,
-				}),
-
-				Input = e(FormTextInput, {
-					layoutOrder = 2,
-					width = UDim.new(0, 80),
-					value = self.state.port,
-					placeholderValue = Config.defaultPort,
-					onValueChange = function(newValue)
-						self:setState({
-							port = newValue,
-						})
-					end,
-				}),
-			}),
-		}),
-
-		Buttons = e(FitList, {
-			fitAxes = "Y",
-			containerProps = {
-				BackgroundTransparency = 1,
-				LayoutOrder = 2,
-				Size = UDim2.new(1, 0, 0, 0),
-			},
-			layoutProps = {
-				FillDirection = Enum.FillDirection.Horizontal,
-				HorizontalAlignment = Enum.HorizontalAlignment.Right,
-				Padding = UDim.new(0, 8),
-			},
-			paddingProps = {
-				PaddingTop = UDim.new(0, 0),
-				PaddingBottom = UDim.new(0, 20),
-				PaddingLeft = UDim.new(0, 24),
-				PaddingRight = UDim.new(0, 24),
-			},
-		}, {
-			e(FormButton, {
-				layoutOrder = 1,
-				text = "Cancel",
-				onClick = function()
-					if cancel ~= nil then
-						cancel()
-					end
-				end,
-				secondary = true,
-			}),
-
-			e(FormButton, {
-				layoutOrder = 2,
-				text = "Connect",
-				onClick = function()
-					if startSession ~= nil then
-						local address = self.state.address
-						if address:len() == 0 then
-							address = Config.defaultHost
-						end
-
-						local port = self.state.port
-						if port:len() == 0 then
-							port = Config.defaultPort
-						end
-
-						startSession(address, port)
-					end
-				end,
-			}),
-		}),
-
-		Footer = e(FitList, {
-			fitAxes = "Y",
-			containerKind = "ImageLabel",
-			containerProps = {
-				Image = RoundBox.asset,
-				ImageRectOffset = RoundBox.offset + Vector2.new(0, RoundBox.size.Y / 2),
-				ImageRectSize = RoundBox.size * Vector2.new(1, 0.5),
-				SliceCenter = RoundBox.center,
-				ScaleType = Enum.ScaleType.Slice,
-				ImageColor3 = Theme.SecondaryColor,
-				Size = UDim2.new(1, 0, 0, 0),
-				LayoutOrder = 3,
-				BackgroundTransparency = 1,
-
-				[Roact.Change.AbsoluteSize] = function(rbx)
-					self.setFooterSize(rbx.AbsoluteSize)
-				end,
-			},
-			layoutProps = {
-				FillDirection = Enum.FillDirection.Horizontal,
+	return Theme.with(function(theme)
+		return e(Panel, nil, {
+			Layout = e("UIListLayout", {
+				SortOrder = Enum.SortOrder.LayoutOrder,
 				HorizontalAlignment = Enum.HorizontalAlignment.Center,
 				VerticalAlignment = Enum.VerticalAlignment.Center,
-			},
-			paddingProps = {
-				PaddingTop = UDim.new(0, 4),
-				PaddingBottom = UDim.new(0, 4),
-				PaddingLeft = UDim.new(0, 8),
-				PaddingRight = UDim.new(0, 8),
-			},
-		}, {
-			LogoContainer = e("Frame", {
-				BackgroundTransparency = 1,
+			}),
 
-				Size = self.footerRestSize,
-			}, {
-				Logo = e("ImageLabel", {
-					Image = Assets.Images.Logo,
-					Size = UDim2.new(0, 80, 0, 40),
-					ScaleType = Enum.ScaleType.Fit,
+			Inputs = e(FitList, {
+				containerProps = {
 					BackgroundTransparency = 1,
-					Position = UDim2.new(0, 0, 1, -10),
-					AnchorPoint = Vector2.new(0, 1),
+					LayoutOrder = 1,
+				},
+				layoutProps = {
+					FillDirection = Enum.FillDirection.Horizontal,
+					Padding = UDim.new(0, 8),
+				},
+				paddingProps = {
+					PaddingTop = UDim.new(0, 20),
+					PaddingBottom = UDim.new(0, 10),
+					PaddingLeft = UDim.new(0, 24),
+					PaddingRight = UDim.new(0, 24),
+				},
+			}, {
+				Address = e(FitList, {
+					containerProps = {
+						LayoutOrder = 1,
+						BackgroundTransparency = 1,
+					},
+					layoutProps = {
+						Padding = UDim.new(0, 4),
+					},
+				}, {
+					Label = e(FitText, {
+						Kind = "TextLabel",
+						LayoutOrder = 1,
+						BackgroundTransparency = 1,
+						TextXAlignment = Enum.TextXAlignment.Left,
+						Font = theme.TitleFont,
+						TextSize = 20,
+						Text = "Address",
+						TextColor3 = theme.Text1,
+					}),
+
+					Input = e(FormTextInput, {
+						layoutOrder = 2,
+						width = UDim.new(0, 220),
+						value = self.state.address,
+						placeholderValue = Config.defaultHost,
+						onValueChange = function(newValue)
+							self:setState({
+								address = newValue,
+							})
+						end,
+					}),
+				}),
+
+				Port = e(FitList, {
+					containerProps = {
+						LayoutOrder = 2,
+						BackgroundTransparency = 1,
+					},
+					layoutProps = {
+						Padding = UDim.new(0, 4),
+					},
+				}, {
+					Label = e(FitText, {
+						Kind = "TextLabel",
+						LayoutOrder = 1,
+						BackgroundTransparency = 1,
+						TextXAlignment = Enum.TextXAlignment.Left,
+						Font = theme.TitleFont,
+						TextSize = 20,
+						Text = "Port",
+						TextColor3 = theme.Text1,
+					}),
+
+					Input = e(FormTextInput, {
+						layoutOrder = 2,
+						width = UDim.new(0, 80),
+						value = self.state.port,
+						placeholderValue = Config.defaultPort,
+						onValueChange = function(newValue)
+							self:setState({
+								port = newValue,
+							})
+						end,
+					}),
 				}),
 			}),
 
-			Version = e(FitText, {
-				Font = Theme.TitleFont,
-				TextSize = 18,
-				Text = Version.display(Config.version),
-				TextXAlignment = Enum.TextXAlignment.Right,
-				TextColor3 = Theme.LightTextColor,
-				BackgroundTransparency = 1,
+			Buttons = e(FitList, {
+				fitAxes = "Y",
+				containerProps = {
+					BackgroundTransparency = 1,
+					LayoutOrder = 2,
+					Size = UDim2.new(1, 0, 0, 0),
+				},
+				layoutProps = {
+					FillDirection = Enum.FillDirection.Horizontal,
+					HorizontalAlignment = Enum.HorizontalAlignment.Right,
+					Padding = UDim.new(0, 8),
+				},
+				paddingProps = {
+					PaddingTop = UDim.new(0, 0),
+					PaddingBottom = UDim.new(0, 20),
+					PaddingLeft = UDim.new(0, 24),
+					PaddingRight = UDim.new(0, 24),
+				},
+			}, {
+				e(FormButton, {
+					layoutOrder = 2,
+					text = "Connect",
+					onClick = function()
+						if startSession ~= nil then
+							local address = self.state.address
+							if address:len() == 0 then
+								address = Config.defaultHost
+							end
 
-				[Roact.Change.AbsoluteSize] = function(rbx)
-					self.setFooterVersionSize(rbx.AbsoluteSize)
-				end,
+							local port = self.state.port
+							if port:len() == 0 then
+								port = Config.defaultPort
+							end
+
+							startSession(address, port)
+						end
+					end,
+				}),
 			}),
-		}),
-	})
+		})
+	end)
 end
 
 return ConnectPanel

plugin/src/Components/ConnectingPanel.lua

@@ -0,0 +1,35 @@
+local Roact = require(script:FindFirstAncestor("Rojo").Roact)
+
+local Plugin = script:FindFirstAncestor("Plugin")
+
+local Theme = require(Plugin.Components.Theme)
+local Panel = require(Plugin.Components.Panel)
+local FitText = require(Plugin.Components.FitText)
+
+local e = Roact.createElement
+
+local ConnectingPanel = Roact.Component:extend("ConnectingPanel")
+
+function ConnectingPanel:render()
+	return Theme.with(function(theme)
+		return e(Panel, nil, {
+			Layout = Roact.createElement("UIListLayout", {
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				VerticalAlignment = Enum.VerticalAlignment.Center,
+				SortOrder = Enum.SortOrder.LayoutOrder,
+				Padding = UDim.new(0, 8),
+			}),
+
+			Text = e(FitText, {
+				Padding = Vector2.new(12, 6),
+				Font = theme.ButtonFont,
+				TextSize = 18,
+				Text = "Connecting...",
+				TextColor3 = theme.Text1,
+				BackgroundTransparency = 1,
+			}),
+		})
+	end)
+end
+
+return ConnectingPanel

plugin/src/Components/ConnectionActivePanel.lua

@@ -2,66 +2,46 @@ local Roact = require(script:FindFirstAncestor("Rojo").Roact)
 
 local Plugin = script:FindFirstAncestor("Plugin")
 
-local Theme = require(Plugin.Theme)
-local Assets = require(Plugin.Assets)
-
-local FitList = require(Plugin.Components.FitList)
+local Theme = require(Plugin.Components.Theme)
+local Panel = require(Plugin.Components.Panel)
 local FitText = require(Plugin.Components.FitText)
+local FormButton = require(Plugin.Components.FormButton)
 
 local e = Roact.createElement
 
-local RoundBox = Assets.Slices.RoundBox
-local WhiteCross = Assets.Sprites.WhiteCross
+local ConnectionActivePanel = Roact.Component:extend("ConnectionActivePanel")
 
-local function ConnectionActivePanel(props)
-	local stopSession = props.stopSession
+function ConnectionActivePanel:render()
+	local stopSession = self.props.stopSession
 
-	return e(FitList, {
-		containerKind = "ImageLabel",
-		containerProps = {
-			Image = RoundBox.asset,
-			ImageRectOffset = RoundBox.offset + Vector2.new(0, RoundBox.size.Y / 2),
-			ImageRectSize = RoundBox.size * Vector2.new(1, 0.5),
-			SliceCenter = Rect.new(4, 4, 4, 4),
-			ScaleType = Enum.ScaleType.Slice,
-			BackgroundTransparency = 1,
-			Position = UDim2.new(0.5, 0, 0, 0),
-			AnchorPoint = Vector2.new(0.5, 0),
-		},
-		layoutProps = {
-			FillDirection = Enum.FillDirection.Horizontal,
-			VerticalAlignment = Enum.VerticalAlignment.Center,
-		},
-	}, {
-		Text = e(FitText, {
-			Padding = Vector2.new(12, 6),
-			Font = Theme.ButtonFont,
-			TextSize = 18,
-			Text = "Rojo Connected",
-			TextColor3 = Theme.PrimaryColor,
-			BackgroundTransparency = 1,
-		}),
+	return Theme.with(function(theme)
+		return e(Panel, nil, {
+			Layout = Roact.createElement("UIListLayout", {
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				VerticalAlignment = Enum.VerticalAlignment.Center,
+				SortOrder = Enum.SortOrder.LayoutOrder,
+				Padding = UDim.new(0, 8),
+			}),
 
-		CloseContainer = e("ImageButton", {
-			Size = UDim2.new(0, 30, 0, 30),
-			BackgroundTransparency = 1,
-
-			[Roact.Event.Activated] = function()
-				stopSession()
-			end,
-		}, {
-			CloseImage = e("ImageLabel", {
-				Size = UDim2.new(0, 16, 0, 16),
-				Position = UDim2.new(0.5, 0, 0.5, 0),
-				AnchorPoint = Vector2.new(0.5, 0.5),
-				Image = WhiteCross.asset,
-				ImageRectOffset = WhiteCross.offset,
-				ImageRectSize = WhiteCross.size,
-				ImageColor3 = Theme.PrimaryColor,
+			Text = e(FitText, {
+				Padding = Vector2.new(12, 6),
+				Font = theme.ButtonFont,
+				TextSize = 18,
+				Text = "Connected to Live-Sync Server",
+				TextColor3 = theme.Text1,
 				BackgroundTransparency = 1,
 			}),
-		}),
-	})
+
+			DisconnectButton = e(FormButton, {
+				layoutOrder = 2,
+				text = "Disconnect",
+				secondary = true,
+				onClick = function()
+					stopSession()
+				end,
+			}),
+		})
+	end)
 end
 
 return ConnectionActivePanel

plugin/src/Components/ErrorPanel.lua

@@ -0,0 +1,70 @@
+local Roact = require(script:FindFirstAncestor("Rojo").Roact)
+
+local Plugin = script:FindFirstAncestor("Plugin")
+
+local Theme = require(Plugin.Components.Theme)
+local Panel = require(Plugin.Components.Panel)
+local FitText = require(Plugin.Components.FitText)
+local FitScrollingFrame = require(Plugin.Components.FitScrollingFrame)
+local FormButton = require(Plugin.Components.FormButton)
+
+local e = Roact.createElement
+
+local BUTTON_HEIGHT = 60
+local HOR_PADDING = 8
+
+local ErrorPanel = Roact.Component:extend("ErrorPanel")
+
+function ErrorPanel:render()
+	local errorMessage = self.props.errorMessage
+	local onDismiss = self.props.onDismiss
+
+	return Theme.with(function(theme)
+		return e(Panel, nil, {
+			Layout = Roact.createElement("UIListLayout", {
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				VerticalAlignment = Enum.VerticalAlignment.Center,
+				SortOrder = Enum.SortOrder.LayoutOrder,
+				Padding = UDim.new(0, 8),
+			}),
+
+			ErrorContainer = e(FitScrollingFrame, {
+				containerProps = {
+					BackgroundTransparency = 1,
+					BorderSizePixel = 0,
+					Size = UDim2.new(1, -HOR_PADDING * 2, 1, -BUTTON_HEIGHT),
+					Position = UDim2.new(0, HOR_PADDING, 0, 0),
+					ScrollBarImageColor3 = theme.Text1,
+					VerticalScrollBarInset = Enum.ScrollBarInset.ScrollBar,
+					ScrollingDirection = Enum.ScrollingDirection.Y,
+				},
+			}, {
+				Text = e(FitText, {
+					Size = UDim2.new(1, 0, 0, 0),
+
+					LayoutOrder = 1,
+					TextXAlignment = Enum.TextXAlignment.Left,
+					TextYAlignment = Enum.TextYAlignment.Top,
+					FitAxis = "Y",
+					Font = theme.ButtonFont,
+					TextSize = 18,
+					Text = errorMessage,
+					TextWrap = true,
+					TextColor3 = theme.Text1,
+					BackgroundTransparency = 1,
+				}),
+			}),
+
+			DismissButton = e(FormButton, {
+				layoutOrder = 2,
+				text = "Dismiss",
+				secondary = true,
+				onClick = function()
+					onDismiss()
+				end,
+			}),
+		})
+	end)
+end
+
+return ErrorPanel

plugin/src/Components/FitScrollingFrame.lua

@@ -0,0 +1,33 @@
+local Roact = require(script:FindFirstAncestor("Rojo").Roact)
+
+local Dictionary = require(script.Parent.Parent.Dictionary)
+
+local e = Roact.createElement
+
+local FitScrollingFrame = Roact.Component:extend("FitScrollingFrame")
+
+function FitScrollingFrame:init()
+	self.sizeBinding, self.setSize = Roact.createBinding(UDim2.new())
+end
+
+function FitScrollingFrame:render()
+	local containerProps = self.props.containerProps
+	local layoutProps = self.props.layoutProps
+
+	local children = Dictionary.merge(self.props[Roact.Children], {
+		["$Layout"] = e("UIListLayout", Dictionary.merge({
+			SortOrder = Enum.SortOrder.LayoutOrder,
+			[Roact.Change.AbsoluteContentSize] = function(instance)
+				self.setSize(UDim2.new(0, 0, 0, instance.AbsoluteContentSize.Y))
+			end,
+		}, layoutProps)),
+	})
+
+	local fullContainerProps = Dictionary.merge(containerProps, {
+		CanvasSize = self.sizeBinding,
+	})
+
+	return e("ScrollingFrame", fullContainerProps, children)
+end
+
+return FitScrollingFrame

plugin/src/Components/FitText.lua

@@ -9,6 +9,7 @@ local e = Roact.createElement
 local FitText = Roact.Component:extend("FitText")
 
 function FitText:init()
+	self.ref = Roact.createRef()
 	self.sizeBinding, self.setSize = Roact.createBinding(UDim2.new())
 end
 
@@ -16,10 +17,15 @@ function FitText:render()
 	local kind = self.props.Kind or "TextLabel"
 
 	local containerProps = Dictionary.merge(self.props, {
+		FitAxis = Dictionary.None,
 		Kind = Dictionary.None,
 		Padding = Dictionary.None,
 		MinSize = Dictionary.None,
-		Size = self.sizeBinding
+		Size = self.sizeBinding,
+		[Roact.Ref] = self.ref,
+		[Roact.Change.AbsoluteSize] = function()
+			self:updateTextMeasurements()
+		end
 	})
 
 	return e(kind, containerProps)
@@ -36,15 +42,45 @@ end
 function FitText:updateTextMeasurements()
 	local minSize = self.props.MinSize or Vector2.new(0, 0)
 	local padding = self.props.Padding or Vector2.new(0, 0)
+	local fitAxis = self.props.FitAxis or "XY"
+	local baseSize = self.props.Size
 
 	local text = self.props.Text or ""
 	local font = self.props.Font or Enum.Font.Legacy
 	local textSize = self.props.TextSize or 12
 
-	local measuredText = TextService:GetTextSize(text, textSize, font, Vector2.new(9e6, 9e6))
-	local totalSize = UDim2.new(
-		0, math.max(minSize.X, padding.X * 2 + measuredText.X),
-		0, math.max(minSize.Y, padding.Y * 2 + measuredText.Y))
+	local containerSize = self.ref.current.AbsoluteSize
+
+	local textBounds
+
+	if fitAxis == "XY" then
+		textBounds = Vector2.new(9e6, 9e6)
+	elseif fitAxis == "X" then
+		textBounds = Vector2.new(9e6, containerSize.Y - padding.Y * 2)
+	elseif fitAxis == "Y" then
+		textBounds = Vector2.new(containerSize.X - padding.X * 2, 9e6)
+	end
+
+	local measuredText = TextService:GetTextSize(text, textSize, font, textBounds)
+
+	local computedX = math.max(minSize.X, padding.X * 2 + measuredText.X)
+	local computedY = math.max(minSize.Y, padding.Y * 2 + measuredText.Y)
+
+	local totalSize
+
+	if fitAxis == "XY" then
+		totalSize = UDim2.new(
+			0, computedX,
+			0, computedY)
+	elseif fitAxis == "X" then
+		totalSize = UDim2.new(
+			0, computedX,
+			baseSize.Y.Scale, baseSize.Y.Offset)
+	elseif fitAxis == "Y" then
+		totalSize = UDim2.new(
+			baseSize.X.Scale, baseSize.X.Offset,
+			0, computedY)
+	end
 
 	self.setSize(totalSize)
 end

plugin/src/Components/FormButton.lua

@@ -4,7 +4,7 @@ local Plugin = Rojo.Plugin
 local Roact = require(Rojo.Roact)
 
 local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.Theme)
+local Theme = require(Plugin.Components.Theme)
 local FitList = require(Plugin.Components.FitList)
 local FitText = require(Plugin.Components.FitText)
 
@@ -20,43 +20,45 @@ local function FormButton(props)
 	local textColor
 	local backgroundColor
 
-	if props.secondary then
-		textColor = Theme.AccentColor
-		backgroundColor = Theme.SecondaryColor
-	else
-		textColor = Theme.SecondaryColor
-		backgroundColor = Theme.AccentColor
-	end
+	return Theme.with(function(theme)
+		if props.secondary then
+			textColor = theme.Brand1
+			backgroundColor = theme.Background2
+		else
+			textColor = theme.TextOnAccent
+			backgroundColor = theme.Brand1
+		end
 
-	return e(FitList, {
-		containerKind = "ImageButton",
-		containerProps = {
-			LayoutOrder = layoutOrder,
-			BackgroundTransparency = 1,
-			Image = RoundBox.asset,
-			ImageRectOffset = RoundBox.offset,
-			ImageRectSize = RoundBox.size,
-			SliceCenter = RoundBox.center,
-			ScaleType = Enum.ScaleType.Slice,
-			ImageColor3 = backgroundColor,
+		return e(FitList, {
+			containerKind = "ImageButton",
+			containerProps = {
+				LayoutOrder = layoutOrder,
+				BackgroundTransparency = 1,
+				Image = RoundBox.asset,
+				ImageRectOffset = RoundBox.offset,
+				ImageRectSize = RoundBox.size,
+				SliceCenter = RoundBox.center,
+				ScaleType = Enum.ScaleType.Slice,
+				ImageColor3 = backgroundColor,
 
-			[Roact.Event.Activated] = function()
-				if onClick ~= nil then
-					onClick()
-				end
-			end,
-		},
-	}, {
-		Text = e(FitText, {
-			Kind = "TextLabel",
-			Text = text,
-			TextSize = 18,
-			TextColor3 = textColor,
-			Font = Theme.ButtonFont,
-			Padding = Vector2.new(16, 8),
-			BackgroundTransparency = 1,
-		}),
-	})
+				[Roact.Event.Activated] = function()
+					if onClick ~= nil then
+						onClick()
+					end
+				end,
+			},
+		}, {
+			Text = e(FitText, {
+				Kind = "TextLabel",
+				Text = text,
+				TextSize = 18,
+				TextColor3 = textColor,
+				Font = theme.ButtonFont,
+				Padding = Vector2.new(16, 8),
+				BackgroundTransparency = 1,
+			}),
+		})
+	end)
 end
 
 return FormButton

plugin/src/Components/FormTextInput.lua

@@ -4,7 +4,7 @@ local Plugin = Rojo.Plugin
 local Roact = require(Rojo.Roact)
 
 local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.Theme)
+local Theme = require(Plugin.Components.Theme)
 
 local e = Roact.createElement
 
@@ -35,46 +35,48 @@ function FormTextInput:render()
 		shownPlaceholder = placeholderValue
 	end
 
-	return e("ImageLabel", {
-		LayoutOrder = layoutOrder,
-		Image = RoundBox.asset,
-		ImageRectOffset = RoundBox.offset,
-		ImageRectSize = RoundBox.size,
-		ScaleType = Enum.ScaleType.Slice,
-		SliceCenter = RoundBox.center,
-		ImageColor3 = Theme.SecondaryColor,
-		Size = UDim2.new(width.Scale, width.Offset, 0, TEXT_SIZE + PADDING * 2),
-		BackgroundTransparency = 1,
-	}, {
-		InputInner = e("TextBox", {
+	return Theme.with(function(theme)
+		return e("ImageLabel", {
+			LayoutOrder = layoutOrder,
+			Image = RoundBox.asset,
+			ImageRectOffset = RoundBox.offset,
+			ImageRectSize = RoundBox.size,
+			ScaleType = Enum.ScaleType.Slice,
+			SliceCenter = RoundBox.center,
+			ImageColor3 = theme.Background2,
+			Size = UDim2.new(width.Scale, width.Offset, 0, TEXT_SIZE + PADDING * 2),
 			BackgroundTransparency = 1,
-			Size = UDim2.new(1, -PADDING * 2, 1, -PADDING * 2),
-			Position = UDim2.new(0.5, 0, 0.5, 0),
-			AnchorPoint = Vector2.new(0.5, 0.5),
-			Font = Theme.InputFont,
-			ClearTextOnFocus = false,
-			TextXAlignment = Enum.TextXAlignment.Center,
-			TextSize = TEXT_SIZE,
-			Text = value,
-			PlaceholderText = shownPlaceholder,
-			PlaceholderColor3 = Theme.AccentLightColor,
-			TextColor3 = Theme.AccentColor,
+		}, {
+			InputInner = e("TextBox", {
+				BackgroundTransparency = 1,
+				Size = UDim2.new(1, -PADDING * 2, 1, -PADDING * 2),
+				Position = UDim2.new(0.5, 0, 0.5, 0),
+				AnchorPoint = Vector2.new(0.5, 0.5),
+				Font = theme.InputFont,
+				ClearTextOnFocus = false,
+				TextXAlignment = Enum.TextXAlignment.Center,
+				TextSize = TEXT_SIZE,
+				Text = value,
+				PlaceholderText = shownPlaceholder,
+				PlaceholderColor3 = theme.Text2,
+				TextColor3 = theme.Text1,
 
-			[Roact.Change.Text] = function(rbx)
-				onValueChange(rbx.Text)
-			end,
-			[Roact.Event.Focused] = function()
-				self:setState({
-					focused = true,
-				})
-			end,
-			[Roact.Event.FocusLost] = function()
-				self:setState({
-					focused = false,
-				})
-			end,
-		}),
-	})
+				[Roact.Change.Text] = function(rbx)
+					onValueChange(rbx.Text)
+				end,
+				[Roact.Event.Focused] = function()
+					self:setState({
+						focused = true,
+					})
+				end,
+				[Roact.Event.FocusLost] = function()
+					self:setState({
+						focused = false,
+					})
+				end,
+			}),
+		})
+	end)
 end
 
 return FormTextInput

plugin/src/Components/Panel.lua

@@ -0,0 +1,38 @@
+local Roact = require(script:FindFirstAncestor("Rojo").Roact)
+
+local Plugin = script:FindFirstAncestor("Plugin")
+
+local RojoFooter = require(Plugin.Components.RojoFooter)
+local Theme = require(Plugin.Components.Theme)
+
+local e = Roact.createElement
+
+local Panel = Roact.Component:extend("Panel")
+
+function Panel:init()
+	self.footerSize, self.setFooterSize = Roact.createBinding(Vector2.new())
+end
+
+function Panel:render()
+	return Theme.with(function(theme)
+		return e("Frame", {
+			Size = UDim2.new(1, 0, 1, 0),
+			BackgroundTransparency = 1,
+		}, {
+			Layout = Roact.createElement("UIListLayout", {
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				SortOrder = Enum.SortOrder.LayoutOrder,
+			}),
+
+			Body = e("Frame", {
+				Size = UDim2.new(0, 360, 1, -32),
+				BackgroundColor3 = theme.Background1,
+				BorderSizePixel = 0,
+			}, self.props[Roact.Children]),
+
+			Footer = e(RojoFooter),
+		})
+	end)
+end
+
+return Panel

plugin/src/Components/RojoFooter.lua

@@ -0,0 +1,70 @@
+local Rojo = script:FindFirstAncestor("Rojo")
+local Plugin = Rojo.Plugin
+
+local Roact = require(Rojo.Roact)
+
+local Config = require(Plugin.Config)
+local Version = require(Plugin.Version)
+local Assets = require(Plugin.Assets)
+local Theme = require(Plugin.Components.Theme)
+
+local e = Roact.createElement
+
+local RojoFooter = Roact.Component:extend("RojoFooter")
+
+function RojoFooter:init()
+	self.footerSize, self.setFooterSize = Roact.createBinding(Vector2.new())
+	self.footerVersionSize, self.setFooterVersionSize = Roact.createBinding(Vector2.new())
+end
+
+function RojoFooter:render()
+	return Theme.with(function(theme)
+		return e("Frame", {
+			LayoutOrder = 3,
+			Size = UDim2.new(1, 0, 0, 32),
+			BackgroundColor3 = theme.Background2,
+			BorderSizePixel = 0,
+			ZIndex = 2,
+		}, {
+			Padding = e("UIPadding", {
+				PaddingTop = UDim.new(0, 4),
+				PaddingBottom = UDim.new(0, 4),
+				PaddingLeft = UDim.new(0, 8),
+				PaddingRight = UDim.new(0, 8),
+			}),
+
+			LogoContainer = e("Frame", {
+				BackgroundTransparency = 1,
+
+				Size = UDim2.new(0, 0, 0, 32),
+			}, {
+				Logo = e("ImageLabel", {
+					Image = Assets.Images.Logo,
+					Size = UDim2.new(0, 80, 0, 40),
+					ScaleType = Enum.ScaleType.Fit,
+					BackgroundTransparency = 1,
+					Position = UDim2.new(0, 0, 1, -10),
+					AnchorPoint = Vector2.new(0, 1),
+				}),
+			}),
+
+			Version = e("TextLabel", {
+				Position = UDim2.new(1, 0, 0, 0),
+				Size = UDim2.new(0, 0, 1, 0),
+				AnchorPoint = Vector2.new(1, 0),
+				Font = theme.TitleFont,
+				TextSize = 18,
+				Text = Version.display(Config.version),
+				TextXAlignment = Enum.TextXAlignment.Right,
+				TextColor3 = theme.Text2,
+				BackgroundTransparency = 1,
+
+				[Roact.Change.AbsoluteSize] = function(rbx)
+					self.setFooterVersionSize(rbx.AbsoluteSize)
+				end,
+			}),
+		})
+	end)
+end
+
+return RojoFooter

plugin/src/Components/Theme.lua

@@ -0,0 +1,104 @@
+--[[
+	Theming system taking advantage of Roact's new context API.
+
+	Doesn't use colors provided by Studio and instead just branches on theme
+	name. This isn't exactly best practice.
+]]
+
+local Studio = settings():GetService("Studio")
+
+local Rojo = script:FindFirstAncestor("Rojo")
+
+local Roact = require(Rojo.Roact)
+local Log = require(Rojo.Log)
+
+local strict = require(script.Parent.Parent.strict)
+
+local lightTheme = strict("Theme", {
+	ButtonFont = Enum.Font.GothamSemibold,
+	InputFont = Enum.Font.Code,
+	TitleFont = Enum.Font.GothamBold,
+	MainFont = Enum.Font.Gotham,
+
+	Brand1 = Color3.fromRGB(225, 56, 53),
+
+	Text1 = Color3.fromRGB(64, 64, 64),
+	Text2 = Color3.fromRGB(160, 160, 160),
+	TextOnAccent = Color3.fromRGB(235, 235, 235),
+
+	Background1 = Color3.fromRGB(255, 255, 255),
+	Background2 = Color3.fromRGB(235, 235, 235),
+})
+
+local darkTheme = strict("Theme", {
+	ButtonFont = Enum.Font.GothamSemibold,
+	InputFont = Enum.Font.Code,
+	TitleFont = Enum.Font.GothamBold,
+	MainFont = Enum.Font.Gotham,
+
+	Brand1 = Color3.fromRGB(225, 56, 53),
+
+	Text1 = Color3.fromRGB(235, 235, 235),
+	Text2 = Color3.fromRGB(200, 200, 200),
+	TextOnAccent = Color3.fromRGB(235, 235, 235),
+
+	Background1 = Color3.fromRGB(48, 48, 48),
+	Background2 = Color3.fromRGB(64, 64, 64),
+})
+
+local Context = Roact.createContext(lightTheme)
+
+local StudioProvider = Roact.Component:extend("StudioProvider")
+
+-- Pull the current theme from Roblox Studio and update state with it.
+function StudioProvider:updateTheme()
+	local studioTheme = Studio.Theme
+
+	if studioTheme.Name == "Light" then
+		self:setState({
+			theme = lightTheme,
+		})
+	elseif studioTheme.Name == "Dark" then
+		self:setState({
+			theme = darkTheme,
+		})
+	else
+		Log.warn("Unexpected theme '{}'' -- falling back to light theme!", studioTheme.Name)
+
+		self:setState({
+			theme = lightTheme,
+		})
+	end
+end
+
+function StudioProvider:init()
+	self:updateTheme()
+end
+
+function StudioProvider:render()
+	return Roact.createElement(Context.Provider, {
+		value = self.state.theme,
+	}, self.props[Roact.Children])
+end
+
+function StudioProvider:didMount()
+	self.connection = Studio.ThemeChanged:Connect(function()
+		self:updateTheme()
+	end)
+end
+
+function StudioProvider:willUnmount()
+	self.connection:Disconnect()
+end
+
+local function with(callback)
+	return Roact.createElement(Context.Consumer, {
+		render = callback,
+	})
+end
+
+return {
+	StudioProvider = StudioProvider,
+	Consumer = Context.Consumer,
+	with = with,
+}

plugin/src/Config.lua

@@ -1,8 +1,13 @@
-return {
+local strict = require(script.Parent.strict)
+
+local isDevBuild = script.Parent.Parent:FindFirstChild("ROJO_DEV_BUILD") ~= nil
+
+return strict("Config", {
+	isDevBuild = isDevBuild,
 	codename = "Epiphany",
-	version = {0, 5, 0, "-alpha.3"},
-	expectedServerVersionString = "0.5.0 or newer",
-	protocolVersion = 2,
+	version = {0, 6, 0, "-alpha.2"},
+	expectedServerVersionString = "0.6.0 or newer",
+	protocolVersion = 3,
 	defaultHost = "localhost",
 	defaultPort = 34872,
-}
+})