Skip to content

Commit 2ada5b2

Browse files
EqualMaEqualMa
committed
feat!: rename frender-elements to frender-keyed-elements
1 parent 1623412 commit 2ada5b2

File tree

11 files changed

+45
-42
lines changed

11 files changed

+45
-42
lines changed

‎Cargo.lock‎

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/frender-elements/Cargo.toml renamed to packages/frender-keyed-elements/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "frender-elements"
2+
name = "frender-keyed-elements"
33
version = "0.1.0"
44
edition = "2021"
55

packages/frender-elements/src/csr.rs renamed to packages/frender-keyed-elements/src/csr.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use frender_html::{
88
CsrElement, HtmlRenderContext,
99
};
1010

11-
use crate::{Elements, Keyed};
11+
use crate::{KeyedElements, Keyed};
1212

1313
pub trait KeyedElementsAlgorithm<K, E> {
1414
type KeyedElementsRenderStateKind: UnpinnedRenderStateKindPollRender;
@@ -1119,7 +1119,7 @@ pub mod linked_vec {
11191119
}
11201120
}
11211121

1122-
impl<I, A, E> CsrElement for Elements<I, A>
1122+
impl<I, A, E> CsrElement for KeyedElements<I, A>
11231123
where
11241124
I: IntoIterator<Item = E>,
11251125
A: ElementsAlgorithm<E>,
@@ -1196,7 +1196,7 @@ where
11961196
}
11971197

11981198
#[cfg(not_working_yet)]
1199-
pub type ElementsLinkedVec<I> = Elements<
1199+
pub type ElementsLinkedVec<I> = KeyedElements<
12001200
I,
12011201
linked_vec::Algorithm<
12021202
linked_vec::RealIndexMap<
@@ -1210,8 +1210,8 @@ pub type ElementsLinkedVec<I> = Elements<
12101210
#[allow(non_snake_case)]
12111211
pub fn ElementsLinkedVec<K, E: Element, I: IntoIterator<Item = Keyed<K, E>>>(
12121212
iter: I,
1213-
) -> Elements<I, linked_vec::Algorithm<linked_vec::RealIndexMap<K, E::UnpinnedRenderState<R>>>> {
1214-
Elements {
1213+
) -> KeyedElements<I, linked_vec::Algorithm<linked_vec::RealIndexMap<K, E::UnpinnedRenderState<R>>>> {
1214+
KeyedElements {
12151215
iter,
12161216
algorithm: Default::default(),
12171217
}

packages/frender-elements/src/csr/default.rs renamed to packages/frender-keyed-elements/src/csr/default.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ use frender_html::{
3939
CsrElement, HtmlRenderContext, RenderHtml, StateUnmount,
4040
};
4141

42-
use crate::{DefaultElementsAlgorithm, Keyed};
42+
use crate::{DefaultAlgorithm, Keyed};
4343

4444
use super::{ElementsAlgorithm, KeyedElementsAlgorithm};
4545

@@ -293,7 +293,7 @@ impl<K: Hash + Eq, EK: UnpinnedRenderStateKindPollRender> UnpinnedRenderStateKin
293293
}
294294
}
295295

296-
impl<K: Hash + Eq, E: CsrElement> KeyedElementsAlgorithm<K, E> for DefaultElementsAlgorithm {
296+
impl<K: Hash + Eq, E: CsrElement> KeyedElementsAlgorithm<K, E> for DefaultAlgorithm {
297297
type KeyedElementsRenderStateKind = Kind<K, E::RenderStateKind>;
298298

299299
fn keyed_elements_render_init<

packages/frender-elements/src/lib.rs renamed to packages/frender-keyed-elements/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ impl<K, E> Keyed<K, E> {
77
}
88
}
99

10-
#[derive(Debug, Clone, Copy)]
11-
pub struct DefaultElementsAlgorithm;
10+
#[derive(Debug, Clone, Copy, Default)]
11+
pub struct DefaultAlgorithm;
1212

1313
#[derive(Debug, Clone, Copy)]
14-
pub struct Elements<I: IntoIterator, A = DefaultElementsAlgorithm> {
14+
pub struct KeyedElements<I: IntoIterator, A = DefaultAlgorithm> {
1515
pub iter: I,
1616
pub algorithm: A,
1717
}
1818

1919
#[allow(non_snake_case)]
20-
pub const fn Elements<I: IntoIterator>(iter: I) -> Elements<I> {
21-
Elements {
20+
pub const fn KeyedElements<I: IntoIterator>(iter: I) -> KeyedElements<I> {
21+
KeyedElements {
2222
iter,
23-
algorithm: DefaultElementsAlgorithm,
23+
algorithm: DefaultAlgorithm,
2424
}
2525
}
2626

packages/frender-elements/src/ssr.rs renamed to packages/frender-keyed-elements/src/ssr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use frender_ssr::SsrElement;
22

3-
use crate::{Elements, Keyed};
3+
use crate::{KeyedElements, Keyed};
44

55
pub struct IterKeyed<I>(I);
66

@@ -15,7 +15,7 @@ where
1515
}
1616
}
1717

18-
impl<K, E, A, I: IntoIterator<Item = Keyed<K, E>>> SsrElement for Elements<I, A>
18+
impl<K, E, A, I: IntoIterator<Item = Keyed<K, E>>> SsrElement for KeyedElements<I, A>
1919
where
2020
K: std::hash::Hash + Eq, // TODO: ToString ?
2121
E: SsrElement,

packages/frender-elements/tests/html.rs renamed to packages/frender-keyed-elements/tests/html.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![cfg(feature = "csr")]
22

3-
use frender_elements::{Elements, Keyed};
43
use frender_html::cs;
4+
use frender_keyed_elements::{Keyed, KeyedElements};
55
use frender_test::{element::Node, renderer::RendererWithRoot};
66

77
fn dom_nodes_div_i32(dom: &RendererWithRoot) -> Vec<i32> {

packages/frender-elements/tests/simple.rs renamed to packages/frender-keyed-elements/tests/simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use std::str::FromStr;
44

5-
use frender_elements::{Elements, Keyed};
5+
use frender_keyed_elements::{Keyed, KeyedElements};
66
use frender_test::{element::Node, renderer::RendererWithRoot};
77

88
fn dom_nodes_parse<T: FromStr + PartialEq>(dom: &RendererWithRoot) -> Vec<T>

‎packages/frender/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ async-str-iter = { version = "0.1.0", path = "../async-str-iter" }
2525
frender-csr = { version = "0.1.0", path = "../frender-csr", optional = true }
2626
frender-csr-web = { version = "0.1.0", path = "../frender-csr-web", optional = true }
2727
frender-render-with = { version = "0.1.0", path = "../frender-render-with", optional = true }
28-
frender-elements = { version = "0.1.0", path = "../frender-elements", optional = true }
28+
frender-keyed-elements = { version = "0.1.0", path = "../frender-keyed-elements", optional = true }
2929
frender-context = { version = "0.1.0", path = "../frender-context", default-features = false, optional = true }
3030
frender-element = { version = "0.1.0", path = "../frender-element" }
3131
frender-style = { version = "0.1.0", path = "../frender-style" }
@@ -70,10 +70,10 @@ either = [
7070
]
7171
web = ["frender-csr-web"]
7272
spawn = ["frender-csr-web?/spawn"]
73-
ssr = ["frender-elements?/ssr"] # TODO: remove ssr feature
74-
csr = ["ssr", "frender-csr", "frender-elements?/csr"]
73+
ssr = ["frender-keyed-elements?/ssr"] # TODO: remove ssr feature
74+
csr = ["ssr", "frender-csr", "frender-keyed-elements?/csr"]
7575
RenderWith = ["dep:frender-render-with"]
76-
Elements = ["dep:frender-elements"]
76+
KeyedElements = ["dep:frender-keyed-elements"]
7777
ToElement = []
7878
context = ["dep:frender-context"]
7979
hooks = ["dep:hooks", "frender-context?/hooks"]

‎packages/frender/src/lib.rs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@ pub use frender_render_with::{
6060
RenderWith, Rendered,
6161
};
6262

63-
#[cfg(feature = "Elements")]
64-
pub use frender_elements::{DefaultElementsAlgorithm, Elements, Keyed};
63+
#[cfg(feature = "KeyedElements")]
64+
pub use frender_keyed_elements::{Keyed, KeyedElements};
65+
66+
#[cfg(feature = "KeyedElements")]
67+
pub use frender_keyed_elements as keyed_elements;
6568

6669
#[cfg(feature = "context")]
6770
pub use frender_context as context;
@@ -118,8 +121,8 @@ pub mod prelude {
118121

119122
pub use frender_element::Element;
120123

121-
#[cfg(feature = "Elements")]
122-
pub use crate::{Elements, Keyed};
124+
#[cfg(feature = "KeyedElements")]
125+
pub use crate::{Keyed, KeyedElements};
123126

124127
pub use crate::dom_tokens;
125128

0 commit comments

Comments
 (0)