not modify RawINdeXDefV10

Author: Shubham8287

crates/bindings-macro/src/table.rs

@@ -453,8 +453,9 @@ impl ValidatedIndex<'_> {
         let index_name = &self.index_name;
         // 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 {
-            accessor_name: #accessor_name,
+            source_name: #accessor_name,
             index_name: #index_name,
             algo: #algo,
         })

crates/bindings-typescript/src/lib/autogen/raw_index_def_v_10_type.ts

@@ -100,8 +100,7 @@ function tableToSchema<T extends UntypedTableSchema>(
           ? [idx.algorithm.value]
           : idx.algorithm.value;
       return {
-// use accessor name?
-        name: idx.sourceName!,
+        name: idx.accessorName!,
         unique: tableDef.constraints.some(c =>
           c.data.value.columns.every(col => columnIds.includes(col))
         ),

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

@@ -350,6 +350,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
       }
       indexes.push({
         sourceName: undefined, // Unnamed indexes will be assigned a globally unique name
+        accessorName: name,
         algorithm,
       });
     }
@@ -419,6 +420,7 @@ 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,
       algorithm,
     });
   }

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

@@ -794,11 +794,10 @@ function makeTableView(
       } as RangedIndex<any, any>;
     }
 
-    //TODO: use accessor name
-    if (Object.hasOwn(tableView, indexDef.sourceName!)) {
-      freeze(Object.assign(tableView[indexDef.sourceName!], index));
+    if (Object.hasOwn(tableView, indexDef.accessorName!)) {
+      freeze(Object.assign(tableView[indexDef.accessorName!], index));
     } else {
-      tableView[indexDef.sourceName!] = freeze(index) as any;
+      tableView[indexDef.accessorName!] = freeze(index) as any;
     }
   }
 

crates/bindings-typescript/src/server/runtime.ts

@@ -746,7 +746,7 @@ pub fn register_table<T: Table>() {
             table = table.with_unique_constraint(col);
         }
         for index in T::INDEXES {
-            table = table.with_index(index.algo.into(), index.accessor_name);
+            table = table.with_index(index.algo.into(), index.source_name);
         }
         if let Some(primary_key) = T::PRIMARY_KEY {
             table = table.with_primary_key(primary_key);

crates/bindings/src/rt.rs

@@ -138,7 +138,7 @@ pub trait TableInternal: Sized {
 /// Describe a named index with an index type over a set of columns identified by their IDs.
 #[derive(Clone, Copy)]
 pub struct IndexDesc<'a> {
-    pub accessor_name: &'a str,
+    pub source_name: &'a str,
     pub index_name: &'a str,
     pub algo: IndexAlgo<'a>,
 }

crates/bindings/src/table.rs

@@ -367,6 +367,9 @@ pub struct RawIndexDefV10 {
     /// Even though there is ABSOLUTELY NO REASON TO.
     pub source_name: Option<RawIdentifier>,
 
+    // not to be used in v10
+    pub accessor_name: Option<RawIdentifier>,
+
     /// The algorithm parameters for the index.
     pub algorithm: RawIndexAlgorithm,
 }
@@ -1146,6 +1149,7 @@ impl RawTableDefBuilderV10<'_> {
     pub fn with_index(mut self, algorithm: RawIndexAlgorithm, source_name: impl Into<RawIdentifier>) -> Self {
         self.table.indexes.push(RawIndexDefV10 {
             source_name: Some(source_name.into()),
+            accessor_name: None,
             algorithm,
         });
         self
@@ -1155,6 +1159,7 @@ impl RawTableDefBuilderV10<'_> {
     pub fn with_index_no_accessor_name(mut self, algorithm: RawIndexAlgorithm) -> Self {
         self.table.indexes.push(RawIndexDefV10 {
             source_name: None,
+            accessor_name: None,
             algorithm,
         });
         self

crates/lib/src/db/raw_def/v10.rs

@@ -855,7 +855,7 @@ impl From<IndexDef> for RawIndexDefV10 {
     fn from(val: IndexDef) -> Self {
         RawIndexDefV10 {
             source_name: Some(val.name),
-            //           accessor_name: val.accessor_name.map(Into::into),
+            accessor_name: None,
             algorithm: val.algorithm.into(),
         }
     }