remove from RawIndexDefV10

Author: Shubham8287

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

@@ -722,7 +722,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, Some(index.index_name));
+            table = table.with_index(index.algo.into(), index.accessor_name);
         }
         if let Some(primary_key) = T::PRIMARY_KEY {
             table = table.with_primary_key(primary_key);

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

@@ -106,46 +106,68 @@ pub enum CaseConversionPolicy {
     PascalCase,
 }
 
+
 #[derive(Debug, Clone, SpacetimeType)]
 #[sats(crate = crate)]
 #[cfg_attr(feature = "test", derive(PartialEq, Eq, Ord, PartialOrd))]
 #[non_exhaustive]
-pub struct ExplicitNameEntry {
-    /// The original name as written in the raw module definition.
-    source_name: RawIdentifier,
+pub struct NameMapping {
+    pub source_name: RawIdentifier,
+    pub canonical_name: RawIdentifier,
+}
 
-    /// The canonical name after applying case conversion.
-    canonical_name: RawIdentifier,
+#[derive(Debug, Clone, SpacetimeType)]
+#[sats(crate = crate)]
+#[cfg_attr(feature = "test", derive(PartialEq, Eq, Ord, PartialOrd))]
+#[non_exhaustive]
+pub enum ExplicitNameEntry {
+    Table(NameMapping),
+    Function(NameMapping)
 }
 
 #[derive(Debug, Default, Clone, SpacetimeType)]
 #[sats(crate = crate)]
 #[cfg_attr(feature = "test", derive(PartialEq, Eq, Ord, PartialOrd))]
 #[non_exhaustive]
 pub struct ExplicitNames {
-    tables: Vec<ExplicitNameEntry>,
-    funcs: Vec<ExplicitNameEntry>,
+    entries: Vec<ExplicitNameEntry>,
 }
 
 impl ExplicitNames {
-    pub fn insert_table(&mut self, source_name: impl Into<RawIdentifier>, canonical_name: impl Into<RawIdentifier>) {
-        self.tables.push(ExplicitNameEntry {
+    fn insert(
+        &mut self,
+        entry: ExplicitNameEntry,
+    ) {
+        self.entries.push(entry);
+    }
+
+    pub fn insert_table(
+        &mut self,
+        source_name: impl Into<RawIdentifier>,
+        canonical_name: impl Into<RawIdentifier>,
+    ) {
+        self.insert(ExplicitNameEntry::Table(NameMapping {
             source_name: source_name.into(),
             canonical_name: canonical_name.into(),
-        });
+        }));
     }
-    pub fn insert_function(&mut self, source_name: impl Into<RawIdentifier>, canonical_name: impl Into<RawIdentifier>) {
-        self.funcs.push(ExplicitNameEntry {
+
+    pub fn insert_function(
+        &mut self,
+        source_name: impl Into<RawIdentifier>,
+        canonical_name: impl Into<RawIdentifier>,
+    ) {
+        self.insert(ExplicitNameEntry::Function(NameMapping {
             source_name: source_name.into(),
             canonical_name: canonical_name.into(),
-        });
+        }));
     }
 
     pub fn merge(&mut self, other: ExplicitNames) {
-        self.tables.extend(other.tables);
-        self.funcs.extend(other.funcs);
+        self.entries.extend(other.entries);
     }
 }
+
 pub type RawRowLevelSecurityDefV10 = crate::db::raw_def::v9::RawRowLevelSecurityDefV9;
 
 /// The definition of a database table.
@@ -350,15 +372,6 @@ pub struct RawIndexDefV10 {
     /// Even though there is ABSOLUTELY NO REASON TO.
     pub source_name: Option<RawIdentifier>,
 
-    /// name for the index used internally and in client codegen
-    ///
-    /// This is set the user and should not be assumed to follow
-    /// any particular format.
-    ///
-    /// May be set to `None` if this is an auto-generated index for which the user
-    /// has not supplied a name.
-    pub name: Option<RawIdentifier>,
-
     /// The algorithm parameters for the index.
     pub algorithm: RawIndexAlgorithm,
 }
@@ -1128,17 +1141,9 @@ impl RawTableDefBuilderV10<'_> {
     }
 
     /// Generates a [RawIndexDefV10] using the supplied `columns`.
-    pub fn with_index(
-        mut self,
-        algorithm: RawIndexAlgorithm,
-        accessor_name: impl Into<RawIdentifier>,
-        index_name: Option<impl Into<RawIdentifier>>,
-    ) -> Self {
-        let accessor_name = accessor_name.into();
-
+    pub fn with_index(mut self, algorithm: RawIndexAlgorithm, source_name: impl Into<RawIdentifier>) -> Self {
         self.table.indexes.push(RawIndexDefV10 {
-            name: index_name.map(Into::into),
-            source_name: Some(accessor_name),
+            source_name: Some(source_name.into()),
             algorithm,
         });
         self
@@ -1148,7 +1153,6 @@ impl RawTableDefBuilderV10<'_> {
     pub fn with_index_no_accessor_name(mut self, algorithm: RawIndexAlgorithm) -> Self {
         self.table.indexes.push(RawIndexDefV10 {
             source_name: None,
-            name: None,
             algorithm,
         });
         self

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

@@ -1075,8 +1075,8 @@ impl From<RawIndexDefV10> for RawIndexDefV9 {
     fn from(raw: RawIndexDefV10) -> Self {
         RawIndexDefV9 {
             accessor_name: raw.source_name,
-            name: raw.name,
             algorithm: raw.algorithm,
+            name: None,
         }
     }
 }

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

@@ -744,7 +744,6 @@ mod tests {
         let schedule_at_type = builder.add_type::<ScheduleAt>();
 
         let red_delicious = AlgebraicValue::Sum(SumValue::new(2, ()));
-        let none = Option::<&str>::None;
 
         builder
             .build_table_with_new_type(
@@ -757,10 +756,10 @@ mod tests {
                 ]),
                 true,
             )
-            .with_index(btree([1, 2]), "apples_id", none)
-            .with_index(direct(2), "Apples_count_direct", none)
+            .with_index(btree([1, 2]), "apples_id")
+            .with_index(direct(2), "Apples_count_direct")
             .with_unique_constraint(2)
-            .with_index(btree(3), "Apples_type_btree", none)
+            .with_index(btree(3), "Apples_type_btree")
             .with_unique_constraint(3)
             .with_default_column_value(2, AlgebraicValue::U16(37))
             .with_default_column_value(3, red_delicious.clone())
@@ -784,8 +783,8 @@ mod tests {
             .with_unique_constraint(ColId(0))
             .with_primary_key(0)
             .with_access(TableAccess::Private)
-            .with_index(btree(0), "bananas_count", none)
-            .with_index(btree([0, 1, 2]), "bananas_count_id_name", none)
+            .with_index(btree(0), "bananas_count")
+            .with_index(btree([0, 1, 2]), "bananas_count_id_name")
             .finish();
 
         let deliveries_product_type = builder
@@ -799,7 +798,7 @@ mod tests {
                 true,
             )
             .with_auto_inc_primary_key(2)
-            .with_index(btree(2), "scheduled_id_index", none)
+            .with_index(btree(2), "scheduled_id_index")
             .with_type(TableType::System)
             .finish();
 
@@ -1071,7 +1070,7 @@ mod tests {
                 ProductType::from([("b", AlgebraicType::U16), ("a", AlgebraicType::U64)]),
                 false,
             )
-            .with_index(btree([0, 55]), "bananas_a_b", Option::<&str>::None)
+            .with_index(btree([0, 55]), "bananas_a_b")
             .finish();
         let result: Result<ModuleDef> = builder.finish().try_into();
 
@@ -1150,7 +1149,7 @@ mod tests {
                 ProductType::from([("b", AlgebraicType::U16), ("a", AlgebraicType::U64)]),
                 false,
             )
-            .with_index(btree([0, 0]), "bananas_b_b", None::<&str>)
+            .with_index(btree([0, 0]), "bananas_b_b")
             .finish();
         let result: Result<ModuleDef> = builder.finish().try_into();
 
@@ -1232,7 +1231,7 @@ mod tests {
                 ProductType::from([("b", AlgebraicType::U16), ("a", AlgebraicType::U64)]),
                 true,
             )
-            .with_index(hash(0), "bananas_b", None::<&str>)
+            .with_index(hash(0), "bananas_b")
             .finish();
         let def: ModuleDef = builder.finish().try_into().unwrap();
         let indexes = def.indexes().collect::<Vec<_>>();
@@ -1270,7 +1269,7 @@ mod tests {
                 ProductType::from([("b", AlgebraicType::I32), ("a", AlgebraicType::U64)]),
                 false,
             )
-            .with_index(direct(0), "bananas_b", None::<&str>)
+            .with_index(direct(0), "bananas_b")
             .finish();
         let result: Result<ModuleDef> = builder.finish().try_into();
 
@@ -1385,7 +1384,7 @@ mod tests {
                 true,
             )
             .with_auto_inc_primary_key(2)
-            .with_index(btree(2), "scheduled_id_index", None::<&str>)
+            .with_index(btree(2), "scheduled_id_index")
             .with_type(TableType::System)
             .finish();
 
@@ -1413,7 +1412,7 @@ mod tests {
                 true,
             )
             .with_auto_inc_primary_key(2)
-            .with_index(direct(2), "scheduled_id_idx", None::<&str>)
+            .with_index(direct(2), "scheduled_id_idx")
             .with_type(TableType::System)
             .finish();
 
@@ -1446,8 +1445,8 @@ mod tests {
                 true,
             )
             .with_auto_inc_primary_key(2)
-            .with_index(direct(2), "scheduled_id_index", None::<&str>)
-            .with_index(btree([0, 2]), "nice_index_name", None::<&str>)
+            .with_index(direct(2), "scheduled_id_index")
+            .with_index(btree([0, 2]), "nice_index_name")
             .with_type(TableType::System)
             .finish();
 

crates/bindings/src/rt.rs

@@ -1099,7 +1099,9 @@ impl<'a, 'b> TableValidator<'a, 'b> {
             RawModuleDefVersion::V9OrEarlier => accessor_name.map(identifier).transpose(),
 
             // In V10, `name` is used both for internal purpose and client codefen.
-            RawModuleDefVersion::V10 => identifier(name.clone()).map(Some),
+            RawModuleDefVersion::V10 => {
+                identifier(generate_index_name(&self.raw_name, self.product_type, &algorithm_raw)).map(Some)
+            }
         };
 
         let name = self.add_to_global_namespace(name);