Skip to content

Commit 42ad3d2

Browse files
keithamuskeithamus
committed
tweak seralisation
1 parent 8af3a99 commit 42ad3d2

20 files changed

+47
-47
lines changed

‎crates/hdx_ast/src/css/rules/page.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<'a> PageSelector<'a> {
4949
}
5050

5151
#[derive(Atomizable, Debug, Clone, PartialEq, Hash)]
52-
#[cfg_attr(feature = "serde", derive(Serialize), serde(rename_all = "lowercase"))]
52+
#[cfg_attr(feature = "serde", derive(Serialize), serde(rename_all = "kebab-case"))]
5353
pub enum PagePseudoClass {
5454
Left,
5555
Right,

‎crates/hdx_ast/src/css/selector/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub enum AttributeModifier {
104104
}
105105

106106
#[derive(Atomizable, Debug, PartialEq, Hash)]
107-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
107+
#[cfg_attr(feature = "serde", derive(Serialize), serde(rename_all = "kebab-case"))]
108108
pub enum PseudoClass {
109109
Active, // atom!("active")
110110
AnyLink, // atom!("any-link")
@@ -178,7 +178,7 @@ pub enum PseudoFunction<'a> {
178178
}
179179

180180
#[derive(Atomizable, Debug, PartialEq, Hash)]
181-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
181+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
182182
pub enum DirValue {
183183
Rtl, // atom!("rtl")
184184
Ltr, // atom!("ltr")

‎crates/hdx_ast/src/css/stylesheet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{
1414

1515
// https://drafts.csswg.org/cssom-1/#the-cssstylesheet-interface
1616
#[derive(Debug, PartialEq, Hash)]
17-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "camelCase"))]
17+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
1818
pub struct CSSStyleSheet<'a> {
1919
pub rules: Vec<'a, CSSRule<'a>>,
2020
}

‎crates/hdx_ast/src/css/values/backgrounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub enum LineWidth {
2626

2727
// https://drafts.csswg.org/css-backgrounds-3/#typedef-line-style
2828
#[derive(Atomizable, Debug, Default, PartialEq, Hash)]
29-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
29+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
3030
pub enum LineStyle {
3131
#[default]
3232
None, // atom!("none")

‎crates/hdx_ast/src/css/values/break.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{atom, Atom, Atomizable};
55

66
// https://drafts.csswg.org/css-break-4/#propdef-box-decoration-break
77
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
8-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
8+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
99
pub enum BoxDecorationBreakValue {
1010
#[default]
1111
Slice, // atom!("slice")
@@ -14,7 +14,7 @@ pub enum BoxDecorationBreakValue {
1414

1515
// https://drafts.csswg.org/css-break-4/#propdef-break-after
1616
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
17-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
17+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1818
pub enum BreakValue {
1919
#[default]
2020
Auto, // atom!("auto")
@@ -35,7 +35,7 @@ pub enum BreakValue {
3535

3636
// https://drafts.csswg.org/css-break-4/#propdef-break-inside
3737
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
38-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
38+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
3939
pub enum BreakInsideValue {
4040
#[default]
4141
Auto, // atom!("auto")
@@ -47,7 +47,7 @@ pub enum BreakInsideValue {
4747

4848
// https://drafts.csswg.org/css-break-4/#propdef-margin-break
4949
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
50-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
50+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
5151
pub enum MarginBreakValue {
5252
#[default]
5353
Auto, // atom!("auto")

‎crates/hdx_ast/src/css/values/color.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ impl<'a> ColorValue<'a> {
241241
}
242242

243243
#[derive(Atomizable, Debug, PartialEq, Hash)]
244-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "name", rename_all = "lowercase"))]
244+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
245245
pub enum NamedColor {
246246
Aliceblue, // atom!("aliceblue")
247247
Antiquewhite, // atom!("antiquewhite")

‎crates/hdx_ast/src/css/values/content.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub enum ContentElement<'a> {
5353

5454
// https://drafts.csswg.org/css-content-3/#typedef-quote
5555
#[derive(Atomizable, Debug, PartialEq, Hash)]
56-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
56+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
5757
pub enum Quote {
5858
OpenQuote, // atom!("open-quote")
5959
CloseQuote, // atom!("close-quote")

‎crates/hdx_ast/src/css/values/counter_styles.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub enum CounterStyle<'a> {
1414

1515
// https://drafts.csswg.org/css-counter-styles-3/#predefined-counters
1616
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
17-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
17+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1818
pub enum PredefinedCounterStyle {
1919
Decimal, // atom!("decimal"),
2020
DecimalLeadingZero, // atom!("decimal-leading-zero"),
@@ -79,7 +79,7 @@ pub enum Symbol<'a> {
7979

8080
// https://drafts.csswg.org/css-counter-styles-3/#typedef-symbols-type
8181
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
82-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
82+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
8383
pub enum SymbolsType {
8484
Cyclic, // atom!("cyclic")
8585
Numeric, // atom!("numeric")

‎crates/hdx_ast/src/css/values/display.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl DisplayMarker {
218218

219219
// https://drafts.csswg.org/css-display-4/#propdef-visibility
220220
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
221-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
221+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
222222
pub enum VisibilityValue {
223223
#[default]
224224
Visible, // atom!("visible")

‎crates/hdx_ast/src/css/values/fonts.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{atom, Atom, Atomizable, Spanned};
66

77
// https://drafts.csswg.org/css2/#value-def-absolute-size
88
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
9-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
9+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1010
pub enum AbsoluteSize {
1111
XxSmall, // atom!("xx-small")
1212
XSmall, // atom!("x-small")
@@ -20,7 +20,7 @@ pub enum AbsoluteSize {
2020

2121
// https://drafts.csswg.org/css2/#value-def-relative-size
2222
#[derive(Atomizable, Debug, PartialEq, Hash)]
23-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
23+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
2424
pub enum RelativeSize {
2525
Larger, // atom!("larger")
2626
Smaller, // atom!("smaller")

‎crates/hdx_ast/src/css/values/images.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub enum RadialGradientSize {
4343

4444
// https://drafts.csswg.org/css-images-3/#typedef-rg-ending-shape
4545
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
46-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
46+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
4747
pub enum RadialGradientEndingShape {
4848
#[default]
4949
Circle, // atom!("circle")

‎crates/hdx_ast/src/css/values/inline.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::{atom, Atom, Atomizable, Spanned};
88

99
// https://drafts.csswg.org/css-inline/#propdef-alignment-baseline
1010
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
11-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
11+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1212
pub enum AlignmentBaselineValue {
1313
#[default]
1414
Baseline, // atom!("baseline")
@@ -23,7 +23,7 @@ pub enum AlignmentBaselineValue {
2323

2424
// https://drafts.csswg.org/css-inline/#propdef-baseline-source
2525
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
26-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
26+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
2727
pub enum BaselineSourceValue {
2828
#[default]
2929
Auto, // atom!("auto")
@@ -51,7 +51,7 @@ impl Default for BaselineShiftValue {
5151

5252
// https://drafts.csswg.org/css-inline/#propdef-dominant-baseline
5353
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
54-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
54+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
5555
pub enum DominantBaselineValue {
5656
#[default]
5757
Auto, // atom!("auto")
@@ -67,7 +67,7 @@ pub enum DominantBaselineValue {
6767

6868
// https://drafts.csswg.org/css-inline/#propdef-inline-sizing
6969
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
70-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
70+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
7171
pub enum InlineSizingValue {
7272
#[default]
7373
Normal, // atom!("normal")

‎crates/hdx_ast/src/css/values/lists.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub struct Counters<'a> {
3131

3232
// https://drafts.csswg.org/css-lists-3/#funcdef-counters
3333
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
34-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
34+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
3535
pub enum ListStylePositionValue {
3636
#[default]
3737
Outside, // atom!("outside")

‎crates/hdx_ast/src/css/values/overflow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{atom, Atom, Atomizable};
55

66
// https://drafts.csswg.org/css-overflow-3/#propdef-overflow-block
77
#[derive(Atomizable, Copy, Clone, Default, Debug, PartialEq, Hash)]
8-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
8+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
99
pub enum OverflowKeyword {
1010
#[default]
1111
Visible, // atom!("visible")

‎crates/hdx_ast/src/css/values/page_floats.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ impl FloatValue {
6262
}
6363

6464
#[derive(Atomizable, Debug, PartialEq, Hash)]
65-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
65+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
6666
pub enum SnapBlockFloat {
6767
Start, // atom!("start")
6868
End, // atom!("end")
6969
Near, // atom!("near")
7070
}
7171

7272
#[derive(Atomizable, Debug, PartialEq, Hash)]
73-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
73+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
7474
pub enum SnapInlineFloat {
7575
Right, // atom!("right")
7676
Left, // atom!("left")
@@ -79,7 +79,7 @@ pub enum SnapInlineFloat {
7979

8080
// https://drafts.csswg.org/css-page-floats-3/#propdef-clear
8181
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
82-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
82+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
8383
pub enum ClearValue {
8484
InlineStart, // atom!("inline-start")
8585
InlineEnd, // atom!("inline-end")
@@ -138,7 +138,7 @@ impl From<i32> for FloatDeferValue {
138138

139139
// https://drafts.csswg.org/css-page-floats-3/#propdef-float-reference
140140
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
141-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
141+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
142142
pub enum FloatReferenceValue {
143143
#[default]
144144
Inline, // atom!("inline")

‎crates/hdx_ast/src/css/values/position.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{atom, Atom, Atomizable};
66

77
// https://drafts.csswg.org/css-position-3/#propdef-position
88
#[derive(Atomizable, Debug, Default, PartialEq, Hash)]
9-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
9+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1010
pub enum PositionValue {
1111
#[default]
1212
Static, // atom!("static")
@@ -18,7 +18,7 @@ pub enum PositionValue {
1818

1919
// https://drafts.csswg.org/css-position-3/#inset-shorthands
2020
#[derive(Debug, Default, PartialEq, Hash)]
21-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
21+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
2222
pub struct InsetShorthand<'a> {
2323
pub top: Shorthand<'a, MathExpr<'a, LengthPercentageOrAuto>>,
2424
pub right: Shorthand<'a, MathExpr<'a, LengthPercentageOrAuto>>,

‎crates/hdx_ast/src/css/values/sizing.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{atom, Atom, Atomizable, Spanned};
66

77
// https://www.w3.org/TR/css-sizing-3/#propdef-box-sizing
88
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
9-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
9+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1010
pub enum BoxSizingValue {
1111
#[default]
1212
ContentBox, // atom!("content-box")
@@ -15,7 +15,7 @@ pub enum BoxSizingValue {
1515

1616
// https://drafts.csswg.org/css-sizing-4/#sizing-values
1717
#[derive(Default, Debug, PartialEq, Hash)]
18-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
18+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1919
pub enum Sizing {
2020
#[default]
2121
Auto,
@@ -30,7 +30,7 @@ pub enum Sizing {
3030
}
3131

3232
#[derive(Default, Debug, PartialEq, Hash)]
33-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
33+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
3434
pub enum MaxSizing {
3535
#[default]
3636
None,
@@ -45,7 +45,7 @@ pub enum MaxSizing {
4545
}
4646

4747
#[derive(Default, Debug, PartialEq, Hash)]
48-
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type"))]
48+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
4949
pub enum RatioOrAuto {
5050
#[default]
5151
Auto,
@@ -54,7 +54,7 @@ pub enum RatioOrAuto {
5454

5555
// https://drafts.csswg.org/css-sizing-4/#intrinsic-contribution-override
5656
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
57-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
57+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
5858
pub enum MinIntrinsicSizingValue {
5959
#[default]
6060
Legacy, // atom!("legacy")

‎crates/hdx_ast/src/css/values/tables.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{atom, Atom, Atomizable, Span};
66

77
// https://drafts.csswg.org/css-tables-3/#propdef-border-collapse
88
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
9-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
9+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1010
pub enum BorderCollapseValue {
1111
#[default]
1212
Separate, // atom!("separate")
@@ -15,7 +15,7 @@ pub enum BorderCollapseValue {
1515

1616
// https://drafts.csswg.org/css-tables-3/#propdef-caption-side
1717
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
18-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
18+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
1919
pub enum CaptionSideValue {
2020
#[default]
2121
Top, // atom!("top")
@@ -24,7 +24,7 @@ pub enum CaptionSideValue {
2424

2525
// https://drafts.csswg.org/css-tables-3/#propdef-caption-side
2626
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
27-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
27+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
2828
pub enum EmptyCellsValue {
2929
#[default]
3030
Show, // atom!("show")
@@ -33,7 +33,7 @@ pub enum EmptyCellsValue {
3333

3434
// https://drafts.csswg.org/css-tables-3/#propdef-caption-side
3535
#[derive(Atomizable, Default, Debug, PartialEq, Hash)]
36-
#[cfg_attr(feature = "serde", derive(Serialize), serde())]
36+
#[cfg_attr(feature = "serde", derive(Serialize), serde(tag = "type", rename_all = "kebab-case"))]
3737
pub enum TableLayoutValue {
3838
#[default]
3939
Auto, // atom!("auto")

0 commit comments

Comments
 (0)