Merge remote-tracking branch 'origin/jdetter/use-github-large-runner' into jdetter/parallel-smoketests

Author: jdetter

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ name: CI
 jobs:
   docker_smoketests:
     name: Smoketests
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -23,7 +23,7 @@ jobs:
 
   test:
     name: Test Suite
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
 
   lints:
     name: Lints
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
 
   wasm_bindings:
     name: Build and test wasm bindings
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-runner
     steps:
       - uses: actions/checkout@v3
 

Cargo.lock

@@ -5,7 +5,7 @@ use spacetimedb::db::relational_db::{open_db, RelationalDB};
 use spacetimedb_lib::sats::product;
 use spacetimedb_lib::{AlgebraicType, AlgebraicValue, ProductType};
 
-type DbResult = (RelationalDB, u32);
+type DbResult = (RelationalDB, TempDir, u32);
 
 fn init_db() -> ResultBench<(TempDir, u32)> {
     let tmp_dir = TempDir::new("stdb_test")?;
@@ -26,7 +26,7 @@ fn init_db() -> ResultBench<(TempDir, u32)> {
 fn build_db() -> ResultBench<DbResult> {
     let (tmp_dir, table_id) = init_db()?;
     let stdb = open_db(&tmp_dir)?;
-    Ok((stdb, table_id))
+    Ok((stdb, tmp_dir, table_id))
 }
 
 fn insert_row(db: &RelationalDB, tx: &mut MutTxId, table_id: u32, run: Runs) -> ResultBench<()> {
@@ -60,7 +60,7 @@ impl BuildDb for DbResult {
 }
 
 pub fn prefill_data(db: &DbResult, run: Runs) -> ResultBench<()> {
-    let (conn, table_id) = db;
+    let (conn, _tmp_dir, table_id) = db;
 
     let mut tx = conn.begin_tx();
     insert_row(conn, &mut tx, *table_id, run)?;
@@ -70,8 +70,8 @@ pub fn prefill_data(db: &DbResult, run: Runs) -> ResultBench<()> {
 }
 
 pub fn insert_tx_per_row(pool: &mut Pool<DbResult>, run: Runs) -> ResultBench<()> {
-    let (conn, table_id) = pool.next()?;
-    //let mut log = log.lock().unwrap();
+    let (conn, _tmp_dir, table_id) = pool.next()?;
+
     for row in run.data() {
         let mut tx = conn.begin_tx();
 
@@ -96,7 +96,7 @@ pub fn insert_tx(pool: &mut Pool<DbResult>, _run: Runs) -> ResultBench<()> {
 }
 
 pub fn select_no_index(pool: &mut Pool<DbResult>, run: Runs) -> ResultBench<()> {
-    let (conn, table_id) = pool.next()?;
+    let (conn, _tmp_dir, table_id) = pool.next()?;
 
     let tx = conn.begin_tx();
 

crates/bench/src/spacetime.rs

@@ -615,12 +615,18 @@ fn autogen_csharp_product_table_common(
                     AlgebraicType::Sum(sum) => {
                         if is_option_type(sum) {
                             writeln!(output, "[SpacetimeDB.Some]").unwrap();
-                        } else if is_enum(sum) {
-                            writeln!(
-                                output,
-                                "[Newtonsoft.Json.JsonConverter(typeof(SpacetimeDB.EnumConverter))]"
-                            )
-                            .unwrap();
+                        } else {
+                            unimplemented!()
+                        }
+                    }
+                    AlgebraicType::Ref(type_ref) => {
+                        let ref_type = &ctx.typespace.types[type_ref.idx()];
+                        if let AlgebraicType::Sum(sum_type) = ref_type {
+                            if is_enum(sum_type) {
+                                writeln!(output, "[SpacetimeDB.Enum]").unwrap();
+                            } else {
+                                unimplemented!()
+                            }
                         }
                     }
                     _ => {}

crates/cli/src/subcommands/generate/csharp.rs

@@ -4,6 +4,7 @@ use std::path::{Path, PathBuf};
 use clap::Arg;
 use clap::ArgAction::SetTrue;
 use convert_case::{Case, Casing};
+use duct::cmd;
 use spacetimedb_lib::sats::{AlgebraicType, Typespace};
 use spacetimedb_lib::{bsatn, MiscModuleExport, ModuleDef, ReducerDef, TableDef, TypeAlias};
 use wasmtime::{AsContext, Caller, ExternType};
@@ -110,10 +111,15 @@ Failed to compile module {:?}. See cargo errors above for more details.",
         ));
     }
 
+    let mut paths = vec![];
     for (fname, code) in generate(&wasm_file, lang, namespace.as_str())?.into_iter() {
-        fs::write(out_dir.join(fname), code)?;
+        let path = out_dir.join(fname);
+        paths.push(path.clone());
+        fs::write(path, code)?;
     }
 
+    format_files(paths, lang)?;
+
     println!("Generate finished successfully.");
     Ok(())
 }
@@ -433,3 +439,19 @@ impl Memory {
             .get(..len as usize)
     }
 }
+
+fn format_files(generated_files: Vec<PathBuf>, lang: Language) -> anyhow::Result<()> {
+    match lang {
+        Language::Rust => {
+            cmd!("rustup", "component", "add", "rustfmt").run()?;
+            for path in generated_files {
+                cmd!("rustfmt", path.to_str().unwrap()).run()?;
+            }
+        }
+        Language::Csharp => {}
+        Language::TypeScript => {}
+        Language::Python => {}
+    }
+
+    Ok(())
+}

crates/cli/src/subcommands/generate/mod.rs

@@ -224,7 +224,7 @@ fn autogen_python_product_table_common(
         writeln!(output).unwrap();
         writeln!(
             output,
-            "from spacetimedb_python_sdk.spacetimedb_client import SpacetimeDBClient"
+            "from spacetimedb_sdk.spacetimedb_client import SpacetimeDBClient"
         )
         .unwrap();
     } else {
@@ -545,7 +545,7 @@ pub fn autogen_python_reducer(ctx: &GenCtx, reducer: &ReducerDef) -> String {
 
     writeln!(
         output,
-        "from spacetimedb_python_sdk.spacetimedb_client import SpacetimeDBClient"
+        "from spacetimedb_sdk.spacetimedb_client import SpacetimeDBClient"
     )
     .unwrap();
     writeln!(output).unwrap();

crates/cli/src/subcommands/generate/python.rs

@@ -535,12 +535,32 @@ fn print_table_filter_methods(
     )
 }
 
+fn reducer_type_name(reducer: &ReducerDef) -> String {
+    let mut name = reducer.name.to_case(Case::Pascal);
+    name.push_str("Args");
+    name
+}
+
+fn reducer_variant_name(reducer: &ReducerDef) -> String {
+    reducer.name.to_case(Case::Pascal)
+}
+
+fn reducer_module_name(reducer: &ReducerDef) -> String {
+    let mut name = reducer.name.to_case(Case::Snake);
+    name.push_str("_reducer");
+    name
+}
+
+fn reducer_function_name(reducer: &ReducerDef) -> String {
+    reducer.name.to_case(Case::Snake)
+}
+
 /// Generate a file which defines a struct corresponding to the `reducer`'s arguments,
 /// implements `spacetimedb_sdk::table::Reducer` for it, and defines a helper
 /// function which invokes the reducer.
 pub fn autogen_rust_reducer(ctx: &GenCtx, reducer: &ReducerDef) -> String {
-    let func_name = reducer.name.to_case(Case::Snake);
-    let type_name = reducer.name.to_case(Case::Pascal);
+    let func_name = reducer_function_name(reducer);
+    let type_name = reducer_type_name(reducer);
 
     let mut output = CodeIndenter::new(String::new());
     let out = &mut output;
@@ -610,9 +630,9 @@ pub fn autogen_rust_reducer(ctx: &GenCtx, reducer: &ReducerDef) -> String {
 ///
 /// The `mod.rs` contains several things:
 ///
-/// 1. `pub mod` declarations for all the other files generated. Without these, either the
-///    other files wouldn't get compiled, or users would have to `mod`-declare each file
-///    manually.
+/// 1. `pub mod` and `pub use` declarations for all the other files generated.
+///    Without these, either the other files wouldn't get compiled,
+///    or users would have to `mod`-declare each file manually.
 ///
 /// 2. `enum ReducerEvent`, which has variants for each reducer in the module.
 ///    Row callbacks are passed an optional `ReducerEvent` as an additional argument,
@@ -659,6 +679,11 @@ pub fn autogen_rust_globals(ctx: &GenCtx, items: &[GenItem]) -> Vec<(String, Str
 
     out.newline();
 
+    // Re-export all the modules for the generated files.
+    print_module_reexports(out, items);
+
+    out.newline();
+
     // Define `enum ReducerEvent`.
     print_reducer_event_defn(out, items);
 
@@ -723,21 +748,25 @@ fn iter_table_items(items: &[GenItem]) -> impl Iterator<Item = &TableDef> {
     })
 }
 
+fn iter_module_names(items: &[GenItem]) -> impl Iterator<Item = String> + '_ {
+    items.iter().filter_map(|item| match item {
+        GenItem::Table(table) => Some(table.name.to_case(Case::Snake)),
+        GenItem::TypeAlias(ty) => Some(ty.name.to_case(Case::Snake)),
+        GenItem::Reducer(reducer) => (!is_init(reducer)).then_some(reducer_module_name(reducer)),
+    })
+}
+
 /// Print `pub mod` declarations for all the files that will be generated for `items`.
 fn print_module_decls(out: &mut Indenter, items: &[GenItem]) {
-    for item in items {
-        let (name, suffix) = match item {
-            GenItem::Table(table) => (&table.name, ""),
-            GenItem::TypeAlias(ty) => (&ty.name, ""),
-            GenItem::Reducer(reducer) => {
-                if is_init(reducer) {
-                    continue;
-                }
-                (&reducer.name, "_reducer")
-            }
-        };
-        let module_name = name.to_case(Case::Snake);
-        writeln!(out, "pub mod {}{};", module_name, suffix).unwrap();
+    for module_name in iter_module_names(items) {
+        writeln!(out, "pub mod {};", module_name).unwrap();
+    }
+}
+
+/// Print `pub use *` declarations for all the files that will be generated for `items`.
+fn print_module_reexports(out: &mut Indenter, items: &[GenItem]) {
+    for module_name in iter_module_names(items) {
+        writeln!(out, "pub use {}::*;", module_name).unwrap();
     }
 }
 
@@ -856,14 +885,13 @@ fn print_handle_event_defn(out: &mut Indenter, items: &[GenItem]) {
                 "match &function_call.reducer[..] {",
                 |out| {
                     for reducer in iter_reducer_items(items) {
-                        let type_or_variant_name = reducer.name.to_case(Case::Pascal);
                         writeln!(
                             out,
-                            "{:?} => reducer_callbacks.handle_event_of_type::<{}_reducer::{}, ReducerEvent>(event, state, ReducerEvent::{}),",
+                            "{:?} => reducer_callbacks.handle_event_of_type::<{}::{}, ReducerEvent>(event, state, ReducerEvent::{}),",
                             reducer.name,
-                            reducer.name.to_case(Case::Snake),
-                            type_or_variant_name,
-                            type_or_variant_name,
+                            reducer_module_name(reducer),
+                            reducer_type_name(reducer),
+                            reducer_variant_name(reducer),
                         ).unwrap();
                     }
                     writeln!(
@@ -925,13 +953,12 @@ fn print_reducer_event_defn(out: &mut Indenter, items: &[GenItem]) {
             for item in items {
                 if let GenItem::Reducer(reducer) = item {
                     if !is_init(reducer) {
-                        let type_name = reducer.name.to_case(Case::Pascal);
                         writeln!(
                             out,
-                            "{}({}_reducer::{}),",
-                            type_name,
-                            reducer.name.to_case(Case::Snake),
-                            type_name,
+                            "{}({}::{}),",
+                            reducer_variant_name(reducer),
+                            reducer_module_name(reducer),
+                            reducer_type_name(reducer),
                         )
                         .unwrap();
                     }

crates/cli/src/subcommands/generate/rust.rs

@@ -720,7 +720,7 @@ fn autogen_typescript_product_table_common(
                         .as_ref()
                         .expect("autogen'd tuples should have field names")
                         .replace("r#", "");
-                    format!("\"{}\"", field_name)
+                    format!("\"{}\"", field_name.to_case(Case::Camel))
                 })
             {
                 writeln!(