Also reserving Option<...> for query arguments.

recatek · Jan 19, 2025 · f8b64c7 · f8b64c7
1 parent 993fc64
commit f8b64c7
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 9 deletions.
diff --git a/macros/src/generate/query.rs b/macros/src/generate/query.rs
@@ -193,6 +193,9 @@ fn find_bind_mut(param: &ParseQueryParam) -> TokenStream {
         ParseQueryParamType::OneOf(_) => {
             panic!("must unpack OneOf first")
         }
+        ParseQueryParamType::Option(_) => {
+            todo!() // Not yet implemented
+        }
         ParseQueryParamType::With(_) => {
             todo!() // Not yet implemented
         }
@@ -232,7 +235,10 @@ fn find_bind_borrow(param: &ParseQueryParam) -> TokenStream {
         ParseQueryParamType::OneOf(_) => {
             panic!("must unpack OneOf first")
         }
-                ParseQueryParamType::With(_) => {
+        ParseQueryParamType::Option(_) => {
+            todo!() // Not yet implemented
+        }
+        ParseQueryParamType::With(_) => {
             todo!() // Not yet implemented
         }
         ParseQueryParamType::Without(_) => {
@@ -507,7 +513,10 @@ fn iter_bind_mut(param: &ParseQueryParam) -> TokenStream {
         ParseQueryParamType::OneOf(_) => {
             panic!("must unpack OneOf first")
         }
-                ParseQueryParamType::With(_) => {
+        ParseQueryParamType::Option(_) => {
+            todo!() // Not yet implemented
+        }
+        ParseQueryParamType::With(_) => {
             todo!() // Not yet implemented
         }
         ParseQueryParamType::Without(_) => {
@@ -546,7 +555,10 @@ fn iter_bind_borrow(param: &ParseQueryParam) -> TokenStream {
         ParseQueryParamType::OneOf(_) => {
             panic!("must unpack OneOf first")
         }
-                ParseQueryParamType::With(_) => {
+        ParseQueryParamType::Option(_) => {
+            todo!() // Not yet implemented
+        }
+        ParseQueryParamType::With(_) => {
             todo!() // Not yet implemented
         }
         ParseQueryParamType::Without(_) => {
@@ -572,6 +584,7 @@ fn to_type(param: &ParseQueryParam, archetype: &DataArchetype) -> TokenStream {
         ParseQueryParamType::EntityDirectAny => quote!(EntityDirectAny),
         ParseQueryParamType::EntityDirectWild => quote!(EntityDirect<#archetype_name>),
         ParseQueryParamType::OneOf(_) => panic!("must unpack OneOf first"),
+        ParseQueryParamType::Option(_) => todo!(),
         ParseQueryParamType::With(_) => todo!(),
         ParseQueryParamType::Without(_) => todo!(),
     }
@@ -676,6 +689,9 @@ fn bind_query_params(
                         continue; // No need to check more
                     }
                 }
+                ParseQueryParamType::Option(_) => {
+                    todo!() // Not yet implemented
+                }
                 ParseQueryParamType::With(_) => {
                     todo!() // Not yet implemented
                 }

diff --git a/macros/src/parse/query.rs b/macros/src/parse/query.rs
@@ -17,6 +17,7 @@ mod kw {
     syn::custom_keyword!(EntityDirectAny);
 
     syn::custom_keyword!(OneOf);
+    syn::custom_keyword!(Option);
     syn::custom_keyword!(With);
     syn::custom_keyword!(Without);
 }
@@ -59,19 +60,22 @@ pub struct ParseQueryParam {
 }
 
 #[derive(Clone, Debug)]
+#[allow(dead_code)]
 pub enum ParseQueryParamType {
-    Component(Ident),    // CompFoo
+    Component(Ident), // CompFoo
+
+    // Entity Types
     Entity(Ident),       // Entity<A>
     EntityWild,          // Entity<_>
     EntityAny,           // EntityAny
     EntityDirect(Ident), // EntityDirect<A>
     EntityDirectWild,    // EntityDirect<_>
     EntityDirectAny,     // EntityDirectAny
-    OneOf(Box<[Ident]>), // OneOf<CompFoo, CompBar>
 
-    #[allow(dead_code)]
+    // Special Types
+    OneOf(Box<[Ident]>), // OneOf<CompFoo, CompBar>
+    Option(Ident),       // Option<CompFoo> -- TODO: RESERVED
     With(Ident),         // With<CompFoo> -- TODO: RESERVED
-    #[allow(dead_code)]
     Without(Ident),      // Without<CompFoo> -- TODO: RESERVED
 }
 
@@ -281,10 +285,21 @@ impl Parse for ParseQueryParamType {
                     break Err(lookahead.error());
                 }
             }
+        } else if lookahead.peek(kw::Option) {
+            Err(syn::Error::new(
+                input.span(),
+                "reserved special 'Option' not yet implemented",
+            ))
         } else if lookahead.peek(kw::With) {
-            Err(syn::Error::new(input.span(), "reserved keyword 'With' not yet implemented"))
+            Err(syn::Error::new(
+                input.span(),
+                "reserved special 'With' not yet implemented",
+            ))
         } else if lookahead.peek(kw::Without) {
-            Err(syn::Error::new(input.span(), "reserved keyword 'Without' not yet implemented"))
+            Err(syn::Error::new(
+                input.span(),
+                "reserved special 'Without' not yet implemented",
+            ))
         } else if lookahead.peek(Ident) {
             // Component
             Ok(ParseQueryParamType::Component(input.parse()?))