mirror of
https://github.com/TxtDot/dalet-rs.git
synced 2024-11-05 17:33:58 +03:00
refactor: add type aliases
This commit is contained in:
parent
8b23712619
commit
fac56efca0
3 changed files with 92 additions and 86 deletions
|
|
@ -1,9 +1,9 @@
|
|||
use crate::daletl::{Argument, Body, IsNull, Page, Tag, Tid};
|
||||
|
||||
use super::{DaletPackError, TypeId};
|
||||
use super::{utils, DaletPackError, TypeId};
|
||||
|
||||
pub fn encode(page: &Page) -> Result<Vec<u8>, DaletPackError> {
|
||||
Ok(zstd::bulk::compress(&encode_no_compress(page)?, 5)
|
||||
Ok(utils::compress_zstd(&encode_no_compress(page)?)
|
||||
.map_err(|_| DaletPackError::ZstdCompressError)?)
|
||||
}
|
||||
|
||||
|
|
|
|||
166
src/typed.rs
166
src/typed.rs
|
|
@ -11,35 +11,94 @@ pub type Page = Vec<Tag>;
|
|||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Tag {
|
||||
El(NNBody),
|
||||
H(String, Hl),
|
||||
H(TBody, Hl),
|
||||
P(NNBody),
|
||||
Br,
|
||||
Ul(Vec<Tag>),
|
||||
Ol(Vec<Tag>),
|
||||
Row(Vec<Tag>, AlignArgument),
|
||||
Link(Body, String),
|
||||
Navlink(Body, String),
|
||||
Btn(Body, String),
|
||||
Navbtn(Body, String),
|
||||
Img(String),
|
||||
Row(Vec<Tag>, AlignArg),
|
||||
Link(Body, TArg),
|
||||
Navlink(Body, TArg),
|
||||
Btn(Body, TArg),
|
||||
Navbtn(Body, TArg),
|
||||
Img(TArg),
|
||||
Table(Vec<Tag>),
|
||||
Tcol(Vec<Tag>),
|
||||
Tpcol(Vec<Tag>),
|
||||
Hr,
|
||||
B(String),
|
||||
I(String),
|
||||
B(TBody),
|
||||
I(TBody),
|
||||
Bq(NNBody),
|
||||
Footlnk(NNArg),
|
||||
Footn(String, NNArg),
|
||||
Footn(TBody, NNArg),
|
||||
A(NNArg),
|
||||
S(String),
|
||||
Sup(String),
|
||||
Sub(String),
|
||||
S(TBody),
|
||||
Sup(TBody),
|
||||
Sub(TBody),
|
||||
Disc(NNBody),
|
||||
Bl(NNBody, AlignArgument),
|
||||
Bl(NNBody, AlignArg),
|
||||
Carousel(Vec<Tag>),
|
||||
Code(String, TNArgument),
|
||||
Pre(String),
|
||||
Code(TBody, TNArg),
|
||||
Pre(TBody),
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Body {
|
||||
Text(String),
|
||||
Tags(Vec<Tag>),
|
||||
Null,
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum NNBody {
|
||||
Text(String),
|
||||
Tags(Vec<Tag>),
|
||||
}
|
||||
|
||||
/// Text body
|
||||
pub type TBody = String;
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Arg {
|
||||
Text(String),
|
||||
Number(u8),
|
||||
Null,
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum TNArg {
|
||||
Text(String),
|
||||
Null,
|
||||
}
|
||||
|
||||
/// Text argument
|
||||
pub type TArg = String;
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
/// Not null argument
|
||||
pub enum NNArg {
|
||||
Text(String),
|
||||
Number(u8),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, TryFromPrimitive)]
|
||||
#[repr(u8)]
|
||||
pub enum AlignArg {
|
||||
Start,
|
||||
Center,
|
||||
End,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, TryFromPrimitive)]
|
||||
#[repr(u8)]
|
||||
/// Heading level
|
||||
pub enum Hl {
|
||||
One = 1,
|
||||
Two,
|
||||
Three,
|
||||
Four,
|
||||
Five,
|
||||
Six,
|
||||
}
|
||||
|
||||
impl From<Tag> for daletl::Tag {
|
||||
|
|
@ -73,24 +132,12 @@ impl From<Tag> for daletl::Tag {
|
|||
Tag::Disc(b) => t_new(Tid::Disc, b.into(), NA),
|
||||
Tag::Bl(b, a) => t_new(Tid::Bl, b.into(), a.into()),
|
||||
Tag::Carousel(b) => t_new(Tid::Carousel, b.into(), NA),
|
||||
Tag::Code(s, a) => t_new(Tid::Code, s.into(), a.into()),
|
||||
Tag::Pre(s) => t_new(Tid::Pre, s.into(), NA),
|
||||
Tag::Code(b, a) => t_new(Tid::Code, b.into(), a.into()),
|
||||
Tag::Pre(b) => t_new(Tid::Pre, b.into(), NA),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, TryFromPrimitive)]
|
||||
#[repr(u8)]
|
||||
/// Heading level
|
||||
pub enum Hl {
|
||||
One = 1,
|
||||
Two,
|
||||
Three,
|
||||
Four,
|
||||
Five,
|
||||
Six,
|
||||
}
|
||||
|
||||
impl From<Hl> for daletl::Argument {
|
||||
fn from(item: Hl) -> daletl::Argument {
|
||||
match item {
|
||||
|
|
@ -104,46 +151,25 @@ impl From<Hl> for daletl::Argument {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, TryFromPrimitive)]
|
||||
#[repr(u8)]
|
||||
pub enum AlignArgument {
|
||||
Start,
|
||||
Center,
|
||||
End,
|
||||
}
|
||||
|
||||
impl From<AlignArgument> for daletl::Argument {
|
||||
fn from(item: AlignArgument) -> daletl::Argument {
|
||||
impl From<AlignArg> for daletl::Argument {
|
||||
fn from(item: AlignArg) -> daletl::Argument {
|
||||
match item {
|
||||
AlignArgument::Start => NA,
|
||||
AlignArgument::Center => 1u8.into(),
|
||||
AlignArgument::End => 2u8.into(),
|
||||
AlignArg::Start => NA,
|
||||
AlignArg::Center => 1u8.into(),
|
||||
AlignArg::End => 2u8.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum TNArgument {
|
||||
Text(String),
|
||||
Null,
|
||||
}
|
||||
|
||||
impl From<TNArgument> for daletl::Argument {
|
||||
fn from(item: TNArgument) -> daletl::Argument {
|
||||
impl From<TNArg> for daletl::Argument {
|
||||
fn from(item: TNArg) -> daletl::Argument {
|
||||
match item {
|
||||
TNArgument::Text(s) => s.into(),
|
||||
TNArgument::Null => NA,
|
||||
TNArg::Text(s) => s.into(),
|
||||
TNArg::Null => NA,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Body {
|
||||
Text(String),
|
||||
Tags(Vec<Tag>),
|
||||
Null,
|
||||
}
|
||||
|
||||
impl From<Body> for daletl::Body {
|
||||
fn from(item: Body) -> daletl::Body {
|
||||
match item {
|
||||
|
|
@ -154,13 +180,6 @@ impl From<Body> for daletl::Body {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Arg {
|
||||
Text(String),
|
||||
Number(u8),
|
||||
Null,
|
||||
}
|
||||
|
||||
impl From<Arg> for daletl::Argument {
|
||||
fn from(item: Arg) -> daletl::Argument {
|
||||
match item {
|
||||
|
|
@ -171,13 +190,6 @@ impl From<Arg> for daletl::Argument {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
/// Not null argument
|
||||
pub enum NNArg {
|
||||
Text(String),
|
||||
Number(u8),
|
||||
}
|
||||
|
||||
impl From<NNArg> for daletl::Argument {
|
||||
fn from(item: NNArg) -> daletl::Argument {
|
||||
match item {
|
||||
|
|
@ -187,12 +199,6 @@ impl From<NNArg> for daletl::Argument {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(AutoFrom, Debug, Clone, PartialEq, Eq)]
|
||||
pub enum NNBody {
|
||||
Text(String),
|
||||
Tags(Vec<Tag>),
|
||||
}
|
||||
|
||||
impl From<NNBody> for daletl::Body {
|
||||
fn from(item: NNBody) -> daletl::Body {
|
||||
match item {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use dalet::{
|
|||
daletl::ToDaletlPage,
|
||||
daletpack::*,
|
||||
typed::{
|
||||
Body, Hl, NNBody, Page, TNArgument,
|
||||
Body, Hl, NNBody, Page, TNArg,
|
||||
Tag::{self, *},
|
||||
},
|
||||
};
|
||||
|
|
@ -38,7 +38,7 @@ fn bench() {
|
|||
let page: Page = vec![
|
||||
H("I am heading".into(), Hl::One),
|
||||
H("Heading 2".into(), Hl::Two),
|
||||
El(vec![
|
||||
P(vec![
|
||||
El("Some ".into()),
|
||||
B("bold".into()),
|
||||
I("italic".into()),
|
||||
|
|
@ -46,7 +46,7 @@ fn bench() {
|
|||
]
|
||||
.into()),
|
||||
Br,
|
||||
Code("Hello world".into(), TNArgument::Null),
|
||||
Code("Hello world".into(), TNArg::Null),
|
||||
Br,
|
||||
Ul(vec![
|
||||
El("abc".into()),
|
||||
|
|
@ -58,7 +58,7 @@ fn bench() {
|
|||
El("xyz".into()),
|
||||
]),
|
||||
Br,
|
||||
El(vec![
|
||||
P(vec![
|
||||
El("Lorem ipsum ".into()),
|
||||
Link(
|
||||
vec![Img("https://my-picture".into())].into(),
|
||||
|
|
|
|||
Loading…
Reference in a new issue