remove index name in rust

Author: Shubham8287

crates/bindings-macro/src/table.rs

@@ -169,7 +169,6 @@ impl ScheduledArg {
 impl IndexArg {
     fn parse_meta(meta: ParseNestedMeta) -> syn::Result<Self> {
         let mut accessor = None;
-        let mut _name = None;
         let mut algo = None;
 
         meta.parse_nested_meta(|meta| {
@@ -178,11 +177,6 @@ impl IndexArg {
                     check_duplicate(&accessor, &meta)?;
                     accessor = Some(meta.value()?.parse()?);
                 }
-                sym::name => {
-                    check_duplicate(&_name, &meta)?;
-                    let litstr: LitStr = meta.value()?.parse()?;
-                    _name = Some(litstr);
-                }
                 sym::btree => {
                     check_duplicate_msg(&algo, &meta, "index algorithm specified twice")?;
                     algo = Some(Self::parse_btree(meta)?);
@@ -266,7 +260,6 @@ impl IndexArg {
     /// Parses an inline `#[index(btree)]`, `#[index(hash)]`, or `#[index(direct)]` attribute on a field.
     fn parse_index_attr(field: &Ident, attr: &syn::Attribute) -> syn::Result<Self> {
         let mut kind = None;
-        let mut _name: Option<LitStr> = None;
         attr.parse_nested_meta(|meta| {
             match_meta!(match meta {
                 sym::btree => {
@@ -285,10 +278,6 @@ impl IndexArg {
                     check_duplicate_msg(&kind, &meta, "index type specified twice")?;
                     kind = Some(IndexType::Direct { column: field.clone() })
                 }
-                sym::name => {
-                    check_duplicate(&_name, &meta)?;
-                    _name = Some(meta.value()?.parse()?);
-                }
             });
             Ok(())
         })?;
@@ -1039,9 +1028,11 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     let trait_def = quote_spanned! {table_ident.span()=>
         #[allow(non_camel_case_types, dead_code)]
         #vis trait #table_ident {
+            #[allow(non_camel_case_types, dead_code)]
             fn #table_ident(&self) -> &#tablehandle_ident;
         }
         impl #table_ident for spacetimedb::Local {
+            #[allow(non_camel_case_types, dead_code)]
             fn #table_ident(&self) -> &#tablehandle_ident {
                 &#tablehandle_ident {}
             }
@@ -1051,6 +1042,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
     let trait_def_view = quote_spanned! {table_ident.span()=>
         #[allow(non_camel_case_types, dead_code)]
         #vis trait #view_trait_ident {
+            #[allow(non_camel_case_types, dead_code)]
             fn #table_ident(&self) -> &#viewhandle_ident;
         }
         impl #view_trait_ident for spacetimedb::LocalReadOnly {

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

@@ -187,6 +187,7 @@ export class ModuleContext {
         value: module.rowLevelSecurity,
       }
     );
+    push(module.explicitNames && { tag: 'ExplicitNames', value: module.explicitNames });
     return { sections };
   }
 
@@ -248,9 +249,9 @@ export class ModuleContext {
 
   #registerCompoundTypeRecursively<
     T extends
-      | SumBuilder<VariantsObj>
-      | ProductBuilder<ElementsObj>
-      | RowBuilder<RowObj>,
+    | SumBuilder<VariantsObj>
+    | ProductBuilder<ElementsObj>
+    | RowBuilder<RowObj>,
   >(typeBuilder: T): RefBuilder<Infer<T>, InferSpacetimeTypeOfTypeBuilder<T>> {
     const ty = typeBuilder.algebraicType;
     // NB! You must ensure that all TypeBuilder passed into this function
@@ -273,13 +274,13 @@ export class ModuleContext {
     const newTy =
       typeBuilder instanceof RowBuilder || typeBuilder instanceof ProductBuilder
         ? ({
-            tag: 'Product',
-            value: { elements: [] },
-          } as AlgebraicTypeVariants.Product)
+          tag: 'Product',
+          value: { elements: [] },
+        } as AlgebraicTypeVariants.Product)
         : ({
-            tag: 'Sum',
-            value: { variants: [] },
-          } as AlgebraicTypeVariants.Sum);
+          tag: 'Sum',
+          value: { variants: [] },
+        } as AlgebraicTypeVariants.Sum);
 
     r = new RefBuilder(this.#moduleDef.typespace.types.length);
     this.#moduleDef.typespace.types.push(newTy);

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

@@ -44,26 +44,26 @@ type HasInvalidColumn<Row extends RowObj> =
   // this checks if Row exactly equals RowObj - if it does, we can't
   // do type-system-level checking, so just let it pass
   (<G>() => G extends Row ? 1 : 2) extends <G>() => G extends RowObj ? 1 : 2
-    ? false
-    : {
-          [K in keyof Row]: Row[K] extends ColumnBuilder<any, any, infer M>
-            ? ValidateColumnMetadata<M> extends InvalidColumnMetadata<any>
-              ? true
-              : false
-            : false;
-        }[keyof Row] extends false
-      ? false
-      : true;
+  ? false
+  : {
+    [K in keyof Row]: Row[K] extends ColumnBuilder<any, any, infer M>
+    ? ValidateColumnMetadata<M> extends InvalidColumnMetadata<any>
+    ? true
+    : false
+    : false;
+  }[keyof Row] extends false
+  ? false
+  : true;
 
 /**
  * Extract the names of columns that have invalid metadata.
  */
 type InvalidColumnNames<Row extends RowObj> = {
   [K in keyof Row]: Row[K] extends ColumnBuilder<any, any, infer M>
-    ? ValidateColumnMetadata<M> extends InvalidColumnMetadata<any>
-      ? K & string
-      : never
-    : never;
+  ? ValidateColumnMetadata<M> extends InvalidColumnMetadata<any>
+  ? K & string
+  : never
+  : never;
 }[keyof Row];
 
 /**
@@ -90,8 +90,8 @@ export type CoerceColumn<
   Col extends TypeBuilder<any, any> | ColumnBuilder<any, any, any>,
 > =
   Col extends TypeBuilder<infer T, infer U>
-    ? ColumnBuilder<T, U, ColumnMetadata<any>>
-    : Col;
+  ? ColumnBuilder<T, U, ColumnMetadata<any>>
+  : Col;
 
 /**
  * Coerces a RowObj where TypeBuilders are replaced with ColumnBuilders
@@ -127,10 +127,10 @@ export type TableIndexes<TableDef extends UntypedTableDef> = {
     K,
     TableDef['columns'][K]['columnMetadata']
   > extends never
-    ? never
-    : K]: ColumnIndex<K, TableDef['columns'][K]['columnMetadata']>;
+  ? never
+  : K]: ColumnIndex<K, TableDef['columns'][K]['columnMetadata']>;
 } & {
-  [I in TableDef['indexes'][number] as I['accessor'] & {}]: TableIndexFromDef<
+  [I in TableDef['indexes'][number]as I['accessor'] & {}]: TableIndexFromDef<
     TableDef,
     I
   >;
@@ -143,21 +143,21 @@ type TableIndexFromDef<
   NormalizeIndexColumns<TableDef, I> extends infer Cols extends ReadonlyArray<
     keyof TableDef['columns'] & string
   >
-    ? {
-        name: I['accessor'];
-        unique: AllUnique<TableDef, Cols>;
-        algorithm: Lowercase<I['algorithm']>;
-        columns: Cols;
-      }
-    : never;
+  ? {
+    name: I['accessor'];
+    unique: AllUnique<TableDef, Cols>;
+    algorithm: Lowercase<I['algorithm']>;
+    columns: Cols;
+  }
+  : never;
 
 type NormalizeIndexColumns<
   TableDef extends UntypedTableDef,
   I extends IndexOpts<keyof TableDef['columns'] & string>,
 > =
   IndexColumns<I> extends ReadonlyArray<keyof TableDef['columns'] & string>
-    ? IndexColumns<I>
-    : never;
+  ? IndexColumns<I>
+  : never;
 
 /**
  * Options for configuring a database table.
@@ -175,10 +175,10 @@ export type TableOpts<Row extends RowObj> = {
   scheduled?: () =>
     | ReducerExport<any, { [k: string]: RowBuilder<RowObj> }>
     | ProcedureExport<
-        any,
-        { [k: string]: RowBuilder<RowObj> },
-        ReturnType<typeof t.unit>
-      >;
+      any,
+      { [k: string]: RowBuilder<RowObj> },
+      ReturnType<typeof t.unit>
+    >;
 };
 
 /**
@@ -212,7 +212,7 @@ export type Table<TableDef extends UntypedTableDef> = Prettify<
 
 export type ReadonlyTable<TableDef extends UntypedTableDef> = Prettify<
   ReadonlyTableMethods<TableDef> &
-    ReadonlyIndexes<TableDef, TableIndexes<TableDef>>
+  ReadonlyIndexes<TableDef, TableIndexes<TableDef>>
 >;
 
 export interface ReadonlyTableMethods<TableDef extends UntypedTableDef> {
@@ -290,10 +290,10 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
   // See the JSDoc above for details on how to fix this error.
   ..._: HasInvalidColumn<Row> extends true
     ? [
-        error: ERROR_default_cannot_be_combined_with_primaryKey_unique_or_autoInc<
-          InvalidColumnNames<Row>
-        >,
-      ]
+      error: ERROR_default_cannot_be_combined_with_primaryKey_unique_or_autoInc<
+        InvalidColumnNames<Row>
+      >,
+    ]
     : []
 ): TableSchema<CoerceRow<Row>, OptsIndices<Opts>> {
   const {

crates/schema/tests/ensure_same_schema.rs

@@ -101,7 +101,11 @@ fn ensure_same_schema_rust_csharp_benchmarks() {
 #[test]
 #[serial]
 fn test_all_schema_names() {
-    let module_def: ModuleDef = get_normalized_schema("module-test-ts");
+    let module_def: ModuleDef = get_normalized_schema("module-test");
+
+    println!("Types {:?}", module_def.types().collect::<Vec<_>>());
+
+    println!("Types space {:?}", module_def.typespace());
 
     // Test Tables
     let table_names = ["test_d", "person"];