Add impls.

moonrepo · Apr 25, 2024 · 5ecba30 · 5ecba30
1 parent 2c3c54a
commit 5ecba30
Show file tree

Hide file tree

Showing 10 changed files with 362 additions and 1,903 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = ["crates/*"]
+exclude = ["crates/schematic", "crates/test-app"]
 
 [workspace.dependencies]
 chrono = "0.4.37"

diff --git a/crates/types/src/arrays.rs b/crates/types/src/arrays.rs
@@ -1,5 +1,5 @@
 use crate::schema_type::SchemaType;
-use crate::Schematic;
+use crate::{Schema, SchemaBuilder, Schematic};
 use std::collections::{BTreeSet, HashSet};
 
 #[derive(Clone, Debug, Default)]
@@ -23,38 +23,42 @@ impl ArrayType {
     }
 }
 
-// macro_rules! impl_list {
-//     ($type:ident) => {
-//         impl<T: Schematic> Schematic for $type<T> {
-//             fn generate_schema() -> SchemaType {
-//                 SchemaType::array(T::generate_schema())
-//             }
-//         }
-//     };
-// }
+macro_rules! impl_list {
+    ($type:ident) => {
+        impl<T: Schematic> Schematic for $type<T> {
+            fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+                schema.array(ArrayType::new(schema.infer::<T>()));
+                schema.build()
+            }
+        }
+    };
+}
 
-// impl_list!(Vec);
-// impl_list!(BTreeSet);
+impl_list!(Vec);
+impl_list!(BTreeSet);
 
-// impl<T: Schematic> Schematic for &[T] {
-//     fn generate_schema() -> SchemaType {
-//         SchemaType::array(T::generate_schema())
-//     }
-// }
+impl<T: Schematic> Schematic for &[T] {
+    fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+        schema.array(ArrayType::new(schema.infer::<T>()));
+        schema.build()
+    }
+}
 
-// impl<T: Schematic, const N: usize> Schematic for [T; N] {
-//     fn generate_schema() -> SchemaType {
-//         SchemaType::Array(Box::new(ArrayType {
-//             items_type: Box::new(T::generate_schema()),
-//             max_length: Some(N),
-//             min_length: Some(N),
-//             ..ArrayType::default()
-//         }))
-//     }
-// }
+impl<T: Schematic, const N: usize> Schematic for [T; N] {
+    fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+        schema.array(ArrayType {
+            items_type: Box::new(schema.infer::<T>()),
+            max_length: Some(N),
+            min_length: Some(N),
+            ..ArrayType::default()
+        });
+        schema.build()
+    }
+}
 
-// impl<T: Schematic, S> Schematic for HashSet<T, S> {
-//     fn generate_schema() -> SchemaType {
-//         SchemaType::array(T::generate_schema())
-//     }
-// }
+impl<T: Schematic, S> Schematic for HashSet<T, S> {
+    fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+        schema.array(ArrayType::new(schema.infer::<T>()));
+        schema.build()
+    }
+}
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
@@ -29,6 +29,10 @@ pub use unions::*;
 
 /// Defines a schema that represents the shape of the implementing type.
 pub trait Schematic {
+    fn schema_id() -> Option<String> {
+        None
+    }
+
     /// Create and return a schema that models the structure of the implementing type.
     /// The schema can be used to generate code, documentation, or other artifacts.
     fn generate_schema(schema: SchemaBuilder) -> Schema {

diff --git a/crates/types/src/numbers.rs b/crates/types/src/numbers.rs
@@ -1,6 +1,5 @@
 use crate::literals::LiteralValue;
-use crate::schema_type::SchemaType;
-use crate::Schematic;
+use crate::{Schema, SchemaBuilder, Schematic};
 
 #[derive(Clone, Debug, Default)]
 pub enum IntegerKind {
@@ -65,37 +64,38 @@ impl IntegerType {
     }
 
     /// Create an integer schema with the provided kind.
-    pub fn new_kind(kind: IntegerKind) -> SchemaType {
-        SchemaType::Integer(Box::new(IntegerType {
+    pub fn new_kind(kind: IntegerKind) -> Self {
+        IntegerType {
             kind,
             ..IntegerType::default()
-        }))
+        }
     }
 }
 
-// macro_rules! impl_int {
-//     ($type:ty, $kind:expr) => {
-//         impl Schematic for $type {
-//             fn generate_schema() -> SchemaType {
-//                 SchemaType::integer($kind)
-//             }
-//         }
-//     };
-// }
-
-// impl_int!(usize, IntegerKind::Usize);
-// impl_int!(u8, IntegerKind::U8);
-// impl_int!(u16, IntegerKind::U16);
-// impl_int!(u32, IntegerKind::U32);
-// impl_int!(u64, IntegerKind::U64);
-// impl_int!(u128, IntegerKind::U128);
-
-// impl_int!(isize, IntegerKind::Isize);
-// impl_int!(i8, IntegerKind::I8);
-// impl_int!(i16, IntegerKind::I16);
-// impl_int!(i32, IntegerKind::I32);
-// impl_int!(i64, IntegerKind::I64);
-// impl_int!(i128, IntegerKind::I128);
+macro_rules! impl_int {
+    ($type:ty, $kind:expr) => {
+        impl Schematic for $type {
+            fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+                schema.integer(IntegerType::new_kind($kind));
+                schema.build()
+            }
+        }
+    };
+}
+
+impl_int!(usize, IntegerKind::Usize);
+impl_int!(u8, IntegerKind::U8);
+impl_int!(u16, IntegerKind::U16);
+impl_int!(u32, IntegerKind::U32);
+impl_int!(u64, IntegerKind::U64);
+impl_int!(u128, IntegerKind::U128);
+
+impl_int!(isize, IntegerKind::Isize);
+impl_int!(i8, IntegerKind::I8);
+impl_int!(i16, IntegerKind::I16);
+impl_int!(i32, IntegerKind::I32);
+impl_int!(i64, IntegerKind::I64);
+impl_int!(i128, IntegerKind::I128);
 
 #[derive(Clone, Debug, Default)]
 pub enum FloatKind {
@@ -146,15 +146,16 @@ impl FloatType {
     }
 }
 
-// macro_rules! impl_float {
-//     ($type:ty, $kind:expr) => {
-//         impl Schematic for $type {
-//             fn generate_schema() -> SchemaType {
-//                 SchemaType::float($kind)
-//             }
-//         }
-//     };
-// }
-
-// impl_float!(f32, FloatKind::F32);
-// impl_float!(f64, FloatKind::F64);
+macro_rules! impl_float {
+    ($type:ty, $kind:expr) => {
+        impl Schematic for $type {
+            fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+                schema.float(FloatType::new_kind($kind));
+                schema.build()
+            }
+        }
+    };
+}
+
+impl_float!(f32, FloatKind::F32);
+impl_float!(f64, FloatKind::F64);
diff --git a/crates/types/src/objects.rs b/crates/types/src/objects.rs
@@ -1,5 +1,5 @@
 use crate::schema_type::SchemaType;
-use crate::Schematic;
+use crate::{Schema, SchemaBuilder, Schematic};
 use std::collections::{BTreeMap, HashMap};
 
 #[derive(Clone, Debug, Default)]
@@ -22,14 +22,16 @@ impl ObjectType {
     }
 }
 
-// impl<K: Schematic, V: Schematic> Schematic for BTreeMap<K, V> {
-//     fn generate_schema() -> SchemaType {
-//         SchemaType::object(K::generate_schema(), V::generate_schema())
-//     }
-// }
+impl<K: Schematic, V: Schematic> Schematic for BTreeMap<K, V> {
+    fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+        schema.object(ObjectType::new(schema.infer::<K>(), schema.infer::<V>()));
+        schema.build()
+    }
+}
 
-// impl<K: Schematic, V: Schematic, S> Schematic for HashMap<K, V, S> {
-//     fn generate_schema() -> SchemaType {
-//         SchemaType::object(K::generate_schema(), V::generate_schema())
-//     }
-// }
+impl<K: Schematic, V: Schematic, S> Schematic for HashMap<K, V, S> {
+    fn generate_schema(mut schema: SchemaBuilder) -> Schema {
+        schema.object(ObjectType::new(schema.infer::<K>(), schema.infer::<V>()));
+        schema.build()
+    }
+}