fix client codegen for views

Author: joshua-spacetime

crates/codegen/src/csharp.rs

@@ -7,8 +7,8 @@ use std::ops::Deref;
 use super::code_indenter::CodeIndenter;
 use super::Lang;
 use crate::util::{
-    collect_case, is_reducer_invokable, iter_indexes, iter_reducers, iter_tables, print_auto_generated_file_comment,
-    print_auto_generated_version_comment, type_ref_name,
+    collect_case, is_reducer_invokable, iter_indexes, iter_reducers, iter_table_names_and_types,
+    print_auto_generated_file_comment, print_auto_generated_version_comment, type_ref_name,
 };
 use crate::{indent_scope, OutputFile};
 use convert_case::{Case, Casing};
@@ -745,11 +745,11 @@ impl Lang for Csharp<'_> {
         indented_block(&mut output, |output| {
             writeln!(output, "public RemoteTables(DbConnection conn)");
             indented_block(output, |output| {
-                for table in iter_tables(module) {
+                for (table_name, _) in iter_table_names_and_types(module) {
                     writeln!(
                         output,
                         "AddTable({} = new(conn));",
-                        table.name.deref().to_case(Case::Pascal)
+                        table_name.deref().to_case(Case::Pascal)
                     );
                 }
             });

crates/codegen/src/rust.rs

@@ -2,8 +2,8 @@ use super::code_indenter::{CodeIndenter, Indenter};
 use super::util::{collect_case, iter_reducers, print_lines, type_ref_name};
 use super::Lang;
 use crate::util::{
-    iter_procedures, iter_tables, iter_types, iter_unique_cols, print_auto_generated_file_comment,
-    print_auto_generated_version_comment,
+    iter_procedures, iter_table_names_and_types, iter_tables, iter_types, iter_unique_cols, iter_views,
+    print_auto_generated_file_comment, print_auto_generated_version_comment,
 };
 use crate::OutputFile;
 use convert_case::{Case, Casing};
@@ -930,12 +930,13 @@ fn reducer_flags_trait_name(reducer: &ReducerDef) -> String {
     format!("set_flags_for_{}", reducer_function_name(reducer))
 }
 
-/// Iterate over all of the Rust `mod`s for types, reducers and tables in the `module`.
+/// Iterate over all of the Rust `mod`s for types, reducers, views, and tables in the `module`.
 fn iter_module_names(module: &ModuleDef) -> impl Iterator<Item = String> + '_ {
     itertools::chain!(
         iter_types(module).map(|ty| type_module_name(&ty.name)),
         iter_reducers(module).map(|r| reducer_module_name(&r.name)),
         iter_tables(module).map(|tbl| table_module_name(&tbl.name)),
+        iter_views(module).map(|view| table_module_name(&view.name)),
         iter_procedures(module).map(|proc| procedure_module_name(&proc.name)),
     )
 }
@@ -954,8 +955,8 @@ fn print_module_reexports(module: &ModuleDef, out: &mut Indenter) {
         let type_name = collect_case(Case::Pascal, ty.name.name_segments());
         writeln!(out, "pub use {mod_name}::{type_name};")
     }
-    for table in iter_tables(module) {
-        let mod_name = table_module_name(&table.name);
+    for (table_name, _) in iter_table_names_and_types(module) {
+        let mod_name = table_module_name(table_name);
         // TODO: More precise reexport: we want:
         // - The trait name.
         // - The insert, delete and possibly update callback ids.
@@ -1113,12 +1114,12 @@ fn print_db_update_defn(module: &ModuleDef, out: &mut Indenter) {
     out.delimited_block(
         "pub struct DbUpdate {",
         |out| {
-            for table in iter_tables(module) {
+            for (table_name, product_type_ref) in iter_table_names_and_types(module) {
                 writeln!(
                     out,
                     "{}: __sdk::TableUpdate<{}>,",
-                    table_method_name(&table.name),
-                    type_ref_name(module, table.product_type_ref),
+                    table_method_name(table_name),
+                    type_ref_name(module, product_type_ref),
                 );
             }
         },
@@ -1137,13 +1138,13 @@ impl TryFrom<__ws::DatabaseUpdate<__ws::BsatnFormat>> for DbUpdate {
             match &table_update.table_name[..] {
 ",
         |out| {
-            for table in iter_tables(module) {
+            for (table_name, _) in iter_table_names_and_types(module) {
                 writeln!(
                     out,
                     "{:?} => db_update.{}.append({}::parse_table_update(table_update)?),",
-                    table.name.deref(),
-                    table_method_name(&table.name),
-                    table_module_name(&table.name),
+                    table_name.deref(),
+                    table_method_name(table_name),
+                    table_module_name(table_name),
                 );
             }
         },
@@ -1181,21 +1182,28 @@ impl __sdk::InModule for DbUpdate {{
                     let mut diff = AppliedDiff::default();
                 ",
                 |out| {
-                    for table in iter_tables(module) {
-                        let with_updates = table
-                            .primary_key
-                            .map(|col| {
-                                let pk_field = table.get_column(col).unwrap().name.deref().to_case(Case::Snake);
-                                format!(".with_updates_by_pk(|row| &row.{pk_field})")
-                            })
-                            .unwrap_or_default();
-
-                        let field_name = table_method_name(&table.name);
+                    for (table_name, product_type_ref, with_updates) in itertools::chain!(
+                        iter_tables(module).map(|table| {
+                            (
+                                &table.name,
+                                table.product_type_ref,
+                                table
+                                    .primary_key
+                                    .map(|col| {
+                                        let pk_field = table.get_column(col).unwrap().name.deref().to_case(Case::Snake);
+                                        format!(".with_updates_by_pk(|row| &row.{pk_field})")
+                                    })
+                                    .unwrap_or_default(),
+                            )
+                        }),
+                        iter_views(module).map(|view| (&view.name, view.product_type_ref, "".into()))
+                    ) {
+                        let field_name = table_method_name(table_name);
                         writeln!(
                             out,
                             "diff.{field_name} = cache.apply_diff_to_table::<{}>({:?}, &self.{field_name}){with_updates};",
-                            type_ref_name(module, table.product_type_ref),
-                            table.name.deref(),
+                            type_ref_name(module, product_type_ref),
+                            table_name.deref(),
                         );
                     }
                 },
@@ -1215,12 +1223,12 @@ fn print_applied_diff_defn(module: &ModuleDef, out: &mut Indenter) {
     out.delimited_block(
         "pub struct AppliedDiff<'r> {",
         |out| {
-            for table in iter_tables(module) {
+            for (table_name, product_type_ref) in iter_table_names_and_types(module) {
                 writeln!(
                     out,
                     "{}: __sdk::TableAppliedDiff<'r, {}>,",
-                    table_method_name(&table.name),
-                    type_ref_name(module, table.product_type_ref),
+                    table_method_name(table_name),
+                    type_ref_name(module, product_type_ref),
                 );
             }
             // Also write a `PhantomData` field which uses the lifetime `r`,
@@ -1248,13 +1256,13 @@ impl __sdk::InModule for AppliedDiff<'_> {{
             out.delimited_block(
                 "fn invoke_row_callbacks(&self, event: &EventContext, callbacks: &mut __sdk::DbCallbacks<RemoteModule>) {",
                 |out| {
-                    for table in iter_tables(module) {
+                    for (table_name, product_type_ref) in iter_table_names_and_types(module) {
                         writeln!(
                             out,
                             "callbacks.invoke_table_row_callbacks::<{}>({:?}, &self.{}, event);",
-                            type_ref_name(module, table.product_type_ref),
-                            table.name.deref(),
-                            table_method_name(&table.name),
+                            type_ref_name(module, product_type_ref),
+                            table_name.deref(),
+                            table_method_name(table_name),
                         );
                     }
                 },
@@ -1290,8 +1298,8 @@ type SubscriptionHandle = SubscriptionHandle;
             out.delimited_block(
                 "fn register_tables(client_cache: &mut __sdk::ClientCache<Self>) {",
                 |out| {
-                    for table in iter_tables(module) {
-                        writeln!(out, "{}::register_table(client_cache);", table_module_name(&table.name));
+                    for (table_name, _) in iter_table_names_and_types(module) {
+                        writeln!(out, "{}::register_table(client_cache);", table_module_name(table_name));
                     }
                 },
                 "}\n",

crates/codegen/src/typescript.rs

@@ -1,5 +1,5 @@
 use crate::util::{
-    is_reducer_invokable, iter_constraints, iter_indexes, iter_reducers, iter_table_and_view_names, iter_tables,
+    is_reducer_invokable, iter_constraints, iter_indexes, iter_reducers, iter_table_names_and_types, iter_tables,
     iter_types, iter_views, print_auto_generated_version_comment,
 };
 use crate::OutputFile;
@@ -195,7 +195,7 @@ impl Lang for TypeScript {
 
         writeln!(out);
         writeln!(out, "// Import and reexport all table handle types");
-        for table_name in iter_table_and_view_names(module) {
+        for (table_name, _) in iter_table_names_and_types(module) {
             let table_module_name = table_module_name(table_name);
             let table_name_pascalcase = table_name.deref().to_case(Case::Pascal);
             // TODO: This really shouldn't be necessary. We could also have `table()` accept

crates/codegen/src/unrealcpp.rs

@@ -1,7 +1,8 @@
 //! Autogenerated Unreal‑C++ code‑gen backend for SpacetimeDB CLI
 use crate::code_indenter::CodeIndenter;
 use crate::util::{
-    collect_case, fmt_fn, iter_tables, print_auto_generated_file_comment, print_auto_generated_version_comment,
+    collect_case, fmt_fn, iter_table_names_and_types, print_auto_generated_file_comment,
+    print_auto_generated_version_comment,
 };
 use crate::util::{iter_indexes, iter_reducers};
 use crate::Lang;
@@ -683,8 +684,8 @@ impl Lang for UnrealCpp<'_> {
         writeln!(client_h);
 
         writeln!(client_h, "/** Forward declaration for tables */");
-        for table in iter_tables(module) {
-            let table_pascal = type_ref_name(module, table.product_type_ref);
+        for (_, product_type_ref) in iter_table_names_and_types(module) {
+            let table_pascal = type_ref_name(module, product_type_ref);
             writeln!(client_h, "class U{table_pascal}Table;");
         }
         writeln!(client_h, "/***/");
@@ -774,12 +775,11 @@ impl Lang for UnrealCpp<'_> {
         });
 
         // Build table includes
-        let table_includes: Vec<String> = module
-            .tables()
-            .map(|table| {
+        let table_includes: Vec<String> = iter_table_names_and_types(module)
+            .map(|(_, product_type_ref)| {
                 format!(
                     "ModuleBindings/Tables/{}Table.g.h",
-                    type_ref_name(module, table.product_type_ref)
+                    type_ref_name(module, product_type_ref)
                 )
             })
             .collect();
@@ -1856,14 +1856,14 @@ fn generate_remote_tables_class(output: &mut UnrealCppAutogen, module: &ModuleDe
     writeln!(output);
 
     // Generate table handle properties
-    for table in module.tables() {
-        let table_pascal = type_ref_name(module, table.product_type_ref);
+    for (table_name, product_type_ref) in iter_table_names_and_types(module) {
+        let table_pascal = type_ref_name(module, product_type_ref);
 
         writeln!(output, "    UPROPERTY(BlueprintReadOnly, Category=\"SpacetimeDB\")");
         writeln!(
             output,
             "    U{table_pascal}Table* {};",
-            table.name.deref().to_case(Case::Pascal)
+            table_name.deref().to_case(Case::Pascal)
         );
         writeln!(output);
     }
@@ -2357,16 +2357,16 @@ fn generate_client_implementation(output: &mut UnrealCppAutogen, module: &Module
     writeln!(output, "\tReducers->SetCallReducerFlags = SetReducerFlags;");
     writeln!(output, "\tReducers->Conn = this;");
     writeln!(output);
-    for table in module.tables() {
-        let table_pascal = type_ref_name(module, table.product_type_ref);
-        let table_name = table.name.deref();
+    for (table_name, product_type_ref) in iter_table_names_and_types(module) {
+        let table_pascal = type_ref_name(module, product_type_ref);
+        let table_name = table_name.deref();
         writeln!(
             output,
             "\tRegisterTable<F{}Type, U{}Table, FEventContext>(TEXT(\"{}\"), Db->{});",
             table_pascal,
             table_pascal,
             table_name,
-            table.name.deref().to_case(Case::Pascal)
+            table_name.to_case(Case::Pascal)
         );
     }
     writeln!(output, "}}");
@@ -2412,23 +2412,23 @@ fn generate_client_implementation(output: &mut UnrealCppAutogen, module: &Module
     writeln!(output, "{{");
     writeln!(output);
     writeln!(output, "\t/** Creating tables */");
-    for table in module.tables() {
-        let table_pascal = type_ref_name(module, table.product_type_ref);
+    for (table_name, product_type_ref) in iter_table_names_and_types(module) {
+        let table_pascal = type_ref_name(module, product_type_ref);
         writeln!(
             output,
             "\t{} = NewObject<U{}Table>(this);",
-            table.name.deref().to_case(Case::Pascal),
+            table_name.deref().to_case(Case::Pascal),
             table_pascal
         );
     }
     writeln!(output, "\t/**/");
     writeln!(output);
     writeln!(output, "\t/** Initialization */");
-    for table in module.tables() {
+    for (table_name, _) in iter_table_names_and_types(module) {
         writeln!(
             output,
             "\t{}->PostInitialize();",
-            table.name.deref().to_case(Case::Pascal)
+            table_name.deref().to_case(Case::Pascal)
         );
     }
     writeln!(output, "\t/**/");
@@ -3095,10 +3095,8 @@ fn collect_optional_types(module: &ModuleDef) -> HashSet<String> {
     }
 
     // Collect from all tables
-    for table in module.tables() {
-        let product_type = module.typespace_for_generate()[table.product_type_ref]
-            .as_product()
-            .unwrap();
+    for (_, product_type_ref) in iter_table_names_and_types(module) {
+        let product_type = module.typespace_for_generate()[product_type_ref].as_product().unwrap();
         for (_, field_ty) in &product_type.elements {
             collect_from_type(module, field_ty, &mut optional_types);
         }

crates/codegen/src/util.rs

@@ -125,12 +125,12 @@ pub(super) fn iter_views(module: &ModuleDef) -> impl Iterator<Item = &ViewDef> {
 /// Iterate over the names of all the tables and views defined by the module, in alphabetical order.
 ///
 /// Sorting is necessary to have deterministic reproducible codegen.
-pub(super) fn iter_table_and_view_names(module: &ModuleDef) -> impl Iterator<Item = &Identifier> {
-    itertools::chain(
-        module.tables().map(|table| &table.name),
-        module.views().map(|view| &view.name),
-    )
-    .sorted()
+pub(super) fn iter_table_names_and_types(module: &ModuleDef) -> impl Iterator<Item = (&Identifier, AlgebraicTypeRef)> {
+    module
+        .tables()
+        .map(|def| (&def.name, def.product_type_ref))
+        .chain(module.views().map(|def| (&def.name, def.product_type_ref)))
+        .sorted_by_key(|(name, _)| *name)
 }
 
 pub(super) fn iter_unique_cols<'a>(

crates/codegen/tests/snapshots/codegen__codegen_csharp.snap

@@ -1011,6 +1011,7 @@ namespace SpacetimeDB
         {
             AddTable(HasSpecialStuff = new(conn));
             AddTable(LoggedOutPlayer = new(conn));
+            AddTable(MyPlayer = new(conn));
             AddTable(Person = new(conn));
             AddTable(PkMultiIdentity = new(conn));
             AddTable(Player = new(conn));