tinybase 5.0.0-beta.0 → 5.0.0-beta.2

package/lib/types/with-schemas/store.d.ts

@@ -17,6 +17,7 @@ import {
   DefaultValueIdFromSchema,
   DefaultedCellFromSchema,
   DefaultedValueFromSchema,
+  StoreAlias,
   TableIdFromSchema,
   Truncate,
   ValueIdFromSchema,
@@ -818,7 +819,7 @@ export type DoRollback<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type TransactionListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   getTransactionChanges: GetTransactionChanges,
  *   getTransactionLog: GetTransactionLog,
@@ -840,8 +841,11 @@ export type DoRollback<Schemas extends OptionalSchemas> = (
  * log of the changes made or attempted during the transaction, since v4.0.
  * @category Listener
  */
-export type TransactionListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
+export type TransactionListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (
+  store: Store,
   getTransactionChanges: GetTransactionChanges<Schemas>,
   getTransactionLog: GetTransactionLog<Schemas>,
 ) => void;
@@ -853,7 +857,10 @@ export type TransactionListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (store: Store, hasTables: boolean) => void;
+ * export type HasTablesListener<Store extends StoreAlias = StoreAlias> = (
+ *   store: Store,
+ *   hasTables: boolean,
+ * ) => void;
  * ```
  *
  * A HasTablesListener is provided when using the addHasTablesListener method.
@@ -867,10 +874,10 @@ export type TransactionListener<Schemas extends OptionalSchemas> = (
  * @category Listener
  * @since v4.4.0
  */
-export type HasTablesListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
-  hasTables: boolean,
-) => void;
+export type HasTablesListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (store: Store, hasTables: boolean) => void;
 
 /**
  * The TablesListener type describes a function that is used to listen to
@@ -879,7 +886,7 @@ export type HasTablesListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type TablesListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   getCellChange: GetCellChange | undefined,
  * ) => void;
@@ -900,8 +907,11 @@ export type HasTablesListener<Schemas extends OptionalSchemas> = (
  * changes.
  * @category Listener
  */
-export type TablesListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
+export type TablesListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (
+  store: Store,
   getCellChange: GetCellChange<Schemas[0]> | undefined,
 ) => void;
 
@@ -912,7 +922,7 @@ export type TablesListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type TableIdsListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   getIdChanges: GetIdChanges | undefined,
  * ) => void;
@@ -930,8 +940,11 @@ export type TablesListener<Schemas extends OptionalSchemas> = (
  * since v3.3.
  * @category Listener
  */
-export type TableIdsListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
+export type TableIdsListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (
+  store: Store,
   getIdChanges: GetIdChanges<TableIdFromSchema<Schemas[0]>> | undefined,
 ) => void;
 
@@ -942,7 +955,7 @@ export type TableIdsListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type HasTableListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   hasTable: boolean,
@@ -965,8 +978,9 @@ export type TableIdsListener<Schemas extends OptionalSchemas> = (
 export type HasTableListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableIdOrNull extends null
     ? TableIdFromSchema<Schemas[0]>
     : TableIdOrNull,
@@ -980,7 +994,7 @@ export type HasTableListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type TableListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   getCellChange: GetCellChange | undefined,
@@ -1006,8 +1020,9 @@ export type HasTableListener<
 export type TableListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableIdOrNull extends null
     ? TableIdFromSchema<Schemas[0]>
     : TableIdOrNull,
@@ -1021,7 +1036,7 @@ export type TableListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type TableCellIdsListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   getIdChanges: GetIdChanges | undefined,
@@ -1043,12 +1058,13 @@ export type TableListener<
 export type TableCellIdsListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
   Params extends any[] = (
     TableIdOrNull extends null ? TableIdFromSchema<Schemas[0]> : TableIdOrNull
   ) extends infer TableId
     ? TableId extends TableIdFromSchema<Schemas[0]>
       ? [
-          store: Store<Schemas>,
+          store: Store,
           tableId: TableId,
           getIdChanges: GetIdChanges<CellIdFromSchema<Schemas[0], TableId>>,
         ]
@@ -1071,7 +1087,7 @@ export type TableCellIdsListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type HasTableCellListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   cellId: Id,
@@ -1101,6 +1117,7 @@ export type HasTableCellListener<
         ? CellIdFromSchema<Schemas[0], TableIdOrNull>
         : AllCellIdFromSchema<Schemas[0]>)
     | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
   Params extends any[] = (
     TableIdOrNull extends null ? TableIdFromSchema<Schemas[0]> : TableIdOrNull
   ) extends infer TableId
@@ -1112,7 +1129,7 @@ export type HasTableCellListener<
         ) extends infer CellId
         ? CellId extends CellIdFromSchema<Schemas[0], TableId>
           ? [
-              store: Store<Schemas>,
+              store: Store,
               tableId: TableId,
               cellId: CellId,
               hasTableCell: boolean,
@@ -1140,7 +1157,7 @@ export type HasTableCellListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type RowCountListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   count: number,
@@ -1161,8 +1178,9 @@ export type HasTableCellListener<
 export type RowCountListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableIdOrNull extends null
     ? TableIdFromSchema<Schemas[0]>
     : TableIdOrNull,
@@ -1176,7 +1194,7 @@ export type RowCountListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type RowIdsListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   getIdChanges: GetIdChanges | undefined,
@@ -1200,8 +1218,9 @@ export type RowCountListener<
 export type RowIdsListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableIdOrNull extends null
     ? TableIdFromSchema<Schemas[0]>
     : TableIdOrNull,
@@ -1215,7 +1234,7 @@ export type RowIdsListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type SortedRowIdsListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   cellId: Id | undefined,
@@ -1252,8 +1271,9 @@ export type SortedRowIdsListener<
   Descending extends boolean,
   Offset extends number,
   Limit extends number | undefined,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableId,
   cellId: CellId,
   descending: Descending,
@@ -1269,7 +1289,7 @@ export type SortedRowIdsListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type HasRowListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   rowId: Id,
@@ -1295,8 +1315,9 @@ export type HasRowListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
   RowIdOrNull extends IdOrNull,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableIdOrNull extends null
     ? TableIdFromSchema<Schemas[0]>
     : TableIdOrNull,
@@ -1311,7 +1332,7 @@ export type HasRowListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type RowListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   rowId: Id,
@@ -1341,8 +1362,9 @@ export type RowListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
   RowIdOrNull extends IdOrNull,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   tableId: TableIdOrNull extends null
     ? TableIdFromSchema<Schemas[0]>
     : TableIdOrNull,
@@ -1357,7 +1379,7 @@ export type RowListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type CellIdsListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   rowId: Id,
@@ -1384,12 +1406,13 @@ export type CellIdsListener<
   Schemas extends OptionalSchemas,
   TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
   RowIdOrNull extends IdOrNull,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
   Params extends any[] = (
     TableIdOrNull extends null ? TableIdFromSchema<Schemas[0]> : TableIdOrNull
   ) extends infer TableId
     ? TableId extends TableIdFromSchema<Schemas[0]>
       ? [
-          store: Store<Schemas>,
+          store: Store,
           tableId: TableId,
           rowId: RowIdOrNull extends null ? Id : RowIdOrNull,
           getIdChanges: GetIdChanges<CellIdFromSchema<Schemas[0], TableId>>,
@@ -1415,7 +1438,7 @@ export type CellIdsListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type HasCellListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   rowId: Id,
@@ -1448,6 +1471,7 @@ export type HasCellListener<
         ? CellIdFromSchema<Schemas[0], TableIdOrNull>
         : AllCellIdFromSchema<Schemas[0]>)
     | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
   Params extends any[] = (
     TableIdOrNull extends null ? TableIdFromSchema<Schemas[0]> : TableIdOrNull
   ) extends infer TableId
@@ -1459,7 +1483,7 @@ export type HasCellListener<
         ) extends infer CellId
         ? CellId extends CellIdFromSchema<Schemas[0], TableId>
           ? [
-              store: Store<Schemas>,
+              store: Store,
               tableId: TableId,
               rowId: RowIdOrNull extends null ? Id : RowIdOrNull,
               cellId: CellId,
@@ -1498,7 +1522,7 @@ export type HasCellListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type CellListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   rowId: Id,
@@ -1541,6 +1565,7 @@ export type CellListener<
         ? CellIdFromSchema<Schemas[0], TableIdOrNull>
         : AllCellIdFromSchema<Schemas[0]>)
     | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
   Params extends any[] = (
     TableIdOrNull extends null ? TableIdFromSchema<Schemas[0]> : TableIdOrNull
   ) extends infer TableId
@@ -1552,7 +1577,7 @@ export type CellListener<
         ) extends infer CellId
         ? CellId extends CellIdFromSchema<Schemas[0], TableId>
           ? [
-              store: Store<Schemas>,
+              store: Store,
               tableId: TableId,
               rowId: RowIdOrNull extends null ? Id : RowIdOrNull,
               cellId: CellId,
@@ -1601,7 +1626,10 @@ export type CellListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (store: Store, hasValues: boolean) => void;
+ * export type HasValuesListener<Store extends StoreAlias = StoreAlias> = (
+ *   store: Store,
+ *   hasValues: boolean,
+ * ) => void;
  * ```
  *
  * A HasValuesListener is provided when using the addHasValuesListener method.
@@ -1615,10 +1643,10 @@ export type CellListener<
  * @category Listener
  * @since v4.4.0
  */
-export type HasValuesListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
-  hasValues: boolean,
-) => void;
+export type HasValuesListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (store: Store, hasValues: boolean) => void;
 
 /**
  * The ValuesListener type describes a function that is used to listen to
@@ -1627,7 +1655,7 @@ export type HasValuesListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type ValuesListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   getValueChange: GetValueChange | undefined,
  * ) => void;
@@ -1648,8 +1676,11 @@ export type HasValuesListener<Schemas extends OptionalSchemas> = (
  * changes.
  * @category Listener
  */
-export type ValuesListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
+export type ValuesListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (
+  store: Store,
   getValueChange: GetValueChange<Schemas[1]> | undefined,
 ) => void;
 
@@ -1660,7 +1691,7 @@ export type ValuesListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type ValueIdsListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   getIdChanges: GetIdChanges | undefined,
  * ) => void;
@@ -1678,8 +1709,11 @@ export type ValuesListener<Schemas extends OptionalSchemas> = (
  * since v3.3.
  * @category Listener
  */
-export type ValueIdsListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
+export type ValueIdsListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (
+  store: Store,
   getIdChanges: GetIdChanges<ValueIdFromSchema<Schemas[1]>> | undefined,
 ) => void;
 
@@ -1690,7 +1724,7 @@ export type ValueIdsListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type HasValueListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   valueId: Id,
  *   hasValue: boolean,
@@ -1713,8 +1747,9 @@ export type ValueIdsListener<Schemas extends OptionalSchemas> = (
 export type HasValueListener<
   Schemas extends OptionalSchemas,
   ValueIdOrNull extends ValueIdFromSchema<Schemas[1]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
 > = (
-  store: Store<Schemas>,
+  store: Store,
   valueId: ValueIdOrNull extends null
     ? ValueIdFromSchema<Schemas[1]>
     : ValueIdOrNull,
@@ -1728,7 +1763,7 @@ export type HasValueListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type ValueListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   valueId: Id,
  *   newValue: Value,
@@ -1761,12 +1796,13 @@ export type HasValueListener<
 export type ValueListener<
   Schemas extends OptionalSchemas,
   ValueIdOrNull extends ValueIdFromSchema<Schemas[1]> | null,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
   Params extends any[] = (
     ValueIdOrNull extends null ? ValueIdFromSchema<Schemas[1]> : ValueIdOrNull
   ) extends infer ValueId
     ? ValueId extends ValueIdFromSchema<Schemas[1]>
       ? [
-          store: Store<Schemas>,
+          store: Store,
           valueId: ValueId,
           newValue: Value<Schemas[1], ValueId>,
           oldValue: Value<Schemas[1], ValueId>,
@@ -1803,7 +1839,7 @@ export type ValueListener<
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type InvalidCellListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   tableId: Id,
  *   rowId: Id,
@@ -1829,8 +1865,11 @@ export type ValueListener<
  * @category Listener
  * @since v1.1.0
  */
-export type InvalidCellListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
+export type InvalidCellListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (
+  store: Store,
   tableId: Id,
   rowId: Id,
   cellId: Id,
@@ -1844,7 +1883,7 @@ export type InvalidCellListener<Schemas extends OptionalSchemas> = (
  * This has schema-based typing. The following is a simplified representation:
  *
  * ```ts override
- * (
+ * export type InvalidValueListener<Store extends StoreAlias = StoreAlias> = (
  *   store: Store,
  *   valueId: Id,
  *   invalidValues: any[],
@@ -1866,11 +1905,10 @@ export type InvalidCellListener<Schemas extends OptionalSchemas> = (
  * @category Listener
  * @since v3.0.0
  */
-export type InvalidValueListener<Schemas extends OptionalSchemas> = (
-  store: Store<Schemas>,
-  valueId: Id,
-  invalidValues: any[],
-) => void;
+export type InvalidValueListener<
+  Schemas extends OptionalSchemas,
+  Store extends StoreAlias<Schemas> = StoreAlias<Schemas>,
+> = (store: Store, valueId: Id, invalidValues: any[]) => void;
 
 /**
  * The GetIdChanges type describes a function that returns information about the
@@ -3643,7 +3681,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setContent([tables, values]: [Tables, Values]): Store;
+   * setContent([tables, values]: [Tables, Values]): this;
    * ```
    *
    * This method will cause listeners to be called for any Table, Row, Cell,
@@ -3710,7 +3748,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setTables(tables: Tables): Store;
+   * setTables(tables: Tables): this;
    * ```
    *
    * This method will cause listeners to be called for any Table, Row, Cell, or
@@ -3764,7 +3802,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setTable(tableId: Id, table: Table): Store;
+   * setTable(tableId: Id, table: Table): this;
    * ```
    *
    * This method will cause listeners to be called for any Table, Row, Cell, or
@@ -3823,7 +3861,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setRow(tableId: Id, rowId: Id, row: Row): Store;
+   * setRow(tableId: Id, rowId: Id, row: Row): this;
    * ```
    *
    * This method will cause listeners to be called for any Table, Row, Cell, or
@@ -3953,7 +3991,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setPartialRow(tableId: Id, rowId: Id, partialRow: Row): Store;
+   * setPartialRow(tableId: Id, rowId: Id, partialRow: Row): this;
    * ```
    *
    * This method will cause listeners to be called for any Table, Row, Cell, or
@@ -4013,7 +4051,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setCell(tableId: Id, rowId: Id, cellId: Id, cell: Cell | MapCell): Store;
+   * setCell(tableId: Id, rowId: Id, cellId: Id, cell: Cell | MapCell): this;
    * ```
    *
    * This method will cause listeners to be called for any Table, Row, Cell, or
@@ -4086,7 +4124,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setValues(values: Values): Store;
+   * setValues(values: Values): this;
    * ```
    *
    * This method will cause listeners to be called for any Value or Id changes
@@ -4140,7 +4178,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setPartialValues(partialValues: Values): Store;
+   * setPartialValues(partialValues: Values): this;
    * ```
    *
    * This method will cause listeners to be called for any Values or Id changes
@@ -4194,7 +4232,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setValue(valueId: Id, value: Value | MapValue): Store;
+   * setValue(valueId: Id, value: Value | MapValue): this;
    * ```
    *
    * This method will cause listeners to be called for any Value, or Id changes
@@ -4257,7 +4295,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setTransactionChanges(transactionChanges: TransactionChanges): Store;
+   * setTransactionChanges(transactionChanges: TransactionChanges): this;
    * ```
    *
    * This method will take a TransactionChanges object (which is available at
@@ -4306,7 +4344,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setTablesJson(tablesJson: Json): Store;
+   * setTablesJson(tablesJson: Json): this;
    * ```
    *
    * If the JSON cannot be parsed, this will fail silently. If it can be parsed,
@@ -4346,7 +4384,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setValuesJson(valuesJson: Json): Store;
+   * setValuesJson(valuesJson: Json): this;
    * ```
    *
    * If the JSON cannot be parsed, this will fail silently. If it can be parsed,
@@ -4386,7 +4424,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setJson(tablesAndValuesJson: Json): Store;
+   * setJson(tablesAndValuesJson: Json): this;
    * ```
    *
    * From v3.0 onwards, the serialization should be of an array with two
@@ -4450,7 +4488,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setTablesSchema(tablesSchema: TablesSchema): Store;
+   * setTablesSchema(tablesSchema: TablesSchema): this;
    * ```
    *
    * Note that this may result in a change to data in the Store, as defaults are
@@ -4490,7 +4528,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setValuesSchema(valuesSchema: ValuesSchema): Store;
+   * setValuesSchema(valuesSchema: ValuesSchema): this;
    * ```
    *
    * Note that this may result in a change to data in the Store, as defaults are
@@ -4527,7 +4565,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * setSchema(tablesSchema: TablesSchema, valuesSchema?: ValuesSchema): Store;
+   * setSchema(tablesSchema: TablesSchema, valuesSchema?: ValuesSchema): this;
    * ```
    *
    * Note that this may result in a change to data in the Store, as defaults are
@@ -4603,7 +4641,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delTables(): Store;
+   * delTables(): this;
    * ```
    *
    * ```js
@@ -4627,7 +4665,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delTable(tableId: Id): Store;
+   * delTable(tableId: Id): this;
    * ```
    *
    * ```js
@@ -4650,7 +4688,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delRow(tableId: Id, rowId: Id): Store;
+   * delRow(tableId: Id, rowId: Id): this;
    * ```
    *
    * If this is the last Row in its Table, then that Table will be removed.
@@ -4679,7 +4717,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delCell(tableId: Id, rowId: Id, cellId: Id, forceDel?: boolean): Store;
+   * delCell(tableId: Id, rowId: Id, cellId: Id, forceDel?: boolean): this;
    * ```
    *
    * When there is no TablesSchema applied to the Store, then if this is the
@@ -4773,7 +4811,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delValues(): Store;
+   * delValues(): this;
    * ```
    *
    * If there is a ValuesSchema applied to the Store and it specifies a default
@@ -4817,7 +4855,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delValue(valueId: Id): Store;
+   * delValue(valueId: Id): this;
    * ```
    *
    * If there is a ValuesSchema applied to the Store and it specifies a default
@@ -4865,7 +4903,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delTablesSchema(): Store;
+   * delTablesSchema(): this;
    * ```
    *
    * ```js
@@ -4891,7 +4929,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delValuesSchema(): Store;
+   * delValuesSchema(): this;
    * ```
    *
    * ```js
@@ -4916,7 +4954,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delSchema(): Store;
+   * delSchema(): this;
    * ```
    *
    * Prior to v3.0, this method removed the TablesSchema only.
@@ -5088,7 +5126,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * startTransaction(): Store;
+   * startTransaction(): this;
    * ```
    *
    * Transactions are useful for making bulk changes to the data in a Store, and
@@ -5143,7 +5181,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * finishTransaction(doRollback?: DoRollback): Store;
+   * finishTransaction(doRollback?: DoRollback): this;
    * ```
    *
    * Transactions are useful for making bulk changes to the data in a Store, and
@@ -5432,7 +5470,10 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addHasTablesListener(listener: HasTablesListener, mutator?: boolean): Id;
+   * addHasTablesListener(
+   *   listener: HasTablesListener<this>,
+   *   mutator?: boolean,
+   * ): Id;
    * ```
    *
    * The provided listener is a HasTablesListener function, and will be called
@@ -5494,7 +5535,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @since v4.4.0
    */
   addHasTablesListener(
-    listener: HasTablesListener<Schemas>,
+    listener: HasTablesListener<Schemas, this>,
     mutator?: boolean,
   ): Id;
 
@@ -5505,7 +5546,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addTablesListener(listener: TablesListener, mutator?: boolean): Id;
+   * addTablesListener(listener: TablesListener<this>, mutator?: boolean): Id;
    * ```
    *
    * The provided listener is a TablesListener function, and will be called with
@@ -5565,7 +5606,10 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```
    * @category Listener
    */
-  addTablesListener(listener: TablesListener<Schemas>, mutator?: boolean): Id;
+  addTablesListener(
+    listener: TablesListener<Schemas, this>,
+    mutator?: boolean,
+  ): Id;
 
   /**
    * The addTableIdsListener method registers a listener function with the Store
@@ -5574,7 +5618,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addTableIdsListener(listener: TableIdsListener, mutator?: boolean): Id;
+   * addTableIdsListener(listener: TableIdsListener<this>, mutator?: boolean): Id;
    * ```
    *
    * The provided listener is a TableIdsListener function, and will be called
@@ -5634,7 +5678,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @category Listener
    */
   addTableIdsListener(
-    listener: TableIdsListener<Schemas>,
+    listener: TableIdsListener<Schemas, this>,
     mutator?: boolean,
   ): Id;
 
@@ -5647,7 +5691,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addHasTableListener(
    *   tableId: IdOrNull,
-   *   listener: HasTableListener,
+   *   listener: HasTableListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -5747,7 +5791,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
     TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
   >(
     tableId: TableIdOrNull,
-    listener: HasTableListener<Schemas, TableIdOrNull>,
+    listener: HasTableListener<Schemas, TableIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -5760,7 +5804,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addTableListener(
    *   tableId: IdOrNull,
-   *   listener: TableListener,
+   *   listener: TableListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -5853,7 +5897,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    */
   addTableListener<TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null>(
     tableId: TableIdOrNull,
-    listener: TableListener<Schemas, TableIdOrNull>,
+    listener: TableListener<Schemas, TableIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -5867,7 +5911,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addTableCellIdsListener(
    *   tableId: IdOrNull,
-   *   listener: TableCellIdsListener,
+   *   listener: TableCellIdsListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -5969,7 +6013,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
     TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
   >(
     tableId: TableIdOrNull,
-    listener: TableCellIdsListener<Schemas, TableIdOrNull>,
+    listener: TableCellIdsListener<Schemas, TableIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -5984,7 +6028,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * addHasTableCellListener(
    *   tableId: IdOrNull,
    *   cellId: IdOrNull,
-   *   listener: HasTableCellListener,
+   *   listener: HasTableCellListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6106,7 +6150,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
   >(
     tableId: TableIdOrNull,
     cellId: CellIdOrNull,
-    listener: HasTableCellListener<Schemas, TableIdOrNull, CellIdOrNull>,
+    listener: HasTableCellListener<Schemas, TableIdOrNull, CellIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -6119,7 +6163,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addRowCountListener(
    *   tableId: IdOrNull,
-   *   listener: RowCountListener,
+   *   listener: RowCountListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6211,7 +6255,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
     TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
   >(
     tableId: TableIdOrNull,
-    listener: RowCountListener<Schemas, TableIdOrNull>,
+    listener: RowCountListener<Schemas, TableIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -6224,7 +6268,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addRowIdsListener(
    *   tableId: IdOrNull,
-   *   listener: RowIdsListener,
+   *   listener: RowIdsListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6312,7 +6356,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    */
   addRowIdsListener<TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null>(
     tableId: TableIdOrNull,
-    listener: RowIdsListener<Schemas, TableIdOrNull>,
+    listener: RowIdsListener<Schemas, TableIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -6330,7 +6374,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    *   descending: boolean,
    *   offset: number,
    *   limit: number | undefined,
-   *   listener: SortedRowIdsListener,
+   *   listener: SortedRowIdsListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6563,7 +6607,8 @@ export interface Store<in out Schemas extends OptionalSchemas> {
       CellIdOrUndefined,
       Descending,
       Offset,
-      Limit
+      Limit,
+      this
     >,
     mutator?: boolean,
   ): Id;
@@ -6578,7 +6623,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * addHasRowListener(
    *   tableId: IdOrNull,
    *   rowId: IdOrNull,
-   *   listener: HasRowListener,
+   *   listener: HasRowListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6695,7 +6740,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
   >(
     tableId: TableIdOrNull,
     rowId: RowIdOrNull,
-    listener: HasRowListener<Schemas, TableIdOrNull, RowIdOrNull>,
+    listener: HasRowListener<Schemas, TableIdOrNull, RowIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -6709,7 +6754,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * addRowListener(
    *   tableId: IdOrNull,
    *   rowId: IdOrNull,
-   *   listener: RowListener,
+   *   listener: RowListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6818,7 +6863,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
   >(
     tableId: TableIdOrNull,
     rowId: RowIdOrNull,
-    listener: RowListener<Schemas, TableIdOrNull, RowIdOrNull>,
+    listener: RowListener<Schemas, TableIdOrNull, RowIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -6832,7 +6877,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * addCellIdsListener(
    *   tableId: IdOrNull,
    *   rowId: IdOrNull,
-   *   listener: CellIdsListener,
+   *   listener: CellIdsListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -6937,7 +6982,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
   >(
     tableId: TableIdOrNull,
     rowId: RowIdOrNull,
-    listener: CellIdsListener<Schemas, TableIdOrNull, RowIdOrNull>,
+    listener: CellIdsListener<Schemas, TableIdOrNull, RowIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -6952,7 +6997,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    *   tableId: IdOrNull,
    *   rowId: IdOrNull,
    *   cellId: IdOrNull,
-   *   listener: HasCellListener,
+   *   listener: HasCellListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -7085,7 +7130,8 @@ export interface Store<in out Schemas extends OptionalSchemas> {
       Schemas,
       TableIdOrNull,
       RowIdOrNull,
-      CellIdOrNull
+      CellIdOrNull,
+      this
     >,
     mutator?: boolean,
   ): Id;
@@ -7101,7 +7147,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    *   tableId: IdOrNull,
    *   rowId: IdOrNull,
    *   cellId: IdOrNull,
-   *   listener: CellListener,
+   *   listener: CellListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -7225,7 +7271,13 @@ export interface Store<in out Schemas extends OptionalSchemas> {
     tableId: TableIdOrNull,
     rowId: RowIdOrNull,
     cellId: CellIdOrNull,
-    listener: CellListener<Schemas, TableIdOrNull, RowIdOrNull, CellIdOrNull>,
+    listener: CellListener<
+      Schemas,
+      TableIdOrNull,
+      RowIdOrNull,
+      CellIdOrNull,
+      this
+    >,
     mutator?: boolean,
   ): Id;
 
@@ -7237,7 +7289,10 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addHasValuesListener(listener: HasValuesListener, mutator?: boolean): Id;
+   * addHasValuesListener(
+   *   listener: HasValuesListener<this>,
+   *   mutator?: boolean,
+   * ): Id;
    * ```
    *
    * The provided listener is a HasValuesListener function, and will be called
@@ -7297,7 +7352,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @since v4.4.0
    */
   addHasValuesListener(
-    listener: HasValuesListener<Schemas>,
+    listener: HasValuesListener<Schemas, this>,
     mutator?: boolean,
   ): Id;
 
@@ -7308,7 +7363,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addValuesListener(listener: ValuesListener, mutator?: boolean): Id;
+   * addValuesListener(listener: ValuesListener<this>, mutator?: boolean): Id;
    * ```
    *
    * The provided listener is a ValuesListener function, and will be called with
@@ -7365,7 +7420,10 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @category Listener
    * @since v3.0.0
    */
-  addValuesListener(listener: ValuesListener<Schemas>, mutator?: boolean): Id;
+  addValuesListener(
+    listener: ValuesListener<Schemas, this>,
+    mutator?: boolean,
+  ): Id;
 
   /**
    * The addValueIdsListener method registers a listener function with the Store
@@ -7374,7 +7432,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addValueIdsListener(listener: ValueIdsListener, mutator?: boolean): Id;
+   * addValueIdsListener(listener: ValueIdsListener<this>, mutator?: boolean): Id;
    * ```
    *
    * The provided listener is a ValueIdsListener function, and will be called
@@ -7435,7 +7493,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @since v3.0.0
    */
   addValueIdsListener(
-    listener: ValueIdsListener<Schemas>,
+    listener: ValueIdsListener<Schemas, this>,
     mutator?: boolean,
   ): Id;
 
@@ -7448,7 +7506,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addHasValueListener(
    *   valueId: IdOrNull,
-   *   listener: HasValueListener,
+   *   listener: HasValueListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -7542,7 +7600,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
     ValueIdOrNull extends ValueIdFromSchema<Schemas[1]> | null,
   >(
     valueId: ValueIdOrNull,
-    listener: HasValueListener<Schemas, ValueIdOrNull>,
+    listener: HasValueListener<Schemas, ValueIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -7555,7 +7613,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addValueListener(
    *   valueId: IdOrNull,
-   *   listener: ValueListener,
+   *   listener: ValueListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -7644,7 +7702,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    */
   addValueListener<ValueIdOrNull extends ValueIdFromSchema<Schemas[1]> | null>(
     valueId: ValueIdOrNull,
-    listener: ValueListener<Schemas, ValueIdOrNull>,
+    listener: ValueListener<Schemas, ValueIdOrNull, this>,
     mutator?: boolean,
   ): Id;
 
@@ -7660,7 +7718,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    *   tableId: IdOrNull,
    *   rowId: IdOrNull,
    *   cellId: IdOrNull,
-   *   listener: InvalidCellListener,
+   *   listener: InvalidCellListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -7886,7 +7944,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
     tableId: IdOrNull,
     rowId: IdOrNull,
     cellId: IdOrNull,
-    listener: InvalidCellListener<Schemas>,
+    listener: InvalidCellListener<Schemas, this>,
     mutator?: boolean,
   ): Id;
 
@@ -7900,7 +7958,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * ```ts override
    * addInvalidValueListener(
    *   valueId: IdOrNull,
-   *   listener: InvalidValueListener,
+   *   listener: InvalidValueListener<this>,
    *   mutator?: boolean,
    * ): Id;
    * ```
@@ -8071,7 +8129,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    */
   addInvalidValueListener(
     valueId: IdOrNull,
-    listener: InvalidValueListener<Schemas>,
+    listener: InvalidValueListener<Schemas, this>,
     mutator?: boolean,
   ): Id;
 
@@ -8082,7 +8140,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addStartTransactionListener(listener: TransactionListener): Id;
+   * addStartTransactionListener(listener: TransactionListener<this>): Id;
    * ```
    *
    * The provided TransactionListener will receive a reference to the Store and
@@ -8125,7 +8183,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @category Listener
    * @since v3.2.0
    */
-  addStartTransactionListener(listener: TransactionListener<Schemas>): Id;
+  addStartTransactionListener(listener: TransactionListener<Schemas, this>): Id;
 
   /**
    * The addWillFinishTransactionListener method registers a listener function
@@ -8135,7 +8193,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addWillFinishTransactionListener(listener: TransactionListener): Id;
+   * addWillFinishTransactionListener(listener: TransactionListener<this>): Id;
    * ```
    *
    * This is useful if you need to know that a set of listeners are about to be
@@ -8230,7 +8288,9 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @category Listener
    * @since v1.3.0
    */
-  addWillFinishTransactionListener(listener: TransactionListener<Schemas>): Id;
+  addWillFinishTransactionListener(
+    listener: TransactionListener<Schemas, this>,
+  ): Id;
 
   /**
    * The addDidFinishTransactionListener method registers a listener function
@@ -8240,7 +8300,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * addDidFinishTransactionListener(listener: TransactionListener): Id;
+   * addDidFinishTransactionListener(listener: TransactionListener<this>): Id;
    * ```
    *
    * This is useful if you need to know that a set of listeners have just been
@@ -8334,7 +8394,9 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * @category Listener
    * @since v1.3.0
    */
-  addDidFinishTransactionListener(listener: TransactionListener<Schemas>): Id;
+  addDidFinishTransactionListener(
+    listener: TransactionListener<Schemas, this>,
+  ): Id;
 
   /**
    * The callListener method provides a way for you to manually provoke a
@@ -8343,7 +8405,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * callListener(listenerId: Id): Store;
+   * callListener(listenerId: Id): this;
    * ```
    *
    * This is useful when you are using mutator listeners to guarantee that data
@@ -8465,7 +8527,7 @@ export interface Store<in out Schemas extends OptionalSchemas> {
    * This has schema-based typing. The following is a simplified representation:
    *
    * ```ts override
-   * delListener(listenerId: Id): Store;
+   * delListener(listenerId: Id): this;
    * ```
    *
    * Use the Id returned by whichever method was used to add the listener. Note