Disabled codegen for private tables by default

crates/bindings-csharp/Codegen.Tests/fixtures/server/snapshots/Module#FFI.verified.cs

@@ -1,4 +1,4 @@
-//HintName: FFI.cs
+//HintName: FFI.cs
 // <auto-generated />
 #nullable enable
 // The runtime already defines SpacetimeDB.Internal.LocalReadOnly in Runtime\Internal\Module.cs as an empty partial type.
@@ -17,7 +17,6 @@ namespace SpacetimeDB
 {
     public sealed record ReducerContext : DbContext<Local>, Internal.IReducerContext
     {
-        public readonly Identity Sender;
         public readonly ConnectionId? ConnectionId;
         public readonly Random Rng;
         public readonly Timestamp Timestamp;
@@ -29,6 +28,8 @@ public sealed record ReducerContext : DbContext<Local>, Internal.IReducerContext
         // We need this property to be non-static for parity with client SDK.
         public Identity Identity => Internal.IReducerContext.GetIdentity();
 
+        private readonly Identity _sender;
+
         internal ReducerContext(
             Identity identity,
             ConnectionId? connectionId,
@@ -37,14 +38,19 @@ internal ReducerContext(
             AuthCtx? senderAuth = null
         )
         {
-            Sender = identity;
+            _sender = identity;
             ConnectionId = connectionId;
             Rng = random;
             Timestamp = time;
             SenderAuth = senderAuth ?? AuthCtx.BuildFromSystemTables(connectionId, identity);
             CounterUuid = 0;
         }
 
+        /// <summary>
+        /// The identity of the client that invoked the reducer.
+        /// </summary>
+        public Identity Sender() => _sender;
+
         /// <summary>
         /// Create a new random <see cref="Uuid"/> `v4` using the built-in RNG.
         /// </summary>
@@ -199,13 +205,18 @@ public sealed class Local : global::SpacetimeDB.LocalBase
 
     public sealed record ViewContext : DbContext<Internal.LocalReadOnly>, Internal.IViewContext
     {
-        public Identity Sender { get; }
+        private readonly Identity _sender;
 
         internal ViewContext(Identity sender, Internal.LocalReadOnly db)
             : base(db)
         {
-            Sender = sender;
+            _sender = sender;
         }
+
+        /// <summary>
+        /// The identity of the client that invoked the view.
+        /// </summary>
+        public Identity Sender() => _sender;
     }
 
     public sealed record AnonymousViewContext

crates/bindings-csharp/Codegen/Module.cs

@@ -1743,7 +1743,6 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
                     namespace SpacetimeDB {
                         public sealed record ReducerContext : DbContext<Local>, Internal.IReducerContext {
-                            public readonly Identity Sender;
                             public readonly ConnectionId? ConnectionId;
                             public readonly Random Rng;
                             public readonly Timestamp Timestamp;
@@ -1753,16 +1752,24 @@ public sealed record ReducerContext : DbContext<Local>, Internal.IReducerContext
                             // We need this property to be non-static for parity with client SDK.
                             public Identity Identity => Internal.IReducerContext.GetIdentity();
 
+                            private readonly Identity _sender;
+
                             internal ReducerContext(Identity identity, ConnectionId? connectionId, Random random,
                                             Timestamp time, AuthCtx? senderAuth = null)
                             {
-                                Sender = identity;
+                                _sender = identity;
                                 ConnectionId = connectionId;
                                 Rng = random;
                                 Timestamp = time;
                                 SenderAuth = senderAuth ?? AuthCtx.BuildFromSystemTables(connectionId, identity);
                                 CounterUuid = 0;
                             }
+
+                            /// <summary>
+                            /// The identity of the client that invoked the reducer.
+                            /// </summary>
+                            public Identity Sender() => _sender;
+
                             /// <summary>
                             /// Create a new random <see cref="Uuid"/> `v4` using the built-in RNG.
                             /// </summary>
@@ -1897,13 +1904,18 @@ public sealed class Local : global::SpacetimeDB.LocalBase {
 
                         public sealed record ViewContext : DbContext<Internal.LocalReadOnly>, Internal.IViewContext 
                         {
-                            public Identity Sender { get; }
+                            private readonly Identity _sender;
 
                             internal ViewContext(Identity sender, Internal.LocalReadOnly db)
                                 : base(db)
                             {
-                                Sender = sender;
+                                _sender = sender;
                             }
+
+                            /// <summary>
+                            /// The identity of the client that invoked the view.
+                            /// </summary>
+                            public Identity Sender() => _sender;
                         }
 
                         public sealed record AnonymousViewContext : DbContext<Internal.LocalReadOnly>, Internal.IAnonymousViewContext 

crates/bindings-csharp/Runtime/Internal/TxContext.cs

@@ -9,13 +9,16 @@ public sealed class TxContext(
     Random rng
 )
 {
+    private readonly Identity _sender = sender;
+
     public Local Db { get; } = db;
-    public Identity Sender { get; } = sender;
     public ConnectionId? ConnectionId { get; } = connectionId;
     public Timestamp Timestamp { get; } = timestamp;
     public AuthCtx SenderAuth { get; } = senderAuth;
     public Random Rng { get; } = rng;
 
+    public Identity Sender() => _sender;
+
     public TxContext WithTimestamp(Timestamp ts) =>
-        new(Db, Sender, ConnectionId, ts, SenderAuth, Rng);
+        new(Db, _sender, ConnectionId, ts, SenderAuth, Rng);
 }

crates/bindings-csharp/Runtime/ProcedureContext.cs

@@ -10,8 +10,11 @@ public abstract class ProcedureContextBase(
     Timestamp time
 ) : Internal.IInternalProcedureContext
 {
+    private readonly Identity _sender = sender;
+
+    public Identity Sender() => _sender;
+
     public static Identity Identity => Internal.IProcedureContext.GetIdentity();
-    public Identity Sender { get; } = sender;
     public ConnectionId? ConnectionId { get; } = connectionId;
     public Random Rng { get; } = random;
     public Timestamp Timestamp { get; private set; } = time;
@@ -47,7 +50,7 @@ public Internal.TxContext EnterTxContext(long timestampMicros)
             txContext?.WithTimestamp(timestamp)
             ?? new Internal.TxContext(
                 CreateLocal(),
-                Sender,
+                _sender,
                 ConnectionId,
                 timestamp,
                 SenderAuth,
@@ -229,8 +232,9 @@ public abstract class ProcedureTxContextBase(Internal.TxContext inner)
 
     internal void Refresh(Internal.TxContext inner) => Inner = inner;
 
+    public Identity Sender() => Inner.Sender();
+
     public LocalBase Db => (LocalBase)Inner.Db;
-    public Identity Sender => Inner.Sender;
     public ConnectionId? ConnectionId => Inner.ConnectionId;
     public Timestamp Timestamp => Inner.Timestamp;
     public AuthCtx SenderAuth => Inner.SenderAuth;

crates/bindings-sys/src/lib.rs

@@ -924,7 +924,7 @@ pub mod raw {
             /// would be where you would initialize the interepreter and load the user module into it.
             fn __setup__() -> Result;
             /// Required. Runs after `__setup__`; returns all the exports for the module.
-            fn __describe_module__() -> Encoded<ModuleDef>;
+            fn __describe_module_v10__() -> Encoded<ModuleDef>;
             /// Required. id is an index into the `ModuleDef.reducers` returned from `__describe_module__`.
             /// args is a bsatn-encoded product value defined by the schema at `reducers[id]`.
             fn __call_reducer__(

crates/bindings/src/rt.rs

@@ -4,8 +4,9 @@ use crate::query_builder::Query;
 use crate::table::IndexAlgo;
 use crate::{sys, AnonymousViewContext, IterBuf, ReducerContext, ReducerResult, SpacetimeType, Table, ViewContext};
 use spacetimedb_lib::bsatn::EncodeError;
+use spacetimedb_lib::db::raw_def::v10::RawModuleDefV10Builder;
 pub use spacetimedb_lib::db::raw_def::v9::Lifecycle as LifecycleReducer;
-use spacetimedb_lib::db::raw_def::v9::{RawIndexAlgorithm, RawModuleDefV9Builder, TableType, ViewResultHeader};
+use spacetimedb_lib::db::raw_def::v9::{RawIndexAlgorithm, TableType, ViewResultHeader};
 use spacetimedb_lib::de::{self, Deserialize, DeserializeOwned, Error as _, SeqProductAccess};
 use spacetimedb_lib::sats::typespace::TypespaceBuilder;
 use spacetimedb_lib::sats::{impl_deserialize, impl_serialize, ProductTypeElement};
@@ -674,7 +675,7 @@ pub trait RowLevelSecurityInfo {
 }
 
 /// A function which will be registered by [`register_describer`] into [`DESCRIBERS`],
-/// which will be called by [`__describe_module__`] to construct a module definition.
+/// which will be called by [`__describe_module_v10__`] to construct a module definition.
 ///
 /// May be a closure over static data, so that e.g.
 /// [`register_row_level_security`] doesn't need to take a type parameter.
@@ -700,6 +701,13 @@ pub fn register_reftype<T: SpacetimeType>() {
 pub fn register_table<T: Table>() {
     register_describer(|module| {
         let product_type_ref = *T::Row::make_type(&mut module.inner).as_ref().unwrap();
+        if let Some(schedule) = T::SCHEDULE {
+            module.inner.add_schedule(
+                T::TABLE_NAME,
+                schedule.scheduled_at_column,
+                schedule.reducer_or_procedure_name,
+            );
+        }
 
         let mut table = module
             .inner
@@ -719,10 +727,6 @@ pub fn register_table<T: Table>() {
         for &col in T::SEQUENCES {
             table = table.with_column_sequence(col);
         }
-        if let Some(schedule) = T::SCHEDULE {
-            table = table.with_schedule(schedule.reducer_or_procedure_name, schedule.scheduled_at_column);
-        }
-
         for col in T::get_default_col_values().iter_mut() {
             table = table.with_default_column_value(col.col_id, col.value.clone())
         }
@@ -749,7 +753,11 @@ impl From<IndexAlgo<'_>> for RawIndexAlgorithm {
 pub fn register_reducer<'a, A: Args<'a>, I: FnInfo<Invoke = ReducerFn>>(_: impl Reducer<'a, A>) {
     register_describer(|module| {
         let params = A::schema::<I>(&mut module.inner);
-        module.inner.add_reducer(I::NAME, params, I::LIFECYCLE);
+        if let Some(lifecycle) = I::LIFECYCLE {
+            module.inner.add_lifecycle_reducer(lifecycle, I::NAME, params);
+        } else {
+            module.inner.add_reducer(I::NAME, params);
+        }
         module.reducers.push(I::INVOKE);
     })
 }
@@ -814,7 +822,7 @@ pub fn register_row_level_security(sql: &'static str) {
 #[derive(Default)]
 pub struct ModuleBuilder {
     /// The module definition.
-    inner: RawModuleDefV9Builder,
+    inner: RawModuleDefV10Builder,
     /// The reducers of the module.
     reducers: Vec<ReducerFn>,
     /// The procedures of the module.
@@ -863,7 +871,7 @@ static ANONYMOUS_VIEWS: OnceLock<Vec<AnonymousFn>> = OnceLock::new();
 /// including when modules are updated (re-publishing).
 /// After initialization, the module cannot alter the schema.
 #[no_mangle]
-extern "C" fn __describe_module__(description: BytesSink) {
+extern "C" fn __describe_module_v10__(description: BytesSink) {
     // Collect the `module`.
     let mut module = ModuleBuilder::default();
     for describer in &mut *DESCRIBERS.lock().unwrap() {
@@ -872,7 +880,7 @@ extern "C" fn __describe_module__(description: BytesSink) {
 
     // Serialize the module to bsatn.
     let module_def = module.inner.finish();
-    let module_def = RawModuleDef::V9(module_def);
+    let module_def = RawModuleDef::V10(module_def);
     let bytes = bsatn::to_vec(&module_def).expect("unable to serialize typespace");
 
     // Write the sets of reducers, procedures and views.

crates/cli/src/subcommands/generate.rs

@@ -5,7 +5,9 @@ use clap::parser::ValueSource;
 use clap::Arg;
 use clap::ArgAction::Set;
 use fs_err as fs;
-use spacetimedb_codegen::{generate, Csharp, Lang, OutputFile, Rust, TypeScript, UnrealCpp, AUTO_GENERATED_PREFIX};
+use spacetimedb_codegen::{
+    generate, private_table_names, Csharp, Lang, OutputFile, Rust, TypeScript, UnrealCpp, AUTO_GENERATED_PREFIX,
+};
 use spacetimedb_lib::de::serde::DeserializeWrapper;
 use spacetimedb_lib::{sats, RawModuleDef};
 use spacetimedb_schema;
@@ -171,6 +173,12 @@ pub async fn exec_ex(
         extract_descriptions(&path).context("could not extract schema")?
     };
 
+    // TODO: Update this to work with --include-private once that flag exists.
+    let private_tables = private_table_names(&module);
+    if !private_tables.is_empty() {
+        println!("Skipping private tables during codegen: {}.", private_tables.join(", "));
+    }
+
     fs::create_dir_all(out_dir)?;
 
     let mut paths = BTreeSet::new();

crates/codegen/src/csharp.rs

@@ -8,7 +8,7 @@ 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_table_names_and_types,
+    CodegenVisibility, 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};
@@ -1048,7 +1048,7 @@ impl Lang for Csharp<'_> {
         indented_block(&mut output, |output| {
             writeln!(output, "public RemoteTables(DbConnection conn)");
             indented_block(output, |output| {
-                for (table_name, _) in iter_table_names_and_types(module) {
+                for (table_name, _) in iter_table_names_and_types(module, CodegenVisibility::OnlyPublic) {
                     writeln!(
                         output,
                         "AddTable({} = new(conn));",
@@ -1071,7 +1071,7 @@ impl Lang for Csharp<'_> {
 
         writeln!(output, "public sealed class From");
         indented_block(&mut output, |output| {
-            for (table_name, product_type_ref) in iter_table_names_and_types(module) {
+            for (table_name, product_type_ref) in iter_table_names_and_types(module, CodegenVisibility::OnlyPublic) {
                 let method_name = table_name.deref().to_case(Case::Pascal);
                 let row_type = type_ref_name(module, product_type_ref);
                 let table_name_lit = format!("{:?}", table_name.deref());

crates/codegen/src/lib.rs

@@ -11,11 +11,12 @@ pub use self::csharp::Csharp;
 pub use self::rust::Rust;
 pub use self::typescript::TypeScript;
 pub use self::unrealcpp::UnrealCpp;
+pub use util::private_table_names;
 pub use util::AUTO_GENERATED_PREFIX;
 
 pub fn generate(module: &ModuleDef, lang: &dyn Lang) -> Vec<OutputFile> {
     itertools::chain!(
-        module.tables().map(|tbl| lang.generate_table_file(module, tbl)),
+        util::iter_tables(module, util::CodegenVisibility::OnlyPublic).map(|tbl| lang.generate_table_file(module, tbl)),
         module.views().map(|view| lang.generate_view_file(module, view)),
         module.types().flat_map(|typ| lang.generate_type_files(module, typ)),
         util::iter_reducers(module).map(|reducer| lang.generate_reducer_file(module, reducer)),