From 652982712640a33e8dddfbe8a2e137630d23f460 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 2 Nov 2025 21:00:43 -0500
Subject: [PATCH 01/23] Big prototype

---
 .../examples/quickstart-chat/src/App.tsx      |   3 +-
 .../src/module_bindings/index.ts              |   6 +-
 .../src/module_bindings/user_table.ts         |   8 +-
 .../src/react/SpacetimeDBProvider.ts          |  96 +++-
 .../src/react/connection_state.ts             |  12 +
 crates/bindings-typescript/src/react/index.ts |   1 +
 .../src/react/useReducer.ts                   |  17 +
 .../src/react/useSpacetimeDB.ts               |  14 +-
 .../bindings-typescript/src/react/useTable.ts |  34 +-
 .../src/sdk/client_api/index.ts               |   2 +-
 .../src/sdk/client_cache.ts                   | 105 +++-
 .../src/sdk/db_connection_builder.ts          |  48 +-
 .../src/sdk/db_connection_impl.ts             | 276 ++++++----
 .../bindings-typescript/src/sdk/db_context.ts |  24 +-
 crates/bindings-typescript/src/sdk/db_view.ts |  14 +
 crates/bindings-typescript/src/sdk/event.ts   |   5 +-
 .../src/sdk/event_context.ts                  |  40 +-
 crates/bindings-typescript/src/sdk/index.ts   |   4 +-
 .../src/sdk/reducer_event.ts                  |   5 +-
 .../src/sdk/reducer_handle.ts                 |  12 +
 .../bindings-typescript/src/sdk/reducers.ts   |  25 +
 .../src/sdk/set_reducer_flags.ts              |   3 +
 .../src/sdk/spacetime_module.ts               |  19 +-
 .../src/sdk/subscription_builder_impl.ts      |  57 +--
 .../src/sdk/table_cache.ts                    | 113 +++--
 .../src/sdk/table_handle.ts                   |  80 ++-
 .../bindings-typescript/src/server/db_view.ts |  25 +
 .../bindings-typescript/src/server/index.ts   |   2 +
 .../bindings-typescript/src/server/indexes.ts |  53 +-
 .../src/server/reducers.ts                    | 122 ++++-
 .../bindings-typescript/src/server/runtime.ts |  44 +-
 .../bindings-typescript/src/server/schema.ts  |  30 +-
 .../bindings-typescript/src/server/table.ts   |  37 +-
 .../src/server/type_util.ts                   |  12 +
 .../bindings-typescript/test-app/src/App.tsx  |   4 +-
 .../test-app/src/module_bindings/index.ts     | 473 +++++++++++-------
 .../src/module_bindings/player_table.ts       |  10 +-
 .../src/module_bindings/user_table.ts         |   6 +-
 .../src/module_bindings/counter_table.ts      |   6 +-
 .../src/module_bindings/offline_user_table.ts |   6 +-
 .../src/module_bindings/user_table.ts         |   6 +-
 crates/codegen/src/typescript.rs              |  13 +-
 42 files changed, 1276 insertions(+), 596 deletions(-)
 create mode 100644 crates/bindings-typescript/src/react/connection_state.ts
 create mode 100644 crates/bindings-typescript/src/react/useReducer.ts
 create mode 100644 crates/bindings-typescript/src/sdk/db_view.ts
 create mode 100644 crates/bindings-typescript/src/sdk/reducer_handle.ts
 create mode 100644 crates/bindings-typescript/src/sdk/reducers.ts
 create mode 100644 crates/bindings-typescript/src/sdk/set_reducer_flags.ts
 create mode 100644 crates/bindings-typescript/src/server/db_view.ts

diff --git a/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx b/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx
index 78ae2da57a0..0fa172b20ab 100644
--- a/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx
+++ b/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx
@@ -16,8 +16,9 @@ function App() {
   const [settingName, setSettingName] = useState(false);
   const [systemMessages, setSystemMessages] = useState([] as Message[]);
   const [newMessage, setNewMessage] = useState('');
-
   const conn = useSpacetimeDB<DbConnection>();
+
+  conn.setReducerFlags()
   const { identity, isActive: connected } = conn;
 
   // Subscribe to all messages in the chat
diff --git a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/index.ts b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/index.ts
index f30b1c1253b..b104c9eced0 100644
--- a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/index.ts
@@ -61,9 +61,9 @@ const REMOTE_MODULE = {
     user: {
       tableName: 'user' as const,
       rowType: User.getTypeScriptAlgebraicType(),
-      primaryKey: 'identity',
+      primaryKey: 'identity' as const,
       primaryKeyInfo: {
-        colName: 'identity',
+        colName: 'identity' as const,
         colType: (
           User.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
         ).value.elements[0].algebraicType,
@@ -119,7 +119,7 @@ const REMOTE_MODULE = {
   setReducerFlagsConstructor: () => {
     return new SetReducerFlags();
   },
-};
+} satisfies RemoteModule;
 
 // A type representing all the possible variants of a reducer.
 export type Reducer =
diff --git a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts
index 85687a99eff..9b35746a2ab 100644
--- a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts
@@ -47,7 +47,7 @@ declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
  * like `ctx.db.user.on_insert(...)`.
  */
 export class UserTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
+  extends ClientTable<TableName>
 {
   // phantom type to track the table name
   readonly tableName!: TableName;
@@ -76,11 +76,11 @@ export class UserTableHandle<TableName extends string>
    * Get a handle on the `identity` unique index on the table `user`.
    */
   identity = {
-    // Find the subscribed row whose `identity` column value is equal to `col_val`,
+    // Find the subscribed row whose `identity` column value is equal to `colVal`,
     // if such a row is present in the client cache.
-    find: (col_val: __Identity): User | undefined => {
+    find: (colVal: __Identity): User | undefined => {
       for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, col_val)) {
+        if (__deepEqual(row.identity, colVal)) {
           return row;
         }
       }
diff --git a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
index 0af29acf067..6899bed3610 100644
--- a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
+++ b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
@@ -1,38 +1,96 @@
 import {
   DbConnectionBuilder,
   type DbConnectionImpl,
+  type ErrorContextInterface,
+  type SubscriptionEventContextInterface,
 } from '../sdk/db_connection_impl';
 import * as React from 'react';
 import { SpacetimeDBContext } from './useSpacetimeDB';
+import type { ConnectionState } from './connection_state';
+import { ConnectionId } from '../lib/connection_id';
 
 export interface SpacetimeDBProviderProps<
   DbConnection extends DbConnectionImpl,
-  ErrorContext,
-  SubscriptionEventContext,
+  ErrorContext extends ErrorContextInterface,
+  SubscriptionEventContext extends SubscriptionEventContextInterface,
 > {
-  connectionBuilder: DbConnectionBuilder<
-    DbConnection,
-    ErrorContext,
-    SubscriptionEventContext
-  >;
+  connectionBuilder: DbConnectionBuilder<DbConnection, ErrorContext, SubscriptionEventContext>;
   children?: React.ReactNode;
 }
 
 export function SpacetimeDBProvider<
   DbConnection extends DbConnectionImpl,
-  ErrorContext,
-  SubscriptionEventContext,
->({
-  connectionBuilder,
-  children,
-}: SpacetimeDBProviderProps<
-  DbConnection,
-  ErrorContext,
-  SubscriptionEventContext
->): React.JSX.Element {
+  ErrorContext extends ErrorContextInterface,
+  SubscriptionEventContext extends SubscriptionEventContextInterface,
+>({ connectionBuilder, children }: SpacetimeDBProviderProps<DbConnection, ErrorContext, SubscriptionEventContext>) {
+  // Holds the imperative connection instance when (and only when) we’re on the client.
+  const connRef = React.useRef<DbConnection | null>(null);
+  const getConnection = React.useCallback(() => connRef.current, []);
+
+  const [state, setState] = React.useState<ConnectionState<DbConnection>>({
+    isActive: false,
+    identity: undefined,
+    token: undefined,
+    connectionId: ConnectionId.random(),
+    connectionError: undefined,
+    getConnection,
+  });
+
+  // Build on the client only; useEffect won't run during SSR.
+  React.useEffect(() => {
+    // Register callback for onConnect to update state
+      const onConnect = (conn: DbConnectionImpl) => {
+      setState(s => ({
+        ...s,
+        isActive: conn.isActive,
+        identity: conn.identity,
+        token: conn.token,
+        connectionId: conn.connectionId,
+      }));
+    };
+    const onDisconnect = (ctx: ErrorContextInterface) => {
+      setState(s => ({
+        ...s,
+        isActive: ctx.isActive,
+      }));
+    };
+    const onConnectError = (ctx: ErrorContextInterface, err: Error) => {
+      setState(s => ({
+        ...s,
+        isActive: ctx.isActive,
+        connectionError: err,
+      }));
+    };
+    connectionBuilder.onConnect(onConnect);
+    connectionBuilder.onDisconnect(onDisconnect);
+    connectionBuilder.onConnectError(onConnectError);
+
+    const conn = connRef.current!;
+    setState(s => ({
+      ...s,
+      isActive: conn.isActive,
+      identity: conn.identity,
+      token: conn.token,
+      connectionId: conn.connectionId,
+    }));
+
+    // Lazily build once
+    if (!connRef.current) {
+      connRef.current = connectionBuilder.build();
+    }
+
+    return () => {
+      connRef.current?.removeOnConnect(onConnect);
+      connRef.current?.removeOnDisconnect(onDisconnect);
+      connRef.current?.removeOnConnectError(onConnectError);
+      connRef.current?.disconnect();
+      connRef.current = null;
+    };
+  }, [connectionBuilder]);
+
   return React.createElement(
     SpacetimeDBContext.Provider,
-    { value: connectionBuilder.build() }, // May need to modify this to do it lazily in server-side rendering
+    { value: state },
     children
   );
-}
+ }
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/connection_state.ts b/crates/bindings-typescript/src/react/connection_state.ts
new file mode 100644
index 00000000000..4f45c6b902e
--- /dev/null
+++ b/crates/bindings-typescript/src/react/connection_state.ts
@@ -0,0 +1,12 @@
+import type { ConnectionId } from "../lib/connection_id";
+import type { Identity } from "../lib/identity";
+import type { DbConnectionImpl } from "../sdk/db_connection_impl";
+
+export type ConnectionState<DbConnection extends DbConnectionImpl> = {
+  isActive: boolean;
+  identity?: Identity;
+  token?: string;
+  connectionId: ConnectionId;
+  connectionError?: Error;
+  getConnection(): DbConnection | null;
+};
diff --git a/crates/bindings-typescript/src/react/index.ts b/crates/bindings-typescript/src/react/index.ts
index b99fe7f78f4..6bcf01a6a28 100644
--- a/crates/bindings-typescript/src/react/index.ts
+++ b/crates/bindings-typescript/src/react/index.ts
@@ -1,3 +1,4 @@
 export * from './SpacetimeDBProvider.ts';
 export { useSpacetimeDB } from './useSpacetimeDB.ts';
 export { useTable, where, eq } from './useTable.ts';
+export { useReducer } from './useReducer.ts';
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
new file mode 100644
index 00000000000..dab84320ed2
--- /dev/null
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -0,0 +1,17 @@
+import type { DbConnectionImpl } from "../sdk/db_connection_impl";
+import type { ReducerNamesFromReducers } from "../sdk/reducer_handle";
+import { useSpacetimeDB } from "./useSpacetimeDB";
+
+// export function useReducer<
+//   DbConnection extends DbConnectionImpl,
+//   ReducerName extends ReducerNamesFromReducers<DbConnection['reducers']> = ReducerNamesFromReducers<
+//     DbConnection['reducers']
+//   >,
+//   ReducerType = DbConnection['reducers'][ReducerName & keyof DbConnection['reducers']]
+// >(
+//   reducerName: ReducerName,
+// ): ReducerType {
+//     const connectionState = useSpacetimeDB<DbConnection>();
+//     const connection = connectionState.getConnection()!;
+//     return connection.reducers[reducerName as keyof typeof connection.reducers];
+// }
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/useSpacetimeDB.ts b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
index 505c8143742..17f180b9878 100644
--- a/crates/bindings-typescript/src/react/useSpacetimeDB.ts
+++ b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
@@ -1,19 +1,17 @@
-import { createContext, useContext, type Context } from 'react';
+import { createContext, useContext } from 'react';
 import type { DbConnectionImpl } from '../sdk/db_connection_impl';
+import type { ConnectionState } from './connection_state';
 
-export const SpacetimeDBContext: Context<DbConnectionImpl | undefined> =
-  createContext<DbConnectionImpl | undefined>(undefined);
+export const SpacetimeDBContext = createContext<ConnectionState<DbConnectionImpl> | undefined>(undefined);
 
 // Throws an error if used outside of a SpacetimeDBProvider
 // Error is caught by other hooks like useTable so they can provide better error messages
-export function useSpacetimeDB<
-  DbConnection extends DbConnectionImpl,
->(): DbConnection {
-  const context = useContext(SpacetimeDBContext) as DbConnection | undefined;
+export function useSpacetimeDB<DbConnection extends DbConnectionImpl>(): ConnectionState<DbConnection> {
+  const context = useContext(SpacetimeDBContext) as ConnectionState<DbConnection> | undefined;
   if (!context) {
     throw new Error(
       'useSpacetimeDB must be used within a SpacetimeDBProvider component. Did you forget to add a `SpacetimeDBProvider` to your component tree?'
     );
   }
   return context;
-}
+}
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index 78f675f6e31..5c81fdf2ed4 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -8,6 +8,7 @@ import {
 import { useSpacetimeDB } from './useSpacetimeDB';
 import { DbConnectionImpl, TableCache } from '../sdk/db_connection_impl';
 import type { TableNamesFromDb } from '../sdk/table_handle';
+import type { ConnectionState } from './connection_state';
 
 export interface UseQueryCallbacks<RowType> {
   onInsert?: (row: RowType) => void;
@@ -292,9 +293,9 @@ export function useTable<
       | undefined;
   }
   const [subscribeApplied, setSubscribeApplied] = useState(false);
-  let spacetime: DbConnection | undefined;
+  let connectionState: ConnectionState<DbConnection> | undefined;
   try {
-    spacetime = useSpacetimeDB<DbConnection>();
+    connectionState = useSpacetimeDB<DbConnection>();
   } catch {
     throw new Error(
       'Could not find SpacetimeDB client! Did you forget to add a ' +
@@ -302,7 +303,6 @@ export function useTable<
         'under a `SpacetimeDBProvider` component.'
     );
   }
-  const client = spacetime;
 
   const query =
     `SELECT * FROM ${tableName}` +
@@ -314,8 +314,12 @@ export function useTable<
   const whereKey = whereClause ? toString(whereClause) : '';
 
   const computeSnapshot = useCallback((): Snapshot<RowType> => {
-    const table = client.db[
-      tableName as keyof typeof client.db
+    const connection = connectionState.getConnection();
+    if (!connection) {
+      return { rows: [], state: 'loading' };
+    }
+    const table = connection.db[
+      tableName as keyof typeof connection.db
     ] as unknown as TableCache<RowType>;
     const result: readonly RowType[] = whereClause
       ? table.iter().filter(row => evaluate(whereClause, row))
@@ -325,11 +329,12 @@ export function useTable<
       state: subscribeApplied ? 'ready' : 'loading',
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [client, tableName, whereKey, subscribeApplied]);
+  }, [connectionState, tableName, whereKey, subscribeApplied]);
 
   useEffect(() => {
-    if (client.isActive) {
-      const cancel = client
+    const connection = connectionState.getConnection()!;
+    if (connectionState.isActive && connection) {
+      const cancel = connection 
         .subscriptionBuilder()
         .onApplied(() => {
           setSubscribeApplied(true);
@@ -339,7 +344,7 @@ export function useTable<
         cancel.unsubscribe();
       };
     }
-  }, [query, client.isActive, client]);
+  }, [query, connectionState.isActive, connectionState]);
 
   const subscribe = useCallback(
     (onStoreChange: () => void) => {
@@ -400,8 +405,13 @@ export function useTable<
         }
       };
 
-      const table = client.db[
-        tableName as keyof typeof client.db
+      const connection = connectionState.getConnection();
+      if (!connection) {
+        return () => {};
+      }
+
+      const table = connection.db[
+        tableName as keyof typeof connection.db
       ] as unknown as TableCache<RowType>;
       table.onInsert(onInsert);
       table.onDelete(onDelete);
@@ -415,7 +425,7 @@ export function useTable<
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
-      client,
+      connectionState,
       tableName,
       whereKey,
       callbacks?.onDelete,
diff --git a/crates/bindings-typescript/src/sdk/client_api/index.ts b/crates/bindings-typescript/src/sdk/client_api/index.ts
index 5e3cc809133..2441d1d8732 100644
--- a/crates/bindings-typescript/src/sdk/client_api/index.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/index.ts
@@ -112,7 +112,7 @@ const REMOTE_MODULE = {
   // SDK, but if in the future we wanted to create a class this would be
   // necessary because classes have methods, so we'll keep it.
   eventContextConstructor: (
-    imp: __DbConnectionImpl,
+    imp: __DbConnectionImpl<RemoteTables,
     event: __Event<Reducer>
   ) => {
     return {
diff --git a/crates/bindings-typescript/src/sdk/client_cache.ts b/crates/bindings-typescript/src/sdk/client_cache.ts
index 81beec64ba5..40b8c98bc08 100644
--- a/crates/bindings-typescript/src/sdk/client_cache.ts
+++ b/crates/bindings-typescript/src/sdk/client_cache.ts
@@ -1,47 +1,100 @@
-import type { TableRuntimeTypeInfo } from './spacetime_module.ts';
+import type { UntypedSchemaDef } from '../server/schema.ts';
+import type { UntypedTableDef } from '../server/table.ts';
+import type { UntypedReducersDef } from './reducers.ts';
 import { TableCache } from './table_cache.ts';
 
-export class ClientCache {
+type TableName<SchemaDef> =
+  [SchemaDef] extends [UntypedSchemaDef] ? SchemaDef['tables'][number]['name'] : string;
+
+export type TableDefForTableName<SchemaDef, N> =
+  [SchemaDef] extends [UntypedSchemaDef]
+    ? Extract<SchemaDef['tables'][number], { name: N }>
+    : UntypedTableDef;
+
+type TableCacheForTableName<
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+  N
+> = TableCache<SchemaDef, Reducers, TableDefForTableName<SchemaDef, N>>;
+
+/**
+ * This is a helper class that provides a mapping from table names to their corresponding TableCache instances
+ * while preserving the correspondence between the key and value type.
+ */
+class TableMap<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
+  private readonly map: Map<string, TableCacheForTableName<SchemaDef, Reducers, TableName<SchemaDef>>> = new Map();
+
+  get<K extends TableName<SchemaDef>>(key: K): TableCacheForTableName<SchemaDef, Reducers, K> | undefined {
+    // Cast required: a Map<string, Union> can't refine the union to the exact K-specific member on get<K>(key: K).
+    return this.map.get(key) as TableCacheForTableName<SchemaDef, Reducers, K> | undefined;
+  }
+
+  set<K extends TableName<SchemaDef>>(key: K, value: TableCacheForTableName<SchemaDef, Reducers, K>): this {
+    this.map.set(key, value);
+    return this;
+  }
+
+  has(key: TableName<SchemaDef>): boolean {
+    return this.map.has(key);
+  }
+
+  delete(key: TableName<SchemaDef>): boolean {
+    return this.map.delete(key);
+  }
+
+  // optional: iteration stays broadly typed (cannot express per-key relation here)
+  keys(): IterableIterator<string> { return this.map.keys(); }
+  values(): IterableIterator<TableCacheForTableName<SchemaDef, Reducers, TableName<SchemaDef>>> { return this.map.values(); }
+  entries(): IterableIterator<[string, TableCacheForTableName<SchemaDef, Reducers, TableName<SchemaDef>>]> { return this.map.entries(); }
+  [Symbol.iterator]() { return this.entries(); }
+}
+
+/**
+ * ClientCache maintains a cache of TableCache instances for each table in the database.
+ * It provides methods to get or create TableCache instances by table name,
+ * ensuring type safety based on the provided SchemaDef.
+ */
+export class ClientCache<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
   /**
    * The tables in the database.
    */
-  tables: Map<string, TableCache<any>>;
-
-  constructor() {
-    this.tables = new Map();
-  }
+  readonly tables = new TableMap<SchemaDef, Reducers>();
 
   /**
    * Returns the table with the given name.
-   * @param name The name of the table.
-   * @returns The table
+   * - If SchemaDef is a concrete schema, `name` is constrained to known table names,
+   *   and the return type matches that table.
+   * - If SchemaDef is undefined, `name` is string and the return type is untyped.
    */
-  getTable<RowType extends Record<string, any>>(
-    name: string
-  ): TableCache<RowType> {
+  getTable<N extends TableName<SchemaDef>>(name: N): TableCacheForTableName<SchemaDef, Reducers, N> {
     const table = this.tables.get(name);
-
-    // ! This should not happen as the table should be available but an exception is thrown just in case.
     if (!table) {
       console.error(
         'The table has not been registered for this client. Please register the table before using it. If you have registered global tables using the SpacetimeDBClient.registerTables() or `registerTable()` method, please make sure that is executed first!'
       );
-      throw new Error(`Table ${name} does not exist`);
+      throw new Error(`Table ${String(name)} does not exist`);
     }
-
     return table;
   }
 
-  getOrCreateTable<RowType extends Record<string, any>>(
-    tableTypeInfo: TableRuntimeTypeInfo
-  ): TableCache<RowType> {
-    let table: TableCache<RowType>;
-    if (!this.tables.has(tableTypeInfo.tableName)) {
-      table = new TableCache<RowType>(tableTypeInfo);
-      this.tables.set(tableTypeInfo.tableName, table);
-    } else {
-      table = this.tables.get(tableTypeInfo.tableName)!;
+  /**
+   * Returns the table with the given name, creating it if needed.
+   * - Typed mode: `tableTypeInfo.tableName` is constrained to known names and
+   *   the return type matches that table.
+   * - Untyped mode: accepts any string and returns an untyped TableCache.
+   */
+  getOrCreateTable<N extends TableName<SchemaDef>>(
+    tableDef: TableDefForTableName<SchemaDef, N>
+  ): TableCacheForTableName<SchemaDef, Reducers, N> {
+    const name = tableDef.name as N;
+
+    let table = this.tables.get(name);
+    if (table) {
+      return table;
     }
-    return table;
+
+    const newTable = new TableCache<SchemaDef, Reducers, TableDefForTableName<SchemaDef, N>>(tableDef);
+    this.tables.set(name, newTable);
+    return newTable;
   }
 }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index a891dd3cb6b..b585cf35564 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -1,17 +1,19 @@
 import { DbConnectionImpl, type ConnectionEvent } from './db_connection_impl';
 import { EventEmitter } from './event_emitter';
-import type { Identity } from '../';
-import type RemoteModule from './spacetime_module';
+import type { DbConnectionConfig, ErrorContextInterface, Identity, SubscriptionEventContextInterface } from '../';
+import { type RemoteModule, type RemoteModule2 } from './spacetime_module';
 import { ensureMinimumVersionOrThrow } from './version';
 import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
+import type { UntypedSchemaDef } from '../server/schema';
+import type { UntypedReducersDef } from './reducers';
 
 /**
  * The database client connection to a SpacetimeDB server.
  */
 export class DbConnectionBuilder<
-  DbConnection,
-  ErrorContext,
-  _SubscriptionEventContext,
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+  DbConnection extends DbConnectionImpl<SchemaDef, Reducers>,
 > {
   #uri?: URL;
   #nameOrAddress?: string;
@@ -32,8 +34,8 @@ export class DbConnectionBuilder<
    * @param dbConnectionConstructor The constructor to use to create a new `DbConnection`.
    */
   constructor(
-    private remoteModule: RemoteModule,
-    private dbConnectionConstructor: (imp: DbConnectionImpl) => DbConnection
+    private remoteModule: RemoteModule2<SchemaDef, Reducers>,
+    private dbConnectionCtor: (config: DbConnectionConfig<SchemaDef, Reducers>) => DbConnection
   ) {
     this.#createWSFn = WebsocketDecompressAdapter.createWebSocketFn;
   }
@@ -179,7 +181,7 @@ export class DbConnectionBuilder<
    * });
    * ```
    */
-  onConnectError(callback: (ctx: ErrorContext, error: Error) => void): this {
+  onConnectError(callback: (ctx: ErrorContextInterface<SchemaDef, Reducers>, error: Error) => void): this {
     this.#emitter.on('connectError', callback);
     return this;
   }
@@ -211,7 +213,7 @@ export class DbConnectionBuilder<
    * @throws {Error} Throws an error if called multiple times on the same `DbConnectionBuilder`.
    */
   onDisconnect(
-    callback: (ctx: ErrorContext, error?: Error | undefined) => void
+    callback: (ctx: ErrorContextInterface<SchemaDef, Reducers>, error?: Error | undefined) => void
   ): this {
     this.#emitter.on('disconnect', callback);
     return this;
@@ -231,7 +233,7 @@ export class DbConnectionBuilder<
    * DbConnection.builder().withUri(host).withModuleName(name_or_address).withToken(auth_token).build();
    * ```
    */
-  build(): DbConnection {
+  build(): DbConnectionImpl<SchemaDef, Reducers> {
     if (!this.#uri) {
       throw new Error('URI is required to connect to SpacetimeDB');
     }
@@ -245,19 +247,17 @@ export class DbConnectionBuilder<
     // Ideally, it would be a compile time error, but I'm not sure how to accomplish that.
     ensureMinimumVersionOrThrow(this.remoteModule.versionInfo?.cliVersion);
 
-    return this.dbConnectionConstructor(
-      new DbConnectionImpl({
-        uri: this.#uri,
-        nameOrAddress: this.#nameOrAddress,
-        identity: this.#identity,
-        token: this.#token,
-        emitter: this.#emitter,
-        compression: this.#compression,
-        lightMode: this.#lightMode,
-        confirmedReads: this.#confirmedReads,
-        createWSFn: this.#createWSFn,
-        remoteModule: this.remoteModule,
-      })
-    );
+    return this.dbConnectionCtor({
+      uri: this.#uri,
+      nameOrAddress: this.#nameOrAddress,
+      identity: this.#identity,
+      token: this.#token,
+      emitter: this.#emitter,
+      compression: this.#compression,
+      lightMode: this.#lightMode,
+      confirmedReads: this.#confirmedReads,
+      createWSFn: this.#createWSFn,
+      remoteModule: this.remoteModule,
+    })
   }
 }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index 16720d8837b..64c7b435554 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -1,4 +1,4 @@
-import { ConnectionId } from '../';
+import { ConnectionId, ProductType } from '../';
 import {
   AlgebraicType,
   type AlgebraicTypeVariants,
@@ -22,6 +22,7 @@ import {
   type EventContextInterface,
   type ReducerEventContextInterface,
   type SubscriptionEventContextInterface,
+  type UntypedEventContext,
 } from './event_context.ts';
 import { EventEmitter } from './event_emitter.ts';
 import { decompress } from './decompress.ts';
@@ -33,7 +34,7 @@ import type {
   UnsubscribeAppliedMessage,
 } from './message_types.ts';
 import type { ReducerEvent } from './reducer_event.ts';
-import type RemoteModule from './spacetime_module.ts';
+import { type RemoteModule, type RemoteModule2 } from './spacetime_module.ts';
 import {
   TableCache,
   type Operation,
@@ -49,8 +50,13 @@ import {
   type SubscribeEvent,
 } from './subscription_builder_impl.ts';
 import { stdbLogger } from './logger.ts';
-import { type ReducerRuntimeTypeInfo } from './spacetime_module.ts';
 import { fromByteArray } from 'base64-js';
+import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
+import type { UntypedSchemaDef } from '../server/schema.ts';
+import type { DbView } from '../server/db_view.ts';
+import type { RowType, UntypedTableDef } from '../server/table.ts';
+import type { CamelCase } from '../server/type_util.ts';
+import { toCamelCase } from '../server/runtime.ts';
 
 export { DbConnectionBuilder, SubscriptionBuilderImpl, TableCache, type Event };
 
@@ -66,12 +72,13 @@ export type {
 export type ConnectionEvent = 'connect' | 'disconnect' | 'connectError';
 export type CallReducerFlags = 'FullUpdate' | 'NoSuccessNotify';
 
-type ReducerEventCallback<ReducerArgs extends any[] = any[]> = (
-  ctx: ReducerEventContextInterface,
+type ReducerEventCallback<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef, ReducerArgs extends any[] = any[]> = (
+  ctx: ReducerEventContextInterface<SchemaDef, Reducers>,
   ...args: ReducerArgs
 ) => void;
-type SubscriptionEventCallback = (
-  ctx: SubscriptionEventContextInterface
+
+type SubscriptionEventCallback<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> = (
+  ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>,
 ) => void;
 
 function callReducerFlagsToNumber(flags: CallReducerFlags): number {
@@ -83,25 +90,23 @@ function callReducerFlagsToNumber(flags: CallReducerFlags): number {
   }
 }
 
-type DbConnectionConfig = {
+export type DbConnectionConfig<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> = {
   uri: URL;
   nameOrAddress: string;
   identity?: Identity;
   token?: string;
   emitter: EventEmitter<ConnectionEvent>;
-  remoteModule: RemoteModule;
   createWSFn: typeof WebsocketDecompressAdapter.createWebSocketFn;
   compression: 'gzip' | 'none';
   lightMode: boolean;
   confirmedReads?: boolean;
+  remoteModule: RemoteModule2<SchemaDef, Reducers>;
 };
 
 export class DbConnectionImpl<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
-> implements DbContext<DBView, Reducers>
-{
+  SchemaDef extends UntypedSchemaDef,
+  ReducersDef extends UntypedReducersDef,
+> implements DbContext<SchemaDef, ReducersDef> {
   /**
    * Whether or not the connection is active.
    */
@@ -121,20 +126,20 @@ export class DbConnectionImpl<
    * The accessor field to access the tables in the database and associated
    * callback functions.
    */
-  db: DBView;
+  db: DbView<SchemaDef>;
 
   /**
    * The accessor field to access the reducers in the database and associated
    * callback functions.
    */
-  reducers: Reducers;
+  reducers: ReducersView<ReducersDef>;
 
   /**
    * The accessor field to access functions related to setting flags on
    * reducers regarding how the server should handle the reducer call and
    * the events that it sends back to the client.
    */
-  setReducerFlags: SetReducerFlags;
+  setReducerFlags: SetReducerFlags<ReducersDef>;
 
   /**
    * The `ConnectionId` of the connection to to the database.
@@ -144,18 +149,19 @@ export class DbConnectionImpl<
   // These fields are meant to be strictly private.
   #queryId = 0;
   #emitter: EventEmitter<ConnectionEvent>;
-  #reducerEmitter: EventEmitter<string, ReducerEventCallback> =
+  #reducerEmitter: EventEmitter<string, ReducerEventCallback<SchemaDef, ReducersDef>> =
     new EventEmitter();
-  #onApplied?: SubscriptionEventCallback;
-  #remoteModule: RemoteModule;
+  #onApplied?: SubscriptionEventCallback<SchemaDef, ReducersDef>;
   #messageQueue = Promise.resolve();
-  #subscriptionManager = new SubscriptionManager();
+  #subscriptionManager = new SubscriptionManager<SchemaDef, ReducersDef>();
+  #remoteModule: RemoteModule2<SchemaDef, ReducersDef>;
+  #callReducerFlags = new Map<string, CallReducerFlags>();
 
   // These fields are not part of the public API, but in a pinch you
   // could use JavaScript to access them by bypassing TypeScript's
   // private fields.
   // We use them in testing.
-  private clientCache: ClientCache;
+  private clientCache: ClientCache<SchemaDef, ReducersDef>;
   private ws?: WebsocketDecompressAdapter | WebsocketTestAdapter;
   private wsPromise: Promise<
     WebsocketDecompressAdapter | WebsocketTestAdapter | undefined
@@ -172,7 +178,7 @@ export class DbConnectionImpl<
     compression,
     lightMode,
     confirmedReads,
-  }: DbConnectionConfig) {
+  }: DbConnectionConfig<SchemaDef, ReducersDef>) {
     stdbLogger('info', 'Connecting to SpacetimeDB WS...');
 
     // We use .toString() here because some versions of React Native contain a bug where the URL constructor
@@ -192,13 +198,10 @@ export class DbConnectionImpl<
     const connectionId = this.connectionId.toHexString();
     url.searchParams.set('connection_id', connectionId);
 
-    this.clientCache = new ClientCache();
-    this.db = this.#remoteModule.dbViewConstructor(this);
-    this.setReducerFlags = this.#remoteModule.setReducerFlagsConstructor();
-    this.reducers = this.#remoteModule.reducersConstructor(
-      this,
-      this.setReducerFlags
-    );
+    this.clientCache = new ClientCache<SchemaDef, ReducersDef>();
+    this.db = this.#makeDbView(remoteModule.tables);
+    this.reducers = this.#makeReducers(remoteModule.reducers);
+    this.setReducerFlags = this.#makeSetReducerFlags(remoteModule.reducers);
 
     this.wsPromise = createWSFn({
       url,
@@ -236,6 +239,74 @@ export class DbConnectionImpl<
     return queryId;
   };
 
+  #makeDbView(def: SchemaDef): DbView<SchemaDef> {
+    const view = Object.create(null) as DbView<SchemaDef>;
+
+    for (const tbl of def.tables) {
+      // DbView uses this name verbatim
+      const key = tbl.accessorName; 
+      Object.defineProperty(view, key, {
+        enumerable: true,
+        configurable: false,
+        get: () => {
+          return this.clientCache.getOrCreateTable(tbl);
+        },
+      });
+    }
+
+    return view;
+  }
+
+  #makeReducers(def: ReducersDef): ReducersView<ReducersDef> {
+    const out: Record<string, unknown> = {};
+
+    for (const reducer of def.reducers) {
+      const key = toCamelCase(reducer.name);
+
+      (out as any)[key] = (params: typeof reducer.params) => {
+        const flags = this.#callReducerFlags.get(reducer.name) ?? 'FullUpdate';
+        this.callReducerWithParams(
+          reducer.name,
+          reducer.paramsSpacetimeType,
+          params,
+          flags
+        );
+      };
+    }
+
+    return out as ReducersView<ReducersDef>;
+  }
+
+  #makeSetReducerFlags(defs: ReducersDef): SetReducerFlags<ReducersDef> {
+    const out = Object.create(null) as SetReducerFlags<ReducersDef>;
+    for (const r of defs.reducers) {
+      const key = toCamelCase(r.name);
+      Object.defineProperty(out, key, {
+        enumerable: true,
+        configurable: false,
+        value: (flags: CallReducerFlags) => {
+          this.#callReducerFlags.set(r.name, flags);
+        },
+      });
+    }
+    return out;
+  }
+
+  #makeEventContext(
+    event: Event<ReducersDef['reducers'][number]>
+  ): EventContextInterface<SchemaDef, ReducersDef> {
+    // Bind methods to preserve `this` (#private fields safe)
+    return {
+      db: this.db,
+      reducers: this.reducers,
+      setReducerFlags: this.setReducerFlags,
+      isActive: this.isActive,
+      subscriptionBuilder: this.subscriptionBuilder.bind(this),
+      disconnect: this.disconnect.bind(this),
+      event,
+    };
+  }
+
   // NOTE: This is very important!!! This is the actual function that
   // gets called when you call `connection.subscriptionBuilder()`.
   // The `subscriptionBuilder` function which is generated, just shadows
@@ -243,13 +314,13 @@ export class DbConnectionImpl<
   // Do not remove this function, or shoot yourself in the foot please.
   // It's not clear what would be a better way to do this at this exact
   // moment.
-  subscriptionBuilder = (): SubscriptionBuilderImpl => {
+  subscriptionBuilder = (): SubscriptionBuilderImpl<SchemaDef, ReducersDef> => {
     return new SubscriptionBuilderImpl(this);
   };
 
   registerSubscription(
-    handle: SubscriptionHandleImpl<DBView, Reducers, SetReducerFlags>,
-    handleEmitter: EventEmitter<SubscribeEvent, SubscriptionEventCallback>,
+    handle: SubscriptionHandleImpl<SchemaDef, ReducersDef>,
+    handleEmitter: EventEmitter<SubscribeEvent, SubscriptionEventCallback<SchemaDef, ReducersDef>>,
     querySql: string[]
   ): number {
     const queryId = this.#getNextQueryId();
@@ -292,16 +363,21 @@ export class DbConnectionImpl<
       const buffer = rowList.rowsData;
       const reader = new BinaryReader(buffer);
       const rows: Operation[] = [];
-      const rowType = this.#remoteModule.tables[tableName]!.rowType;
-      const primaryKeyInfo =
-        this.#remoteModule.tables[tableName]!.primaryKeyInfo;
+
+      // TODO: performance
+      const table = this.#remoteModule.tables.tables.find(t => t.name === tableName);
+      const rowType = table!.rowType;
+      const columnsArray = Object.entries(table!.columns);
+      const primaryKeyColumnEntry = columnsArray.find(col => col[1].columnMetadata.isPrimaryKey);
       while (reader.remaining > 0) {
-        const row = AlgebraicType.deserializeValue(reader, rowType);
+        const row = ProductType.deserializeValue(reader, rowType);
         let rowId: ComparablePrimitive | undefined = undefined;
-        if (primaryKeyInfo !== undefined) {
+        if (primaryKeyColumnEntry !== undefined) {
+          const primaryKeyColName = primaryKeyColumnEntry[0];
+          const primaryKeyColType = primaryKeyColumnEntry[1].typeBuilder.algebraicType;
           rowId = AlgebraicType.intoMapKey(
-            primaryKeyInfo.colType,
-            row[primaryKeyInfo.colName]
+            primaryKeyColType,
+            row[primaryKeyColName]
           );
         } else {
           // Get a view of the bytes for this row.
@@ -322,7 +398,7 @@ export class DbConnectionImpl<
 
     const parseTableUpdate = async (
       rawTableUpdate: RawTableUpdate
-    ): Promise<CacheTableUpdate> => {
+    ): Promise<CacheTableUpdate<UntypedTableDef>> => {
       const tableName = rawTableUpdate.tableName;
       let operations: Operation[] = [];
       for (const update of rawTableUpdate.updates) {
@@ -354,8 +430,8 @@ export class DbConnectionImpl<
 
     const parseDatabaseUpdate = async (
       dbUpdate: DatabaseUpdate
-    ): Promise<CacheTableUpdate[]> => {
-      const tableUpdates: CacheTableUpdate[] = [];
+    ): Promise<CacheTableUpdate<UntypedTableDef>[]> => {
+      const tableUpdates: CacheTableUpdate<UntypedTableDef>[] = [];
       for (const rawTableUpdate of dbUpdate.tables) {
         tableUpdates.push(await parseTableUpdate(rawTableUpdate));
       }
@@ -393,7 +469,7 @@ export class DbConnectionImpl<
         const args = txUpdate.reducerCall.args;
         const energyQuantaUsed = txUpdate.energyQuantaUsed;
 
-        let tableUpdates: CacheTableUpdate[] = [];
+        let tableUpdates: CacheTableUpdate<UntypedTableDef>[] = [];
         let errMessage = '';
         switch (txUpdate.status.tag) {
           case 'Committed':
@@ -418,9 +494,9 @@ export class DbConnectionImpl<
 
         let reducerInfo:
           | {
-              reducerName: string;
-              args: Uint8Array;
-            }
+            reducerName: string;
+            args: Uint8Array;
+          }
           | undefined;
         if (reducerName !== '') {
           reducerInfo = {
@@ -516,15 +592,16 @@ export class DbConnectionImpl<
   }
 
   #applyTableUpdates(
-    tableUpdates: CacheTableUpdate[],
-    eventContext: EventContextInterface
+    tableUpdates: CacheTableUpdate<UntypedTableDef>[],
+    eventContext: EventContextInterface<SchemaDef, ReducersDef>
   ): PendingCallback[] {
     const pendingCallbacks: PendingCallback[] = [];
     for (const tableUpdate of tableUpdates) {
       // Get table information for the table being updated
       const tableName = tableUpdate.tableName;
-      const tableTypeInfo = this.#remoteModule.tables[tableName]!;
-      const table = this.clientCache.getOrCreateTable(tableTypeInfo);
+      // TODO: performance
+      const tableDef = this.#remoteModule.tables.tables.find(t => t.name === tableName)!;
+      const table = this.clientCache.getOrCreateTable(tableDef);
       const newCallbacks = table.applyOperations(
         tableUpdate.operations,
         eventContext
@@ -545,11 +622,7 @@ export class DbConnectionImpl<
     switch (message.tag) {
       case 'InitialSubscription': {
         const event: Event<never> = { tag: 'SubscribeApplied' };
-
-        const eventContext = this.#remoteModule.eventContextConstructor(
-          this,
-          event
-        );
+        const eventContext = this.#makeEventContext(event);
         // Remove the event from the subscription event context
         // It is not a field in the type narrowed SubscriptionEventContext
         const { event: _, ...subscriptionEventContext } = eventContext;
@@ -568,10 +641,7 @@ export class DbConnectionImpl<
       }
       case 'TransactionUpdateLight': {
         const event: Event<never> = { tag: 'UnknownTransaction' };
-        const eventContext = this.#remoteModule.eventContextConstructor(
-          this,
-          event
-        );
+        const eventContext = this.#makeEventContext(event);
         const callbacks = this.#applyTableUpdates(
           message.tableUpdates,
           eventContext
@@ -585,17 +655,16 @@ export class DbConnectionImpl<
         let reducerInfo = message.reducerInfo;
         let unknownTransaction = false;
         let reducerArgs: any | undefined;
-        let reducerTypeInfo: ReducerRuntimeTypeInfo | undefined;
+        const reducer = this.#remoteModule.reducers.reducers.find(t => t.name === reducerInfo!.reducerName)!;
         if (!reducerInfo) {
           unknownTransaction = true;
         } else {
-          reducerTypeInfo =
-            this.#remoteModule.reducers[reducerInfo.reducerName];
+          // TODO: performance
           try {
             const reader = new BinaryReader(reducerInfo.args as Uint8Array);
-            reducerArgs = AlgebraicType.deserializeValue(
+            reducerArgs = ProductType.deserializeValue(
               reader,
-              reducerTypeInfo.argsType
+              reducer?.paramsSpacetimeType
             );
           } catch {
             // This should only be printed in development, since it's
@@ -608,10 +677,7 @@ export class DbConnectionImpl<
 
         if (unknownTransaction) {
           const event: Event<never> = { tag: 'UnknownTransaction' };
-          const eventContext = this.#remoteModule.eventContextConstructor(
-            this,
-            event
-          );
+          const eventContext = this.#makeEventContext(event);
           const callbacks = this.#applyTableUpdates(
             message.tableUpdates,
             eventContext
@@ -626,7 +692,6 @@ export class DbConnectionImpl<
         // At this point, we know that `reducerInfo` is not null because
         // we return if `unknownTransaction` is true.
         reducerInfo = reducerInfo!;
-        reducerTypeInfo = reducerTypeInfo!;
 
         // Thus this must be a reducer event create it and emit it.
         const reducerEvent = {
@@ -637,17 +702,16 @@ export class DbConnectionImpl<
           energyConsumed: message.energyConsumed,
           reducer: {
             name: reducerInfo.reducerName,
-            args: reducerArgs,
+            // TODO(cloutiertyler): rename back to args to maintain API compatibility
+            params: reducerArgs,
+            paramsSpacetimeType: reducer.paramsSpacetimeType,
           },
         };
         const event: Event<typeof reducerEvent.reducer> = {
           tag: 'Reducer',
           value: reducerEvent,
         };
-        const eventContext = this.#remoteModule.eventContextConstructor(
-          this,
-          event
-        );
+        const eventContext = this.#makeEventContext(event); 
         const reducerEventContext = {
           ...eventContext,
           event: reducerEvent,
@@ -660,8 +724,8 @@ export class DbConnectionImpl<
 
         const argsArray: any[] = [];
         (
-          reducerTypeInfo.argsType as AlgebraicTypeVariants.Product
-        ).value.elements.forEach(element => {
+          reducer.paramsSpacetimeType
+        ).elements.forEach(element => {
           argsArray.push(reducerArgs[element.name!]);
         });
         this.#reducerEmitter.emit(
@@ -696,10 +760,7 @@ export class DbConnectionImpl<
           break;
         }
         const event: Event<never> = { tag: 'SubscribeApplied' };
-        const eventContext = this.#remoteModule.eventContextConstructor(
-          this,
-          event
-        );
+        const eventContext = this.#makeEventContext(event);
         const { event: _, ...subscriptionEventContext } = eventContext;
         const callbacks = this.#applyTableUpdates(
           message.tableUpdates,
@@ -724,10 +785,7 @@ export class DbConnectionImpl<
           break;
         }
         const event: Event<never> = { tag: 'UnsubscribeApplied' };
-        const eventContext = this.#remoteModule.eventContextConstructor(
-          this,
-          event
-        );
+        const eventContext = this.#makeEventContext(event);
         const { event: _, ...subscriptionEventContext } = eventContext;
         const callbacks = this.#applyTableUpdates(
           message.tableUpdates,
@@ -743,10 +801,7 @@ export class DbConnectionImpl<
       case 'SubscriptionError': {
         const error = Error(message.error);
         const event: Event<never> = { tag: 'Error', value: error };
-        const eventContext = this.#remoteModule.eventContextConstructor(
-          this,
-          event
-        );
+        const eventContext = this.#makeEventContext(event);
         const errorContext = {
           ...eventContext,
           event: error,
@@ -807,6 +862,23 @@ export class DbConnectionImpl<
     this.#sendMessage(message);
   }
 
+  /**
+   * Call a reducer on your SpacetimeDB module with typed arguments.
+   * @param reducerSchema The schema of the reducer to call
+   * @param callReducerFlags The flags for the reducer call
+   * @param params The arguments to pass to the reducer 
+   */
+  callReducerWithParams(reducerName: string, paramsType: ProductType, params: object, flags: CallReducerFlags) {
+    let writer = new BinaryWriter(1024);
+    ProductType.serializeValue(writer, paramsType, params);
+    let argsBuffer = writer.getBuffer();
+    this.callReducer(
+      reducerName,
+      argsBuffer,
+      flags
+    );
+  }
+
   /**
    * Close the current connection.
    *
@@ -827,63 +899,63 @@ export class DbConnectionImpl<
 
   private on(
     eventName: ConnectionEvent,
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.on(eventName, callback);
   }
 
   private off(
     eventName: ConnectionEvent,
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.off(eventName, callback);
   }
 
   private onConnect(
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.on('connect', callback);
   }
 
   private onDisconnect(
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.on('disconnect', callback);
   }
 
   private onConnectError(
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.on('connectError', callback);
   }
 
-  private removeOnConnect(
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+  removeOnConnect(
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.off('connect', callback);
   }
 
-  private removeOnDisconnect(
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+  removeOnDisconnect(
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.off('disconnect', callback);
   }
 
-  private removeOnConnectError(
-    callback: (ctx: DbConnectionImpl, ...args: any[]) => void
+  removeOnConnectError(
+    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
   ): void {
     this.#emitter.off('connectError', callback);
   }
 
   // Note: This is required to be public because it needs to be
   // called from the `RemoteReducers` class.
-  onReducer(reducerName: string, callback: ReducerEventCallback): void {
+  onReducer(reducerName: string, callback: ReducerEventCallback<SchemaDef, ReducersDef>): void {
     this.#reducerEmitter.on(reducerName, callback);
   }
 
   // Note: This is required to be public because it needs to be
   // called from the `RemoteReducers` class.
-  offReducer(reducerName: string, callback: ReducerEventCallback): void {
+  offReducer(reducerName: string, callback: ReducerEventCallback<SchemaDef, ReducersDef>): void {
     this.#reducerEmitter.off(reducerName, callback);
   }
 }
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index 533ce32e923..7d5d0da464c 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -1,20 +1,19 @@
+import type { DbView } from '../server/db_view';
+import type { UntypedSchemaDef } from '../server/schema';
+import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
 
 /**
  * Interface representing a database context.
  *
- * @template DBView - Type representing the database view.
- * @template Reducers - Type representing the reducers.
+ * @template DbView - Type representing the database view.
+ * @template ReducersDef - Type representing the reducers.
  * @template SetReducerFlags - Type representing the reducer flags collection.
  */
-export interface DbContext<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
-> {
-  db: DBView;
-  reducers: Reducers;
-  setReducerFlags: SetReducerFlags;
+export interface DbContext<SchemaDef extends UntypedSchemaDef, ReducersDef extends UntypedReducersDef> {
+  db: DbView<SchemaDef>;
+  reducers: ReducersView<ReducersDef>;
+  setReducerFlags: SetReducerFlags<ReducersDef>;
   isActive: boolean;
 
   /**
@@ -23,9 +22,8 @@ export interface DbContext<
    * @returns The subscription builder.
    */
   subscriptionBuilder(): SubscriptionBuilderImpl<
-    DBView,
-    Reducers,
-    SetReducerFlags
+    SchemaDef,
+    ReducersDef
   >;
 
   /**
diff --git a/crates/bindings-typescript/src/sdk/db_view.ts b/crates/bindings-typescript/src/sdk/db_view.ts
new file mode 100644
index 00000000000..664fcbe2483
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/db_view.ts
@@ -0,0 +1,14 @@
+import type { DbView } from "../server/db_view";
+import type { UntypedSchemaDef } from "../server/schema";
+
+/**
+ * An untyped database view, where the table names and row types are not known.
+ * Each key is a camelCased version of the table name, and each value is an untyped table handle.
+ * 
+ * For example, a database with tables "user_profile" and "game_stats" would have the type:
+ * {
+ *   userProfile: TableHandle<"user_profile", any>;
+ *   gameStats: TableHandle<"game_stats", any>;
+ * }
+ */
+export type UntypedDbView = DbView<UntypedSchemaDef>;
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/event.ts b/crates/bindings-typescript/src/sdk/event.ts
index 8be677e47ab..98254af3ca5 100644
--- a/crates/bindings-typescript/src/sdk/event.ts
+++ b/crates/bindings-typescript/src/sdk/event.ts
@@ -1,6 +1,7 @@
-import type { ReducerEvent, ReducerInfoType } from './reducer_event';
+import type { ReducerEvent } from './reducer_event';
+import type { UntypedReducerDef } from './reducers';
 
-export type Event<Reducer extends ReducerInfoType> =
+export type Event<Reducer extends UntypedReducerDef> =
   | { tag: 'Reducer'; value: ReducerEvent<Reducer> }
   | { tag: 'SubscribeApplied' }
   | { tag: 'UnsubscribeApplied' }
diff --git a/crates/bindings-typescript/src/sdk/event_context.ts b/crates/bindings-typescript/src/sdk/event_context.ts
index 2ed7112d431..459cfbfeaf0 100644
--- a/crates/bindings-typescript/src/sdk/event_context.ts
+++ b/crates/bindings-typescript/src/sdk/event_context.ts
@@ -1,41 +1,39 @@
+import type { UntypedSchemaDef } from '../server/schema.ts';
 import type { DbContext } from './db_context';
 import type { Event } from './event.ts';
-import type { ReducerEvent, ReducerInfoType } from './reducer_event.ts';
+import type { ReducerEvent } from './reducer_event.ts';
+import type { UntypedReducersDef } from './reducers.ts';
+
+export type UntypedEventContext = EventContextInterface<UntypedSchemaDef, UntypedReducersDef>;
 
 export interface EventContextInterface<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
-  Reducer extends ReducerInfoType = never,
-> extends DbContext<DBView, Reducers, SetReducerFlags> {
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+> extends DbContext<SchemaDef, Reducers> {
   /** Enum with variants for all possible events. */
-  event: Event<Reducer>;
+  event: Event<Reducers['reducers'][number]>;
 }
 
 export interface ReducerEventContextInterface<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
-  Reducer extends ReducerInfoType = never,
-> extends DbContext<DBView, Reducers, SetReducerFlags> {
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+> extends DbContext<SchemaDef, Reducers> {
   /** Enum with variants for all possible events. */
-  event: ReducerEvent<Reducer>;
+  event: ReducerEvent<Reducers['reducers'][number]>;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface SubscriptionEventContextInterface<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
-> extends DbContext<DBView, Reducers, SetReducerFlags> {
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+> extends DbContext<SchemaDef, Reducers> {
   /** No event is provided **/
 }
 
 export interface ErrorContextInterface<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
-> extends DbContext<DBView, Reducers, SetReducerFlags> {
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+> extends DbContext<SchemaDef, Reducers> {
   /** Enum with variants for all possible events. */
   event?: Error;
 }
diff --git a/crates/bindings-typescript/src/sdk/index.ts b/crates/bindings-typescript/src/sdk/index.ts
index 814bc67a54e..568e04bd5b5 100644
--- a/crates/bindings-typescript/src/sdk/index.ts
+++ b/crates/bindings-typescript/src/sdk/index.ts
@@ -2,4 +2,6 @@
 export * from './db_connection_impl.ts';
 export * from './client_cache.ts';
 export * from './message_types.ts';
-export { type TableHandle } from './table_handle.ts';
+export { type ClientTable } from './table_handle.ts';
+export { type RemoteModule } from './spacetime_module.ts';
+export { type SetReducerFlags } from './reducers.ts';
diff --git a/crates/bindings-typescript/src/sdk/reducer_event.ts b/crates/bindings-typescript/src/sdk/reducer_event.ts
index aaebd27fabb..1ffe5c79177 100644
--- a/crates/bindings-typescript/src/sdk/reducer_event.ts
+++ b/crates/bindings-typescript/src/sdk/reducer_event.ts
@@ -2,10 +2,9 @@ import { ConnectionId } from '../';
 import { Timestamp } from '../';
 import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
+import type { UntypedReducerDef } from './reducers.ts';
 
-export type ReducerInfoType = { name: string; args?: any } | never;
-
-export type ReducerEvent<Reducer extends ReducerInfoType> = {
+export type ReducerEvent<Reducer extends UntypedReducerDef> = {
   /**
    * The time when the reducer started running.
    *
diff --git a/crates/bindings-typescript/src/sdk/reducer_handle.ts b/crates/bindings-typescript/src/sdk/reducer_handle.ts
new file mode 100644
index 00000000000..a4e76eda4a4
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/reducer_handle.ts
@@ -0,0 +1,12 @@
+export type ReducerHandle<ReducerName extends string> = {
+  /** Phantom reducer name */
+  readonly reducerName?: ReducerName;
+};
+
+export type ReducerNamesFromReducers<R> = R extends object 
+  ? {
+      [K in keyof R]: R[K] extends ReducerHandle<infer ReducerName>
+        ? ReducerName 
+        : never;
+    }[keyof R]
+  : never;
diff --git a/crates/bindings-typescript/src/sdk/reducers.ts b/crates/bindings-typescript/src/sdk/reducers.ts
new file mode 100644
index 00000000000..e25b805c97f
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/reducers.ts
@@ -0,0 +1,25 @@
+import type { ProductType } from "../lib/algebraic_type";
+import type { ParamsObj } from "../server/reducers";
+import type { CamelCase } from "../server/type_util";
+import type { CallReducerFlags } from "./db_connection_impl";
+
+export type ReducersView<R extends UntypedReducersDef> = {
+  [I in keyof R['reducers'] as CamelCase<R['reducers'][number]['name']>]:
+    (params: R['reducers'][number]['params']) => void
+};
+
+export type UntypedReducers = Record<string, (...args: any[]) => void>;
+
+export type UntypedReducerDef = {
+  name: string;
+  params: ParamsObj;
+  paramsSpacetimeType: ProductType;
+};
+
+export type UntypedReducersDef = {
+  reducers: readonly UntypedReducerDef[];
+};
+
+export type SetReducerFlags<R extends UntypedReducersDef> = {
+  [K in keyof R['reducers'] as CamelCase<R['reducers'][number]['name']>]: (flags: CallReducerFlags) => void;
+};
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/set_reducer_flags.ts b/crates/bindings-typescript/src/sdk/set_reducer_flags.ts
new file mode 100644
index 00000000000..a5648b67d36
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/set_reducer_flags.ts
@@ -0,0 +1,3 @@
+import type { CallReducerFlags } from "./db_connection_impl";
+
+export type UntypedSetReducerFlags = Record<string, (flags: CallReducerFlags) => void>;
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/spacetime_module.ts b/crates/bindings-typescript/src/sdk/spacetime_module.ts
index 4a76006f93f..72ad623703e 100644
--- a/crates/bindings-typescript/src/sdk/spacetime_module.ts
+++ b/crates/bindings-typescript/src/sdk/spacetime_module.ts
@@ -1,9 +1,12 @@
 import type { AlgebraicType } from '../';
+import type { UntypedSchemaDef } from '../server/schema';
 import type { DbConnectionImpl } from './db_connection_impl';
+import type { UntypedReducersDef } from './reducers';
 
 export interface TableRuntimeTypeInfo {
   tableName: string;
   rowType: AlgebraicType;
+  primaryKey?: string;
   primaryKeyInfo?: PrimaryKeyInfo;
 }
 
@@ -17,13 +20,21 @@ export interface ReducerRuntimeTypeInfo {
   argsType: AlgebraicType;
 }
 
-export default interface RemoteModule {
+export type RemoteModule2<SchemaDef extends UntypedSchemaDef, ReducersDef extends UntypedReducersDef, CLI extends string = string> = {
+  versionInfo: {
+    cliVersion: CLI;
+  };
+  tables: SchemaDef;
+  reducers: ReducersDef;
+}
+
+export interface RemoteModule<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
   tables: { [name: string]: TableRuntimeTypeInfo };
   reducers: { [name: string]: ReducerRuntimeTypeInfo };
-  eventContextConstructor: (imp: DbConnectionImpl, event: any) => any;
-  dbViewConstructor: (connection: DbConnectionImpl) => any;
+  eventContextConstructor: (imp: DbConnectionImpl<SchemaDef, Reducers>, event: any) => any;
+  dbViewConstructor: (connection: DbConnectionImpl<SchemaDef, Reducers>) => any;
   reducersConstructor: (
-    connection: DbConnectionImpl,
+    connection: DbConnectionImpl<SchemaDef, Reducers>,
     setReducerFlags: any
   ) => any;
   setReducerFlagsConstructor: () => any;
diff --git a/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts b/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
index 5fffd581237..a0856367b7b 100644
--- a/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
+++ b/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
@@ -1,23 +1,24 @@
+import type { UntypedSchemaDef } from '../server/schema';
 import type { DbConnectionImpl } from './db_connection_impl';
 import type {
   ErrorContextInterface,
   SubscriptionEventContextInterface,
 } from './event_context';
 import { EventEmitter } from './event_emitter';
+import type { UntypedReducersDef } from './reducers';
 
 export class SubscriptionBuilderImpl<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
 > {
   #onApplied?: (
-    ctx: SubscriptionEventContextInterface<DBView, Reducers, SetReducerFlags>
+    ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
   ) => void = undefined;
   #onError?: (
-    ctx: ErrorContextInterface<DBView, Reducers, SetReducerFlags>
+    ctx: ErrorContextInterface<SchemaDef, Reducers>
   ) => void = undefined;
   constructor(
-    private db: DbConnectionImpl<DBView, Reducers, SetReducerFlags>
+    private db: DbConnectionImpl<SchemaDef, Reducers>
   ) {}
 
   /**
@@ -37,9 +38,9 @@ export class SubscriptionBuilderImpl<
    */
   onApplied(
     cb: (
-      ctx: SubscriptionEventContextInterface<DBView, Reducers, SetReducerFlags>
+      ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
     ) => void
-  ): SubscriptionBuilderImpl<DBView, Reducers, SetReducerFlags> {
+  ): SubscriptionBuilderImpl<SchemaDef, Reducers> {
     this.#onApplied = cb;
     return this;
   }
@@ -65,8 +66,8 @@ export class SubscriptionBuilderImpl<
    * @returns The current `SubscriptionBuilder` instance.
    */
   onError(
-    cb: (ctx: ErrorContextInterface<DBView, Reducers, SetReducerFlags>) => void
-  ): SubscriptionBuilderImpl<DBView, Reducers, SetReducerFlags> {
+    cb: (ctx: ErrorContextInterface<SchemaDef, Reducers>) => void
+  ): SubscriptionBuilderImpl<SchemaDef, Reducers> {
     this.#onError = cb;
     return this;
   }
@@ -89,7 +90,7 @@ export class SubscriptionBuilderImpl<
    */
   subscribe(
     query_sql: string | string[]
-  ): SubscriptionHandleImpl<DBView, Reducers, SetReducerFlags> {
+  ): SubscriptionHandleImpl<SchemaDef, Reducers> {
     const queries = Array.isArray(query_sql) ? query_sql : [query_sql];
     if (queries.length === 0) {
       throw new Error('Subscriptions must have at least one query');
@@ -126,17 +127,16 @@ export class SubscriptionBuilderImpl<
 
 export type SubscribeEvent = 'applied' | 'error' | 'end';
 
-export class SubscriptionManager {
+export class SubscriptionManager<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
   subscriptions: Map<
     number,
-    { handle: SubscriptionHandleImpl; emitter: EventEmitter<SubscribeEvent> }
+    { handle: SubscriptionHandleImpl<SchemaDef, Reducers>; emitter: EventEmitter<SubscribeEvent> }
   > = new Map();
 }
 
 export class SubscriptionHandleImpl<
-  DBView = any,
-  Reducers = any,
-  SetReducerFlags = any,
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
 > {
   #queryId: number;
   #unsubscribeCalled: boolean = false;
@@ -146,13 +146,13 @@ export class SubscriptionHandleImpl<
     new EventEmitter();
 
   constructor(
-    private db: DbConnectionImpl<DBView, Reducers, SetReducerFlags>,
+    private db: DbConnectionImpl<SchemaDef, Reducers>,
     querySql: string[],
     onApplied?: (
-      ctx: SubscriptionEventContextInterface<DBView, Reducers, SetReducerFlags>
+      ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
     ) => void,
     onError?: (
-      ctx: ErrorContextInterface<DBView, Reducers, SetReducerFlags>,
+      ctx: ErrorContextInterface<SchemaDef, Reducers>,
       error: Error
     ) => void
   ) {
@@ -160,9 +160,8 @@ export class SubscriptionHandleImpl<
       'applied',
       (
         ctx: SubscriptionEventContextInterface<
-          DBView,
-          Reducers,
-          SetReducerFlags
+          SchemaDef,
+          Reducers
         >
       ) => {
         this.#activeState = true;
@@ -174,7 +173,7 @@ export class SubscriptionHandleImpl<
     this.#emitter.on(
       'error',
       (
-        ctx: ErrorContextInterface<DBView, Reducers, SetReducerFlags>,
+        ctx: ErrorContextInterface<SchemaDef, Reducers>,
         error: Error
       ) => {
         this.#activeState = false;
@@ -202,9 +201,8 @@ export class SubscriptionHandleImpl<
       'end',
       (
         _ctx: SubscriptionEventContextInterface<
-          DBView,
-          Reducers,
-          SetReducerFlags
+          SchemaDef,
+          Reducers
         >
       ) => {
         this.#endedState = true;
@@ -225,7 +223,7 @@ export class SubscriptionHandleImpl<
    */
   unsubscribeThen(
     onEnd: (
-      ctx: SubscriptionEventContextInterface<DBView, Reducers, SetReducerFlags>
+      ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
     ) => void
   ): void {
     if (this.#endedState) {
@@ -240,9 +238,8 @@ export class SubscriptionHandleImpl<
       'end',
       (
         ctx: SubscriptionEventContextInterface<
-          DBView,
-          Reducers,
-          SetReducerFlags
+          SchemaDef,
+          Reducers
         >
       ) => {
         this.#endedState = true;
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index dc9fce02431..cd79debf72e 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -3,7 +3,11 @@ import type { TableRuntimeTypeInfo } from './spacetime_module.ts';
 
 import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
-import type { EventContextInterface } from './index.ts';
+import type { EventContextInterface, ClientTable } from './index.ts';
+import type { RowType, Table, UntypedTableDef } from '../server/table.ts';
+import type { UntypedSchemaDef } from '../server/schema.ts';
+import type { UntypedReducersDef } from './reducers.ts';
+import type { ClientTableCore } from './table_handle.ts';
 
 export type Operation<
   RowType extends Record<string, any> = Record<string, any>,
@@ -16,10 +20,10 @@ export type Operation<
 };
 
 export type TableUpdate<
-  RowType extends Record<string, any> = Record<string, any>,
+  TableDef extends UntypedTableDef,
 > = {
   tableName: string;
-  operations: Operation<RowType>[];
+  operations: Operation<RowType<TableDef>>[];
 };
 
 export type PendingCallback = {
@@ -31,10 +35,12 @@ export type PendingCallback = {
  * Builder to generate calls to query a `table` in the database
  */
 export class TableCache<
-  RowType extends Record<string, any> = Record<string, any>,
-> {
-  private rows: Map<ComparablePrimitive, [RowType, number]>;
-  private tableTypeInfo: TableRuntimeTypeInfo;
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+  TableDef extends UntypedTableDef,
+> implements ClientTableCore<SchemaDef, Reducers, TableDef> {
+  private rows: Map<ComparablePrimitive, [RowType<TableDef>, number]>;
+  private tableDef: TableDef;
   private emitter: EventEmitter<'insert' | 'delete' | 'update'>;
 
   /**
@@ -43,8 +49,8 @@ export class TableCache<
    * @param primaryKey column name designated as `#[primarykey]`
    * @param entityClass the entityClass
    */
-  constructor(tableTypeInfo: TableRuntimeTypeInfo) {
-    this.tableTypeInfo = tableTypeInfo;
+  constructor(tableDef: TableDef) {
+    this.tableDef = tableDef;
     this.rows = new Map();
     this.emitter = new EventEmitter();
   }
@@ -52,30 +58,45 @@ export class TableCache<
   /**
    * @returns number of rows in the table
    */
-  count(): number {
-    return this.rows.size;
+  count(): bigint {
+    return BigInt(this.rows.size);
   }
 
   /**
    * @returns The values of the rows in the table
    */
-  iter(): RowType[] {
-    return Array.from(this.rows.values()).map(([row]) => row);
+  iter(): IterableIterator<RowType<TableDef>> {
+    function* generator(rows: Map<ComparablePrimitive, [RowType<TableDef>, number]>): IterableIterator<RowType<TableDef>> {
+      for (const [row] of rows.values()) {
+        yield row;
+      }
+    }
+    return generator(this.rows);
+  }
+
+  /**
+   * Allows iteration over the rows in the table 
+   * @returns An iterator over the rows in the table
+   */
+  [Symbol.iterator](): IterableIterator<RowType<TableDef>> {
+    return this.iter();
   }
 
   applyOperations = (
-    operations: Operation<RowType>[],
-    ctx: EventContextInterface
+    operations: Operation<RowType<TableDef>>[],
+    ctx: EventContextInterface<SchemaDef, Reducers>
   ): PendingCallback[] => {
     const pendingCallbacks: PendingCallback[] = [];
-    if (this.tableTypeInfo.primaryKeyInfo !== undefined) {
+    // TODO: performance
+    const hasPrimaryKey = Object.values(this.tableDef.columns).some(col => col.columnMetadata.isPrimaryKey === true); 
+    if (hasPrimaryKey) {
       const insertMap = new Map<
         ComparablePrimitive,
-        [Operation<RowType>, number]
+        [Operation<RowType<TableDef>>, number]
       >();
       const deleteMap = new Map<
         ComparablePrimitive,
-        [Operation<RowType>, number]
+        [Operation<RowType<TableDef>>, number]
       >();
       for (const op of operations) {
         if (op.type === 'insert') {
@@ -136,9 +157,9 @@ export class TableCache<
   };
 
   update = (
-    ctx: EventContextInterface,
+    ctx: EventContextInterface<SchemaDef, Reducers>,
     rowId: ComparablePrimitive,
-    newRow: RowType,
+    newRow: RowType<TableDef>,
     refCountDelta: number = 0
   ): PendingCallback | undefined => {
     const existingEntry = this.rows.get(rowId);
@@ -146,7 +167,7 @@ export class TableCache<
       // TODO: this should throw an error and kill the connection.
       stdbLogger(
         'error',
-        `Updating a row that was not present in the cache. Table: ${this.tableTypeInfo.tableName}, RowId: ${rowId}`
+        `Updating a row that was not present in the cache. Table: ${this.tableDef.name}, RowId: ${rowId}`
       );
       return undefined;
     }
@@ -155,7 +176,7 @@ export class TableCache<
     if (previousCount + refCountDelta <= 0) {
       stdbLogger(
         'error',
-        `Negative reference count for in table ${this.tableTypeInfo.tableName} row ${rowId} (${previousCount} + ${refCountDelta})`
+        `Negative reference count for in table ${this.tableDef.name} row ${rowId} (${previousCount} + ${refCountDelta})`
       );
       return undefined;
     }
@@ -164,11 +185,11 @@ export class TableCache<
     if (previousCount === 0) {
       stdbLogger(
         'error',
-        `Updating a row id in table ${this.tableTypeInfo.tableName} which was not present in the cache (rowId: ${rowId})`
+        `Updating a row id in table ${this.tableDef.name} which was not present in the cache (rowId: ${rowId})`
       );
       return {
         type: 'insert',
-        table: this.tableTypeInfo.tableName,
+        table: this.tableDef.name,
         cb: () => {
           this.emitter.emit('insert', ctx, newRow);
         },
@@ -176,7 +197,7 @@ export class TableCache<
     }
     return {
       type: 'update',
-      table: this.tableTypeInfo.tableName,
+      table: this.tableDef.name,
       cb: () => {
         this.emitter.emit('update', ctx, oldRow, newRow);
       },
@@ -184,8 +205,8 @@ export class TableCache<
   };
 
   insert = (
-    ctx: EventContextInterface,
-    operation: Operation<RowType>,
+    ctx: EventContextInterface<SchemaDef, Reducers>,
+    operation: Operation<RowType<TableDef>>,
     count: number = 1
   ): PendingCallback | undefined => {
     const [_, previousCount] = this.rows.get(operation.rowId) || [
@@ -196,7 +217,7 @@ export class TableCache<
     if (previousCount === 0) {
       return {
         type: 'insert',
-        table: this.tableTypeInfo.tableName,
+        table: this.tableDef.name,
         cb: () => {
           this.emitter.emit('insert', ctx, operation.row);
         },
@@ -207,8 +228,8 @@ export class TableCache<
   };
 
   delete = (
-    ctx: EventContextInterface,
-    operation: Operation<RowType>,
+    ctx: EventContextInterface<SchemaDef, Reducers>,
+    operation: Operation<RowType<TableDef>>,
     count: number = 1
   ): PendingCallback | undefined => {
     const [_, previousCount] = this.rows.get(operation.rowId) || [
@@ -226,7 +247,7 @@ export class TableCache<
       this.rows.delete(operation.rowId);
       return {
         type: 'delete',
-        table: this.tableTypeInfo.tableName,
+        table: this.tableDef.name,
         cb: () => {
           this.emitter.emit('delete', ctx, operation.row);
         },
@@ -240,7 +261,7 @@ export class TableCache<
    * Register a callback for when a row is newly inserted into the database.
    *
    * ```ts
-   * User.onInsert((user, reducerEvent) => {
+   * ctx.db.user.onInsert((reducerEvent, user) => {
    *   if (reducerEvent) {
    *      console.log("New user on reducer", reducerEvent, user);
    *   } else {
@@ -251,8 +272,8 @@ export class TableCache<
    *
    * @param cb Callback to be called when a new row is inserted
    */
-  onInsert = <EventContext>(
-    cb: (ctx: EventContext, row: RowType) => void
+  onInsert = (
+    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.on('insert', cb);
   };
@@ -261,7 +282,7 @@ export class TableCache<
    * Register a callback for when a row is deleted from the database.
    *
    * ```ts
-   * User.onDelete((user, reducerEvent) => {
+   * ctx.db.user.onDelete((reducerEvent, user) => {
    *   if (reducerEvent) {
    *      console.log("Deleted user on reducer", reducerEvent, user);
    *   } else {
@@ -272,8 +293,8 @@ export class TableCache<
    *
    * @param cb Callback to be called when a new row is inserted
    */
-  onDelete = <EventContext>(
-    cb: (ctx: EventContext, row: RowType) => void
+  onDelete = (
+    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.on('delete', cb);
   };
@@ -282,7 +303,7 @@ export class TableCache<
    * Register a callback for when a row is updated into the database.
    *
    * ```ts
-   * User.onInsert((user, reducerEvent) => {
+   * ctx.db.user.onInsert((reducerEvent, oldUser, user) => {
    *   if (reducerEvent) {
    *      console.log("Updated user on reducer", reducerEvent, user);
    *   } else {
@@ -293,8 +314,8 @@ export class TableCache<
    *
    * @param cb Callback to be called when a new row is inserted
    */
-  onUpdate = <EventContext>(
-    cb: (ctx: EventContext, oldRow: RowType, row: RowType) => void
+  onUpdate = (
+    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.on('update', cb);
   };
@@ -304,8 +325,8 @@ export class TableCache<
    *
    * @param cb Callback to be removed
    */
-  removeOnInsert = <EventContext>(
-    cb: (ctx: EventContext, row: RowType) => void
+  removeOnInsert = (
+    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.off('insert', cb);
   };
@@ -315,8 +336,8 @@ export class TableCache<
    *
    * @param cb Callback to be removed
    */
-  removeOnDelete = <EventContext>(
-    cb: (ctx: EventContext, row: RowType) => void
+  removeOnDelete = (
+    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.off('delete', cb);
   };
@@ -326,8 +347,8 @@ export class TableCache<
    *
    * @param cb Callback to be removed
    */
-  removeOnUpdate = <EventContext>(
-    cb: (ctx: EventContext, oldRow: RowType, row: RowType) => void
+  removeOnUpdate = (
+    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.off('update', cb);
   };
diff --git a/crates/bindings-typescript/src/sdk/table_handle.ts b/crates/bindings-typescript/src/sdk/table_handle.ts
index a648be11325..757caae4e80 100644
--- a/crates/bindings-typescript/src/sdk/table_handle.ts
+++ b/crates/bindings-typescript/src/sdk/table_handle.ts
@@ -1,12 +1,72 @@
-export type TableHandle<TableName extends string> = {
-  /** Phantom table name */
-  readonly tableName?: TableName;
+import type { ReadonlyIndexes } from "../server/indexes";
+import type { UntypedSchemaDef } from "../server/schema";
+import type { ReadonlyTableMethods, RowType, TableIndexes, UntypedTableDef } from "../server/table";
+import type { Prettify } from "../server/type_util";
+import type { EventContextInterface } from "./event_context";
+import type { UntypedReducersDef } from "./reducers";
+
+export type ClientTableMethods<
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+  TableDef extends UntypedTableDef,
+> = {
+  /**
+   * Registers a callback to be invoked when a row is inserted into the table.
+   */
+  onInsert(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+
+  /**
+   *  Removes a previously registered insert event listener. 
+   * @param cb The callback to remove from the insert event listeners.
+   */
+  removeOnInsert(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+
+  /**
+   * Registers a callback to be invoked when a row is deleted from the table.
+   */
+  onDelete(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+
+  /**
+   * Removes a previously registered delete event listener.
+   * @param cb The callback to remove from the delete event listeners.
+   */
+  removeOnDelete(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
 };
 
-export type TableNamesFromDb<Db> = Db extends object
-  ? {
-      [K in keyof Db]: Db[K] extends TableHandle<infer TableName>
-        ? TableName
-        : never;
-    }[keyof Db]
-  : never;
+/**
+ * Table<Row, UniqueConstraintViolation = never, AutoIncOverflow = never>
+ *
+ * - Row: row shape
+ * - UCV: unique-constraint violation error type (never if none)
+ * - AIO: auto-increment overflow error type (never if none)
+ */
+export type ClientTable<
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+  TableDef extends UntypedTableDef
+> = Prettify<
+  ClientTableCore<SchemaDef, Reducers, TableDef> &
+  ReadonlyIndexes<TableDef, TableIndexes<TableDef>>
+>;
+
+/**
+ * Core methods of ClientTable, without the indexes mixed in.
+ * Includes only staticly known methods.
+ */
+export type ClientTableCore<
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+  TableDef extends UntypedTableDef,
+> =
+  ReadonlyTableMethods<TableDef> &
+  ClientTableMethods<SchemaDef, Reducers, TableDef>;
+
+/**
+ * Client database view, mapping table names to their corresponding ClientTable handles.
+ */
+export type ClientDbView<
+  SchemaDef extends UntypedSchemaDef,
+  Reducers extends UntypedReducersDef,
+> = {
+  readonly [Tbl in SchemaDef['tables'][number] as Tbl['name']]: ClientTable<SchemaDef, Reducers, Tbl>;
+};
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/server/db_view.ts b/crates/bindings-typescript/src/server/db_view.ts
new file mode 100644
index 00000000000..3ba53c0da55
--- /dev/null
+++ b/crates/bindings-typescript/src/server/db_view.ts
@@ -0,0 +1,25 @@
+import type { ClientTable } from "../sdk";
+import type { UntypedReducersDef } from "../sdk/reducers";
+import type { UntypedSchemaDef } from "./schema";
+import type { ReadonlyTable, Table } from "./table";
+
+/**
+ * A type representing a read-only database view, mapping table names to their corresponding read-only Table handles.
+ */
+export type ReadonlyDbView<SchemaDef extends UntypedSchemaDef> = {
+  readonly [Tbl in SchemaDef['tables'][number] as Tbl['accessorName']]: ReadonlyTable<Tbl>;
+};
+
+/**
+ * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
+ */
+export type ClientDbView<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> = {
+  readonly [Tbl in SchemaDef['tables'][number] as Tbl['accessorName']]: ClientTable<SchemaDef, Reducers, Tbl>;
+};
+
+/**
+ * A type representing the database view, mapping table names to their corresponding Table handles.
+ */
+export type DbView<SchemaDef extends UntypedSchemaDef> = {
+  readonly [Tbl in SchemaDef['tables'][number] as Tbl['accessorName']]: Table<Tbl>;
+};
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/server/index.ts b/crates/bindings-typescript/src/server/index.ts
index c602d704184..6db590d7d07 100644
--- a/crates/bindings-typescript/src/server/index.ts
+++ b/crates/bindings-typescript/src/server/index.ts
@@ -1,9 +1,11 @@
 export * from './type_builders';
 export { schema, type InferSchema } from './schema';
 export { table } from './table';
+export { reducers } from './reducers';
 export * as errors from './errors';
 export { SenderError } from './errors';
 export { type Reducer, type ReducerCtx } from './reducers';
+export { type DbView } from './db_view';
 
 import './polyfills'; // Ensure polyfills are loaded
 import './register_hooks'; // Ensure module hooks are registered
diff --git a/crates/bindings-typescript/src/server/indexes.ts b/crates/bindings-typescript/src/server/indexes.ts
index 7af552012f6..f85bd92cbe2 100644
--- a/crates/bindings-typescript/src/server/indexes.ts
+++ b/crates/bindings-typescript/src/server/indexes.ts
@@ -56,6 +56,37 @@ export type Index<
   ? UniqueIndex<TableDef, I>
   : RangedIndex<TableDef, I>;
 
+/**
+ * A type representing a collection of read-only indexes defined on a table.
+ */
+export type ReadonlyIndexes<
+  TableDef extends UntypedTableDef,
+  I extends Record<string, UntypedIndex<keyof TableDef['columns'] & string>>,
+> = {
+  [k in keyof I]: ReadonlyIndex<TableDef, I[k]>;
+};
+
+/**
+ * A type representing a read-only database index, which can be either unique or ranged.
+ * This type only exposes read-only operations.
+ */
+export type ReadonlyIndex<
+  TableDef extends UntypedTableDef,
+  I extends UntypedIndex<keyof TableDef['columns'] & string>,
+> = I['unique'] extends true
+  ? ReadonlyUniqueIndex<TableDef, I>
+  : ReadonlyRangedIndex<TableDef, I>;
+
+/**
+ * A type representing a read-only unique index on a database table.
+ */
+export type ReadonlyUniqueIndex<
+  TableDef extends UntypedTableDef,
+  I extends UntypedIndex<keyof TableDef['columns'] & string>,
+> = {
+  find(colVal: IndexVal<TableDef, I>): RowType<TableDef> | null;
+};
+
 /**
  * A type representing a unique index on a database table.
  * Unique indexes enforce that the indexed columns contain unique values.
@@ -63,23 +94,31 @@ export type Index<
 export type UniqueIndex<
   TableDef extends UntypedTableDef,
   I extends UntypedIndex<keyof TableDef['columns'] & string>,
-> = {
-  find(col_val: IndexVal<TableDef, I>): RowType<TableDef> | null;
-  delete(col_val: IndexVal<TableDef, I>): boolean;
-  update(col_val: RowType<TableDef>): RowType<TableDef>;
+> = ReadonlyUniqueIndex<TableDef, I> & {
+  delete(colVal: IndexVal<TableDef, I>): boolean;
+  update(colVal: RowType<TableDef>): RowType<TableDef>;
 };
 
 /**
- * A type representing a ranged index on a database table.
- * Ranged indexes allow for range queries on the indexed columns.
+ * A type representing a read-only ranged index on a database table. 
  */
-export type RangedIndex<
+export type ReadonlyRangedIndex<
   TableDef extends UntypedTableDef,
   I extends UntypedIndex<keyof TableDef['columns'] & string>,
 > = {
   filter(
     range: IndexScanRangeBounds<TableDef, I>
   ): IterableIterator<RowType<TableDef>>;
+};
+
+/**
+ * A type representing a ranged index on a database table.
+ * Ranged indexes allow for range queries on the indexed columns.
+ */
+export type RangedIndex<
+  TableDef extends UntypedTableDef,
+  I extends UntypedIndex<keyof TableDef['columns'] & string>,
+> = ReadonlyRangedIndex<TableDef, I> & {
   delete(range: IndexScanRangeBounds<TableDef, I>): number;
 };
 
diff --git a/crates/bindings-typescript/src/server/reducers.ts b/crates/bindings-typescript/src/server/reducers.ts
index 0735cc004c1..55233d5a5b1 100644
--- a/crates/bindings-typescript/src/server/reducers.ts
+++ b/crates/bindings-typescript/src/server/reducers.ts
@@ -4,12 +4,14 @@ import type RawReducerDefV9 from '../lib/autogen/raw_reducer_def_v_9_type';
 import type { ConnectionId } from '../lib/connection_id';
 import type { Identity } from '../lib/identity';
 import type { Timestamp } from '../lib/timestamp';
+import type { UntypedReducersDef } from '../sdk/reducers';
+import type { DbView } from './db_view';
 import { MODULE_DEF, type UntypedSchemaDef } from './schema';
-import type { Table } from './table';
 import type {
   InferTypeOfRow,
   RowBuilder,
   RowObj,
+  StringBuilder,
   TypeBuilder,
 } from './type_builders';
 
@@ -58,13 +60,6 @@ export type Reducer<
   payload: ParamsAsObject<Params>
 ) => void | { tag: 'ok' } | { tag: 'err'; value: string };
 
-/**
- * A type representing the database view, mapping table names to their corresponding Table handles.
- */
-export type DbView<SchemaDef extends UntypedSchemaDef> = {
-  readonly [Tbl in SchemaDef['tables'][number] as Tbl['name']]: Table<Tbl>;
-};
-
 /**
  * Authentication information for the caller of a reducer.
  */
@@ -133,8 +128,9 @@ export function pushReducer(
   fn: Reducer<any, any>,
   lifecycle?: RawReducerDefV9['lifecycle']
 ): void {
-  if (existingReducers.has(name))
+  if (existingReducers.has(name)) {
     throw new TypeError(`There is already a reducer with the name '${name}'`);
+  }
   existingReducers.add(name);
 
   const paramType: ProductType = {
@@ -263,3 +259,111 @@ export function clientDisconnected<
 >(name: string, params: Params, fn: Reducer<S, Params>): void {
   pushReducer(name, params, fn, Lifecycle.OnDisconnect);
 }
+
+/**
+ * Represents a handle to a database reducer, including its name and argument type.
+ */
+export type ReducerSchema<
+  ReducerName extends string,
+  Params extends ParamsObj,
+> = {
+  /**
+   * The name of the reducer.
+   */
+  readonly reducerName: ReducerName;
+
+  /**
+   * The type of the parameters object expected by the reducer.
+   */
+  readonly paramsType: Params;
+
+  /**
+   * 
+   */
+  readonly paramsSpacetimeType: ProductType;
+
+  /**
+   * The {@link RawReducerDefV9} of the configured reducer.
+   */
+  readonly reducerDef: RawReducerDefV9;
+};
+
+class Reducers<ReducersDef extends UntypedReducersDef> {
+  /**
+   * Phantom type to track the reducers definition 
+   */
+  reducersType!: ReducersDef;
+}
+
+/**
+ * Helper type to convert an array of TableSchema into a schema definition
+ */
+type ReducersToSchema<T extends readonly ReducerSchema<any, any>[]> = {
+  reducers: {
+    /** @type {UntypedReducerDef} */
+    readonly [i in keyof T]: {
+      name: T[i]['reducerName'];
+      params: T[i]['paramsType'];
+      paramsSpacetimeType: T[i]['paramsSpacetimeType'];
+    };
+  };
+};
+
+/**
+ * Creates a schema from table definitions
+ * @param handles - Array of table handles created by table() function
+ * @returns ColumnBuilder representing the complete database schema
+ * @example
+ * ```ts
+ * const s = schema(
+ *   table({ name: 'user' }, userType),
+ *   table({ name: 'post' }, postType)
+ * );
+ * ```
+ */
+export function reducers<const H extends readonly ReducerSchema<any, any>[]>(
+  ...handles: H
+): Reducers<ReducersToSchema<H>>;
+
+/**
+ * Creates a schema from table definitions (array overload)
+ * @param handles - Array of table handles created by table() function
+ * @returns ColumnBuilder representing the complete database schema
+ */
+export function reducers<const H extends readonly ReducerSchema<any, any>[]>(
+  handles: H
+): Reducers<ReducersToSchema<H>>;
+
+export function reducers(
+  ...args:
+    | [readonly ReducerSchema<any, any>[]]
+    | readonly ReducerSchema<any, any>[]
+): Reducers<UntypedReducersDef> {
+  return new Reducers();
+}
+
+export function reducerSchema<
+  ReducerName extends string,
+  Params extends ParamsObj,
+>(
+  name: ReducerName,
+  params: Params
+): ReducerSchema<ReducerName, Params> {
+  const paramType: ProductType = {
+    elements: Object.entries(params).map(([n, c]) => ({
+      name: n,
+      algebraicType: c.algebraicType,
+    })),
+  };
+  return {
+    reducerName: name,
+    paramsType: params,
+    paramsSpacetimeType: paramType,
+    reducerDef: {
+      name,
+      params: paramType,
+      lifecycle: undefined,
+    },
+  };
+} 
+
diff --git a/crates/bindings-typescript/src/server/runtime.ts b/crates/bindings-typescript/src/server/runtime.ts
index e9d1ecff775..74533661373 100644
--- a/crates/bindings-typescript/src/server/runtime.ts
+++ b/crates/bindings-typescript/src/server/runtime.ts
@@ -18,7 +18,6 @@ import {
 } from './indexes';
 import { type RowType, type Table, type TableMethods } from './table';
 import {
-  type DbView,
   type ReducerCtx,
   REDUCERS,
   type JwtClaims,
@@ -29,9 +28,20 @@ import { MODULE_DEF } from './schema';
 
 import * as _syscalls from 'spacetime:sys@1.0';
 import type { u16, u32, ModuleHooks } from 'spacetime:sys@1.0';
+import type { DbView } from './db_view';
+import type { CamelCase } from './type_util';
 
 const { freeze } = Object;
 
+/**
+ * Type safe conversion from a string like "some_identifier-name" to "someIdentifierName".
+ * @param str The string to convert
+ * @returns The converted string
+ */
+export function toCamelCase<T extends string>(str: T): CamelCase<T> {
+  return str.replace(/[-_]+(\w)/g, (_, c) => c.toUpperCase()) as CamelCase<T>;
+}
+
 const sys: typeof _syscalls = freeze(
   Object.fromEntries(
     Object.entries(_syscalls).map(([name, syscall]) => [
@@ -218,12 +228,12 @@ function getDbView() {
   return DB_VIEW;
 }
 
-function makeDbView(module_def: RawModuleDefV9): DbView<any> {
+function makeDbView(moduleDef: RawModuleDefV9): DbView<any> {
   return freeze(
     Object.fromEntries(
-      module_def.tables.map(table => [
-        table.name,
-        makeTableView(module_def.typespace, table),
+      moduleDef.tables.map(table => [
+        toCamelCase(table.name),
+        makeTableView(moduleDef.typespace, table),
       ])
     )
   );
@@ -232,7 +242,9 @@ function makeDbView(module_def: RawModuleDefV9): DbView<any> {
 function makeTableView(typespace: Typespace, table: RawTableDefV9): Table<any> {
   const table_id = sys.table_id_from_name(table.name);
   const rowType = typespace.types[table.productTypeRef];
-  if (rowType.tag !== 'Product') throw 'impossible';
+  if (rowType.tag !== 'Product') {
+    throw 'impossible';
+  }
 
   const baseSize = bsatnBaseSize(typespace, rowType);
 
@@ -339,19 +351,19 @@ function makeTableView(typespace: Typespace, table: RawTableDefV9): Table<any> {
 
     let index: Index<any, any>;
     if (isUnique) {
-      const serializeBound = (col_val: any[]): IndexScanArgs => {
-        if (col_val.length !== numColumns)
+      const serializeBound = (colVal: any[]): IndexScanArgs => {
+        if (colVal.length !== numColumns)
           throw new TypeError('wrong number of elements');
 
         const writer = new BinaryWriter(baseSize + 1);
         const prefix_elems = numColumns - 1;
-        serializePrefix(writer, col_val, prefix_elems);
+        serializePrefix(writer, colVal, prefix_elems);
         const rstartOffset = writer.offset;
         writer.writeU8(0);
         AlgebraicType.serializeValue(
           writer,
           indexType.value.elements[numColumns - 1].algebraicType,
-          col_val[numColumns - 1],
+          colVal[numColumns - 1],
           typespace
         );
         const buffer = writer.getBuffer();
@@ -360,9 +372,9 @@ function makeTableView(typespace: Typespace, table: RawTableDefV9): Table<any> {
         return [prefix, prefix_elems, rstart, rstart];
       };
       index = {
-        find: (col_val: IndexVal<any, any>): RowType<any> | null => {
-          if (numColumns === 1) col_val = [col_val];
-          const args = serializeBound(col_val);
+        find: (colVal: IndexVal<any, any>): RowType<any> | null => {
+          if (numColumns === 1) colVal = [colVal];
+          const args = serializeBound(colVal);
           const iter = new TableIterator(
             sys.datastore_index_scan_range_bsatn(index_id, ...args),
             rowType
@@ -375,9 +387,9 @@ function makeTableView(typespace: Typespace, table: RawTableDefV9): Table<any> {
             );
           return value;
         },
-        delete: (col_val: IndexVal<any, any>): boolean => {
-          if (numColumns === 1) col_val = [col_val];
-          const args = serializeBound(col_val);
+        delete: (colVal: IndexVal<any, any>): boolean => {
+          if (numColumns === 1) colVal = [colVal];
+          const args = serializeBound(colVal);
           const num = sys.datastore_delete_by_index_scan_range_bsatn(
             index_id,
             ...args
diff --git a/crates/bindings-typescript/src/server/schema.ts b/crates/bindings-typescript/src/server/schema.ts
index 6684091b788..a8b775121e7 100644
--- a/crates/bindings-typescript/src/server/schema.ts
+++ b/crates/bindings-typescript/src/server/schema.ts
@@ -22,6 +22,7 @@ import {
   type AlgebraicTypeVariants,
 } from '../lib/algebraic_type';
 import type RawScopedTypeNameV9 from '../lib/autogen/raw_scoped_type_name_v_9_type';
+import type { CamelCase } from './type_util';
 
 /**
  * The global module definition that gets populated by calls to `reducer()` and lifecycle hooks.
@@ -86,7 +87,9 @@ type TablesToSchema<T extends readonly TableSchema<any, any, any>[]> = {
     /** @type {UntypedTableDef} */
     readonly [i in keyof T]: {
       name: T[i]['tableName'];
+      accessorName: CamelCase<T[i]['tableName']>;
       columns: T[i]['rowType']['row'];
+      rowType: T[i]['rowSpacetimeType'];
       indexes: T[i]['idxs'];
     };
   };
@@ -314,22 +317,6 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
   ...handles: H
 ): Schema<TablesToSchema<H>>;
 
-/**
- * Creates a schema from table definitions
- * @param handles - Array of table handles created by table() function
- * @returns ColumnBuilder representing the complete database schema
- * @example
- * ```ts
- * const s = schema(
- *   table({ name: 'user' }, userType),
- *   table({ name: 'post' }, postType)
- * );
- * ```
- */
-export function schema<const H extends readonly TableSchema<any, any, any>[]>(
-  ...handles: H
-): Schema<TablesToSchema<H>>;
-
 /**
  * Creates a schema from table definitions (array overload)
  * @param handles - Array of table handles created by table() function
@@ -351,13 +338,12 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
  * );
  * ```
  */
-export function schema(
+export function schema<const H extends readonly TableSchema<any, any, any>[]>(
   ...args:
-    | [readonly TableSchema<any, any, any>[]]
-    | readonly TableSchema<any, any, any>[]
-): Schema<UntypedSchemaDef> {
-  const handles: readonly TableSchema<any, any, any>[] =
-    args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+    | [H]
+    | H 
+): Schema<TablesToSchema<H>> {
+  const handles = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as H;
 
   const tableDefs = handles.map(h => h.tableDef);
 
diff --git a/crates/bindings-typescript/src/server/table.ts b/crates/bindings-typescript/src/server/table.ts
index 8c78488433b..96803cc1646 100644
--- a/crates/bindings-typescript/src/server/table.ts
+++ b/crates/bindings-typescript/src/server/table.ts
@@ -1,11 +1,11 @@
-import { AlgebraicType } from '../lib/algebraic_type';
+import { AlgebraicType, ProductType } from '../lib/algebraic_type';
 import type RawConstraintDefV9 from '../lib/autogen/raw_constraint_def_v_9_type';
 import RawIndexAlgorithm from '../lib/autogen/raw_index_algorithm_type';
 import type RawIndexDefV9 from '../lib/autogen/raw_index_def_v_9_type';
 import type RawSequenceDefV9 from '../lib/autogen/raw_sequence_def_v_9_type';
 import type RawTableDefV9 from '../lib/autogen/raw_table_def_v_9_type';
 import type { AllUnique } from './constraints';
-import type { ColumnIndex, IndexColumns, Indexes, IndexOpts } from './indexes';
+import type { ColumnIndex, IndexColumns, Indexes, IndexOpts, ReadonlyIndexes } from './indexes';
 import { MODULE_DEF, splitName } from './schema';
 import {
   RowBuilder,
@@ -53,7 +53,9 @@ type CoerceArray<X extends IndexOpts<any>[]> = X;
  */
 export type UntypedTableDef = {
   name: string;
+  accessorName: string;
   columns: Record<string, ColumnBuilder<any, any, ColumnMetadata<any>>>;
+  rowType: ProductType;
   indexes: IndexOpts<any>[];
 };
 
@@ -108,17 +110,30 @@ export type Table<TableDef extends UntypedTableDef> = Prettify<
   TableMethods<TableDef> & Indexes<TableDef, TableIndexes<TableDef>>
 >;
 
-/**
- * A type representing the methods available on a table.
- */
-export type TableMethods<TableDef extends UntypedTableDef> = {
+export type ReadonlyTable<TableDef extends UntypedTableDef> = Prettify<
+  ReadonlyTableMethods<TableDef> &
+    ReadonlyIndexes<TableDef, TableIndexes<TableDef>>
+>;
+
+export type ReadonlyTableMethods<TableDef extends UntypedTableDef> = {
   /** Returns the number of rows in the TX state. */
   count(): bigint;
 
-  /** Iterate over all rows in the TX state. Rust Iterator<Item=Row> → TS IterableIterator<Row>. */
+  /**
+   * Insert and return the inserted row (auto-increment fields filled).
+   *
+   * May throw on error:
+   * * If there are any unique or primary key columns in this table, may throw {@link UniqueAlreadyExists}.
+   * * If there are any auto-incrementing columns in this table, may throw {@link AutoIncOverflow}.
+   * */
   iter(): IterableIterator<RowType<TableDef>>;
   [Symbol.iterator](): IterableIterator<RowType<TableDef>>;
+};
 
+/**
+ * A type representing the methods available on a table.
+ */
+export type TableMethods<TableDef extends UntypedTableDef> = ReadonlyTableMethods<TableDef> & {
   /**
    * Insert and return the inserted row (auto-increment fields filled).
    *
@@ -148,9 +163,9 @@ export type TableSchema<
   readonly tableName: TableName;
 
   /**
-   * The {@link AlgebraicType} representing the structure of a row in the table.
+   * The {@link ProductType} representing the structure of a row in the table.
    */
-  readonly rowSpacetimeType: AlgebraicType;
+  readonly rowSpacetimeType: ProductType;
 
   /**
    * The {@link RawTableDefV9} of the configured table
@@ -319,11 +334,11 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     });
   }
 
-  const productType = AlgebraicType.Product({
+  const productType = {
     elements: row.resolveType().value.elements.map(elem => {
       return { name: elem.name, algebraicType: elem.algebraicType };
     }),
-  });
+  };
 
   return {
     rowType: row as RowBuilder<CoerceRow<Row>>,
diff --git a/crates/bindings-typescript/src/server/type_util.ts b/crates/bindings-typescript/src/server/type_util.ts
index 4febb2c11c8..ae9e978c7e9 100644
--- a/crates/bindings-typescript/src/server/type_util.ts
+++ b/crates/bindings-typescript/src/server/type_util.ts
@@ -32,3 +32,15 @@ export type Values<T> = T[keyof T];
  * A helper type to collapse a tuple into a single type if it has only one element.
  */
 export type CollapseTuple<A extends any[]> = A extends [infer T] ? T : A;
+
+type CamelCaseImpl<S extends string> =
+  S extends `${infer Head}_${infer Tail}` ? `${Head}${Capitalize<CamelCaseImpl<Tail>>}` :
+  S extends `${infer Head}-${infer Tail}` ? `${Head}${Capitalize<CamelCaseImpl<Tail>>}` :
+  S;
+
+/**
+ * Convert "Some_identifier-name" -> "someIdentifierName"
+ * - No spaces; allowed separators: "_" and "-"
+ * - Normalizes the *first* character to lowercase (e.g. "User_Name" -> "userName")
+ */
+export type CamelCase<S extends string> = Uncapitalize<CamelCaseImpl<S>>;
\ No newline at end of file
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index b8ee5f08b50..894e49b9239 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -1,9 +1,11 @@
 import { DbConnection, Player } from './module_bindings';
 import { useEffect } from 'react';
 import './App.css';
-import { useSpacetimeDB, useTable } from '../../src/react';
+import { useReducer, useSpacetimeDB, useTable } from '../../src/react';
 
 function App() {
+  const x = useReducer;
+  const createPlayer = useReducer<DbConnection>('createPlayer');
   const connection = useSpacetimeDB<DbConnection>();
   const players = useTable<DbConnection, Player>('player', {
     onInsert: player => {
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 104b8f6c14c..908c9243607 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -27,7 +27,10 @@ import {
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  type ClientTable as __ClientTable,
+  type RemoteModule as __RemoteModule,
+  type SetReducerFlags as __SetReducerFlags,
+  DbConnectionConfig,
 } from '../../../src/index';
 
 // Import and reexport all reducer arg types
@@ -50,196 +53,312 @@ export { Point };
 import { UnindexedPlayer } from './unindexed_player_type.ts';
 export { UnindexedPlayer };
 import { User } from './user_type.ts';
+import { schema } from '../../../src/server/schema.ts';
+import t from '../../../src/server/type_builders.ts';
+import { table } from '../../../src/server/table.ts';
+import { reducerSchema, reducers } from '../../../src/server/reducers.ts';
+import { RemoteModule2 } from '../../../src/sdk/spacetime_module.ts';
 export { User };
 
+const pointType = t.object('Point', {
+  x: t.number(),
+  y: t.number(),
+});
+
+const tablesSchema = schema(
+  table({ name: 'player', }, t.row({
+    ownerId: t.string(),
+    name: t.string(),
+    location: pointType,
+  })),
+  table({ name: 'unindexed_player', }, t.row({
+    ownerId: t.string(),
+    name: t.string(),
+    location: pointType,
+  })),
+  table({ name: 'user', primaryKey: 'identity', }, t.row({
+    identity: t.string(),
+    name: t.string(),
+  })),
+);
+
+const reducersSchema = reducers(
+  reducerSchema('create_player', {
+    name: t.string(),
+    location: pointType,
+  }),
+  reducerSchema('foo_bar', {
+    name: t.string(),
+    location: pointType,
+  }),
+);
+
 const REMOTE_MODULE = {
-  tables: {
-    player: {
-      tableName: 'player' as const,
-      rowType: Player.getTypeScriptAlgebraicType(),
-      primaryKey: 'ownerId',
-      primaryKeyInfo: {
-        colName: 'ownerId',
-        colType: (
-          Player.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-        ).value.elements[0].algebraicType,
-      },
-    },
-    unindexed_player: {
-      tableName: 'unindexed_player' as const,
-      rowType: UnindexedPlayer.getTypeScriptAlgebraicType(),
-    },
-    user: {
-      tableName: 'user' as const,
-      rowType: User.getTypeScriptAlgebraicType(),
-      primaryKey: 'identity',
-      primaryKeyInfo: {
-        colName: 'identity',
-        colType: (
-          User.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-        ).value.elements[0].algebraicType,
-      },
-    },
-  },
-  reducers: {
-    create_player: {
-      reducerName: 'create_player',
-      argsType: CreatePlayer.getTypeScriptAlgebraicType(),
-    },
-  },
   versionInfo: {
-    cliVersion: '1.5.0',
-  },
-  // Constructors which are used by the DbConnectionImpl to
-  // extract type information from the generated RemoteModule.
-  //
-  // NOTE: This is not strictly necessary for `eventContextConstructor` because
-  // all we do is build a TypeScript object which we could have done inside the
-  // SDK, but if in the future we wanted to create a class this would be
-  // necessary because classes have methods, so we'll keep it.
-  eventContextConstructor: (
-    imp: __DbConnectionImpl,
-    event: __Event<Reducer>
-  ) => {
-    return {
-      ...(imp as DbConnection),
-      event,
-    };
-  },
-  dbViewConstructor: (imp: __DbConnectionImpl) => {
-    return new RemoteTables(imp);
+    cliVersion: '1.6.0' as const,
   },
-  reducersConstructor: (
-    imp: __DbConnectionImpl,
-    setReducerFlags: SetReducerFlags
-  ) => {
-    return new RemoteReducers(imp, setReducerFlags);
-  },
-  setReducerFlagsConstructor: () => {
-    return new SetReducerFlags();
-  },
-};
-
-// A type representing all the possible variants of a reducer.
-export type Reducer = never | { name: 'CreatePlayer'; args: CreatePlayer };
-
-export class RemoteReducers {
-  constructor(
-    private connection: __DbConnectionImpl,
-    private setCallReducerFlags: SetReducerFlags
-  ) {}
-
-  createPlayer(name: string, location: Point) {
-    const __args = { name, location };
-    let __writer = new __BinaryWriter(1024);
-    CreatePlayer.serialize(__writer, __args);
-    let __argsBuffer = __writer.getBuffer();
-    this.connection.callReducer(
-      'create_player',
-      __argsBuffer,
-      this.setCallReducerFlags.createPlayerFlags
-    );
-  }
-
-  onCreatePlayer(
-    callback: (ctx: ReducerEventContext, name: string, location: Point) => void
-  ) {
-    this.connection.onReducer('create_player', callback);
-  }
-
-  removeOnCreatePlayer(
-    callback: (ctx: ReducerEventContext, name: string, location: Point) => void
-  ) {
-    this.connection.offReducer('create_player', callback);
-  }
-}
+  tables: tablesSchema.schemaType,
+  reducers: reducersSchema.reducersType,
+} satisfies RemoteModule2<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
 
-export class SetReducerFlags {
-  createPlayerFlags: __CallReducerFlags = 'FullUpdate';
-  createPlayer(flags: __CallReducerFlags) {
-    this.createPlayerFlags = flags;
-  }
-}
+export type EventContext = __EventContextInterface<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
 
-export class RemoteTables {
-  constructor(private connection: __DbConnectionImpl) {}
-
-  get player(): PlayerTableHandle<'player'> {
-    // clientCache is a private property
-    return new PlayerTableHandle(
-      (
-        this.connection as unknown as { clientCache: __ClientCache }
-      ).clientCache.getOrCreateTable<Player>(REMOTE_MODULE.tables.player)
-    );
-  }
-
-  get unindexedPlayer(): UnindexedPlayerTableHandle<'unindexed_player'> {
-    // clientCache is a private property
-    return new UnindexedPlayerTableHandle(
-      (
-        this.connection as unknown as { clientCache: __ClientCache }
-      ).clientCache.getOrCreateTable<UnindexedPlayer>(
-        REMOTE_MODULE.tables.unindexed_player
-      )
-    );
-  }
-
-  get user(): UserTableHandle<'user'> {
-    // clientCache is a private property
-    return new UserTableHandle(
-      (
-        this.connection as unknown as { clientCache: __ClientCache }
-      ).clientCache.getOrCreateTable<User>(REMOTE_MODULE.tables.user)
-    );
-  }
-}
+export type ReducerEventContext = __ReducerEventContextInterface<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
+
+export type SubscriptionEventContext = __SubscriptionEventContextInterface<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
+
+export type ErrorContext = __ErrorContextInterface<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
 
 export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
 > {}
 
-export class DbConnection extends __DbConnectionImpl<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
-> {
-  static builder = (): __DbConnectionBuilder<
-    DbConnection,
-    ErrorContext,
-    SubscriptionEventContext
-  > => {
-    return new __DbConnectionBuilder<
-      DbConnection,
-      ErrorContext,
-      SubscriptionEventContext
-    >(REMOTE_MODULE, (imp: __DbConnectionImpl) => imp as DbConnection);
+export class DbConnectionBuilder extends __DbConnectionBuilder<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType,
+  DbConnection
+> {};
+
+export class DbConnection extends __DbConnectionImpl<typeof tablesSchema.schemaType, typeof reducersSchema.reducersType> {
+  static builder = (): DbConnectionBuilder => {
+    return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof tablesSchema.schemaType, typeof reducersSchema.reducersType>) => new DbConnection(config));
   };
   subscriptionBuilder = (): SubscriptionBuilder => {
     return new SubscriptionBuilder(this);
   };
 }
 
-export type EventContext = __EventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags,
-  Reducer
->;
-export type ReducerEventContext = __ReducerEventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags,
-  Reducer
->;
-export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
->;
-export type ErrorContext = __ErrorContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
->;
+
+// // --- factory returning a well-typed object ---
+// function makeReducersObj<R extends UntypedReducersDef>(
+//   r: { reducersType: R },
+//   call: (name: string, spacetime: R['reducers'][number]['paramsSpacetimeType'], params: R['reducers'][number]['params']) => void
+// ): Readonly<ReducersFrom<R>> {
+//   const obj: Record<string, any> = {};
+//   for (const red of Object.values(r.reducersType.reducers)) {
+//     const key = toCamelCase(red.name as string);
+//     obj[key] = (params: any) => call(red.name as string, red.paramsSpacetimeType, params);
+//   }
+//   return Object.freeze(obj) as Readonly<ReducersFrom<R>>;
+// }
+
+// const reducersObj: UntypedReducers = {}
+// for (const reducer of Object.values(reducersSchema.reducersType.reducers)) {
+//   reducersObj[toCamelCase(reducer.name)] = function<Args extends any[]>(...args: Args) {
+//     this.#connection.callReducerWithParams(
+//       reducersSchema.reducersType.reducers[0].name,
+//       reducersSchema.reducersType.reducers[0].paramsSpacetimeType,
+//       args,
+//       "FullUpdate",
+//     );
+//   };
+// }
+// Object.freeze(reducersObj);
+
+// export class RemoteReducers implements UntypedReducersDef {
+//   [key: string]: (...args: any[]) => void;
+
+//   #connection: __DbConnectionImpl<typeof spacetimedb.schemaType, typeof r.reducersType>;
+//   #setCallReducerFlags: SetReducerFlags;
+
+//   constructor(
+//     connection: __DbConnectionImpl<typeof spacetimedb.schemaType, typeof r.reducersType>,
+//     setCallReducerFlags: SetReducerFlags
+//   ) {
+//     this.#connection = connection;
+//     this.#setCallReducerFlags = setCallReducerFlags;
+//   }
+
+//   createPlayer(name: string, location: Point) {
+//     this.#connection.callReducerWithParams(
+//       r.reducersType.reducers[0].name,
+//       r.reducersType.reducers[0].paramsSpacetimeType,
+//       [name, location],
+//       this.#setCallReducerFlags.createPlayerFlags,
+//     );
+//   }
+
+//   // onCreatePlayer(
+//   //   callback: (ctx: ReducerEventContext, name: string, location: Point) => void
+//   // ) {
+//   //   this.#connection.onReducer('create_player', callback);
+//   // }
+
+//   // removeOnCreatePlayer(
+//   //   callback: (ctx: ReducerEventContext, name: string, location: Point) => void
+//   // ) {
+//   //   this.#connection.offReducer('create_player', callback);
+//   // }
+// }
+
+// export class SetReducerFlags implements __SetReducerFlags<RemoteReducers> {
+//   createPlayerFlags: __CallReducerFlags = 'FullUpdate';
+//   createPlayer(flags: __CallReducerFlags) {
+//     this.createPlayerFlags = flags;
+//   }
+// }
+
+// export class RemoteTables implements ClientDbView<typeof spacetimedb.schemaType> {
+//   constructor(private connection: __DbConnectionImpl<typeof spacetimedb.schemaType, RemoteReducers>) {}
+
+//   get player(): PlayerTableHandle<typeof spacetimedb.schemaType, typeof r.reducersType> {
+//     // clientCache is a private property
+//     return new PlayerTableHandle(
+//       (
+//         this.connection as unknown as { clientCache: __ClientCache }
+//       ).clientCache.getOrCreateTable<"player">(spacetimedb.tablesDef.tables[0])
+//     );
+//   }
+
+//   get unindexedPlayer(): UnindexedPlayerTableHandle<'unindexed_player'> {
+//     // clientCache is a private property
+//     return new UnindexedPlayerTableHandle(
+//       (
+//         this.connection as unknown as { clientCache: __ClientCache }
+//       ).clientCache.getOrCreateTable<"unindexed_player">(
+//         REMOTE_MODULE.tables.unindexed_player
+//       )
+//     );
+//   }
+
+//   get user(): UserTableHandle<'user'> {
+//     // clientCache is a private property
+//     return new UserTableHandle(
+//       (
+//         this.connection as unknown as { clientCache: __ClientCache }
+//       ).clientCache.getOrCreateTable<"user">(REMOTE_MODULE.tables.user)
+//     );
+//   }
+// }
+
+// export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
+//   SchemaDef,
+//   RemoteReducers
+// > {}
+
+// export class DbConnection extends __DbConnectionImpl<
+//   SchemaDef,
+//   RemoteReducers,
+// > {
+//   static builder = (): __DbConnectionBuilder<
+//     DbConnection,
+//     ErrorContext,
+//     SubscriptionEventContext
+//   > => {
+//     return new __DbConnectionBuilder<
+//       DbConnection,
+//       ErrorContext,
+//       SubscriptionEventContext
+//     >(REMOTE_MODULE, (imp: __DbConnectionImpl) => imp as DbConnection);
+//   };
+//   subscriptionBuilder = (): SubscriptionBuilder => {
+//     return new SubscriptionBuilder(this);
+//   };
+// }
+
+// export type EventContext = __EventContextInterface<
+//   RemoteTables,
+//   RemoteReducers,
+//   SetReducerFlags,
+//   Reducer
+// >;
+// export type ReducerEventContext = __ReducerEventContextInterface<
+//   RemoteTables,
+//   RemoteReducers,
+//   SetReducerFlags,
+//   Reducer
+// >;
+// export type SubscriptionEventContext = __SubscriptionEventContextInterface<
+//   RemoteTables,
+//   RemoteReducers,
+//   SetReducerFlags
+// >;
+// export type ErrorContext = __ErrorContextInterface<
+//   RemoteTables,
+//   RemoteReducers,
+//   SetReducerFlags
+// >;
+
+// const REMOTE_MODULE = {
+//   tables: {
+//     player: {
+//       name: 'player' as const,
+//       rowType: Player.getTypeScriptAlgebraicType(),
+//       primaryKey: 'ownerId',
+//       primaryKeyInfo: {
+//         colName: 'ownerId',
+//         colType: (
+//           Player.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
+//         ).value.elements[0].algebraicType,
+//       },
+//     },
+//     unindexed_player: {
+//       tableName: 'unindexed_player' as const,
+//       rowType: UnindexedPlayer.getTypeScriptAlgebraicType(),
+//     },
+//     user: {
+//       tableName: 'user' as const,
+//       rowType: User.getTypeScriptAlgebraicType(),
+//       primaryKey: 'identity',
+//       primaryKeyInfo: {
+//         colName: 'identity',
+//         colType: (
+//           User.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
+//         ).value.elements[0].algebraicType,
+//       },
+//     },
+//   },
+//   reducers: {
+//     create_player: {
+//       reducerName: 'create_player',
+//       argsType: CreatePlayer.getTypeScriptAlgebraicType(),
+//     },
+//   },
+//   versionInfo: {
+//     cliVersion: '1.5.0',
+//   },
+//   // Constructors which are used by the DbConnectionImpl to
+//   // extract type information from the generated RemoteModule.
+//   //
+//   // NOTE: This is not strictly necessary for `eventContextConstructor` because
+//   // all we do is build a TypeScript object which we could have done inside the
+//   // SDK, but if in the future we wanted to create a class this would be
+//   // necessary because classes have methods, so we'll keep it.
+//   eventContextConstructor: (
+//     imp: __DbConnectionImpl<SchemaDef, RemoteReducers>,
+//     event: __Event<Reducer>
+//   ) => {
+//     return {
+//       ...(imp as DbConnection),
+//       event,
+//     };
+//   },
+//   dbViewConstructor: (imp: __DbConnectionImpl<SchemaDef, RemoteReducers>) => {
+//     return new RemoteTables(imp);
+//   },
+//   reducersConstructor: (
+//     imp: __DbConnectionImpl<SchemaDef, RemoteReducers>,
+//     setReducerFlags: SetReducerFlags
+//   ) => {
+//     return new RemoteReducers(imp, setReducerFlags);
+//   },
+//   setReducerFlagsConstructor: () => {
+//     return new SetReducerFlags();
+//   },
+// } satisfies __RemoteModule<SchemaDef, RemoteReducers>;
\ No newline at end of file
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 63a846fa7f6..53444fbc677 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -25,7 +25,7 @@ import {
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  type ClientTable as __ClientTable,
 } from '../../../src/index';
 import { Player } from './player_type';
 import { Point } from './point_type';
@@ -51,7 +51,7 @@ declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
  * like `ctx.db.player.on_insert(...)`.
  */
 export class PlayerTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
+  implements __ClientTable<TableName>
 {
   // phantom type to track the table name
   readonly tableName!: TableName;
@@ -80,11 +80,11 @@ export class PlayerTableHandle<TableName extends string>
    * Get a handle on the `ownerId` unique index on the table `player`.
    */
   ownerId = {
-    // Find the subscribed row whose `ownerId` column value is equal to `col_val`,
+    // Find the subscribed row whose `ownerId` column value is equal to `colVal`,
     // if such a row is present in the client cache.
-    find: (col_val: string): Player | undefined => {
+    find: (colVal: string): Player | undefined => {
       for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.ownerId, col_val)) {
+        if (__deepEqual(row.ownerId, colVal)) {
           return row;
         }
       }
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
index 21275ac19c1..e8364a92e8f 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
@@ -76,11 +76,11 @@ export class UserTableHandle<TableName extends string>
    * Get a handle on the `identity` unique index on the table `user`.
    */
   identity = {
-    // Find the subscribed row whose `identity` column value is equal to `col_val`,
+    // Find the subscribed row whose `identity` column value is equal to `colVal`,
     // if such a row is present in the client cache.
-    find: (col_val: __Identity): User | undefined => {
+    find: (colVal: __Identity): User | undefined => {
       for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, col_val)) {
+        if (__deepEqual(row.identity, colVal)) {
           return row;
         }
       }
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts
index 6d99cb4b7c6..9ffbf83d2c4 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts
@@ -76,11 +76,11 @@ export class CounterTableHandle<TableName extends string>
    * Get a handle on the `id` unique index on the table `counter`.
    */
   id = {
-    // Find the subscribed row whose `id` column value is equal to `col_val`,
+    // Find the subscribed row whose `id` column value is equal to `colVal`,
     // if such a row is present in the client cache.
-    find: (col_val: number): Counter | undefined => {
+    find: (colVal: number): Counter | undefined => {
       for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.id, col_val)) {
+        if (__deepEqual(row.id, colVal)) {
           return row;
         }
       }
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts
index 47537ef2c6a..cb526e2dee8 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts
@@ -76,11 +76,11 @@ export class OfflineUserTableHandle<TableName extends string>
    * Get a handle on the `identity` unique index on the table `offline_user`.
    */
   identity = {
-    // Find the subscribed row whose `identity` column value is equal to `col_val`,
+    // Find the subscribed row whose `identity` column value is equal to `colVal`,
     // if such a row is present in the client cache.
-    find: (col_val: __Identity): User | undefined => {
+    find: (colVal: __Identity): User | undefined => {
       for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, col_val)) {
+        if (__deepEqual(row.identity, colVal)) {
           return row;
         }
       }
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts
index 21275ac19c1..e8364a92e8f 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts
@@ -76,11 +76,11 @@ export class UserTableHandle<TableName extends string>
    * Get a handle on the `identity` unique index on the table `user`.
    */
   identity = {
-    // Find the subscribed row whose `identity` column value is equal to `col_val`,
+    // Find the subscribed row whose `identity` column value is equal to `colVal`,
     // if such a row is present in the client cache.
-    find: (col_val: __Identity): User | undefined => {
+    find: (colVal: __Identity): User | undefined => {
       for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, col_val)) {
+        if (__deepEqual(row.identity, colVal)) {
           return row;
         }
       }
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index e8c793be5b8..2770fc4d6ab 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -167,7 +167,7 @@ impl Lang for TypeScript {
  * but to directly chain method calls,
  * like `ctx.db.{accessor_method}.on_insert(...)`.
  */
-export class {table_handle}<TableName extends string> implements __TableHandle<TableName> {{
+export class {table_handle}<TableName extends string> extends __TableCache<TableName> {{
 "
         );
         out.indent(1);
@@ -373,11 +373,11 @@ removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type})
                 // version of the SDK.
                 //
                 // Eventually we can remove this and only generate use the `primaryKeyInfo` field.
-                writeln!(out, "primaryKey: \"{}\",", pk.col_name.to_string().to_case(Case::Camel));
+                writeln!(out, "primaryKey: \"{}\" as const,", pk.col_name.to_string().to_case(Case::Camel));
 
                 writeln!(out, "primaryKeyInfo: {{");
                 out.indent(1);
-                writeln!(out, "colName: \"{}\",", pk.col_name.to_string().to_case(Case::Camel));
+                writeln!(out, "colName: \"{}\" as const,", pk.col_name.to_string().to_case(Case::Camel));
                 writeln!(
                     out,
                     "colType: ({row_type}.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product).value.elements[{}].algebraicType,",
@@ -396,7 +396,7 @@ removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type})
         for reducer in iter_reducers(module) {
             writeln!(out, "{}: {{", reducer.name);
             out.indent(1);
-            writeln!(out, "reducerName: \"{}\",", reducer.name);
+            writeln!(out, "reducerName: \"{}\" as const,", reducer.name);
             writeln!(
                 out,
                 "argsType: {args_type}.getTypeScriptAlgebraicType(),",
@@ -409,7 +409,7 @@ removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type})
         writeln!(out, "}},");
         writeln!(out, "versionInfo: {{");
         out.indent(1);
-        writeln!(out, "cliVersion: \"{}\",", spacetimedb_lib_version());
+        writeln!(out, "cliVersion: \"{}\" as const,", spacetimedb_lib_version());
         out.dedent(1);
         writeln!(out, "}},");
         writeln!(
@@ -438,7 +438,7 @@ setReducerFlagsConstructor: () => {{
 }}"
         );
         out.dedent(1);
-        writeln!(out, "}}");
+        writeln!(out, "}} satisfies __RemoteModule;");
 
         // Define `type Reducer` enum.
         writeln!(out);
@@ -693,6 +693,7 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "type CallReducerFlags as __CallReducerFlags",
         "type EventContextInterface as __EventContextInterface",
         "type ReducerEventContextInterface as __ReducerEventContextInterface",
+        "type RemoteModule as __RemoteModule",
         "type SubscriptionEventContextInterface as __SubscriptionEventContextInterface",
         "type ErrorContextInterface as __ErrorContextInterface",
         "SubscriptionBuilderImpl as __SubscriptionBuilderImpl",

From e9c0a6fe35f20f5219852b5fdd3b51c605c1c9de Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 2 Nov 2025 21:34:37 -0500
Subject: [PATCH 02/23] RemoteModule-ify

---
 .../src/sdk/client_cache.ts                   | 39 ++++----
 .../src/sdk/db_connection_builder.ts          | 19 ++--
 .../src/sdk/db_connection_impl.ts             | 99 +++++++++----------
 .../bindings-typescript/src/sdk/db_context.ts | 13 ++-
 .../src/sdk/event_context.ts                  | 29 +++---
 .../src/sdk/spacetime_module.ts               | 46 ++-------
 .../src/sdk/subscription_builder_impl.ts      | 54 ++++------
 .../src/sdk/table_cache.ts                    | 29 +++---
 .../src/sdk/table_handle.ts                   | 29 +++---
 .../bindings-typescript/src/server/db_view.ts |  6 +-
 .../test-app/src/module_bindings/index.ts     | 30 +++---
 .../tests/table_cache.test.ts                 |  1 -
 12 files changed, 164 insertions(+), 230 deletions(-)

diff --git a/crates/bindings-typescript/src/sdk/client_cache.ts b/crates/bindings-typescript/src/sdk/client_cache.ts
index 40b8c98bc08..f410911c454 100644
--- a/crates/bindings-typescript/src/sdk/client_cache.ts
+++ b/crates/bindings-typescript/src/sdk/client_cache.ts
@@ -1,6 +1,6 @@
 import type { UntypedSchemaDef } from '../server/schema.ts';
 import type { UntypedTableDef } from '../server/table.ts';
-import type { UntypedReducersDef } from './reducers.ts';
+import type { UntypedRemoteModule } from './spacetime_module.ts';
 import { TableCache } from './table_cache.ts';
 
 type TableName<SchemaDef> =
@@ -12,40 +12,39 @@ export type TableDefForTableName<SchemaDef, N> =
     : UntypedTableDef;
 
 type TableCacheForTableName<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
   N
-> = TableCache<SchemaDef, Reducers, TableDefForTableName<SchemaDef, N>>;
+> = TableCache<RemoteModule, TableDefForTableName<RemoteModule, N>>;
 
 /**
  * This is a helper class that provides a mapping from table names to their corresponding TableCache instances
  * while preserving the correspondence between the key and value type.
  */
-class TableMap<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
-  private readonly map: Map<string, TableCacheForTableName<SchemaDef, Reducers, TableName<SchemaDef>>> = new Map();
+class TableMap<RemoteModule extends UntypedRemoteModule> {
+  private readonly map: Map<string, TableCacheForTableName<RemoteModule, TableName<RemoteModule>>> = new Map();
 
-  get<K extends TableName<SchemaDef>>(key: K): TableCacheForTableName<SchemaDef, Reducers, K> | undefined {
+  get<K extends TableName<RemoteModule>>(key: K): TableCacheForTableName<RemoteModule, K> | undefined {
     // Cast required: a Map<string, Union> can't refine the union to the exact K-specific member on get<K>(key: K).
-    return this.map.get(key) as TableCacheForTableName<SchemaDef, Reducers, K> | undefined;
+    return this.map.get(key) as TableCacheForTableName<RemoteModule, K> | undefined;
   }
 
-  set<K extends TableName<SchemaDef>>(key: K, value: TableCacheForTableName<SchemaDef, Reducers, K>): this {
+  set<K extends TableName<RemoteModule>>(key: K, value: TableCacheForTableName<RemoteModule, K>): this {
     this.map.set(key, value);
     return this;
   }
 
-  has(key: TableName<SchemaDef>): boolean {
+  has(key: TableName<RemoteModule>): boolean {
     return this.map.has(key);
   }
 
-  delete(key: TableName<SchemaDef>): boolean {
+  delete(key: TableName<RemoteModule>): boolean {
     return this.map.delete(key);
   }
 
   // optional: iteration stays broadly typed (cannot express per-key relation here)
   keys(): IterableIterator<string> { return this.map.keys(); }
-  values(): IterableIterator<TableCacheForTableName<SchemaDef, Reducers, TableName<SchemaDef>>> { return this.map.values(); }
-  entries(): IterableIterator<[string, TableCacheForTableName<SchemaDef, Reducers, TableName<SchemaDef>>]> { return this.map.entries(); }
+  values(): IterableIterator<TableCacheForTableName<RemoteModule, TableName<RemoteModule>>> { return this.map.values(); }
+  entries(): IterableIterator<[string, TableCacheForTableName<RemoteModule, TableName<RemoteModule>>]> { return this.map.entries(); }
   [Symbol.iterator]() { return this.entries(); }
 }
 
@@ -54,11 +53,11 @@ class TableMap<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReduc
  * It provides methods to get or create TableCache instances by table name,
  * ensuring type safety based on the provided SchemaDef.
  */
-export class ClientCache<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
+export class ClientCache<RemoteModule extends UntypedRemoteModule> {
   /**
    * The tables in the database.
    */
-  readonly tables = new TableMap<SchemaDef, Reducers>();
+  readonly tables = new TableMap<RemoteModule>();
 
   /**
    * Returns the table with the given name.
@@ -66,7 +65,7 @@ export class ClientCache<SchemaDef extends UntypedSchemaDef, Reducers extends Un
    *   and the return type matches that table.
    * - If SchemaDef is undefined, `name` is string and the return type is untyped.
    */
-  getTable<N extends TableName<SchemaDef>>(name: N): TableCacheForTableName<SchemaDef, Reducers, N> {
+  getTable<N extends TableName<RemoteModule>>(name: N): TableCacheForTableName<RemoteModule, N> {
     const table = this.tables.get(name);
     if (!table) {
       console.error(
@@ -83,9 +82,9 @@ export class ClientCache<SchemaDef extends UntypedSchemaDef, Reducers extends Un
    *   the return type matches that table.
    * - Untyped mode: accepts any string and returns an untyped TableCache.
    */
-  getOrCreateTable<N extends TableName<SchemaDef>>(
-    tableDef: TableDefForTableName<SchemaDef, N>
-  ): TableCacheForTableName<SchemaDef, Reducers, N> {
+  getOrCreateTable<N extends TableName<RemoteModule>>(
+    tableDef: TableDefForTableName<RemoteModule, N>
+  ): TableCacheForTableName<RemoteModule, N> {
     const name = tableDef.name as N;
 
     let table = this.tables.get(name);
@@ -93,7 +92,7 @@ export class ClientCache<SchemaDef extends UntypedSchemaDef, Reducers extends Un
       return table;
     }
 
-    const newTable = new TableCache<SchemaDef, Reducers, TableDefForTableName<SchemaDef, N>>(tableDef);
+    const newTable = new TableCache<RemoteModule, TableDefForTableName<RemoteModule, N>>(tableDef);
     this.tables.set(name, newTable);
     return newTable;
   }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index b585cf35564..4eec420dd97 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -1,19 +1,16 @@
 import { DbConnectionImpl, type ConnectionEvent } from './db_connection_impl';
 import { EventEmitter } from './event_emitter';
 import type { DbConnectionConfig, ErrorContextInterface, Identity, SubscriptionEventContextInterface } from '../';
-import { type RemoteModule, type RemoteModule2 } from './spacetime_module';
+import { type UntypedRemoteModule } from './spacetime_module';
 import { ensureMinimumVersionOrThrow } from './version';
 import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
-import type { UntypedSchemaDef } from '../server/schema';
-import type { UntypedReducersDef } from './reducers';
 
 /**
  * The database client connection to a SpacetimeDB server.
  */
 export class DbConnectionBuilder<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
-  DbConnection extends DbConnectionImpl<SchemaDef, Reducers>,
+  RemoteModule extends UntypedRemoteModule,
+  DbConnection extends DbConnectionImpl<RemoteModule>,
 > {
   #uri?: URL;
   #nameOrAddress?: string;
@@ -34,8 +31,8 @@ export class DbConnectionBuilder<
    * @param dbConnectionConstructor The constructor to use to create a new `DbConnection`.
    */
   constructor(
-    private remoteModule: RemoteModule2<SchemaDef, Reducers>,
-    private dbConnectionCtor: (config: DbConnectionConfig<SchemaDef, Reducers>) => DbConnection
+    private remoteModule: RemoteModule,
+    private dbConnectionCtor: (config: DbConnectionConfig<RemoteModule>) => DbConnection
   ) {
     this.#createWSFn = WebsocketDecompressAdapter.createWebSocketFn;
   }
@@ -181,7 +178,7 @@ export class DbConnectionBuilder<
    * });
    * ```
    */
-  onConnectError(callback: (ctx: ErrorContextInterface<SchemaDef, Reducers>, error: Error) => void): this {
+  onConnectError(callback: (ctx: ErrorContextInterface<RemoteModule>, error: Error) => void): this {
     this.#emitter.on('connectError', callback);
     return this;
   }
@@ -213,7 +210,7 @@ export class DbConnectionBuilder<
    * @throws {Error} Throws an error if called multiple times on the same `DbConnectionBuilder`.
    */
   onDisconnect(
-    callback: (ctx: ErrorContextInterface<SchemaDef, Reducers>, error?: Error | undefined) => void
+    callback: (ctx: ErrorContextInterface<RemoteModule>, error?: Error | undefined) => void
   ): this {
     this.#emitter.on('disconnect', callback);
     return this;
@@ -233,7 +230,7 @@ export class DbConnectionBuilder<
    * DbConnection.builder().withUri(host).withModuleName(name_or_address).withToken(auth_token).build();
    * ```
    */
-  build(): DbConnectionImpl<SchemaDef, Reducers> {
+  build(): DbConnectionImpl<RemoteModule> {
     if (!this.#uri) {
       throw new Error('URI is required to connect to SpacetimeDB');
     }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index 64c7b435554..fc270ac69ef 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -34,7 +34,7 @@ import type {
   UnsubscribeAppliedMessage,
 } from './message_types.ts';
 import type { ReducerEvent } from './reducer_event.ts';
-import { type RemoteModule, type RemoteModule2 } from './spacetime_module.ts';
+import { type RemoteModule, type UntypedRemoteModule } from './spacetime_module.ts';
 import {
   TableCache,
   type Operation,
@@ -52,10 +52,8 @@ import {
 import { stdbLogger } from './logger.ts';
 import { fromByteArray } from 'base64-js';
 import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
-import type { UntypedSchemaDef } from '../server/schema.ts';
 import type { DbView } from '../server/db_view.ts';
-import type { RowType, UntypedTableDef } from '../server/table.ts';
-import type { CamelCase } from '../server/type_util.ts';
+import type { UntypedTableDef } from '../server/table.ts';
 import { toCamelCase } from '../server/runtime.ts';
 
 export { DbConnectionBuilder, SubscriptionBuilderImpl, TableCache, type Event };
@@ -72,13 +70,13 @@ export type {
 export type ConnectionEvent = 'connect' | 'disconnect' | 'connectError';
 export type CallReducerFlags = 'FullUpdate' | 'NoSuccessNotify';
 
-type ReducerEventCallback<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef, ReducerArgs extends any[] = any[]> = (
-  ctx: ReducerEventContextInterface<SchemaDef, Reducers>,
+type ReducerEventCallback<RemoteModule extends UntypedRemoteModule, ReducerArgs extends any[] = any[]> = (
+  ctx: ReducerEventContextInterface<RemoteModule>,
   ...args: ReducerArgs
 ) => void;
 
-type SubscriptionEventCallback<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> = (
-  ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>,
+type SubscriptionEventCallback<RemoteModule extends UntypedRemoteModule> = (
+  ctx: SubscriptionEventContextInterface<RemoteModule>,
 ) => void;
 
 function callReducerFlagsToNumber(flags: CallReducerFlags): number {
@@ -90,7 +88,7 @@ function callReducerFlagsToNumber(flags: CallReducerFlags): number {
   }
 }
 
-export type DbConnectionConfig<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> = {
+export type DbConnectionConfig<RemoteModule extends UntypedRemoteModule> = {
   uri: URL;
   nameOrAddress: string;
   identity?: Identity;
@@ -100,13 +98,12 @@ export type DbConnectionConfig<SchemaDef extends UntypedSchemaDef, Reducers exte
   compression: 'gzip' | 'none';
   lightMode: boolean;
   confirmedReads?: boolean;
-  remoteModule: RemoteModule2<SchemaDef, Reducers>;
+  remoteModule: RemoteModule;
 };
 
 export class DbConnectionImpl<
-  SchemaDef extends UntypedSchemaDef,
-  ReducersDef extends UntypedReducersDef,
-> implements DbContext<SchemaDef, ReducersDef> {
+  RemoteModule extends UntypedRemoteModule,
+> implements DbContext<RemoteModule> {
   /**
    * Whether or not the connection is active.
    */
@@ -126,20 +123,20 @@ export class DbConnectionImpl<
    * The accessor field to access the tables in the database and associated
    * callback functions.
    */
-  db: DbView<SchemaDef>;
+  db: DbView<RemoteModule>;
 
   /**
    * The accessor field to access the reducers in the database and associated
    * callback functions.
    */
-  reducers: ReducersView<ReducersDef>;
+  reducers: ReducersView<RemoteModule>;
 
   /**
    * The accessor field to access functions related to setting flags on
    * reducers regarding how the server should handle the reducer call and
    * the events that it sends back to the client.
    */
-  setReducerFlags: SetReducerFlags<ReducersDef>;
+  setReducerFlags: SetReducerFlags<RemoteModule>;
 
   /**
    * The `ConnectionId` of the connection to to the database.
@@ -149,19 +146,19 @@ export class DbConnectionImpl<
   // These fields are meant to be strictly private.
   #queryId = 0;
   #emitter: EventEmitter<ConnectionEvent>;
-  #reducerEmitter: EventEmitter<string, ReducerEventCallback<SchemaDef, ReducersDef>> =
+  #reducerEmitter: EventEmitter<string, ReducerEventCallback<RemoteModule>> =
     new EventEmitter();
-  #onApplied?: SubscriptionEventCallback<SchemaDef, ReducersDef>;
+  #onApplied?: SubscriptionEventCallback<RemoteModule>;
   #messageQueue = Promise.resolve();
-  #subscriptionManager = new SubscriptionManager<SchemaDef, ReducersDef>();
-  #remoteModule: RemoteModule2<SchemaDef, ReducersDef>;
+  #subscriptionManager = new SubscriptionManager<RemoteModule>();
+  #remoteModule: RemoteModule;
   #callReducerFlags = new Map<string, CallReducerFlags>();
 
   // These fields are not part of the public API, but in a pinch you
   // could use JavaScript to access them by bypassing TypeScript's
   // private fields.
   // We use them in testing.
-  private clientCache: ClientCache<SchemaDef, ReducersDef>;
+  private clientCache: ClientCache<RemoteModule>;
   private ws?: WebsocketDecompressAdapter | WebsocketTestAdapter;
   private wsPromise: Promise<
     WebsocketDecompressAdapter | WebsocketTestAdapter | undefined
@@ -178,7 +175,7 @@ export class DbConnectionImpl<
     compression,
     lightMode,
     confirmedReads,
-  }: DbConnectionConfig<SchemaDef, ReducersDef>) {
+  }: DbConnectionConfig<RemoteModule>) {
     stdbLogger('info', 'Connecting to SpacetimeDB WS...');
 
     // We use .toString() here because some versions of React Native contain a bug where the URL constructor
@@ -198,10 +195,10 @@ export class DbConnectionImpl<
     const connectionId = this.connectionId.toHexString();
     url.searchParams.set('connection_id', connectionId);
 
-    this.clientCache = new ClientCache<SchemaDef, ReducersDef>();
-    this.db = this.#makeDbView(remoteModule.tables);
-    this.reducers = this.#makeReducers(remoteModule.reducers);
-    this.setReducerFlags = this.#makeSetReducerFlags(remoteModule.reducers);
+    this.clientCache = new ClientCache<RemoteModule>();
+    this.db = this.#makeDbView(remoteModule);
+    this.reducers = this.#makeReducers(remoteModule);
+    this.setReducerFlags = this.#makeSetReducerFlags(remoteModule);
 
     this.wsPromise = createWSFn({
       url,
@@ -239,8 +236,8 @@ export class DbConnectionImpl<
     return queryId;
   };
 
-  #makeDbView(def: SchemaDef): DbView<SchemaDef> {
-    const view = Object.create(null) as DbView<SchemaDef>;
+  #makeDbView(def: RemoteModule): DbView<RemoteModule> {
+    const view = Object.create(null) as DbView<RemoteModule>;
 
     for (const tbl of def.tables) {
       // DbView uses this name verbatim
@@ -257,7 +254,7 @@ export class DbConnectionImpl<
     return view;
   }
 
-  #makeReducers(def: ReducersDef): ReducersView<ReducersDef> {
+  #makeReducers(def: RemoteModule): ReducersView<RemoteModule> {
     const out: Record<string, unknown> = {};
 
     for (const reducer of def.reducers) {
@@ -274,11 +271,11 @@ export class DbConnectionImpl<
       };
     }
 
-    return out as ReducersView<ReducersDef>;
+    return out as ReducersView<RemoteModule>;
   }
 
-  #makeSetReducerFlags(defs: ReducersDef): SetReducerFlags<ReducersDef> {
-    const out = Object.create(null) as SetReducerFlags<ReducersDef>;
+  #makeSetReducerFlags(defs: RemoteModule): SetReducerFlags<RemoteModule> {
+    const out = Object.create(null) as SetReducerFlags<RemoteModule>;
     for (const r of defs.reducers) {
       const key = toCamelCase(r.name);
       Object.defineProperty(out, key, {
@@ -293,8 +290,8 @@ export class DbConnectionImpl<
   }
 
   #makeEventContext(
-    event: Event<ReducersDef['reducers'][number]>
-  ): EventContextInterface<SchemaDef, ReducersDef> {
+    event: Event<RemoteModule['reducers'][number]>
+  ): EventContextInterface<RemoteModule> {
     // Bind methods to preserve `this` (#private fields safe)
     return {
       db: this.db,
@@ -314,13 +311,13 @@ export class DbConnectionImpl<
   // Do not remove this function, or shoot yourself in the foot please.
   // It's not clear what would be a better way to do this at this exact
   // moment.
-  subscriptionBuilder = (): SubscriptionBuilderImpl<SchemaDef, ReducersDef> => {
+  subscriptionBuilder = (): SubscriptionBuilderImpl<RemoteModule> => {
     return new SubscriptionBuilderImpl(this);
   };
 
   registerSubscription(
-    handle: SubscriptionHandleImpl<SchemaDef, ReducersDef>,
-    handleEmitter: EventEmitter<SubscribeEvent, SubscriptionEventCallback<SchemaDef, ReducersDef>>,
+    handle: SubscriptionHandleImpl<RemoteModule>,
+    handleEmitter: EventEmitter<SubscribeEvent, SubscriptionEventCallback<RemoteModule>>,
     querySql: string[]
   ): number {
     const queryId = this.#getNextQueryId();
@@ -365,7 +362,7 @@ export class DbConnectionImpl<
       const rows: Operation[] = [];
 
       // TODO: performance
-      const table = this.#remoteModule.tables.tables.find(t => t.name === tableName);
+      const table = this.#remoteModule.tables.find(t => t.name === tableName);
       const rowType = table!.rowType;
       const columnsArray = Object.entries(table!.columns);
       const primaryKeyColumnEntry = columnsArray.find(col => col[1].columnMetadata.isPrimaryKey);
@@ -593,14 +590,14 @@ export class DbConnectionImpl<
 
   #applyTableUpdates(
     tableUpdates: CacheTableUpdate<UntypedTableDef>[],
-    eventContext: EventContextInterface<SchemaDef, ReducersDef>
+    eventContext: EventContextInterface<RemoteModule>
   ): PendingCallback[] {
     const pendingCallbacks: PendingCallback[] = [];
     for (const tableUpdate of tableUpdates) {
       // Get table information for the table being updated
       const tableName = tableUpdate.tableName;
       // TODO: performance
-      const tableDef = this.#remoteModule.tables.tables.find(t => t.name === tableName)!;
+      const tableDef = this.#remoteModule.tables.find(t => t.name === tableName)!;
       const table = this.clientCache.getOrCreateTable(tableDef);
       const newCallbacks = table.applyOperations(
         tableUpdate.operations,
@@ -655,7 +652,7 @@ export class DbConnectionImpl<
         let reducerInfo = message.reducerInfo;
         let unknownTransaction = false;
         let reducerArgs: any | undefined;
-        const reducer = this.#remoteModule.reducers.reducers.find(t => t.name === reducerInfo!.reducerName)!;
+        const reducer = this.#remoteModule.reducers.find(t => t.name === reducerInfo!.reducerName)!;
         if (!reducerInfo) {
           unknownTransaction = true;
         } else {
@@ -899,63 +896,63 @@ export class DbConnectionImpl<
 
   private on(
     eventName: ConnectionEvent,
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.on(eventName, callback);
   }
 
   private off(
     eventName: ConnectionEvent,
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.off(eventName, callback);
   }
 
   private onConnect(
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.on('connect', callback);
   }
 
   private onDisconnect(
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.on('disconnect', callback);
   }
 
   private onConnectError(
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.on('connectError', callback);
   }
 
   removeOnConnect(
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.off('connect', callback);
   }
 
   removeOnDisconnect(
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.off('disconnect', callback);
   }
 
   removeOnConnectError(
-    callback: (ctx: DbConnectionImpl<SchemaDef, ReducersDef>, ...args: any[]) => void
+    callback: (ctx: DbConnectionImpl<RemoteModule>, ...args: any[]) => void
   ): void {
     this.#emitter.off('connectError', callback);
   }
 
   // Note: This is required to be public because it needs to be
   // called from the `RemoteReducers` class.
-  onReducer(reducerName: string, callback: ReducerEventCallback<SchemaDef, ReducersDef>): void {
+  onReducer(reducerName: string, callback: ReducerEventCallback<RemoteModule>): void {
     this.#reducerEmitter.on(reducerName, callback);
   }
 
   // Note: This is required to be public because it needs to be
   // called from the `RemoteReducers` class.
-  offReducer(reducerName: string, callback: ReducerEventCallback<SchemaDef, ReducersDef>): void {
+  offReducer(reducerName: string, callback: ReducerEventCallback<RemoteModule>): void {
     this.#reducerEmitter.off(reducerName, callback);
   }
 }
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index 7d5d0da464c..cb7f76579a1 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -1,6 +1,6 @@
 import type { DbView } from '../server/db_view';
-import type { UntypedSchemaDef } from '../server/schema';
 import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers';
+import type { SchemaDef, UntypedRemoteModule } from './spacetime_module';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
 
 /**
@@ -10,10 +10,10 @@ import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
  * @template ReducersDef - Type representing the reducers.
  * @template SetReducerFlags - Type representing the reducer flags collection.
  */
-export interface DbContext<SchemaDef extends UntypedSchemaDef, ReducersDef extends UntypedReducersDef> {
-  db: DbView<SchemaDef>;
-  reducers: ReducersView<ReducersDef>;
-  setReducerFlags: SetReducerFlags<ReducersDef>;
+export interface DbContext<RemoteModule extends UntypedRemoteModule> {
+  db: DbView<RemoteModule>;
+  reducers: ReducersView<RemoteModule>;
+  setReducerFlags: SetReducerFlags<RemoteModule>;
   isActive: boolean;
 
   /**
@@ -22,8 +22,7 @@ export interface DbContext<SchemaDef extends UntypedSchemaDef, ReducersDef exten
    * @returns The subscription builder.
    */
   subscriptionBuilder(): SubscriptionBuilderImpl<
-    SchemaDef,
-    ReducersDef
+    RemoteModule
   >;
 
   /**
diff --git a/crates/bindings-typescript/src/sdk/event_context.ts b/crates/bindings-typescript/src/sdk/event_context.ts
index 459cfbfeaf0..1a69b4c2a3c 100644
--- a/crates/bindings-typescript/src/sdk/event_context.ts
+++ b/crates/bindings-typescript/src/sdk/event_context.ts
@@ -1,39 +1,34 @@
-import type { UntypedSchemaDef } from '../server/schema.ts';
 import type { DbContext } from './db_context';
 import type { Event } from './event.ts';
 import type { ReducerEvent } from './reducer_event.ts';
-import type { UntypedReducersDef } from './reducers.ts';
+import type { UntypedRemoteModule } from './spacetime_module.ts';
 
-export type UntypedEventContext = EventContextInterface<UntypedSchemaDef, UntypedReducersDef>;
+export type UntypedEventContext = EventContextInterface<UntypedRemoteModule>;
 
 export interface EventContextInterface<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
-> extends DbContext<SchemaDef, Reducers> {
+  RemoteModule extends UntypedRemoteModule,
+> extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
-  event: Event<Reducers['reducers'][number]>;
+  event: Event<RemoteModule['reducers'][number]>;
 }
 
 export interface ReducerEventContextInterface<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
-> extends DbContext<SchemaDef, Reducers> {
+  RemoteModule extends UntypedRemoteModule,
+> extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
-  event: ReducerEvent<Reducers['reducers'][number]>;
+  event: ReducerEvent<RemoteModule['reducers'][number]>;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface SubscriptionEventContextInterface<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
-> extends DbContext<SchemaDef, Reducers> {
+  RemoteModule extends UntypedRemoteModule,
+> extends DbContext<RemoteModule> {
   /** No event is provided **/
 }
 
 export interface ErrorContextInterface<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
-> extends DbContext<SchemaDef, Reducers> {
+  RemoteModule extends UntypedRemoteModule,
+> extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
   event?: Error;
 }
diff --git a/crates/bindings-typescript/src/sdk/spacetime_module.ts b/crates/bindings-typescript/src/sdk/spacetime_module.ts
index 72ad623703e..f9326331198 100644
--- a/crates/bindings-typescript/src/sdk/spacetime_module.ts
+++ b/crates/bindings-typescript/src/sdk/spacetime_module.ts
@@ -1,44 +1,18 @@
-import type { AlgebraicType } from '../';
 import type { UntypedSchemaDef } from '../server/schema';
-import type { DbConnectionImpl } from './db_connection_impl';
 import type { UntypedReducersDef } from './reducers';
 
-export interface TableRuntimeTypeInfo {
-  tableName: string;
-  rowType: AlgebraicType;
-  primaryKey?: string;
-  primaryKeyInfo?: PrimaryKeyInfo;
-}
-
-export interface PrimaryKeyInfo {
-  colName: string;
-  colType: AlgebraicType;
-}
-
-export interface ReducerRuntimeTypeInfo {
-  reducerName: string;
-  argsType: AlgebraicType;
-}
-
-export type RemoteModule2<SchemaDef extends UntypedSchemaDef, ReducersDef extends UntypedReducersDef, CLI extends string = string> = {
+export type RemoteModule<
+  SchemaDef extends UntypedSchemaDef,
+  ReducersDef extends UntypedReducersDef,
+  CLI extends string = string
+> = SchemaDef & ReducersDef & {
   versionInfo: {
     cliVersion: CLI;
   };
-  tables: SchemaDef;
-  reducers: ReducersDef;
 }
 
-export interface RemoteModule<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
-  tables: { [name: string]: TableRuntimeTypeInfo };
-  reducers: { [name: string]: ReducerRuntimeTypeInfo };
-  eventContextConstructor: (imp: DbConnectionImpl<SchemaDef, Reducers>, event: any) => any;
-  dbViewConstructor: (connection: DbConnectionImpl<SchemaDef, Reducers>) => any;
-  reducersConstructor: (
-    connection: DbConnectionImpl<SchemaDef, Reducers>,
-    setReducerFlags: any
-  ) => any;
-  setReducerFlagsConstructor: () => any;
-  versionInfo?: {
-    cliVersion: string;
-  };
-}
+export type UntypedRemoteModule = RemoteModule<UntypedSchemaDef, UntypedReducersDef>;
+
+export type SchemaDef<RemoteModule extends UntypedRemoteModule> = RemoteModule['tables'];
+
+export type ReducersDef<RemoteModule extends UntypedRemoteModule> = RemoteModule['reducers'];
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts b/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
index a0856367b7b..842e055b791 100644
--- a/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
+++ b/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
@@ -1,24 +1,22 @@
-import type { UntypedSchemaDef } from '../server/schema';
 import type { DbConnectionImpl } from './db_connection_impl';
 import type {
   ErrorContextInterface,
   SubscriptionEventContextInterface,
 } from './event_context';
 import { EventEmitter } from './event_emitter';
-import type { UntypedReducersDef } from './reducers';
+import type { UntypedRemoteModule } from './spacetime_module';
 
 export class SubscriptionBuilderImpl<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
 > {
   #onApplied?: (
-    ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
+    ctx: SubscriptionEventContextInterface<RemoteModule>
   ) => void = undefined;
   #onError?: (
-    ctx: ErrorContextInterface<SchemaDef, Reducers>
+    ctx: ErrorContextInterface<RemoteModule>
   ) => void = undefined;
   constructor(
-    private db: DbConnectionImpl<SchemaDef, Reducers>
+    private db: DbConnectionImpl<RemoteModule>
   ) {}
 
   /**
@@ -38,9 +36,9 @@ export class SubscriptionBuilderImpl<
    */
   onApplied(
     cb: (
-      ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
+      ctx: SubscriptionEventContextInterface<RemoteModule>
     ) => void
-  ): SubscriptionBuilderImpl<SchemaDef, Reducers> {
+  ): SubscriptionBuilderImpl<RemoteModule> {
     this.#onApplied = cb;
     return this;
   }
@@ -66,8 +64,8 @@ export class SubscriptionBuilderImpl<
    * @returns The current `SubscriptionBuilder` instance.
    */
   onError(
-    cb: (ctx: ErrorContextInterface<SchemaDef, Reducers>) => void
-  ): SubscriptionBuilderImpl<SchemaDef, Reducers> {
+    cb: (ctx: ErrorContextInterface<RemoteModule>) => void
+  ): SubscriptionBuilderImpl<RemoteModule> {
     this.#onError = cb;
     return this;
   }
@@ -90,7 +88,7 @@ export class SubscriptionBuilderImpl<
    */
   subscribe(
     query_sql: string | string[]
-  ): SubscriptionHandleImpl<SchemaDef, Reducers> {
+  ): SubscriptionHandleImpl<RemoteModule> {
     const queries = Array.isArray(query_sql) ? query_sql : [query_sql];
     if (queries.length === 0) {
       throw new Error('Subscriptions must have at least one query');
@@ -127,16 +125,15 @@ export class SubscriptionBuilderImpl<
 
 export type SubscribeEvent = 'applied' | 'error' | 'end';
 
-export class SubscriptionManager<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> {
+export class SubscriptionManager<RemoteModule extends UntypedRemoteModule> {
   subscriptions: Map<
     number,
-    { handle: SubscriptionHandleImpl<SchemaDef, Reducers>; emitter: EventEmitter<SubscribeEvent> }
+    { handle: SubscriptionHandleImpl<RemoteModule>; emitter: EventEmitter<SubscribeEvent> }
   > = new Map();
 }
 
 export class SubscriptionHandleImpl<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
 > {
   #queryId: number;
   #unsubscribeCalled: boolean = false;
@@ -146,23 +143,20 @@ export class SubscriptionHandleImpl<
     new EventEmitter();
 
   constructor(
-    private db: DbConnectionImpl<SchemaDef, Reducers>,
+    private db: DbConnectionImpl<RemoteModule>,
     querySql: string[],
     onApplied?: (
-      ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
+      ctx: SubscriptionEventContextInterface<RemoteModule>
     ) => void,
     onError?: (
-      ctx: ErrorContextInterface<SchemaDef, Reducers>,
+      ctx: ErrorContextInterface<RemoteModule>,
       error: Error
     ) => void
   ) {
     this.#emitter.on(
       'applied',
       (
-        ctx: SubscriptionEventContextInterface<
-          SchemaDef,
-          Reducers
-        >
+        ctx: SubscriptionEventContextInterface<RemoteModule>
       ) => {
         this.#activeState = true;
         if (onApplied) {
@@ -173,7 +167,7 @@ export class SubscriptionHandleImpl<
     this.#emitter.on(
       'error',
       (
-        ctx: ErrorContextInterface<SchemaDef, Reducers>,
+        ctx: ErrorContextInterface<RemoteModule>,
         error: Error
       ) => {
         this.#activeState = false;
@@ -200,10 +194,7 @@ export class SubscriptionHandleImpl<
     this.#emitter.on(
       'end',
       (
-        _ctx: SubscriptionEventContextInterface<
-          SchemaDef,
-          Reducers
-        >
+        _ctx: SubscriptionEventContextInterface<RemoteModule>
       ) => {
         this.#endedState = true;
         this.#activeState = false;
@@ -223,7 +214,7 @@ export class SubscriptionHandleImpl<
    */
   unsubscribeThen(
     onEnd: (
-      ctx: SubscriptionEventContextInterface<SchemaDef, Reducers>
+      ctx: SubscriptionEventContextInterface<RemoteModule>
     ) => void
   ): void {
     if (this.#endedState) {
@@ -237,10 +228,7 @@ export class SubscriptionHandleImpl<
     this.#emitter.on(
       'end',
       (
-        ctx: SubscriptionEventContextInterface<
-          SchemaDef,
-          Reducers
-        >
+        ctx: SubscriptionEventContextInterface<RemoteModule>
       ) => {
         this.#endedState = true;
         this.#activeState = false;
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index cd79debf72e..53521530beb 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -1,13 +1,11 @@
 import { EventEmitter } from './event_emitter.ts';
-import type { TableRuntimeTypeInfo } from './spacetime_module.ts';
 
 import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
 import type { EventContextInterface, ClientTable } from './index.ts';
 import type { RowType, Table, UntypedTableDef } from '../server/table.ts';
-import type { UntypedSchemaDef } from '../server/schema.ts';
-import type { UntypedReducersDef } from './reducers.ts';
 import type { ClientTableCore } from './table_handle.ts';
+import type { UntypedRemoteModule } from './spacetime_module.ts';
 
 export type Operation<
   RowType extends Record<string, any> = Record<string, any>,
@@ -35,10 +33,9 @@ export type PendingCallback = {
  * Builder to generate calls to query a `table` in the database
  */
 export class TableCache<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
   TableDef extends UntypedTableDef,
-> implements ClientTableCore<SchemaDef, Reducers, TableDef> {
+> implements ClientTableCore<RemoteModule, TableDef> {
   private rows: Map<ComparablePrimitive, [RowType<TableDef>, number]>;
   private tableDef: TableDef;
   private emitter: EventEmitter<'insert' | 'delete' | 'update'>;
@@ -84,7 +81,7 @@ export class TableCache<
 
   applyOperations = (
     operations: Operation<RowType<TableDef>>[],
-    ctx: EventContextInterface<SchemaDef, Reducers>
+    ctx: EventContextInterface<RemoteModule>
   ): PendingCallback[] => {
     const pendingCallbacks: PendingCallback[] = [];
     // TODO: performance
@@ -157,7 +154,7 @@ export class TableCache<
   };
 
   update = (
-    ctx: EventContextInterface<SchemaDef, Reducers>,
+    ctx: EventContextInterface<RemoteModule>,
     rowId: ComparablePrimitive,
     newRow: RowType<TableDef>,
     refCountDelta: number = 0
@@ -205,7 +202,7 @@ export class TableCache<
   };
 
   insert = (
-    ctx: EventContextInterface<SchemaDef, Reducers>,
+    ctx: EventContextInterface<RemoteModule>,
     operation: Operation<RowType<TableDef>>,
     count: number = 1
   ): PendingCallback | undefined => {
@@ -228,7 +225,7 @@ export class TableCache<
   };
 
   delete = (
-    ctx: EventContextInterface<SchemaDef, Reducers>,
+    ctx: EventContextInterface<RemoteModule>,
     operation: Operation<RowType<TableDef>>,
     count: number = 1
   ): PendingCallback | undefined => {
@@ -273,7 +270,7 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onInsert = (
-    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.on('insert', cb);
   };
@@ -294,7 +291,7 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onDelete = (
-    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.on('delete', cb);
   };
@@ -315,7 +312,7 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onUpdate = (
-    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.on('update', cb);
   };
@@ -326,7 +323,7 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnInsert = (
-    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.off('insert', cb);
   };
@@ -337,7 +334,7 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnDelete = (
-    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.off('delete', cb);
   };
@@ -348,7 +345,7 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnUpdate = (
-    cb: (ctx: EventContextInterface<SchemaDef, Reducers>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
   ): void => {
     this.emitter.off('update', cb);
   };
diff --git a/crates/bindings-typescript/src/sdk/table_handle.ts b/crates/bindings-typescript/src/sdk/table_handle.ts
index 757caae4e80..9751d8edc96 100644
--- a/crates/bindings-typescript/src/sdk/table_handle.ts
+++ b/crates/bindings-typescript/src/sdk/table_handle.ts
@@ -1,36 +1,34 @@
 import type { ReadonlyIndexes } from "../server/indexes";
-import type { UntypedSchemaDef } from "../server/schema";
 import type { ReadonlyTableMethods, RowType, TableIndexes, UntypedTableDef } from "../server/table";
 import type { Prettify } from "../server/type_util";
 import type { EventContextInterface } from "./event_context";
-import type { UntypedReducersDef } from "./reducers";
+import type { UntypedRemoteModule } from "./spacetime_module";
 
 export type ClientTableMethods<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
   TableDef extends UntypedTableDef,
 > = {
   /**
    * Registers a callback to be invoked when a row is inserted into the table.
    */
-  onInsert(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+  onInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
 
   /**
    *  Removes a previously registered insert event listener. 
    * @param cb The callback to remove from the insert event listeners.
    */
-  removeOnInsert(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+  removeOnInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
 
   /**
    * Registers a callback to be invoked when a row is deleted from the table.
    */
-  onDelete(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+  onDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
 
   /**
    * Removes a previously registered delete event listener.
    * @param cb The callback to remove from the delete event listeners.
    */
-  removeOnDelete(cb: (ctx: EventContextInterface<SchemaDef, Reducers>, row: RowType<TableDef>) => void): void;
+  removeOnDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
 };
 
 /**
@@ -41,11 +39,10 @@ export type ClientTableMethods<
  * - AIO: auto-increment overflow error type (never if none)
  */
 export type ClientTable<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
   TableDef extends UntypedTableDef
 > = Prettify<
-  ClientTableCore<SchemaDef, Reducers, TableDef> &
+  ClientTableCore<RemoteModule, TableDef> &
   ReadonlyIndexes<TableDef, TableIndexes<TableDef>>
 >;
 
@@ -54,19 +51,17 @@ export type ClientTable<
  * Includes only staticly known methods.
  */
 export type ClientTableCore<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
   TableDef extends UntypedTableDef,
 > =
   ReadonlyTableMethods<TableDef> &
-  ClientTableMethods<SchemaDef, Reducers, TableDef>;
+  ClientTableMethods<RemoteModule, TableDef>;
 
 /**
  * Client database view, mapping table names to their corresponding ClientTable handles.
  */
 export type ClientDbView<
-  SchemaDef extends UntypedSchemaDef,
-  Reducers extends UntypedReducersDef,
+  RemoteModule extends UntypedRemoteModule,
 > = {
-  readonly [Tbl in SchemaDef['tables'][number] as Tbl['name']]: ClientTable<SchemaDef, Reducers, Tbl>;
+  readonly [Tbl in RemoteModule['tables'][number] as Tbl['name']]: ClientTable<RemoteModule, Tbl>;
 };
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/server/db_view.ts b/crates/bindings-typescript/src/server/db_view.ts
index 3ba53c0da55..ad8e540d192 100644
--- a/crates/bindings-typescript/src/server/db_view.ts
+++ b/crates/bindings-typescript/src/server/db_view.ts
@@ -1,5 +1,5 @@
 import type { ClientTable } from "../sdk";
-import type { UntypedReducersDef } from "../sdk/reducers";
+import type { UntypedRemoteModule } from "../sdk/spacetime_module";
 import type { UntypedSchemaDef } from "./schema";
 import type { ReadonlyTable, Table } from "./table";
 
@@ -13,8 +13,8 @@ export type ReadonlyDbView<SchemaDef extends UntypedSchemaDef> = {
 /**
  * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
  */
-export type ClientDbView<SchemaDef extends UntypedSchemaDef, Reducers extends UntypedReducersDef> = {
-  readonly [Tbl in SchemaDef['tables'][number] as Tbl['accessorName']]: ClientTable<SchemaDef, Reducers, Tbl>;
+export type ClientDbView<RemoteModule extends UntypedRemoteModule> = {
+  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<RemoteModule, Tbl>;
 };
 
 /**
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 908c9243607..09683ccc7fa 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -57,7 +57,7 @@ import { schema } from '../../../src/server/schema.ts';
 import t from '../../../src/server/type_builders.ts';
 import { table } from '../../../src/server/table.ts';
 import { reducerSchema, reducers } from '../../../src/server/reducers.ts';
-import { RemoteModule2 } from '../../../src/sdk/spacetime_module.ts';
+import { RemoteModule } from '../../../src/sdk/spacetime_module.ts';
 export { User };
 
 const pointType = t.object('Point', {
@@ -97,47 +97,41 @@ const REMOTE_MODULE = {
   versionInfo: {
     cliVersion: '1.6.0' as const,
   },
-  tables: tablesSchema.schemaType,
-  reducers: reducersSchema.reducersType,
-} satisfies RemoteModule2<
+  tables: tablesSchema.schemaType.tables,
+  reducers: reducersSchema.reducersType.reducers,
+} satisfies RemoteModule<
   typeof tablesSchema.schemaType,
   typeof reducersSchema.reducersType
 >;
 
 export type EventContext = __EventContextInterface<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType
+  typeof REMOTE_MODULE
 >;
 
 export type ReducerEventContext = __ReducerEventContextInterface<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType
+  typeof REMOTE_MODULE
 >;
 
 export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType
+  typeof REMOTE_MODULE
 >;
 
 export type ErrorContext = __ErrorContextInterface<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType
+  typeof REMOTE_MODULE
 >;
 
 export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType
+  typeof REMOTE_MODULE
 > {}
 
 export class DbConnectionBuilder extends __DbConnectionBuilder<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType,
+  typeof REMOTE_MODULE,
   DbConnection
 > {};
 
-export class DbConnection extends __DbConnectionImpl<typeof tablesSchema.schemaType, typeof reducersSchema.reducersType> {
+export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
   static builder = (): DbConnectionBuilder => {
-    return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof tablesSchema.schemaType, typeof reducersSchema.reducersType>) => new DbConnection(config));
+    return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));
   };
   subscriptionBuilder = (): SubscriptionBuilder => {
     return new SubscriptionBuilder(this);
diff --git a/crates/bindings-typescript/tests/table_cache.test.ts b/crates/bindings-typescript/tests/table_cache.test.ts
index eef948ba6be..f5961e9a4fd 100644
--- a/crates/bindings-typescript/tests/table_cache.test.ts
+++ b/crates/bindings-typescript/tests/table_cache.test.ts
@@ -1,5 +1,4 @@
 import { type Operation, TableCache } from '../src/sdk/table_cache';
-import type { TableRuntimeTypeInfo } from '../src/sdk/spacetime_module';
 import { describe, expect, test } from 'vitest';
 
 import { Player } from '../test-app/src/module_bindings/player_type.ts';

From 541f493fb18da5c93c321b410785042f2cbfe463 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 2 Nov 2025 22:09:01 -0500
Subject: [PATCH 03/23] Smaller fixes

---
 .../src/react/SpacetimeDBProvider.ts          | 25 ++++++++---------
 .../src/react/connection_state.ts             |  3 +-
 .../src/react/useReducer.ts                   | 28 ++++++++++---------
 .../src/react/useSpacetimeDB.ts               |  7 +++--
 .../bindings-typescript/src/react/useTable.ts | 16 +++++------
 .../src/sdk/db_connection_impl.ts             | 10 +++----
 .../bindings-typescript/src/sdk/db_context.ts |  6 ++--
 7 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
index 6899bed3610..7ddd5b95981 100644
--- a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
+++ b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
@@ -8,26 +8,25 @@ import * as React from 'react';
 import { SpacetimeDBContext } from './useSpacetimeDB';
 import type { ConnectionState } from './connection_state';
 import { ConnectionId } from '../lib/connection_id';
+import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
 export interface SpacetimeDBProviderProps<
-  DbConnection extends DbConnectionImpl,
-  ErrorContext extends ErrorContextInterface,
-  SubscriptionEventContext extends SubscriptionEventContextInterface,
+  RemoteModule extends UntypedRemoteModule,
+  DbConnection extends DbConnectionImpl<RemoteModule>,
 > {
-  connectionBuilder: DbConnectionBuilder<DbConnection, ErrorContext, SubscriptionEventContext>;
+  connectionBuilder: DbConnectionBuilder<RemoteModule, DbConnection>;
   children?: React.ReactNode;
 }
 
 export function SpacetimeDBProvider<
-  DbConnection extends DbConnectionImpl,
-  ErrorContext extends ErrorContextInterface,
-  SubscriptionEventContext extends SubscriptionEventContextInterface,
->({ connectionBuilder, children }: SpacetimeDBProviderProps<DbConnection, ErrorContext, SubscriptionEventContext>) {
+  RemoteModule extends UntypedRemoteModule,
+  DbConnection extends DbConnectionImpl<RemoteModule>,
+>({ connectionBuilder, children }: SpacetimeDBProviderProps<RemoteModule, DbConnection>) {
   // Holds the imperative connection instance when (and only when) we’re on the client.
   const connRef = React.useRef<DbConnection | null>(null);
   const getConnection = React.useCallback(() => connRef.current, []);
 
-  const [state, setState] = React.useState<ConnectionState<DbConnection>>({
+  const [state, setState] = React.useState<ConnectionState<RemoteModule, DbConnection>>({
     isActive: false,
     identity: undefined,
     token: undefined,
@@ -39,7 +38,7 @@ export function SpacetimeDBProvider<
   // Build on the client only; useEffect won't run during SSR.
   React.useEffect(() => {
     // Register callback for onConnect to update state
-      const onConnect = (conn: DbConnectionImpl) => {
+      const onConnect = (conn: DbConnectionImpl<RemoteModule>) => {
       setState(s => ({
         ...s,
         isActive: conn.isActive,
@@ -48,13 +47,13 @@ export function SpacetimeDBProvider<
         connectionId: conn.connectionId,
       }));
     };
-    const onDisconnect = (ctx: ErrorContextInterface) => {
+    const onDisconnect = (ctx: ErrorContextInterface<RemoteModule>) => {
       setState(s => ({
         ...s,
         isActive: ctx.isActive,
       }));
     };
-    const onConnectError = (ctx: ErrorContextInterface, err: Error) => {
+    const onConnectError = (ctx: ErrorContextInterface<RemoteModule>, err: Error) => {
       setState(s => ({
         ...s,
         isActive: ctx.isActive,
@@ -76,7 +75,7 @@ export function SpacetimeDBProvider<
 
     // Lazily build once
     if (!connRef.current) {
-      connRef.current = connectionBuilder.build();
+      connRef.current = connectionBuilder.build() as DbConnection;
     }
 
     return () => {
diff --git a/crates/bindings-typescript/src/react/connection_state.ts b/crates/bindings-typescript/src/react/connection_state.ts
index 4f45c6b902e..6d63e91d693 100644
--- a/crates/bindings-typescript/src/react/connection_state.ts
+++ b/crates/bindings-typescript/src/react/connection_state.ts
@@ -1,8 +1,9 @@
 import type { ConnectionId } from "../lib/connection_id";
 import type { Identity } from "../lib/identity";
 import type { DbConnectionImpl } from "../sdk/db_connection_impl";
+import type { UntypedRemoteModule } from "../sdk/spacetime_module";
 
-export type ConnectionState<DbConnection extends DbConnectionImpl> = {
+export type ConnectionState<DbConnection extends DbConnectionImpl<UntypedRemoteModule>> = {
   isActive: boolean;
   identity?: Identity;
   token?: string;
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index dab84320ed2..b7684234b46 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -1,17 +1,19 @@
 import type { DbConnectionImpl } from "../sdk/db_connection_impl";
 import type { ReducerNamesFromReducers } from "../sdk/reducer_handle";
+import type { UntypedRemoteModule } from "../sdk/spacetime_module";
 import { useSpacetimeDB } from "./useSpacetimeDB";
 
-// export function useReducer<
-//   DbConnection extends DbConnectionImpl,
-//   ReducerName extends ReducerNamesFromReducers<DbConnection['reducers']> = ReducerNamesFromReducers<
-//     DbConnection['reducers']
-//   >,
-//   ReducerType = DbConnection['reducers'][ReducerName & keyof DbConnection['reducers']]
-// >(
-//   reducerName: ReducerName,
-// ): ReducerType {
-//     const connectionState = useSpacetimeDB<DbConnection>();
-//     const connection = connectionState.getConnection()!;
-//     return connection.reducers[reducerName as keyof typeof connection.reducers];
-// }
\ No newline at end of file
+export function useReducer<
+  RemoteModule extends UntypedRemoteModule,
+  DbConnection extends DbConnectionImpl<RemoteModule>,
+  ReducerName extends ReducerNamesFromReducers<DbConnection['reducers']> = ReducerNamesFromReducers<
+    DbConnection['reducers']
+  >,
+  ReducerType = DbConnection['reducers'][ReducerName & keyof DbConnection['reducers']]
+>(
+  reducerName: ReducerName,
+): ReducerType {
+    const connectionState = useSpacetimeDB<RemoteModule, DbConnection>();
+    const connection = connectionState.getConnection()!;
+    return connection.reducers[reducerName as keyof typeof connection.reducers];
+}
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/useSpacetimeDB.ts b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
index 17f180b9878..c0421a2ffd2 100644
--- a/crates/bindings-typescript/src/react/useSpacetimeDB.ts
+++ b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
@@ -1,13 +1,14 @@
 import { createContext, useContext } from 'react';
 import type { DbConnectionImpl } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
+import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
-export const SpacetimeDBContext = createContext<ConnectionState<DbConnectionImpl> | undefined>(undefined);
+export const SpacetimeDBContext = createContext<ConnectionState<UntypedRemoteModule, DbConnectionImpl<UntypedRemoteModule>> | undefined>(undefined);
 
 // Throws an error if used outside of a SpacetimeDBProvider
 // Error is caught by other hooks like useTable so they can provide better error messages
-export function useSpacetimeDB<DbConnection extends DbConnectionImpl>(): ConnectionState<DbConnection> {
-  const context = useContext(SpacetimeDBContext) as ConnectionState<DbConnection> | undefined;
+export function useSpacetimeDB<DbConnection extends DbConnectionImpl<UntypedRemoteModule>>(): ConnectionState<UntypedRemoteModule, DbConnection> {
+  const context = useContext(SpacetimeDBContext) as ConnectionState<UntypedRemoteModule, DbConnection> | undefined;
   if (!context) {
     throw new Error(
       'useSpacetimeDB must be used within a SpacetimeDBProvider component. Did you forget to add a `SpacetimeDBProvider` to your component tree?'
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index 5c81fdf2ed4..6a7f0f48782 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -9,6 +9,7 @@ import { useSpacetimeDB } from './useSpacetimeDB';
 import { DbConnectionImpl, TableCache } from '../sdk/db_connection_impl';
 import type { TableNamesFromDb } from '../sdk/table_handle';
 import type { ConnectionState } from './connection_state';
+import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
 export interface UseQueryCallbacks<RowType> {
   onInsert?: (row: RowType) => void;
@@ -212,7 +213,7 @@ type ColumnsFromRow<R> = {
  * ```
  */
 export function useTable<
-  DbConnection extends DbConnectionImpl,
+  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
   RowType extends Record<string, any>,
   TableName extends TableNamesFromDb<DbConnection['db']> = TableNamesFromDb<
     DbConnection['db']
@@ -257,7 +258,7 @@ export function useTable<
  * ```
  */
 export function useTable<
-  DbConnection extends DbConnectionImpl,
+  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
   RowType extends Record<string, any>,
   TableName extends TableNamesFromDb<DbConnection['db']> = TableNamesFromDb<
     DbConnection['db']
@@ -268,8 +269,7 @@ export function useTable<
 ): Snapshot<RowType>;
 
 export function useTable<
-  DbConnection extends DbConnectionImpl,
-  RowType extends Record<string, any>,
+  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
   TableName extends TableNamesFromDb<DbConnection['db']> = TableNamesFromDb<
     DbConnection['db']
   >,
@@ -320,10 +320,10 @@ export function useTable<
     }
     const table = connection.db[
       tableName as keyof typeof connection.db
-    ] as unknown as TableCache<RowType>;
+    ];
     const result: readonly RowType[] = whereClause
-      ? table.iter().filter(row => evaluate(whereClause, row))
-      : table.iter();
+      ? Array.from(table.iter()).filter(row => evaluate(whereClause, row))
+      : Array.from(table.iter());
     return {
       rows: result,
       state: subscribeApplied ? 'ready' : 'loading',
@@ -412,7 +412,7 @@ export function useTable<
 
       const table = connection.db[
         tableName as keyof typeof connection.db
-      ] as unknown as TableCache<RowType>;
+      ];
       table.onInsert(onInsert);
       table.onDelete(onDelete);
       table.onUpdate?.(onUpdate);
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index fc270ac69ef..12bf41202f7 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -52,7 +52,7 @@ import {
 import { stdbLogger } from './logger.ts';
 import { fromByteArray } from 'base64-js';
 import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
-import type { DbView } from '../server/db_view.ts';
+import type { ClientDbView, DbView } from '../server/db_view.ts';
 import type { UntypedTableDef } from '../server/table.ts';
 import { toCamelCase } from '../server/runtime.ts';
 
@@ -123,7 +123,7 @@ export class DbConnectionImpl<
    * The accessor field to access the tables in the database and associated
    * callback functions.
    */
-  db: DbView<RemoteModule>;
+  db: ClientDbView<RemoteModule>;
 
   /**
    * The accessor field to access the reducers in the database and associated
@@ -236,11 +236,11 @@ export class DbConnectionImpl<
     return queryId;
   };
 
-  #makeDbView(def: RemoteModule): DbView<RemoteModule> {
-    const view = Object.create(null) as DbView<RemoteModule>;
+  #makeDbView(def: RemoteModule): ClientDbView<RemoteModule> {
+    const view = Object.create(null) as ClientDbView<RemoteModule>;
 
     for (const tbl of def.tables) {
-      // DbView uses this name verbatim
+      // ClientDbView uses this name verbatim
       const key = tbl.accessorName; 
       Object.defineProperty(view, key, {
         enumerable: true,
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index cb7f76579a1..2816b76b8d4 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -1,6 +1,6 @@
-import type { DbView } from '../server/db_view';
+import type { ClientDbView } from '../server/db_view';
 import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers';
-import type { SchemaDef, UntypedRemoteModule } from './spacetime_module';
+import type { UntypedRemoteModule } from './spacetime_module';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
 
 /**
@@ -11,7 +11,7 @@ import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
  * @template SetReducerFlags - Type representing the reducer flags collection.
  */
 export interface DbContext<RemoteModule extends UntypedRemoteModule> {
-  db: DbView<RemoteModule>;
+  db: ClientDbView<RemoteModule>;
   reducers: ReducersView<RemoteModule>;
   setReducerFlags: SetReducerFlags<RemoteModule>;
   isActive: boolean;

From 5da15d8dc4eb20998ce93b5fa25ba34bea9ce954 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Mon, 3 Nov 2025 09:33:56 -0500
Subject: [PATCH 04/23] Cleaning up where code lives

---
 .../src/{server => lib}/constraints.ts        |   0
 .../src/{server => lib}/indexes.ts            |   2 +-
 .../src/{server => lib}/reducers.ts           |  14 +-
 .../src/{server => lib}/schema.ts             |  56 +++----
 .../src/{server => lib}/table.ts              |  12 +-
 .../{server => lib}/type_builders.test-d.ts   |   0
 .../src/{server => lib}/type_builders.ts      |   4 +-
 .../src/{server => lib}/type_util.ts          |   0
 crates/bindings-typescript/src/lib/utils.ts   |  10 ++
 .../src/sdk/client_cache.ts                   |   4 +-
 .../sdk/{table_handle.ts => client_table.ts}  |   6 +-
 .../src/sdk/db_connection_impl.ts             |   7 +-
 .../bindings-typescript/src/sdk/db_context.ts |   2 +-
 crates/bindings-typescript/src/sdk/db_view.ts |  17 +--
 .../bindings-typescript/src/sdk/reducers.ts   |   4 +-
 .../src/sdk/spacetime_module.ts               |   2 +-
 .../src/sdk/table_cache.ts                    |   5 +-
 .../bindings-typescript/src/server/db_view.ts |  13 +-
 .../bindings-typescript/src/server/index.ts   |  10 +-
 .../bindings-typescript/src/server/runtime.ts |  19 +--
 .../test-app/src/module_bindings/index.ts     |   6 +-
 .../src/module_bindings/player_type.ts        |   8 +
 .../bindings-typescript/tests/index.test.ts   |   2 +-
 crates/codegen/src/typescript.rs              | 141 ++++++++++++++++++
 24 files changed, 240 insertions(+), 104 deletions(-)
 rename crates/bindings-typescript/src/{server => lib}/constraints.ts (100%)
 rename crates/bindings-typescript/src/{server => lib}/indexes.ts (99%)
 rename crates/bindings-typescript/src/{server => lib}/reducers.ts (96%)
 rename crates/bindings-typescript/src/{server => lib}/schema.ts (97%)
 rename crates/bindings-typescript/src/{server => lib}/table.ts (95%)
 rename crates/bindings-typescript/src/{server => lib}/type_builders.test-d.ts (100%)
 rename crates/bindings-typescript/src/{server => lib}/type_builders.ts (99%)
 rename crates/bindings-typescript/src/{server => lib}/type_util.ts (100%)
 rename crates/bindings-typescript/src/sdk/{table_handle.ts => client_table.ts} (93%)

diff --git a/crates/bindings-typescript/src/server/constraints.ts b/crates/bindings-typescript/src/lib/constraints.ts
similarity index 100%
rename from crates/bindings-typescript/src/server/constraints.ts
rename to crates/bindings-typescript/src/lib/constraints.ts
diff --git a/crates/bindings-typescript/src/server/indexes.ts b/crates/bindings-typescript/src/lib/indexes.ts
similarity index 99%
rename from crates/bindings-typescript/src/server/indexes.ts
rename to crates/bindings-typescript/src/lib/indexes.ts
index f85bd92cbe2..5c93c9aac9b 100644
--- a/crates/bindings-typescript/src/server/indexes.ts
+++ b/crates/bindings-typescript/src/lib/indexes.ts
@@ -1,7 +1,7 @@
 import type { RowType, UntypedTableDef } from './table';
 import type { ColumnMetadata, IndexTypes } from './type_builders';
 import type { CollapseTuple, Prettify } from './type_util';
-import { Range } from './range';
+import { Range } from '../server/range';
 import type { ColumnIsUnique } from './constraints';
 
 /**
diff --git a/crates/bindings-typescript/src/server/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
similarity index 96%
rename from crates/bindings-typescript/src/server/reducers.ts
rename to crates/bindings-typescript/src/lib/reducers.ts
index 55233d5a5b1..e6c1b767a04 100644
--- a/crates/bindings-typescript/src/server/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -1,11 +1,11 @@
-import type { ProductType } from '../lib/algebraic_type';
-import Lifecycle from '../lib/autogen/lifecycle_type';
-import type RawReducerDefV9 from '../lib/autogen/raw_reducer_def_v_9_type';
-import type { ConnectionId } from '../lib/connection_id';
-import type { Identity } from '../lib/identity';
-import type { Timestamp } from '../lib/timestamp';
+import type { ProductType } from './algebraic_type';
+import Lifecycle from './autogen/lifecycle_type';
+import type RawReducerDefV9 from './autogen/raw_reducer_def_v_9_type';
+import type { ConnectionId } from './connection_id';
+import type { Identity } from './identity';
+import type { Timestamp } from './timestamp';
 import type { UntypedReducersDef } from '../sdk/reducers';
-import type { DbView } from './db_view';
+import type { DbView } from '../server/db_view';
 import { MODULE_DEF, type UntypedSchemaDef } from './schema';
 import type {
   InferTypeOfRow,
diff --git a/crates/bindings-typescript/src/server/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
similarity index 97%
rename from crates/bindings-typescript/src/server/schema.ts
rename to crates/bindings-typescript/src/lib/schema.ts
index a8b775121e7..1a33c11473d 100644
--- a/crates/bindings-typescript/src/server/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -1,5 +1,5 @@
-import type RawTableDefV9 from '../lib/autogen/raw_table_def_v_9_type';
-import type Typespace from '../lib/autogen/typespace_type';
+import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
+import type Typespace from './autogen/typespace_type';
 import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type ColumnBuilder,
@@ -16,14 +16,37 @@ import {
   type ParamsObj,
   type Reducer,
 } from './reducers';
-import type RawModuleDefV9 from '../lib/autogen/raw_module_def_v_9_type';
+import type RawModuleDefV9 from './autogen/raw_module_def_v_9_type';
 import {
   AlgebraicType,
   type AlgebraicTypeVariants,
-} from '../lib/algebraic_type';
-import type RawScopedTypeNameV9 from '../lib/autogen/raw_scoped_type_name_v_9_type';
+} from './algebraic_type';
+import type RawScopedTypeNameV9 from './autogen/raw_scoped_type_name_v_9_type';
 import type { CamelCase } from './type_util';
 
+/**
+ * An untyped representation of the database schema.
+ */
+export type UntypedSchemaDef = {
+  tables: readonly UntypedTableDef[];
+};
+
+/**
+ * Helper type to convert an array of TableSchema into a schema definition
+ */
+type TablesToSchema<T extends readonly TableSchema<any, any, any>[]> = {
+  tables: {
+    /** @type {UntypedTableDef} */
+    readonly [i in keyof T]: {
+      name: T[i]['tableName'];
+      accessorName: CamelCase<T[i]['tableName']>;
+      columns: T[i]['rowType']['row'];
+      rowType: T[i]['rowSpacetimeType'];
+      indexes: T[i]['idxs'];
+    };
+  };
+};
+
 /**
  * The global module definition that gets populated by calls to `reducer()` and lifecycle hooks.
  */
@@ -72,29 +95,6 @@ export function splitName(name: string): RawScopedTypeNameV9 {
   return { name: scope.pop()!, scope };
 }
 
-/**
- * An untyped representation of the database schema.
- */
-export type UntypedSchemaDef = {
-  tables: readonly UntypedTableDef[];
-};
-
-/**
- * Helper type to convert an array of TableSchema into a schema definition
- */
-type TablesToSchema<T extends readonly TableSchema<any, any, any>[]> = {
-  tables: {
-    /** @type {UntypedTableDef} */
-    readonly [i in keyof T]: {
-      name: T[i]['tableName'];
-      accessorName: CamelCase<T[i]['tableName']>;
-      columns: T[i]['rowType']['row'];
-      rowType: T[i]['rowSpacetimeType'];
-      indexes: T[i]['idxs'];
-    };
-  };
-};
-
 /**
  * The Schema class represents the database schema for a SpacetimeDB application.
  * It encapsulates the table definitions and typespace, and provides methods to define
diff --git a/crates/bindings-typescript/src/server/table.ts b/crates/bindings-typescript/src/lib/table.ts
similarity index 95%
rename from crates/bindings-typescript/src/server/table.ts
rename to crates/bindings-typescript/src/lib/table.ts
index 96803cc1646..a4d4d9b5254 100644
--- a/crates/bindings-typescript/src/server/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -1,9 +1,9 @@
-import { AlgebraicType, ProductType } from '../lib/algebraic_type';
-import type RawConstraintDefV9 from '../lib/autogen/raw_constraint_def_v_9_type';
-import RawIndexAlgorithm from '../lib/autogen/raw_index_algorithm_type';
-import type RawIndexDefV9 from '../lib/autogen/raw_index_def_v_9_type';
-import type RawSequenceDefV9 from '../lib/autogen/raw_sequence_def_v_9_type';
-import type RawTableDefV9 from '../lib/autogen/raw_table_def_v_9_type';
+import { AlgebraicType, ProductType } from './algebraic_type';
+import type RawConstraintDefV9 from './autogen/raw_constraint_def_v_9_type';
+import RawIndexAlgorithm from './autogen/raw_index_algorithm_type';
+import type RawIndexDefV9 from './autogen/raw_index_def_v_9_type';
+import type RawSequenceDefV9 from './autogen/raw_sequence_def_v_9_type';
+import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
 import type { AllUnique } from './constraints';
 import type { ColumnIndex, IndexColumns, Indexes, IndexOpts, ReadonlyIndexes } from './indexes';
 import { MODULE_DEF, splitName } from './schema';
diff --git a/crates/bindings-typescript/src/server/type_builders.test-d.ts b/crates/bindings-typescript/src/lib/type_builders.test-d.ts
similarity index 100%
rename from crates/bindings-typescript/src/server/type_builders.test-d.ts
rename to crates/bindings-typescript/src/lib/type_builders.test-d.ts
diff --git a/crates/bindings-typescript/src/server/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
similarity index 99%
rename from crates/bindings-typescript/src/server/type_builders.ts
rename to crates/bindings-typescript/src/lib/type_builders.ts
index ab440838003..9ede6be0864 100644
--- a/crates/bindings-typescript/src/server/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -12,8 +12,8 @@ import {
   type TimeDurationAlgebraicType,
   type TimestampAlgebraicType,
 } from '..';
-import type { OptionAlgebraicType } from '../lib/option';
-import { addType, MODULE_DEF } from './schema';
+import type { OptionAlgebraicType } from './option';
+import { addType, MODULE_DEF } from '../server/schema';
 import type { CoerceRow } from './table';
 import { set, type Set } from './type_util';
 
diff --git a/crates/bindings-typescript/src/server/type_util.ts b/crates/bindings-typescript/src/lib/type_util.ts
similarity index 100%
rename from crates/bindings-typescript/src/server/type_util.ts
rename to crates/bindings-typescript/src/lib/type_util.ts
diff --git a/crates/bindings-typescript/src/lib/utils.ts b/crates/bindings-typescript/src/lib/utils.ts
index 0b09319dc53..dfb42ff23e6 100644
--- a/crates/bindings-typescript/src/lib/utils.ts
+++ b/crates/bindings-typescript/src/lib/utils.ts
@@ -1,5 +1,6 @@
 import BinaryReader from './binary_reader';
 import BinaryWriter from './binary_writer';
+import type { CamelCase } from './type_util';
 
 export function toPascalCase(s: string): string {
   const str = s.replace(/([-_][a-z])/gi, $1 => {
@@ -98,3 +99,12 @@ export function u256ToUint8Array(data: bigint): Uint8Array {
 export function u256ToHexString(data: bigint): string {
   return uint8ArrayToHexString(u256ToUint8Array(data));
 }
+
+/**
+ * Type safe conversion from a string like "some_identifier-name" to "someIdentifierName".
+ * @param str The string to convert
+ * @returns The converted string
+ */
+export function toCamelCase<T extends string>(str: T): CamelCase<T> {
+  return str.replace(/[-_]+(\w)/g, (_, c) => c.toUpperCase()) as CamelCase<T>;
+}
diff --git a/crates/bindings-typescript/src/sdk/client_cache.ts b/crates/bindings-typescript/src/sdk/client_cache.ts
index f410911c454..125a43ee99c 100644
--- a/crates/bindings-typescript/src/sdk/client_cache.ts
+++ b/crates/bindings-typescript/src/sdk/client_cache.ts
@@ -1,5 +1,5 @@
-import type { UntypedSchemaDef } from '../server/schema.ts';
-import type { UntypedTableDef } from '../server/table.ts';
+import type { UntypedSchemaDef } from '../lib/schema.ts';
+import type { UntypedTableDef } from '../lib/table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 import { TableCache } from './table_cache.ts';
 
diff --git a/crates/bindings-typescript/src/sdk/table_handle.ts b/crates/bindings-typescript/src/sdk/client_table.ts
similarity index 93%
rename from crates/bindings-typescript/src/sdk/table_handle.ts
rename to crates/bindings-typescript/src/sdk/client_table.ts
index 9751d8edc96..ca19165f639 100644
--- a/crates/bindings-typescript/src/sdk/table_handle.ts
+++ b/crates/bindings-typescript/src/sdk/client_table.ts
@@ -1,6 +1,6 @@
-import type { ReadonlyIndexes } from "../server/indexes";
-import type { ReadonlyTableMethods, RowType, TableIndexes, UntypedTableDef } from "../server/table";
-import type { Prettify } from "../server/type_util";
+import type { ReadonlyIndexes } from "../lib/indexes";
+import type { ReadonlyTableMethods, RowType, TableIndexes, UntypedTableDef } from "../lib/table";
+import type { Prettify } from "../lib/type_util";
 import type { EventContextInterface } from "./event_context";
 import type { UntypedRemoteModule } from "./spacetime_module";
 
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index 12bf41202f7..d2854f4f92f 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -1,7 +1,6 @@
 import { ConnectionId, ProductType } from '../';
 import {
   AlgebraicType,
-  type AlgebraicTypeVariants,
   type ComparablePrimitive,
 } from '../';
 import { parseValue } from '../';
@@ -52,9 +51,9 @@ import {
 import { stdbLogger } from './logger.ts';
 import { fromByteArray } from 'base64-js';
 import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
-import type { ClientDbView, DbView } from '../server/db_view.ts';
-import type { UntypedTableDef } from '../server/table.ts';
-import { toCamelCase } from '../server/runtime.ts';
+import type { ClientDbView } from './db_view.ts';
+import type { UntypedTableDef } from '../lib/table.ts';
+import { toCamelCase } from '../lib/utils.ts';
 
 export { DbConnectionBuilder, SubscriptionBuilderImpl, TableCache, type Event };
 
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index 2816b76b8d4..65c127d67d5 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -1,4 +1,4 @@
-import type { ClientDbView } from '../server/db_view';
+import type { ClientDbView } from './db_view';
 import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers';
 import type { UntypedRemoteModule } from './spacetime_module';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
diff --git a/crates/bindings-typescript/src/sdk/db_view.ts b/crates/bindings-typescript/src/sdk/db_view.ts
index 664fcbe2483..2d12c64326e 100644
--- a/crates/bindings-typescript/src/sdk/db_view.ts
+++ b/crates/bindings-typescript/src/sdk/db_view.ts
@@ -1,14 +1,9 @@
-import type { DbView } from "../server/db_view";
-import type { UntypedSchemaDef } from "../server/schema";
+import type { UntypedRemoteModule } from "./spacetime_module";
+import type { ClientTable } from "./table_handle";
 
 /**
- * An untyped database view, where the table names and row types are not known.
- * Each key is a camelCased version of the table name, and each value is an untyped table handle.
- * 
- * For example, a database with tables "user_profile" and "game_stats" would have the type:
- * {
- *   userProfile: TableHandle<"user_profile", any>;
- *   gameStats: TableHandle<"game_stats", any>;
- * }
+ * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
  */
-export type UntypedDbView = DbView<UntypedSchemaDef>;
\ No newline at end of file
+export type ClientDbView<RemoteModule extends UntypedRemoteModule> = {
+  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<RemoteModule, Tbl>;
+};
diff --git a/crates/bindings-typescript/src/sdk/reducers.ts b/crates/bindings-typescript/src/sdk/reducers.ts
index e25b805c97f..28a7b6804c8 100644
--- a/crates/bindings-typescript/src/sdk/reducers.ts
+++ b/crates/bindings-typescript/src/sdk/reducers.ts
@@ -1,6 +1,6 @@
 import type { ProductType } from "../lib/algebraic_type";
-import type { ParamsObj } from "../server/reducers";
-import type { CamelCase } from "../server/type_util";
+import type { ParamsObj } from "../lib/reducers";
+import type { CamelCase } from "../lib/type_util";
 import type { CallReducerFlags } from "./db_connection_impl";
 
 export type ReducersView<R extends UntypedReducersDef> = {
diff --git a/crates/bindings-typescript/src/sdk/spacetime_module.ts b/crates/bindings-typescript/src/sdk/spacetime_module.ts
index f9326331198..73f7d5fdca9 100644
--- a/crates/bindings-typescript/src/sdk/spacetime_module.ts
+++ b/crates/bindings-typescript/src/sdk/spacetime_module.ts
@@ -1,4 +1,4 @@
-import type { UntypedSchemaDef } from '../server/schema';
+import type { UntypedSchemaDef } from '../lib/schema';
 import type { UntypedReducersDef } from './reducers';
 
 export type RemoteModule<
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index 53521530beb..c87afc5e895 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -3,8 +3,8 @@ import { EventEmitter } from './event_emitter.ts';
 import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
 import type { EventContextInterface, ClientTable } from './index.ts';
-import type { RowType, Table, UntypedTableDef } from '../server/table.ts';
-import type { ClientTableCore } from './table_handle.ts';
+import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
+import type { ClientTableCore } from './client_table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 
 export type Operation<
@@ -29,6 +29,7 @@ export type PendingCallback = {
   table: string;
   cb: () => void;
 };
+
 /**
  * Builder to generate calls to query a `table` in the database
  */
diff --git a/crates/bindings-typescript/src/server/db_view.ts b/crates/bindings-typescript/src/server/db_view.ts
index ad8e540d192..43a4a284ed3 100644
--- a/crates/bindings-typescript/src/server/db_view.ts
+++ b/crates/bindings-typescript/src/server/db_view.ts
@@ -1,7 +1,5 @@
-import type { ClientTable } from "../sdk";
-import type { UntypedRemoteModule } from "../sdk/spacetime_module";
-import type { UntypedSchemaDef } from "./schema";
-import type { ReadonlyTable, Table } from "./table";
+import type { UntypedSchemaDef } from "../lib/schema";
+import type { ReadonlyTable, Table } from "../lib/table";
 
 /**
  * A type representing a read-only database view, mapping table names to their corresponding read-only Table handles.
@@ -10,13 +8,6 @@ export type ReadonlyDbView<SchemaDef extends UntypedSchemaDef> = {
   readonly [Tbl in SchemaDef['tables'][number] as Tbl['accessorName']]: ReadonlyTable<Tbl>;
 };
 
-/**
- * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
- */
-export type ClientDbView<RemoteModule extends UntypedRemoteModule> = {
-  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<RemoteModule, Tbl>;
-};
-
 /**
  * A type representing the database view, mapping table names to their corresponding Table handles.
  */
diff --git a/crates/bindings-typescript/src/server/index.ts b/crates/bindings-typescript/src/server/index.ts
index 6db590d7d07..903bb80ec73 100644
--- a/crates/bindings-typescript/src/server/index.ts
+++ b/crates/bindings-typescript/src/server/index.ts
@@ -1,10 +1,10 @@
-export * from './type_builders';
-export { schema, type InferSchema } from './schema';
-export { table } from './table';
-export { reducers } from './reducers';
+export * from '../lib/type_builders';
+export { schema, type InferSchema } from '../lib/schema';
+export { table } from '../lib/table';
+export { reducers } from '../lib/reducers';
 export * as errors from './errors';
 export { SenderError } from './errors';
-export { type Reducer, type ReducerCtx } from './reducers';
+export { type Reducer, type ReducerCtx } from '../lib/reducers';
 export { type DbView } from './db_view';
 
 import './polyfills'; // Ensure polyfills are loaded
diff --git a/crates/bindings-typescript/src/server/runtime.ts b/crates/bindings-typescript/src/server/runtime.ts
index 74533661373..1366c763aa6 100644
--- a/crates/bindings-typescript/src/server/runtime.ts
+++ b/crates/bindings-typescript/src/server/runtime.ts
@@ -15,33 +15,24 @@ import {
   type IndexVal,
   type UniqueIndex,
   type RangedIndex,
-} from './indexes';
-import { type RowType, type Table, type TableMethods } from './table';
+} from '../lib/indexes';
+import { type RowType, type Table, type TableMethods } from '../lib/table';
 import {
   type ReducerCtx,
   REDUCERS,
   type JwtClaims,
   type AuthCtx,
   type JsonObject,
-} from './reducers';
-import { MODULE_DEF } from './schema';
+} from '../lib/reducers';
+import { MODULE_DEF } from '../lib/schema';
 
 import * as _syscalls from 'spacetime:sys@1.0';
 import type { u16, u32, ModuleHooks } from 'spacetime:sys@1.0';
 import type { DbView } from './db_view';
-import type { CamelCase } from './type_util';
+import { toCamelCase } from '../lib/utils';
 
 const { freeze } = Object;
 
-/**
- * Type safe conversion from a string like "some_identifier-name" to "someIdentifierName".
- * @param str The string to convert
- * @returns The converted string
- */
-export function toCamelCase<T extends string>(str: T): CamelCase<T> {
-  return str.replace(/[-_]+(\w)/g, (_, c) => c.toUpperCase()) as CamelCase<T>;
-}
-
 const sys: typeof _syscalls = freeze(
   Object.fromEntries(
     Object.entries(_syscalls).map(([name, syscall]) => [
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 09683ccc7fa..5f44e5493cc 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -54,9 +54,9 @@ import { UnindexedPlayer } from './unindexed_player_type.ts';
 export { UnindexedPlayer };
 import { User } from './user_type.ts';
 import { schema } from '../../../src/server/schema.ts';
-import t from '../../../src/server/type_builders.ts';
-import { table } from '../../../src/server/table.ts';
-import { reducerSchema, reducers } from '../../../src/server/reducers.ts';
+import t from '../../../src/lib/type_builders.ts';
+import { table } from '../../../src/lib/table.ts';
+import { reducerSchema, reducers } from '../../../src/lib/reducers.ts';
 import { RemoteModule } from '../../../src/sdk/spacetime_module.ts';
 export { User };
 
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index 4bafe1fb1e4..72ace94abbd 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -27,10 +27,18 @@ import {
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
   type TableHandle as __TableHandle,
 } from '../../../src/index';
+import { t } from '../../../src/server';
 import { Point } from './point_type';
 // Mark import as potentially unused
 declare type __keep_Point = Point;
 
+t.object('Player', {
+  ownerId: t.string(),
+  name: t.string(),
+  location: Point.getTypeScriptAlgebraicType(),
+});
+
+
 export type Player = {
   ownerId: string;
   name: string;
diff --git a/crates/bindings-typescript/tests/index.test.ts b/crates/bindings-typescript/tests/index.test.ts
index 570728769fb..90be9efc2c0 100644
--- a/crates/bindings-typescript/tests/index.test.ts
+++ b/crates/bindings-typescript/tests/index.test.ts
@@ -6,7 +6,7 @@ import {
   type IdentityTokenMessage,
 } from '../src/index';
 import type { ColumnBuilder } from '../src/server';
-import { t } from '../src/server/type_builders';
+import { t } from '../src/lib/type_builders';
 
 describe('TypeBuilder', () => {
   it('builds the correct algebraic type for a point', () => {
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index 2770fc4d6ab..b02e233f777 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -24,6 +24,147 @@ use spacetimedb_lib::version::spacetimedb_lib_version;
 
 type Imports = BTreeSet<AlgebraicTypeRef>;
 
+// Target output
+// // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+// // This was generated using ../../../src/index cli version 1.5.0 (commit 5bfc84351742a6a8dc717b6c0011946f2d1b632d).
+
+// /* eslint-disable */
+// /* tslint:disable */
+// import {
+//   AlgebraicType as __AlgebraicTypeValue,
+//   BinaryReader as __BinaryReader,
+//   BinaryWriter as __BinaryWriter,
+//   ClientCache as __ClientCache,
+//   ConnectionId as __ConnectionId,
+//   DbConnectionBuilder as __DbConnectionBuilder,
+//   DbConnectionImpl as __DbConnectionImpl,
+//   Identity as __Identity,
+//   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+//   TableCache as __TableCache,
+//   TimeDuration as __TimeDuration,
+//   Timestamp as __Timestamp,
+//   deepEqual as __deepEqual,
+//   type AlgebraicType as __AlgebraicTypeType,
+//   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
+//   type CallReducerFlags as __CallReducerFlags,
+//   type ErrorContextInterface as __ErrorContextInterface,
+//   type Event as __Event,
+//   type EventContextInterface as __EventContextInterface,
+//   type ReducerEventContextInterface as __ReducerEventContextInterface,
+//   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
+//   type ClientTable as __ClientTable,
+//   type RemoteModule as __RemoteModule,
+//   type SetReducerFlags as __SetReducerFlags,
+//   DbConnectionConfig,
+// } from '../../../src/index';
+
+// // Import and reexport all reducer arg types
+// import { CreatePlayer } from './create_player_reducer.ts';
+// export { CreatePlayer };
+
+// // Import and reexport all table handle types
+// import { PlayerTableHandle } from './player_table.ts';
+// export { PlayerTableHandle };
+// import { UnindexedPlayerTableHandle } from './unindexed_player_table.ts';
+// export { UnindexedPlayerTableHandle };
+// import { UserTableHandle } from './user_table.ts';
+// export { UserTableHandle };
+
+// // Import and reexport all types
+// import { Player } from './player_type.ts';
+// export { Player };
+// import { Point } from './point_type.ts';
+// export { Point };
+// import { UnindexedPlayer } from './unindexed_player_type.ts';
+// export { UnindexedPlayer };
+// import { User } from './user_type.ts';
+// import { schema } from '../../../src/server/schema.ts';
+// import t from '../../../src/server/type_builders.ts';
+// import { table } from '../../../src/server/table.ts';
+// import { reducerSchema, reducers } from '../../../src/server/reducers.ts';
+// import { RemoteModule } from '../../../src/sdk/spacetime_module.ts';
+// export { User };
+
+// const pointType = t.object('Point', {
+//   x: t.number(),
+//   y: t.number(),
+// });
+
+// const tablesSchema = schema(
+//   table({ name: 'player', }, t.row({
+//     ownerId: t.string(),
+//     name: t.string(),
+//     location: pointType,
+//   })),
+//   table({ name: 'unindexed_player', }, t.row({
+//     ownerId: t.string(),
+//     name: t.string(),
+//     location: pointType,
+//   })),
+//   table({ name: 'user', primaryKey: 'identity', }, t.row({
+//     identity: t.string(),
+//     name: t.string(),
+//   })),
+// );
+
+// const reducersSchema = reducers(
+//   reducerSchema('create_player', {
+//     name: t.string(),
+//     location: pointType,
+//   }),
+//   reducerSchema('foo_bar', {
+//     name: t.string(),
+//     location: pointType,
+//   }),
+// );
+
+// const REMOTE_MODULE = {
+//   versionInfo: {
+//     cliVersion: '1.6.0' as const,
+//   },
+//   tables: tablesSchema.schemaType.tables,
+//   reducers: reducersSchema.reducersType.reducers,
+// } satisfies RemoteModule<
+//   typeof tablesSchema.schemaType,
+//   typeof reducersSchema.reducersType
+// >;
+
+// export type EventContext = __EventContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export type ReducerEventContext = __ReducerEventContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export type SubscriptionEventContext = __SubscriptionEventContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export type ErrorContext = __ErrorContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
+//   typeof REMOTE_MODULE
+// > {}
+
+// export class DbConnectionBuilder extends __DbConnectionBuilder<
+//   typeof REMOTE_MODULE,
+//   DbConnection
+// > {};
+
+// export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
+//   static builder = (): DbConnectionBuilder => {
+//     return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));
+//   };
+//   subscriptionBuilder = (): SubscriptionBuilder => {
+//     return new SubscriptionBuilder(this);
+//   };
+// }
+
 const INDENT: &str = "  ";
 
 pub struct TypeScript;

From 269ad2f69ebf577dee6bbfcb9e9a4ab4864ac121 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Mon, 3 Nov 2025 12:36:49 -0500
Subject: [PATCH 05/23] Small fixes

---
 .../bindings-typescript/src/react/useTable.ts |  2 +-
 .../src/sdk/db_connection_impl.ts             |  8 ++---
 crates/bindings-typescript/src/sdk/db_view.ts |  2 +-
 crates/bindings-typescript/src/sdk/index.ts   |  2 +-
 .../src/sdk/message_types.ts                  | 34 +++++++++----------
 .../test-app/src/module_bindings/index.ts     |  2 +-
 6 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index 6a7f0f48782..311b3d68663 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -7,7 +7,7 @@ import {
 } from 'react';
 import { useSpacetimeDB } from './useSpacetimeDB';
 import { DbConnectionImpl, TableCache } from '../sdk/db_connection_impl';
-import type { TableNamesFromDb } from '../sdk/table_handle';
+import type { TableNamesFromDb } from '../sdk/client_table';
 import type { ConnectionState } from './connection_state';
 import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index d2854f4f92f..14ea6d83606 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -535,9 +535,7 @@ export class DbConnectionImpl<
         const parsedTableUpdates = await parseDatabaseUpdate(
           message.value.update
         );
-        const subscribeAppliedMessage: SubscribeAppliedMessage<
-          Record<string, any>
-        > = {
+        const subscribeAppliedMessage: SubscribeAppliedMessage = {
           tag: 'SubscribeApplied',
           queryId: message.value.queryId.id,
           tableUpdates: parsedTableUpdates,
@@ -549,9 +547,7 @@ export class DbConnectionImpl<
         const parsedTableUpdates = await parseDatabaseUpdate(
           message.value.update
         );
-        const unsubscribeAppliedMessage: UnsubscribeAppliedMessage<
-          Record<string, any>
-        > = {
+        const unsubscribeAppliedMessage: UnsubscribeAppliedMessage = {
           tag: 'UnsubscribeApplied',
           queryId: message.value.queryId.id,
           tableUpdates: parsedTableUpdates,
diff --git a/crates/bindings-typescript/src/sdk/db_view.ts b/crates/bindings-typescript/src/sdk/db_view.ts
index 2d12c64326e..9d991765226 100644
--- a/crates/bindings-typescript/src/sdk/db_view.ts
+++ b/crates/bindings-typescript/src/sdk/db_view.ts
@@ -1,5 +1,5 @@
 import type { UntypedRemoteModule } from "./spacetime_module";
-import type { ClientTable } from "./table_handle";
+import type { ClientTable } from "./client_table";
 
 /**
  * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
diff --git a/crates/bindings-typescript/src/sdk/index.ts b/crates/bindings-typescript/src/sdk/index.ts
index 568e04bd5b5..0f35b9d06f9 100644
--- a/crates/bindings-typescript/src/sdk/index.ts
+++ b/crates/bindings-typescript/src/sdk/index.ts
@@ -2,6 +2,6 @@
 export * from './db_connection_impl.ts';
 export * from './client_cache.ts';
 export * from './message_types.ts';
-export { type ClientTable } from './table_handle.ts';
+export { type ClientTable } from './client_table.ts';
 export { type RemoteModule } from './spacetime_module.ts';
 export { type SetReducerFlags } from './reducers.ts';
diff --git a/crates/bindings-typescript/src/sdk/message_types.ts b/crates/bindings-typescript/src/sdk/message_types.ts
index ee7842019c0..5051dddeb82 100644
--- a/crates/bindings-typescript/src/sdk/message_types.ts
+++ b/crates/bindings-typescript/src/sdk/message_types.ts
@@ -3,15 +3,16 @@ import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
 import type { TableUpdate } from './table_cache.ts';
 import { Timestamp } from '../';
+import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
 
-export type InitialSubscriptionMessage<RowType extends Record<string, any>> = {
+export type InitialSubscriptionMessage = {
   tag: 'InitialSubscription';
-  tableUpdates: TableUpdate<RowType>[];
+  tableUpdates: TableUpdate<UntypedTableDef>[];
 };
 
-export type TransactionUpdateMessage<RowType extends Record<string, any>> = {
+export type TransactionUpdateMessage = {
   tag: 'TransactionUpdate';
-  tableUpdates: TableUpdate<RowType>[];
+  tableUpdates: TableUpdate<UntypedTableDef>[];
   identity: Identity;
   connectionId: ConnectionId | null;
   reducerInfo?: {
@@ -24,10 +25,10 @@ export type TransactionUpdateMessage<RowType extends Record<string, any>> = {
   energyConsumed: bigint;
 };
 
-export type TransactionUpdateLightMessage<RowType extends Record<string, any>> =
+export type TransactionUpdateLightMessage =
   {
     tag: 'TransactionUpdateLight';
-    tableUpdates: TableUpdate<RowType>[];
+    tableUpdates: TableUpdate<UntypedTableDef>[];
   };
 
 export type IdentityTokenMessage = {
@@ -37,16 +38,16 @@ export type IdentityTokenMessage = {
   connectionId: ConnectionId;
 };
 
-export type SubscribeAppliedMessage<RowType extends Record<string, any>> = {
+export type SubscribeAppliedMessage = {
   tag: 'SubscribeApplied';
   queryId: number;
-  tableUpdates: TableUpdate<RowType>[];
+  tableUpdates: TableUpdate<UntypedTableDef>[];
 };
 
-export type UnsubscribeAppliedMessage<RowType extends Record<string, any>> = {
+export type UnsubscribeAppliedMessage = {
   tag: 'UnsubscribeApplied';
   queryId: number;
-  tableUpdates: TableUpdate<RowType>[];
+  tableUpdates: TableUpdate<UntypedTableDef>[];
 };
 
 export type SubscriptionError = {
@@ -55,12 +56,11 @@ export type SubscriptionError = {
   error: string;
 };
 
-export type Message<RowType extends Record<string, any> = Record<string, any>> =
-
-    | InitialSubscriptionMessage<RowType>
-    | TransactionUpdateMessage<RowType>
-    | TransactionUpdateLightMessage<RowType>
+export type Message =
+    | InitialSubscriptionMessage
+    | TransactionUpdateMessage
+    | TransactionUpdateLightMessage
     | IdentityTokenMessage
-    | SubscribeAppliedMessage<RowType>
-    | UnsubscribeAppliedMessage<RowType>
+    | SubscribeAppliedMessage
+    | UnsubscribeAppliedMessage
     | SubscriptionError;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 5f44e5493cc..0768767c9d1 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -53,7 +53,7 @@ export { Point };
 import { UnindexedPlayer } from './unindexed_player_type.ts';
 export { UnindexedPlayer };
 import { User } from './user_type.ts';
-import { schema } from '../../../src/server/schema.ts';
+import { schema } from '../../../src/lib/schema.ts';
 import t from '../../../src/lib/type_builders.ts';
 import { table } from '../../../src/lib/table.ts';
 import { reducerSchema, reducers } from '../../../src/lib/reducers.ts';

From 051fb278b3d871c87536cb87c8905c21103728fe Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Mon, 3 Nov 2025 19:58:49 -0500
Subject: [PATCH 06/23] About to try new code gen

---
 .../src/lib/type_builders.ts                  |    2 +-
 crates/bindings-typescript/src/sdk/index.ts   |    4 +
 .../test-app/src/module_bindings/index.ts     |   13 +
 .../src/module_bindings/player_table.ts       |   11 +
 .../src/module_bindings/player_type.ts        |    5 +
 .../src/module_bindings/point_type.ts         |   47 +-
 crates/codegen/src/typescript.rs              | 1128 +++++------------
 7 files changed, 340 insertions(+), 870 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 9ede6be0864..771cce3b188 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -13,7 +13,7 @@ import {
   type TimestampAlgebraicType,
 } from '..';
 import type { OptionAlgebraicType } from './option';
-import { addType, MODULE_DEF } from '../server/schema';
+import { addType, MODULE_DEF } from '../lib/schema';
 import type { CoerceRow } from './table';
 import { set, type Set } from './type_util';
 
diff --git a/crates/bindings-typescript/src/sdk/index.ts b/crates/bindings-typescript/src/sdk/index.ts
index 0f35b9d06f9..3a066053531 100644
--- a/crates/bindings-typescript/src/sdk/index.ts
+++ b/crates/bindings-typescript/src/sdk/index.ts
@@ -5,3 +5,7 @@ export * from './message_types.ts';
 export { type ClientTable } from './client_table.ts';
 export { type RemoteModule } from './spacetime_module.ts';
 export { type SetReducerFlags } from './reducers.ts';
+export * from '../lib/type_builders.ts';
+export { schema } from '../lib/schema.ts';
+export { table } from '../lib/table.ts';
+export { reducerSchema, reducers } from '../lib/reducers.ts';
\ No newline at end of file
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 0768767c9d1..95c704eaad9 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -65,6 +65,19 @@ const pointType = t.object('Point', {
   y: t.number(),
 });
 
+table({
+  name: 'player',
+  primaryKey: 'ownerId',
+  
+  indexes: [
+    { name: 'this_is_an_index', algorithm: "btree", columns: [ "ownerId" ] } 
+  ],
+}, t.row({
+  ownerId: t.string(),
+  name: t.string(),
+  location: pointType,
+}))
+
 const tablesSchema = schema(
   table({ name: 'player', }, t.row({
     ownerId: t.string(),
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 53444fbc677..a966cde4283 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -26,6 +26,8 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
   type ClientTable as __ClientTable,
+  table,
+  t,
 } from '../../../src/index';
 import { Player } from './player_type';
 import { Point } from './point_type';
@@ -40,6 +42,15 @@ import {
 } from '.';
 declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
 
+
+export default table({ name: 'player' }, {
+  id: t.string().primaryKey().index(),
+  ownerId: t.string().unique(),
+  timestamp: t.timestamp(),
+  score: t.i32(),
+  location: Point,
+});
+
 /**
  * Table handle for the table `player`.
  *
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index 72ace94abbd..d6f04870fa6 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -38,6 +38,11 @@ t.object('Player', {
   location: Point.getTypeScriptAlgebraicType(),
 });
 
+const x = t.enum('PlayerEnum', {
+  foobar: t.f32(),
+  bazqux: t.string(),
+  quxfoo: t.bool(),
+});
 
 export type Player = {
   ownerId: string;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
index 9bd08a301a1..939de299c8b 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
@@ -25,47 +25,10 @@ import {
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  t as __t,
 } from '../../../src/index';
 
-export type Point = {
-  x: number;
-  y: number;
-};
-let _cached_Point_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const Point = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Point_type_value) return _cached_Point_type_value;
-    _cached_Point_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_Point_type_value.value.elements.push(
-      { name: 'x', algebraicType: __AlgebraicTypeValue.U16 },
-      { name: 'y', algebraicType: __AlgebraicTypeValue.U16 }
-    );
-    return _cached_Point_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Point): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Point.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Point {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Point.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Point;
+export default __t.object('Point', {
+  x: __t.number(),
+  y: __t.number(),
+});
\ No newline at end of file
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index b02e233f777..dd3f0c8b871 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -1,8 +1,7 @@
 use crate::util::{
-    is_reducer_invokable, iter_reducers, iter_tables, iter_types, iter_unique_cols,
-    print_auto_generated_version_comment,
+    is_reducer_invokable, iter_indexes, iter_reducers, iter_tables, iter_types, iter_unique_cols, print_auto_generated_version_comment
 };
-use crate::{indent_scope, OutputFile};
+use crate::{OutputFile};
 
 use super::util::{collect_case, print_auto_generated_file_comment, type_ref_name};
 
@@ -13,7 +12,8 @@ use std::ops::Deref;
 use convert_case::{Case, Casing};
 use spacetimedb_lib::sats::layout::PrimitiveType;
 use spacetimedb_lib::sats::AlgebraicTypeRef;
-use spacetimedb_schema::def::{ModuleDef, ReducerDef, ScopedTypeName, TableDef, TypeDef};
+use spacetimedb_primitives::ColId;
+use spacetimedb_schema::def::{BTreeAlgorithm, IndexAlgorithm, ModuleDef, ReducerDef, ScopedTypeName, TableDef, TypeDef};
 use spacetimedb_schema::identifier::Identifier;
 use spacetimedb_schema::schema::{Schema, TableSchema};
 use spacetimedb_schema::type_for_generate::{AlgebraicTypeDef, AlgebraicTypeUse, ProductTypeDef};
@@ -24,147 +24,6 @@ use spacetimedb_lib::version::spacetimedb_lib_version;
 
 type Imports = BTreeSet<AlgebraicTypeRef>;
 
-// Target output
-// // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-// // This was generated using ../../../src/index cli version 1.5.0 (commit 5bfc84351742a6a8dc717b6c0011946f2d1b632d).
-
-// /* eslint-disable */
-// /* tslint:disable */
-// import {
-//   AlgebraicType as __AlgebraicTypeValue,
-//   BinaryReader as __BinaryReader,
-//   BinaryWriter as __BinaryWriter,
-//   ClientCache as __ClientCache,
-//   ConnectionId as __ConnectionId,
-//   DbConnectionBuilder as __DbConnectionBuilder,
-//   DbConnectionImpl as __DbConnectionImpl,
-//   Identity as __Identity,
-//   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-//   TableCache as __TableCache,
-//   TimeDuration as __TimeDuration,
-//   Timestamp as __Timestamp,
-//   deepEqual as __deepEqual,
-//   type AlgebraicType as __AlgebraicTypeType,
-//   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-//   type CallReducerFlags as __CallReducerFlags,
-//   type ErrorContextInterface as __ErrorContextInterface,
-//   type Event as __Event,
-//   type EventContextInterface as __EventContextInterface,
-//   type ReducerEventContextInterface as __ReducerEventContextInterface,
-//   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-//   type ClientTable as __ClientTable,
-//   type RemoteModule as __RemoteModule,
-//   type SetReducerFlags as __SetReducerFlags,
-//   DbConnectionConfig,
-// } from '../../../src/index';
-
-// // Import and reexport all reducer arg types
-// import { CreatePlayer } from './create_player_reducer.ts';
-// export { CreatePlayer };
-
-// // Import and reexport all table handle types
-// import { PlayerTableHandle } from './player_table.ts';
-// export { PlayerTableHandle };
-// import { UnindexedPlayerTableHandle } from './unindexed_player_table.ts';
-// export { UnindexedPlayerTableHandle };
-// import { UserTableHandle } from './user_table.ts';
-// export { UserTableHandle };
-
-// // Import and reexport all types
-// import { Player } from './player_type.ts';
-// export { Player };
-// import { Point } from './point_type.ts';
-// export { Point };
-// import { UnindexedPlayer } from './unindexed_player_type.ts';
-// export { UnindexedPlayer };
-// import { User } from './user_type.ts';
-// import { schema } from '../../../src/server/schema.ts';
-// import t from '../../../src/server/type_builders.ts';
-// import { table } from '../../../src/server/table.ts';
-// import { reducerSchema, reducers } from '../../../src/server/reducers.ts';
-// import { RemoteModule } from '../../../src/sdk/spacetime_module.ts';
-// export { User };
-
-// const pointType = t.object('Point', {
-//   x: t.number(),
-//   y: t.number(),
-// });
-
-// const tablesSchema = schema(
-//   table({ name: 'player', }, t.row({
-//     ownerId: t.string(),
-//     name: t.string(),
-//     location: pointType,
-//   })),
-//   table({ name: 'unindexed_player', }, t.row({
-//     ownerId: t.string(),
-//     name: t.string(),
-//     location: pointType,
-//   })),
-//   table({ name: 'user', primaryKey: 'identity', }, t.row({
-//     identity: t.string(),
-//     name: t.string(),
-//   })),
-// );
-
-// const reducersSchema = reducers(
-//   reducerSchema('create_player', {
-//     name: t.string(),
-//     location: pointType,
-//   }),
-//   reducerSchema('foo_bar', {
-//     name: t.string(),
-//     location: pointType,
-//   }),
-// );
-
-// const REMOTE_MODULE = {
-//   versionInfo: {
-//     cliVersion: '1.6.0' as const,
-//   },
-//   tables: tablesSchema.schemaType.tables,
-//   reducers: reducersSchema.reducersType.reducers,
-// } satisfies RemoteModule<
-//   typeof tablesSchema.schemaType,
-//   typeof reducersSchema.reducersType
-// >;
-
-// export type EventContext = __EventContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export type ReducerEventContext = __ReducerEventContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export type ErrorContext = __ErrorContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-//   typeof REMOTE_MODULE
-// > {}
-
-// export class DbConnectionBuilder extends __DbConnectionBuilder<
-//   typeof REMOTE_MODULE,
-//   DbConnection
-// > {};
-
-// export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
-//   static builder = (): DbConnectionBuilder => {
-//     return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));
-//   };
-//   subscriptionBuilder = (): SubscriptionBuilder => {
-//     return new SubscriptionBuilder(this);
-//   };
-// }
-
 const INDENT: &str = "  ";
 
 pub struct TypeScript;
@@ -249,6 +108,21 @@ impl Lang for TypeScript {
         }
     }
 
+
+    /// e.g.
+    /// ```ts
+    /// table({
+    ///   name: 'player',
+    ///   indexes: [
+    ///     { name: 'this_is_an_index', algorithm: "btree", columns: [ "ownerId" ] } 
+    ///   ],
+    /// }, t.row({
+    ///   id: t.u32().primaryKey(),
+    ///   ownerId: t.string(),
+    ///   name: t.string().unique(),
+    ///   location: pointType,
+    /// }))
+    /// ```
     fn generate_table_file(&self, module: &ModuleDef, table: &TableDef) -> OutputFile {
         let schema = TableSchema::from_module_def(module, table, (), 0.into())
             .validated()
@@ -278,150 +152,67 @@ impl Lang for TypeScript {
             None,
         );
 
-        writeln!(
-            out,
-            "import {{ type EventContext, type Reducer, RemoteReducers, RemoteTables }} from \".\";"
-        );
-
-        // Mark potentially unused types
-        writeln!(
-            out,
-            "declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];"
-        );
-
-        let table_name = table.name.deref();
-        let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
-        let table_handle = table_name_pascalcase.clone() + "TableHandle";
-        let accessor_method = table_method_name(&table.name);
-
         writeln!(out);
 
-        write!(
-            out,
-            "/**
- * Table handle for the table `{table_name}`.
- *
- * Obtain a handle from the [`{accessor_method}`] property on [`RemoteTables`],
- * like `ctx.db.{accessor_method}`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.{accessor_method}.on_insert(...)`.
- */
-export class {table_handle}<TableName extends string> extends __TableCache<TableName> {{
-"
-        );
+        writeln!(out, "export default table({{");
         out.indent(1);
-        writeln!(out, "// phantom type to track the table name");
-        writeln!(out, "readonly tableName!: TableName;");
-        writeln!(out, "tableCache: __TableCache<{row_type}>;");
-        writeln!(out);
-        writeln!(out, "constructor(tableCache: __TableCache<{row_type}>) {{");
-        out.with_indent(|out| writeln!(out, "this.tableCache = tableCache;"));
-        writeln!(out, "}}");
-        writeln!(out);
-        writeln!(out, "count(): number {{");
-        out.with_indent(|out| {
-            writeln!(out, "return this.tableCache.count();");
-        });
-        writeln!(out, "}}");
-        writeln!(out);
-        writeln!(out, "iter(): Iterable<{row_type}> {{");
-        out.with_indent(|out| {
-            writeln!(out, "return this.tableCache.iter();");
-        });
-        writeln!(out, "}}");
-
-        for (unique_field_ident, unique_field_type_use) in
-            iter_unique_cols(module.typespace_for_generate(), &schema, product_def)
-        {
-            let unique_field_name = unique_field_ident.deref().to_case(Case::Camel);
-            let unique_field_name_pascalcase = unique_field_name.to_case(Case::Pascal);
-
-            let unique_constraint = table_name_pascalcase.clone() + &unique_field_name_pascalcase + "Unique";
-            let unique_field_type = type_name(module, unique_field_type_use);
-
-            writeln!(
-                out,
-                "/**
- * Access to the `{unique_field_name}` unique index on the table `{table_name}`,
- * which allows point queries on the field of the same name
- * via the [`{unique_constraint}.find`] method.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.{accessor_method}.{unique_field_name}().find(...)`.
- *
- * Get a handle on the `{unique_field_name}` unique index on the table `{table_name}`.
- */"
-            );
-            writeln!(out, "{unique_field_name} = {{");
-            out.with_indent(|out| {
-                writeln!(
-                    out,
-                    "// Find the subscribed row whose `{unique_field_name}` column value is equal to `col_val`,"
-                );
-                writeln!(out, "// if such a row is present in the client cache.");
-                writeln!(
-                    out,
-                    "find: (col_val: {unique_field_type}): {row_type} | undefined => {{"
-                );
-                out.with_indent(|out| {
-                    writeln!(out, "for (let row of this.tableCache.iter()) {{");
-                    out.with_indent(|out| {
-                        writeln!(out, "if (__deepEqual(row.{unique_field_name}, col_val)) {{");
-                        out.with_indent(|out| {
-                            writeln!(out, "return row;");
-                        });
-                        writeln!(out, "}}");
-                    });
-                    writeln!(out, "}}");
-                });
-                writeln!(out, "}},");
-            });
-            writeln!(out, "}};");
-        }
-
-        writeln!(out);
-
-        // TODO: expose non-unique indices.
-
         writeln!(
             out,
-            "onInsert = (cb: (ctx: EventContext, row: {row_type}) => void) => {{
-{INDENT}return this.tableCache.onInsert(cb);
-}}
-
-removeOnInsert = (cb: (ctx: EventContext, row: {row_type}) => void) => {{
-{INDENT}return this.tableCache.removeOnInsert(cb);
-}}
-
-onDelete = (cb: (ctx: EventContext, row: {row_type}) => void) => {{
-{INDENT}return this.tableCache.onDelete(cb);
-}}
-
-removeOnDelete = (cb: (ctx: EventContext, row: {row_type}) => void) => {{
-{INDENT}return this.tableCache.removeOnDelete(cb);
-}}"
+            "name: '{}',",
+            table.name.deref()
         );
-
-        if schema.pk().is_some() {
-            write!(
-                out,
-                "
-// Updates are only defined for tables with primary keys.
-onUpdate = (cb: (ctx: EventContext, oldRow: {row_type}, newRow: {row_type}) => void) => {{
-{INDENT}return this.tableCache.onUpdate(cb);
-}}
-
-removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type}) => void) => {{
-{INDENT}return this.tableCache.removeOnUpdate(cb);
-}}"
-            );
+        writeln!(out, "indexes: [");
+        out.indent(1);
+        for index_def in iter_indexes(table) {
+            if !index_def.generated() {
+                // Skip system-defined indexes
+                continue;
+            }
+            match &index_def.algorithm {
+                IndexAlgorithm::BTree(BTreeAlgorithm { columns }) => {
+                    let get_name_and_type = |col_pos: ColId| {
+                        let (field_name, field_type) = &product_def.elements[col_pos.idx()];
+                        let name_camel = field_name.deref().to_case(Case::Camel);
+                        (name_camel, field_type)
+                    };
+                    writeln!(out, "{{ name: '{}', algorithm: 'btree', columns: [", index_def.name);
+                    out.indent(1);
+                    for col_id in columns.iter() {
+                        writeln!(out, "'{}',", get_name_and_type(col_id).0);
+                    }
+                    out.dedent(1);
+                    writeln!(out, "] }},");
+                }
+                IndexAlgorithm::Direct(_) => {
+                    // Direct indexes are not implemented yet.
+                    continue;
+                }
+                _ => todo!(),
+            };
         }
         out.dedent(1);
-
-        writeln!(out, "}}");
+        writeln!(out, "}}, {{");
+        out.indent(1);
+        for (field_ident, field_ty) in &product_def.elements {
+            let field_name = field_ident.deref().to_case(Case::Camel);
+            write!(out, "{field_name}: ");
+            write_type(module, out, field_ty, None, None).unwrap();
+
+            let mut annotations = Vec::new();
+            if schema.pk().map(|pk| *field_ident == Identifier::new(pk.col_name.clone()).unwrap()).unwrap_or(false) {
+                annotations.push("primaryKey()");
+            } else {
+                for (unique_field_ident, _) in
+                    iter_unique_cols(module.typespace_for_generate(), &schema, product_def)
+                {
+                    if field_ident == unique_field_ident {
+                        annotations.push("unique()");
+                    }
+                }
+            }
+        }
+        writeln!(out, "}});");
+        out.dedent(1);
         OutputFile {
             filename: table_module_name(&table.name) + ".ts",
             code: output.into_inner(),
@@ -463,12 +254,84 @@ removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type})
 
         out.newline();
 
+        // const tablesSchema = schema(
+//   table({ name: 'player', }, t.row({
+//     ownerId: t.string(),
+//     name: t.string(),
+//     location: pointType,
+//   })),
+//   table({ name: 'unindexed_player', }, t.row({
+//     ownerId: t.string(),
+//     name: t.string(),
+//     location: pointType,
+//   })),
+//   table({ name: 'user', primaryKey: 'identity', }, t.row({
+//     identity: t.string(),
+//     name: t.string(),
+//   })),
+// );
+
+// const reducersSchema = reducers(
+//   reducerSchema('create_player', {
+//     name: t.string(),
+//     location: pointType,
+//   }),
+//   reducerSchema('foo_bar', {
+//     name: t.string(),
+//     location: pointType,
+//   }),
+// );
+
+// const REMOTE_MODULE = {
+//   versionInfo: {
+//     cliVersion: '1.6.0' as const,
+//   },
+//   tables: tablesSchema.schemaType.tables,
+//   reducers: reducersSchema.reducersType.reducers,
+// } satisfies RemoteModule<
+//   typeof tablesSchema.schemaType,
+//   typeof reducersSchema.reducersType
+// >;
+
+// export type EventContext = __EventContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export type ReducerEventContext = __ReducerEventContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export type SubscriptionEventContext = __SubscriptionEventContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export type ErrorContext = __ErrorContextInterface<
+//   typeof REMOTE_MODULE
+// >;
+
+// export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
+//   typeof REMOTE_MODULE
+// > {}
+
+// export class DbConnectionBuilder extends __DbConnectionBuilder<
+//   typeof REMOTE_MODULE,
+//   DbConnection
+// > {};
+
+// export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
+//   static builder = (): DbConnectionBuilder => {
+//     return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));
+//   };
+//   subscriptionBuilder = (): SubscriptionBuilder => {
+//     return new SubscriptionBuilder(this);
+//   };
+
         writeln!(out, "// Import and reexport all reducer arg types");
         for reducer in iter_reducers(module) {
             let reducer_name = &reducer.name;
             let reducer_module_name = reducer_module_name(reducer_name) + ".ts";
             let args_type = reducer_args_type_name(&reducer.name);
-            writeln!(out, "import {{ {args_type} }} from \"./{reducer_module_name}\";");
+            writeln!(out, "import {args_type} from \"./{reducer_module_name}\";");
             writeln!(out, "export {{ {args_type} }};");
         }
 
@@ -478,9 +341,8 @@ removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type})
             let table_name = &table.name;
             let table_module_name = table_module_name(table_name) + ".ts";
             let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
-            let table_handle = table_name_pascalcase.clone() + "TableHandle";
-            writeln!(out, "import {{ {table_handle} }} from \"./{table_module_name}\";");
-            writeln!(out, "export {{ {table_handle} }};");
+            writeln!(out, "import {table_name_pascalcase} from \"./{table_module_name}\";");
+            writeln!(out, "export {{ {table_name_pascalcase} }};");
         }
 
         writeln!(out);
@@ -488,331 +350,128 @@ removeOnUpdate = (cb: (ctx: EventContext, onRow: {row_type}, newRow: {row_type})
         for ty in iter_types(module) {
             let type_name = collect_case(Case::Pascal, ty.name.name_segments());
             let type_module_name = type_module_name(&ty.name) + ".ts";
-            writeln!(out, "import {{ {type_name} }} from \"./{type_module_name}\";");
+            writeln!(out, "import {type_name} from \"./{type_module_name}\";");
             writeln!(out, "export {{ {type_name} }};");
         }
 
         out.newline();
-
-        // Define SpacetimeModule
-        writeln!(out, "const REMOTE_MODULE = {{");
-        out.indent(1);
-        writeln!(out, "tables: {{");
+        
+        writeln!(out);
+        writeln!(out, "const tablesSchema = schema(");
         out.indent(1);
         for table in iter_tables(module) {
-            let type_ref = table.product_type_ref;
-            let row_type = type_ref_name(module, type_ref);
-            let schema = TableSchema::from_module_def(module, table, (), 0.into())
-                .validated()
-                .expect("Failed to generate table due to validation errors");
-            writeln!(out, "{}: {{", table.name);
-            out.indent(1);
-            writeln!(out, "tableName: \"{}\" as const,", table.name);
-            writeln!(out, "rowType: {row_type}.getTypeScriptAlgebraicType(),");
-            if let Some(pk) = schema.pk() {
-                // This is left here so we can release the codegen change before releasing a new
-                // version of the SDK.
-                //
-                // Eventually we can remove this and only generate use the `primaryKeyInfo` field.
-                writeln!(out, "primaryKey: \"{}\" as const,", pk.col_name.to_string().to_case(Case::Camel));
-
-                writeln!(out, "primaryKeyInfo: {{");
-                out.indent(1);
-                writeln!(out, "colName: \"{}\" as const,", pk.col_name.to_string().to_case(Case::Camel));
-                writeln!(
-                    out,
-                    "colType: ({row_type}.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product).value.elements[{}].algebraicType,",
-                    pk.col_pos.0
-                );
-                out.dedent(1);
-                writeln!(out, "}},");
-            }
-            out.dedent(1);
-            writeln!(out, "}},");
+            let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
+            writeln!(out, "{},", table_name_pascalcase);
         }
         out.dedent(1);
-        writeln!(out, "}},");
-        writeln!(out, "reducers: {{");
+        writeln!(out, ");");
+
+        writeln!(out);
+
+        writeln!(out, "const reducersSchema = reducers(");
         out.indent(1);
         for reducer in iter_reducers(module) {
-            writeln!(out, "{}: {{", reducer.name);
-            out.indent(1);
-            writeln!(out, "reducerName: \"{}\" as const,", reducer.name);
-            writeln!(
-                out,
-                "argsType: {args_type}.getTypeScriptAlgebraicType(),",
-                args_type = reducer_args_type_name(&reducer.name)
-            );
-            out.dedent(1);
-            writeln!(out, "}},");
+            if !is_reducer_invokable(reducer) {
+                // Skip system-defined reducers
+                continue;
+            }
+            let reducer_name = &reducer.name;
+            let args_type = reducer_args_type_name(&reducer.name);
+            writeln!(out, "reducerSchema(\"{}\", {}),", reducer_name, args_type);
         }
         out.dedent(1);
-        writeln!(out, "}},");
+        writeln!(out, ");");
+
+        writeln!(out);
+
+        writeln!(out, "const REMOTE_MODULE = {{");
+        out.indent(1);
         writeln!(out, "versionInfo: {{");
         out.indent(1);
         writeln!(out, "cliVersion: \"{}\" as const,", spacetimedb_lib_version());
         out.dedent(1);
         writeln!(out, "}},");
-        writeln!(
-            out,
-            "// Constructors which are used by the DbConnectionImpl to
-// extract type information from the generated RemoteModule.
-//
-// NOTE: This is not strictly necessary for `eventContextConstructor` because
-// all we do is build a TypeScript object which we could have done inside the
-// SDK, but if in the future we wanted to create a class this would be
-// necessary because classes have methods, so we'll keep it.
-eventContextConstructor: (imp: __DbConnectionImpl, event: __Event<Reducer>) => {{
-  return {{
-    ...(imp as DbConnection),
-    event
-  }}
-}},
-dbViewConstructor: (imp: __DbConnectionImpl) => {{
-  return new RemoteTables(imp);
-}},
-reducersConstructor: (imp: __DbConnectionImpl, setReducerFlags: SetReducerFlags) => {{
-  return new RemoteReducers(imp, setReducerFlags);
-}},
-setReducerFlagsConstructor: () => {{
-  return new SetReducerFlags();
-}}"
-        );
+        writeln!(out, "tables: tablesSchema.schemaType.tables,");
+        writeln!(out, "reducers: reducersSchema.reducersType.reducers,");
+        out.dedent(1);
+        writeln!(out, "}} satisfies __RemoteModule<");
+        out.indent(1);
+        writeln!(out, "typeof tablesSchema.schemaType,");
+        writeln!(out, "typeof reducersSchema.reducersType");
+        out.dedent(1);
+        writeln!(out, ">;");
         out.dedent(1);
-        writeln!(out, "}} satisfies __RemoteModule;");
-
-        // Define `type Reducer` enum.
-        writeln!(out);
-        print_reducer_enum_defn(module, out);
-
-        out.newline();
-
-        print_remote_reducers(module, out);
-
-        out.newline();
-
-        print_set_reducer_flags(module, out);
-
-        out.newline();
-
-        print_remote_tables(module, out);
-
-        out.newline();
-
-        print_subscription_builder(module, out);
-
-        out.newline();
-
-        print_db_connection(module, out);
 
         out.newline();
 
+        // Write type aliases for EventContext, ReducerEventContext, SubscriptionEventContext, ErrorContext
         writeln!(
             out,
-            "export type EventContext = __EventContextInterface<RemoteTables, RemoteReducers, SetReducerFlags, Reducer>;"
+            "export type EventContext = __EventContextInterface<typeof REMOTE_MODULE>;"
         );
-
         writeln!(
             out,
-            "export type ReducerEventContext = __ReducerEventContextInterface<RemoteTables, RemoteReducers, SetReducerFlags, Reducer>;"
+            "export type ReducerEventContext = __ReducerEventContextInterface<typeof REMOTE_MODULE>;"
         );
-
         writeln!(
             out,
-            "export type SubscriptionEventContext = __SubscriptionEventContextInterface<RemoteTables, RemoteReducers, SetReducerFlags>;"
+            "export type SubscriptionEventContext = __SubscriptionEventContextInterface<typeof REMOTE_MODULE>;"
         );
-
         writeln!(
             out,
-            "export type ErrorContext = __ErrorContextInterface<RemoteTables, RemoteReducers, SetReducerFlags>;"
+            "export type ErrorContext = __ErrorContextInterface<typeof REMOTE_MODULE>;"
         );
 
-        vec![OutputFile {
-            filename: "index.ts".to_string(),
-            code: output.into_inner(),
-        }]
-    }
-}
+        writeln!(out);
 
-fn print_remote_reducers(module: &ModuleDef, out: &mut Indenter) {
-    writeln!(out, "export class RemoteReducers {{");
-    out.indent(1);
-    writeln!(
-        out,
-        "constructor(private connection: __DbConnectionImpl, private setCallReducerFlags: SetReducerFlags) {{}}"
-    );
-    out.newline();
+        writeln!(out, "export class SubscriptionBuilder extends __SubscriptionBuilderImpl<");
+        out.indent(1);
+        writeln!(out, "typeof REMOTE_MODULE");
+        out.dedent(1);
+        writeln!(out, "> {{}}");
 
-    for reducer in iter_reducers(module) {
-        // The reducer argument names and types as `ident: ty, ident: ty, ident: ty`,
-        // and the argument names as `ident, ident, ident`
-        // for passing to function call and struct literal expressions.
-        let mut arg_list = "".to_string();
-        let mut arg_name_list = "".to_string();
-        for (arg_ident, arg_ty) in &reducer.params_for_generate.elements[..] {
-            let arg_name = arg_ident.deref().to_case(Case::Camel);
-            arg_name_list += &arg_name;
-            arg_list += &arg_name;
-            arg_list += ": ";
-            write_type(module, &mut arg_list, arg_ty, None, None).unwrap();
-            arg_list += ", ";
-            arg_name_list += ", ";
-        }
-        let arg_list = arg_list.trim_end_matches(", ");
-        let arg_name_list = arg_name_list.trim_end_matches(", ");
-
-        let reducer_name = &reducer.name;
-
-        if is_reducer_invokable(reducer) {
-            let reducer_function_name = reducer_function_name(reducer);
-            let reducer_variant = reducer_variant_name(&reducer.name);
-            if reducer.params_for_generate.elements.is_empty() {
-                writeln!(out, "{reducer_function_name}() {{");
-                out.with_indent(|out| {
-                    writeln!(
-                        out,
-                        "this.connection.callReducer(\"{reducer_name}\", new Uint8Array(0), this.setCallReducerFlags.{reducer_function_name}Flags);"
-                    );
-                });
-            } else {
-                writeln!(out, "{reducer_function_name}({arg_list}) {{");
-                out.with_indent(|out| {
-                    writeln!(out, "const __args = {{ {arg_name_list} }};");
-                    writeln!(out, "let __writer = new __BinaryWriter(1024);");
-                    writeln!(
-                        out,
-                        "{reducer_variant}.serialize(__writer, __args);"
-                    );
-                    writeln!(out, "let __argsBuffer = __writer.getBuffer();");
-                    writeln!(out, "this.connection.callReducer(\"{reducer_name}\", __argsBuffer, this.setCallReducerFlags.{reducer_function_name}Flags);");
-                });
-            }
-            writeln!(out, "}}");
-            out.newline();
-        }
+        writeln!(out);
+        writeln!(out, "export class DbConnectionBuilder extends __DbConnectionBuilder<");
+        out.indent(1);
+        writeln!(out, "typeof REMOTE_MODULE,");
+        writeln!(out, "DbConnection");
+        out.dedent(1);
+        writeln!(out, "> {{}}");
 
-        let arg_list_padded = if arg_list.is_empty() {
-            String::new()
-        } else {
-            format!(", {arg_list}")
-        };
-        let reducer_name_pascal = reducer_name.deref().to_case(Case::Pascal);
+        writeln!(out);
         writeln!(
             out,
-            "on{reducer_name_pascal}(callback: (ctx: ReducerEventContext{arg_list_padded}) => void) {{"
+            "export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {{"
         );
         out.indent(1);
-        writeln!(out, "this.connection.onReducer(\"{reducer_name}\", callback);");
+        writeln!(
+            out,
+            "static builder = (): DbConnectionBuilder => {{"
+        );
+        out.indent(1);
+        writeln!(
+            out,
+            "return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));"
+        );
         out.dedent(1);
-        writeln!(out, "}}");
-        out.newline();
+        writeln!(out, "}};");
         writeln!(
             out,
-            "removeOn{reducer_name_pascal}(callback: (ctx: ReducerEventContext{arg_list_padded}) => void) {{"
+            "subscriptionBuilder = (): SubscriptionBuilder => {{"
         );
         out.indent(1);
-        writeln!(out, "this.connection.offReducer(\"{reducer_name}\", callback);");
+        writeln!(out, "return new SubscriptionBuilder(this);");
+        out.dedent(1);
+        writeln!(out, "}};");
         out.dedent(1);
         writeln!(out, "}}");
         out.newline();
-    }
-
-    out.dedent(1);
-    writeln!(out, "}}");
-}
-
-fn print_set_reducer_flags(module: &ModuleDef, out: &mut Indenter) {
-    writeln!(out, "export class SetReducerFlags {{");
-    out.indent(1);
-
-    for reducer in iter_reducers(module).filter(|r| is_reducer_invokable(r)) {
-        let reducer_function_name = reducer_function_name(reducer);
-        writeln!(out, "{reducer_function_name}Flags: __CallReducerFlags = 'FullUpdate';");
-        writeln!(out, "{reducer_function_name}(flags: __CallReducerFlags) {{");
-        out.with_indent(|out| {
-            writeln!(out, "this.{reducer_function_name}Flags = flags;");
-        });
-        writeln!(out, "}}");
-        out.newline();
-    }
-
-    out.dedent(1);
-    writeln!(out, "}}");
-}
-
-fn print_remote_tables(module: &ModuleDef, out: &mut Indenter) {
-    writeln!(out, "export class RemoteTables {{");
-    out.indent(1);
-    writeln!(out, "constructor(private connection: __DbConnectionImpl) {{}}");
-
-    for table in iter_tables(module) {
-        writeln!(out);
-        let table_name = table.name.deref();
-        let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
-        let table_name_camelcase = table.name.deref().to_case(Case::Camel);
-        let table_handle = table_name_pascalcase.clone() + "TableHandle";
-        let type_ref = table.product_type_ref;
-        let row_type = type_ref_name(module, type_ref);
-        writeln!(out, "get {table_name_camelcase}(): {table_handle}<'{table_name}'> {{");
-        out.with_indent(|out| {
-            writeln!(out, "// clientCache is a private property");
-            writeln!(
-                out,
-                "return new {table_handle}((this.connection as unknown as {{ clientCache: __ClientCache }}).clientCache.getOrCreateTable<{row_type}>(REMOTE_MODULE.tables.{table_name}));"
-            );
-        });
-        writeln!(out, "}}");
-    }
-
-    out.dedent(1);
-    writeln!(out, "}}");
-}
-
-fn print_subscription_builder(_module: &ModuleDef, out: &mut Indenter) {
-    writeln!(
-        out,
-        "export class SubscriptionBuilder extends __SubscriptionBuilderImpl<RemoteTables, RemoteReducers, SetReducerFlags> {{ }}"
-    );
-}
-
-fn print_db_connection(_module: &ModuleDef, out: &mut Indenter) {
-    writeln!(
-        out,
-        "export class DbConnection extends __DbConnectionImpl<RemoteTables, RemoteReducers, SetReducerFlags> {{"
-    );
-    out.indent(1);
-    writeln!(
-        out,
-        "static builder = (): __DbConnectionBuilder<DbConnection, ErrorContext, SubscriptionEventContext> => {{"
-    );
-    out.indent(1);
-    writeln!(
-        out,
-        "return new __DbConnectionBuilder<DbConnection, ErrorContext, SubscriptionEventContext>(REMOTE_MODULE, (imp: __DbConnectionImpl) => imp as DbConnection);"
-    );
-    out.dedent(1);
-    writeln!(out, "}}");
-    writeln!(out, "subscriptionBuilder = (): SubscriptionBuilder => {{");
-    out.indent(1);
-    writeln!(out, "return new SubscriptionBuilder(this);");
-    out.dedent(1);
-    writeln!(out, "}}");
-    out.dedent(1);
-    writeln!(out, "}}");
-}
 
-fn print_reducer_enum_defn(module: &ModuleDef, out: &mut Indenter) {
-    writeln!(out, "// A type representing all the possible variants of a reducer.");
-    writeln!(out, "export type Reducer = never");
-    for reducer in iter_reducers(module) {
-        writeln!(
-            out,
-            "| {{ name: \"{}\", args: {} }}",
-            reducer_variant_name(&reducer.name),
-            reducer_args_type_name(&reducer.name)
-        );
+        vec![OutputFile {
+            filename: "index.ts".to_string(),
+            code: output.into_inner(),
+        }]
     }
-    writeln!(out, ";");
 }
 
 fn print_spacetimedb_imports(out: &mut Indenter) {
@@ -824,13 +483,12 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "type AlgebraicTypeVariants as __AlgebraicTypeVariants",
         "Identity as __Identity",
         "ClientCache as __ClientCache",
+        "ClientTable as __ClientTable",
         "ConnectionId as __ConnectionId",
         "Timestamp as __Timestamp",
         "TimeDuration as __TimeDuration",
         "DbConnectionBuilder as __DbConnectionBuilder",
-        "TableCache as __TableCache",
         "BinaryWriter as __BinaryWriter",
-        "type TableHandle as __TableHandle",
         "type CallReducerFlags as __CallReducerFlags",
         "type EventContextInterface as __EventContextInterface",
         "type ReducerEventContextInterface as __ReducerEventContextInterface",
@@ -842,6 +500,13 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "DbConnectionImpl as __DbConnectionImpl",
         "type Event as __Event",
         "deepEqual as __deepEqual",
+        "schema as __schema",
+        "table as __table",
+        "reducers as __reducers",
+        "reducerSchema as __reducerSchema",
+        "DbConnectionConfig as __DbConnectionConfig",
+        "RemoteModule as __RemoteModule",
+        "t as __t",
     ];
     types.sort();
     writeln!(out, "import {{");
@@ -867,111 +532,45 @@ fn print_lint_suppression(output: &mut Indenter) {
     writeln!(output, "/* tslint:disable */");
 }
 
-fn write_get_algebraic_type_for_product(
-    module: &ModuleDef,
-    out: &mut Indenter,
-    type_cache_name: &str,
-    elements: &[(Identifier, AlgebraicTypeUse)],
-) {
-    writeln!(
-        out,
-        "/**
-* A function which returns this type represented as an AlgebraicType.
-* This function is derived from the AlgebraicType used to generate this type.
-*/"
-    );
-    writeln!(out, "getTypeScriptAlgebraicType(): __AlgebraicTypeType {{");
-    {
-        out.indent(1);
-        writeln!(out, "if ({type_cache_name}) return {type_cache_name};");
-        // initialization is split in two because of recursive types
-        writeln!(
-            out,
-            "{type_cache_name} = __AlgebraicTypeValue.Product({{ elements: [] }});"
-        );
-        writeln!(out, "{type_cache_name}.value.elements.push(");
-        out.indent(1);
-        convert_product_type_elements(module, out, elements, "");
-        out.dedent(1);
-        writeln!(out, ");");
-        writeln!(out, "return {type_cache_name};");
-        out.dedent(1);
-    }
-    writeln!(out, "}},");
-}
-
+/// e.g.
+/// ```ts
+/// export default __t.object('Point', {
+///   x: __t.f32(),
+///   y: __t.f32(),
+///   fooBar: __t.string(),
+/// });
+/// ```
 fn define_body_for_product(
     module: &ModuleDef,
     out: &mut Indenter,
     name: &str,
     elements: &[(Identifier, AlgebraicTypeUse)],
 ) {
-    write!(out, "export type {name} = {{");
+
+    write!(out, "export default __t.object(\"{name}\", {{");
     if elements.is_empty() {
         writeln!(out, "}};");
     } else {
         writeln!(out);
-        out.with_indent(|out| write_arglist_no_delimiters(module, out, elements, None, true).unwrap());
+        out.with_indent(|out| write_object_type_builder_fields(module, out, elements, true).unwrap());
         writeln!(out, "}};");
     }
-
-    let type_cache_name = &*format!("_cached_{name}_type_value");
-    writeln!(out, "let {type_cache_name}: __AlgebraicTypeType | null = null;");
-    out.newline();
-
-    writeln!(
-        out,
-        "/**
- * An object for generated helper functions.
- */"
-    );
-    writeln!(out, "export const {name} = {{");
-    out.indent(1);
-    write_get_algebraic_type_for_product(module, out, type_cache_name, elements);
-    writeln!(out);
-
-    writeln!(out, "serialize(writer: __BinaryWriter, value: {name}): void {{");
-    out.indent(1);
-    writeln!(
-        out,
-        "__AlgebraicTypeValue.serializeValue(writer, {name}.getTypeScriptAlgebraicType(), value);"
-    );
-    out.dedent(1);
-    writeln!(out, "}},");
-    writeln!(out);
-
-    writeln!(out, "deserialize(reader: __BinaryReader): {name} {{");
-    out.indent(1);
-    writeln!(
-        out,
-        "return __AlgebraicTypeValue.deserializeValue(reader, {name}.getTypeScriptAlgebraicType());"
-    );
-    out.dedent(1);
-    writeln!(out, "}},");
-    writeln!(out);
-
-    out.dedent(1);
-    writeln!(out, "}}");
-
-    out.newline();
-
-    writeln!(out, "export default {name};");
-
     out.newline();
 }
 
-fn write_arglist_no_delimiters(
+/// e.g.
+/// ```ts
+///   x: __t.f32(),
+///   y: __t.f32(),
+///   fooBar: __t.string(),
+/// ```
+fn write_object_type_builder_fields(
     module: &ModuleDef,
     out: &mut impl Write,
     elements: &[(Identifier, AlgebraicTypeUse)],
-    prefix: Option<&str>,
     convert_case: bool,
 ) -> anyhow::Result<()> {
     for (ident, ty) in elements {
-        if let Some(prefix) = prefix {
-            write!(out, "{prefix} ")?;
-        }
-
         let name = if convert_case {
             ident.deref().to_case(Case::Camel)
         } else {
@@ -979,13 +578,58 @@ fn write_arglist_no_delimiters(
         };
 
         write!(out, "{name}: ")?;
-        write_type(module, out, ty, None, None)?;
+        write_type_builder(module, out, ty)?;
         writeln!(out, ",")?;
     }
 
     Ok(())
 }
 
+/// e.g. `__t.option(__t.i32())`, `__t.string()`
+fn write_type_builder<W: Write>(module: &ModuleDef, out: &mut W, ty: &AlgebraicTypeUse) -> fmt::Result {
+    match ty {
+        AlgebraicTypeUse::Unit => write!(out, "__t.unit()")?,
+        AlgebraicTypeUse::Never => write!(out, "__t.never()")?,
+        AlgebraicTypeUse::Identity => write!(out, "__t.identity()")?,
+        AlgebraicTypeUse::ConnectionId => write!(out, "__t.connectionId()")?,
+        AlgebraicTypeUse::Timestamp => write!(out, "__t.timestamp()")?,
+        AlgebraicTypeUse::TimeDuration => write!(out, "__t.timeDuration()")?,
+        AlgebraicTypeUse::ScheduleAt => write!(out, "__t.scheduleAt()")?,
+        AlgebraicTypeUse::Option(inner_ty) => {
+            write!(out, "__t.option(")?;
+            write_type_builder(module, out, inner_ty)?;
+            write!(out, ")")?;
+        },
+        AlgebraicTypeUse::Primitive(prim) => match prim {
+            PrimitiveType::Bool => write!(out, "__t.bool()")?,
+            PrimitiveType::I8 => write!(out, "__t.i8()")?,
+            PrimitiveType::U8 => write!(out, "__t.u8()")?,
+            PrimitiveType::I16 => write!(out, "__t.i16()")?,
+            PrimitiveType::U16 => write!(out, "__t.u16()")?,
+            PrimitiveType::I32 => write!(out, "__t.i32()")?,
+            PrimitiveType::U32 => write!(out, "__t.u32()")?,
+            PrimitiveType::I64 => write!(out, "__t.i64()")?,
+            PrimitiveType::U64 => write!(out, "__t.u64()")?,
+            PrimitiveType::I128 => write!(out, "__t.i128()")?,
+            PrimitiveType::U128 => write!(out, "__t.u128()")?,
+            PrimitiveType::I256 => write!(out, "__t.i256()")?,
+            PrimitiveType::U256 => write!(out, "__t.u256()")?,
+            PrimitiveType::F32 => write!(out, "__t.f32()")?,
+            PrimitiveType::F64 => write!(out, "__t.f64()")?,
+        },
+        AlgebraicTypeUse::String => write!(out, "__t.string()")?,
+        AlgebraicTypeUse::Array(elem_ty) => {
+            write!(out, "__t.array(")?;
+            write_type_builder(module, out, elem_ty)?;
+            write!(out, ")")?;
+        },
+        AlgebraicTypeUse::Ref(r) => {
+            write!(out, "{}", type_ref_name(module, *r))?;
+        },
+    }
+    Ok(())
+}
+
 fn write_sum_variant_type(module: &ModuleDef, out: &mut Indenter, ident: &Identifier, ty: &AlgebraicTypeUse) {
     let name = ident.deref().to_case(Case::Pascal);
     write!(out, "export type {name} = ");
@@ -1031,56 +675,14 @@ fn write_variant_types(module: &ModuleDef, out: &mut Indenter, variants: &[(Iden
     }
 }
 
-fn write_variant_constructors(
-    module: &ModuleDef,
-    out: &mut Indenter,
-    name: &str,
-    variants: &[(Identifier, AlgebraicTypeUse)],
-) {
-    // Write all the variant constructors.
-    // Write all of the variant constructors.
-    for (ident, ty) in variants {
-        if matches!(ty, AlgebraicTypeUse::Unit) {
-            // If the variant has no members, we can export a simple object.
-            // ```
-            // Foo: { tag: "Foo" } = { tag: "Foo" } as const,
-            // ```
-            write!(out, "{ident}: {{ tag: \"{ident}\" }} as const,");
-            writeln!(out);
-            continue;
-        }
-        let variant_name = ident.deref().to_case(Case::Pascal);
-        write!(out, "{variant_name}: (value: ");
-        write_type(module, out, ty, None, None).unwrap();
-        writeln!(
-            out,
-            "): {name}Variants.{variant_name} => ({{ tag: \"{variant_name}\", value }}),"
-        );
-    }
-}
-
-fn write_get_algebraic_type_for_sum(
-    module: &ModuleDef,
-    out: &mut Indenter,
-    type_cache_name: &str,
-    variants: &[(Identifier, AlgebraicTypeUse)],
-) {
-    writeln!(out, "getTypeScriptAlgebraicType(): __AlgebraicTypeType {{");
-    {
-        indent_scope!(out);
-        writeln!(out, "if ({type_cache_name}) return {type_cache_name};");
-        // initialization is split in two because of recursive types
-        writeln!(out, "{type_cache_name} = __AlgebraicTypeValue.Sum({{ variants: [] }});");
-        writeln!(out, "{type_cache_name}.value.variants.push(");
-        out.indent(1);
-        convert_sum_type_variants(module, &mut out, variants, "");
-        out.dedent(1);
-        writeln!(out, ");");
-        writeln!(out, "return {type_cache_name};");
-    }
-    writeln!(out, "}},");
-}
-
+/// e.g.
+/// ```ts
+/// // The tagged union or sum type for the algebraic type `Option`.
+/// export default __t.enum("Option", {
+///   none: __t.unit(),
+///   some: { value: __t.i32() },
+/// });
+/// ```
 fn define_body_for_sum(
     module: &ModuleDef,
     out: &mut Indenter,
@@ -1088,71 +690,9 @@ fn define_body_for_sum(
     variants: &[(Identifier, AlgebraicTypeUse)],
 ) {
     writeln!(out, "// The tagged union or sum type for the algebraic type `{name}`.");
-    write!(out, "export type {name} = ");
-
-    let names = variants
-        .iter()
-        .map(|(ident, _)| format!("{name}Variants.{}", ident.deref().to_case(Case::Pascal)))
-        .collect::<Vec<String>>()
-        .join(" |\n  ");
-
-    if variants.is_empty() {
-        writeln!(out, "never;");
-    } else {
-        writeln!(out, "{names};");
-    }
-
-    out.newline();
-
-    let type_cache_name = &*format!("_cached_{name}_type_value");
-    writeln!(out, "let {type_cache_name}: __AlgebraicTypeType | null = null;");
-    out.newline();
-
-    // Write the runtime value with helper functions
-    writeln!(out, "// A value with helper functions to construct the type.");
-    writeln!(out, "export const {name} = {{");
-    out.indent(1);
-
-    // Write all of the variant constructors.
-    writeln!(
-        out,
-        "// Helper functions for constructing each variant of the tagged union.
-// ```
-// const foo = Foo.A(42);
-// assert!(foo.tag === \"A\");
-// assert!(foo.value === 42);
-// ```"
-    );
-    write_variant_constructors(module, out, name, variants);
-    writeln!(out);
-
-    // Write the function that generates the algebraic type.
-    write_get_algebraic_type_for_sum(module, out, type_cache_name, variants);
-    writeln!(out);
-
-    writeln!(
-        out,
-        "serialize(writer: __BinaryWriter, value: {name}): void {{
-    __AlgebraicTypeValue.serializeValue(writer, {name}.getTypeScriptAlgebraicType(), value);
-}},"
-    );
-    writeln!(out);
-
-    writeln!(
-        out,
-        "deserialize(reader: __BinaryReader): {name} {{
-    return __AlgebraicTypeValue.deserializeValue(reader, {name}.getTypeScriptAlgebraicType());
-}},"
-    );
-    writeln!(out);
-
-    out.dedent(1);
-
-    writeln!(out, "}}");
-    out.newline();
-
-    writeln!(out, "export default {name};");
-
+    write!(out, "export default __t.enum(\"{name}\", {{");
+    out.with_indent(|out| write_object_type_builder_fields(module, out, variants, true).unwrap());
+    writeln!(out, "}});");
     out.newline();
 }
 
@@ -1290,72 +830,6 @@ pub fn write_type<W: Write>(
     Ok(())
 }
 
-fn convert_algebraic_type<'a>(
-    module: &'a ModuleDef,
-    out: &mut Indenter,
-    ty: &'a AlgebraicTypeUse,
-    ref_prefix: &'a str,
-) {
-    match ty {
-        AlgebraicTypeUse::ScheduleAt => write!(out, "__AlgebraicTypeValue.createScheduleAtType()"),
-        AlgebraicTypeUse::Identity => write!(out, "__AlgebraicTypeValue.createIdentityType()"),
-        AlgebraicTypeUse::ConnectionId => write!(out, "__AlgebraicTypeValue.createConnectionIdType()"),
-        AlgebraicTypeUse::Timestamp => write!(out, "__AlgebraicTypeValue.createTimestampType()"),
-        AlgebraicTypeUse::TimeDuration => write!(out, "__AlgebraicTypeValue.createTimeDurationType()"),
-        AlgebraicTypeUse::Option(inner_ty) => {
-            write!(out, "__AlgebraicTypeValue.createOptionType(");
-            convert_algebraic_type(module, out, inner_ty, ref_prefix);
-            write!(out, ")");
-        }
-        AlgebraicTypeUse::Array(ty) => {
-            write!(out, "__AlgebraicTypeValue.Array(");
-            convert_algebraic_type(module, out, ty, ref_prefix);
-            write!(out, ")");
-        }
-        AlgebraicTypeUse::Ref(r) => write!(
-            out,
-            "{ref_prefix}{}.getTypeScriptAlgebraicType()",
-            type_ref_name(module, *r)
-        ),
-        AlgebraicTypeUse::Primitive(prim) => {
-            write!(out, "__AlgebraicTypeValue.{prim:?}");
-        }
-        AlgebraicTypeUse::Unit => write!(out, "__AlgebraicTypeValue.Product({{ elements: [] }})"),
-        AlgebraicTypeUse::Never => unimplemented!(),
-        AlgebraicTypeUse::String => write!(out, "__AlgebraicTypeValue.String"),
-    }
-}
-
-fn convert_sum_type_variants<'a>(
-    module: &'a ModuleDef,
-    out: &mut Indenter,
-    variants: &'a [(Identifier, AlgebraicTypeUse)],
-    ref_prefix: &'a str,
-) {
-    for (ident, ty) in variants {
-        write!(out, "{{ name: \"{ident}\", algebraicType: ",);
-        convert_algebraic_type(module, out, ty, ref_prefix);
-        writeln!(out, " }},");
-    }
-}
-
-fn convert_product_type_elements<'a>(
-    module: &'a ModuleDef,
-    out: &mut Indenter,
-    elements: &'a [(Identifier, AlgebraicTypeUse)],
-    ref_prefix: &'a str,
-) {
-    for (ident, ty) in elements {
-        write!(
-            out,
-            "{{ name: \"{}\", algebraicType: ",
-            ident.deref().to_case(Case::Camel)
-        );
-        convert_algebraic_type(module, out, ty, ref_prefix);
-        writeln!(out, " }},");
-    }
-}
-
 /// Print imports for each of the `imports`.
 fn print_imports(module: &ModuleDef, out: &mut Indenter, imports: Imports, suffix: Option<&str>) {
     for typeref in imports {

From 83a23f9d1ffeac322d519a70a2f431a84befe8fe Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Mon, 3 Nov 2025 23:38:34 -0500
Subject: [PATCH 07/23] Almost there, just in a bit of a pickle

---
 .../src/lib/constraints.ts                    |  11 +
 .../bindings-typescript/src/lib/reducers.ts   |   5 +-
 crates/bindings-typescript/src/lib/table.ts   |  20 +-
 .../src/react/SpacetimeDBProvider.ts          |  24 +-
 .../src/react/useReducer.ts                   |  23 +-
 .../src/react/useSpacetimeDB.ts               |   6 +-
 .../bindings-typescript/src/react/useTable.ts |  83 +++--
 .../src/sdk/client_table.ts                   |  11 +-
 .../src/sdk/db_connection_builder.ts          |  15 +-
 .../src/sdk/db_connection_impl.ts             |   2 +
 crates/bindings-typescript/src/sdk/db_view.ts |   4 +-
 .../bindings-typescript/test-app/src/App.tsx  |   2 +-
 .../module_bindings/create_player_reducer.ts  |  59 +--
 .../test-app/src/module_bindings/index.ts     | 348 +++---------------
 .../src/module_bindings/player_table.ts       | 115 +-----
 .../src/module_bindings/player_type.ts        |  73 +---
 .../src/module_bindings/point_type.ts         |  16 +-
 .../module_bindings/unindexed_player_table.ts |  73 +---
 .../module_bindings/unindexed_player_type.ts  |  65 +---
 .../src/module_bindings/user_table.ts         | 100 +----
 .../test-app/src/module_bindings/user_type.ts |  58 +--
 crates/codegen/src/typescript.rs              | 248 +++++--------
 22 files changed, 356 insertions(+), 1005 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/constraints.ts b/crates/bindings-typescript/src/lib/constraints.ts
index 4301137281f..4b206a8c858 100644
--- a/crates/bindings-typescript/src/lib/constraints.ts
+++ b/crates/bindings-typescript/src/lib/constraints.ts
@@ -37,3 +37,14 @@ export type ColumnIsUnique<M extends ColumnMetadata<any>> = M extends
   | { isPrimaryKey: true }
   ? true
   : false;
+
+/**
+ * Constraint helper type used *inside* {@link table} to enforce the type
+ * of constraint definitions.
+ */
+export type ConstraintOpts<AllowedCol extends string> = {
+  name?: string;
+} & (
+  | { constraint: 'unique'; columns: [AllowedCol] }
+  | { constraint: 'primaryKey'; columns: [AllowedCol] }
+);
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index e6c1b767a04..64f54c3d961 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -11,7 +11,6 @@ import type {
   InferTypeOfRow,
   RowBuilder,
   RowObj,
-  StringBuilder,
   TypeBuilder,
 } from './type_builders';
 
@@ -265,7 +264,7 @@ export function clientDisconnected<
  */
 export type ReducerSchema<
   ReducerName extends string,
-  Params extends ParamsObj,
+  Params extends ParamsObj | RowObj,
 > = {
   /**
    * The name of the reducer.
@@ -347,7 +346,7 @@ export function reducerSchema<
   Params extends ParamsObj,
 >(
   name: ReducerName,
-  params: Params
+  params: Params 
 ): ReducerSchema<ReducerName, Params> {
   const paramType: ProductType = {
     elements: Object.entries(params).map(([n, c]) => ({
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index a4d4d9b5254..9bbc3e9e99c 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -4,10 +4,11 @@ import RawIndexAlgorithm from './autogen/raw_index_algorithm_type';
 import type RawIndexDefV9 from './autogen/raw_index_def_v_9_type';
 import type RawSequenceDefV9 from './autogen/raw_sequence_def_v_9_type';
 import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
-import type { AllUnique } from './constraints';
+import type { AllUnique, ConstraintOpts } from './constraints';
 import type { ColumnIndex, IndexColumns, Indexes, IndexOpts, ReadonlyIndexes } from './indexes';
 import { MODULE_DEF, splitName } from './schema';
 import {
+  ProductBuilder,
   RowBuilder,
   type ColumnBuilder,
   type ColumnMetadata,
@@ -87,6 +88,7 @@ export type TableOpts<Row extends RowObj> = {
   name: string;
   public?: boolean;
   indexes?: IndexOpts<keyof Row & string>[]; // declarative multi‑column indexes
+  constraints?: ConstraintOpts<keyof Row & string>[];
   scheduled?: string;
 };
 
@@ -295,6 +297,22 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     indexes.push({ name: undefined, accessorName: indexOpts.name, algorithm });
   }
 
+  // add explicit constraints from options.constraints
+  for (const constraintOpts of opts.constraints ?? []) {
+    if (constraintOpts.constraint === 'unique') {
+      let data: RawConstraintDefV9['data'];
+      data = {
+        tag: 'Unique',
+        value: { columns: constraintOpts.columns.map(c => colIds.get(c)!) },
+      };
+      constraints.push({ name: constraintOpts.name, data });
+      continue;
+    } 
+    if (constraintOpts.constraint === 'primaryKey') {
+      pk.push(...constraintOpts.columns.map(c => colIds.get(c)!));
+    }
+  }
+
   for (const index of indexes) {
     const cols =
       index.algorithm.tag === 'Direct'
diff --git a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
index 7ddd5b95981..0ca560b86ec 100644
--- a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
+++ b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
@@ -2,6 +2,7 @@ import {
   DbConnectionBuilder,
   type DbConnectionImpl,
   type ErrorContextInterface,
+  type RemoteModuleOf,
   type SubscriptionEventContextInterface,
 } from '../sdk/db_connection_impl';
 import * as React from 'react';
@@ -12,21 +13,20 @@ import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
 export interface SpacetimeDBProviderProps<
   RemoteModule extends UntypedRemoteModule,
-  DbConnection extends DbConnectionImpl<RemoteModule>,
+  DbConnection extends DbConnectionImpl<RemoteModule> = DbConnectionImpl<RemoteModule>,
 > {
   connectionBuilder: DbConnectionBuilder<RemoteModule, DbConnection>;
   children?: React.ReactNode;
 }
 
 export function SpacetimeDBProvider<
-  RemoteModule extends UntypedRemoteModule,
-  DbConnection extends DbConnectionImpl<RemoteModule>,
->({ connectionBuilder, children }: SpacetimeDBProviderProps<RemoteModule, DbConnection>) {
+  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
+>({ connectionBuilder, children }: SpacetimeDBProviderProps<RemoteModuleOf<DbConnection>>) {
   // Holds the imperative connection instance when (and only when) we’re on the client.
   const connRef = React.useRef<DbConnection | null>(null);
   const getConnection = React.useCallback(() => connRef.current, []);
 
-  const [state, setState] = React.useState<ConnectionState<RemoteModule, DbConnection>>({
+  const [state, setState] = React.useState<ConnectionState<DbConnection>>({
     isActive: false,
     identity: undefined,
     token: undefined,
@@ -38,7 +38,7 @@ export function SpacetimeDBProvider<
   // Build on the client only; useEffect won't run during SSR.
   React.useEffect(() => {
     // Register callback for onConnect to update state
-      const onConnect = (conn: DbConnectionImpl<RemoteModule>) => {
+      const onConnect = (conn: DbConnectionImpl<RemoteModuleOf<DbConnection>>) => {
       setState(s => ({
         ...s,
         isActive: conn.isActive,
@@ -47,13 +47,13 @@ export function SpacetimeDBProvider<
         connectionId: conn.connectionId,
       }));
     };
-    const onDisconnect = (ctx: ErrorContextInterface<RemoteModule>) => {
+    const onDisconnect = (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>) => {
       setState(s => ({
         ...s,
         isActive: ctx.isActive,
       }));
     };
-    const onConnectError = (ctx: ErrorContextInterface<RemoteModule>, err: Error) => {
+    const onConnectError = (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>, err: Error) => {
       setState(s => ({
         ...s,
         isActive: ctx.isActive,
@@ -75,13 +75,13 @@ export function SpacetimeDBProvider<
 
     // Lazily build once
     if (!connRef.current) {
-      connRef.current = connectionBuilder.build() as DbConnection;
+      connRef.current = connectionBuilder.build() as unknown as DbConnection;
     }
 
     return () => {
-      connRef.current?.removeOnConnect(onConnect);
-      connRef.current?.removeOnDisconnect(onDisconnect);
-      connRef.current?.removeOnConnectError(onConnectError);
+      connRef.current?.removeOnConnect(onConnect as any);
+      connRef.current?.removeOnDisconnect(onDisconnect as any);
+      connRef.current?.removeOnConnectError(onConnectError as any);
       connRef.current?.disconnect();
       connRef.current = null;
     };
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index b7684234b46..06eb76da311 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -1,19 +1,16 @@
-import type { DbConnectionImpl } from "../sdk/db_connection_impl";
-import type { ReducerNamesFromReducers } from "../sdk/reducer_handle";
+import type { DbConnectionImpl, RemoteModuleOf } from "../sdk/db_connection_impl";
+import type { ReducersView } from "../sdk/reducers";
 import type { UntypedRemoteModule } from "../sdk/spacetime_module";
-import { useSpacetimeDB } from "./useSpacetimeDB";
+import { useSpacetimeDB, } from "./useSpacetimeDB";
+
 
 export function useReducer<
-  RemoteModule extends UntypedRemoteModule,
-  DbConnection extends DbConnectionImpl<RemoteModule>,
-  ReducerName extends ReducerNamesFromReducers<DbConnection['reducers']> = ReducerNamesFromReducers<
-    DbConnection['reducers']
-  >,
-  ReducerType = DbConnection['reducers'][ReducerName & keyof DbConnection['reducers']]
+  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
+  ReducerName extends keyof ReducersView<RemoteModuleOf<DbConnection>> = keyof ReducersView<RemoteModuleOf<DbConnection>>
 >(
-  reducerName: ReducerName,
-): ReducerType {
-    const connectionState = useSpacetimeDB<RemoteModule, DbConnection>();
+  reducerName: ReducerName 
+): ReducersView<RemoteModuleOf<DbConnection>>[ReducerName] {
+    const connectionState = useSpacetimeDB<DbConnection>();
     const connection = connectionState.getConnection()!;
-    return connection.reducers[reducerName as keyof typeof connection.reducers];
+    return connection.reducers[reducerName];
 }
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/useSpacetimeDB.ts b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
index c0421a2ffd2..8eb1a1e01d1 100644
--- a/crates/bindings-typescript/src/react/useSpacetimeDB.ts
+++ b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
@@ -3,12 +3,12 @@ import type { DbConnectionImpl } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
 import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
-export const SpacetimeDBContext = createContext<ConnectionState<UntypedRemoteModule, DbConnectionImpl<UntypedRemoteModule>> | undefined>(undefined);
+export const SpacetimeDBContext = createContext<ConnectionState<DbConnectionImpl<UntypedRemoteModule>> | undefined>(undefined);
 
 // Throws an error if used outside of a SpacetimeDBProvider
 // Error is caught by other hooks like useTable so they can provide better error messages
-export function useSpacetimeDB<DbConnection extends DbConnectionImpl<UntypedRemoteModule>>(): ConnectionState<UntypedRemoteModule, DbConnection> {
-  const context = useContext(SpacetimeDBContext) as ConnectionState<UntypedRemoteModule, DbConnection> | undefined;
+export function useSpacetimeDB<DbConnection extends DbConnectionImpl<UntypedRemoteModule>>(): ConnectionState<DbConnection> {
+  const context = useContext(SpacetimeDBContext) as ConnectionState<DbConnection> | undefined;
   if (!context) {
     throw new Error(
       'useSpacetimeDB must be used within a SpacetimeDBProvider component. Did you forget to add a `SpacetimeDBProvider` to your component tree?'
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index 311b3d68663..0dc69d54f6a 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -6,10 +6,13 @@ import {
   useSyncExternalStore,
 } from 'react';
 import { useSpacetimeDB } from './useSpacetimeDB';
-import { DbConnectionImpl, TableCache } from '../sdk/db_connection_impl';
-import type { TableNamesFromDb } from '../sdk/client_table';
+import { DbConnectionImpl, TableCache, type EventContextInterface, type RemoteModuleOf } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
-import type { UntypedRemoteModule } from '../sdk/spacetime_module';
+import type { RemoteModule, UntypedRemoteModule } from '../sdk/spacetime_module';
+import type { ClientDbView } from '../sdk/db_view';
+import type { RowType, UntypedTableDef } from '../lib/table';
+import type { ClientTable } from '../sdk/client_table';
+import type { Infer, InferTypeOfRow } from '../lib/type_builders';
 
 export interface UseQueryCallbacks<RowType> {
   onInsert?: (row: RowType) => void;
@@ -69,7 +72,7 @@ export const isOr = <Column extends string>(
   e: Expr<Column>
 ): e is Extract<Expr<Column>, { type: 'or' }> => e.type === 'or';
 
-type RecordLike<Column extends string> = Record<Column, unknown>;
+type RecordLike<Column extends string> = Record<Column, any>;
 
 export function evaluate<Column extends string>(
   expr: Expr<Column>,
@@ -179,6 +182,15 @@ type ColumnsFromRow<R> = {
 }[keyof R] &
   string;
 
+// From a ClientTable<RM, Tbl>, get Tbl
+type TableDefOfClient<T> = T extends ClientTable<any, infer Tbl extends UntypedTableDef> ? Tbl : never;
+
+// Row type for a given connection + table key
+type RowTypeOfTable<
+  C extends DbConnectionImpl<any>,
+  K extends keyof ClientDbView<RemoteModuleOf<C>>
+> = InferTypeOfRow<RowType<TableDefOfClient<ClientDbView<RemoteModuleOf<C>>[K]>>>;
+
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
  *
@@ -214,15 +226,12 @@ type ColumnsFromRow<R> = {
  */
 export function useTable<
   DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  RowType extends Record<string, any>,
-  TableName extends TableNamesFromDb<DbConnection['db']> = TableNamesFromDb<
-    DbConnection['db']
-  >,
+  TableName extends keyof ClientDbView<RemoteModuleOf<DbConnection>> 
 >(
   tableName: TableName,
-  where: Expr<ColumnsFromRow<RowType>>,
-  callbacks?: UseQueryCallbacks<RowType>
-): Snapshot<RowType>;
+  where: Expr<ColumnsFromRow<RowTypeOfTable<DbConnection, TableName>>> ,
+  callbacks?: UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>
+): Snapshot<RowTypeOfTable<DbConnection, TableName>>;
 
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
@@ -259,37 +268,33 @@ export function useTable<
  */
 export function useTable<
   DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  RowType extends Record<string, any>,
-  TableName extends TableNamesFromDb<DbConnection['db']> = TableNamesFromDb<
-    DbConnection['db']
-  >,
+  TableName extends keyof ClientDbView<RemoteModuleOf<DbConnection>> 
 >(
   tableName: TableName,
-  callbacks?: UseQueryCallbacks<RowType>
-): Snapshot<RowType>;
+  callbacks?: UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>
+): Snapshot<RowTypeOfTable<DbConnection, TableName>>;
 
 export function useTable<
   DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  TableName extends TableNamesFromDb<DbConnection['db']> = TableNamesFromDb<
-    DbConnection['db']
-  >,
+  TableName extends keyof ClientDbView<RemoteModuleOf<DbConnection>>,
 >(
   tableName: TableName,
   whereClauseOrCallbacks?:
-    | Expr<ColumnsFromRow<RowType>>
-    | UseQueryCallbacks<RowType>,
-  callbacks?: UseQueryCallbacks<RowType>
-): Snapshot<RowType> {
-  let whereClause: Expr<ColumnsFromRow<RowType>> | undefined;
+    | Expr<ColumnsFromRow<RowTypeOfTable<DbConnection, TableName>>>
+    | UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>,
+  callbacks?: UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>
+): Snapshot<RowTypeOfTable<DbConnection, TableName>> {
+  type UseTableRowType = RowTypeOfTable<DbConnection, TableName>;
+  let whereClause: Expr<ColumnsFromRow<UseTableRowType>> | undefined;
   if (
     whereClauseOrCallbacks &&
     typeof whereClauseOrCallbacks === 'object' &&
     'type' in whereClauseOrCallbacks
   ) {
-    whereClause = whereClauseOrCallbacks as Expr<ColumnsFromRow<RowType>>;
+    whereClause = whereClauseOrCallbacks as Expr<ColumnsFromRow<UseTableRowType>>;
   } else {
     callbacks = whereClauseOrCallbacks as
-      | UseQueryCallbacks<RowType>
+      | UseQueryCallbacks<UseTableRowType>
       | undefined;
   }
   const [subscribeApplied, setSubscribeApplied] = useState(false);
@@ -305,25 +310,23 @@ export function useTable<
   }
 
   const query =
-    `SELECT * FROM ${tableName}` +
+    `SELECT * FROM ${String(tableName)}` +
     (whereClause ? ` WHERE ${toString(whereClause)}` : '');
 
   const latestTransactionEvent = useRef<any>(null);
-  const lastSnapshotRef = useRef<Snapshot<RowType> | null>(null);
+  const lastSnapshotRef = useRef<Snapshot<UseTableRowType> | null>(null);
 
   const whereKey = whereClause ? toString(whereClause) : '';
 
-  const computeSnapshot = useCallback((): Snapshot<RowType> => {
+  const computeSnapshot = useCallback((): Snapshot<UseTableRowType> => {
     const connection = connectionState.getConnection();
     if (!connection) {
       return { rows: [], state: 'loading' };
     }
-    const table = connection.db[
-      tableName as keyof typeof connection.db
-    ];
-    const result: readonly RowType[] = whereClause
-      ? Array.from(table.iter()).filter(row => evaluate(whereClause, row))
-      : Array.from(table.iter());
+    const table = connection.db[tableName];
+    const result: readonly UseTableRowType[] = whereClause
+      ? Array.from(table.iter()).filter(row => evaluate(whereClause, row as any)) as unknown as readonly UseTableRowType[]
+      : Array.from(table.iter()) as unknown as readonly UseTableRowType[];
     return {
       rows: result,
       state: subscribeApplied ? 'ready' : 'loading',
@@ -348,7 +351,7 @@ export function useTable<
 
   const subscribe = useCallback(
     (onStoreChange: () => void) => {
-      const onInsert = (ctx: any, row: RowType) => {
+      const onInsert = (ctx: EventContextInterface<UntypedRemoteModule>, row: any) => {
         if (whereClause && !evaluate(whereClause, row)) {
           return;
         }
@@ -363,7 +366,7 @@ export function useTable<
         }
       };
 
-      const onDelete = (ctx: any, row: RowType) => {
+      const onDelete = (ctx: EventContextInterface<UntypedRemoteModule>, row: any) => {
         if (whereClause && !evaluate(whereClause, row)) {
           return;
         }
@@ -378,7 +381,7 @@ export function useTable<
         }
       };
 
-      const onUpdate = (ctx: any, oldRow: RowType, newRow: RowType) => {
+      const onUpdate = (ctx: EventContextInterface<UntypedRemoteModule>, oldRow: any, newRow: any) => {
         const change = classifyMembership(whereClause, oldRow, newRow);
 
         switch (change) {
@@ -434,7 +437,7 @@ export function useTable<
     ]
   );
 
-  const getSnapshot = useCallback((): Snapshot<RowType> => {
+  const getSnapshot = useCallback((): Snapshot<UseTableRowType> => {
     if (!lastSnapshotRef.current) {
       lastSnapshotRef.current = computeSnapshot();
     }
diff --git a/crates/bindings-typescript/src/sdk/client_table.ts b/crates/bindings-typescript/src/sdk/client_table.ts
index ca19165f639..6d0e006e9b2 100644
--- a/crates/bindings-typescript/src/sdk/client_table.ts
+++ b/crates/bindings-typescript/src/sdk/client_table.ts
@@ -55,13 +55,4 @@ export type ClientTableCore<
   TableDef extends UntypedTableDef,
 > =
   ReadonlyTableMethods<TableDef> &
-  ClientTableMethods<RemoteModule, TableDef>;
-
-/**
- * Client database view, mapping table names to their corresponding ClientTable handles.
- */
-export type ClientDbView<
-  RemoteModule extends UntypedRemoteModule,
-> = {
-  readonly [Tbl in RemoteModule['tables'][number] as Tbl['name']]: ClientTable<RemoteModule, Tbl>;
-};
\ No newline at end of file
+  ClientTableMethods<RemoteModule, TableDef>;
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index 4eec420dd97..cf33668d4c7 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -1,16 +1,17 @@
 import { DbConnectionImpl, type ConnectionEvent } from './db_connection_impl';
 import { EventEmitter } from './event_emitter';
-import type { DbConnectionConfig, ErrorContextInterface, Identity, SubscriptionEventContextInterface } from '../';
+import type { DbConnectionConfig, ErrorContextInterface, Identity, RemoteModuleOf, SubscriptionEventContextInterface } from '../';
 import { type UntypedRemoteModule } from './spacetime_module';
 import { ensureMinimumVersionOrThrow } from './version';
 import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
 
 /**
  * The database client connection to a SpacetimeDB server.
+ * NOTE: DbConnectionImpl<any> is used here 
  */
 export class DbConnectionBuilder<
   RemoteModule extends UntypedRemoteModule,
-  DbConnection extends DbConnectionImpl<RemoteModule>,
+  DbConnection extends DbConnectionImpl<RemoteModule>
 > {
   #uri?: URL;
   #nameOrAddress?: string;
@@ -31,8 +32,8 @@ export class DbConnectionBuilder<
    * @param dbConnectionConstructor The constructor to use to create a new `DbConnection`.
    */
   constructor(
-    private remoteModule: RemoteModule,
-    private dbConnectionCtor: (config: DbConnectionConfig<RemoteModule>) => DbConnection
+    private remoteModule: RemoteModuleOf<DbConnection>,
+    private dbConnectionCtor: (config: DbConnectionConfig<RemoteModuleOf<DbConnection>>) => DbConnection
   ) {
     this.#createWSFn = WebsocketDecompressAdapter.createWebSocketFn;
   }
@@ -178,7 +179,7 @@ export class DbConnectionBuilder<
    * });
    * ```
    */
-  onConnectError(callback: (ctx: ErrorContextInterface<RemoteModule>, error: Error) => void): this {
+  onConnectError(callback: (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>, error: Error) => void): this {
     this.#emitter.on('connectError', callback);
     return this;
   }
@@ -210,7 +211,7 @@ export class DbConnectionBuilder<
    * @throws {Error} Throws an error if called multiple times on the same `DbConnectionBuilder`.
    */
   onDisconnect(
-    callback: (ctx: ErrorContextInterface<RemoteModule>, error?: Error | undefined) => void
+    callback: (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>, error?: Error | undefined) => void
   ): this {
     this.#emitter.on('disconnect', callback);
     return this;
@@ -230,7 +231,7 @@ export class DbConnectionBuilder<
    * DbConnection.builder().withUri(host).withModuleName(name_or_address).withToken(auth_token).build();
    * ```
    */
-  build(): DbConnectionImpl<RemoteModule> {
+  build(): DbConnection {
     if (!this.#uri) {
       throw new Error('URI is required to connect to SpacetimeDB');
     }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index 14ea6d83606..04b1a7967bd 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -57,6 +57,8 @@ import { toCamelCase } from '../lib/utils.ts';
 
 export { DbConnectionBuilder, SubscriptionBuilderImpl, TableCache, type Event };
 
+export type RemoteModuleOf<C> = C extends DbConnectionImpl<infer RM> ? RM : never;
+
 export type {
   DbContext,
   EventContextInterface,
diff --git a/crates/bindings-typescript/src/sdk/db_view.ts b/crates/bindings-typescript/src/sdk/db_view.ts
index 9d991765226..afcdbd4d4d0 100644
--- a/crates/bindings-typescript/src/sdk/db_view.ts
+++ b/crates/bindings-typescript/src/sdk/db_view.ts
@@ -5,5 +5,5 @@ import type { ClientTable } from "./client_table";
  * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
  */
 export type ClientDbView<RemoteModule extends UntypedRemoteModule> = {
-  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<RemoteModule, Tbl>;
-};
+  readonly [Tbl in RemoteModule['tables'][number] as Extract<Tbl['accessorName'], string>]: ClientTable<RemoteModule, Tbl>;
+};
\ No newline at end of file
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index 894e49b9239..bb2e7b1b7bf 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -7,7 +7,7 @@ function App() {
   const x = useReducer;
   const createPlayer = useReducer<DbConnection>('createPlayer');
   const connection = useSpacetimeDB<DbConnection>();
-  const players = useTable<DbConnection, Player>('player', {
+  const players = useTable<DbConnection, typeof Player>('player', {
     onInsert: player => {
       console.log(player);
     },
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
index 494f9eb5d1e..fdec0043c97 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,54 +30,13 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
 
-import { Point } from './point_type';
-// Mark import as potentially unused
-declare type __keep_Point = Point;
+import Point from './point_type';
 
-export type CreatePlayer = {
-  name: string;
-  location: Point;
+export default {
+  name: __t.string(),
+  location: Point,
 };
-let _cached_CreatePlayer_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const CreatePlayer = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_CreatePlayer_type_value) return _cached_CreatePlayer_type_value;
-    _cached_CreatePlayer_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_CreatePlayer_type_value.value.elements.push(
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'location', algebraicType: Point.getTypeScriptAlgebraicType() }
-    );
-    return _cached_CreatePlayer_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: CreatePlayer): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      CreatePlayer.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): CreatePlayer {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      CreatePlayer.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default CreatePlayer;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 95c704eaad9..004d8995f86 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -1,7 +1,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
 // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
 
-// This was generated using ../../../src/index cli version 1.5.0 (commit 5bfc84351742a6a8dc717b6c0011946f2d1b632d).
+// This was generated using ../../../src/index cli version 1.6.0 (commit 051fb278b3d871c87536cb87c8905c21103728fe).
 
 /* eslint-disable */
 /* tslint:disable */
@@ -10,15 +10,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -26,84 +32,58 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type ClientTable as __ClientTable,
   type RemoteModule as __RemoteModule,
-  type SetReducerFlags as __SetReducerFlags,
-  DbConnectionConfig,
+  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 
 // Import and reexport all reducer arg types
-import { CreatePlayer } from './create_player_reducer.ts';
+import CreatePlayer from './create_player_reducer.ts';
 export { CreatePlayer };
 
 // Import and reexport all table handle types
-import { PlayerTableHandle } from './player_table.ts';
-export { PlayerTableHandle };
-import { UnindexedPlayerTableHandle } from './unindexed_player_table.ts';
-export { UnindexedPlayerTableHandle };
-import { UserTableHandle } from './user_table.ts';
-export { UserTableHandle };
+import PlayerRow from './player_table.ts';
+export { PlayerRow };
+import UnindexedPlayerRow from './unindexed_player_table.ts';
+export { UnindexedPlayerRow };
+import UserRow from './user_table.ts';
+export { UserRow };
 
 // Import and reexport all types
-import { Player } from './player_type.ts';
+import Player from './player_type.ts';
 export { Player };
-import { Point } from './point_type.ts';
+import Point from './point_type.ts';
 export { Point };
-import { UnindexedPlayer } from './unindexed_player_type.ts';
+import UnindexedPlayer from './unindexed_player_type.ts';
 export { UnindexedPlayer };
-import { User } from './user_type.ts';
-import { schema } from '../../../src/lib/schema.ts';
-import t from '../../../src/lib/type_builders.ts';
-import { table } from '../../../src/lib/table.ts';
-import { reducerSchema, reducers } from '../../../src/lib/reducers.ts';
-import { RemoteModule } from '../../../src/sdk/spacetime_module.ts';
+import User from './user_type.ts';
 export { User };
 
-const pointType = t.object('Point', {
-  x: t.number(),
-  y: t.number(),
-});
-
-table({
-  name: 'player',
-  primaryKey: 'ownerId',
-  
-  indexes: [
-    { name: 'this_is_an_index', algorithm: "btree", columns: [ "ownerId" ] } 
-  ],
-}, t.row({
-  ownerId: t.string(),
-  name: t.string(),
-  location: pointType,
-}))
-
-const tablesSchema = schema(
-  table({ name: 'player', }, t.row({
-    ownerId: t.string(),
-    name: t.string(),
-    location: pointType,
-  })),
-  table({ name: 'unindexed_player', }, t.row({
-    ownerId: t.string(),
-    name: t.string(),
-    location: pointType,
-  })),
-  table({ name: 'user', primaryKey: 'identity', }, t.row({
-    identity: t.string(),
-    name: t.string(),
-  })),
+const tablesSchema = __schema(
+  __table(
+    {
+      name: 'player',
+      indexes: [],
+    },
+    PlayerRow
+  ),
+  __table(
+    {
+      name: 'unindexed_player',
+      indexes: [],
+    },
+    UnindexedPlayerRow
+  ),
+  __table(
+    {
+      name: 'user',
+      indexes: [],
+    },
+    UserRow
+  )
 );
 
-const reducersSchema = reducers(
-  reducerSchema('create_player', {
-    name: t.string(),
-    location: pointType,
-  }),
-  reducerSchema('foo_bar', {
-    name: t.string(),
-    location: pointType,
-  }),
+const reducersSchema = __reducers(
+  __reducerSchema('create_player', CreatePlayer)
 );
 
 const REMOTE_MODULE = {
@@ -112,26 +92,21 @@ const REMOTE_MODULE = {
   },
   tables: tablesSchema.schemaType.tables,
   reducers: reducersSchema.reducersType.reducers,
-} satisfies RemoteModule<
+} satisfies __RemoteModule<
   typeof tablesSchema.schemaType,
   typeof reducersSchema.reducersType
 >;
 
-export type EventContext = __EventContextInterface<
-  typeof REMOTE_MODULE
->;
+export type Module = typeof REMOTE_MODULE;
 
+export type EventContext = __EventContextInterface<typeof REMOTE_MODULE>;
 export type ReducerEventContext = __ReducerEventContextInterface<
   typeof REMOTE_MODULE
 >;
-
 export type SubscriptionEventContext = __SubscriptionEventContextInterface<
   typeof REMOTE_MODULE
 >;
-
-export type ErrorContext = __ErrorContextInterface<
-  typeof REMOTE_MODULE
->;
+export type ErrorContext = __ErrorContextInterface<typeof REMOTE_MODULE>;
 
 export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
   typeof REMOTE_MODULE
@@ -140,232 +115,17 @@ export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
 export class DbConnectionBuilder extends __DbConnectionBuilder<
   typeof REMOTE_MODULE,
   DbConnection
-> {};
+> {}
 
 export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
   static builder = (): DbConnectionBuilder => {
-    return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));
+    return new DbConnectionBuilder(
+      REMOTE_MODULE,
+      (config: __DbConnectionConfig<typeof REMOTE_MODULE>) =>
+        new DbConnection(config)
+    );
   };
   subscriptionBuilder = (): SubscriptionBuilder => {
     return new SubscriptionBuilder(this);
   };
 }
-
-
-// // --- factory returning a well-typed object ---
-// function makeReducersObj<R extends UntypedReducersDef>(
-//   r: { reducersType: R },
-//   call: (name: string, spacetime: R['reducers'][number]['paramsSpacetimeType'], params: R['reducers'][number]['params']) => void
-// ): Readonly<ReducersFrom<R>> {
-//   const obj: Record<string, any> = {};
-//   for (const red of Object.values(r.reducersType.reducers)) {
-//     const key = toCamelCase(red.name as string);
-//     obj[key] = (params: any) => call(red.name as string, red.paramsSpacetimeType, params);
-//   }
-//   return Object.freeze(obj) as Readonly<ReducersFrom<R>>;
-// }
-
-// const reducersObj: UntypedReducers = {}
-// for (const reducer of Object.values(reducersSchema.reducersType.reducers)) {
-//   reducersObj[toCamelCase(reducer.name)] = function<Args extends any[]>(...args: Args) {
-//     this.#connection.callReducerWithParams(
-//       reducersSchema.reducersType.reducers[0].name,
-//       reducersSchema.reducersType.reducers[0].paramsSpacetimeType,
-//       args,
-//       "FullUpdate",
-//     );
-//   };
-// }
-// Object.freeze(reducersObj);
-
-// export class RemoteReducers implements UntypedReducersDef {
-//   [key: string]: (...args: any[]) => void;
-
-//   #connection: __DbConnectionImpl<typeof spacetimedb.schemaType, typeof r.reducersType>;
-//   #setCallReducerFlags: SetReducerFlags;
-
-//   constructor(
-//     connection: __DbConnectionImpl<typeof spacetimedb.schemaType, typeof r.reducersType>,
-//     setCallReducerFlags: SetReducerFlags
-//   ) {
-//     this.#connection = connection;
-//     this.#setCallReducerFlags = setCallReducerFlags;
-//   }
-
-//   createPlayer(name: string, location: Point) {
-//     this.#connection.callReducerWithParams(
-//       r.reducersType.reducers[0].name,
-//       r.reducersType.reducers[0].paramsSpacetimeType,
-//       [name, location],
-//       this.#setCallReducerFlags.createPlayerFlags,
-//     );
-//   }
-
-//   // onCreatePlayer(
-//   //   callback: (ctx: ReducerEventContext, name: string, location: Point) => void
-//   // ) {
-//   //   this.#connection.onReducer('create_player', callback);
-//   // }
-
-//   // removeOnCreatePlayer(
-//   //   callback: (ctx: ReducerEventContext, name: string, location: Point) => void
-//   // ) {
-//   //   this.#connection.offReducer('create_player', callback);
-//   // }
-// }
-
-// export class SetReducerFlags implements __SetReducerFlags<RemoteReducers> {
-//   createPlayerFlags: __CallReducerFlags = 'FullUpdate';
-//   createPlayer(flags: __CallReducerFlags) {
-//     this.createPlayerFlags = flags;
-//   }
-// }
-
-// export class RemoteTables implements ClientDbView<typeof spacetimedb.schemaType> {
-//   constructor(private connection: __DbConnectionImpl<typeof spacetimedb.schemaType, RemoteReducers>) {}
-
-//   get player(): PlayerTableHandle<typeof spacetimedb.schemaType, typeof r.reducersType> {
-//     // clientCache is a private property
-//     return new PlayerTableHandle(
-//       (
-//         this.connection as unknown as { clientCache: __ClientCache }
-//       ).clientCache.getOrCreateTable<"player">(spacetimedb.tablesDef.tables[0])
-//     );
-//   }
-
-//   get unindexedPlayer(): UnindexedPlayerTableHandle<'unindexed_player'> {
-//     // clientCache is a private property
-//     return new UnindexedPlayerTableHandle(
-//       (
-//         this.connection as unknown as { clientCache: __ClientCache }
-//       ).clientCache.getOrCreateTable<"unindexed_player">(
-//         REMOTE_MODULE.tables.unindexed_player
-//       )
-//     );
-//   }
-
-//   get user(): UserTableHandle<'user'> {
-//     // clientCache is a private property
-//     return new UserTableHandle(
-//       (
-//         this.connection as unknown as { clientCache: __ClientCache }
-//       ).clientCache.getOrCreateTable<"user">(REMOTE_MODULE.tables.user)
-//     );
-//   }
-// }
-
-// export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-//   SchemaDef,
-//   RemoteReducers
-// > {}
-
-// export class DbConnection extends __DbConnectionImpl<
-//   SchemaDef,
-//   RemoteReducers,
-// > {
-//   static builder = (): __DbConnectionBuilder<
-//     DbConnection,
-//     ErrorContext,
-//     SubscriptionEventContext
-//   > => {
-//     return new __DbConnectionBuilder<
-//       DbConnection,
-//       ErrorContext,
-//       SubscriptionEventContext
-//     >(REMOTE_MODULE, (imp: __DbConnectionImpl) => imp as DbConnection);
-//   };
-//   subscriptionBuilder = (): SubscriptionBuilder => {
-//     return new SubscriptionBuilder(this);
-//   };
-// }
-
-// export type EventContext = __EventContextInterface<
-//   RemoteTables,
-//   RemoteReducers,
-//   SetReducerFlags,
-//   Reducer
-// >;
-// export type ReducerEventContext = __ReducerEventContextInterface<
-//   RemoteTables,
-//   RemoteReducers,
-//   SetReducerFlags,
-//   Reducer
-// >;
-// export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-//   RemoteTables,
-//   RemoteReducers,
-//   SetReducerFlags
-// >;
-// export type ErrorContext = __ErrorContextInterface<
-//   RemoteTables,
-//   RemoteReducers,
-//   SetReducerFlags
-// >;
-
-// const REMOTE_MODULE = {
-//   tables: {
-//     player: {
-//       name: 'player' as const,
-//       rowType: Player.getTypeScriptAlgebraicType(),
-//       primaryKey: 'ownerId',
-//       primaryKeyInfo: {
-//         colName: 'ownerId',
-//         colType: (
-//           Player.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-//         ).value.elements[0].algebraicType,
-//       },
-//     },
-//     unindexed_player: {
-//       tableName: 'unindexed_player' as const,
-//       rowType: UnindexedPlayer.getTypeScriptAlgebraicType(),
-//     },
-//     user: {
-//       tableName: 'user' as const,
-//       rowType: User.getTypeScriptAlgebraicType(),
-//       primaryKey: 'identity',
-//       primaryKeyInfo: {
-//         colName: 'identity',
-//         colType: (
-//           User.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-//         ).value.elements[0].algebraicType,
-//       },
-//     },
-//   },
-//   reducers: {
-//     create_player: {
-//       reducerName: 'create_player',
-//       argsType: CreatePlayer.getTypeScriptAlgebraicType(),
-//     },
-//   },
-//   versionInfo: {
-//     cliVersion: '1.5.0',
-//   },
-//   // Constructors which are used by the DbConnectionImpl to
-//   // extract type information from the generated RemoteModule.
-//   //
-//   // NOTE: This is not strictly necessary for `eventContextConstructor` because
-//   // all we do is build a TypeScript object which we could have done inside the
-//   // SDK, but if in the future we wanted to create a class this would be
-//   // necessary because classes have methods, so we'll keep it.
-//   eventContextConstructor: (
-//     imp: __DbConnectionImpl<SchemaDef, RemoteReducers>,
-//     event: __Event<Reducer>
-//   ) => {
-//     return {
-//       ...(imp as DbConnection),
-//       event,
-//     };
-//   },
-//   dbViewConstructor: (imp: __DbConnectionImpl<SchemaDef, RemoteReducers>) => {
-//     return new RemoteTables(imp);
-//   },
-//   reducersConstructor: (
-//     imp: __DbConnectionImpl<SchemaDef, RemoteReducers>,
-//     setReducerFlags: SetReducerFlags
-//   ) => {
-//     return new RemoteReducers(imp, setReducerFlags);
-//   },
-//   setReducerFlagsConstructor: () => {
-//     return new SetReducerFlags();
-//   },
-// } satisfies __RemoteModule<SchemaDef, RemoteReducers>;
\ No newline at end of file
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index a966cde4283..239885c6eb7 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,110 +30,13 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type ClientTable as __ClientTable,
-  table,
-  t,
 } from '../../../src/index';
-import { Player } from './player_type';
-import { Point } from './point_type';
-// Mark import as potentially unused
-declare type __keep_Point = Point;
+import Point from './point_type';
 
-import {
-  type EventContext,
-  type Reducer,
-  RemoteReducers,
-  RemoteTables,
-} from '.';
-declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
-
-
-export default table({ name: 'player' }, {
-  id: t.string().primaryKey().index(),
-  ownerId: t.string().unique(),
-  timestamp: t.timestamp(),
-  score: t.i32(),
+export default __t.row({
+  ownerId: __t.string(),
+  name: __t.string(),
   location: Point,
 });
-
-/**
- * Table handle for the table `player`.
- *
- * Obtain a handle from the [`player`] property on [`RemoteTables`],
- * like `ctx.db.player`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.player.on_insert(...)`.
- */
-export class PlayerTableHandle<TableName extends string>
-  implements __ClientTable<TableName>
-{
-  // phantom type to track the table name
-  readonly tableName!: TableName;
-  tableCache: __TableCache<Player>;
-
-  constructor(tableCache: __TableCache<Player>) {
-    this.tableCache = tableCache;
-  }
-
-  count(): number {
-    return this.tableCache.count();
-  }
-
-  iter(): Iterable<Player> {
-    return this.tableCache.iter();
-  }
-  /**
-   * Access to the `ownerId` unique index on the table `player`,
-   * which allows point queries on the field of the same name
-   * via the [`PlayerOwnerIdUnique.find`] method.
-   *
-   * Users are encouraged not to explicitly reference this type,
-   * but to directly chain method calls,
-   * like `ctx.db.player.ownerId().find(...)`.
-   *
-   * Get a handle on the `ownerId` unique index on the table `player`.
-   */
-  ownerId = {
-    // Find the subscribed row whose `ownerId` column value is equal to `colVal`,
-    // if such a row is present in the client cache.
-    find: (colVal: string): Player | undefined => {
-      for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.ownerId, colVal)) {
-          return row;
-        }
-      }
-    },
-  };
-
-  onInsert = (cb: (ctx: EventContext, row: Player) => void) => {
-    return this.tableCache.onInsert(cb);
-  };
-
-  removeOnInsert = (cb: (ctx: EventContext, row: Player) => void) => {
-    return this.tableCache.removeOnInsert(cb);
-  };
-
-  onDelete = (cb: (ctx: EventContext, row: Player) => void) => {
-    return this.tableCache.onDelete(cb);
-  };
-
-  removeOnDelete = (cb: (ctx: EventContext, row: Player) => void) => {
-    return this.tableCache.removeOnDelete(cb);
-  };
-
-  // Updates are only defined for tables with primary keys.
-  onUpdate = (
-    cb: (ctx: EventContext, oldRow: Player, newRow: Player) => void
-  ) => {
-    return this.tableCache.onUpdate(cb);
-  };
-
-  removeOnUpdate = (
-    cb: (ctx: EventContext, onRow: Player, newRow: Player) => void
-  ) => {
-    return this.tableCache.removeOnUpdate(cb);
-  };
-}
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index d6f04870fa6..5249c4a6be3 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,66 +30,13 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
-import { t } from '../../../src/server';
-import { Point } from './point_type';
-// Mark import as potentially unused
-declare type __keep_Point = Point;
+import Point from './point_type';
 
-t.object('Player', {
-  ownerId: t.string(),
-  name: t.string(),
-  location: Point.getTypeScriptAlgebraicType(),
+export default __t.object('Player', {
+  ownerId: __t.string(),
+  name: __t.string(),
+  location: Point,
 });
-
-const x = t.enum('PlayerEnum', {
-  foobar: t.f32(),
-  bazqux: t.string(),
-  quxfoo: t.bool(),
-});
-
-export type Player = {
-  ownerId: string;
-  name: string;
-  location: Point;
-};
-let _cached_Player_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const Player = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Player_type_value) return _cached_Player_type_value;
-    _cached_Player_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_Player_type_value.value.elements.push(
-      { name: 'ownerId', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'location', algebraicType: Point.getTypeScriptAlgebraicType() }
-    );
-    return _cached_Player_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Player): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Player.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Player {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Player.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Player;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
index 939de299c8b..3c0f0fd79d3 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,11 +30,11 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  t as __t,
 } from '../../../src/index';
 
 export default __t.object('Point', {
-  x: __t.number(),
-  y: __t.number(),
-});
\ No newline at end of file
+  x: __t.u16(),
+  y: __t.u16(),
+});
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
index eaff291a344..239885c6eb7 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,64 +30,13 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
-import { UnindexedPlayer } from './unindexed_player_type';
-import { Point } from './point_type';
-// Mark import as potentially unused
-declare type __keep_Point = Point;
+import Point from './point_type';
 
-import {
-  type EventContext,
-  type Reducer,
-  RemoteReducers,
-  RemoteTables,
-} from '.';
-declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
-
-/**
- * Table handle for the table `unindexed_player`.
- *
- * Obtain a handle from the [`unindexedPlayer`] property on [`RemoteTables`],
- * like `ctx.db.unindexedPlayer`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.unindexedPlayer.on_insert(...)`.
- */
-export class UnindexedPlayerTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
-{
-  // phantom type to track the table name
-  readonly tableName!: TableName;
-  tableCache: __TableCache<UnindexedPlayer>;
-
-  constructor(tableCache: __TableCache<UnindexedPlayer>) {
-    this.tableCache = tableCache;
-  }
-
-  count(): number {
-    return this.tableCache.count();
-  }
-
-  iter(): Iterable<UnindexedPlayer> {
-    return this.tableCache.iter();
-  }
-
-  onInsert = (cb: (ctx: EventContext, row: UnindexedPlayer) => void) => {
-    return this.tableCache.onInsert(cb);
-  };
-
-  removeOnInsert = (cb: (ctx: EventContext, row: UnindexedPlayer) => void) => {
-    return this.tableCache.removeOnInsert(cb);
-  };
-
-  onDelete = (cb: (ctx: EventContext, row: UnindexedPlayer) => void) => {
-    return this.tableCache.onDelete(cb);
-  };
-
-  removeOnDelete = (cb: (ctx: EventContext, row: UnindexedPlayer) => void) => {
-    return this.tableCache.removeOnDelete(cb);
-  };
-}
+export default __t.row({
+  ownerId: __t.string(),
+  name: __t.string(),
+  location: Point,
+});
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
index 8f2545fa8be..c27daf013e7 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,56 +30,13 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
-import { Point } from './point_type';
-// Mark import as potentially unused
-declare type __keep_Point = Point;
+import Point from './point_type';
 
-export type UnindexedPlayer = {
-  ownerId: string;
-  name: string;
-  location: Point;
-};
-let _cached_UnindexedPlayer_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const UnindexedPlayer = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_UnindexedPlayer_type_value)
-      return _cached_UnindexedPlayer_type_value;
-    _cached_UnindexedPlayer_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_UnindexedPlayer_type_value.value.elements.push(
-      { name: 'ownerId', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'location', algebraicType: Point.getTypeScriptAlgebraicType() }
-    );
-    return _cached_UnindexedPlayer_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: UnindexedPlayer): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      UnindexedPlayer.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): UnindexedPlayer {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      UnindexedPlayer.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default UnindexedPlayer;
+export default __t.object('UnindexedPlayer', {
+  ownerId: __t.string(),
+  name: __t.string(),
+  location: Point,
+});
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
index e8364a92e8f..29fa7652d66 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,93 +30,11 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
-import { User } from './user_type';
-import {
-  type EventContext,
-  type Reducer,
-  RemoteReducers,
-  RemoteTables,
-} from '.';
-declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
-
-/**
- * Table handle for the table `user`.
- *
- * Obtain a handle from the [`user`] property on [`RemoteTables`],
- * like `ctx.db.user`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.user.on_insert(...)`.
- */
-export class UserTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
-{
-  // phantom type to track the table name
-  readonly tableName!: TableName;
-  tableCache: __TableCache<User>;
-
-  constructor(tableCache: __TableCache<User>) {
-    this.tableCache = tableCache;
-  }
-
-  count(): number {
-    return this.tableCache.count();
-  }
-
-  iter(): Iterable<User> {
-    return this.tableCache.iter();
-  }
-  /**
-   * Access to the `identity` unique index on the table `user`,
-   * which allows point queries on the field of the same name
-   * via the [`UserIdentityUnique.find`] method.
-   *
-   * Users are encouraged not to explicitly reference this type,
-   * but to directly chain method calls,
-   * like `ctx.db.user.identity().find(...)`.
-   *
-   * Get a handle on the `identity` unique index on the table `user`.
-   */
-  identity = {
-    // Find the subscribed row whose `identity` column value is equal to `colVal`,
-    // if such a row is present in the client cache.
-    find: (colVal: __Identity): User | undefined => {
-      for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, colVal)) {
-          return row;
-        }
-      }
-    },
-  };
-
-  onInsert = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.onInsert(cb);
-  };
-
-  removeOnInsert = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.removeOnInsert(cb);
-  };
-
-  onDelete = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.onDelete(cb);
-  };
-
-  removeOnDelete = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.removeOnDelete(cb);
-  };
-
-  // Updates are only defined for tables with primary keys.
-  onUpdate = (cb: (ctx: EventContext, oldRow: User, newRow: User) => void) => {
-    return this.tableCache.onUpdate(cb);
-  };
 
-  removeOnUpdate = (
-    cb: (ctx: EventContext, onRow: User, newRow: User) => void
-  ) => {
-    return this.tableCache.removeOnUpdate(cb);
-  };
-}
+export default __t.row({
+  identity: __t.identity(),
+  username: __t.string(),
+});
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
index 6fa4066b314..3a4ccf1be08 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
@@ -8,15 +8,21 @@ import {
   BinaryReader as __BinaryReader,
   BinaryWriter as __BinaryWriter,
   ClientCache as __ClientCache,
+  ClientTable as __ClientTable,
   ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
   TimeDuration as __TimeDuration,
   Timestamp as __Timestamp,
   deepEqual as __deepEqual,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
   type AlgebraicType as __AlgebraicTypeType,
   type AlgebraicTypeVariants as __AlgebraicTypeVariants,
   type CallReducerFlags as __CallReducerFlags,
@@ -24,51 +30,11 @@ import {
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
 
-export type User = {
-  identity: __Identity;
-  username: string;
-};
-let _cached_User_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const User = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_User_type_value) return _cached_User_type_value;
-    _cached_User_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_User_type_value.value.elements.push(
-      {
-        name: 'identity',
-        algebraicType: __AlgebraicTypeValue.createIdentityType(),
-      },
-      { name: 'username', algebraicType: __AlgebraicTypeValue.String }
-    );
-    return _cached_User_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: User): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      User.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): User {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      User.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default User;
+export default __t.object('User', {
+  identity: __t.identity(),
+  username: __t.string(),
+});
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index dd3f0c8b871..4a398e7234e 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -1,5 +1,5 @@
 use crate::util::{
-    is_reducer_invokable, iter_indexes, iter_reducers, iter_tables, iter_types, iter_unique_cols, print_auto_generated_version_comment
+    is_reducer_invokable, iter_indexes, iter_reducers, iter_tables, iter_types, print_auto_generated_version_comment
 };
 use crate::{OutputFile};
 
@@ -15,7 +15,6 @@ use spacetimedb_lib::sats::AlgebraicTypeRef;
 use spacetimedb_primitives::ColId;
 use spacetimedb_schema::def::{BTreeAlgorithm, IndexAlgorithm, ModuleDef, ReducerDef, ScopedTypeName, TableDef, TypeDef};
 use spacetimedb_schema::identifier::Identifier;
-use spacetimedb_schema::schema::{Schema, TableSchema};
 use spacetimedb_schema::type_for_generate::{AlgebraicTypeDef, AlgebraicTypeUse, ProductTypeDef};
 
 use super::code_indenter::{CodeIndenter, Indenter};
@@ -124,21 +123,12 @@ impl Lang for TypeScript {
     /// }))
     /// ```
     fn generate_table_file(&self, module: &ModuleDef, table: &TableDef) -> OutputFile {
-        let schema = TableSchema::from_module_def(module, table, (), 0.into())
-            .validated()
-            .expect("Failed to generate table due to validation errors");
-
         let mut output = CodeIndenter::new(String::new(), INDENT);
         let out = &mut output;
 
         print_file_header(out, false);
 
         let type_ref = table.product_type_ref;
-        let row_type = type_ref_name(module, type_ref);
-        let row_type_module = type_ref_module_name(module, type_ref);
-
-        writeln!(out, "import {{ {row_type} }} from \"./{row_type_module}\";");
-
         let product_def = module.typespace_for_generate()[type_ref].as_product().unwrap();
 
         // Import the types of all fields.
@@ -154,65 +144,11 @@ impl Lang for TypeScript {
 
         writeln!(out);
 
-        writeln!(out, "export default table({{");
-        out.indent(1);
-        writeln!(
-            out,
-            "name: '{}',",
-            table.name.deref()
-        );
-        writeln!(out, "indexes: [");
+        writeln!(out, "export default __t.row({{");
         out.indent(1);
-        for index_def in iter_indexes(table) {
-            if !index_def.generated() {
-                // Skip system-defined indexes
-                continue;
-            }
-            match &index_def.algorithm {
-                IndexAlgorithm::BTree(BTreeAlgorithm { columns }) => {
-                    let get_name_and_type = |col_pos: ColId| {
-                        let (field_name, field_type) = &product_def.elements[col_pos.idx()];
-                        let name_camel = field_name.deref().to_case(Case::Camel);
-                        (name_camel, field_type)
-                    };
-                    writeln!(out, "{{ name: '{}', algorithm: 'btree', columns: [", index_def.name);
-                    out.indent(1);
-                    for col_id in columns.iter() {
-                        writeln!(out, "'{}',", get_name_and_type(col_id).0);
-                    }
-                    out.dedent(1);
-                    writeln!(out, "] }},");
-                }
-                IndexAlgorithm::Direct(_) => {
-                    // Direct indexes are not implemented yet.
-                    continue;
-                }
-                _ => todo!(),
-            };
-        }
+        write_object_type_builder_fields(module, out, &product_def.elements, true).unwrap();
         out.dedent(1);
-        writeln!(out, "}}, {{");
-        out.indent(1);
-        for (field_ident, field_ty) in &product_def.elements {
-            let field_name = field_ident.deref().to_case(Case::Camel);
-            write!(out, "{field_name}: ");
-            write_type(module, out, field_ty, None, None).unwrap();
-
-            let mut annotations = Vec::new();
-            if schema.pk().map(|pk| *field_ident == Identifier::new(pk.col_name.clone()).unwrap()).unwrap_or(false) {
-                annotations.push("primaryKey()");
-            } else {
-                for (unique_field_ident, _) in
-                    iter_unique_cols(module.typespace_for_generate(), &schema, product_def)
-                {
-                    if field_ident == unique_field_ident {
-                        annotations.push("unique()");
-                    }
-                }
-            }
-        }
         writeln!(out, "}});");
-        out.dedent(1);
         OutputFile {
             filename: table_module_name(&table.name) + ".ts",
             code: output.into_inner(),
@@ -236,9 +172,7 @@ impl Lang for TypeScript {
             None,
         );
 
-        let args_type = reducer_args_type_name(&reducer.name);
-
-        define_body_for_product(module, out, &args_type, &reducer.params_for_generate.elements);
+        define_body_for_reducer(module, out, &reducer.params_for_generate.elements);
 
         OutputFile {
             filename: reducer_module_name(&reducer.name) + ".ts",
@@ -254,78 +188,6 @@ impl Lang for TypeScript {
 
         out.newline();
 
-        // const tablesSchema = schema(
-//   table({ name: 'player', }, t.row({
-//     ownerId: t.string(),
-//     name: t.string(),
-//     location: pointType,
-//   })),
-//   table({ name: 'unindexed_player', }, t.row({
-//     ownerId: t.string(),
-//     name: t.string(),
-//     location: pointType,
-//   })),
-//   table({ name: 'user', primaryKey: 'identity', }, t.row({
-//     identity: t.string(),
-//     name: t.string(),
-//   })),
-// );
-
-// const reducersSchema = reducers(
-//   reducerSchema('create_player', {
-//     name: t.string(),
-//     location: pointType,
-//   }),
-//   reducerSchema('foo_bar', {
-//     name: t.string(),
-//     location: pointType,
-//   }),
-// );
-
-// const REMOTE_MODULE = {
-//   versionInfo: {
-//     cliVersion: '1.6.0' as const,
-//   },
-//   tables: tablesSchema.schemaType.tables,
-//   reducers: reducersSchema.reducersType.reducers,
-// } satisfies RemoteModule<
-//   typeof tablesSchema.schemaType,
-//   typeof reducersSchema.reducersType
-// >;
-
-// export type EventContext = __EventContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export type ReducerEventContext = __ReducerEventContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export type ErrorContext = __ErrorContextInterface<
-//   typeof REMOTE_MODULE
-// >;
-
-// export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-//   typeof REMOTE_MODULE
-// > {}
-
-// export class DbConnectionBuilder extends __DbConnectionBuilder<
-//   typeof REMOTE_MODULE,
-//   DbConnection
-// > {};
-
-// export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
-//   static builder = (): DbConnectionBuilder => {
-//     return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));
-//   };
-//   subscriptionBuilder = (): SubscriptionBuilder => {
-//     return new SubscriptionBuilder(this);
-//   };
-
         writeln!(out, "// Import and reexport all reducer arg types");
         for reducer in iter_reducers(module) {
             let reducer_name = &reducer.name;
@@ -341,8 +203,10 @@ impl Lang for TypeScript {
             let table_name = &table.name;
             let table_module_name = table_module_name(table_name) + ".ts";
             let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
-            writeln!(out, "import {table_name_pascalcase} from \"./{table_module_name}\";");
-            writeln!(out, "export {{ {table_name_pascalcase} }};");
+            // TODO: This really shouldn't be necessary. We could also have `table()` accept
+            // `__t.object(...)`s.
+            writeln!(out, "import {table_name_pascalcase}Row from \"./{table_module_name}\";");
+            writeln!(out, "export {{ {table_name_pascalcase}Row }};");
         }
 
         writeln!(out);
@@ -357,18 +221,23 @@ impl Lang for TypeScript {
         out.newline();
         
         writeln!(out);
-        writeln!(out, "const tablesSchema = schema(");
+        writeln!(out, "const tablesSchema = __schema(");
         out.indent(1);
         for table in iter_tables(module) {
-            let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
-            writeln!(out, "{},", table_name_pascalcase);
+            let type_ref = table.product_type_ref;
+            let row_type_name = type_ref_name(module, type_ref);
+            writeln!(out, "__table({{");
+            out.indent(1);
+            write_table_opts(module, out, table);
+            out.dedent(1);
+            writeln!(out, "}}, {}Row),", row_type_name);
         }
         out.dedent(1);
         writeln!(out, ");");
 
         writeln!(out);
 
-        writeln!(out, "const reducersSchema = reducers(");
+        writeln!(out, "const reducersSchema = __reducers(");
         out.indent(1);
         for reducer in iter_reducers(module) {
             if !is_reducer_invokable(reducer) {
@@ -377,7 +246,7 @@ impl Lang for TypeScript {
             }
             let reducer_name = &reducer.name;
             let args_type = reducer_args_type_name(&reducer.name);
-            writeln!(out, "reducerSchema(\"{}\", {}),", reducer_name, args_type);
+            writeln!(out, "__reducerSchema(\"{}\", {}),", reducer_name, args_type);
         }
         out.dedent(1);
         writeln!(out, ");");
@@ -451,7 +320,7 @@ impl Lang for TypeScript {
         out.indent(1);
         writeln!(
             out,
-            "return new DbConnectionBuilder(REMOTE_MODULE, (config: DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));"
+            "return new DbConnectionBuilder(REMOTE_MODULE, (config: __DbConnectionConfig<typeof REMOTE_MODULE>) => new DbConnection(config));"
         );
         out.dedent(1);
         writeln!(out, "}};");
@@ -492,9 +361,9 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "type CallReducerFlags as __CallReducerFlags",
         "type EventContextInterface as __EventContextInterface",
         "type ReducerEventContextInterface as __ReducerEventContextInterface",
-        "type RemoteModule as __RemoteModule",
         "type SubscriptionEventContextInterface as __SubscriptionEventContextInterface",
         "type ErrorContextInterface as __ErrorContextInterface",
+        "type RemoteModule as __RemoteModule",
         "SubscriptionBuilderImpl as __SubscriptionBuilderImpl",
         "BinaryReader as __BinaryReader",
         "DbConnectionImpl as __DbConnectionImpl",
@@ -505,7 +374,6 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "reducers as __reducers",
         "reducerSchema as __reducerSchema",
         "DbConnectionConfig as __DbConnectionConfig",
-        "RemoteModule as __RemoteModule",
         "t as __t",
     ];
     types.sort();
@@ -532,6 +400,29 @@ fn print_lint_suppression(output: &mut Indenter) {
     writeln!(output, "/* tslint:disable */");
 }
 
+/// e.g.
+/// ```ts
+/// export default {
+///   x: __t.f32(),
+///   y: __t.f32(),
+///   fooBar: __t.string(),
+/// };
+/// ```
+fn define_body_for_reducer(
+    module: &ModuleDef,
+    out: &mut Indenter,
+    params: &[(Identifier, AlgebraicTypeUse)],
+) {
+    write!(out, "export default {{");
+    if params.is_empty() {
+        writeln!(out, "}};");
+    } else {    
+        writeln!(out);
+        out.with_indent(|out| write_object_type_builder_fields(module, out, params, true).unwrap());
+        writeln!(out, "}};");
+    }
+}
+
 /// e.g.
 /// ```ts
 /// export default __t.object('Point', {
@@ -549,15 +440,56 @@ fn define_body_for_product(
 
     write!(out, "export default __t.object(\"{name}\", {{");
     if elements.is_empty() {
-        writeln!(out, "}};");
+        writeln!(out, "}});");
     } else {
         writeln!(out);
         out.with_indent(|out| write_object_type_builder_fields(module, out, elements, true).unwrap());
-        writeln!(out, "}};");
+        writeln!(out, "}});");
     }
     out.newline();
 }
 
+fn write_table_opts(module: &ModuleDef, out: &mut Indenter, table: &TableDef) {
+    let type_ref = table.product_type_ref;
+    let product_def = module.typespace_for_generate()[type_ref].as_product().unwrap();
+    writeln!(
+        out,
+        "name: '{}',",
+        table.name.deref()
+    );
+    writeln!(out, "indexes: [");
+    out.indent(1);
+    for index_def in iter_indexes(table) {
+        if !index_def.generated() {
+            // Skip system-defined indexes
+            continue;
+        }
+        match &index_def.algorithm {
+            IndexAlgorithm::BTree(BTreeAlgorithm { columns }) => {
+                let get_name_and_type = |col_pos: ColId| {
+                    let (field_name, field_type) = &product_def.elements[col_pos.idx()];
+                    let name_camel = field_name.deref().to_case(Case::Camel);
+                    (name_camel, field_type)
+                };
+                writeln!(out, "{{ name: '{}', algorithm: 'btree', columns: [", index_def.name);
+                out.indent(1);
+                for col_id in columns.iter() {
+                    writeln!(out, "'{}',", get_name_and_type(col_id).0);
+                }
+                out.dedent(1);
+                writeln!(out, "] }},");
+            }
+            IndexAlgorithm::Direct(_) => {
+                // Direct indexes are not implemented yet.
+                continue;
+            }
+            _ => todo!(),
+        };
+    }
+    out.dedent(1);
+    writeln!(out, "],");
+}
+
 /// e.g.
 /// ```ts
 ///   x: __t.f32(),
@@ -838,14 +770,10 @@ fn print_imports(module: &ModuleDef, out: &mut Indenter, imports: Imports, suffi
         if let Some(suffix) = suffix {
             writeln!(
                 out,
-                "import {{ {type_name} as {type_name}{suffix} }} from \"./{module_name}\";"
+                "import {type_name}{suffix} from \"./{module_name}\";"
             );
-            writeln!(out, "// Mark import as potentially unused");
-            writeln!(out, "declare type __keep_{type_name}{suffix} = {type_name}{suffix};");
         } else {
-            writeln!(out, "import {{ {type_name} }} from \"./{module_name}\";");
-            writeln!(out, "// Mark import as potentially unused");
-            writeln!(out, "declare type __keep_{type_name} = {type_name};");
+            writeln!(out, "import {type_name} from \"./{module_name}\";");
         }
     }
 }

From ae3556ed584ab41f29187826c0fac8dc54479dc3 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Tue, 4 Nov 2025 20:41:46 -0500
Subject: [PATCH 08/23] Fixed many small issues, now begin the AlgebraicType
 stuff

---
 .../src/lib/reducer_schema.ts                 |  38 ++
 .../bindings-typescript/src/lib/reducers.ts   |  49 +-
 crates/bindings-typescript/src/lib/schema.ts  |  15 +-
 crates/bindings-typescript/src/lib/table.ts   |  38 +-
 .../src/lib/table_schema.ts                   |  38 ++
 .../src/lib/type_builders.ts                  | 544 +++++++++---------
 .../bindings-typescript/src/lib/type_util.ts  |  18 +-
 .../src/react/SpacetimeDBProvider.ts          |  15 +-
 .../src/react/connection_state.ts             |   5 +-
 .../src/react/useReducer.ts                   |  19 +-
 .../src/react/useSpacetimeDB.ts               |   6 +-
 .../bindings-typescript/src/react/useTable.ts | 103 ++--
 .../src/sdk/client_cache.ts                   |  14 +-
 .../src/sdk/client_table.ts                   |  79 ++-
 .../src/sdk/db_connection_builder.ts          |   9 +-
 .../src/sdk/db_connection_impl.ts             |  21 +-
 crates/bindings-typescript/src/sdk/db_view.ts |   2 +-
 crates/bindings-typescript/src/sdk/event.ts   |   4 +-
 .../src/sdk/event_context.ts                  |   6 +-
 crates/bindings-typescript/src/sdk/index.ts   |   2 +-
 .../src/sdk/reducer_event.ts                  |   4 +-
 .../bindings-typescript/src/sdk/reducers.ts   |  18 +-
 .../src/sdk/table_cache.ts                    |  45 +-
 .../bindings-typescript/test-app/src/App.tsx  |  23 +-
 .../module_bindings/create_player_reducer.ts  |  14 +-
 .../test-app/src/module_bindings/index.ts     |  24 +-
 .../src/module_bindings/player_table.ts       |  14 +-
 .../src/module_bindings/player_type.ts        |  14 +-
 .../src/module_bindings/point_type.ts         |  14 +-
 .../module_bindings/unindexed_player_table.ts |  14 +-
 .../module_bindings/unindexed_player_type.ts  |  14 +-
 .../src/module_bindings/user_table.ts         |  14 +-
 .../test-app/src/module_bindings/user_type.ts |  14 +-
 crates/codegen/src/typescript.rs              |  21 +-
 34 files changed, 631 insertions(+), 641 deletions(-)
 create mode 100644 crates/bindings-typescript/src/lib/reducer_schema.ts
 create mode 100644 crates/bindings-typescript/src/lib/table_schema.ts

diff --git a/crates/bindings-typescript/src/lib/reducer_schema.ts b/crates/bindings-typescript/src/lib/reducer_schema.ts
new file mode 100644
index 00000000000..1d0b2f71221
--- /dev/null
+++ b/crates/bindings-typescript/src/lib/reducer_schema.ts
@@ -0,0 +1,38 @@
+import type { ProductType } from "./algebraic_type";
+import type RawReducerDefV9 from "./autogen/raw_reducer_def_v_9_type";
+import type { ParamsObj } from "./reducers";
+import type { Infer, RowBuilder, RowObj } from "./type_builders";
+import type { CamelCase } from "./type_util";
+
+/**
+ * Represents a handle to a database reducer, including its name and argument type.
+ */
+export type ReducerSchema<
+  ReducerName extends string,
+  Params extends ParamsObj | RowObj,
+> = {
+  /**
+   * The name of the reducer.
+   */
+  readonly reducerName: ReducerName;
+  
+  /**
+   * The accessor name for the reducer.
+   */
+  readonly accessorName: CamelCase<ReducerName>;
+
+  /**
+   * The TypeBuilder representation of the reducer's parameter type.
+   */
+  readonly params: RowBuilder<Params>;
+  
+  /**
+   * The {@link ProductType} representing the structure of the reducer's parameters.
+   */
+  readonly paramsSpacetimeType: ProductType;
+
+  /**
+   * The {@link RawReducerDefV9} of the configured reducer.
+   */
+  readonly reducerDef: RawReducerDefV9;
+};
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index 64f54c3d961..7e2835df33c 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -7,12 +7,17 @@ import type { Timestamp } from './timestamp';
 import type { UntypedReducersDef } from '../sdk/reducers';
 import type { DbView } from '../server/db_view';
 import { MODULE_DEF, type UntypedSchemaDef } from './schema';
-import type {
-  InferTypeOfRow,
+import {
   RowBuilder,
-  RowObj,
-  TypeBuilder,
+  type Infer,
+  type InferTypeOfRow,
+  type ProductBuilder,
+  type RowObj,
+  type TypeBuilder,
 } from './type_builders';
+import type { CamelCase } from './type_util';
+import type { ReducerSchema } from './reducer_schema';
+import { toCamelCase } from './utils';
 
 /**
  * Helper to extract the parameter types from an object type
@@ -259,34 +264,6 @@ export function clientDisconnected<
   pushReducer(name, params, fn, Lifecycle.OnDisconnect);
 }
 
-/**
- * Represents a handle to a database reducer, including its name and argument type.
- */
-export type ReducerSchema<
-  ReducerName extends string,
-  Params extends ParamsObj | RowObj,
-> = {
-  /**
-   * The name of the reducer.
-   */
-  readonly reducerName: ReducerName;
-
-  /**
-   * The type of the parameters object expected by the reducer.
-   */
-  readonly paramsType: Params;
-
-  /**
-   * 
-   */
-  readonly paramsSpacetimeType: ProductType;
-
-  /**
-   * The {@link RawReducerDefV9} of the configured reducer.
-   */
-  readonly reducerDef: RawReducerDefV9;
-};
-
 class Reducers<ReducersDef extends UntypedReducersDef> {
   /**
    * Phantom type to track the reducers definition 
@@ -302,8 +279,9 @@ type ReducersToSchema<T extends readonly ReducerSchema<any, any>[]> = {
     /** @type {UntypedReducerDef} */
     readonly [i in keyof T]: {
       name: T[i]['reducerName'];
-      params: T[i]['paramsType'];
-      paramsSpacetimeType: T[i]['paramsSpacetimeType'];
+      accessorName: T[i]['accessorName'];
+      params: T[i]['params']['row'];
+      paramsType: T[i]['paramsSpacetimeType'];
     };
   };
 };
@@ -356,7 +334,8 @@ export function reducerSchema<
   };
   return {
     reducerName: name,
-    paramsType: params,
+    accessorName: toCamelCase(name),
+    params: new RowBuilder<Params>(params),
     paramsSpacetimeType: paramType,
     reducerDef: {
       name,
diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
index 1a33c11473d..16fe41680d7 100644
--- a/crates/bindings-typescript/src/lib/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -7,7 +7,7 @@ import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type TypeBuilder,
 } from './type_builders';
-import type { TableSchema, UntypedTableDef } from './table';
+import type { UntypedTableDef } from './table';
 import {
   clientConnected,
   clientDisconnected,
@@ -23,6 +23,9 @@ import {
 } from './algebraic_type';
 import type RawScopedTypeNameV9 from './autogen/raw_scoped_type_name_v_9_type';
 import type { CamelCase } from './type_util';
+import type { TableSchema } from './table_schema';
+
+export type TableNamesOf<S extends UntypedSchemaDef> = S['tables'][number]['name'];
 
 /**
  * An untyped representation of the database schema.
@@ -363,3 +366,13 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
 
   return new Schema(tableDefs, MODULE_DEF.typespace);
 }
+
+type HasAccessor = { accessorName: PropertyKey };
+
+export type ConvertToAccessorMap<TableDefs extends readonly HasAccessor[]> = {
+  [Tbl in TableDefs[number] as Tbl["accessorName"]]: Tbl
+};
+
+export function convertToAccessorMap<T extends readonly HasAccessor[]>(arr: T): ConvertToAccessorMap<T> {
+  return Object.fromEntries(arr.map(v => [v.accessorName, v])) as ConvertToAccessorMap<T>;
+}
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index 9bbc3e9e99c..4fe94e545df 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -7,6 +7,7 @@ import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
 import type { AllUnique, ConstraintOpts } from './constraints';
 import type { ColumnIndex, IndexColumns, Indexes, IndexOpts, ReadonlyIndexes } from './indexes';
 import { MODULE_DEF, splitName } from './schema';
+import type { TableSchema } from './table_schema';
 import {
   ProductBuilder,
   RowBuilder,
@@ -16,7 +17,7 @@ import {
   type RowObj,
   type TypeBuilder,
 } from './type_builders';
-import type { Prettify } from './type_util';
+import type { Prettify, PrettifyDeep } from './type_util';
 
 export type AlgebraicTypeRef = number;
 type ColId = number;
@@ -35,7 +36,7 @@ export type RowType<TableDef extends UntypedTableDef> = InferTypeOfRow<
 export type CoerceColumn<
   Col extends TypeBuilder<any, any> | ColumnBuilder<any, any, any>,
 > =
-  Col extends TypeBuilder<infer T, infer U> ? ColumnBuilder<T, U, object> : Col;
+  Col extends TypeBuilder<infer T, infer U> ? ColumnBuilder<T, U, ColumnMetadata<any>> : Col;
 
 /**
  * Coerces a RowObj where TypeBuilders are replaced with ColumnBuilders
@@ -55,7 +56,7 @@ type CoerceArray<X extends IndexOpts<any>[]> = X;
 export type UntypedTableDef = {
   name: string;
   accessorName: string;
-  columns: Record<string, ColumnBuilder<any, any, ColumnMetadata<any>>>;
+  columns: CoerceRow<RowObj>;
   rowType: ProductType;
   indexes: IndexOpts<any>[];
 };
@@ -149,37 +150,6 @@ export type TableMethods<TableDef extends UntypedTableDef> = ReadonlyTableMethod
   delete(row: RowType<TableDef>): boolean;
 };
 
-/**
- * Represents a handle to a database table, including its name, row type, and row spacetime type.
- */
-export type TableSchema<
-  TableName extends string,
-  Row extends Record<string, ColumnBuilder<any, any, any>>,
-  Idx extends readonly IndexOpts<keyof Row & string>[],
-> = {
-  readonly rowType: RowBuilder<Row>;
-
-  /**
-   * The name of the table.
-   */
-  readonly tableName: TableName;
-
-  /**
-   * The {@link ProductType} representing the structure of a row in the table.
-   */
-  readonly rowSpacetimeType: ProductType;
-
-  /**
-   * The {@link RawTableDefV9} of the configured table
-   */
-  readonly tableDef: RawTableDefV9;
-
-  /**
-   * The indexes defined on the table.
-   */
-  readonly idxs: Idx;
-};
-
 /**
  * Defines a database table with schema and options
  * @param opts - Table configuration including name, indexes, and access control
diff --git a/crates/bindings-typescript/src/lib/table_schema.ts b/crates/bindings-typescript/src/lib/table_schema.ts
new file mode 100644
index 00000000000..a76d05ef4ec
--- /dev/null
+++ b/crates/bindings-typescript/src/lib/table_schema.ts
@@ -0,0 +1,38 @@
+import type { ProductType } from "./algebraic_type";
+import type RawTableDefV9 from "./autogen/raw_table_def_v_9_type";
+import type { IndexOpts } from "./indexes";
+import type { ColumnBuilder, RowBuilder } from "./type_builders";
+
+/**
+ * Represents a handle to a database table, including its name, row type, and row spacetime type.
+ */
+export type TableSchema<
+  TableName extends string,
+  Row extends Record<string, ColumnBuilder<any, any, any>>,
+  Idx extends readonly IndexOpts<keyof Row & string>[],
+> = {
+  /**
+   * The name of the table.
+   */
+  readonly tableName: TableName;
+
+  /**
+   * The TypeBuilder representation of the type of the rows in the table.
+   **/
+  readonly rowType: RowBuilder<Row>;
+
+  /**
+   * The {@link ProductType} representing the structure of a row in the table.
+   */
+  readonly rowSpacetimeType: ProductType;
+
+  /**
+   * The {@link RawTableDefV9} of the configured table
+   */
+  readonly tableDef: RawTableDefV9;
+
+  /**
+   * The indexes defined on the table.
+   */
+  readonly idxs: Idx;
+};
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 771cce3b188..c046b9a4067 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -15,7 +15,7 @@ import {
 import type { OptionAlgebraicType } from './option';
 import { addType, MODULE_DEF } from '../lib/schema';
 import type { CoerceRow } from './table';
-import { set, type Set } from './type_util';
+import { set, type SetField } from './type_util';
 
 /**
  * Helper type to extract the TypeScript type from a TypeBuilder
@@ -54,7 +54,7 @@ type CollapseColumn<
  */
 export type RowObj = Record<
   string,
-  TypeBuilder<any, any> | ColumnBuilder<any, any, any>
+  TypeBuilder<any, any> | ColumnBuilder<any, any, ColumnMetadata<any>>
 >;
 
 /**
@@ -199,7 +199,7 @@ interface PrimaryKeyable<
   primaryKey(): ColumnBuilder<
     Type,
     SpacetimeType,
-    Set<M, 'isPrimaryKey', true>
+    SetField<M, 'isPrimaryKey', true>
   >;
 }
 
@@ -228,7 +228,7 @@ interface Uniqueable<
   /**
    * Specify this column as unique
    */
-  unique(): ColumnBuilder<Type, SpacetimeType, Set<M, 'isUnique', true>>;
+  unique(): ColumnBuilder<Type, SpacetimeType, SetField<M, 'isUnique', true>>;
 }
 
 /**
@@ -256,10 +256,10 @@ interface Indexable<
    * Specify the index type for this column
    * @param algorithm The index algorithm to use
    */
-  index(): ColumnBuilder<Type, SpacetimeType, Set<M, 'indexType', 'btree'>>;
+  index(): ColumnBuilder<Type, SpacetimeType, SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): ColumnBuilder<Type, SpacetimeType, Set<M, 'indexType', N>>;
+  ): ColumnBuilder<Type, SpacetimeType, SetField<M, 'indexType', N>>;
 }
 
 /**
@@ -290,7 +290,7 @@ interface AutoIncrementable<
   autoInc(): ColumnBuilder<
     Type,
     SpacetimeType,
-    Set<M, 'isAutoIncrement', true>
+    SetField<M, 'isAutoIncrement', true>
   >;
 }
 
@@ -344,7 +344,7 @@ interface Defaultable<
    */
   default(
     value: Type
-  ): ColumnBuilder<Type, SpacetimeType, Set<M, 'defaultValue', Type>>;
+  ): ColumnBuilder<Type, SpacetimeType, SetField<M, 'defaultValue', Type>>;
 }
 
 export class U8Builder
@@ -359,28 +359,28 @@ export class U8Builder
   constructor() {
     super(AlgebraicType.U8);
   }
-  index(): U8ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): U8ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U8ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): U8ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U8ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): U8ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new U8ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): U8ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): U8ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U8ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U8ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U8ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new U8ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U8ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U8ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new U8ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -388,7 +388,7 @@ export class U8Builder
   }
   default(
     value: number
-  ): U8ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): U8ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new U8ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -408,28 +408,28 @@ export class U16Builder
   constructor() {
     super(AlgebraicType.U16);
   }
-  index(): U16ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): U16ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U16ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): U16ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U16ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): U16ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new U16ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): U16ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): U16ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U16ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U16ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U16ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new U16ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U16ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U16ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new U16ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -437,7 +437,7 @@ export class U16Builder
   }
   default(
     value: number
-  ): U16ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): U16ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new U16ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -457,28 +457,28 @@ export class U32Builder
   constructor() {
     super(AlgebraicType.U32);
   }
-  index(): U32ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): U32ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U32ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): U32ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U32ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): U32ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new U32ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): U32ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): U32ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U32ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U32ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U32ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new U32ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U32ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U32ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new U32ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -486,7 +486,7 @@ export class U32Builder
   }
   default(
     value: number
-  ): U32ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): U32ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new U32ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -506,28 +506,28 @@ export class U64Builder
   constructor() {
     super(AlgebraicType.U64);
   }
-  index(): U64ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): U64ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U64ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): U64ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U64ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): U64ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new U64ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): U64ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): U64ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U64ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U64ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U64ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new U64ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U64ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U64ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new U64ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -535,7 +535,7 @@ export class U64Builder
   }
   default(
     value: bigint
-  ): U64ColumnBuilder<Set<DefaultMetadata, 'defaultValue', bigint>> {
+  ): U64ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', bigint>> {
     return new U64ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -555,31 +555,31 @@ export class U128Builder
   constructor() {
     super(AlgebraicType.U128);
   }
-  index(): U128ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): U128ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U128ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): U128ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U128ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): U128ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): U128ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): U128ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U128ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U128ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U128ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U128ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -587,7 +587,7 @@ export class U128Builder
   }
   default(
     value: bigint
-  ): U128ColumnBuilder<Set<DefaultMetadata, 'defaultValue', bigint>> {
+  ): U128ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', bigint>> {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -607,31 +607,31 @@ export class U256Builder
   constructor() {
     super(AlgebraicType.U256);
   }
-  index(): U256ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): U256ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U256ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): U256ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U256ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): U256ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): U256ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): U256ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U256ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U256ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U256ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U256ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -639,7 +639,7 @@ export class U256Builder
   }
   default(
     value: bigint
-  ): U256ColumnBuilder<Set<DefaultMetadata, 'defaultValue', bigint>> {
+  ): U256ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', bigint>> {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -659,28 +659,28 @@ export class I8Builder
   constructor() {
     super(AlgebraicType.I8);
   }
-  index(): I8ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): I8ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I8ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): I8ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I8ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): I8ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new I8ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): I8ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): I8ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I8ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I8ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I8ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new I8ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I8ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I8ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new I8ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -688,7 +688,7 @@ export class I8Builder
   }
   default(
     value: number
-  ): I8ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): I8ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new I8ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -708,28 +708,28 @@ export class I16Builder
   constructor() {
     super(AlgebraicType.I16);
   }
-  index(): I16ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): I16ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I16ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): I16ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I16ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): I16ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new I16ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): I16ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): I16ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I16ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I16ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I16ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new I16ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I16ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I16ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new I16ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -737,7 +737,7 @@ export class I16Builder
   }
   default(
     value: number
-  ): I16ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): I16ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new I16ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -758,28 +758,28 @@ export class I32Builder
   constructor() {
     super(AlgebraicType.I32);
   }
-  index(): I32ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): I32ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I32ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): I32ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I32ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): I32ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new I32ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): I32ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): I32ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I32ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I32ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I32ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new I32ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I32ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I32ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new I32ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -787,7 +787,7 @@ export class I32Builder
   }
   default(
     value: number
-  ): I32ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): I32ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new I32ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -807,28 +807,28 @@ export class I64Builder
   constructor() {
     super(AlgebraicType.I64);
   }
-  index(): I64ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): I64ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I64ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): I64ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I64ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): I64ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new I64ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): I64ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): I64ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I64ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I64ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I64ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new I64ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I64ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I64ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new I64ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -836,7 +836,7 @@ export class I64Builder
   }
   default(
     value: bigint
-  ): I64ColumnBuilder<Set<DefaultMetadata, 'defaultValue', bigint>> {
+  ): I64ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', bigint>> {
     return new I64ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -856,31 +856,31 @@ export class I128Builder
   constructor() {
     super(AlgebraicType.I128);
   }
-  index(): I128ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): I128ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I128ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): I128ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I128ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): I128ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): I128ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): I128ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I128ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I128ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I128ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I128ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -888,7 +888,7 @@ export class I128Builder
   }
   default(
     value: bigint
-  ): I128ColumnBuilder<Set<DefaultMetadata, 'defaultValue', bigint>> {
+  ): I128ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', bigint>> {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -908,31 +908,31 @@ export class I256Builder
   constructor() {
     super(AlgebraicType.I256);
   }
-  index(): I256ColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): I256ColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I256ColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): I256ColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I256ColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): I256ColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): I256ColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): I256ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I256ColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I256ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I256ColumnBuilder<Set<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I256ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -940,7 +940,7 @@ export class I256Builder
   }
   default(
     value: bigint
-  ): I256ColumnBuilder<Set<DefaultMetadata, 'defaultValue', bigint>> {
+  ): I256ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', bigint>> {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -957,7 +957,7 @@ export class F32Builder
   }
   default(
     value: number
-  ): F32ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): F32ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new F32ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -974,7 +974,7 @@ export class F64Builder
   }
   default(
     value: number
-  ): F64ColumnBuilder<Set<DefaultMetadata, 'defaultValue', number>> {
+  ): F64ColumnBuilder<SetField<DefaultMetadata, 'defaultValue', number>> {
     return new F64ColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -993,25 +993,25 @@ export class BoolBuilder
   constructor() {
     super(AlgebraicType.Bool);
   }
-  index(): BoolColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): BoolColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): BoolColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): BoolColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): BoolColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): BoolColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new BoolColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): BoolColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): BoolColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new BoolColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): BoolColumnBuilder<Set<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): BoolColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
     return new BoolColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
@@ -1019,7 +1019,7 @@ export class BoolBuilder
   }
   default(
     value: boolean
-  ): BoolColumnBuilder<Set<DefaultMetadata, 'defaultValue', boolean>> {
+  ): BoolColumnBuilder<SetField<DefaultMetadata, 'defaultValue', boolean>> {
     return new BoolColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1038,26 +1038,26 @@ export class StringBuilder
   constructor() {
     super(AlgebraicType.String);
   }
-  index(): StringColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): StringColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): StringColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): StringColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): StringColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): StringColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new StringColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): StringColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): StringColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new StringColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
   primaryKey(): StringColumnBuilder<
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new StringColumnBuilder(
       this,
@@ -1066,7 +1066,7 @@ export class StringBuilder
   }
   default(
     value: string
-  ): StringColumnBuilder<Set<DefaultMetadata, 'defaultValue', string>> {
+  ): StringColumnBuilder<SetField<DefaultMetadata, 'defaultValue', string>> {
     return new StringColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1091,7 +1091,7 @@ export class ArrayBuilder<Element extends TypeBuilder<any, any>>
   }
   default(
     value: Array<InferTypeOfTypeBuilder<Element>>
-  ): ArrayColumnBuilder<Element, Set<DefaultMetadata, 'defaultValue', any>> {
+  ): ArrayColumnBuilder<Element, SetField<DefaultMetadata, 'defaultValue', any>> {
     return new ArrayColumnBuilder(
       this.element,
       set(defaultMetadata, { defaultValue: value })
@@ -1125,7 +1125,7 @@ export class OptionBuilder<Value extends TypeBuilder<any, any>>
     value: InferTypeOfTypeBuilder<Value> | undefined
   ): OptionColumnBuilder<
     InferTypeOfTypeBuilder<Value>,
-    Set<
+    SetField<
       DefaultMetadata,
       'defaultValue',
       InferTypeOfTypeBuilder<Value> | undefined
@@ -1166,7 +1166,7 @@ export class ProductBuilder<Elements extends ElementsObj>
   }
   default(
     value: ObjectType<Elements>
-  ): ProductColumnBuilder<Elements, Set<DefaultMetadata, 'defaultValue', any>> {
+  ): ProductColumnBuilder<Elements, SetField<DefaultMetadata, 'defaultValue', any>> {
     return new ProductColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1229,7 +1229,7 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
   }
   default(
     value: EnumType<Variants>
-  ): SumColumnBuilder<Variants, Set<DefaultMetadata, 'defaultValue', any>> {
+  ): SumColumnBuilder<Variants, SetField<DefaultMetadata, 'defaultValue', any>> {
     return new SumColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1257,16 +1257,16 @@ export class SimpleSumBuilder<Variants extends SimpleVariantsObj>
 {
   index(): SimpleSumColumnBuilder<
     Variants,
-    Set<DefaultMetadata, 'indexType', 'btree'>
+    SetField<DefaultMetadata, 'indexType', 'btree'>
   >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): SimpleSumColumnBuilder<Variants, Set<DefaultMetadata, 'indexType', N>>;
+  ): SimpleSumColumnBuilder<Variants, SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
   ): SimpleSumColumnBuilder<
     Variants,
-    Set<DefaultMetadata, 'indexType', IndexTypes>
+    SetField<DefaultMetadata, 'indexType', IndexTypes>
   > {
     return new SimpleSumColumnBuilder(
       this,
@@ -1275,7 +1275,7 @@ export class SimpleSumBuilder<Variants extends SimpleVariantsObj>
   }
   primaryKey(): SimpleSumColumnBuilder<
     Variants,
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new SimpleSumColumnBuilder(
       this,
@@ -1295,26 +1295,26 @@ export class IdentityBuilder
   constructor() {
     super(Identity.getAlgebraicType());
   }
-  index(): IdentityColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): IdentityColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): IdentityColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): IdentityColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): IdentityColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): IdentityColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new IdentityColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): IdentityColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): IdentityColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new IdentityColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
   primaryKey(): IdentityColumnBuilder<
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new IdentityColumnBuilder(
       this,
@@ -1322,7 +1322,7 @@ export class IdentityBuilder
     );
   }
   autoInc(): IdentityColumnBuilder<
-    Set<DefaultMetadata, 'isAutoIncrement', true>
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
   > {
     return new IdentityColumnBuilder(
       this,
@@ -1331,7 +1331,7 @@ export class IdentityBuilder
   }
   default(
     value: Identity
-  ): IdentityColumnBuilder<Set<DefaultMetadata, 'defaultValue', Identity>> {
+  ): IdentityColumnBuilder<SetField<DefaultMetadata, 'defaultValue', Identity>> {
     return new IdentityColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1351,27 +1351,27 @@ export class ConnectionIdBuilder
     super(ConnectionId.getAlgebraicType());
   }
   index(): ConnectionIdColumnBuilder<
-    Set<DefaultMetadata, 'indexType', 'btree'>
+    SetField<DefaultMetadata, 'indexType', 'btree'>
   >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): ConnectionIdColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): ConnectionIdColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): ConnectionIdColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): ConnectionIdColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new ConnectionIdColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): ConnectionIdColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): ConnectionIdColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new ConnectionIdColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
   primaryKey(): ConnectionIdColumnBuilder<
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new ConnectionIdColumnBuilder(
       this,
@@ -1379,7 +1379,7 @@ export class ConnectionIdBuilder
     );
   }
   autoInc(): ConnectionIdColumnBuilder<
-    Set<DefaultMetadata, 'isAutoIncrement', true>
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
   > {
     return new ConnectionIdColumnBuilder(
       this,
@@ -1389,7 +1389,7 @@ export class ConnectionIdBuilder
   default(
     value: ConnectionId
   ): ConnectionIdColumnBuilder<
-    Set<DefaultMetadata, 'defaultValue', ConnectionId>
+    SetField<DefaultMetadata, 'defaultValue', ConnectionId>
   > {
     return new ConnectionIdColumnBuilder(
       this,
@@ -1409,26 +1409,26 @@ export class TimestampBuilder
   constructor() {
     super(Timestamp.getAlgebraicType());
   }
-  index(): TimestampColumnBuilder<Set<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): TimestampColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): TimestampColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): TimestampColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): TimestampColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): TimestampColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new TimestampColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): TimestampColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): TimestampColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new TimestampColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
   primaryKey(): TimestampColumnBuilder<
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new TimestampColumnBuilder(
       this,
@@ -1436,7 +1436,7 @@ export class TimestampBuilder
     );
   }
   autoInc(): TimestampColumnBuilder<
-    Set<DefaultMetadata, 'isAutoIncrement', true>
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
   > {
     return new TimestampColumnBuilder(
       this,
@@ -1445,7 +1445,7 @@ export class TimestampBuilder
   }
   default(
     value: Timestamp
-  ): TimestampColumnBuilder<Set<DefaultMetadata, 'defaultValue', Timestamp>> {
+  ): TimestampColumnBuilder<SetField<DefaultMetadata, 'defaultValue', Timestamp>> {
     return new TimestampColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1465,27 +1465,27 @@ export class TimeDurationBuilder
     super(TimeDuration.getAlgebraicType());
   }
   index(): TimeDurationColumnBuilder<
-    Set<DefaultMetadata, 'indexType', 'btree'>
+    SetField<DefaultMetadata, 'indexType', 'btree'>
   >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): TimeDurationColumnBuilder<Set<DefaultMetadata, 'indexType', N>>;
+  ): TimeDurationColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): TimeDurationColumnBuilder<Set<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): TimeDurationColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
     return new TimeDurationColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): TimeDurationColumnBuilder<Set<DefaultMetadata, 'isUnique', true>> {
+  unique(): TimeDurationColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new TimeDurationColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
     );
   }
   primaryKey(): TimeDurationColumnBuilder<
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new TimeDurationColumnBuilder(
       this,
@@ -1493,7 +1493,7 @@ export class TimeDurationBuilder
     );
   }
   autoInc(): TimeDurationColumnBuilder<
-    Set<DefaultMetadata, 'isAutoIncrement', true>
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
   > {
     return new TimeDurationColumnBuilder(
       this,
@@ -1503,7 +1503,7 @@ export class TimeDurationBuilder
   default(
     value: TimeDuration
   ): TimeDurationColumnBuilder<
-    Set<DefaultMetadata, 'defaultValue', TimeDuration>
+    SetField<DefaultMetadata, 'defaultValue', TimeDuration>
   > {
     return new TimeDurationColumnBuilder(
       this,
@@ -1570,37 +1570,37 @@ export class U8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
     AutoIncrementable<number, AlgebraicTypeVariants.U8>,
     Defaultable<number, AlgebraicTypeVariants.U8>
 {
-  index(): U8ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): U8ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U8ColumnBuilder<Set<M, 'indexType', N>>;
+  ): U8ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U8ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): U8ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new U8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): U8ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): U8ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new U8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U8ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): U8ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new U8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U8ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): U8ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): U8ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): U8ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new U8ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1619,37 +1619,37 @@ export class U16ColumnBuilder<
     AutoIncrementable<number, AlgebraicTypeVariants.U16>,
     Defaultable<number, AlgebraicTypeVariants.U16>
 {
-  index(): U16ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): U16ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U16ColumnBuilder<Set<M, 'indexType', N>>;
+  ): U16ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U16ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): U16ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new U16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): U16ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): U16ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new U16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U16ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): U16ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new U16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U16ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): U16ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): U16ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): U16ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new U16ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1668,37 +1668,37 @@ export class U32ColumnBuilder<
     AutoIncrementable<number, AlgebraicTypeVariants.U32>,
     Defaultable<number, AlgebraicTypeVariants.U32>
 {
-  index(): U32ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): U32ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U32ColumnBuilder<Set<M, 'indexType', N>>;
+  ): U32ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U32ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): U32ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new U32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): U32ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): U32ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new U32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U32ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): U32ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new U32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U32ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): U32ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): U32ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): U32ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new U32ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1717,37 +1717,37 @@ export class U64ColumnBuilder<
     AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
     Defaultable<bigint, AlgebraicTypeVariants.U64>
 {
-  index(): U64ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): U64ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U64ColumnBuilder<Set<M, 'indexType', N>>;
+  ): U64ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U64ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): U64ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new U64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): U64ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): U64ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new U64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U64ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): U64ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new U64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U64ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): U64ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): U64ColumnBuilder<Set<M, 'defaultValue', bigint>> {
+  default(value: bigint): U64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
     return new U64ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1766,37 +1766,37 @@ export class U128ColumnBuilder<
     AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
     Defaultable<bigint, AlgebraicTypeVariants.U128>
 {
-  index(): U128ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): U128ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U128ColumnBuilder<Set<M, 'indexType', N>>;
+  ): U128ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U128ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): U128ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new U128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): U128ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): U128ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new U128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U128ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): U128ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new U128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U128ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): U128ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): U128ColumnBuilder<Set<M, 'defaultValue', bigint>> {
+  default(value: bigint): U128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
     return new U128ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1815,37 +1815,37 @@ export class U256ColumnBuilder<
     AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
     Defaultable<bigint, AlgebraicTypeVariants.U256>
 {
-  index(): U256ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): U256ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): U256ColumnBuilder<Set<M, 'indexType', N>>;
+  ): U256ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): U256ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): U256ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new U256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): U256ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): U256ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new U256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U256ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): U256ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new U256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U256ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): U256ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): U256ColumnBuilder<Set<M, 'defaultValue', bigint>> {
+  default(value: bigint): U256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
     return new U256ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1862,37 +1862,37 @@ export class I8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
     AutoIncrementable<number, AlgebraicTypeVariants.I8>,
     Defaultable<number, AlgebraicTypeVariants.I8>
 {
-  index(): I8ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): I8ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I8ColumnBuilder<Set<M, 'indexType', N>>;
+  ): I8ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I8ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): I8ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new I8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): I8ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): I8ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new I8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I8ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): I8ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new I8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I8ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): I8ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new I8ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): I8ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): I8ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new I8ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1911,37 +1911,37 @@ export class I16ColumnBuilder<
     AutoIncrementable<number, AlgebraicTypeVariants.I16>,
     Defaultable<number, AlgebraicTypeVariants.I16>
 {
-  index(): I16ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): I16ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I16ColumnBuilder<Set<M, 'indexType', N>>;
+  ): I16ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I16ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): I16ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new I16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): I16ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): I16ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new I16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I16ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): I16ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new I16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I16ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): I16ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new I16ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): I16ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): I16ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new I16ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -1960,37 +1960,37 @@ export class I32ColumnBuilder<
     AutoIncrementable<number, AlgebraicTypeVariants.I32>,
     Defaultable<number, AlgebraicTypeVariants.I32>
 {
-  index(): I32ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): I32ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I32ColumnBuilder<Set<M, 'indexType', N>>;
+  ): I32ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I32ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): I32ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new I32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): I32ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): I32ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new I32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I32ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): I32ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new I32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I32ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): I32ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new I32ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): I32ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): I32ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new I32ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2009,37 +2009,37 @@ export class I64ColumnBuilder<
     AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
     Defaultable<bigint, AlgebraicTypeVariants.I64>
 {
-  index(): I64ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): I64ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I64ColumnBuilder<Set<M, 'indexType', N>>;
+  ): I64ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I64ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): I64ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new I64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): I64ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): I64ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new I64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I64ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): I64ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new I64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I64ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): I64ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new I64ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): I64ColumnBuilder<Set<M, 'defaultValue', bigint>> {
+  default(value: bigint): I64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
     return new I64ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2058,37 +2058,37 @@ export class I128ColumnBuilder<
     AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
     Defaultable<bigint, AlgebraicTypeVariants.I128>
 {
-  index(): I128ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): I128ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I128ColumnBuilder<Set<M, 'indexType', N>>;
+  ): I128ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I128ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): I128ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new I128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): I128ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): I128ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new I128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I128ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): I128ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new I128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I128ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): I128ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new I128ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): I128ColumnBuilder<Set<M, 'defaultValue', bigint>> {
+  default(value: bigint): I128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
     return new I128ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2107,37 +2107,37 @@ export class I256ColumnBuilder<
     AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
     Defaultable<bigint, AlgebraicTypeVariants.I256>
 {
-  index(): I256ColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): I256ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): I256ColumnBuilder<Set<M, 'indexType', N>>;
+  ): I256ColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): I256ColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): I256ColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new I256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): I256ColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): I256ColumnBuilder<SetField<M, 'isUnique', true>> {
     return new I256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I256ColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): I256ColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new I256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I256ColumnBuilder<Set<M, 'isAutoIncrement', true>> {
+  autoInc(): I256ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new I256ColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): I256ColumnBuilder<Set<M, 'defaultValue', bigint>> {
+  default(value: bigint): I256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
     return new I256ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2151,7 +2151,7 @@ export class F32ColumnBuilder<
   extends ColumnBuilder<number, AlgebraicTypeVariants.F32, M>
   implements Defaultable<number, AlgebraicTypeVariants.F32>
 {
-  default(value: number): F32ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): F32ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new F32ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2165,7 +2165,7 @@ export class F64ColumnBuilder<
   extends ColumnBuilder<number, AlgebraicTypeVariants.F64, M>
   implements Defaultable<number, AlgebraicTypeVariants.F64>
 {
-  default(value: number): F64ColumnBuilder<Set<M, 'defaultValue', number>> {
+  default(value: number): F64ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new F64ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2183,31 +2183,31 @@ export class BoolColumnBuilder<
     PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
     Defaultable<boolean, AlgebraicTypeVariants.Bool>
 {
-  index(): BoolColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): BoolColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): BoolColumnBuilder<Set<M, 'indexType', N>>;
+  ): BoolColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): BoolColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): BoolColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new BoolColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): BoolColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): BoolColumnBuilder<SetField<M, 'isUnique', true>> {
     return new BoolColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): BoolColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): BoolColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new BoolColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  default(value: boolean): BoolColumnBuilder<Set<M, 'defaultValue', boolean>> {
+  default(value: boolean): BoolColumnBuilder<SetField<M, 'defaultValue', boolean>> {
     return new BoolColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2225,31 +2225,31 @@ export class StringColumnBuilder<
     PrimaryKeyable<string, AlgebraicTypeVariants.String>,
     Defaultable<string, AlgebraicTypeVariants.String>
 {
-  index(): StringColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): StringColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): StringColumnBuilder<Set<M, 'indexType', N>>;
+  ): StringColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): StringColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): StringColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new StringColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): StringColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): StringColumnBuilder<SetField<M, 'isUnique', true>> {
     return new StringColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): StringColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): StringColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new StringColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  default(value: string): StringColumnBuilder<Set<M, 'defaultValue', string>> {
+  default(value: string): StringColumnBuilder<SetField<M, 'defaultValue', string>> {
     return new StringColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2278,7 +2278,7 @@ export class ArrayColumnBuilder<
     value: Array<InferTypeOfTypeBuilder<Element>>
   ): ArrayColumnBuilder<
     Element,
-    Set<M, 'defaultValue', Array<InferTypeOfTypeBuilder<Element>>>
+    SetField<M, 'defaultValue', Array<InferTypeOfTypeBuilder<Element>>>
   > {
     return new ArrayColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
@@ -2305,7 +2305,7 @@ export class OptionColumnBuilder<
     value: InferTypeOfTypeBuilder<Value> | undefined
   ): OptionColumnBuilder<
     InferTypeOfTypeBuilder<Value>,
-    Set<M, 'defaultValue', InferTypeOfTypeBuilder<Value> | undefined>
+    SetField<M, 'defaultValue', InferTypeOfTypeBuilder<Value> | undefined>
   > {
     return new OptionColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
@@ -2330,7 +2330,7 @@ export class ProductColumnBuilder<
 {
   default(
     value: ObjectType<Elements>
-  ): ProductColumnBuilder<Elements, Set<DefaultMetadata, 'defaultValue', any>> {
+  ): ProductColumnBuilder<Elements, SetField<DefaultMetadata, 'defaultValue', any>> {
     return new ProductColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { defaultValue: value })
@@ -2351,7 +2351,7 @@ export class SumColumnBuilder<
 {
   default(
     value: EnumType<Variants>
-  ): SumColumnBuilder<Variants, Set<DefaultMetadata, 'defaultValue', any>> {
+  ): SumColumnBuilder<Variants, SetField<DefaultMetadata, 'defaultValue', any>> {
     return new SumColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { defaultValue: value })
@@ -2370,16 +2370,16 @@ export class SimpleSumColumnBuilder<
 {
   index(): SimpleSumColumnBuilder<
     Variants,
-    Set<DefaultMetadata, 'indexType', 'btree'>
+    SetField<DefaultMetadata, 'indexType', 'btree'>
   >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): SimpleSumColumnBuilder<Variants, Set<DefaultMetadata, 'indexType', N>>;
+  ): SimpleSumColumnBuilder<Variants, SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
   ): SimpleSumColumnBuilder<
     Variants,
-    Set<DefaultMetadata, 'indexType', IndexTypes>
+    SetField<DefaultMetadata, 'indexType', IndexTypes>
   > {
     return new SimpleSumColumnBuilder(
       this.typeBuilder,
@@ -2388,7 +2388,7 @@ export class SimpleSumColumnBuilder<
   }
   primaryKey(): SimpleSumColumnBuilder<
     Variants,
-    Set<DefaultMetadata, 'isPrimaryKey', true>
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
   > {
     return new SimpleSumColumnBuilder(
       this.typeBuilder,
@@ -2407,25 +2407,25 @@ export class IdentityColumnBuilder<
     PrimaryKeyable<Identity, IdentityAlgebraicType>,
     Defaultable<Identity, IdentityAlgebraicType>
 {
-  index(): IdentityColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): IdentityColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): IdentityColumnBuilder<Set<M, 'indexType', N>>;
+  ): IdentityColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): IdentityColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): IdentityColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new IdentityColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): IdentityColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): IdentityColumnBuilder<SetField<M, 'isUnique', true>> {
     return new IdentityColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): IdentityColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): IdentityColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new IdentityColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
@@ -2433,7 +2433,7 @@ export class IdentityColumnBuilder<
   }
   default(
     value: Identity
-  ): IdentityColumnBuilder<Set<M, 'defaultValue', Identity>> {
+  ): IdentityColumnBuilder<SetField<M, 'defaultValue', Identity>> {
     return new IdentityColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2451,25 +2451,25 @@ export class ConnectionIdColumnBuilder<
     PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
     Defaultable<ConnectionId, ConnectionIdAlgebraicType>
 {
-  index(): ConnectionIdColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): ConnectionIdColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): ConnectionIdColumnBuilder<Set<M, 'indexType', N>>;
+  ): ConnectionIdColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): ConnectionIdColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): ConnectionIdColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new ConnectionIdColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): ConnectionIdColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): ConnectionIdColumnBuilder<SetField<M, 'isUnique', true>> {
     return new ConnectionIdColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): ConnectionIdColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): ConnectionIdColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new ConnectionIdColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
@@ -2477,7 +2477,7 @@ export class ConnectionIdColumnBuilder<
   }
   default(
     value: ConnectionId
-  ): ConnectionIdColumnBuilder<Set<M, 'defaultValue', ConnectionId>> {
+  ): ConnectionIdColumnBuilder<SetField<M, 'defaultValue', ConnectionId>> {
     return new ConnectionIdColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2495,25 +2495,25 @@ export class TimestampColumnBuilder<
     PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
     Defaultable<Timestamp, TimestampAlgebraicType>
 {
-  index(): TimestampColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): TimestampColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): TimestampColumnBuilder<Set<M, 'indexType', N>>;
+  ): TimestampColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): TimestampColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): TimestampColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new TimestampColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): TimestampColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): TimestampColumnBuilder<SetField<M, 'isUnique', true>> {
     return new TimestampColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): TimestampColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): TimestampColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new TimestampColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
@@ -2521,7 +2521,7 @@ export class TimestampColumnBuilder<
   }
   default(
     value: Timestamp
-  ): TimestampColumnBuilder<Set<M, 'defaultValue', Timestamp>> {
+  ): TimestampColumnBuilder<SetField<M, 'defaultValue', Timestamp>> {
     return new TimestampColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
@@ -2539,25 +2539,25 @@ export class TimeDurationColumnBuilder<
     PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
     Defaultable<TimeDuration, TimeDurationAlgebraicType>
 {
-  index(): TimeDurationColumnBuilder<Set<M, 'indexType', 'btree'>>;
+  index(): TimeDurationColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): TimeDurationColumnBuilder<Set<M, 'indexType', N>>;
+  ): TimeDurationColumnBuilder<SetField<M, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): TimeDurationColumnBuilder<Set<M, 'indexType', IndexTypes>> {
+  ): TimeDurationColumnBuilder<SetField<M, 'indexType', IndexTypes>> {
     return new TimeDurationColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { indexType: algorithm })
     );
   }
-  unique(): TimeDurationColumnBuilder<Set<M, 'isUnique', true>> {
+  unique(): TimeDurationColumnBuilder<SetField<M, 'isUnique', true>> {
     return new TimeDurationColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isUnique: true })
     );
   }
-  primaryKey(): TimeDurationColumnBuilder<Set<M, 'isPrimaryKey', true>> {
+  primaryKey(): TimeDurationColumnBuilder<SetField<M, 'isPrimaryKey', true>> {
     return new TimeDurationColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { isPrimaryKey: true })
@@ -2565,7 +2565,7 @@ export class TimeDurationColumnBuilder<
   }
   default(
     value: TimeDuration
-  ): TimeDurationColumnBuilder<Set<M, 'defaultValue', TimeDuration>> {
+  ): TimeDurationColumnBuilder<SetField<M, 'defaultValue', TimeDuration>> {
     return new TimeDurationColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
       defaultValue: value,
diff --git a/crates/bindings-typescript/src/lib/type_util.ts b/crates/bindings-typescript/src/lib/type_util.ts
index ae9e978c7e9..04a33bfd528 100644
--- a/crates/bindings-typescript/src/lib/type_util.ts
+++ b/crates/bindings-typescript/src/lib/type_util.ts
@@ -3,10 +3,24 @@
  */
 export type Prettify<T> = { [K in keyof T]: T[K] } & {};
 
+type Builtin =
+  | string | number | boolean | symbol | bigint | null | undefined
+  | Function | Date | RegExp | Error
+  | Map<any, any> | Set<any> | WeakMap<any, any> | WeakSet<any>
+  | Promise<any>;
+
+// Deep
+export type PrettifyDeep<T> =
+  T extends Builtin ? T :
+  T extends readonly [...infer _] ? { [K in keyof T]: PrettifyDeep<T[K]> } :
+  T extends ReadonlyArray<infer U> ? ReadonlyArray<PrettifyDeep<U>> :
+  T extends object ? Prettify<{ [K in keyof T]: PrettifyDeep<T[K]> }> :
+  T;
+
 /**
  * Helper function to sets a field in an object
  */
-export type Set<T, F extends string, V> = Prettify<
+export type SetField<T, F extends string, V> = Prettify<
   Omit<T, F> & { [K in F]: V }
 >;
 
@@ -19,7 +33,7 @@ export type Set<T, F extends string, V> = Prettify<
 export function set<T, F extends string, V>(
   x: T,
   t: { [k in F]: V }
-): Set<T, F, V> {
+): SetField<T, F, V> {
   return { ...x, ...t };
 }
 
diff --git a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
index 0ca560b86ec..c728d424548 100644
--- a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
+++ b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
@@ -12,33 +12,32 @@ import { ConnectionId } from '../lib/connection_id';
 import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
 export interface SpacetimeDBProviderProps<
-  RemoteModule extends UntypedRemoteModule,
-  DbConnection extends DbConnectionImpl<RemoteModule> = DbConnectionImpl<RemoteModule>,
+  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
 > {
-  connectionBuilder: DbConnectionBuilder<RemoteModule, DbConnection>;
+  connectionBuilder: DbConnectionBuilder<DbConnection>;
   children?: React.ReactNode;
 }
 
 export function SpacetimeDBProvider<
   DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
->({ connectionBuilder, children }: SpacetimeDBProviderProps<RemoteModuleOf<DbConnection>>) {
+>({ connectionBuilder, children }: SpacetimeDBProviderProps<DbConnection>) {
   // Holds the imperative connection instance when (and only when) we’re on the client.
   const connRef = React.useRef<DbConnection | null>(null);
   const getConnection = React.useCallback(() => connRef.current, []);
 
-  const [state, setState] = React.useState<ConnectionState<DbConnection>>({
+  const [state, setState] = React.useState<ConnectionState>({
     isActive: false,
     identity: undefined,
     token: undefined,
     connectionId: ConnectionId.random(),
     connectionError: undefined,
-    getConnection,
+    getConnection: getConnection as ConnectionState["getConnection"],
   });
 
   // Build on the client only; useEffect won't run during SSR.
   React.useEffect(() => {
     // Register callback for onConnect to update state
-      const onConnect = (conn: DbConnectionImpl<RemoteModuleOf<DbConnection>>) => {
+      const onConnect = (conn: DbConnection) => {
       setState(s => ({
         ...s,
         isActive: conn.isActive,
@@ -75,7 +74,7 @@ export function SpacetimeDBProvider<
 
     // Lazily build once
     if (!connRef.current) {
-      connRef.current = connectionBuilder.build() as unknown as DbConnection;
+      connRef.current = connectionBuilder.build();
     }
 
     return () => {
diff --git a/crates/bindings-typescript/src/react/connection_state.ts b/crates/bindings-typescript/src/react/connection_state.ts
index 6d63e91d693..f9c333c100f 100644
--- a/crates/bindings-typescript/src/react/connection_state.ts
+++ b/crates/bindings-typescript/src/react/connection_state.ts
@@ -1,13 +1,12 @@
 import type { ConnectionId } from "../lib/connection_id";
 import type { Identity } from "../lib/identity";
 import type { DbConnectionImpl } from "../sdk/db_connection_impl";
-import type { UntypedRemoteModule } from "../sdk/spacetime_module";
 
-export type ConnectionState<DbConnection extends DbConnectionImpl<UntypedRemoteModule>> = {
+export type ConnectionState = {
   isActive: boolean;
   identity?: Identity;
   token?: string;
   connectionId: ConnectionId;
   connectionError?: Error;
-  getConnection(): DbConnection | null;
+  getConnection<DbConnection extends DbConnectionImpl<any>>(): DbConnection | null;
 };
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index 06eb76da311..ee21aceb8c3 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -1,16 +1,15 @@
-import type { DbConnectionImpl, RemoteModuleOf } from "../sdk/db_connection_impl";
-import type { ReducersView } from "../sdk/reducers";
-import type { UntypedRemoteModule } from "../sdk/spacetime_module";
+import type { InferTypeOfRow } from "../lib/type_builders";
+import type { PrettifyDeep } from "../lib/type_util";
+import type { UntypedReducerDef } from "../sdk/reducers";
 import { useSpacetimeDB, } from "./useSpacetimeDB";
 
-
 export function useReducer<
-  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  ReducerName extends keyof ReducersView<RemoteModuleOf<DbConnection>> = keyof ReducersView<RemoteModuleOf<DbConnection>>
+  ReducerDef extends UntypedReducerDef
 >(
-  reducerName: ReducerName 
-): ReducersView<RemoteModuleOf<DbConnection>>[ReducerName] {
-    const connectionState = useSpacetimeDB<DbConnection>();
+  reducerDef: ReducerDef,
+): (params: PrettifyDeep<InferTypeOfRow<ReducerDef['params']>>) => void {
+    const reducerName = reducerDef.accessorName;
+    const connectionState = useSpacetimeDB();
     const connection = connectionState.getConnection()!;
-    return connection.reducers[reducerName];
+    return connection.reducers[reducerName as any] as (params: PrettifyDeep<InferTypeOfRow<ReducerDef['params']>>) => void;
 }
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/useSpacetimeDB.ts b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
index 8eb1a1e01d1..619a5b39dea 100644
--- a/crates/bindings-typescript/src/react/useSpacetimeDB.ts
+++ b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
@@ -3,12 +3,12 @@ import type { DbConnectionImpl } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
 import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
-export const SpacetimeDBContext = createContext<ConnectionState<DbConnectionImpl<UntypedRemoteModule>> | undefined>(undefined);
+export const SpacetimeDBContext = createContext<ConnectionState | undefined>(undefined);
 
 // Throws an error if used outside of a SpacetimeDBProvider
 // Error is caught by other hooks like useTable so they can provide better error messages
-export function useSpacetimeDB<DbConnection extends DbConnectionImpl<UntypedRemoteModule>>(): ConnectionState<DbConnection> {
-  const context = useContext(SpacetimeDBContext) as ConnectionState<DbConnection> | undefined;
+export function useSpacetimeDB(): ConnectionState {
+  const context = useContext(SpacetimeDBContext) as ConnectionState | undefined;
   if (!context) {
     throw new Error(
       'useSpacetimeDB must be used within a SpacetimeDBProvider component. Did you forget to add a `SpacetimeDBProvider` to your component tree?'
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index 0dc69d54f6a..b8ac3fab862 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -6,15 +6,15 @@ import {
   useSyncExternalStore,
 } from 'react';
 import { useSpacetimeDB } from './useSpacetimeDB';
-import { DbConnectionImpl, TableCache, type EventContextInterface, type RemoteModuleOf } from '../sdk/db_connection_impl';
+import { DbConnectionImpl, type EventContextInterface, type RemoteModuleOf } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
-import type { RemoteModule, UntypedRemoteModule } from '../sdk/spacetime_module';
-import type { ClientDbView } from '../sdk/db_view';
-import type { RowType, UntypedTableDef } from '../lib/table';
+import type { UntypedRemoteModule } from '../sdk/spacetime_module';
+import type { RowType, Table, UntypedTableDef } from '../lib/table';
 import type { ClientTable } from '../sdk/client_table';
-import type { Infer, InferTypeOfRow } from '../lib/type_builders';
+import type { InferTypeOfRow } from '../lib/type_builders';
+import type { PrettifyDeep } from '../lib/type_util';
 
-export interface UseQueryCallbacks<RowType> {
+export interface UseTableCallbacks<RowType> {
   onInsert?: (row: RowType) => void;
   onDelete?: (row: RowType) => void;
   onUpdate?: (oldRow: RowType, newRow: RowType) => void;
@@ -72,11 +72,9 @@ export const isOr = <Column extends string>(
   e: Expr<Column>
 ): e is Extract<Expr<Column>, { type: 'or' }> => e.type === 'or';
 
-type RecordLike<Column extends string> = Record<Column, any>;
-
 export function evaluate<Column extends string>(
   expr: Expr<Column>,
-  row: RecordLike<Column>
+  row: Record<Column, any>
 ): boolean {
   switch (expr.type) {
     case 'eq': {
@@ -142,11 +140,6 @@ export function where<Column extends string>(expr: Expr<Column>): Expr<Column> {
   return expr;
 }
 
-type Snapshot<RowType> = {
-  readonly rows: readonly RowType[];
-  readonly state: 'loading' | 'ready';
-};
-
 type MembershipChange = 'enter' | 'leave' | 'stayIn' | 'stayOut';
 
 function classifyMembership<
@@ -182,14 +175,10 @@ type ColumnsFromRow<R> = {
 }[keyof R] &
   string;
 
-// From a ClientTable<RM, Tbl>, get Tbl
-type TableDefOfClient<T> = T extends ClientTable<any, infer Tbl extends UntypedTableDef> ? Tbl : never;
-
 // Row type for a given connection + table key
 type RowTypeOfTable<
-  C extends DbConnectionImpl<any>,
-  K extends keyof ClientDbView<RemoteModuleOf<C>>
-> = InferTypeOfRow<RowType<TableDefOfClient<ClientDbView<RemoteModuleOf<C>>[K]>>>;
+  TableDef extends UntypedTableDef,
+> = InferTypeOfRow<RowType<TableDef>>;
 
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
@@ -225,13 +214,12 @@ type RowTypeOfTable<
  * ```
  */
 export function useTable<
-  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  TableName extends keyof ClientDbView<RemoteModuleOf<DbConnection>> 
+  TableDef extends UntypedTableDef,
 >(
-  tableName: TableName,
-  where: Expr<ColumnsFromRow<RowTypeOfTable<DbConnection, TableName>>> ,
-  callbacks?: UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>
-): Snapshot<RowTypeOfTable<DbConnection, TableName>>;
+  tableDef: TableDef,
+  where: Expr<ColumnsFromRow<RowTypeOfTable<TableDef>>>,
+  callbacks?: UseTableCallbacks<RowTypeOfTable<TableDef>>
+): PrettifyDeep<RowTypeOfTable<TableDef>>[];
 
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
@@ -266,25 +254,31 @@ export function useTable<
  * });
  * ```
  */
+// export function useTable<
+//   TableDef extends UntypedTableDef,
+// >(
+//   tableDef: TableDef,
+//   where: Expr<ColumnsFromRow<RowTypeOfTable<TableDef>>>,
+//   callbacks?: UseQueryCallbacks<RowTypeOfTable<TableDef>>
+// ): Snapshot<PrettifyDeep<RowTypeOfTable<TableDef>>>;
 export function useTable<
-  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  TableName extends keyof ClientDbView<RemoteModuleOf<DbConnection>> 
+  TableDef extends UntypedTableDef,
 >(
-  tableName: TableName,
-  callbacks?: UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>
-): Snapshot<RowTypeOfTable<DbConnection, TableName>>;
+  tableDef: TableDef,
+  callbacks?: UseTableCallbacks<RowTypeOfTable<TableDef>>
+): PrettifyDeep<RowTypeOfTable<TableDef>>[];
 
 export function useTable<
-  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
-  TableName extends keyof ClientDbView<RemoteModuleOf<DbConnection>>,
+  TableDef extends UntypedTableDef,
 >(
-  tableName: TableName,
+  tableDef: TableDef,
   whereClauseOrCallbacks?:
-    | Expr<ColumnsFromRow<RowTypeOfTable<DbConnection, TableName>>>
-    | UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>,
-  callbacks?: UseQueryCallbacks<RowTypeOfTable<DbConnection, TableName>>
-): Snapshot<RowTypeOfTable<DbConnection, TableName>> {
-  type UseTableRowType = RowTypeOfTable<DbConnection, TableName>;
+    | Expr<ColumnsFromRow<RowTypeOfTable<TableDef>>>
+    | UseTableCallbacks<RowTypeOfTable<TableDef>>,
+  callbacks?: UseTableCallbacks<RowTypeOfTable<TableDef>>
+): readonly RowTypeOfTable<TableDef>[] {
+  type UseTableRowType = RowTypeOfTable<TableDef>;
+  const tableName = tableDef.name;
   let whereClause: Expr<ColumnsFromRow<UseTableRowType>> | undefined;
   if (
     whereClauseOrCallbacks &&
@@ -294,13 +288,13 @@ export function useTable<
     whereClause = whereClauseOrCallbacks as Expr<ColumnsFromRow<UseTableRowType>>;
   } else {
     callbacks = whereClauseOrCallbacks as
-      | UseQueryCallbacks<UseTableRowType>
+      | UseTableCallbacks<UseTableRowType>
       | undefined;
   }
   const [subscribeApplied, setSubscribeApplied] = useState(false);
-  let connectionState: ConnectionState<DbConnection> | undefined;
+  let connectionState: ConnectionState | undefined;
   try {
-    connectionState = useSpacetimeDB<DbConnection>();
+    connectionState = useSpacetimeDB();
   } catch {
     throw new Error(
       'Could not find SpacetimeDB client! Did you forget to add a ' +
@@ -310,27 +304,24 @@ export function useTable<
   }
 
   const query =
-    `SELECT * FROM ${String(tableName)}` +
+    `SELECT * FROM ${tableName}` +
     (whereClause ? ` WHERE ${toString(whereClause)}` : '');
 
   const latestTransactionEvent = useRef<any>(null);
-  const lastSnapshotRef = useRef<Snapshot<UseTableRowType> | null>(null);
+  const lastSnapshotRef = useRef<readonly UseTableRowType[] | null>(null);
 
   const whereKey = whereClause ? toString(whereClause) : '';
 
-  const computeSnapshot = useCallback((): Snapshot<UseTableRowType> => {
+  const computeSnapshot = useCallback((): readonly UseTableRowType[] => {
     const connection = connectionState.getConnection();
     if (!connection) {
-      return { rows: [], state: 'loading' };
+      return [];
     }
-    const table = connection.db[tableName];
+    const table = connection.db[tableName] as ClientTable<UntypedRemoteModule, TableDef['name']>;
     const result: readonly UseTableRowType[] = whereClause
-      ? Array.from(table.iter()).filter(row => evaluate(whereClause, row as any)) as unknown as readonly UseTableRowType[]
-      : Array.from(table.iter()) as unknown as readonly UseTableRowType[];
-    return {
-      rows: result,
-      state: subscribeApplied ? 'ready' : 'loading',
-    };
+      ? (Array.from(table.iter()).filter(row => evaluate(whereClause, row as UseTableRowType)) as UseTableRowType[])
+      : (Array.from(table.iter()) as UseTableRowType[]);
+    return result;
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [connectionState, tableName, whereKey, subscribeApplied]);
 
@@ -413,9 +404,7 @@ export function useTable<
         return () => {};
       }
 
-      const table = connection.db[
-        tableName as keyof typeof connection.db
-      ];
+      const table = connection.db[tableName];
       table.onInsert(onInsert);
       table.onDelete(onDelete);
       table.onUpdate?.(onUpdate);
@@ -437,7 +426,7 @@ export function useTable<
     ]
   );
 
-  const getSnapshot = useCallback((): Snapshot<UseTableRowType> => {
+  const getSnapshot = useCallback((): readonly UseTableRowType[] => {
     if (!lastSnapshotRef.current) {
       lastSnapshotRef.current = computeSnapshot();
     }
diff --git a/crates/bindings-typescript/src/sdk/client_cache.ts b/crates/bindings-typescript/src/sdk/client_cache.ts
index 125a43ee99c..8f07f15af37 100644
--- a/crates/bindings-typescript/src/sdk/client_cache.ts
+++ b/crates/bindings-typescript/src/sdk/client_cache.ts
@@ -1,20 +1,20 @@
-import type { UntypedSchemaDef } from '../lib/schema.ts';
+import type { TableNamesOf, UntypedSchemaDef } from '../lib/schema.ts';
 import type { UntypedTableDef } from '../lib/table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 import { TableCache } from './table_cache.ts';
 
 type TableName<SchemaDef> =
-  [SchemaDef] extends [UntypedSchemaDef] ? SchemaDef['tables'][number]['name'] : string;
+  [SchemaDef] extends [UntypedSchemaDef] ? TableNamesOf<SchemaDef> : string;
 
-export type TableDefForTableName<SchemaDef, N> =
+export type TableDefForTableName<SchemaDef extends UntypedSchemaDef, N extends TableName<SchemaDef>> =
   [SchemaDef] extends [UntypedSchemaDef]
-    ? Extract<SchemaDef['tables'][number], { name: N }>
+    ? (SchemaDef['tables'][number] & { name: N })
     : UntypedTableDef;
 
 type TableCacheForTableName<
   RemoteModule extends UntypedRemoteModule,
-  N
-> = TableCache<RemoteModule, TableDefForTableName<RemoteModule, N>>;
+  TableName extends TableNamesOf<RemoteModule>,
+> = TableCache<RemoteModule, TableName>;
 
 /**
  * This is a helper class that provides a mapping from table names to their corresponding TableCache instances
@@ -92,7 +92,7 @@ export class ClientCache<RemoteModule extends UntypedRemoteModule> {
       return table;
     }
 
-    const newTable = new TableCache<RemoteModule, TableDefForTableName<RemoteModule, N>>(tableDef);
+    const newTable = new TableCache<RemoteModule, N>(tableDef);
     this.tables.set(name, newTable);
     return newTable;
   }
diff --git a/crates/bindings-typescript/src/sdk/client_table.ts b/crates/bindings-typescript/src/sdk/client_table.ts
index 6d0e006e9b2..bafaf8eb49f 100644
--- a/crates/bindings-typescript/src/sdk/client_table.ts
+++ b/crates/bindings-typescript/src/sdk/client_table.ts
@@ -1,34 +1,55 @@
 import type { ReadonlyIndexes } from "../lib/indexes";
+import type { TableNamesOf } from "../lib/schema";
 import type { ReadonlyTableMethods, RowType, TableIndexes, UntypedTableDef } from "../lib/table";
+import type { ColumnBuilder } from "../lib/type_builders";
 import type { Prettify } from "../lib/type_util";
+import type { TableDefForTableName } from "./client_cache";
 import type { EventContextInterface } from "./event_context";
 import type { UntypedRemoteModule } from "./spacetime_module";
 
+export type ClientTablePrimaryKeyMethods<
+  RemoteModule extends UntypedRemoteModule,
+  TableName extends TableNamesOf<RemoteModule>,
+> = {
+  /**
+   * Registers a callback to be invoked when a row is updated in the table.
+   * Requires that the table has a primary key defined.
+   * @param cb The callback to invoke when a row is updated.
+   */
+  onUpdate(cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, newRow: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+
+  /**
+   * Removes a previously registered update event listener. 
+   * @param cb The callback to remove from the update event listeners.
+   */
+  removeOnUpdate(cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, newRow: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+};
+
 export type ClientTableMethods<
   RemoteModule extends UntypedRemoteModule,
-  TableDef extends UntypedTableDef,
+  TableName extends TableNamesOf<RemoteModule>,
 > = {
   /**
    * Registers a callback to be invoked when a row is inserted into the table.
    */
-  onInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
+  onInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
 
   /**
    *  Removes a previously registered insert event listener. 
    * @param cb The callback to remove from the insert event listeners.
    */
-  removeOnInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
+  removeOnInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
 
   /**
    * Registers a callback to be invoked when a row is deleted from the table.
    */
-  onDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
+  onDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
 
   /**
    * Removes a previously registered delete event listener.
    * @param cb The callback to remove from the delete event listeners.
    */
-  removeOnDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void): void;
+  removeOnDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
 };
 
 /**
@@ -40,19 +61,55 @@ export type ClientTableMethods<
  */
 export type ClientTable<
   RemoteModule extends UntypedRemoteModule,
-  TableDef extends UntypedTableDef
+  TableName extends TableNamesOf<RemoteModule>,
 > = Prettify<
-  ClientTableCore<RemoteModule, TableDef> &
-  ReadonlyIndexes<TableDef, TableIndexes<TableDef>>
+  ClientTableCore<RemoteModule, TableName> &
+  ReadonlyIndexes<TableDefForTableName<RemoteModule, TableName>, TableIndexes<TableDefForTableName<RemoteModule, TableName>>>
 >;
 
+type HasPrimaryKey<TableDef extends UntypedTableDef> =
+  ColumnsHavePrimaryKey<TableDef['columns']>;
+
+type ColumnsHavePrimaryKey<
+  Cs extends Record<string, ColumnBuilder<any, any, any>>
+> =
+  {
+    [K in keyof Cs]:
+      Cs[K] extends ColumnBuilder<any, any, infer M>
+        ? (M extends { isPrimaryKey: true } ? true : never)
+        : never
+  }[keyof Cs] extends true ? true : false;
+
+type MaybePKMethods<
+  RemoteModule extends UntypedRemoteModule,
+  TableName extends TableNamesOf<RemoteModule>,
+> = Partial<ClientTablePrimaryKeyMethods<RemoteModule, TableName>>;
+
+/**
+ * A variant of ClientTableCore where the primary key methods are always optional,
+ * allowing for classes like TableCache to implement this interface
+ */
+export type ClientTableCoreImplementable<
+  RemoteModule extends UntypedRemoteModule,
+  TableName extends TableNamesOf<RemoteModule>,
+> =
+  ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
+  ClientTableMethods<RemoteModule, TableName> &
+  // always present but optional -> statically known member set
+  MaybePKMethods<RemoteModule, TableName>;
+
 /**
  * Core methods of ClientTable, without the indexes mixed in.
  * Includes only staticly known methods.
  */
 export type ClientTableCore<
   RemoteModule extends UntypedRemoteModule,
-  TableDef extends UntypedTableDef,
+  TableName extends TableNamesOf<RemoteModule>,
 > =
-  ReadonlyTableMethods<TableDef> &
-  ClientTableMethods<RemoteModule, TableDef>;
\ No newline at end of file
+  ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
+  ClientTableMethods<RemoteModule, TableName> &
+  (
+    HasPrimaryKey<TableDefForTableName<RemoteModule, TableName>> extends true
+      ? ClientTablePrimaryKeyMethods<RemoteModule, TableName>
+      : {}
+  );
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index cf33668d4c7..90ac3cd5015 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -7,11 +7,14 @@ import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
 
 /**
  * The database client connection to a SpacetimeDB server.
- * NOTE: DbConnectionImpl<any> is used here 
+ * NOTE: DbConnectionImpl<any> is used here because UntypedRemoteModule causes
+ * variance issues with function paramters, and the end user will never be
+ * constructing a DbConnectionBuilder directly since it's code generated. We will
+ * always have a concrete RemoteModule type in those cases. Even if they user
+ * did do this, they would just lose type safety on the RemoteModule.
  */
 export class DbConnectionBuilder<
-  RemoteModule extends UntypedRemoteModule,
-  DbConnection extends DbConnectionImpl<RemoteModule>
+  DbConnection extends DbConnectionImpl<any>
 > {
   #uri?: URL;
   #nameOrAddress?: string;
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index 04b1a7967bd..d51dded9905 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -25,7 +25,7 @@ import {
 } from './event_context.ts';
 import { EventEmitter } from './event_emitter.ts';
 import { decompress } from './decompress.ts';
-import type { Identity } from '../';
+import type { Identity, InferTypeOfRow } from '../';
 import type {
   IdentityTokenMessage,
   Message,
@@ -50,7 +50,7 @@ import {
 } from './subscription_builder_impl.ts';
 import { stdbLogger } from './logger.ts';
 import { fromByteArray } from 'base64-js';
-import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
+import type { ReducerEventInfo, ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
 import type { ClientDbView } from './db_view.ts';
 import type { UntypedTableDef } from '../lib/table.ts';
 import { toCamelCase } from '../lib/utils.ts';
@@ -261,11 +261,11 @@ export class DbConnectionImpl<
     for (const reducer of def.reducers) {
       const key = toCamelCase(reducer.name);
 
-      (out as any)[key] = (params: typeof reducer.params) => {
+      (out as any)[key] = (params: InferTypeOfRow<typeof reducer.params>) => {
         const flags = this.#callReducerFlags.get(reducer.name) ?? 'FullUpdate';
         this.callReducerWithParams(
           reducer.name,
-          reducer.paramsSpacetimeType,
+          reducer.paramsType,
           params,
           flags
         );
@@ -291,7 +291,7 @@ export class DbConnectionImpl<
   }
 
   #makeEventContext(
-    event: Event<RemoteModule['reducers'][number]>
+    event: Event<ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>>
   ): EventContextInterface<RemoteModule> {
     // Bind methods to preserve `this` (#private fields safe)
     return {
@@ -648,7 +648,7 @@ export class DbConnectionImpl<
       case 'TransactionUpdate': {
         let reducerInfo = message.reducerInfo;
         let unknownTransaction = false;
-        let reducerArgs: any | undefined;
+        let reducerArgs: InferTypeOfRow<typeof reducer.params> | undefined;
         const reducer = this.#remoteModule.reducers.find(t => t.name === reducerInfo!.reducerName)!;
         if (!reducerInfo) {
           unknownTransaction = true;
@@ -658,7 +658,7 @@ export class DbConnectionImpl<
             const reader = new BinaryReader(reducerInfo.args as Uint8Array);
             reducerArgs = ProductType.deserializeValue(
               reader,
-              reducer?.paramsSpacetimeType
+              reducer?.paramsType
             );
           } catch {
             // This should only be printed in development, since it's
@@ -686,6 +686,7 @@ export class DbConnectionImpl<
         // At this point, we know that `reducerInfo` is not null because
         // we return if `unknownTransaction` is true.
         reducerInfo = reducerInfo!;
+        reducerArgs = reducerArgs!;
 
         // Thus this must be a reducer event create it and emit it.
         const reducerEvent = {
@@ -696,9 +697,7 @@ export class DbConnectionImpl<
           energyConsumed: message.energyConsumed,
           reducer: {
             name: reducerInfo.reducerName,
-            // TODO(cloutiertyler): rename back to args to maintain API compatibility
-            params: reducerArgs,
-            paramsSpacetimeType: reducer.paramsSpacetimeType,
+            args: reducerArgs,
           },
         };
         const event: Event<typeof reducerEvent.reducer> = {
@@ -718,7 +717,7 @@ export class DbConnectionImpl<
 
         const argsArray: any[] = [];
         (
-          reducer.paramsSpacetimeType
+          reducer.paramsType
         ).elements.forEach(element => {
           argsArray.push(reducerArgs[element.name!]);
         });
diff --git a/crates/bindings-typescript/src/sdk/db_view.ts b/crates/bindings-typescript/src/sdk/db_view.ts
index afcdbd4d4d0..ffdee9e7199 100644
--- a/crates/bindings-typescript/src/sdk/db_view.ts
+++ b/crates/bindings-typescript/src/sdk/db_view.ts
@@ -5,5 +5,5 @@ import type { ClientTable } from "./client_table";
  * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
  */
 export type ClientDbView<RemoteModule extends UntypedRemoteModule> = {
-  readonly [Tbl in RemoteModule['tables'][number] as Extract<Tbl['accessorName'], string>]: ClientTable<RemoteModule, Tbl>;
+  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<RemoteModule, Tbl['name']>;
 };
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/event.ts b/crates/bindings-typescript/src/sdk/event.ts
index 98254af3ca5..b3d07405d37 100644
--- a/crates/bindings-typescript/src/sdk/event.ts
+++ b/crates/bindings-typescript/src/sdk/event.ts
@@ -1,7 +1,7 @@
 import type { ReducerEvent } from './reducer_event';
-import type { UntypedReducerDef } from './reducers';
+import type { ReducerEventInfo } from './reducers';
 
-export type Event<Reducer extends UntypedReducerDef> =
+export type Event<Reducer extends ReducerEventInfo> =
   | { tag: 'Reducer'; value: ReducerEvent<Reducer> }
   | { tag: 'SubscribeApplied' }
   | { tag: 'UnsubscribeApplied' }
diff --git a/crates/bindings-typescript/src/sdk/event_context.ts b/crates/bindings-typescript/src/sdk/event_context.ts
index 1a69b4c2a3c..8511832cac3 100644
--- a/crates/bindings-typescript/src/sdk/event_context.ts
+++ b/crates/bindings-typescript/src/sdk/event_context.ts
@@ -1,6 +1,8 @@
+import type { InferTypeOfRow } from '../lib/type_builders.ts';
 import type { DbContext } from './db_context';
 import type { Event } from './event.ts';
 import type { ReducerEvent } from './reducer_event.ts';
+import type { ReducerEventInfo } from './reducers.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 
 export type UntypedEventContext = EventContextInterface<UntypedRemoteModule>;
@@ -9,14 +11,14 @@ export interface EventContextInterface<
   RemoteModule extends UntypedRemoteModule,
 > extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
-  event: Event<RemoteModule['reducers'][number]>;
+  event: Event<ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>>;
 }
 
 export interface ReducerEventContextInterface<
   RemoteModule extends UntypedRemoteModule,
 > extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
-  event: ReducerEvent<RemoteModule['reducers'][number]>;
+  event: ReducerEvent<ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>>;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
diff --git a/crates/bindings-typescript/src/sdk/index.ts b/crates/bindings-typescript/src/sdk/index.ts
index 3a066053531..06cf0cdc3b9 100644
--- a/crates/bindings-typescript/src/sdk/index.ts
+++ b/crates/bindings-typescript/src/sdk/index.ts
@@ -6,6 +6,6 @@ export { type ClientTable } from './client_table.ts';
 export { type RemoteModule } from './spacetime_module.ts';
 export { type SetReducerFlags } from './reducers.ts';
 export * from '../lib/type_builders.ts';
-export { schema } from '../lib/schema.ts';
+export { schema, convertToAccessorMap } from '../lib/schema.ts';
 export { table } from '../lib/table.ts';
 export { reducerSchema, reducers } from '../lib/reducers.ts';
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/sdk/reducer_event.ts b/crates/bindings-typescript/src/sdk/reducer_event.ts
index 1ffe5c79177..60638bd2f43 100644
--- a/crates/bindings-typescript/src/sdk/reducer_event.ts
+++ b/crates/bindings-typescript/src/sdk/reducer_event.ts
@@ -2,9 +2,9 @@ import { ConnectionId } from '../';
 import { Timestamp } from '../';
 import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
-import type { UntypedReducerDef } from './reducers.ts';
+import type { ReducerEventInfo } from './reducers.ts';
 
-export type ReducerEvent<Reducer extends UntypedReducerDef> = {
+export type ReducerEvent<Reducer extends ReducerEventInfo> = {
   /**
    * The time when the reducer started running.
    *
diff --git a/crates/bindings-typescript/src/sdk/reducers.ts b/crates/bindings-typescript/src/sdk/reducers.ts
index 28a7b6804c8..567c16df2f7 100644
--- a/crates/bindings-typescript/src/sdk/reducers.ts
+++ b/crates/bindings-typescript/src/sdk/reducers.ts
@@ -1,19 +1,25 @@
 import type { ProductType } from "../lib/algebraic_type";
 import type { ParamsObj } from "../lib/reducers";
-import type { CamelCase } from "../lib/type_util";
+import type { CoerceRow } from "../lib/table";
+import type { InferTypeOfRow } from "../lib/type_builders";
+import type { CamelCase, PrettifyDeep } from "../lib/type_util";
 import type { CallReducerFlags } from "./db_connection_impl";
 
 export type ReducersView<R extends UntypedReducersDef> = {
-  [I in keyof R['reducers'] as CamelCase<R['reducers'][number]['name']>]:
-    (params: R['reducers'][number]['params']) => void
+  [I in keyof R['reducers'] as CamelCase<R['reducers'][number]['accessorName']>]:
+    (params: PrettifyDeep<InferTypeOfRow<R['reducers'][number]['params']>>) => void
 };
 
-export type UntypedReducers = Record<string, (...args: any[]) => void>;
+export type ReducerEventInfo<Args extends object = object> = {
+  name: string;
+  args: Args;
+};
 
 export type UntypedReducerDef = {
   name: string;
-  params: ParamsObj;
-  paramsSpacetimeType: ProductType;
+  accessorName: string;
+  params: CoerceRow<ParamsObj>; 
+  paramsType: ProductType;
 };
 
 export type UntypedReducersDef = {
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index c87afc5e895..655a17278f9 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -2,10 +2,11 @@ import { EventEmitter } from './event_emitter.ts';
 
 import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
-import type { EventContextInterface, ClientTable } from './index.ts';
+import type { EventContextInterface, ClientTable, TableDefForTableName } from './index.ts';
 import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
-import type { ClientTableCore } from './client_table.ts';
+import type { ClientTableCore, ClientTableCoreImplementable } from './client_table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
+import type { TableNamesOf } from '../lib/schema.ts';
 
 export type Operation<
   RowType extends Record<string, any> = Record<string, any>,
@@ -35,10 +36,10 @@ export type PendingCallback = {
  */
 export class TableCache<
   RemoteModule extends UntypedRemoteModule,
-  TableDef extends UntypedTableDef,
-> implements ClientTableCore<RemoteModule, TableDef> {
-  private rows: Map<ComparablePrimitive, [RowType<TableDef>, number]>;
-  private tableDef: TableDef;
+  TableName extends TableNamesOf<RemoteModule>,
+> implements ClientTableCoreImplementable<RemoteModule, TableName> {
+  private rows: Map<ComparablePrimitive, [RowType<TableDefForTableName<RemoteModule, TableName>>, number]>;
+  private tableDef: TableDefForTableName<RemoteModule, TableName>;
   private emitter: EventEmitter<'insert' | 'delete' | 'update'>;
 
   /**
@@ -47,7 +48,7 @@ export class TableCache<
    * @param primaryKey column name designated as `#[primarykey]`
    * @param entityClass the entityClass
    */
-  constructor(tableDef: TableDef) {
+  constructor(tableDef: TableDefForTableName<RemoteModule, TableName>) {
     this.tableDef = tableDef;
     this.rows = new Map();
     this.emitter = new EventEmitter();
@@ -63,8 +64,8 @@ export class TableCache<
   /**
    * @returns The values of the rows in the table
    */
-  iter(): IterableIterator<RowType<TableDef>> {
-    function* generator(rows: Map<ComparablePrimitive, [RowType<TableDef>, number]>): IterableIterator<RowType<TableDef>> {
+  iter(): IterableIterator<RowType<TableDefForTableName<RemoteModule, TableName>>> {
+    function* generator(rows: Map<ComparablePrimitive, [RowType<TableDefForTableName<RemoteModule, TableName>>, number]>): IterableIterator<RowType<TableDefForTableName<RemoteModule, TableName>>> {
       for (const [row] of rows.values()) {
         yield row;
       }
@@ -76,12 +77,12 @@ export class TableCache<
    * Allows iteration over the rows in the table 
    * @returns An iterator over the rows in the table
    */
-  [Symbol.iterator](): IterableIterator<RowType<TableDef>> {
+  [Symbol.iterator](): IterableIterator<RowType<TableDefForTableName<RemoteModule, TableName>>> {
     return this.iter();
   }
 
   applyOperations = (
-    operations: Operation<RowType<TableDef>>[],
+    operations: Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>[],
     ctx: EventContextInterface<RemoteModule>
   ): PendingCallback[] => {
     const pendingCallbacks: PendingCallback[] = [];
@@ -90,11 +91,11 @@ export class TableCache<
     if (hasPrimaryKey) {
       const insertMap = new Map<
         ComparablePrimitive,
-        [Operation<RowType<TableDef>>, number]
+        [Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>, number]
       >();
       const deleteMap = new Map<
         ComparablePrimitive,
-        [Operation<RowType<TableDef>>, number]
+        [Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>, number]
       >();
       for (const op of operations) {
         if (op.type === 'insert') {
@@ -157,7 +158,7 @@ export class TableCache<
   update = (
     ctx: EventContextInterface<RemoteModule>,
     rowId: ComparablePrimitive,
-    newRow: RowType<TableDef>,
+    newRow: RowType<TableDefForTableName<RemoteModule, TableName>>,
     refCountDelta: number = 0
   ): PendingCallback | undefined => {
     const existingEntry = this.rows.get(rowId);
@@ -204,7 +205,7 @@ export class TableCache<
 
   insert = (
     ctx: EventContextInterface<RemoteModule>,
-    operation: Operation<RowType<TableDef>>,
+    operation: Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>,
     count: number = 1
   ): PendingCallback | undefined => {
     const [_, previousCount] = this.rows.get(operation.rowId) || [
@@ -227,7 +228,7 @@ export class TableCache<
 
   delete = (
     ctx: EventContextInterface<RemoteModule>,
-    operation: Operation<RowType<TableDef>>,
+    operation: Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>,
     count: number = 1
   ): PendingCallback | undefined => {
     const [_, previousCount] = this.rows.get(operation.rowId) || [
@@ -271,7 +272,7 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onInsert = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
   ): void => {
     this.emitter.on('insert', cb);
   };
@@ -292,7 +293,7 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onDelete = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
   ): void => {
     this.emitter.on('delete', cb);
   };
@@ -313,7 +314,7 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onUpdate = (
-    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
   ): void => {
     this.emitter.on('update', cb);
   };
@@ -324,7 +325,7 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnInsert = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
   ): void => {
     this.emitter.off('insert', cb);
   };
@@ -335,7 +336,7 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnDelete = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
   ): void => {
     this.emitter.off('delete', cb);
   };
@@ -346,7 +347,7 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnUpdate = (
-    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDef>, row: RowType<TableDef>) => void
+    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
   ): void => {
     this.emitter.off('update', cb);
   };
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index bb2e7b1b7bf..fdb4fcdf554 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -1,23 +1,19 @@
-import { DbConnection, Player } from './module_bindings';
+import { tables, reducers, DbConnection } from './module_bindings';
 import { useEffect } from 'react';
 import './App.css';
 import { useReducer, useSpacetimeDB, useTable } from '../../src/react';
 
 function App() {
-  const x = useReducer;
-  const createPlayer = useReducer<DbConnection>('createPlayer');
-  const connection = useSpacetimeDB<DbConnection>();
-  const players = useTable<DbConnection, typeof Player>('player', {
-    onInsert: player => {
-      console.log(player);
-    },
-  });
+  const connection = useSpacetimeDB();
+  const players = useTable(tables.player);
+  const createPlayer = useReducer(reducers.createPlayer);
+  createPlayer({ name: 'Test', location: { x: 0, y: 0 } });
 
   useEffect(() => {
     setTimeout(() => {
-      console.log(Array.from(players.rows));
+      console.log(Array.from(players));
     }, 5000);
-  }, [connection, players.rows]);
+  }, [connection, players]);
 
   return (
     <div className="App">
@@ -26,7 +22,10 @@ function App() {
 
       <button
         onClick={() =>
-          connection.reducers.createPlayer('Hello', { x: 10, y: 40 })
+          connection.getConnection<DbConnection>()?.reducers.createPlayer({
+            name: 'Hello',
+            location: { x: 10, y: 40 },
+          })
         }
       >
         Update
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
index fdec0043c97..ae96105ad77 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 004d8995f86..fe002646926 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -6,28 +6,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
@@ -97,7 +85,10 @@ const REMOTE_MODULE = {
   typeof reducersSchema.reducersType
 >;
 
-export type Module = typeof REMOTE_MODULE;
+export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);
+export const reducers = __convertToAccessorMap(
+  reducersSchema.reducersType.reducers
+);
 
 export type EventContext = __EventContextInterface<typeof REMOTE_MODULE>;
 export type ReducerEventContext = __ReducerEventContextInterface<
@@ -112,10 +103,7 @@ export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
   typeof REMOTE_MODULE
 > {}
 
-export class DbConnectionBuilder extends __DbConnectionBuilder<
-  typeof REMOTE_MODULE,
-  DbConnection
-> {}
+export class DbConnectionBuilder extends __DbConnectionBuilder<DbConnection> {}
 
 export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
   static builder = (): DbConnectionBuilder => {
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 239885c6eb7..2c616acbfe5 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index 5249c4a6be3..a546844a378 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
index 3c0f0fd79d3..edc37d92a5e 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
index 239885c6eb7..2c616acbfe5 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
index c27daf013e7..d698ae7b3c5 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
index 29fa7652d66..2f323db0106 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
index 3a4ccf1be08..6c8228a49a8 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
@@ -4,28 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ClientTable as __ClientTable,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
+  convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index 4a398e7234e..f7d6b5f374a 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -271,6 +271,11 @@ impl Lang for TypeScript {
         writeln!(out, ">;");
         out.dedent(1);
 
+        writeln!(out);
+        writeln!(out, "export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);");
+        writeln!(out, "export const reducers = __convertToAccessorMap(reducersSchema.reducersType.reducers);");
+        writeln!(out);
+
         out.newline();
 
         // Write type aliases for EventContext, ReducerEventContext, SubscriptionEventContext, ErrorContext
@@ -302,7 +307,6 @@ impl Lang for TypeScript {
         writeln!(out);
         writeln!(out, "export class DbConnectionBuilder extends __DbConnectionBuilder<");
         out.indent(1);
-        writeln!(out, "typeof REMOTE_MODULE,");
         writeln!(out, "DbConnection");
         out.dedent(1);
         writeln!(out, "> {{}}");
@@ -330,6 +334,7 @@ impl Lang for TypeScript {
         );
         out.indent(1);
         writeln!(out, "return new SubscriptionBuilder(this);");
+        
         out.dedent(1);
         writeln!(out, "}};");
         out.dedent(1);
@@ -347,28 +352,16 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
     // All library imports are prefixed with `__` to avoid
     // clashing with the names of user generated types.
     let mut types = [
-        "type AlgebraicType as __AlgebraicTypeType",
-        "AlgebraicType as __AlgebraicTypeValue",
-        "type AlgebraicTypeVariants as __AlgebraicTypeVariants",
-        "Identity as __Identity",
-        "ClientCache as __ClientCache",
-        "ClientTable as __ClientTable",
-        "ConnectionId as __ConnectionId",
-        "Timestamp as __Timestamp",
-        "TimeDuration as __TimeDuration",
         "DbConnectionBuilder as __DbConnectionBuilder",
-        "BinaryWriter as __BinaryWriter",
-        "type CallReducerFlags as __CallReducerFlags",
+        "convertToAccessorMap as __convertToAccessorMap",
         "type EventContextInterface as __EventContextInterface",
         "type ReducerEventContextInterface as __ReducerEventContextInterface",
         "type SubscriptionEventContextInterface as __SubscriptionEventContextInterface",
         "type ErrorContextInterface as __ErrorContextInterface",
         "type RemoteModule as __RemoteModule",
         "SubscriptionBuilderImpl as __SubscriptionBuilderImpl",
-        "BinaryReader as __BinaryReader",
         "DbConnectionImpl as __DbConnectionImpl",
         "type Event as __Event",
-        "deepEqual as __deepEqual",
         "schema as __schema",
         "table as __table",
         "reducers as __reducers",

From 05e663f31cfe8fe166f279c97c45c08d918d9231 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Tue, 4 Nov 2025 22:35:47 -0500
Subject: [PATCH 09/23] clusterfuck

---
 .../src/lib/algebraic_type.ts                 | 724 +++++++++---------
 .../src/lib/autogen/algebraic_type_type.ts    | 210 +----
 .../lib/autogen/algebraic_type_variants.ts    |  40 +-
 .../src/lib/autogen/index_type_type.ts        |  68 +-
 .../src/lib/autogen/index_type_variants.ts    |  19 +-
 .../src/lib/autogen/lifecycle_type.ts         |  80 +-
 .../src/lib/autogen/lifecycle_variants.ts     |  19 +-
 .../lib/autogen/misc_module_export_type.ts    |  71 +-
 .../autogen/misc_module_export_variants.ts    |  28 +-
 .../lib/autogen/product_type_element_type.ts  |  79 +-
 .../src/lib/autogen/product_type_type.ts      |  70 +-
 .../lib/autogen/raw_column_def_v_8_type.ts    |  74 +-
 .../raw_column_default_value_v_9_type.ts      |  74 +-
 .../autogen/raw_constraint_data_v_9_type.ts   |  72 +-
 .../raw_constraint_data_v_9_variants.ts       |  29 +-
 .../autogen/raw_constraint_def_v_8_type.ts    |  73 +-
 .../autogen/raw_constraint_def_v_9_type.ts    |  79 +-
 .../lib/autogen/raw_index_algorithm_type.ts   |  89 +--
 .../autogen/raw_index_algorithm_variants.ts   |  19 +-
 .../src/lib/autogen/raw_index_def_v_8_type.ts |  83 +-
 .../src/lib/autogen/raw_index_def_v_9_type.ts |  87 +--
 .../raw_misc_module_export_v_9_type.ts        |  80 +-
 .../raw_misc_module_export_v_9_variants.ts    |  32 +-
 .../src/lib/autogen/raw_module_def_type.ts    |  86 +--
 .../lib/autogen/raw_module_def_v_8_type.ts    | 107 +--
 .../lib/autogen/raw_module_def_v_9_type.ts    | 131 +---
 .../lib/autogen/raw_module_def_variants.ts    |  34 +-
 .../lib/autogen/raw_procedure_def_v_9_type.ts |  23 +
 .../lib/autogen/raw_reducer_def_v_9_type.ts   |  86 +--
 .../raw_row_level_security_def_v_9_type.ts    |  66 +-
 .../lib/autogen/raw_schedule_def_v_9_type.ts  |  75 +-
 .../autogen/raw_scoped_type_name_v_9_type.ts  |  70 +-
 .../lib/autogen/raw_sequence_def_v_8_type.ts  |  97 +--
 .../lib/autogen/raw_sequence_def_v_9_type.ts  |  99 +--
 .../src/lib/autogen/raw_table_def_v_8_type.ts | 126 +--
 .../src/lib/autogen/raw_table_def_v_9_type.ts | 141 +---
 .../src/lib/autogen/raw_type_def_v_9_type.ts  |  76 +-
 .../raw_unique_constraint_data_v_9_type.ts    |  66 +-
 .../src/lib/autogen/raw_view_def_v_9_type.ts  |  25 +
 .../src/lib/autogen/reducer_def_type.ts       |  75 +-
 .../src/lib/autogen/sum_type_type.ts          |  68 +-
 .../src/lib/autogen/sum_type_variant_type.ts  |  79 +-
 .../src/lib/autogen/table_access_type.ts      |  73 +-
 .../src/lib/autogen/table_access_variants.ts  |  19 +-
 .../src/lib/autogen/table_desc_type.ts        |  73 +-
 .../src/lib/autogen/table_type_type.ts        |  68 +-
 .../src/lib/autogen/table_type_variants.ts    |  19 +-
 .../src/lib/autogen/type_alias_type.ts        |  66 +-
 .../src/lib/autogen/typespace_type.ts         |  70 +-
 .../src/lib/type_builders.ts                  |  42 +-
 .../bindings-typescript/src/lib/type_util.ts  |   4 +-
 .../bindings-typescript/tests/serde.test.ts   |  10 +-
 .../examples/regen-typescript-moduledef.rs    |   1 +
 crates/codegen/src/typescript.rs              |  19 +-
 54 files changed, 1080 insertions(+), 3113 deletions(-)
 create mode 100644 crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
 create mode 100644 crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts

diff --git a/crates/bindings-typescript/src/lib/algebraic_type.ts b/crates/bindings-typescript/src/lib/algebraic_type.ts
index d7af713abac..34b5983b613 100644
--- a/crates/bindings-typescript/src/lib/algebraic_type.ts
+++ b/crates/bindings-typescript/src/lib/algebraic_type.ts
@@ -4,21 +4,9 @@ import { ConnectionId } from './connection_id';
 import type BinaryReader from './binary_reader';
 import BinaryWriter from './binary_writer';
 import { Identity } from './identity';
-import { Option } from './option';
-import {
-  AlgebraicType as AlgebraicTypeType,
-  AlgebraicType as AlgebraicTypeValue,
-} from './autogen/algebraic_type_type';
-import {
-  type ProductType as ProductTypeType,
-  ProductType as ProductTypeValue,
-} from './autogen/product_type_type';
-import {
-  type SumType as SumTypeType,
-  SumType as SumTypeValue,
-} from './autogen/sum_type_type';
-import ScheduleAt from './schedule_at';
-import type Typespace from './autogen/typespace_type';
+import AlgebraicType from './autogen/algebraic_type_type';
+import Typespace from './autogen/typespace_type';
+import { SumBuilder, type Infer } from './type_builders';
 
 /**
  * A factor / element of a product type.
@@ -43,6 +31,8 @@ export * from './autogen/sum_type_variant_type';
  */
 export type * as AlgebraicTypeVariants from './autogen/algebraic_type_variants';
 
+export { AlgebraicType };
+
 /**
  * The SpacetimeDB Algebraic Type System (SATS) is a structural type system in
  * which a nominal type system can be constructed.
@@ -50,79 +40,26 @@ export type * as AlgebraicTypeVariants from './autogen/algebraic_type_variants';
  * The type system unifies the concepts sum types, product types, and built-in
  * primitive types into a single type system.
  */
-export type AlgebraicType = AlgebraicTypeType;
+export type AlgebraicTypeType = Infer<typeof AlgebraicType>;
 
-/**
- * Algebraic Type utilities.
- */
-export const AlgebraicType: {
-  Sum<T extends SumType>(value: T): { tag: 'Sum'; value: T };
-  Product<T extends ProductType>(value: T): { tag: 'Product'; value: T };
-  Array<T extends AlgebraicType>(value: T): { tag: 'Array'; value: T };
+type TypespaceType = Infer<typeof Typespace>;
+
+export class AlgebraicTypeBuilder
+  extends SumBuilder<Infer<typeof AlgebraicType>> {
+
+  private constructor() {
+    // reuse the exact variants from the generated instance
+    super((AlgebraicType as any)._variants, 'AlgebraicType');
+  }
+
+  static readonly instance = new AlgebraicTypeBuilder();
 
-  createOptionType(innerType: AlgebraicTypeType): AlgebraicTypeType;
-  createIdentityType(): AlgebraicTypeType;
-  createConnectionIdType(): AlgebraicTypeType;
-  createScheduleAtType(): AlgebraicTypeType;
-  createTimestampType(): AlgebraicTypeType;
-  createTimeDurationType(): AlgebraicTypeType;
   serializeValue(
     writer: BinaryWriter,
     ty: AlgebraicTypeType,
     value: any,
-    typespace?: Typespace
-  ): void;
-  deserializeValue(
-    reader: BinaryReader,
-    ty: AlgebraicTypeType,
-    typespace?: Typespace
-  ): any;
-  /**
-   * Convert a value of the algebraic type into something that can be used as a key in a map.
-   * There are no guarantees about being able to order it.
-   * This is only guaranteed to be comparable to other values of the same type.
-   * @param value A value of the algebraic type
-   * @returns Something that can be used as a key in a map.
-   */
-  intoMapKey(ty: AlgebraicTypeType, value: any): ComparablePrimitive;
-} & typeof AlgebraicTypeValue = {
-  ...AlgebraicTypeValue,
-  Sum: <T extends SumType>(value: T): { tag: 'Sum'; value: T } => ({
-    tag: 'Sum',
-    value,
-  }),
-  Product: <T extends ProductType>(value: T): { tag: 'Product'; value: T } => ({
-    tag: 'Product',
-    value,
-  }),
-  Array: <T extends AlgebraicType>(value: T): { tag: 'Array'; value: T } => ({
-    tag: 'Array',
-    value,
-  }),
-  createOptionType: function (innerType: AlgebraicTypeType): AlgebraicTypeType {
-    return Option.getAlgebraicType(innerType);
-  },
-  createIdentityType: function (): AlgebraicTypeType {
-    return Identity.getAlgebraicType();
-  },
-  createConnectionIdType: function (): AlgebraicTypeType {
-    return ConnectionId.getAlgebraicType();
-  },
-  createScheduleAtType: function (): AlgebraicTypeType {
-    return ScheduleAt.getAlgebraicType();
-  },
-  createTimestampType: function (): AlgebraicTypeType {
-    return Timestamp.getAlgebraicType();
-  },
-  createTimeDurationType: function (): AlgebraicTypeType {
-    return TimeDuration.getAlgebraicType();
-  },
-  serializeValue: function (
-    writer: BinaryWriter,
-    ty: AlgebraicTypeType,
-    value: any,
-    typespace?: Typespace
-  ): void {
+    typespace?: TypespaceType
+  ) {
     if (ty.tag === 'Ref') {
       if (!typespace)
         throw new Error('cannot serialize refs without a typespace');
@@ -195,110 +132,137 @@ export const AlgebraicType: {
         writer.writeString(value);
         break;
     }
-  },
-  deserializeValue: function (
-    reader: BinaryReader,
-    ty: AlgebraicTypeType,
-    typespace?: Typespace
-  ): any {
-    if (ty.tag === 'Ref') {
-      if (!typespace)
-        throw new Error('cannot deserialize refs without a typespace');
-      while (ty.tag === 'Ref') ty = typespace.types[ty.value];
-    }
-    switch (ty.tag) {
-      case 'Product':
-        return ProductType.deserializeValue(reader, ty.value, typespace);
-      case 'Sum':
-        return SumType.deserializeValue(reader, ty.value, typespace);
-      case 'Array':
-        if (ty.value.tag === 'U8') {
-          return reader.readUInt8Array();
-        } else {
-          const elemType = ty.value;
-          const length = reader.readU32();
-          const result: any[] = [];
-          for (let i = 0; i < length; i++) {
-            result.push(
-              AlgebraicType.deserializeValue(reader, elemType, typespace)
-            );
-          }
-          return result;
-        }
-      case 'Bool':
-        return reader.readBool();
-      case 'I8':
-        return reader.readI8();
-      case 'U8':
-        return reader.readU8();
-      case 'I16':
-        return reader.readI16();
-      case 'U16':
-        return reader.readU16();
-      case 'I32':
-        return reader.readI32();
-      case 'U32':
-        return reader.readU32();
-      case 'I64':
-        return reader.readI64();
-      case 'U64':
-        return reader.readU64();
-      case 'I128':
-        return reader.readI128();
-      case 'U128':
-        return reader.readU128();
-      case 'I256':
-        return reader.readI256();
-      case 'U256':
-        return reader.readU256();
-      case 'F32':
-        return reader.readF32();
-      case 'F64':
-        return reader.readF64();
-      case 'String':
-        return reader.readString();
-    }
-  },
-  /**
-   * Convert a value of the algebraic type into something that can be used as a key in a map.
-   * There are no guarantees about being able to order it.
-   * This is only guaranteed to be comparable to other values of the same type.
-   * @param value A value of the algebraic type
-   * @returns Something that can be used as a key in a map.
-   */
-  intoMapKey: function (
-    ty: AlgebraicTypeType,
-    value: any
-  ): ComparablePrimitive {
-    switch (ty.tag) {
-      case 'U8':
-      case 'U16':
-      case 'U32':
-      case 'U64':
-      case 'U128':
-      case 'U256':
-      case 'I8':
-      case 'I16':
-      case 'I32':
-      case 'I64':
-      case 'I128':
-      case 'I256':
-      case 'F32':
-      case 'F64':
-      case 'String':
-      case 'Bool':
-        return value;
-      case 'Product':
-        return ProductType.intoMapKey(ty.value, value);
-      default: {
-        // The fallback is to serialize and base64 encode the bytes.
-        const writer = new BinaryWriter(10);
-        AlgebraicType.serializeValue(writer, ty, value);
-        return writer.toBase64();
-      }
-    }
-  },
-};
+  }
+
+  // deserializeValue: function (
+  //   reader: BinaryReader,
+  //   ty: AlgebraicTypeType,
+  //   typespace?: TypespaceType
+  // ): any {
+  //   if (ty.tag === 'Ref') {
+  //     if (!typespace)
+  //       throw new Error('cannot deserialize refs without a typespace');
+  //     while (ty.tag === 'Ref') ty = typespace.types[ty.value];
+  //   }
+  //   switch (ty.tag) {
+  //     case 'Product':
+  //       return ProductType.deserializeValue(reader, ty.value, typespace);
+  //     case 'Sum':
+  //       return SumType.deserializeValue(reader, ty.value, typespace);
+  //     case 'Array':
+  //       if (ty.value.tag === 'U8') {
+  //         return reader.readUInt8Array();
+  //       } else {
+  //         const elemType = ty.value;
+  //         const length = reader.readU32();
+  //         const result: any[] = [];
+  //         for (let i = 0; i < length; i++) {
+  //           result.push(
+  //             AlgebraicType.deserializeValue(reader, elemType, typespace)
+  //           );
+  //         }
+  //         return result;
+  //       }
+  //     case 'Bool':
+  //       return reader.readBool();
+  //     case 'I8':
+  //       return reader.readI8();
+  //     case 'U8':
+  //       return reader.readU8();
+  //     case 'I16':
+  //       return reader.readI16();
+  //     case 'U16':
+  //       return reader.readU16();
+  //     case 'I32':
+  //       return reader.readI32();
+  //     case 'U32':
+  //       return reader.readU32();
+  //     case 'I64':
+  //       return reader.readI64();
+  //     case 'U64':
+  //       return reader.readU64();
+  //     case 'I128':
+  //       return reader.readI128();
+  //     case 'U128':
+  //       return reader.readU128();
+  //     case 'I256':
+  //       return reader.readI256();
+  //     case 'U256':
+  //       return reader.readU256();
+  //     case 'F32':
+  //       return reader.readF32();
+  //     case 'F64':
+  //       return reader.readF64();
+  //     case 'String':
+  //       return reader.readString();
+  //   }
+  // },
+  // /**
+  //  * Convert a value of the algebraic type into something that can be used as a key in a map.
+  //  * There are no guarantees about being able to order it.
+  //  * This is only guaranteed to be comparable to other values of the same type.
+  //  * @param value A value of the algebraic type
+  //  * @returns Something that can be used as a key in a map.
+  //  */
+  // intoMapKey: function (
+  //   ty: AlgebraicTypeType,
+  //   value: any
+  // ): ComparablePrimitive {
+  //   switch (ty.tag) {
+  //     case 'U8':
+  //     case 'U16':
+  //     case 'U32':
+  //     case 'U64':
+  //     case 'U128':
+  //     case 'U256':
+  //     case 'I8':
+  //     case 'I16':
+  //     case 'I32':
+  //     case 'I64':
+  //     case 'I128':
+  //     case 'I256':
+  //     case 'F32':
+  //     case 'F64':
+  //     case 'String':
+  //     case 'Bool':
+  //       return value;
+  //     case 'Product':
+  //       return ProductType.intoMapKey(ty.value, value);
+  //     default: {
+  //       // The fallback is to serialize and base64 encode the bytes.
+  //       const writer = new BinaryWriter(10);
+  //       AlgebraicType.serializeValue(writer, ty, value);
+  //       return writer.toBase64();
+  //     }
+  //   }
+  // },
+}
+
+/**
+//  * Algebraic Type utilities.
+//  */
+// export const Foo: {
+//   serializeValue(
+//     writer: BinaryWriter,
+//     ty: AlgebraicTypeType,
+//     value: any,
+//     typespace?: TypespaceType
+//   ): void;
+//   deserializeValue(
+//     reader: BinaryReader,
+//     ty: AlgebraicTypeType,
+//     typespace?: TypespaceType
+//   ): any;
+//   /**
+//    * Convert a value of the algebraic type into something that can be used as a key in a map.
+//    * There are no guarantees about being able to order it.
+//    * This is only guaranteed to be comparable to other values of the same type.
+//    * @param value A value of the algebraic type
+//    * @returns Something that can be used as a key in a map.
+//    */
+//   intoMapKey(ty: AlgebraicTypeType, value: any): ComparablePrimitive;
+// } = {
+// };
 
 /**
  * A structural product type  of the factors given by `elements`.
@@ -325,208 +289,208 @@ export const AlgebraicType: {
  *
  * [structural]: https://en.wikipedia.org/wiki/Structural_type_system
  */
-export type ProductType = ProductTypeType;
+// export type ProductType = ProductTypeType;
 
-export const ProductType: {
-  serializeValue(
-    writer: BinaryWriter,
-    ty: ProductTypeType,
-    value: any,
-    typespace?: Typespace
-  ): void;
-  deserializeValue(
-    reader: BinaryReader,
-    ty: ProductTypeType,
-    typespace?: Typespace
-  ): any;
-  intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive;
-} = {
-  ...ProductTypeValue,
-  serializeValue(
-    writer: BinaryWriter,
-    ty: ProductTypeType,
-    value: any,
-    typespace?: Typespace
-  ): void {
-    for (const element of ty.elements) {
-      AlgebraicType.serializeValue(
-        writer,
-        element.algebraicType,
-        value[element.name!],
-        typespace
-      );
-    }
-  },
-  deserializeValue(
-    reader: BinaryReader,
-    ty: ProductTypeType,
-    typespace?: Typespace
-  ): any {
-    const result: { [key: string]: any } = {};
-    if (ty.elements.length === 1) {
-      if (ty.elements[0].name === '__time_duration_micros__') {
-        return new TimeDuration(reader.readI64());
-      }
+// export const ProductType: {
+//   serializeValue(
+//     writer: BinaryWriter,
+//     ty: ProductTypeType,
+//     value: any,
+//     typespace?: TypespaceType
+//   ): void;
+//   deserializeValue(
+//     reader: BinaryReader,
+//     ty: ProductTypeType,
+//     typespace?: TypespaceType
+//   ): any;
+//   intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive;
+// } = {
+//   ...ProductTypeValue,
+//   serializeValue(
+//     writer: BinaryWriter,
+//     ty: ProductTypeType,
+//     value: any,
+//     typespace?: TypespaceType
+//   ): void {
+//     for (const element of ty.elements) {
+//       AlgebraicType.serializeValue(
+//         writer,
+//         element.algebraicType,
+//         value[element.name!],
+//         typespace
+//       );
+//     }
+//   },
+//   deserializeValue(
+//     reader: BinaryReader,
+//     ty: ProductTypeType,
+//     typespace?: TypespaceType
+//   ): any {
+//     const result: { [key: string]: any } = {};
+//     if (ty.elements.length === 1) {
+//       if (ty.elements[0].name === '__time_duration_micros__') {
+//         return new TimeDuration(reader.readI64());
+//       }
 
-      if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
-        return new Timestamp(reader.readI64());
-      }
+//       if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
+//         return new Timestamp(reader.readI64());
+//       }
 
-      if (ty.elements[0].name === '__identity__') {
-        return new Identity(reader.readU256());
-      }
+//       if (ty.elements[0].name === '__identity__') {
+//         return new Identity(reader.readU256());
+//       }
 
-      if (ty.elements[0].name === '__connection_id__') {
-        return new ConnectionId(reader.readU128());
-      }
-    }
+//       if (ty.elements[0].name === '__connection_id__') {
+//         return new ConnectionId(reader.readU128());
+//       }
+//     }
 
-    for (const element of ty.elements) {
-      result[element.name!] = AlgebraicType.deserializeValue(
-        reader,
-        element.algebraicType,
-        typespace
-      );
-    }
-    return result;
-  },
-  intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive {
-    if (ty.elements.length === 1) {
-      if (ty.elements[0].name === '__time_duration_micros__') {
-        return (value as TimeDuration).__time_duration_micros__;
-      }
+//     for (const element of ty.elements) {
+//       result[element.name!] = AlgebraicType.deserializeValue(
+//         reader,
+//         element.algebraicType,
+//         typespace
+//       );
+//     }
+//     return result;
+//   },
+//   intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive {
+//     if (ty.elements.length === 1) {
+//       if (ty.elements[0].name === '__time_duration_micros__') {
+//         return (value as TimeDuration).__time_duration_micros__;
+//       }
 
-      if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
-        return (value as Timestamp).__timestamp_micros_since_unix_epoch__;
-      }
+//       if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
+//         return (value as Timestamp).__timestamp_micros_since_unix_epoch__;
+//       }
 
-      if (ty.elements[0].name === '__identity__') {
-        return (value as Identity).__identity__;
-      }
+//       if (ty.elements[0].name === '__identity__') {
+//         return (value as Identity).__identity__;
+//       }
 
-      if (ty.elements[0].name === '__connection_id__') {
-        return (value as ConnectionId).__connection_id__;
-      }
-    }
-    // The fallback is to serialize and base64 encode the bytes.
-    const writer = new BinaryWriter(10);
-    AlgebraicType.serializeValue(writer, AlgebraicType.Product(ty), value);
-    return writer.toBase64();
-  },
-};
+//       if (ty.elements[0].name === '__connection_id__') {
+//         return (value as ConnectionId).__connection_id__;
+//       }
+//     }
+//     // The fallback is to serialize and base64 encode the bytes.
+//     const writer = new BinaryWriter(10);
+//     AlgebraicType.serializeValue(writer, AlgebraicType.Product(ty), value);
+//     return writer.toBase64();
+//   },
+// };
 
-export type SumType = SumTypeType;
+// export type SumTypeType = Infer<typeof SumType>;
 
-/**
- * Unlike most languages, sums in SATS are *[structural]* and not nominal.
- * When checking whether two nominal types are the same,
- * their names and/or declaration sites (e.g., module / namespace) are considered.
- * Meanwhile, a structural type system would only check the structure of the type itself,
- * e.g., the names of its variants and their inner data types in the case of a sum.
- *
- * This is also known as a discriminated union (implementation) or disjoint union.
- * Another name is [coproduct (category theory)](https://ncatlab.org/nlab/show/coproduct).
- *
- * These structures are known as sum types because the number of possible values a sum
- * ```ignore
- * { N_0(T_0), N_1(T_1), ..., N_n(T_n) }
- * ```
- * is:
- * ```ignore
- * Σ (i ∈ 0..n). values(T_i)
- * ```
- * so for example, `values({ A(U64), B(Bool) }) = values(U64) + values(Bool)`.
- *
- * See also: https://ncatlab.org/nlab/show/sum+type.
- *
- * [structural]: https://en.wikipedia.org/wiki/Structural_type_system
- */
-export const SumType: {
-  serializeValue(
-    writer: BinaryWriter,
-    ty: SumTypeType,
-    value: any,
-    typespace?: Typespace
-  ): void;
-  deserializeValue(
-    reader: BinaryReader,
-    ty: SumTypeType,
-    typespace?: Typespace
-  ): any;
-} = {
-  ...SumTypeValue,
-  serializeValue: function (
-    writer: BinaryWriter,
-    ty: SumTypeType,
-    value: any,
-    typespace?: Typespace
-  ): void {
-    if (
-      ty.variants.length == 2 &&
-      ty.variants[0].name === 'some' &&
-      ty.variants[1].name === 'none'
-    ) {
-      if (value !== null && value !== undefined) {
-        writer.writeByte(0);
-        AlgebraicType.serializeValue(
-          writer,
-          ty.variants[0].algebraicType,
-          value,
-          typespace
-        );
-      } else {
-        writer.writeByte(1);
-      }
-    } else {
-      const variant = value['tag'];
-      const index = ty.variants.findIndex(v => v.name === variant);
-      if (index < 0) {
-        throw `Can't serialize a sum type, couldn't find ${value.tag} tag`;
-      }
-      writer.writeU8(index);
-      AlgebraicType.serializeValue(
-        writer,
-        ty.variants[index].algebraicType,
-        value['value'],
-        typespace
-      );
-    }
-  },
-  deserializeValue: function (
-    reader: BinaryReader,
-    ty: SumTypeType,
-    typespace?: Typespace
-  ): any {
-    const tag = reader.readU8();
-    // In TypeScript we handle Option values as a special case
-    // we don't represent the some and none variants, but instead
-    // we represent the value directly.
-    if (
-      ty.variants.length == 2 &&
-      ty.variants[0].name === 'some' &&
-      ty.variants[1].name === 'none'
-    ) {
-      if (tag === 0) {
-        return AlgebraicType.deserializeValue(
-          reader,
-          ty.variants[0].algebraicType,
-          typespace
-        );
-      } else if (tag === 1) {
-        return undefined;
-      } else {
-        throw `Can't deserialize an option type, couldn't find ${tag} tag`;
-      }
-    } else {
-      const variant = ty.variants[tag];
-      const value = AlgebraicType.deserializeValue(
-        reader,
-        variant.algebraicType,
-        typespace
-      );
-      return { tag: variant.name, value };
-    }
-  },
-};
+// /**
+//  * Unlike most languages, sums in SATS are *[structural]* and not nominal.
+//  * When checking whether two nominal types are the same,
+//  * their names and/or declaration sites (e.g., module / namespace) are considered.
+//  * Meanwhile, a structural type system would only check the structure of the type itself,
+//  * e.g., the names of its variants and their inner data types in the case of a sum.
+//  *
+//  * This is also known as a discriminated union (implementation) or disjoint union.
+//  * Another name is [coproduct (category theory)](https://ncatlab.org/nlab/show/coproduct).
+//  *
+//  * These structures are known as sum types because the number of possible values a sum
+//  * ```ignore
+//  * { N_0(T_0), N_1(T_1), ..., N_n(T_n) }
+//  * ```
+//  * is:
+//  * ```ignore
+//  * Σ (i ∈ 0..n). values(T_i)
+//  * ```
+//  * so for example, `values({ A(U64), B(Bool) }) = values(U64) + values(Bool)`.
+//  *
+//  * See also: https://ncatlab.org/nlab/show/sum+type.
+//  *
+//  * [structural]: https://en.wikipedia.org/wiki/Structural_type_system
+//  */
+// export const SumType: {
+//   serializeValue(
+//     writer: BinaryWriter,
+//     ty: SumTypeType,
+//     value: any,
+//     typespace?: TypespaceType
+//   ): void;
+//   deserializeValue(
+//     reader: BinaryReader,
+//     ty: SumTypeType,
+//     typespace?: TypespaceType
+//   ): any;
+// } = {
+//   ...SumTypeValue,
+//   serializeValue: function (
+//     writer: BinaryWriter,
+//     ty: SumTypeType,
+//     value: any,
+//     typespace?: TypespaceType
+//   ): void {
+//     if (
+//       ty.variants.length == 2 &&
+//       ty.variants[0].name === 'some' &&
+//       ty.variants[1].name === 'none'
+//     ) {
+//       if (value !== null && value !== undefined) {
+//         writer.writeByte(0);
+//         AlgebraicType.serializeValue(
+//           writer,
+//           ty.variants[0].algebraicType,
+//           value,
+//           typespace
+//         );
+//       } else {
+//         writer.writeByte(1);
+//       }
+//     } else {
+//       const variant = value['tag'];
+//       const index = ty.variants.findIndex(v => v.name === variant);
+//       if (index < 0) {
+//         throw `Can't serialize a sum type, couldn't find ${value.tag} tag`;
+//       }
+//       writer.writeU8(index);
+//       AlgebraicType.serializeValue(
+//         writer,
+//         ty.variants[index].algebraicType,
+//         value['value'],
+//         typespace
+//       );
+//     }
+//   },
+//   deserializeValue: function (
+//     reader: BinaryReader,
+//     ty: SumTypeType,
+//     typespace?: TypespaceType
+//   ): any {
+//     const tag = reader.readU8();
+//     // In TypeScript we handle Option values as a special case
+//     // we don't represent the some and none variants, but instead
+//     // we represent the value directly.
+//     if (
+//       ty.variants.length == 2 &&
+//       ty.variants[0].name === 'some' &&
+//       ty.variants[1].name === 'none'
+//     ) {
+//       if (tag === 0) {
+//         return AlgebraicType.deserializeValue(
+//           reader,
+//           ty.variants[0].algebraicType,
+//           typespace
+//         );
+//       } else if (tag === 1) {
+//         return undefined;
+//       } else {
+//         throw `Can't deserialize an option type, couldn't find ${tag} tag`;
+//       }
+//     } else {
+//       const variant = ty.variants[tag];
+//       const value = AlgebraicType.deserializeValue(
+//         reader,
+//         variant.algebraicType,
+//         typespace
+//       );
+//       return { tag: variant.name, value };
+//     }
+//   },
+// };
 
-export type ComparablePrimitive = number | string | boolean | bigint;
+// export type ComparablePrimitive = number | string | boolean | bigint;
diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
index fcbc92cd34c..82e31ab4910 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
@@ -4,186 +4,40 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { SumType } from './sum_type_type';
-// Mark import as potentially unused
-declare type __keep_SumType = SumType;
-import { ProductType } from './product_type_type';
-// Mark import as potentially unused
-declare type __keep_ProductType = ProductType;
+import SumType from './sum_type_type';
+import ProductType from './product_type_type';
 
 import * as AlgebraicTypeVariants from './algebraic_type_variants';
 
 // The tagged union or sum type for the algebraic type `AlgebraicType`.
-export type AlgebraicType =
-  | AlgebraicTypeVariants.Ref
-  | AlgebraicTypeVariants.Sum
-  | AlgebraicTypeVariants.Product
-  | AlgebraicTypeVariants.Array
-  | AlgebraicTypeVariants.String
-  | AlgebraicTypeVariants.Bool
-  | AlgebraicTypeVariants.I8
-  | AlgebraicTypeVariants.U8
-  | AlgebraicTypeVariants.I16
-  | AlgebraicTypeVariants.U16
-  | AlgebraicTypeVariants.I32
-  | AlgebraicTypeVariants.U32
-  | AlgebraicTypeVariants.I64
-  | AlgebraicTypeVariants.U64
-  | AlgebraicTypeVariants.I128
-  | AlgebraicTypeVariants.U128
-  | AlgebraicTypeVariants.I256
-  | AlgebraicTypeVariants.U256
-  | AlgebraicTypeVariants.F32
-  | AlgebraicTypeVariants.F64;
-
-let _cached_AlgebraicType_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const AlgebraicType = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  Ref: (value: number): AlgebraicTypeVariants.Ref => ({ tag: 'Ref', value }),
-  Sum: (value: SumType): AlgebraicTypeVariants.Sum => ({ tag: 'Sum', value }),
-  Product: (value: ProductType): AlgebraicTypeVariants.Product => ({
-    tag: 'Product',
-    value,
-  }),
-  Array: (value: AlgebraicType): AlgebraicTypeVariants.Array => ({
-    tag: 'Array',
-    value,
-  }),
-  String: { tag: 'String' } as const,
-  Bool: { tag: 'Bool' } as const,
-  I8: { tag: 'I8' } as const,
-  U8: { tag: 'U8' } as const,
-  I16: { tag: 'I16' } as const,
-  U16: { tag: 'U16' } as const,
-  I32: { tag: 'I32' } as const,
-  U32: { tag: 'U32' } as const,
-  I64: { tag: 'I64' } as const,
-  U64: { tag: 'U64' } as const,
-  I128: { tag: 'I128' } as const,
-  U128: { tag: 'U128' } as const,
-  I256: { tag: 'I256' } as const,
-  U256: { tag: 'U256' } as const,
-  F32: { tag: 'F32' } as const,
-  F64: { tag: 'F64' } as const,
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_AlgebraicType_type_value)
-      return _cached_AlgebraicType_type_value;
-    _cached_AlgebraicType_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_AlgebraicType_type_value.value.variants.push(
-      { name: 'Ref', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'Sum', algebraicType: SumType.getTypeScriptAlgebraicType() },
-      {
-        name: 'Product',
-        algebraicType: ProductType.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'Array',
-        algebraicType: AlgebraicType.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'String',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'Bool',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'I8',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'U8',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'I16',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'U16',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'I32',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'U32',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'I64',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'U64',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'I128',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'U128',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'I256',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'U256',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'F32',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'F64',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      }
-    );
-    return _cached_AlgebraicType_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: AlgebraicType): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      AlgebraicType.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): AlgebraicType {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      AlgebraicType.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default AlgebraicType;
+export default __t.enum('AlgebraicType', {
+  ref: __t.u32(),
+  sum: SumType,
+  product: ProductType,
+  array: AlgebraicType,
+  string: __t.unit(),
+  bool: __t.unit(),
+  i8: __t.unit(),
+  u8: __t.unit(),
+  i16: __t.unit(),
+  u16: __t.unit(),
+  i32: __t.unit(),
+  u32: __t.unit(),
+  i64: __t.unit(),
+  u64: __t.unit(),
+  i128: __t.unit(),
+  u128: __t.unit(),
+  i256: __t.unit(),
+  u256: __t.unit(),
+  f32: __t.unit(),
+  f64: __t.unit(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
index e92c84b2140..7b6a73122a1 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
@@ -4,32 +4,26 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { AlgebraicType as AlgebraicTypeType } from './algebraic_type_type';
-// Mark import as potentially unused
-declare type __keep_AlgebraicTypeType = AlgebraicTypeType;
-import { SumType as SumTypeType } from './sum_type_type';
-// Mark import as potentially unused
-declare type __keep_SumTypeType = SumTypeType;
-import { ProductType as ProductTypeType } from './product_type_type';
-// Mark import as potentially unused
-declare type __keep_ProductTypeType = ProductTypeType;
+import AlgebraicTypeType from './algebraic_type_type';
+import SumTypeType from './sum_type_type';
+import ProductTypeType from './product_type_type';
 
 export type Ref = { tag: 'Ref'; value: number };
-export type Sum = { tag: 'Sum'; value: SumTypeType };
-export type Product = { tag: 'Product'; value: ProductTypeType };
-export type Array = { tag: 'Array'; value: AlgebraicTypeType };
+export type Sum = { tag: 'Sum'; value: __Infer<typeof SumTypeType> };
+export type Product = {
+  tag: 'Product';
+  value: __Infer<typeof ProductTypeType>;
+};
+export type Array = { tag: 'Array'; value: __Infer<typeof AlgebraicTypeType> };
 export type String = { tag: 'String' };
 export type Bool = { tag: 'Bool' };
 export type I8 = { tag: 'I8' };
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
index 691424a1d7b..b50441a6678 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
@@ -4,66 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as IndexTypeVariants from './index_type_variants';
 
 // The tagged union or sum type for the algebraic type `IndexType`.
-export type IndexType = IndexTypeVariants.BTree | IndexTypeVariants.Hash;
-
-let _cached_IndexType_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const IndexType = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  BTree: { tag: 'BTree' } as const,
-  Hash: { tag: 'Hash' } as const,
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_IndexType_type_value) return _cached_IndexType_type_value;
-    _cached_IndexType_type_value = __AlgebraicTypeValue.Sum({ variants: [] });
-    _cached_IndexType_type_value.value.variants.push(
-      {
-        name: 'BTree',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'Hash',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      }
-    );
-    return _cached_IndexType_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: IndexType): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      IndexType.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): IndexType {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      IndexType.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default IndexType;
+export default __t.enum('IndexType', { bTree: __t.unit(), hash: __t.unit() });
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
index e6ad5bc4a79..da26f7c9eea 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
@@ -4,17 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type BTree = { tag: 'BTree' };
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
index 1ac1f627392..01418fad34b 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
@@ -4,74 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as LifecycleVariants from './lifecycle_variants';
 
 // The tagged union or sum type for the algebraic type `Lifecycle`.
-export type Lifecycle =
-  | LifecycleVariants.Init
-  | LifecycleVariants.OnConnect
-  | LifecycleVariants.OnDisconnect;
-
-let _cached_Lifecycle_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const Lifecycle = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  Init: { tag: 'Init' } as const,
-  OnConnect: { tag: 'OnConnect' } as const,
-  OnDisconnect: { tag: 'OnDisconnect' } as const,
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Lifecycle_type_value) return _cached_Lifecycle_type_value;
-    _cached_Lifecycle_type_value = __AlgebraicTypeValue.Sum({ variants: [] });
-    _cached_Lifecycle_type_value.value.variants.push(
-      {
-        name: 'Init',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'OnConnect',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'OnDisconnect',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      }
-    );
-    return _cached_Lifecycle_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Lifecycle): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Lifecycle.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Lifecycle {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Lifecycle.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Lifecycle;
+export default __t.enum('Lifecycle', {
+  init: __t.unit(),
+  onConnect: __t.unit(),
+  onDisconnect: __t.unit(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
index 0816ce1d64e..c310246c499 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
@@ -4,17 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type Init = { tag: 'Init' };
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
index 427e9f437f0..5abd5213412 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
@@ -4,69 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { TypeAlias } from './type_alias_type';
-// Mark import as potentially unused
-declare type __keep_TypeAlias = TypeAlias;
+import TypeAlias from './type_alias_type';
 
 import * as MiscModuleExportVariants from './misc_module_export_variants';
 
 // The tagged union or sum type for the algebraic type `MiscModuleExport`.
-export type MiscModuleExport = MiscModuleExportVariants.TypeAlias;
-
-let _cached_MiscModuleExport_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const MiscModuleExport = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  TypeAlias: (value: TypeAlias): MiscModuleExportVariants.TypeAlias => ({
-    tag: 'TypeAlias',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_MiscModuleExport_type_value)
-      return _cached_MiscModuleExport_type_value;
-    _cached_MiscModuleExport_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_MiscModuleExport_type_value.value.variants.push({
-      name: 'TypeAlias',
-      algebraicType: TypeAlias.getTypeScriptAlgebraicType(),
-    });
-    return _cached_MiscModuleExport_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: MiscModuleExport): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      MiscModuleExport.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): MiscModuleExport {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      MiscModuleExport.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default MiscModuleExport;
+export default __t.enum('MiscModuleExport', { typeAlias: TypeAlias });
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
index d416d705c2f..4e7f89d02fc 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
@@ -4,20 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { TypeAlias as TypeAliasType } from './type_alias_type';
-// Mark import as potentially unused
-declare type __keep_TypeAliasType = TypeAliasType;
+import TypeAliasType from './type_alias_type';
 
-export type TypeAlias = { tag: 'TypeAlias'; value: TypeAliasType };
+export type TypeAlias = {
+  tag: 'TypeAlias';
+  value: __Infer<typeof TypeAliasType>;
+};
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
index 18e793c3857..c2d4d57154d 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
@@ -4,71 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { AlgebraicType } from './algebraic_type_type';
-// Mark import as potentially unused
-declare type __keep_AlgebraicType = AlgebraicType;
+import AlgebraicType from './algebraic_type_type';
 
-export type ProductTypeElement = {
-  name: string | undefined;
-  algebraicType: AlgebraicType;
-};
-let _cached_ProductTypeElement_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ProductTypeElement = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ProductTypeElement_type_value)
-      return _cached_ProductTypeElement_type_value;
-    _cached_ProductTypeElement_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ProductTypeElement_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      {
-        name: 'algebraicType',
-        algebraicType: AlgebraicType.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_ProductTypeElement_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ProductTypeElement): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ProductTypeElement.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ProductTypeElement {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ProductTypeElement.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ProductTypeElement;
+export default __t.object('ProductTypeElement', {
+  name: __t.option(__t.string()),
+  algebraicType: AlgebraicType,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
index aa72f5a57af..f064b890c0c 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
@@ -4,63 +4,17 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { ProductTypeElement } from './product_type_element_type';
-// Mark import as potentially unused
-declare type __keep_ProductTypeElement = ProductTypeElement;
+import ProductTypeElement from './product_type_element_type';
 
-export type ProductType = {
-  elements: ProductTypeElement[];
-};
-let _cached_ProductType_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ProductType = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ProductType_type_value) return _cached_ProductType_type_value;
-    _cached_ProductType_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ProductType_type_value.value.elements.push({
-      name: 'elements',
-      algebraicType: __AlgebraicTypeValue.Array(
-        ProductTypeElement.getTypeScriptAlgebraicType()
-      ),
-    });
-    return _cached_ProductType_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ProductType): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ProductType.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ProductType {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ProductType.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ProductType;
+export default __t.object('ProductType', {
+  elements: __t.array(ProductTypeElement),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
index c7ceea12688..8a06977a8ba 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
@@ -4,66 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { AlgebraicType } from './algebraic_type_type';
-// Mark import as potentially unused
-declare type __keep_AlgebraicType = AlgebraicType;
+import AlgebraicType from './algebraic_type_type';
 
-export type RawColumnDefV8 = {
-  colName: string;
-  colType: AlgebraicType;
-};
-let _cached_RawColumnDefV8_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawColumnDefV8 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawColumnDefV8_type_value)
-      return _cached_RawColumnDefV8_type_value;
-    _cached_RawColumnDefV8_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawColumnDefV8_type_value.value.elements.push(
-      { name: 'colName', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'colType',
-        algebraicType: AlgebraicType.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_RawColumnDefV8_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawColumnDefV8): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawColumnDefV8.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawColumnDefV8 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawColumnDefV8.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawColumnDefV8;
+export default __t.object('RawColumnDefV8', {
+  colName: __t.string(),
+  colType: AlgebraicType,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
index f3b486cf3c6..53afa043403 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
@@ -4,66 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawColumnDefaultValueV9 = {
-  table: string;
-  colId: number;
-  value: Uint8Array;
-};
-let _cached_RawColumnDefaultValueV9_type_value: __AlgebraicTypeType | null =
-  null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawColumnDefaultValueV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawColumnDefaultValueV9_type_value)
-      return _cached_RawColumnDefaultValueV9_type_value;
-    _cached_RawColumnDefaultValueV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawColumnDefaultValueV9_type_value.value.elements.push(
-      { name: 'table', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'colId', algebraicType: __AlgebraicTypeValue.U16 },
-      {
-        name: 'value',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      }
-    );
-    return _cached_RawColumnDefaultValueV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawColumnDefaultValueV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawColumnDefaultValueV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawColumnDefaultValueV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawColumnDefaultValueV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawColumnDefaultValueV9;
+export default __t.object('RawColumnDefaultValueV9', {
+  table: __t.string(),
+  colId: __t.u16(),
+  value: __t.array(__t.u8()),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
index 453163184fa..46e1f345f39 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
@@ -4,68 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawUniqueConstraintDataV9 } from './raw_unique_constraint_data_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawUniqueConstraintDataV9 = RawUniqueConstraintDataV9;
+import RawUniqueConstraintDataV9 from './raw_unique_constraint_data_v_9_type';
 
 import * as RawConstraintDataV9Variants from './raw_constraint_data_v_9_variants';
 
 // The tagged union or sum type for the algebraic type `RawConstraintDataV9`.
-export type RawConstraintDataV9 = RawConstraintDataV9Variants.Unique;
-
-let _cached_RawConstraintDataV9_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const RawConstraintDataV9 = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  Unique: (
-    value: RawUniqueConstraintDataV9
-  ): RawConstraintDataV9Variants.Unique => ({ tag: 'Unique', value }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawConstraintDataV9_type_value)
-      return _cached_RawConstraintDataV9_type_value;
-    _cached_RawConstraintDataV9_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_RawConstraintDataV9_type_value.value.variants.push({
-      name: 'Unique',
-      algebraicType: RawUniqueConstraintDataV9.getTypeScriptAlgebraicType(),
-    });
-    return _cached_RawConstraintDataV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawConstraintDataV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawConstraintDataV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawConstraintDataV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawConstraintDataV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawConstraintDataV9;
+export default __t.enum('RawConstraintDataV9', {
+  unique: RawUniqueConstraintDataV9,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
index 81d12153b5d..3816567d978 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
@@ -4,21 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawUniqueConstraintDataV9 as RawUniqueConstraintDataV9Type } from './raw_unique_constraint_data_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawUniqueConstraintDataV9Type =
-  RawUniqueConstraintDataV9Type;
+import RawUniqueConstraintDataV9Type from './raw_unique_constraint_data_v_9_type';
 
-export type Unique = { tag: 'Unique'; value: RawUniqueConstraintDataV9Type };
+export type Unique = {
+  tag: 'Unique';
+  value: __Infer<typeof RawUniqueConstraintDataV9Type>;
+};
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
index 53a1d66fafa..2cd0dbf84aa 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
@@ -4,65 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawConstraintDefV8 = {
-  constraintName: string;
-  constraints: number;
-  columns: number[];
-};
-let _cached_RawConstraintDefV8_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawConstraintDefV8 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawConstraintDefV8_type_value)
-      return _cached_RawConstraintDefV8_type_value;
-    _cached_RawConstraintDefV8_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawConstraintDefV8_type_value.value.elements.push(
-      { name: 'constraintName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'constraints', algebraicType: __AlgebraicTypeValue.U8 },
-      {
-        name: 'columns',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U16),
-      }
-    );
-    return _cached_RawConstraintDefV8_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawConstraintDefV8): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawConstraintDefV8.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawConstraintDefV8 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawConstraintDefV8.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawConstraintDefV8;
+export default __t.object('RawConstraintDefV8', {
+  constraintName: __t.string(),
+  constraints: __t.u8(),
+  columns: __t.array(__t.u16()),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
index eb21bf196eb..f5b4befba60 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
@@ -4,71 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawConstraintDataV9 } from './raw_constraint_data_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawConstraintDataV9 = RawConstraintDataV9;
+import RawConstraintDataV9 from './raw_constraint_data_v_9_type';
 
-export type RawConstraintDefV9 = {
-  name: string | undefined;
-  data: RawConstraintDataV9;
-};
-let _cached_RawConstraintDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawConstraintDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawConstraintDefV9_type_value)
-      return _cached_RawConstraintDefV9_type_value;
-    _cached_RawConstraintDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawConstraintDefV9_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      {
-        name: 'data',
-        algebraicType: RawConstraintDataV9.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_RawConstraintDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawConstraintDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawConstraintDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawConstraintDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawConstraintDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawConstraintDefV9;
+export default __t.object('RawConstraintDefV9', {
+  name: __t.option(__t.string()),
+  data: RawConstraintDataV9,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
index c9d9b9111cc..e74950214f6 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
@@ -4,83 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as RawIndexAlgorithmVariants from './raw_index_algorithm_variants';
 
 // The tagged union or sum type for the algebraic type `RawIndexAlgorithm`.
-export type RawIndexAlgorithm =
-  | RawIndexAlgorithmVariants.BTree
-  | RawIndexAlgorithmVariants.Hash
-  | RawIndexAlgorithmVariants.Direct;
-
-let _cached_RawIndexAlgorithm_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const RawIndexAlgorithm = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  BTree: (value: number[]): RawIndexAlgorithmVariants.BTree => ({
-    tag: 'BTree',
-    value,
-  }),
-  Hash: (value: number[]): RawIndexAlgorithmVariants.Hash => ({
-    tag: 'Hash',
-    value,
-  }),
-  Direct: (value: number): RawIndexAlgorithmVariants.Direct => ({
-    tag: 'Direct',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawIndexAlgorithm_type_value)
-      return _cached_RawIndexAlgorithm_type_value;
-    _cached_RawIndexAlgorithm_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_RawIndexAlgorithm_type_value.value.variants.push(
-      {
-        name: 'BTree',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U16),
-      },
-      {
-        name: 'Hash',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U16),
-      },
-      { name: 'Direct', algebraicType: __AlgebraicTypeValue.U16 }
-    );
-    return _cached_RawIndexAlgorithm_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawIndexAlgorithm): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawIndexAlgorithm.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawIndexAlgorithm {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawIndexAlgorithm.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawIndexAlgorithm;
+export default __t.enum('RawIndexAlgorithm', {
+  bTree: __t.array(__t.u16()),
+  hash: __t.array(__t.u16()),
+  direct: __t.u16(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
index cee2772163f..fdc4c354fd8 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
@@ -4,17 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type BTree = { tag: 'BTree'; value: number[] };
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
index 4760d1cd435..90eb98b4906 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
@@ -4,73 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { IndexType } from './index_type_type';
-// Mark import as potentially unused
-declare type __keep_IndexType = IndexType;
+import IndexType from './index_type_type';
 
-export type RawIndexDefV8 = {
-  indexName: string;
-  isUnique: boolean;
-  indexType: IndexType;
-  columns: number[];
-};
-let _cached_RawIndexDefV8_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawIndexDefV8 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawIndexDefV8_type_value)
-      return _cached_RawIndexDefV8_type_value;
-    _cached_RawIndexDefV8_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawIndexDefV8_type_value.value.elements.push(
-      { name: 'indexName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'isUnique', algebraicType: __AlgebraicTypeValue.Bool },
-      {
-        name: 'indexType',
-        algebraicType: IndexType.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'columns',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U16),
-      }
-    );
-    return _cached_RawIndexDefV8_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawIndexDefV8): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawIndexDefV8.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawIndexDefV8 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawIndexDefV8.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawIndexDefV8;
+export default __t.object('RawIndexDefV8', {
+  indexName: __t.string(),
+  isUnique: __t.bool(),
+  indexType: IndexType,
+  columns: __t.array(__t.u16()),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
index d3df3940259..6ea95a6d49b 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
@@ -4,78 +4,19 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawIndexAlgorithm } from './raw_index_algorithm_type';
-// Mark import as potentially unused
-declare type __keep_RawIndexAlgorithm = RawIndexAlgorithm;
+import RawIndexAlgorithm from './raw_index_algorithm_type';
 
-export type RawIndexDefV9 = {
-  name: string | undefined;
-  accessorName: string | undefined;
-  algorithm: RawIndexAlgorithm;
-};
-let _cached_RawIndexDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawIndexDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawIndexDefV9_type_value)
-      return _cached_RawIndexDefV9_type_value;
-    _cached_RawIndexDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawIndexDefV9_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      {
-        name: 'accessorName',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      {
-        name: 'algorithm',
-        algebraicType: RawIndexAlgorithm.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_RawIndexDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawIndexDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawIndexDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawIndexDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawIndexDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawIndexDefV9;
+export default __t.object('RawIndexDefV9', {
+  name: __t.option(__t.string()),
+  accessorName: __t.option(__t.string()),
+  algorithm: RawIndexAlgorithm,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
index f8a0566672b..f6efe13f751 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
@@ -4,72 +4,24 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawColumnDefaultValueV9 } from './raw_column_default_value_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawColumnDefaultValueV9 = RawColumnDefaultValueV9;
+import RawColumnDefaultValueV9 from './raw_column_default_value_v_9_type';
+import RawProcedureDefV9 from './raw_procedure_def_v_9_type';
+import RawViewDefV9 from './raw_view_def_v_9_type';
 
 import * as RawMiscModuleExportV9Variants from './raw_misc_module_export_v_9_variants';
 
 // The tagged union or sum type for the algebraic type `RawMiscModuleExportV9`.
-export type RawMiscModuleExportV9 =
-  RawMiscModuleExportV9Variants.ColumnDefaultValue;
-
-let _cached_RawMiscModuleExportV9_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const RawMiscModuleExportV9 = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  ColumnDefaultValue: (
-    value: RawColumnDefaultValueV9
-  ): RawMiscModuleExportV9Variants.ColumnDefaultValue => ({
-    tag: 'ColumnDefaultValue',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawMiscModuleExportV9_type_value)
-      return _cached_RawMiscModuleExportV9_type_value;
-    _cached_RawMiscModuleExportV9_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_RawMiscModuleExportV9_type_value.value.variants.push({
-      name: 'ColumnDefaultValue',
-      algebraicType: RawColumnDefaultValueV9.getTypeScriptAlgebraicType(),
-    });
-    return _cached_RawMiscModuleExportV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawMiscModuleExportV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawMiscModuleExportV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawMiscModuleExportV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawMiscModuleExportV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawMiscModuleExportV9;
+export default __t.enum('RawMiscModuleExportV9', {
+  columnDefaultValue: RawColumnDefaultValueV9,
+  procedure: RawProcedureDefV9,
+  view: RawViewDefV9,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
index e65385fac01..827361c8c95 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
@@ -4,23 +4,25 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawColumnDefaultValueV9 as RawColumnDefaultValueV9Type } from './raw_column_default_value_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawColumnDefaultValueV9Type = RawColumnDefaultValueV9Type;
+import RawColumnDefaultValueV9Type from './raw_column_default_value_v_9_type';
+import RawProcedureDefV9Type from './raw_procedure_def_v_9_type';
+import RawViewDefV9Type from './raw_view_def_v_9_type';
 
 export type ColumnDefaultValue = {
   tag: 'ColumnDefaultValue';
-  value: RawColumnDefaultValueV9Type;
+  value: __Infer<typeof RawColumnDefaultValueV9Type>;
 };
+export type Procedure = {
+  tag: 'Procedure';
+  value: __Infer<typeof RawProcedureDefV9Type>;
+};
+export type View = { tag: 'View'; value: __Infer<typeof RawViewDefV9Type> };
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
index 6df7f5869b6..660f69a598f 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
@@ -4,80 +4,22 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawModuleDefV8 } from './raw_module_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawModuleDefV8 = RawModuleDefV8;
-import { RawModuleDefV9 } from './raw_module_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawModuleDefV9 = RawModuleDefV9;
+import RawModuleDefV8 from './raw_module_def_v_8_type';
+import RawModuleDefV9 from './raw_module_def_v_9_type';
 
 import * as RawModuleDefVariants from './raw_module_def_variants';
 
 // The tagged union or sum type for the algebraic type `RawModuleDef`.
-export type RawModuleDef =
-  | RawModuleDefVariants.V8BackCompat
-  | RawModuleDefVariants.V9;
-
-let _cached_RawModuleDef_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const RawModuleDef = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  V8BackCompat: (value: RawModuleDefV8): RawModuleDefVariants.V8BackCompat => ({
-    tag: 'V8BackCompat',
-    value,
-  }),
-  V9: (value: RawModuleDefV9): RawModuleDefVariants.V9 => ({
-    tag: 'V9',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawModuleDef_type_value) return _cached_RawModuleDef_type_value;
-    _cached_RawModuleDef_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_RawModuleDef_type_value.value.variants.push(
-      {
-        name: 'V8BackCompat',
-        algebraicType: RawModuleDefV8.getTypeScriptAlgebraicType(),
-      },
-      { name: 'V9', algebraicType: RawModuleDefV9.getTypeScriptAlgebraicType() }
-    );
-    return _cached_RawModuleDef_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawModuleDef): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawModuleDef.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawModuleDef {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawModuleDef.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawModuleDef;
+export default __t.enum('RawModuleDef', {
+  v8BackCompat: RawModuleDefV8,
+  v9: RawModuleDefV9,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
index 1ea5fdf6afa..bf554872868 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
@@ -4,94 +4,23 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { Typespace } from './typespace_type';
-// Mark import as potentially unused
-declare type __keep_Typespace = Typespace;
-import { TableDesc } from './table_desc_type';
-// Mark import as potentially unused
-declare type __keep_TableDesc = TableDesc;
-import { ReducerDef } from './reducer_def_type';
-// Mark import as potentially unused
-declare type __keep_ReducerDef = ReducerDef;
-import { MiscModuleExport } from './misc_module_export_type';
-// Mark import as potentially unused
-declare type __keep_MiscModuleExport = MiscModuleExport;
+import Typespace from './typespace_type';
+import TableDesc from './table_desc_type';
+import ReducerDef from './reducer_def_type';
+import MiscModuleExport from './misc_module_export_type';
 
-export type RawModuleDefV8 = {
-  typespace: Typespace;
-  tables: TableDesc[];
-  reducers: ReducerDef[];
-  miscExports: MiscModuleExport[];
-};
-let _cached_RawModuleDefV8_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawModuleDefV8 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawModuleDefV8_type_value)
-      return _cached_RawModuleDefV8_type_value;
-    _cached_RawModuleDefV8_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawModuleDefV8_type_value.value.elements.push(
-      {
-        name: 'typespace',
-        algebraicType: Typespace.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'tables',
-        algebraicType: __AlgebraicTypeValue.Array(
-          TableDesc.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'reducers',
-        algebraicType: __AlgebraicTypeValue.Array(
-          ReducerDef.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'miscExports',
-        algebraicType: __AlgebraicTypeValue.Array(
-          MiscModuleExport.getTypeScriptAlgebraicType()
-        ),
-      }
-    );
-    return _cached_RawModuleDefV8_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawModuleDefV8): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawModuleDefV8.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawModuleDefV8 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawModuleDefV8.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawModuleDefV8;
+export default __t.object('RawModuleDefV8', {
+  typespace: Typespace,
+  tables: __t.array(TableDesc),
+  reducers: __t.array(ReducerDef),
+  miscExports: __t.array(MiscModuleExport),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
index f73d0060b67..210acad551a 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
@@ -4,114 +4,27 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { Typespace } from './typespace_type';
-// Mark import as potentially unused
-declare type __keep_Typespace = Typespace;
-import { RawTableDefV9 } from './raw_table_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawTableDefV9 = RawTableDefV9;
-import { RawReducerDefV9 } from './raw_reducer_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawReducerDefV9 = RawReducerDefV9;
-import { RawTypeDefV9 } from './raw_type_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawTypeDefV9 = RawTypeDefV9;
-import { RawMiscModuleExportV9 } from './raw_misc_module_export_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawMiscModuleExportV9 = RawMiscModuleExportV9;
-import { RawRowLevelSecurityDefV9 } from './raw_row_level_security_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawRowLevelSecurityDefV9 = RawRowLevelSecurityDefV9;
+import Typespace from './typespace_type';
+import RawTableDefV9 from './raw_table_def_v_9_type';
+import RawReducerDefV9 from './raw_reducer_def_v_9_type';
+import RawTypeDefV9 from './raw_type_def_v_9_type';
+import RawMiscModuleExportV9 from './raw_misc_module_export_v_9_type';
+import RawRowLevelSecurityDefV9 from './raw_row_level_security_def_v_9_type';
 
-export type RawModuleDefV9 = {
-  typespace: Typespace;
-  tables: RawTableDefV9[];
-  reducers: RawReducerDefV9[];
-  types: RawTypeDefV9[];
-  miscExports: RawMiscModuleExportV9[];
-  rowLevelSecurity: RawRowLevelSecurityDefV9[];
-};
-let _cached_RawModuleDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawModuleDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawModuleDefV9_type_value)
-      return _cached_RawModuleDefV9_type_value;
-    _cached_RawModuleDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawModuleDefV9_type_value.value.elements.push(
-      {
-        name: 'typespace',
-        algebraicType: Typespace.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'tables',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawTableDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'reducers',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawReducerDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'types',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawTypeDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'miscExports',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawMiscModuleExportV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'rowLevelSecurity',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawRowLevelSecurityDefV9.getTypeScriptAlgebraicType()
-        ),
-      }
-    );
-    return _cached_RawModuleDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawModuleDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawModuleDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawModuleDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawModuleDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawModuleDefV9;
+export default __t.object('RawModuleDefV9', {
+  typespace: Typespace,
+  tables: __t.array(RawTableDefV9),
+  reducers: __t.array(RawReducerDefV9),
+  types: __t.array(RawTypeDefV9),
+  miscExports: __t.array(RawMiscModuleExportV9),
+  rowLevelSecurity: __t.array(RawRowLevelSecurityDefV9),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
index f64bc93e672..b29ddc80918 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
@@ -4,24 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawModuleDefV8 as RawModuleDefV8Type } from './raw_module_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawModuleDefV8Type = RawModuleDefV8Type;
-import { RawModuleDefV9 as RawModuleDefV9Type } from './raw_module_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawModuleDefV9Type = RawModuleDefV9Type;
+import RawModuleDefV8Type from './raw_module_def_v_8_type';
+import RawModuleDefV9Type from './raw_module_def_v_9_type';
 
-export type V8BackCompat = { tag: 'V8BackCompat'; value: RawModuleDefV8Type };
-export type V9 = { tag: 'V9'; value: RawModuleDefV9Type };
+export type V8BackCompat = {
+  tag: 'V8BackCompat';
+  value: __Infer<typeof RawModuleDefV8Type>;
+};
+export type V9 = { tag: 'V9'; value: __Infer<typeof RawModuleDefV9Type> };
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
new file mode 100644
index 00000000000..47216a7f1d2
--- /dev/null
+++ b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
@@ -0,0 +1,23 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+/* eslint-disable */
+/* tslint:disable */
+import {
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
+} from '../../index';
+import AlgebraicType from './algebraic_type_type';
+import ProductType from './product_type_type';
+
+export default __t.object('RawProcedureDefV9', {
+  name: __t.string(),
+  params: ProductType,
+  returnType: AlgebraicType,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
index 85872e7391d..09369d012dd 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
@@ -4,76 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { ProductType } from './product_type_type';
-// Mark import as potentially unused
-declare type __keep_ProductType = ProductType;
-import { Lifecycle } from './lifecycle_type';
-// Mark import as potentially unused
-declare type __keep_Lifecycle = Lifecycle;
+import ProductType from './product_type_type';
+import Lifecycle from './lifecycle_type';
 
-export type RawReducerDefV9 = {
-  name: string;
-  params: ProductType;
-  lifecycle: Lifecycle | undefined;
-};
-let _cached_RawReducerDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawReducerDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawReducerDefV9_type_value)
-      return _cached_RawReducerDefV9_type_value;
-    _cached_RawReducerDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawReducerDefV9_type_value.value.elements.push(
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'params',
-        algebraicType: ProductType.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'lifecycle',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          Lifecycle.getTypeScriptAlgebraicType()
-        ),
-      }
-    );
-    return _cached_RawReducerDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawReducerDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawReducerDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawReducerDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawReducerDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawReducerDefV9;
+export default __t.object('RawReducerDefV9', {
+  name: __t.string(),
+  params: ProductType,
+  lifecycle: __t.option(Lifecycle),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
index b611871d29b..5fbd40f3e59 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
@@ -4,60 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawRowLevelSecurityDefV9 = {
-  sql: string;
-};
-let _cached_RawRowLevelSecurityDefV9_type_value: __AlgebraicTypeType | null =
-  null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawRowLevelSecurityDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawRowLevelSecurityDefV9_type_value)
-      return _cached_RawRowLevelSecurityDefV9_type_value;
-    _cached_RawRowLevelSecurityDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawRowLevelSecurityDefV9_type_value.value.elements.push({
-      name: 'sql',
-      algebraicType: __AlgebraicTypeValue.String,
-    });
-    return _cached_RawRowLevelSecurityDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawRowLevelSecurityDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawRowLevelSecurityDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawRowLevelSecurityDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawRowLevelSecurityDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawRowLevelSecurityDefV9;
+export default __t.object('RawRowLevelSecurityDefV9', {
+  sql: __t.string(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
index 1ea84503d48..372932c66e7 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
@@ -4,67 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawScheduleDefV9 = {
-  name: string | undefined;
-  reducerName: string;
-  scheduledAtColumn: number;
-};
-let _cached_RawScheduleDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawScheduleDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawScheduleDefV9_type_value)
-      return _cached_RawScheduleDefV9_type_value;
-    _cached_RawScheduleDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawScheduleDefV9_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      { name: 'reducerName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'scheduledAtColumn', algebraicType: __AlgebraicTypeValue.U16 }
-    );
-    return _cached_RawScheduleDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawScheduleDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawScheduleDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawScheduleDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawScheduleDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawScheduleDefV9;
+export default __t.object('RawScheduleDefV9', {
+  name: __t.option(__t.string()),
+  reducerName: __t.string(),
+  scheduledAtColumn: __t.u16(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
index 70cf0cd455b..e6eea3effdc 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
@@ -4,63 +4,17 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawScopedTypeNameV9 = {
-  scope: string[];
-  name: string;
-};
-let _cached_RawScopedTypeNameV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawScopedTypeNameV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawScopedTypeNameV9_type_value)
-      return _cached_RawScopedTypeNameV9_type_value;
-    _cached_RawScopedTypeNameV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawScopedTypeNameV9_type_value.value.elements.push(
-      {
-        name: 'scope',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.String),
-      },
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String }
-    );
-    return _cached_RawScopedTypeNameV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawScopedTypeNameV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawScopedTypeNameV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawScopedTypeNameV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawScopedTypeNameV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawScopedTypeNameV9;
+export default __t.object('RawScopedTypeNameV9', {
+  scope: __t.array(__t.string()),
+  name: __t.string(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
index 75c1799359f..f9d4b9abae6 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
@@ -4,85 +4,22 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawSequenceDefV8 = {
-  sequenceName: string;
-  colPos: number;
-  increment: bigint;
-  start: bigint | undefined;
-  minValue: bigint | undefined;
-  maxValue: bigint | undefined;
-  allocated: bigint;
-};
-let _cached_RawSequenceDefV8_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawSequenceDefV8 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawSequenceDefV8_type_value)
-      return _cached_RawSequenceDefV8_type_value;
-    _cached_RawSequenceDefV8_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawSequenceDefV8_type_value.value.elements.push(
-      { name: 'sequenceName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'colPos', algebraicType: __AlgebraicTypeValue.U16 },
-      { name: 'increment', algebraicType: __AlgebraicTypeValue.I128 },
-      {
-        name: 'start',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.I128
-        ),
-      },
-      {
-        name: 'minValue',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.I128
-        ),
-      },
-      {
-        name: 'maxValue',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.I128
-        ),
-      },
-      { name: 'allocated', algebraicType: __AlgebraicTypeValue.I128 }
-    );
-    return _cached_RawSequenceDefV8_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawSequenceDefV8): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawSequenceDefV8.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawSequenceDefV8 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawSequenceDefV8.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawSequenceDefV8;
+export default __t.object('RawSequenceDefV8', {
+  sequenceName: __t.string(),
+  colPos: __t.u16(),
+  increment: __t.i128(),
+  start: __t.option(__t.i128()),
+  minValue: __t.option(__t.i128()),
+  maxValue: __t.option(__t.i128()),
+  allocated: __t.i128(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
index 4043c78a806..bf75bce155d 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
@@ -4,88 +4,21 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawSequenceDefV9 = {
-  name: string | undefined;
-  column: number;
-  start: bigint | undefined;
-  minValue: bigint | undefined;
-  maxValue: bigint | undefined;
-  increment: bigint;
-};
-let _cached_RawSequenceDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawSequenceDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawSequenceDefV9_type_value)
-      return _cached_RawSequenceDefV9_type_value;
-    _cached_RawSequenceDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawSequenceDefV9_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      { name: 'column', algebraicType: __AlgebraicTypeValue.U16 },
-      {
-        name: 'start',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.I128
-        ),
-      },
-      {
-        name: 'minValue',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.I128
-        ),
-      },
-      {
-        name: 'maxValue',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.I128
-        ),
-      },
-      { name: 'increment', algebraicType: __AlgebraicTypeValue.I128 }
-    );
-    return _cached_RawSequenceDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawSequenceDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawSequenceDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawSequenceDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawSequenceDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawSequenceDefV9;
+export default __t.object('RawSequenceDefV9', {
+  name: __t.option(__t.string()),
+  column: __t.u16(),
+  start: __t.option(__t.i128()),
+  minValue: __t.option(__t.i128()),
+  maxValue: __t.option(__t.i128()),
+  increment: __t.i128(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
index 56775011d3e..5ad27b2a05a 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
@@ -4,109 +4,27 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawColumnDefV8 } from './raw_column_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawColumnDefV8 = RawColumnDefV8;
-import { RawIndexDefV8 } from './raw_index_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawIndexDefV8 = RawIndexDefV8;
-import { RawConstraintDefV8 } from './raw_constraint_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawConstraintDefV8 = RawConstraintDefV8;
-import { RawSequenceDefV8 } from './raw_sequence_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawSequenceDefV8 = RawSequenceDefV8;
+import RawColumnDefV8 from './raw_column_def_v_8_type';
+import RawIndexDefV8 from './raw_index_def_v_8_type';
+import RawConstraintDefV8 from './raw_constraint_def_v_8_type';
+import RawSequenceDefV8 from './raw_sequence_def_v_8_type';
 
-export type RawTableDefV8 = {
-  tableName: string;
-  columns: RawColumnDefV8[];
-  indexes: RawIndexDefV8[];
-  constraints: RawConstraintDefV8[];
-  sequences: RawSequenceDefV8[];
-  tableType: string;
-  tableAccess: string;
-  scheduled: string | undefined;
-};
-let _cached_RawTableDefV8_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawTableDefV8 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawTableDefV8_type_value)
-      return _cached_RawTableDefV8_type_value;
-    _cached_RawTableDefV8_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawTableDefV8_type_value.value.elements.push(
-      { name: 'tableName', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'columns',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawColumnDefV8.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'indexes',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawIndexDefV8.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'constraints',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawConstraintDefV8.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'sequences',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawSequenceDefV8.getTypeScriptAlgebraicType()
-        ),
-      },
-      { name: 'tableType', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'tableAccess', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'scheduled',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      }
-    );
-    return _cached_RawTableDefV8_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawTableDefV8): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawTableDefV8.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawTableDefV8 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawTableDefV8.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawTableDefV8;
+export default __t.object('RawTableDefV8', {
+  tableName: __t.string(),
+  columns: __t.array(RawColumnDefV8),
+  indexes: __t.array(RawIndexDefV8),
+  constraints: __t.array(RawConstraintDefV8),
+  sequences: __t.array(RawSequenceDefV8),
+  tableType: __t.string(),
+  tableAccess: __t.string(),
+  scheduled: __t.option(__t.string()),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
index 88d6045c24a..bdb569b2bc0 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
@@ -4,121 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawIndexDefV9 } from './raw_index_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawIndexDefV9 = RawIndexDefV9;
-import { RawConstraintDefV9 } from './raw_constraint_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawConstraintDefV9 = RawConstraintDefV9;
-import { RawSequenceDefV9 } from './raw_sequence_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawSequenceDefV9 = RawSequenceDefV9;
-import { RawScheduleDefV9 } from './raw_schedule_def_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawScheduleDefV9 = RawScheduleDefV9;
-import { TableType } from './table_type_type';
-// Mark import as potentially unused
-declare type __keep_TableType = TableType;
-import { TableAccess } from './table_access_type';
-// Mark import as potentially unused
-declare type __keep_TableAccess = TableAccess;
+import RawIndexDefV9 from './raw_index_def_v_9_type';
+import RawConstraintDefV9 from './raw_constraint_def_v_9_type';
+import RawSequenceDefV9 from './raw_sequence_def_v_9_type';
+import RawScheduleDefV9 from './raw_schedule_def_v_9_type';
+import TableType from './table_type_type';
+import TableAccess from './table_access_type';
 
-export type RawTableDefV9 = {
-  name: string;
-  productTypeRef: number;
-  primaryKey: number[];
-  indexes: RawIndexDefV9[];
-  constraints: RawConstraintDefV9[];
-  sequences: RawSequenceDefV9[];
-  schedule: RawScheduleDefV9 | undefined;
-  tableType: TableType;
-  tableAccess: TableAccess;
-};
-let _cached_RawTableDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawTableDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawTableDefV9_type_value)
-      return _cached_RawTableDefV9_type_value;
-    _cached_RawTableDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawTableDefV9_type_value.value.elements.push(
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'productTypeRef', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'primaryKey',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U16),
-      },
-      {
-        name: 'indexes',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawIndexDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'constraints',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawConstraintDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'sequences',
-        algebraicType: __AlgebraicTypeValue.Array(
-          RawSequenceDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'schedule',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          RawScheduleDefV9.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'tableType',
-        algebraicType: TableType.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'tableAccess',
-        algebraicType: TableAccess.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_RawTableDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawTableDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawTableDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawTableDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawTableDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawTableDefV9;
+export default __t.object('RawTableDefV9', {
+  name: __t.string(),
+  productTypeRef: __t.u32(),
+  primaryKey: __t.array(__t.u16()),
+  indexes: __t.array(RawIndexDefV9),
+  constraints: __t.array(RawConstraintDefV9),
+  sequences: __t.array(RawSequenceDefV9),
+  schedule: __t.option(RawScheduleDefV9),
+  tableType: TableType,
+  tableAccess: TableAccess,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
index 5a589342fe4..d46d86dc660 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
@@ -4,67 +4,19 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawScopedTypeNameV9 } from './raw_scoped_type_name_v_9_type';
-// Mark import as potentially unused
-declare type __keep_RawScopedTypeNameV9 = RawScopedTypeNameV9;
+import RawScopedTypeNameV9 from './raw_scoped_type_name_v_9_type';
 
-export type RawTypeDefV9 = {
-  name: RawScopedTypeNameV9;
-  ty: number;
-  customOrdering: boolean;
-};
-let _cached_RawTypeDefV9_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawTypeDefV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawTypeDefV9_type_value) return _cached_RawTypeDefV9_type_value;
-    _cached_RawTypeDefV9_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_RawTypeDefV9_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: RawScopedTypeNameV9.getTypeScriptAlgebraicType(),
-      },
-      { name: 'ty', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'customOrdering', algebraicType: __AlgebraicTypeValue.Bool }
-    );
-    return _cached_RawTypeDefV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawTypeDefV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawTypeDefV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawTypeDefV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawTypeDefV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawTypeDefV9;
+export default __t.object('RawTypeDefV9', {
+  name: RawScopedTypeNameV9,
+  ty: __t.u32(),
+  customOrdering: __t.bool(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
index 5d0ff3e4cef..1956d936f0c 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
@@ -4,60 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type RawUniqueConstraintDataV9 = {
-  columns: number[];
-};
-let _cached_RawUniqueConstraintDataV9_type_value: __AlgebraicTypeType | null =
-  null;
-
-/**
- * An object for generated helper functions.
- */
-export const RawUniqueConstraintDataV9 = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RawUniqueConstraintDataV9_type_value)
-      return _cached_RawUniqueConstraintDataV9_type_value;
-    _cached_RawUniqueConstraintDataV9_type_value = __AlgebraicTypeValue.Product(
-      { elements: [] }
-    );
-    _cached_RawUniqueConstraintDataV9_type_value.value.elements.push({
-      name: 'columns',
-      algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U16),
-    });
-    return _cached_RawUniqueConstraintDataV9_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RawUniqueConstraintDataV9): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RawUniqueConstraintDataV9.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RawUniqueConstraintDataV9 {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RawUniqueConstraintDataV9.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default RawUniqueConstraintDataV9;
+export default __t.object('RawUniqueConstraintDataV9', {
+  columns: __t.array(__t.u16()),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
new file mode 100644
index 00000000000..b76633bdd31
--- /dev/null
+++ b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
@@ -0,0 +1,25 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+/* eslint-disable */
+/* tslint:disable */
+import {
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
+} from '../../index';
+import AlgebraicType from './algebraic_type_type';
+import ProductType from './product_type_type';
+
+export default __t.object('RawViewDefV9', {
+  name: __t.string(),
+  isPublic: __t.bool(),
+  isAnonymous: __t.bool(),
+  params: ProductType,
+  returnType: AlgebraicType,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
index 55f9af77507..f819e4e4bd9 100644
--- a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
@@ -4,67 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { ProductTypeElement } from './product_type_element_type';
-// Mark import as potentially unused
-declare type __keep_ProductTypeElement = ProductTypeElement;
+import ProductTypeElement from './product_type_element_type';
 
-export type ReducerDef = {
-  name: string;
-  args: ProductTypeElement[];
-};
-let _cached_ReducerDef_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ReducerDef = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ReducerDef_type_value) return _cached_ReducerDef_type_value;
-    _cached_ReducerDef_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ReducerDef_type_value.value.elements.push(
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'args',
-        algebraicType: __AlgebraicTypeValue.Array(
-          ProductTypeElement.getTypeScriptAlgebraicType()
-        ),
-      }
-    );
-    return _cached_ReducerDef_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ReducerDef): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ReducerDef.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ReducerDef {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ReducerDef.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ReducerDef;
+export default __t.object('ReducerDef', {
+  name: __t.string(),
+  args: __t.array(ProductTypeElement),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
index c8e1bd6313c..dab366e323d 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
@@ -4,61 +4,17 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { SumTypeVariant } from './sum_type_variant_type';
-// Mark import as potentially unused
-declare type __keep_SumTypeVariant = SumTypeVariant;
+import SumTypeVariant from './sum_type_variant_type';
 
-export type SumType = {
-  variants: SumTypeVariant[];
-};
-let _cached_SumType_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SumType = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SumType_type_value) return _cached_SumType_type_value;
-    _cached_SumType_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_SumType_type_value.value.elements.push({
-      name: 'variants',
-      algebraicType: __AlgebraicTypeValue.Array(
-        SumTypeVariant.getTypeScriptAlgebraicType()
-      ),
-    });
-    return _cached_SumType_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SumType): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SumType.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SumType {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SumType.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SumType;
+export default __t.object('SumType', {
+  variants: __t.array(SumTypeVariant),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
index 9f784c25997..ea683b23519 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
@@ -4,71 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { AlgebraicType } from './algebraic_type_type';
-// Mark import as potentially unused
-declare type __keep_AlgebraicType = AlgebraicType;
+import AlgebraicType from './algebraic_type_type';
 
-export type SumTypeVariant = {
-  name: string | undefined;
-  algebraicType: AlgebraicType;
-};
-let _cached_SumTypeVariant_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SumTypeVariant = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SumTypeVariant_type_value)
-      return _cached_SumTypeVariant_type_value;
-    _cached_SumTypeVariant_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SumTypeVariant_type_value.value.elements.push(
-      {
-        name: 'name',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      {
-        name: 'algebraicType',
-        algebraicType: AlgebraicType.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_SumTypeVariant_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SumTypeVariant): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SumTypeVariant.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SumTypeVariant {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SumTypeVariant.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SumTypeVariant;
+export default __t.object('SumTypeVariant', {
+  name: __t.option(__t.string()),
+  algebraicType: AlgebraicType,
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
index 884835677b3..d5c665aeb05 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
@@ -4,68 +4,19 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as TableAccessVariants from './table_access_variants';
 
 // The tagged union or sum type for the algebraic type `TableAccess`.
-export type TableAccess =
-  | TableAccessVariants.Public
-  | TableAccessVariants.Private;
-
-let _cached_TableAccess_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const TableAccess = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  Public: { tag: 'Public' } as const,
-  Private: { tag: 'Private' } as const,
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TableAccess_type_value) return _cached_TableAccess_type_value;
-    _cached_TableAccess_type_value = __AlgebraicTypeValue.Sum({ variants: [] });
-    _cached_TableAccess_type_value.value.variants.push(
-      {
-        name: 'Public',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'Private',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      }
-    );
-    return _cached_TableAccess_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TableAccess): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TableAccess.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TableAccess {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TableAccess.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TableAccess;
+export default __t.enum('TableAccess', {
+  public: __t.unit(),
+  private: __t.unit(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
index aee95dd15f1..b0964033c04 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
@@ -4,17 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type Public = { tag: 'Public' };
diff --git a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
index 78d3f6f7bb3..e3e09479fac 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
@@ -4,65 +4,18 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { RawTableDefV8 } from './raw_table_def_v_8_type';
-// Mark import as potentially unused
-declare type __keep_RawTableDefV8 = RawTableDefV8;
+import RawTableDefV8 from './raw_table_def_v_8_type';
 
-export type TableDesc = {
-  schema: RawTableDefV8;
-  data: number;
-};
-let _cached_TableDesc_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const TableDesc = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TableDesc_type_value) return _cached_TableDesc_type_value;
-    _cached_TableDesc_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_TableDesc_type_value.value.elements.push(
-      {
-        name: 'schema',
-        algebraicType: RawTableDefV8.getTypeScriptAlgebraicType(),
-      },
-      { name: 'data', algebraicType: __AlgebraicTypeValue.U32 }
-    );
-    return _cached_TableDesc_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TableDesc): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TableDesc.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TableDesc {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TableDesc.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TableDesc;
+export default __t.object('TableDesc', {
+  schema: RawTableDefV8,
+  data: __t.u32(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
index d2237db481b..782d6ecf0cd 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
@@ -4,66 +4,16 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as TableTypeVariants from './table_type_variants';
 
 // The tagged union or sum type for the algebraic type `TableType`.
-export type TableType = TableTypeVariants.System | TableTypeVariants.User;
-
-let _cached_TableType_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const TableType = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  System: { tag: 'System' } as const,
-  User: { tag: 'User' } as const,
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TableType_type_value) return _cached_TableType_type_value;
-    _cached_TableType_type_value = __AlgebraicTypeValue.Sum({ variants: [] });
-    _cached_TableType_type_value.value.variants.push(
-      {
-        name: 'System',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      },
-      {
-        name: 'User',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      }
-    );
-    return _cached_TableType_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TableType): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TableType.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TableType {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TableType.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TableType;
+export default __t.enum('TableType', { system: __t.unit(), user: __t.unit() });
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
index 8c80797c561..611eac9e858 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
@@ -4,17 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type System = { tag: 'System' };
diff --git a/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts b/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
index 6bb6000a51b..df8542b4bfd 100644
--- a/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
@@ -4,59 +4,17 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
 
-export type TypeAlias = {
-  name: string;
-  ty: number;
-};
-let _cached_TypeAlias_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const TypeAlias = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TypeAlias_type_value) return _cached_TypeAlias_type_value;
-    _cached_TypeAlias_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_TypeAlias_type_value.value.elements.push(
-      { name: 'name', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'ty', algebraicType: __AlgebraicTypeValue.U32 }
-    );
-    return _cached_TypeAlias_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TypeAlias): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TypeAlias.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TypeAlias {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TypeAlias.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TypeAlias;
+export default __t.object('TypeAlias', {
+  name: __t.string(),
+  ty: __t.u32(),
+});
diff --git a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
index 7eb7d338238..6b9a01317d5 100644
--- a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
@@ -4,63 +4,17 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ConnectionId as __ConnectionId,
-  Identity as __Identity,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type TableHandle as __TableHandle,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type Infer as __Infer,
+  type RemoteModule as __RemoteModule,
 } from '../../index';
-import { AlgebraicType } from './algebraic_type_type';
-// Mark import as potentially unused
-declare type __keep_AlgebraicType = AlgebraicType;
+import AlgebraicType from './algebraic_type_type';
 
-export type Typespace = {
-  types: AlgebraicType[];
-};
-let _cached_Typespace_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const Typespace = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Typespace_type_value) return _cached_Typespace_type_value;
-    _cached_Typespace_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_Typespace_type_value.value.elements.push({
-      name: 'types',
-      algebraicType: __AlgebraicTypeValue.Array(
-        AlgebraicType.getTypeScriptAlgebraicType()
-      ),
-    });
-    return _cached_Typespace_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Typespace): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Typespace.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Typespace {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Typespace.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Typespace;
+export default __t.object('Typespace', {
+  types: __t.array(AlgebraicType),
+});
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index c046b9a4067..4cd99ada03b 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -1,5 +1,4 @@
 import {
-  AlgebraicType,
   ConnectionId,
   Identity,
   ScheduleAt,
@@ -9,10 +8,11 @@ import {
   type AlgebraicTypeVariants,
   type ConnectionIdAlgebraicType,
   type IdentityAlgebraicType,
+  type OptionAlgebraicType,
   type TimeDurationAlgebraicType,
   type TimestampAlgebraicType,
 } from '..';
-import type { OptionAlgebraicType } from './option';
+import { AlgebraicType } from '../lib/algebraic_type';
 import { addType, MODULE_DEF } from '../lib/schema';
 import type { CoerceRow } from './table';
 import { set, type SetField } from './type_util';
@@ -113,6 +113,8 @@ type VariantsObj = Record<string, TypeBuilder<any, any>>;
 type UnitBuilder = ProductBuilder<{}>;
 type SimpleVariantsObj = Record<string, UnitBuilder>;
 
+type IsUnit<B> = B extends UnitBuilder ? true : false;
+
 /**
  * A type which converts the elements of ElementsObj to a TypeScript object type.
  * It works by `Infer`ing the types of the column builders which are the values of
@@ -121,8 +123,10 @@ type SimpleVariantsObj = Record<string, UnitBuilder>;
  * e.g. { A: I32TypeBuilder, B: StringBuilder } -> { tag: "A", value: number } | { tag: "B", value: string }
  */
 type EnumType<Variants extends VariantsObj> = {
-  [K in keyof Variants]: { tag: K; value: InferTypeOfTypeBuilder<Variants[K]> };
-}[keyof Variants];
+  [K in keyof Variants & string]:
+    (IsUnit<Variants[K]> extends true ? { tag: K }
+     : { tag: K; value: InferTypeOfTypeBuilder<Variants[K]> })
+}[keyof Variants & string];
 
 /**
  * Type which converts the elements of VariantsObj to a SumType variants array
@@ -1205,10 +1209,17 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
   }
 }
 
+// Value type produced for a given variant key + builder
+type EnumValue<K extends string, B extends TypeBuilder<any, any>> =
+  IsUnit<B> extends true
+    ? { tag: K }
+    : { tag: K; value: InferTypeOfTypeBuilder<B> };
+
 export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
   EnumType<Variants>,
   { tag: 'Sum'; value: { variants: VariantsArrayFromVariantsObj<Variants> } }
 > {
+  protected readonly _variants: Variants;
   constructor(variants: Variants, name?: string) {
     function variantsArrayFromVariantsObj<Variants extends VariantsObj>(
       variants: Variants
@@ -1226,7 +1237,26 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
         })
       )
     );
+    this._variants = variants;
+  }
+
+  /**
+   * Create a value of this sum type.
+   * - Unit variants: create('bar')
+   * - Payload variants: create('foo', value)
+   */
+  create<K extends keyof Variants & string>(
+    ...args: IsUnit<Variants[K]> extends true
+      ? [tag: K]                                 // unit variant: only the tag
+      : [tag: K, value: InferTypeOfTypeBuilder<Variants[K]>] // payload variant: tag + value
+  ): EnumValue<K, Variants[K]> {
+    const [tag, value] = args as [K, unknown];
+    // just return the shape, types guarantee correctness
+    return (value === undefined
+      ? { tag }
+      : { tag, value }) as EnumValue<K, Variants[K]>;
   }
+
   default(
     value: EnumType<Variants>
   ): SumColumnBuilder<Variants, SetField<DefaultMetadata, 'defaultValue', any>> {
@@ -2295,11 +2325,11 @@ export class OptionColumnBuilder<
   >
   extends ColumnBuilder<
     InferTypeOfTypeBuilder<Value> | undefined,
-    OptionAlgebraicType,
+    OptionAlgebraicTypeType,
     M
   >
   implements
-    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType>
+    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicTypeType>
 {
   default(
     value: InferTypeOfTypeBuilder<Value> | undefined
diff --git a/crates/bindings-typescript/src/lib/type_util.ts b/crates/bindings-typescript/src/lib/type_util.ts
index 04a33bfd528..1a5e7d12a29 100644
--- a/crates/bindings-typescript/src/lib/type_util.ts
+++ b/crates/bindings-typescript/src/lib/type_util.ts
@@ -10,13 +10,15 @@ type Builtin =
   | Promise<any>;
 
 // Deep
-export type PrettifyDeep<T> =
+export type _PrettifyDeep<T> =
   T extends Builtin ? T :
   T extends readonly [...infer _] ? { [K in keyof T]: PrettifyDeep<T[K]> } :
   T extends ReadonlyArray<infer U> ? ReadonlyArray<PrettifyDeep<U>> :
   T extends object ? Prettify<{ [K in keyof T]: PrettifyDeep<T[K]> }> :
   T;
 
+export type PrettifyDeep<T> = T extends unknown ? _PrettifyDeep<T> : never;
+
 /**
  * Helper function to sets a field in an object
  */
diff --git a/crates/bindings-typescript/tests/serde.test.ts b/crates/bindings-typescript/tests/serde.test.ts
index cb9759c1b69..21cb3d639cb 100644
--- a/crates/bindings-typescript/tests/serde.test.ts
+++ b/crates/bindings-typescript/tests/serde.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { AlgebraicType, BinaryReader, BinaryWriter } from 'spacetimedb';
+import { AlgebraicType, BinaryReader, BinaryWriter, ConnectionId, Identity, ScheduleAt } from 'spacetimedb';
 
 describe('it correctly serializes and deserializes algebraic values', () => {
   test('when it serializes and deserializes with a product type', () => {
@@ -52,7 +52,7 @@ describe('it correctly serializes and deserializes algebraic values', () => {
       __identity__: BigInt(1234567890123456789012345678901234567890n),
     };
 
-    const algebraic_type = AlgebraicType.createIdentityType();
+    const algebraic_type = Identity.getAlgebraicType();
     const binaryWriter = new BinaryWriter(1024);
     AlgebraicType.serializeValue(binaryWriter, algebraic_type, value);
 
@@ -82,7 +82,7 @@ describe('it correctly serializes and deserializes algebraic values', () => {
       },
     };
 
-    const algebraic_type = AlgebraicType.createScheduleAtType();
+    const algebraic_type = ScheduleAt.getAlgebraicType();
     const binaryWriter = new BinaryWriter(1024);
     AlgebraicType.serializeValue(binaryWriter, algebraic_type, value);
 
@@ -107,7 +107,7 @@ describe('it correctly serializes and deserializes algebraic values', () => {
       },
     };
 
-    const algebraic_type = AlgebraicType.createScheduleAtType();
+    const algebraic_type = ScheduleAt.getAlgebraicType();
     const binaryWriter = new BinaryWriter(1024);
     AlgebraicType.serializeValue(binaryWriter, algebraic_type, value);
 
@@ -130,7 +130,7 @@ describe('it correctly serializes and deserializes algebraic values', () => {
       __connection_id__: U128_MAX,
     };
 
-    const algebraic_type = AlgebraicType.createConnectionIdType();
+    const algebraic_type = ConnectionId.getAlgebraicType();
     const binaryWriter = new BinaryWriter(1024);
     AlgebraicType.serializeValue(binaryWriter, algebraic_type, value);
 
diff --git a/crates/codegen/examples/regen-typescript-moduledef.rs b/crates/codegen/examples/regen-typescript-moduledef.rs
index b47162d15f3..64ceee6e934 100644
--- a/crates/codegen/examples/regen-typescript-moduledef.rs
+++ b/crates/codegen/examples/regen-typescript-moduledef.rs
@@ -58,6 +58,7 @@ fn main() -> anyhow::Result<()> {
             );
             let code = regex_replace!(&code, r"DbConnectionBuilder as __DbConnectionBuilder,", r"");
             let code = regex_replace!(&code, r"DbConnectionImpl as __DbConnectionImpl,", r"");
+            let code = regex_replace!(&code, r"DbConnectionConfig as __DbConnectionConfig,", r"");
             let code = regex_replace!(&code, r"SubscriptionBuilderImpl as __SubscriptionBuilderImpl,", r"");
             let code = regex_replace!(&code, r"TableCache as __TableCache,", r"");
             let code = regex_replace!(&code, r"ClientCache as __ClientCache,", r"");
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index f7d6b5f374a..b1f5e6db48a 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -364,6 +364,7 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "type Event as __Event",
         "schema as __schema",
         "table as __table",
+        "type Infer as __Infer",
         "reducers as __reducers",
         "reducerSchema as __reducerSchema",
         "DbConnectionConfig as __DbConnectionConfig",
@@ -569,18 +570,18 @@ fn write_sum_variant_type(module: &ModuleDef, out: &mut Indenter, ident: &Identi
 
     // If the contained type is not the unit type, write the tag and the value.
     // ```
-    // { tag: "Bar", value: BarType }
+    // { tag: "Bar", value: Infer<typeof BarType> }
     // { tag: "Bar", value: number }
     // { tag: "Bar", value: string }
     // ```
     // Note you could alternatively do:
     // ```
-    // { tag: "Bar" } & BarType
+    // { tag: "Bar" } & Infer<typeof BarType>
     // ```
     // for non-primitive types but that doesn't extend to primitives.
     // Another alternative would be to name the value field the same as the tag field, but lowercased
     // ```
-    // { tag: "Bar", bar: BarType }
+    // { tag: "Bar", bar: Infer<typeof BarType> }
     // { tag: "Bar", bar: number }
     // { tag: "Bar", bar: string }
     // ```
@@ -697,13 +698,13 @@ pub fn write_type<W: Write>(
     match ty {
         AlgebraicTypeUse::Unit => write!(out, "void")?,
         AlgebraicTypeUse::Never => write!(out, "never")?,
-        AlgebraicTypeUse::Identity => write!(out, "__Identity")?,
-        AlgebraicTypeUse::ConnectionId => write!(out, "__ConnectionId")?,
-        AlgebraicTypeUse::Timestamp => write!(out, "__Timestamp")?,
-        AlgebraicTypeUse::TimeDuration => write!(out, "__TimeDuration")?,
+        AlgebraicTypeUse::Identity => write!(out, "__Infer<typeof __t.identity()>")?,
+        AlgebraicTypeUse::ConnectionId => write!(out, "__Infer<typeof __t.connectionId()>")?,
+        AlgebraicTypeUse::Timestamp => write!(out, "__Infer<typeof __t.timestamp()>")?,
+        AlgebraicTypeUse::TimeDuration => write!(out, "__Infer<typeof __t.timeDuration()>")?,
         AlgebraicTypeUse::ScheduleAt => write!(
             out,
-            "{{ tag: \"Interval\", value: __TimeDuration }} | {{ tag: \"Time\", value: __Timestamp }}"
+            "{{ tag: \"Interval\", value: __Infer<typeof __t.timeDuration()> }} | {{ tag: \"Time\", value: __Infer<typeof __t.timestamp()> }}"
         )?,
         AlgebraicTypeUse::Option(inner_ty) => {
             write_type(module, out, inner_ty, ref_prefix, ref_suffix)?;
@@ -743,6 +744,7 @@ pub fn write_type<W: Write>(
             write!(out, "[]")?;
         }
         AlgebraicTypeUse::Ref(r) => {
+            write!(out, "__Infer<typeof ")?;;
             if let Some(prefix) = ref_prefix {
                 write!(out, "{prefix}")?;
             }
@@ -750,6 +752,7 @@ pub fn write_type<W: Write>(
             if let Some(suffix) = ref_suffix {
                 write!(out, "{suffix}")?;
             }
+            write!(out, ">")?;
         }
     }
     Ok(())

From 55fba2e01d9280b78031e5e74d19a5f644b6cd48 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Wed, 5 Nov 2025 18:10:31 -0500
Subject: [PATCH 10/23] Sweet jesus it builds

---
 .../src/lib/algebraic_type.ts                 | 696 ++++++++---------
 .../src/lib/algebraic_type_variants.ts        |  22 +
 .../src/lib/autogen/algebraic_type_type.ts    |  49 +-
 .../lib/autogen/algebraic_type_variants.ts    |   2 +
 .../src/lib/autogen/index_type_type.ts        |   9 +-
 .../src/lib/autogen/index_type_variants.ts    |   2 +
 .../src/lib/autogen/lifecycle_type.ts         |  12 +-
 .../src/lib/autogen/lifecycle_variants.ts     |   2 +
 .../lib/autogen/misc_module_export_type.ts    |   8 +-
 .../autogen/misc_module_export_variants.ts    |   2 +
 .../lib/autogen/product_type_element_type.ts  |   4 +-
 .../src/lib/autogen/product_type_type.ts      |   4 +-
 .../lib/autogen/raw_column_def_v_8_type.ts    |   4 +-
 .../raw_column_default_value_v_9_type.ts      |   2 +
 .../autogen/raw_constraint_data_v_9_type.ts   |   8 +-
 .../raw_constraint_data_v_9_variants.ts       |   2 +
 .../autogen/raw_constraint_def_v_8_type.ts    |   2 +
 .../autogen/raw_constraint_def_v_9_type.ts    |   4 +-
 .../lib/autogen/raw_index_algorithm_type.ts   |  12 +-
 .../autogen/raw_index_algorithm_variants.ts   |   2 +
 .../src/lib/autogen/raw_index_def_v_8_type.ts |   4 +-
 .../src/lib/autogen/raw_index_def_v_9_type.ts |   4 +-
 .../raw_misc_module_export_v_9_type.ts        |  12 +-
 .../raw_misc_module_export_v_9_variants.ts    |   2 +
 .../src/lib/autogen/raw_module_def_type.ts    |  10 +-
 .../lib/autogen/raw_module_def_v_8_type.ts    |  10 +-
 .../lib/autogen/raw_module_def_v_9_type.ts    |  14 +-
 .../lib/autogen/raw_module_def_variants.ts    |   2 +
 .../lib/autogen/raw_procedure_def_v_9_type.ts |   6 +-
 .../lib/autogen/raw_reducer_def_v_9_type.ts   |   6 +-
 .../raw_row_level_security_def_v_9_type.ts    |   2 +
 .../lib/autogen/raw_schedule_def_v_9_type.ts  |   2 +
 .../autogen/raw_scoped_type_name_v_9_type.ts  |   2 +
 .../lib/autogen/raw_sequence_def_v_8_type.ts  |   2 +
 .../lib/autogen/raw_sequence_def_v_9_type.ts  |   2 +
 .../src/lib/autogen/raw_table_def_v_8_type.ts |  10 +-
 .../src/lib/autogen/raw_table_def_v_9_type.ts |  14 +-
 .../src/lib/autogen/raw_type_def_v_9_type.ts  |   4 +-
 .../raw_unique_constraint_data_v_9_type.ts    |   2 +
 .../src/lib/autogen/raw_view_def_v_9_type.ts  |   6 +-
 .../src/lib/autogen/reducer_def_type.ts       |   4 +-
 .../src/lib/autogen/sum_type_type.ts          |   4 +-
 .../src/lib/autogen/sum_type_variant_type.ts  |   4 +-
 .../src/lib/autogen/table_access_type.ts      |  10 +-
 .../src/lib/autogen/table_access_variants.ts  |   2 +
 .../src/lib/autogen/table_desc_type.ts        |   4 +-
 .../src/lib/autogen/table_type_type.ts        |   9 +-
 .../src/lib/autogen/table_type_variants.ts    |   2 +
 .../src/lib/autogen/type_alias_type.ts        |   2 +
 .../src/lib/autogen/typespace_type.ts         |   4 +-
 .../src/lib/reducer_schema.ts                 |   2 +-
 .../bindings-typescript/src/lib/reducers.ts   |   9 +-
 crates/bindings-typescript/src/lib/schema.ts  |  11 +-
 crates/bindings-typescript/src/lib/table.ts   |  19 +-
 .../src/lib/table_schema.ts                   |   4 +-
 .../src/lib/type_builders.ts                  | 734 +++++++++---------
 .../src/sdk/db_connection_impl.ts             |   5 +-
 crates/codegen/src/typescript.rs              |  59 +-
 58 files changed, 1021 insertions(+), 831 deletions(-)
 create mode 100644 crates/bindings-typescript/src/lib/algebraic_type_variants.ts

diff --git a/crates/bindings-typescript/src/lib/algebraic_type.ts b/crates/bindings-typescript/src/lib/algebraic_type.ts
index 34b5983b613..cfbae70a6ff 100644
--- a/crates/bindings-typescript/src/lib/algebraic_type.ts
+++ b/crates/bindings-typescript/src/lib/algebraic_type.ts
@@ -4,9 +4,16 @@ import { ConnectionId } from './connection_id';
 import type BinaryReader from './binary_reader';
 import BinaryWriter from './binary_writer';
 import { Identity } from './identity';
-import AlgebraicType from './autogen/algebraic_type_type';
-import Typespace from './autogen/typespace_type';
-import { SumBuilder, type Infer } from './type_builders';
+import * as AlgebraicTypeVariants from './algebraic_type_variants';
+import type { MaybeLazy } from './type_builders';
+
+type TypespaceType = {
+  types: AlgebraicTypeType[];
+};
+
+export type ProductTypeType = {
+  elements: ProductTypeElement[];
+};
 
 /**
  * A factor / element of a product type.
@@ -16,7 +23,14 @@ import { SumBuilder, type Infer } from './type_builders';
  * NOTE: Each element has an implicit element tag based on its order.
  * Uniquely identifies an element similarly to protobuf tags.
  */
-export * from './autogen/product_type_element_type';
+export type ProductTypeElement = {
+  name: string | undefined;
+  algebraicType: AlgebraicTypeType;
+};
+
+export type SumTypeType = {
+  variants: SumTypeVariant[];
+};
 
 /**
  * A variant of a sum type.
@@ -24,36 +38,68 @@ export * from './autogen/product_type_element_type';
  * NOTE: Each element has an implicit element tag based on its order.
  * Uniquely identifies an element similarly to protobuf tags.
  */
-export * from './autogen/sum_type_variant_type';
+export type SumTypeVariant = {
+  name: string | undefined;
+  algebraicType: AlgebraicTypeType;
+};
 
-/**
- * The variant types of the Algebraic Type tagged union.
- */
-export type * as AlgebraicTypeVariants from './autogen/algebraic_type_variants';
+export type AlgebraicTypeType =
+  | AlgebraicTypeVariants.Ref
+  | AlgebraicTypeVariants.Sum
+  | AlgebraicTypeVariants.Product
+  | AlgebraicTypeVariants.Array
+  | AlgebraicTypeVariants.String
+  | AlgebraicTypeVariants.Bool
+  | AlgebraicTypeVariants.I8
+  | AlgebraicTypeVariants.U8
+  | AlgebraicTypeVariants.I16
+  | AlgebraicTypeVariants.U16
+  | AlgebraicTypeVariants.I32
+  | AlgebraicTypeVariants.U32
+  | AlgebraicTypeVariants.I64
+  | AlgebraicTypeVariants.U64
+  | AlgebraicTypeVariants.I128
+  | AlgebraicTypeVariants.U128
+  | AlgebraicTypeVariants.I256
+  | AlgebraicTypeVariants.U256
+  | AlgebraicTypeVariants.F32
+  | AlgebraicTypeVariants.F64;
 
-export { AlgebraicType };
+export type AlgebraicType = AlgebraicTypeType;
 
 /**
- * The SpacetimeDB Algebraic Type System (SATS) is a structural type system in
- * which a nominal type system can be constructed.
- *
- * The type system unifies the concepts sum types, product types, and built-in
- * primitive types into a single type system.
+ * The variant types of the Algebraic Type tagged union.
  */
-export type AlgebraicTypeType = Infer<typeof AlgebraicType>;
-
-type TypespaceType = Infer<typeof Typespace>;
-
-export class AlgebraicTypeBuilder
-  extends SumBuilder<Infer<typeof AlgebraicType>> {
-
-  private constructor() {
-    // reuse the exact variants from the generated instance
-    super((AlgebraicType as any)._variants, 'AlgebraicType');
-  }
-
-  static readonly instance = new AlgebraicTypeBuilder();
+export { AlgebraicTypeVariants }
 
+// A value with helper functions to construct the type.
+export const AlgebraicType = {
+  Ref: (value: number): AlgebraicTypeVariants.Ref => ({ tag: 'Ref', value }),
+  Sum: <T extends MaybeLazy<SumTypeType>>(value: T): { tag: 'Sum'; value: T } => ({ tag: 'Sum', value }),
+  Product: <T extends MaybeLazy<ProductTypeType>>(value: T): { tag: 'Product'; value: T } => ({
+    tag: 'Product',
+    value,
+  }),
+  Array: <T extends MaybeLazy<AlgebraicTypeType>[]>(value: T): { tag: 'Array'; value: T } => ({
+    tag: 'Array',
+    value,
+  }),
+  String: { tag: 'String' } as const,
+  Bool: { tag: 'Bool' } as const,
+  I8: { tag: 'I8' } as const,
+  U8: { tag: 'U8' } as const,
+  I16: { tag: 'I16' } as const,
+  U16: { tag: 'U16' } as const,
+  I32: { tag: 'I32' } as const,
+  U32: { tag: 'U32' } as const,
+  I64: { tag: 'I64' } as const,
+  U64: { tag: 'U64' } as const,
+  I128: { tag: 'I128' } as const,
+  U128: { tag: 'U128' } as const,
+  I256: { tag: 'I256' } as const,
+  U256: { tag: 'U256' } as const,
+  F32: { tag: 'F32' } as const,
+  F64: { tag: 'F64' } as const,
   serializeValue(
     writer: BinaryWriter,
     ty: AlgebraicTypeType,
@@ -132,138 +178,111 @@ export class AlgebraicTypeBuilder
         writer.writeString(value);
         break;
     }
-  }
-
-  // deserializeValue: function (
-  //   reader: BinaryReader,
-  //   ty: AlgebraicTypeType,
-  //   typespace?: TypespaceType
-  // ): any {
-  //   if (ty.tag === 'Ref') {
-  //     if (!typespace)
-  //       throw new Error('cannot deserialize refs without a typespace');
-  //     while (ty.tag === 'Ref') ty = typespace.types[ty.value];
-  //   }
-  //   switch (ty.tag) {
-  //     case 'Product':
-  //       return ProductType.deserializeValue(reader, ty.value, typespace);
-  //     case 'Sum':
-  //       return SumType.deserializeValue(reader, ty.value, typespace);
-  //     case 'Array':
-  //       if (ty.value.tag === 'U8') {
-  //         return reader.readUInt8Array();
-  //       } else {
-  //         const elemType = ty.value;
-  //         const length = reader.readU32();
-  //         const result: any[] = [];
-  //         for (let i = 0; i < length; i++) {
-  //           result.push(
-  //             AlgebraicType.deserializeValue(reader, elemType, typespace)
-  //           );
-  //         }
-  //         return result;
-  //       }
-  //     case 'Bool':
-  //       return reader.readBool();
-  //     case 'I8':
-  //       return reader.readI8();
-  //     case 'U8':
-  //       return reader.readU8();
-  //     case 'I16':
-  //       return reader.readI16();
-  //     case 'U16':
-  //       return reader.readU16();
-  //     case 'I32':
-  //       return reader.readI32();
-  //     case 'U32':
-  //       return reader.readU32();
-  //     case 'I64':
-  //       return reader.readI64();
-  //     case 'U64':
-  //       return reader.readU64();
-  //     case 'I128':
-  //       return reader.readI128();
-  //     case 'U128':
-  //       return reader.readU128();
-  //     case 'I256':
-  //       return reader.readI256();
-  //     case 'U256':
-  //       return reader.readU256();
-  //     case 'F32':
-  //       return reader.readF32();
-  //     case 'F64':
-  //       return reader.readF64();
-  //     case 'String':
-  //       return reader.readString();
-  //   }
-  // },
-  // /**
-  //  * Convert a value of the algebraic type into something that can be used as a key in a map.
-  //  * There are no guarantees about being able to order it.
-  //  * This is only guaranteed to be comparable to other values of the same type.
-  //  * @param value A value of the algebraic type
-  //  * @returns Something that can be used as a key in a map.
-  //  */
-  // intoMapKey: function (
-  //   ty: AlgebraicTypeType,
-  //   value: any
-  // ): ComparablePrimitive {
-  //   switch (ty.tag) {
-  //     case 'U8':
-  //     case 'U16':
-  //     case 'U32':
-  //     case 'U64':
-  //     case 'U128':
-  //     case 'U256':
-  //     case 'I8':
-  //     case 'I16':
-  //     case 'I32':
-  //     case 'I64':
-  //     case 'I128':
-  //     case 'I256':
-  //     case 'F32':
-  //     case 'F64':
-  //     case 'String':
-  //     case 'Bool':
-  //       return value;
-  //     case 'Product':
-  //       return ProductType.intoMapKey(ty.value, value);
-  //     default: {
-  //       // The fallback is to serialize and base64 encode the bytes.
-  //       const writer = new BinaryWriter(10);
-  //       AlgebraicType.serializeValue(writer, ty, value);
-  //       return writer.toBase64();
-  //     }
-  //   }
-  // },
+  },
+  deserializeValue: function (
+    reader: BinaryReader,
+    ty: AlgebraicTypeType,
+    typespace?: TypespaceType
+  ): any {
+    if (ty.tag === 'Ref') {
+      if (!typespace)
+        throw new Error('cannot deserialize refs without a typespace');
+      while (ty.tag === 'Ref') ty = typespace.types[ty.value];
+    }
+    switch (ty.tag) {
+      case 'Product':
+        return ProductType.deserializeValue(reader, ty.value, typespace);
+      case 'Sum':
+        return SumType.deserializeValue(reader, ty.value, typespace);
+      case 'Array':
+        if (ty.value.tag === 'U8') {
+          return reader.readUInt8Array();
+        } else {
+          const elemType = ty.value;
+          const length = reader.readU32();
+          const result: any[] = [];
+          for (let i = 0; i < length; i++) {
+            result.push(
+              AlgebraicType.deserializeValue(reader, elemType, typespace)
+            );
+          }
+          return result;
+        }
+      case 'Bool':
+        return reader.readBool();
+      case 'I8':
+        return reader.readI8();
+      case 'U8':
+        return reader.readU8();
+      case 'I16':
+        return reader.readI16();
+      case 'U16':
+        return reader.readU16();
+      case 'I32':
+        return reader.readI32();
+      case 'U32':
+        return reader.readU32();
+      case 'I64':
+        return reader.readI64();
+      case 'U64':
+        return reader.readU64();
+      case 'I128':
+        return reader.readI128();
+      case 'U128':
+        return reader.readU128();
+      case 'I256':
+        return reader.readI256();
+      case 'U256':
+        return reader.readU256();
+      case 'F32':
+        return reader.readF32();
+      case 'F64':
+        return reader.readF64();
+      case 'String':
+        return reader.readString();
+    }
+  },
+  /**
+   * Convert a value of the algebraic type into something that can be used as a key in a map.
+   * There are no guarantees about being able to order it.
+   * This is only guaranteed to be comparable to other values of the same type.
+   * @param value A value of the algebraic type
+   * @returns Something that can be used as a key in a map.
+   */
+  intoMapKey: function (
+    ty: AlgebraicTypeType,
+    value: any
+  ): ComparablePrimitive {
+    switch (ty.tag) {
+      case 'U8':
+      case 'U16':
+      case 'U32':
+      case 'U64':
+      case 'U128':
+      case 'U256':
+      case 'I8':
+      case 'I16':
+      case 'I32':
+      case 'I64':
+      case 'I128':
+      case 'I256':
+      case 'F32':
+      case 'F64':
+      case 'String':
+      case 'Bool':
+        return value;
+      case 'Product':
+        return ProductType.intoMapKey(ty.value, value);
+      default: {
+        // The fallback is to serialize and base64 encode the bytes.
+        const writer = new BinaryWriter(10);
+        AlgebraicType.serializeValue(writer, ty, value);
+        return writer.toBase64();
+      }
+    }
+  },
 }
 
-/**
-//  * Algebraic Type utilities.
-//  */
-// export const Foo: {
-//   serializeValue(
-//     writer: BinaryWriter,
-//     ty: AlgebraicTypeType,
-//     value: any,
-//     typespace?: TypespaceType
-//   ): void;
-//   deserializeValue(
-//     reader: BinaryReader,
-//     ty: AlgebraicTypeType,
-//     typespace?: TypespaceType
-//   ): any;
-//   /**
-//    * Convert a value of the algebraic type into something that can be used as a key in a map.
-//    * There are no guarantees about being able to order it.
-//    * This is only guaranteed to be comparable to other values of the same type.
-//    * @param value A value of the algebraic type
-//    * @returns Something that can be used as a key in a map.
-//    */
-//   intoMapKey(ty: AlgebraicTypeType, value: any): ComparablePrimitive;
-// } = {
-// };
-
 /**
  * A structural product type  of the factors given by `elements`.
  *
@@ -289,208 +308,181 @@ export class AlgebraicTypeBuilder
  *
  * [structural]: https://en.wikipedia.org/wiki/Structural_type_system
  */
-// export type ProductType = ProductTypeType;
+export type ProductType = ProductTypeType;
 
-// export const ProductType: {
-//   serializeValue(
-//     writer: BinaryWriter,
-//     ty: ProductTypeType,
-//     value: any,
-//     typespace?: TypespaceType
-//   ): void;
-//   deserializeValue(
-//     reader: BinaryReader,
-//     ty: ProductTypeType,
-//     typespace?: TypespaceType
-//   ): any;
-//   intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive;
-// } = {
-//   ...ProductTypeValue,
-//   serializeValue(
-//     writer: BinaryWriter,
-//     ty: ProductTypeType,
-//     value: any,
-//     typespace?: TypespaceType
-//   ): void {
-//     for (const element of ty.elements) {
-//       AlgebraicType.serializeValue(
-//         writer,
-//         element.algebraicType,
-//         value[element.name!],
-//         typespace
-//       );
-//     }
-//   },
-//   deserializeValue(
-//     reader: BinaryReader,
-//     ty: ProductTypeType,
-//     typespace?: TypespaceType
-//   ): any {
-//     const result: { [key: string]: any } = {};
-//     if (ty.elements.length === 1) {
-//       if (ty.elements[0].name === '__time_duration_micros__') {
-//         return new TimeDuration(reader.readI64());
-//       }
+export const ProductType = {
+  serializeValue(
+    writer: BinaryWriter,
+    ty: ProductTypeType,
+    value: any,
+    typespace?: TypespaceType
+  ): void {
+    for (const element of ty.elements) {
+      AlgebraicType.serializeValue(
+        writer,
+        element.algebraicType,
+        value[element.name!],
+        typespace
+      );
+    }
+  },
+  deserializeValue(
+    reader: BinaryReader,
+    ty: ProductTypeType,
+    typespace?: TypespaceType
+  ): any {
+    const result: { [key: string]: any } = {};
+    if (ty.elements.length === 1) {
+      if (ty.elements[0].name === '__time_duration_micros__') {
+        return new TimeDuration(reader.readI64());
+      }
 
-//       if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
-//         return new Timestamp(reader.readI64());
-//       }
+      if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
+        return new Timestamp(reader.readI64());
+      }
 
-//       if (ty.elements[0].name === '__identity__') {
-//         return new Identity(reader.readU256());
-//       }
+      if (ty.elements[0].name === '__identity__') {
+        return new Identity(reader.readU256());
+      }
 
-//       if (ty.elements[0].name === '__connection_id__') {
-//         return new ConnectionId(reader.readU128());
-//       }
-//     }
+      if (ty.elements[0].name === '__connection_id__') {
+        return new ConnectionId(reader.readU128());
+      }
+    }
 
-//     for (const element of ty.elements) {
-//       result[element.name!] = AlgebraicType.deserializeValue(
-//         reader,
-//         element.algebraicType,
-//         typespace
-//       );
-//     }
-//     return result;
-//   },
-//   intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive {
-//     if (ty.elements.length === 1) {
-//       if (ty.elements[0].name === '__time_duration_micros__') {
-//         return (value as TimeDuration).__time_duration_micros__;
-//       }
+    for (const element of ty.elements) {
+      result[element.name!] = AlgebraicType.deserializeValue(
+        reader,
+        element.algebraicType,
+        typespace
+      );
+    }
+    return result;
+  },
+  intoMapKey(ty: ProductTypeType, value: any): ComparablePrimitive {
+    if (ty.elements.length === 1) {
+      if (ty.elements[0].name === '__time_duration_micros__') {
+        return (value as TimeDuration).__time_duration_micros__;
+      }
 
-//       if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
-//         return (value as Timestamp).__timestamp_micros_since_unix_epoch__;
-//       }
+      if (ty.elements[0].name === '__timestamp_micros_since_unix_epoch__') {
+        return (value as Timestamp).__timestamp_micros_since_unix_epoch__;
+      }
 
-//       if (ty.elements[0].name === '__identity__') {
-//         return (value as Identity).__identity__;
-//       }
+      if (ty.elements[0].name === '__identity__') {
+        return (value as Identity).__identity__;
+      }
 
-//       if (ty.elements[0].name === '__connection_id__') {
-//         return (value as ConnectionId).__connection_id__;
-//       }
-//     }
-//     // The fallback is to serialize and base64 encode the bytes.
-//     const writer = new BinaryWriter(10);
-//     AlgebraicType.serializeValue(writer, AlgebraicType.Product(ty), value);
-//     return writer.toBase64();
-//   },
-// };
+      if (ty.elements[0].name === '__connection_id__') {
+        return (value as ConnectionId).__connection_id__;
+      }
+    }
+    // The fallback is to serialize and base64 encode the bytes.
+    const writer = new BinaryWriter(10);
+    AlgebraicType.serializeValue(writer, AlgebraicType.Product(ty), value);
+    return writer.toBase64();
+  },
+};
 
-// export type SumTypeType = Infer<typeof SumType>;
+export type SumType = SumTypeType;
 
-// /**
-//  * Unlike most languages, sums in SATS are *[structural]* and not nominal.
-//  * When checking whether two nominal types are the same,
-//  * their names and/or declaration sites (e.g., module / namespace) are considered.
-//  * Meanwhile, a structural type system would only check the structure of the type itself,
-//  * e.g., the names of its variants and their inner data types in the case of a sum.
-//  *
-//  * This is also known as a discriminated union (implementation) or disjoint union.
-//  * Another name is [coproduct (category theory)](https://ncatlab.org/nlab/show/coproduct).
-//  *
-//  * These structures are known as sum types because the number of possible values a sum
-//  * ```ignore
-//  * { N_0(T_0), N_1(T_1), ..., N_n(T_n) }
-//  * ```
-//  * is:
-//  * ```ignore
-//  * Σ (i ∈ 0..n). values(T_i)
-//  * ```
-//  * so for example, `values({ A(U64), B(Bool) }) = values(U64) + values(Bool)`.
-//  *
-//  * See also: https://ncatlab.org/nlab/show/sum+type.
-//  *
-//  * [structural]: https://en.wikipedia.org/wiki/Structural_type_system
-//  */
-// export const SumType: {
-//   serializeValue(
-//     writer: BinaryWriter,
-//     ty: SumTypeType,
-//     value: any,
-//     typespace?: TypespaceType
-//   ): void;
-//   deserializeValue(
-//     reader: BinaryReader,
-//     ty: SumTypeType,
-//     typespace?: TypespaceType
-//   ): any;
-// } = {
-//   ...SumTypeValue,
-//   serializeValue: function (
-//     writer: BinaryWriter,
-//     ty: SumTypeType,
-//     value: any,
-//     typespace?: TypespaceType
-//   ): void {
-//     if (
-//       ty.variants.length == 2 &&
-//       ty.variants[0].name === 'some' &&
-//       ty.variants[1].name === 'none'
-//     ) {
-//       if (value !== null && value !== undefined) {
-//         writer.writeByte(0);
-//         AlgebraicType.serializeValue(
-//           writer,
-//           ty.variants[0].algebraicType,
-//           value,
-//           typespace
-//         );
-//       } else {
-//         writer.writeByte(1);
-//       }
-//     } else {
-//       const variant = value['tag'];
-//       const index = ty.variants.findIndex(v => v.name === variant);
-//       if (index < 0) {
-//         throw `Can't serialize a sum type, couldn't find ${value.tag} tag`;
-//       }
-//       writer.writeU8(index);
-//       AlgebraicType.serializeValue(
-//         writer,
-//         ty.variants[index].algebraicType,
-//         value['value'],
-//         typespace
-//       );
-//     }
-//   },
-//   deserializeValue: function (
-//     reader: BinaryReader,
-//     ty: SumTypeType,
-//     typespace?: TypespaceType
-//   ): any {
-//     const tag = reader.readU8();
-//     // In TypeScript we handle Option values as a special case
-//     // we don't represent the some and none variants, but instead
-//     // we represent the value directly.
-//     if (
-//       ty.variants.length == 2 &&
-//       ty.variants[0].name === 'some' &&
-//       ty.variants[1].name === 'none'
-//     ) {
-//       if (tag === 0) {
-//         return AlgebraicType.deserializeValue(
-//           reader,
-//           ty.variants[0].algebraicType,
-//           typespace
-//         );
-//       } else if (tag === 1) {
-//         return undefined;
-//       } else {
-//         throw `Can't deserialize an option type, couldn't find ${tag} tag`;
-//       }
-//     } else {
-//       const variant = ty.variants[tag];
-//       const value = AlgebraicType.deserializeValue(
-//         reader,
-//         variant.algebraicType,
-//         typespace
-//       );
-//       return { tag: variant.name, value };
-//     }
-//   },
-// };
+/**
+ * Unlike most languages, sums in SATS are *[structural]* and not nominal.
+ * When checking whether two nominal types are the same,
+ * their names and/or declaration sites (e.g., module / namespace) are considered.
+ * Meanwhile, a structural type system would only check the structure of the type itself,
+ * e.g., the names of its variants and their inner data types in the case of a sum.
+ *
+ * This is also known as a discriminated union (implementation) or disjoint union.
+ * Another name is [coproduct (category theory)](https://ncatlab.org/nlab/show/coproduct).
+ *
+ * These structures are known as sum types because the number of possible values a sum
+ * ```ignore
+ * { N_0(T_0), N_1(T_1), ..., N_n(T_n) }
+ * ```
+ * is:
+ * ```ignore
+ * Σ (i ∈ 0..n). values(T_i)
+ * ```
+ * so for example, `values({ A(U64), B(Bool) }) = values(U64) + values(Bool)`.
+ *
+ * See also: https://ncatlab.org/nlab/show/sum+type.
+ *
+ * [structural]: https://en.wikipedia.org/wiki/Structural_type_system
+ */
+export const SumType = {
+  serializeValue: function (
+    writer: BinaryWriter,
+    ty: SumTypeType,
+    value: any,
+    typespace?: TypespaceType
+  ): void {
+    if (
+      ty.variants.length == 2 &&
+      ty.variants[0].name === 'some' &&
+      ty.variants[1].name === 'none'
+    ) {
+      if (value !== null && value !== undefined) {
+        writer.writeByte(0);
+        AlgebraicType.serializeValue(
+          writer,
+          ty.variants[0].algebraicType,
+          value,
+          typespace
+        );
+      } else {
+        writer.writeByte(1);
+      }
+    } else {
+      const variant = value['tag'];
+      const index = ty.variants.findIndex(v => v.name === variant);
+      if (index < 0) {
+        throw `Can't serialize a sum type, couldn't find ${value.tag} tag`;
+      }
+      writer.writeU8(index);
+      AlgebraicType.serializeValue(
+        writer,
+        ty.variants[index].algebraicType,
+        value['value'],
+        typespace
+      );
+    }
+  },
+  deserializeValue: function (
+    reader: BinaryReader,
+    ty: SumTypeType,
+    typespace?: TypespaceType
+  ): any {
+    const tag = reader.readU8();
+    // In TypeScript we handle Option values as a special case
+    // we don't represent the some and none variants, but instead
+    // we represent the value directly.
+    if (
+      ty.variants.length == 2 &&
+      ty.variants[0].name === 'some' &&
+      ty.variants[1].name === 'none'
+    ) {
+      if (tag === 0) {
+        return AlgebraicType.deserializeValue(
+          reader,
+          ty.variants[0].algebraicType,
+          typespace
+        );
+      } else if (tag === 1) {
+        return undefined;
+      } else {
+        throw `Can't deserialize an option type, couldn't find ${tag} tag`;
+      }
+    } else {
+      const variant = ty.variants[tag];
+      const value = AlgebraicType.deserializeValue(
+        reader,
+        variant.algebraicType,
+        typespace
+      );
+      return { tag: variant.name, value };
+    }
+  },
+};
 
-// export type ComparablePrimitive = number | string | boolean | bigint;
+export type ComparablePrimitive = number | string | boolean | bigint;
diff --git a/crates/bindings-typescript/src/lib/algebraic_type_variants.ts b/crates/bindings-typescript/src/lib/algebraic_type_variants.ts
new file mode 100644
index 00000000000..0a911a40438
--- /dev/null
+++ b/crates/bindings-typescript/src/lib/algebraic_type_variants.ts
@@ -0,0 +1,22 @@
+import type { AlgebraicTypeType, ProductTypeType, SumTypeType } from "./algebraic_type";
+
+export type Ref = { tag: 'Ref'; value: number };
+export type Sum = { tag: 'Sum'; value: SumTypeType };
+export type Product = { tag: 'Product'; value: ProductTypeType };
+export type Array = { tag: 'Array'; value: AlgebraicTypeType };
+export type String = { tag: 'String' };
+export type Bool = { tag: 'Bool' };
+export type I8 = { tag: 'I8' };
+export type U8 = { tag: 'U8' };
+export type I16 = { tag: 'I16' };
+export type U16 = { tag: 'U16' };
+export type I32 = { tag: 'I32' };
+export type U32 = { tag: 'U32' };
+export type I64 = { tag: 'I64' };
+export type U64 = { tag: 'U64' };
+export type I128 = { tag: 'I128' };
+export type U128 = { tag: 'U128' };
+export type I256 = { tag: 'I256' };
+export type U256 = { tag: 'U256' };
+export type F32 = { tag: 'F32' };
+export type F64 = { tag: 'F64' };
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
index 82e31ab4910..473db013d39 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -19,25 +21,28 @@ import ProductType from './product_type_type';
 import * as AlgebraicTypeVariants from './algebraic_type_variants';
 
 // The tagged union or sum type for the algebraic type `AlgebraicType`.
-export default __t.enum('AlgebraicType', {
-  ref: __t.u32(),
-  sum: SumType,
-  product: ProductType,
-  array: AlgebraicType,
-  string: __t.unit(),
-  bool: __t.unit(),
-  i8: __t.unit(),
-  u8: __t.unit(),
-  i16: __t.unit(),
-  u16: __t.unit(),
-  i32: __t.unit(),
-  u32: __t.unit(),
-  i64: __t.unit(),
-  u64: __t.unit(),
-  i128: __t.unit(),
-  u128: __t.unit(),
-  i256: __t.unit(),
-  u256: __t.unit(),
-  f32: __t.unit(),
-  f64: __t.unit(),
-});
+const AlgebraicType: __TypeBuilder<__AlgebraicTypeType, __AlgebraicTypeType> =
+  __t.enum('AlgebraicType', {
+    Ref: __t.u32(),
+    Sum: __t.lazy(() => SumType),
+    Product: __t.lazy(() => ProductType),
+    Array: __t.lazy(() => AlgebraicType),
+    String: __t.unit(),
+    Bool: __t.unit(),
+    I8: __t.unit(),
+    U8: __t.unit(),
+    I16: __t.unit(),
+    U16: __t.unit(),
+    I32: __t.unit(),
+    U32: __t.unit(),
+    I64: __t.unit(),
+    U64: __t.unit(),
+    I128: __t.unit(),
+    U128: __t.unit(),
+    I256: __t.unit(),
+    U256: __t.unit(),
+    F32: __t.unit(),
+    F64: __t.unit(),
+  });
+
+export default AlgebraicType;
diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
index 7b6a73122a1..6d599677f5c 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
index b50441a6678..f570aae8a7c 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
@@ -4,16 +4,23 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as IndexTypeVariants from './index_type_variants';
 
 // The tagged union or sum type for the algebraic type `IndexType`.
-export default __t.enum('IndexType', { bTree: __t.unit(), hash: __t.unit() });
+const IndexType = __t.enum('IndexType', {
+  BTree: __t.unit(),
+  Hash: __t.unit(),
+});
+
+export default IndexType;
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
index da26f7c9eea..4624af926a3 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
index 01418fad34b..fa365f8be27 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
@@ -4,20 +4,24 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as LifecycleVariants from './lifecycle_variants';
 
 // The tagged union or sum type for the algebraic type `Lifecycle`.
-export default __t.enum('Lifecycle', {
-  init: __t.unit(),
-  onConnect: __t.unit(),
-  onDisconnect: __t.unit(),
+const Lifecycle = __t.enum('Lifecycle', {
+  Init: __t.unit(),
+  OnConnect: __t.unit(),
+  OnDisconnect: __t.unit(),
 });
+
+export default Lifecycle;
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
index c310246c499..aabc98ddf2b 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
index 5abd5213412..aa73d10f932 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -18,4 +20,8 @@ import TypeAlias from './type_alias_type';
 import * as MiscModuleExportVariants from './misc_module_export_variants';
 
 // The tagged union or sum type for the algebraic type `MiscModuleExport`.
-export default __t.enum('MiscModuleExport', { typeAlias: TypeAlias });
+const MiscModuleExport = __t.enum('MiscModuleExport', {
+  TypeAlias: __t.lazy(() => TypeAlias),
+});
+
+export default MiscModuleExport;
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
index 4e7f89d02fc..7e390c464ac 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
index c2d4d57154d..6c0c18db2ed 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -17,5 +19,5 @@ import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('ProductTypeElement', {
   name: __t.option(__t.string()),
-  algebraicType: AlgebraicType,
+  algebraicType: __t.lazy(() => AlgebraicType),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
index f064b890c0c..2ae773e4ae1 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
@@ -4,17 +4,19 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import ProductTypeElement from './product_type_element_type';
 
 export default __t.object('ProductType', {
-  elements: __t.array(ProductTypeElement),
+  elements: __t.array(__t.lazy(() => ProductTypeElement)),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
index 8a06977a8ba..fba5664e6bd 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -17,5 +19,5 @@ import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('RawColumnDefV8', {
   colName: __t.string(),
-  colType: AlgebraicType,
+  colType: __t.lazy(() => AlgebraicType),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
index 53afa043403..6ee8e3467b6 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
index 46e1f345f39..bfba927c01d 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -18,6 +20,8 @@ import RawUniqueConstraintDataV9 from './raw_unique_constraint_data_v_9_type';
 import * as RawConstraintDataV9Variants from './raw_constraint_data_v_9_variants';
 
 // The tagged union or sum type for the algebraic type `RawConstraintDataV9`.
-export default __t.enum('RawConstraintDataV9', {
-  unique: RawUniqueConstraintDataV9,
+const RawConstraintDataV9 = __t.enum('RawConstraintDataV9', {
+  Unique: __t.lazy(() => RawUniqueConstraintDataV9),
 });
+
+export default RawConstraintDataV9;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
index 3816567d978..63404adbcc1 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
index 2cd0dbf84aa..97c589847cb 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
index f5b4befba60..f7546f62c21 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -17,5 +19,5 @@ import RawConstraintDataV9 from './raw_constraint_data_v_9_type';
 
 export default __t.object('RawConstraintDefV9', {
   name: __t.option(__t.string()),
-  data: RawConstraintDataV9,
+  data: __t.lazy(() => RawConstraintDataV9),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
index e74950214f6..8ac5a46f997 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
@@ -4,20 +4,24 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as RawIndexAlgorithmVariants from './raw_index_algorithm_variants';
 
 // The tagged union or sum type for the algebraic type `RawIndexAlgorithm`.
-export default __t.enum('RawIndexAlgorithm', {
-  bTree: __t.array(__t.u16()),
-  hash: __t.array(__t.u16()),
-  direct: __t.u16(),
+const RawIndexAlgorithm = __t.enum('RawIndexAlgorithm', {
+  BTree: __t.array(__t.u16()),
+  Hash: __t.array(__t.u16()),
+  Direct: __t.u16(),
 });
+
+export default RawIndexAlgorithm;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
index fdc4c354fd8..1d9d57c2506 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
index 90eb98b4906..9ff3382a532 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -18,6 +20,6 @@ import IndexType from './index_type_type';
 export default __t.object('RawIndexDefV8', {
   indexName: __t.string(),
   isUnique: __t.bool(),
-  indexType: IndexType,
+  indexType: __t.lazy(() => IndexType),
   columns: __t.array(__t.u16()),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
index 6ea95a6d49b..cd512b020b6 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -18,5 +20,5 @@ import RawIndexAlgorithm from './raw_index_algorithm_type';
 export default __t.object('RawIndexDefV9', {
   name: __t.option(__t.string()),
   accessorName: __t.option(__t.string()),
-  algorithm: RawIndexAlgorithm,
+  algorithm: __t.lazy(() => RawIndexAlgorithm),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
index f6efe13f751..41e0e3aa057 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -20,8 +22,10 @@ import RawViewDefV9 from './raw_view_def_v_9_type';
 import * as RawMiscModuleExportV9Variants from './raw_misc_module_export_v_9_variants';
 
 // The tagged union or sum type for the algebraic type `RawMiscModuleExportV9`.
-export default __t.enum('RawMiscModuleExportV9', {
-  columnDefaultValue: RawColumnDefaultValueV9,
-  procedure: RawProcedureDefV9,
-  view: RawViewDefV9,
+const RawMiscModuleExportV9 = __t.enum('RawMiscModuleExportV9', {
+  ColumnDefaultValue: __t.lazy(() => RawColumnDefaultValueV9),
+  Procedure: __t.lazy(() => RawProcedureDefV9),
+  View: __t.lazy(() => RawViewDefV9),
 });
+
+export default RawMiscModuleExportV9;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
index 827361c8c95..0150cc650b0 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
index 660f69a598f..f8700af5410 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -19,7 +21,9 @@ import RawModuleDefV9 from './raw_module_def_v_9_type';
 import * as RawModuleDefVariants from './raw_module_def_variants';
 
 // The tagged union or sum type for the algebraic type `RawModuleDef`.
-export default __t.enum('RawModuleDef', {
-  v8BackCompat: RawModuleDefV8,
-  v9: RawModuleDefV9,
+const RawModuleDef = __t.enum('RawModuleDef', {
+  V8BackCompat: __t.lazy(() => RawModuleDefV8),
+  V9: __t.lazy(() => RawModuleDefV9),
 });
+
+export default RawModuleDef;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
index bf554872868..e5e46dafac0 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -19,8 +21,8 @@ import ReducerDef from './reducer_def_type';
 import MiscModuleExport from './misc_module_export_type';
 
 export default __t.object('RawModuleDefV8', {
-  typespace: Typespace,
-  tables: __t.array(TableDesc),
-  reducers: __t.array(ReducerDef),
-  miscExports: __t.array(MiscModuleExport),
+  typespace: __t.lazy(() => Typespace),
+  tables: __t.array(__t.lazy(() => TableDesc)),
+  reducers: __t.array(__t.lazy(() => ReducerDef)),
+  miscExports: __t.array(__t.lazy(() => MiscModuleExport)),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
index 210acad551a..796d92076ee 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -21,10 +23,10 @@ import RawMiscModuleExportV9 from './raw_misc_module_export_v_9_type';
 import RawRowLevelSecurityDefV9 from './raw_row_level_security_def_v_9_type';
 
 export default __t.object('RawModuleDefV9', {
-  typespace: Typespace,
-  tables: __t.array(RawTableDefV9),
-  reducers: __t.array(RawReducerDefV9),
-  types: __t.array(RawTypeDefV9),
-  miscExports: __t.array(RawMiscModuleExportV9),
-  rowLevelSecurity: __t.array(RawRowLevelSecurityDefV9),
+  typespace: __t.lazy(() => Typespace),
+  tables: __t.array(__t.lazy(() => RawTableDefV9)),
+  reducers: __t.array(__t.lazy(() => RawReducerDefV9)),
+  types: __t.array(__t.lazy(() => RawTypeDefV9)),
+  miscExports: __t.array(__t.lazy(() => RawMiscModuleExportV9)),
+  rowLevelSecurity: __t.array(__t.lazy(() => RawRowLevelSecurityDefV9)),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
index b29ddc80918..ec4476d92d8 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
index 47216a7f1d2..b74a7d5f430 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -18,6 +20,6 @@ import ProductType from './product_type_type';
 
 export default __t.object('RawProcedureDefV9', {
   name: __t.string(),
-  params: ProductType,
-  returnType: AlgebraicType,
+  params: __t.lazy(() => ProductType),
+  returnType: __t.lazy(() => AlgebraicType),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
index 09369d012dd..325f5ebdc80 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -18,6 +20,6 @@ import Lifecycle from './lifecycle_type';
 
 export default __t.object('RawReducerDefV9', {
   name: __t.string(),
-  params: ProductType,
-  lifecycle: __t.option(Lifecycle),
+  params: __t.lazy(() => ProductType),
+  lifecycle: __t.option(__t.lazy(() => Lifecycle)),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
index 5fbd40f3e59..73b27e0039e 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
index 372932c66e7..2aa3f796a7a 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
index e6eea3effdc..90052774483 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
index f9d4b9abae6..6a93beecd5c 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
index bf75bce155d..0f923b0a74f 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
index 5ad27b2a05a..02885efe43a 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -20,10 +22,10 @@ import RawSequenceDefV8 from './raw_sequence_def_v_8_type';
 
 export default __t.object('RawTableDefV8', {
   tableName: __t.string(),
-  columns: __t.array(RawColumnDefV8),
-  indexes: __t.array(RawIndexDefV8),
-  constraints: __t.array(RawConstraintDefV8),
-  sequences: __t.array(RawSequenceDefV8),
+  columns: __t.array(__t.lazy(() => RawColumnDefV8)),
+  indexes: __t.array(__t.lazy(() => RawIndexDefV8)),
+  constraints: __t.array(__t.lazy(() => RawConstraintDefV8)),
+  sequences: __t.array(__t.lazy(() => RawSequenceDefV8)),
   tableType: __t.string(),
   tableAccess: __t.string(),
   scheduled: __t.option(__t.string()),
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
index bdb569b2bc0..7d593002beb 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -24,10 +26,10 @@ export default __t.object('RawTableDefV9', {
   name: __t.string(),
   productTypeRef: __t.u32(),
   primaryKey: __t.array(__t.u16()),
-  indexes: __t.array(RawIndexDefV9),
-  constraints: __t.array(RawConstraintDefV9),
-  sequences: __t.array(RawSequenceDefV9),
-  schedule: __t.option(RawScheduleDefV9),
-  tableType: TableType,
-  tableAccess: TableAccess,
+  indexes: __t.array(__t.lazy(() => RawIndexDefV9)),
+  constraints: __t.array(__t.lazy(() => RawConstraintDefV9)),
+  sequences: __t.array(__t.lazy(() => RawSequenceDefV9)),
+  schedule: __t.option(__t.lazy(() => RawScheduleDefV9)),
+  tableType: __t.lazy(() => TableType),
+  tableAccess: __t.lazy(() => TableAccess),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
index d46d86dc660..0b0b4e11b1d 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
@@ -4,19 +4,21 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawScopedTypeNameV9 from './raw_scoped_type_name_v_9_type';
 
 export default __t.object('RawTypeDefV9', {
-  name: RawScopedTypeNameV9,
+  name: __t.lazy(() => RawScopedTypeNameV9),
   ty: __t.u32(),
   customOrdering: __t.bool(),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
index 1956d936f0c..fd9f15f2831 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
index b76633bdd31..e333d27b505 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -20,6 +22,6 @@ export default __t.object('RawViewDefV9', {
   name: __t.string(),
   isPublic: __t.bool(),
   isAnonymous: __t.bool(),
-  params: ProductType,
-  returnType: AlgebraicType,
+  params: __t.lazy(() => ProductType),
+  returnType: __t.lazy(() => AlgebraicType),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
index f819e4e4bd9..eff8f6ac0f4 100644
--- a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -17,5 +19,5 @@ import ProductTypeElement from './product_type_element_type';
 
 export default __t.object('ReducerDef', {
   name: __t.string(),
-  args: __t.array(ProductTypeElement),
+  args: __t.array(__t.lazy(() => ProductTypeElement)),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
index dab366e323d..fe155e775ad 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
@@ -4,17 +4,19 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import SumTypeVariant from './sum_type_variant_type';
 
 export default __t.object('SumType', {
-  variants: __t.array(SumTypeVariant),
+  variants: __t.array(__t.lazy(() => SumTypeVariant)),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
index ea683b23519..a94709e505a 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
@@ -17,5 +19,5 @@ import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('SumTypeVariant', {
   name: __t.option(__t.string()),
-  algebraicType: AlgebraicType,
+  algebraicType: __t.lazy(() => AlgebraicType),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
index d5c665aeb05..bb58743b39e 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
@@ -4,19 +4,23 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as TableAccessVariants from './table_access_variants';
 
 // The tagged union or sum type for the algebraic type `TableAccess`.
-export default __t.enum('TableAccess', {
-  public: __t.unit(),
-  private: __t.unit(),
+const TableAccess = __t.enum('TableAccess', {
+  Public: __t.unit(),
+  Private: __t.unit(),
 });
+
+export default TableAccess;
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
index b0964033c04..e3439ea4df4 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
index e3e09479fac..ed8675690e7 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
@@ -4,18 +4,20 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawTableDefV8 from './raw_table_def_v_8_type';
 
 export default __t.object('TableDesc', {
-  schema: RawTableDefV8,
+  schema: __t.lazy(() => RawTableDefV8),
   data: __t.u32(),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
index 782d6ecf0cd..b006fac7509 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
@@ -4,16 +4,23 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as TableTypeVariants from './table_type_variants';
 
 // The tagged union or sum type for the algebraic type `TableType`.
-export default __t.enum('TableType', { system: __t.unit(), user: __t.unit() });
+const TableType = __t.enum('TableType', {
+  System: __t.unit(),
+  User: __t.unit(),
+});
+
+export default TableType;
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
index 611eac9e858..caad701b6e9 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts b/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
index df8542b4bfd..4227f5bf030 100644
--- a/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
@@ -4,12 +4,14 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
diff --git a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
index 6b9a01317d5..cec842682ea 100644
--- a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
@@ -4,17 +4,19 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
   type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('Typespace', {
-  types: __t.array(AlgebraicType),
+  types: __t.array(__t.lazy(() => AlgebraicType)),
 });
diff --git a/crates/bindings-typescript/src/lib/reducer_schema.ts b/crates/bindings-typescript/src/lib/reducer_schema.ts
index 1d0b2f71221..d8fd614de91 100644
--- a/crates/bindings-typescript/src/lib/reducer_schema.ts
+++ b/crates/bindings-typescript/src/lib/reducer_schema.ts
@@ -34,5 +34,5 @@ export type ReducerSchema<
   /**
    * The {@link RawReducerDefV9} of the configured reducer.
    */
-  readonly reducerDef: RawReducerDefV9;
+  readonly reducerDef: Infer<typeof RawReducerDefV9>;
 };
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index 7e2835df33c..8f11e5fd730 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -15,7 +15,6 @@ import {
   type RowObj,
   type TypeBuilder,
 } from './type_builders';
-import type { CamelCase } from './type_util';
 import type { ReducerSchema } from './reducer_schema';
 import { toCamelCase } from './utils';
 
@@ -130,7 +129,7 @@ export function pushReducer(
   name: string,
   params: RowObj | RowBuilder<RowObj>,
   fn: Reducer<any, any>,
-  lifecycle?: RawReducerDefV9['lifecycle']
+  lifecycle?: Infer<typeof RawReducerDefV9>['lifecycle']
 ): void {
   if (existingReducers.has(name)) {
     throw new TypeError(`There is already a reducer with the name '${name}'`);
@@ -219,7 +218,7 @@ export function init<S extends UntypedSchemaDef, Params extends ParamsObj>(
   params: Params,
   fn: Reducer<S, Params>
 ): void {
-  pushReducer(name, params, fn, Lifecycle.Init);
+  pushReducer(name, params, fn, Lifecycle.create('Init'));
 }
 
 /**
@@ -235,7 +234,7 @@ export function clientConnected<
   S extends UntypedSchemaDef,
   Params extends ParamsObj,
 >(name: string, params: Params, fn: Reducer<S, Params>): void {
-  pushReducer(name, params, fn, Lifecycle.OnConnect);
+  pushReducer(name, params, fn, Lifecycle.create('OnConnect'));
 }
 
 /**
@@ -261,7 +260,7 @@ export function clientDisconnected<
   S extends UntypedSchemaDef,
   Params extends ParamsObj,
 >(name: string, params: Params, fn: Reducer<S, Params>): void {
-  pushReducer(name, params, fn, Lifecycle.OnDisconnect);
+  pushReducer(name, params, fn, Lifecycle.create('OnDisconnect'));
 }
 
 class Reducers<ReducersDef extends UntypedReducersDef> {
diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
index 16fe41680d7..f39c888f4b0 100644
--- a/crates/bindings-typescript/src/lib/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -3,6 +3,7 @@ import type Typespace from './autogen/typespace_type';
 import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type ColumnBuilder,
+  type Infer,
   type RowObj,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type TypeBuilder,
@@ -53,7 +54,7 @@ type TablesToSchema<T extends readonly TableSchema<any, any, any>[]> = {
 /**
  * The global module definition that gets populated by calls to `reducer()` and lifecycle hooks.
  */
-export const MODULE_DEF: RawModuleDefV9 = {
+export const MODULE_DEF: Infer<typeof RawModuleDefV9> = {
   typespace: { types: [] },
   tables: [],
   reducers: [],
@@ -93,7 +94,7 @@ export function addType<T extends AlgebraicType>(
   }
 }
 
-export function splitName(name: string): RawScopedTypeNameV9 {
+export function splitName(name: string): Infer<typeof RawScopedTypeNameV9> {
   const scope = name.split('.');
   return { name: scope.pop()!, scope };
 }
@@ -133,11 +134,11 @@ export function splitName(name: string): RawScopedTypeNameV9 {
 // for the tables from the schema object, e.g. `spacetimedb.user.type` would
 // be the type of the user table.
 class Schema<S extends UntypedSchemaDef> {
-  readonly tablesDef: { tables: RawTableDefV9[] };
-  readonly typespace: Typespace;
+  readonly tablesDef: { tables: Infer<typeof RawTableDefV9>[] };
+  readonly typespace: Infer<typeof Typespace>;
   readonly schemaType!: S;
 
-  constructor(tables: RawTableDefV9[], typespace: Typespace) {
+  constructor(tables: Infer<typeof RawTableDefV9>[], typespace: Infer<typeof Typespace>) {
     this.tablesDef = { tables };
     this.typespace = typespace;
   }
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index 4fe94e545df..5bf887dba02 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -13,6 +13,7 @@ import {
   RowBuilder,
   type ColumnBuilder,
   type ColumnMetadata,
+  type Infer,
   type InferTypeOfRow,
   type RowObj,
   type TypeBuilder,
@@ -192,9 +193,9 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
 
   // gather primary keys, per‑column indexes, uniques, sequences
   const pk: ColList = [];
-  const indexes: RawIndexDefV9[] = [];
-  const constraints: RawConstraintDefV9[] = [];
-  const sequences: RawSequenceDefV9[] = [];
+  const indexes: Infer<typeof RawIndexDefV9>[] = [];
+  const constraints: Infer<typeof RawConstraintDefV9>[] = [];
+  const sequences: Infer<typeof RawSequenceDefV9>[] = [];
 
   let scheduleAtCol: ColId | undefined;
 
@@ -211,13 +212,13 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     if (meta.indexType || isUnique) {
       const algo = meta.indexType ?? 'btree';
       const id = colIds.get(name)!;
-      let algorithm: RawIndexAlgorithm;
+      let algorithm: Infer<typeof RawIndexAlgorithm>;
       switch (algo) {
         case 'btree':
-          algorithm = RawIndexAlgorithm.BTree([id]);
+          algorithm = RawIndexAlgorithm.create('BTree', [id]);
           break;
         case 'direct':
-          algorithm = RawIndexAlgorithm.Direct(id);
+          algorithm = RawIndexAlgorithm.create('Direct', id);
           break;
       }
       indexes.push({
@@ -252,7 +253,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
 
   // convert explicit multi‑column indexes coming from options.indexes
   for (const indexOpts of userIndexes ?? []) {
-    let algorithm: RawIndexAlgorithm;
+    let algorithm: Infer<typeof RawIndexAlgorithm>;
     switch (indexOpts.algorithm) {
       case 'btree':
         algorithm = {
@@ -270,7 +271,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
   // add explicit constraints from options.constraints
   for (const constraintOpts of opts.constraints ?? []) {
     if (constraintOpts.constraint === 'unique') {
-      let data: RawConstraintDefV9['data'];
+      let data: Infer<typeof RawConstraintDefV9>['data'];
       data = {
         tag: 'Unique',
         value: { columns: constraintOpts.columns.map(c => colIds.get(c)!) },
@@ -295,7 +296,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
   // Temporarily set the type ref to 0. We will set this later
   // in the schema function.
 
-  const tableDef: RawTableDefV9 = {
+  const tableDef: Infer<typeof RawTableDefV9> = {
     name,
     productTypeRef: row.algebraicType.value as number,
     primaryKey: pk,
diff --git a/crates/bindings-typescript/src/lib/table_schema.ts b/crates/bindings-typescript/src/lib/table_schema.ts
index a76d05ef4ec..c160989e4a3 100644
--- a/crates/bindings-typescript/src/lib/table_schema.ts
+++ b/crates/bindings-typescript/src/lib/table_schema.ts
@@ -1,7 +1,7 @@
 import type { ProductType } from "./algebraic_type";
 import type RawTableDefV9 from "./autogen/raw_table_def_v_9_type";
 import type { IndexOpts } from "./indexes";
-import type { ColumnBuilder, RowBuilder } from "./type_builders";
+import type { ColumnBuilder, Infer, RowBuilder } from "./type_builders";
 
 /**
  * Represents a handle to a database table, including its name, row type, and row spacetime type.
@@ -29,7 +29,7 @@ export type TableSchema<
   /**
    * The {@link RawTableDefV9} of the configured table
    */
-  readonly tableDef: RawTableDefV9;
+  readonly tableDef: Infer<typeof RawTableDefV9>;
 
   /**
    * The indexes defined on the table.
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 4cd99ada03b..b42b1f9c238 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -1,4 +1,5 @@
 import {
+  AlgebraicType,
   ConnectionId,
   Identity,
   ScheduleAt,
@@ -12,7 +13,6 @@ import {
   type TimeDurationAlgebraicType,
   type TimestampAlgebraicType,
 } from '..';
-import { AlgebraicType } from '../lib/algebraic_type';
 import { addType, MODULE_DEF } from '../lib/schema';
 import type { CoerceRow } from './table';
 import { set, type SetField } from './type_util';
@@ -20,14 +20,14 @@ import { set, type SetField } from './type_util';
 /**
  * Helper type to extract the TypeScript type from a TypeBuilder
  */
-export type InferTypeOfTypeBuilder<T extends TypeBuilder<any, any>> =
-  T extends TypeBuilder<infer U, any> ? U : never;
+export type InferTypeOfTypeBuilder<T extends MaybeLazy<TypeBuilder<any, any>>> =
+  UnwrapLazy<T> extends TypeBuilder<infer U, any> ? U : never;
 
 /**
  * Helper type to extract the Spacetime type from a TypeBuilder
  */
-export type InferSpacetimeTypeOfTypeBuilder<T extends TypeBuilder<any, any>> =
-  T extends TypeBuilder<any, infer U> ? U : never;
+export type InferSpacetimeTypeOfTypeBuilder<T extends MaybeLazy<TypeBuilder<any, any>>> =
+  UnwrapLazy<T> extends TypeBuilder<any, infer U> ? U : never;
 
 /**
  * Helper type to extract the TypeScript type from a TypeBuilder
@@ -83,7 +83,7 @@ type RowType<Row extends RowObj> = {
 /**
  * Type which represents a valid argument to the ProductColumnBuilder
  */
-type ElementsObj = Record<string, TypeBuilder<any, any>>;
+type ElementsObj = Record<string, MaybeLazy<TypeBuilder<any, any>>>;
 
 /**
  * Type which converts the elements of ElementsObj to a ProductType elements array
@@ -108,10 +108,17 @@ type ObjectType<Elements extends ElementsObj> = {
   [K in keyof Elements]: InferTypeOfTypeBuilder<Elements[K]>;
 };
 
-type VariantsObj = Record<string, TypeBuilder<any, any>>;
+// A value or a thunk returning that value
+export type MaybeLazy<T> = T;
+
+// Recursively peel off () => layers, if any
+type UnwrapLazy<T> = T extends () => infer R ? UnwrapLazy<R> : T;
+
+// type VariantsObj = Record<string, TypedPropertyDescriptor<TypeBuilder<any, any>>>;
+type VariantsObj = Record<string, MaybeLazy<TypeBuilder<any, any>>>;
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 type UnitBuilder = ProductBuilder<{}>;
-type SimpleVariantsObj = Record<string, UnitBuilder>;
+type SimpleVariantsObj = Record<string, MaybeLazy<UnitBuilder>>;
 
 type IsUnit<B> = B extends UnitBuilder ? true : false;
 
@@ -124,8 +131,8 @@ type IsUnit<B> = B extends UnitBuilder ? true : false;
  */
 type EnumType<Variants extends VariantsObj> = {
   [K in keyof Variants & string]:
-    (IsUnit<Variants[K]> extends true ? { tag: K }
-     : { tag: K; value: InferTypeOfTypeBuilder<Variants[K]> })
+  (IsUnit<Variants[K]> extends true ? { tag: K }
+    : { tag: K; value: InferTypeOfTypeBuilder<Variants[K]> })
 }[keyof Variants & string];
 
 /**
@@ -141,8 +148,7 @@ type VariantsArrayFromVariantsObj<Obj extends VariantsObj> = {
  * and the corresponding `AlgebraicType`.
  */
 export class TypeBuilder<Type, SpacetimeType extends AlgebraicType>
-  implements Optional<Type, SpacetimeType>
-{
+  implements Optional<Type, SpacetimeType> {
   /**
    * The TypeScript phantom type. This is not stored at runtime,
    * but is visible to the compiler
@@ -166,7 +172,9 @@ export class TypeBuilder<Type, SpacetimeType extends AlgebraicType>
 
   resolveType(): SpacetimeType {
     let ty: AlgebraicType = this.algebraicType;
-    while (ty.tag === 'Ref') ty = MODULE_DEF.typespace.types[ty.value];
+    while (ty.tag === 'Ref') {
+      ty = MODULE_DEF.typespace.types[ty.value];
+    }
     return ty as SpacetimeType;
   }
 
@@ -354,12 +362,11 @@ interface Defaultable<
 export class U8Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.U8>
   implements
-    Indexable<number, AlgebraicTypeVariants.U8>,
-    Uniqueable<number, AlgebraicTypeVariants.U8>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
-    AutoIncrementable<number, AlgebraicTypeVariants.U8>,
-    Defaultable<number, AlgebraicTypeVariants.U8>
-{
+  Indexable<number, AlgebraicTypeVariants.U8>,
+  Uniqueable<number, AlgebraicTypeVariants.U8>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
+  AutoIncrementable<number, AlgebraicTypeVariants.U8>,
+  Defaultable<number, AlgebraicTypeVariants.U8> {
   constructor() {
     super(AlgebraicType.U8);
   }
@@ -403,12 +410,11 @@ export class U8Builder
 export class U16Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.U16>
   implements
-    Indexable<number, AlgebraicTypeVariants.U16>,
-    Uniqueable<number, AlgebraicTypeVariants.U16>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
-    AutoIncrementable<number, AlgebraicTypeVariants.U16>,
-    Defaultable<number, AlgebraicTypeVariants.U16>
-{
+  Indexable<number, AlgebraicTypeVariants.U16>,
+  Uniqueable<number, AlgebraicTypeVariants.U16>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
+  AutoIncrementable<number, AlgebraicTypeVariants.U16>,
+  Defaultable<number, AlgebraicTypeVariants.U16> {
   constructor() {
     super(AlgebraicType.U16);
   }
@@ -452,12 +458,11 @@ export class U16Builder
 export class U32Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.U32>
   implements
-    Indexable<number, AlgebraicTypeVariants.U32>,
-    Uniqueable<number, AlgebraicTypeVariants.U32>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
-    AutoIncrementable<number, AlgebraicTypeVariants.U32>,
-    Defaultable<number, AlgebraicTypeVariants.U32>
-{
+  Indexable<number, AlgebraicTypeVariants.U32>,
+  Uniqueable<number, AlgebraicTypeVariants.U32>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
+  AutoIncrementable<number, AlgebraicTypeVariants.U32>,
+  Defaultable<number, AlgebraicTypeVariants.U32> {
   constructor() {
     super(AlgebraicType.U32);
   }
@@ -501,12 +506,11 @@ export class U32Builder
 export class U64Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.U64>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.U64>,
-    Uniqueable<bigint, AlgebraicTypeVariants.U64>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
-    Defaultable<bigint, AlgebraicTypeVariants.U64>
-{
+  Indexable<bigint, AlgebraicTypeVariants.U64>,
+  Uniqueable<bigint, AlgebraicTypeVariants.U64>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
+  Defaultable<bigint, AlgebraicTypeVariants.U64> {
   constructor() {
     super(AlgebraicType.U64);
   }
@@ -550,12 +554,11 @@ export class U64Builder
 export class U128Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.U128>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.U128>,
-    Uniqueable<bigint, AlgebraicTypeVariants.U128>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
-    Defaultable<bigint, AlgebraicTypeVariants.U128>
-{
+  Indexable<bigint, AlgebraicTypeVariants.U128>,
+  Uniqueable<bigint, AlgebraicTypeVariants.U128>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
+  Defaultable<bigint, AlgebraicTypeVariants.U128> {
   constructor() {
     super(AlgebraicType.U128);
   }
@@ -602,12 +605,11 @@ export class U128Builder
 export class U256Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.U256>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.U256>,
-    Uniqueable<bigint, AlgebraicTypeVariants.U256>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
-    Defaultable<bigint, AlgebraicTypeVariants.U256>
-{
+  Indexable<bigint, AlgebraicTypeVariants.U256>,
+  Uniqueable<bigint, AlgebraicTypeVariants.U256>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
+  Defaultable<bigint, AlgebraicTypeVariants.U256> {
   constructor() {
     super(AlgebraicType.U256);
   }
@@ -654,12 +656,11 @@ export class U256Builder
 export class I8Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.I8>
   implements
-    Indexable<number, AlgebraicTypeVariants.I8>,
-    Uniqueable<number, AlgebraicTypeVariants.I8>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
-    AutoIncrementable<number, AlgebraicTypeVariants.I8>,
-    Defaultable<number, AlgebraicTypeVariants.I8>
-{
+  Indexable<number, AlgebraicTypeVariants.I8>,
+  Uniqueable<number, AlgebraicTypeVariants.I8>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
+  AutoIncrementable<number, AlgebraicTypeVariants.I8>,
+  Defaultable<number, AlgebraicTypeVariants.I8> {
   constructor() {
     super(AlgebraicType.I8);
   }
@@ -703,12 +704,11 @@ export class I8Builder
 export class I16Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.I16>
   implements
-    Indexable<number, AlgebraicTypeVariants.I16>,
-    Uniqueable<number, AlgebraicTypeVariants.I16>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
-    AutoIncrementable<number, AlgebraicTypeVariants.I16>,
-    Defaultable<number, AlgebraicTypeVariants.I16>
-{
+  Indexable<number, AlgebraicTypeVariants.I16>,
+  Uniqueable<number, AlgebraicTypeVariants.I16>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
+  AutoIncrementable<number, AlgebraicTypeVariants.I16>,
+  Defaultable<number, AlgebraicTypeVariants.I16> {
   constructor() {
     super(AlgebraicType.I16);
   }
@@ -752,13 +752,12 @@ export class I16Builder
 export class I32Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.I32>
   implements
-    TypeBuilder<number, AlgebraicTypeVariants.I32>,
-    Indexable<number, AlgebraicTypeVariants.I32>,
-    Uniqueable<number, AlgebraicTypeVariants.I32>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
-    AutoIncrementable<number, AlgebraicTypeVariants.I32>,
-    Defaultable<number, AlgebraicTypeVariants.I32>
-{
+  TypeBuilder<number, AlgebraicTypeVariants.I32>,
+  Indexable<number, AlgebraicTypeVariants.I32>,
+  Uniqueable<number, AlgebraicTypeVariants.I32>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
+  AutoIncrementable<number, AlgebraicTypeVariants.I32>,
+  Defaultable<number, AlgebraicTypeVariants.I32> {
   constructor() {
     super(AlgebraicType.I32);
   }
@@ -802,12 +801,11 @@ export class I32Builder
 export class I64Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.I64>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.I64>,
-    Uniqueable<bigint, AlgebraicTypeVariants.I64>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
-    Defaultable<bigint, AlgebraicTypeVariants.I64>
-{
+  Indexable<bigint, AlgebraicTypeVariants.I64>,
+  Uniqueable<bigint, AlgebraicTypeVariants.I64>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
+  Defaultable<bigint, AlgebraicTypeVariants.I64> {
   constructor() {
     super(AlgebraicType.I64);
   }
@@ -851,12 +849,11 @@ export class I64Builder
 export class I128Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.I128>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.I128>,
-    Uniqueable<bigint, AlgebraicTypeVariants.I128>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
-    Defaultable<bigint, AlgebraicTypeVariants.I128>
-{
+  Indexable<bigint, AlgebraicTypeVariants.I128>,
+  Uniqueable<bigint, AlgebraicTypeVariants.I128>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
+  Defaultable<bigint, AlgebraicTypeVariants.I128> {
   constructor() {
     super(AlgebraicType.I128);
   }
@@ -903,12 +900,11 @@ export class I128Builder
 export class I256Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.I256>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.I256>,
-    Uniqueable<bigint, AlgebraicTypeVariants.I256>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
-    Defaultable<bigint, AlgebraicTypeVariants.I256>
-{
+  Indexable<bigint, AlgebraicTypeVariants.I256>,
+  Uniqueable<bigint, AlgebraicTypeVariants.I256>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
+  Defaultable<bigint, AlgebraicTypeVariants.I256> {
   constructor() {
     super(AlgebraicType.I256);
   }
@@ -954,8 +950,7 @@ export class I256Builder
 
 export class F32Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.F32>
-  implements Defaultable<number, AlgebraicTypeVariants.F32>
-{
+  implements Defaultable<number, AlgebraicTypeVariants.F32> {
   constructor() {
     super(AlgebraicType.F32);
   }
@@ -971,8 +966,7 @@ export class F32Builder
 
 export class F64Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.F64>
-  implements Defaultable<number, AlgebraicTypeVariants.F64>
-{
+  implements Defaultable<number, AlgebraicTypeVariants.F64> {
   constructor() {
     super(AlgebraicType.F64);
   }
@@ -989,11 +983,10 @@ export class F64Builder
 export class BoolBuilder
   extends TypeBuilder<boolean, AlgebraicTypeVariants.Bool>
   implements
-    Indexable<boolean, AlgebraicTypeVariants.Bool>,
-    Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
-    PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
-    Defaultable<boolean, AlgebraicTypeVariants.Bool>
-{
+  Indexable<boolean, AlgebraicTypeVariants.Bool>,
+  Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
+  PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
+  Defaultable<boolean, AlgebraicTypeVariants.Bool> {
   constructor() {
     super(AlgebraicType.Bool);
   }
@@ -1034,11 +1027,10 @@ export class BoolBuilder
 export class StringBuilder
   extends TypeBuilder<string, AlgebraicTypeVariants.String>
   implements
-    Indexable<string, AlgebraicTypeVariants.String>,
-    Uniqueable<string, AlgebraicTypeVariants.String>,
-    PrimaryKeyable<string, AlgebraicTypeVariants.String>,
-    Defaultable<string, AlgebraicTypeVariants.String>
-{
+  Indexable<string, AlgebraicTypeVariants.String>,
+  Uniqueable<string, AlgebraicTypeVariants.String>,
+  PrimaryKeyable<string, AlgebraicTypeVariants.String>,
+  Defaultable<string, AlgebraicTypeVariants.String> {
   constructor() {
     super(AlgebraicType.String);
   }
@@ -1083,8 +1075,7 @@ export class ArrayBuilder<Element extends TypeBuilder<any, any>>
     Array<InferTypeOfTypeBuilder<Element>>,
     { tag: 'Array'; value: InferSpacetimeTypeOfTypeBuilder<Element> }
   >
-  implements Defaultable<Array<InferTypeOfTypeBuilder<Element>>, any>
-{
+  implements Defaultable<Array<InferTypeOfTypeBuilder<Element>>, any> {
   /**
    * The phantom element type of the array for TypeScript
    */
@@ -1109,8 +1100,7 @@ export class OptionBuilder<Value extends TypeBuilder<any, any>>
     OptionAlgebraicType
   >
   implements
-    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType>
-{
+  Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType> {
   /**
    * The phantom value type of the option for TypeScript
    */
@@ -1128,7 +1118,7 @@ export class OptionBuilder<Value extends TypeBuilder<any, any>>
   default(
     value: InferTypeOfTypeBuilder<Value> | undefined
   ): OptionColumnBuilder<
-    InferTypeOfTypeBuilder<Value>,
+    Value,
     SetField<
       DefaultMetadata,
       'defaultValue',
@@ -1150,13 +1140,12 @@ export class ProductBuilder<Elements extends ElementsObj>
       value: { elements: ElementsArrayFromElementsObj<Elements> };
     }
   >
-  implements Defaultable<ObjectType<Elements>, any>
-{
+  implements Defaultable<ObjectType<Elements>, any> {
   constructor(elements: Elements, name?: string) {
     function elementsArrayFromElementsObj<Obj extends ElementsObj>(obj: Obj) {
-      return Object.entries(obj).map(([name, { algebraicType }]) => ({
+      return Object.entries(obj).map(([name, value]) => ({
         name,
-        algebraicType,
+        algebraicType: value.algebraicType,
       }));
     }
     super(
@@ -1210,10 +1199,10 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
 }
 
 // Value type produced for a given variant key + builder
-type EnumValue<K extends string, B extends TypeBuilder<any, any>> =
+type EnumValue<K extends string, B extends MaybeLazy<TypeBuilder<any, any>>> =
   IsUnit<B> extends true
-    ? { tag: K }
-    : { tag: K; value: InferTypeOfTypeBuilder<B> };
+  ? { tag: K }
+  : { tag: K; value: InferTypeOfTypeBuilder<B> };
 
 export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
   EnumType<Variants>,
@@ -1224,9 +1213,9 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
     function variantsArrayFromVariantsObj<Variants extends VariantsObj>(
       variants: Variants
     ) {
-      return Object.entries(variants).map(([name, { algebraicType }]) => ({
+      return Object.entries(variants).map(([name, value]) => ({
         name,
-        algebraicType,
+        algebraicType: value.algebraicType,
       }));
     }
     super(
@@ -1270,21 +1259,20 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
 export class SimpleSumBuilder<Variants extends SimpleVariantsObj>
   extends SumBuilder<Variants>
   implements
-    Indexable<
-      EnumType<Variants>,
-      {
-        tag: 'Sum';
-        value: { variants: VariantsArrayFromVariantsObj<Variants> };
-      }
-    >,
-    PrimaryKeyable<
-      EnumType<Variants>,
-      {
-        tag: 'Sum';
-        value: { variants: VariantsArrayFromVariantsObj<Variants> };
-      }
-    >
-{
+  Indexable<
+    EnumType<Variants>,
+    {
+      tag: 'Sum';
+      value: { variants: VariantsArrayFromVariantsObj<Variants> };
+    }
+  >,
+  PrimaryKeyable<
+    EnumType<Variants>,
+    {
+      tag: 'Sum';
+      value: { variants: VariantsArrayFromVariantsObj<Variants> };
+    }
+  > {
   index(): SimpleSumColumnBuilder<
     Variants,
     SetField<DefaultMetadata, 'indexType', 'btree'>
@@ -1317,11 +1305,10 @@ export class SimpleSumBuilder<Variants extends SimpleVariantsObj>
 export class IdentityBuilder
   extends TypeBuilder<Identity, IdentityAlgebraicType>
   implements
-    Indexable<Identity, IdentityAlgebraicType>,
-    Uniqueable<Identity, IdentityAlgebraicType>,
-    PrimaryKeyable<Identity, IdentityAlgebraicType>,
-    Defaultable<Identity, IdentityAlgebraicType>
-{
+  Indexable<Identity, IdentityAlgebraicType>,
+  Uniqueable<Identity, IdentityAlgebraicType>,
+  PrimaryKeyable<Identity, IdentityAlgebraicType>,
+  Defaultable<Identity, IdentityAlgebraicType> {
   constructor() {
     super(Identity.getAlgebraicType());
   }
@@ -1372,11 +1359,10 @@ export class IdentityBuilder
 export class ConnectionIdBuilder
   extends TypeBuilder<ConnectionId, ConnectionIdAlgebraicType>
   implements
-    Indexable<ConnectionId, ConnectionIdAlgebraicType>,
-    Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
-    PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
-    Defaultable<ConnectionId, ConnectionIdAlgebraicType>
-{
+  Indexable<ConnectionId, ConnectionIdAlgebraicType>,
+  Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
+  PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
+  Defaultable<ConnectionId, ConnectionIdAlgebraicType> {
   constructor() {
     super(ConnectionId.getAlgebraicType());
   }
@@ -1431,11 +1417,10 @@ export class ConnectionIdBuilder
 export class TimestampBuilder
   extends TypeBuilder<Timestamp, TimestampAlgebraicType>
   implements
-    Indexable<Timestamp, TimestampAlgebraicType>,
-    Uniqueable<Timestamp, TimestampAlgebraicType>,
-    PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
-    Defaultable<Timestamp, TimestampAlgebraicType>
-{
+  Indexable<Timestamp, TimestampAlgebraicType>,
+  Uniqueable<Timestamp, TimestampAlgebraicType>,
+  PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
+  Defaultable<Timestamp, TimestampAlgebraicType> {
   constructor() {
     super(Timestamp.getAlgebraicType());
   }
@@ -1486,11 +1471,10 @@ export class TimestampBuilder
 export class TimeDurationBuilder
   extends TypeBuilder<TimeDuration, TimeDurationAlgebraicType>
   implements
-    Indexable<TimeDuration, TimeDurationAlgebraicType>,
-    Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
-    PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
-    Defaultable<TimeDuration, TimeDurationAlgebraicType>
-{
+  Indexable<TimeDuration, TimeDurationAlgebraicType>,
+  Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
+  PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
+  Defaultable<TimeDuration, TimeDurationAlgebraicType> {
   constructor() {
     super(TimeDuration.getAlgebraicType());
   }
@@ -1594,12 +1578,11 @@ export class ColumnBuilder<
 export class U8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
   extends ColumnBuilder<number, AlgebraicTypeVariants.U8, M>
   implements
-    Indexable<number, AlgebraicTypeVariants.U8>,
-    Uniqueable<number, AlgebraicTypeVariants.U8>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
-    AutoIncrementable<number, AlgebraicTypeVariants.U8>,
-    Defaultable<number, AlgebraicTypeVariants.U8>
-{
+  Indexable<number, AlgebraicTypeVariants.U8>,
+  Uniqueable<number, AlgebraicTypeVariants.U8>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
+  AutoIncrementable<number, AlgebraicTypeVariants.U8>,
+  Defaultable<number, AlgebraicTypeVariants.U8> {
   index(): U8ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1639,16 +1622,15 @@ export class U8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
 }
 
 export class U16ColumnBuilder<
-    M extends ColumnMetadata<number> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<number> = DefaultMetadata,
+>
   extends ColumnBuilder<number, AlgebraicTypeVariants.U16, M>
   implements
-    Indexable<number, AlgebraicTypeVariants.U16>,
-    Uniqueable<number, AlgebraicTypeVariants.U16>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
-    AutoIncrementable<number, AlgebraicTypeVariants.U16>,
-    Defaultable<number, AlgebraicTypeVariants.U16>
-{
+  Indexable<number, AlgebraicTypeVariants.U16>,
+  Uniqueable<number, AlgebraicTypeVariants.U16>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
+  AutoIncrementable<number, AlgebraicTypeVariants.U16>,
+  Defaultable<number, AlgebraicTypeVariants.U16> {
   index(): U16ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1688,16 +1670,15 @@ export class U16ColumnBuilder<
 }
 
 export class U32ColumnBuilder<
-    M extends ColumnMetadata<number> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<number> = DefaultMetadata,
+>
   extends ColumnBuilder<number, AlgebraicTypeVariants.U32, M>
   implements
-    Indexable<number, AlgebraicTypeVariants.U32>,
-    Uniqueable<number, AlgebraicTypeVariants.U32>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
-    AutoIncrementable<number, AlgebraicTypeVariants.U32>,
-    Defaultable<number, AlgebraicTypeVariants.U32>
-{
+  Indexable<number, AlgebraicTypeVariants.U32>,
+  Uniqueable<number, AlgebraicTypeVariants.U32>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
+  AutoIncrementable<number, AlgebraicTypeVariants.U32>,
+  Defaultable<number, AlgebraicTypeVariants.U32> {
   index(): U32ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1737,16 +1718,15 @@ export class U32ColumnBuilder<
 }
 
 export class U64ColumnBuilder<
-    M extends ColumnMetadata<bigint> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<bigint> = DefaultMetadata,
+>
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.U64, M>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.U64>,
-    Uniqueable<bigint, AlgebraicTypeVariants.U64>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
-    Defaultable<bigint, AlgebraicTypeVariants.U64>
-{
+  Indexable<bigint, AlgebraicTypeVariants.U64>,
+  Uniqueable<bigint, AlgebraicTypeVariants.U64>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
+  Defaultable<bigint, AlgebraicTypeVariants.U64> {
   index(): U64ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1786,16 +1766,15 @@ export class U64ColumnBuilder<
 }
 
 export class U128ColumnBuilder<
-    M extends ColumnMetadata<bigint> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<bigint> = DefaultMetadata,
+>
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.U128, M>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.U128>,
-    Uniqueable<bigint, AlgebraicTypeVariants.U128>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
-    Defaultable<bigint, AlgebraicTypeVariants.U128>
-{
+  Indexable<bigint, AlgebraicTypeVariants.U128>,
+  Uniqueable<bigint, AlgebraicTypeVariants.U128>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
+  Defaultable<bigint, AlgebraicTypeVariants.U128> {
   index(): U128ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1835,16 +1814,15 @@ export class U128ColumnBuilder<
 }
 
 export class U256ColumnBuilder<
-    M extends ColumnMetadata<bigint> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<bigint> = DefaultMetadata,
+>
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.U256, M>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.U256>,
-    Uniqueable<bigint, AlgebraicTypeVariants.U256>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
-    Defaultable<bigint, AlgebraicTypeVariants.U256>
-{
+  Indexable<bigint, AlgebraicTypeVariants.U256>,
+  Uniqueable<bigint, AlgebraicTypeVariants.U256>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
+  Defaultable<bigint, AlgebraicTypeVariants.U256> {
   index(): U256ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1886,12 +1864,11 @@ export class U256ColumnBuilder<
 export class I8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
   extends ColumnBuilder<number, AlgebraicTypeVariants.I8, M>
   implements
-    Indexable<number, AlgebraicTypeVariants.I8>,
-    Uniqueable<number, AlgebraicTypeVariants.I8>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
-    AutoIncrementable<number, AlgebraicTypeVariants.I8>,
-    Defaultable<number, AlgebraicTypeVariants.I8>
-{
+  Indexable<number, AlgebraicTypeVariants.I8>,
+  Uniqueable<number, AlgebraicTypeVariants.I8>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
+  AutoIncrementable<number, AlgebraicTypeVariants.I8>,
+  Defaultable<number, AlgebraicTypeVariants.I8> {
   index(): I8ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1931,16 +1908,15 @@ export class I8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
 }
 
 export class I16ColumnBuilder<
-    M extends ColumnMetadata<number> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<number> = DefaultMetadata,
+>
   extends ColumnBuilder<number, AlgebraicTypeVariants.I16, M>
   implements
-    Indexable<number, AlgebraicTypeVariants.I16>,
-    Uniqueable<number, AlgebraicTypeVariants.I16>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
-    AutoIncrementable<number, AlgebraicTypeVariants.I16>,
-    Defaultable<number, AlgebraicTypeVariants.I16>
-{
+  Indexable<number, AlgebraicTypeVariants.I16>,
+  Uniqueable<number, AlgebraicTypeVariants.I16>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
+  AutoIncrementable<number, AlgebraicTypeVariants.I16>,
+  Defaultable<number, AlgebraicTypeVariants.I16> {
   index(): I16ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1980,16 +1956,15 @@ export class I16ColumnBuilder<
 }
 
 export class I32ColumnBuilder<
-    M extends ColumnMetadata<number> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<number> = DefaultMetadata,
+>
   extends ColumnBuilder<number, AlgebraicTypeVariants.I32, M>
   implements
-    Indexable<number, AlgebraicTypeVariants.I32>,
-    Uniqueable<number, AlgebraicTypeVariants.I32>,
-    PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
-    AutoIncrementable<number, AlgebraicTypeVariants.I32>,
-    Defaultable<number, AlgebraicTypeVariants.I32>
-{
+  Indexable<number, AlgebraicTypeVariants.I32>,
+  Uniqueable<number, AlgebraicTypeVariants.I32>,
+  PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
+  AutoIncrementable<number, AlgebraicTypeVariants.I32>,
+  Defaultable<number, AlgebraicTypeVariants.I32> {
   index(): I32ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2029,16 +2004,15 @@ export class I32ColumnBuilder<
 }
 
 export class I64ColumnBuilder<
-    M extends ColumnMetadata<bigint> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<bigint> = DefaultMetadata,
+>
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.I64, M>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.I64>,
-    Uniqueable<bigint, AlgebraicTypeVariants.I64>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
-    Defaultable<bigint, AlgebraicTypeVariants.I64>
-{
+  Indexable<bigint, AlgebraicTypeVariants.I64>,
+  Uniqueable<bigint, AlgebraicTypeVariants.I64>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
+  Defaultable<bigint, AlgebraicTypeVariants.I64> {
   index(): I64ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2078,16 +2052,15 @@ export class I64ColumnBuilder<
 }
 
 export class I128ColumnBuilder<
-    M extends ColumnMetadata<bigint> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<bigint> = DefaultMetadata,
+>
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.I128, M>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.I128>,
-    Uniqueable<bigint, AlgebraicTypeVariants.I128>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
-    Defaultable<bigint, AlgebraicTypeVariants.I128>
-{
+  Indexable<bigint, AlgebraicTypeVariants.I128>,
+  Uniqueable<bigint, AlgebraicTypeVariants.I128>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
+  Defaultable<bigint, AlgebraicTypeVariants.I128> {
   index(): I128ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2127,16 +2100,15 @@ export class I128ColumnBuilder<
 }
 
 export class I256ColumnBuilder<
-    M extends ColumnMetadata<bigint> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<bigint> = DefaultMetadata,
+>
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.I256, M>
   implements
-    Indexable<bigint, AlgebraicTypeVariants.I256>,
-    Uniqueable<bigint, AlgebraicTypeVariants.I256>,
-    PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
-    AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
-    Defaultable<bigint, AlgebraicTypeVariants.I256>
-{
+  Indexable<bigint, AlgebraicTypeVariants.I256>,
+  Uniqueable<bigint, AlgebraicTypeVariants.I256>,
+  PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
+  AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
+  Defaultable<bigint, AlgebraicTypeVariants.I256> {
   index(): I256ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2176,11 +2148,10 @@ export class I256ColumnBuilder<
 }
 
 export class F32ColumnBuilder<
-    M extends ColumnMetadata<number> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<number> = DefaultMetadata,
+>
   extends ColumnBuilder<number, AlgebraicTypeVariants.F32, M>
-  implements Defaultable<number, AlgebraicTypeVariants.F32>
-{
+  implements Defaultable<number, AlgebraicTypeVariants.F32> {
   default(value: number): F32ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new F32ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
@@ -2190,11 +2161,10 @@ export class F32ColumnBuilder<
 }
 
 export class F64ColumnBuilder<
-    M extends ColumnMetadata<number> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<number> = DefaultMetadata,
+>
   extends ColumnBuilder<number, AlgebraicTypeVariants.F64, M>
-  implements Defaultable<number, AlgebraicTypeVariants.F64>
-{
+  implements Defaultable<number, AlgebraicTypeVariants.F64> {
   default(value: number): F64ColumnBuilder<SetField<M, 'defaultValue', number>> {
     return new F64ColumnBuilder(this.typeBuilder, {
       ...this.columnMetadata,
@@ -2204,15 +2174,14 @@ export class F64ColumnBuilder<
 }
 
 export class BoolColumnBuilder<
-    M extends ColumnMetadata<boolean> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<boolean> = DefaultMetadata,
+>
   extends ColumnBuilder<boolean, AlgebraicTypeVariants.Bool, M>
   implements
-    Indexable<boolean, AlgebraicTypeVariants.Bool>,
-    Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
-    PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
-    Defaultable<boolean, AlgebraicTypeVariants.Bool>
-{
+  Indexable<boolean, AlgebraicTypeVariants.Bool>,
+  Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
+  PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
+  Defaultable<boolean, AlgebraicTypeVariants.Bool> {
   index(): BoolColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2246,15 +2215,14 @@ export class BoolColumnBuilder<
 }
 
 export class StringColumnBuilder<
-    M extends ColumnMetadata<string> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<string> = DefaultMetadata,
+>
   extends ColumnBuilder<string, AlgebraicTypeVariants.String, M>
   implements
-    Indexable<string, AlgebraicTypeVariants.String>,
-    Uniqueable<string, AlgebraicTypeVariants.String>,
-    PrimaryKeyable<string, AlgebraicTypeVariants.String>,
-    Defaultable<string, AlgebraicTypeVariants.String>
-{
+  Indexable<string, AlgebraicTypeVariants.String>,
+  Uniqueable<string, AlgebraicTypeVariants.String>,
+  PrimaryKeyable<string, AlgebraicTypeVariants.String>,
+  Defaultable<string, AlgebraicTypeVariants.String> {
   index(): StringColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2288,22 +2256,21 @@ export class StringColumnBuilder<
 }
 
 export class ArrayColumnBuilder<
-    Element extends TypeBuilder<any, any>,
-    M extends ColumnMetadata<
-      Array<InferTypeOfTypeBuilder<Element>>
-    > = DefaultMetadata,
-  >
+  Element extends TypeBuilder<any, any>,
+  M extends ColumnMetadata<
+    Array<InferTypeOfTypeBuilder<Element>>
+  > = DefaultMetadata,
+>
   extends ColumnBuilder<
     Array<InferTypeOfTypeBuilder<Element>>,
     { tag: 'Array'; value: InferSpacetimeTypeOfTypeBuilder<Element> },
     M
   >
   implements
-    Defaultable<
-      Array<InferTypeOfTypeBuilder<Element>>,
-      AlgebraicTypeVariants.Array
-    >
-{
+  Defaultable<
+    Array<InferTypeOfTypeBuilder<Element>>,
+    AlgebraicTypeVariants.Array
+  > {
   default(
     value: Array<InferTypeOfTypeBuilder<Element>>
   ): ArrayColumnBuilder<
@@ -2318,23 +2285,22 @@ export class ArrayColumnBuilder<
 }
 
 export class OptionColumnBuilder<
-    Value extends TypeBuilder<any, any>,
-    M extends ColumnMetadata<
-      InferTypeOfTypeBuilder<Value> | undefined
-    > = DefaultMetadata,
-  >
+  Value extends TypeBuilder<any, any>,
+  M extends ColumnMetadata<
+    InferTypeOfTypeBuilder<Value> | undefined
+  > = DefaultMetadata,
+>
   extends ColumnBuilder<
     InferTypeOfTypeBuilder<Value> | undefined,
-    OptionAlgebraicTypeType,
+    OptionAlgebraicType,
     M
   >
   implements
-    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicTypeType>
-{
+  Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType> {
   default(
     value: InferTypeOfTypeBuilder<Value> | undefined
   ): OptionColumnBuilder<
-    InferTypeOfTypeBuilder<Value>,
+    Value,
     SetField<M, 'defaultValue', InferTypeOfTypeBuilder<Value> | undefined>
   > {
     return new OptionColumnBuilder(this.typeBuilder, {
@@ -2345,9 +2311,9 @@ export class OptionColumnBuilder<
 }
 
 export class ProductColumnBuilder<
-    Elements extends ElementsObj,
-    M extends ColumnMetadata<ObjectType<Elements>> = DefaultMetadata,
-  >
+  Elements extends ElementsObj,
+  M extends ColumnMetadata<ObjectType<Elements>> = DefaultMetadata,
+>
   extends ColumnBuilder<
     ObjectType<Elements>,
     {
@@ -2356,8 +2322,7 @@ export class ProductColumnBuilder<
     },
     M
   >
-  implements Defaultable<ObjectType<Elements>, AlgebraicTypeVariants.Product>
-{
+  implements Defaultable<ObjectType<Elements>, AlgebraicTypeVariants.Product> {
   default(
     value: ObjectType<Elements>
   ): ProductColumnBuilder<Elements, SetField<DefaultMetadata, 'defaultValue', any>> {
@@ -2369,16 +2334,15 @@ export class ProductColumnBuilder<
 }
 
 export class SumColumnBuilder<
-    Variants extends VariantsObj,
-    M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
-  >
+  Variants extends VariantsObj,
+  M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
+>
   extends ColumnBuilder<
     EnumType<Variants>,
     { tag: 'Sum'; value: { variants: VariantsArrayFromVariantsObj<Variants> } },
     M
   >
-  implements Defaultable<EnumType<Variants>, AlgebraicTypeVariants.Sum>
-{
+  implements Defaultable<EnumType<Variants>, AlgebraicTypeVariants.Sum> {
   default(
     value: EnumType<Variants>
   ): SumColumnBuilder<Variants, SetField<DefaultMetadata, 'defaultValue', any>> {
@@ -2390,14 +2354,13 @@ export class SumColumnBuilder<
 }
 
 export class SimpleSumColumnBuilder<
-    Variants extends VariantsObj,
-    M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
-  >
+  Variants extends VariantsObj,
+  M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
+>
   extends SumColumnBuilder<Variants, M>
   implements
-    Indexable<EnumType<Variants>, AlgebraicTypeVariants.Sum>,
-    PrimaryKeyable<EnumType<Variants>, AlgebraicTypeVariants.Sum>
-{
+  Indexable<EnumType<Variants>, AlgebraicTypeVariants.Sum>,
+  PrimaryKeyable<EnumType<Variants>, AlgebraicTypeVariants.Sum> {
   index(): SimpleSumColumnBuilder<
     Variants,
     SetField<DefaultMetadata, 'indexType', 'btree'>
@@ -2428,15 +2391,14 @@ export class SimpleSumColumnBuilder<
 }
 
 export class IdentityColumnBuilder<
-    M extends ColumnMetadata<Identity> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<Identity> = DefaultMetadata,
+>
   extends ColumnBuilder<Identity, IdentityAlgebraicType, M>
   implements
-    Indexable<Identity, IdentityAlgebraicType>,
-    Uniqueable<Identity, IdentityAlgebraicType>,
-    PrimaryKeyable<Identity, IdentityAlgebraicType>,
-    Defaultable<Identity, IdentityAlgebraicType>
-{
+  Indexable<Identity, IdentityAlgebraicType>,
+  Uniqueable<Identity, IdentityAlgebraicType>,
+  PrimaryKeyable<Identity, IdentityAlgebraicType>,
+  Defaultable<Identity, IdentityAlgebraicType> {
   index(): IdentityColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2472,15 +2434,14 @@ export class IdentityColumnBuilder<
 }
 
 export class ConnectionIdColumnBuilder<
-    M extends ColumnMetadata<ConnectionId> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<ConnectionId> = DefaultMetadata,
+>
   extends ColumnBuilder<ConnectionId, ConnectionIdAlgebraicType, M>
   implements
-    Indexable<ConnectionId, ConnectionIdAlgebraicType>,
-    Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
-    PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
-    Defaultable<ConnectionId, ConnectionIdAlgebraicType>
-{
+  Indexable<ConnectionId, ConnectionIdAlgebraicType>,
+  Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
+  PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
+  Defaultable<ConnectionId, ConnectionIdAlgebraicType> {
   index(): ConnectionIdColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2516,15 +2477,14 @@ export class ConnectionIdColumnBuilder<
 }
 
 export class TimestampColumnBuilder<
-    M extends ColumnMetadata<Timestamp> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<Timestamp> = DefaultMetadata,
+>
   extends ColumnBuilder<Timestamp, TimestampAlgebraicType, M>
   implements
-    Indexable<Timestamp, TimestampAlgebraicType>,
-    Uniqueable<Timestamp, TimestampAlgebraicType>,
-    PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
-    Defaultable<Timestamp, TimestampAlgebraicType>
-{
+  Indexable<Timestamp, TimestampAlgebraicType>,
+  Uniqueable<Timestamp, TimestampAlgebraicType>,
+  PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
+  Defaultable<Timestamp, TimestampAlgebraicType> {
   index(): TimestampColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2560,15 +2520,14 @@ export class TimestampColumnBuilder<
 }
 
 export class TimeDurationColumnBuilder<
-    M extends ColumnMetadata<TimeDuration> = DefaultMetadata,
-  >
+  M extends ColumnMetadata<TimeDuration> = DefaultMetadata,
+>
   extends ColumnBuilder<TimeDuration, TimeDurationAlgebraicType, M>
   implements
-    Indexable<TimeDuration, TimeDurationAlgebraicType>,
-    Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
-    PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
-    Defaultable<TimeDuration, TimeDurationAlgebraicType>
-{
+  Indexable<TimeDuration, TimeDurationAlgebraicType>,
+  Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
+  PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
+  Defaultable<TimeDuration, TimeDurationAlgebraicType> {
   index(): TimeDurationColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2834,6 +2793,9 @@ export const t = {
     }
     if (
       Object.values(obj).every(x => {
+        if (typeof x === 'function') {
+          return false;
+        }
         const ty: AlgebraicType = x.resolveType();
         return ty.tag === 'Product' && ty.value.elements.length === 0;
       })
@@ -2860,6 +2822,40 @@ export const t = {
     return new ProductBuilder({});
   },
 
+  lazy<Build extends () => TypeBuilder<any, any>>(
+    thunk: Build
+  ): ReturnType<Build> {
+    type B = ReturnType<Build>;
+    let cached: B | null = null;
+    const get = (): B => (cached ??= thunk() as B);
+
+    const proxy = new Proxy({} as unknown as B, {
+      get(_t, prop, recv) {
+        const target = get() as any;
+        const val = Reflect.get(target, prop, recv);
+        return typeof val === "function" ? val.bind(target) : val;
+      },
+      set(_t, prop, value, recv) {
+        return Reflect.set(get() as any, prop, value, recv);
+      },
+      has(_t, prop) {
+        return prop in (get() as any);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(get() as any);
+      },
+      getOwnPropertyDescriptor(_t, prop) {
+        return Object.getOwnPropertyDescriptor(get() as any, prop);
+      },
+      getPrototypeOf() {
+        // makes `instanceof TypeBuilder` work if you care about it
+        return Object.getPrototypeOf(get() as any);
+      },
+    }) as B;
+
+    return proxy;
+  },
+
   /**
    * This is a special helper function for conveniently creating {@link ScheduleAt} type columns.
    * @returns A new ColumnBuilder instance with the {@link ScheduleAt} type.
@@ -2868,24 +2864,24 @@ export const t = {
     ScheduleAt,
     ReturnType<typeof ScheduleAt.getAlgebraicType>,
     Omit<ColumnMetadata<ScheduleAt>, 'isScheduleAt'> & { isScheduleAt: true }
-  > => {
-    return new ColumnBuilder(
-      new TypeBuilder(ScheduleAt.getAlgebraicType()),
-      set(defaultMetadata, { isScheduleAt: true })
-    );
-  },
+    > => {
+  return new ColumnBuilder(
+    new TypeBuilder(ScheduleAt.getAlgebraicType()),
+    set(defaultMetadata, { isScheduleAt: true })
+  );
+},
 
-  /**
-   * This is a convenience method for creating a column with the {@link Option} type.
-   * You can create a column of the same type by constructing an enum with a `some` and `none` variant.
-   * @param value The type of the value contained in the `some` variant of the `Option`.
-   * @returns A new {@link OptionBuilder} instance with the {@link Option} type.
-   */
-  option<Value extends TypeBuilder<any, any>>(
-    value: Value
-  ): OptionBuilder<Value> {
-    return new OptionBuilder(value);
-  },
+/**
+ * This is a convenience method for creating a column with the {@link Option} type.
+ * You can create a column of the same type by constructing an enum with a `some` and `none` variant.
+ * @param value The type of the value contained in the `some` variant of the `Option`.
+ * @returns A new {@link OptionBuilder} instance with the {@link Option} type.
+ */
+option<Value extends TypeBuilder<any, any>>(
+  value: Value
+): OptionBuilder < Value > {
+  return new OptionBuilder(value);
+},
 
   /**
    * This is a convenience method for creating a column with the {@link Identity} type.
@@ -2896,31 +2892,31 @@ export const t = {
     return new IdentityBuilder();
   },
 
-  /**
-   * This is a convenience method for creating a column with the {@link ConnectionId} type.
-   * You can create a column of the same type by constructing an `object` with a single `__connection_id__` element.
-   * @returns A new {@link TypeBuilder} instance with the {@link ConnectionId} type.
-   */
-  connectionId: (): ConnectionIdBuilder => {
-    return new ConnectionIdBuilder();
-  },
-
-  /**
-   * This is a convenience method for creating a column with the {@link Timestamp} type.
-   * You can create a column of the same type by constructing an `object` with a single `__timestamp_micros_since_unix_epoch__` element.
-   * @returns A new {@link TypeBuilder} instance with the {@link Timestamp} type.
-   */
-  timestamp: (): TimestampBuilder => {
-    return new TimestampBuilder();
-  },
+    /**
+     * This is a convenience method for creating a column with the {@link ConnectionId} type.
+     * You can create a column of the same type by constructing an `object` with a single `__connection_id__` element.
+     * @returns A new {@link TypeBuilder} instance with the {@link ConnectionId} type.
+     */
+    connectionId: (): ConnectionIdBuilder => {
+      return new ConnectionIdBuilder();
+    },
 
-  /**
-   * This is a convenience method for creating a column with the {@link TimeDuration} type.
-   * You can create a column of the same type by constructing an `object` with a single `__time_duration_micros__` element.
-   * @returns A new {@link TypeBuilder} instance with the {@link TimeDuration} type.
-   */
-  timeDuration: (): TimeDurationBuilder => {
-    return new TimeDurationBuilder();
-  },
-} as const;
+      /**
+       * This is a convenience method for creating a column with the {@link Timestamp} type.
+       * You can create a column of the same type by constructing an `object` with a single `__timestamp_micros_since_unix_epoch__` element.
+       * @returns A new {@link TypeBuilder} instance with the {@link Timestamp} type.
+       */
+      timestamp: (): TimestampBuilder => {
+        return new TimestampBuilder();
+      },
+
+        /**
+         * This is a convenience method for creating a column with the {@link TimeDuration} type.
+         * You can create a column of the same type by constructing an `object` with a single `__time_duration_micros__` element.
+         * @returns A new {@link TypeBuilder} instance with the {@link TimeDuration} type.
+         */
+        timeDuration: (): TimeDurationBuilder => {
+          return new TimeDurationBuilder();
+        },
+} as const ;
 export default t;
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index d51dded9905..b371426cf15 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -367,6 +367,7 @@ export class DbConnectionImpl<
       const rowType = table!.rowType;
       const columnsArray = Object.entries(table!.columns);
       const primaryKeyColumnEntry = columnsArray.find(col => col[1].columnMetadata.isPrimaryKey);
+      let previousOffset = 0;
       while (reader.remaining > 0) {
         const row = ProductType.deserializeValue(reader, rowType);
         let rowId: ComparablePrimitive | undefined = undefined;
@@ -379,12 +380,14 @@ export class DbConnectionImpl<
           );
         } else {
           // Get a view of the bytes for this row.
-          const rowBytes = buffer.subarray(0, reader.offset);
+          const rowBytes = buffer.subarray(previousOffset, reader.offset);
           // Convert it to a base64 string, so we can use it as a map key.
           const asBase64 = fromByteArray(rowBytes);
           rowId = asBase64;
         }
 
+        previousOffset = reader.offset;
+
         rows.push({
           type,
           rowId,
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index b1f5e6db48a..dcb1dd4bcf3 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -107,7 +107,6 @@ impl Lang for TypeScript {
         }
     }
 
-
     /// e.g.
     /// ```ts
     /// table({
@@ -352,6 +351,8 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
     // All library imports are prefixed with `__` to avoid
     // clashing with the names of user generated types.
     let mut types = [
+        "TypeBuilder as __TypeBuilder",
+        "type AlgebraicTypeType as __AlgebraicTypeType",
         "DbConnectionBuilder as __DbConnectionBuilder",
         "convertToAccessorMap as __convertToAccessorMap",
         "type EventContextInterface as __EventContextInterface",
@@ -550,7 +551,7 @@ fn write_type_builder<W: Write>(module: &ModuleDef, out: &mut W, ty: &AlgebraicT
             write!(out, ")")?;
         },
         AlgebraicTypeUse::Ref(r) => {
-            write!(out, "{}", type_ref_name(module, *r))?;
+            write!(out, "__t.lazy(() => {})", type_ref_name(module, *r))?;
         },
     }
     Ok(())
@@ -615,11 +616,61 @@ fn define_body_for_sum(
     name: &str,
     variants: &[(Identifier, AlgebraicTypeUse)],
 ) {
+
+// /* eslint-disable */
+// /* tslint:disable */
+// import {
+//   TypeBuilder,
+//   convertToAccessorMap as __convertToAccessorMap,
+//   reducerSchema as __reducerSchema,
+//   reducers as __reducers,
+//   schema as __schema,
+//   t as __t,
+//   table as __table,
+//   type AlgebraicTypeType,
+//   type Infer as __Infer,
+//   type RemoteModule as __RemoteModule,
+// } from '../../index';
+// import SumType from './sum_type_type';
+// import ProductType from './product_type_type';
+
+// // The tagged union or sum type for the algebraic type `AlgebraicType`.
+// const AlgebraicType: TypeBuilder<AlgebraicTypeType, AlgebraicTypeType> = __t.enum('AlgebraicType', {
+//   Ref: __t.u32(),
+//   Sum: SumType,
+//   Product: ProductType,
+//   Array: __t.lazy(() => AlgebraicType),
+//   String: __t.unit(),
+//   Bool: __t.unit(),
+//   I8: __t.unit(),
+//   U8: __t.unit(),
+//   I16: __t.unit(),
+//   U16: __t.unit(),
+//   I32: __t.unit(),
+//   U32: __t.unit(),
+//   I64: __t.unit(),
+//   U64: __t.unit(),
+//   I128: __t.unit(),
+//   U128: __t.unit(),
+//   I256: __t.unit(),
+//   U256: __t.unit(),
+//   F32: __t.unit(),
+//   F64: __t.unit(),
+// });
+
+// export default AlgebraicType;
+
     writeln!(out, "// The tagged union or sum type for the algebraic type `{name}`.");
-    write!(out, "export default __t.enum(\"{name}\", {{");
-    out.with_indent(|out| write_object_type_builder_fields(module, out, variants, true).unwrap());
+    write!(out, "const {name}");
+    if name == "AlgebraicType" {
+        write!(out, ": __TypeBuilder<__AlgebraicTypeType, __AlgebraicTypeType>");
+    }
+    write!(out, " = __t.enum(\"{name}\", {{");
+    out.with_indent(|out| write_object_type_builder_fields(module, out, variants, false).unwrap());
     writeln!(out, "}});");
     out.newline();
+    writeln!(out, "export default {name};");
+    out.newline();
 }
 
 fn type_ref_module_name(module: &ModuleDef, type_ref: AlgebraicTypeRef) -> String {

From 7099b6518da404542e5fd3daaf6425310e279914 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Wed, 5 Nov 2025 18:54:24 -0500
Subject: [PATCH 11/23] Sweet heavens I think it's alive

---
 .../src/lib/algebraic_type.ts                 |   2 +-
 .../raw_column_default_value_v_9_type.ts      |   2 +-
 .../src/lib/type_builders.ts                  | 123 ++++++----
 .../src/sdk/client_api/bsatn_row_list_type.ts |  84 ++-----
 .../src/sdk/client_api/call_procedure_type.ts |  33 +++
 .../src/sdk/client_api/call_reducer_type.ts   |  83 ++-----
 .../src/sdk/client_api/client_message_type.ts | 171 +++----------
 .../sdk/client_api/client_message_variants.ts |  86 +++----
 .../compressable_query_update_type.ts         | 105 ++------
 .../compressable_query_update_variants.ts     |  36 ++-
 .../sdk/client_api/database_update_type.ts    |  79 ++----
 .../src/sdk/client_api/energy_quanta_type.ts  |  72 ++----
 .../src/sdk/client_api/identity_token_type.ts |  84 ++-----
 .../src/sdk/client_api/index.ts               | 217 +++++++----------
 .../client_api/initial_subscription_type.ts   |  88 ++-----
 .../client_api/one_off_query_response_type.ts | 101 ++------
 .../src/sdk/client_api/one_off_query_type.ts  |  77 ++----
 .../src/sdk/client_api/one_off_table_type.ts  |  78 ++----
 .../sdk/client_api/procedure_result_type.ts   |  34 +++
 .../sdk/client_api/procedure_status_type.ts   |  36 +++
 .../client_api/procedure_status_variants.ts   |  30 +++
 .../src/sdk/client_api/query_id_type.ts       |  70 ++----
 .../src/sdk/client_api/query_update_type.ts   |  84 ++-----
 .../sdk/client_api/reducer_call_info_type.ts  |  84 ++-----
 .../src/sdk/client_api/row_size_hint_type.ts  |  82 ++-----
 .../sdk/client_api/row_size_hint_variants.ts  |  27 +--
 .../src/sdk/client_api/server_message_type.ts | 227 +++---------------
 .../sdk/client_api/server_message_variants.ts |  95 +++-----
 .../sdk/client_api/subscribe_applied_type.ts  |  95 ++------
 .../subscribe_multi_applied_type.ts           |  95 ++------
 .../sdk/client_api/subscribe_multi_type.ts    |  85 ++-----
 .../src/sdk/client_api/subscribe_rows_type.ts |  85 ++-----
 .../sdk/client_api/subscribe_single_type.ts   |  82 ++-----
 .../src/sdk/client_api/subscribe_type.ts      |  77 ++----
 .../sdk/client_api/subscription_error_type.ts | 102 ++------
 .../src/sdk/client_api/table_update_type.ts   |  89 ++-----
 .../transaction_update_light_type.ts          |  83 ++-----
 .../sdk/client_api/transaction_update_type.ts | 123 ++--------
 .../client_api/unsubscribe_applied_type.ts    |  95 ++------
 .../unsubscribe_multi_applied_type.ts         |  96 ++------
 .../sdk/client_api/unsubscribe_multi_type.ts  |  79 ++----
 .../src/sdk/client_api/unsubscribe_type.ts    |  78 ++----
 .../src/sdk/client_api/update_status_type.ts  |  95 ++------
 .../sdk/client_api/update_status_variants.ts  |  36 ++-
 .../src/sdk/db_connection_impl.ts             |  41 ++--
 .../module_bindings/create_player_reducer.ts  |   7 +-
 .../test-app/src/module_bindings/index.ts     |   5 +-
 .../src/module_bindings/player_table.ts       |   7 +-
 .../src/module_bindings/player_type.ts        |   7 +-
 .../src/module_bindings/point_type.ts         |   5 +-
 .../module_bindings/unindexed_player_table.ts |   7 +-
 .../module_bindings/unindexed_player_type.ts  |   7 +-
 .../src/module_bindings/user_table.ts         |   5 +-
 .../test-app/src/module_bindings/user_type.ts |   5 +-
 .../examples/regen-typescript-moduledef.rs    |   2 +-
 crates/codegen/src/typescript.rs              |  51 +---
 56 files changed, 1080 insertions(+), 2754 deletions(-)
 create mode 100644 crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
 create mode 100644 crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
 create mode 100644 crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
 create mode 100644 crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts

diff --git a/crates/bindings-typescript/src/lib/algebraic_type.ts b/crates/bindings-typescript/src/lib/algebraic_type.ts
index cfbae70a6ff..fde84d63a4e 100644
--- a/crates/bindings-typescript/src/lib/algebraic_type.ts
+++ b/crates/bindings-typescript/src/lib/algebraic_type.ts
@@ -80,7 +80,7 @@ export const AlgebraicType = {
     tag: 'Product',
     value,
   }),
-  Array: <T extends MaybeLazy<AlgebraicTypeType>[]>(value: T): { tag: 'Array'; value: T } => ({
+  Array: <T extends MaybeLazy<AlgebraicTypeType>>(value: T): { tag: 'Array'; value: T } => ({
     tag: 'Array',
     value,
   }),
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
index 6ee8e3467b6..207fe21991f 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
@@ -19,5 +19,5 @@ import {
 export default __t.object('RawColumnDefaultValueV9', {
   table: __t.string(),
   colId: __t.u16(),
-  value: __t.array(__t.u8()),
+  value: __t.byteArray(),
 });
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index b42b1f9c238..183b2a079d8 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -1094,6 +1094,25 @@ export class ArrayBuilder<Element extends TypeBuilder<any, any>>
   }
 }
 
+export class ByteArrayBuilder
+  extends TypeBuilder<
+    Uint8Array,
+    { tag: 'Array'; value: AlgebraicTypeVariants.U8 }
+  >
+  implements Defaultable<Uint8Array, any> {
+
+  constructor() {
+    super(AlgebraicType.Array(AlgebraicType.U8));
+  }
+  default(
+    value: Uint8Array 
+  ): ByteArrayColumnBuilder<SetField<DefaultMetadata, 'defaultValue', any>> {
+    return new ByteArrayColumnBuilder(
+      set(defaultMetadata, { defaultValue: value })
+    );
+  }
+}
+
 export class OptionBuilder<Value extends TypeBuilder<any, any>>
   extends TypeBuilder<
     InferTypeOfTypeBuilder<Value> | undefined,
@@ -2284,6 +2303,16 @@ export class ArrayColumnBuilder<
   }
 }
 
+export class ByteArrayColumnBuilder<M extends ColumnMetadata<Uint8Array> = DefaultMetadata>
+  extends ColumnBuilder<Uint8Array, {
+    tag: 'Array';
+    value: AlgebraicTypeVariants.U8;
+  }, M> {
+  constructor(metadata: M) {
+    super(new TypeBuilder(AlgebraicType.Array(AlgebraicType.U8)), metadata);
+  }
+}
+
 export class OptionColumnBuilder<
   Value extends TypeBuilder<any, any>,
   M extends ColumnMetadata<
@@ -2864,24 +2893,24 @@ export const t = {
     ScheduleAt,
     ReturnType<typeof ScheduleAt.getAlgebraicType>,
     Omit<ColumnMetadata<ScheduleAt>, 'isScheduleAt'> & { isScheduleAt: true }
-    > => {
-  return new ColumnBuilder(
-    new TypeBuilder(ScheduleAt.getAlgebraicType()),
-    set(defaultMetadata, { isScheduleAt: true })
-  );
-},
+  > => {
+    return new ColumnBuilder(
+      new TypeBuilder(ScheduleAt.getAlgebraicType()),
+      set(defaultMetadata, { isScheduleAt: true })
+    );
+  },
 
-/**
- * This is a convenience method for creating a column with the {@link Option} type.
- * You can create a column of the same type by constructing an enum with a `some` and `none` variant.
- * @param value The type of the value contained in the `some` variant of the `Option`.
- * @returns A new {@link OptionBuilder} instance with the {@link Option} type.
- */
-option<Value extends TypeBuilder<any, any>>(
-  value: Value
-): OptionBuilder < Value > {
-  return new OptionBuilder(value);
-},
+  /**
+   * This is a convenience method for creating a column with the {@link Option} type.
+   * You can create a column of the same type by constructing an enum with a `some` and `none` variant.
+   * @param value The type of the value contained in the `some` variant of the `Option`.
+   * @returns A new {@link OptionBuilder} instance with the {@link Option} type.
+   */
+  option<Value extends TypeBuilder<any, any>>(
+    value: Value
+  ): OptionBuilder<Value> {
+    return new OptionBuilder(value);
+  },
 
   /**
    * This is a convenience method for creating a column with the {@link Identity} type.
@@ -2892,31 +2921,41 @@ option<Value extends TypeBuilder<any, any>>(
     return new IdentityBuilder();
   },
 
-    /**
-     * This is a convenience method for creating a column with the {@link ConnectionId} type.
-     * You can create a column of the same type by constructing an `object` with a single `__connection_id__` element.
-     * @returns A new {@link TypeBuilder} instance with the {@link ConnectionId} type.
-     */
-    connectionId: (): ConnectionIdBuilder => {
-      return new ConnectionIdBuilder();
-    },
+  /**
+   * This is a convenience method for creating a column with the {@link ConnectionId} type.
+   * You can create a column of the same type by constructing an `object` with a single `__connection_id__` element.
+   * @returns A new {@link TypeBuilder} instance with the {@link ConnectionId} type.
+   */
+  connectionId: (): ConnectionIdBuilder => {
+    return new ConnectionIdBuilder();
+  },
 
-      /**
-       * This is a convenience method for creating a column with the {@link Timestamp} type.
-       * You can create a column of the same type by constructing an `object` with a single `__timestamp_micros_since_unix_epoch__` element.
-       * @returns A new {@link TypeBuilder} instance with the {@link Timestamp} type.
-       */
-      timestamp: (): TimestampBuilder => {
-        return new TimestampBuilder();
-      },
+  /**
+   * This is a convenience method for creating a column with the {@link Timestamp} type.
+   * You can create a column of the same type by constructing an `object` with a single `__timestamp_micros_since_unix_epoch__` element.
+   * @returns A new {@link TypeBuilder} instance with the {@link Timestamp} type.
+   */
+  timestamp: (): TimestampBuilder => {
+    return new TimestampBuilder();
+  },
 
-        /**
-         * This is a convenience method for creating a column with the {@link TimeDuration} type.
-         * You can create a column of the same type by constructing an `object` with a single `__time_duration_micros__` element.
-         * @returns A new {@link TypeBuilder} instance with the {@link TimeDuration} type.
-         */
-        timeDuration: (): TimeDurationBuilder => {
-          return new TimeDurationBuilder();
-        },
-} as const ;
+  /**
+   * This is a convenience method for creating a column with the {@link TimeDuration} type.
+   * You can create a column of the same type by constructing an `object` with a single `__time_duration_micros__` element.
+   * @returns A new {@link TypeBuilder} instance with the {@link TimeDuration} type.
+   */
+  timeDuration: (): TimeDurationBuilder => {
+    return new TimeDurationBuilder();
+  },
+
+  /**
+   * This is a convenience method for creating a column with the {@link ByteArray} type.
+   * You can create a column of the same type by constructing an `array` of `u8`. 
+   * The TypeScript representation is {@link Uint8Array}.
+   * @returns A new {@link ByteArrayBuilder} instance with the {@link ByteArray} type.
+   */
+  byteArray: (): ByteArrayBuilder => {
+    return new ByteArrayBuilder();
+  },
+} as const;
 export default t;
diff --git a/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts b/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
index 2e769689c07..7767bc4bdd8 100644
--- a/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
@@ -4,79 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { RowSizeHint } from './row_size_hint_type';
-// Mark import as potentially unused
-declare type __keep_RowSizeHint = RowSizeHint;
+} from '../../';
+import RowSizeHint from './row_size_hint_type';
 
-export type BsatnRowList = {
-  sizeHint: RowSizeHint;
-  rowsData: Uint8Array;
-};
-let _cached_BsatnRowList_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const BsatnRowList = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_BsatnRowList_type_value) return _cached_BsatnRowList_type_value;
-    _cached_BsatnRowList_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_BsatnRowList_type_value.value.elements.push(
-      {
-        name: 'sizeHint',
-        algebraicType: RowSizeHint.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'rowsData',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      }
-    );
-    return _cached_BsatnRowList_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: BsatnRowList): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      BsatnRowList.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): BsatnRowList {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      BsatnRowList.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default BsatnRowList;
+export default __t.object('BsatnRowList', {
+  sizeHint: __t.lazy(() => RowSizeHint),
+  rowsData: __t.byteArray(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts b/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
new file mode 100644
index 00000000000..49ae8862530
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
@@ -0,0 +1,33 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+/* eslint-disable */
+/* tslint:disable */
+import {
+  DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionImpl as __DbConnectionImpl,
+  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
+  type ErrorContextInterface as __ErrorContextInterface,
+  type Event as __Event,
+  type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
+  type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
+  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
+} from '../../';
+
+export default __t.object('CallProcedure', {
+  procedure: __t.string(),
+  args: __t.byteArray(),
+  requestId: __t.u32(),
+  flags: __t.u8(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts b/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
index 8b41532f796..5d03c628ddd 100644
--- a/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
@@ -4,77 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type CallReducer = {
-  reducer: string;
-  args: Uint8Array;
-  requestId: number;
-  flags: number;
-};
-let _cached_CallReducer_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const CallReducer = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_CallReducer_type_value) return _cached_CallReducer_type_value;
-    _cached_CallReducer_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_CallReducer_type_value.value.elements.push(
-      { name: 'reducer', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'args',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      },
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'flags', algebraicType: __AlgebraicTypeValue.U8 }
-    );
-    return _cached_CallReducer_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: CallReducer): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      CallReducer.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): CallReducer {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      CallReducer.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default CallReducer;
+export default __t.object('CallReducer', {
+  reducer: __t.string(),
+  args: __t.byteArray(),
+  requestId: __t.u32(),
+  flags: __t.u8(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
index 4883bbf7a85..81457076c19 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
@@ -4,158 +4,47 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { CallReducer } from './call_reducer_type';
-// Mark import as potentially unused
-declare type __keep_CallReducer = CallReducer;
-import { Subscribe } from './subscribe_type';
-// Mark import as potentially unused
-declare type __keep_Subscribe = Subscribe;
-import { OneOffQuery } from './one_off_query_type';
-// Mark import as potentially unused
-declare type __keep_OneOffQuery = OneOffQuery;
-import { SubscribeSingle } from './subscribe_single_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeSingle = SubscribeSingle;
-import { SubscribeMulti } from './subscribe_multi_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeMulti = SubscribeMulti;
-import { Unsubscribe } from './unsubscribe_type';
-// Mark import as potentially unused
-declare type __keep_Unsubscribe = Unsubscribe;
-import { UnsubscribeMulti } from './unsubscribe_multi_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeMulti = UnsubscribeMulti;
+} from '../../';
+import CallReducer from './call_reducer_type';
+import Subscribe from './subscribe_type';
+import OneOffQuery from './one_off_query_type';
+import SubscribeSingle from './subscribe_single_type';
+import SubscribeMulti from './subscribe_multi_type';
+import Unsubscribe from './unsubscribe_type';
+import UnsubscribeMulti from './unsubscribe_multi_type';
+import CallProcedure from './call_procedure_type';
 
 import * as ClientMessageVariants from './client_message_variants';
 
 // The tagged union or sum type for the algebraic type `ClientMessage`.
-export type ClientMessage =
-  | ClientMessageVariants.CallReducer
-  | ClientMessageVariants.Subscribe
-  | ClientMessageVariants.OneOffQuery
-  | ClientMessageVariants.SubscribeSingle
-  | ClientMessageVariants.SubscribeMulti
-  | ClientMessageVariants.Unsubscribe
-  | ClientMessageVariants.UnsubscribeMulti;
-
-let _cached_ClientMessage_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const ClientMessage = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  CallReducer: (value: CallReducer): ClientMessageVariants.CallReducer => ({
-    tag: 'CallReducer',
-    value,
-  }),
-  Subscribe: (value: Subscribe): ClientMessageVariants.Subscribe => ({
-    tag: 'Subscribe',
-    value,
-  }),
-  OneOffQuery: (value: OneOffQuery): ClientMessageVariants.OneOffQuery => ({
-    tag: 'OneOffQuery',
-    value,
-  }),
-  SubscribeSingle: (
-    value: SubscribeSingle
-  ): ClientMessageVariants.SubscribeSingle => ({
-    tag: 'SubscribeSingle',
-    value,
-  }),
-  SubscribeMulti: (
-    value: SubscribeMulti
-  ): ClientMessageVariants.SubscribeMulti => ({ tag: 'SubscribeMulti', value }),
-  Unsubscribe: (value: Unsubscribe): ClientMessageVariants.Unsubscribe => ({
-    tag: 'Unsubscribe',
-    value,
-  }),
-  UnsubscribeMulti: (
-    value: UnsubscribeMulti
-  ): ClientMessageVariants.UnsubscribeMulti => ({
-    tag: 'UnsubscribeMulti',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ClientMessage_type_value)
-      return _cached_ClientMessage_type_value;
-    _cached_ClientMessage_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_ClientMessage_type_value.value.variants.push(
-      {
-        name: 'CallReducer',
-        algebraicType: CallReducer.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'Subscribe',
-        algebraicType: Subscribe.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'OneOffQuery',
-        algebraicType: OneOffQuery.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'SubscribeSingle',
-        algebraicType: SubscribeSingle.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'SubscribeMulti',
-        algebraicType: SubscribeMulti.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'Unsubscribe',
-        algebraicType: Unsubscribe.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'UnsubscribeMulti',
-        algebraicType: UnsubscribeMulti.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_ClientMessage_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ClientMessage): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ClientMessage.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ClientMessage {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ClientMessage.getTypeScriptAlgebraicType()
-    );
-  },
-};
+const ClientMessage = __t.enum('ClientMessage', {
+  CallReducer: __t.lazy(() => CallReducer),
+  Subscribe: __t.lazy(() => Subscribe),
+  OneOffQuery: __t.lazy(() => OneOffQuery),
+  SubscribeSingle: __t.lazy(() => SubscribeSingle),
+  SubscribeMulti: __t.lazy(() => SubscribeMulti),
+  Unsubscribe: __t.lazy(() => Unsubscribe),
+  UnsubscribeMulti: __t.lazy(() => UnsubscribeMulti),
+  CallProcedure: __t.lazy(() => CallProcedure),
+});
 
 export default ClientMessage;
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
index a5bcbd5eae6..57e163c2671 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
@@ -4,64 +4,64 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { CallReducer as CallReducerType } from './call_reducer_type';
-// Mark import as potentially unused
-declare type __keep_CallReducerType = CallReducerType;
-import { Subscribe as SubscribeType } from './subscribe_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeType = SubscribeType;
-import { OneOffQuery as OneOffQueryType } from './one_off_query_type';
-// Mark import as potentially unused
-declare type __keep_OneOffQueryType = OneOffQueryType;
-import { SubscribeSingle as SubscribeSingleType } from './subscribe_single_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeSingleType = SubscribeSingleType;
-import { SubscribeMulti as SubscribeMultiType } from './subscribe_multi_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeMultiType = SubscribeMultiType;
-import { Unsubscribe as UnsubscribeType } from './unsubscribe_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeType = UnsubscribeType;
-import { UnsubscribeMulti as UnsubscribeMultiType } from './unsubscribe_multi_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeMultiType = UnsubscribeMultiType;
+} from '../../';
+import CallReducerType from './call_reducer_type';
+import SubscribeType from './subscribe_type';
+import OneOffQueryType from './one_off_query_type';
+import SubscribeSingleType from './subscribe_single_type';
+import SubscribeMultiType from './subscribe_multi_type';
+import UnsubscribeType from './unsubscribe_type';
+import UnsubscribeMultiType from './unsubscribe_multi_type';
+import CallProcedureType from './call_procedure_type';
 
-export type CallReducer = { tag: 'CallReducer'; value: CallReducerType };
-export type Subscribe = { tag: 'Subscribe'; value: SubscribeType };
-export type OneOffQuery = { tag: 'OneOffQuery'; value: OneOffQueryType };
+export type CallReducer = {
+  tag: 'CallReducer';
+  value: __Infer<typeof CallReducerType>;
+};
+export type Subscribe = {
+  tag: 'Subscribe';
+  value: __Infer<typeof SubscribeType>;
+};
+export type OneOffQuery = {
+  tag: 'OneOffQuery';
+  value: __Infer<typeof OneOffQueryType>;
+};
 export type SubscribeSingle = {
   tag: 'SubscribeSingle';
-  value: SubscribeSingleType;
+  value: __Infer<typeof SubscribeSingleType>;
 };
 export type SubscribeMulti = {
   tag: 'SubscribeMulti';
-  value: SubscribeMultiType;
+  value: __Infer<typeof SubscribeMultiType>;
+};
+export type Unsubscribe = {
+  tag: 'Unsubscribe';
+  value: __Infer<typeof UnsubscribeType>;
 };
-export type Unsubscribe = { tag: 'Unsubscribe'; value: UnsubscribeType };
 export type UnsubscribeMulti = {
   tag: 'UnsubscribeMulti';
-  value: UnsubscribeMultiType;
+  value: __Infer<typeof UnsubscribeMultiType>;
+};
+export type CallProcedure = {
+  tag: 'CallProcedure';
+  value: __Infer<typeof CallProcedureType>;
 };
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
index 65ec3b3f8eb..adf37943a66 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
@@ -4,104 +4,35 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryUpdate } from './query_update_type';
-// Mark import as potentially unused
-declare type __keep_QueryUpdate = QueryUpdate;
+} from '../../';
+import QueryUpdate from './query_update_type';
 
 import * as CompressableQueryUpdateVariants from './compressable_query_update_variants';
 
 // The tagged union or sum type for the algebraic type `CompressableQueryUpdate`.
-export type CompressableQueryUpdate =
-  | CompressableQueryUpdateVariants.Uncompressed
-  | CompressableQueryUpdateVariants.Brotli
-  | CompressableQueryUpdateVariants.Gzip;
-
-let _cached_CompressableQueryUpdate_type_value: __AlgebraicTypeType | null =
-  null;
-
-// A value with helper functions to construct the type.
-export const CompressableQueryUpdate = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  Uncompressed: (
-    value: QueryUpdate
-  ): CompressableQueryUpdateVariants.Uncompressed => ({
-    tag: 'Uncompressed',
-    value,
-  }),
-  Brotli: (value: Uint8Array): CompressableQueryUpdateVariants.Brotli => ({
-    tag: 'Brotli',
-    value,
-  }),
-  Gzip: (value: Uint8Array): CompressableQueryUpdateVariants.Gzip => ({
-    tag: 'Gzip',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_CompressableQueryUpdate_type_value)
-      return _cached_CompressableQueryUpdate_type_value;
-    _cached_CompressableQueryUpdate_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_CompressableQueryUpdate_type_value.value.variants.push(
-      {
-        name: 'Uncompressed',
-        algebraicType: QueryUpdate.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'Brotli',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      },
-      {
-        name: 'Gzip',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      }
-    );
-    return _cached_CompressableQueryUpdate_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: CompressableQueryUpdate): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      CompressableQueryUpdate.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): CompressableQueryUpdate {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      CompressableQueryUpdate.getTypeScriptAlgebraicType()
-    );
-  },
-};
+const CompressableQueryUpdate = __t.enum('CompressableQueryUpdate', {
+  Uncompressed: __t.lazy(() => QueryUpdate),
+  Brotli: __t.byteArray(),
+  Gzip: __t.byteArray(),
+});
 
 export default CompressableQueryUpdate;
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
index a1542e7d2bc..e5ea8187da4 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
@@ -4,33 +4,31 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryUpdate as QueryUpdateType } from './query_update_type';
-// Mark import as potentially unused
-declare type __keep_QueryUpdateType = QueryUpdateType;
+} from '../../';
+import QueryUpdateType from './query_update_type';
 
-export type Uncompressed = { tag: 'Uncompressed'; value: QueryUpdateType };
+export type Uncompressed = {
+  tag: 'Uncompressed';
+  value: __Infer<typeof QueryUpdateType>;
+};
 export type Brotli = { tag: 'Brotli'; value: Uint8Array };
 export type Gzip = { tag: 'Gzip'; value: Uint8Array };
diff --git a/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
index 45745374d29..29f18c4e8d3 100644
--- a/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
@@ -4,75 +4,28 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { TableUpdate } from './table_update_type';
-// Mark import as potentially unused
-declare type __keep_TableUpdate = TableUpdate;
+} from '../../';
+import TableUpdate from './table_update_type';
 
-export type DatabaseUpdate = {
-  tables: TableUpdate[];
-};
-let _cached_DatabaseUpdate_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const DatabaseUpdate = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_DatabaseUpdate_type_value)
-      return _cached_DatabaseUpdate_type_value;
-    _cached_DatabaseUpdate_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_DatabaseUpdate_type_value.value.elements.push({
-      name: 'tables',
-      algebraicType: __AlgebraicTypeValue.Array(
-        TableUpdate.getTypeScriptAlgebraicType()
-      ),
-    });
-    return _cached_DatabaseUpdate_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: DatabaseUpdate): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      DatabaseUpdate.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): DatabaseUpdate {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      DatabaseUpdate.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default DatabaseUpdate;
+export default __t.object('DatabaseUpdate', {
+  tables: __t.array(__t.lazy(() => TableUpdate)),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts b/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
index 73ab3911e5c..0c6a8b2cbe7 100644
--- a/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
@@ -4,69 +4,27 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type EnergyQuanta = {
-  quanta: bigint;
-};
-let _cached_EnergyQuanta_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const EnergyQuanta = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_EnergyQuanta_type_value) return _cached_EnergyQuanta_type_value;
-    _cached_EnergyQuanta_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_EnergyQuanta_type_value.value.elements.push({
-      name: 'quanta',
-      algebraicType: __AlgebraicTypeValue.U128,
-    });
-    return _cached_EnergyQuanta_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: EnergyQuanta): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      EnergyQuanta.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): EnergyQuanta {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      EnergyQuanta.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default EnergyQuanta;
+export default __t.object('EnergyQuanta', {
+  quanta: __t.u128(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts b/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
index e92172030cd..4fdf17d0ae9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
@@ -4,79 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type IdentityToken = {
-  identity: __Identity;
-  token: string;
-  connectionId: __ConnectionId;
-};
-let _cached_IdentityToken_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const IdentityToken = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_IdentityToken_type_value)
-      return _cached_IdentityToken_type_value;
-    _cached_IdentityToken_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_IdentityToken_type_value.value.elements.push(
-      {
-        name: 'identity',
-        algebraicType: __AlgebraicTypeValue.createIdentityType(),
-      },
-      { name: 'token', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'connectionId',
-        algebraicType: __AlgebraicTypeValue.createConnectionIdType(),
-      }
-    );
-    return _cached_IdentityToken_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: IdentityToken): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      IdentityToken.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): IdentityToken {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      IdentityToken.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default IdentityToken;
+export default __t.object('IdentityToken', {
+  identity: __t.identity(),
+  token: __t.string(),
+  connectionId: __t.connectionId(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/index.ts b/crates/bindings-typescript/src/sdk/client_api/index.ts
index 2441d1d8732..06acd7dca9f 100644
--- a/crates/bindings-typescript/src/sdk/client_api/index.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/index.ts
@@ -1,201 +1,150 @@
 // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
 // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
 
-// This was generated using ../../index cli version 1.5.0 (commit 5bfc84351742a6a8dc717b6c0011946f2d1b632d).
+// This was generated using spacetimedb cli version 1.6.0 (commit 051fb278b3d871c87536cb87c8905c21103728fe).
 
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
 // Import and reexport all reducer arg types
 
 // Import and reexport all table handle types
 
 // Import and reexport all types
-import { BsatnRowList } from './bsatn_row_list_type.ts';
+import BsatnRowList from './bsatn_row_list_type.ts';
 export { BsatnRowList };
-import { CallReducer } from './call_reducer_type.ts';
+import CallProcedure from './call_procedure_type.ts';
+export { CallProcedure };
+import CallReducer from './call_reducer_type.ts';
 export { CallReducer };
-import { ClientMessage } from './client_message_type.ts';
+import ClientMessage from './client_message_type.ts';
 export { ClientMessage };
-import { CompressableQueryUpdate } from './compressable_query_update_type.ts';
+import CompressableQueryUpdate from './compressable_query_update_type.ts';
 export { CompressableQueryUpdate };
-import { DatabaseUpdate } from './database_update_type.ts';
+import DatabaseUpdate from './database_update_type.ts';
 export { DatabaseUpdate };
-import { EnergyQuanta } from './energy_quanta_type.ts';
+import EnergyQuanta from './energy_quanta_type.ts';
 export { EnergyQuanta };
-import { IdentityToken } from './identity_token_type.ts';
+import IdentityToken from './identity_token_type.ts';
 export { IdentityToken };
-import { InitialSubscription } from './initial_subscription_type.ts';
+import InitialSubscription from './initial_subscription_type.ts';
 export { InitialSubscription };
-import { OneOffQuery } from './one_off_query_type.ts';
+import OneOffQuery from './one_off_query_type.ts';
 export { OneOffQuery };
-import { OneOffQueryResponse } from './one_off_query_response_type.ts';
+import OneOffQueryResponse from './one_off_query_response_type.ts';
 export { OneOffQueryResponse };
-import { OneOffTable } from './one_off_table_type.ts';
+import OneOffTable from './one_off_table_type.ts';
 export { OneOffTable };
-import { QueryId } from './query_id_type.ts';
+import ProcedureResult from './procedure_result_type.ts';
+export { ProcedureResult };
+import ProcedureStatus from './procedure_status_type.ts';
+export { ProcedureStatus };
+import QueryId from './query_id_type.ts';
 export { QueryId };
-import { QueryUpdate } from './query_update_type.ts';
+import QueryUpdate from './query_update_type.ts';
 export { QueryUpdate };
-import { ReducerCallInfo } from './reducer_call_info_type.ts';
+import ReducerCallInfo from './reducer_call_info_type.ts';
 export { ReducerCallInfo };
-import { RowSizeHint } from './row_size_hint_type.ts';
+import RowSizeHint from './row_size_hint_type.ts';
 export { RowSizeHint };
-import { ServerMessage } from './server_message_type.ts';
+import ServerMessage from './server_message_type.ts';
 export { ServerMessage };
-import { Subscribe } from './subscribe_type.ts';
+import Subscribe from './subscribe_type.ts';
 export { Subscribe };
-import { SubscribeApplied } from './subscribe_applied_type.ts';
+import SubscribeApplied from './subscribe_applied_type.ts';
 export { SubscribeApplied };
-import { SubscribeMulti } from './subscribe_multi_type.ts';
+import SubscribeMulti from './subscribe_multi_type.ts';
 export { SubscribeMulti };
-import { SubscribeMultiApplied } from './subscribe_multi_applied_type.ts';
+import SubscribeMultiApplied from './subscribe_multi_applied_type.ts';
 export { SubscribeMultiApplied };
-import { SubscribeRows } from './subscribe_rows_type.ts';
+import SubscribeRows from './subscribe_rows_type.ts';
 export { SubscribeRows };
-import { SubscribeSingle } from './subscribe_single_type.ts';
+import SubscribeSingle from './subscribe_single_type.ts';
 export { SubscribeSingle };
-import { SubscriptionError } from './subscription_error_type.ts';
+import SubscriptionError from './subscription_error_type.ts';
 export { SubscriptionError };
-import { TableUpdate } from './table_update_type.ts';
+import TableUpdate from './table_update_type.ts';
 export { TableUpdate };
-import { TransactionUpdate } from './transaction_update_type.ts';
+import TransactionUpdate from './transaction_update_type.ts';
 export { TransactionUpdate };
-import { TransactionUpdateLight } from './transaction_update_light_type.ts';
+import TransactionUpdateLight from './transaction_update_light_type.ts';
 export { TransactionUpdateLight };
-import { Unsubscribe } from './unsubscribe_type.ts';
+import Unsubscribe from './unsubscribe_type.ts';
 export { Unsubscribe };
-import { UnsubscribeApplied } from './unsubscribe_applied_type.ts';
+import UnsubscribeApplied from './unsubscribe_applied_type.ts';
 export { UnsubscribeApplied };
-import { UnsubscribeMulti } from './unsubscribe_multi_type.ts';
+import UnsubscribeMulti from './unsubscribe_multi_type.ts';
 export { UnsubscribeMulti };
-import { UnsubscribeMultiApplied } from './unsubscribe_multi_applied_type.ts';
+import UnsubscribeMultiApplied from './unsubscribe_multi_applied_type.ts';
 export { UnsubscribeMultiApplied };
-import { UpdateStatus } from './update_status_type.ts';
+import UpdateStatus from './update_status_type.ts';
 export { UpdateStatus };
 
+const tablesSchema = __schema();
+
+const reducersSchema = __reducers();
+
 const REMOTE_MODULE = {
-  tables: {},
-  reducers: {},
   versionInfo: {
-    cliVersion: '1.5.0',
-  },
-  // Constructors which are used by the DbConnectionImpl to
-  // extract type information from the generated RemoteModule.
-  //
-  // NOTE: This is not strictly necessary for `eventContextConstructor` because
-  // all we do is build a TypeScript object which we could have done inside the
-  // SDK, but if in the future we wanted to create a class this would be
-  // necessary because classes have methods, so we'll keep it.
-  eventContextConstructor: (
-    imp: __DbConnectionImpl<RemoteTables,
-    event: __Event<Reducer>
-  ) => {
-    return {
-      ...(imp as DbConnection),
-      event,
-    };
-  },
-  dbViewConstructor: (imp: __DbConnectionImpl) => {
-    return new RemoteTables(imp);
-  },
-  reducersConstructor: (
-    imp: __DbConnectionImpl,
-    setReducerFlags: SetReducerFlags
-  ) => {
-    return new RemoteReducers(imp, setReducerFlags);
-  },
-  setReducerFlagsConstructor: () => {
-    return new SetReducerFlags();
+    cliVersion: '1.6.0' as const,
   },
-};
-
-// A type representing all the possible variants of a reducer.
-export type Reducer = never;
-
-export class RemoteReducers {
-  constructor(
-    private connection: __DbConnectionImpl,
-    private setCallReducerFlags: SetReducerFlags
-  ) {}
-}
+  tables: tablesSchema.schemaType.tables,
+  reducers: reducersSchema.reducersType.reducers,
+} satisfies __RemoteModule<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
 
-export class SetReducerFlags {}
+export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);
+export const reducers = __convertToAccessorMap(
+  reducersSchema.reducersType.reducers
+);
 
-export class RemoteTables {
-  constructor(private connection: __DbConnectionImpl) {}
-}
+export type EventContext = __EventContextInterface<typeof REMOTE_MODULE>;
+export type ReducerEventContext = __ReducerEventContextInterface<
+  typeof REMOTE_MODULE
+>;
+export type SubscriptionEventContext = __SubscriptionEventContextInterface<
+  typeof REMOTE_MODULE
+>;
+export type ErrorContext = __ErrorContextInterface<typeof REMOTE_MODULE>;
 
 export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
+  typeof REMOTE_MODULE
 > {}
 
-export class DbConnection extends __DbConnectionImpl<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
-> {
-  static builder = (): __DbConnectionBuilder<
-    DbConnection,
-    ErrorContext,
-    SubscriptionEventContext
-  > => {
-    return new __DbConnectionBuilder<
-      DbConnection,
-      ErrorContext,
-      SubscriptionEventContext
-    >(REMOTE_MODULE, (imp: __DbConnectionImpl) => imp as DbConnection);
+export class DbConnectionBuilder extends __DbConnectionBuilder<DbConnection> {}
+
+export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
+  static builder = (): DbConnectionBuilder => {
+    return new DbConnectionBuilder(
+      REMOTE_MODULE,
+      (config: __DbConnectionConfig<typeof REMOTE_MODULE>) =>
+        new DbConnection(config)
+    );
   };
   subscriptionBuilder = (): SubscriptionBuilder => {
     return new SubscriptionBuilder(this);
   };
 }
-
-export type EventContext = __EventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags,
-  Reducer
->;
-export type ReducerEventContext = __ReducerEventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags,
-  Reducer
->;
-export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
->;
-export type ErrorContext = __ErrorContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
->;
diff --git a/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts b/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
index 26533c4e263..de161adb28c 100644
--- a/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
@@ -4,82 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { DatabaseUpdate } from './database_update_type';
-// Mark import as potentially unused
-declare type __keep_DatabaseUpdate = DatabaseUpdate;
+} from '../../';
+import DatabaseUpdate from './database_update_type';
 
-export type InitialSubscription = {
-  databaseUpdate: DatabaseUpdate;
-  requestId: number;
-  totalHostExecutionDuration: __TimeDuration;
-};
-let _cached_InitialSubscription_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const InitialSubscription = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_InitialSubscription_type_value)
-      return _cached_InitialSubscription_type_value;
-    _cached_InitialSubscription_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_InitialSubscription_type_value.value.elements.push(
-      {
-        name: 'databaseUpdate',
-        algebraicType: DatabaseUpdate.getTypeScriptAlgebraicType(),
-      },
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'totalHostExecutionDuration',
-        algebraicType: __AlgebraicTypeValue.createTimeDurationType(),
-      }
-    );
-    return _cached_InitialSubscription_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: InitialSubscription): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      InitialSubscription.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): InitialSubscription {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      InitialSubscription.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default InitialSubscription;
+export default __t.object('InitialSubscription', {
+  databaseUpdate: __t.lazy(() => DatabaseUpdate),
+  requestId: __t.u32(),
+  totalHostExecutionDuration: __t.timeDuration(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
index 3e0dd287591..362d6f7325b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
@@ -4,94 +4,31 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { OneOffTable } from './one_off_table_type';
-// Mark import as potentially unused
-declare type __keep_OneOffTable = OneOffTable;
+} from '../../';
+import OneOffTable from './one_off_table_type';
 
-export type OneOffQueryResponse = {
-  messageId: Uint8Array;
-  error: string | undefined;
-  tables: OneOffTable[];
-  totalHostExecutionDuration: __TimeDuration;
-};
-let _cached_OneOffQueryResponse_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const OneOffQueryResponse = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_OneOffQueryResponse_type_value)
-      return _cached_OneOffQueryResponse_type_value;
-    _cached_OneOffQueryResponse_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_OneOffQueryResponse_type_value.value.elements.push(
-      {
-        name: 'messageId',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      },
-      {
-        name: 'error',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.String
-        ),
-      },
-      {
-        name: 'tables',
-        algebraicType: __AlgebraicTypeValue.Array(
-          OneOffTable.getTypeScriptAlgebraicType()
-        ),
-      },
-      {
-        name: 'totalHostExecutionDuration',
-        algebraicType: __AlgebraicTypeValue.createTimeDurationType(),
-      }
-    );
-    return _cached_OneOffQueryResponse_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: OneOffQueryResponse): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      OneOffQueryResponse.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): OneOffQueryResponse {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      OneOffQueryResponse.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default OneOffQueryResponse;
+export default __t.object('OneOffQueryResponse', {
+  messageId: __t.byteArray(),
+  error: __t.option(__t.string()),
+  tables: __t.array(__t.lazy(() => OneOffTable)),
+  totalHostExecutionDuration: __t.timeDuration(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
index 14ef4c02b90..f1a97f613a0 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
@@ -4,73 +4,28 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type OneOffQuery = {
-  messageId: Uint8Array;
-  queryString: string;
-};
-let _cached_OneOffQuery_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const OneOffQuery = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_OneOffQuery_type_value) return _cached_OneOffQuery_type_value;
-    _cached_OneOffQuery_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_OneOffQuery_type_value.value.elements.push(
-      {
-        name: 'messageId',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      },
-      { name: 'queryString', algebraicType: __AlgebraicTypeValue.String }
-    );
-    return _cached_OneOffQuery_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: OneOffQuery): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      OneOffQuery.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): OneOffQuery {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      OneOffQuery.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default OneOffQuery;
+export default __t.object('OneOffQuery', {
+  messageId: __t.byteArray(),
+  queryString: __t.string(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
index 9767f476433..9e0483a344c 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
@@ -4,73 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { BsatnRowList } from './bsatn_row_list_type';
-// Mark import as potentially unused
-declare type __keep_BsatnRowList = BsatnRowList;
+} from '../../';
+import BsatnRowList from './bsatn_row_list_type';
 
-export type OneOffTable = {
-  tableName: string;
-  rows: BsatnRowList;
-};
-let _cached_OneOffTable_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const OneOffTable = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_OneOffTable_type_value) return _cached_OneOffTable_type_value;
-    _cached_OneOffTable_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_OneOffTable_type_value.value.elements.push(
-      { name: 'tableName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'rows', algebraicType: BsatnRowList.getTypeScriptAlgebraicType() }
-    );
-    return _cached_OneOffTable_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: OneOffTable): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      OneOffTable.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): OneOffTable {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      OneOffTable.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default OneOffTable;
+export default __t.object('OneOffTable', {
+  tableName: __t.string(),
+  rows: __t.lazy(() => BsatnRowList),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
new file mode 100644
index 00000000000..f3248b713fd
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
@@ -0,0 +1,34 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+/* eslint-disable */
+/* tslint:disable */
+import {
+  DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionImpl as __DbConnectionImpl,
+  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
+  type ErrorContextInterface as __ErrorContextInterface,
+  type Event as __Event,
+  type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
+  type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
+  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
+} from '../../';
+import ProcedureStatus from './procedure_status_type';
+
+export default __t.object('ProcedureResult', {
+  status: __t.lazy(() => ProcedureStatus),
+  timestamp: __t.timestamp(),
+  totalHostExecutionDuration: __t.timeDuration(),
+  requestId: __t.u32(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
new file mode 100644
index 00000000000..c02e65cc449
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
@@ -0,0 +1,36 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+/* eslint-disable */
+/* tslint:disable */
+import {
+  DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionImpl as __DbConnectionImpl,
+  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
+  type ErrorContextInterface as __ErrorContextInterface,
+  type Event as __Event,
+  type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
+  type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
+  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
+} from '../../';
+import * as ProcedureStatusVariants from './procedure_status_variants';
+
+// The tagged union or sum type for the algebraic type `ProcedureStatus`.
+const ProcedureStatus = __t.enum('ProcedureStatus', {
+  Returned: __t.byteArray(),
+  OutOfEnergy: __t.unit(),
+  InternalError: __t.string(),
+});
+
+export default ProcedureStatus;
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
new file mode 100644
index 00000000000..077446826b9
--- /dev/null
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
@@ -0,0 +1,30 @@
+// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
+// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
+
+/* eslint-disable */
+/* tslint:disable */
+import {
+  DbConnectionBuilder as __DbConnectionBuilder,
+  DbConnectionImpl as __DbConnectionImpl,
+  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
+  type ErrorContextInterface as __ErrorContextInterface,
+  type Event as __Event,
+  type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
+  type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
+  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
+} from '../../';
+
+export type Returned = { tag: 'Returned'; value: Uint8Array };
+export type OutOfEnergy = { tag: 'OutOfEnergy' };
+export type InternalError = { tag: 'InternalError'; value: string };
diff --git a/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts b/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
index a2ffef60aad..93578095b89 100644
--- a/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
@@ -4,67 +4,27 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type QueryId = {
-  id: number;
-};
-let _cached_QueryId_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const QueryId = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_QueryId_type_value) return _cached_QueryId_type_value;
-    _cached_QueryId_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_QueryId_type_value.value.elements.push({
-      name: 'id',
-      algebraicType: __AlgebraicTypeValue.U32,
-    });
-    return _cached_QueryId_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: QueryId): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      QueryId.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): QueryId {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      QueryId.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default QueryId;
+export default __t.object('QueryId', {
+  id: __t.u32(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
index 3523e9f5196..207357a2f1d 100644
--- a/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
@@ -4,79 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { BsatnRowList } from './bsatn_row_list_type';
-// Mark import as potentially unused
-declare type __keep_BsatnRowList = BsatnRowList;
+} from '../../';
+import BsatnRowList from './bsatn_row_list_type';
 
-export type QueryUpdate = {
-  deletes: BsatnRowList;
-  inserts: BsatnRowList;
-};
-let _cached_QueryUpdate_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const QueryUpdate = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_QueryUpdate_type_value) return _cached_QueryUpdate_type_value;
-    _cached_QueryUpdate_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_QueryUpdate_type_value.value.elements.push(
-      {
-        name: 'deletes',
-        algebraicType: BsatnRowList.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'inserts',
-        algebraicType: BsatnRowList.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_QueryUpdate_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: QueryUpdate): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      QueryUpdate.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): QueryUpdate {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      QueryUpdate.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default QueryUpdate;
+export default __t.object('QueryUpdate', {
+  deletes: __t.lazy(() => BsatnRowList),
+  inserts: __t.lazy(() => BsatnRowList),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts b/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
index ce37a59a355..d3eff21f62f 100644
--- a/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
@@ -4,78 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type ReducerCallInfo = {
-  reducerName: string;
-  reducerId: number;
-  args: Uint8Array;
-  requestId: number;
-};
-let _cached_ReducerCallInfo_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ReducerCallInfo = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ReducerCallInfo_type_value)
-      return _cached_ReducerCallInfo_type_value;
-    _cached_ReducerCallInfo_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ReducerCallInfo_type_value.value.elements.push(
-      { name: 'reducerName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'reducerId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'args',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U8),
-      },
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 }
-    );
-    return _cached_ReducerCallInfo_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ReducerCallInfo): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ReducerCallInfo.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ReducerCallInfo {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ReducerCallInfo.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ReducerCallInfo;
+export default __t.object('ReducerCallInfo', {
+  reducerName: __t.string(),
+  reducerId: __t.u32(),
+  args: __t.byteArray(),
+  requestId: __t.u32(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
index 345dbeefd25..99feedff67a 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
@@ -4,82 +4,32 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 import * as RowSizeHintVariants from './row_size_hint_variants';
 
 // The tagged union or sum type for the algebraic type `RowSizeHint`.
-export type RowSizeHint =
-  | RowSizeHintVariants.FixedSize
-  | RowSizeHintVariants.RowOffsets;
-
-let _cached_RowSizeHint_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const RowSizeHint = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  FixedSize: (value: number): RowSizeHintVariants.FixedSize => ({
-    tag: 'FixedSize',
-    value,
-  }),
-  RowOffsets: (value: bigint[]): RowSizeHintVariants.RowOffsets => ({
-    tag: 'RowOffsets',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_RowSizeHint_type_value) return _cached_RowSizeHint_type_value;
-    _cached_RowSizeHint_type_value = __AlgebraicTypeValue.Sum({ variants: [] });
-    _cached_RowSizeHint_type_value.value.variants.push(
-      { name: 'FixedSize', algebraicType: __AlgebraicTypeValue.U16 },
-      {
-        name: 'RowOffsets',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.U64),
-      }
-    );
-    return _cached_RowSizeHint_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: RowSizeHint): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      RowSizeHint.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): RowSizeHint {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      RowSizeHint.getTypeScriptAlgebraicType()
-    );
-  },
-};
+const RowSizeHint = __t.enum('RowSizeHint', {
+  FixedSize: __t.u16(),
+  RowOffsets: __t.array(__t.u64()),
+});
 
 export default RowSizeHint;
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
index 48f9ef80f43..71c16732e0b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
@@ -4,29 +4,26 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
 export type FixedSize = { tag: 'FixedSize'; value: number };
 export type RowOffsets = { tag: 'RowOffsets'; value: bigint[] };
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
index 868a382da42..d771b875e47 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
@@ -4,208 +4,53 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { InitialSubscription } from './initial_subscription_type';
-// Mark import as potentially unused
-declare type __keep_InitialSubscription = InitialSubscription;
-import { TransactionUpdate } from './transaction_update_type';
-// Mark import as potentially unused
-declare type __keep_TransactionUpdate = TransactionUpdate;
-import { TransactionUpdateLight } from './transaction_update_light_type';
-// Mark import as potentially unused
-declare type __keep_TransactionUpdateLight = TransactionUpdateLight;
-import { IdentityToken } from './identity_token_type';
-// Mark import as potentially unused
-declare type __keep_IdentityToken = IdentityToken;
-import { OneOffQueryResponse } from './one_off_query_response_type';
-// Mark import as potentially unused
-declare type __keep_OneOffQueryResponse = OneOffQueryResponse;
-import { SubscribeApplied } from './subscribe_applied_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeApplied = SubscribeApplied;
-import { UnsubscribeApplied } from './unsubscribe_applied_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeApplied = UnsubscribeApplied;
-import { SubscriptionError } from './subscription_error_type';
-// Mark import as potentially unused
-declare type __keep_SubscriptionError = SubscriptionError;
-import { SubscribeMultiApplied } from './subscribe_multi_applied_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeMultiApplied = SubscribeMultiApplied;
-import { UnsubscribeMultiApplied } from './unsubscribe_multi_applied_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeMultiApplied = UnsubscribeMultiApplied;
+} from '../../';
+import InitialSubscription from './initial_subscription_type';
+import TransactionUpdate from './transaction_update_type';
+import TransactionUpdateLight from './transaction_update_light_type';
+import IdentityToken from './identity_token_type';
+import OneOffQueryResponse from './one_off_query_response_type';
+import SubscribeApplied from './subscribe_applied_type';
+import UnsubscribeApplied from './unsubscribe_applied_type';
+import SubscriptionError from './subscription_error_type';
+import SubscribeMultiApplied from './subscribe_multi_applied_type';
+import UnsubscribeMultiApplied from './unsubscribe_multi_applied_type';
+import ProcedureResult from './procedure_result_type';
 
 import * as ServerMessageVariants from './server_message_variants';
 
 // The tagged union or sum type for the algebraic type `ServerMessage`.
-export type ServerMessage =
-  | ServerMessageVariants.InitialSubscription
-  | ServerMessageVariants.TransactionUpdate
-  | ServerMessageVariants.TransactionUpdateLight
-  | ServerMessageVariants.IdentityToken
-  | ServerMessageVariants.OneOffQueryResponse
-  | ServerMessageVariants.SubscribeApplied
-  | ServerMessageVariants.UnsubscribeApplied
-  | ServerMessageVariants.SubscriptionError
-  | ServerMessageVariants.SubscribeMultiApplied
-  | ServerMessageVariants.UnsubscribeMultiApplied;
-
-let _cached_ServerMessage_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const ServerMessage = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  InitialSubscription: (
-    value: InitialSubscription
-  ): ServerMessageVariants.InitialSubscription => ({
-    tag: 'InitialSubscription',
-    value,
-  }),
-  TransactionUpdate: (
-    value: TransactionUpdate
-  ): ServerMessageVariants.TransactionUpdate => ({
-    tag: 'TransactionUpdate',
-    value,
-  }),
-  TransactionUpdateLight: (
-    value: TransactionUpdateLight
-  ): ServerMessageVariants.TransactionUpdateLight => ({
-    tag: 'TransactionUpdateLight',
-    value,
-  }),
-  IdentityToken: (
-    value: IdentityToken
-  ): ServerMessageVariants.IdentityToken => ({ tag: 'IdentityToken', value }),
-  OneOffQueryResponse: (
-    value: OneOffQueryResponse
-  ): ServerMessageVariants.OneOffQueryResponse => ({
-    tag: 'OneOffQueryResponse',
-    value,
-  }),
-  SubscribeApplied: (
-    value: SubscribeApplied
-  ): ServerMessageVariants.SubscribeApplied => ({
-    tag: 'SubscribeApplied',
-    value,
-  }),
-  UnsubscribeApplied: (
-    value: UnsubscribeApplied
-  ): ServerMessageVariants.UnsubscribeApplied => ({
-    tag: 'UnsubscribeApplied',
-    value,
-  }),
-  SubscriptionError: (
-    value: SubscriptionError
-  ): ServerMessageVariants.SubscriptionError => ({
-    tag: 'SubscriptionError',
-    value,
-  }),
-  SubscribeMultiApplied: (
-    value: SubscribeMultiApplied
-  ): ServerMessageVariants.SubscribeMultiApplied => ({
-    tag: 'SubscribeMultiApplied',
-    value,
-  }),
-  UnsubscribeMultiApplied: (
-    value: UnsubscribeMultiApplied
-  ): ServerMessageVariants.UnsubscribeMultiApplied => ({
-    tag: 'UnsubscribeMultiApplied',
-    value,
-  }),
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ServerMessage_type_value)
-      return _cached_ServerMessage_type_value;
-    _cached_ServerMessage_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_ServerMessage_type_value.value.variants.push(
-      {
-        name: 'InitialSubscription',
-        algebraicType: InitialSubscription.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'TransactionUpdate',
-        algebraicType: TransactionUpdate.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'TransactionUpdateLight',
-        algebraicType: TransactionUpdateLight.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'IdentityToken',
-        algebraicType: IdentityToken.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'OneOffQueryResponse',
-        algebraicType: OneOffQueryResponse.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'SubscribeApplied',
-        algebraicType: SubscribeApplied.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'UnsubscribeApplied',
-        algebraicType: UnsubscribeApplied.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'SubscriptionError',
-        algebraicType: SubscriptionError.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'SubscribeMultiApplied',
-        algebraicType: SubscribeMultiApplied.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'UnsubscribeMultiApplied',
-        algebraicType: UnsubscribeMultiApplied.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_ServerMessage_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ServerMessage): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ServerMessage.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ServerMessage {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ServerMessage.getTypeScriptAlgebraicType()
-    );
-  },
-};
+const ServerMessage = __t.enum('ServerMessage', {
+  InitialSubscription: __t.lazy(() => InitialSubscription),
+  TransactionUpdate: __t.lazy(() => TransactionUpdate),
+  TransactionUpdateLight: __t.lazy(() => TransactionUpdateLight),
+  IdentityToken: __t.lazy(() => IdentityToken),
+  OneOffQueryResponse: __t.lazy(() => OneOffQueryResponse),
+  SubscribeApplied: __t.lazy(() => SubscribeApplied),
+  UnsubscribeApplied: __t.lazy(() => UnsubscribeApplied),
+  SubscriptionError: __t.lazy(() => SubscriptionError),
+  SubscribeMultiApplied: __t.lazy(() => SubscribeMultiApplied),
+  UnsubscribeMultiApplied: __t.lazy(() => UnsubscribeMultiApplied),
+  ProcedureResult: __t.lazy(() => ProcedureResult),
+});
 
 export default ServerMessage;
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
index 530882d718b..9cdaf1c2218 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
@@ -4,94 +4,79 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { InitialSubscription as InitialSubscriptionType } from './initial_subscription_type';
-// Mark import as potentially unused
-declare type __keep_InitialSubscriptionType = InitialSubscriptionType;
-import { TransactionUpdate as TransactionUpdateType } from './transaction_update_type';
-// Mark import as potentially unused
-declare type __keep_TransactionUpdateType = TransactionUpdateType;
-import { TransactionUpdateLight as TransactionUpdateLightType } from './transaction_update_light_type';
-// Mark import as potentially unused
-declare type __keep_TransactionUpdateLightType = TransactionUpdateLightType;
-import { IdentityToken as IdentityTokenType } from './identity_token_type';
-// Mark import as potentially unused
-declare type __keep_IdentityTokenType = IdentityTokenType;
-import { OneOffQueryResponse as OneOffQueryResponseType } from './one_off_query_response_type';
-// Mark import as potentially unused
-declare type __keep_OneOffQueryResponseType = OneOffQueryResponseType;
-import { SubscribeApplied as SubscribeAppliedType } from './subscribe_applied_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeAppliedType = SubscribeAppliedType;
-import { UnsubscribeApplied as UnsubscribeAppliedType } from './unsubscribe_applied_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeAppliedType = UnsubscribeAppliedType;
-import { SubscriptionError as SubscriptionErrorType } from './subscription_error_type';
-// Mark import as potentially unused
-declare type __keep_SubscriptionErrorType = SubscriptionErrorType;
-import { SubscribeMultiApplied as SubscribeMultiAppliedType } from './subscribe_multi_applied_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeMultiAppliedType = SubscribeMultiAppliedType;
-import { UnsubscribeMultiApplied as UnsubscribeMultiAppliedType } from './unsubscribe_multi_applied_type';
-// Mark import as potentially unused
-declare type __keep_UnsubscribeMultiAppliedType = UnsubscribeMultiAppliedType;
+} from '../../';
+import InitialSubscriptionType from './initial_subscription_type';
+import TransactionUpdateType from './transaction_update_type';
+import TransactionUpdateLightType from './transaction_update_light_type';
+import IdentityTokenType from './identity_token_type';
+import OneOffQueryResponseType from './one_off_query_response_type';
+import SubscribeAppliedType from './subscribe_applied_type';
+import UnsubscribeAppliedType from './unsubscribe_applied_type';
+import SubscriptionErrorType from './subscription_error_type';
+import SubscribeMultiAppliedType from './subscribe_multi_applied_type';
+import UnsubscribeMultiAppliedType from './unsubscribe_multi_applied_type';
+import ProcedureResultType from './procedure_result_type';
 
 export type InitialSubscription = {
   tag: 'InitialSubscription';
-  value: InitialSubscriptionType;
+  value: __Infer<typeof InitialSubscriptionType>;
 };
 export type TransactionUpdate = {
   tag: 'TransactionUpdate';
-  value: TransactionUpdateType;
+  value: __Infer<typeof TransactionUpdateType>;
 };
 export type TransactionUpdateLight = {
   tag: 'TransactionUpdateLight';
-  value: TransactionUpdateLightType;
+  value: __Infer<typeof TransactionUpdateLightType>;
+};
+export type IdentityToken = {
+  tag: 'IdentityToken';
+  value: __Infer<typeof IdentityTokenType>;
 };
-export type IdentityToken = { tag: 'IdentityToken'; value: IdentityTokenType };
 export type OneOffQueryResponse = {
   tag: 'OneOffQueryResponse';
-  value: OneOffQueryResponseType;
+  value: __Infer<typeof OneOffQueryResponseType>;
 };
 export type SubscribeApplied = {
   tag: 'SubscribeApplied';
-  value: SubscribeAppliedType;
+  value: __Infer<typeof SubscribeAppliedType>;
 };
 export type UnsubscribeApplied = {
   tag: 'UnsubscribeApplied';
-  value: UnsubscribeAppliedType;
+  value: __Infer<typeof UnsubscribeAppliedType>;
 };
 export type SubscriptionError = {
   tag: 'SubscriptionError';
-  value: SubscriptionErrorType;
+  value: __Infer<typeof SubscriptionErrorType>;
 };
 export type SubscribeMultiApplied = {
   tag: 'SubscribeMultiApplied';
-  value: SubscribeMultiAppliedType;
+  value: __Infer<typeof SubscribeMultiAppliedType>;
 };
 export type UnsubscribeMultiApplied = {
   tag: 'UnsubscribeMultiApplied';
-  value: UnsubscribeMultiAppliedType;
+  value: __Infer<typeof UnsubscribeMultiAppliedType>;
+};
+export type ProcedureResult = {
+  tag: 'ProcedureResult';
+  value: __Infer<typeof ProcedureResultType>;
 };
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
index 637b77472ea..3e10b59c700 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
@@ -4,87 +4,32 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
-import { SubscribeRows } from './subscribe_rows_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeRows = SubscribeRows;
+} from '../../';
+import QueryId from './query_id_type';
+import SubscribeRows from './subscribe_rows_type';
 
-export type SubscribeApplied = {
-  requestId: number;
-  totalHostExecutionDurationMicros: bigint;
-  queryId: QueryId;
-  rows: SubscribeRows;
-};
-let _cached_SubscribeApplied_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SubscribeApplied = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SubscribeApplied_type_value)
-      return _cached_SubscribeApplied_type_value;
-    _cached_SubscribeApplied_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SubscribeApplied_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'totalHostExecutionDurationMicros',
-        algebraicType: __AlgebraicTypeValue.U64,
-      },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() },
-      {
-        name: 'rows',
-        algebraicType: SubscribeRows.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_SubscribeApplied_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SubscribeApplied): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SubscribeApplied.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SubscribeApplied {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SubscribeApplied.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SubscribeApplied;
+export default __t.object('SubscribeApplied', {
+  requestId: __t.u32(),
+  totalHostExecutionDurationMicros: __t.u64(),
+  queryId: __t.lazy(() => QueryId),
+  rows: __t.lazy(() => SubscribeRows),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
index c068eada2a5..cbd8c96aa92 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
@@ -4,87 +4,32 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
-import { DatabaseUpdate } from './database_update_type';
-// Mark import as potentially unused
-declare type __keep_DatabaseUpdate = DatabaseUpdate;
+} from '../../';
+import QueryId from './query_id_type';
+import DatabaseUpdate from './database_update_type';
 
-export type SubscribeMultiApplied = {
-  requestId: number;
-  totalHostExecutionDurationMicros: bigint;
-  queryId: QueryId;
-  update: DatabaseUpdate;
-};
-let _cached_SubscribeMultiApplied_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SubscribeMultiApplied = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SubscribeMultiApplied_type_value)
-      return _cached_SubscribeMultiApplied_type_value;
-    _cached_SubscribeMultiApplied_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SubscribeMultiApplied_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'totalHostExecutionDurationMicros',
-        algebraicType: __AlgebraicTypeValue.U64,
-      },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() },
-      {
-        name: 'update',
-        algebraicType: DatabaseUpdate.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_SubscribeMultiApplied_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SubscribeMultiApplied): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SubscribeMultiApplied.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SubscribeMultiApplied {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SubscribeMultiApplied.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SubscribeMultiApplied;
+export default __t.object('SubscribeMultiApplied', {
+  requestId: __t.u32(),
+  totalHostExecutionDurationMicros: __t.u64(),
+  queryId: __t.lazy(() => QueryId),
+  update: __t.lazy(() => DatabaseUpdate),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
index 34aad33a9a6..9f5d32a9ad7 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
@@ -4,79 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
+} from '../../';
+import QueryId from './query_id_type';
 
-export type SubscribeMulti = {
-  queryStrings: string[];
-  requestId: number;
-  queryId: QueryId;
-};
-let _cached_SubscribeMulti_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SubscribeMulti = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SubscribeMulti_type_value)
-      return _cached_SubscribeMulti_type_value;
-    _cached_SubscribeMulti_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SubscribeMulti_type_value.value.elements.push(
-      {
-        name: 'queryStrings',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.String),
-      },
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() }
-    );
-    return _cached_SubscribeMulti_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SubscribeMulti): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SubscribeMulti.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SubscribeMulti {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SubscribeMulti.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SubscribeMulti;
+export default __t.object('SubscribeMulti', {
+  queryStrings: __t.array(__t.string()),
+  requestId: __t.u32(),
+  queryId: __t.lazy(() => QueryId),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
index ceb20dff46a..ac6679968b9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
@@ -4,79 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { TableUpdate } from './table_update_type';
-// Mark import as potentially unused
-declare type __keep_TableUpdate = TableUpdate;
+} from '../../';
+import TableUpdate from './table_update_type';
 
-export type SubscribeRows = {
-  tableId: number;
-  tableName: string;
-  tableRows: TableUpdate;
-};
-let _cached_SubscribeRows_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SubscribeRows = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SubscribeRows_type_value)
-      return _cached_SubscribeRows_type_value;
-    _cached_SubscribeRows_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SubscribeRows_type_value.value.elements.push(
-      { name: 'tableId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'tableName', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'tableRows',
-        algebraicType: TableUpdate.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_SubscribeRows_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SubscribeRows): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SubscribeRows.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SubscribeRows {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SubscribeRows.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SubscribeRows;
+export default __t.object('SubscribeRows', {
+  tableId: __t.u32(),
+  tableName: __t.string(),
+  tableRows: __t.lazy(() => TableUpdate),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
index cb72b19fe54..1c39b4c64ec 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
@@ -4,76 +4,30 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
+} from '../../';
+import QueryId from './query_id_type';
 
-export type SubscribeSingle = {
-  query: string;
-  requestId: number;
-  queryId: QueryId;
-};
-let _cached_SubscribeSingle_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SubscribeSingle = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SubscribeSingle_type_value)
-      return _cached_SubscribeSingle_type_value;
-    _cached_SubscribeSingle_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SubscribeSingle_type_value.value.elements.push(
-      { name: 'query', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() }
-    );
-    return _cached_SubscribeSingle_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SubscribeSingle): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SubscribeSingle.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SubscribeSingle {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SubscribeSingle.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SubscribeSingle;
+export default __t.object('SubscribeSingle', {
+  query: __t.string(),
+  requestId: __t.u32(),
+  queryId: __t.lazy(() => QueryId),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
index da3b45b269d..61ebad17ac5 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
@@ -4,73 +4,28 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type Subscribe = {
-  queryStrings: string[];
-  requestId: number;
-};
-let _cached_Subscribe_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const Subscribe = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Subscribe_type_value) return _cached_Subscribe_type_value;
-    _cached_Subscribe_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_Subscribe_type_value.value.elements.push(
-      {
-        name: 'queryStrings',
-        algebraicType: __AlgebraicTypeValue.Array(__AlgebraicTypeValue.String),
-      },
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 }
-    );
-    return _cached_Subscribe_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Subscribe): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Subscribe.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Subscribe {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Subscribe.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Subscribe;
+export default __t.object('Subscribe', {
+  queryStrings: __t.array(__t.string()),
+  requestId: __t.u32(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
index 2c1d3325dfd..4e8441a2357 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
@@ -4,95 +4,31 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
+} from '../../';
 
-export type SubscriptionError = {
-  totalHostExecutionDurationMicros: bigint;
-  requestId: number | undefined;
-  queryId: number | undefined;
-  tableId: number | undefined;
-  error: string;
-};
-let _cached_SubscriptionError_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const SubscriptionError = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_SubscriptionError_type_value)
-      return _cached_SubscriptionError_type_value;
-    _cached_SubscriptionError_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_SubscriptionError_type_value.value.elements.push(
-      {
-        name: 'totalHostExecutionDurationMicros',
-        algebraicType: __AlgebraicTypeValue.U64,
-      },
-      {
-        name: 'requestId',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.U32
-        ),
-      },
-      {
-        name: 'queryId',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.U32
-        ),
-      },
-      {
-        name: 'tableId',
-        algebraicType: __AlgebraicTypeValue.createOptionType(
-          __AlgebraicTypeValue.U32
-        ),
-      },
-      { name: 'error', algebraicType: __AlgebraicTypeValue.String }
-    );
-    return _cached_SubscriptionError_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: SubscriptionError): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      SubscriptionError.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): SubscriptionError {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      SubscriptionError.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default SubscriptionError;
+export default __t.object('SubscriptionError', {
+  totalHostExecutionDurationMicros: __t.u64(),
+  requestId: __t.option(__t.u32()),
+  queryId: __t.option(__t.u32()),
+  tableId: __t.option(__t.u32()),
+  error: __t.string(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
index 1c195641522..02820f4ebc0 100644
--- a/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
@@ -4,82 +4,31 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { CompressableQueryUpdate } from './compressable_query_update_type';
-// Mark import as potentially unused
-declare type __keep_CompressableQueryUpdate = CompressableQueryUpdate;
+} from '../../';
+import CompressableQueryUpdate from './compressable_query_update_type';
 
-export type TableUpdate = {
-  tableId: number;
-  tableName: string;
-  numRows: bigint;
-  updates: CompressableQueryUpdate[];
-};
-let _cached_TableUpdate_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const TableUpdate = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TableUpdate_type_value) return _cached_TableUpdate_type_value;
-    _cached_TableUpdate_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_TableUpdate_type_value.value.elements.push(
-      { name: 'tableId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'tableName', algebraicType: __AlgebraicTypeValue.String },
-      { name: 'numRows', algebraicType: __AlgebraicTypeValue.U64 },
-      {
-        name: 'updates',
-        algebraicType: __AlgebraicTypeValue.Array(
-          CompressableQueryUpdate.getTypeScriptAlgebraicType()
-        ),
-      }
-    );
-    return _cached_TableUpdate_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TableUpdate): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TableUpdate.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TableUpdate {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TableUpdate.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TableUpdate;
+export default __t.object('TableUpdate', {
+  tableId: __t.u32(),
+  tableName: __t.string(),
+  numRows: __t.u64(),
+  updates: __t.array(__t.lazy(() => CompressableQueryUpdate)),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts b/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
index 24765e2b063..57d95a270d5 100644
--- a/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
@@ -4,78 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { DatabaseUpdate } from './database_update_type';
-// Mark import as potentially unused
-declare type __keep_DatabaseUpdate = DatabaseUpdate;
+} from '../../';
+import DatabaseUpdate from './database_update_type';
 
-export type TransactionUpdateLight = {
-  requestId: number;
-  update: DatabaseUpdate;
-};
-let _cached_TransactionUpdateLight_type_value: __AlgebraicTypeType | null =
-  null;
-
-/**
- * An object for generated helper functions.
- */
-export const TransactionUpdateLight = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TransactionUpdateLight_type_value)
-      return _cached_TransactionUpdateLight_type_value;
-    _cached_TransactionUpdateLight_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_TransactionUpdateLight_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'update',
-        algebraicType: DatabaseUpdate.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_TransactionUpdateLight_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TransactionUpdateLight): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TransactionUpdateLight.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TransactionUpdateLight {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TransactionUpdateLight.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TransactionUpdateLight;
+export default __t.object('TransactionUpdateLight', {
+  requestId: __t.u32(),
+  update: __t.lazy(() => DatabaseUpdate),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
index 8e8c08c5206..2a2aeb6e79b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
@@ -4,111 +4,36 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { UpdateStatus } from './update_status_type';
-// Mark import as potentially unused
-declare type __keep_UpdateStatus = UpdateStatus;
-import { ReducerCallInfo } from './reducer_call_info_type';
-// Mark import as potentially unused
-declare type __keep_ReducerCallInfo = ReducerCallInfo;
-import { EnergyQuanta } from './energy_quanta_type';
-// Mark import as potentially unused
-declare type __keep_EnergyQuanta = EnergyQuanta;
+} from '../../';
+import UpdateStatus from './update_status_type';
+import ReducerCallInfo from './reducer_call_info_type';
+import EnergyQuanta from './energy_quanta_type';
 
-export type TransactionUpdate = {
-  status: UpdateStatus;
-  timestamp: __Timestamp;
-  callerIdentity: __Identity;
-  callerConnectionId: __ConnectionId;
-  reducerCall: ReducerCallInfo;
-  energyQuantaUsed: EnergyQuanta;
-  totalHostExecutionDuration: __TimeDuration;
-};
-let _cached_TransactionUpdate_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const TransactionUpdate = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_TransactionUpdate_type_value)
-      return _cached_TransactionUpdate_type_value;
-    _cached_TransactionUpdate_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_TransactionUpdate_type_value.value.elements.push(
-      {
-        name: 'status',
-        algebraicType: UpdateStatus.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'timestamp',
-        algebraicType: __AlgebraicTypeValue.createTimestampType(),
-      },
-      {
-        name: 'callerIdentity',
-        algebraicType: __AlgebraicTypeValue.createIdentityType(),
-      },
-      {
-        name: 'callerConnectionId',
-        algebraicType: __AlgebraicTypeValue.createConnectionIdType(),
-      },
-      {
-        name: 'reducerCall',
-        algebraicType: ReducerCallInfo.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'energyQuantaUsed',
-        algebraicType: EnergyQuanta.getTypeScriptAlgebraicType(),
-      },
-      {
-        name: 'totalHostExecutionDuration',
-        algebraicType: __AlgebraicTypeValue.createTimeDurationType(),
-      }
-    );
-    return _cached_TransactionUpdate_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: TransactionUpdate): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      TransactionUpdate.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): TransactionUpdate {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      TransactionUpdate.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default TransactionUpdate;
+export default __t.object('TransactionUpdate', {
+  status: __t.lazy(() => UpdateStatus),
+  timestamp: __t.timestamp(),
+  callerIdentity: __t.identity(),
+  callerConnectionId: __t.connectionId(),
+  reducerCall: __t.lazy(() => ReducerCallInfo),
+  energyQuantaUsed: __t.lazy(() => EnergyQuanta),
+  totalHostExecutionDuration: __t.timeDuration(),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
index e40f9d5ecf6..7df4e4b436e 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
@@ -4,87 +4,32 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
-import { SubscribeRows } from './subscribe_rows_type';
-// Mark import as potentially unused
-declare type __keep_SubscribeRows = SubscribeRows;
+} from '../../';
+import QueryId from './query_id_type';
+import SubscribeRows from './subscribe_rows_type';
 
-export type UnsubscribeApplied = {
-  requestId: number;
-  totalHostExecutionDurationMicros: bigint;
-  queryId: QueryId;
-  rows: SubscribeRows;
-};
-let _cached_UnsubscribeApplied_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const UnsubscribeApplied = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_UnsubscribeApplied_type_value)
-      return _cached_UnsubscribeApplied_type_value;
-    _cached_UnsubscribeApplied_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_UnsubscribeApplied_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'totalHostExecutionDurationMicros',
-        algebraicType: __AlgebraicTypeValue.U64,
-      },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() },
-      {
-        name: 'rows',
-        algebraicType: SubscribeRows.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_UnsubscribeApplied_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: UnsubscribeApplied): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      UnsubscribeApplied.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): UnsubscribeApplied {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      UnsubscribeApplied.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default UnsubscribeApplied;
+export default __t.object('UnsubscribeApplied', {
+  requestId: __t.u32(),
+  totalHostExecutionDurationMicros: __t.u64(),
+  queryId: __t.lazy(() => QueryId),
+  rows: __t.lazy(() => SubscribeRows),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
index d3cc7eba1f1..dcca1461ac7 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
@@ -4,88 +4,32 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
-import { DatabaseUpdate } from './database_update_type';
-// Mark import as potentially unused
-declare type __keep_DatabaseUpdate = DatabaseUpdate;
+} from '../../';
+import QueryId from './query_id_type';
+import DatabaseUpdate from './database_update_type';
 
-export type UnsubscribeMultiApplied = {
-  requestId: number;
-  totalHostExecutionDurationMicros: bigint;
-  queryId: QueryId;
-  update: DatabaseUpdate;
-};
-let _cached_UnsubscribeMultiApplied_type_value: __AlgebraicTypeType | null =
-  null;
-
-/**
- * An object for generated helper functions.
- */
-export const UnsubscribeMultiApplied = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_UnsubscribeMultiApplied_type_value)
-      return _cached_UnsubscribeMultiApplied_type_value;
-    _cached_UnsubscribeMultiApplied_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_UnsubscribeMultiApplied_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      {
-        name: 'totalHostExecutionDurationMicros',
-        algebraicType: __AlgebraicTypeValue.U64,
-      },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() },
-      {
-        name: 'update',
-        algebraicType: DatabaseUpdate.getTypeScriptAlgebraicType(),
-      }
-    );
-    return _cached_UnsubscribeMultiApplied_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: UnsubscribeMultiApplied): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      UnsubscribeMultiApplied.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): UnsubscribeMultiApplied {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      UnsubscribeMultiApplied.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default UnsubscribeMultiApplied;
+export default __t.object('UnsubscribeMultiApplied', {
+  requestId: __t.u32(),
+  totalHostExecutionDurationMicros: __t.u64(),
+  queryId: __t.lazy(() => QueryId),
+  update: __t.lazy(() => DatabaseUpdate),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
index 64279e511ff..bd727820597 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
@@ -4,74 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
+} from '../../';
+import QueryId from './query_id_type';
 
-export type UnsubscribeMulti = {
-  requestId: number;
-  queryId: QueryId;
-};
-let _cached_UnsubscribeMulti_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const UnsubscribeMulti = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_UnsubscribeMulti_type_value)
-      return _cached_UnsubscribeMulti_type_value;
-    _cached_UnsubscribeMulti_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_UnsubscribeMulti_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() }
-    );
-    return _cached_UnsubscribeMulti_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: UnsubscribeMulti): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      UnsubscribeMulti.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): UnsubscribeMulti {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      UnsubscribeMulti.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default UnsubscribeMulti;
+export default __t.object('UnsubscribeMulti', {
+  requestId: __t.u32(),
+  queryId: __t.lazy(() => QueryId),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
index d8d55cfd897..6bf6a3121ee 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
@@ -4,73 +4,29 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { QueryId } from './query_id_type';
-// Mark import as potentially unused
-declare type __keep_QueryId = QueryId;
+} from '../../';
+import QueryId from './query_id_type';
 
-export type Unsubscribe = {
-  requestId: number;
-  queryId: QueryId;
-};
-let _cached_Unsubscribe_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const Unsubscribe = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Unsubscribe_type_value) return _cached_Unsubscribe_type_value;
-    _cached_Unsubscribe_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_Unsubscribe_type_value.value.elements.push(
-      { name: 'requestId', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'queryId', algebraicType: QueryId.getTypeScriptAlgebraicType() }
-    );
-    return _cached_Unsubscribe_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Unsubscribe): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Unsubscribe.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Unsubscribe {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Unsubscribe.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Unsubscribe;
+export default __t.object('Unsubscribe', {
+  requestId: __t.u32(),
+  queryId: __t.lazy(() => QueryId),
+});
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
index ca9022ea5db..3f44ad0b748 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
@@ -4,94 +4,35 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { DatabaseUpdate } from './database_update_type';
-// Mark import as potentially unused
-declare type __keep_DatabaseUpdate = DatabaseUpdate;
+} from '../../';
+import DatabaseUpdate from './database_update_type';
 
 import * as UpdateStatusVariants from './update_status_variants';
 
 // The tagged union or sum type for the algebraic type `UpdateStatus`.
-export type UpdateStatus =
-  | UpdateStatusVariants.Committed
-  | UpdateStatusVariants.Failed
-  | UpdateStatusVariants.OutOfEnergy;
-
-let _cached_UpdateStatus_type_value: __AlgebraicTypeType | null = null;
-
-// A value with helper functions to construct the type.
-export const UpdateStatus = {
-  // Helper functions for constructing each variant of the tagged union.
-  // ```
-  // const foo = Foo.A(42);
-  // assert!(foo.tag === "A");
-  // assert!(foo.value === 42);
-  // ```
-  Committed: (value: DatabaseUpdate): UpdateStatusVariants.Committed => ({
-    tag: 'Committed',
-    value,
-  }),
-  Failed: (value: string): UpdateStatusVariants.Failed => ({
-    tag: 'Failed',
-    value,
-  }),
-  OutOfEnergy: { tag: 'OutOfEnergy' } as const,
-
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_UpdateStatus_type_value) return _cached_UpdateStatus_type_value;
-    _cached_UpdateStatus_type_value = __AlgebraicTypeValue.Sum({
-      variants: [],
-    });
-    _cached_UpdateStatus_type_value.value.variants.push(
-      {
-        name: 'Committed',
-        algebraicType: DatabaseUpdate.getTypeScriptAlgebraicType(),
-      },
-      { name: 'Failed', algebraicType: __AlgebraicTypeValue.String },
-      {
-        name: 'OutOfEnergy',
-        algebraicType: __AlgebraicTypeValue.Product({ elements: [] }),
-      }
-    );
-    return _cached_UpdateStatus_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: UpdateStatus): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      UpdateStatus.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): UpdateStatus {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      UpdateStatus.getTypeScriptAlgebraicType()
-    );
-  },
-};
+const UpdateStatus = __t.enum('UpdateStatus', {
+  Committed: __t.lazy(() => DatabaseUpdate),
+  Failed: __t.string(),
+  OutOfEnergy: __t.unit(),
+});
 
 export default UpdateStatus;
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
index 2a0f3231faa..67de3fe0d84 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
@@ -4,33 +4,31 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
-} from '../../index';
-import { DatabaseUpdate as DatabaseUpdateType } from './database_update_type';
-// Mark import as potentially unused
-declare type __keep_DatabaseUpdateType = DatabaseUpdateType;
+} from '../../';
+import DatabaseUpdateType from './database_update_type';
 
-export type Committed = { tag: 'Committed'; value: DatabaseUpdateType };
+export type Committed = {
+  tag: 'Committed';
+  value: __Infer<typeof DatabaseUpdateType>;
+};
 export type Failed = { tag: 'Failed'; value: string };
 export type OutOfEnergy = { tag: 'OutOfEnergy' };
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index b371426cf15..ac3d8c992b4 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -6,12 +6,12 @@ import {
 import { parseValue } from '../';
 import { BinaryReader } from '../';
 import { BinaryWriter } from '../';
-import { BsatnRowList } from './client_api/bsatn_row_list_type.ts';
-import { ClientMessage } from './client_api/client_message_type.ts';
-import { DatabaseUpdate } from './client_api/database_update_type.ts';
-import { QueryUpdate } from './client_api/query_update_type.ts';
-import { ServerMessage } from './client_api/server_message_type.ts';
-import { TableUpdate as RawTableUpdate } from './client_api/table_update_type.ts';
+import BsatnRowList from './client_api/bsatn_row_list_type.ts';
+import ClientMessage from './client_api/client_message_type.ts';
+import DatabaseUpdate from './client_api/database_update_type.ts';
+import QueryUpdate from './client_api/query_update_type.ts';
+import ServerMessage from './client_api/server_message_type.ts';
+import RawTableUpdate from './client_api/table_update_type.ts';
 import { ClientCache } from './client_cache.ts';
 import { DbConnectionBuilder } from './db_connection_builder.ts';
 import { type DbContext } from './db_context.ts';
@@ -25,7 +25,7 @@ import {
 } from './event_context.ts';
 import { EventEmitter } from './event_emitter.ts';
 import { decompress } from './decompress.ts';
-import type { Identity, InferTypeOfRow } from '../';
+import type { Identity, Infer, InferTypeOfRow } from '../';
 import type {
   IdentityTokenMessage,
   Message,
@@ -327,7 +327,7 @@ export class DbConnectionImpl<
       emitter: handleEmitter,
     });
     this.#sendMessage(
-      ClientMessage.SubscribeMulti({
+      ClientMessage.create('SubscribeMulti', {
         queryStrings: querySql,
         queryId: { id: queryId },
         // The TypeScript SDK doesn't currently track `request_id`s,
@@ -340,7 +340,7 @@ export class DbConnectionImpl<
 
   unregisterSubscription(queryId: number): void {
     this.#sendMessage(
-      ClientMessage.UnsubscribeMulti({
+      ClientMessage.create('UnsubscribeMulti', {
         queryId: { id: queryId },
         // The TypeScript SDK doesn't currently track `request_id`s,
         // so always use 0.
@@ -351,12 +351,12 @@ export class DbConnectionImpl<
 
   // This function is async because we decompress the message async
   async #processParsedMessage(
-    message: ServerMessage
+    message: Infer<typeof ServerMessage>
   ): Promise<Message | undefined> {
     const parseRowList = (
       type: 'insert' | 'delete',
       tableName: string,
-      rowList: BsatnRowList
+      rowList: Infer<typeof BsatnRowList>
     ): Operation[] => {
       const buffer = rowList.rowsData;
       const reader = new BinaryReader(buffer);
@@ -398,16 +398,17 @@ export class DbConnectionImpl<
     };
 
     const parseTableUpdate = async (
-      rawTableUpdate: RawTableUpdate
+      rawTableUpdate: Infer<typeof RawTableUpdate>
     ): Promise<CacheTableUpdate<UntypedTableDef>> => {
       const tableName = rawTableUpdate.tableName;
       let operations: Operation[] = [];
       for (const update of rawTableUpdate.updates) {
-        let decompressed: QueryUpdate;
+        let decompressed: Infer<typeof QueryUpdate>;
         if (update.tag === 'Gzip') {
           const decompressedBuffer = await decompress(update.value, 'gzip');
-          decompressed = QueryUpdate.deserialize(
-            new BinaryReader(decompressedBuffer)
+          decompressed = AlgebraicType.deserializeValue(
+            new BinaryReader(decompressedBuffer),
+            QueryUpdate.algebraicType
           );
         } else if (update.tag === 'Brotli') {
           throw new Error(
@@ -430,7 +431,7 @@ export class DbConnectionImpl<
     };
 
     const parseDatabaseUpdate = async (
-      dbUpdate: DatabaseUpdate
+      dbUpdate: Infer<typeof DatabaseUpdate>
     ): Promise<CacheTableUpdate<UntypedTableDef>[]> => {
       const tableUpdates: CacheTableUpdate<UntypedTableDef>[] = [];
       for (const rawTableUpdate of dbUpdate.tables) {
@@ -570,11 +571,11 @@ export class DbConnectionImpl<
     }
   }
 
-  #sendMessage(message: ClientMessage): void {
+  #sendMessage(message: Infer<typeof ClientMessage>): void {
     this.wsPromise.then(wsResolved => {
       if (wsResolved) {
         const writer = new BinaryWriter(1024);
-        ClientMessage.serialize(writer, message);
+        AlgebraicType.serializeValue(writer, ClientMessage.algebraicType, message);
         const encoded = writer.getBuffer();
         wsResolved.send(encoded);
       }
@@ -611,7 +612,7 @@ export class DbConnectionImpl<
   }
 
   async #processMessage(data: Uint8Array): Promise<void> {
-    const serverMessage = parseValue(ServerMessage, data);
+    const serverMessage = AlgebraicType.deserializeValue(new BinaryReader(data), ServerMessage.algebraicType);
     const message = await this.#processParsedMessage(serverMessage);
     if (!message) {
       return;
@@ -847,7 +848,7 @@ export class DbConnectionImpl<
     argsBuffer: Uint8Array,
     flags: CallReducerFlags
   ): void {
-    const message = ClientMessage.CallReducer({
+    const message = ClientMessage.create('CallReducer', {
       reducer: reducerName,
       args: argsBuffer,
       // The TypeScript SDK doesn't currently track `request_id`s,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
index ae96105ad77..07ca68d51ab 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
@@ -26,5 +29,5 @@ import Point from './point_type';
 
 export default {
   name: __t.string(),
-  location: Point,
+  location: __t.lazy(() => Point),
 };
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index fe002646926..9a78093d3e6 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -7,18 +7,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 2c616acbfe5..8de99f205dd 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
@@ -26,5 +29,5 @@ import Point from './point_type';
 export default __t.row({
   ownerId: __t.string(),
   name: __t.string(),
-  location: Point,
+  location: __t.lazy(() => Point),
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index a546844a378..c516e37b3f1 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
@@ -26,5 +29,5 @@ import Point from './point_type';
 export default __t.object('Player', {
   ownerId: __t.string(),
   name: __t.string(),
-  location: Point,
+  location: __t.lazy(() => Point),
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
index edc37d92a5e..ac099fec355 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
index 2c616acbfe5..8de99f205dd 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
@@ -26,5 +29,5 @@ import Point from './point_type';
 export default __t.row({
   ownerId: __t.string(),
   name: __t.string(),
-  location: Point,
+  location: __t.lazy(() => Point),
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
index d698ae7b3c5..739b174a030 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
@@ -26,5 +29,5 @@ import Point from './point_type';
 export default __t.object('UnindexedPlayer', {
   ownerId: __t.string(),
   name: __t.string(),
-  location: Point,
+  location: __t.lazy(() => Point),
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
index 2f323db0106..8f2f9bb22c3 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
index 6c8228a49a8..1f333d6f12a 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
@@ -5,18 +5,21 @@
 /* tslint:disable */
 import {
   DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionConfig as __DbConnectionConfig,
   DbConnectionImpl as __DbConnectionImpl,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
+  TypeBuilder as __TypeBuilder,
   convertToAccessorMap as __convertToAccessorMap,
   reducerSchema as __reducerSchema,
   reducers as __reducers,
   schema as __schema,
   t as __t,
   table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
diff --git a/crates/codegen/examples/regen-typescript-moduledef.rs b/crates/codegen/examples/regen-typescript-moduledef.rs
index 64ceee6e934..67d83892187 100644
--- a/crates/codegen/examples/regen-typescript-moduledef.rs
+++ b/crates/codegen/examples/regen-typescript-moduledef.rs
@@ -58,7 +58,7 @@ fn main() -> anyhow::Result<()> {
             );
             let code = regex_replace!(&code, r"DbConnectionBuilder as __DbConnectionBuilder,", r"");
             let code = regex_replace!(&code, r"DbConnectionImpl as __DbConnectionImpl,", r"");
-            let code = regex_replace!(&code, r"DbConnectionConfig as __DbConnectionConfig,", r"");
+            let code = regex_replace!(&code, r"type DbConnectionConfig as __DbConnectionConfig,", r"");
             let code = regex_replace!(&code, r"SubscriptionBuilderImpl as __SubscriptionBuilderImpl,", r"");
             let code = regex_replace!(&code, r"TableCache as __TableCache,", r"");
             let code = regex_replace!(&code, r"ClientCache as __ClientCache,", r"");
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index dcb1dd4bcf3..18186622aba 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -368,7 +368,7 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
         "type Infer as __Infer",
         "reducers as __reducers",
         "reducerSchema as __reducerSchema",
-        "DbConnectionConfig as __DbConnectionConfig",
+        "type DbConnectionConfig as __DbConnectionConfig",
         "t as __t",
     ];
     types.sort();
@@ -546,6 +546,9 @@ fn write_type_builder<W: Write>(module: &ModuleDef, out: &mut W, ty: &AlgebraicT
         },
         AlgebraicTypeUse::String => write!(out, "__t.string()")?,
         AlgebraicTypeUse::Array(elem_ty) => {
+            if matches!(&**elem_ty, AlgebraicTypeUse::Primitive(PrimitiveType::U8)) {
+                return write!(out, "__t.byteArray()");
+            }
             write!(out, "__t.array(")?;
             write_type_builder(module, out, elem_ty)?;
             write!(out, ")")?;
@@ -616,50 +619,6 @@ fn define_body_for_sum(
     name: &str,
     variants: &[(Identifier, AlgebraicTypeUse)],
 ) {
-
-// /* eslint-disable */
-// /* tslint:disable */
-// import {
-//   TypeBuilder,
-//   convertToAccessorMap as __convertToAccessorMap,
-//   reducerSchema as __reducerSchema,
-//   reducers as __reducers,
-//   schema as __schema,
-//   t as __t,
-//   table as __table,
-//   type AlgebraicTypeType,
-//   type Infer as __Infer,
-//   type RemoteModule as __RemoteModule,
-// } from '../../index';
-// import SumType from './sum_type_type';
-// import ProductType from './product_type_type';
-
-// // The tagged union or sum type for the algebraic type `AlgebraicType`.
-// const AlgebraicType: TypeBuilder<AlgebraicTypeType, AlgebraicTypeType> = __t.enum('AlgebraicType', {
-//   Ref: __t.u32(),
-//   Sum: SumType,
-//   Product: ProductType,
-//   Array: __t.lazy(() => AlgebraicType),
-//   String: __t.unit(),
-//   Bool: __t.unit(),
-//   I8: __t.unit(),
-//   U8: __t.unit(),
-//   I16: __t.unit(),
-//   U16: __t.unit(),
-//   I32: __t.unit(),
-//   U32: __t.unit(),
-//   I64: __t.unit(),
-//   U64: __t.unit(),
-//   I128: __t.unit(),
-//   U128: __t.unit(),
-//   I256: __t.unit(),
-//   U256: __t.unit(),
-//   F32: __t.unit(),
-//   F64: __t.unit(),
-// });
-
-// export default AlgebraicType;
-
     writeln!(out, "// The tagged union or sum type for the algebraic type `{name}`.");
     write!(out, "const {name}");
     if name == "AlgebraicType" {
@@ -795,7 +754,7 @@ pub fn write_type<W: Write>(
             write!(out, "[]")?;
         }
         AlgebraicTypeUse::Ref(r) => {
-            write!(out, "__Infer<typeof ")?;;
+            write!(out, "__Infer<typeof ")?;
             if let Some(prefix) = ref_prefix {
                 write!(out, "{prefix}")?;
             }

From 0bb29765e510b85e3257567c0a745439c4e6321b Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Thu, 6 Nov 2025 08:24:41 -0500
Subject: [PATCH 12/23] It finally builds successfully

---
 .../src/lib/algebraic_type.ts                 |  7 +++---
 .../src/lib/type_builders.ts                  | 23 +++++++------------
 .../bindings-typescript/src/react/useTable.ts |  2 +-
 .../src/sdk/message_types.ts                  |  4 ++--
 .../src/sdk/reducer_event.ts                  |  4 ++--
 .../src/sdk/websocket_test_adapter.ts         |  6 ++---
 .../bindings-typescript/src/server/runtime.ts | 13 +++++++----
 7 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/algebraic_type.ts b/crates/bindings-typescript/src/lib/algebraic_type.ts
index fde84d63a4e..4bb42a475e9 100644
--- a/crates/bindings-typescript/src/lib/algebraic_type.ts
+++ b/crates/bindings-typescript/src/lib/algebraic_type.ts
@@ -5,7 +5,6 @@ import type BinaryReader from './binary_reader';
 import BinaryWriter from './binary_writer';
 import { Identity } from './identity';
 import * as AlgebraicTypeVariants from './algebraic_type_variants';
-import type { MaybeLazy } from './type_builders';
 
 type TypespaceType = {
   types: AlgebraicTypeType[];
@@ -75,12 +74,12 @@ export { AlgebraicTypeVariants }
 // A value with helper functions to construct the type.
 export const AlgebraicType = {
   Ref: (value: number): AlgebraicTypeVariants.Ref => ({ tag: 'Ref', value }),
-  Sum: <T extends MaybeLazy<SumTypeType>>(value: T): { tag: 'Sum'; value: T } => ({ tag: 'Sum', value }),
-  Product: <T extends MaybeLazy<ProductTypeType>>(value: T): { tag: 'Product'; value: T } => ({
+  Sum: <T extends SumTypeType>(value: T): { tag: 'Sum'; value: T } => ({ tag: 'Sum', value }),
+  Product: <T extends ProductTypeType>(value: T): { tag: 'Product'; value: T } => ({
     tag: 'Product',
     value,
   }),
-  Array: <T extends MaybeLazy<AlgebraicTypeType>>(value: T): { tag: 'Array'; value: T } => ({
+  Array: <T extends AlgebraicTypeType>(value: T): { tag: 'Array'; value: T } => ({
     tag: 'Array',
     value,
   }),
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 183b2a079d8..1aabfab31d0 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -20,14 +20,14 @@ import { set, type SetField } from './type_util';
 /**
  * Helper type to extract the TypeScript type from a TypeBuilder
  */
-export type InferTypeOfTypeBuilder<T extends MaybeLazy<TypeBuilder<any, any>>> =
-  UnwrapLazy<T> extends TypeBuilder<infer U, any> ? U : never;
+export type InferTypeOfTypeBuilder<T extends TypeBuilder<any, any>> =
+  T extends TypeBuilder<infer U, any> ? U : never;
 
 /**
  * Helper type to extract the Spacetime type from a TypeBuilder
  */
-export type InferSpacetimeTypeOfTypeBuilder<T extends MaybeLazy<TypeBuilder<any, any>>> =
-  UnwrapLazy<T> extends TypeBuilder<any, infer U> ? U : never;
+export type InferSpacetimeTypeOfTypeBuilder<T extends TypeBuilder<any, any>> =
+  T extends TypeBuilder<any, infer U> ? U : never;
 
 /**
  * Helper type to extract the TypeScript type from a TypeBuilder
@@ -83,7 +83,7 @@ type RowType<Row extends RowObj> = {
 /**
  * Type which represents a valid argument to the ProductColumnBuilder
  */
-type ElementsObj = Record<string, MaybeLazy<TypeBuilder<any, any>>>;
+type ElementsObj = Record<string, TypeBuilder<any, any>>;
 
 /**
  * Type which converts the elements of ElementsObj to a ProductType elements array
@@ -108,17 +108,10 @@ type ObjectType<Elements extends ElementsObj> = {
   [K in keyof Elements]: InferTypeOfTypeBuilder<Elements[K]>;
 };
 
-// A value or a thunk returning that value
-export type MaybeLazy<T> = T;
-
-// Recursively peel off () => layers, if any
-type UnwrapLazy<T> = T extends () => infer R ? UnwrapLazy<R> : T;
-
-// type VariantsObj = Record<string, TypedPropertyDescriptor<TypeBuilder<any, any>>>;
-type VariantsObj = Record<string, MaybeLazy<TypeBuilder<any, any>>>;
+type VariantsObj = Record<string, TypeBuilder<any, any>>;
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 type UnitBuilder = ProductBuilder<{}>;
-type SimpleVariantsObj = Record<string, MaybeLazy<UnitBuilder>>;
+type SimpleVariantsObj = Record<string, UnitBuilder>;
 
 type IsUnit<B> = B extends UnitBuilder ? true : false;
 
@@ -1218,7 +1211,7 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
 }
 
 // Value type produced for a given variant key + builder
-type EnumValue<K extends string, B extends MaybeLazy<TypeBuilder<any, any>>> =
+type EnumValue<K extends string, B extends TypeBuilder<any, any>> =
   IsUnit<B> extends true
   ? { tag: K }
   : { tag: K; value: InferTypeOfTypeBuilder<B> };
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index b8ac3fab862..d2c056ea78e 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -317,7 +317,7 @@ export function useTable<
     if (!connection) {
       return [];
     }
-    const table = connection.db[tableName] as ClientTable<UntypedRemoteModule, TableDef['name']>;
+    const table = connection.db[tableName];
     const result: readonly UseTableRowType[] = whereClause
       ? (Array.from(table.iter()).filter(row => evaluate(whereClause, row as UseTableRowType)) as UseTableRowType[])
       : (Array.from(table.iter()) as UseTableRowType[]);
diff --git a/crates/bindings-typescript/src/sdk/message_types.ts b/crates/bindings-typescript/src/sdk/message_types.ts
index 5051dddeb82..d9c9008534f 100644
--- a/crates/bindings-typescript/src/sdk/message_types.ts
+++ b/crates/bindings-typescript/src/sdk/message_types.ts
@@ -1,4 +1,4 @@
-import { ConnectionId } from '../';
+import { ConnectionId, type Infer } from '../';
 import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
 import type { TableUpdate } from './table_cache.ts';
@@ -19,7 +19,7 @@ export type TransactionUpdateMessage = {
     reducerName: string;
     args: Uint8Array;
   };
-  status: UpdateStatus;
+  status: Infer<typeof UpdateStatus>;
   message: string;
   timestamp: Timestamp;
   energyConsumed: bigint;
diff --git a/crates/bindings-typescript/src/sdk/reducer_event.ts b/crates/bindings-typescript/src/sdk/reducer_event.ts
index 60638bd2f43..86904c7892e 100644
--- a/crates/bindings-typescript/src/sdk/reducer_event.ts
+++ b/crates/bindings-typescript/src/sdk/reducer_event.ts
@@ -1,4 +1,4 @@
-import { ConnectionId } from '../';
+import { ConnectionId, type Infer } from '../';
 import { Timestamp } from '../';
 import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
@@ -16,7 +16,7 @@ export type ReducerEvent<Reducer extends ReducerEventInfo> = {
   /**
    * Whether the reducer committed, was aborted due to insufficient energy, or failed with an error message.
    */
-  status: UpdateStatus;
+  status: Infer<typeof UpdateStatus>;
 
   /**
    * The identity of the caller.
diff --git a/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts b/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
index fc5a7255d93..53dd85cf7f0 100644
--- a/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
+++ b/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
@@ -1,4 +1,4 @@
-import { AlgebraicType, BinaryWriter } from '../';
+import { AlgebraicType, BinaryWriter, type Infer } from '../';
 import { ServerMessage } from './client_api/index.ts';
 
 class WebsocketTestAdapter {
@@ -28,11 +28,11 @@ class WebsocketTestAdapter {
     this.onopen();
   }
 
-  sendToClient(message: ServerMessage): void {
+  sendToClient(message: Infer<typeof ServerMessage>): void {
     const writer = new BinaryWriter(1024);
     AlgebraicType.serializeValue(
       writer,
-      ServerMessage.getTypeScriptAlgebraicType(),
+      ServerMessage.algebraicType,
       message
     );
     const rawBytes = writer.getBuffer();
diff --git a/crates/bindings-typescript/src/server/runtime.ts b/crates/bindings-typescript/src/server/runtime.ts
index 1366c763aa6..ea442b38308 100644
--- a/crates/bindings-typescript/src/server/runtime.ts
+++ b/crates/bindings-typescript/src/server/runtime.ts
@@ -30,6 +30,7 @@ import * as _syscalls from 'spacetime:sys@1.0';
 import type { u16, u32, ModuleHooks } from 'spacetime:sys@1.0';
 import type { DbView } from './db_view';
 import { toCamelCase } from '../lib/utils';
+import type { Infer } from '../lib/type_builders';
 
 const { freeze } = Object;
 
@@ -176,7 +177,11 @@ class AuthCtxImpl implements AuthCtx {
 export const hooks: ModuleHooks = {
   __describe_module__() {
     const writer = new BinaryWriter(128);
-    RawModuleDef.serialize(writer, RawModuleDef.V9(MODULE_DEF));
+    AlgebraicType.serializeValue(
+      writer,
+      RawModuleDef.algebraicType,
+      RawModuleDef.create('V9', MODULE_DEF),
+    )
     return writer.getBuffer();
   },
   __call_reducer__(reducerId, sender, connId, timestamp, argsBuf) {
@@ -219,7 +224,7 @@ function getDbView() {
   return DB_VIEW;
 }
 
-function makeDbView(moduleDef: RawModuleDefV9): DbView<any> {
+function makeDbView(moduleDef: Infer<typeof RawModuleDefV9>): DbView<any> {
   return freeze(
     Object.fromEntries(
       moduleDef.tables.map(table => [
@@ -230,7 +235,7 @@ function makeDbView(moduleDef: RawModuleDefV9): DbView<any> {
   );
 }
 
-function makeTableView(typespace: Typespace, table: RawTableDefV9): Table<any> {
+function makeTableView(typespace: Infer<typeof Typespace>, table: Infer<typeof RawTableDefV9>): Table<any> {
   const table_id = sys.table_id_from_name(table.name);
   const rowType = typespace.types[table.productTypeRef];
   if (rowType.tag !== 'Product') {
@@ -467,7 +472,7 @@ function makeTableView(typespace: Typespace, table: RawTableDefV9): Table<any> {
   return freeze(tableView);
 }
 
-function bsatnBaseSize(typespace: Typespace, ty: AlgebraicType): number {
+function bsatnBaseSize(typespace: Infer<typeof Typespace>, ty: AlgebraicType): number {
   const assumedArrayLength = 4;
   while (ty.tag === 'Ref') ty = typespace.types[ty.value];
   if (ty.tag === 'Product') {

From 0b0b06d5f67fecff50eb7b1c79bff5dad686f5d2 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Thu, 6 Nov 2025 18:16:30 -0500
Subject: [PATCH 13/23] Small comment

---
 crates/bindings-typescript/src/lib/type_builders.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 1aabfab31d0..cf1ffceeaa3 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -2844,6 +2844,12 @@ export const t = {
     return new ProductBuilder({});
   },
 
+  /**
+   * Creates a lazily-evaluated {@link TypeBuilder}. This is useful for creating
+   * recursive types, such as a tree or linked list. 
+   * @param thunk A function that returns a {@link TypeBuilder}.
+   * @returns A proxy {@link TypeBuilder} that evaluates the thunk on first access. 
+   */
   lazy<Build extends () => TypeBuilder<any, any>>(
     thunk: Build
   ): ReturnType<Build> {

From 08dba2f5d991b8834cdf039e092b50bcb2c9542e Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sat, 8 Nov 2025 17:57:25 -0500
Subject: [PATCH 14/23] Living the dream

---
 .../src/lib/autogen/algebraic_type_type.ts    |  12 +-
 .../lib/autogen/misc_module_export_type.ts    |   4 +-
 .../lib/autogen/product_type_element_type.ts  |   4 +-
 .../src/lib/autogen/product_type_type.ts      |   4 +-
 .../lib/autogen/raw_column_def_v_8_type.ts    |   4 +-
 .../autogen/raw_constraint_data_v_9_type.ts   |   4 +-
 .../autogen/raw_constraint_def_v_9_type.ts    |   4 +-
 .../src/lib/autogen/raw_index_def_v_8_type.ts |   4 +-
 .../src/lib/autogen/raw_index_def_v_9_type.ts |   4 +-
 .../raw_misc_module_export_v_9_type.ts        |  12 +-
 .../src/lib/autogen/raw_module_def_type.ts    |   8 +-
 .../lib/autogen/raw_module_def_v_8_type.ts    |  16 +-
 .../lib/autogen/raw_module_def_v_9_type.ts    |  24 ++-
 .../lib/autogen/raw_procedure_def_v_9_type.ts |   8 +-
 .../lib/autogen/raw_reducer_def_v_9_type.ts   |   8 +-
 .../src/lib/autogen/raw_table_def_v_8_type.ts |  16 +-
 .../src/lib/autogen/raw_table_def_v_9_type.ts |  24 ++-
 .../src/lib/autogen/raw_type_def_v_9_type.ts  |   4 +-
 .../src/lib/autogen/raw_view_def_v_9_type.ts  |   8 +-
 .../src/lib/autogen/reducer_def_type.ts       |   4 +-
 .../src/lib/autogen/sum_type_type.ts          |   4 +-
 .../src/lib/autogen/sum_type_variant_type.ts  |   4 +-
 .../src/lib/autogen/table_desc_type.ts        |   4 +-
 .../src/lib/autogen/typespace_type.ts         |   4 +-
 .../bindings-typescript/src/lib/reducers.ts   |   2 +-
 crates/bindings-typescript/src/lib/schema.ts  | 107 ++++++++---
 crates/bindings-typescript/src/lib/table.ts   |  17 +-
 .../src/lib/type_builders.ts                  | 181 ++++++++++--------
 .../src/sdk/client_api/bsatn_row_list_type.ts |   6 +-
 .../src/sdk/client_api/call_procedure_type.ts |   2 +-
 .../src/sdk/client_api/call_reducer_type.ts   |   2 +-
 .../src/sdk/client_api/client_message_type.ts |  34 +++-
 .../sdk/client_api/client_message_variants.ts |   2 +-
 .../compressable_query_update_type.ts         |   6 +-
 .../compressable_query_update_variants.ts     |   2 +-
 .../sdk/client_api/database_update_type.ts    |   6 +-
 .../src/sdk/client_api/energy_quanta_type.ts  |   2 +-
 .../src/sdk/client_api/identity_token_type.ts |   2 +-
 .../src/sdk/client_api/index.ts               |   4 +-
 .../client_api/initial_subscription_type.ts   |   6 +-
 .../client_api/one_off_query_response_type.ts |   6 +-
 .../src/sdk/client_api/one_off_query_type.ts  |   2 +-
 .../src/sdk/client_api/one_off_table_type.ts  |   6 +-
 .../sdk/client_api/procedure_result_type.ts   |   6 +-
 .../sdk/client_api/procedure_status_type.ts   |   2 +-
 .../client_api/procedure_status_variants.ts   |   2 +-
 .../src/sdk/client_api/query_id_type.ts       |   2 +-
 .../src/sdk/client_api/query_update_type.ts   |  10 +-
 .../sdk/client_api/reducer_call_info_type.ts  |   2 +-
 .../src/sdk/client_api/row_size_hint_type.ts  |   2 +-
 .../sdk/client_api/row_size_hint_variants.ts  |   2 +-
 .../src/sdk/client_api/server_message_type.ts |  46 +++--
 .../sdk/client_api/server_message_variants.ts |   2 +-
 .../sdk/client_api/subscribe_applied_type.ts  |  10 +-
 .../subscribe_multi_applied_type.ts           |  10 +-
 .../sdk/client_api/subscribe_multi_type.ts    |   6 +-
 .../src/sdk/client_api/subscribe_rows_type.ts |   6 +-
 .../sdk/client_api/subscribe_single_type.ts   |   6 +-
 .../src/sdk/client_api/subscribe_type.ts      |   2 +-
 .../sdk/client_api/subscription_error_type.ts |   2 +-
 .../src/sdk/client_api/table_update_type.ts   |   6 +-
 .../transaction_update_light_type.ts          |   6 +-
 .../sdk/client_api/transaction_update_type.ts |  14 +-
 .../client_api/unsubscribe_applied_type.ts    |  10 +-
 .../unsubscribe_multi_applied_type.ts         |  10 +-
 .../sdk/client_api/unsubscribe_multi_type.ts  |   6 +-
 .../src/sdk/client_api/unsubscribe_type.ts    |   6 +-
 .../src/sdk/client_api/update_status_type.ts  |   6 +-
 .../sdk/client_api/update_status_variants.ts  |   2 +-
 .../module_bindings/create_player_reducer.ts  |   4 +-
 .../test-app/src/module_bindings/index.ts     |   2 +-
 .../src/module_bindings/player_table.ts       |   4 +-
 .../src/module_bindings/player_type.ts        |   4 +-
 .../module_bindings/unindexed_player_table.ts |   4 +-
 .../module_bindings/unindexed_player_type.ts  |   4 +-
 crates/codegen/src/typescript.rs              |  38 +++-
 crates/update/src/proxy.rs                    |   2 +-
 77 files changed, 571 insertions(+), 262 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
index 473db013d39..dae554a56f9 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
@@ -24,9 +24,15 @@ import * as AlgebraicTypeVariants from './algebraic_type_variants';
 const AlgebraicType: __TypeBuilder<__AlgebraicTypeType, __AlgebraicTypeType> =
   __t.enum('AlgebraicType', {
     Ref: __t.u32(),
-    Sum: __t.lazy(() => SumType),
-    Product: __t.lazy(() => ProductType),
-    Array: __t.lazy(() => AlgebraicType),
+    get Sum() {
+      return SumType;
+    },
+    get Product() {
+      return ProductType;
+    },
+    get Array() {
+      return AlgebraicType;
+    },
     String: __t.unit(),
     Bool: __t.unit(),
     I8: __t.unit(),
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
index aa73d10f932..361d1e837d6 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
@@ -21,7 +21,9 @@ import * as MiscModuleExportVariants from './misc_module_export_variants';
 
 // The tagged union or sum type for the algebraic type `MiscModuleExport`.
 const MiscModuleExport = __t.enum('MiscModuleExport', {
-  TypeAlias: __t.lazy(() => TypeAlias),
+  get TypeAlias() {
+    return TypeAlias;
+  },
 });
 
 export default MiscModuleExport;
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
index 6c0c18db2ed..a74101a01ff 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
@@ -19,5 +19,7 @@ import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('ProductTypeElement', {
   name: __t.option(__t.string()),
-  algebraicType: __t.lazy(() => AlgebraicType),
+  get algebraicType() {
+    return AlgebraicType;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
index 2ae773e4ae1..9c6b1d829bd 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
@@ -18,5 +18,7 @@ import {
 import ProductTypeElement from './product_type_element_type';
 
 export default __t.object('ProductType', {
-  elements: __t.array(__t.lazy(() => ProductTypeElement)),
+  get elements() {
+    return __t.array(ProductTypeElement);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
index fba5664e6bd..a75f00564e2 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
@@ -19,5 +19,7 @@ import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('RawColumnDefV8', {
   colName: __t.string(),
-  colType: __t.lazy(() => AlgebraicType),
+  get colType() {
+    return AlgebraicType;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
index bfba927c01d..873bce360bf 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
@@ -21,7 +21,9 @@ import * as RawConstraintDataV9Variants from './raw_constraint_data_v_9_variants
 
 // The tagged union or sum type for the algebraic type `RawConstraintDataV9`.
 const RawConstraintDataV9 = __t.enum('RawConstraintDataV9', {
-  Unique: __t.lazy(() => RawUniqueConstraintDataV9),
+  get Unique() {
+    return RawUniqueConstraintDataV9;
+  },
 });
 
 export default RawConstraintDataV9;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
index f7546f62c21..dbf85cb0c94 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
@@ -19,5 +19,7 @@ import RawConstraintDataV9 from './raw_constraint_data_v_9_type';
 
 export default __t.object('RawConstraintDefV9', {
   name: __t.option(__t.string()),
-  data: __t.lazy(() => RawConstraintDataV9),
+  get data() {
+    return RawConstraintDataV9;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
index 9ff3382a532..893984859e3 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
@@ -20,6 +20,8 @@ import IndexType from './index_type_type';
 export default __t.object('RawIndexDefV8', {
   indexName: __t.string(),
   isUnique: __t.bool(),
-  indexType: __t.lazy(() => IndexType),
+  get indexType() {
+    return IndexType;
+  },
   columns: __t.array(__t.u16()),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
index cd512b020b6..414120b454c 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
@@ -20,5 +20,7 @@ import RawIndexAlgorithm from './raw_index_algorithm_type';
 export default __t.object('RawIndexDefV9', {
   name: __t.option(__t.string()),
   accessorName: __t.option(__t.string()),
-  algorithm: __t.lazy(() => RawIndexAlgorithm),
+  get algorithm() {
+    return RawIndexAlgorithm;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
index 41e0e3aa057..4ab2cea93e9 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
@@ -23,9 +23,15 @@ import * as RawMiscModuleExportV9Variants from './raw_misc_module_export_v_9_var
 
 // The tagged union or sum type for the algebraic type `RawMiscModuleExportV9`.
 const RawMiscModuleExportV9 = __t.enum('RawMiscModuleExportV9', {
-  ColumnDefaultValue: __t.lazy(() => RawColumnDefaultValueV9),
-  Procedure: __t.lazy(() => RawProcedureDefV9),
-  View: __t.lazy(() => RawViewDefV9),
+  get ColumnDefaultValue() {
+    return RawColumnDefaultValueV9;
+  },
+  get Procedure() {
+    return RawProcedureDefV9;
+  },
+  get View() {
+    return RawViewDefV9;
+  },
 });
 
 export default RawMiscModuleExportV9;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
index f8700af5410..b7e32068158 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
@@ -22,8 +22,12 @@ import * as RawModuleDefVariants from './raw_module_def_variants';
 
 // The tagged union or sum type for the algebraic type `RawModuleDef`.
 const RawModuleDef = __t.enum('RawModuleDef', {
-  V8BackCompat: __t.lazy(() => RawModuleDefV8),
-  V9: __t.lazy(() => RawModuleDefV9),
+  get V8BackCompat() {
+    return RawModuleDefV8;
+  },
+  get V9() {
+    return RawModuleDefV9;
+  },
 });
 
 export default RawModuleDef;
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
index e5e46dafac0..218270d4167 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
@@ -21,8 +21,16 @@ import ReducerDef from './reducer_def_type';
 import MiscModuleExport from './misc_module_export_type';
 
 export default __t.object('RawModuleDefV8', {
-  typespace: __t.lazy(() => Typespace),
-  tables: __t.array(__t.lazy(() => TableDesc)),
-  reducers: __t.array(__t.lazy(() => ReducerDef)),
-  miscExports: __t.array(__t.lazy(() => MiscModuleExport)),
+  get typespace() {
+    return Typespace;
+  },
+  get tables() {
+    return __t.array(TableDesc);
+  },
+  get reducers() {
+    return __t.array(ReducerDef);
+  },
+  get miscExports() {
+    return __t.array(MiscModuleExport);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
index 796d92076ee..a7fc9f2bcfa 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
@@ -23,10 +23,22 @@ import RawMiscModuleExportV9 from './raw_misc_module_export_v_9_type';
 import RawRowLevelSecurityDefV9 from './raw_row_level_security_def_v_9_type';
 
 export default __t.object('RawModuleDefV9', {
-  typespace: __t.lazy(() => Typespace),
-  tables: __t.array(__t.lazy(() => RawTableDefV9)),
-  reducers: __t.array(__t.lazy(() => RawReducerDefV9)),
-  types: __t.array(__t.lazy(() => RawTypeDefV9)),
-  miscExports: __t.array(__t.lazy(() => RawMiscModuleExportV9)),
-  rowLevelSecurity: __t.array(__t.lazy(() => RawRowLevelSecurityDefV9)),
+  get typespace() {
+    return Typespace;
+  },
+  get tables() {
+    return __t.array(RawTableDefV9);
+  },
+  get reducers() {
+    return __t.array(RawReducerDefV9);
+  },
+  get types() {
+    return __t.array(RawTypeDefV9);
+  },
+  get miscExports() {
+    return __t.array(RawMiscModuleExportV9);
+  },
+  get rowLevelSecurity() {
+    return __t.array(RawRowLevelSecurityDefV9);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
index b74a7d5f430..3edba3dd591 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
@@ -20,6 +20,10 @@ import ProductType from './product_type_type';
 
 export default __t.object('RawProcedureDefV9', {
   name: __t.string(),
-  params: __t.lazy(() => ProductType),
-  returnType: __t.lazy(() => AlgebraicType),
+  get params() {
+    return ProductType;
+  },
+  get returnType() {
+    return AlgebraicType;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
index 325f5ebdc80..90a742f73e3 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
@@ -20,6 +20,10 @@ import Lifecycle from './lifecycle_type';
 
 export default __t.object('RawReducerDefV9', {
   name: __t.string(),
-  params: __t.lazy(() => ProductType),
-  lifecycle: __t.option(__t.lazy(() => Lifecycle)),
+  get params() {
+    return ProductType;
+  },
+  get lifecycle() {
+    return __t.option(Lifecycle);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
index 02885efe43a..0e04a4bdf23 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
@@ -22,10 +22,18 @@ import RawSequenceDefV8 from './raw_sequence_def_v_8_type';
 
 export default __t.object('RawTableDefV8', {
   tableName: __t.string(),
-  columns: __t.array(__t.lazy(() => RawColumnDefV8)),
-  indexes: __t.array(__t.lazy(() => RawIndexDefV8)),
-  constraints: __t.array(__t.lazy(() => RawConstraintDefV8)),
-  sequences: __t.array(__t.lazy(() => RawSequenceDefV8)),
+  get columns() {
+    return __t.array(RawColumnDefV8);
+  },
+  get indexes() {
+    return __t.array(RawIndexDefV8);
+  },
+  get constraints() {
+    return __t.array(RawConstraintDefV8);
+  },
+  get sequences() {
+    return __t.array(RawSequenceDefV8);
+  },
   tableType: __t.string(),
   tableAccess: __t.string(),
   scheduled: __t.option(__t.string()),
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
index 7d593002beb..497e4a8069e 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
@@ -26,10 +26,22 @@ export default __t.object('RawTableDefV9', {
   name: __t.string(),
   productTypeRef: __t.u32(),
   primaryKey: __t.array(__t.u16()),
-  indexes: __t.array(__t.lazy(() => RawIndexDefV9)),
-  constraints: __t.array(__t.lazy(() => RawConstraintDefV9)),
-  sequences: __t.array(__t.lazy(() => RawSequenceDefV9)),
-  schedule: __t.option(__t.lazy(() => RawScheduleDefV9)),
-  tableType: __t.lazy(() => TableType),
-  tableAccess: __t.lazy(() => TableAccess),
+  get indexes() {
+    return __t.array(RawIndexDefV9);
+  },
+  get constraints() {
+    return __t.array(RawConstraintDefV9);
+  },
+  get sequences() {
+    return __t.array(RawSequenceDefV9);
+  },
+  get schedule() {
+    return __t.option(RawScheduleDefV9);
+  },
+  get tableType() {
+    return TableType;
+  },
+  get tableAccess() {
+    return TableAccess;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
index 0b0b4e11b1d..3c0393dd8fe 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
@@ -18,7 +18,9 @@ import {
 import RawScopedTypeNameV9 from './raw_scoped_type_name_v_9_type';
 
 export default __t.object('RawTypeDefV9', {
-  name: __t.lazy(() => RawScopedTypeNameV9),
+  get name() {
+    return RawScopedTypeNameV9;
+  },
   ty: __t.u32(),
   customOrdering: __t.bool(),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
index e333d27b505..403f40dc2aa 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
@@ -22,6 +22,10 @@ export default __t.object('RawViewDefV9', {
   name: __t.string(),
   isPublic: __t.bool(),
   isAnonymous: __t.bool(),
-  params: __t.lazy(() => ProductType),
-  returnType: __t.lazy(() => AlgebraicType),
+  get params() {
+    return ProductType;
+  },
+  get returnType() {
+    return AlgebraicType;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
index eff8f6ac0f4..cb6684478a6 100644
--- a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
@@ -19,5 +19,7 @@ import ProductTypeElement from './product_type_element_type';
 
 export default __t.object('ReducerDef', {
   name: __t.string(),
-  args: __t.array(__t.lazy(() => ProductTypeElement)),
+  get args() {
+    return __t.array(ProductTypeElement);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
index fe155e775ad..8e56f6cd3bb 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
@@ -18,5 +18,7 @@ import {
 import SumTypeVariant from './sum_type_variant_type';
 
 export default __t.object('SumType', {
-  variants: __t.array(__t.lazy(() => SumTypeVariant)),
+  get variants() {
+    return __t.array(SumTypeVariant);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
index a94709e505a..6a42cb2abc4 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
@@ -19,5 +19,7 @@ import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('SumTypeVariant', {
   name: __t.option(__t.string()),
-  algebraicType: __t.lazy(() => AlgebraicType),
+  get algebraicType() {
+    return AlgebraicType;
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
index ed8675690e7..53211d09bdc 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
@@ -18,6 +18,8 @@ import {
 import RawTableDefV8 from './raw_table_def_v_8_type';
 
 export default __t.object('TableDesc', {
-  schema: __t.lazy(() => RawTableDefV8),
+  get schema() {
+    return RawTableDefV8;
+  },
   data: __t.u32(),
 });
diff --git a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
index cec842682ea..debfdd68b43 100644
--- a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
@@ -18,5 +18,7 @@ import {
 import AlgebraicType from './algebraic_type_type';
 
 export default __t.object('Typespace', {
-  types: __t.array(__t.lazy(() => AlgebraicType)),
+  get types() {
+    return __t.array(AlgebraicType);
+  },
 });
diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index 8f11e5fd730..8551fed39dc 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -139,7 +139,7 @@ export function pushReducer(
   const paramType: ProductType = {
     elements: Object.entries(params).map(([n, c]) => ({
       name: n,
-      algebraicType: ('typeBuilder' in c ? c.typeBuilder : c).algebraicType,
+      algebraicType: c.algebraicType,
     })),
   };
 
diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
index f39c888f4b0..8676385a6dc 100644
--- a/crates/bindings-typescript/src/lib/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -2,11 +2,17 @@ import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
 import type Typespace from './autogen/typespace_type';
 import {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  type ColumnBuilder,
+  ColumnBuilder,
+  ProductBuilder,
+  RefBuilder,
+  RowBuilder,
+  SumBuilder,
+  type ElementsObj,
   type Infer,
   type RowObj,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type TypeBuilder,
+  type VariantsObj,
 } from './type_builders';
 import type { UntypedTableDef } from './table';
 import {
@@ -20,6 +26,7 @@ import {
 import type RawModuleDefV9 from './autogen/raw_module_def_v_9_type';
 import {
   AlgebraicType,
+  type AlgebraicTypeType,
   type AlgebraicTypeVariants,
 } from './algebraic_type';
 import type RawScopedTypeNameV9 from './autogen/raw_scoped_type_name_v_9_type';
@@ -65,33 +72,81 @@ export const MODULE_DEF: Infer<typeof RawModuleDefV9> = {
 
 const COMPOUND_TYPES = new Map<
   AlgebraicTypeVariants.Product | AlgebraicTypeVariants.Sum,
-  AlgebraicTypeVariants.Ref
+  RefBuilder
 >();
 
-export function addType<T extends AlgebraicType>(
-  name: string | undefined,
-  ty: T
-): T | AlgebraicTypeVariants.Ref {
-  if (
-    (ty.tag === 'Product' && (ty.value.elements.length > 0 || name != null)) ||
-    (ty.tag === 'Sum' && (ty.value.variants.length > 0 || name != null))
-  ) {
-    let r = COMPOUND_TYPES.get(ty);
-    if (r == null) {
-      r = AlgebraicType.Ref(MODULE_DEF.typespace.types.length);
-      MODULE_DEF.typespace.types.push(ty);
-      COMPOUND_TYPES.set(ty, r);
-      if (name != null)
-        MODULE_DEF.types.push({
-          name: splitName(name),
-          ty: r.value,
-          customOrdering: true,
-        });
-    }
+/**
+ * Resolves the actual type of a TypeBuilder by following its references until it reaches a non-ref type.
+ * @param typespace The typespace to resolve types against.
+ * @param typeBuilder The TypeBuilder to resolve.
+ * @returns The resolved algebraic type.
+ */
+export function resolveType<AT extends AlgebraicTypeType>(
+  typespace: Infer<typeof Typespace>,
+  typeBuilder: TypeBuilder<any, AT>
+): AT {
+  let ty: AlgebraicType = typeBuilder.algebraicType;
+  while (ty.tag === 'Ref') {
+    ty = typespace.types[ty.value];
+  }
+  return ty as AT;
+}
+
+/**
+ * Adds a type to the module definition's typespace as a `Ref` if it is a named compound type (Product or Sum).
+ * Otherwise, returns the type as is.
+ * @param name 
+ * @param ty 
+ * @returns 
+ */
+export function registerTypesRecursively(
+  typeBuilder: SumBuilder<VariantsObj> | ProductBuilder<ElementsObj> | RowBuilder<RowObj> 
+): RefBuilder {
+  const ty = typeBuilder.algebraicType;
+  const name = typeBuilder.typeName;
+
+  let r = COMPOUND_TYPES.get(ty);
+  if (r != null) {
+    // Already added to typespace
     return r;
-  } else {
-    return ty;
   }
+
+  // Recursively register nested compound types
+  if (typeBuilder instanceof RowBuilder) {
+    for (const [name, elem] of Object.entries(typeBuilder.row)) {
+      if (!(elem instanceof ProductBuilder || elem instanceof SumBuilder || elem instanceof RowBuilder)) {
+        continue;
+      }
+      typeBuilder.row[name] = new ColumnBuilder(registerTypesRecursively(elem), {});
+    }
+  } else if (typeBuilder instanceof ProductBuilder) {
+    for (const [name, elem] of Object.entries(typeBuilder.elements)) {
+      if (!(elem instanceof ProductBuilder || elem instanceof SumBuilder || elem instanceof RowBuilder)) {
+        continue;
+      }
+      typeBuilder.elements[name] = registerTypesRecursively(elem);
+    }
+  } else if (typeBuilder instanceof SumBuilder) {
+    for (const [name, variant] of Object.entries(typeBuilder.variants)) {
+      if (!(variant instanceof ProductBuilder || variant instanceof SumBuilder || variant instanceof RowBuilder)) {
+        continue;
+      }
+      typeBuilder.variants[name] = registerTypesRecursively(variant);
+    }
+  }
+ 
+  // Add to typespace and return a Ref type
+  r = new RefBuilder(MODULE_DEF.typespace.types.length);
+  MODULE_DEF.typespace.types.push(ty);
+
+  COMPOUND_TYPES.set(ty, r);
+  if (name !== undefined)
+    MODULE_DEF.types.push({
+      name: splitName(name),
+      ty: r.ref,
+      customOrdering: true,
+    });
+  return r;
 }
 
 export function splitName(name: string): Infer<typeof RawScopedTypeNameV9> {
@@ -345,7 +400,7 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
 export function schema<const H extends readonly TableSchema<any, any, any>[]>(
   ...args:
     | [H]
-    | H 
+    | H
 ): Schema<TablesToSchema<H>> {
   const handles = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as H;
 
@@ -371,7 +426,7 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
 type HasAccessor = { accessorName: PropertyKey };
 
 export type ConvertToAccessorMap<TableDefs extends readonly HasAccessor[]> = {
-  [Tbl in TableDefs[number] as Tbl["accessorName"]]: Tbl
+  [Tbl in TableDefs[number]as Tbl["accessorName"]]: Tbl
 };
 
 export function convertToAccessorMap<T extends readonly HasAccessor[]>(arr: T): ConvertToAccessorMap<T> {
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index 5bf887dba02..60f9d0f55fb 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -1,4 +1,4 @@
-import { AlgebraicType, ProductType } from './algebraic_type';
+import { ProductType } from './algebraic_type';
 import type RawConstraintDefV9 from './autogen/raw_constraint_def_v_9_type';
 import RawIndexAlgorithm from './autogen/raw_index_algorithm_type';
 import type RawIndexDefV9 from './autogen/raw_index_def_v_9_type';
@@ -6,10 +6,9 @@ import type RawSequenceDefV9 from './autogen/raw_sequence_def_v_9_type';
 import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
 import type { AllUnique, ConstraintOpts } from './constraints';
 import type { ColumnIndex, IndexColumns, Indexes, IndexOpts, ReadonlyIndexes } from './indexes';
-import { MODULE_DEF, splitName } from './schema';
+import { registerTypesRecursively, MODULE_DEF, resolveType, splitName } from './schema';
 import type { TableSchema } from './table_schema';
 import {
-  ProductBuilder,
   RowBuilder,
   type ColumnBuilder,
   type ColumnMetadata,
@@ -186,7 +185,9 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     row = new RowBuilder(row);
   }
 
-  row.resolveType().value.elements.forEach((elem, i) => {
+  const rowTypeRef = registerTypesRecursively(row);
+
+  row.algebraicType.value.elements.forEach((elem, i) => {
     colIds.set(elem.name, i);
     colNameList.push(elem.name);
   });
@@ -298,7 +299,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
 
   const tableDef: Infer<typeof RawTableDefV9> = {
     name,
-    productTypeRef: row.algebraicType.value as number,
+    productTypeRef: rowTypeRef.ref,
     primaryKey: pk,
     indexes,
     constraints,
@@ -315,16 +316,16 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
     tableAccess: { tag: isPublic ? 'Public' : 'Private' },
   };
 
-  if (!row.nameProvided) {
+  if (row.typeName === undefined) {
     MODULE_DEF.types.push({
       customOrdering: true,
       name: splitName(name),
-      ty: row.algebraicType.value as number,
+      ty: rowTypeRef.ref,
     });
   }
 
   const productType = {
-    elements: row.resolveType().value.elements.map(elem => {
+    elements: resolveType(MODULE_DEF.typespace, row).value.elements.map(elem => {
       return { name: elem.name, algebraicType: elem.algebraicType };
     }),
   };
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index cf1ffceeaa3..aac213c1146 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -1,19 +1,18 @@
 import {
   AlgebraicType,
+  AlgebraicTypeVariants,
   ConnectionId,
   Identity,
   ScheduleAt,
   TimeDuration,
   Timestamp,
   Option,
-  type AlgebraicTypeVariants,
   type ConnectionIdAlgebraicType,
   type IdentityAlgebraicType,
   type OptionAlgebraicType,
   type TimeDurationAlgebraicType,
   type TimestampAlgebraicType,
 } from '..';
-import { addType, MODULE_DEF } from '../lib/schema';
 import type { CoerceRow } from './table';
 import { set, type SetField } from './type_util';
 
@@ -83,7 +82,7 @@ type RowType<Row extends RowObj> = {
 /**
  * Type which represents a valid argument to the ProductColumnBuilder
  */
-type ElementsObj = Record<string, TypeBuilder<any, any>>;
+export type ElementsObj = Record<string, TypeBuilder<any, any>>;
 
 /**
  * Type which converts the elements of ElementsObj to a ProductType elements array
@@ -108,7 +107,7 @@ type ObjectType<Elements extends ElementsObj> = {
   [K in keyof Elements]: InferTypeOfTypeBuilder<Elements[K]>;
 };
 
-type VariantsObj = Record<string, TypeBuilder<any, any>>;
+export type VariantsObj = Record<string, TypeBuilder<any, any>>;
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 type UnitBuilder = ProductBuilder<{}>;
 type SimpleVariantsObj = Record<string, UnitBuilder>;
@@ -157,20 +156,12 @@ export class TypeBuilder<Type, SpacetimeType extends AlgebraicType>
    *
    * e.g. `string` corresponds to `AlgebraicType.String`
    */
-  readonly algebraicType: SpacetimeType | AlgebraicTypeVariants.Ref;
+  readonly algebraicType: SpacetimeType;
 
-  constructor(algebraicType: SpacetimeType | AlgebraicTypeVariants.Ref) {
+  constructor(algebraicType: SpacetimeType) {
     this.algebraicType = algebraicType;
   }
 
-  resolveType(): SpacetimeType {
-    let ty: AlgebraicType = this.algebraicType;
-    while (ty.tag === 'Ref') {
-      ty = MODULE_DEF.typespace.types[ty.value];
-    }
-    return ty as SpacetimeType;
-  }
-
   optional(): OptionBuilder<typeof this> {
     return new OptionBuilder(this);
   }
@@ -1153,6 +1144,8 @@ export class ProductBuilder<Elements extends ElementsObj>
     }
   >
   implements Defaultable<ObjectType<Elements>, any> {
+  readonly typeName: string | undefined;
+  readonly elements: Elements;
   constructor(elements: Elements, name?: string) {
     function elementsArrayFromElementsObj<Obj extends ElementsObj>(obj: Obj) {
       return Object.entries(obj).map(([name, value]) => ({
@@ -1161,13 +1154,12 @@ export class ProductBuilder<Elements extends ElementsObj>
       }));
     }
     super(
-      addType(
-        name,
-        AlgebraicType.Product({
-          elements: elementsArrayFromElementsObj(elements),
-        })
-      )
+      AlgebraicType.Product({
+        elements: elementsArrayFromElementsObj(elements),
+      })
     );
+    this.typeName = name;
+    this.elements = elements;
   }
   default(
     value: ObjectType<Elements>
@@ -1186,12 +1178,12 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
     value: { elements: ElementsArrayFromRowObj<Row> };
   }
 > {
-  row: CoerceRow<Row>;
-  nameProvided: boolean;
+  readonly row: CoerceRow<Row>;
+  readonly typeName: string | undefined;
   constructor(row: Row, name?: string) {
     const mappedRow = Object.fromEntries(
-      Object.entries(row).map(([name, builder]) => [
-        name,
+      Object.entries(row).map(([colName, builder]) => [
+        colName,
         builder instanceof ColumnBuilder
           ? builder
           : new ColumnBuilder(builder, {}),
@@ -1203,10 +1195,9 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
       algebraicType: builder.typeBuilder.algebraicType,
     })) as ElementsArrayFromRowObj<Row>;
 
-    super(addType(name, AlgebraicType.Product({ elements })));
-    this.nameProvided = name != null;
-
+    super(AlgebraicType.Product({ elements }));
     this.row = mappedRow;
+    this.typeName = name;
   }
 }
 
@@ -1220,7 +1211,8 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
   EnumType<Variants>,
   { tag: 'Sum'; value: { variants: VariantsArrayFromVariantsObj<Variants> } }
 > {
-  protected readonly _variants: Variants;
+  readonly variants: Variants;
+  readonly typeName: string | undefined;
   constructor(variants: Variants, name?: string) {
     function variantsArrayFromVariantsObj<Variants extends VariantsObj>(
       variants: Variants
@@ -1231,14 +1223,11 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
       }));
     }
     super(
-      addType(
-        name,
-        AlgebraicType.Sum({
-          variants: variantsArrayFromVariantsObj(variants),
-        })
-      )
+      AlgebraicType.Sum({
+        variants: variantsArrayFromVariantsObj(variants),
+      })
     );
-    this._variants = variants;
+    this.variants = variants;
   }
 
   /**
@@ -1572,6 +1561,11 @@ const defaultMetadata: ColumnMetadata<never> = {};
  *
  * It carries both a phantom TypeScript type (the `Type`) and
  * runtime algebraic type information.
+ * 
+ * IMPORTANT! We have deliberately chosen to not have {@link ColumnBuilder} 
+ * extend {@link TypeBuilder} so that you cannot pass a {@link ColumnBuilder}
+ * where a {@link TypeBuilder} is expected. i.e. We want to maintain
+ * contravariance for functions that accept {@link TypeBuilder} parameters.
  */
 export class ColumnBuilder<
   Type,
@@ -2584,6 +2578,78 @@ export class TimeDurationColumnBuilder<
   }
 }
 
+export class RefBuilder extends TypeBuilder<number, AlgebraicTypeVariants.Ref> {
+  readonly ref: number;
+  constructor(ref: number) {
+    super(AlgebraicType.Ref(ref));
+    this.ref = ref;
+  }
+}
+
+interface EnumFn {
+  /**
+   * Creates a simple sum type whose cases are all unit variants.
+   * Each string in the array becomes a case of the enum.
+   *
+   * Example:
+   * ```ts
+   * t.enum("Color", ["red", "green", "blue"]);
+   * ```
+   */
+  <Case extends string>(
+    name: string,
+    cases: readonly [Case, ...Case[]]
+  ): SimpleSumBuilder<Record<Case, UnitBuilder>>;
+
+  /**
+   * Creates an empty simple sum type (no cases, equivalent to `never`).
+   * This can be useful for code generation or placeholder types.
+   * Example:
+   * ```ts
+   * t.enum("Never", []);
+   * ```
+   */
+  (name: string, cases: []): SimpleSumBuilder<Record<never, UnitBuilder>>;
+
+  /**
+   * Creates a full sum type, where each case can have a payload.
+   * Each value in the object must be a {@link TypeBuilder}.
+   *
+   * Example:
+   * ```ts
+   * t.enum("Result", { Ok: t.unit(), Err: t.string() });
+   * ```
+   */
+  <Obj extends VariantsObj>(name: string, obj: Obj): SumBuilder<Obj>;
+}
+
+const enumImpl = ((nameOrObj: any, maybeObj?: any) => {
+  let obj: any = nameOrObj;
+  let name: string | undefined = undefined;
+
+  if (typeof nameOrObj === "string") {
+    if (!maybeObj) {
+      throw new TypeError(
+        "When providing a name, you must also provide the variants object or array."
+      );
+    }
+    obj = maybeObj;
+    name = nameOrObj;
+  }
+
+  // Simple sum (array form)
+  if (Array.isArray(obj)) {
+    const simpleVariantsObj: Record<string, UnitBuilder> = {};
+    for (const variant of obj) {
+      simpleVariantsObj[variant] = new ProductBuilder({});
+    }
+    return new SimpleSumBuilder(simpleVariantsObj, name);
+  }
+
+  // Regular sum (object form)
+  return new SumBuilder(obj, name);
+}) as EnumFn;
+
 /**
  * A collection of factory functions for creating various SpacetimeDB algebraic types
  * to be used in table definitions. Each function returns a corresponding builder
@@ -2790,50 +2856,7 @@ export const t = {
     return new ArrayBuilder(e);
   },
 
-  /**
-   * Creates a new `Sum` {@link AlgebraicType} to be used in table definitions. Sum types in SpacetimeDB
-   * are similar to enums or unions in languages like Rust or TypeScript respectively.
-   * Each variant of the enum must be a {@link TypeBuilder}.
-   * Represented as a union of string literals in TypeScript.
-   *
-   * @param name (optional) A display name for the sum type. If omitted, an anonymous sum type is created.
-   * @param obj The object defining the variants of the enum, whose variant
-   * types must be {@link TypeBuilder}s.
-   * @returns A new {@link SumBuilder} instance.
-   */
-  enum: ((nameOrObj: any, maybeObj?: any) => {
-    let obj: VariantsObj = nameOrObj;
-    let name: string | undefined = undefined;
-    if (typeof nameOrObj === 'string') {
-      if (!maybeObj) {
-        throw new TypeError(
-          'When providing a name, you must also provide the variants object.'
-        );
-      }
-      obj = maybeObj;
-      name = nameOrObj;
-    }
-    if (
-      Object.values(obj).every(x => {
-        if (typeof x === 'function') {
-          return false;
-        }
-        const ty: AlgebraicType = x.resolveType();
-        return ty.tag === 'Product' && ty.value.elements.length === 0;
-      })
-    ) {
-      return new SimpleSumBuilder(obj as SimpleVariantsObj, name);
-    }
-    return new SumBuilder(obj, name);
-  }) as {
-    <Obj extends SimpleVariantsObj>(
-      name: string,
-      obj: Obj
-    ): SimpleSumBuilder<Obj>;
-    <Obj extends VariantsObj>(name: string, obj: Obj): SumBuilder<Obj>;
-    // TODO: Currently names are not optional
-    // <Obj extends VariantsObj>(obj: Obj): SumBuilder<Obj>;
-  },
+  enum: enumImpl,
 
   /**
    * This is a special helper function for conveniently creating {@link Product} type columns with no fields.
diff --git a/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts b/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
index 7767bc4bdd8..0f6e1097565 100644
--- a/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
@@ -23,10 +23,12 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import RowSizeHint from './row_size_hint_type';
 
 export default __t.object('BsatnRowList', {
-  sizeHint: __t.lazy(() => RowSizeHint),
+  get sizeHint() {
+    return RowSizeHint;
+  },
   rowsData: __t.byteArray(),
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts b/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
index 49ae8862530..424ca0f6f26 100644
--- a/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('CallProcedure', {
   procedure: __t.string(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts b/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
index 5d03c628ddd..a9c9573e18c 100644
--- a/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('CallReducer', {
   reducer: __t.string(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
index 81457076c19..79b47bc5b77 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import CallReducer from './call_reducer_type';
 import Subscribe from './subscribe_type';
 import OneOffQuery from './one_off_query_type';
@@ -37,14 +37,30 @@ import * as ClientMessageVariants from './client_message_variants';
 
 // The tagged union or sum type for the algebraic type `ClientMessage`.
 const ClientMessage = __t.enum('ClientMessage', {
-  CallReducer: __t.lazy(() => CallReducer),
-  Subscribe: __t.lazy(() => Subscribe),
-  OneOffQuery: __t.lazy(() => OneOffQuery),
-  SubscribeSingle: __t.lazy(() => SubscribeSingle),
-  SubscribeMulti: __t.lazy(() => SubscribeMulti),
-  Unsubscribe: __t.lazy(() => Unsubscribe),
-  UnsubscribeMulti: __t.lazy(() => UnsubscribeMulti),
-  CallProcedure: __t.lazy(() => CallProcedure),
+  get CallReducer() {
+    return CallReducer;
+  },
+  get Subscribe() {
+    return Subscribe;
+  },
+  get OneOffQuery() {
+    return OneOffQuery;
+  },
+  get SubscribeSingle() {
+    return SubscribeSingle;
+  },
+  get SubscribeMulti() {
+    return SubscribeMulti;
+  },
+  get Unsubscribe() {
+    return Unsubscribe;
+  },
+  get UnsubscribeMulti() {
+    return UnsubscribeMulti;
+  },
+  get CallProcedure() {
+    return CallProcedure;
+  },
 });
 
 export default ClientMessage;
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
index 57e163c2671..7faae1d9aa4 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import CallReducerType from './call_reducer_type';
 import SubscribeType from './subscribe_type';
 import OneOffQueryType from './one_off_query_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
index adf37943a66..de898134d86 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
@@ -23,14 +23,16 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryUpdate from './query_update_type';
 
 import * as CompressableQueryUpdateVariants from './compressable_query_update_variants';
 
 // The tagged union or sum type for the algebraic type `CompressableQueryUpdate`.
 const CompressableQueryUpdate = __t.enum('CompressableQueryUpdate', {
-  Uncompressed: __t.lazy(() => QueryUpdate),
+  get Uncompressed() {
+    return QueryUpdate;
+  },
   Brotli: __t.byteArray(),
   Gzip: __t.byteArray(),
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
index e5ea8187da4..acaaa990511 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryUpdateType from './query_update_type';
 
 export type Uncompressed = {
diff --git a/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
index 29f18c4e8d3..1f549dbcbc9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
@@ -23,9 +23,11 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import TableUpdate from './table_update_type';
 
 export default __t.object('DatabaseUpdate', {
-  tables: __t.array(__t.lazy(() => TableUpdate)),
+  get tables() {
+    return __t.array(TableUpdate);
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts b/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
index 0c6a8b2cbe7..92e6a9abede 100644
--- a/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('EnergyQuanta', {
   quanta: __t.u128(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts b/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
index 4fdf17d0ae9..c128c925a50 100644
--- a/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('IdentityToken', {
   identity: __t.identity(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/index.ts b/crates/bindings-typescript/src/sdk/client_api/index.ts
index 06acd7dca9f..c1eb3184c5e 100644
--- a/crates/bindings-typescript/src/sdk/client_api/index.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/index.ts
@@ -1,7 +1,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
 // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
 
-// This was generated using spacetimedb cli version 1.6.0 (commit 051fb278b3d871c87536cb87c8905c21103728fe).
+// This was generated using spacetimedb cli version 1.6.0 (commit 0b0b06d5f67fecff50eb7b1c79bff5dad686f5d2).
 
 /* eslint-disable */
 /* tslint:disable */
@@ -25,7 +25,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 // Import and reexport all reducer arg types
 
diff --git a/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts b/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
index de161adb28c..9f897151ef7 100644
--- a/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
@@ -23,11 +23,13 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import DatabaseUpdate from './database_update_type';
 
 export default __t.object('InitialSubscription', {
-  databaseUpdate: __t.lazy(() => DatabaseUpdate),
+  get databaseUpdate() {
+    return DatabaseUpdate;
+  },
   requestId: __t.u32(),
   totalHostExecutionDuration: __t.timeDuration(),
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
index 362d6f7325b..e287012cf24 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
@@ -23,12 +23,14 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import OneOffTable from './one_off_table_type';
 
 export default __t.object('OneOffQueryResponse', {
   messageId: __t.byteArray(),
   error: __t.option(__t.string()),
-  tables: __t.array(__t.lazy(() => OneOffTable)),
+  get tables() {
+    return __t.array(OneOffTable);
+  },
   totalHostExecutionDuration: __t.timeDuration(),
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
index f1a97f613a0..729aad3abdc 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('OneOffQuery', {
   messageId: __t.byteArray(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
index 9e0483a344c..da5fd216448 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
@@ -23,10 +23,12 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import BsatnRowList from './bsatn_row_list_type';
 
 export default __t.object('OneOffTable', {
   tableName: __t.string(),
-  rows: __t.lazy(() => BsatnRowList),
+  get rows() {
+    return BsatnRowList;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
index f3248b713fd..2340cf37ec9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
@@ -23,11 +23,13 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import ProcedureStatus from './procedure_status_type';
 
 export default __t.object('ProcedureResult', {
-  status: __t.lazy(() => ProcedureStatus),
+  get status() {
+    return ProcedureStatus;
+  },
   timestamp: __t.timestamp(),
   totalHostExecutionDuration: __t.timeDuration(),
   requestId: __t.u32(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
index c02e65cc449..b214ecbecf9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import * as ProcedureStatusVariants from './procedure_status_variants';
 
 // The tagged union or sum type for the algebraic type `ProcedureStatus`.
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
index 077446826b9..31f2e4fe79b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export type Returned = { tag: 'Returned'; value: Uint8Array };
 export type OutOfEnergy = { tag: 'OutOfEnergy' };
diff --git a/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts b/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
index 93578095b89..dc7a0a3cd39 100644
--- a/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('QueryId', {
   id: __t.u32(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
index 207357a2f1d..cf82064e70b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
@@ -23,10 +23,14 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import BsatnRowList from './bsatn_row_list_type';
 
 export default __t.object('QueryUpdate', {
-  deletes: __t.lazy(() => BsatnRowList),
-  inserts: __t.lazy(() => BsatnRowList),
+  get deletes() {
+    return BsatnRowList;
+  },
+  get inserts() {
+    return BsatnRowList;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts b/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
index d3eff21f62f..812fe6649f8 100644
--- a/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('ReducerCallInfo', {
   reducerName: __t.string(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
index 99feedff67a..0dcf9658727 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import * as RowSizeHintVariants from './row_size_hint_variants';
 
 // The tagged union or sum type for the algebraic type `RowSizeHint`.
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
index 71c16732e0b..5b74f9d7735 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export type FixedSize = { tag: 'FixedSize'; value: number };
 export type RowOffsets = { tag: 'RowOffsets'; value: bigint[] };
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
index d771b875e47..c1eda11aabb 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import InitialSubscription from './initial_subscription_type';
 import TransactionUpdate from './transaction_update_type';
 import TransactionUpdateLight from './transaction_update_light_type';
@@ -40,17 +40,39 @@ import * as ServerMessageVariants from './server_message_variants';
 
 // The tagged union or sum type for the algebraic type `ServerMessage`.
 const ServerMessage = __t.enum('ServerMessage', {
-  InitialSubscription: __t.lazy(() => InitialSubscription),
-  TransactionUpdate: __t.lazy(() => TransactionUpdate),
-  TransactionUpdateLight: __t.lazy(() => TransactionUpdateLight),
-  IdentityToken: __t.lazy(() => IdentityToken),
-  OneOffQueryResponse: __t.lazy(() => OneOffQueryResponse),
-  SubscribeApplied: __t.lazy(() => SubscribeApplied),
-  UnsubscribeApplied: __t.lazy(() => UnsubscribeApplied),
-  SubscriptionError: __t.lazy(() => SubscriptionError),
-  SubscribeMultiApplied: __t.lazy(() => SubscribeMultiApplied),
-  UnsubscribeMultiApplied: __t.lazy(() => UnsubscribeMultiApplied),
-  ProcedureResult: __t.lazy(() => ProcedureResult),
+  get InitialSubscription() {
+    return InitialSubscription;
+  },
+  get TransactionUpdate() {
+    return TransactionUpdate;
+  },
+  get TransactionUpdateLight() {
+    return TransactionUpdateLight;
+  },
+  get IdentityToken() {
+    return IdentityToken;
+  },
+  get OneOffQueryResponse() {
+    return OneOffQueryResponse;
+  },
+  get SubscribeApplied() {
+    return SubscribeApplied;
+  },
+  get UnsubscribeApplied() {
+    return UnsubscribeApplied;
+  },
+  get SubscriptionError() {
+    return SubscriptionError;
+  },
+  get SubscribeMultiApplied() {
+    return SubscribeMultiApplied;
+  },
+  get UnsubscribeMultiApplied() {
+    return UnsubscribeMultiApplied;
+  },
+  get ProcedureResult() {
+    return ProcedureResult;
+  },
 });
 
 export default ServerMessage;
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
index 9cdaf1c2218..e127e3f8f12 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import InitialSubscriptionType from './initial_subscription_type';
 import TransactionUpdateType from './transaction_update_type';
 import TransactionUpdateLightType from './transaction_update_light_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
index 3e10b59c700..59449adb016 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
@@ -23,13 +23,17 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 import SubscribeRows from './subscribe_rows_type';
 
 export default __t.object('SubscribeApplied', {
   requestId: __t.u32(),
   totalHostExecutionDurationMicros: __t.u64(),
-  queryId: __t.lazy(() => QueryId),
-  rows: __t.lazy(() => SubscribeRows),
+  get queryId() {
+    return QueryId;
+  },
+  get rows() {
+    return SubscribeRows;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
index cbd8c96aa92..749cad69bde 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
@@ -23,13 +23,17 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 import DatabaseUpdate from './database_update_type';
 
 export default __t.object('SubscribeMultiApplied', {
   requestId: __t.u32(),
   totalHostExecutionDurationMicros: __t.u64(),
-  queryId: __t.lazy(() => QueryId),
-  update: __t.lazy(() => DatabaseUpdate),
+  get queryId() {
+    return QueryId;
+  },
+  get update() {
+    return DatabaseUpdate;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
index 9f5d32a9ad7..1f11210ff18 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
@@ -23,11 +23,13 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 
 export default __t.object('SubscribeMulti', {
   queryStrings: __t.array(__t.string()),
   requestId: __t.u32(),
-  queryId: __t.lazy(() => QueryId),
+  get queryId() {
+    return QueryId;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
index ac6679968b9..ea896d3c6b0 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
@@ -23,11 +23,13 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import TableUpdate from './table_update_type';
 
 export default __t.object('SubscribeRows', {
   tableId: __t.u32(),
   tableName: __t.string(),
-  tableRows: __t.lazy(() => TableUpdate),
+  get tableRows() {
+    return TableUpdate;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
index 1c39b4c64ec..923001398a6 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
@@ -23,11 +23,13 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 
 export default __t.object('SubscribeSingle', {
   query: __t.string(),
   requestId: __t.u32(),
-  queryId: __t.lazy(() => QueryId),
+  get queryId() {
+    return QueryId;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
index 61ebad17ac5..3db423d5205 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('Subscribe', {
   queryStrings: __t.array(__t.string()),
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
index 4e8441a2357..130c423e1e5 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 
 export default __t.object('SubscriptionError', {
   totalHostExecutionDurationMicros: __t.u64(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
index 02820f4ebc0..4d48b90fda4 100644
--- a/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
@@ -23,12 +23,14 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import CompressableQueryUpdate from './compressable_query_update_type';
 
 export default __t.object('TableUpdate', {
   tableId: __t.u32(),
   tableName: __t.string(),
   numRows: __t.u64(),
-  updates: __t.array(__t.lazy(() => CompressableQueryUpdate)),
+  get updates() {
+    return __t.array(CompressableQueryUpdate);
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts b/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
index 57d95a270d5..ec986f1be5f 100644
--- a/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
@@ -23,10 +23,12 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import DatabaseUpdate from './database_update_type';
 
 export default __t.object('TransactionUpdateLight', {
   requestId: __t.u32(),
-  update: __t.lazy(() => DatabaseUpdate),
+  get update() {
+    return DatabaseUpdate;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
index 2a2aeb6e79b..b1c3ffee9ba 100644
--- a/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
@@ -23,17 +23,23 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import UpdateStatus from './update_status_type';
 import ReducerCallInfo from './reducer_call_info_type';
 import EnergyQuanta from './energy_quanta_type';
 
 export default __t.object('TransactionUpdate', {
-  status: __t.lazy(() => UpdateStatus),
+  get status() {
+    return UpdateStatus;
+  },
   timestamp: __t.timestamp(),
   callerIdentity: __t.identity(),
   callerConnectionId: __t.connectionId(),
-  reducerCall: __t.lazy(() => ReducerCallInfo),
-  energyQuantaUsed: __t.lazy(() => EnergyQuanta),
+  get reducerCall() {
+    return ReducerCallInfo;
+  },
+  get energyQuantaUsed() {
+    return EnergyQuanta;
+  },
   totalHostExecutionDuration: __t.timeDuration(),
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
index 7df4e4b436e..a079d321a37 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
@@ -23,13 +23,17 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 import SubscribeRows from './subscribe_rows_type';
 
 export default __t.object('UnsubscribeApplied', {
   requestId: __t.u32(),
   totalHostExecutionDurationMicros: __t.u64(),
-  queryId: __t.lazy(() => QueryId),
-  rows: __t.lazy(() => SubscribeRows),
+  get queryId() {
+    return QueryId;
+  },
+  get rows() {
+    return SubscribeRows;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
index dcca1461ac7..ee657727b6a 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
@@ -23,13 +23,17 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 import DatabaseUpdate from './database_update_type';
 
 export default __t.object('UnsubscribeMultiApplied', {
   requestId: __t.u32(),
   totalHostExecutionDurationMicros: __t.u64(),
-  queryId: __t.lazy(() => QueryId),
-  update: __t.lazy(() => DatabaseUpdate),
+  get queryId() {
+    return QueryId;
+  },
+  get update() {
+    return DatabaseUpdate;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
index bd727820597..f4e6805c6fe 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
@@ -23,10 +23,12 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 
 export default __t.object('UnsubscribeMulti', {
   requestId: __t.u32(),
-  queryId: __t.lazy(() => QueryId),
+  get queryId() {
+    return QueryId;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
index 6bf6a3121ee..aad2672ae46 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
@@ -23,10 +23,12 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import QueryId from './query_id_type';
 
 export default __t.object('Unsubscribe', {
   requestId: __t.u32(),
-  queryId: __t.lazy(() => QueryId),
+  get queryId() {
+    return QueryId;
+  },
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
index 3f44ad0b748..609ba46da39 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
@@ -23,14 +23,16 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import DatabaseUpdate from './database_update_type';
 
 import * as UpdateStatusVariants from './update_status_variants';
 
 // The tagged union or sum type for the algebraic type `UpdateStatus`.
 const UpdateStatus = __t.enum('UpdateStatus', {
-  Committed: __t.lazy(() => DatabaseUpdate),
+  get Committed() {
+    return DatabaseUpdate;
+  },
   Failed: __t.string(),
   OutOfEnergy: __t.unit(),
 });
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
index 67de3fe0d84..490f2b356ef 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
@@ -23,7 +23,7 @@ import {
   type ReducerEventContextInterface as __ReducerEventContextInterface,
   type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from '../../';
+} from 'spacetimedb';
 import DatabaseUpdateType from './database_update_type';
 
 export type Committed = {
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
index 07ca68d51ab..92c1a3fc322 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
@@ -29,5 +29,7 @@ import Point from './point_type';
 
 export default {
   name: __t.string(),
-  location: __t.lazy(() => Point),
+  get location() {
+    return Point;
+  },
 };
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index 9a78093d3e6..fe0c2f4fbe0 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -1,7 +1,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
 // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
 
-// This was generated using ../../../src/index cli version 1.6.0 (commit 051fb278b3d871c87536cb87c8905c21103728fe).
+// This was generated using ../../../src/index cli version 1.6.0 (commit 0b0b06d5f67fecff50eb7b1c79bff5dad686f5d2).
 
 /* eslint-disable */
 /* tslint:disable */
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 8de99f205dd..084741c8378 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -29,5 +29,7 @@ import Point from './point_type';
 export default __t.row({
   ownerId: __t.string(),
   name: __t.string(),
-  location: __t.lazy(() => Point),
+  get location() {
+    return Point;
+  },
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index c516e37b3f1..8f435a91817 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -29,5 +29,7 @@ import Point from './point_type';
 export default __t.object('Player', {
   ownerId: __t.string(),
   name: __t.string(),
-  location: __t.lazy(() => Point),
+  get location() {
+    return Point;
+  },
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
index 8de99f205dd..084741c8378 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
@@ -29,5 +29,7 @@ import Point from './point_type';
 export default __t.row({
   ownerId: __t.string(),
   name: __t.string(),
-  location: __t.lazy(() => Point),
+  get location() {
+    return Point;
+  },
 });
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
index 739b174a030..d43660f05a6 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
@@ -29,5 +29,7 @@ import Point from './point_type';
 export default __t.object('UnindexedPlayer', {
   ownerId: __t.string(),
   name: __t.string(),
-  location: __t.lazy(() => Point),
+  get location() {
+    return Point;
+  },
 });
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index 18186622aba..b4c54a83ab0 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -493,7 +493,7 @@ fn write_table_opts(module: &ModuleDef, out: &mut Indenter, table: &TableDef) {
 /// ```
 fn write_object_type_builder_fields(
     module: &ModuleDef,
-    out: &mut impl Write,
+    out: &mut Indenter,
     elements: &[(Identifier, AlgebraicTypeUse)],
     convert_case: bool,
 ) -> anyhow::Result<()> {
@@ -504,9 +504,39 @@ fn write_object_type_builder_fields(
             ident.deref().into()
         };
 
-        write!(out, "{name}: ")?;
+        write_type_builder_field(module, out, &name, ty)?;
+    }
+
+    Ok(())
+}
+
+fn write_type_builder_field(
+    module: &ModuleDef,
+    out: &mut Indenter,
+    name: &str,
+    ty: &AlgebraicTypeUse,
+) -> fmt::Result {
+    // Do we need a getter? (Option/Array only if their inner is a Ref)
+    let needs_getter = match ty {
+        AlgebraicTypeUse::Ref(_) => true,
+        AlgebraicTypeUse::Option(inner) | AlgebraicTypeUse::Array(inner) => {
+            matches!(inner.as_ref(), AlgebraicTypeUse::Ref(_))
+        }
+        _ => false,
+    };
+
+    if needs_getter {
+        writeln!(out, "get {name}() {{");
+        out.indent(1);
+        write!(out, "return ");
         write_type_builder(module, out, ty)?;
-        writeln!(out, ",")?;
+        writeln!(out, ";");
+        out.dedent(1);
+        writeln!(out, "}},");
+    } else {
+        write!(out, "{name}: ");
+        write_type_builder(module, out, ty)?;
+        writeln!(out, ",");
     }
 
     Ok(())
@@ -554,7 +584,7 @@ fn write_type_builder<W: Write>(module: &ModuleDef, out: &mut W, ty: &AlgebraicT
             write!(out, ")")?;
         },
         AlgebraicTypeUse::Ref(r) => {
-            write!(out, "__t.lazy(() => {})", type_ref_name(module, *r))?;
+            write!(out, "{}", type_ref_name(module, *r))?;
         },
     }
     Ok(())
diff --git a/crates/update/src/proxy.rs b/crates/update/src/proxy.rs
index 95d8ef8f2ae..51296ee85f4 100644
--- a/crates/update/src/proxy.rs
+++ b/crates/update/src/proxy.rs
@@ -102,7 +102,7 @@ fn exec_replace(cmd: &mut Command) -> io::Result<ExitCode> {
         }
         unsafe {
             if SetConsoleCtrlHandler(Some(ctrlc_handler), TRUE) == FALSE {
-                return Err(io::Error::new(io::ErrorKind::Other, "Unable to set console handler"));
+                return Err(io::Error::other("Unable to set console handler"));
             }
         }
 

From 3f3e6a6571768599dc02e86761e5606c686955cc Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sat, 8 Nov 2025 18:39:46 -0500
Subject: [PATCH 15/23] Progress!

---
 .../src/lib/autogen/algebraic_type_type.ts    |   6 -
 .../lib/autogen/algebraic_type_variants.ts    |   6 -
 .../src/lib/autogen/index_type_type.ts        |   6 -
 .../src/lib/autogen/index_type_variants.ts    |   6 -
 .../src/lib/autogen/lifecycle_type.ts         |   6 -
 .../src/lib/autogen/lifecycle_variants.ts     |   6 -
 .../lib/autogen/misc_module_export_type.ts    |   6 -
 .../autogen/misc_module_export_variants.ts    |   6 -
 .../lib/autogen/product_type_element_type.ts  |   6 -
 .../src/lib/autogen/product_type_type.ts      |   6 -
 .../lib/autogen/raw_column_def_v_8_type.ts    |   6 -
 .../raw_column_default_value_v_9_type.ts      |   6 -
 .../autogen/raw_constraint_data_v_9_type.ts   |   6 -
 .../raw_constraint_data_v_9_variants.ts       |   6 -
 .../autogen/raw_constraint_def_v_8_type.ts    |   6 -
 .../autogen/raw_constraint_def_v_9_type.ts    |   6 -
 .../lib/autogen/raw_index_algorithm_type.ts   |   6 -
 .../autogen/raw_index_algorithm_variants.ts   |   6 -
 .../src/lib/autogen/raw_index_def_v_8_type.ts |   6 -
 .../src/lib/autogen/raw_index_def_v_9_type.ts |   6 -
 .../raw_misc_module_export_v_9_type.ts        |   6 -
 .../raw_misc_module_export_v_9_variants.ts    |   6 -
 .../src/lib/autogen/raw_module_def_type.ts    |   6 -
 .../lib/autogen/raw_module_def_v_8_type.ts    |   6 -
 .../lib/autogen/raw_module_def_v_9_type.ts    |   6 -
 .../lib/autogen/raw_module_def_variants.ts    |   6 -
 .../lib/autogen/raw_procedure_def_v_9_type.ts |   6 -
 .../lib/autogen/raw_reducer_def_v_9_type.ts   |   6 -
 .../raw_row_level_security_def_v_9_type.ts    |   6 -
 .../lib/autogen/raw_schedule_def_v_9_type.ts  |   6 -
 .../autogen/raw_scoped_type_name_v_9_type.ts  |   6 -
 .../lib/autogen/raw_sequence_def_v_8_type.ts  |   6 -
 .../lib/autogen/raw_sequence_def_v_9_type.ts  |   6 -
 .../src/lib/autogen/raw_table_def_v_8_type.ts |   6 -
 .../src/lib/autogen/raw_table_def_v_9_type.ts |   6 -
 .../src/lib/autogen/raw_type_def_v_9_type.ts  |   6 -
 .../raw_unique_constraint_data_v_9_type.ts    |   6 -
 .../src/lib/autogen/raw_view_def_v_9_type.ts  |   6 -
 .../src/lib/autogen/reducer_def_type.ts       |   6 -
 .../src/lib/autogen/sum_type_type.ts          |   6 -
 .../src/lib/autogen/sum_type_variant_type.ts  |   6 -
 .../src/lib/autogen/table_access_type.ts      |   6 -
 .../src/lib/autogen/table_access_variants.ts  |   6 -
 .../src/lib/autogen/table_desc_type.ts        |   6 -
 .../src/lib/autogen/table_type_type.ts        |   6 -
 .../src/lib/autogen/table_type_variants.ts    |   6 -
 .../src/lib/autogen/type_alias_type.ts        |   6 -
 .../src/lib/autogen/typespace_type.ts         |   6 -
 .../src/lib/type_builders.ts                  |  25 ++-
 .../src/sdk/client_api/bsatn_row_list_type.ts |  17 +-
 .../src/sdk/client_api/call_procedure_type.ts |  17 +-
 .../src/sdk/client_api/call_reducer_type.ts   |  17 +-
 .../src/sdk/client_api/client_message_type.ts |  17 +-
 .../sdk/client_api/client_message_variants.ts |  17 +-
 .../compressable_query_update_type.ts         |  17 +-
 .../compressable_query_update_variants.ts     |  17 +-
 .../sdk/client_api/database_update_type.ts    |  17 +-
 .../src/sdk/client_api/energy_quanta_type.ts  |  17 +-
 .../src/sdk/client_api/identity_token_type.ts |  17 +-
 .../src/sdk/client_api/index.ts               | 150 ------------------
 .../client_api/initial_subscription_type.ts   |  17 +-
 .../client_api/one_off_query_response_type.ts |  17 +-
 .../src/sdk/client_api/one_off_query_type.ts  |  17 +-
 .../src/sdk/client_api/one_off_table_type.ts  |  17 +-
 .../sdk/client_api/procedure_result_type.ts   |  17 +-
 .../sdk/client_api/procedure_status_type.ts   |  17 +-
 .../client_api/procedure_status_variants.ts   |  17 +-
 .../src/sdk/client_api/query_id_type.ts       |  17 +-
 .../src/sdk/client_api/query_update_type.ts   |  17 +-
 .../sdk/client_api/reducer_call_info_type.ts  |  17 +-
 .../src/sdk/client_api/row_size_hint_type.ts  |  17 +-
 .../sdk/client_api/row_size_hint_variants.ts  |  17 +-
 .../src/sdk/client_api/server_message_type.ts |  17 +-
 .../sdk/client_api/server_message_variants.ts |  17 +-
 .../sdk/client_api/subscribe_applied_type.ts  |  17 +-
 .../subscribe_multi_applied_type.ts           |  17 +-
 .../sdk/client_api/subscribe_multi_type.ts    |  17 +-
 .../src/sdk/client_api/subscribe_rows_type.ts |  17 +-
 .../sdk/client_api/subscribe_single_type.ts   |  17 +-
 .../src/sdk/client_api/subscribe_type.ts      |  17 +-
 .../sdk/client_api/subscription_error_type.ts |  17 +-
 .../src/sdk/client_api/table_update_type.ts   |  17 +-
 .../transaction_update_light_type.ts          |  17 +-
 .../sdk/client_api/transaction_update_type.ts |  17 +-
 .../client_api/unsubscribe_applied_type.ts    |  17 +-
 .../unsubscribe_multi_applied_type.ts         |  17 +-
 .../sdk/client_api/unsubscribe_multi_type.ts  |  17 +-
 .../src/sdk/client_api/unsubscribe_type.ts    |  17 +-
 .../src/sdk/client_api/update_status_type.ts  |  17 +-
 .../sdk/client_api/update_status_variants.ts  |  17 +-
 .../src/sdk/db_connection_builder.ts          |   1 -
 .../src/sdk/db_connection_impl.ts             |   2 -
 .../src/sdk/message_types.ts                  |   2 +-
 .../src/sdk/reducer_event.ts                  |   2 +-
 .../src/sdk/websocket_test_adapter.ts         |   2 +-
 .../module_bindings/create_player_reducer.ts  |  15 --
 .../src/module_bindings/player_table.ts       |  15 --
 .../src/module_bindings/player_type.ts        |  15 --
 .../src/module_bindings/point_type.ts         |  15 --
 .../module_bindings/unindexed_player_table.ts |  15 --
 .../module_bindings/unindexed_player_type.ts  |  15 --
 .../src/module_bindings/user_table.ts         |  15 --
 .../test-app/src/module_bindings/user_type.ts |  15 --
 crates/codegen/src/typescript.rs              |  45 ++++--
 104 files changed, 87 insertions(+), 1230 deletions(-)
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/index.ts

diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
index dae554a56f9..fd16d887075 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import SumType from './sum_type_type';
 import ProductType from './product_type_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
index 6d599677f5c..b81b181d802 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicTypeType from './algebraic_type_type';
 import SumTypeType from './sum_type_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
index f570aae8a7c..7253194254a 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as IndexTypeVariants from './index_type_variants';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
index 4624af926a3..37e5ee90972 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type BTree = { tag: 'BTree' };
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
index fa365f8be27..3f80e90dfb4 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as LifecycleVariants from './lifecycle_variants';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
index aabc98ddf2b..0570638b19f 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type Init = { tag: 'Init' };
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
index 361d1e837d6..b4d4be33f34 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import TypeAlias from './type_alias_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
index 7e390c464ac..99d584fbdca 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import TypeAliasType from './type_alias_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
index a74101a01ff..62a8e3649db 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_element_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
index 9c6b1d829bd..202f0d07617 100644
--- a/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/product_type_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import ProductTypeElement from './product_type_element_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
index a75f00564e2..8cfffad67c1 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_def_v_8_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
index 207fe21991f..8e6ba6cc96d 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_column_default_value_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawColumnDefaultValueV9', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
index 873bce360bf..314c7014bfb 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawUniqueConstraintDataV9 from './raw_unique_constraint_data_v_9_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
index 63404adbcc1..5ace6a528b1 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawUniqueConstraintDataV9Type from './raw_unique_constraint_data_v_9_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
index 97c589847cb..95a37ba403a 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_8_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawConstraintDefV8', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
index dbf85cb0c94..b4af353d9ee 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawConstraintDataV9 from './raw_constraint_data_v_9_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
index 8ac5a46f997..e755ee94c7e 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as RawIndexAlgorithmVariants from './raw_index_algorithm_variants';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
index 1d9d57c2506..709fb79d6d2 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type BTree = { tag: 'BTree'; value: number[] };
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
index 893984859e3..043c14554a1 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_8_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import IndexType from './index_type_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
index 414120b454c..890afd29f98 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawIndexAlgorithm from './raw_index_algorithm_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
index 4ab2cea93e9..5f592285551 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawColumnDefaultValueV9 from './raw_column_default_value_v_9_type';
 import RawProcedureDefV9 from './raw_procedure_def_v_9_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
index 0150cc650b0..ec0e9e4f899 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawColumnDefaultValueV9Type from './raw_column_default_value_v_9_type';
 import RawProcedureDefV9Type from './raw_procedure_def_v_9_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
index b7e32068158..e808e1528a7 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawModuleDefV8 from './raw_module_def_v_8_type';
 import RawModuleDefV9 from './raw_module_def_v_9_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
index 218270d4167..3d7f8432636 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_8_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import Typespace from './typespace_type';
 import TableDesc from './table_desc_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
index a7fc9f2bcfa..91be3311621 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import Typespace from './typespace_type';
 import RawTableDefV9 from './raw_table_def_v_9_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
index ec4476d92d8..2f1f1e2d2b0 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawModuleDefV8Type from './raw_module_def_v_8_type';
 import RawModuleDefV9Type from './raw_module_def_v_9_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
index 3edba3dd591..e19d2456f03 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_procedure_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 import ProductType from './product_type_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
index 90a742f73e3..9dc29e31c59 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_reducer_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import ProductType from './product_type_type';
 import Lifecycle from './lifecycle_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
index 73b27e0039e..d32a79f32f4 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_row_level_security_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawRowLevelSecurityDefV9', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
index 2aa3f796a7a..8c1463607dd 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_schedule_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawScheduleDefV9', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
index 90052774483..b6ddc65622d 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_scoped_type_name_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawScopedTypeNameV9', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
index 6a93beecd5c..05d5b54daff 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_8_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawSequenceDefV8', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
index 0f923b0a74f..5c506094b3f 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_sequence_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawSequenceDefV9', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
index 0e04a4bdf23..be8ef6b922a 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_8_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawColumnDefV8 from './raw_column_def_v_8_type';
 import RawIndexDefV8 from './raw_index_def_v_8_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
index 497e4a8069e..b3fcb11dccb 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_table_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawIndexDefV9 from './raw_index_def_v_9_type';
 import RawConstraintDefV9 from './raw_constraint_def_v_9_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
index 3c0393dd8fe..ecfc9fcab81 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_type_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawScopedTypeNameV9 from './raw_scoped_type_name_v_9_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
index fd9f15f2831..89b24676cf7 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_unique_constraint_data_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('RawUniqueConstraintDataV9', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
index 403f40dc2aa..701571e50d6 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_view_def_v_9_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 import ProductType from './product_type_type';
diff --git a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
index cb6684478a6..8a23f6854b4 100644
--- a/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/reducer_def_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import ProductTypeElement from './product_type_element_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
index 8e56f6cd3bb..7345998cc7f 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import SumTypeVariant from './sum_type_variant_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
index 6a42cb2abc4..8adc80e7bc1 100644
--- a/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/sum_type_variant_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
index bb58743b39e..0d310bf2d23 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as TableAccessVariants from './table_access_variants';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
index e3439ea4df4..9567b4f4006 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type Public = { tag: 'Public' };
diff --git a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
index 53211d09bdc..626b04864bb 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_desc_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import RawTableDefV8 from './raw_table_def_v_8_type';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
index b006fac7509..ee5cfa6b497 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import * as TableTypeVariants from './table_type_variants';
 
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
index caad701b6e9..ea10b2d5aaa 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export type System = { tag: 'System' };
diff --git a/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts b/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
index 4227f5bf030..815cce037f9 100644
--- a/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/type_alias_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 
 export default __t.object('TypeAlias', {
diff --git a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
index debfdd68b43..32cdea5d607 100644
--- a/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/typespace_type.ts
@@ -5,15 +5,9 @@
 /* tslint:disable */
 import {
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
-  type RemoteModule as __RemoteModule,
 } from '../../index';
 import AlgebraicType from './algebraic_type_type';
 
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index aac213c1146..8d897ab6465 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -1,21 +1,16 @@
-import {
-  AlgebraicType,
-  AlgebraicTypeVariants,
-  ConnectionId,
-  Identity,
-  ScheduleAt,
-  TimeDuration,
-  Timestamp,
-  Option,
-  type ConnectionIdAlgebraicType,
-  type IdentityAlgebraicType,
-  type OptionAlgebraicType,
-  type TimeDurationAlgebraicType,
-  type TimestampAlgebraicType,
-} from '..';
+import { AlgebraicType, type AlgebraicTypeVariants } from './algebraic_type';
+import { ConnectionId, type ConnectionIdAlgebraicType } from './connection_id';
+import { Identity, type IdentityAlgebraicType } from './identity';
+import { Option, type OptionAlgebraicType } from './option';
+import ScheduleAt from './schedule_at';
 import type { CoerceRow } from './table';
+import { TimeDuration, type TimeDurationAlgebraicType } from './time_duration';
+import { Timestamp, type TimestampAlgebraicType } from './timestamp';
 import { set, type SetField } from './type_util';
 
+// Used in codegen files
+export { type AlgebraicTypeType } from './algebraic_type';
+
 /**
  * Helper type to extract the TypeScript type from a TypeBuilder
  */
diff --git a/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts b/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
index 0f6e1097565..785d9595b7e 100644
--- a/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/bsatn_row_list_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import RowSizeHint from './row_size_hint_type';
 
 export default __t.object('BsatnRowList', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts b/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
index 424ca0f6f26..6be8e6916d7 100644
--- a/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/call_procedure_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('CallProcedure', {
   procedure: __t.string(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts b/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
index a9c9573e18c..b1b7045c927 100644
--- a/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/call_reducer_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('CallReducer', {
   reducer: __t.string(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
index 79b47bc5b77..a9235ed5572 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import CallReducer from './call_reducer_type';
 import Subscribe from './subscribe_type';
 import OneOffQuery from './one_off_query_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
index 7faae1d9aa4..b85719a2956 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import CallReducerType from './call_reducer_type';
 import SubscribeType from './subscribe_type';
 import OneOffQueryType from './one_off_query_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
index de898134d86..287eb2364cc 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryUpdate from './query_update_type';
 
 import * as CompressableQueryUpdateVariants from './compressable_query_update_variants';
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
index acaaa990511..8246811b00e 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryUpdateType from './query_update_type';
 
 export type Uncompressed = {
diff --git a/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
index 1f549dbcbc9..0334e62ff43 100644
--- a/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/database_update_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import TableUpdate from './table_update_type';
 
 export default __t.object('DatabaseUpdate', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts b/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
index 92e6a9abede..4c100ba390c 100644
--- a/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/energy_quanta_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('EnergyQuanta', {
   quanta: __t.u128(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts b/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
index c128c925a50..e251e103e92 100644
--- a/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/identity_token_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('IdentityToken', {
   identity: __t.identity(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/index.ts b/crates/bindings-typescript/src/sdk/client_api/index.ts
deleted file mode 100644
index c1eb3184c5e..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/index.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-// This was generated using spacetimedb cli version 1.6.0 (commit 0b0b06d5f67fecff50eb7b1c79bff5dad686f5d2).
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
-  t as __t,
-  table as __table,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
-
-// Import and reexport all reducer arg types
-
-// Import and reexport all table handle types
-
-// Import and reexport all types
-import BsatnRowList from './bsatn_row_list_type.ts';
-export { BsatnRowList };
-import CallProcedure from './call_procedure_type.ts';
-export { CallProcedure };
-import CallReducer from './call_reducer_type.ts';
-export { CallReducer };
-import ClientMessage from './client_message_type.ts';
-export { ClientMessage };
-import CompressableQueryUpdate from './compressable_query_update_type.ts';
-export { CompressableQueryUpdate };
-import DatabaseUpdate from './database_update_type.ts';
-export { DatabaseUpdate };
-import EnergyQuanta from './energy_quanta_type.ts';
-export { EnergyQuanta };
-import IdentityToken from './identity_token_type.ts';
-export { IdentityToken };
-import InitialSubscription from './initial_subscription_type.ts';
-export { InitialSubscription };
-import OneOffQuery from './one_off_query_type.ts';
-export { OneOffQuery };
-import OneOffQueryResponse from './one_off_query_response_type.ts';
-export { OneOffQueryResponse };
-import OneOffTable from './one_off_table_type.ts';
-export { OneOffTable };
-import ProcedureResult from './procedure_result_type.ts';
-export { ProcedureResult };
-import ProcedureStatus from './procedure_status_type.ts';
-export { ProcedureStatus };
-import QueryId from './query_id_type.ts';
-export { QueryId };
-import QueryUpdate from './query_update_type.ts';
-export { QueryUpdate };
-import ReducerCallInfo from './reducer_call_info_type.ts';
-export { ReducerCallInfo };
-import RowSizeHint from './row_size_hint_type.ts';
-export { RowSizeHint };
-import ServerMessage from './server_message_type.ts';
-export { ServerMessage };
-import Subscribe from './subscribe_type.ts';
-export { Subscribe };
-import SubscribeApplied from './subscribe_applied_type.ts';
-export { SubscribeApplied };
-import SubscribeMulti from './subscribe_multi_type.ts';
-export { SubscribeMulti };
-import SubscribeMultiApplied from './subscribe_multi_applied_type.ts';
-export { SubscribeMultiApplied };
-import SubscribeRows from './subscribe_rows_type.ts';
-export { SubscribeRows };
-import SubscribeSingle from './subscribe_single_type.ts';
-export { SubscribeSingle };
-import SubscriptionError from './subscription_error_type.ts';
-export { SubscriptionError };
-import TableUpdate from './table_update_type.ts';
-export { TableUpdate };
-import TransactionUpdate from './transaction_update_type.ts';
-export { TransactionUpdate };
-import TransactionUpdateLight from './transaction_update_light_type.ts';
-export { TransactionUpdateLight };
-import Unsubscribe from './unsubscribe_type.ts';
-export { Unsubscribe };
-import UnsubscribeApplied from './unsubscribe_applied_type.ts';
-export { UnsubscribeApplied };
-import UnsubscribeMulti from './unsubscribe_multi_type.ts';
-export { UnsubscribeMulti };
-import UnsubscribeMultiApplied from './unsubscribe_multi_applied_type.ts';
-export { UnsubscribeMultiApplied };
-import UpdateStatus from './update_status_type.ts';
-export { UpdateStatus };
-
-const tablesSchema = __schema();
-
-const reducersSchema = __reducers();
-
-const REMOTE_MODULE = {
-  versionInfo: {
-    cliVersion: '1.6.0' as const,
-  },
-  tables: tablesSchema.schemaType.tables,
-  reducers: reducersSchema.reducersType.reducers,
-} satisfies __RemoteModule<
-  typeof tablesSchema.schemaType,
-  typeof reducersSchema.reducersType
->;
-
-export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);
-export const reducers = __convertToAccessorMap(
-  reducersSchema.reducersType.reducers
-);
-
-export type EventContext = __EventContextInterface<typeof REMOTE_MODULE>;
-export type ReducerEventContext = __ReducerEventContextInterface<
-  typeof REMOTE_MODULE
->;
-export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-  typeof REMOTE_MODULE
->;
-export type ErrorContext = __ErrorContextInterface<typeof REMOTE_MODULE>;
-
-export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-  typeof REMOTE_MODULE
-> {}
-
-export class DbConnectionBuilder extends __DbConnectionBuilder<DbConnection> {}
-
-export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
-  static builder = (): DbConnectionBuilder => {
-    return new DbConnectionBuilder(
-      REMOTE_MODULE,
-      (config: __DbConnectionConfig<typeof REMOTE_MODULE>) =>
-        new DbConnection(config)
-    );
-  };
-  subscriptionBuilder = (): SubscriptionBuilder => {
-    return new SubscriptionBuilder(this);
-  };
-}
diff --git a/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts b/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
index 9f897151ef7..05d2ff3e671 100644
--- a/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/initial_subscription_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import DatabaseUpdate from './database_update_type';
 
 export default __t.object('InitialSubscription', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
index e287012cf24..03dee420bd8 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_query_response_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import OneOffTable from './one_off_table_type';
 
 export default __t.object('OneOffQueryResponse', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
index 729aad3abdc..b550bf4304f 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_query_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('OneOffQuery', {
   messageId: __t.byteArray(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts b/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
index da5fd216448..2b7017d1b34 100644
--- a/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/one_off_table_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import BsatnRowList from './bsatn_row_list_type';
 
 export default __t.object('OneOffTable', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
index 2340cf37ec9..c83dd849bcf 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_result_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import ProcedureStatus from './procedure_status_type';
 
 export default __t.object('ProcedureResult', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
index b214ecbecf9..f2750e88a29 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import * as ProcedureStatusVariants from './procedure_status_variants';
 
 // The tagged union or sum type for the algebraic type `ProcedureStatus`.
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
index 31f2e4fe79b..6652aab16d4 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export type Returned = { tag: 'Returned'; value: Uint8Array };
 export type OutOfEnergy = { tag: 'OutOfEnergy' };
diff --git a/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts b/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
index dc7a0a3cd39..9c8cd403090 100644
--- a/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/query_id_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('QueryId', {
   id: __t.u32(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
index cf82064e70b..89338dc40ae 100644
--- a/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/query_update_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import BsatnRowList from './bsatn_row_list_type';
 
 export default __t.object('QueryUpdate', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts b/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
index 812fe6649f8..8df1255dd45 100644
--- a/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/reducer_call_info_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('ReducerCallInfo', {
   reducerName: __t.string(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
index 0dcf9658727..b5fcd506486 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import * as RowSizeHintVariants from './row_size_hint_variants';
 
 // The tagged union or sum type for the algebraic type `RowSizeHint`.
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
index 5b74f9d7735..8c28ef824b9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export type FixedSize = { tag: 'FixedSize'; value: number };
 export type RowOffsets = { tag: 'RowOffsets'; value: bigint[] };
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
index c1eda11aabb..b670d6b69bc 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import InitialSubscription from './initial_subscription_type';
 import TransactionUpdate from './transaction_update_type';
 import TransactionUpdateLight from './transaction_update_light_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
index e127e3f8f12..e27eb295f81 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import InitialSubscriptionType from './initial_subscription_type';
 import TransactionUpdateType from './transaction_update_type';
 import TransactionUpdateLightType from './transaction_update_light_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
index 59449adb016..58bfe91169d 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_applied_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 import SubscribeRows from './subscribe_rows_type';
 
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
index 749cad69bde..dedef69e1b5 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_applied_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 import DatabaseUpdate from './database_update_type';
 
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
index 1f11210ff18..f57c6cdc3ba 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_multi_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 
 export default __t.object('SubscribeMulti', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
index ea896d3c6b0..9bb71d3e9c8 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_rows_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import TableUpdate from './table_update_type';
 
 export default __t.object('SubscribeRows', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
index 923001398a6..24f95da4ead 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_single_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 
 export default __t.object('SubscribeSingle', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
index 3db423d5205..12dd03b70e9 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscribe_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('Subscribe', {
   queryStrings: __t.array(__t.string()),
diff --git a/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts b/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
index 130c423e1e5..6e6c706d762 100644
--- a/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/subscription_error_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 
 export default __t.object('SubscriptionError', {
   totalHostExecutionDurationMicros: __t.u64(),
diff --git a/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
index 4d48b90fda4..3af80ec50ce 100644
--- a/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/table_update_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import CompressableQueryUpdate from './compressable_query_update_type';
 
 export default __t.object('TableUpdate', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts b/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
index ec986f1be5f..749059e6301 100644
--- a/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/transaction_update_light_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import DatabaseUpdate from './database_update_type';
 
 export default __t.object('TransactionUpdateLight', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
index b1c3ffee9ba..b95ae7cf008 100644
--- a/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/transaction_update_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import UpdateStatus from './update_status_type';
 import ReducerCallInfo from './reducer_call_info_type';
 import EnergyQuanta from './energy_quanta_type';
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
index a079d321a37..bf921d16cc0 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_applied_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 import SubscribeRows from './subscribe_rows_type';
 
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
index ee657727b6a..a7c4c54fcf6 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_applied_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 import DatabaseUpdate from './database_update_type';
 
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
index f4e6805c6fe..e70eca30320 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_multi_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 
 export default __t.object('UnsubscribeMulti', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
index aad2672ae46..fecc55d3c7b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/unsubscribe_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import QueryId from './query_id_type';
 
 export default __t.object('Unsubscribe', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
index 609ba46da39..0a666da5719 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import DatabaseUpdate from './database_update_type';
 
 import * as UpdateStatusVariants from './update_status_variants';
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
index 490f2b356ef..e2234e39e52 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
@@ -4,26 +4,11 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-} from 'spacetimedb';
+} from '../../lib/type_builders';
 import DatabaseUpdateType from './database_update_type';
 
 export type Committed = {
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index 90ac3cd5015..1e5b4be9abf 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -1,7 +1,6 @@
 import { DbConnectionImpl, type ConnectionEvent } from './db_connection_impl';
 import { EventEmitter } from './event_emitter';
 import type { DbConnectionConfig, ErrorContextInterface, Identity, RemoteModuleOf, SubscriptionEventContextInterface } from '../';
-import { type UntypedRemoteModule } from './spacetime_module';
 import { ensureMinimumVersionOrThrow } from './version';
 import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
 
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index ac3d8c992b4..e2a7ced5371 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -3,7 +3,6 @@ import {
   AlgebraicType,
   type ComparablePrimitive,
 } from '../';
-import { parseValue } from '../';
 import { BinaryReader } from '../';
 import { BinaryWriter } from '../';
 import BsatnRowList from './client_api/bsatn_row_list_type.ts';
@@ -21,7 +20,6 @@ import {
   type EventContextInterface,
   type ReducerEventContextInterface,
   type SubscriptionEventContextInterface,
-  type UntypedEventContext,
 } from './event_context.ts';
 import { EventEmitter } from './event_emitter.ts';
 import { decompress } from './decompress.ts';
diff --git a/crates/bindings-typescript/src/sdk/message_types.ts b/crates/bindings-typescript/src/sdk/message_types.ts
index d9c9008534f..3ae8314b2c2 100644
--- a/crates/bindings-typescript/src/sdk/message_types.ts
+++ b/crates/bindings-typescript/src/sdk/message_types.ts
@@ -1,9 +1,9 @@
 import { ConnectionId, type Infer } from '../';
-import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
 import type { TableUpdate } from './table_cache.ts';
 import { Timestamp } from '../';
 import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
+import type UpdateStatus from './client_api/update_status_type.ts';
 
 export type InitialSubscriptionMessage = {
   tag: 'InitialSubscription';
diff --git a/crates/bindings-typescript/src/sdk/reducer_event.ts b/crates/bindings-typescript/src/sdk/reducer_event.ts
index 86904c7892e..884f083118d 100644
--- a/crates/bindings-typescript/src/sdk/reducer_event.ts
+++ b/crates/bindings-typescript/src/sdk/reducer_event.ts
@@ -1,7 +1,7 @@
 import { ConnectionId, type Infer } from '../';
 import { Timestamp } from '../';
-import type { UpdateStatus } from './client_api/index.ts';
 import { Identity } from '../';
+import type UpdateStatus from './client_api/update_status_type.ts';
 import type { ReducerEventInfo } from './reducers.ts';
 
 export type ReducerEvent<Reducer extends ReducerEventInfo> = {
diff --git a/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts b/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
index 53dd85cf7f0..2b1dc2ac25f 100644
--- a/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
+++ b/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
@@ -1,5 +1,5 @@
 import { AlgebraicType, BinaryWriter, type Infer } from '../';
-import { ServerMessage } from './client_api/index.ts';
+import ServerMessage from './client_api/server_message_type';
 
 class WebsocketTestAdapter {
   onclose: any;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
index 92c1a3fc322..368f9ad64f8 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/create_player_reducer.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 
 import Point from './point_type';
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 084741c8378..8acf176ea68 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 import Point from './point_type';
 
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index 8f435a91817..3a1d4492baa 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 import Point from './point_type';
 
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
index ac099fec355..e65bc722fff 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/point_type.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 
 export default __t.object('Point', {
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
index 084741c8378..8acf176ea68 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 import Point from './point_type';
 
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
index d43660f05a6..f697863ed0c 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 import Point from './point_type';
 
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
index 8f2f9bb22c3..efa159d1988 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_table.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 
 export default __t.row({
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
index 1f333d6f12a..be7f606145e 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/user_type.ts
@@ -4,25 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
   TypeBuilder as __TypeBuilder,
-  convertToAccessorMap as __convertToAccessorMap,
-  reducerSchema as __reducerSchema,
-  reducers as __reducers,
-  schema as __schema,
   t as __t,
-  table as __table,
   type AlgebraicTypeType as __AlgebraicTypeType,
-  type DbConnectionConfig as __DbConnectionConfig,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
   type Infer as __Infer,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type RemoteModule as __RemoteModule,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
 } from '../../../src/index';
 
 export default __t.object('User', {
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index b4c54a83ab0..704ccb6069f 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -35,7 +35,7 @@ impl Lang for TypeScript {
             let mut output = CodeIndenter::new(String::new(), INDENT);
             let out = &mut output;
 
-            print_file_header(out, false);
+            print_file_header(out, false, true);
             gen_and_print_imports(module, out, &product.elements, &[typ.ty], None);
             writeln!(out);
             define_body_for_product(module, out, &type_name, &product.elements);
@@ -50,7 +50,7 @@ impl Lang for TypeScript {
             let mut output = CodeIndenter::new(String::new(), INDENT);
             let out = &mut output;
 
-            print_file_header(out, false);
+            print_file_header(out, false, true);
             // Note that the current type is not included in dont_import below.
             gen_and_print_imports(module, out, variants, &[], Some("Type"));
             writeln!(out);
@@ -66,7 +66,7 @@ impl Lang for TypeScript {
             let mut output = CodeIndenter::new(String::new(), INDENT);
             let out = &mut output;
 
-            print_file_header(out, false);
+            print_file_header(out, false, true);
             gen_and_print_imports(module, out, variants, &[typ.ty], None);
             writeln!(
                 out,
@@ -125,7 +125,7 @@ impl Lang for TypeScript {
         let mut output = CodeIndenter::new(String::new(), INDENT);
         let out = &mut output;
 
-        print_file_header(out, false);
+        print_file_header(out, false, true);
 
         let type_ref = table.product_type_ref;
         let product_def = module.typespace_for_generate()[type_ref].as_product().unwrap();
@@ -158,7 +158,7 @@ impl Lang for TypeScript {
         let mut output = CodeIndenter::new(String::new(), INDENT);
         let out = &mut output;
 
-        print_file_header(out, false);
+        print_file_header(out, false, true);
 
         out.newline();
 
@@ -183,7 +183,7 @@ impl Lang for TypeScript {
         let mut output = CodeIndenter::new(String::new(), INDENT);
         let out = &mut output;
 
-        print_file_header(out, true);
+        print_file_header(out, true, false);
 
         out.newline();
 
@@ -347,10 +347,10 @@ impl Lang for TypeScript {
     }
 }
 
-fn print_spacetimedb_imports(out: &mut Indenter) {
+fn print_index_imports(out: &mut Indenter) {
     // All library imports are prefixed with `__` to avoid
     // clashing with the names of user generated types.
-    let mut types = [
+     let mut types = [
         "TypeBuilder as __TypeBuilder",
         "type AlgebraicTypeType as __AlgebraicTypeType",
         "DbConnectionBuilder as __DbConnectionBuilder",
@@ -374,20 +374,43 @@ fn print_spacetimedb_imports(out: &mut Indenter) {
     types.sort();
     writeln!(out, "import {{");
     out.indent(1);
-    for ty in &types {
+    for ty in types {
         writeln!(out, "{ty},");
     }
     out.dedent(1);
     writeln!(out, "}} from \"spacetimedb\";");
 }
 
-fn print_file_header(output: &mut Indenter, include_version: bool) {
+fn print_type_builder_imports(out: &mut Indenter) {
+    // All library imports are prefixed with `__` to avoid
+    // clashing with the names of user generated types.
+     let mut types = [
+        "TypeBuilder as __TypeBuilder",
+        "type AlgebraicTypeType as __AlgebraicTypeType",
+        "type Infer as __Infer",
+        "t as __t",
+    ];
+    types.sort();
+    writeln!(out, "import {{");
+    out.indent(1);
+    for ty in types {
+        writeln!(out, "{ty},");
+    }
+    out.dedent(1);
+    writeln!(out, "}} from \"spacetimedb\";");
+}
+
+fn print_file_header(output: &mut Indenter, include_version: bool, type_builder_only: bool) {
     print_auto_generated_file_comment(output);
     if include_version {
         print_auto_generated_version_comment(output);
     }
     print_lint_suppression(output);
-    print_spacetimedb_imports(output);
+    if type_builder_only {
+        print_type_builder_imports(output);
+    } else {
+        print_index_imports(output);
+    }
 }
 
 fn print_lint_suppression(output: &mut Indenter) {

From ac4e15a9221facb4f994cb6ac024291ccac0070e Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sat, 8 Nov 2025 21:16:34 -0500
Subject: [PATCH 16/23] It is magnifico

---
 .../bindings-typescript/src/lib/reducers.ts   |  49 ++++++--
 crates/bindings-typescript/src/lib/schema.ts  |  43 +++++--
 crates/bindings-typescript/src/lib/table.ts   |   6 +-
 .../src/lib/type_builders.ts                  | 118 +++++++-----------
 .../bindings-typescript/src/lib/type_util.ts  |  29 ++---
 .../src/react/SpacetimeDBProvider.ts          |  21 ++--
 .../src/react/useReducer.ts                   |  48 +++++--
 .../bindings-typescript/src/react/useTable.ts |  40 ++----
 .../bindings-typescript/src/sdk/reducers.ts   |   4 +-
 .../test-app/server/src/lib.rs                |  16 ++-
 .../bindings-typescript/test-app/src/App.tsx  |  27 ++--
 .../bindings-typescript/test-app/src/main.tsx |   9 +-
 .../src/module_bindings/player_table.ts       |   3 +-
 .../src/module_bindings/player_type.ts        |   3 +-
 .../module_bindings/unindexed_player_table.ts |   3 +-
 .../module_bindings/unindexed_player_type.ts  |   3 +-
 16 files changed, 240 insertions(+), 182 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index 8551fed39dc..14f7a9caffa 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -17,6 +17,7 @@ import {
 } from './type_builders';
 import type { ReducerSchema } from './reducer_schema';
 import { toCamelCase } from './utils';
+import type { CamelCase } from './type_util';
 
 /**
  * Helper to extract the parameter types from an object type
@@ -264,10 +265,11 @@ export function clientDisconnected<
 }
 
 class Reducers<ReducersDef extends UntypedReducersDef> {
-  /**
-   * Phantom type to track the reducers definition 
-   */
-  reducersType!: ReducersDef;
+  reducersType: ReducersDef;
+
+  constructor(handles: readonly ReducerSchema<any, any>[]) {
+    this.reducersType = reducersToSchema(handles) as ReducersDef;
+  }
 }
 
 /**
@@ -278,13 +280,39 @@ type ReducersToSchema<T extends readonly ReducerSchema<any, any>[]> = {
     /** @type {UntypedReducerDef} */
     readonly [i in keyof T]: {
       name: T[i]['reducerName'];
-      accessorName: T[i]['accessorName'];
+      accessorName: CamelCase<T[i]['accessorName']>;
       params: T[i]['params']['row'];
       paramsType: T[i]['paramsSpacetimeType'];
     };
   };
 };
 
+export function reducersToSchema<
+  const T extends readonly ReducerSchema<any, any>[]
+>(reducers: T): ReducersToSchema<T> {
+  const mapped = reducers.map((r) => {
+    const paramsRow = r.params.row;
+
+    return {
+      name: r.reducerName,
+      // Prefer the schema's own accessorName if present at runtime; otherwise derive it.
+      accessorName: r.accessorName,
+      params: paramsRow,
+      paramsType: r.paramsSpacetimeType,
+    } as const;
+  }) as {
+    readonly [I in keyof T]: {
+      name: T[I]['reducerName'];
+      accessorName: T[I]['accessorName'];
+      params: T[I]['params']['row'];
+      paramsType: T[I]['paramsSpacetimeType'];
+    };
+  };
+  
+  const result = { reducers: mapped } satisfies ReducersToSchema<T>;
+  return result;
+}
+
 /**
  * Creates a schema from table definitions
  * @param handles - Array of table handles created by table() function
@@ -310,12 +338,13 @@ export function reducers<const H extends readonly ReducerSchema<any, any>[]>(
   handles: H
 ): Reducers<ReducersToSchema<H>>;
 
-export function reducers(
+export function reducers<const H extends readonly ReducerSchema<any, any>[]>(
   ...args:
-    | [readonly ReducerSchema<any, any>[]]
-    | readonly ReducerSchema<any, any>[]
-): Reducers<UntypedReducersDef> {
-  return new Reducers();
+    | [H]
+    | H
+): Reducers<ReducersToSchema<H>> {
+  const handles = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as H;
+  return new Reducers(handles);
 }
 
 export function reducerSchema<
diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
index 8676385a6dc..a06293e8f49 100644
--- a/crates/bindings-typescript/src/lib/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -32,6 +32,7 @@ import {
 import type RawScopedTypeNameV9 from './autogen/raw_scoped_type_name_v_9_type';
 import type { CamelCase } from './type_util';
 import type { TableSchema } from './table_schema';
+import { toCamelCase } from './utils';
 
 export type TableNamesOf<S extends UntypedSchemaDef> = S['tables'][number]['name'];
 
@@ -58,6 +59,33 @@ type TablesToSchema<T extends readonly TableSchema<any, any, any>[]> = {
   };
 };
 
+export function tablesToSchema<
+  const T extends readonly TableSchema<any, any, readonly any[]>[]
+>(tables: T): TablesToSchema<T> {
+  const result = {
+    tables: tables.map((schema) => {
+      return {
+        name: schema.tableName,
+        accessorName: toCamelCase(schema.tableName),
+        columns: schema.rowType.row, // typed as T[i]['rowType']['row'] under TablesToSchema<T>
+        rowType: schema.rowSpacetimeType,
+        // UntypedTableDef expects mutable array; idxs are readonly, spread to copy.
+        indexes: [...schema.idxs],
+      } as const;
+    }) as {
+        // preserve tuple indices so the return type matches `[i in keyof T]`
+        readonly [I in keyof T]: {
+          name: T[I]['tableName'];
+          accessorName: CamelCase<T[I]['tableName']>;
+          columns: T[I]['rowType']['row'];
+          rowType: T[I]['rowSpacetimeType'];
+          indexes: T[I]['idxs'];
+        };
+      },
+  } satisfies TablesToSchema<T>;
+  return result;
+}
+
 /**
  * The global module definition that gets populated by calls to `reducer()` and lifecycle hooks.
  */
@@ -100,7 +128,7 @@ export function resolveType<AT extends AlgebraicTypeType>(
  * @returns 
  */
 export function registerTypesRecursively(
-  typeBuilder: SumBuilder<VariantsObj> | ProductBuilder<ElementsObj> | RowBuilder<RowObj> 
+  typeBuilder: SumBuilder<VariantsObj> | ProductBuilder<ElementsObj> | RowBuilder<RowObj>
 ): RefBuilder {
   const ty = typeBuilder.algebraicType;
   const name = typeBuilder.typeName;
@@ -134,7 +162,7 @@ export function registerTypesRecursively(
       typeBuilder.variants[name] = registerTypesRecursively(variant);
     }
   }
- 
+
   // Add to typespace and return a Ref type
   r = new RefBuilder(MODULE_DEF.typespace.types.length);
   MODULE_DEF.typespace.types.push(ty);
@@ -191,11 +219,13 @@ export function splitName(name: string): Infer<typeof RawScopedTypeNameV9> {
 class Schema<S extends UntypedSchemaDef> {
   readonly tablesDef: { tables: Infer<typeof RawTableDefV9>[] };
   readonly typespace: Infer<typeof Typespace>;
-  readonly schemaType!: S;
+  readonly schemaType: S;
 
-  constructor(tables: Infer<typeof RawTableDefV9>[], typespace: Infer<typeof Typespace>) {
+  constructor(tables: Infer<typeof RawTableDefV9>[], typespace: Infer<typeof Typespace>, handles: readonly TableSchema<any, any, any>[]) {
     this.tablesDef = { tables };
     this.typespace = typespace;
+    // TODO: TableSchema and TableDef should really be unified
+    this.schemaType = tablesToSchema(handles) as S;
   }
 
   /**
@@ -403,7 +433,6 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
     | H
 ): Schema<TablesToSchema<H>> {
   const handles = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as H;
-
   const tableDefs = handles.map(h => h.tableDef);
 
   // Side-effect:
@@ -420,13 +449,13 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
   //     .join('\n')
   // );
 
-  return new Schema(tableDefs, MODULE_DEF.typespace);
+  return new Schema(tableDefs, MODULE_DEF.typespace, handles);
 }
 
 type HasAccessor = { accessorName: PropertyKey };
 
 export type ConvertToAccessorMap<TableDefs extends readonly HasAccessor[]> = {
-  [Tbl in TableDefs[number]as Tbl["accessorName"]]: Tbl
+  [Tbl in TableDefs[number] as Tbl["accessorName"]]: Tbl
 };
 
 export function convertToAccessorMap<T extends readonly HasAccessor[]>(arr: T): ConvertToAccessorMap<T> {
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index 60f9d0f55fb..a57f8fbebb5 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -17,7 +17,7 @@ import {
   type RowObj,
   type TypeBuilder,
 } from './type_builders';
-import type { Prettify, PrettifyDeep } from './type_util';
+import type { Prettify, } from './type_util';
 
 export type AlgebraicTypeRef = number;
 type ColId = number;
@@ -26,9 +26,9 @@ type ColList = ColId[];
 /**
  * A helper type to extract the row type from a TableDef
  */
-export type RowType<TableDef extends UntypedTableDef> = InferTypeOfRow<
+export type RowType<TableDef extends UntypedTableDef> = Prettify<InferTypeOfRow<
   TableDef['columns']
->;
+>>;
 
 /**
  * Coerces a column which may be a TypeBuilder or ColumnBuilder into a ColumnBuilder
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 8d897ab6465..b616e5d27ab 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -6,7 +6,7 @@ import ScheduleAt from './schedule_at';
 import type { CoerceRow } from './table';
 import { TimeDuration, type TimeDurationAlgebraicType } from './time_duration';
 import { Timestamp, type TimestampAlgebraicType } from './timestamp';
-import { set, type SetField } from './type_util';
+import { set, type Prettify, type SetField } from './type_util';
 
 // Used in codegen files
 export { type AlgebraicTypeType } from './algebraic_type';
@@ -15,7 +15,7 @@ export { type AlgebraicTypeType } from './algebraic_type';
  * Helper type to extract the TypeScript type from a TypeBuilder
  */
 export type InferTypeOfTypeBuilder<T extends TypeBuilder<any, any>> =
-  T extends TypeBuilder<infer U, any> ? U : never;
+  T extends TypeBuilder<infer U, any> ? Prettify<U> : never;
 
 /**
  * Helper type to extract the Spacetime type from a TypeBuilder
@@ -1188,7 +1188,7 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
     const elements = Object.entries(mappedRow).map(([name, builder]) => ({
       name,
       algebraicType: builder.typeBuilder.algebraicType,
-    })) as ElementsArrayFromRowObj<Row>;
+    }));
 
     super(AlgebraicType.Product({ elements }));
     this.row = mappedRow;
@@ -1611,14 +1611,13 @@ export class U8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
   autoInc(): U8ColumnBuilder<SetField<M, 'isAutoIncrement', true>> {
     return new U8ColumnBuilder(
       this.typeBuilder,
-      set(this.columnMetadata, { isAutoIncrement: true })
+      set(this.columnMetadata, { isAutoIncrement: true as const })
     );
   }
   default(value: number): U8ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new U8ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new U8ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1663,10 +1662,9 @@ export class U16ColumnBuilder<
     );
   }
   default(value: number): U16ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new U16ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new U16ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1711,10 +1709,9 @@ export class U32ColumnBuilder<
     );
   }
   default(value: number): U32ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new U32ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new U32ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1759,10 +1756,9 @@ export class U64ColumnBuilder<
     );
   }
   default(value: bigint): U64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new U64ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new U64ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1807,10 +1803,9 @@ export class U128ColumnBuilder<
     );
   }
   default(value: bigint): U128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new U128ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new U128ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1855,10 +1850,9 @@ export class U256ColumnBuilder<
     );
   }
   default(value: bigint): U256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new U256ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new U256ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1901,10 +1895,9 @@ export class I8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
     );
   }
   default(value: number): I8ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new I8ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new I8ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1949,10 +1942,9 @@ export class I16ColumnBuilder<
     );
   }
   default(value: number): I16ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new I16ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new I16ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -1997,10 +1989,9 @@ export class I32ColumnBuilder<
     );
   }
   default(value: number): I32ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new I32ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new I32ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2045,10 +2036,9 @@ export class I64ColumnBuilder<
     );
   }
   default(value: bigint): I64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new I64ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new I64ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2093,10 +2083,9 @@ export class I128ColumnBuilder<
     );
   }
   default(value: bigint): I128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new I128ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new I128ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2141,10 +2130,9 @@ export class I256ColumnBuilder<
     );
   }
   default(value: bigint): I256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new I256ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new I256ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2154,10 +2142,9 @@ export class F32ColumnBuilder<
   extends ColumnBuilder<number, AlgebraicTypeVariants.F32, M>
   implements Defaultable<number, AlgebraicTypeVariants.F32> {
   default(value: number): F32ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new F32ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new F32ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2167,10 +2154,9 @@ export class F64ColumnBuilder<
   extends ColumnBuilder<number, AlgebraicTypeVariants.F64, M>
   implements Defaultable<number, AlgebraicTypeVariants.F64> {
   default(value: number): F64ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new F64ColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new F64ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2208,10 +2194,9 @@ export class BoolColumnBuilder<
     );
   }
   default(value: boolean): BoolColumnBuilder<SetField<M, 'defaultValue', boolean>> {
-    return new BoolColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new BoolColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2249,10 +2234,9 @@ export class StringColumnBuilder<
     );
   }
   default(value: string): StringColumnBuilder<SetField<M, 'defaultValue', string>> {
-    return new StringColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new StringColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2278,10 +2262,9 @@ export class ArrayColumnBuilder<
     Element,
     SetField<M, 'defaultValue', Array<InferTypeOfTypeBuilder<Element>>>
   > {
-    return new ArrayColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new ArrayColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2314,10 +2297,9 @@ export class OptionColumnBuilder<
     Value,
     SetField<M, 'defaultValue', InferTypeOfTypeBuilder<Value> | undefined>
   > {
-    return new OptionColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
+    return new OptionColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
       defaultValue: value,
-    });
+    }));
   }
 }
 
@@ -2437,10 +2419,7 @@ export class IdentityColumnBuilder<
   default(
     value: Identity
   ): IdentityColumnBuilder<SetField<M, 'defaultValue', Identity>> {
-    return new IdentityColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
-      defaultValue: value,
-    });
+    return new IdentityColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
   }
 }
 
@@ -2480,10 +2459,7 @@ export class ConnectionIdColumnBuilder<
   default(
     value: ConnectionId
   ): ConnectionIdColumnBuilder<SetField<M, 'defaultValue', ConnectionId>> {
-    return new ConnectionIdColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
-      defaultValue: value,
-    });
+    return new ConnectionIdColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
   }
 }
 
@@ -2523,10 +2499,7 @@ export class TimestampColumnBuilder<
   default(
     value: Timestamp
   ): TimestampColumnBuilder<SetField<M, 'defaultValue', Timestamp>> {
-    return new TimestampColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
-      defaultValue: value,
-    });
+    return new TimestampColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
   }
 }
 
@@ -2566,10 +2539,7 @@ export class TimeDurationColumnBuilder<
   default(
     value: TimeDuration
   ): TimeDurationColumnBuilder<SetField<M, 'defaultValue', TimeDuration>> {
-    return new TimeDurationColumnBuilder(this.typeBuilder, {
-      ...this.columnMetadata,
-      defaultValue: value,
-    });
+    return new TimeDurationColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
   }
 }
 
diff --git a/crates/bindings-typescript/src/lib/type_util.ts b/crates/bindings-typescript/src/lib/type_util.ts
index 1a5e7d12a29..1c0bc697284 100644
--- a/crates/bindings-typescript/src/lib/type_util.ts
+++ b/crates/bindings-typescript/src/lib/type_util.ts
@@ -1,23 +1,16 @@
+import type { ConnectionId } from "./connection_id";
+import type { Identity } from "./identity";
+import type { ScheduleAt } from "./schedule_at";
+import type { TimeDuration } from "./time_duration";
+import type { Timestamp } from "./timestamp";
+
+type DoNotPrettify = Identity | ConnectionId | Timestamp | TimeDuration | ScheduleAt;
+
 /**
  * Utility to make TS show cleaner types by flattening intersections.
  */
-export type Prettify<T> = { [K in keyof T]: T[K] } & {};
-
-type Builtin =
-  | string | number | boolean | symbol | bigint | null | undefined
-  | Function | Date | RegExp | Error
-  | Map<any, any> | Set<any> | WeakMap<any, any> | WeakSet<any>
-  | Promise<any>;
-
-// Deep
-export type _PrettifyDeep<T> =
-  T extends Builtin ? T :
-  T extends readonly [...infer _] ? { [K in keyof T]: PrettifyDeep<T[K]> } :
-  T extends ReadonlyArray<infer U> ? ReadonlyArray<PrettifyDeep<U>> :
-  T extends object ? Prettify<{ [K in keyof T]: PrettifyDeep<T[K]> }> :
-  T;
-
-export type PrettifyDeep<T> = T extends unknown ? _PrettifyDeep<T> : never;
+export type Prettify<T> =
+  T extends DoNotPrettify ? T : { [K in keyof T]: T[K] } & {};
 
 /**
  * Helper function to sets a field in an object
@@ -36,7 +29,7 @@ export function set<T, F extends string, V>(
   x: T,
   t: { [k in F]: V }
 ): SetField<T, F, V> {
-  return { ...x, ...t };
+  return { ...x, ...t } as SetField<T, F, V>;
 }
 
 /**
diff --git a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
index c728d424548..26ccbb78c89 100644
--- a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
+++ b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
@@ -3,24 +3,22 @@ import {
   type DbConnectionImpl,
   type ErrorContextInterface,
   type RemoteModuleOf,
-  type SubscriptionEventContextInterface,
 } from '../sdk/db_connection_impl';
 import * as React from 'react';
 import { SpacetimeDBContext } from './useSpacetimeDB';
 import type { ConnectionState } from './connection_state';
 import { ConnectionId } from '../lib/connection_id';
-import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
 export interface SpacetimeDBProviderProps<
-  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
+  DbConnection extends DbConnectionImpl<any>,
 > {
   connectionBuilder: DbConnectionBuilder<DbConnection>;
   children?: React.ReactNode;
 }
 
 export function SpacetimeDBProvider<
-  DbConnection extends DbConnectionImpl<UntypedRemoteModule>,
->({ connectionBuilder, children }: SpacetimeDBProviderProps<DbConnection>) {
+  DbConnection extends DbConnectionImpl<any>,
+>({ connectionBuilder, children }: SpacetimeDBProviderProps<DbConnection>): React.JSX.Element {
   // Holds the imperative connection instance when (and only when) we’re on the client.
   const connRef = React.useRef<DbConnection | null>(null);
   const getConnection = React.useCallback(() => connRef.current, []);
@@ -36,8 +34,12 @@ export function SpacetimeDBProvider<
 
   // Build on the client only; useEffect won't run during SSR.
   React.useEffect(() => {
+    if (!connRef.current) {
+      connRef.current = connectionBuilder.build();
+    }
+    console.log("HAPPPP");
     // Register callback for onConnect to update state
-      const onConnect = (conn: DbConnection) => {
+    const onConnect = (conn: DbConnection) => {
       setState(s => ({
         ...s,
         isActive: conn.isActive,
@@ -63,7 +65,7 @@ export function SpacetimeDBProvider<
     connectionBuilder.onDisconnect(onDisconnect);
     connectionBuilder.onConnectError(onConnectError);
 
-    const conn = connRef.current!;
+    const conn = connRef.current;
     setState(s => ({
       ...s,
       isActive: conn.isActive,
@@ -72,11 +74,6 @@ export function SpacetimeDBProvider<
       connectionId: conn.connectionId,
     }));
 
-    // Lazily build once
-    if (!connRef.current) {
-      connRef.current = connectionBuilder.build();
-    }
-
     return () => {
       connRef.current?.removeOnConnect(onConnect as any);
       connRef.current?.removeOnDisconnect(onDisconnect as any);
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index ee21aceb8c3..3d43e672718 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -1,15 +1,45 @@
+import { useCallback, useEffect, useRef } from "react";
 import type { InferTypeOfRow } from "../lib/type_builders";
-import type { PrettifyDeep } from "../lib/type_util";
 import type { UntypedReducerDef } from "../sdk/reducers";
 import { useSpacetimeDB, } from "./useSpacetimeDB";
 
-export function useReducer<
-  ReducerDef extends UntypedReducerDef
->(
+export function useReducer<ReducerDef extends UntypedReducerDef>(
   reducerDef: ReducerDef,
-): (params: PrettifyDeep<InferTypeOfRow<ReducerDef['params']>>) => void {
-    const reducerName = reducerDef.accessorName;
-    const connectionState = useSpacetimeDB();
-    const connection = connectionState.getConnection()!;
-    return connection.reducers[reducerName as any] as (params: PrettifyDeep<InferTypeOfRow<ReducerDef['params']>>) => void;
+): (params: InferTypeOfRow<ReducerDef['params']>) => void {
+  const { getConnection, isActive } = useSpacetimeDB();
+  const reducerName = reducerDef.accessorName;
+
+  // Holds calls made before the connection exists
+  const queueRef = useRef<
+    Array<InferTypeOfRow<ReducerDef['params']>>
+  >([]);
+
+  // Flush when we finally have a connection
+  useEffect(() => {
+    const conn = getConnection();
+    if (!conn) {
+      return;
+    }
+    const fn =
+      (conn.reducers as any)[reducerName] as
+        (p: InferTypeOfRow<ReducerDef['params']>) => void;
+    if (queueRef.current.length) {
+      const pending = queueRef.current.splice(0);
+      for (const params of pending) fn(params);
+    }
+  }, [getConnection, reducerName, isActive]);
+
+  return useCallback((
+    params: InferTypeOfRow<ReducerDef['params']>
+  ) => {
+    const conn = getConnection();
+    if (!conn) {
+      queueRef.current.push(params);
+      return;
+    }
+    const fn =
+      (conn.reducers as any)[reducerName] as
+        (p: InferTypeOfRow<ReducerDef['params']>) => void;
+    return fn(params);
+  }, [getConnection, reducerName]);
 }
\ No newline at end of file
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index d2c056ea78e..fe337e1780c 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -6,13 +6,11 @@ import {
   useSyncExternalStore,
 } from 'react';
 import { useSpacetimeDB } from './useSpacetimeDB';
-import { DbConnectionImpl, type EventContextInterface, type RemoteModuleOf } from '../sdk/db_connection_impl';
+import { type EventContextInterface } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
 import type { UntypedRemoteModule } from '../sdk/spacetime_module';
-import type { RowType, Table, UntypedTableDef } from '../lib/table';
-import type { ClientTable } from '../sdk/client_table';
-import type { InferTypeOfRow } from '../lib/type_builders';
-import type { PrettifyDeep } from '../lib/type_util';
+import type { RowType, UntypedTableDef } from '../lib/table';
+import type { Prettify } from '../lib/type_util';
 
 export interface UseTableCallbacks<RowType> {
   onInsert?: (row: RowType) => void;
@@ -175,11 +173,6 @@ type ColumnsFromRow<R> = {
 }[keyof R] &
   string;
 
-// Row type for a given connection + table key
-type RowTypeOfTable<
-  TableDef extends UntypedTableDef,
-> = InferTypeOfRow<RowType<TableDef>>;
-
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
  *
@@ -217,9 +210,9 @@ export function useTable<
   TableDef extends UntypedTableDef,
 >(
   tableDef: TableDef,
-  where: Expr<ColumnsFromRow<RowTypeOfTable<TableDef>>>,
-  callbacks?: UseTableCallbacks<RowTypeOfTable<TableDef>>
-): PrettifyDeep<RowTypeOfTable<TableDef>>[];
+  where: Expr<ColumnsFromRow<RowType<TableDef>>>,
+  callbacks?: UseTableCallbacks<RowType<TableDef>>
+): readonly RowType<TableDef>[];
 
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
@@ -254,30 +247,23 @@ export function useTable<
  * });
  * ```
  */
-// export function useTable<
-//   TableDef extends UntypedTableDef,
-// >(
-//   tableDef: TableDef,
-//   where: Expr<ColumnsFromRow<RowTypeOfTable<TableDef>>>,
-//   callbacks?: UseQueryCallbacks<RowTypeOfTable<TableDef>>
-// ): Snapshot<PrettifyDeep<RowTypeOfTable<TableDef>>>;
 export function useTable<
   TableDef extends UntypedTableDef,
 >(
   tableDef: TableDef,
-  callbacks?: UseTableCallbacks<RowTypeOfTable<TableDef>>
-): PrettifyDeep<RowTypeOfTable<TableDef>>[];
+  callbacks?: UseTableCallbacks<RowType<TableDef>>
+): readonly RowType<TableDef>[];
 
 export function useTable<
   TableDef extends UntypedTableDef,
 >(
   tableDef: TableDef,
   whereClauseOrCallbacks?:
-    | Expr<ColumnsFromRow<RowTypeOfTable<TableDef>>>
-    | UseTableCallbacks<RowTypeOfTable<TableDef>>,
-  callbacks?: UseTableCallbacks<RowTypeOfTable<TableDef>>
-): readonly RowTypeOfTable<TableDef>[] {
-  type UseTableRowType = RowTypeOfTable<TableDef>;
+    | Expr<ColumnsFromRow<RowType<TableDef>>>
+    | UseTableCallbacks<RowType<TableDef>>,
+  callbacks?: UseTableCallbacks<RowType<TableDef>>
+): readonly RowType<TableDef>[] {
+  type UseTableRowType = RowType<TableDef>;
   const tableName = tableDef.name;
   let whereClause: Expr<ColumnsFromRow<UseTableRowType>> | undefined;
   if (
diff --git a/crates/bindings-typescript/src/sdk/reducers.ts b/crates/bindings-typescript/src/sdk/reducers.ts
index 567c16df2f7..f341e73dd36 100644
--- a/crates/bindings-typescript/src/sdk/reducers.ts
+++ b/crates/bindings-typescript/src/sdk/reducers.ts
@@ -2,12 +2,12 @@ import type { ProductType } from "../lib/algebraic_type";
 import type { ParamsObj } from "../lib/reducers";
 import type { CoerceRow } from "../lib/table";
 import type { InferTypeOfRow } from "../lib/type_builders";
-import type { CamelCase, PrettifyDeep } from "../lib/type_util";
+import type { CamelCase } from "../lib/type_util";
 import type { CallReducerFlags } from "./db_connection_impl";
 
 export type ReducersView<R extends UntypedReducersDef> = {
   [I in keyof R['reducers'] as CamelCase<R['reducers'][number]['accessorName']>]:
-    (params: PrettifyDeep<InferTypeOfRow<R['reducers'][number]['params']>>) => void
+    (params: InferTypeOfRow<R['reducers'][number]['params']>) => void
 };
 
 export type ReducerEventInfo<Args extends object = object> = {
diff --git a/crates/bindings-typescript/test-app/server/src/lib.rs b/crates/bindings-typescript/test-app/server/src/lib.rs
index 4fbd2086d21..853c91632e1 100644
--- a/crates/bindings-typescript/test-app/server/src/lib.rs
+++ b/crates/bindings-typescript/test-app/server/src/lib.rs
@@ -3,7 +3,9 @@ use spacetimedb::{reducer, table, Identity, ReducerContext, SpacetimeType, Table
 #[table(name = player, public)]
 pub struct Player {
     #[primary_key]
-    owner_id: String,
+    #[auto_inc]
+    id: u32,
+    user_id: Identity,
     name: String,
     location: Point,
 }
@@ -23,15 +25,23 @@ pub struct User {
 
 #[table(name = unindexed_player, public)]
 pub struct UnindexedPlayer {
-    owner_id: String,
+    #[primary_key]
+    #[auto_inc]
+    id: u32,
+    owner_id: Identity,
     name: String,
     location: Point,
 }
 
 #[reducer]
 pub fn create_player(ctx: &ReducerContext, name: String, location: Point) {
+    ctx.db.user().insert(User {
+        identity: ctx.sender,
+        username: name.clone(),
+    });
     ctx.db.player().insert(Player {
-        owner_id: ctx.sender.to_hex().to_string(),
+        id: 0,
+        user_id: ctx.sender,
         name,
         location,
     });
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index fdb4fcdf554..d68312f00d9 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -1,13 +1,17 @@
-import { tables, reducers, DbConnection } from './module_bindings';
+import { tables, reducers } from './module_bindings';
 import { useEffect } from 'react';
 import './App.css';
 import { useReducer, useSpacetimeDB, useTable } from '../../src/react';
 
+function getRandomInt(max: number) {
+  return Math.floor(Math.random() * max);
+}
+
 function App() {
   const connection = useSpacetimeDB();
   const players = useTable(tables.player);
+  const x = players[0];
   const createPlayer = useReducer(reducers.createPlayer);
-  createPlayer({ name: 'Test', location: { x: 0, y: 0 } });
 
   useEffect(() => {
     setTimeout(() => {
@@ -21,15 +25,24 @@ function App() {
       <p>{connection.identity?.toHexString()}</p>
 
       <button
-        onClick={() =>
-          connection.getConnection<DbConnection>()?.reducers.createPlayer({
+        onClick={() => {
+          const player = {
             name: 'Hello',
-            location: { x: 10, y: 40 },
-          })
-        }
+            location: { x: getRandomInt(100), y: getRandomInt(100) },
+          };
+          console.log('Creating player:', player);
+          createPlayer(player);
+        }}
       >
         Update
       </button>
+      <div>
+        {Array.from(players).map((player, i) => (
+          <div key={i}>
+            {player.name} - ({player.location.x}, {player.location.y})
+          </div>
+        ))}
+      </div>
     </div>
   );
 }
diff --git a/crates/bindings-typescript/test-app/src/main.tsx b/crates/bindings-typescript/test-app/src/main.tsx
index fcb7271984b..028148b3eb7 100644
--- a/crates/bindings-typescript/test-app/src/main.tsx
+++ b/crates/bindings-typescript/test-app/src/main.tsx
@@ -12,8 +12,8 @@ const connectionBuilder = DbConnection.builder()
   .onDisconnect(() => {
     console.log('disconnected');
   })
-  .onConnectError(() => {
-    console.log('client_error');
+  .onConnectError((ctx, err) => {
+    console.log('client_error: ', err);
   })
   .onConnect((conn, identity, _token) => {
     console.log(
@@ -22,10 +22,7 @@ const connectionBuilder = DbConnection.builder()
     );
 
     conn.subscriptionBuilder().subscribe('SELECT * FROM player');
-  })
-  .withToken(
-    'eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiIwMUpCQTBYRzRESFpIWUdQQk5GRFk5RDQ2SiIsImlzcyI6Imh0dHBzOi8vYXV0aC5zdGFnaW5nLnNwYWNldGltZWRiLmNvbSIsImlhdCI6MTczMDgwODUwNSwiZXhwIjoxNzkzODgwNTA1fQ.kGM4HGX0c0twL8NJoSQowzSZa8dc2Ogc-fsvaDK7otUrcdGFsZ3KsNON2eNkFh73FER0hl55_eJStr2tgoPwfTyl_v_TqkY45iUOUlLmHfB-X42cMzpE7PXbR_PKYcp-P-Wa4jGtVl4oF7CvdGKxlhIYEk3e0ElQlA9ThnZN4IEciYV0vwAXGqbaO9SOG8jbrmlmfN7oKgl02EgpodEAHTrnB2mD1qf1YyOw7_9n_EkxJxWLkJf9-nFCVRrbfSLqSJBeE6OKNAu2VLLYrSFE7GkVXNCFVugoCDM2oVJogX75AgzWimrp75QRmLsXbvB-YvvRkQ8Gfb2RZnqCj9kiYg'
-  );
+  });
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
index 8acf176ea68..ee98682e78b 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_table.ts
@@ -12,7 +12,8 @@ import {
 import Point from './point_type';
 
 export default __t.row({
-  ownerId: __t.string(),
+  id: __t.u32(),
+  userId: __t.identity(),
   name: __t.string(),
   get location() {
     return Point;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
index 3a1d4492baa..596b73f7d06 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/player_type.ts
@@ -12,7 +12,8 @@ import {
 import Point from './point_type';
 
 export default __t.object('Player', {
-  ownerId: __t.string(),
+  id: __t.u32(),
+  userId: __t.identity(),
   name: __t.string(),
   get location() {
     return Point;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
index 8acf176ea68..96f056baeb7 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_table.ts
@@ -12,7 +12,8 @@ import {
 import Point from './point_type';
 
 export default __t.row({
-  ownerId: __t.string(),
+  id: __t.u32(),
+  ownerId: __t.identity(),
   name: __t.string(),
   get location() {
     return Point;
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
index f697863ed0c..5f717022485 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/unindexed_player_type.ts
@@ -12,7 +12,8 @@ import {
 import Point from './point_type';
 
 export default __t.object('UnindexedPlayer', {
-  ownerId: __t.string(),
+  id: __t.u32(),
+  ownerId: __t.identity(),
   name: __t.string(),
   get location() {
     return Point;

From 16814cb5555ef9c95ddff6e56d7c9b975de82d6d Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sat, 8 Nov 2025 21:23:32 -0500
Subject: [PATCH 17/23] Small adjustments

---
 crates/bindings-typescript/src/lib/connection_id.ts | 7 +++++++
 crates/bindings-typescript/src/lib/identity.ts      | 9 ++++++++-
 crates/bindings-typescript/test-app/src/App.tsx     | 9 +++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/connection_id.ts b/crates/bindings-typescript/src/lib/connection_id.ts
index 64da6361395..80a940115c4 100644
--- a/crates/bindings-typescript/src/lib/connection_id.ts
+++ b/crates/bindings-typescript/src/lib/connection_id.ts
@@ -63,6 +63,13 @@ export class ConnectionId {
     return this.__connection_id__ == other.__connection_id__;
   }
 
+  /**
+   * Check if two connection IDs are equal.
+   */
+  equals(other: ConnectionId): boolean {
+    return this.isEqual(other);
+  }
+
   /**
    * Print the connection ID as a hexadecimal string.
    */
diff --git a/crates/bindings-typescript/src/lib/identity.ts b/crates/bindings-typescript/src/lib/identity.ts
index 3b2b0e60ed8..68d890c4f39 100644
--- a/crates/bindings-typescript/src/lib/identity.ts
+++ b/crates/bindings-typescript/src/lib/identity.ts
@@ -36,12 +36,19 @@ export class Identity {
   }
 
   /**
-   * Compare two identities for equality.
+   * Check if two identities are equal. 
    */
   isEqual(other: Identity): boolean {
     return this.toHexString() === other.toHexString();
   }
 
+  /**
+   * Check if two identities are equal.
+   */
+  equals(other: Identity): boolean {
+    return this.isEqual(other);
+  }
+
   /**
    * Print the identity as a hexadecimal string.
    */
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index d68312f00d9..3ef576fb0e1 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -1,7 +1,7 @@
 import { tables, reducers } from './module_bindings';
 import { useEffect } from 'react';
 import './App.css';
-import { useReducer, useSpacetimeDB, useTable } from '../../src/react';
+import { eq, useReducer, useSpacetimeDB, useTable, where } from '../../src/react';
 
 function getRandomInt(max: number) {
   return Math.floor(Math.random() * max);
@@ -9,7 +9,12 @@ function getRandomInt(max: number) {
 
 function App() {
   const connection = useSpacetimeDB();
-  const players = useTable(tables.player);
+  const players = useTable(tables.player, where(eq('name', 'Hello')), {
+    onInsert: (row) => {
+      console.log('Player inserted:', rows);
+    },
+
+  });
   const x = players[0];
   const createPlayer = useReducer(reducers.createPlayer);
 

From 384f8b02b50eb5d5467004b6e1336a962c1aeb83 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 9 Nov 2025 01:04:52 -0500
Subject: [PATCH 18/23] pnpm format

---
 .../examples/quickstart-chat/src/App.tsx      |    2 +-
 .../src/module_bindings/user_table.ts         |    6 +-
 .../src/lib/algebraic_type.ts                 |   17 +-
 .../src/lib/algebraic_type_variants.ts        |    8 +-
 .../src/lib/constraints.ts                    |    2 +-
 .../bindings-typescript/src/lib/identity.ts   |    2 +-
 crates/bindings-typescript/src/lib/indexes.ts |    2 +-
 .../src/lib/reducer_schema.ts                 |   16 +-
 .../bindings-typescript/src/lib/reducers.ts   |   22 +-
 crates/bindings-typescript/src/lib/schema.ts  |   89 +-
 crates/bindings-typescript/src/lib/table.ts   |   62 +-
 .../src/lib/table_schema.ts                   |   10 +-
 .../src/lib/type_builders.ts                  | 1031 ++++++++++-------
 .../bindings-typescript/src/lib/type_util.ts  |   35 +-
 .../src/react/SpacetimeDBProvider.ts          |   20 +-
 .../src/react/connection_state.ts             |   10 +-
 .../src/react/useReducer.ts                   |   50 +-
 .../src/react/useSpacetimeDB.ts               |    6 +-
 .../bindings-typescript/src/react/useTable.ts |   77 +-
 .../src/sdk/client_cache.ts                   |   57 +-
 .../src/sdk/client_table.ts                   |  111 +-
 .../src/sdk/db_connection_builder.ts          |   30 +-
 .../src/sdk/db_connection_impl.ts             |  109 +-
 .../bindings-typescript/src/sdk/db_context.ts |   10 +-
 crates/bindings-typescript/src/sdk/db_view.ts |   11 +-
 .../src/sdk/event_context.ts                  |   18 +-
 crates/bindings-typescript/src/sdk/index.ts   |    2 +-
 .../src/sdk/message_types.ts                  |   23 +-
 .../src/sdk/reducer_handle.ts                 |    4 +-
 .../bindings-typescript/src/sdk/reducers.ts   |   25 +-
 .../src/sdk/set_reducer_flags.ts              |    7 +-
 .../src/sdk/spacetime_module.ts               |   22 +-
 .../src/sdk/subscription_builder_impl.ts      |   60 +-
 .../src/sdk/table_cache.ts                    |  100 +-
 .../src/sdk/websocket_test_adapter.ts         |    6 +-
 .../bindings-typescript/src/server/db_view.ts |    6 +-
 .../bindings-typescript/src/server/runtime.ts |   14 +-
 .../bindings-typescript/test-app/src/App.tsx  |   13 +-
 .../bindings-typescript/tests/serde.test.ts   |    9 +-
 39 files changed, 1307 insertions(+), 797 deletions(-)

diff --git a/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx b/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx
index 0fa172b20ab..a6cf1f2751c 100644
--- a/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx
+++ b/crates/bindings-typescript/examples/quickstart-chat/src/App.tsx
@@ -18,7 +18,7 @@ function App() {
   const [newMessage, setNewMessage] = useState('');
   const conn = useSpacetimeDB<DbConnection>();
 
-  conn.setReducerFlags()
+  conn.setReducerFlags();
   const { identity, isActive: connected } = conn;
 
   // Subscribe to all messages in the chat
diff --git a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts
index 9b35746a2ab..61c82b8de12 100644
--- a/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/examples/quickstart-chat/src/module_bindings/user_table.ts
@@ -46,9 +46,9 @@ declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
  * but to directly chain method calls,
  * like `ctx.db.user.on_insert(...)`.
  */
-export class UserTableHandle<TableName extends string>
-  extends ClientTable<TableName>
-{
+export class UserTableHandle<
+  TableName extends string,
+> extends ClientTable<TableName> {
   // phantom type to track the table name
   readonly tableName!: TableName;
   tableCache: __TableCache<User>;
diff --git a/crates/bindings-typescript/src/lib/algebraic_type.ts b/crates/bindings-typescript/src/lib/algebraic_type.ts
index 4bb42a475e9..2f8b4bdbba3 100644
--- a/crates/bindings-typescript/src/lib/algebraic_type.ts
+++ b/crates/bindings-typescript/src/lib/algebraic_type.ts
@@ -69,17 +69,24 @@ export type AlgebraicType = AlgebraicTypeType;
 /**
  * The variant types of the Algebraic Type tagged union.
  */
-export { AlgebraicTypeVariants }
+export { AlgebraicTypeVariants };
 
 // A value with helper functions to construct the type.
 export const AlgebraicType = {
   Ref: (value: number): AlgebraicTypeVariants.Ref => ({ tag: 'Ref', value }),
-  Sum: <T extends SumTypeType>(value: T): { tag: 'Sum'; value: T } => ({ tag: 'Sum', value }),
-  Product: <T extends ProductTypeType>(value: T): { tag: 'Product'; value: T } => ({
+  Sum: <T extends SumTypeType>(value: T): { tag: 'Sum'; value: T } => ({
+    tag: 'Sum',
+    value,
+  }),
+  Product: <T extends ProductTypeType>(
+    value: T
+  ): { tag: 'Product'; value: T } => ({
     tag: 'Product',
     value,
   }),
-  Array: <T extends AlgebraicTypeType>(value: T): { tag: 'Array'; value: T } => ({
+  Array: <T extends AlgebraicTypeType>(
+    value: T
+  ): { tag: 'Array'; value: T } => ({
     tag: 'Array',
     value,
   }),
@@ -280,7 +287,7 @@ export const AlgebraicType = {
       }
     }
   },
-}
+};
 
 /**
  * A structural product type  of the factors given by `elements`.
diff --git a/crates/bindings-typescript/src/lib/algebraic_type_variants.ts b/crates/bindings-typescript/src/lib/algebraic_type_variants.ts
index 0a911a40438..5890d53c148 100644
--- a/crates/bindings-typescript/src/lib/algebraic_type_variants.ts
+++ b/crates/bindings-typescript/src/lib/algebraic_type_variants.ts
@@ -1,4 +1,8 @@
-import type { AlgebraicTypeType, ProductTypeType, SumTypeType } from "./algebraic_type";
+import type {
+  AlgebraicTypeType,
+  ProductTypeType,
+  SumTypeType,
+} from './algebraic_type';
 
 export type Ref = { tag: 'Ref'; value: number };
 export type Sum = { tag: 'Sum'; value: SumTypeType };
@@ -19,4 +23,4 @@ export type U128 = { tag: 'U128' };
 export type I256 = { tag: 'I256' };
 export type U256 = { tag: 'U256' };
 export type F32 = { tag: 'F32' };
-export type F64 = { tag: 'F64' };
\ No newline at end of file
+export type F64 = { tag: 'F64' };
diff --git a/crates/bindings-typescript/src/lib/constraints.ts b/crates/bindings-typescript/src/lib/constraints.ts
index 4b206a8c858..c3ee5a87c6f 100644
--- a/crates/bindings-typescript/src/lib/constraints.ts
+++ b/crates/bindings-typescript/src/lib/constraints.ts
@@ -47,4 +47,4 @@ export type ConstraintOpts<AllowedCol extends string> = {
 } & (
   | { constraint: 'unique'; columns: [AllowedCol] }
   | { constraint: 'primaryKey'; columns: [AllowedCol] }
-);
\ No newline at end of file
+);
diff --git a/crates/bindings-typescript/src/lib/identity.ts b/crates/bindings-typescript/src/lib/identity.ts
index 68d890c4f39..3ec9081c835 100644
--- a/crates/bindings-typescript/src/lib/identity.ts
+++ b/crates/bindings-typescript/src/lib/identity.ts
@@ -36,7 +36,7 @@ export class Identity {
   }
 
   /**
-   * Check if two identities are equal. 
+   * Check if two identities are equal.
    */
   isEqual(other: Identity): boolean {
     return this.toHexString() === other.toHexString();
diff --git a/crates/bindings-typescript/src/lib/indexes.ts b/crates/bindings-typescript/src/lib/indexes.ts
index 5c93c9aac9b..04e3215e466 100644
--- a/crates/bindings-typescript/src/lib/indexes.ts
+++ b/crates/bindings-typescript/src/lib/indexes.ts
@@ -100,7 +100,7 @@ export type UniqueIndex<
 };
 
 /**
- * A type representing a read-only ranged index on a database table. 
+ * A type representing a read-only ranged index on a database table.
  */
 export type ReadonlyRangedIndex<
   TableDef extends UntypedTableDef,
diff --git a/crates/bindings-typescript/src/lib/reducer_schema.ts b/crates/bindings-typescript/src/lib/reducer_schema.ts
index d8fd614de91..c68a350f2d8 100644
--- a/crates/bindings-typescript/src/lib/reducer_schema.ts
+++ b/crates/bindings-typescript/src/lib/reducer_schema.ts
@@ -1,8 +1,8 @@
-import type { ProductType } from "./algebraic_type";
-import type RawReducerDefV9 from "./autogen/raw_reducer_def_v_9_type";
-import type { ParamsObj } from "./reducers";
-import type { Infer, RowBuilder, RowObj } from "./type_builders";
-import type { CamelCase } from "./type_util";
+import type { ProductType } from './algebraic_type';
+import type RawReducerDefV9 from './autogen/raw_reducer_def_v_9_type';
+import type { ParamsObj } from './reducers';
+import type { Infer, RowBuilder, RowObj } from './type_builders';
+import type { CamelCase } from './type_util';
 
 /**
  * Represents a handle to a database reducer, including its name and argument type.
@@ -15,7 +15,7 @@ export type ReducerSchema<
    * The name of the reducer.
    */
   readonly reducerName: ReducerName;
-  
+
   /**
    * The accessor name for the reducer.
    */
@@ -25,7 +25,7 @@ export type ReducerSchema<
    * The TypeBuilder representation of the reducer's parameter type.
    */
   readonly params: RowBuilder<Params>;
-  
+
   /**
    * The {@link ProductType} representing the structure of the reducer's parameters.
    */
@@ -35,4 +35,4 @@ export type ReducerSchema<
    * The {@link RawReducerDefV9} of the configured reducer.
    */
   readonly reducerDef: Infer<typeof RawReducerDefV9>;
-};
\ No newline at end of file
+};
diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index 14f7a9caffa..da7191d8f76 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -288,9 +288,9 @@ type ReducersToSchema<T extends readonly ReducerSchema<any, any>[]> = {
 };
 
 export function reducersToSchema<
-  const T extends readonly ReducerSchema<any, any>[]
+  const T extends readonly ReducerSchema<any, any>[],
 >(reducers: T): ReducersToSchema<T> {
-  const mapped = reducers.map((r) => {
+  const mapped = reducers.map(r => {
     const paramsRow = r.params.row;
 
     return {
@@ -308,7 +308,7 @@ export function reducersToSchema<
       paramsType: T[I]['paramsSpacetimeType'];
     };
   };
-  
+
   const result = { reducers: mapped } satisfies ReducersToSchema<T>;
   return result;
 }
@@ -339,21 +339,18 @@ export function reducers<const H extends readonly ReducerSchema<any, any>[]>(
 ): Reducers<ReducersToSchema<H>>;
 
 export function reducers<const H extends readonly ReducerSchema<any, any>[]>(
-  ...args:
-    | [H]
-    | H
+  ...args: [H] | H
 ): Reducers<ReducersToSchema<H>> {
-  const handles = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as H;
+  const handles = (
+    args.length === 1 && Array.isArray(args[0]) ? args[0] : args
+  ) as H;
   return new Reducers(handles);
 }
 
 export function reducerSchema<
   ReducerName extends string,
   Params extends ParamsObj,
->(
-  name: ReducerName,
-  params: Params 
-): ReducerSchema<ReducerName, Params> {
+>(name: ReducerName, params: Params): ReducerSchema<ReducerName, Params> {
   const paramType: ProductType = {
     elements: Object.entries(params).map(([n, c]) => ({
       name: n,
@@ -371,5 +368,4 @@ export function reducerSchema<
       lifecycle: undefined,
     },
   };
-} 
-
+}
diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
index a06293e8f49..5c764537d88 100644
--- a/crates/bindings-typescript/src/lib/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -34,7 +34,8 @@ import type { CamelCase } from './type_util';
 import type { TableSchema } from './table_schema';
 import { toCamelCase } from './utils';
 
-export type TableNamesOf<S extends UntypedSchemaDef> = S['tables'][number]['name'];
+export type TableNamesOf<S extends UntypedSchemaDef> =
+  S['tables'][number]['name'];
 
 /**
  * An untyped representation of the database schema.
@@ -60,10 +61,10 @@ type TablesToSchema<T extends readonly TableSchema<any, any, any>[]> = {
 };
 
 export function tablesToSchema<
-  const T extends readonly TableSchema<any, any, readonly any[]>[]
+  const T extends readonly TableSchema<any, any, readonly any[]>[],
 >(tables: T): TablesToSchema<T> {
   const result = {
-    tables: tables.map((schema) => {
+    tables: tables.map(schema => {
       return {
         name: schema.tableName,
         accessorName: toCamelCase(schema.tableName),
@@ -73,15 +74,15 @@ export function tablesToSchema<
         indexes: [...schema.idxs],
       } as const;
     }) as {
-        // preserve tuple indices so the return type matches `[i in keyof T]`
-        readonly [I in keyof T]: {
-          name: T[I]['tableName'];
-          accessorName: CamelCase<T[I]['tableName']>;
-          columns: T[I]['rowType']['row'];
-          rowType: T[I]['rowSpacetimeType'];
-          indexes: T[I]['idxs'];
-        };
-      },
+      // preserve tuple indices so the return type matches `[i in keyof T]`
+      readonly [I in keyof T]: {
+        name: T[I]['tableName'];
+        accessorName: CamelCase<T[I]['tableName']>;
+        columns: T[I]['rowType']['row'];
+        rowType: T[I]['rowSpacetimeType'];
+        indexes: T[I]['idxs'];
+      };
+    },
   } satisfies TablesToSchema<T>;
   return result;
 }
@@ -123,12 +124,15 @@ export function resolveType<AT extends AlgebraicTypeType>(
 /**
  * Adds a type to the module definition's typespace as a `Ref` if it is a named compound type (Product or Sum).
  * Otherwise, returns the type as is.
- * @param name 
- * @param ty 
- * @returns 
+ * @param name
+ * @param ty
+ * @returns
  */
 export function registerTypesRecursively(
-  typeBuilder: SumBuilder<VariantsObj> | ProductBuilder<ElementsObj> | RowBuilder<RowObj>
+  typeBuilder:
+    | SumBuilder<VariantsObj>
+    | ProductBuilder<ElementsObj>
+    | RowBuilder<RowObj>
 ): RefBuilder {
   const ty = typeBuilder.algebraicType;
   const name = typeBuilder.typeName;
@@ -142,21 +146,42 @@ export function registerTypesRecursively(
   // Recursively register nested compound types
   if (typeBuilder instanceof RowBuilder) {
     for (const [name, elem] of Object.entries(typeBuilder.row)) {
-      if (!(elem instanceof ProductBuilder || elem instanceof SumBuilder || elem instanceof RowBuilder)) {
+      if (
+        !(
+          elem instanceof ProductBuilder ||
+          elem instanceof SumBuilder ||
+          elem instanceof RowBuilder
+        )
+      ) {
         continue;
       }
-      typeBuilder.row[name] = new ColumnBuilder(registerTypesRecursively(elem), {});
+      typeBuilder.row[name] = new ColumnBuilder(
+        registerTypesRecursively(elem),
+        {}
+      );
     }
   } else if (typeBuilder instanceof ProductBuilder) {
     for (const [name, elem] of Object.entries(typeBuilder.elements)) {
-      if (!(elem instanceof ProductBuilder || elem instanceof SumBuilder || elem instanceof RowBuilder)) {
+      if (
+        !(
+          elem instanceof ProductBuilder ||
+          elem instanceof SumBuilder ||
+          elem instanceof RowBuilder
+        )
+      ) {
         continue;
       }
       typeBuilder.elements[name] = registerTypesRecursively(elem);
     }
   } else if (typeBuilder instanceof SumBuilder) {
     for (const [name, variant] of Object.entries(typeBuilder.variants)) {
-      if (!(variant instanceof ProductBuilder || variant instanceof SumBuilder || variant instanceof RowBuilder)) {
+      if (
+        !(
+          variant instanceof ProductBuilder ||
+          variant instanceof SumBuilder ||
+          variant instanceof RowBuilder
+        )
+      ) {
         continue;
       }
       typeBuilder.variants[name] = registerTypesRecursively(variant);
@@ -221,7 +246,11 @@ class Schema<S extends UntypedSchemaDef> {
   readonly typespace: Infer<typeof Typespace>;
   readonly schemaType: S;
 
-  constructor(tables: Infer<typeof RawTableDefV9>[], typespace: Infer<typeof Typespace>, handles: readonly TableSchema<any, any, any>[]) {
+  constructor(
+    tables: Infer<typeof RawTableDefV9>[],
+    typespace: Infer<typeof Typespace>,
+    handles: readonly TableSchema<any, any, any>[]
+  ) {
     this.tablesDef = { tables };
     this.typespace = typespace;
     // TODO: TableSchema and TableDef should really be unified
@@ -428,11 +457,11 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
  * ```
  */
 export function schema<const H extends readonly TableSchema<any, any, any>[]>(
-  ...args:
-    | [H]
-    | H
+  ...args: [H] | H
 ): Schema<TablesToSchema<H>> {
-  const handles = (args.length === 1 && Array.isArray(args[0]) ? args[0] : args) as H;
+  const handles = (
+    args.length === 1 && Array.isArray(args[0]) ? args[0] : args
+  ) as H;
   const tableDefs = handles.map(h => h.tableDef);
 
   // Side-effect:
@@ -455,9 +484,13 @@ export function schema<const H extends readonly TableSchema<any, any, any>[]>(
 type HasAccessor = { accessorName: PropertyKey };
 
 export type ConvertToAccessorMap<TableDefs extends readonly HasAccessor[]> = {
-  [Tbl in TableDefs[number] as Tbl["accessorName"]]: Tbl
+  [Tbl in TableDefs[number] as Tbl['accessorName']]: Tbl;
 };
 
-export function convertToAccessorMap<T extends readonly HasAccessor[]>(arr: T): ConvertToAccessorMap<T> {
-  return Object.fromEntries(arr.map(v => [v.accessorName, v])) as ConvertToAccessorMap<T>;
+export function convertToAccessorMap<T extends readonly HasAccessor[]>(
+  arr: T
+): ConvertToAccessorMap<T> {
+  return Object.fromEntries(
+    arr.map(v => [v.accessorName, v])
+  ) as ConvertToAccessorMap<T>;
 }
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index a57f8fbebb5..6d27e10a799 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -5,8 +5,19 @@ import type RawIndexDefV9 from './autogen/raw_index_def_v_9_type';
 import type RawSequenceDefV9 from './autogen/raw_sequence_def_v_9_type';
 import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
 import type { AllUnique, ConstraintOpts } from './constraints';
-import type { ColumnIndex, IndexColumns, Indexes, IndexOpts, ReadonlyIndexes } from './indexes';
-import { registerTypesRecursively, MODULE_DEF, resolveType, splitName } from './schema';
+import type {
+  ColumnIndex,
+  IndexColumns,
+  Indexes,
+  IndexOpts,
+  ReadonlyIndexes,
+} from './indexes';
+import {
+  registerTypesRecursively,
+  MODULE_DEF,
+  resolveType,
+  splitName,
+} from './schema';
 import type { TableSchema } from './table_schema';
 import {
   RowBuilder,
@@ -17,7 +28,7 @@ import {
   type RowObj,
   type TypeBuilder,
 } from './type_builders';
-import type { Prettify, } from './type_util';
+import type { Prettify } from './type_util';
 
 export type AlgebraicTypeRef = number;
 type ColId = number;
@@ -26,9 +37,9 @@ type ColList = ColId[];
 /**
  * A helper type to extract the row type from a TableDef
  */
-export type RowType<TableDef extends UntypedTableDef> = Prettify<InferTypeOfRow<
+export type RowType<TableDef extends UntypedTableDef> = InferTypeOfRow<
   TableDef['columns']
->>;
+>;
 
 /**
  * Coerces a column which may be a TypeBuilder or ColumnBuilder into a ColumnBuilder
@@ -36,7 +47,9 @@ export type RowType<TableDef extends UntypedTableDef> = Prettify<InferTypeOfRow<
 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;
+  Col extends TypeBuilder<infer T, infer U>
+    ? ColumnBuilder<T, U, ColumnMetadata<any>>
+    : Col;
 
 /**
  * Coerces a RowObj where TypeBuilders are replaced with ColumnBuilders
@@ -136,19 +149,20 @@ export type ReadonlyTableMethods<TableDef extends UntypedTableDef> = {
 /**
  * A type representing the methods available on a table.
  */
-export type TableMethods<TableDef extends UntypedTableDef> = ReadonlyTableMethods<TableDef> & {
-  /**
-   * Insert and return the inserted row (auto-increment fields filled).
-   *
-   * May throw on error:
-   * * If there are any unique or primary key columns in this table, may throw {@link UniqueAlreadyExists}.
-   * * If there are any auto-incrementing columns in this table, may throw {@link AutoIncOverflow}.
-   * */
-  insert(row: RowType<TableDef>): RowType<TableDef>;
-
-  /** Delete a row equal to `row`. Returns true if something was deleted. */
-  delete(row: RowType<TableDef>): boolean;
-};
+export type TableMethods<TableDef extends UntypedTableDef> =
+  ReadonlyTableMethods<TableDef> & {
+    /**
+     * Insert and return the inserted row (auto-increment fields filled).
+     *
+     * May throw on error:
+     * * If there are any unique or primary key columns in this table, may throw {@link UniqueAlreadyExists}.
+     * * If there are any auto-incrementing columns in this table, may throw {@link AutoIncOverflow}.
+     * */
+    insert(row: RowType<TableDef>): RowType<TableDef>;
+
+    /** Delete a row equal to `row`. Returns true if something was deleted. */
+    delete(row: RowType<TableDef>): boolean;
+  };
 
 /**
  * Defines a database table with schema and options
@@ -279,7 +293,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
       };
       constraints.push({ name: constraintOpts.name, data });
       continue;
-    } 
+    }
     if (constraintOpts.constraint === 'primaryKey') {
       pk.push(...constraintOpts.columns.map(c => colIds.get(c)!));
     }
@@ -325,9 +339,11 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
   }
 
   const productType = {
-    elements: resolveType(MODULE_DEF.typespace, row).value.elements.map(elem => {
-      return { name: elem.name, algebraicType: elem.algebraicType };
-    }),
+    elements: resolveType(MODULE_DEF.typespace, row).value.elements.map(
+      elem => {
+        return { name: elem.name, algebraicType: elem.algebraicType };
+      }
+    ),
   };
 
   return {
diff --git a/crates/bindings-typescript/src/lib/table_schema.ts b/crates/bindings-typescript/src/lib/table_schema.ts
index c160989e4a3..540af16673a 100644
--- a/crates/bindings-typescript/src/lib/table_schema.ts
+++ b/crates/bindings-typescript/src/lib/table_schema.ts
@@ -1,7 +1,7 @@
-import type { ProductType } from "./algebraic_type";
-import type RawTableDefV9 from "./autogen/raw_table_def_v_9_type";
-import type { IndexOpts } from "./indexes";
-import type { ColumnBuilder, Infer, RowBuilder } from "./type_builders";
+import type { ProductType } from './algebraic_type';
+import type RawTableDefV9 from './autogen/raw_table_def_v_9_type';
+import type { IndexOpts } from './indexes';
+import type { ColumnBuilder, Infer, RowBuilder } from './type_builders';
 
 /**
  * Represents a handle to a database table, including its name, row type, and row spacetime type.
@@ -35,4 +35,4 @@ export type TableSchema<
    * The indexes defined on the table.
    */
   readonly idxs: Idx;
-};
\ No newline at end of file
+};
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index b616e5d27ab..567bae3975f 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -117,9 +117,9 @@ type IsUnit<B> = B extends UnitBuilder ? true : false;
  * e.g. { A: I32TypeBuilder, B: StringBuilder } -> { tag: "A", value: number } | { tag: "B", value: string }
  */
 type EnumType<Variants extends VariantsObj> = {
-  [K in keyof Variants & string]:
-  (IsUnit<Variants[K]> extends true ? { tag: K }
-    : { tag: K; value: InferTypeOfTypeBuilder<Variants[K]> })
+  [K in keyof Variants & string]: IsUnit<Variants[K]> extends true
+    ? { tag: K }
+    : { tag: K; value: InferTypeOfTypeBuilder<Variants[K]> };
 }[keyof Variants & string];
 
 /**
@@ -135,7 +135,8 @@ type VariantsArrayFromVariantsObj<Obj extends VariantsObj> = {
  * and the corresponding `AlgebraicType`.
  */
 export class TypeBuilder<Type, SpacetimeType extends AlgebraicType>
-  implements Optional<Type, SpacetimeType> {
+  implements Optional<Type, SpacetimeType>
+{
   /**
    * The TypeScript phantom type. This is not stored at runtime,
    * but is visible to the compiler
@@ -247,7 +248,11 @@ interface Indexable<
    * Specify the index type for this column
    * @param algorithm The index algorithm to use
    */
-  index(): ColumnBuilder<Type, SpacetimeType, SetField<M, 'indexType', 'btree'>>;
+  index(): ColumnBuilder<
+    Type,
+    SpacetimeType,
+    SetField<M, 'indexType', 'btree'>
+  >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
   ): ColumnBuilder<Type, SpacetimeType, SetField<M, 'indexType', N>>;
@@ -341,11 +346,12 @@ interface Defaultable<
 export class U8Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.U8>
   implements
-  Indexable<number, AlgebraicTypeVariants.U8>,
-  Uniqueable<number, AlgebraicTypeVariants.U8>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
-  AutoIncrementable<number, AlgebraicTypeVariants.U8>,
-  Defaultable<number, AlgebraicTypeVariants.U8> {
+    Indexable<number, AlgebraicTypeVariants.U8>,
+    Uniqueable<number, AlgebraicTypeVariants.U8>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
+    AutoIncrementable<number, AlgebraicTypeVariants.U8>,
+    Defaultable<number, AlgebraicTypeVariants.U8>
+{
   constructor() {
     super(AlgebraicType.U8);
   }
@@ -364,13 +370,17 @@ export class U8Builder
   unique(): U8ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U8ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U8ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U8ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new U8ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U8ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U8ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new U8ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -389,11 +399,12 @@ export class U8Builder
 export class U16Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.U16>
   implements
-  Indexable<number, AlgebraicTypeVariants.U16>,
-  Uniqueable<number, AlgebraicTypeVariants.U16>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
-  AutoIncrementable<number, AlgebraicTypeVariants.U16>,
-  Defaultable<number, AlgebraicTypeVariants.U16> {
+    Indexable<number, AlgebraicTypeVariants.U16>,
+    Uniqueable<number, AlgebraicTypeVariants.U16>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
+    AutoIncrementable<number, AlgebraicTypeVariants.U16>,
+    Defaultable<number, AlgebraicTypeVariants.U16>
+{
   constructor() {
     super(AlgebraicType.U16);
   }
@@ -412,13 +423,17 @@ export class U16Builder
   unique(): U16ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U16ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U16ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U16ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new U16ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U16ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U16ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new U16ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -437,11 +452,12 @@ export class U16Builder
 export class U32Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.U32>
   implements
-  Indexable<number, AlgebraicTypeVariants.U32>,
-  Uniqueable<number, AlgebraicTypeVariants.U32>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
-  AutoIncrementable<number, AlgebraicTypeVariants.U32>,
-  Defaultable<number, AlgebraicTypeVariants.U32> {
+    Indexable<number, AlgebraicTypeVariants.U32>,
+    Uniqueable<number, AlgebraicTypeVariants.U32>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
+    AutoIncrementable<number, AlgebraicTypeVariants.U32>,
+    Defaultable<number, AlgebraicTypeVariants.U32>
+{
   constructor() {
     super(AlgebraicType.U32);
   }
@@ -460,13 +476,17 @@ export class U32Builder
   unique(): U32ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U32ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U32ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U32ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new U32ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U32ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U32ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new U32ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -485,11 +505,12 @@ export class U32Builder
 export class U64Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.U64>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.U64>,
-  Uniqueable<bigint, AlgebraicTypeVariants.U64>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
-  Defaultable<bigint, AlgebraicTypeVariants.U64> {
+    Indexable<bigint, AlgebraicTypeVariants.U64>,
+    Uniqueable<bigint, AlgebraicTypeVariants.U64>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
+    Defaultable<bigint, AlgebraicTypeVariants.U64>
+{
   constructor() {
     super(AlgebraicType.U64);
   }
@@ -508,13 +529,17 @@ export class U64Builder
   unique(): U64ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new U64ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): U64ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U64ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new U64ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U64ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U64ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new U64ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -533,11 +558,12 @@ export class U64Builder
 export class U128Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.U128>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.U128>,
-  Uniqueable<bigint, AlgebraicTypeVariants.U128>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
-  Defaultable<bigint, AlgebraicTypeVariants.U128> {
+    Indexable<bigint, AlgebraicTypeVariants.U128>,
+    Uniqueable<bigint, AlgebraicTypeVariants.U128>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
+    Defaultable<bigint, AlgebraicTypeVariants.U128>
+{
   constructor() {
     super(AlgebraicType.U128);
   }
@@ -559,13 +585,17 @@ export class U128Builder
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U128ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U128ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U128ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U128ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new U128ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -584,11 +614,12 @@ export class U128Builder
 export class U256Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.U256>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.U256>,
-  Uniqueable<bigint, AlgebraicTypeVariants.U256>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
-  Defaultable<bigint, AlgebraicTypeVariants.U256> {
+    Indexable<bigint, AlgebraicTypeVariants.U256>,
+    Uniqueable<bigint, AlgebraicTypeVariants.U256>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
+    Defaultable<bigint, AlgebraicTypeVariants.U256>
+{
   constructor() {
     super(AlgebraicType.U256);
   }
@@ -610,13 +641,17 @@ export class U256Builder
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): U256ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): U256ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): U256ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): U256ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new U256ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -635,11 +670,12 @@ export class U256Builder
 export class I8Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.I8>
   implements
-  Indexable<number, AlgebraicTypeVariants.I8>,
-  Uniqueable<number, AlgebraicTypeVariants.I8>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
-  AutoIncrementable<number, AlgebraicTypeVariants.I8>,
-  Defaultable<number, AlgebraicTypeVariants.I8> {
+    Indexable<number, AlgebraicTypeVariants.I8>,
+    Uniqueable<number, AlgebraicTypeVariants.I8>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
+    AutoIncrementable<number, AlgebraicTypeVariants.I8>,
+    Defaultable<number, AlgebraicTypeVariants.I8>
+{
   constructor() {
     super(AlgebraicType.I8);
   }
@@ -658,13 +694,17 @@ export class I8Builder
   unique(): I8ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I8ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I8ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I8ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new I8ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I8ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I8ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new I8ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -683,11 +723,12 @@ export class I8Builder
 export class I16Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.I16>
   implements
-  Indexable<number, AlgebraicTypeVariants.I16>,
-  Uniqueable<number, AlgebraicTypeVariants.I16>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
-  AutoIncrementable<number, AlgebraicTypeVariants.I16>,
-  Defaultable<number, AlgebraicTypeVariants.I16> {
+    Indexable<number, AlgebraicTypeVariants.I16>,
+    Uniqueable<number, AlgebraicTypeVariants.I16>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
+    AutoIncrementable<number, AlgebraicTypeVariants.I16>,
+    Defaultable<number, AlgebraicTypeVariants.I16>
+{
   constructor() {
     super(AlgebraicType.I16);
   }
@@ -706,13 +747,17 @@ export class I16Builder
   unique(): I16ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I16ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I16ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I16ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new I16ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I16ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I16ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new I16ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -731,12 +776,13 @@ export class I16Builder
 export class I32Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.I32>
   implements
-  TypeBuilder<number, AlgebraicTypeVariants.I32>,
-  Indexable<number, AlgebraicTypeVariants.I32>,
-  Uniqueable<number, AlgebraicTypeVariants.I32>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
-  AutoIncrementable<number, AlgebraicTypeVariants.I32>,
-  Defaultable<number, AlgebraicTypeVariants.I32> {
+    TypeBuilder<number, AlgebraicTypeVariants.I32>,
+    Indexable<number, AlgebraicTypeVariants.I32>,
+    Uniqueable<number, AlgebraicTypeVariants.I32>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
+    AutoIncrementable<number, AlgebraicTypeVariants.I32>,
+    Defaultable<number, AlgebraicTypeVariants.I32>
+{
   constructor() {
     super(AlgebraicType.I32);
   }
@@ -755,13 +801,17 @@ export class I32Builder
   unique(): I32ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I32ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I32ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I32ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new I32ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I32ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I32ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new I32ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -780,11 +830,12 @@ export class I32Builder
 export class I64Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.I64>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.I64>,
-  Uniqueable<bigint, AlgebraicTypeVariants.I64>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
-  Defaultable<bigint, AlgebraicTypeVariants.I64> {
+    Indexable<bigint, AlgebraicTypeVariants.I64>,
+    Uniqueable<bigint, AlgebraicTypeVariants.I64>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
+    Defaultable<bigint, AlgebraicTypeVariants.I64>
+{
   constructor() {
     super(AlgebraicType.I64);
   }
@@ -803,13 +854,17 @@ export class I64Builder
   unique(): I64ColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
     return new I64ColumnBuilder(this, set(defaultMetadata, { isUnique: true }));
   }
-  primaryKey(): I64ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I64ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new I64ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I64ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I64ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new I64ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -828,11 +883,12 @@ export class I64Builder
 export class I128Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.I128>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.I128>,
-  Uniqueable<bigint, AlgebraicTypeVariants.I128>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
-  Defaultable<bigint, AlgebraicTypeVariants.I128> {
+    Indexable<bigint, AlgebraicTypeVariants.I128>,
+    Uniqueable<bigint, AlgebraicTypeVariants.I128>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
+    Defaultable<bigint, AlgebraicTypeVariants.I128>
+{
   constructor() {
     super(AlgebraicType.I128);
   }
@@ -854,13 +910,17 @@ export class I128Builder
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I128ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I128ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I128ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I128ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new I128ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -879,11 +939,12 @@ export class I128Builder
 export class I256Builder
   extends TypeBuilder<bigint, AlgebraicTypeVariants.I256>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.I256>,
-  Uniqueable<bigint, AlgebraicTypeVariants.I256>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
-  Defaultable<bigint, AlgebraicTypeVariants.I256> {
+    Indexable<bigint, AlgebraicTypeVariants.I256>,
+    Uniqueable<bigint, AlgebraicTypeVariants.I256>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
+    Defaultable<bigint, AlgebraicTypeVariants.I256>
+{
   constructor() {
     super(AlgebraicType.I256);
   }
@@ -905,13 +966,17 @@ export class I256Builder
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): I256ColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): I256ColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
     );
   }
-  autoInc(): I256ColumnBuilder<SetField<DefaultMetadata, 'isAutoIncrement', true>> {
+  autoInc(): I256ColumnBuilder<
+    SetField<DefaultMetadata, 'isAutoIncrement', true>
+  > {
     return new I256ColumnBuilder(
       this,
       set(defaultMetadata, { isAutoIncrement: true })
@@ -929,7 +994,8 @@ export class I256Builder
 
 export class F32Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.F32>
-  implements Defaultable<number, AlgebraicTypeVariants.F32> {
+  implements Defaultable<number, AlgebraicTypeVariants.F32>
+{
   constructor() {
     super(AlgebraicType.F32);
   }
@@ -945,7 +1011,8 @@ export class F32Builder
 
 export class F64Builder
   extends TypeBuilder<number, AlgebraicTypeVariants.F64>
-  implements Defaultable<number, AlgebraicTypeVariants.F64> {
+  implements Defaultable<number, AlgebraicTypeVariants.F64>
+{
   constructor() {
     super(AlgebraicType.F64);
   }
@@ -962,10 +1029,11 @@ export class F64Builder
 export class BoolBuilder
   extends TypeBuilder<boolean, AlgebraicTypeVariants.Bool>
   implements
-  Indexable<boolean, AlgebraicTypeVariants.Bool>,
-  Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
-  PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
-  Defaultable<boolean, AlgebraicTypeVariants.Bool> {
+    Indexable<boolean, AlgebraicTypeVariants.Bool>,
+    Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
+    PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
+    Defaultable<boolean, AlgebraicTypeVariants.Bool>
+{
   constructor() {
     super(AlgebraicType.Bool);
   }
@@ -987,7 +1055,9 @@ export class BoolBuilder
       set(defaultMetadata, { isUnique: true })
     );
   }
-  primaryKey(): BoolColumnBuilder<SetField<DefaultMetadata, 'isPrimaryKey', true>> {
+  primaryKey(): BoolColumnBuilder<
+    SetField<DefaultMetadata, 'isPrimaryKey', true>
+  > {
     return new BoolColumnBuilder(
       this,
       set(defaultMetadata, { isPrimaryKey: true })
@@ -1006,10 +1076,11 @@ export class BoolBuilder
 export class StringBuilder
   extends TypeBuilder<string, AlgebraicTypeVariants.String>
   implements
-  Indexable<string, AlgebraicTypeVariants.String>,
-  Uniqueable<string, AlgebraicTypeVariants.String>,
-  PrimaryKeyable<string, AlgebraicTypeVariants.String>,
-  Defaultable<string, AlgebraicTypeVariants.String> {
+    Indexable<string, AlgebraicTypeVariants.String>,
+    Uniqueable<string, AlgebraicTypeVariants.String>,
+    PrimaryKeyable<string, AlgebraicTypeVariants.String>,
+    Defaultable<string, AlgebraicTypeVariants.String>
+{
   constructor() {
     super(AlgebraicType.String);
   }
@@ -1054,7 +1125,8 @@ export class ArrayBuilder<Element extends TypeBuilder<any, any>>
     Array<InferTypeOfTypeBuilder<Element>>,
     { tag: 'Array'; value: InferSpacetimeTypeOfTypeBuilder<Element> }
   >
-  implements Defaultable<Array<InferTypeOfTypeBuilder<Element>>, any> {
+  implements Defaultable<Array<InferTypeOfTypeBuilder<Element>>, any>
+{
   /**
    * The phantom element type of the array for TypeScript
    */
@@ -1065,7 +1137,10 @@ export class ArrayBuilder<Element extends TypeBuilder<any, any>>
   }
   default(
     value: Array<InferTypeOfTypeBuilder<Element>>
-  ): ArrayColumnBuilder<Element, SetField<DefaultMetadata, 'defaultValue', any>> {
+  ): ArrayColumnBuilder<
+    Element,
+    SetField<DefaultMetadata, 'defaultValue', any>
+  > {
     return new ArrayColumnBuilder(
       this.element,
       set(defaultMetadata, { defaultValue: value })
@@ -1078,13 +1153,13 @@ export class ByteArrayBuilder
     Uint8Array,
     { tag: 'Array'; value: AlgebraicTypeVariants.U8 }
   >
-  implements Defaultable<Uint8Array, any> {
-
+  implements Defaultable<Uint8Array, any>
+{
   constructor() {
     super(AlgebraicType.Array(AlgebraicType.U8));
   }
   default(
-    value: Uint8Array 
+    value: Uint8Array
   ): ByteArrayColumnBuilder<SetField<DefaultMetadata, 'defaultValue', any>> {
     return new ByteArrayColumnBuilder(
       set(defaultMetadata, { defaultValue: value })
@@ -1098,7 +1173,8 @@ export class OptionBuilder<Value extends TypeBuilder<any, any>>
     OptionAlgebraicType
   >
   implements
-  Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType> {
+    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType>
+{
   /**
    * The phantom value type of the option for TypeScript
    */
@@ -1138,7 +1214,8 @@ export class ProductBuilder<Elements extends ElementsObj>
       value: { elements: ElementsArrayFromElementsObj<Elements> };
     }
   >
-  implements Defaultable<ObjectType<Elements>, any> {
+  implements Defaultable<ObjectType<Elements>, any>
+{
   readonly typeName: string | undefined;
   readonly elements: Elements;
   constructor(elements: Elements, name?: string) {
@@ -1158,7 +1235,10 @@ export class ProductBuilder<Elements extends ElementsObj>
   }
   default(
     value: ObjectType<Elements>
-  ): ProductColumnBuilder<Elements, SetField<DefaultMetadata, 'defaultValue', any>> {
+  ): ProductColumnBuilder<
+    Elements,
+    SetField<DefaultMetadata, 'defaultValue', any>
+  > {
     return new ProductColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1199,8 +1279,8 @@ export class RowBuilder<Row extends RowObj> extends TypeBuilder<
 // Value type produced for a given variant key + builder
 type EnumValue<K extends string, B extends TypeBuilder<any, any>> =
   IsUnit<B> extends true
-  ? { tag: K }
-  : { tag: K; value: InferTypeOfTypeBuilder<B> };
+    ? { tag: K }
+    : { tag: K; value: InferTypeOfTypeBuilder<B> };
 
 export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
   EnumType<Variants>,
@@ -1232,19 +1312,23 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
    */
   create<K extends keyof Variants & string>(
     ...args: IsUnit<Variants[K]> extends true
-      ? [tag: K]                                 // unit variant: only the tag
+      ? [tag: K] // unit variant: only the tag
       : [tag: K, value: InferTypeOfTypeBuilder<Variants[K]>] // payload variant: tag + value
   ): EnumValue<K, Variants[K]> {
     const [tag, value] = args as [K, unknown];
     // just return the shape, types guarantee correctness
-    return (value === undefined
-      ? { tag }
-      : { tag, value }) as EnumValue<K, Variants[K]>;
+    return (value === undefined ? { tag } : { tag, value }) as EnumValue<
+      K,
+      Variants[K]
+    >;
   }
 
   default(
     value: EnumType<Variants>
-  ): SumColumnBuilder<Variants, SetField<DefaultMetadata, 'defaultValue', any>> {
+  ): SumColumnBuilder<
+    Variants,
+    SetField<DefaultMetadata, 'defaultValue', any>
+  > {
     return new SumColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1255,27 +1339,31 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
 export class SimpleSumBuilder<Variants extends SimpleVariantsObj>
   extends SumBuilder<Variants>
   implements
-  Indexable<
-    EnumType<Variants>,
-    {
-      tag: 'Sum';
-      value: { variants: VariantsArrayFromVariantsObj<Variants> };
-    }
-  >,
-  PrimaryKeyable<
-    EnumType<Variants>,
-    {
-      tag: 'Sum';
-      value: { variants: VariantsArrayFromVariantsObj<Variants> };
-    }
-  > {
+    Indexable<
+      EnumType<Variants>,
+      {
+        tag: 'Sum';
+        value: { variants: VariantsArrayFromVariantsObj<Variants> };
+      }
+    >,
+    PrimaryKeyable<
+      EnumType<Variants>,
+      {
+        tag: 'Sum';
+        value: { variants: VariantsArrayFromVariantsObj<Variants> };
+      }
+    >
+{
   index(): SimpleSumColumnBuilder<
     Variants,
     SetField<DefaultMetadata, 'indexType', 'btree'>
   >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): SimpleSumColumnBuilder<Variants, SetField<DefaultMetadata, 'indexType', N>>;
+  ): SimpleSumColumnBuilder<
+    Variants,
+    SetField<DefaultMetadata, 'indexType', N>
+  >;
   index(
     algorithm: IndexTypes = 'btree'
   ): SimpleSumColumnBuilder<
@@ -1301,14 +1389,17 @@ export class SimpleSumBuilder<Variants extends SimpleVariantsObj>
 export class IdentityBuilder
   extends TypeBuilder<Identity, IdentityAlgebraicType>
   implements
-  Indexable<Identity, IdentityAlgebraicType>,
-  Uniqueable<Identity, IdentityAlgebraicType>,
-  PrimaryKeyable<Identity, IdentityAlgebraicType>,
-  Defaultable<Identity, IdentityAlgebraicType> {
+    Indexable<Identity, IdentityAlgebraicType>,
+    Uniqueable<Identity, IdentityAlgebraicType>,
+    PrimaryKeyable<Identity, IdentityAlgebraicType>,
+    Defaultable<Identity, IdentityAlgebraicType>
+{
   constructor() {
     super(Identity.getAlgebraicType());
   }
-  index(): IdentityColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): IdentityColumnBuilder<
+    SetField<DefaultMetadata, 'indexType', 'btree'>
+  >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
   ): IdentityColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
@@ -1344,7 +1435,9 @@ export class IdentityBuilder
   }
   default(
     value: Identity
-  ): IdentityColumnBuilder<SetField<DefaultMetadata, 'defaultValue', Identity>> {
+  ): IdentityColumnBuilder<
+    SetField<DefaultMetadata, 'defaultValue', Identity>
+  > {
     return new IdentityColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1355,10 +1448,11 @@ export class IdentityBuilder
 export class ConnectionIdBuilder
   extends TypeBuilder<ConnectionId, ConnectionIdAlgebraicType>
   implements
-  Indexable<ConnectionId, ConnectionIdAlgebraicType>,
-  Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
-  PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
-  Defaultable<ConnectionId, ConnectionIdAlgebraicType> {
+    Indexable<ConnectionId, ConnectionIdAlgebraicType>,
+    Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
+    PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
+    Defaultable<ConnectionId, ConnectionIdAlgebraicType>
+{
   constructor() {
     super(ConnectionId.getAlgebraicType());
   }
@@ -1370,13 +1464,17 @@ export class ConnectionIdBuilder
   ): ConnectionIdColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): ConnectionIdColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): ConnectionIdColumnBuilder<
+    SetField<DefaultMetadata, 'indexType', IndexTypes>
+  > {
     return new ConnectionIdColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): ConnectionIdColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
+  unique(): ConnectionIdColumnBuilder<
+    SetField<DefaultMetadata, 'isUnique', true>
+  > {
     return new ConnectionIdColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
@@ -1413,26 +1511,33 @@ export class ConnectionIdBuilder
 export class TimestampBuilder
   extends TypeBuilder<Timestamp, TimestampAlgebraicType>
   implements
-  Indexable<Timestamp, TimestampAlgebraicType>,
-  Uniqueable<Timestamp, TimestampAlgebraicType>,
-  PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
-  Defaultable<Timestamp, TimestampAlgebraicType> {
+    Indexable<Timestamp, TimestampAlgebraicType>,
+    Uniqueable<Timestamp, TimestampAlgebraicType>,
+    PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
+    Defaultable<Timestamp, TimestampAlgebraicType>
+{
   constructor() {
     super(Timestamp.getAlgebraicType());
   }
-  index(): TimestampColumnBuilder<SetField<DefaultMetadata, 'indexType', 'btree'>>;
+  index(): TimestampColumnBuilder<
+    SetField<DefaultMetadata, 'indexType', 'btree'>
+  >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
   ): TimestampColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): TimestampColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): TimestampColumnBuilder<
+    SetField<DefaultMetadata, 'indexType', IndexTypes>
+  > {
     return new TimestampColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): TimestampColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
+  unique(): TimestampColumnBuilder<
+    SetField<DefaultMetadata, 'isUnique', true>
+  > {
     return new TimestampColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
@@ -1456,7 +1561,9 @@ export class TimestampBuilder
   }
   default(
     value: Timestamp
-  ): TimestampColumnBuilder<SetField<DefaultMetadata, 'defaultValue', Timestamp>> {
+  ): TimestampColumnBuilder<
+    SetField<DefaultMetadata, 'defaultValue', Timestamp>
+  > {
     return new TimestampColumnBuilder(
       this,
       set(defaultMetadata, { defaultValue: value })
@@ -1467,10 +1574,11 @@ export class TimestampBuilder
 export class TimeDurationBuilder
   extends TypeBuilder<TimeDuration, TimeDurationAlgebraicType>
   implements
-  Indexable<TimeDuration, TimeDurationAlgebraicType>,
-  Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
-  PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
-  Defaultable<TimeDuration, TimeDurationAlgebraicType> {
+    Indexable<TimeDuration, TimeDurationAlgebraicType>,
+    Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
+    PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
+    Defaultable<TimeDuration, TimeDurationAlgebraicType>
+{
   constructor() {
     super(TimeDuration.getAlgebraicType());
   }
@@ -1482,13 +1590,17 @@ export class TimeDurationBuilder
   ): TimeDurationColumnBuilder<SetField<DefaultMetadata, 'indexType', N>>;
   index(
     algorithm: IndexTypes = 'btree'
-  ): TimeDurationColumnBuilder<SetField<DefaultMetadata, 'indexType', IndexTypes>> {
+  ): TimeDurationColumnBuilder<
+    SetField<DefaultMetadata, 'indexType', IndexTypes>
+  > {
     return new TimeDurationColumnBuilder(
       this,
       set(defaultMetadata, { indexType: algorithm })
     );
   }
-  unique(): TimeDurationColumnBuilder<SetField<DefaultMetadata, 'isUnique', true>> {
+  unique(): TimeDurationColumnBuilder<
+    SetField<DefaultMetadata, 'isUnique', true>
+  > {
     return new TimeDurationColumnBuilder(
       this,
       set(defaultMetadata, { isUnique: true })
@@ -1556,8 +1668,8 @@ const defaultMetadata: ColumnMetadata<never> = {};
  *
  * It carries both a phantom TypeScript type (the `Type`) and
  * runtime algebraic type information.
- * 
- * IMPORTANT! We have deliberately chosen to not have {@link ColumnBuilder} 
+ *
+ * IMPORTANT! We have deliberately chosen to not have {@link ColumnBuilder}
  * extend {@link TypeBuilder} so that you cannot pass a {@link ColumnBuilder}
  * where a {@link TypeBuilder} is expected. i.e. We want to maintain
  * contravariance for functions that accept {@link TypeBuilder} parameters.
@@ -1579,11 +1691,12 @@ export class ColumnBuilder<
 export class U8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
   extends ColumnBuilder<number, AlgebraicTypeVariants.U8, M>
   implements
-  Indexable<number, AlgebraicTypeVariants.U8>,
-  Uniqueable<number, AlgebraicTypeVariants.U8>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
-  AutoIncrementable<number, AlgebraicTypeVariants.U8>,
-  Defaultable<number, AlgebraicTypeVariants.U8> {
+    Indexable<number, AlgebraicTypeVariants.U8>,
+    Uniqueable<number, AlgebraicTypeVariants.U8>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.U8>,
+    AutoIncrementable<number, AlgebraicTypeVariants.U8>,
+    Defaultable<number, AlgebraicTypeVariants.U8>
+{
   index(): U8ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1615,22 +1728,26 @@ export class U8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
     );
   }
   default(value: number): U8ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new U8ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+    return new U8ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class U16ColumnBuilder<
-  M extends ColumnMetadata<number> = DefaultMetadata,
->
+    M extends ColumnMetadata<number> = DefaultMetadata,
+  >
   extends ColumnBuilder<number, AlgebraicTypeVariants.U16, M>
   implements
-  Indexable<number, AlgebraicTypeVariants.U16>,
-  Uniqueable<number, AlgebraicTypeVariants.U16>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
-  AutoIncrementable<number, AlgebraicTypeVariants.U16>,
-  Defaultable<number, AlgebraicTypeVariants.U16> {
+    Indexable<number, AlgebraicTypeVariants.U16>,
+    Uniqueable<number, AlgebraicTypeVariants.U16>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.U16>,
+    AutoIncrementable<number, AlgebraicTypeVariants.U16>,
+    Defaultable<number, AlgebraicTypeVariants.U16>
+{
   index(): U16ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1661,23 +1778,29 @@ export class U16ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): U16ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new U16ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: number
+  ): U16ColumnBuilder<SetField<M, 'defaultValue', number>> {
+    return new U16ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class U32ColumnBuilder<
-  M extends ColumnMetadata<number> = DefaultMetadata,
->
+    M extends ColumnMetadata<number> = DefaultMetadata,
+  >
   extends ColumnBuilder<number, AlgebraicTypeVariants.U32, M>
   implements
-  Indexable<number, AlgebraicTypeVariants.U32>,
-  Uniqueable<number, AlgebraicTypeVariants.U32>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
-  AutoIncrementable<number, AlgebraicTypeVariants.U32>,
-  Defaultable<number, AlgebraicTypeVariants.U32> {
+    Indexable<number, AlgebraicTypeVariants.U32>,
+    Uniqueable<number, AlgebraicTypeVariants.U32>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.U32>,
+    AutoIncrementable<number, AlgebraicTypeVariants.U32>,
+    Defaultable<number, AlgebraicTypeVariants.U32>
+{
   index(): U32ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1708,23 +1831,29 @@ export class U32ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): U32ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new U32ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: number
+  ): U32ColumnBuilder<SetField<M, 'defaultValue', number>> {
+    return new U32ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class U64ColumnBuilder<
-  M extends ColumnMetadata<bigint> = DefaultMetadata,
->
+    M extends ColumnMetadata<bigint> = DefaultMetadata,
+  >
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.U64, M>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.U64>,
-  Uniqueable<bigint, AlgebraicTypeVariants.U64>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
-  Defaultable<bigint, AlgebraicTypeVariants.U64> {
+    Indexable<bigint, AlgebraicTypeVariants.U64>,
+    Uniqueable<bigint, AlgebraicTypeVariants.U64>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.U64>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.U64>,
+    Defaultable<bigint, AlgebraicTypeVariants.U64>
+{
   index(): U64ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1755,23 +1884,29 @@ export class U64ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): U64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new U64ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: bigint
+  ): U64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
+    return new U64ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class U128ColumnBuilder<
-  M extends ColumnMetadata<bigint> = DefaultMetadata,
->
+    M extends ColumnMetadata<bigint> = DefaultMetadata,
+  >
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.U128, M>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.U128>,
-  Uniqueable<bigint, AlgebraicTypeVariants.U128>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
-  Defaultable<bigint, AlgebraicTypeVariants.U128> {
+    Indexable<bigint, AlgebraicTypeVariants.U128>,
+    Uniqueable<bigint, AlgebraicTypeVariants.U128>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.U128>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.U128>,
+    Defaultable<bigint, AlgebraicTypeVariants.U128>
+{
   index(): U128ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1802,23 +1937,29 @@ export class U128ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): U128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new U128ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: bigint
+  ): U128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
+    return new U128ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class U256ColumnBuilder<
-  M extends ColumnMetadata<bigint> = DefaultMetadata,
->
+    M extends ColumnMetadata<bigint> = DefaultMetadata,
+  >
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.U256, M>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.U256>,
-  Uniqueable<bigint, AlgebraicTypeVariants.U256>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
-  Defaultable<bigint, AlgebraicTypeVariants.U256> {
+    Indexable<bigint, AlgebraicTypeVariants.U256>,
+    Uniqueable<bigint, AlgebraicTypeVariants.U256>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.U256>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.U256>,
+    Defaultable<bigint, AlgebraicTypeVariants.U256>
+{
   index(): U256ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1849,21 +1990,27 @@ export class U256ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): U256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new U256ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: bigint
+  ): U256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
+    return new U256ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class I8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
   extends ColumnBuilder<number, AlgebraicTypeVariants.I8, M>
   implements
-  Indexable<number, AlgebraicTypeVariants.I8>,
-  Uniqueable<number, AlgebraicTypeVariants.I8>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
-  AutoIncrementable<number, AlgebraicTypeVariants.I8>,
-  Defaultable<number, AlgebraicTypeVariants.I8> {
+    Indexable<number, AlgebraicTypeVariants.I8>,
+    Uniqueable<number, AlgebraicTypeVariants.I8>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.I8>,
+    AutoIncrementable<number, AlgebraicTypeVariants.I8>,
+    Defaultable<number, AlgebraicTypeVariants.I8>
+{
   index(): I8ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1895,22 +2042,26 @@ export class I8ColumnBuilder<M extends ColumnMetadata<number> = DefaultMetadata>
     );
   }
   default(value: number): I8ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new I8ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+    return new I8ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class I16ColumnBuilder<
-  M extends ColumnMetadata<number> = DefaultMetadata,
->
+    M extends ColumnMetadata<number> = DefaultMetadata,
+  >
   extends ColumnBuilder<number, AlgebraicTypeVariants.I16, M>
   implements
-  Indexable<number, AlgebraicTypeVariants.I16>,
-  Uniqueable<number, AlgebraicTypeVariants.I16>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
-  AutoIncrementable<number, AlgebraicTypeVariants.I16>,
-  Defaultable<number, AlgebraicTypeVariants.I16> {
+    Indexable<number, AlgebraicTypeVariants.I16>,
+    Uniqueable<number, AlgebraicTypeVariants.I16>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.I16>,
+    AutoIncrementable<number, AlgebraicTypeVariants.I16>,
+    Defaultable<number, AlgebraicTypeVariants.I16>
+{
   index(): I16ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1941,23 +2092,29 @@ export class I16ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): I16ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new I16ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: number
+  ): I16ColumnBuilder<SetField<M, 'defaultValue', number>> {
+    return new I16ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class I32ColumnBuilder<
-  M extends ColumnMetadata<number> = DefaultMetadata,
->
+    M extends ColumnMetadata<number> = DefaultMetadata,
+  >
   extends ColumnBuilder<number, AlgebraicTypeVariants.I32, M>
   implements
-  Indexable<number, AlgebraicTypeVariants.I32>,
-  Uniqueable<number, AlgebraicTypeVariants.I32>,
-  PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
-  AutoIncrementable<number, AlgebraicTypeVariants.I32>,
-  Defaultable<number, AlgebraicTypeVariants.I32> {
+    Indexable<number, AlgebraicTypeVariants.I32>,
+    Uniqueable<number, AlgebraicTypeVariants.I32>,
+    PrimaryKeyable<number, AlgebraicTypeVariants.I32>,
+    AutoIncrementable<number, AlgebraicTypeVariants.I32>,
+    Defaultable<number, AlgebraicTypeVariants.I32>
+{
   index(): I32ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -1988,23 +2145,29 @@ export class I32ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: number): I32ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new I32ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: number
+  ): I32ColumnBuilder<SetField<M, 'defaultValue', number>> {
+    return new I32ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class I64ColumnBuilder<
-  M extends ColumnMetadata<bigint> = DefaultMetadata,
->
+    M extends ColumnMetadata<bigint> = DefaultMetadata,
+  >
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.I64, M>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.I64>,
-  Uniqueable<bigint, AlgebraicTypeVariants.I64>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
-  Defaultable<bigint, AlgebraicTypeVariants.I64> {
+    Indexable<bigint, AlgebraicTypeVariants.I64>,
+    Uniqueable<bigint, AlgebraicTypeVariants.I64>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.I64>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.I64>,
+    Defaultable<bigint, AlgebraicTypeVariants.I64>
+{
   index(): I64ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2035,23 +2198,29 @@ export class I64ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): I64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new I64ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: bigint
+  ): I64ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
+    return new I64ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class I128ColumnBuilder<
-  M extends ColumnMetadata<bigint> = DefaultMetadata,
->
+    M extends ColumnMetadata<bigint> = DefaultMetadata,
+  >
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.I128, M>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.I128>,
-  Uniqueable<bigint, AlgebraicTypeVariants.I128>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
-  Defaultable<bigint, AlgebraicTypeVariants.I128> {
+    Indexable<bigint, AlgebraicTypeVariants.I128>,
+    Uniqueable<bigint, AlgebraicTypeVariants.I128>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.I128>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.I128>,
+    Defaultable<bigint, AlgebraicTypeVariants.I128>
+{
   index(): I128ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2082,23 +2251,29 @@ export class I128ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): I128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new I128ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: bigint
+  ): I128ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
+    return new I128ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class I256ColumnBuilder<
-  M extends ColumnMetadata<bigint> = DefaultMetadata,
->
+    M extends ColumnMetadata<bigint> = DefaultMetadata,
+  >
   extends ColumnBuilder<bigint, AlgebraicTypeVariants.I256, M>
   implements
-  Indexable<bigint, AlgebraicTypeVariants.I256>,
-  Uniqueable<bigint, AlgebraicTypeVariants.I256>,
-  PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
-  AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
-  Defaultable<bigint, AlgebraicTypeVariants.I256> {
+    Indexable<bigint, AlgebraicTypeVariants.I256>,
+    Uniqueable<bigint, AlgebraicTypeVariants.I256>,
+    PrimaryKeyable<bigint, AlgebraicTypeVariants.I256>,
+    AutoIncrementable<bigint, AlgebraicTypeVariants.I256>,
+    Defaultable<bigint, AlgebraicTypeVariants.I256>
+{
   index(): I256ColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2129,46 +2304,64 @@ export class I256ColumnBuilder<
       set(this.columnMetadata, { isAutoIncrement: true })
     );
   }
-  default(value: bigint): I256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
-    return new I256ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: bigint
+  ): I256ColumnBuilder<SetField<M, 'defaultValue', bigint>> {
+    return new I256ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class F32ColumnBuilder<
-  M extends ColumnMetadata<number> = DefaultMetadata,
->
+    M extends ColumnMetadata<number> = DefaultMetadata,
+  >
   extends ColumnBuilder<number, AlgebraicTypeVariants.F32, M>
-  implements Defaultable<number, AlgebraicTypeVariants.F32> {
-  default(value: number): F32ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new F32ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  implements Defaultable<number, AlgebraicTypeVariants.F32>
+{
+  default(
+    value: number
+  ): F32ColumnBuilder<SetField<M, 'defaultValue', number>> {
+    return new F32ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class F64ColumnBuilder<
-  M extends ColumnMetadata<number> = DefaultMetadata,
->
+    M extends ColumnMetadata<number> = DefaultMetadata,
+  >
   extends ColumnBuilder<number, AlgebraicTypeVariants.F64, M>
-  implements Defaultable<number, AlgebraicTypeVariants.F64> {
-  default(value: number): F64ColumnBuilder<SetField<M, 'defaultValue', number>> {
-    return new F64ColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  implements Defaultable<number, AlgebraicTypeVariants.F64>
+{
+  default(
+    value: number
+  ): F64ColumnBuilder<SetField<M, 'defaultValue', number>> {
+    return new F64ColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class BoolColumnBuilder<
-  M extends ColumnMetadata<boolean> = DefaultMetadata,
->
+    M extends ColumnMetadata<boolean> = DefaultMetadata,
+  >
   extends ColumnBuilder<boolean, AlgebraicTypeVariants.Bool, M>
   implements
-  Indexable<boolean, AlgebraicTypeVariants.Bool>,
-  Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
-  PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
-  Defaultable<boolean, AlgebraicTypeVariants.Bool> {
+    Indexable<boolean, AlgebraicTypeVariants.Bool>,
+    Uniqueable<boolean, AlgebraicTypeVariants.Bool>,
+    PrimaryKeyable<boolean, AlgebraicTypeVariants.Bool>,
+    Defaultable<boolean, AlgebraicTypeVariants.Bool>
+{
   index(): BoolColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2193,22 +2386,28 @@ export class BoolColumnBuilder<
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  default(value: boolean): BoolColumnBuilder<SetField<M, 'defaultValue', boolean>> {
-    return new BoolColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: boolean
+  ): BoolColumnBuilder<SetField<M, 'defaultValue', boolean>> {
+    return new BoolColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class StringColumnBuilder<
-  M extends ColumnMetadata<string> = DefaultMetadata,
->
+    M extends ColumnMetadata<string> = DefaultMetadata,
+  >
   extends ColumnBuilder<string, AlgebraicTypeVariants.String, M>
   implements
-  Indexable<string, AlgebraicTypeVariants.String>,
-  Uniqueable<string, AlgebraicTypeVariants.String>,
-  PrimaryKeyable<string, AlgebraicTypeVariants.String>,
-  Defaultable<string, AlgebraicTypeVariants.String> {
+    Indexable<string, AlgebraicTypeVariants.String>,
+    Uniqueable<string, AlgebraicTypeVariants.String>,
+    PrimaryKeyable<string, AlgebraicTypeVariants.String>,
+    Defaultable<string, AlgebraicTypeVariants.String>
+{
   index(): StringColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2233,80 +2432,98 @@ export class StringColumnBuilder<
       set(this.columnMetadata, { isPrimaryKey: true })
     );
   }
-  default(value: string): StringColumnBuilder<SetField<M, 'defaultValue', string>> {
-    return new StringColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+  default(
+    value: string
+  ): StringColumnBuilder<SetField<M, 'defaultValue', string>> {
+    return new StringColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class ArrayColumnBuilder<
-  Element extends TypeBuilder<any, any>,
-  M extends ColumnMetadata<
-    Array<InferTypeOfTypeBuilder<Element>>
-  > = DefaultMetadata,
->
+    Element extends TypeBuilder<any, any>,
+    M extends ColumnMetadata<
+      Array<InferTypeOfTypeBuilder<Element>>
+    > = DefaultMetadata,
+  >
   extends ColumnBuilder<
     Array<InferTypeOfTypeBuilder<Element>>,
     { tag: 'Array'; value: InferSpacetimeTypeOfTypeBuilder<Element> },
     M
   >
   implements
-  Defaultable<
-    Array<InferTypeOfTypeBuilder<Element>>,
-    AlgebraicTypeVariants.Array
-  > {
+    Defaultable<
+      Array<InferTypeOfTypeBuilder<Element>>,
+      AlgebraicTypeVariants.Array
+    >
+{
   default(
     value: Array<InferTypeOfTypeBuilder<Element>>
   ): ArrayColumnBuilder<
     Element,
     SetField<M, 'defaultValue', Array<InferTypeOfTypeBuilder<Element>>>
   > {
-    return new ArrayColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+    return new ArrayColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
-export class ByteArrayColumnBuilder<M extends ColumnMetadata<Uint8Array> = DefaultMetadata>
-  extends ColumnBuilder<Uint8Array, {
+export class ByteArrayColumnBuilder<
+  M extends ColumnMetadata<Uint8Array> = DefaultMetadata,
+> extends ColumnBuilder<
+  Uint8Array,
+  {
     tag: 'Array';
     value: AlgebraicTypeVariants.U8;
-  }, M> {
+  },
+  M
+> {
   constructor(metadata: M) {
     super(new TypeBuilder(AlgebraicType.Array(AlgebraicType.U8)), metadata);
   }
 }
 
 export class OptionColumnBuilder<
-  Value extends TypeBuilder<any, any>,
-  M extends ColumnMetadata<
-    InferTypeOfTypeBuilder<Value> | undefined
-  > = DefaultMetadata,
->
+    Value extends TypeBuilder<any, any>,
+    M extends ColumnMetadata<
+      InferTypeOfTypeBuilder<Value> | undefined
+    > = DefaultMetadata,
+  >
   extends ColumnBuilder<
     InferTypeOfTypeBuilder<Value> | undefined,
     OptionAlgebraicType,
     M
   >
   implements
-  Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType> {
+    Defaultable<InferTypeOfTypeBuilder<Value> | undefined, OptionAlgebraicType>
+{
   default(
     value: InferTypeOfTypeBuilder<Value> | undefined
   ): OptionColumnBuilder<
     Value,
     SetField<M, 'defaultValue', InferTypeOfTypeBuilder<Value> | undefined>
   > {
-    return new OptionColumnBuilder(this.typeBuilder, set(this.columnMetadata, {
-      defaultValue: value,
-    }));
+    return new OptionColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, {
+        defaultValue: value,
+      })
+    );
   }
 }
 
 export class ProductColumnBuilder<
-  Elements extends ElementsObj,
-  M extends ColumnMetadata<ObjectType<Elements>> = DefaultMetadata,
->
+    Elements extends ElementsObj,
+    M extends ColumnMetadata<ObjectType<Elements>> = DefaultMetadata,
+  >
   extends ColumnBuilder<
     ObjectType<Elements>,
     {
@@ -2315,10 +2532,14 @@ export class ProductColumnBuilder<
     },
     M
   >
-  implements Defaultable<ObjectType<Elements>, AlgebraicTypeVariants.Product> {
+  implements Defaultable<ObjectType<Elements>, AlgebraicTypeVariants.Product>
+{
   default(
     value: ObjectType<Elements>
-  ): ProductColumnBuilder<Elements, SetField<DefaultMetadata, 'defaultValue', any>> {
+  ): ProductColumnBuilder<
+    Elements,
+    SetField<DefaultMetadata, 'defaultValue', any>
+  > {
     return new ProductColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { defaultValue: value })
@@ -2327,18 +2548,22 @@ export class ProductColumnBuilder<
 }
 
 export class SumColumnBuilder<
-  Variants extends VariantsObj,
-  M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
->
+    Variants extends VariantsObj,
+    M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
+  >
   extends ColumnBuilder<
     EnumType<Variants>,
     { tag: 'Sum'; value: { variants: VariantsArrayFromVariantsObj<Variants> } },
     M
   >
-  implements Defaultable<EnumType<Variants>, AlgebraicTypeVariants.Sum> {
+  implements Defaultable<EnumType<Variants>, AlgebraicTypeVariants.Sum>
+{
   default(
     value: EnumType<Variants>
-  ): SumColumnBuilder<Variants, SetField<DefaultMetadata, 'defaultValue', any>> {
+  ): SumColumnBuilder<
+    Variants,
+    SetField<DefaultMetadata, 'defaultValue', any>
+  > {
     return new SumColumnBuilder(
       this.typeBuilder,
       set(this.columnMetadata, { defaultValue: value })
@@ -2347,20 +2572,24 @@ export class SumColumnBuilder<
 }
 
 export class SimpleSumColumnBuilder<
-  Variants extends VariantsObj,
-  M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
->
+    Variants extends VariantsObj,
+    M extends ColumnMetadata<EnumType<Variants>> = DefaultMetadata,
+  >
   extends SumColumnBuilder<Variants, M>
   implements
-  Indexable<EnumType<Variants>, AlgebraicTypeVariants.Sum>,
-  PrimaryKeyable<EnumType<Variants>, AlgebraicTypeVariants.Sum> {
+    Indexable<EnumType<Variants>, AlgebraicTypeVariants.Sum>,
+    PrimaryKeyable<EnumType<Variants>, AlgebraicTypeVariants.Sum>
+{
   index(): SimpleSumColumnBuilder<
     Variants,
     SetField<DefaultMetadata, 'indexType', 'btree'>
   >;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
-  ): SimpleSumColumnBuilder<Variants, SetField<DefaultMetadata, 'indexType', N>>;
+  ): SimpleSumColumnBuilder<
+    Variants,
+    SetField<DefaultMetadata, 'indexType', N>
+  >;
   index(
     algorithm: IndexTypes = 'btree'
   ): SimpleSumColumnBuilder<
@@ -2384,14 +2613,15 @@ export class SimpleSumColumnBuilder<
 }
 
 export class IdentityColumnBuilder<
-  M extends ColumnMetadata<Identity> = DefaultMetadata,
->
+    M extends ColumnMetadata<Identity> = DefaultMetadata,
+  >
   extends ColumnBuilder<Identity, IdentityAlgebraicType, M>
   implements
-  Indexable<Identity, IdentityAlgebraicType>,
-  Uniqueable<Identity, IdentityAlgebraicType>,
-  PrimaryKeyable<Identity, IdentityAlgebraicType>,
-  Defaultable<Identity, IdentityAlgebraicType> {
+    Indexable<Identity, IdentityAlgebraicType>,
+    Uniqueable<Identity, IdentityAlgebraicType>,
+    PrimaryKeyable<Identity, IdentityAlgebraicType>,
+    Defaultable<Identity, IdentityAlgebraicType>
+{
   index(): IdentityColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2419,19 +2649,23 @@ export class IdentityColumnBuilder<
   default(
     value: Identity
   ): IdentityColumnBuilder<SetField<M, 'defaultValue', Identity>> {
-    return new IdentityColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
+    return new IdentityColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, { defaultValue: value })
+    );
   }
 }
 
 export class ConnectionIdColumnBuilder<
-  M extends ColumnMetadata<ConnectionId> = DefaultMetadata,
->
+    M extends ColumnMetadata<ConnectionId> = DefaultMetadata,
+  >
   extends ColumnBuilder<ConnectionId, ConnectionIdAlgebraicType, M>
   implements
-  Indexable<ConnectionId, ConnectionIdAlgebraicType>,
-  Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
-  PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
-  Defaultable<ConnectionId, ConnectionIdAlgebraicType> {
+    Indexable<ConnectionId, ConnectionIdAlgebraicType>,
+    Uniqueable<ConnectionId, ConnectionIdAlgebraicType>,
+    PrimaryKeyable<ConnectionId, ConnectionIdAlgebraicType>,
+    Defaultable<ConnectionId, ConnectionIdAlgebraicType>
+{
   index(): ConnectionIdColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2459,19 +2693,23 @@ export class ConnectionIdColumnBuilder<
   default(
     value: ConnectionId
   ): ConnectionIdColumnBuilder<SetField<M, 'defaultValue', ConnectionId>> {
-    return new ConnectionIdColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
+    return new ConnectionIdColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, { defaultValue: value })
+    );
   }
 }
 
 export class TimestampColumnBuilder<
-  M extends ColumnMetadata<Timestamp> = DefaultMetadata,
->
+    M extends ColumnMetadata<Timestamp> = DefaultMetadata,
+  >
   extends ColumnBuilder<Timestamp, TimestampAlgebraicType, M>
   implements
-  Indexable<Timestamp, TimestampAlgebraicType>,
-  Uniqueable<Timestamp, TimestampAlgebraicType>,
-  PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
-  Defaultable<Timestamp, TimestampAlgebraicType> {
+    Indexable<Timestamp, TimestampAlgebraicType>,
+    Uniqueable<Timestamp, TimestampAlgebraicType>,
+    PrimaryKeyable<Timestamp, TimestampAlgebraicType>,
+    Defaultable<Timestamp, TimestampAlgebraicType>
+{
   index(): TimestampColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2499,19 +2737,23 @@ export class TimestampColumnBuilder<
   default(
     value: Timestamp
   ): TimestampColumnBuilder<SetField<M, 'defaultValue', Timestamp>> {
-    return new TimestampColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
+    return new TimestampColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, { defaultValue: value })
+    );
   }
 }
 
 export class TimeDurationColumnBuilder<
-  M extends ColumnMetadata<TimeDuration> = DefaultMetadata,
->
+    M extends ColumnMetadata<TimeDuration> = DefaultMetadata,
+  >
   extends ColumnBuilder<TimeDuration, TimeDurationAlgebraicType, M>
   implements
-  Indexable<TimeDuration, TimeDurationAlgebraicType>,
-  Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
-  PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
-  Defaultable<TimeDuration, TimeDurationAlgebraicType> {
+    Indexable<TimeDuration, TimeDurationAlgebraicType>,
+    Uniqueable<TimeDuration, TimeDurationAlgebraicType>,
+    PrimaryKeyable<TimeDuration, TimeDurationAlgebraicType>,
+    Defaultable<TimeDuration, TimeDurationAlgebraicType>
+{
   index(): TimeDurationColumnBuilder<SetField<M, 'indexType', 'btree'>>;
   index<N extends NonNullable<IndexTypes>>(
     algorithm: N
@@ -2539,7 +2781,10 @@ export class TimeDurationColumnBuilder<
   default(
     value: TimeDuration
   ): TimeDurationColumnBuilder<SetField<M, 'defaultValue', TimeDuration>> {
-    return new TimeDurationColumnBuilder(this.typeBuilder, set(this.columnMetadata, { defaultValue: value }));
+    return new TimeDurationColumnBuilder(
+      this.typeBuilder,
+      set(this.columnMetadata, { defaultValue: value })
+    );
   }
 }
 
@@ -2592,10 +2837,10 @@ const enumImpl = ((nameOrObj: any, maybeObj?: any) => {
   let obj: any = nameOrObj;
   let name: string | undefined = undefined;
 
-  if (typeof nameOrObj === "string") {
+  if (typeof nameOrObj === 'string') {
     if (!maybeObj) {
       throw new TypeError(
-        "When providing a name, you must also provide the variants object or array."
+        'When providing a name, you must also provide the variants object or array.'
       );
     }
     obj = maybeObj;
@@ -2834,9 +3079,9 @@ export const t = {
 
   /**
    * Creates a lazily-evaluated {@link TypeBuilder}. This is useful for creating
-   * recursive types, such as a tree or linked list. 
+   * recursive types, such as a tree or linked list.
    * @param thunk A function that returns a {@link TypeBuilder}.
-   * @returns A proxy {@link TypeBuilder} that evaluates the thunk on first access. 
+   * @returns A proxy {@link TypeBuilder} that evaluates the thunk on first access.
    */
   lazy<Build extends () => TypeBuilder<any, any>>(
     thunk: Build
@@ -2849,7 +3094,7 @@ export const t = {
       get(_t, prop, recv) {
         const target = get() as any;
         const val = Reflect.get(target, prop, recv);
-        return typeof val === "function" ? val.bind(target) : val;
+        return typeof val === 'function' ? val.bind(target) : val;
       },
       set(_t, prop, value, recv) {
         return Reflect.set(get() as any, prop, value, recv);
@@ -2937,7 +3182,7 @@ export const t = {
 
   /**
    * This is a convenience method for creating a column with the {@link ByteArray} type.
-   * You can create a column of the same type by constructing an `array` of `u8`. 
+   * You can create a column of the same type by constructing an `array` of `u8`.
    * The TypeScript representation is {@link Uint8Array}.
    * @returns A new {@link ByteArrayBuilder} instance with the {@link ByteArray} type.
    */
diff --git a/crates/bindings-typescript/src/lib/type_util.ts b/crates/bindings-typescript/src/lib/type_util.ts
index 1c0bc697284..55aa63ec162 100644
--- a/crates/bindings-typescript/src/lib/type_util.ts
+++ b/crates/bindings-typescript/src/lib/type_util.ts
@@ -1,16 +1,22 @@
-import type { ConnectionId } from "./connection_id";
-import type { Identity } from "./identity";
-import type { ScheduleAt } from "./schedule_at";
-import type { TimeDuration } from "./time_duration";
-import type { Timestamp } from "./timestamp";
-
-type DoNotPrettify = Identity | ConnectionId | Timestamp | TimeDuration | ScheduleAt;
+import type { ConnectionId } from './connection_id';
+import type { Identity } from './identity';
+import type { ScheduleAt } from './schedule_at';
+import type { TimeDuration } from './time_duration';
+import type { Timestamp } from './timestamp';
+
+type DoNotPrettify =
+  | Identity
+  | ConnectionId
+  | Timestamp
+  | TimeDuration
+  | ScheduleAt;
 
 /**
  * Utility to make TS show cleaner types by flattening intersections.
  */
-export type Prettify<T> =
-  T extends DoNotPrettify ? T : { [K in keyof T]: T[K] } & {};
+export type Prettify<T> = T extends DoNotPrettify
+  ? T
+  : { [K in keyof T]: T[K] } & {};
 
 /**
  * Helper function to sets a field in an object
@@ -42,14 +48,15 @@ export type Values<T> = T[keyof T];
  */
 export type CollapseTuple<A extends any[]> = A extends [infer T] ? T : A;
 
-type CamelCaseImpl<S extends string> =
-  S extends `${infer Head}_${infer Tail}` ? `${Head}${Capitalize<CamelCaseImpl<Tail>>}` :
-  S extends `${infer Head}-${infer Tail}` ? `${Head}${Capitalize<CamelCaseImpl<Tail>>}` :
-  S;
+type CamelCaseImpl<S extends string> = S extends `${infer Head}_${infer Tail}`
+  ? `${Head}${Capitalize<CamelCaseImpl<Tail>>}`
+  : S extends `${infer Head}-${infer Tail}`
+    ? `${Head}${Capitalize<CamelCaseImpl<Tail>>}`
+    : S;
 
 /**
  * Convert "Some_identifier-name" -> "someIdentifierName"
  * - No spaces; allowed separators: "_" and "-"
  * - Normalizes the *first* character to lowercase (e.g. "User_Name" -> "userName")
  */
-export type CamelCase<S extends string> = Uncapitalize<CamelCaseImpl<S>>;
\ No newline at end of file
+export type CamelCase<S extends string> = Uncapitalize<CamelCaseImpl<S>>;
diff --git a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
index 26ccbb78c89..5c10b2aed8c 100644
--- a/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
+++ b/crates/bindings-typescript/src/react/SpacetimeDBProvider.ts
@@ -18,7 +18,10 @@ export interface SpacetimeDBProviderProps<
 
 export function SpacetimeDBProvider<
   DbConnection extends DbConnectionImpl<any>,
->({ connectionBuilder, children }: SpacetimeDBProviderProps<DbConnection>): React.JSX.Element {
+>({
+  connectionBuilder,
+  children,
+}: SpacetimeDBProviderProps<DbConnection>): React.JSX.Element {
   // Holds the imperative connection instance when (and only when) we’re on the client.
   const connRef = React.useRef<DbConnection | null>(null);
   const getConnection = React.useCallback(() => connRef.current, []);
@@ -29,7 +32,7 @@ export function SpacetimeDBProvider<
     token: undefined,
     connectionId: ConnectionId.random(),
     connectionError: undefined,
-    getConnection: getConnection as ConnectionState["getConnection"],
+    getConnection: getConnection as ConnectionState['getConnection'],
   });
 
   // Build on the client only; useEffect won't run during SSR.
@@ -37,7 +40,7 @@ export function SpacetimeDBProvider<
     if (!connRef.current) {
       connRef.current = connectionBuilder.build();
     }
-    console.log("HAPPPP");
+    console.log('HAPPPP');
     // Register callback for onConnect to update state
     const onConnect = (conn: DbConnection) => {
       setState(s => ({
@@ -48,13 +51,18 @@ export function SpacetimeDBProvider<
         connectionId: conn.connectionId,
       }));
     };
-    const onDisconnect = (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>) => {
+    const onDisconnect = (
+      ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>
+    ) => {
       setState(s => ({
         ...s,
         isActive: ctx.isActive,
       }));
     };
-    const onConnectError = (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>, err: Error) => {
+    const onConnectError = (
+      ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>,
+      err: Error
+    ) => {
       setState(s => ({
         ...s,
         isActive: ctx.isActive,
@@ -88,4 +96,4 @@ export function SpacetimeDBProvider<
     { value: state },
     children
   );
- }
\ No newline at end of file
+}
diff --git a/crates/bindings-typescript/src/react/connection_state.ts b/crates/bindings-typescript/src/react/connection_state.ts
index f9c333c100f..056a3c7b3d3 100644
--- a/crates/bindings-typescript/src/react/connection_state.ts
+++ b/crates/bindings-typescript/src/react/connection_state.ts
@@ -1,6 +1,6 @@
-import type { ConnectionId } from "../lib/connection_id";
-import type { Identity } from "../lib/identity";
-import type { DbConnectionImpl } from "../sdk/db_connection_impl";
+import type { ConnectionId } from '../lib/connection_id';
+import type { Identity } from '../lib/identity';
+import type { DbConnectionImpl } from '../sdk/db_connection_impl';
 
 export type ConnectionState = {
   isActive: boolean;
@@ -8,5 +8,7 @@ export type ConnectionState = {
   token?: string;
   connectionId: ConnectionId;
   connectionError?: Error;
-  getConnection<DbConnection extends DbConnectionImpl<any>>(): DbConnection | null;
+  getConnection<
+    DbConnection extends DbConnectionImpl<any>,
+  >(): DbConnection | null;
 };
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index 3d43e672718..6a16f1a2a38 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -1,17 +1,18 @@
-import { useCallback, useEffect, useRef } from "react";
-import type { InferTypeOfRow } from "../lib/type_builders";
-import type { UntypedReducerDef } from "../sdk/reducers";
-import { useSpacetimeDB, } from "./useSpacetimeDB";
+import { useCallback, useEffect, useRef } from 'react';
+import type { InferTypeOfRow } from '../lib/type_builders';
+import type { UntypedReducerDef } from '../sdk/reducers';
+import { useSpacetimeDB } from './useSpacetimeDB';
+import type { Prettify } from '../lib/type_util';
 
 export function useReducer<ReducerDef extends UntypedReducerDef>(
-  reducerDef: ReducerDef,
-): (params: InferTypeOfRow<ReducerDef['params']>) => void {
+  reducerDef: ReducerDef
+): (params: Prettify<InferTypeOfRow<ReducerDef['params']>>) => void {
   const { getConnection, isActive } = useSpacetimeDB();
   const reducerName = reducerDef.accessorName;
 
   // Holds calls made before the connection exists
   const queueRef = useRef<
-    Array<InferTypeOfRow<ReducerDef['params']>>
+    Array<Prettify<InferTypeOfRow<ReducerDef['params']>>>
   >([]);
 
   // Flush when we finally have a connection
@@ -20,26 +21,27 @@ export function useReducer<ReducerDef extends UntypedReducerDef>(
     if (!conn) {
       return;
     }
-    const fn =
-      (conn.reducers as any)[reducerName] as
-        (p: InferTypeOfRow<ReducerDef['params']>) => void;
+    const fn = (conn.reducers as any)[reducerName] as (
+      p: InferTypeOfRow<ReducerDef['params']>
+    ) => void;
     if (queueRef.current.length) {
       const pending = queueRef.current.splice(0);
       for (const params of pending) fn(params);
     }
   }, [getConnection, reducerName, isActive]);
 
-  return useCallback((
-    params: InferTypeOfRow<ReducerDef['params']>
-  ) => {
-    const conn = getConnection();
-    if (!conn) {
-      queueRef.current.push(params);
-      return;
-    }
-    const fn =
-      (conn.reducers as any)[reducerName] as
-        (p: InferTypeOfRow<ReducerDef['params']>) => void;
-    return fn(params);
-  }, [getConnection, reducerName]);
-}
\ No newline at end of file
+  return useCallback(
+    (params: Prettify<InferTypeOfRow<ReducerDef['params']>>) => {
+      const conn = getConnection();
+      if (!conn) {
+        queueRef.current.push(params);
+        return;
+      }
+      const fn = (conn.reducers as any)[reducerName] as (
+        p: Prettify<InferTypeOfRow<ReducerDef['params']>>
+      ) => void;
+      return fn(params);
+    },
+    [getConnection, reducerName]
+  );
+}
diff --git a/crates/bindings-typescript/src/react/useSpacetimeDB.ts b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
index 619a5b39dea..9298eb3fda4 100644
--- a/crates/bindings-typescript/src/react/useSpacetimeDB.ts
+++ b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
@@ -3,7 +3,9 @@ import type { DbConnectionImpl } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
 import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
-export const SpacetimeDBContext = createContext<ConnectionState | undefined>(undefined);
+export const SpacetimeDBContext = createContext<ConnectionState | undefined>(
+  undefined
+);
 
 // Throws an error if used outside of a SpacetimeDBProvider
 // Error is caught by other hooks like useTable so they can provide better error messages
@@ -15,4 +17,4 @@ export function useSpacetimeDB(): ConnectionState {
     );
   }
   return context;
-}
\ No newline at end of file
+}
diff --git a/crates/bindings-typescript/src/react/useTable.ts b/crates/bindings-typescript/src/react/useTable.ts
index fe337e1780c..98b4d55a68c 100644
--- a/crates/bindings-typescript/src/react/useTable.ts
+++ b/crates/bindings-typescript/src/react/useTable.ts
@@ -206,13 +206,11 @@ type ColumnsFromRow<R> = {
  * });
  * ```
  */
-export function useTable<
-  TableDef extends UntypedTableDef,
->(
+export function useTable<TableDef extends UntypedTableDef>(
   tableDef: TableDef,
   where: Expr<ColumnsFromRow<RowType<TableDef>>>,
-  callbacks?: UseTableCallbacks<RowType<TableDef>>
-): readonly RowType<TableDef>[];
+  callbacks?: UseTableCallbacks<Prettify<RowType<TableDef>>>
+): readonly Prettify<RowType<TableDef>>[];
 
 /**
  * React hook to subscribe to a table in SpacetimeDB and receive live updates as rows are inserted, updated, or deleted.
@@ -247,22 +245,18 @@ export function useTable<
  * });
  * ```
  */
-export function useTable<
-  TableDef extends UntypedTableDef,
->(
+export function useTable<TableDef extends UntypedTableDef>(
   tableDef: TableDef,
-  callbacks?: UseTableCallbacks<RowType<TableDef>>
-): readonly RowType<TableDef>[];
+  callbacks?: UseTableCallbacks<Prettify<RowType<TableDef>>>
+): readonly Prettify<RowType<TableDef>>[];
 
-export function useTable<
-  TableDef extends UntypedTableDef,
->(
+export function useTable<TableDef extends UntypedTableDef>(
   tableDef: TableDef,
   whereClauseOrCallbacks?:
     | Expr<ColumnsFromRow<RowType<TableDef>>>
     | UseTableCallbacks<RowType<TableDef>>,
   callbacks?: UseTableCallbacks<RowType<TableDef>>
-): readonly RowType<TableDef>[] {
+): readonly Prettify<RowType<TableDef>>[] {
   type UseTableRowType = RowType<TableDef>;
   const tableName = tableDef.name;
   let whereClause: Expr<ColumnsFromRow<UseTableRowType>> | undefined;
@@ -271,7 +265,9 @@ export function useTable<
     typeof whereClauseOrCallbacks === 'object' &&
     'type' in whereClauseOrCallbacks
   ) {
-    whereClause = whereClauseOrCallbacks as Expr<ColumnsFromRow<UseTableRowType>>;
+    whereClause = whereClauseOrCallbacks as Expr<
+      ColumnsFromRow<UseTableRowType>
+    >;
   } else {
     callbacks = whereClauseOrCallbacks as
       | UseTableCallbacks<UseTableRowType>
@@ -294,27 +290,32 @@ export function useTable<
     (whereClause ? ` WHERE ${toString(whereClause)}` : '');
 
   const latestTransactionEvent = useRef<any>(null);
-  const lastSnapshotRef = useRef<readonly UseTableRowType[] | null>(null);
+  const lastSnapshotRef = useRef<readonly Prettify<UseTableRowType>[] | null>(
+    null
+  );
 
   const whereKey = whereClause ? toString(whereClause) : '';
 
-  const computeSnapshot = useCallback((): readonly UseTableRowType[] => {
-    const connection = connectionState.getConnection();
-    if (!connection) {
-      return [];
-    }
-    const table = connection.db[tableName];
-    const result: readonly UseTableRowType[] = whereClause
-      ? (Array.from(table.iter()).filter(row => evaluate(whereClause, row as UseTableRowType)) as UseTableRowType[])
-      : (Array.from(table.iter()) as UseTableRowType[]);
-    return result;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [connectionState, tableName, whereKey, subscribeApplied]);
+  const computeSnapshot =
+    useCallback((): readonly Prettify<UseTableRowType>[] => {
+      const connection = connectionState.getConnection();
+      if (!connection) {
+        return [];
+      }
+      const table = connection.db[tableName];
+      const result: readonly Prettify<UseTableRowType>[] = whereClause
+        ? (Array.from(table.iter()).filter(row =>
+            evaluate(whereClause, row as UseTableRowType)
+          ) as Prettify<UseTableRowType>[])
+        : (Array.from(table.iter()) as Prettify<UseTableRowType>[]);
+      return result;
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [connectionState, tableName, whereKey, subscribeApplied]);
 
   useEffect(() => {
     const connection = connectionState.getConnection()!;
     if (connectionState.isActive && connection) {
-      const cancel = connection 
+      const cancel = connection
         .subscriptionBuilder()
         .onApplied(() => {
           setSubscribeApplied(true);
@@ -328,7 +329,10 @@ export function useTable<
 
   const subscribe = useCallback(
     (onStoreChange: () => void) => {
-      const onInsert = (ctx: EventContextInterface<UntypedRemoteModule>, row: any) => {
+      const onInsert = (
+        ctx: EventContextInterface<UntypedRemoteModule>,
+        row: any
+      ) => {
         if (whereClause && !evaluate(whereClause, row)) {
           return;
         }
@@ -343,7 +347,10 @@ export function useTable<
         }
       };
 
-      const onDelete = (ctx: EventContextInterface<UntypedRemoteModule>, row: any) => {
+      const onDelete = (
+        ctx: EventContextInterface<UntypedRemoteModule>,
+        row: any
+      ) => {
         if (whereClause && !evaluate(whereClause, row)) {
           return;
         }
@@ -358,7 +365,11 @@ export function useTable<
         }
       };
 
-      const onUpdate = (ctx: EventContextInterface<UntypedRemoteModule>, oldRow: any, newRow: any) => {
+      const onUpdate = (
+        ctx: EventContextInterface<UntypedRemoteModule>,
+        oldRow: any,
+        newRow: any
+      ) => {
         const change = classifyMembership(whereClause, oldRow, newRow);
 
         switch (change) {
@@ -412,7 +423,7 @@ export function useTable<
     ]
   );
 
-  const getSnapshot = useCallback((): readonly UseTableRowType[] => {
+  const getSnapshot = useCallback((): readonly Prettify<UseTableRowType>[] => {
     if (!lastSnapshotRef.current) {
       lastSnapshotRef.current = computeSnapshot();
     }
diff --git a/crates/bindings-typescript/src/sdk/client_cache.ts b/crates/bindings-typescript/src/sdk/client_cache.ts
index 8f07f15af37..afadb578a50 100644
--- a/crates/bindings-typescript/src/sdk/client_cache.ts
+++ b/crates/bindings-typescript/src/sdk/client_cache.ts
@@ -3,13 +3,16 @@ import type { UntypedTableDef } from '../lib/table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 import { TableCache } from './table_cache.ts';
 
-type TableName<SchemaDef> =
-  [SchemaDef] extends [UntypedSchemaDef] ? TableNamesOf<SchemaDef> : string;
+type TableName<SchemaDef> = [SchemaDef] extends [UntypedSchemaDef]
+  ? TableNamesOf<SchemaDef>
+  : string;
 
-export type TableDefForTableName<SchemaDef extends UntypedSchemaDef, N extends TableName<SchemaDef>> =
-  [SchemaDef] extends [UntypedSchemaDef]
-    ? (SchemaDef['tables'][number] & { name: N })
-    : UntypedTableDef;
+export type TableDefForTableName<
+  SchemaDef extends UntypedSchemaDef,
+  N extends TableName<SchemaDef>,
+> = [SchemaDef] extends [UntypedSchemaDef]
+  ? SchemaDef['tables'][number] & { name: N }
+  : UntypedTableDef;
 
 type TableCacheForTableName<
   RemoteModule extends UntypedRemoteModule,
@@ -21,14 +24,24 @@ type TableCacheForTableName<
  * while preserving the correspondence between the key and value type.
  */
 class TableMap<RemoteModule extends UntypedRemoteModule> {
-  private readonly map: Map<string, TableCacheForTableName<RemoteModule, TableName<RemoteModule>>> = new Map();
+  private readonly map: Map<
+    string,
+    TableCacheForTableName<RemoteModule, TableName<RemoteModule>>
+  > = new Map();
 
-  get<K extends TableName<RemoteModule>>(key: K): TableCacheForTableName<RemoteModule, K> | undefined {
+  get<K extends TableName<RemoteModule>>(
+    key: K
+  ): TableCacheForTableName<RemoteModule, K> | undefined {
     // Cast required: a Map<string, Union> can't refine the union to the exact K-specific member on get<K>(key: K).
-    return this.map.get(key) as TableCacheForTableName<RemoteModule, K> | undefined;
+    return this.map.get(key) as
+      | TableCacheForTableName<RemoteModule, K>
+      | undefined;
   }
 
-  set<K extends TableName<RemoteModule>>(key: K, value: TableCacheForTableName<RemoteModule, K>): this {
+  set<K extends TableName<RemoteModule>>(
+    key: K,
+    value: TableCacheForTableName<RemoteModule, K>
+  ): this {
     this.map.set(key, value);
     return this;
   }
@@ -42,10 +55,22 @@ class TableMap<RemoteModule extends UntypedRemoteModule> {
   }
 
   // optional: iteration stays broadly typed (cannot express per-key relation here)
-  keys(): IterableIterator<string> { return this.map.keys(); }
-  values(): IterableIterator<TableCacheForTableName<RemoteModule, TableName<RemoteModule>>> { return this.map.values(); }
-  entries(): IterableIterator<[string, TableCacheForTableName<RemoteModule, TableName<RemoteModule>>]> { return this.map.entries(); }
-  [Symbol.iterator]() { return this.entries(); }
+  keys(): IterableIterator<string> {
+    return this.map.keys();
+  }
+  values(): IterableIterator<
+    TableCacheForTableName<RemoteModule, TableName<RemoteModule>>
+  > {
+    return this.map.values();
+  }
+  entries(): IterableIterator<
+    [string, TableCacheForTableName<RemoteModule, TableName<RemoteModule>>]
+  > {
+    return this.map.entries();
+  }
+  [Symbol.iterator]() {
+    return this.entries();
+  }
 }
 
 /**
@@ -65,7 +90,9 @@ export class ClientCache<RemoteModule extends UntypedRemoteModule> {
    *   and the return type matches that table.
    * - If SchemaDef is undefined, `name` is string and the return type is untyped.
    */
-  getTable<N extends TableName<RemoteModule>>(name: N): TableCacheForTableName<RemoteModule, N> {
+  getTable<N extends TableName<RemoteModule>>(
+    name: N
+  ): TableCacheForTableName<RemoteModule, N> {
     const table = this.tables.get(name);
     if (!table) {
       console.error(
diff --git a/crates/bindings-typescript/src/sdk/client_table.ts b/crates/bindings-typescript/src/sdk/client_table.ts
index bafaf8eb49f..ac20b83decf 100644
--- a/crates/bindings-typescript/src/sdk/client_table.ts
+++ b/crates/bindings-typescript/src/sdk/client_table.ts
@@ -1,11 +1,16 @@
-import type { ReadonlyIndexes } from "../lib/indexes";
-import type { TableNamesOf } from "../lib/schema";
-import type { ReadonlyTableMethods, RowType, TableIndexes, UntypedTableDef } from "../lib/table";
-import type { ColumnBuilder } from "../lib/type_builders";
-import type { Prettify } from "../lib/type_util";
-import type { TableDefForTableName } from "./client_cache";
-import type { EventContextInterface } from "./event_context";
-import type { UntypedRemoteModule } from "./spacetime_module";
+import type { ReadonlyIndexes } from '../lib/indexes';
+import type { TableNamesOf } from '../lib/schema';
+import type {
+  ReadonlyTableMethods,
+  RowType,
+  TableIndexes,
+  UntypedTableDef,
+} from '../lib/table';
+import type { ColumnBuilder } from '../lib/type_builders';
+import type { Prettify } from '../lib/type_util';
+import type { TableDefForTableName } from './client_cache';
+import type { EventContextInterface } from './event_context';
+import type { UntypedRemoteModule } from './spacetime_module';
 
 export type ClientTablePrimaryKeyMethods<
   RemoteModule extends UntypedRemoteModule,
@@ -16,13 +21,25 @@ export type ClientTablePrimaryKeyMethods<
    * Requires that the table has a primary key defined.
    * @param cb The callback to invoke when a row is updated.
    */
-  onUpdate(cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, newRow: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+  onUpdate(
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>,
+      newRow: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
+  ): void;
 
   /**
-   * Removes a previously registered update event listener. 
+   * Removes a previously registered update event listener.
    * @param cb The callback to remove from the update event listeners.
    */
-  removeOnUpdate(cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, newRow: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+  removeOnUpdate(
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>,
+      newRow: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
+  ): void;
 };
 
 export type ClientTableMethods<
@@ -32,24 +49,44 @@ export type ClientTableMethods<
   /**
    * Registers a callback to be invoked when a row is inserted into the table.
    */
-  onInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+  onInsert(
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
+  ): void;
 
   /**
-   *  Removes a previously registered insert event listener. 
+   *  Removes a previously registered insert event listener.
    * @param cb The callback to remove from the insert event listeners.
    */
-  removeOnInsert(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+  removeOnInsert(
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
+  ): void;
 
   /**
    * Registers a callback to be invoked when a row is deleted from the table.
    */
-  onDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+  onDelete(
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
+  ): void;
 
   /**
    * Removes a previously registered delete event listener.
    * @param cb The callback to remove from the delete event listeners.
    */
-  removeOnDelete(cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void): void;
+  removeOnDelete(
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
+  ): void;
 };
 
 /**
@@ -64,21 +101,27 @@ export type ClientTable<
   TableName extends TableNamesOf<RemoteModule>,
 > = Prettify<
   ClientTableCore<RemoteModule, TableName> &
-  ReadonlyIndexes<TableDefForTableName<RemoteModule, TableName>, TableIndexes<TableDefForTableName<RemoteModule, TableName>>>
+    ReadonlyIndexes<
+      TableDefForTableName<RemoteModule, TableName>,
+      TableIndexes<TableDefForTableName<RemoteModule, TableName>>
+    >
 >;
 
-type HasPrimaryKey<TableDef extends UntypedTableDef> =
-  ColumnsHavePrimaryKey<TableDef['columns']>;
+type HasPrimaryKey<TableDef extends UntypedTableDef> = ColumnsHavePrimaryKey<
+  TableDef['columns']
+>;
 
 type ColumnsHavePrimaryKey<
-  Cs extends Record<string, ColumnBuilder<any, any, any>>
-> =
-  {
-    [K in keyof Cs]:
-      Cs[K] extends ColumnBuilder<any, any, infer M>
-        ? (M extends { isPrimaryKey: true } ? true : never)
-        : never
-  }[keyof Cs] extends true ? true : false;
+  Cs extends Record<string, ColumnBuilder<any, any, any>>,
+> = {
+  [K in keyof Cs]: Cs[K] extends ColumnBuilder<any, any, infer M>
+    ? M extends { isPrimaryKey: true }
+      ? true
+      : never
+    : never;
+}[keyof Cs] extends true
+  ? true
+  : false;
 
 type MaybePKMethods<
   RemoteModule extends UntypedRemoteModule,
@@ -92,8 +135,7 @@ type MaybePKMethods<
 export type ClientTableCoreImplementable<
   RemoteModule extends UntypedRemoteModule,
   TableName extends TableNamesOf<RemoteModule>,
-> =
-  ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
+> = ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
   ClientTableMethods<RemoteModule, TableName> &
   // always present but optional -> statically known member set
   MaybePKMethods<RemoteModule, TableName>;
@@ -105,11 +147,8 @@ export type ClientTableCoreImplementable<
 export type ClientTableCore<
   RemoteModule extends UntypedRemoteModule,
   TableName extends TableNamesOf<RemoteModule>,
-> =
-  ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
+> = ReadonlyTableMethods<TableDefForTableName<RemoteModule, TableName>> &
   ClientTableMethods<RemoteModule, TableName> &
-  (
-    HasPrimaryKey<TableDefForTableName<RemoteModule, TableName>> extends true
-      ? ClientTablePrimaryKeyMethods<RemoteModule, TableName>
-      : {}
-  );
\ No newline at end of file
+  (HasPrimaryKey<TableDefForTableName<RemoteModule, TableName>> extends true
+    ? ClientTablePrimaryKeyMethods<RemoteModule, TableName>
+    : {});
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index 1e5b4be9abf..1842f31fde2 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -1,6 +1,12 @@
 import { DbConnectionImpl, type ConnectionEvent } from './db_connection_impl';
 import { EventEmitter } from './event_emitter';
-import type { DbConnectionConfig, ErrorContextInterface, Identity, RemoteModuleOf, SubscriptionEventContextInterface } from '../';
+import type {
+  DbConnectionConfig,
+  ErrorContextInterface,
+  Identity,
+  RemoteModuleOf,
+  SubscriptionEventContextInterface,
+} from '../';
 import { ensureMinimumVersionOrThrow } from './version';
 import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
 
@@ -12,9 +18,7 @@ import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
  * always have a concrete RemoteModule type in those cases. Even if they user
  * did do this, they would just lose type safety on the RemoteModule.
  */
-export class DbConnectionBuilder<
-  DbConnection extends DbConnectionImpl<any>
-> {
+export class DbConnectionBuilder<DbConnection extends DbConnectionImpl<any>> {
   #uri?: URL;
   #nameOrAddress?: string;
   #identity?: Identity;
@@ -35,7 +39,9 @@ export class DbConnectionBuilder<
    */
   constructor(
     private remoteModule: RemoteModuleOf<DbConnection>,
-    private dbConnectionCtor: (config: DbConnectionConfig<RemoteModuleOf<DbConnection>>) => DbConnection
+    private dbConnectionCtor: (
+      config: DbConnectionConfig<RemoteModuleOf<DbConnection>>
+    ) => DbConnection
   ) {
     this.#createWSFn = WebsocketDecompressAdapter.createWebSocketFn;
   }
@@ -181,7 +187,12 @@ export class DbConnectionBuilder<
    * });
    * ```
    */
-  onConnectError(callback: (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>, error: Error) => void): this {
+  onConnectError(
+    callback: (
+      ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>,
+      error: Error
+    ) => void
+  ): this {
     this.#emitter.on('connectError', callback);
     return this;
   }
@@ -213,7 +224,10 @@ export class DbConnectionBuilder<
    * @throws {Error} Throws an error if called multiple times on the same `DbConnectionBuilder`.
    */
   onDisconnect(
-    callback: (ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>, error?: Error | undefined) => void
+    callback: (
+      ctx: ErrorContextInterface<RemoteModuleOf<DbConnection>>,
+      error?: Error | undefined
+    ) => void
   ): this {
     this.#emitter.on('disconnect', callback);
     return this;
@@ -258,6 +272,6 @@ export class DbConnectionBuilder<
       confirmedReads: this.#confirmedReads,
       createWSFn: this.#createWSFn,
       remoteModule: this.remoteModule,
-    })
+    });
   }
 }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index e2a7ced5371..cae78d0564c 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -1,8 +1,5 @@
 import { ConnectionId, ProductType } from '../';
-import {
-  AlgebraicType,
-  type ComparablePrimitive,
-} from '../';
+import { AlgebraicType, type ComparablePrimitive } from '../';
 import { BinaryReader } from '../';
 import { BinaryWriter } from '../';
 import BsatnRowList from './client_api/bsatn_row_list_type.ts';
@@ -31,7 +28,10 @@ import type {
   UnsubscribeAppliedMessage,
 } from './message_types.ts';
 import type { ReducerEvent } from './reducer_event.ts';
-import { type RemoteModule, type UntypedRemoteModule } from './spacetime_module.ts';
+import {
+  type RemoteModule,
+  type UntypedRemoteModule,
+} from './spacetime_module.ts';
 import {
   TableCache,
   type Operation,
@@ -48,14 +48,20 @@ import {
 } from './subscription_builder_impl.ts';
 import { stdbLogger } from './logger.ts';
 import { fromByteArray } from 'base64-js';
-import type { ReducerEventInfo, ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers.ts';
+import type {
+  ReducerEventInfo,
+  ReducersView,
+  SetReducerFlags,
+  UntypedReducersDef,
+} from './reducers.ts';
 import type { ClientDbView } from './db_view.ts';
 import type { UntypedTableDef } from '../lib/table.ts';
 import { toCamelCase } from '../lib/utils.ts';
 
 export { DbConnectionBuilder, SubscriptionBuilderImpl, TableCache, type Event };
 
-export type RemoteModuleOf<C> = C extends DbConnectionImpl<infer RM> ? RM : never;
+export type RemoteModuleOf<C> =
+  C extends DbConnectionImpl<infer RM> ? RM : never;
 
 export type {
   DbContext,
@@ -69,13 +75,16 @@ export type {
 export type ConnectionEvent = 'connect' | 'disconnect' | 'connectError';
 export type CallReducerFlags = 'FullUpdate' | 'NoSuccessNotify';
 
-type ReducerEventCallback<RemoteModule extends UntypedRemoteModule, ReducerArgs extends any[] = any[]> = (
+type ReducerEventCallback<
+  RemoteModule extends UntypedRemoteModule,
+  ReducerArgs extends any[] = any[],
+> = (
   ctx: ReducerEventContextInterface<RemoteModule>,
   ...args: ReducerArgs
 ) => void;
 
 type SubscriptionEventCallback<RemoteModule extends UntypedRemoteModule> = (
-  ctx: SubscriptionEventContextInterface<RemoteModule>,
+  ctx: SubscriptionEventContextInterface<RemoteModule>
 ) => void;
 
 function callReducerFlagsToNumber(flags: CallReducerFlags): number {
@@ -100,9 +109,9 @@ export type DbConnectionConfig<RemoteModule extends UntypedRemoteModule> = {
   remoteModule: RemoteModule;
 };
 
-export class DbConnectionImpl<
-  RemoteModule extends UntypedRemoteModule,
-> implements DbContext<RemoteModule> {
+export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
+  implements DbContext<RemoteModule>
+{
   /**
    * Whether or not the connection is active.
    */
@@ -240,7 +249,7 @@ export class DbConnectionImpl<
 
     for (const tbl of def.tables) {
       // ClientDbView uses this name verbatim
-      const key = tbl.accessorName; 
+      const key = tbl.accessorName;
       Object.defineProperty(view, key, {
         enumerable: true,
         configurable: false,
@@ -289,7 +298,11 @@ export class DbConnectionImpl<
   }
 
   #makeEventContext(
-    event: Event<ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>>
+    event: Event<
+      ReducerEventInfo<
+        InferTypeOfRow<RemoteModule['reducers'][number]['params']>
+      >
+    >
   ): EventContextInterface<RemoteModule> {
     // Bind methods to preserve `this` (#private fields safe)
     return {
@@ -316,7 +329,10 @@ export class DbConnectionImpl<
 
   registerSubscription(
     handle: SubscriptionHandleImpl<RemoteModule>,
-    handleEmitter: EventEmitter<SubscribeEvent, SubscriptionEventCallback<RemoteModule>>,
+    handleEmitter: EventEmitter<
+      SubscribeEvent,
+      SubscriptionEventCallback<RemoteModule>
+    >,
     querySql: string[]
   ): number {
     const queryId = this.#getNextQueryId();
@@ -364,14 +380,17 @@ export class DbConnectionImpl<
       const table = this.#remoteModule.tables.find(t => t.name === tableName);
       const rowType = table!.rowType;
       const columnsArray = Object.entries(table!.columns);
-      const primaryKeyColumnEntry = columnsArray.find(col => col[1].columnMetadata.isPrimaryKey);
+      const primaryKeyColumnEntry = columnsArray.find(
+        col => col[1].columnMetadata.isPrimaryKey
+      );
       let previousOffset = 0;
       while (reader.remaining > 0) {
         const row = ProductType.deserializeValue(reader, rowType);
         let rowId: ComparablePrimitive | undefined = undefined;
         if (primaryKeyColumnEntry !== undefined) {
           const primaryKeyColName = primaryKeyColumnEntry[0];
-          const primaryKeyColType = primaryKeyColumnEntry[1].typeBuilder.algebraicType;
+          const primaryKeyColType =
+            primaryKeyColumnEntry[1].typeBuilder.algebraicType;
           rowId = AlgebraicType.intoMapKey(
             primaryKeyColType,
             row[primaryKeyColName]
@@ -494,9 +513,9 @@ export class DbConnectionImpl<
 
         let reducerInfo:
           | {
-            reducerName: string;
-            args: Uint8Array;
-          }
+              reducerName: string;
+              args: Uint8Array;
+            }
           | undefined;
         if (reducerName !== '') {
           reducerInfo = {
@@ -573,7 +592,11 @@ export class DbConnectionImpl<
     this.wsPromise.then(wsResolved => {
       if (wsResolved) {
         const writer = new BinaryWriter(1024);
-        AlgebraicType.serializeValue(writer, ClientMessage.algebraicType, message);
+        AlgebraicType.serializeValue(
+          writer,
+          ClientMessage.algebraicType,
+          message
+        );
         const encoded = writer.getBuffer();
         wsResolved.send(encoded);
       }
@@ -596,7 +619,9 @@ export class DbConnectionImpl<
       // Get table information for the table being updated
       const tableName = tableUpdate.tableName;
       // TODO: performance
-      const tableDef = this.#remoteModule.tables.find(t => t.name === tableName)!;
+      const tableDef = this.#remoteModule.tables.find(
+        t => t.name === tableName
+      )!;
       const table = this.clientCache.getOrCreateTable(tableDef);
       const newCallbacks = table.applyOperations(
         tableUpdate.operations,
@@ -610,7 +635,10 @@ export class DbConnectionImpl<
   }
 
   async #processMessage(data: Uint8Array): Promise<void> {
-    const serverMessage = AlgebraicType.deserializeValue(new BinaryReader(data), ServerMessage.algebraicType);
+    const serverMessage = AlgebraicType.deserializeValue(
+      new BinaryReader(data),
+      ServerMessage.algebraicType
+    );
     const message = await this.#processParsedMessage(serverMessage);
     if (!message) {
       return;
@@ -651,7 +679,9 @@ export class DbConnectionImpl<
         let reducerInfo = message.reducerInfo;
         let unknownTransaction = false;
         let reducerArgs: InferTypeOfRow<typeof reducer.params> | undefined;
-        const reducer = this.#remoteModule.reducers.find(t => t.name === reducerInfo!.reducerName)!;
+        const reducer = this.#remoteModule.reducers.find(
+          t => t.name === reducerInfo!.reducerName
+        )!;
         if (!reducerInfo) {
           unknownTransaction = true;
         } else {
@@ -706,7 +736,7 @@ export class DbConnectionImpl<
           tag: 'Reducer',
           value: reducerEvent,
         };
-        const eventContext = this.#makeEventContext(event); 
+        const eventContext = this.#makeEventContext(event);
         const reducerEventContext = {
           ...eventContext,
           event: reducerEvent,
@@ -718,9 +748,7 @@ export class DbConnectionImpl<
         );
 
         const argsArray: any[] = [];
-        (
-          reducer.paramsType
-        ).elements.forEach(element => {
+        reducer.paramsType.elements.forEach(element => {
           argsArray.push(reducerArgs[element.name!]);
         });
         this.#reducerEmitter.emit(
@@ -861,17 +889,18 @@ export class DbConnectionImpl<
    * Call a reducer on your SpacetimeDB module with typed arguments.
    * @param reducerSchema The schema of the reducer to call
    * @param callReducerFlags The flags for the reducer call
-   * @param params The arguments to pass to the reducer 
+   * @param params The arguments to pass to the reducer
    */
-  callReducerWithParams(reducerName: string, paramsType: ProductType, params: object, flags: CallReducerFlags) {
+  callReducerWithParams(
+    reducerName: string,
+    paramsType: ProductType,
+    params: object,
+    flags: CallReducerFlags
+  ) {
     let writer = new BinaryWriter(1024);
     ProductType.serializeValue(writer, paramsType, params);
     let argsBuffer = writer.getBuffer();
-    this.callReducer(
-      reducerName,
-      argsBuffer,
-      flags
-    );
+    this.callReducer(reducerName, argsBuffer, flags);
   }
 
   /**
@@ -944,13 +973,19 @@ export class DbConnectionImpl<
 
   // Note: This is required to be public because it needs to be
   // called from the `RemoteReducers` class.
-  onReducer(reducerName: string, callback: ReducerEventCallback<RemoteModule>): void {
+  onReducer(
+    reducerName: string,
+    callback: ReducerEventCallback<RemoteModule>
+  ): void {
     this.#reducerEmitter.on(reducerName, callback);
   }
 
   // Note: This is required to be public because it needs to be
   // called from the `RemoteReducers` class.
-  offReducer(reducerName: string, callback: ReducerEventCallback<RemoteModule>): void {
+  offReducer(
+    reducerName: string,
+    callback: ReducerEventCallback<RemoteModule>
+  ): void {
     this.#reducerEmitter.off(reducerName, callback);
   }
 }
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index 65c127d67d5..a991794594e 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -1,5 +1,9 @@
 import type { ClientDbView } from './db_view';
-import type { ReducersView, SetReducerFlags, UntypedReducersDef } from './reducers';
+import type {
+  ReducersView,
+  SetReducerFlags,
+  UntypedReducersDef,
+} from './reducers';
 import type { UntypedRemoteModule } from './spacetime_module';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
 
@@ -21,9 +25,7 @@ export interface DbContext<RemoteModule extends UntypedRemoteModule> {
    *
    * @returns The subscription builder.
    */
-  subscriptionBuilder(): SubscriptionBuilderImpl<
-    RemoteModule
-  >;
+  subscriptionBuilder(): SubscriptionBuilderImpl<RemoteModule>;
 
   /**
    * Disconnects from the database.
diff --git a/crates/bindings-typescript/src/sdk/db_view.ts b/crates/bindings-typescript/src/sdk/db_view.ts
index ffdee9e7199..dcfd6b13517 100644
--- a/crates/bindings-typescript/src/sdk/db_view.ts
+++ b/crates/bindings-typescript/src/sdk/db_view.ts
@@ -1,9 +1,12 @@
-import type { UntypedRemoteModule } from "./spacetime_module";
-import type { ClientTable } from "./client_table";
+import type { UntypedRemoteModule } from './spacetime_module';
+import type { ClientTable } from './client_table';
 
 /**
  * A type representing a client-side database view, mapping table names to their corresponding client Table handles.
  */
 export type ClientDbView<RemoteModule extends UntypedRemoteModule> = {
-  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<RemoteModule, Tbl['name']>;
-};
\ No newline at end of file
+  readonly [Tbl in RemoteModule['tables'][number] as Tbl['accessorName']]: ClientTable<
+    RemoteModule,
+    Tbl['name']
+  >;
+};
diff --git a/crates/bindings-typescript/src/sdk/event_context.ts b/crates/bindings-typescript/src/sdk/event_context.ts
index 8511832cac3..677adcac90d 100644
--- a/crates/bindings-typescript/src/sdk/event_context.ts
+++ b/crates/bindings-typescript/src/sdk/event_context.ts
@@ -7,18 +7,21 @@ import type { UntypedRemoteModule } from './spacetime_module.ts';
 
 export type UntypedEventContext = EventContextInterface<UntypedRemoteModule>;
 
-export interface EventContextInterface<
-  RemoteModule extends UntypedRemoteModule,
-> extends DbContext<RemoteModule> {
+export interface EventContextInterface<RemoteModule extends UntypedRemoteModule>
+  extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
-  event: Event<ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>>;
+  event: Event<
+    ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>
+  >;
 }
 
 export interface ReducerEventContextInterface<
   RemoteModule extends UntypedRemoteModule,
 > extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
-  event: ReducerEvent<ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>>;
+  event: ReducerEvent<
+    ReducerEventInfo<InferTypeOfRow<RemoteModule['reducers'][number]['params']>>
+  >;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -28,9 +31,8 @@ export interface SubscriptionEventContextInterface<
   /** No event is provided **/
 }
 
-export interface ErrorContextInterface<
-  RemoteModule extends UntypedRemoteModule,
-> extends DbContext<RemoteModule> {
+export interface ErrorContextInterface<RemoteModule extends UntypedRemoteModule>
+  extends DbContext<RemoteModule> {
   /** Enum with variants for all possible events. */
   event?: Error;
 }
diff --git a/crates/bindings-typescript/src/sdk/index.ts b/crates/bindings-typescript/src/sdk/index.ts
index 06cf0cdc3b9..30f7b0e90cd 100644
--- a/crates/bindings-typescript/src/sdk/index.ts
+++ b/crates/bindings-typescript/src/sdk/index.ts
@@ -8,4 +8,4 @@ export { type SetReducerFlags } from './reducers.ts';
 export * from '../lib/type_builders.ts';
 export { schema, convertToAccessorMap } from '../lib/schema.ts';
 export { table } from '../lib/table.ts';
-export { reducerSchema, reducers } from '../lib/reducers.ts';
\ No newline at end of file
+export { reducerSchema, reducers } from '../lib/reducers.ts';
diff --git a/crates/bindings-typescript/src/sdk/message_types.ts b/crates/bindings-typescript/src/sdk/message_types.ts
index 3ae8314b2c2..24e834a1ebe 100644
--- a/crates/bindings-typescript/src/sdk/message_types.ts
+++ b/crates/bindings-typescript/src/sdk/message_types.ts
@@ -25,11 +25,10 @@ export type TransactionUpdateMessage = {
   energyConsumed: bigint;
 };
 
-export type TransactionUpdateLightMessage =
-  {
-    tag: 'TransactionUpdateLight';
-    tableUpdates: TableUpdate<UntypedTableDef>[];
-  };
+export type TransactionUpdateLightMessage = {
+  tag: 'TransactionUpdateLight';
+  tableUpdates: TableUpdate<UntypedTableDef>[];
+};
 
 export type IdentityTokenMessage = {
   tag: 'IdentityToken';
@@ -57,10 +56,10 @@ export type SubscriptionError = {
 };
 
 export type Message =
-    | InitialSubscriptionMessage
-    | TransactionUpdateMessage
-    | TransactionUpdateLightMessage
-    | IdentityTokenMessage
-    | SubscribeAppliedMessage
-    | UnsubscribeAppliedMessage
-    | SubscriptionError;
+  | InitialSubscriptionMessage
+  | TransactionUpdateMessage
+  | TransactionUpdateLightMessage
+  | IdentityTokenMessage
+  | SubscribeAppliedMessage
+  | UnsubscribeAppliedMessage
+  | SubscriptionError;
diff --git a/crates/bindings-typescript/src/sdk/reducer_handle.ts b/crates/bindings-typescript/src/sdk/reducer_handle.ts
index a4e76eda4a4..17a80e72000 100644
--- a/crates/bindings-typescript/src/sdk/reducer_handle.ts
+++ b/crates/bindings-typescript/src/sdk/reducer_handle.ts
@@ -3,10 +3,10 @@ export type ReducerHandle<ReducerName extends string> = {
   readonly reducerName?: ReducerName;
 };
 
-export type ReducerNamesFromReducers<R> = R extends object 
+export type ReducerNamesFromReducers<R> = R extends object
   ? {
       [K in keyof R]: R[K] extends ReducerHandle<infer ReducerName>
-        ? ReducerName 
+        ? ReducerName
         : never;
     }[keyof R]
   : never;
diff --git a/crates/bindings-typescript/src/sdk/reducers.ts b/crates/bindings-typescript/src/sdk/reducers.ts
index f341e73dd36..e8bf048e868 100644
--- a/crates/bindings-typescript/src/sdk/reducers.ts
+++ b/crates/bindings-typescript/src/sdk/reducers.ts
@@ -1,13 +1,14 @@
-import type { ProductType } from "../lib/algebraic_type";
-import type { ParamsObj } from "../lib/reducers";
-import type { CoerceRow } from "../lib/table";
-import type { InferTypeOfRow } from "../lib/type_builders";
-import type { CamelCase } from "../lib/type_util";
-import type { CallReducerFlags } from "./db_connection_impl";
+import type { ProductType } from '../lib/algebraic_type';
+import type { ParamsObj } from '../lib/reducers';
+import type { CoerceRow } from '../lib/table';
+import type { InferTypeOfRow } from '../lib/type_builders';
+import type { CamelCase } from '../lib/type_util';
+import type { CallReducerFlags } from './db_connection_impl';
 
 export type ReducersView<R extends UntypedReducersDef> = {
-  [I in keyof R['reducers'] as CamelCase<R['reducers'][number]['accessorName']>]:
-    (params: InferTypeOfRow<R['reducers'][number]['params']>) => void
+  [I in keyof R['reducers'] as CamelCase<
+    R['reducers'][number]['accessorName']
+  >]: (params: InferTypeOfRow<R['reducers'][number]['params']>) => void;
 };
 
 export type ReducerEventInfo<Args extends object = object> = {
@@ -18,7 +19,7 @@ export type ReducerEventInfo<Args extends object = object> = {
 export type UntypedReducerDef = {
   name: string;
   accessorName: string;
-  params: CoerceRow<ParamsObj>; 
+  params: CoerceRow<ParamsObj>;
   paramsType: ProductType;
 };
 
@@ -27,5 +28,7 @@ export type UntypedReducersDef = {
 };
 
 export type SetReducerFlags<R extends UntypedReducersDef> = {
-  [K in keyof R['reducers'] as CamelCase<R['reducers'][number]['name']>]: (flags: CallReducerFlags) => void;
-};
\ No newline at end of file
+  [K in keyof R['reducers'] as CamelCase<R['reducers'][number]['name']>]: (
+    flags: CallReducerFlags
+  ) => void;
+};
diff --git a/crates/bindings-typescript/src/sdk/set_reducer_flags.ts b/crates/bindings-typescript/src/sdk/set_reducer_flags.ts
index a5648b67d36..35fdf3a1c39 100644
--- a/crates/bindings-typescript/src/sdk/set_reducer_flags.ts
+++ b/crates/bindings-typescript/src/sdk/set_reducer_flags.ts
@@ -1,3 +1,6 @@
-import type { CallReducerFlags } from "./db_connection_impl";
+import type { CallReducerFlags } from './db_connection_impl';
 
-export type UntypedSetReducerFlags = Record<string, (flags: CallReducerFlags) => void>;
\ No newline at end of file
+export type UntypedSetReducerFlags = Record<
+  string,
+  (flags: CallReducerFlags) => void
+>;
diff --git a/crates/bindings-typescript/src/sdk/spacetime_module.ts b/crates/bindings-typescript/src/sdk/spacetime_module.ts
index 73f7d5fdca9..bf37b798d2f 100644
--- a/crates/bindings-typescript/src/sdk/spacetime_module.ts
+++ b/crates/bindings-typescript/src/sdk/spacetime_module.ts
@@ -4,15 +4,21 @@ import type { UntypedReducersDef } from './reducers';
 export type RemoteModule<
   SchemaDef extends UntypedSchemaDef,
   ReducersDef extends UntypedReducersDef,
-  CLI extends string = string
-> = SchemaDef & ReducersDef & {
-  versionInfo: {
-    cliVersion: CLI;
+  CLI extends string = string,
+> = SchemaDef &
+  ReducersDef & {
+    versionInfo: {
+      cliVersion: CLI;
+    };
   };
-}
 
-export type UntypedRemoteModule = RemoteModule<UntypedSchemaDef, UntypedReducersDef>;
+export type UntypedRemoteModule = RemoteModule<
+  UntypedSchemaDef,
+  UntypedReducersDef
+>;
 
-export type SchemaDef<RemoteModule extends UntypedRemoteModule> = RemoteModule['tables'];
+export type SchemaDef<RemoteModule extends UntypedRemoteModule> =
+  RemoteModule['tables'];
 
-export type ReducersDef<RemoteModule extends UntypedRemoteModule> = RemoteModule['reducers'];
\ No newline at end of file
+export type ReducersDef<RemoteModule extends UntypedRemoteModule> =
+  RemoteModule['reducers'];
diff --git a/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts b/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
index 842e055b791..851b6baffe0 100644
--- a/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
+++ b/crates/bindings-typescript/src/sdk/subscription_builder_impl.ts
@@ -6,18 +6,11 @@ import type {
 import { EventEmitter } from './event_emitter';
 import type { UntypedRemoteModule } from './spacetime_module';
 
-export class SubscriptionBuilderImpl<
-  RemoteModule extends UntypedRemoteModule,
-> {
-  #onApplied?: (
-    ctx: SubscriptionEventContextInterface<RemoteModule>
-  ) => void = undefined;
-  #onError?: (
-    ctx: ErrorContextInterface<RemoteModule>
-  ) => void = undefined;
-  constructor(
-    private db: DbConnectionImpl<RemoteModule>
-  ) {}
+export class SubscriptionBuilderImpl<RemoteModule extends UntypedRemoteModule> {
+  #onApplied?: (ctx: SubscriptionEventContextInterface<RemoteModule>) => void =
+    undefined;
+  #onError?: (ctx: ErrorContextInterface<RemoteModule>) => void = undefined;
+  constructor(private db: DbConnectionImpl<RemoteModule>) {}
 
   /**
    * Registers `callback` to run when this query is successfully added to our subscribed set,
@@ -35,9 +28,7 @@ export class SubscriptionBuilderImpl<
    * @returns The current `SubscriptionBuilder` instance.
    */
   onApplied(
-    cb: (
-      ctx: SubscriptionEventContextInterface<RemoteModule>
-    ) => void
+    cb: (ctx: SubscriptionEventContextInterface<RemoteModule>) => void
   ): SubscriptionBuilderImpl<RemoteModule> {
     this.#onApplied = cb;
     return this;
@@ -128,13 +119,14 @@ export type SubscribeEvent = 'applied' | 'error' | 'end';
 export class SubscriptionManager<RemoteModule extends UntypedRemoteModule> {
   subscriptions: Map<
     number,
-    { handle: SubscriptionHandleImpl<RemoteModule>; emitter: EventEmitter<SubscribeEvent> }
+    {
+      handle: SubscriptionHandleImpl<RemoteModule>;
+      emitter: EventEmitter<SubscribeEvent>;
+    }
   > = new Map();
 }
 
-export class SubscriptionHandleImpl<
-  RemoteModule extends UntypedRemoteModule,
-> {
+export class SubscriptionHandleImpl<RemoteModule extends UntypedRemoteModule> {
   #queryId: number;
   #unsubscribeCalled: boolean = false;
   #endedState: boolean = false;
@@ -145,19 +137,12 @@ export class SubscriptionHandleImpl<
   constructor(
     private db: DbConnectionImpl<RemoteModule>,
     querySql: string[],
-    onApplied?: (
-      ctx: SubscriptionEventContextInterface<RemoteModule>
-    ) => void,
-    onError?: (
-      ctx: ErrorContextInterface<RemoteModule>,
-      error: Error
-    ) => void
+    onApplied?: (ctx: SubscriptionEventContextInterface<RemoteModule>) => void,
+    onError?: (ctx: ErrorContextInterface<RemoteModule>, error: Error) => void
   ) {
     this.#emitter.on(
       'applied',
-      (
-        ctx: SubscriptionEventContextInterface<RemoteModule>
-      ) => {
+      (ctx: SubscriptionEventContextInterface<RemoteModule>) => {
         this.#activeState = true;
         if (onApplied) {
           onApplied(ctx);
@@ -166,10 +151,7 @@ export class SubscriptionHandleImpl<
     );
     this.#emitter.on(
       'error',
-      (
-        ctx: ErrorContextInterface<RemoteModule>,
-        error: Error
-      ) => {
+      (ctx: ErrorContextInterface<RemoteModule>, error: Error) => {
         this.#activeState = false;
         this.#endedState = true;
         if (onError) {
@@ -193,9 +175,7 @@ export class SubscriptionHandleImpl<
     this.db.unregisterSubscription(this.#queryId);
     this.#emitter.on(
       'end',
-      (
-        _ctx: SubscriptionEventContextInterface<RemoteModule>
-      ) => {
+      (_ctx: SubscriptionEventContextInterface<RemoteModule>) => {
         this.#endedState = true;
         this.#activeState = false;
       }
@@ -213,9 +193,7 @@ export class SubscriptionHandleImpl<
    * @param onEnd - Callback to run upon successful unsubscribe.
    */
   unsubscribeThen(
-    onEnd: (
-      ctx: SubscriptionEventContextInterface<RemoteModule>
-    ) => void
+    onEnd: (ctx: SubscriptionEventContextInterface<RemoteModule>) => void
   ): void {
     if (this.#endedState) {
       throw new Error('Subscription has already ended');
@@ -227,9 +205,7 @@ export class SubscriptionHandleImpl<
     this.db.unregisterSubscription(this.#queryId);
     this.#emitter.on(
       'end',
-      (
-        ctx: SubscriptionEventContextInterface<RemoteModule>
-      ) => {
+      (ctx: SubscriptionEventContextInterface<RemoteModule>) => {
         this.#endedState = true;
         this.#activeState = false;
         onEnd(ctx);
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index 655a17278f9..66e8330dc0b 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -2,9 +2,16 @@ import { EventEmitter } from './event_emitter.ts';
 
 import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
-import type { EventContextInterface, ClientTable, TableDefForTableName } from './index.ts';
+import type {
+  EventContextInterface,
+  ClientTable,
+  TableDefForTableName,
+} from './index.ts';
 import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
-import type { ClientTableCore, ClientTableCoreImplementable } from './client_table.ts';
+import type {
+  ClientTableCore,
+  ClientTableCoreImplementable,
+} from './client_table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 import type { TableNamesOf } from '../lib/schema.ts';
 
@@ -18,9 +25,7 @@ export type Operation<
   row: RowType;
 };
 
-export type TableUpdate<
-  TableDef extends UntypedTableDef,
-> = {
+export type TableUpdate<TableDef extends UntypedTableDef> = {
   tableName: string;
   operations: Operation<RowType<TableDef>>[];
 };
@@ -37,8 +42,12 @@ export type PendingCallback = {
 export class TableCache<
   RemoteModule extends UntypedRemoteModule,
   TableName extends TableNamesOf<RemoteModule>,
-> implements ClientTableCoreImplementable<RemoteModule, TableName> {
-  private rows: Map<ComparablePrimitive, [RowType<TableDefForTableName<RemoteModule, TableName>>, number]>;
+> implements ClientTableCoreImplementable<RemoteModule, TableName>
+{
+  private rows: Map<
+    ComparablePrimitive,
+    [RowType<TableDefForTableName<RemoteModule, TableName>>, number]
+  >;
   private tableDef: TableDefForTableName<RemoteModule, TableName>;
   private emitter: EventEmitter<'insert' | 'delete' | 'update'>;
 
@@ -64,8 +73,17 @@ export class TableCache<
   /**
    * @returns The values of the rows in the table
    */
-  iter(): IterableIterator<RowType<TableDefForTableName<RemoteModule, TableName>>> {
-    function* generator(rows: Map<ComparablePrimitive, [RowType<TableDefForTableName<RemoteModule, TableName>>, number]>): IterableIterator<RowType<TableDefForTableName<RemoteModule, TableName>>> {
+  iter(): IterableIterator<
+    RowType<TableDefForTableName<RemoteModule, TableName>>
+  > {
+    function* generator(
+      rows: Map<
+        ComparablePrimitive,
+        [RowType<TableDefForTableName<RemoteModule, TableName>>, number]
+      >
+    ): IterableIterator<
+      RowType<TableDefForTableName<RemoteModule, TableName>>
+    > {
       for (const [row] of rows.values()) {
         yield row;
       }
@@ -74,28 +92,40 @@ export class TableCache<
   }
 
   /**
-   * Allows iteration over the rows in the table 
+   * Allows iteration over the rows in the table
    * @returns An iterator over the rows in the table
    */
-  [Symbol.iterator](): IterableIterator<RowType<TableDefForTableName<RemoteModule, TableName>>> {
+  [Symbol.iterator](): IterableIterator<
+    RowType<TableDefForTableName<RemoteModule, TableName>>
+  > {
     return this.iter();
   }
 
   applyOperations = (
-    operations: Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>[],
+    operations: Operation<
+      RowType<TableDefForTableName<RemoteModule, TableName>>
+    >[],
     ctx: EventContextInterface<RemoteModule>
   ): PendingCallback[] => {
     const pendingCallbacks: PendingCallback[] = [];
     // TODO: performance
-    const hasPrimaryKey = Object.values(this.tableDef.columns).some(col => col.columnMetadata.isPrimaryKey === true); 
+    const hasPrimaryKey = Object.values(this.tableDef.columns).some(
+      col => col.columnMetadata.isPrimaryKey === true
+    );
     if (hasPrimaryKey) {
       const insertMap = new Map<
         ComparablePrimitive,
-        [Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>, number]
+        [
+          Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>,
+          number,
+        ]
       >();
       const deleteMap = new Map<
         ComparablePrimitive,
-        [Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>, number]
+        [
+          Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>,
+          number,
+        ]
       >();
       for (const op of operations) {
         if (op.type === 'insert') {
@@ -205,7 +235,9 @@ export class TableCache<
 
   insert = (
     ctx: EventContextInterface<RemoteModule>,
-    operation: Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>,
+    operation: Operation<
+      RowType<TableDefForTableName<RemoteModule, TableName>>
+    >,
     count: number = 1
   ): PendingCallback | undefined => {
     const [_, previousCount] = this.rows.get(operation.rowId) || [
@@ -228,7 +260,9 @@ export class TableCache<
 
   delete = (
     ctx: EventContextInterface<RemoteModule>,
-    operation: Operation<RowType<TableDefForTableName<RemoteModule, TableName>>>,
+    operation: Operation<
+      RowType<TableDefForTableName<RemoteModule, TableName>>
+    >,
     count: number = 1
   ): PendingCallback | undefined => {
     const [_, previousCount] = this.rows.get(operation.rowId) || [
@@ -272,7 +306,10 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onInsert = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
   ): void => {
     this.emitter.on('insert', cb);
   };
@@ -293,7 +330,10 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onDelete = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
   ): void => {
     this.emitter.on('delete', cb);
   };
@@ -314,7 +354,11 @@ export class TableCache<
    * @param cb Callback to be called when a new row is inserted
    */
   onUpdate = (
-    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
   ): void => {
     this.emitter.on('update', cb);
   };
@@ -325,7 +369,10 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnInsert = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
   ): void => {
     this.emitter.off('insert', cb);
   };
@@ -336,7 +383,10 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnDelete = (
-    cb: (ctx: EventContextInterface<RemoteModule>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
   ): void => {
     this.emitter.off('delete', cb);
   };
@@ -347,7 +397,11 @@ export class TableCache<
    * @param cb Callback to be removed
    */
   removeOnUpdate = (
-    cb: (ctx: EventContextInterface<RemoteModule>, oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>, row: RowType<TableDefForTableName<RemoteModule, TableName>>) => void
+    cb: (
+      ctx: EventContextInterface<RemoteModule>,
+      oldRow: RowType<TableDefForTableName<RemoteModule, TableName>>,
+      row: RowType<TableDefForTableName<RemoteModule, TableName>>
+    ) => void
   ): void => {
     this.emitter.off('update', cb);
   };
diff --git a/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts b/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
index 2b1dc2ac25f..58f1861603a 100644
--- a/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
+++ b/crates/bindings-typescript/src/sdk/websocket_test_adapter.ts
@@ -30,11 +30,7 @@ class WebsocketTestAdapter {
 
   sendToClient(message: Infer<typeof ServerMessage>): void {
     const writer = new BinaryWriter(1024);
-    AlgebraicType.serializeValue(
-      writer,
-      ServerMessage.algebraicType,
-      message
-    );
+    AlgebraicType.serializeValue(writer, ServerMessage.algebraicType, message);
     const rawBytes = writer.getBuffer();
     // The brotli library's `compress` is somehow broken: it returns `null` for some inputs.
     // See https://github.com/foliojs/brotli.js/issues/36, which is closed but not actually fixed.
diff --git a/crates/bindings-typescript/src/server/db_view.ts b/crates/bindings-typescript/src/server/db_view.ts
index 43a4a284ed3..25e3978c288 100644
--- a/crates/bindings-typescript/src/server/db_view.ts
+++ b/crates/bindings-typescript/src/server/db_view.ts
@@ -1,5 +1,5 @@
-import type { UntypedSchemaDef } from "../lib/schema";
-import type { ReadonlyTable, Table } from "../lib/table";
+import type { UntypedSchemaDef } from '../lib/schema';
+import type { ReadonlyTable, Table } from '../lib/table';
 
 /**
  * A type representing a read-only database view, mapping table names to their corresponding read-only Table handles.
@@ -13,4 +13,4 @@ export type ReadonlyDbView<SchemaDef extends UntypedSchemaDef> = {
  */
 export type DbView<SchemaDef extends UntypedSchemaDef> = {
   readonly [Tbl in SchemaDef['tables'][number] as Tbl['accessorName']]: Table<Tbl>;
-};
\ No newline at end of file
+};
diff --git a/crates/bindings-typescript/src/server/runtime.ts b/crates/bindings-typescript/src/server/runtime.ts
index ea442b38308..fd2a9e6a02b 100644
--- a/crates/bindings-typescript/src/server/runtime.ts
+++ b/crates/bindings-typescript/src/server/runtime.ts
@@ -180,8 +180,8 @@ export const hooks: ModuleHooks = {
     AlgebraicType.serializeValue(
       writer,
       RawModuleDef.algebraicType,
-      RawModuleDef.create('V9', MODULE_DEF),
-    )
+      RawModuleDef.create('V9', MODULE_DEF)
+    );
     return writer.getBuffer();
   },
   __call_reducer__(reducerId, sender, connId, timestamp, argsBuf) {
@@ -235,7 +235,10 @@ function makeDbView(moduleDef: Infer<typeof RawModuleDefV9>): DbView<any> {
   );
 }
 
-function makeTableView(typespace: Infer<typeof Typespace>, table: Infer<typeof RawTableDefV9>): Table<any> {
+function makeTableView(
+  typespace: Infer<typeof Typespace>,
+  table: Infer<typeof RawTableDefV9>
+): Table<any> {
   const table_id = sys.table_id_from_name(table.name);
   const rowType = typespace.types[table.productTypeRef];
   if (rowType.tag !== 'Product') {
@@ -472,7 +475,10 @@ function makeTableView(typespace: Infer<typeof Typespace>, table: Infer<typeof R
   return freeze(tableView);
 }
 
-function bsatnBaseSize(typespace: Infer<typeof Typespace>, ty: AlgebraicType): number {
+function bsatnBaseSize(
+  typespace: Infer<typeof Typespace>,
+  ty: AlgebraicType
+): number {
   const assumedArrayLength = 4;
   while (ty.tag === 'Ref') ty = typespace.types[ty.value];
   if (ty.tag === 'Product') {
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index 3ef576fb0e1..3bbee2cbf27 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -1,7 +1,13 @@
 import { tables, reducers } from './module_bindings';
 import { useEffect } from 'react';
 import './App.css';
-import { eq, useReducer, useSpacetimeDB, useTable, where } from '../../src/react';
+import {
+  eq,
+  useReducer,
+  useSpacetimeDB,
+  useTable,
+  where,
+} from '../../src/react';
 
 function getRandomInt(max: number) {
   return Math.floor(Math.random() * max);
@@ -10,10 +16,9 @@ function getRandomInt(max: number) {
 function App() {
   const connection = useSpacetimeDB();
   const players = useTable(tables.player, where(eq('name', 'Hello')), {
-    onInsert: (row) => {
-      console.log('Player inserted:', rows);
+    onInsert: row => {
+      console.log('Player inserted:', row);
     },
-
   });
   const x = players[0];
   const createPlayer = useReducer(reducers.createPlayer);
diff --git a/crates/bindings-typescript/tests/serde.test.ts b/crates/bindings-typescript/tests/serde.test.ts
index 21cb3d639cb..c740dd2ec8e 100644
--- a/crates/bindings-typescript/tests/serde.test.ts
+++ b/crates/bindings-typescript/tests/serde.test.ts
@@ -1,5 +1,12 @@
 import { describe, expect, test } from 'vitest';
-import { AlgebraicType, BinaryReader, BinaryWriter, ConnectionId, Identity, ScheduleAt } from 'spacetimedb';
+import {
+  AlgebraicType,
+  BinaryReader,
+  BinaryWriter,
+  ConnectionId,
+  Identity,
+  ScheduleAt,
+} from 'spacetimedb';
 
 describe('it correctly serializes and deserializes algebraic values', () => {
   test('when it serializes and deserializes with a product type', () => {

From cb16789be729954a7c47b87fb40b35baa0bd1029 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 9 Nov 2025 15:51:00 -0500
Subject: [PATCH 19/23] Removed generation of variant types since they can now
 be derived from the type builders

---
 .../src/lib/autogen/algebraic_type_type.ts    |   2 -
 .../lib/autogen/algebraic_type_variants.ts    |  38 --
 .../src/lib/autogen/index_type_type.ts        |   1 -
 .../src/lib/autogen/index_type_variants.ts    |  14 -
 .../src/lib/autogen/lifecycle_type.ts         |   1 -
 .../src/lib/autogen/lifecycle_variants.ts     |  15 -
 .../lib/autogen/misc_module_export_type.ts    |   2 -
 .../autogen/misc_module_export_variants.ts    |  17 -
 .../autogen/raw_constraint_data_v_9_type.ts   |   2 -
 .../raw_constraint_data_v_9_variants.ts       |  17 -
 .../lib/autogen/raw_index_algorithm_type.ts   |   1 -
 .../autogen/raw_index_algorithm_variants.ts   |  15 -
 .../raw_misc_module_export_v_9_type.ts        |   2 -
 .../raw_misc_module_export_v_9_variants.ts    |  24 --
 .../src/lib/autogen/raw_module_def_type.ts    |   2 -
 .../lib/autogen/raw_module_def_variants.ts    |  19 -
 .../src/lib/autogen/table_access_type.ts      |   1 -
 .../src/lib/autogen/table_access_variants.ts  |  14 -
 .../src/lib/autogen/table_type_type.ts        |   1 -
 .../src/lib/autogen/table_type_variants.ts    |  14 -
 .../bindings-typescript/src/lib/reducers.ts   |   1 -
 crates/bindings-typescript/src/lib/table.ts   |   3 +-
 .../src/lib/type_builders.ts                  |   1 +
 .../src/react/useReducer.ts                   |  21 +-
 .../src/react/useSpacetimeDB.ts               |   2 -
 .../src/sdk/client_api/client_message_type.ts |   2 -
 .../sdk/client_api/client_message_variants.ts |  52 ---
 .../compressable_query_update_type.ts         |   2 -
 .../compressable_query_update_variants.ts     |  19 -
 .../sdk/client_api/procedure_status_type.ts   |   1 -
 .../client_api/procedure_status_variants.ts   |  15 -
 .../src/sdk/client_api/row_size_hint_type.ts  |   1 -
 .../sdk/client_api/row_size_hint_variants.ts  |  14 -
 .../src/sdk/client_api/server_message_type.ts |   2 -
 .../sdk/client_api/server_message_variants.ts |  67 ----
 .../src/sdk/client_api/update_status_type.ts  |   2 -
 .../sdk/client_api/update_status_variants.ts  |  19 -
 .../src/sdk/client_cache.ts                   |   2 +-
 .../src/sdk/db_connection_builder.ts          |   1 -
 .../src/sdk/db_connection_impl.ts             |   6 +-
 .../bindings-typescript/src/sdk/db_context.ts |   1 -
 .../src/sdk/message_types.ts                  |   2 +-
 .../src/sdk/table_cache.ts                    |   4 +-
 .../bindings-typescript/test-app/src/App.tsx  |   1 -
 .../test-app/src/module_bindings/index.ts     |  16 +-
 .../test-react-router-app/package.json        |   1 +
 .../test-react-router-app/server/src/lib.rs   |   1 +
 .../module_bindings/clear_counter_reducer.ts  |  64 +---
 .../client_connected_reducer.ts               |  65 +---
 .../client_disconnected_reducer.ts            |  65 +---
 .../src/module_bindings/counter_table.ts      | 118 +------
 .../src/module_bindings/counter_type.ts       |  71 +---
 .../increment_counter_reducer.ts              |  65 +---
 .../src/module_bindings/index.ts              | 333 +++++-------------
 .../src/module_bindings/offline_user_table.ts | 116 +-----
 .../src/module_bindings/user_table.ts         | 116 +-----
 .../src/module_bindings/user_type.ts          |  74 +---
 .../src/pages/CounterPage.tsx                 |  13 +-
 .../src/pages/UserPage.tsx                    |  26 +-
 crates/codegen/src/typescript.rs              | 172 ++-------
 pnpm-lock.yaml                                | 179 ++++++++--
 61 files changed, 380 insertions(+), 1558 deletions(-)
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
 delete mode 100644 crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
 delete mode 100644 crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts

diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
index fd16d887075..8ec644f676b 100644
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/algebraic_type_type.ts
@@ -12,8 +12,6 @@ import {
 import SumType from './sum_type_type';
 import ProductType from './product_type_type';
 
-import * as AlgebraicTypeVariants from './algebraic_type_variants';
-
 // The tagged union or sum type for the algebraic type `AlgebraicType`.
 const AlgebraicType: __TypeBuilder<__AlgebraicTypeType, __AlgebraicTypeType> =
   __t.enum('AlgebraicType', {
diff --git a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
deleted file mode 100644
index b81b181d802..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/algebraic_type_variants.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-import AlgebraicTypeType from './algebraic_type_type';
-import SumTypeType from './sum_type_type';
-import ProductTypeType from './product_type_type';
-
-export type Ref = { tag: 'Ref'; value: number };
-export type Sum = { tag: 'Sum'; value: __Infer<typeof SumTypeType> };
-export type Product = {
-  tag: 'Product';
-  value: __Infer<typeof ProductTypeType>;
-};
-export type Array = { tag: 'Array'; value: __Infer<typeof AlgebraicTypeType> };
-export type String = { tag: 'String' };
-export type Bool = { tag: 'Bool' };
-export type I8 = { tag: 'I8' };
-export type U8 = { tag: 'U8' };
-export type I16 = { tag: 'I16' };
-export type U16 = { tag: 'U16' };
-export type I32 = { tag: 'I32' };
-export type U32 = { tag: 'U32' };
-export type I64 = { tag: 'I64' };
-export type U64 = { tag: 'U64' };
-export type I128 = { tag: 'I128' };
-export type U128 = { tag: 'U128' };
-export type I256 = { tag: 'I256' };
-export type U256 = { tag: 'U256' };
-export type F32 = { tag: 'F32' };
-export type F64 = { tag: 'F64' };
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
index 7253194254a..4c2c4d6f3fc 100644
--- a/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/index_type_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../index';
-import * as IndexTypeVariants from './index_type_variants';
 
 // The tagged union or sum type for the algebraic type `IndexType`.
 const IndexType = __t.enum('IndexType', {
diff --git a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
deleted file mode 100644
index 37e5ee90972..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/index_type_variants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-
-export type BTree = { tag: 'BTree' };
-export type Hash = { tag: 'Hash' };
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
index 3f80e90dfb4..8de101313f0 100644
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/lifecycle_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../index';
-import * as LifecycleVariants from './lifecycle_variants';
 
 // The tagged union or sum type for the algebraic type `Lifecycle`.
 const Lifecycle = __t.enum('Lifecycle', {
diff --git a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts b/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
deleted file mode 100644
index 0570638b19f..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/lifecycle_variants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-
-export type Init = { tag: 'Init' };
-export type OnConnect = { tag: 'OnConnect' };
-export type OnDisconnect = { tag: 'OnDisconnect' };
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
index b4d4be33f34..753169f2831 100644
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/misc_module_export_type.ts
@@ -11,8 +11,6 @@ import {
 } from '../../index';
 import TypeAlias from './type_alias_type';
 
-import * as MiscModuleExportVariants from './misc_module_export_variants';
-
 // The tagged union or sum type for the algebraic type `MiscModuleExport`.
 const MiscModuleExport = __t.enum('MiscModuleExport', {
   get TypeAlias() {
diff --git a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts b/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
deleted file mode 100644
index 99d584fbdca..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/misc_module_export_variants.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-import TypeAliasType from './type_alias_type';
-
-export type TypeAlias = {
-  tag: 'TypeAlias';
-  value: __Infer<typeof TypeAliasType>;
-};
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
index 314c7014bfb..dafe670e956 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_type.ts
@@ -11,8 +11,6 @@ import {
 } from '../../index';
 import RawUniqueConstraintDataV9 from './raw_unique_constraint_data_v_9_type';
 
-import * as RawConstraintDataV9Variants from './raw_constraint_data_v_9_variants';
-
 // The tagged union or sum type for the algebraic type `RawConstraintDataV9`.
 const RawConstraintDataV9 = __t.enum('RawConstraintDataV9', {
   get Unique() {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
deleted file mode 100644
index 5ace6a528b1..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/raw_constraint_data_v_9_variants.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-import RawUniqueConstraintDataV9Type from './raw_unique_constraint_data_v_9_type';
-
-export type Unique = {
-  tag: 'Unique';
-  value: __Infer<typeof RawUniqueConstraintDataV9Type>;
-};
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
index e755ee94c7e..f70c8992c68 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../index';
-import * as RawIndexAlgorithmVariants from './raw_index_algorithm_variants';
 
 // The tagged union or sum type for the algebraic type `RawIndexAlgorithm`.
 const RawIndexAlgorithm = __t.enum('RawIndexAlgorithm', {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
deleted file mode 100644
index 709fb79d6d2..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/raw_index_algorithm_variants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-
-export type BTree = { tag: 'BTree'; value: number[] };
-export type Hash = { tag: 'Hash'; value: number[] };
-export type Direct = { tag: 'Direct'; value: number };
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
index 5f592285551..81612d985f9 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_type.ts
@@ -13,8 +13,6 @@ import RawColumnDefaultValueV9 from './raw_column_default_value_v_9_type';
 import RawProcedureDefV9 from './raw_procedure_def_v_9_type';
 import RawViewDefV9 from './raw_view_def_v_9_type';
 
-import * as RawMiscModuleExportV9Variants from './raw_misc_module_export_v_9_variants';
-
 // The tagged union or sum type for the algebraic type `RawMiscModuleExportV9`.
 const RawMiscModuleExportV9 = __t.enum('RawMiscModuleExportV9', {
   get ColumnDefaultValue() {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
deleted file mode 100644
index ec0e9e4f899..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/raw_misc_module_export_v_9_variants.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-import RawColumnDefaultValueV9Type from './raw_column_default_value_v_9_type';
-import RawProcedureDefV9Type from './raw_procedure_def_v_9_type';
-import RawViewDefV9Type from './raw_view_def_v_9_type';
-
-export type ColumnDefaultValue = {
-  tag: 'ColumnDefaultValue';
-  value: __Infer<typeof RawColumnDefaultValueV9Type>;
-};
-export type Procedure = {
-  tag: 'Procedure';
-  value: __Infer<typeof RawProcedureDefV9Type>;
-};
-export type View = { tag: 'View'; value: __Infer<typeof RawViewDefV9Type> };
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
index e808e1528a7..ac92d10fa65 100644
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/raw_module_def_type.ts
@@ -12,8 +12,6 @@ import {
 import RawModuleDefV8 from './raw_module_def_v_8_type';
 import RawModuleDefV9 from './raw_module_def_v_9_type';
 
-import * as RawModuleDefVariants from './raw_module_def_variants';
-
 // The tagged union or sum type for the algebraic type `RawModuleDef`.
 const RawModuleDef = __t.enum('RawModuleDef', {
   get V8BackCompat() {
diff --git a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts b/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
deleted file mode 100644
index 2f1f1e2d2b0..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/raw_module_def_variants.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-import RawModuleDefV8Type from './raw_module_def_v_8_type';
-import RawModuleDefV9Type from './raw_module_def_v_9_type';
-
-export type V8BackCompat = {
-  tag: 'V8BackCompat';
-  value: __Infer<typeof RawModuleDefV8Type>;
-};
-export type V9 = { tag: 'V9'; value: __Infer<typeof RawModuleDefV9Type> };
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
index 0d310bf2d23..80d87d447c0 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_access_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../index';
-import * as TableAccessVariants from './table_access_variants';
 
 // The tagged union or sum type for the algebraic type `TableAccess`.
 const TableAccess = __t.enum('TableAccess', {
diff --git a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
deleted file mode 100644
index 9567b4f4006..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/table_access_variants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-
-export type Public = { tag: 'Public' };
-export type Private = { tag: 'Private' };
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
index ee5cfa6b497..b5d1071151c 100644
--- a/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
+++ b/crates/bindings-typescript/src/lib/autogen/table_type_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../index';
-import * as TableTypeVariants from './table_type_variants';
 
 // The tagged union or sum type for the algebraic type `TableType`.
 const TableType = __t.enum('TableType', {
diff --git a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts b/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
deleted file mode 100644
index ea10b2d5aaa..00000000000
--- a/crates/bindings-typescript/src/lib/autogen/table_type_variants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../index';
-
-export type System = { tag: 'System' };
-export type User = { tag: 'User' };
diff --git a/crates/bindings-typescript/src/lib/reducers.ts b/crates/bindings-typescript/src/lib/reducers.ts
index da7191d8f76..1550173e1ee 100644
--- a/crates/bindings-typescript/src/lib/reducers.ts
+++ b/crates/bindings-typescript/src/lib/reducers.ts
@@ -11,7 +11,6 @@ import {
   RowBuilder,
   type Infer,
   type InferTypeOfRow,
-  type ProductBuilder,
   type RowObj,
   type TypeBuilder,
 } from './type_builders';
diff --git a/crates/bindings-typescript/src/lib/table.ts b/crates/bindings-typescript/src/lib/table.ts
index 6d27e10a799..6187f5a4b78 100644
--- a/crates/bindings-typescript/src/lib/table.ts
+++ b/crates/bindings-typescript/src/lib/table.ts
@@ -286,8 +286,7 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
   // add explicit constraints from options.constraints
   for (const constraintOpts of opts.constraints ?? []) {
     if (constraintOpts.constraint === 'unique') {
-      let data: Infer<typeof RawConstraintDefV9>['data'];
-      data = {
+      const data: Infer<typeof RawConstraintDefV9>['data'] = {
         tag: 'Unique',
         value: { columns: constraintOpts.columns.map(c => colIds.get(c)!) },
       };
diff --git a/crates/bindings-typescript/src/lib/type_builders.ts b/crates/bindings-typescript/src/lib/type_builders.ts
index 567bae3975f..408467fed9d 100644
--- a/crates/bindings-typescript/src/lib/type_builders.ts
+++ b/crates/bindings-typescript/src/lib/type_builders.ts
@@ -1303,6 +1303,7 @@ export class SumBuilder<Variants extends VariantsObj> extends TypeBuilder<
       })
     );
     this.variants = variants;
+    this.typeName = name;
   }
 
   /**
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index 6a16f1a2a38..dc93ae01b58 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -4,15 +4,22 @@ import type { UntypedReducerDef } from '../sdk/reducers';
 import { useSpacetimeDB } from './useSpacetimeDB';
 import type { Prettify } from '../lib/type_util';
 
+type IsEmptyObject<T> = [keyof T] extends [never] ? true : false;
+type MaybeParams<T> = IsEmptyObject<T> extends true ? [] : [params: T];
+
+type ParamsType<R extends UntypedReducerDef> = MaybeParams<Prettify<
+  InferTypeOfRow<R['params']>
+>>;
+
 export function useReducer<ReducerDef extends UntypedReducerDef>(
   reducerDef: ReducerDef
-): (params: Prettify<InferTypeOfRow<ReducerDef['params']>>) => void {
+): (...params: ParamsType<ReducerDef>) => void {
   const { getConnection, isActive } = useSpacetimeDB();
   const reducerName = reducerDef.accessorName;
 
   // Holds calls made before the connection exists
   const queueRef = useRef<
-    Array<Prettify<InferTypeOfRow<ReducerDef['params']>>>
+    ParamsType<ReducerDef>[]
   >([]);
 
   // Flush when we finally have a connection
@@ -22,23 +29,25 @@ export function useReducer<ReducerDef extends UntypedReducerDef>(
       return;
     }
     const fn = (conn.reducers as any)[reducerName] as (
-      p: InferTypeOfRow<ReducerDef['params']>
+      p: ParamsType<ReducerDef>
     ) => void;
     if (queueRef.current.length) {
       const pending = queueRef.current.splice(0);
-      for (const params of pending) fn(params);
+      for (const params of pending) {
+        fn(params);
+      }
     }
   }, [getConnection, reducerName, isActive]);
 
   return useCallback(
-    (params: Prettify<InferTypeOfRow<ReducerDef['params']>>) => {
+    (...params: ParamsType<ReducerDef>) => {
       const conn = getConnection();
       if (!conn) {
         queueRef.current.push(params);
         return;
       }
       const fn = (conn.reducers as any)[reducerName] as (
-        p: Prettify<InferTypeOfRow<ReducerDef['params']>>
+        p: ParamsType<ReducerDef>
       ) => void;
       return fn(params);
     },
diff --git a/crates/bindings-typescript/src/react/useSpacetimeDB.ts b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
index 9298eb3fda4..2a7cbfc828a 100644
--- a/crates/bindings-typescript/src/react/useSpacetimeDB.ts
+++ b/crates/bindings-typescript/src/react/useSpacetimeDB.ts
@@ -1,7 +1,5 @@
 import { createContext, useContext } from 'react';
-import type { DbConnectionImpl } from '../sdk/db_connection_impl';
 import type { ConnectionState } from './connection_state';
-import type { UntypedRemoteModule } from '../sdk/spacetime_module';
 
 export const SpacetimeDBContext = createContext<ConnectionState | undefined>(
   undefined
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
index a9235ed5572..7024d9d2840 100644
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/client_message_type.ts
@@ -18,8 +18,6 @@ import Unsubscribe from './unsubscribe_type';
 import UnsubscribeMulti from './unsubscribe_multi_type';
 import CallProcedure from './call_procedure_type';
 
-import * as ClientMessageVariants from './client_message_variants';
-
 // The tagged union or sum type for the algebraic type `ClientMessage`.
 const ClientMessage = __t.enum('ClientMessage', {
   get CallReducer() {
diff --git a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
deleted file mode 100644
index b85719a2956..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/client_message_variants.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../lib/type_builders';
-import CallReducerType from './call_reducer_type';
-import SubscribeType from './subscribe_type';
-import OneOffQueryType from './one_off_query_type';
-import SubscribeSingleType from './subscribe_single_type';
-import SubscribeMultiType from './subscribe_multi_type';
-import UnsubscribeType from './unsubscribe_type';
-import UnsubscribeMultiType from './unsubscribe_multi_type';
-import CallProcedureType from './call_procedure_type';
-
-export type CallReducer = {
-  tag: 'CallReducer';
-  value: __Infer<typeof CallReducerType>;
-};
-export type Subscribe = {
-  tag: 'Subscribe';
-  value: __Infer<typeof SubscribeType>;
-};
-export type OneOffQuery = {
-  tag: 'OneOffQuery';
-  value: __Infer<typeof OneOffQueryType>;
-};
-export type SubscribeSingle = {
-  tag: 'SubscribeSingle';
-  value: __Infer<typeof SubscribeSingleType>;
-};
-export type SubscribeMulti = {
-  tag: 'SubscribeMulti';
-  value: __Infer<typeof SubscribeMultiType>;
-};
-export type Unsubscribe = {
-  tag: 'Unsubscribe';
-  value: __Infer<typeof UnsubscribeType>;
-};
-export type UnsubscribeMulti = {
-  tag: 'UnsubscribeMulti';
-  value: __Infer<typeof UnsubscribeMultiType>;
-};
-export type CallProcedure = {
-  tag: 'CallProcedure';
-  value: __Infer<typeof CallProcedureType>;
-};
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
index 287eb2364cc..fd07c71773b 100644
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_type.ts
@@ -11,8 +11,6 @@ import {
 } from '../../lib/type_builders';
 import QueryUpdate from './query_update_type';
 
-import * as CompressableQueryUpdateVariants from './compressable_query_update_variants';
-
 // The tagged union or sum type for the algebraic type `CompressableQueryUpdate`.
 const CompressableQueryUpdate = __t.enum('CompressableQueryUpdate', {
   get Uncompressed() {
diff --git a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts b/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
deleted file mode 100644
index 8246811b00e..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/compressable_query_update_variants.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../lib/type_builders';
-import QueryUpdateType from './query_update_type';
-
-export type Uncompressed = {
-  tag: 'Uncompressed';
-  value: __Infer<typeof QueryUpdateType>;
-};
-export type Brotli = { tag: 'Brotli'; value: Uint8Array };
-export type Gzip = { tag: 'Gzip'; value: Uint8Array };
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
index f2750e88a29..29f444f66bd 100644
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/procedure_status_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../lib/type_builders';
-import * as ProcedureStatusVariants from './procedure_status_variants';
 
 // The tagged union or sum type for the algebraic type `ProcedureStatus`.
 const ProcedureStatus = __t.enum('ProcedureStatus', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
deleted file mode 100644
index 6652aab16d4..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/procedure_status_variants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../lib/type_builders';
-
-export type Returned = { tag: 'Returned'; value: Uint8Array };
-export type OutOfEnergy = { tag: 'OutOfEnergy' };
-export type InternalError = { tag: 'InternalError'; value: string };
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
index b5fcd506486..112417b2ac3 100644
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_type.ts
@@ -9,7 +9,6 @@ import {
   type AlgebraicTypeType as __AlgebraicTypeType,
   type Infer as __Infer,
 } from '../../lib/type_builders';
-import * as RowSizeHintVariants from './row_size_hint_variants';
 
 // The tagged union or sum type for the algebraic type `RowSizeHint`.
 const RowSizeHint = __t.enum('RowSizeHint', {
diff --git a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts b/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
deleted file mode 100644
index 8c28ef824b9..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/row_size_hint_variants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../lib/type_builders';
-
-export type FixedSize = { tag: 'FixedSize'; value: number };
-export type RowOffsets = { tag: 'RowOffsets'; value: bigint[] };
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
index b670d6b69bc..cd9e0e2ea23 100644
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/server_message_type.ts
@@ -21,8 +21,6 @@ import SubscribeMultiApplied from './subscribe_multi_applied_type';
 import UnsubscribeMultiApplied from './unsubscribe_multi_applied_type';
 import ProcedureResult from './procedure_result_type';
 
-import * as ServerMessageVariants from './server_message_variants';
-
 // The tagged union or sum type for the algebraic type `ServerMessage`.
 const ServerMessage = __t.enum('ServerMessage', {
   get InitialSubscription() {
diff --git a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts b/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
deleted file mode 100644
index e27eb295f81..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/server_message_variants.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../lib/type_builders';
-import InitialSubscriptionType from './initial_subscription_type';
-import TransactionUpdateType from './transaction_update_type';
-import TransactionUpdateLightType from './transaction_update_light_type';
-import IdentityTokenType from './identity_token_type';
-import OneOffQueryResponseType from './one_off_query_response_type';
-import SubscribeAppliedType from './subscribe_applied_type';
-import UnsubscribeAppliedType from './unsubscribe_applied_type';
-import SubscriptionErrorType from './subscription_error_type';
-import SubscribeMultiAppliedType from './subscribe_multi_applied_type';
-import UnsubscribeMultiAppliedType from './unsubscribe_multi_applied_type';
-import ProcedureResultType from './procedure_result_type';
-
-export type InitialSubscription = {
-  tag: 'InitialSubscription';
-  value: __Infer<typeof InitialSubscriptionType>;
-};
-export type TransactionUpdate = {
-  tag: 'TransactionUpdate';
-  value: __Infer<typeof TransactionUpdateType>;
-};
-export type TransactionUpdateLight = {
-  tag: 'TransactionUpdateLight';
-  value: __Infer<typeof TransactionUpdateLightType>;
-};
-export type IdentityToken = {
-  tag: 'IdentityToken';
-  value: __Infer<typeof IdentityTokenType>;
-};
-export type OneOffQueryResponse = {
-  tag: 'OneOffQueryResponse';
-  value: __Infer<typeof OneOffQueryResponseType>;
-};
-export type SubscribeApplied = {
-  tag: 'SubscribeApplied';
-  value: __Infer<typeof SubscribeAppliedType>;
-};
-export type UnsubscribeApplied = {
-  tag: 'UnsubscribeApplied';
-  value: __Infer<typeof UnsubscribeAppliedType>;
-};
-export type SubscriptionError = {
-  tag: 'SubscriptionError';
-  value: __Infer<typeof SubscriptionErrorType>;
-};
-export type SubscribeMultiApplied = {
-  tag: 'SubscribeMultiApplied';
-  value: __Infer<typeof SubscribeMultiAppliedType>;
-};
-export type UnsubscribeMultiApplied = {
-  tag: 'UnsubscribeMultiApplied';
-  value: __Infer<typeof UnsubscribeMultiAppliedType>;
-};
-export type ProcedureResult = {
-  tag: 'ProcedureResult';
-  value: __Infer<typeof ProcedureResultType>;
-};
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
index 0a666da5719..e5db16fc2e8 100644
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
+++ b/crates/bindings-typescript/src/sdk/client_api/update_status_type.ts
@@ -11,8 +11,6 @@ import {
 } from '../../lib/type_builders';
 import DatabaseUpdate from './database_update_type';
 
-import * as UpdateStatusVariants from './update_status_variants';
-
 // The tagged union or sum type for the algebraic type `UpdateStatus`.
 const UpdateStatus = __t.enum('UpdateStatus', {
   get Committed() {
diff --git a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts b/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
deleted file mode 100644
index e2234e39e52..00000000000
--- a/crates/bindings-typescript/src/sdk/client_api/update_status_variants.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
-// WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
-
-/* eslint-disable */
-/* tslint:disable */
-import {
-  TypeBuilder as __TypeBuilder,
-  t as __t,
-  type AlgebraicTypeType as __AlgebraicTypeType,
-  type Infer as __Infer,
-} from '../../lib/type_builders';
-import DatabaseUpdateType from './database_update_type';
-
-export type Committed = {
-  tag: 'Committed';
-  value: __Infer<typeof DatabaseUpdateType>;
-};
-export type Failed = { tag: 'Failed'; value: string };
-export type OutOfEnergy = { tag: 'OutOfEnergy' };
diff --git a/crates/bindings-typescript/src/sdk/client_cache.ts b/crates/bindings-typescript/src/sdk/client_cache.ts
index afadb578a50..33c7bca6aa7 100644
--- a/crates/bindings-typescript/src/sdk/client_cache.ts
+++ b/crates/bindings-typescript/src/sdk/client_cache.ts
@@ -114,7 +114,7 @@ export class ClientCache<RemoteModule extends UntypedRemoteModule> {
   ): TableCacheForTableName<RemoteModule, N> {
     const name = tableDef.name as N;
 
-    let table = this.tables.get(name);
+    const table = this.tables.get(name);
     if (table) {
       return table;
     }
diff --git a/crates/bindings-typescript/src/sdk/db_connection_builder.ts b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
index 1842f31fde2..efc32059ae9 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_builder.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_builder.ts
@@ -5,7 +5,6 @@ import type {
   ErrorContextInterface,
   Identity,
   RemoteModuleOf,
-  SubscriptionEventContextInterface,
 } from '../';
 import { ensureMinimumVersionOrThrow } from './version';
 import { WebsocketDecompressAdapter } from './websocket_decompress_adapter';
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index cae78d0564c..5b2a2187631 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -29,7 +29,6 @@ import type {
 } from './message_types.ts';
 import type { ReducerEvent } from './reducer_event.ts';
 import {
-  type RemoteModule,
   type UntypedRemoteModule,
 } from './spacetime_module.ts';
 import {
@@ -52,7 +51,6 @@ import type {
   ReducerEventInfo,
   ReducersView,
   SetReducerFlags,
-  UntypedReducersDef,
 } from './reducers.ts';
 import type { ClientDbView } from './db_view.ts';
 import type { UntypedTableDef } from '../lib/table.ts';
@@ -897,9 +895,9 @@ export class DbConnectionImpl<RemoteModule extends UntypedRemoteModule>
     params: object,
     flags: CallReducerFlags
   ) {
-    let writer = new BinaryWriter(1024);
+    const writer = new BinaryWriter(1024);
     ProductType.serializeValue(writer, paramsType, params);
-    let argsBuffer = writer.getBuffer();
+    const argsBuffer = writer.getBuffer();
     this.callReducer(reducerName, argsBuffer, flags);
   }
 
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index a991794594e..230170ac840 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -2,7 +2,6 @@ import type { ClientDbView } from './db_view';
 import type {
   ReducersView,
   SetReducerFlags,
-  UntypedReducersDef,
 } from './reducers';
 import type { UntypedRemoteModule } from './spacetime_module';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
diff --git a/crates/bindings-typescript/src/sdk/message_types.ts b/crates/bindings-typescript/src/sdk/message_types.ts
index 24e834a1ebe..6a7bdaa4dec 100644
--- a/crates/bindings-typescript/src/sdk/message_types.ts
+++ b/crates/bindings-typescript/src/sdk/message_types.ts
@@ -2,7 +2,7 @@ import { ConnectionId, type Infer } from '../';
 import { Identity } from '../';
 import type { TableUpdate } from './table_cache.ts';
 import { Timestamp } from '../';
-import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
+import type { UntypedTableDef } from '../lib/table.ts';
 import type UpdateStatus from './client_api/update_status_type.ts';
 
 export type InitialSubscriptionMessage = {
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index 66e8330dc0b..2ff2a1ac194 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -4,12 +4,10 @@ import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
 import type {
   EventContextInterface,
-  ClientTable,
   TableDefForTableName,
 } from './index.ts';
-import type { RowType, Table, UntypedTableDef } from '../lib/table.ts';
+import type { RowType, UntypedTableDef } from '../lib/table.ts';
 import type {
-  ClientTableCore,
   ClientTableCoreImplementable,
 } from './client_table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
diff --git a/crates/bindings-typescript/test-app/src/App.tsx b/crates/bindings-typescript/test-app/src/App.tsx
index 3bbee2cbf27..720504f78d8 100644
--- a/crates/bindings-typescript/test-app/src/App.tsx
+++ b/crates/bindings-typescript/test-app/src/App.tsx
@@ -20,7 +20,6 @@ function App() {
       console.log('Player inserted:', row);
     },
   });
-  const x = players[0];
   const createPlayer = useReducer(reducers.createPlayer);
 
   useEffect(() => {
diff --git a/crates/bindings-typescript/test-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
index fe0c2f4fbe0..fa5382b6be6 100644
--- a/crates/bindings-typescript/test-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-app/src/module_bindings/index.ts
@@ -28,25 +28,25 @@ import {
 } from '../../../src/index';
 
 // Import and reexport all reducer arg types
-import CreatePlayer from './create_player_reducer.ts';
+import CreatePlayer from './create_player_reducer';
 export { CreatePlayer };
 
 // Import and reexport all table handle types
-import PlayerRow from './player_table.ts';
+import PlayerRow from './player_table';
 export { PlayerRow };
-import UnindexedPlayerRow from './unindexed_player_table.ts';
+import UnindexedPlayerRow from './unindexed_player_table';
 export { UnindexedPlayerRow };
-import UserRow from './user_table.ts';
+import UserRow from './user_table';
 export { UserRow };
 
 // Import and reexport all types
-import Player from './player_type.ts';
+import Player from './player_type';
 export { Player };
-import Point from './point_type.ts';
+import Point from './point_type';
 export { Point };
-import UnindexedPlayer from './unindexed_player_type.ts';
+import UnindexedPlayer from './unindexed_player_type';
 export { UnindexedPlayer };
-import User from './user_type.ts';
+import User from './user_type';
 export { User };
 
 const tablesSchema = __schema(
diff --git a/crates/bindings-typescript/test-react-router-app/package.json b/crates/bindings-typescript/test-react-router-app/package.json
index babf93f8200..235f719db0e 100644
--- a/crates/bindings-typescript/test-react-router-app/package.json
+++ b/crates/bindings-typescript/test-react-router-app/package.json
@@ -26,6 +26,7 @@
   "devDependencies": {
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
+    "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^4.3.1",
     "typescript": "^5.2.2",
     "vite": "^7.1.5"
diff --git a/crates/bindings-typescript/test-react-router-app/server/src/lib.rs b/crates/bindings-typescript/test-react-router-app/server/src/lib.rs
index 799eb5f91f3..520e68eeaec 100644
--- a/crates/bindings-typescript/test-react-router-app/server/src/lib.rs
+++ b/crates/bindings-typescript/test-react-router-app/server/src/lib.rs
@@ -59,6 +59,7 @@ fn increment_counter(ctx: &ReducerContext) -> Result<(), String> {
 fn clear_counter(ctx: &ReducerContext) {
     for row in ctx.db.counter().iter() {
         ctx.db.counter().id().delete(row.id);
+        ctx.db.counter().insert(Counter { id: 0, count: 0 });
     }
 
     for row in ctx.db.user().iter() {
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/clear_counter_reducer.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/clear_counter_reducer.ts
index b05311785e6..2454b459929 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/clear_counter_reducer.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/clear_counter_reducer.ts
@@ -4,64 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
 
-export type ClearCounter = {};
-let _cached_ClearCounter_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ClearCounter = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ClearCounter_type_value) return _cached_ClearCounter_type_value;
-    _cached_ClearCounter_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ClearCounter_type_value.value.elements.push();
-    return _cached_ClearCounter_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ClearCounter): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ClearCounter.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ClearCounter {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ClearCounter.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ClearCounter;
+export default {};
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_connected_reducer.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_connected_reducer.ts
index ac7a7e2b90d..2454b459929 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_connected_reducer.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_connected_reducer.ts
@@ -4,65 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
 
-export type ClientConnected = {};
-let _cached_ClientConnected_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ClientConnected = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ClientConnected_type_value)
-      return _cached_ClientConnected_type_value;
-    _cached_ClientConnected_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ClientConnected_type_value.value.elements.push();
-    return _cached_ClientConnected_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ClientConnected): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ClientConnected.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ClientConnected {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ClientConnected.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ClientConnected;
+export default {};
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_disconnected_reducer.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_disconnected_reducer.ts
index d4369a3e513..2454b459929 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_disconnected_reducer.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/client_disconnected_reducer.ts
@@ -4,65 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
 
-export type ClientDisconnected = {};
-let _cached_ClientDisconnected_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const ClientDisconnected = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_ClientDisconnected_type_value)
-      return _cached_ClientDisconnected_type_value;
-    _cached_ClientDisconnected_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_ClientDisconnected_type_value.value.elements.push();
-    return _cached_ClientDisconnected_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: ClientDisconnected): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      ClientDisconnected.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): ClientDisconnected {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      ClientDisconnected.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default ClientDisconnected;
+export default {};
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts
index 9ffbf83d2c4..d492e387b23 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_table.ts
@@ -4,115 +4,13 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
-import { Counter } from './counter_type';
-import {
-  type EventContext,
-  type Reducer,
-  RemoteReducers,
-  RemoteTables,
-} from '.';
-declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
-
-/**
- * Table handle for the table `counter`.
- *
- * Obtain a handle from the [`counter`] property on [`RemoteTables`],
- * like `ctx.db.counter`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.counter.on_insert(...)`.
- */
-export class CounterTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
-{
-  // phantom type to track the table name
-  readonly tableName!: TableName;
-  tableCache: __TableCache<Counter>;
-
-  constructor(tableCache: __TableCache<Counter>) {
-    this.tableCache = tableCache;
-  }
-
-  count(): number {
-    return this.tableCache.count();
-  }
-
-  iter(): Iterable<Counter> {
-    return this.tableCache.iter();
-  }
-  /**
-   * Access to the `id` unique index on the table `counter`,
-   * which allows point queries on the field of the same name
-   * via the [`CounterIdUnique.find`] method.
-   *
-   * Users are encouraged not to explicitly reference this type,
-   * but to directly chain method calls,
-   * like `ctx.db.counter.id().find(...)`.
-   *
-   * Get a handle on the `id` unique index on the table `counter`.
-   */
-  id = {
-    // Find the subscribed row whose `id` column value is equal to `colVal`,
-    // if such a row is present in the client cache.
-    find: (colVal: number): Counter | undefined => {
-      for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.id, colVal)) {
-          return row;
-        }
-      }
-    },
-  };
-
-  onInsert = (cb: (ctx: EventContext, row: Counter) => void) => {
-    return this.tableCache.onInsert(cb);
-  };
-
-  removeOnInsert = (cb: (ctx: EventContext, row: Counter) => void) => {
-    return this.tableCache.removeOnInsert(cb);
-  };
-
-  onDelete = (cb: (ctx: EventContext, row: Counter) => void) => {
-    return this.tableCache.onDelete(cb);
-  };
-
-  removeOnDelete = (cb: (ctx: EventContext, row: Counter) => void) => {
-    return this.tableCache.removeOnDelete(cb);
-  };
-
-  // Updates are only defined for tables with primary keys.
-  onUpdate = (
-    cb: (ctx: EventContext, oldRow: Counter, newRow: Counter) => void
-  ) => {
-    return this.tableCache.onUpdate(cb);
-  };
 
-  removeOnUpdate = (
-    cb: (ctx: EventContext, onRow: Counter, newRow: Counter) => void
-  ) => {
-    return this.tableCache.removeOnUpdate(cb);
-  };
-}
+export default __t.row({
+  id: __t.u32(),
+  count: __t.u32(),
+});
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_type.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_type.ts
index 9819fbb63e3..419b8dbfe5b 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_type.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/counter_type.ts
@@ -4,68 +4,13 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
 
-export type Counter = {
-  id: number;
-  count: number;
-};
-let _cached_Counter_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const Counter = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_Counter_type_value) return _cached_Counter_type_value;
-    _cached_Counter_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_Counter_type_value.value.elements.push(
-      { name: 'id', algebraicType: __AlgebraicTypeValue.U32 },
-      { name: 'count', algebraicType: __AlgebraicTypeValue.U32 }
-    );
-    return _cached_Counter_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: Counter): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      Counter.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): Counter {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      Counter.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default Counter;
+export default __t.object('Counter', {
+  id: __t.u32(),
+  count: __t.u32(),
+});
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/increment_counter_reducer.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/increment_counter_reducer.ts
index 6fe15b551af..2454b459929 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/increment_counter_reducer.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/increment_counter_reducer.ts
@@ -4,65 +4,10 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
 
-export type IncrementCounter = {};
-let _cached_IncrementCounter_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const IncrementCounter = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_IncrementCounter_type_value)
-      return _cached_IncrementCounter_type_value;
-    _cached_IncrementCounter_type_value = __AlgebraicTypeValue.Product({
-      elements: [],
-    });
-    _cached_IncrementCounter_type_value.value.elements.push();
-    return _cached_IncrementCounter_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: IncrementCounter): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      IncrementCounter.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): IncrementCounter {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      IncrementCounter.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default IncrementCounter;
+export default {};
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/index.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/index.ts
index 07472dc2cf0..fa3f793bdb5 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/index.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/index.ts
@@ -1,298 +1,125 @@
 // THIS FILE IS AUTOMATICALLY GENERATED BY SPACETIMEDB. EDITS TO THIS FILE
 // WILL NOT BE SAVED. MODIFY TABLES IN YOUR MODULE SOURCE CODE INSTEAD.
 
-// This was generated using ../../../src/index cli version 1.6.0 (commit 542d26d7ffecafe93e40ac1a991c2ef2b4e4d0cb).
+// This was generated using ../../../src/index cli version 1.6.0 (commit 0b0b06d5f67fecff50eb7b1c79bff5dad686f5d2).
 
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
   DbConnectionBuilder as __DbConnectionBuilder,
   DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
   SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
+  TypeBuilder as __TypeBuilder,
+  convertToAccessorMap as __convertToAccessorMap,
+  reducerSchema as __reducerSchema,
+  reducers as __reducers,
+  schema as __schema,
+  t as __t,
+  table as __table,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type DbConnectionConfig as __DbConnectionConfig,
   type ErrorContextInterface as __ErrorContextInterface,
   type Event as __Event,
   type EventContextInterface as __EventContextInterface,
+  type Infer as __Infer,
   type ReducerEventContextInterface as __ReducerEventContextInterface,
+  type RemoteModule as __RemoteModule,
   type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
 } from '../../../src/index';
 
 // Import and reexport all reducer arg types
-import { ClearCounter } from './clear_counter_reducer.ts';
+import ClearCounter from './clear_counter_reducer';
 export { ClearCounter };
-import { ClientConnected } from './client_connected_reducer.ts';
+import ClientConnected from './client_connected_reducer';
 export { ClientConnected };
-import { ClientDisconnected } from './client_disconnected_reducer.ts';
+import ClientDisconnected from './client_disconnected_reducer';
 export { ClientDisconnected };
-import { IncrementCounter } from './increment_counter_reducer.ts';
+import IncrementCounter from './increment_counter_reducer';
 export { IncrementCounter };
 
 // Import and reexport all table handle types
-import { CounterTableHandle } from './counter_table.ts';
-export { CounterTableHandle };
-import { OfflineUserTableHandle } from './offline_user_table.ts';
-export { OfflineUserTableHandle };
-import { UserTableHandle } from './user_table.ts';
-export { UserTableHandle };
+import CounterRow from './counter_table';
+export { CounterRow };
+import OfflineUserRow from './offline_user_table';
+export { OfflineUserRow };
+import UserRow from './user_table';
+export { UserRow };
 
 // Import and reexport all types
-import { Counter } from './counter_type.ts';
+import Counter from './counter_type';
 export { Counter };
-import { User } from './user_type.ts';
+import User from './user_type';
 export { User };
 
-const REMOTE_MODULE = {
-  tables: {
-    counter: {
-      tableName: 'counter' as const,
-      rowType: Counter.getTypeScriptAlgebraicType(),
-      primaryKey: 'id',
-      primaryKeyInfo: {
-        colName: 'id',
-        colType: (
-          Counter.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-        ).value.elements[0].algebraicType,
-      },
-    },
-    offline_user: {
-      tableName: 'offline_user' as const,
-      rowType: User.getTypeScriptAlgebraicType(),
-      primaryKey: 'identity',
-      primaryKeyInfo: {
-        colName: 'identity',
-        colType: (
-          User.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-        ).value.elements[0].algebraicType,
-      },
+const tablesSchema = __schema(
+  __table(
+    {
+      name: 'counter',
+      indexes: [],
     },
-    user: {
-      tableName: 'user' as const,
-      rowType: User.getTypeScriptAlgebraicType(),
-      primaryKey: 'identity',
-      primaryKeyInfo: {
-        colName: 'identity',
-        colType: (
-          User.getTypeScriptAlgebraicType() as __AlgebraicTypeVariants.Product
-        ).value.elements[0].algebraicType,
-      },
-    },
-  },
-  reducers: {
-    clear_counter: {
-      reducerName: 'clear_counter',
-      argsType: ClearCounter.getTypeScriptAlgebraicType(),
+    CounterRow
+  ),
+  __table(
+    {
+      name: 'offline_user',
+      indexes: [],
     },
-    client_connected: {
-      reducerName: 'client_connected',
-      argsType: ClientConnected.getTypeScriptAlgebraicType(),
+    UserRow
+  ),
+  __table(
+    {
+      name: 'user',
+      indexes: [],
     },
-    client_disconnected: {
-      reducerName: 'client_disconnected',
-      argsType: ClientDisconnected.getTypeScriptAlgebraicType(),
-    },
-    increment_counter: {
-      reducerName: 'increment_counter',
-      argsType: IncrementCounter.getTypeScriptAlgebraicType(),
-    },
-  },
-  versionInfo: {
-    cliVersion: '1.6.0',
-  },
-  // Constructors which are used by the DbConnectionImpl to
-  // extract type information from the generated RemoteModule.
-  //
-  // NOTE: This is not strictly necessary for `eventContextConstructor` because
-  // all we do is build a TypeScript object which we could have done inside the
-  // SDK, but if in the future we wanted to create a class this would be
-  // necessary because classes have methods, so we'll keep it.
-  eventContextConstructor: (
-    imp: __DbConnectionImpl,
-    event: __Event<Reducer>
-  ) => {
-    return {
-      ...(imp as DbConnection),
-      event,
-    };
-  },
-  dbViewConstructor: (imp: __DbConnectionImpl) => {
-    return new RemoteTables(imp);
-  },
-  reducersConstructor: (
-    imp: __DbConnectionImpl,
-    setReducerFlags: SetReducerFlags
-  ) => {
-    return new RemoteReducers(imp, setReducerFlags);
-  },
-  setReducerFlagsConstructor: () => {
-    return new SetReducerFlags();
-  },
-};
-
-// A type representing all the possible variants of a reducer.
-export type Reducer =
-  | never
-  | { name: 'ClearCounter'; args: ClearCounter }
-  | { name: 'ClientConnected'; args: ClientConnected }
-  | { name: 'ClientDisconnected'; args: ClientDisconnected }
-  | { name: 'IncrementCounter'; args: IncrementCounter };
-
-export class RemoteReducers {
-  constructor(
-    private connection: __DbConnectionImpl,
-    private setCallReducerFlags: SetReducerFlags
-  ) {}
-
-  clearCounter() {
-    this.connection.callReducer(
-      'clear_counter',
-      new Uint8Array(0),
-      this.setCallReducerFlags.clearCounterFlags
-    );
-  }
-
-  onClearCounter(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.onReducer('clear_counter', callback);
-  }
-
-  removeOnClearCounter(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.offReducer('clear_counter', callback);
-  }
-
-  onClientConnected(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.onReducer('client_connected', callback);
-  }
-
-  removeOnClientConnected(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.offReducer('client_connected', callback);
-  }
-
-  onClientDisconnected(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.onReducer('client_disconnected', callback);
-  }
-
-  removeOnClientDisconnected(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.offReducer('client_disconnected', callback);
-  }
-
-  incrementCounter() {
-    this.connection.callReducer(
-      'increment_counter',
-      new Uint8Array(0),
-      this.setCallReducerFlags.incrementCounterFlags
-    );
-  }
-
-  onIncrementCounter(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.onReducer('increment_counter', callback);
-  }
+    UserRow
+  )
+);
 
-  removeOnIncrementCounter(callback: (ctx: ReducerEventContext) => void) {
-    this.connection.offReducer('increment_counter', callback);
-  }
-}
-
-export class SetReducerFlags {
-  clearCounterFlags: __CallReducerFlags = 'FullUpdate';
-  clearCounter(flags: __CallReducerFlags) {
-    this.clearCounterFlags = flags;
-  }
-
-  incrementCounterFlags: __CallReducerFlags = 'FullUpdate';
-  incrementCounter(flags: __CallReducerFlags) {
-    this.incrementCounterFlags = flags;
-  }
-}
+const reducersSchema = __reducers(
+  __reducerSchema('clear_counter', ClearCounter),
+  __reducerSchema('increment_counter', IncrementCounter)
+);
 
-export class RemoteTables {
-  constructor(private connection: __DbConnectionImpl) {}
-
-  get counter(): CounterTableHandle<'counter'> {
-    // clientCache is a private property
-    return new CounterTableHandle(
-      (
-        this.connection as unknown as { clientCache: __ClientCache }
-      ).clientCache.getOrCreateTable<Counter>(REMOTE_MODULE.tables.counter)
-    );
-  }
+const REMOTE_MODULE = {
+  versionInfo: {
+    cliVersion: '1.6.0' as const,
+  },
+  tables: tablesSchema.schemaType.tables,
+  reducers: reducersSchema.reducersType.reducers,
+} satisfies __RemoteModule<
+  typeof tablesSchema.schemaType,
+  typeof reducersSchema.reducersType
+>;
 
-  get offlineUser(): OfflineUserTableHandle<'offline_user'> {
-    // clientCache is a private property
-    return new OfflineUserTableHandle(
-      (
-        this.connection as unknown as { clientCache: __ClientCache }
-      ).clientCache.getOrCreateTable<User>(REMOTE_MODULE.tables.offline_user)
-    );
-  }
+export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);
+export const reducers = __convertToAccessorMap(
+  reducersSchema.reducersType.reducers
+);
 
-  get user(): UserTableHandle<'user'> {
-    // clientCache is a private property
-    return new UserTableHandle(
-      (
-        this.connection as unknown as { clientCache: __ClientCache }
-      ).clientCache.getOrCreateTable<User>(REMOTE_MODULE.tables.user)
-    );
-  }
-}
+export type EventContext = __EventContextInterface<typeof REMOTE_MODULE>;
+export type ReducerEventContext = __ReducerEventContextInterface<
+  typeof REMOTE_MODULE
+>;
+export type SubscriptionEventContext = __SubscriptionEventContextInterface<
+  typeof REMOTE_MODULE
+>;
+export type ErrorContext = __ErrorContextInterface<typeof REMOTE_MODULE>;
 
 export class SubscriptionBuilder extends __SubscriptionBuilderImpl<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
+  typeof REMOTE_MODULE
 > {}
 
-export class DbConnection extends __DbConnectionImpl<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
-> {
-  static builder = (): __DbConnectionBuilder<
-    DbConnection,
-    ErrorContext,
-    SubscriptionEventContext
-  > => {
-    return new __DbConnectionBuilder<
-      DbConnection,
-      ErrorContext,
-      SubscriptionEventContext
-    >(REMOTE_MODULE, (imp: __DbConnectionImpl) => imp as DbConnection);
+export class DbConnectionBuilder extends __DbConnectionBuilder<DbConnection> {}
+
+export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {
+  static builder = (): DbConnectionBuilder => {
+    return new DbConnectionBuilder(
+      REMOTE_MODULE,
+      (config: __DbConnectionConfig<typeof REMOTE_MODULE>) =>
+        new DbConnection(config)
+    );
   };
   subscriptionBuilder = (): SubscriptionBuilder => {
     return new SubscriptionBuilder(this);
   };
 }
-
-export type EventContext = __EventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags,
-  Reducer
->;
-export type ReducerEventContext = __ReducerEventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags,
-  Reducer
->;
-export type SubscriptionEventContext = __SubscriptionEventContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
->;
-export type ErrorContext = __ErrorContextInterface<
-  RemoteTables,
-  RemoteReducers,
-  SetReducerFlags
->;
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts
index cb526e2dee8..7a83afcebf0 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/offline_user_table.ts
@@ -4,113 +4,13 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
-import { User } from './user_type';
-import {
-  type EventContext,
-  type Reducer,
-  RemoteReducers,
-  RemoteTables,
-} from '.';
-declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
-
-/**
- * Table handle for the table `offline_user`.
- *
- * Obtain a handle from the [`offlineUser`] property on [`RemoteTables`],
- * like `ctx.db.offlineUser`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.offlineUser.on_insert(...)`.
- */
-export class OfflineUserTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
-{
-  // phantom type to track the table name
-  readonly tableName!: TableName;
-  tableCache: __TableCache<User>;
-
-  constructor(tableCache: __TableCache<User>) {
-    this.tableCache = tableCache;
-  }
-
-  count(): number {
-    return this.tableCache.count();
-  }
-
-  iter(): Iterable<User> {
-    return this.tableCache.iter();
-  }
-  /**
-   * Access to the `identity` unique index on the table `offline_user`,
-   * which allows point queries on the field of the same name
-   * via the [`OfflineUserIdentityUnique.find`] method.
-   *
-   * Users are encouraged not to explicitly reference this type,
-   * but to directly chain method calls,
-   * like `ctx.db.offlineUser.identity().find(...)`.
-   *
-   * Get a handle on the `identity` unique index on the table `offline_user`.
-   */
-  identity = {
-    // Find the subscribed row whose `identity` column value is equal to `colVal`,
-    // if such a row is present in the client cache.
-    find: (colVal: __Identity): User | undefined => {
-      for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, colVal)) {
-          return row;
-        }
-      }
-    },
-  };
-
-  onInsert = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.onInsert(cb);
-  };
-
-  removeOnInsert = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.removeOnInsert(cb);
-  };
-
-  onDelete = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.onDelete(cb);
-  };
-
-  removeOnDelete = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.removeOnDelete(cb);
-  };
-
-  // Updates are only defined for tables with primary keys.
-  onUpdate = (cb: (ctx: EventContext, oldRow: User, newRow: User) => void) => {
-    return this.tableCache.onUpdate(cb);
-  };
 
-  removeOnUpdate = (
-    cb: (ctx: EventContext, onRow: User, newRow: User) => void
-  ) => {
-    return this.tableCache.removeOnUpdate(cb);
-  };
-}
+export default __t.row({
+  identity: __t.identity(),
+  hasIncrementedCount: __t.u32(),
+});
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts
index e8364a92e8f..7a83afcebf0 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_table.ts
@@ -4,113 +4,13 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
-import { User } from './user_type';
-import {
-  type EventContext,
-  type Reducer,
-  RemoteReducers,
-  RemoteTables,
-} from '.';
-declare type __keep = [EventContext, Reducer, RemoteReducers, RemoteTables];
-
-/**
- * Table handle for the table `user`.
- *
- * Obtain a handle from the [`user`] property on [`RemoteTables`],
- * like `ctx.db.user`.
- *
- * Users are encouraged not to explicitly reference this type,
- * but to directly chain method calls,
- * like `ctx.db.user.on_insert(...)`.
- */
-export class UserTableHandle<TableName extends string>
-  implements __TableHandle<TableName>
-{
-  // phantom type to track the table name
-  readonly tableName!: TableName;
-  tableCache: __TableCache<User>;
-
-  constructor(tableCache: __TableCache<User>) {
-    this.tableCache = tableCache;
-  }
-
-  count(): number {
-    return this.tableCache.count();
-  }
-
-  iter(): Iterable<User> {
-    return this.tableCache.iter();
-  }
-  /**
-   * Access to the `identity` unique index on the table `user`,
-   * which allows point queries on the field of the same name
-   * via the [`UserIdentityUnique.find`] method.
-   *
-   * Users are encouraged not to explicitly reference this type,
-   * but to directly chain method calls,
-   * like `ctx.db.user.identity().find(...)`.
-   *
-   * Get a handle on the `identity` unique index on the table `user`.
-   */
-  identity = {
-    // Find the subscribed row whose `identity` column value is equal to `colVal`,
-    // if such a row is present in the client cache.
-    find: (colVal: __Identity): User | undefined => {
-      for (let row of this.tableCache.iter()) {
-        if (__deepEqual(row.identity, colVal)) {
-          return row;
-        }
-      }
-    },
-  };
-
-  onInsert = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.onInsert(cb);
-  };
-
-  removeOnInsert = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.removeOnInsert(cb);
-  };
-
-  onDelete = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.onDelete(cb);
-  };
-
-  removeOnDelete = (cb: (ctx: EventContext, row: User) => void) => {
-    return this.tableCache.removeOnDelete(cb);
-  };
-
-  // Updates are only defined for tables with primary keys.
-  onUpdate = (cb: (ctx: EventContext, oldRow: User, newRow: User) => void) => {
-    return this.tableCache.onUpdate(cb);
-  };
 
-  removeOnUpdate = (
-    cb: (ctx: EventContext, onRow: User, newRow: User) => void
-  ) => {
-    return this.tableCache.removeOnUpdate(cb);
-  };
-}
+export default __t.row({
+  identity: __t.identity(),
+  hasIncrementedCount: __t.u32(),
+});
diff --git a/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_type.ts b/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_type.ts
index bd12911fa23..ad6fb447e3c 100644
--- a/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_type.ts
+++ b/crates/bindings-typescript/test-react-router-app/src/module_bindings/user_type.ts
@@ -4,71 +4,13 @@
 /* eslint-disable */
 /* tslint:disable */
 import {
-  AlgebraicType as __AlgebraicTypeValue,
-  BinaryReader as __BinaryReader,
-  BinaryWriter as __BinaryWriter,
-  ClientCache as __ClientCache,
-  ConnectionId as __ConnectionId,
-  DbConnectionBuilder as __DbConnectionBuilder,
-  DbConnectionImpl as __DbConnectionImpl,
-  Identity as __Identity,
-  SubscriptionBuilderImpl as __SubscriptionBuilderImpl,
-  TableCache as __TableCache,
-  TimeDuration as __TimeDuration,
-  Timestamp as __Timestamp,
-  deepEqual as __deepEqual,
-  type AlgebraicType as __AlgebraicTypeType,
-  type AlgebraicTypeVariants as __AlgebraicTypeVariants,
-  type CallReducerFlags as __CallReducerFlags,
-  type ErrorContextInterface as __ErrorContextInterface,
-  type Event as __Event,
-  type EventContextInterface as __EventContextInterface,
-  type ReducerEventContextInterface as __ReducerEventContextInterface,
-  type SubscriptionEventContextInterface as __SubscriptionEventContextInterface,
-  type TableHandle as __TableHandle,
+  TypeBuilder as __TypeBuilder,
+  t as __t,
+  type AlgebraicTypeType as __AlgebraicTypeType,
+  type Infer as __Infer,
 } from '../../../src/index';
 
-export type User = {
-  identity: __Identity;
-  hasIncrementedCount: number;
-};
-let _cached_User_type_value: __AlgebraicTypeType | null = null;
-
-/**
- * An object for generated helper functions.
- */
-export const User = {
-  /**
-   * A function which returns this type represented as an AlgebraicType.
-   * This function is derived from the AlgebraicType used to generate this type.
-   */
-  getTypeScriptAlgebraicType(): __AlgebraicTypeType {
-    if (_cached_User_type_value) return _cached_User_type_value;
-    _cached_User_type_value = __AlgebraicTypeValue.Product({ elements: [] });
-    _cached_User_type_value.value.elements.push(
-      {
-        name: 'identity',
-        algebraicType: __AlgebraicTypeValue.createIdentityType(),
-      },
-      { name: 'hasIncrementedCount', algebraicType: __AlgebraicTypeValue.U32 }
-    );
-    return _cached_User_type_value;
-  },
-
-  serialize(writer: __BinaryWriter, value: User): void {
-    __AlgebraicTypeValue.serializeValue(
-      writer,
-      User.getTypeScriptAlgebraicType(),
-      value
-    );
-  },
-
-  deserialize(reader: __BinaryReader): User {
-    return __AlgebraicTypeValue.deserializeValue(
-      reader,
-      User.getTypeScriptAlgebraicType()
-    );
-  },
-};
-
-export default User;
+export default __t.object('User', {
+  identity: __t.identity(),
+  hasIncrementedCount: __t.u32(),
+});
diff --git a/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx b/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx
index bc7d5674131..d5787e39620 100644
--- a/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx
+++ b/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx
@@ -1,9 +1,10 @@
-import { useSpacetimeDB, useTable } from '../../../src/react';
-import { DbConnection, Counter } from '../module_bindings';
+import { useReducer, useTable } from '../../../src/react';
+import { tables, reducers } from '../module_bindings';
 
 export default function CounterPage() {
-  const stdb = useSpacetimeDB<DbConnection>();
-  const { rows: counter } = useTable<DbConnection, Counter>('counter');
+  const counter = useTable(tables.counter);
+  const incrementCounter = useReducer(reducers.incrementCounter);
+  const clearCounter = useReducer(reducers.clearCounter);
 
   console.log('Rendering CounterPage, current counter:', counter);
 
@@ -11,13 +12,13 @@ export default function CounterPage() {
     <>
       <h1>Counter</h1>
       <div className="card">
-        <button onClick={() => stdb.reducers.incrementCounter()}>
+        <button onClick={() => incrementCounter()}>
           count is {counter[0]?.count}
         </button>
         <p>
           Click above to increment the count, click below to clear the count.
         </p>
-        <button onClick={() => stdb.reducers.clearCounter()}>
+        <button onClick={() => clearCounter()}>
           clear count
         </button>
       </div>
diff --git a/crates/bindings-typescript/test-react-router-app/src/pages/UserPage.tsx b/crates/bindings-typescript/test-react-router-app/src/pages/UserPage.tsx
index 67eccc256e0..b73e004f791 100644
--- a/crates/bindings-typescript/test-react-router-app/src/pages/UserPage.tsx
+++ b/crates/bindings-typescript/test-react-router-app/src/pages/UserPage.tsx
@@ -1,28 +1,14 @@
-import { useEffect } from 'react';
 import { useSpacetimeDB, useTable } from '../../../src/react';
-import { DbConnection, User } from '../module_bindings';
+import { tables, User } from '../module_bindings';
+import { Infer } from '../../../src';
 
 export default function UserPage() {
-  const stdb = useSpacetimeDB<DbConnection>();
-  const { rows: users } = useTable<DbConnection, User>('user');
+  const connection = useSpacetimeDB();
+  const users = useTable(tables.user);
 
-  useEffect(() => {
-    if (!stdb.isActive) return;
-
-    const sub = stdb
-      .subscriptionBuilder()
-      .onError((err: any) => console.error('User subscription error:', err))
-      .onApplied(() => console.log('User subscription applied'))
-      .subscribe('SELECT * FROM user');
-
-    return () => {
-      sub.unsubscribeThen(() => console.log('User subscription cleaned up'));
-    };
-  }, [stdb.isActive]);
-
-  const identityHex = stdb.identity?.toHexString();
+  const identityHex = connection.identity?.toHexString();
   const currentUser = users.find(
-    (u: User) => u.identity.toHexString() === identityHex
+    (u: Infer<typeof User>) => u.identity.toHexString() === identityHex
   );
 
   return (
diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index 704ccb6069f..d6bd510dd0a 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -1,7 +1,7 @@
 use crate::util::{
-    is_reducer_invokable, iter_indexes, iter_reducers, iter_tables, iter_types, print_auto_generated_version_comment
+    is_reducer_invokable, iter_indexes, iter_reducers, iter_tables, iter_types, print_auto_generated_version_comment,
 };
-use crate::{OutputFile};
+use crate::OutputFile;
 
 use super::util::{collect_case, print_auto_generated_file_comment, type_ref_name};
 
@@ -13,7 +13,9 @@ use convert_case::{Case, Casing};
 use spacetimedb_lib::sats::layout::PrimitiveType;
 use spacetimedb_lib::sats::AlgebraicTypeRef;
 use spacetimedb_primitives::ColId;
-use spacetimedb_schema::def::{BTreeAlgorithm, IndexAlgorithm, ModuleDef, ReducerDef, ScopedTypeName, TableDef, TypeDef};
+use spacetimedb_schema::def::{
+    BTreeAlgorithm, IndexAlgorithm, ModuleDef, ReducerDef, ScopedTypeName, TableDef, TypeDef,
+};
 use spacetimedb_schema::identifier::Identifier;
 use spacetimedb_schema::type_for_generate::{AlgebraicTypeDef, AlgebraicTypeUse, ProductTypeDef};
 
@@ -46,34 +48,12 @@ impl Lang for TypeScript {
             }
         };
 
-        let define_variants_for_sum = |variants: &[(Identifier, AlgebraicTypeUse)]| {
-            let mut output = CodeIndenter::new(String::new(), INDENT);
-            let out = &mut output;
-
-            print_file_header(out, false, true);
-            // Note that the current type is not included in dont_import below.
-            gen_and_print_imports(module, out, variants, &[], Some("Type"));
-            writeln!(out);
-            write_variant_types(module, out, variants);
-            out.newline();
-            OutputFile {
-                filename: variants_module_name(&typ.name) + ".ts",
-                code: output.into_inner(),
-            }
-        };
-
         let define_type_for_sum = |variants: &[(Identifier, AlgebraicTypeUse)]| {
             let mut output = CodeIndenter::new(String::new(), INDENT);
             let out = &mut output;
 
             print_file_header(out, false, true);
             gen_and_print_imports(module, out, variants, &[typ.ty], None);
-            writeln!(
-                out,
-                "import * as {}Variants from './{}'",
-                type_name,
-                variants_module_name(&typ.name)
-            );
             writeln!(out);
             // For the purpose of bootstrapping AlgebraicType, if the name of the type
             // is `AlgebraicType`, we need to use an alias.
@@ -90,10 +70,7 @@ impl Lang for TypeScript {
                 vec![define_type_for_product(product)]
             }
             AlgebraicTypeDef::Sum(sum) => {
-                vec![
-                    define_variants_for_sum(&sum.variants),
-                    define_type_for_sum(&sum.variants),
-                ]
+                vec![define_type_for_sum(&sum.variants)]
             }
             AlgebraicTypeDef::PlainEnum(plain_enum) => {
                 let variants = plain_enum
@@ -102,7 +79,7 @@ impl Lang for TypeScript {
                     .cloned()
                     .map(|var| (var, AlgebraicTypeUse::Unit))
                     .collect::<Vec<_>>();
-                vec![define_variants_for_sum(&variants), define_type_for_sum(&variants)]
+                vec![define_type_for_sum(&variants)]
             }
         }
     }
@@ -112,7 +89,7 @@ impl Lang for TypeScript {
     /// table({
     ///   name: 'player',
     ///   indexes: [
-    ///     { name: 'this_is_an_index', algorithm: "btree", columns: [ "ownerId" ] } 
+    ///     { name: 'this_is_an_index', algorithm: "btree", columns: [ "ownerId" ] }
     ///   ],
     /// }, t.row({
     ///   id: t.u32().primaryKey(),
@@ -190,7 +167,7 @@ impl Lang for TypeScript {
         writeln!(out, "// Import and reexport all reducer arg types");
         for reducer in iter_reducers(module) {
             let reducer_name = &reducer.name;
-            let reducer_module_name = reducer_module_name(reducer_name) + ".ts";
+            let reducer_module_name = reducer_module_name(reducer_name);
             let args_type = reducer_args_type_name(&reducer.name);
             writeln!(out, "import {args_type} from \"./{reducer_module_name}\";");
             writeln!(out, "export {{ {args_type} }};");
@@ -200,7 +177,7 @@ impl Lang for TypeScript {
         writeln!(out, "// Import and reexport all table handle types");
         for table in iter_tables(module) {
             let table_name = &table.name;
-            let table_module_name = table_module_name(table_name) + ".ts";
+            let table_module_name = table_module_name(table_name);
             let table_name_pascalcase = table.name.deref().to_case(Case::Pascal);
             // TODO: This really shouldn't be necessary. We could also have `table()` accept
             // `__t.object(...)`s.
@@ -212,13 +189,13 @@ impl Lang for TypeScript {
         writeln!(out, "// Import and reexport all types");
         for ty in iter_types(module) {
             let type_name = collect_case(Case::Pascal, ty.name.name_segments());
-            let type_module_name = type_module_name(&ty.name) + ".ts";
+            let type_module_name = type_module_name(&ty.name);
             writeln!(out, "import {type_name} from \"./{type_module_name}\";");
             writeln!(out, "export {{ {type_name} }};");
         }
 
         out.newline();
-        
+
         writeln!(out);
         writeln!(out, "const tablesSchema = __schema(");
         out.indent(1);
@@ -271,8 +248,14 @@ impl Lang for TypeScript {
         out.dedent(1);
 
         writeln!(out);
-        writeln!(out, "export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);");
-        writeln!(out, "export const reducers = __convertToAccessorMap(reducersSchema.reducersType.reducers);");
+        writeln!(
+            out,
+            "export const tables = __convertToAccessorMap(tablesSchema.schemaType.tables);"
+        );
+        writeln!(
+            out,
+            "export const reducers = __convertToAccessorMap(reducersSchema.reducersType.reducers);"
+        );
         writeln!(out);
 
         out.newline();
@@ -297,7 +280,10 @@ impl Lang for TypeScript {
 
         writeln!(out);
 
-        writeln!(out, "export class SubscriptionBuilder extends __SubscriptionBuilderImpl<");
+        writeln!(
+            out,
+            "export class SubscriptionBuilder extends __SubscriptionBuilderImpl<"
+        );
         out.indent(1);
         writeln!(out, "typeof REMOTE_MODULE");
         out.dedent(1);
@@ -316,10 +302,7 @@ impl Lang for TypeScript {
             "export class DbConnection extends __DbConnectionImpl<typeof REMOTE_MODULE> {{"
         );
         out.indent(1);
-        writeln!(
-            out,
-            "static builder = (): DbConnectionBuilder => {{"
-        );
+        writeln!(out, "static builder = (): DbConnectionBuilder => {{");
         out.indent(1);
         writeln!(
             out,
@@ -327,13 +310,10 @@ impl Lang for TypeScript {
         );
         out.dedent(1);
         writeln!(out, "}};");
-        writeln!(
-            out,
-            "subscriptionBuilder = (): SubscriptionBuilder => {{"
-        );
+        writeln!(out, "subscriptionBuilder = (): SubscriptionBuilder => {{");
         out.indent(1);
         writeln!(out, "return new SubscriptionBuilder(this);");
-        
+
         out.dedent(1);
         writeln!(out, "}};");
         out.dedent(1);
@@ -350,7 +330,7 @@ impl Lang for TypeScript {
 fn print_index_imports(out: &mut Indenter) {
     // All library imports are prefixed with `__` to avoid
     // clashing with the names of user generated types.
-     let mut types = [
+    let mut types = [
         "TypeBuilder as __TypeBuilder",
         "type AlgebraicTypeType as __AlgebraicTypeType",
         "DbConnectionBuilder as __DbConnectionBuilder",
@@ -384,7 +364,7 @@ fn print_index_imports(out: &mut Indenter) {
 fn print_type_builder_imports(out: &mut Indenter) {
     // All library imports are prefixed with `__` to avoid
     // clashing with the names of user generated types.
-     let mut types = [
+    let mut types = [
         "TypeBuilder as __TypeBuilder",
         "type AlgebraicTypeType as __AlgebraicTypeType",
         "type Infer as __Infer",
@@ -426,15 +406,11 @@ fn print_lint_suppression(output: &mut Indenter) {
 ///   fooBar: __t.string(),
 /// };
 /// ```
-fn define_body_for_reducer(
-    module: &ModuleDef,
-    out: &mut Indenter,
-    params: &[(Identifier, AlgebraicTypeUse)],
-) {
+fn define_body_for_reducer(module: &ModuleDef, out: &mut Indenter, params: &[(Identifier, AlgebraicTypeUse)]) {
     write!(out, "export default {{");
     if params.is_empty() {
         writeln!(out, "}};");
-    } else {    
+    } else {
         writeln!(out);
         out.with_indent(|out| write_object_type_builder_fields(module, out, params, true).unwrap());
         writeln!(out, "}};");
@@ -455,7 +431,6 @@ fn define_body_for_product(
     name: &str,
     elements: &[(Identifier, AlgebraicTypeUse)],
 ) {
-
     write!(out, "export default __t.object(\"{name}\", {{");
     if elements.is_empty() {
         writeln!(out, "}});");
@@ -470,11 +445,7 @@ fn define_body_for_product(
 fn write_table_opts(module: &ModuleDef, out: &mut Indenter, table: &TableDef) {
     let type_ref = table.product_type_ref;
     let product_def = module.typespace_for_generate()[type_ref].as_product().unwrap();
-    writeln!(
-        out,
-        "name: '{}',",
-        table.name.deref()
-    );
+    writeln!(out, "name: '{}',", table.name.deref());
     writeln!(out, "indexes: [");
     out.indent(1);
     for index_def in iter_indexes(table) {
@@ -533,12 +504,7 @@ fn write_object_type_builder_fields(
     Ok(())
 }
 
-fn write_type_builder_field(
-    module: &ModuleDef,
-    out: &mut Indenter,
-    name: &str,
-    ty: &AlgebraicTypeUse,
-) -> fmt::Result {
+fn write_type_builder_field(module: &ModuleDef, out: &mut Indenter, name: &str, ty: &AlgebraicTypeUse) -> fmt::Result {
     // Do we need a getter? (Option/Array only if their inner is a Ref)
     let needs_getter = match ty {
         AlgebraicTypeUse::Ref(_) => true,
@@ -579,7 +545,7 @@ fn write_type_builder<W: Write>(module: &ModuleDef, out: &mut W, ty: &AlgebraicT
             write!(out, "__t.option(")?;
             write_type_builder(module, out, inner_ty)?;
             write!(out, ")")?;
-        },
+        }
         AlgebraicTypeUse::Primitive(prim) => match prim {
             PrimitiveType::Bool => write!(out, "__t.bool()")?,
             PrimitiveType::I8 => write!(out, "__t.i8()")?,
@@ -605,59 +571,14 @@ fn write_type_builder<W: Write>(module: &ModuleDef, out: &mut W, ty: &AlgebraicT
             write!(out, "__t.array(")?;
             write_type_builder(module, out, elem_ty)?;
             write!(out, ")")?;
-        },
+        }
         AlgebraicTypeUse::Ref(r) => {
             write!(out, "{}", type_ref_name(module, *r))?;
-        },
+        }
     }
     Ok(())
 }
 
-fn write_sum_variant_type(module: &ModuleDef, out: &mut Indenter, ident: &Identifier, ty: &AlgebraicTypeUse) {
-    let name = ident.deref().to_case(Case::Pascal);
-    write!(out, "export type {name} = ");
-
-    // If the contained type is the unit type, i.e. this variant has no members,
-    // write only the tag.
-    // ```
-    // { tag: "Foo" }
-    // ```
-    write!(out, "{{ ");
-    write!(out, "tag: \"{name}\"");
-
-    // If the contained type is not the unit type, write the tag and the value.
-    // ```
-    // { tag: "Bar", value: Infer<typeof BarType> }
-    // { tag: "Bar", value: number }
-    // { tag: "Bar", value: string }
-    // ```
-    // Note you could alternatively do:
-    // ```
-    // { tag: "Bar" } & Infer<typeof BarType>
-    // ```
-    // for non-primitive types but that doesn't extend to primitives.
-    // Another alternative would be to name the value field the same as the tag field, but lowercased
-    // ```
-    // { tag: "Bar", bar: Infer<typeof BarType> }
-    // { tag: "Bar", bar: number }
-    // { tag: "Bar", bar: string }
-    // ```
-    // but this is a departure from our previous convention and is not much different.
-    if !matches!(ty, AlgebraicTypeUse::Unit) {
-        write!(out, ", value: ");
-        write_type(module, out, ty, None, Some("Type")).unwrap();
-    }
-
-    writeln!(out, " }};");
-}
-
-fn write_variant_types(module: &ModuleDef, out: &mut Indenter, variants: &[(Identifier, AlgebraicTypeUse)]) {
-    // Write all the variant types.
-    for (ident, ty) in variants {
-        write_sum_variant_type(module, out, ident, ty);
-    }
-}
-
 /// e.g.
 /// ```ts
 /// // The tagged union or sum type for the algebraic type `Option`.
@@ -694,34 +615,18 @@ fn type_module_name(type_name: &ScopedTypeName) -> String {
     collect_case(Case::Snake, type_name.name_segments()) + "_type"
 }
 
-fn variants_module_name(type_name: &ScopedTypeName) -> String {
-    collect_case(Case::Snake, type_name.name_segments()) + "_variants"
-}
-
 fn table_module_name(table_name: &Identifier) -> String {
     table_name.deref().to_case(Case::Snake) + "_table"
 }
 
-fn table_method_name(table_name: &Identifier) -> String {
-    table_name.deref().to_case(Case::Camel)
-}
-
 fn reducer_args_type_name(reducer_name: &Identifier) -> String {
     reducer_name.deref().to_case(Case::Pascal)
 }
 
-fn reducer_variant_name(reducer_name: &Identifier) -> String {
-    reducer_name.deref().to_case(Case::Pascal)
-}
-
 fn reducer_module_name(reducer_name: &Identifier) -> String {
     reducer_name.deref().to_case(Case::Snake) + "_reducer"
 }
 
-fn reducer_function_name(reducer: &ReducerDef) -> String {
-    reducer.name.deref().to_case(Case::Camel)
-}
-
 pub fn type_name(module: &ModuleDef, ty: &AlgebraicTypeUse) -> String {
     let mut s = String::new();
     write_type(module, &mut s, ty, None, None).unwrap();
@@ -827,10 +732,7 @@ fn print_imports(module: &ModuleDef, out: &mut Indenter, imports: Imports, suffi
         let module_name = type_ref_module_name(module, typeref);
         let type_name = type_ref_name(module, typeref);
         if let Some(suffix) = suffix {
-            writeln!(
-                out,
-                "import {type_name}{suffix} from \"./{module_name}\";"
-            );
+            writeln!(out, "import {type_name}{suffix} from \"./{module_name}\";");
         } else {
             writeln!(out, "import {type_name} from \"./{module_name}\";");
         }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd66da9016c..5a173665ccb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -57,8 +57,8 @@ importers:
         specifier: ^3.3.3
         version: 3.6.2
       react:
-        specifier: ^18.0.0 || ^19.0.0-0 || ^19.0.0
-        version: 18.3.1
+        specifier: ^19.0.0
+        version: 19.2.0
       undici:
         specifier: ^6.19.2
         version: 6.21.3
@@ -204,6 +204,37 @@ importers:
         specifier: ^7.1.5
         version: 7.1.5(@types/node@24.3.0)(jiti@2.5.1)(terser@5.43.1)(tsx@4.20.4)
 
+  crates/bindings-typescript/test-react-router-app:
+    dependencies:
+      react:
+        specifier: ^18.3.1
+        version: 18.3.1
+      react-dom:
+        specifier: ^18.3.1
+        version: 18.3.1(react@18.3.1)
+      react-router-dom:
+        specifier: ^7.9.4
+        version: 7.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+    devDependencies:
+      '@types/react':
+        specifier: ^18.3.3
+        version: 18.3.23
+      '@types/react-dom':
+        specifier: ^18.3.0
+        version: 18.3.7(@types/react@18.3.23)
+      '@types/react-router-dom':
+        specifier: ^5.3.3
+        version: 5.3.3
+      '@vitejs/plugin-react':
+        specifier: ^4.3.1
+        version: 4.7.0(vite@7.1.5(@types/node@24.3.0)(jiti@2.5.1)(terser@5.43.1)(tsx@4.20.4))
+      typescript:
+        specifier: ^5.2.2
+        version: 5.9.3
+      vite:
+        specifier: ^7.1.5
+        version: 7.1.5(@types/node@24.3.0)(jiti@2.5.1)(terser@5.43.1)(tsx@4.20.4)
+
   docs:
     dependencies:
       '@docusaurus/core':
@@ -211,7 +242,7 @@ importers:
         version: 3.9.1(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
       '@docusaurus/plugin-content-docs':
         specifier: ^3.9.2
-        version: 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
+        version: 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
       '@docusaurus/preset-classic':
         specifier: 3.9.1
         version: 3.9.1(@algolia/client-search@5.39.0)(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(@types/react@19.2.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(search-insights@2.17.3)(typescript@5.6.3)
@@ -4522,6 +4553,10 @@ packages:
     resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
     engines: {node: '>= 0.6'}
 
+  cookie@1.0.2:
+    resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==}
+    engines: {node: '>=18'}
+
   copy-webpack-plugin@11.0.0:
     resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==}
     engines: {node: '>= 14.15.0'}
@@ -7511,11 +7546,28 @@ packages:
     peerDependencies:
       react: '>=15'
 
+  react-router-dom@7.9.5:
+    resolution: {integrity: sha512-mkEmq/K8tKN63Ae2M7Xgz3c9l9YNbY+NHH6NNeUmLA3kDkhKXRsNb/ZpxaEunvGo2/3YXdk5EJU3Hxp3ocaBPw==}
+    engines: {node: '>=20.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+
   react-router@5.3.4:
     resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==}
     peerDependencies:
       react: '>=15'
 
+  react-router@7.9.5:
+    resolution: {integrity: sha512-JmxqrnBZ6E9hWmf02jzNn9Jm3UqyeimyiwzD69NjxGySG6lIz/1LVPsoTCwN7NBX2XjCEa1LIX5EMz1j2b6u6A==}
+    engines: {node: '>=20.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+
   react-style-singleton@2.2.3:
     resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
     engines: {node: '>=10'}
@@ -7827,6 +7879,9 @@ packages:
     resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
 
+  set-cookie-parser@2.7.2:
+    resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==}
+
   set-function-length@1.2.2:
     resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
     engines: {node: '>= 0.4'}
@@ -9131,10 +9186,10 @@ snapshots:
       '@babel/helper-compilation-targets': 7.27.2
       '@babel/helper-module-transforms': 7.28.3(@babel/core@7.28.3)
       '@babel/helpers': 7.28.3
-      '@babel/parser': 7.28.3
+      '@babel/parser': 7.28.4
       '@babel/template': 7.27.2
-      '@babel/traverse': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/traverse': 7.28.4
+      '@babel/types': 7.28.4
       convert-source-map: 2.0.0
       debug: 4.4.3
       gensync: 1.0.0-beta.2
@@ -9145,8 +9200,8 @@ snapshots:
 
   '@babel/generator@7.28.3':
     dependencies:
-      '@babel/parser': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.30
       jsesc: 3.1.0
@@ -9206,7 +9261,7 @@ snapshots:
   '@babel/helper-module-imports@7.27.1':
     dependencies:
       '@babel/traverse': 7.28.4
-      '@babel/types': 7.28.2
+      '@babel/types': 7.28.4
     transitivePeerDependencies:
       - supports-color
 
@@ -9215,7 +9270,7 @@ snapshots:
       '@babel/core': 7.28.3
       '@babel/helper-module-imports': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
-      '@babel/traverse': 7.28.3
+      '@babel/traverse': 7.28.4
     transitivePeerDependencies:
       - supports-color
 
@@ -9267,7 +9322,7 @@ snapshots:
   '@babel/helpers@7.28.3':
     dependencies:
       '@babel/template': 7.27.2
-      '@babel/types': 7.28.2
+      '@babel/types': 7.28.4
 
   '@babel/parser@7.28.3':
     dependencies:
@@ -9862,8 +9917,8 @@ snapshots:
   '@babel/template@7.27.2':
     dependencies:
       '@babel/code-frame': 7.27.1
-      '@babel/parser': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
 
   '@babel/traverse@7.28.3':
     dependencies:
@@ -10711,6 +10766,46 @@ snapshots:
       - webpack-cli
 
   '@docusaurus/plugin-content-docs@3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)':
+    dependencies:
+      '@docusaurus/core': 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
+      '@docusaurus/logger': 3.9.2
+      '@docusaurus/mdx-loader': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/module-type-aliases': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/theme-common': 3.9.2(@docusaurus/plugin-content-docs@3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/types': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/utils': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/utils-common': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/utils-validation': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@types/react-router-config': 5.0.11
+      combine-promises: 1.2.0
+      fs-extra: 11.3.2
+      js-yaml: 4.1.0
+      lodash: 4.17.21
+      react: 19.2.0
+      react-dom: 19.2.0(react@19.2.0)
+      schema-dts: 1.1.5
+      tslib: 2.8.1
+      utility-types: 3.11.0
+      webpack: 5.102.0
+    transitivePeerDependencies:
+      - '@docusaurus/faster'
+      - '@mdx-js/react'
+      - '@parcel/css'
+      - '@rspack/core'
+      - '@swc/core'
+      - '@swc/css'
+      - bufferutil
+      - csso
+      - debug
+      - esbuild
+      - lightningcss
+      - supports-color
+      - typescript
+      - uglify-js
+      - utf-8-validate
+      - webpack-cli
+
+  '@docusaurus/plugin-content-docs@3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)':
     dependencies:
       '@docusaurus/core': 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
       '@docusaurus/logger': 3.9.2
@@ -11095,7 +11190,7 @@ snapshots:
     dependencies:
       '@docusaurus/mdx-loader': 3.9.1(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
       '@docusaurus/module-type-aliases': 3.9.1(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
-      '@docusaurus/plugin-content-docs': 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
+      '@docusaurus/plugin-content-docs': 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
       '@docusaurus/utils': 3.9.1(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
       '@docusaurus/utils-common': 3.9.1(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
       '@types/history': 4.7.11
@@ -11115,7 +11210,7 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/theme-common@3.9.2(@docusaurus/plugin-content-docs@3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+  '@docusaurus/theme-common@3.9.2(@docusaurus/plugin-content-docs@3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(debug@4.4.3)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
     dependencies:
       '@docusaurus/mdx-loader': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
       '@docusaurus/module-type-aliases': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
@@ -11139,6 +11234,30 @@ snapshots:
       - uglify-js
       - webpack-cli
 
+  '@docusaurus/theme-common@3.9.2(@docusaurus/plugin-content-docs@3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)':
+    dependencies:
+      '@docusaurus/mdx-loader': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/module-type-aliases': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/plugin-content-docs': 3.9.2(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(typescript@5.6.3)
+      '@docusaurus/utils': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@docusaurus/utils-common': 3.9.2(react-dom@19.2.0(react@19.2.0))(react@19.2.0)
+      '@types/history': 4.7.11
+      '@types/react': 18.3.23
+      '@types/react-router-config': 5.0.11
+      clsx: 2.1.1
+      parse-numeric-range: 1.3.0
+      prism-react-renderer: 2.4.1(react@19.2.0)
+      react: 19.2.0
+      react-dom: 19.2.0(react@19.2.0)
+      tslib: 2.8.1
+      utility-types: 3.11.0
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - supports-color
+      - uglify-js
+      - webpack-cli
+
   '@docusaurus/theme-search-algolia@3.9.1(@algolia/client-search@5.39.0)(@mdx-js/react@3.1.1(@types/react@19.2.0)(react@19.2.0))(@types/react@19.2.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(search-insights@2.17.3)(typescript@5.6.3)':
     dependencies:
       '@docsearch/react': 4.2.0(@algolia/client-search@5.39.0)(@types/react@19.2.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(search-insights@2.17.3)
@@ -13175,24 +13294,24 @@ snapshots:
 
   '@types/babel__core@7.20.5':
     dependencies:
-      '@babel/parser': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
       '@types/babel__generator': 7.27.0
       '@types/babel__template': 7.4.4
       '@types/babel__traverse': 7.28.0
 
   '@types/babel__generator@7.27.0':
     dependencies:
-      '@babel/types': 7.28.2
+      '@babel/types': 7.28.4
 
   '@types/babel__template@7.4.4':
     dependencies:
-      '@babel/parser': 7.28.3
-      '@babel/types': 7.28.2
+      '@babel/parser': 7.28.4
+      '@babel/types': 7.28.4
 
   '@types/babel__traverse@7.28.0':
     dependencies:
-      '@babel/types': 7.28.2
+      '@babel/types': 7.28.4
 
   '@types/body-parser@1.19.6':
     dependencies:
@@ -15280,6 +15399,8 @@ snapshots:
 
   cookie@0.7.1: {}
 
+  cookie@1.0.2: {}
+
   copy-webpack-plugin@11.0.0(webpack@5.102.0):
     dependencies:
       fast-glob: 3.3.3
@@ -18813,6 +18934,12 @@ snapshots:
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
+  react-router-dom@7.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-router: 7.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+
   react-router@5.3.4(react@19.2.0):
     dependencies:
       '@babel/runtime': 7.28.4
@@ -18826,6 +18953,14 @@ snapshots:
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
+  react-router@7.9.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      cookie: 1.0.2
+      react: 18.3.1
+      set-cookie-parser: 2.7.2
+    optionalDependencies:
+      react-dom: 18.3.1(react@18.3.1)
+
   react-style-singleton@2.2.3(@types/react@19.2.0)(react@19.2.0):
     dependencies:
       get-nonce: 1.0.1
@@ -19262,6 +19397,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  set-cookie-parser@2.7.2: {}
+
   set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4

From d398d25d044a837e6e517713ef267b15453dfcaa Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 9 Nov 2025 16:26:12 -0500
Subject: [PATCH 20/23] pnpm format

---
 crates/bindings-typescript/src/lib/indexes.ts          |  2 +-
 crates/bindings-typescript/src/lib/schema.ts           |  7 ++++++-
 crates/bindings-typescript/src/lib/util.ts             |  7 +++++--
 crates/bindings-typescript/src/react/useReducer.ts     | 10 ++++------
 .../bindings-typescript/src/sdk/db_connection_impl.ts  |  4 +---
 crates/bindings-typescript/src/sdk/db_context.ts       |  5 +----
 crates/bindings-typescript/src/sdk/table_cache.ts      |  9 ++-------
 crates/bindings-typescript/src/server/runtime.ts       |  7 ++++++-
 .../test-react-router-app/src/pages/CounterPage.tsx    |  4 +---
 9 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/crates/bindings-typescript/src/lib/indexes.ts b/crates/bindings-typescript/src/lib/indexes.ts
index 9ac54cdd83c..75e0b0a0b8d 100644
--- a/crates/bindings-typescript/src/lib/indexes.ts
+++ b/crates/bindings-typescript/src/lib/indexes.ts
@@ -97,7 +97,7 @@ export interface UniqueIndex<
 > extends ReadonlyUniqueIndex<TableDef, I> {
   delete(colVal: IndexVal<TableDef, I>): boolean;
   update(colVal: RowType<TableDef>): RowType<TableDef>;
-};
+}
 
 /**
  * A type representing a read-only ranged index on a database table.
diff --git a/crates/bindings-typescript/src/lib/schema.ts b/crates/bindings-typescript/src/lib/schema.ts
index d5bc6fdbe45..367a0018929 100644
--- a/crates/bindings-typescript/src/lib/schema.ts
+++ b/crates/bindings-typescript/src/lib/schema.ts
@@ -33,7 +33,12 @@ import type RawScopedTypeNameV9 from './autogen/raw_scoped_type_name_v_9_type';
 import type { CamelCase } from './type_util';
 import type { TableSchema } from './table_schema';
 import { toCamelCase } from './util';
-import { defineView, type AnonymousViewFn, type ViewFn, type ViewReturnTypeBuilder } from './views';
+import {
+  defineView,
+  type AnonymousViewFn,
+  type ViewFn,
+  type ViewReturnTypeBuilder,
+} from './views';
 
 export type TableNamesOf<S extends UntypedSchemaDef> =
   S['tables'][number]['name'];
diff --git a/crates/bindings-typescript/src/lib/util.ts b/crates/bindings-typescript/src/lib/util.ts
index 83822e6c760..c13a90b0e53 100644
--- a/crates/bindings-typescript/src/lib/util.ts
+++ b/crates/bindings-typescript/src/lib/util.ts
@@ -113,7 +113,10 @@ import type { AlgebraicType } from './algebraic_type';
 import type Typespace from './autogen/typespace_type';
 import type { Infer } from './type_builders';
 
-export function bsatnBaseSize(typespace: Infer<typeof Typespace>, ty: AlgebraicType): number {
+export function bsatnBaseSize(
+  typespace: Infer<typeof Typespace>,
+  ty: AlgebraicType
+): number {
   const assumedArrayLength = 4;
   while (ty.tag === 'Ref') ty = typespace.types[ty.value];
   if (ty.tag === 'Product') {
@@ -152,4 +155,4 @@ export function bsatnBaseSize(typespace: Infer<typeof Typespace>, ty: AlgebraicT
     I256: 32,
     U256: 32,
   }[ty.tag];
-}
\ No newline at end of file
+}
diff --git a/crates/bindings-typescript/src/react/useReducer.ts b/crates/bindings-typescript/src/react/useReducer.ts
index dc93ae01b58..742f456ae31 100644
--- a/crates/bindings-typescript/src/react/useReducer.ts
+++ b/crates/bindings-typescript/src/react/useReducer.ts
@@ -7,9 +7,9 @@ import type { Prettify } from '../lib/type_util';
 type IsEmptyObject<T> = [keyof T] extends [never] ? true : false;
 type MaybeParams<T> = IsEmptyObject<T> extends true ? [] : [params: T];
 
-type ParamsType<R extends UntypedReducerDef> = MaybeParams<Prettify<
-  InferTypeOfRow<R['params']>
->>;
+type ParamsType<R extends UntypedReducerDef> = MaybeParams<
+  Prettify<InferTypeOfRow<R['params']>>
+>;
 
 export function useReducer<ReducerDef extends UntypedReducerDef>(
   reducerDef: ReducerDef
@@ -18,9 +18,7 @@ export function useReducer<ReducerDef extends UntypedReducerDef>(
   const reducerName = reducerDef.accessorName;
 
   // Holds calls made before the connection exists
-  const queueRef = useRef<
-    ParamsType<ReducerDef>[]
-  >([]);
+  const queueRef = useRef<ParamsType<ReducerDef>[]>([]);
 
   // Flush when we finally have a connection
   useEffect(() => {
diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
index ddfaac3b0b1..1e250548738 100644
--- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts
+++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts
@@ -28,9 +28,7 @@ import type {
   UnsubscribeAppliedMessage,
 } from './message_types.ts';
 import type { ReducerEvent } from './reducer_event.ts';
-import {
-  type UntypedRemoteModule,
-} from './spacetime_module.ts';
+import { type UntypedRemoteModule } from './spacetime_module.ts';
 import {
   TableCache,
   type Operation,
diff --git a/crates/bindings-typescript/src/sdk/db_context.ts b/crates/bindings-typescript/src/sdk/db_context.ts
index 230170ac840..f34bf4a95ed 100644
--- a/crates/bindings-typescript/src/sdk/db_context.ts
+++ b/crates/bindings-typescript/src/sdk/db_context.ts
@@ -1,8 +1,5 @@
 import type { ClientDbView } from './db_view';
-import type {
-  ReducersView,
-  SetReducerFlags,
-} from './reducers';
+import type { ReducersView, SetReducerFlags } from './reducers';
 import type { UntypedRemoteModule } from './spacetime_module';
 import type { SubscriptionBuilderImpl } from './subscription_builder_impl';
 
diff --git a/crates/bindings-typescript/src/sdk/table_cache.ts b/crates/bindings-typescript/src/sdk/table_cache.ts
index 2ff2a1ac194..abc4fb147d5 100644
--- a/crates/bindings-typescript/src/sdk/table_cache.ts
+++ b/crates/bindings-typescript/src/sdk/table_cache.ts
@@ -2,14 +2,9 @@ import { EventEmitter } from './event_emitter.ts';
 
 import { stdbLogger } from './logger.ts';
 import type { ComparablePrimitive } from '../';
-import type {
-  EventContextInterface,
-  TableDefForTableName,
-} from './index.ts';
+import type { EventContextInterface, TableDefForTableName } from './index.ts';
 import type { RowType, UntypedTableDef } from '../lib/table.ts';
-import type {
-  ClientTableCoreImplementable,
-} from './client_table.ts';
+import type { ClientTableCoreImplementable } from './client_table.ts';
 import type { UntypedRemoteModule } from './spacetime_module.ts';
 import type { TableNamesOf } from '../lib/schema.ts';
 
diff --git a/crates/bindings-typescript/src/server/runtime.ts b/crates/bindings-typescript/src/server/runtime.ts
index a6a02308d23..92b50768052 100644
--- a/crates/bindings-typescript/src/server/runtime.ts
+++ b/crates/bindings-typescript/src/server/runtime.ts
@@ -32,7 +32,12 @@ import type { DbView } from './db_view';
 import { toCamelCase } from '../lib/util';
 import type { Infer } from '../lib/type_builders';
 import { bsatnBaseSize } from '../lib/util';
-import { ANON_VIEWS, VIEWS, type AnonymousViewCtx, type ViewCtx } from '../lib/views';
+import {
+  ANON_VIEWS,
+  VIEWS,
+  type AnonymousViewCtx,
+  type ViewCtx,
+} from '../lib/views';
 
 const { freeze } = Object;
 
diff --git a/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx b/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx
index d5787e39620..034ba900866 100644
--- a/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx
+++ b/crates/bindings-typescript/test-react-router-app/src/pages/CounterPage.tsx
@@ -18,9 +18,7 @@ export default function CounterPage() {
         <p>
           Click above to increment the count, click below to clear the count.
         </p>
-        <button onClick={() => clearCounter()}>
-          clear count
-        </button>
+        <button onClick={() => clearCounter()}>clear count</button>
       </div>
     </>
   );

From c61fae717081900187abc1ad39ac841af540346c Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 9 Nov 2025 16:26:27 -0500
Subject: [PATCH 21/23] cargo fmt

---
 crates/codegen/src/typescript.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/codegen/src/typescript.rs b/crates/codegen/src/typescript.rs
index ba1872a7be5..c3aa847b7e4 100644
--- a/crates/codegen/src/typescript.rs
+++ b/crates/codegen/src/typescript.rs
@@ -99,7 +99,12 @@ impl Lang for TypeScript {
     ///   location: pointType,
     /// }))
     /// ```
-    fn generate_table_file_from_schema(&self, module: &ModuleDef, table: &TableDef, _schema: TableSchema) -> OutputFile {
+    fn generate_table_file_from_schema(
+        &self,
+        module: &ModuleDef,
+        table: &TableDef,
+        _schema: TableSchema,
+    ) -> OutputFile {
         let mut output = CodeIndenter::new(String::new(), INDENT);
         let out = &mut output;
 

From 64b3404f9829fa9825cb1b460c912621d493a8d4 Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 9 Nov 2025 16:28:38 -0500
Subject: [PATCH 22/23] misconfigured import

---
 crates/bindings-typescript/src/server/runtime.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/bindings-typescript/src/server/runtime.ts b/crates/bindings-typescript/src/server/runtime.ts
index 92b50768052..a6a02308d23 100644
--- a/crates/bindings-typescript/src/server/runtime.ts
+++ b/crates/bindings-typescript/src/server/runtime.ts
@@ -32,12 +32,7 @@ import type { DbView } from './db_view';
 import { toCamelCase } from '../lib/util';
 import type { Infer } from '../lib/type_builders';
 import { bsatnBaseSize } from '../lib/util';
-import {
-  ANON_VIEWS,
-  VIEWS,
-  type AnonymousViewCtx,
-  type ViewCtx,
-} from '../lib/views';
+import { ANON_VIEWS, VIEWS, type AnonymousViewCtx, type ViewCtx } from '../lib/views';
 
 const { freeze } = Object;
 

From 31243a71da6b5b921f89507411e20fa9f2e575ee Mon Sep 17 00:00:00 2001
From: = <cloutiertyler@gmail.com>
Date: Sun, 9 Nov 2025 16:29:52 -0500
Subject: [PATCH 23/23] Fixed broken type tests

---
 crates/bindings-typescript/src/server/schema.test-d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bindings-typescript/src/server/schema.test-d.ts b/crates/bindings-typescript/src/server/schema.test-d.ts
index 8ffc6f50656..c1846ca1716 100644
--- a/crates/bindings-typescript/src/server/schema.test-d.ts
+++ b/crates/bindings-typescript/src/server/schema.test-d.ts
@@ -1,6 +1,6 @@
-import { schema } from './schema';
-import { table } from './table';
-import t from './type_builders';
+import { schema } from '../lib/schema';
+import { table } from '../lib/table';
+import t from '../lib/type_builders';
 
 const person = table(
   {