ts index fix and canonical naming

Author: Shubham8287

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

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

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

@@ -89,7 +89,7 @@ export function tableToSchema<
 
   type AllowedCol = keyof T['rowType']['row'] & string;
   return {
-    sourceName: schema.tableName ?? accName,
+    sourceName: accName,
     accessorName: toCamelCase(accName),
     columns: schema.rowType.row, // typed as T[i]['rowType']['row'] under TablesToSchema<T>
     rowType: schema.rowSpacetimeType,

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

@@ -422,7 +422,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,
+      accessorName: indexOpts.accessor,
       algorithm,
     });
   }
@@ -439,15 +439,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'];
@@ -466,8 +457,20 @@ 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('_');
+      index.sourceName = `${accName}_${colS}_idx_${index.algorithm.tag.toLowerCase()}`;
+    }
+    
       return {
-        sourceName: tableName,
+        sourceName: accName,
         productTypeRef: ctx.registerTypesRecursively(row).ref,
         primaryKey: pk,
         indexes,

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

@@ -540,6 +540,15 @@ export function schema<const H extends Record<string, UntypedTableSchema>>(
           tableName: tableDef.sourceName,
         });
       }
+      if (table.tableName) {
+          ctx.moduleDef.explicitNames.entries.push ({
+            tag: "Table",
+            value: {
+              sourceName: accName,
+              canonicalName: table.tableName,
+            }
+          })
+        }
     }
     return { tables: tableSchemas } as TablesToSchema<H>;
   });

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

@@ -143,7 +143,6 @@ export function registerView<
     ? AnonymousViewFn<S, Params, Ret>
     : ViewFn<S, Params, Ret>
 ) {
-  const name = opts.name ?? exportName;
   const paramsBuilder = new RowBuilder(params, toPascalCase(name));
 
   // Register return types if they are product types
@@ -156,14 +155,24 @@ export function registerView<
   );
 
   ctx.moduleDef.views.push({
-    sourceName: name,
+    sourceName: exportName,
     index: (anon ? ctx.anonViews : ctx.views).length,
     isPublic: opts.public,
     isAnonymous: anon,
     params: paramType,
     returnType,
   });
 
+  if (opts.name != null)  {
+  ctx.moduleDef.explicitNames.entries.push({
+    tag: "Function",
+    value: {
+      sourceName: exportName,
+      canonicalName: opts.name
+    }
+  })
+}
+
   // If it is an option, we wrap the function to make the return look like an array.
   if (returnType.tag == 'Sum') {
     const originalFn = fn;