mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-04-21 21:25:16 +00:00
Support setting referent properties via attributes (#843)
Co-authored-by: Kenneth Loeffler <kenloef@gmail.com>
This commit is contained in:
@@ -11,6 +11,7 @@ use super::{
|
||||
patch::{AppliedPatchSet, AppliedPatchUpdate, PatchSet, PatchUpdate},
|
||||
InstanceSnapshot, RojoTree,
|
||||
};
|
||||
use crate::{multimap::MultiMap, RojoRef, REF_ID_ATTRIBUTE_NAME, REF_POINTER_ATTRIBUTE_PREFIX};
|
||||
|
||||
/// Consumes the input `PatchSet`, applying all of its prescribed changes to the
|
||||
/// tree and returns an `AppliedPatchSet`, which can be used to keep another
|
||||
@@ -72,6 +73,11 @@ struct PatchApplyContext {
|
||||
/// to be rewritten.
|
||||
has_refs_to_rewrite: HashSet<Ref>,
|
||||
|
||||
/// Tracks all ref properties that were specified using attributes. This has
|
||||
/// to be handled after everything else is done just like normal referent
|
||||
/// properties.
|
||||
attribute_refs_to_rewrite: MultiMap<Ref, (String, String)>,
|
||||
|
||||
/// The current applied patch result, describing changes made to the tree.
|
||||
applied_patch_set: AppliedPatchSet,
|
||||
}
|
||||
@@ -104,6 +110,22 @@ fn finalize_patch_application(context: PatchApplyContext, tree: &mut RojoTree) -
|
||||
}
|
||||
}
|
||||
|
||||
// This is to get around the fact that `RojoTre::get_specified_id` borrows
|
||||
// the tree as immutable, but we need to hold a mutable reference to it.
|
||||
// Not exactly elegant, but it does the job.
|
||||
let mut real_rewrites = Vec::new();
|
||||
for (id, map) in context.attribute_refs_to_rewrite {
|
||||
for (prop_name, prop_value) in map {
|
||||
if let Some(target) = tree.get_specified_id(&RojoRef::new(prop_value)) {
|
||||
real_rewrites.push((prop_name, Variant::Ref(target)))
|
||||
}
|
||||
}
|
||||
let mut instance = tree
|
||||
.get_instance_mut(id)
|
||||
.expect("Invalid instance ID in deferred attribute ref map");
|
||||
instance.properties_mut().extend(real_rewrites.drain(..));
|
||||
}
|
||||
|
||||
context.applied_patch_set
|
||||
}
|
||||
|
||||
@@ -142,6 +164,8 @@ fn apply_add_child(
|
||||
for child in children {
|
||||
apply_add_child(context, tree, id, child);
|
||||
}
|
||||
|
||||
defer_ref_properties(tree, id, context);
|
||||
}
|
||||
|
||||
fn apply_update_child(context: &mut PatchApplyContext, tree: &mut RojoTree, patch: PatchUpdate) {
|
||||
@@ -208,9 +232,72 @@ fn apply_update_child(context: &mut PatchApplyContext, tree: &mut RojoTree, patc
|
||||
applied_patch.changed_properties.insert(key, property_entry);
|
||||
}
|
||||
|
||||
defer_ref_properties(tree, patch.id, context);
|
||||
|
||||
context.applied_patch_set.updated.push(applied_patch)
|
||||
}
|
||||
|
||||
/// Calculates manually-specified Ref properties and marks them in the provided
|
||||
/// `PatchApplyContext` to be rewritten at the end of the patch application
|
||||
/// process.
|
||||
///
|
||||
/// Currently, this only uses attributes but it can easily handle rewriting
|
||||
/// referents in other ways too!
|
||||
fn defer_ref_properties(tree: &mut RojoTree, id: Ref, context: &mut PatchApplyContext) {
|
||||
let instance = tree
|
||||
.get_instance(id)
|
||||
.expect("Instances should exist when calculating deferred refs");
|
||||
let attributes = match instance.properties().get("Attributes") {
|
||||
Some(Variant::Attributes(attrs)) => attrs,
|
||||
_ => return,
|
||||
};
|
||||
|
||||
let mut attr_id = None;
|
||||
for (attr_name, attr_value) in attributes.iter() {
|
||||
if attr_name == REF_ID_ATTRIBUTE_NAME {
|
||||
if let Variant::String(specified_id) = attr_value {
|
||||
attr_id = Some(RojoRef::new(specified_id.clone()));
|
||||
} else if let Variant::BinaryString(specified_id) = attr_value {
|
||||
if let Ok(str) = std::str::from_utf8(specified_id.as_ref()) {
|
||||
attr_id = Some(RojoRef::new(str.to_string()))
|
||||
} else {
|
||||
log::error!("Specified IDs must be valid UTF-8 strings.")
|
||||
}
|
||||
} else {
|
||||
log::warn!(
|
||||
"Attribute {attr_name} is of type {:?} when it was \
|
||||
expected to be a String",
|
||||
attr_value.ty()
|
||||
)
|
||||
}
|
||||
}
|
||||
if let Some(prop_name) = attr_name.strip_prefix(REF_POINTER_ATTRIBUTE_PREFIX) {
|
||||
if let Variant::String(prop_value) = attr_value {
|
||||
context
|
||||
.attribute_refs_to_rewrite
|
||||
.insert(id, (prop_name.to_owned(), prop_value.clone()));
|
||||
} else if let Variant::BinaryString(prop_value) = attr_value {
|
||||
if let Ok(str) = std::str::from_utf8(prop_value.as_ref()) {
|
||||
context
|
||||
.attribute_refs_to_rewrite
|
||||
.insert(id, (prop_name.to_owned(), str.to_string()));
|
||||
} else {
|
||||
log::error!("IDs specified by referent property attributes must be valid UTF-8 strings.")
|
||||
}
|
||||
} else {
|
||||
log::warn!(
|
||||
"Attribute {attr_name} is of type {:?} when it was \
|
||||
expected to be a String",
|
||||
attr_value.ty()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
if let Some(specified_id) = attr_id {
|
||||
tree.set_specified_id(id, specified_id);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
|
||||
Reference in New Issue
Block a user