Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/lune-roblox/src/datatypes/conversion.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use mlua::prelude::*;

use rbx_dom_weak::types::{Variant as DomValue, VariantType as DomType};
use rbx_dom_weak::types::{SharedString, Variant as DomValue, VariantType as DomType};

use crate::{datatypes::extension::DomValueExt, instance::Instance};

Expand Down Expand Up @@ -51,6 +51,7 @@ impl DomValueToLua for LuaValue {
DomValue::Float32(n) => Ok(LuaValue::Number(*n as f64)),
DomValue::String(s) => Ok(LuaValue::String(lua.create_string(s)?)),
DomValue::BinaryString(s) => Ok(LuaValue::String(lua.create_string(s)?)),
DomValue::SharedString(s) => Ok(LuaValue::String(lua.create_string(s.data())?)),
DomValue::ContentId(s) => Ok(LuaValue::String(
lua.create_string(AsRef::<str>::as_ref(s))?,
)),
Expand Down Expand Up @@ -104,6 +105,9 @@ impl LuaToDomValue for LuaValue {
(LuaValue::String(s), DomType::BinaryString) => {
Ok(DomValue::BinaryString(s.as_bytes().to_vec().into()))
}
(LuaValue::String(s), DomType::SharedString) => Ok(DomValue::SharedString(
SharedString::new(s.as_bytes().to_vec()),
)),
(LuaValue::String(s), DomType::ContentId) => {
Ok(DomValue::ContentId(s.to_str()?.to_string().into()))
}
Expand Down
18 changes: 18 additions & 0 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
let
# Rolling updates, not deterministic.
pkgs = import (fetchTarball ("channel:nixpkgs-unstable")) { };
in
pkgs.callPackage (
{
mkShell,
cargo,
rustc,
}:
mkShell {
strictDeps = true;
nativeBuildInputs = [
cargo
rustc
];
}
) { }
13 changes: 13 additions & 0 deletions tests/roblox/files/serializeModel.luau
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,16 @@ do

assert(deserialized[2].ObjectValue.Value == deserialized[1].ParticleEmitter)
end

-- Ensure SharedStrings are properly serialized (and deserialized!)
do
local meshPart = Instance.new("MeshPart")
local SANITY_STRING = "Hello, world!"

(meshPart :: any).PhysicalConfigData = SANITY_STRING

local serialized = roblox.serializeModel({ meshPart })
local deserialized = roblox.deserializeModel(serialized) :: any

assert(deserialized[1].PhysicalConfigData == SANITY_STRING)
end
7 changes: 7 additions & 0 deletions tests/roblox/instance/properties.luau
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ assert(meshPart.Material == Enum.Material.Plastic)
assert(meshPart.Size == Vector3.new(4, 1.2, 2))
assert(meshPart.CustomPhysicalProperties == nil)

-- We should be able to get/set SharedStrings

local SANITY_STRING = "Hello, world!"
meshPart.PhysicalConfigData = SANITY_STRING

assert(meshPart.PhysicalConfigData == SANITY_STRING)

-- Instance reference properties should work

local objectValue = Instance.new("ObjectValue")
Expand Down