make regexp_ast

Author: quininer

Cargo.lock

@@ -92,7 +92,7 @@ pub fn expand(DeriveInput { ident, data, .. }: DeriveInput) -> syn::ItemImpl {
                     let name = &unknown.ident;
                     assert!(
                         unknown.discriminant.is_none(),
-                        "custom discriminant unsupport"
+                        "unknown member is not allowed custom discriminant"
                     );
                     assert!(
                         is_with(&unknown.attrs).is_none(),
@@ -133,15 +133,20 @@ pub fn expand(DeriveInput { ident, data, .. }: DeriveInput) -> syn::ItemImpl {
                 );
             }
 
+            let mut discriminant: u32 = 0;
             let fields = iter
-                .enumerate()
-                .map(|(idx, field)| -> syn::Arm {
-                    let idx = idx + 1; // skip zero
-                    let idx: u32 = idx.try_into().expect("enum tags must not exceed 32 bits");
-                    let idx = idx as u64;
+                .map(|field| -> syn::Arm {
+                    match field.discriminant.as_ref() {
+                        Some((_, syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Int(lit), .. }))) => {
+                            discriminant = lit.base10_parse::<u32>().unwrap();
+                        },
+                        Some(_) => panic!("unsupported discriminant type"),
+                        None => (),
+                    };
+                    discriminant += 1;
+                    let idx = discriminant as u64;
                     let name = &field.ident;
 
-                    assert!(field.discriminant.is_none(), "custom discriminant is not allowed");
                     assert!(!is_unknown(&field.attrs), "unknown member must be first");
 
                     match enum_type {

crates/ast_node/src/encoding/decode.rs

@@ -81,7 +81,7 @@ pub fn expand(DeriveInput { ident, data, .. }: DeriveInput) -> syn::ItemImpl {
                     let name = &unknown.ident;
                     assert!(
                         unknown.discriminant.is_none(),
-                        "custom discriminant is not allowed"
+                        "unknown member is not allowed custom discriminant"
                     );
                     assert!(
                         is_with(&unknown.attrs).is_none(),
@@ -117,15 +117,19 @@ pub fn expand(DeriveInput { ident, data, .. }: DeriveInput) -> syn::ItemImpl {
                 );
             }
 
-            let fields = iter.enumerate().map(|(idx, field)| -> syn::Arm {
-                let idx = idx + 1; // skip zero
-                let idx: u32 = idx.try_into().expect("enum tags must not exceed 32 bits");
+            let mut discriminant: u32 = 0;
+            let fields = iter.map(|field| -> syn::Arm {
+                match field.discriminant.as_ref() {
+                    Some((_, syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Int(lit), .. }))) => {
+                        discriminant = lit.base10_parse::<u32>().unwrap();
+                    },
+                    Some(_) => panic!("unsupported discriminant type"),
+                    None => (),
+                };
+                discriminant += 1;
+                let idx = discriminant;
                 let name = &field.ident;
 
-                assert!(
-                    field.discriminant.is_none(),
-                    "custom discriminant is not allowed"
-                );
                 assert!(
                     !is_unknown(&field.attrs),
                     "unknown member must be first: {:?}",

crates/ast_node/src/encoding/encode.rs

@@ -37,7 +37,7 @@ impl<'de> cbor4ii::core::dec::Decode<'de> for WithChar<char> {
     ) -> Result<Self, cbor4ii::core::dec::Error<R::Error>> {
         let n = u32::decode(reader)?;
         let value = char::from_u32(n).ok_or_else(|| cbor4ii::core::dec::Error::Mismatch {
-            name: &"Token::Delim",
+            name: &"WithChar",
             found: 0,
         })?;
         Ok(WithChar(value))

crates/swc_common/src/serializer.rs

@@ -16,11 +16,13 @@ __rkyv     = []
 default    = []
 rkyv-impl  = []
 serde-impl = ["serde"]
+encoding-impl = ["cbor4ii", "swc_atoms/encoding-impl", "swc_common/encoding-impl"]
 
 [dependencies]
 bitflags  = { workspace = true }
 is-macro  = { workspace = true }
 serde     = { workspace = true, features = ["derive"], optional = true }
+cbor4ii = { workspace = true, features = [ "use_std" ], optional = true }
 
 swc_atoms              = { version = "7.0.0", path = "../swc_atoms" }
 swc_common             = { version = "14.0.4", path = "../swc_common" }

crates/swc_ecma_regexp_ast/Cargo.toml

@@ -30,7 +30,7 @@ pub struct Alternative {
 }
 
 /// Single unit of [`Alternative`], containing various kinds.
-#[ast_node]
+#[ast_node(no_unknown)]
 #[derive(Eq, Hash, EqIgnoreSpan, Is)]
 pub enum Term {
     // Assertion
@@ -85,6 +85,10 @@ pub struct BoundaryAssertion {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    feature = "encoding-impl",
+    derive(::swc_common::Encode, ::swc_common::Decode)
+)]
 pub enum BoundaryAssertionKind {
     Start = 0,
     End = 1,
@@ -104,6 +108,10 @@ pub struct LookAroundAssertion {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    feature = "encoding-impl",
+    derive(::swc_common::Encode, ::swc_common::Decode)
+)]
 pub enum LookAroundAssertionKind {
     Lookahead = 0,
     NegativeLookahead = 1,
@@ -119,6 +127,10 @@ pub struct Quantifier {
     pub span: Span,
     pub min: u64,
     /// `None` means no upper bound.
+    #[cfg_attr(
+        feature = "encoding-impl",
+        encoding(with = "cbor4ii::core::types::Maybe")
+    )]
     pub max: Option<u64>,
     pub greedy: bool,
     pub body: Term,
@@ -138,6 +150,10 @@ pub struct Character {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    feature = "encoding-impl",
+    derive(::swc_common::Encode, ::swc_common::Decode)
+)]
 pub enum CharacterKind {
     ControlLetter = 0,
     HexadecimalEscape = 1,
@@ -163,6 +179,10 @@ pub struct CharacterClassEscape {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    feature = "encoding-impl",
+    derive(::swc_common::Encode, ::swc_common::Decode)
+)]
 pub enum CharacterClassEscapeKind {
     D = 0,
     NegativeD = 1,
@@ -183,6 +203,10 @@ pub struct UnicodePropertyEscape {
     /// strings.
     pub strings: bool,
     pub name: Atom,
+    #[cfg_attr(
+        feature = "encoding-impl",
+        encoding(with = "cbor4ii::core::types::Maybe")
+    )]
     pub value: Option<Atom>,
 }
 
@@ -211,6 +235,10 @@ pub struct CharacterClass {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[cfg_attr(
+    feature = "encoding-impl",
+    derive(::swc_common::Encode, ::swc_common::Decode)
+)]
 pub enum CharacterClassContentsKind {
     Union = 0,
     /// `UnicodeSetsMode` only.
@@ -219,7 +247,7 @@ pub enum CharacterClassContentsKind {
     Subtraction = 2,
 }
 
-#[ast_node]
+#[ast_node(no_unknown)]
 #[derive(Eq, Hash, EqIgnoreSpan, Is)]
 pub enum CharacterClassContents {
     #[tag("CharacterClassRange")]
@@ -281,6 +309,10 @@ pub struct ClassString {
 pub struct CapturingGroup {
     pub span: Span,
     /// Group name to be referenced by [`NamedReference`].
+    #[cfg_attr(
+        feature = "encoding-impl",
+        encoding(with = "cbor4ii::core::types::Maybe")
+    )]
     pub name: Option<Atom>,
     pub body: Disjunction,
 }
@@ -291,6 +323,10 @@ pub struct CapturingGroup {
 #[derive(Eq, Hash, EqIgnoreSpan)]
 pub struct IgnoreGroup {
     pub span: Span,
+    #[cfg_attr(
+        feature = "encoding-impl",
+        encoding(with = "cbor4ii::core::types::Maybe")
+    )]
     pub modifiers: Option<Modifiers>,
     pub body: Disjunction,
 }
@@ -338,6 +374,29 @@ pub struct NamedReference {
     pub name: Atom,
 }
 
+#[cfg(feature = "encoding-impl")]
+impl cbor4ii::core::enc::Encode for Modifier {
+    fn encode<W: cbor4ii::core::enc::Write>(
+        &self,
+        writer: &mut W,
+    ) -> Result<(), cbor4ii::core::enc::Error<W::Error>> {
+        self.bits().encode(writer)
+    }
+}
+
+#[cfg(feature = "encoding-impl")]
+impl<'de> cbor4ii::core::dec::Decode<'de> for Modifier {
+    fn decode<R: cbor4ii::core::dec::Read<'de>>(
+        reader: &mut R,
+    ) -> Result<Self, cbor4ii::core::dec::Error<R::Error>> {
+        let n = u8::decode(reader)?;
+        Modifier::from_bits(n).ok_or_else(|| cbor4ii::core::dec::Error::Mismatch {
+            name: &"Modifier",
+            found: 0,
+        })
+    }
+}
+
 #[cfg(target_pointer_width = "64")]
 #[test]
 fn size_asserts() {