@tanstack/db 0.0.4 → 0.0.6

package/dist/cjs/query/query-builder.d.cts

@@ -1,5 +1,5 @@
 import { Collection } from '../collection.cjs';
-import { Comparator, Condition, Limit, LiteralValue, Offset, OrderBy, Query, Select } from './schema.js';
+import { Comparator, Condition, Limit, LiteralValue, Offset, OrderBy, Query, Select, WhereCallback } from './schema.js';
 import { Context, Flatten, InferResultTypeFromSelectTuple, Input, InputReference, PropertyReference, PropertyReferenceString, RemoveIndexSignature, Schema } from './types.js';
 type CollectionRef = {
     [K: string]: Collection<any>;
@@ -44,8 +44,9 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
     /**
      * Specify what columns to select.
      * Overwrites any previous select clause.
+     * Also supports callback functions that receive the row context and return selected data.
      *
-     * @param selects The columns to select
+     * @param selects The columns to select (can include callbacks)
      * @returns A new QueryBuilder with the select clause set
      */
     select<TSelects extends Array<Select<TContext>>>(this: QueryBuilder<TContext>, ...selects: TSelects): QueryBuilder<Flatten<Omit<TContext, `result`> & {
@@ -59,6 +60,10 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
      * Add a where clause with a complete condition object.
      */
     where(condition: Condition<TContext>): QueryBuilder<TContext>;
+    /**
+     * Add a where clause with a callback function.
+     */
+    where(callback: WhereCallback<TContext>): QueryBuilder<TContext>;
     /**
      * Add a having clause comparing two values.
      * For filtering results after they have been grouped.
@@ -69,6 +74,11 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
      * For filtering results after they have been grouped.
      */
     having(condition: Condition<TContext>): QueryBuilder<TContext>;
+    /**
+     * Add a having clause with a callback function.
+     * For filtering results after they have been grouped.
+     */
+    having(callback: WhereCallback<TContext>): QueryBuilder<TContext>;
     /**
      * Add a join clause to the query using a CollectionRef.
      */
@@ -91,6 +101,7 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
         schema: TContext[`schema`] & {
             [K in keyof TCollectionRef & string]: RemoveIndexSignature<(TCollectionRef[keyof TCollectionRef] extends Collection<infer T> ? T : never) & Input>;
         };
+        hasJoin: true;
     }>>;
     /**
      * Add a join clause to the query without specifying an alias.
@@ -118,6 +129,7 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
         schema: TContext[`schema`] & {
             [K in T]: RemoveIndexSignature<TContext[`baseSchema`][T]>;
         };
+        hasJoin: true;
     }>>;
     /**
      * Add a join clause to the query with a specified alias.
@@ -145,6 +157,7 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
         schema: TContext[`schema`] & {
             [K in TAs]: RemoveIndexSignature<TContext[`baseSchema`][TFrom]>;
         };
+        hasJoin: true;
     }>>;
     private joinCollectionRef;
     private joinInputReference;
@@ -170,13 +183,6 @@ export declare class BaseQueryBuilder<TContext extends Context<Schema>> {
      * @returns A new QueryBuilder with the offset set
      */
     offset(offset: Offset<TContext>): QueryBuilder<TContext>;
-    /**
-     * Specify which column(s) to use as keys in the output keyed stream.
-     *
-     * @param keyBy The column(s) to use as keys
-     * @returns A new QueryBuilder with the keyBy clause set
-     */
-    keyBy(keyBy: PropertyReference<TContext> | Array<PropertyReference<TContext>>): QueryBuilder<TContext>;
     /**
      * Add a groupBy clause to group the results by one or more columns.
      *
@@ -212,7 +218,7 @@ export declare function queryBuilder<TBaseSchema extends Schema = {}>(): Initial
     baseSchema: TBaseSchema;
     schema: {};
 }>;
-export type ResultsFromContext<TContext extends Context<Schema>> = Flatten<TContext[`result`] extends object ? TContext[`result`] : TContext[`result`] extends undefined ? TContext[`schema`] : object>;
+export type ResultsFromContext<TContext extends Context<Schema>> = Flatten<TContext[`result`] extends object ? TContext[`result`] : TContext[`hasJoin`] extends true ? TContext[`schema`] : TContext[`default`] extends keyof TContext[`schema`] ? TContext[`schema`][TContext[`default`]] : never>;
 export type ResultFromQueryBuilder<TQueryBuilder> = Flatten<TQueryBuilder extends QueryBuilder<infer C> ? C extends {
     result: infer R;
 } ? R : never : never>;

package/dist/cjs/query/schema.d.cts

@@ -51,7 +51,6 @@ export interface JoinClause<TContext extends Context = Context> {
     from: string;
     as?: string;
     on: Condition<TContext>;
-    where?: Condition<TContext>;
 }
 export type OrderBy<TContext extends Context = Context> = PropertyReferenceString<TContext> | {
     [column in PropertyReferenceString<TContext>]?: `asc` | `desc`;
@@ -60,31 +59,36 @@ export type OrderBy<TContext extends Context = Context> = PropertyReferenceStrin
 }>;
 export type Select<TContext extends Context = Context> = PropertyReferenceString<TContext> | {
     [alias: string]: PropertyReference<TContext> | FunctionCall<TContext> | AggregateFunctionCall<TContext>;
-} | WildcardReferenceString<TContext>;
+} | WildcardReferenceString<TContext> | SelectCallback<TContext>;
+export type SelectCallback<TContext extends Context = Context> = (context: TContext extends {
+    schema: infer S;
+} ? S : any) => any;
 export type As<TContext extends Context = Context> = string;
 export type From<TContext extends Context = Context> = InputReference<{
     baseSchema: TContext[`baseSchema`];
     schema: TContext[`baseSchema`];
 }>;
-export type Where<TContext extends Context = Context> = Condition<TContext>;
+export type WhereCallback<TContext extends Context = Context> = (context: TContext extends {
+    schema: infer S;
+} ? S : any) => boolean;
+export type Where<TContext extends Context = Context> = Array<Condition<TContext> | WhereCallback<TContext>>;
+export type Having<TContext extends Context = Context> = Where<TContext>;
 export type GroupBy<TContext extends Context = Context> = PropertyReference<TContext> | Array<PropertyReference<TContext>>;
-export type Having<TContext extends Context = Context> = Condition<TContext>;
 export type Limit<TContext extends Context = Context> = number;
 export type Offset<TContext extends Context = Context> = number;
 export interface BaseQuery<TContext extends Context = Context> {
-    select: Array<Select<TContext>>;
+    select?: Array<Select<TContext>>;
     as?: As<TContext>;
     from: From<TContext>;
     join?: Array<JoinClause<TContext>>;
-    where?: Condition<TContext>;
+    where?: Where<TContext>;
     groupBy?: GroupBy<TContext>;
-    having?: Condition<TContext>;
+    having?: Having<TContext>;
     orderBy?: OrderBy<TContext>;
     limit?: Limit<TContext>;
     offset?: Offset<TContext>;
 }
 export interface Query<TContext extends Context = Context> extends BaseQuery<TContext> {
-    keyBy?: PropertyReference<TContext> | Array<PropertyReference<TContext>>;
     with?: Array<WithQuery<TContext>>;
     collections?: {
         [K: string]: Collection<any>;
@@ -93,6 +97,3 @@ export interface Query<TContext extends Context = Context> extends BaseQuery<TCo
 export interface WithQuery<TContext extends Context = Context> extends BaseQuery<TContext> {
     as: string;
 }
-export interface KeyedQuery<TContext extends Context = Context> extends Query<TContext> {
-    keyBy: PropertyReference<TContext> | Array<PropertyReference<TContext>>;
-}

package/dist/cjs/query/select.cjs

@@ -4,18 +4,36 @@ const d2ts = require("@electric-sql/d2ts");
 const extractors = require("./extractors.cjs");
 function processSelect(pipeline, query, mainTableAlias, inputs) {
   return pipeline.pipe(
-    d2ts.map((nestedRow) => {
+    d2ts.map(([key, namespacedRow]) => {
       const result = {};
-      const isGroupedResult = query.groupBy && Object.keys(nestedRow).some(
-        (key) => !Object.keys(inputs).includes(key) && typeof nestedRow[key] !== `object`
+      const isGroupedResult = query.groupBy && Object.keys(namespacedRow).some(
+        (namespaceKey) => !Object.keys(inputs).includes(namespaceKey) && typeof namespacedRow[namespaceKey] !== `object`
       );
+      if (!query.select) {
+        throw new Error(`Cannot process missing SELECT clause`);
+      }
       for (const item of query.select) {
+        if (typeof item === `function`) {
+          const callback = item;
+          const callbackResult = callback(namespacedRow);
+          if (callbackResult && typeof callbackResult === `object` && !Array.isArray(callbackResult)) {
+            Object.assign(result, callbackResult);
+          } else {
+            console.warn(
+              `SelectCallback returned a non-object value. SelectCallbacks should return objects with key-value pairs.`
+            );
+          }
+          continue;
+        }
         if (typeof item === `string`) {
           if (item === `@*`) {
             if (isGroupedResult) {
-              Object.assign(result, nestedRow);
+              Object.assign(result, namespacedRow);
             } else {
-              Object.assign(result, extractAllColumnsFromAllTables(nestedRow));
+              Object.assign(
+                result,
+                extractAllColumnsFromAllTables(namespacedRow)
+              );
             }
             continue;
           }
@@ -26,7 +44,7 @@ function processSelect(pipeline, query, mainTableAlias, inputs) {
             } else {
               Object.assign(
                 result,
-                extractAllColumnsFromTable(nestedRow, tableAlias)
+                extractAllColumnsFromTable(namespacedRow, tableAlias)
               );
             }
             continue;
@@ -34,11 +52,11 @@ function processSelect(pipeline, query, mainTableAlias, inputs) {
           if (item.startsWith(`@`)) {
             const columnRef = item.substring(1);
             const alias = columnRef;
-            if (isGroupedResult && columnRef in nestedRow) {
-              result[alias] = nestedRow[columnRef];
+            if (isGroupedResult && columnRef in namespacedRow) {
+              result[alias] = namespacedRow[columnRef];
             } else {
-              result[alias] = extractors.extractValueFromNestedRow(
-                nestedRow,
+              result[alias] = extractors.extractValueFromNamespacedRow(
+                namespacedRow,
                 columnRef,
                 mainTableAlias,
                 void 0
@@ -54,22 +72,24 @@ function processSelect(pipeline, query, mainTableAlias, inputs) {
           for (const [alias, expr] of Object.entries(item)) {
             if (typeof expr === `string` && expr.startsWith(`@`)) {
               const columnRef = expr.substring(1);
-              if (isGroupedResult && columnRef in nestedRow) {
-                result[alias] = nestedRow[columnRef];
+              if (isGroupedResult && columnRef in namespacedRow) {
+                result[alias] = namespacedRow[columnRef];
               } else {
-                result[alias] = extractors.extractValueFromNestedRow(
-                  nestedRow,
+                result[alias] = extractors.extractValueFromNamespacedRow(
+                  namespacedRow,
                   columnRef,
                   mainTableAlias,
                   void 0
                 );
               }
             } else if (typeof expr === `object`) {
-              if (isGroupedResult && alias in nestedRow) {
-                result[alias] = nestedRow[alias];
+              if (isGroupedResult && alias in namespacedRow) {
+                result[alias] = namespacedRow[alias];
+              } else if (expr.ORDER_INDEX) {
+                result[alias] = namespacedRow[mainTableAlias][alias];
               } else {
-                result[alias] = extractors.evaluateOperandOnNestedRow(
-                  nestedRow,
+                result[alias] = extractors.evaluateOperandOnNamespacedRow(
+                  namespacedRow,
                   expr,
                   mainTableAlias,
                   void 0
@@ -79,22 +99,25 @@ function processSelect(pipeline, query, mainTableAlias, inputs) {
           }
         }
       }
-      return result;
+      return [key, result];
     })
   );
 }
-function extractAllColumnsFromAllTables(nestedRow) {
+function extractAllColumnsFromAllTables(namespacedRow) {
   const result = {};
-  for (const [tableAlias, tableData] of Object.entries(nestedRow)) {
+  for (const [tableAlias, tableData] of Object.entries(namespacedRow)) {
     if (tableData && typeof tableData === `object`) {
-      Object.assign(result, extractAllColumnsFromTable(nestedRow, tableAlias));
+      Object.assign(
+        result,
+        extractAllColumnsFromTable(namespacedRow, tableAlias)
+      );
     }
   }
   return result;
 }
-function extractAllColumnsFromTable(nestedRow, tableAlias) {
+function extractAllColumnsFromTable(namespacedRow, tableAlias) {
   const result = {};
-  const tableData = nestedRow[tableAlias];
+  const tableData = namespacedRow[tableAlias];
   if (!tableData || typeof tableData !== `object`) {
     return result;
   }

package/dist/cjs/query/select.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"select.cjs","sources":["../../../src/query/select.ts"],"sourcesContent":["import { map } from \"@electric-sql/d2ts\"\nimport {\n  evaluateOperandOnNestedRow,\n  extractValueFromNestedRow,\n} from \"./extractors\"\nimport type { IStreamBuilder } from \"@electric-sql/d2ts\"\nimport type { ConditionOperand, Query } from \"./schema\"\n\nexport function processSelect(\n  pipeline: IStreamBuilder<Record<string, unknown>>,\n  query: Query,\n  mainTableAlias: string,\n  inputs: Record<string, IStreamBuilder<Record<string, unknown>>>\n) {\n  return pipeline.pipe(\n    map((nestedRow: Record<string, unknown>) => {\n      const result: Record<string, unknown> = {}\n\n      // Check if this is a grouped result (has no nested table structure)\n      // If it's a grouped result, we need to handle it differently\n      const isGroupedResult =\n        query.groupBy &&\n        Object.keys(nestedRow).some(\n          (key) =>\n            !Object.keys(inputs).includes(key) &&\n            typeof nestedRow[key] !== `object`\n        )\n\n      for (const item of query.select) {\n        if (typeof item === `string`) {\n          // Handle wildcard select - all columns from all tables\n          if ((item as string) === `@*`) {\n            // For grouped results, just return the row as is\n            if (isGroupedResult) {\n              Object.assign(result, nestedRow)\n            } else {\n              // Extract all columns from all tables\n              Object.assign(result, extractAllColumnsFromAllTables(nestedRow))\n            }\n            continue\n          }\n\n          // Handle @table.* syntax - all columns from a specific table\n          if (\n            (item as string).startsWith(`@`) &&\n            (item as string).endsWith(`.*`)\n          ) {\n            const tableAlias = (item as string).slice(1, -2) // Remove the '@' and '.*' parts\n\n            // For grouped results, check if we have columns from this table\n            if (isGroupedResult) {\n              // In grouped results, we don't have the nested structure anymore\n              // So we can't extract by table. Just continue to the next item.\n              continue\n            } else {\n              // Extract all columns from the specified table\n              Object.assign(\n                result,\n                extractAllColumnsFromTable(nestedRow, tableAlias)\n              )\n            }\n            continue\n          }\n\n          // Handle simple column references like \"@table.column\" or \"@column\"\n          if ((item as string).startsWith(`@`)) {\n            const columnRef = (item as string).substring(1)\n            const alias = columnRef\n\n            // For grouped results, check if the column is directly in the row first\n            if (isGroupedResult && columnRef in nestedRow) {\n              result[alias] = nestedRow[columnRef]\n            } else {\n              // Extract the value from the nested structure\n              result[alias] = extractValueFromNestedRow(\n                nestedRow,\n                columnRef,\n                mainTableAlias,\n                undefined\n              )\n            }\n\n            // If the alias contains a dot (table.column),\n            // use just the column part as the field name\n            if (alias.includes(`.`)) {\n              const columnName = alias.split(`.`)[1]\n              result[columnName!] = result[alias]\n              delete result[alias]\n            }\n          }\n        } else {\n          // Handle aliased columns like { alias: \"@column_name\" }\n          for (const [alias, expr] of Object.entries(item)) {\n            if (typeof expr === `string` && (expr as string).startsWith(`@`)) {\n              const columnRef = (expr as string).substring(1)\n\n              // For grouped results, check if the column is directly in the row first\n              if (isGroupedResult && columnRef in nestedRow) {\n                result[alias] = nestedRow[columnRef]\n              } else {\n                // Extract the value from the nested structure\n                result[alias] = extractValueFromNestedRow(\n                  nestedRow,\n                  columnRef,\n                  mainTableAlias,\n                  undefined\n                )\n              }\n            } else if (typeof expr === `object`) {\n              // For grouped results, the aggregate results are already in the row\n              if (isGroupedResult && alias in nestedRow) {\n                result[alias] = nestedRow[alias]\n              } else {\n                // This might be a function call\n                result[alias] = evaluateOperandOnNestedRow(\n                  nestedRow,\n                  expr as ConditionOperand,\n                  mainTableAlias,\n                  undefined\n                )\n              }\n            }\n          }\n        }\n      }\n\n      return result\n    })\n  )\n}\n\n// Helper function to extract all columns from all tables in a nested row\nfunction extractAllColumnsFromAllTables(\n  nestedRow: Record<string, unknown>\n): Record<string, unknown> {\n  const result: Record<string, unknown> = {}\n\n  // Process each table in the nested row\n  for (const [tableAlias, tableData] of Object.entries(nestedRow)) {\n    if (tableData && typeof tableData === `object`) {\n      // Add all columns from this table to the result\n      // If there are column name conflicts, the last table's columns will overwrite previous ones\n      Object.assign(result, extractAllColumnsFromTable(nestedRow, tableAlias))\n    }\n  }\n\n  return result\n}\n\n// Helper function to extract all columns from a table in a nested row\nfunction extractAllColumnsFromTable(\n  nestedRow: Record<string, unknown>,\n  tableAlias: string\n): Record<string, unknown> {\n  const result: Record<string, unknown> = {}\n\n  // Get the table data\n  const tableData = nestedRow[tableAlias] as\n    | Record<string, unknown>\n    | null\n    | undefined\n\n  if (!tableData || typeof tableData !== `object`) {\n    return result\n  }\n\n  // Add all columns from the table to the result\n  for (const [columnName, value] of Object.entries(tableData)) {\n    result[columnName] = value\n  }\n\n  return result\n}\n"],"names":["map","extractValueFromNestedRow","evaluateOperandOnNestedRow"],"mappings":";;;;AAQO,SAAS,cACd,UACA,OACA,gBACA,QACA;AACA,SAAO,SAAS;AAAA,IACdA,KAAA,IAAI,CAAC,cAAuC;AAC1C,YAAM,SAAkC,CAAC;AAIzC,YAAM,kBACJ,MAAM,WACN,OAAO,KAAK,SAAS,EAAE;AAAA,QACrB,CAAC,QACC,CAAC,OAAO,KAAK,MAAM,EAAE,SAAS,GAAG,KACjC,OAAO,UAAU,GAAG,MAAM;AAAA,MAC9B;AAES,iBAAA,QAAQ,MAAM,QAAQ;AAC3B,YAAA,OAAO,SAAS,UAAU;AAE5B,cAAK,SAAoB,MAAM;AAE7B,gBAAI,iBAAiB;AACZ,qBAAA,OAAO,QAAQ,SAAS;AAAA,YAAA,OAC1B;AAEL,qBAAO,OAAO,QAAQ,+BAA+B,SAAS,CAAC;AAAA,YAAA;AAEjE;AAAA,UAAA;AAIF,cACG,KAAgB,WAAW,GAAG,KAC9B,KAAgB,SAAS,IAAI,GAC9B;AACA,kBAAM,aAAc,KAAgB,MAAM,GAAG,EAAE;AAG/C,gBAAI,iBAAiB;AAGnB;AAAA,YAAA,OACK;AAEE,qBAAA;AAAA,gBACL;AAAA,gBACA,2BAA2B,WAAW,UAAU;AAAA,cAClD;AAAA,YAAA;AAEF;AAAA,UAAA;AAIG,cAAA,KAAgB,WAAW,GAAG,GAAG;AAC9B,kBAAA,YAAa,KAAgB,UAAU,CAAC;AAC9C,kBAAM,QAAQ;AAGV,gBAAA,mBAAmB,aAAa,WAAW;AACtC,qBAAA,KAAK,IAAI,UAAU,SAAS;AAAA,YAAA,OAC9B;AAEL,qBAAO,KAAK,IAAIC,WAAA;AAAA,gBACd;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA,YAAA;AAKE,gBAAA,MAAM,SAAS,GAAG,GAAG;AACvB,oBAAM,aAAa,MAAM,MAAM,GAAG,EAAE,CAAC;AAC9B,qBAAA,UAAW,IAAI,OAAO,KAAK;AAClC,qBAAO,OAAO,KAAK;AAAA,YAAA;AAAA,UACrB;AAAA,QACF,OACK;AAEL,qBAAW,CAAC,OAAO,IAAI,KAAK,OAAO,QAAQ,IAAI,GAAG;AAChD,gBAAI,OAAO,SAAS,YAAa,KAAgB,WAAW,GAAG,GAAG;AAC1D,oBAAA,YAAa,KAAgB,UAAU,CAAC;AAG1C,kBAAA,mBAAmB,aAAa,WAAW;AACtC,uBAAA,KAAK,IAAI,UAAU,SAAS;AAAA,cAAA,OAC9B;AAEL,uBAAO,KAAK,IAAIA,WAAA;AAAA,kBACd;AAAA,kBACA;AAAA,kBACA;AAAA,kBACA;AAAA,gBACF;AAAA,cAAA;AAAA,YAEJ,WAAW,OAAO,SAAS,UAAU;AAE/B,kBAAA,mBAAmB,SAAS,WAAW;AAClC,uBAAA,KAAK,IAAI,UAAU,KAAK;AAAA,cAAA,OAC1B;AAEL,uBAAO,KAAK,IAAIC,WAAA;AAAA,kBACd;AAAA,kBACA;AAAA,kBACA;AAAA,kBACA;AAAA,gBACF;AAAA,cAAA;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAGK,aAAA;AAAA,IACR,CAAA;AAAA,EACH;AACF;AAGA,SAAS,+BACP,WACyB;AACzB,QAAM,SAAkC,CAAC;AAGzC,aAAW,CAAC,YAAY,SAAS,KAAK,OAAO,QAAQ,SAAS,GAAG;AAC3D,QAAA,aAAa,OAAO,cAAc,UAAU;AAG9C,aAAO,OAAO,QAAQ,2BAA2B,WAAW,UAAU,CAAC;AAAA,IAAA;AAAA,EACzE;AAGK,SAAA;AACT;AAGA,SAAS,2BACP,WACA,YACyB;AACzB,QAAM,SAAkC,CAAC;AAGnC,QAAA,YAAY,UAAU,UAAU;AAKtC,MAAI,CAAC,aAAa,OAAO,cAAc,UAAU;AACxC,WAAA;AAAA,EAAA;AAIT,aAAW,CAAC,YAAY,KAAK,KAAK,OAAO,QAAQ,SAAS,GAAG;AAC3D,WAAO,UAAU,IAAI;AAAA,EAAA;AAGhB,SAAA;AACT;;"}
+{"version":3,"file":"select.cjs","sources":["../../../src/query/select.ts"],"sourcesContent":["import { map } from \"@electric-sql/d2ts\"\nimport {\n  evaluateOperandOnNamespacedRow,\n  extractValueFromNamespacedRow,\n} from \"./extractors\"\nimport type { ConditionOperand, Query, SelectCallback } from \"./schema\"\nimport type { KeyedStream, NamespacedAndKeyedStream } from \"../types\"\n\nexport function processSelect(\n  pipeline: NamespacedAndKeyedStream,\n  query: Query,\n  mainTableAlias: string,\n  inputs: Record<string, KeyedStream>\n): KeyedStream {\n  return pipeline.pipe(\n    map(([key, namespacedRow]) => {\n      const result: Record<string, unknown> = {}\n\n      // Check if this is a grouped result (has no nested table structure)\n      // If it's a grouped result, we need to handle it differently\n      const isGroupedResult =\n        query.groupBy &&\n        Object.keys(namespacedRow).some(\n          (namespaceKey) =>\n            !Object.keys(inputs).includes(namespaceKey) &&\n            typeof namespacedRow[namespaceKey] !== `object`\n        )\n\n      if (!query.select) {\n        throw new Error(`Cannot process missing SELECT clause`)\n      }\n\n      for (const item of query.select) {\n        // Handle callback functions\n        if (typeof item === `function`) {\n          const callback = item as SelectCallback\n          const callbackResult = callback(namespacedRow)\n\n          // If the callback returns an object, merge its properties into the result\n          if (\n            callbackResult &&\n            typeof callbackResult === `object` &&\n            !Array.isArray(callbackResult)\n          ) {\n            Object.assign(result, callbackResult)\n          } else {\n            // If the callback returns a primitive value, we can't merge it\n            // This would need a specific key, but since we don't have one, we'll skip it\n            // In practice, select callbacks should return objects with keys\n            console.warn(\n              `SelectCallback returned a non-object value. SelectCallbacks should return objects with key-value pairs.`\n            )\n          }\n          continue\n        }\n\n        if (typeof item === `string`) {\n          // Handle wildcard select - all columns from all tables\n          if ((item as string) === `@*`) {\n            // For grouped results, just return the row as is\n            if (isGroupedResult) {\n              Object.assign(result, namespacedRow)\n            } else {\n              // Extract all columns from all tables\n              Object.assign(\n                result,\n                extractAllColumnsFromAllTables(namespacedRow)\n              )\n            }\n            continue\n          }\n\n          // Handle @table.* syntax - all columns from a specific table\n          if (\n            (item as string).startsWith(`@`) &&\n            (item as string).endsWith(`.*`)\n          ) {\n            const tableAlias = (item as string).slice(1, -2) // Remove the '@' and '.*' parts\n\n            // For grouped results, check if we have columns from this table\n            if (isGroupedResult) {\n              // In grouped results, we don't have the nested structure anymore\n              // So we can't extract by table. Just continue to the next item.\n              continue\n            } else {\n              // Extract all columns from the specified table\n              Object.assign(\n                result,\n                extractAllColumnsFromTable(namespacedRow, tableAlias)\n              )\n            }\n            continue\n          }\n\n          // Handle simple column references like \"@table.column\" or \"@column\"\n          if ((item as string).startsWith(`@`)) {\n            const columnRef = (item as string).substring(1)\n            const alias = columnRef\n\n            // For grouped results, check if the column is directly in the row first\n            if (isGroupedResult && columnRef in namespacedRow) {\n              result[alias] = namespacedRow[columnRef]\n            } else {\n              // Extract the value from the nested structure\n              result[alias] = extractValueFromNamespacedRow(\n                namespacedRow,\n                columnRef,\n                mainTableAlias,\n                undefined\n              )\n            }\n\n            // If the alias contains a dot (table.column),\n            // use just the column part as the field name\n            if (alias.includes(`.`)) {\n              const columnName = alias.split(`.`)[1]\n              result[columnName!] = result[alias]\n              delete result[alias]\n            }\n          }\n        } else {\n          // Handle aliased columns like { alias: \"@column_name\" }\n          for (const [alias, expr] of Object.entries(item)) {\n            if (typeof expr === `string` && (expr as string).startsWith(`@`)) {\n              const columnRef = (expr as string).substring(1)\n\n              // For grouped results, check if the column is directly in the row first\n              if (isGroupedResult && columnRef in namespacedRow) {\n                result[alias] = namespacedRow[columnRef]\n              } else {\n                // Extract the value from the nested structure\n                result[alias] = extractValueFromNamespacedRow(\n                  namespacedRow,\n                  columnRef,\n                  mainTableAlias,\n                  undefined\n                )\n              }\n            } else if (typeof expr === `object`) {\n              // For grouped results, the aggregate results are already in the row\n              if (isGroupedResult && alias in namespacedRow) {\n                result[alias] = namespacedRow[alias]\n              } else if ((expr as { ORDER_INDEX: unknown }).ORDER_INDEX) {\n                result[alias] = namespacedRow[mainTableAlias]![alias]\n              } else {\n                // This might be a function call\n                result[alias] = evaluateOperandOnNamespacedRow(\n                  namespacedRow,\n                  expr as ConditionOperand,\n                  mainTableAlias,\n                  undefined\n                )\n              }\n            }\n          }\n        }\n      }\n\n      return [key, result] as [string, typeof result]\n    })\n  )\n}\n\n// Helper function to extract all columns from all tables in a nested row\nfunction extractAllColumnsFromAllTables(\n  namespacedRow: Record<string, unknown>\n): Record<string, unknown> {\n  const result: Record<string, unknown> = {}\n\n  // Process each table in the nested row\n  for (const [tableAlias, tableData] of Object.entries(namespacedRow)) {\n    if (tableData && typeof tableData === `object`) {\n      // Add all columns from this table to the result\n      // If there are column name conflicts, the last table's columns will overwrite previous ones\n      Object.assign(\n        result,\n        extractAllColumnsFromTable(namespacedRow, tableAlias)\n      )\n    }\n  }\n\n  return result\n}\n\n// Helper function to extract all columns from a table in a nested row\nfunction extractAllColumnsFromTable(\n  namespacedRow: Record<string, unknown>,\n  tableAlias: string\n): Record<string, unknown> {\n  const result: Record<string, unknown> = {}\n\n  // Get the table data\n  const tableData = namespacedRow[tableAlias] as\n    | Record<string, unknown>\n    | null\n    | undefined\n\n  if (!tableData || typeof tableData !== `object`) {\n    return result\n  }\n\n  // Add all columns from the table to the result\n  for (const [columnName, value] of Object.entries(tableData)) {\n    result[columnName] = value\n  }\n\n  return result\n}\n"],"names":["map","extractValueFromNamespacedRow","evaluateOperandOnNamespacedRow"],"mappings":"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"}

package/dist/cjs/query/select.d.cts

@@ -1,3 +1,3 @@
-import { IStreamBuilder } from '@electric-sql/d2ts';
 import { Query } from './schema.cjs';
-export declare function processSelect(pipeline: IStreamBuilder<Record<string, unknown>>, query: Query, mainTableAlias: string, inputs: Record<string, IStreamBuilder<Record<string, unknown>>>): IStreamBuilder<Record<string, unknown>>;
+import { KeyedStream, NamespacedAndKeyedStream } from '../types.cjs';
+export declare function processSelect(pipeline: NamespacedAndKeyedStream, query: Query, mainTableAlias: string, inputs: Record<string, KeyedStream>): KeyedStream;

package/dist/cjs/query/types.d.cts

@@ -6,6 +6,7 @@ export type Context<TBaseSchema extends Schema = Schema, TSchema extends Schema
     schema: TSchema;
     default?: keyof TSchema;
     result?: Record<string, unknown>;
+    hasJoin?: boolean;
 };
 export type Flatten<T> = {
     [K in keyof T]: T[K];

package/dist/cjs/transactions.cjs

@@ -12,6 +12,7 @@ function generateUUID() {
   });
 }
 const transactions = [];
+let transactionStack = [];
 function createTransaction(config) {
   if (typeof config.mutationFn === `undefined`) {
     throw `mutationFn is required when creating a transaction`;
@@ -24,7 +25,6 @@ function createTransaction(config) {
   transactions.push(newTransaction);
   return newTransaction;
 }
-let transactionStack = [];
 function getActiveTransaction() {
   if (transactionStack.length > 0) {
     return transactionStack.slice(-1)[0];
@@ -38,6 +38,12 @@ function registerTransaction(tx) {
 function unregisterTransaction(tx) {
   transactionStack = transactionStack.filter((t) => t.id !== tx.id);
 }
+function removeFromPendingList(tx) {
+  const index = transactions.findIndex((t) => t.id === tx.id);
+  if (index !== -1) {
+    transactions.splice(index, 1);
+  }
+}
 class Transaction {
   constructor(config) {
     this.id = config.id;
@@ -51,6 +57,9 @@ class Transaction {
   }
   setState(newState) {
     this.state = newState;
+    if (newState === `completed` || newState === `failed`) {
+      removeFromPendingList(this);
+    }
   }
   mutate(callback) {
     if (this.state !== `pending`) {
@@ -87,11 +96,11 @@ class Transaction {
     }
     this.setState(`failed`);
     if (!isSecondaryRollback) {
-      const mutationKeys = /* @__PURE__ */ new Set();
-      this.mutations.forEach((m) => mutationKeys.add(m.key));
-      transactions.forEach(
-        (t) => t.state === `pending` && t.mutations.some((m) => mutationKeys.has(m.key)) && t.rollback({ isSecondaryRollback: true })
-      );
+      const mutationIds = /* @__PURE__ */ new Set();
+      this.mutations.forEach((m) => mutationIds.add(m.key));
+      for (const t of transactions) {
+        t.state === `pending` && t.mutations.some((m) => mutationIds.has(m.key)) && t.rollback({ isSecondaryRollback: true });
+      }
     }
     this.isPersisted.reject((_a = this.error) == null ? void 0 : _a.error);
     this.touchCollection();
@@ -100,13 +109,13 @@ class Transaction {
   // Tell collection that something has changed with the transaction
   touchCollection() {
     const hasCalled = /* @__PURE__ */ new Set();
-    this.mutations.forEach((mutation) => {
+    for (const mutation of this.mutations) {
       if (!hasCalled.has(mutation.collection.id)) {
         mutation.collection.transactions.setState((state) => state);
         mutation.collection.commitPendingTransactions();
         hasCalled.add(mutation.collection.id);
       }
-    });
+    }
   }
   async commit() {
     if (this.state !== `pending`) {
@@ -115,9 +124,11 @@ class Transaction {
     this.setState(`persisting`);
     if (this.mutations.length === 0) {
       this.setState(`completed`);
+      return this;
     }
     try {
-      await this.mutationFn({ transaction: this });
+      const transactionWithMutations = this;
+      await this.mutationFn({ transaction: transactionWithMutations });
       this.setState(`completed`);
       this.touchCollection();
       this.isPersisted.resolve(this);

package/dist/cjs/transactions.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.cjs","sources":["../../src/transactions.ts"],"sourcesContent":["import { createDeferred } from \"./deferred\"\nimport type { Deferred } from \"./deferred\"\nimport type {\n  PendingMutation,\n  TransactionConfig,\n  TransactionState,\n} from \"./types\"\n\nfunction generateUUID() {\n  // Check if crypto.randomUUID is available (modern browsers and Node.js 15+)\n  if (\n    typeof crypto !== `undefined` &&\n    typeof crypto.randomUUID === `function`\n  ) {\n    return crypto.randomUUID()\n  }\n\n  // Fallback implementation for older environments\n  return `xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx`.replace(/[xy]/g, function (c) {\n    const r = (Math.random() * 16) | 0\n    const v = c === `x` ? r : (r & 0x3) | 0x8\n    return v.toString(16)\n  })\n}\n\nconst transactions: Array<Transaction> = []\n\nexport function createTransaction(config: TransactionConfig): Transaction {\n  if (typeof config.mutationFn === `undefined`) {\n    throw `mutationFn is required when creating a transaction`\n  }\n\n  let transactionId = config.id\n  if (!transactionId) {\n    transactionId = generateUUID()\n  }\n  const newTransaction = new Transaction({ ...config, id: transactionId })\n  transactions.push(newTransaction)\n\n  return newTransaction\n}\n\nlet transactionStack: Array<Transaction> = []\n\nexport function getActiveTransaction(): Transaction | undefined {\n  if (transactionStack.length > 0) {\n    return transactionStack.slice(-1)[0]\n  } else {\n    return undefined\n  }\n}\n\nfunction registerTransaction(tx: Transaction) {\n  transactionStack.push(tx)\n}\n\nfunction unregisterTransaction(tx: Transaction) {\n  transactionStack = transactionStack.filter((t) => t.id !== tx.id)\n}\n\nexport class Transaction {\n  public id: string\n  public state: TransactionState\n  public mutationFn\n  public mutations: Array<PendingMutation<any>>\n  public isPersisted: Deferred<Transaction>\n  public autoCommit: boolean\n  public createdAt: Date\n  public metadata: Record<string, unknown>\n  public error?: {\n    message: string\n    error: Error\n  }\n\n  constructor(config: TransactionConfig) {\n    this.id = config.id!\n    this.mutationFn = config.mutationFn\n    this.state = `pending`\n    this.mutations = []\n    this.isPersisted = createDeferred()\n    this.autoCommit = config.autoCommit ?? true\n    this.createdAt = new Date()\n    this.metadata = config.metadata ?? {}\n  }\n\n  setState(newState: TransactionState) {\n    this.state = newState\n  }\n\n  mutate(callback: () => void): Transaction {\n    if (this.state !== `pending`) {\n      throw `You can no longer call .mutate() as the transaction is no longer pending`\n    }\n\n    registerTransaction(this)\n    try {\n      callback()\n    } finally {\n      unregisterTransaction(this)\n    }\n\n    if (this.autoCommit) {\n      this.commit()\n    }\n\n    return this\n  }\n\n  applyMutations(mutations: Array<PendingMutation<any>>): void {\n    for (const newMutation of mutations) {\n      const existingIndex = this.mutations.findIndex(\n        (m) => m.key === newMutation.key\n      )\n\n      if (existingIndex >= 0) {\n        // Replace existing mutation\n        this.mutations[existingIndex] = newMutation\n      } else {\n        // Insert new mutation\n        this.mutations.push(newMutation)\n      }\n    }\n  }\n\n  rollback(config?: { isSecondaryRollback?: boolean }): Transaction {\n    const isSecondaryRollback = config?.isSecondaryRollback ?? false\n    if (this.state === `completed`) {\n      throw `You can no longer call .rollback() as the transaction is already completed`\n    }\n\n    this.setState(`failed`)\n\n    // See if there's any other transactions w/ mutations on the same keys\n    // and roll them back as well.\n    if (!isSecondaryRollback) {\n      const mutationKeys = new Set()\n      this.mutations.forEach((m) => mutationKeys.add(m.key))\n      transactions.forEach(\n        (t) =>\n          t.state === `pending` &&\n          t.mutations.some((m) => mutationKeys.has(m.key)) &&\n          t.rollback({ isSecondaryRollback: true })\n      )\n    }\n\n    // Reject the promise\n    this.isPersisted.reject(this.error?.error)\n\n    this.touchCollection()\n\n    return this\n  }\n\n  // Tell collection that something has changed with the transaction\n  touchCollection(): void {\n    const hasCalled = new Set()\n    this.mutations.forEach((mutation) => {\n      if (!hasCalled.has(mutation.collection.id)) {\n        mutation.collection.transactions.setState((state) => state)\n        mutation.collection.commitPendingTransactions()\n        hasCalled.add(mutation.collection.id)\n      }\n    })\n  }\n\n  async commit(): Promise<Transaction> {\n    if (this.state !== `pending`) {\n      throw `You can no longer call .commit() as the transaction is no longer pending`\n    }\n\n    this.setState(`persisting`)\n\n    if (this.mutations.length === 0) {\n      this.setState(`completed`)\n    }\n\n    // Run mutationFn\n    try {\n      await this.mutationFn({ transaction: this })\n\n      this.setState(`completed`)\n      this.touchCollection()\n\n      this.isPersisted.resolve(this)\n    } catch (error) {\n      // Update transaction with error information\n      this.error = {\n        message: error instanceof Error ? error.message : String(error),\n        error: error instanceof Error ? error : new Error(String(error)),\n      }\n\n      // rollback the transaction\n      return this.rollback()\n    }\n\n    return this\n  }\n}\n"],"names":["createDeferred"],"mappings":"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"}
+{"version":3,"file":"transactions.cjs","sources":["../../src/transactions.ts"],"sourcesContent":["import { createDeferred } from \"./deferred\"\nimport type { Deferred } from \"./deferred\"\nimport type {\n  PendingMutation,\n  TransactionConfig,\n  TransactionState,\n  TransactionWithMutations,\n} from \"./types\"\n\nfunction generateUUID() {\n  // Check if crypto.randomUUID is available (modern browsers and Node.js 15+)\n  if (\n    typeof crypto !== `undefined` &&\n    typeof crypto.randomUUID === `function`\n  ) {\n    return crypto.randomUUID()\n  }\n\n  // Fallback implementation for older environments\n  return `xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx`.replace(/[xy]/g, function (c) {\n    const r = (Math.random() * 16) | 0\n    const v = c === `x` ? r : (r & 0x3) | 0x8\n    return v.toString(16)\n  })\n}\n\nconst transactions: Array<Transaction> = []\nlet transactionStack: Array<Transaction> = []\n\nexport function createTransaction(config: TransactionConfig): Transaction {\n  if (typeof config.mutationFn === `undefined`) {\n    throw `mutationFn is required when creating a transaction`\n  }\n\n  let transactionId = config.id\n  if (!transactionId) {\n    transactionId = generateUUID()\n  }\n  const newTransaction = new Transaction({ ...config, id: transactionId })\n\n  transactions.push(newTransaction)\n\n  return newTransaction\n}\n\nexport function getActiveTransaction(): Transaction | undefined {\n  if (transactionStack.length > 0) {\n    return transactionStack.slice(-1)[0]\n  } else {\n    return undefined\n  }\n}\n\nfunction registerTransaction(tx: Transaction) {\n  transactionStack.push(tx)\n}\n\nfunction unregisterTransaction(tx: Transaction) {\n  transactionStack = transactionStack.filter((t) => t.id !== tx.id)\n}\n\nfunction removeFromPendingList(tx: Transaction) {\n  const index = transactions.findIndex((t) => t.id === tx.id)\n  if (index !== -1) {\n    transactions.splice(index, 1)\n  }\n}\n\nexport class Transaction {\n  public id: string\n  public state: TransactionState\n  public mutationFn\n  public mutations: Array<PendingMutation<any>>\n  public isPersisted: Deferred<Transaction>\n  public autoCommit: boolean\n  public createdAt: Date\n  public metadata: Record<string, unknown>\n  public error?: {\n    message: string\n    error: Error\n  }\n\n  constructor(config: TransactionConfig) {\n    this.id = config.id!\n    this.mutationFn = config.mutationFn\n    this.state = `pending`\n    this.mutations = []\n    this.isPersisted = createDeferred()\n    this.autoCommit = config.autoCommit ?? true\n    this.createdAt = new Date()\n    this.metadata = config.metadata ?? {}\n  }\n\n  setState(newState: TransactionState) {\n    this.state = newState\n\n    if (newState === `completed` || newState === `failed`) {\n      removeFromPendingList(this)\n    }\n  }\n\n  mutate(callback: () => void): Transaction {\n    if (this.state !== `pending`) {\n      throw `You can no longer call .mutate() as the transaction is no longer pending`\n    }\n\n    registerTransaction(this)\n    try {\n      callback()\n    } finally {\n      unregisterTransaction(this)\n    }\n\n    if (this.autoCommit) {\n      this.commit()\n    }\n\n    return this\n  }\n\n  applyMutations(mutations: Array<PendingMutation<any>>): void {\n    for (const newMutation of mutations) {\n      const existingIndex = this.mutations.findIndex(\n        (m) => m.key === newMutation.key\n      )\n\n      if (existingIndex >= 0) {\n        // Replace existing mutation\n        this.mutations[existingIndex] = newMutation\n      } else {\n        // Insert new mutation\n        this.mutations.push(newMutation)\n      }\n    }\n  }\n\n  rollback(config?: { isSecondaryRollback?: boolean }): Transaction {\n    const isSecondaryRollback = config?.isSecondaryRollback ?? false\n    if (this.state === `completed`) {\n      throw `You can no longer call .rollback() as the transaction is already completed`\n    }\n\n    this.setState(`failed`)\n\n    // See if there's any other transactions w/ mutations on the same ids\n    // and roll them back as well.\n    if (!isSecondaryRollback) {\n      const mutationIds = new Set()\n      this.mutations.forEach((m) => mutationIds.add(m.key))\n      for (const t of transactions) {\n        t.state === `pending` &&\n          t.mutations.some((m) => mutationIds.has(m.key)) &&\n          t.rollback({ isSecondaryRollback: true })\n      }\n    }\n\n    // Reject the promise\n    this.isPersisted.reject(this.error?.error)\n    this.touchCollection()\n\n    return this\n  }\n\n  // Tell collection that something has changed with the transaction\n  touchCollection(): void {\n    const hasCalled = new Set()\n    for (const mutation of this.mutations) {\n      if (!hasCalled.has(mutation.collection.id)) {\n        mutation.collection.transactions.setState((state) => state)\n        mutation.collection.commitPendingTransactions()\n        hasCalled.add(mutation.collection.id)\n      }\n    }\n  }\n\n  async commit(): Promise<Transaction> {\n    if (this.state !== `pending`) {\n      throw `You can no longer call .commit() as the transaction is no longer pending`\n    }\n\n    this.setState(`persisting`)\n\n    if (this.mutations.length === 0) {\n      this.setState(`completed`)\n\n      return this\n    }\n\n    // Run mutationFn\n    try {\n      // At this point we know there's at least one mutation\n      // Use type assertion to tell TypeScript about this guarantee\n      const transactionWithMutations =\n        this as unknown as TransactionWithMutations\n      await this.mutationFn({ transaction: transactionWithMutations })\n\n      this.setState(`completed`)\n      this.touchCollection()\n\n      this.isPersisted.resolve(this)\n    } catch (error) {\n      // Update transaction with error information\n      this.error = {\n        message: error instanceof Error ? error.message : String(error),\n        error: error instanceof Error ? error : new Error(String(error)),\n      }\n\n      // rollback the transaction\n      return this.rollback()\n    }\n\n    return this\n  }\n}\n"],"names":["createDeferred"],"mappings":"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"}

package/dist/cjs/types.d.cts

@@ -1,3 +1,4 @@
+import { IStreamBuilder } from '@electric-sql/d2ts';
 import { Collection } from './collection.cjs';
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Transaction } from './transactions.cjs';
@@ -11,7 +12,7 @@ export interface PendingMutation<T extends object = Record<string, unknown>> {
     original: Record<string, unknown>;
     modified: Record<string, unknown>;
     changes: Record<string, unknown>;
-    key: string;
+    key: any;
     type: OperationType;
     metadata: unknown;
     syncMetadata: Record<string, unknown>;
@@ -26,6 +27,13 @@ export type MutationFnParams = {
     transaction: Transaction;
 };
 export type MutationFn = (params: MutationFnParams) => Promise<any>;
+/**
+ * Utility type for a Transaction with at least one mutation
+ * This is used internally by the Transaction.commit method
+ */
+export type TransactionWithMutations<T extends object = Record<string, unknown>> = Transaction & {
+    mutations: [PendingMutation<T>, ...Array<PendingMutation<T>>];
+};
 export interface TransactionConfig {
     /** Unique identifier for the transaction */
     id?: string;
@@ -36,7 +44,7 @@ export interface TransactionConfig {
 }
 export type { Transaction };
 type Value<TExtensions = never> = string | number | boolean | bigint | null | TExtensions | Array<Value<TExtensions>> | {
-    [key: string]: Value<TExtensions>;
+    [key: string | number | symbol]: Value<TExtensions>;
 };
 export type Row<TExtensions = never> = Record<string, Value<TExtensions>>;
 export type OperationType = `insert` | `update` | `delete`;
@@ -44,17 +52,17 @@ export interface SyncConfig<T extends object = Record<string, unknown>> {
     sync: (params: {
         collection: Collection<T>;
         begin: () => void;
-        write: (message: ChangeMessage<T>) => void;
+        write: (message: Omit<ChangeMessage<T>, `key`>) => void;
         commit: () => void;
     }) => void;
     /**
      * Get the sync metadata for insert operations
-     * @returns Record containing primaryKey and relation information
+     * @returns Record containing relation information
      */
     getSyncMetadata?: () => Record<string, unknown>;
 }
 export interface ChangeMessage<T extends object = Record<string, unknown>> {
-    key: string;
+    key: any;
     value: T;
     previousValue?: T;
     type: OperationType;
@@ -83,12 +91,63 @@ export interface OperationConfig {
     metadata?: Record<string, unknown>;
 }
 export interface InsertConfig {
-    key?: string | Array<string | undefined>;
     metadata?: Record<string, unknown>;
 }
 export interface CollectionConfig<T extends object = Record<string, unknown>> {
-    id: string;
+    id?: string;
     sync: SyncConfig<T>;
     schema?: StandardSchema<T>;
+    /**
+     * Function to extract the ID from an object
+     * This is required for update/delete operations which now only accept IDs
+     * @param item The item to extract the ID from
+     * @returns The ID string for the item
+     * @example
+     * // For a collection with a 'uuid' field as the primary key
+     * getId: (item) => item.uuid
+     */
+    getId: (item: T) => any;
+    /**
+     * Optional asynchronous handler function called before an insert operation
+     * @param params Object containing transaction and mutation information
+     * @returns Promise resolving to any value
+     */
+    onInsert?: MutationFn;
+    /**
+     * Optional asynchronous handler function called before an update operation
+     * @param params Object containing transaction and mutation information
+     * @returns Promise resolving to any value
+     */
+    onUpdate?: MutationFn;
+    /**
+     * Optional asynchronous handler function called before a delete operation
+     * @param params Object containing transaction and mutation information
+     * @returns Promise resolving to any value
+     */
+    onDelete?: MutationFn;
 }
 export type ChangesPayload<T extends object = Record<string, unknown>> = Array<ChangeMessage<T>>;
+/**
+ * An input row from a collection
+ */
+export type InputRow = [unknown, Record<string, unknown>];
+/**
+ * A keyed stream is a stream of rows
+ * This is used as the inputs from a collection to a query
+ */
+export type KeyedStream = IStreamBuilder<InputRow>;
+/**
+ * A namespaced row is a row withing a pipeline that had each table wrapped in its alias
+ */
+export type NamespacedRow = Record<string, Record<string, unknown>>;
+/**
+ * A keyed namespaced row is a row with a key and a namespaced row
+ * This is the main representation of a row in a query pipeline
+ */
+export type KeyedNamespacedRow = [unknown, NamespacedRow];
+/**
+ * A namespaced and keyed stream is a stream of rows
+ * This is used throughout a query pipeline and as the output from a query without
+ * a `select` clause.
+ */
+export type NamespacedAndKeyedStream = IStreamBuilder<KeyedNamespacedRow>;