Skip to content

Upgrade to LiveView 1.1 #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DGollings wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to LiveView 1.1 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions crates/core/src/diff/fragment/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ pub enum MergeError {
AddChildToExisting,
#[error("There was a id mismatch when merging a stream")]
StreamIDMismatch,
#[error("Keyed item at position {0} not found during merge")]
KeyedItemNotFound(i32),
#[error("Keyed item at position {0} was not resolved")]
KeyedItemNotResolved(i32),
#[error("Stream Error {error}")]
Stream {
#[from]
Expand All @@ -42,6 +46,8 @@ pub enum RenderError {
ChildNotFoundForStatic(i32),
#[error("Cousin not found for {0}")]
CousinNotFound(i32),
#[error("Keyed item at index {0} was not resolved")]
KeyedItemNotResolved(i32),
#[error("Serde Error {0}")]
SerdeError(Arc<serde_json::Error>),
#[error("Parse Error {0}")]
Expand Down
122 changes: 114 additions & 8 deletions crates/core/src/diff/fragment/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ impl Root {
};

out.resolve_components(old_components)?;
out.fragment.expand_statics();
Ok(out)
}

Expand Down Expand Up @@ -171,19 +172,37 @@ impl Child {
*statics = new_statics;
}
}
(
Fragment::KeyedComprehension { statics, .. },
Fragment::KeyedComprehension {
statics: new_statics,
..
},
) => {
if statics.is_none() {
*statics = new_statics;
}
}
(
Fragment::Regular {
statics, children, ..
statics,
children,
templates,
..
},
Fragment::Regular {
statics: new_statics,
children: new_children,
templates: new_templates,
..
},
) => {
if statics.is_none() {
*statics = new_statics;
}
if templates.is_none() {
*templates = new_templates;
}

for (id, new_child) in new_children {
match children.get_mut(&id) {
Expand All @@ -204,7 +223,8 @@ impl FragmentDiff {
fn should_replace_current(&self) -> bool {
match self {
FragmentDiff::UpdateRegular { statics, .. }
| FragmentDiff::UpdateComprehension { statics, .. } => statics.is_some(),
| FragmentDiff::UpdateComprehension { statics, .. }
| FragmentDiff::UpdateKeyedComprehension { statics, .. } => statics.is_some(),
}
}
}
Expand Down Expand Up @@ -257,22 +277,26 @@ impl FragmentMerge for Fragment {
Fragment::Regular {
children: current_children,
statics: current_statics,
templates: current_templates,
is_root: current_reply,
..
},
FragmentDiff::UpdateRegular {
children: children_diffs,
templates: new_templates,
is_root: new_reply,
..
},
) => {
let new_children = current_children.merge(children_diffs)?;
let new_reply = new_reply.or(current_reply);
let new_render = new_reply.map(|i| i != 0);
let templates = current_templates.merge(new_templates)?;

Ok(Self::Regular {
children: new_children,
statics: current_statics,
templates,
is_root: new_reply,
new_render,
})
Expand Down Expand Up @@ -377,6 +401,93 @@ impl FragmentMerge for Fragment {
new_render,
})
}
(
Fragment::KeyedComprehension {
keyed: current_keyed,
statics,
templates: current_templates,
is_root: current_reply,
..
},
FragmentDiff::UpdateKeyedComprehension {
keyed: keyed_diff,
templates: new_templates,
is_root: new_reply,
..
},
) => {
let new_reply = new_reply.or(current_reply);
let templates = current_templates.merge(new_templates)?;

// Start with existing items, then apply diffs
let mut new_items = current_keyed.items.clone();
for (key, item_diff) in keyed_diff.items {
let new_item = match item_diff {
KeyedItemDiff::MovedFrom(old_pos) => {
// Copy item from old position unchanged
let old_key = old_pos.to_string();
current_keyed
.items
.get(&old_key)
.cloned()
.ok_or(MergeError::KeyedItemNotFound(old_pos))?
}
KeyedItemDiff::MovedWithDiff(old_pos, fragment_diff) => {
// Copy item from old position and apply diff
let old_key = old_pos.to_string();
let old_item = current_keyed
.items
.get(&old_key)
.ok_or(MergeError::KeyedItemNotFound(old_pos))?;
match old_item {
KeyedItem::Fragment(old_fragment) => {
let merged = (*old_fragment).clone().merge(*fragment_diff)?;
KeyedItem::Fragment(Box::new(merged))
}
KeyedItem::MovedFrom(_) | KeyedItem::MovedWithDiff(_, _) => {
// Shouldn't happen in a properly merged state
return Err(MergeError::KeyedItemNotResolved(old_pos));
}
}
}
KeyedItemDiff::FragmentDiff(fragment_diff) => {
// Check if item already exists - if so, merge; otherwise create new
if let Some(existing_item) = current_keyed.items.get(&key) {
match existing_item {
KeyedItem::Fragment(old_fragment) => {
let merged = (*old_fragment).clone().merge(*fragment_diff)?;
KeyedItem::Fragment(Box::new(merged))
}
KeyedItem::MovedFrom(_) | KeyedItem::MovedWithDiff(_, _) => {
// Shouldn't happen in a properly merged state
return Err(MergeError::KeyedItemNotResolved(
key.parse().unwrap_or(-1),
));
}
}
} else {
// New item - convert from diff
let fragment: Fragment = (*fragment_diff).try_into()?;
KeyedItem::Fragment(Box::new(fragment))
}
}
};
new_items.insert(key, new_item);
}

let new_render = new_reply.map(|i| i != 0);

Ok(Self::KeyedComprehension {
keyed: KeyedItems {
items: new_items,
key_count: keyed_diff.key_count,
},
statics,
templates,
is_root: new_reply,
new_render,
})
}
_ => Err(MergeError::FragmentTypeMismatch),
}
}
Expand Down Expand Up @@ -433,12 +544,7 @@ impl FragmentMerge for Templates {
(None, None) => Ok(None),
(None, Some(template)) => Ok(Some(template)),
(Some(template), None) => Ok(Some(template)),
(Some(mut current), Some(new)) => {
for (key, val) in new.into_iter() {
current.insert(key, val);
}
Ok(Some(current))
}
(Some(_current), Some(new)) => Ok(Some(new)),
}
}
}
Expand Down
Loading