Merge origin/master into shub/table-name-to-accessor

Author: clockwork-labs-bot

Cargo.lock

@@ -49,11 +49,13 @@ members = [
   "modules/sdk-test-connect-disconnect",
   "modules/sdk-test-procedure",
   "modules/sdk-test-view",
+  "modules/sdk-test-event-table",
   "sdks/rust/tests/test-client",
   "sdks/rust/tests/test-counter",
   "sdks/rust/tests/connect_disconnect_client",
   "sdks/rust/tests/procedure-client",
   "sdks/rust/tests/view-client",
+  "sdks/rust/tests/event-table-client",
   "tools/ci",
   "tools/upgrade-version",
   "tools/license-check",
@@ -218,6 +220,7 @@ insta = { version = "1.21.0", features = ["toml", "filters"] }
 is-terminal = "0.4"
 itertools = "0.12"
 itoa = "1"
+json5 = "0.4"
 jsonwebtoken = { package = "spacetimedb-jsonwebtoken", version = "9.3.0" }
 junction = "1"
 jwks = { package = "spacetimedb-jwks", version = "0.1.3" }

Cargo.toml

@@ -12,9 +12,9 @@
 #include <memory>
 #include "../autogen_base.h"
 #include "spacetimedb/bsatn/bsatn.h"
+#include "RawViewDefV9.g.h"
 #include "RawColumnDefaultValueV9.g.h"
 #include "RawProcedureDefV9.g.h"
-#include "RawViewDefV9.g.h"
 
 namespace SpacetimeDB::Internal {
 

crates/bindings-cpp/include/spacetimedb/internal/autogen/RawMiscModuleExportV9.g.h

@@ -13,11 +13,11 @@
 #include "../autogen_base.h"
 #include "spacetimedb/bsatn/bsatn.h"
 #include "RawMiscModuleExportV9.g.h"
-#include "RawReducerDefV9.g.h"
+#include "RawTypeDefV9.g.h"
 #include "RawTableDefV9.g.h"
-#include "Typespace.g.h"
 #include "RawRowLevelSecurityDefV9.g.h"
-#include "RawTypeDefV9.g.h"
+#include "RawReducerDefV9.g.h"
+#include "Typespace.g.h"
 
 namespace SpacetimeDB::Internal {
 

crates/bindings-cpp/include/spacetimedb/internal/autogen/RawModuleDefV9.g.h

@@ -12,8 +12,8 @@
 #include <memory>
 #include "../autogen_base.h"
 #include "spacetimedb/bsatn/bsatn.h"
-#include "ProductType.g.h"
 #include "AlgebraicType.g.h"
+#include "ProductType.g.h"
 
 namespace SpacetimeDB::Internal {
 

crates/bindings-cpp/include/spacetimedb/internal/autogen/RawProcedureDefV9.g.h

@@ -12,12 +12,12 @@
 #include <memory>
 #include "../autogen_base.h"
 #include "spacetimedb/bsatn/bsatn.h"
-#include "RawScheduleDefV9.g.h"
 #include "TableAccess.g.h"
 #include "RawConstraintDefV9.g.h"
+#include "RawIndexDefV9.g.h"
 #include "TableType.g.h"
 #include "RawSequenceDefV9.g.h"
-#include "RawIndexDefV9.g.h"
+#include "RawScheduleDefV9.g.h"
 
 namespace SpacetimeDB::Internal {
 

crates/bindings-cpp/include/spacetimedb/internal/autogen/RawTableDefV9.g.h

@@ -68,7 +68,7 @@ cd crates/bindings-cpp/tests/client-comparison
 ```bash
 # Rust baseline
 cd rust-sdk-test
-spacetime generate --lang rust --out-dir . --project-path ../../../modules/sdk-test
+spacetime generate --lang rust --out-dir . --module-path ../../../modules/sdk-test
 
 # Rust baseline
 ./scripts/regenerate_rust_client.sh

crates/bindings-cpp/tests/client-comparison/README.md

@@ -75,7 +75,7 @@ fi
 # Generate new Rust client
 echo "Generating new Rust client from sdk-test module..."
 cd "$RUST_DIR"
-"$CLI_PATH" generate --lang rust --out-dir . --project-path "$SDK_TEST_DIR" >/dev/null 2>&1
+"$CLI_PATH" generate --lang rust --out-dir . --module-path "$SDK_TEST_DIR" >/dev/null 2>&1
 
 if [ $? -eq 0 ]; then
     echo ""

crates/bindings-cpp/tests/client-comparison/scripts/regenerate_rust_client.sh

@@ -62,6 +62,7 @@ mod sym {
     symbol!(unique);
     symbol!(update);
     symbol!(default);
+    symbol!(event);
 
     symbol!(u8);
     symbol!(i8);

crates/bindings-macro/src/lib.rs

@@ -21,6 +21,7 @@ pub(crate) struct TableArgs {
     scheduled: Option<ScheduledArg>,
     accessor: Ident,
     indices: Vec<IndexArg>,
+    event: Option<Span>,
 }
 
 enum TableAccess {
@@ -81,6 +82,7 @@ impl TableArgs {
         let mut accessor = None;
         let mut name = None;
         let mut indices = Vec::new();
+        let mut event = None;
         syn::meta::parser(|meta| {
             match_meta!(match meta {
                 sym::public => {
@@ -106,6 +108,10 @@ impl TableArgs {
                     check_duplicate(&scheduled, &meta)?;
                     scheduled = Some(ScheduledArg::parse_meta(meta)?);
                 }
+                sym::event => {
+                    check_duplicate(&event, &meta)?;
+                    event = Some(meta.path.span());
+                }
             });
             Ok(())
         })
@@ -123,6 +129,7 @@ impl TableArgs {
             accessor,
             indices,
             name,
+            event,
         })
     }
 }
@@ -895,6 +902,18 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     );
 
     let table_access = args.access.iter().map(|acc| acc.to_value());
+    let is_event = args.event.iter().map(|_| {
+        quote!(
+            const IS_EVENT: bool = true;
+        )
+    });
+    let can_be_lookup_impl = if args.event.is_none() {
+        quote! {
+            impl spacetimedb::query_builder::CanBeLookupTable for #original_struct_ident {}
+        }
+    } else {
+        quote! {}
+    };
     let unique_col_ids = unique_columns.iter().map(|col| col.index);
     let primary_col_id = primary_key_column.clone().into_iter().map(|col| col.index);
     let sequence_col_ids = sequenced_columns.iter().map(|col| col.index);
@@ -1020,6 +1039,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
             const TABLE_NAME: &'static str = #table_name;
             // the default value if not specified is Private
             #(const TABLE_ACCESS: spacetimedb::table::TableAccess = #table_access;)*
+            #(#is_event)*
             const UNIQUE_COLUMNS: &'static [u16] = &[#(#unique_col_ids),*];
             const INDEXES: &'static [spacetimedb::table::IndexDesc<'static>] = &[#(#index_descs),*];
             #(const PRIMARY_KEY: Option<u16> = Some(#primary_col_id);)*
@@ -1133,6 +1153,8 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
             }
         }
 
+        #can_be_lookup_impl
+
     };
 
     let table_query_handle_def = quote! {