feat(serde): add optional serde integration (#105)

This allows this library to be used as a dependency by other Rust crates.

KAG-2426

Cargo.toml

@@ -16,6 +16,13 @@ cidr = "0.2"
 lazy_static = "1.4"
 uuid = "1.5"
 regex = "1.10"
+serde = { version = "1.0", features = ["derive"], optional = true }
+serde_regex = { version = "1.1", optional = true }
 
 [lib]
-crate-type = ["cdylib", "staticlib"]
+crate-type = ["lib", "cdylib", "staticlib"]
+
+[features]
+default = ["ffi"]
+ffi = []
+serde = ["cidr/serde", "dep:serde", "dep:serde_regex"]

src/ast.rs

@@ -3,24 +3,31 @@ use cidr::IpCidr;
 use regex::Regex;
 use std::net::IpAddr;
 
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug)]
 pub enum Expression {
     Logical(Box<LogicalExpression>),
     Predicate(Predicate),
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug)]
 pub enum LogicalExpression {
     And(Expression, Expression),
     Or(Expression, Expression),
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, PartialEq, Eq)]
 pub enum LhsTransformations {
     Lower,
     Any,
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, PartialEq, Eq)]
 pub enum BinaryOperator {
     Equals,         // ==
@@ -37,12 +44,14 @@ pub enum BinaryOperator {
     Contains,       // contains
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, Clone)]
 pub enum Value {
     String(String),
     IpCidr(IpCidr),
     IpAddr(IpAddr),
     Int(i64),
+    #[cfg_attr(feature = "serde", serde(with = "serde_regex"))]
     Regex(Regex),
 }
 
@@ -73,6 +82,7 @@ impl Value {
     }
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, Eq, PartialEq)]
 #[repr(C)]
 pub enum Type {
@@ -83,6 +93,7 @@ pub enum Type {
     Regex,
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug)]
 pub struct Lhs {
     pub var_name: String,
@@ -107,6 +118,7 @@ impl Lhs {
     }
 }
 
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug)]
 pub struct Predicate {
     pub lhs: Lhs,

src/lib.rs

@@ -1,12 +1,14 @@
-mod ast;
-mod context;
-pub mod ffi;
-mod interpreter;
-mod parser;
-mod router;
-mod schema;
-mod semantics;
+pub mod ast;
+pub mod context;
+pub mod interpreter;
+pub mod parser;
+pub mod router;
+pub mod schema;
+pub mod semantics;
 mod ast_tests;
 
+#[cfg(feature = "ffi")]
+pub mod ffi;
+
 #[macro_use]
 extern crate pest_derive;