flatten BuiltinType into AlgebraicType

clockworklabs · Oct 11, 2023 · a6cc5f8 · a6cc5f8
1 parent abccb96
commit a6cc5f8
Show file tree

Hide file tree

Showing 16 changed files with 531 additions and 954 deletions.
diff --git a/crates/cli/src/subcommands/call.rs b/crates/cli/src/subcommands/call.rs
@@ -9,7 +9,7 @@ use itertools::Either;
 use serde_json::Value;
 use spacetimedb::db::AlgebraicType;
 use spacetimedb_lib::de::serde::deserialize_from;
-use spacetimedb_lib::sats::{AlgebraicTypeRef, BuiltinType, Typespace};
+use spacetimedb_lib::sats::{AlgebraicTypeRef, Typespace};
 use spacetimedb_lib::ProductTypeElement;
 use std::fmt::Write;
 use std::iter;
@@ -86,7 +86,7 @@ pub async fn exec(mut config: Config, args: &ArgMatches) -> Result<(), Error> {
         .unwrap_or_default()
         .zip(describe_reducer.schema.elements.iter())
         .map(|(argument, element)| match &element.algebraic_type {
-            AlgebraicType::Builtin(BuiltinType::String) if !argument.starts_with('\"') || !argument.ends_with('\"') => {
+            AlgebraicType::String if !argument.starts_with('\"') || !argument.ends_with('\"') => {
                 format!("\"{}\"", argument)
             }
             _ => argument.to_string(),

diff --git a/crates/cli/src/subcommands/generate/csharp.rs b/crates/cli/src/subcommands/generate/csharp.rs
diff --git a/crates/cli/src/subcommands/generate/mod.rs b/crates/cli/src/subcommands/generate/mod.rs
@@ -264,8 +264,7 @@ impl GenItem {
                     let name = name.to_case(Case::Snake);
                     Some((name + ".py", code))
                 }
-                AlgebraicType::Builtin(_) => todo!(),
-                AlgebraicType::Ref(_) => todo!(),
+                _ => todo!(),
             },
             GenItem::Reducer(reducer) => {
                 let code = python::autogen_python_reducer(ctx, reducer);
@@ -293,8 +292,7 @@ impl GenItem {
                     let name = name.to_case(Case::Snake);
                     Some((name + ".ts", code))
                 }
-                AlgebraicType::Builtin(_) => todo!(),
-                AlgebraicType::Ref(_) => todo!(),
+                _ => todo!(),
             },
             GenItem::Reducer(reducer) => {
                 let code = typescript::autogen_typescript_reducer(ctx, reducer);
@@ -320,8 +318,7 @@ impl GenItem {
                     let code = csharp::autogen_csharp_tuple(ctx, name, prod, namespace);
                     Some((name.clone() + ".cs", code))
                 }
-                AlgebraicType::Builtin(_) => todo!(),
-                AlgebraicType::Ref(_) => todo!(),
+                _ => todo!(),
             },
             GenItem::Reducer(reducer) => {
                 let code = csharp::autogen_csharp_reducer(ctx, reducer, namespace);