Case conversion

crates/bench/Cargo.toml

@@ -55,6 +55,7 @@ spacetimedb-testing = { path = "../testing" }
 
 ahash.workspace = true
 anyhow.workspace = true
+convert_case.workspace = true
 anymap.workspace = true
 byte-unit.workspace = true
 clap.workspace = true

crates/bench/src/spacetime_module.rs

@@ -1,5 +1,6 @@
 use std::{marker::PhantomData, path::Path};
 
+use convert_case::{Case, Casing};
 use spacetimedb::db::{Config, Storage};
 use spacetimedb_lib::{
     sats::{product, ArrayValue},
@@ -89,9 +90,14 @@ impl<L: ModuleLanguage> BenchDatabase for SpacetimeModule<L> {
         table_style: crate::schemas::IndexStrategy,
     ) -> ResultBench<Self::TableId> {
         // Noop. All tables are built into the "benchmarks" module.
+        // The module's default CaseConversionPolicy is SnakeCase, which
+        // inserts underscores at letter-digit boundaries (e.g. u32 -> u_32).
+        // We must match that here so reducer/table lookups succeed.
+        let raw = table_name::<T>(table_style);
+        let converted = raw.as_ref().to_case(Case::Snake);
         Ok(TableId {
-            pascal_case: table_name::<T>(table_style),
-            snake_case: table_name::<T>(table_style),
+            pascal_case: TableName::for_test(&converted),
+            snake_case: TableName::for_test(&converted),
         })
     }
 

crates/bindings-csharp/Codegen/Module.cs

@@ -387,10 +387,10 @@ public TableIndex(ColumnRef col, AttributeData data, DiagReporter diag)
     public static bool CanParse(AttributeData data) =>
         data.AttributeClass?.ToString() == BTreeAttrName;
 
-    public string GenerateIndexDef() =>
+    public string GenerateIndexDef(TableAccessor tableAccessor) =>
         $$"""
             new(
-                SourceName: null,
+                SourceName: "{{StandardIndexName(tableAccessor)}}",
                 AccessorName: "{{AccessorName}}",
                 Algorithm: new SpacetimeDB.Internal.RawIndexAlgorithm.{{Type}}([{{string.Join(
                     ", ",
@@ -744,7 +744,7 @@ public IEnumerable<GeneratedTableAccessor> GenerateTableAccessors()
                             GetConstraints(v, ColumnAttrs.Unique)
                             .Select(c => c.ToIndex())
                             .Concat(GetIndexes(v))
-                            .Select(b => b.GenerateIndexDef())
+                            .Select(b => b.GenerateIndexDef(v))
                         )}}}
                     ],
                     Constraints: {{{GenConstraintList(v, ColumnAttrs.Unique, $"{iTable}.MakeUniqueConstraint")}}},

crates/bindings-macro/src/table.rs

@@ -49,22 +49,21 @@ struct ScheduledArg {
 
 struct IndexArg {
     accessor: Ident,
-    //TODO: add canonical name
-    // name: Option<LitStr>,
+    canonical_name: Option<LitStr>,
     is_unique: bool,
     kind: IndexType,
 }
 
 impl IndexArg {
-    fn new(accessor: Ident, kind: IndexType) -> Self {
+    fn new(accessor: Ident, kind: IndexType, canonical_name: Option<LitStr>) -> Self {
         // We don't know if its unique yet.
         // We'll discover this once we have collected constraints.
         let is_unique = false;
         Self {
+            canonical_name,
             accessor,
             is_unique,
             kind,
-            //  name,
         }
     }
 }
@@ -235,6 +234,7 @@ impl ScheduledArg {
 impl IndexArg {
     fn parse_meta(meta: ParseNestedMeta) -> syn::Result<Self> {
         let mut accessor = None;
+        let mut canonical_name = None;
         let mut algo = None;
 
         meta.parse_nested_meta(|meta| {
@@ -243,6 +243,11 @@ impl IndexArg {
                     check_duplicate(&accessor, &meta)?;
                     accessor = Some(meta.value()?.parse()?);
                 }
+                sym::name => {
+                    check_duplicate(&canonical_name, &meta)?;
+                    canonical_name = Some(meta.value()?.parse()?);
+                }
+
                 sym::btree => {
                     check_duplicate_msg(&algo, &meta, "index algorithm specified twice")?;
                     algo = Some(Self::parse_btree(meta)?);
@@ -304,7 +309,7 @@ Did you mean to specify an `accessor` instead? Do so with `accessor = my_index`,
             )
         })?;
 
-        Ok(IndexArg::new(accessor, kind))
+        Ok(IndexArg::new(accessor, kind, canonical_name))
     }
 
     fn parse_columns(meta: &ParseNestedMeta) -> syn::Result<Option<Vec<Ident>>> {
@@ -390,7 +395,7 @@ Did you mean to specify an `accessor` instead? Do so with `accessor = my_index`,
 
         // Default accessor = field name if not provided
         let accessor = field.clone();
-        Ok(IndexArg::new(accessor, kind))
+        Ok(IndexArg::new(accessor, kind, None))
     }
 
     fn validate<'a>(&'a self, table_name: &str, cols: &'a [Column<'a>]) -> syn::Result<ValidatedIndex<'a>> {
@@ -434,6 +439,7 @@ Did you mean to specify an `accessor` instead? Do so with `accessor = my_index`,
             index_name: gen_index_name(),
             accessor_name: &self.accessor,
             kind,
+            canonical_name: self.canonical_name.as_ref().map(|s| s.value()),
         })
     }
 }
@@ -492,6 +498,7 @@ struct ValidatedIndex<'a> {
     accessor_name: &'a Ident,
     is_unique: bool,
     kind: ValidatedIndexType<'a>,
+    canonical_name: Option<String>,
 }
 
 enum ValidatedIndexType<'a> {
@@ -539,11 +546,13 @@ impl ValidatedIndex<'_> {
             }
         };
         let source_name = self.index_name.clone();
+        let accessor_name = self.accessor_name.to_string();
         // Note: we do not pass the index_name through here.
         // We trust the schema validation logic to reconstruct the name we've stored in `self.name`.
         //TODO(shub): pass generated index name instead of accessor name as source_name
         quote!(spacetimedb::table::IndexDesc {
             source_name: #source_name,
+            accessor_name: #accessor_name,
             algo: #algo,
         })
     }
@@ -939,6 +948,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
             //name: None,
             is_unique: true,
             kind: IndexType::BTree { columns },
+            canonical_name: None,
         })
     }
 
@@ -1130,7 +1140,8 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
         }
     };
 
-    let explicit_names_impl = generate_explicit_names_impl(&table_name, &tablehandle_ident, &explicit_table_name);
+    let explicit_names_impl =
+        generate_explicit_names_impl(&table_name, &tablehandle_ident, &explicit_table_name, &indices);
 
     let register_describer_symbol = format!("__preinit__20_register_describer_{table_ident}");
 
@@ -1323,6 +1334,7 @@ fn generate_explicit_names_impl(
     table_name: &str,
     tablehandle_ident: &Ident,
     explicit_table_name: &Option<String>,
+    indexes: &[ValidatedIndex],
 ) -> TokenStream {
     let mut explicit_names_body = Vec::new();
 
@@ -1336,6 +1348,19 @@ fn generate_explicit_names_impl(
         });
     };
 
+    // Index names
+    for index in indexes {
+        if let Some(canonical_name) = &index.canonical_name {
+            let index_name = &index.index_name;
+            explicit_names_body.push(quote! {
+                names.insert_index(
+                    #index_name,
+                    #canonical_name,
+                );
+            });
+        }
+    }
+
     quote! {
 
         impl spacetimedb::rt::ExplicitNames for #tablehandle_ident {

crates/bindings-typescript/src/lib/indexes.ts

@@ -9,6 +9,7 @@ import type { ColumnIsUnique } from './constraints';
  * existing column names are referenced.
  */
 export type IndexOpts<AllowedCol extends string> = {
+  accessor?: string;
   name?: string;
 } & (
   | { algorithm: 'btree'; columns: readonly AllowedCol[] }

crates/bindings-typescript/src/lib/schema.ts

@@ -30,8 +30,7 @@ import {
   type RowObj,
   type VariantsObj,
 } from './type_builders';
-import type { CamelCase, Values } from './type_util';
-import { toCamelCase } from './util';
+import type { Values } from './type_util';
 
 export type TableNamesOf<S extends UntypedSchemaDef> = Values<
   S['tables']
@@ -58,7 +57,7 @@ export interface TableToSchema<
   AccName extends string,
   T extends UntypedTableSchema,
 > extends UntypedTableDef {
-  accessorName: CamelCase<AccName>;
+  accessorName: AccName;
   columns: T['rowType']['row'];
   rowType: T['rowSpacetimeType'];
   indexes: T['idxs'];
@@ -91,8 +90,8 @@ export function tableToSchema<
 
   type AllowedCol = keyof T['rowType']['row'] & string;
   return {
-    sourceName: schema.tableName ?? accName,
-    accessorName: toCamelCase(accName),
+    sourceName: accName,
+    accessorName: accName,
     columns: schema.rowType.row, // typed as T[i]['rowType']['row'] under TablesToSchema<T>
     rowType: schema.rowSpacetimeType,
     constraints: tableDef.constraints.map(c => ({
@@ -188,6 +187,12 @@ export class ModuleContext {
         value: module.rowLevelSecurity,
       }
     );
+    push(
+      module.explicitNames && {
+        tag: 'ExplicitNames',
+        value: module.explicitNames,
+      }
+    );
     return { sections };
   }
 

crates/bindings-typescript/src/lib/table.ts

@@ -1,6 +1,7 @@
 import type { ProcedureExport, ReducerExport, t } from '../server';
 import type { errors } from '../server/errors';
 import {
+  ExplicitNameEntry,
   RawColumnDefaultValueV10,
   RawConstraintDefV10,
   RawIndexAlgorithm,
@@ -132,7 +133,7 @@ export type TableIndexes<TableDef extends UntypedTableDef> = {
     ? never
     : K]: ColumnIndex<K, TableDef['columns'][K]['columnMetadata']>;
 } & {
-  [I in TableDef['indexes'][number] as I['name'] & {}]: TableIndexFromDef<
+  [I in TableDef['indexes'][number] as I['accessor'] & {}]: TableIndexFromDef<
     TableDef,
     I
   >;
@@ -146,7 +147,7 @@ type TableIndexFromDef<
     keyof TableDef['columns'] & string
   >
     ? {
-        name: I['name'];
+        name: I['accessor'];
         unique: AllUnique<TableDef, Cols>;
         algorithm: Lowercase<I['algorithm']>;
         columns: Cols;
@@ -322,7 +323,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
 
   // gather primary keys, per‑column indexes, uniques, sequences
   const pk: ColList = [];
-  const indexes: RawIndexDefV10[] = [];
+  const indexes: (RawIndexDefV10 & { canonicalName?: string })[] = [];
   const constraints: RawConstraintDefV10[] = [];
   const sequences: RawSequenceDefV10[] = [];
 
@@ -426,8 +427,9 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     // the name and accessor name of an index across all SDKs.
     indexes.push({
       sourceName: undefined,
-      accessorName: indexOpts.name,
+      accessorName: indexOpts.accessor,
       algorithm,
+      canonicalName: indexOpts.name,
     });
   }
 
@@ -443,15 +445,6 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     }
   }
 
-  for (const index of indexes) {
-    const cols =
-      index.algorithm.tag === 'Direct'
-        ? [index.algorithm.value]
-        : index.algorithm.value;
-    const colS = cols.map(i => colNameList[i]).join('_');
-    index.sourceName = `${name}_${colS}_idx_${index.algorithm.tag.toLowerCase()}`;
-  }
-
   const productType = row.algebraicType.value as RowBuilder<
     CoerceRow<Row>
   >['algebraicType']['value'];
@@ -470,8 +463,28 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
       if (row.typeName === undefined) {
         row.typeName = toPascalCase(tableName);
       }
+
+      // Build index source names using accName
+      for (const index of indexes) {
+        const cols =
+          index.algorithm.tag === 'Direct'
+            ? [index.algorithm.value]
+            : index.algorithm.value;
+
+        const colS = cols.map(i => colNameList[i]).join('_');
+        const sourceName =
+          (index.sourceName = `${accName}_${colS}_idx_${index.algorithm.tag.toLowerCase()}`);
+
+        const { canonicalName } = index;
+        if (canonicalName !== undefined) {
+          ctx.moduleDef.explicitNames.entries.push(
+            ExplicitNameEntry.Index({ sourceName, canonicalName })
+          );
+        }
+      }
+
       return {
-        sourceName: tableName,
+        sourceName: accName,
         productTypeRef: ctx.registerTypesRecursively(row).ref,
         primaryKey: pk,
         indexes,

crates/bindings-typescript/src/sdk/db_connection_impl.ts

@@ -54,7 +54,6 @@ import type {
 } from './reducers.ts';
 import type { ClientDbView } from './db_view.ts';
 import type { RowType, UntypedTableDef } from '../lib/table.ts';
-import { toCamelCase } from '../lib/util.ts';
 import type { ProceduresView } from './procedures.ts';
 import type { Values } from '../lib/type_util.ts';
 import type { TransactionUpdate } from './client_api/types.ts';
@@ -305,7 +304,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
 
     for (const reducer of def.reducers) {
       const reducerName = reducer.name;
-      const key = toCamelCase(reducerName);
+      const key = reducer.accessorName;
 
       const { serialize: serializeArgs } =
         this.#reducerArgsSerializers[reducerName];
@@ -326,7 +325,7 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
 
     for (const procedure of def.procedures) {
       const procedureName = procedure.name;
-      const key = toCamelCase(procedureName);
+      const key = procedure.accessorName;
 
       const { serializeArgs, deserializeReturn } =
         this.#procedureSerializers[procedureName];

crates/bindings-typescript/src/sdk/table_cache.ts

@@ -92,7 +92,7 @@ export class TableCacheImpl<
         keyof TableDefForTableName<RemoteModule, TableName>['columns'] & string
       >;
       const index = this.#makeReadonlyIndex(this.tableDef, idxDef);
-      (this as any)[idx.name!] = index;
+      (this as any)[idxDef.name] = index;
     }
   }