tinybase 3.1.0-beta.4 → 3.1.0-beta.5

package/lib/{cjs-es6 → types}/store.d.ts

@@ -26,7 +26,7 @@ import {Id, IdOrNull, Ids, Json} from './common.d';
  * `pets`, in which each Row may contain a string `species` Cell, and is
  * guaranteed to contain a boolean `sold` Cell that defaults to `false`.
  *
- *```js
+ * ```js
  * const tableSchema: TablesSchema = {
  *   pets: {
  *     species: {type: 'string'},
@@ -57,7 +57,7 @@ export type TablesSchema = {[tableId: Id]: {[cellId: Id]: CellSchema}};
  * When applied to a Store, this CellSchema ensures a boolean Cell is always
  * present, and defaults it to `false`.
  *
- *```js
+ * ```js
  * const requiredBoolean: CellSchema = {type: 'boolean', default: false};
  * ```
  * @category Schema
@@ -78,7 +78,7 @@ export type CellSchema =
  * When applied to a Store, this ValuesSchema only allows one boolean Value
  * called `open`, that defaults to `false`.
  *
- *```js
+ * ```js
  * const valuesSchema: ValuesSchema = {
  *   open: {type: 'boolean', default: false},
  * };
@@ -107,7 +107,7 @@ export type ValuesSchema = {[valueId: Id]: ValueSchema};
  * When applied to a Store, this ValueSchema ensures a boolean Value is always
  * present, and defaults it to `false`.
  *
- *```js
+ * ```js
  * const requiredBoolean: ValueSchema = {type: 'boolean', default: false};
  * ```
  * @category Schema
@@ -118,68 +118,10 @@ export type ValueSchema =
   | {type: 'number'; default?: number}
   | {type: 'boolean'; default?: boolean};
 
-/**
- * The NoTablesSchema type is a TablesSchema-like type for when one has not been
- * provided.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type NoTablesSchema = {[tableId: Id]: {[cellId: Id]: {type: 'any'}}};
-
-/**
- * The NoValuesSchema type is a ValuesSchema-like type for when one has not been
- * provided.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type NoValuesSchema = {[valueId: Id]: {type: 'any'}};
-
-/**
- * The OptionalTablesSchema type is used by generic types that can optionally
- * take a TablesSchema.
- *
- * @category Schema
- */
-export type OptionalTablesSchema = TablesSchema | NoTablesSchema;
-
-/**
- * The OptionalValuesSchema type is used by generic types that can optionally
- * take a ValuesSchema.
- *
- * @category Schema
- */
-export type OptionalValuesSchema = ValuesSchema | NoValuesSchema;
-
-/**
- * The OptionalSchemas type is used by generic types that can optionally take
- * either or both of a TablesSchema and ValuesSchema.
- *
- * @category Schema
- */
-export type OptionalSchemas = [OptionalTablesSchema, OptionalValuesSchema];
-
-/**
- * The NoSchemas type is used as a default by generic types that can optionally
- * take either or both of a TablesSchema and ValuesSchema.
- *
- * @category Schema
- */
-export type NoSchemas = [NoTablesSchema, NoValuesSchema];
-
 /**
  * The Tables type is the data structure representing all of the data in a
  * Store.
  *
- * ```ts override
- * {[tableId: Id]: Table}
- * ```
- *
  * A Tables object is used when setting all of the tables together with the
  * setTables method, and when getting them back out again with the getTables
  * method. A Tables object is a regular JavaScript object containing individual
@@ -200,18 +142,11 @@ export type NoSchemas = [NoTablesSchema, NoValuesSchema];
  * ```
  * @category Store
  */
-export type Tables<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  WhenSet extends boolean = false,
-> = TablesFromSchema<Schema, WhenSet>;
+export type Tables = {[tableId: Id]: Table};
 
 /**
  * The Table type is the data structure representing the data in a single table.
  *
- * ```ts override
- * {[rowId: Id]: Row}
- * ```
- *
  * A Table is used when setting a table with the setTable method, and when
  * getting it back out again with the getTable method. A Table object is a
  * regular JavaScript object containing individual Row objects, keyed by their
@@ -226,19 +161,11 @@ export type Tables<
  * ```
  * @category Store
  */
-export type Table<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  WhenSet extends boolean = false,
-> = TableFromSchema<Schema, TableId, WhenSet>;
+export type Table = {[rowId: Id]: Row};
 
 /**
  * The Row type is the data structure representing the data in a single row.
  *
- * ```ts override
- * {[cellId: Id]: Cell}
- * ```
- *
  * A Row is used when setting a row with the setRow method, and when getting it
  * back out again with the getRow method. A Row object is a regular JavaScript
  * object containing individual Cell objects, keyed by their Id.
@@ -249,19 +176,11 @@ export type Table<
  * ```
  * @category Store
  */
-export type Row<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  WhenSet extends boolean = false,
-> = RowFromSchema<Schema, TableId, WhenSet>;
+export type Row = {[cellId: Id]: Cell};
 
 /**
  * The Cell type is the data structure representing the data in a single cell.
  *
- * ```ts override
- * string | number | boolean
- * ```
- *
  * A Cell is used when setting a cell with the setCell method, and when getting
  * it back out again with the getCell method. A Cell is a JavaScript string,
  * number, or boolean.
@@ -272,14 +191,7 @@ export type Row<
  * ```
  * @category Store
  */
-export type Cell<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-> = CellFromSchema<Schema, TableId, CellId>;
+export type Cell = string | number | boolean;
 
 /**
  * The CellOrUndefined type is a data structure representing the data in a
@@ -291,24 +203,12 @@ export type Cell<
  *
  * @category Store
  */
-export type CellOrUndefined<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-  Cell = CellFromSchema<Schema, TableId, CellId>,
-> = Cell | undefined;
+export type CellOrUndefined = Cell | undefined;
 
 /**
  * The Values type is the data structure representing all the keyed values in a
  * Store.
  *
- * ```ts override
- * {[valueId: Id]: Value}
- * ```
- *
  * A Values object is used when setting values with the setValues method, and
  * when getting them back out again with the getValues method. A Values object
  * is a regular JavaScript object containing individual Value objects, keyed by
@@ -321,19 +221,12 @@ export type CellOrUndefined<
  * @category Store
  * @since v3.0.0
  */
-export type Values<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  WhenSet extends boolean = false,
-> = ValuesFromSchema<Schema, WhenSet>;
+export type Values = {[valueId: Id]: Value};
 
 /**
  * The Value type is the data structure representing the data in a single keyed
  * value.
  *
- * ```ts override
- * string | number | boolean
- * ```
- *
  * A Value is used when setting a value with the setValue method, and when
  * getting it back out again with the getValue method. A Value is a JavaScript
  * string, number, or boolean.
@@ -345,10 +238,7 @@ export type Values<
  * @category Store
  * @since v3.0.0
  */
-export type Value<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema> = ValueIdFromSchema<Schema>,
-> = ValueFromSchema<Schema, ValueId>;
+export type Value = string | number | boolean;
 
 /**
  * The ValueOrUndefined type is a data structure representing the data in a
@@ -361,11 +251,7 @@ export type Value<
  * @category Store
  * @since v3.0.0
  */
-export type ValueOrUndefined<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema> = ValueIdFromSchema<Schema>,
-  Value = ValueFromSchema<Schema, ValueId>,
-> = Value | undefined;
+export type ValueOrUndefined = Value | undefined;
 
 /**
  * The TableCallback type describes a function that takes a Table's Id and a
@@ -380,12 +266,9 @@ export type ValueOrUndefined<
  * in this Table.
  * @category Callback
  */
-export type TableCallback<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-> = (
-  tableId: TableId,
-  forEachRow: (rowCallback: RowCallback<Schema, TableId>) => void,
+export type TableCallback = (
+  tableId: Id,
+  forEachRow: (rowCallback: RowCallback) => void,
 ) => void;
 
 /**
@@ -401,12 +284,9 @@ export type TableCallback<
  * in this Row.
  * @category Callback
  */
-export type RowCallback<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-> = (
+export type RowCallback = (
   rowId: Id,
-  forEachCell: (cellCallback: CellCallback<Schema, TableId>) => void,
+  forEachCell: (cellCallback: CellCallback) => void,
 ) => void;
 
 /**
@@ -421,14 +301,7 @@ export type RowCallback<
  * @param cell The value of the Cell.
  * @category Callback
  */
-export type CellCallback<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-> = (cellId: CellId, cell: Cell<Schema, TableId, CellId>) => void;
+export type CellCallback = (cellId: Id, cell: Cell) => void;
 
 /**
  * The ValueCallback type describes a function that takes a Value's Id and its
@@ -443,10 +316,7 @@ export type CellCallback<
  * @category Callback
  * @since v3.0.0
  */
-export type ValueCallback<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema> = ValueIdFromSchema<Schema>,
-> = (valueId: ValueId, value: Value<Schema, ValueId>) => void;
+export type ValueCallback = (valueId: Id, value: Value) => void;
 
 /**
  * The MapCell type describes a function that takes an existing Cell value and
@@ -459,16 +329,7 @@ export type ValueCallback<
  * @param cell The current value of the Cell to map to a new value.
  * @category Callback
  */
-export type MapCell<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-> = (
-  cell: CellOrUndefined<Schema, TableId, CellId>,
-) => Cell<Schema, TableId, CellId>;
+export type MapCell = (cell: CellOrUndefined) => Cell;
 
 /**
  * The MapValue type describes a function that takes an existing Value and
@@ -482,10 +343,7 @@ export type MapCell<
  * @category Callback
  * @since v3.0.0
  */
-export type MapValue<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema> = ValueIdFromSchema<Schema>,
-> = (value: ValueOrUndefined<Schema, ValueId>) => Value<Schema, ValueId>;
+export type MapValue = (value: ValueOrUndefined) => Value;
 
 /**
  * The GetCell type describes a function that takes a Id and returns the Cell
@@ -498,14 +356,7 @@ export type MapValue<
  * @param cellId The Id of the Cell to fetch the value for.
  * @category Callback
  */
-export type GetCell<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-> = (cellId: CellId) => CellOrUndefined<Schema, TableId, CellId>;
+export type GetCell = (cellId: Id) => CellOrUndefined;
 
 /**
  * The DoRollback type describes a function that you can use to rollback the
@@ -526,14 +377,10 @@ export type GetCell<
  * @param invalidValues Any invalid attempts to change Values, since v3.0.0.
  * @category Callback
  */
-export type DoRollback<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TablesSchema extends OptionalTablesSchema = Schemas[0],
-  ValuesSchema extends OptionalValuesSchema = Schemas[1],
-> = (
-  changedCells: ChangedCells<TablesSchema>,
+export type DoRollback = (
+  changedCells: ChangedCells,
   invalidCells: InvalidCells,
-  changedValues: ChangedValues<ValuesSchema>,
+  changedValues: ChangedValues,
   invalidValues: InvalidValues,
 ) => boolean;
 
@@ -563,8 +410,8 @@ export type DoRollback<
  * since v3.0.0.
  * @category Listener
  */
-export type TransactionListener<Schemas extends OptionalSchemas = NoSchemas> = (
-  store: Store<Schemas>,
+export type TransactionListener = (
+  store: Store,
   cellsTouched: boolean,
   valuesTouched: boolean,
 ) => void;
@@ -589,12 +436,9 @@ export type TransactionListener<Schemas extends OptionalSchemas = NoSchemas> = (
  * changes.
  * @category Listener
  */
-export type TablesListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TablesSchema extends OptionalTablesSchema = Schemas[0],
-> = (
-  store: Store<Schemas>,
-  getCellChange: GetCellChange<TablesSchema> | undefined,
+export type TablesListener = (
+  store: Store,
+  getCellChange: GetCellChange | undefined,
 ) => void;
 
 /**
@@ -609,9 +453,7 @@ export type TablesListener<
  * @param store A reference to the Store that changed.
  * @category Listener
  */
-export type TableIdsListener<Schemas extends OptionalSchemas = NoSchemas> = (
-  store: Store<Schemas>,
-) => void;
+export type TableIdsListener = (store: Store) => void;
 
 /**
  * The TableListener type describes a function that is used to listen to changes
@@ -634,19 +476,10 @@ export type TableIdsListener<Schemas extends OptionalSchemas = NoSchemas> = (
  * changes.
  * @category Listener
  */
-export type TableListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableIdOrNull extends TableIdFromSchema<
-    Schemas[0]
-  > | null = TableIdFromSchema<Schemas[0]> | null,
-  TableId = TableIdOrNull extends null
-    ? TableIdFromSchema<Schemas[0]>
-    : TableIdOrNull,
-  TablesSchema extends OptionalTablesSchema = Schemas[0],
-> = (
-  store: Store<Schemas>,
-  tableId: TableId,
-  getCellChange: GetCellChange<TablesSchema> | undefined,
+export type TableListener = (
+  store: Store,
+  tableId: Id,
+  getCellChange: GetCellChange | undefined,
 ) => void;
 
 /**
@@ -663,15 +496,7 @@ export type TableListener<
  * @param tableId The Id of the Table that changed.
  * @category Listener
  */
-export type RowIdsListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableIdOrNull extends TableIdFromSchema<
-    Schemas[0]
-  > | null = TableIdFromSchema<Schemas[0]> | null,
-  TableId = TableIdOrNull extends null
-    ? TableIdFromSchema<Schemas[0]>
-    : TableIdOrNull,
-> = (store: Store<Schemas>, tableId: TableId) => void;
+export type RowIdsListener = (store: Store, tableId: Id) => void;
 
 /**
  * The SortedRowIdsListener type describes a function that is used to listen to
@@ -697,22 +522,13 @@ export type RowIdsListener<
  * @category Listener
  * @since v2.0.0
  */
-export type SortedRowIdsListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableId extends TableIdFromSchema<Schemas[0]> = TableIdFromSchema<Schemas[0]>,
-  CellId extends CellIdFromSchema<Schemas[0], TableId> | undefined =
-    | CellIdFromSchema<Schemas[0], TableId>
-    | undefined,
-  Descending extends boolean = boolean,
-  Offset extends number = number,
-  Limit extends number | undefined = number | undefined,
-> = (
-  store: Store<Schemas>,
-  tableId: TableId,
-  cellId: CellId,
-  descending: Descending,
-  offset: Offset,
-  limit: Limit,
+export type SortedRowIdsListener = (
+  store: Store,
+  tableId: Id,
+  cellId: Id | undefined,
+  descending: boolean,
+  offset: number,
+  limit: number | undefined,
   sortedRowIds: Ids,
 ) => void;
 
@@ -739,22 +555,11 @@ export type SortedRowIdsListener<
  * changes.
  * @category Listener
  */
-export type RowListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableIdOrNull extends TableIdFromSchema<
-    Schemas[0]
-  > | null = TableIdFromSchema<Schemas[0]> | null,
-  RowIdOrNull extends IdOrNull = IdOrNull,
-  TableId = TableIdOrNull extends null
-    ? TableIdFromSchema<Schemas[0]>
-    : TableIdOrNull,
-  RowId = RowIdOrNull extends null ? Id : RowIdOrNull,
-  TablesSchema extends OptionalTablesSchema = Schemas[0],
-> = (
-  store: Store<Schemas>,
-  tableId: TableId,
-  rowId: RowId,
-  getCellChange: GetCellChange<TablesSchema> | undefined,
+export type RowListener = (
+  store: Store,
+  tableId: Id,
+  rowId: Id,
+  getCellChange: GetCellChange | undefined,
 ) => void;
 
 /**
@@ -772,17 +577,7 @@ export type RowListener<
  * @param rowId The Id of the Row that changed.
  * @category Listener
  */
-export type CellIdsListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableIdOrNull extends TableIdFromSchema<
-    Schemas[0]
-  > | null = TableIdFromSchema<Schemas[0]> | null,
-  RowIdOrNull extends IdOrNull = null,
-  TableId = TableIdOrNull extends null
-    ? TableIdFromSchema<Schemas[0]>
-    : TableIdOrNull,
-  RowId = RowIdOrNull extends null ? Id : RowIdOrNull,
-> = (store: Store<Schemas>, tableId: TableId, rowId: RowId) => void;
+export type CellIdsListener = (store: Store, tableId: Id, rowId: Id) => void;
 
 /**
  * The CellListener type describes a function that is used to listen to changes
@@ -812,40 +607,14 @@ export type CellIdsListener<
  * changes.
  * @category Listener
  */
-export type CellListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableIdOrNull extends TableIdFromSchema<
-    Schemas[0]
-  > | null = TableIdFromSchema<Schemas[0]> | null,
-  RowIdOrNull extends IdOrNull = IdOrNull,
-  CellIdOrNull extends
-    | (TableIdOrNull extends TableIdFromSchema<Schemas[0]>
-        ? CellIdFromSchema<Schemas[0], TableIdOrNull>
-        : AllCellIdFromSchema<Schemas[0]>)
-    | null =
-    | (TableIdOrNull extends TableIdFromSchema<Schemas[0]>
-        ? CellIdFromSchema<Schemas[0], TableIdOrNull>
-        : AllCellIdFromSchema<Schemas[0]>)
-    | null,
-  TableId extends Id = TableIdOrNull extends null
-    ? TableIdFromSchema<Schemas[0]>
-    : TableIdOrNull,
-  RowId = RowIdOrNull extends null ? Id : RowIdOrNull,
-  CellId extends Id = CellIdOrNull extends null
-    ? TableIdOrNull extends TableIdFromSchema<Schemas[0]>
-      ? CellIdFromSchema<Schemas[0], TableIdOrNull>
-      : AllCellIdFromSchema<Schemas[0]>
-    : CellIdOrNull,
-  Cell = CellFromSchema<Schemas[0], TableId, CellId>,
-  TablesSchema extends OptionalTablesSchema = Schemas[0],
-> = (
-  store: Store<Schemas>,
-  tableId: TableId,
-  rowId: RowId,
-  cellId: CellId,
+export type CellListener = (
+  store: Store,
+  tableId: Id,
+  rowId: Id,
+  cellId: Id,
   newCell: Cell,
   oldCell: Cell,
-  getCellChange: GetCellChange<TablesSchema> | undefined,
+  getCellChange: GetCellChange | undefined,
 ) => void;
 
 /**
@@ -868,12 +637,9 @@ export type CellListener<
  * changes.
  * @category Listener
  */
-export type ValuesListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  ValuesSchema extends OptionalValuesSchema = Schemas[1],
-> = (
-  store: Store<Schemas>,
-  getValueChange: GetValueChange<ValuesSchema> | undefined,
+export type ValuesListener = (
+  store: Store,
+  getValueChange: GetValueChange | undefined,
 ) => void;
 
 /**
@@ -888,9 +654,7 @@ export type ValuesListener<
  * @param store A reference to the Store that changed.
  * @category Listener
  */
-export type ValueIdsListener<Schemas extends OptionalSchemas = NoSchemas> = (
-  store: Store<Schemas>,
-) => void;
+export type ValueIdsListener = (store: Store) => void;
 
 /**
  * The ValueListener type describes a function that is used to listen to changes
@@ -918,22 +682,12 @@ export type ValueIdsListener<Schemas extends OptionalSchemas = NoSchemas> = (
  * @category Listener
  * @since v3.0.0
  */
-export type ValueListener<
-  Schemas extends OptionalSchemas = NoSchemas,
-  ValueIdOrNull extends ValueIdFromSchema<
-    Schemas[1]
-  > | null = ValueIdFromSchema<Schemas[1]> | null,
-  ValueId extends Id = ValueIdOrNull extends null
-    ? ValueIdFromSchema<Schemas[1]>
-    : ValueIdOrNull,
-  Value = ValueFromSchema<Schemas[1], ValueId>,
-  ValuesSchema extends OptionalValuesSchema = Schemas[1],
-> = (
-  store: Store<Schemas>,
-  valueId: ValueId,
+export type ValueListener = (
+  store: Store,
+  valueId: Id,
   newValue: Value,
   oldValue: Value,
-  getValueChange: GetValueChange<ValuesSchema> | undefined,
+  getValueChange: GetValueChange | undefined,
 ) => void;
 
 /**
@@ -958,8 +712,8 @@ export type ValueListener<
  * @category Listener
  * @since v1.1.0
  */
-export type InvalidCellListener<Schemas extends OptionalSchemas = NoSchemas> = (
-  store: Store<Schemas>,
+export type InvalidCellListener = (
+  store: Store,
   tableId: Id,
   rowId: Id,
   cellId: Id,
@@ -986,8 +740,11 @@ export type InvalidCellListener<Schemas extends OptionalSchemas = NoSchemas> = (
  * @category Listener
  * @since v3.0.0
  */
-export type InvalidValueListener<Schemas extends OptionalSchemas = NoSchemas> =
-  (store: Store<Schemas>, valueId: Id, invalidValues: any[]) => void;
+export type InvalidValueListener = (
+  store: Store,
+  valueId: Id,
+  invalidValues: any[],
+) => void;
 
 /**
  * The GetCellChange type describes a function that returns information about
@@ -1004,16 +761,7 @@ export type InvalidValueListener<Schemas extends OptionalSchemas = NoSchemas> =
  * @returns A CellChange array containing information about the Cell's changes.
  * @category Listener
  */
-export type GetCellChange<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-> = <
-  TableId extends TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId>,
->(
-  tableId: TableId,
-  rowId: Id,
-  cellId: CellId,
-) => CellChange<Schema, TableId, CellId>;
+export type GetCellChange = (tableId: Id, rowId: Id, cellId: Id) => CellChange;
 
 /**
  * The CellChange type describes a Cell's changes during a transaction.
@@ -1025,15 +773,11 @@ export type GetCellChange<
  *
  * @category Listener
  */
-export type CellChange<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-  CellOrUndefined = Cell<Schema, TableId, CellId> | undefined,
-> = [changed: boolean, oldCell: CellOrUndefined, newCell: CellOrUndefined];
+export type CellChange = [
+  changed: boolean,
+  oldCell: CellOrUndefined,
+  newCell: CellOrUndefined,
+];
 
 /**
  * The GetValueChange type describes a function that returns information about
@@ -1049,11 +793,7 @@ export type CellChange<
  * changes.
  * @category Listener
  */
-export type GetValueChange<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-> = <ValueId extends ValueIdFromSchema<Schema>>(
-  valueId: ValueId,
-) => ValueChange<Schema, ValueId>;
+export type GetValueChange = (valueId: Id) => ValueChange;
 
 /**
  * The ValueChange type describes a Value's changes during a transaction.
@@ -1065,27 +805,17 @@ export type GetValueChange<
  *
  * @category Listener
  */
-export type ValueChange<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema> = ValueIdFromSchema<Schema>,
-  ValueOrUndefined = Value<Schema, ValueId> | undefined,
-> = [changed: boolean, oldValue: ValueOrUndefined, newValue: ValueOrUndefined];
+export type ValueChange = [
+  changed: boolean,
+  oldValue: ValueOrUndefined,
+  newValue: ValueOrUndefined,
+];
 
 /**
  * The ChangedCells type describes the Cell values that have been changed during
  * a transaction, primarily used so that you can indicate whether the
  * transaction should be rolled back.
  *
- * ```ts override
- * {
- *   [tableId: Id]: {
- *     [rowId: Id]: {
- *       [cellId: Id]: [CellOrUndefined, CellOrUndefined],
- *     },
- *   },
- * }
- * ```
- *
  * A ChangedCells object is provided to the `doRollback` callback when using the
  * transaction method and the finishTransaction method. See those methods for
  * specific examples.
@@ -1106,17 +836,13 @@ export type ValueChange<
  * @category Transaction
  * @since v1.2.0
  */
-export type ChangedCells<Schema extends OptionalTablesSchema = NoTablesSchema> =
-  {
-    [TableId in TableIdFromSchema<Schema>]?: {
-      [rowId: Id]: {
-        [CellId in CellIdFromSchema<Schema, TableId>]?: [
-          CellOrUndefined<Schema, TableId, CellId>,
-          CellOrUndefined<Schema, TableId, CellId>,
-        ];
-      };
+export type ChangedCells = {
+  [tableId: Id]: {
+    [rowId: Id]: {
+      [cellId: Id]: [CellOrUndefined, CellOrUndefined];
     };
   };
+};
 
 /**
  * The InvalidCells type describes the invalid Cell values that have been
@@ -1148,10 +874,6 @@ export type InvalidCells = {
  * transaction, primarily used so that you can indicate whether the transaction
  * should be rolled back.
  *
- * ```ts override
- * {[valueId: Id]: [ValueOrUndefined, ValueOrUndefined]}
- * ```
- *
  * A ChangedValues object is provided to the `doRollback` callback when using
  * the transaction method and the finishTransaction method. See those methods
  * for specific examples.
@@ -1171,14 +893,10 @@ export type InvalidCells = {
  * @category Transaction
  * @since v3.0.0
  */
-export type ChangedValues<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-> = {
-  [ValueId in ValueIdFromSchema<Schema>]?: [
-    ValueOrUndefined<Schema, ValueId>,
-    ValueOrUndefined<Schema, ValueId>,
-  ];
+export type ChangedValues = {
+  [valueId: Id]: [ValueOrUndefined, ValueOrUndefined];
 };
+
 /**
  * The InvalidValues type describes the invalid Values that have been attempted
  * during a transaction, primarily used so that you can indicate whether the
@@ -1406,13 +1124,6 @@ export type StoreListenerStats = {
  * getSchemaJson method, and remove the schemas altogether with the
  * delValuesSchema method and delTablesSchema method.
  *
- * Throughout this API documentation, you will see the generic type parameter
- * `Schemas`, which refers to a pair of TablesSchema and ValuesSchema
- * respectively. These can be used on the Store interface to constrain its
- * methods, for example. This type parameter is defaulted if not provided, and
- * so if you are using a Store without schemas, you can ignore it and use the
- * Store type bare.
- *
  * Read more about schemas in the Using Schemas guide.
  *
  * # Convenience methods
@@ -1459,7 +1170,7 @@ export type StoreListenerStats = {
  * @see Todo App demos
  * @category Store
  */
-export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
+export interface Store {
   /**
    * The getTables method returns a Tables object containing the entire data of
    * the Store.
@@ -1489,13 +1200,9 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * console.log(store.getTables());
    * // -> {}
    * ```
-   * @see
-   * # Guides
-   * Creating a Store
-   * @see Indexes
    * @category Getter
    */
-  getTables<Tables = TablesFromSchema<Schemas[0]>>(): Tables;
+  getTables(): Tables;
 
   /**
    * The getTableIds method returns the Ids of every Table in the Store.
@@ -1526,7 +1233,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  getTableIds<Ids = TableIdFromSchema<Schemas[0]>[]>(): Ids;
+  getTableIds(): Ids;
 
   /**
    * The getTable method returns an object containing the entire data of a
@@ -1560,12 +1267,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  getTable<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Table = TableFromSchema<Schemas[0]>,
-  >(
-    tableId: TableId,
-  ): Table;
+  getTable(tableId: Id): Table;
 
   /**
    * The getRowIds method returns the Ids of every Row in a given Table.
@@ -1599,9 +1301,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  getRowIds<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-  ): Ids;
+  getRowIds(tableId: Id): Ids;
 
   /**
    * The getSortedRowIds method returns the Ids of every Row in a given Table,
@@ -1702,12 +1402,9 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Getter
    * @since v2.0.0
    */
-  getSortedRowIds<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellId extends CellIdFromSchema<Schemas[0], TableId>,
-  >(
-    tableId: TableId,
-    cellId?: CellId,
+  getSortedRowIds(
+    tableId: Id,
+    cellId?: Id,
     descending?: boolean,
     offset?: number,
     limit?: number,
@@ -1748,13 +1445,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  getRow<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Row = RowFromSchema<Schemas[0], TableId>,
-  >(
-    tableId: TableId,
-    rowId: Id,
-  ): Row;
+  getRow(tableId: Id, rowId: Id): Row;
 
   /**
    * The getCellIds method returns the Ids of every Cell in a given Row, in a
@@ -1789,13 +1480,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  getCellIds<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Ids extends CellIdFromSchema<Schemas[0], TableId>[],
-  >(
-    tableId: TableId,
-    rowId: Id,
-  ): Ids;
+  getCellIds(tableId: Id, rowId: Id): Ids;
 
   /**
    * The getCell method returns the value of a single Cell in a given Row, in a
@@ -1825,15 +1510,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  getCell<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellId extends CellIdFromSchema<Schemas[0], TableId>,
-    CellOrUndefined = CellFromSchema<Schemas[0], TableId, CellId> | undefined,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    cellId: CellId,
-  ): CellOrUndefined;
+  getCell(tableId: Id, rowId: Id, cellId: Id): CellOrUndefined;
 
   /**
    * The getValues method returns an object containing the entire set of keyed
@@ -1864,7 +1541,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Getter
    * @since v3.0.0
    */
-  getValues<Values = ValuesFromSchema<Schemas[1]>>(): Values;
+  getValues(): Values;
 
   /**
    * The getValueIds method returns the Ids of every Value in a Store.
@@ -1893,7 +1570,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Getter
    * @since v3.0.0
    */
-  getValueIds<Ids = ValueIdFromSchema<Schemas[1]>[]>(): Ids;
+  getValueIds(): Ids;
 
   /**
    * The getValue method returns a single keyed Value in the Store.
@@ -1919,12 +1596,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Getter
    * @since v3.0.0
    */
-  getValue<
-    ValueId extends ValueIdFromSchema<Schemas[1]>,
-    ValueOrUndefined = ValueFromSchema<Schemas[1], ValueId> | undefined,
-  >(
-    valueId: ValueId,
-  ): ValueOrUndefined;
+  getValue(valueId: Id): ValueOrUndefined;
 
   /**
    * The hasTables method returns a boolean indicating whether any Table objects
@@ -1964,9 +1636,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  hasTable<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-  ): boolean;
+  hasTable(tableId: Id): boolean;
 
   /**
    * The hasRow method returns a boolean indicating whether a given Row exists
@@ -1987,10 +1657,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  hasRow<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-    rowId: Id,
-  ): boolean;
+  hasRow(tableId: Id, rowId: Id): boolean;
 
   /**
    * The hasCell method returns a boolean indicating whether a given Cell exists
@@ -2012,14 +1679,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Getter
    */
-  hasCell<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellId extends CellIdFromSchema<Schemas[0], TableId>,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    cellId: CellId,
-  ): boolean;
+  hasCell(tableId: Id, rowId: Id, cellId: Id): boolean;
 
   /**
    * The hasTables method returns a boolean indicating whether any Values exist
@@ -2061,9 +1721,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Getter
    * @since v3.0.0
    */
-  hasValue<ValueId extends ValueIdFromSchema<Schemas[1]>>(
-    valueId: ValueId,
-  ): boolean;
+  hasValue(valueId: Id): boolean;
 
   /**
    * The getTablesJson method returns a string serialization of all of the
@@ -2302,9 +1960,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setTables<Tables = TablesFromSchema<Schemas[0], true>>(
-    tables: Tables,
-  ): Store<Schemas>;
+  setTables(tables: Tables): Store;
 
   /**
    * The setTable method takes an object and sets the entire data of a single
@@ -2355,13 +2011,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setTable<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Table = TableFromSchema<Schemas[0], TableId, true>,
-  >(
-    tableId: TableId,
-    table: Table,
-  ): Store<Schemas>;
+  setTable(tableId: Id, table: Table): Store;
 
   /**
    * The setRow method takes an object and sets the entire data of a single Row
@@ -2411,14 +2061,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setRow<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Row = RowFromSchema<Schemas[0], TableId, true>,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    row: Row,
-  ): Store<Schemas>;
+  setRow(tableId: Id, rowId: Id, row: Row): Store;
 
   /**
    * The addRow method takes an object and creates a new Row in the Store,
@@ -2471,13 +2114,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  addRow<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Row = RowFromSchema<Schemas[0], TableId, true>,
-  >(
-    tableId: TableId,
-    row: Row,
-  ): Id | undefined;
+  addRow(tableId: Id, row: Row): Id | undefined;
 
   /**
    * The setPartialRow method takes an object and sets partial data of a single
@@ -2529,14 +2166,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setPartialRow<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    Row = RowFromSchema<Schemas[0], TableId, true>,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    partialRow: Row,
-  ): Store<Schemas>;
+  setPartialRow(tableId: Id, rowId: Id, partialRow: Row): Store;
 
   /**
    * The setCell method sets the value of a single Cell in the Store.
@@ -2594,17 +2224,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setCell<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellId extends CellIdFromSchema<Schemas[0], TableId>,
-    Cell = CellFromSchema<Schemas[0], TableId, CellId>,
-    MapCell = (cell: Cell | undefined) => Cell,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    cellId: CellId,
-    cell: Cell | MapCell,
-  ): Store<Schemas>;
+  setCell(tableId: Id, rowId: Id, cellId: Id, cell: Cell | MapCell): Store;
 
   /**
    * The setValues method takes an object and sets all the Values in the Store.
@@ -2652,9 +2272,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setValues<Values = ValuesFromSchema<Schemas[1], true>>(
-    values: Values,
-  ): Store<Schemas>;
+  setValues(values: Values): Store;
 
   /**
    * The setPartialValues method takes an object and sets its Values in the
@@ -2704,9 +2322,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setPartialValues<Values = ValuesFromSchema<Schemas[1], true>>(
-    partialValues: Values,
-  ): Store<Schemas>;
+  setPartialValues(partialValues: Values): Store;
 
   /**
    * The setValue method sets a single keyed Value in the Store.
@@ -2760,14 +2376,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setValue<
-    ValueId extends ValueIdFromSchema<Schemas[1]>,
-    Value = ValueFromSchema<Schemas[1], ValueId>,
-    MapValue = (value: Value | undefined) => Value,
-  >(
-    valueId: ValueId,
-    value: Value | MapValue,
-  ): Store<Schemas>;
+  setValue(valueId: Id, value: Value | MapValue): Store;
 
   /**
    * The setTablesJson method takes a string serialization of all of the Tables
@@ -2802,7 +2411,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setTablesJson(tablesJson: Json): Store<Schemas>;
+  setTablesJson(tablesJson: Json): Store;
 
   /**
    * The setValuesJson method takes a string serialization of all of the Values
@@ -2837,7 +2446,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setValuesJson(valuesJson: Json): Store<Schemas>;
+  setValuesJson(valuesJson: Json): Store;
 
   /**
    * The setJson method takes a string serialization of all of the Tables and
@@ -2896,24 +2505,16 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setJson(tablesAndValuesJson: Json): Store<Schemas>;
+  setJson(tablesAndValuesJson: Json): Store;
 
   /**
    * The setTablesSchema method lets you specify the TablesSchema of the tabular
    * part of the Store.
    *
-   * ```ts override
-   * setTablesSchema(tablesSchema: TablesSchema): Store<Schemas>
-   * ```
-   *
    * Note that this may result in a change to data in the Store, as defaults are
    * applied or as invalid Table, Row, or Cell objects are removed. These
    * changes will fire any listeners to that data, as expected.
    *
-   * This method will return a Store that is typed according to the schema that
-   * you provided. To benefit from that, you may wish to assign it to a new
-   * variable so that TypeScript is able to reason about its subsequent usage.
-   *
    * When no longer needed, you can also completely remove an existing
    * TablesSchema with the delTablesSchema method.
    *
@@ -2937,29 +2538,16 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setTablesSchema<
-    TablesSchema extends TablesSchemaAlias,
-    ValuesSchema extends OptionalValuesSchema = Schemas[1],
-  >(
-    tablesSchema: TablesSchema,
-  ): Store<[typeof tablesSchema, ValuesSchema]>;
+  setTablesSchema(tablesSchema: TablesSchema): Store;
 
   /**
    * The setValuesSchema method lets you specify the ValuesSchema of the keyed
    * Values part of the Store.
    *
-   * ```ts override
-   * setValuesSchema(valuesSchema: ValuesSchema): Store<Schemas>
-   * ```
-   *
    * Note that this may result in a change to data in the Store, as defaults are
    * applied or as invalid Values are removed. These changes will fire any
    * listeners to that data, as expected.
    *
-   * This method will return a Store that is typed according to the schema that
-   * you provided. To benefit from that, you may wish to assign it to a new
-   * variable so that TypeScript is able to reason about its subsequent usage.
-   *
    * When no longer needed, you can also completely remove an existing
    * ValuesSchema with the delValuesSchema method.
    *
@@ -2980,32 +2568,16 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Setter
    * @since v3.0.0
    */
-  setValuesSchema<
-    ValuesSchema extends ValuesSchemaAlias,
-    TablesSchema extends OptionalTablesSchema = Schemas[0],
-  >(
-    valuesSchema: ValuesSchema,
-  ): Store<[TablesSchema, typeof valuesSchema]>;
+  setValuesSchema(valuesSchema: ValuesSchema): Store;
 
   /**
    * The setSchema method lets you specify the TablesSchema and ValuesSchema of
    * the Store.
    *
-   * ```ts override
-   * setSchema(
-   *   tablesSchema: TablesSchema,
-   *   valuesSchema?: ValuesSchema,
-   * ): Store<Schemas>
-   * ```
-   *
    * Note that this may result in a change to data in the Store, as defaults are
    * applied or as invalid Table, Row, Cell, or Value objects are removed. These
    * changes will fire any listeners to that data, as expected.
    *
-   * This method will return a Store that is typed according to the schemas that
-   * you provided. To benefit from that, you may wish to assign it to a new
-   * variable so that TypeScript is able to reason about its subsequent usage.
-   *
    * From v3.0.0 onwards, this method takes two arguments. The first is the
    * TablesSchema object, the second the ValuesSchema. In previous versions
    * (before the existence of the ValuesSchema data structure), only the first
@@ -3055,20 +2627,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Setter
    */
-  setSchema<
-    TablesSchema extends TablesSchemaAlias,
-    ValuesSchema extends ValuesSchemaAlias,
-  >(
-    tablesSchema: TablesSchema,
-    valuesSchema?: ValuesSchema,
-  ): Store<
-    [
-      typeof tablesSchema,
-      Exclude<ValuesSchemaAlias, typeof valuesSchema> extends never
-        ? NoValuesSchema
-        : NonNullable<typeof valuesSchema>,
-    ]
-  >;
+  setSchema(tablesSchema: TablesSchema, valuesSchema?: ValuesSchema): Store;
 
   /**
    * The delTables method lets you remove all of the data in a Store.
@@ -3086,7 +2645,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Deleter
    */
-  delTables(): Store<Schemas>;
+  delTables(): Store;
 
   /**
    * The delTable method lets you remove a single Table from the Store.
@@ -3108,9 +2667,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Deleter
    */
-  delTable<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-  ): Store<Schemas>;
+  delTable(tableId: Id): Store;
 
   /**
    * The delRow method lets you remove a single Row from a Table.
@@ -3134,10 +2691,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Deleter
    */
-  delRow<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-    rowId: Id,
-  ): Store<Schemas>;
+  delRow(tableId: Id, rowId: Id): Store;
 
   /**
    * The delCell method lets you remove a single Cell from a Row.
@@ -3221,15 +2775,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Deleter
    */
-  delCell<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellId extends CellIdFromSchema<Schemas[0], TableId>,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    cellId: CellId,
-    forceDel?: boolean,
-  ): Store<Schemas>;
+  delCell(tableId: Id, rowId: Id, cellId: Id, forceDel?: boolean): Store;
 
   /**
    * The delValues method lets you remove all the Values from a Store.
@@ -3268,7 +2814,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Deleter
    * @since v3.0.0
    */
-  delValues(): Store<Schemas>;
+  delValues(): Store;
 
   /**
    * The delValue method lets you remove a single Value from a Store.
@@ -3308,9 +2854,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Deleter
    * @since v3.0.0
    */
-  delValue<ValueId extends ValueIdFromSchema<Schemas[1]>>(
-    valueId: ValueId,
-  ): Store<Schemas>;
+  delValue(valueId: Id): Store;
 
   /**
    * The delTablesSchema method lets you remove the TablesSchema of the Store.
@@ -3329,9 +2873,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Deleter
    */
-  delTablesSchema<
-    ValuesSchema extends OptionalValuesSchema = Schemas[1],
-  >(): Store<[NoTablesSchema, ValuesSchema]>;
+  delTablesSchema(): Store;
 
   /**
    * The delValuesSchema method lets you remove the ValuesSchema of the Store.
@@ -3351,9 +2893,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Deleter
    * @since v3.0.0
    */
-  delValuesSchema<
-    TablesSchema extends OptionalTablesSchema = Schemas[0],
-  >(): Store<[TablesSchema, NoValuesSchema]>;
+  delValuesSchema(): Store;
 
   /**
    * The delSchema method lets you remove both the TablesSchema and ValuesSchema
@@ -3380,7 +2920,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Deleter
    * @since v3.0.0
    */
-  delSchema(): Store<NoSchemas>;
+  delSchema(): Store;
 
   /**
    * The transaction method takes a function that makes multiple mutations to
@@ -3508,10 +3048,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Transaction
    */
-  transaction<Return>(
-    actions: () => Return,
-    doRollback?: DoRollback<Schemas>,
-  ): Return;
+  transaction<Return>(actions: () => Return, doRollback?: DoRollback): Return;
 
   /**
    * The startTransaction method allows you to explicitly start a transaction
@@ -3562,7 +3099,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Transaction
    * @since v1.3.0
    */
-  startTransaction(): Store<Schemas>;
+  startTransaction(): Store;
 
   /**
    * The finishTransaction method allows you to explicitly finish a transaction
@@ -3660,7 +3197,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Transaction
    * @since v1.3.0
    */
-  finishTransaction(doRollback?: DoRollback<Schemas>): Store<Schemas>;
+  finishTransaction(doRollback?: DoRollback): Store;
 
   /**
    * The forEachTable method takes a function that it will then call for each
@@ -3693,9 +3230,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Iterator
    */
-  forEachTable<TableCallback = TableCallbackAlias<Schemas[0]>>(
-    tableCallback: TableCallback,
-  ): void;
+  forEachTable(tableCallback: TableCallback): void;
 
   /**
    * The forEachRow method takes a function that it will then call for each Row
@@ -3730,13 +3265,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Iterator
    */
-  forEachRow<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    RowCallback = RowCallbackAlias<Schemas[0], TableId>,
-  >(
-    tableId: TableId,
-    rowCallback: RowCallback,
-  ): void;
+  forEachRow(tableId: Id, rowCallback: RowCallback): void;
 
   /**
    * The forEachCell method takes a function that it will then call for each
@@ -3764,14 +3293,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Iterator
    */
-  forEachCell<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellCallback = CellCallbackAlias<Schemas[0], TableId>,
-  >(
-    tableId: TableId,
-    rowId: Id,
-    cellCallback: CellCallback,
-  ): void;
+  forEachCell(tableId: Id, rowId: Id, cellCallback: CellCallback): void;
 
   /**
    * The forEachValue method takes a function that it will then call for each
@@ -3796,9 +3318,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Iterator
    * @since v3.0.0
    */
-  forEachValue<ValueCallback = ValueCallbackAlias<Schemas[1]>>(
-    valueCallback: ValueCallback,
-  ): void;
+  forEachValue(valueCallback: ValueCallback): void;
 
   /**
    * The addTablesListener method registers a listener function with the Store
@@ -3862,7 +3382,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addTablesListener(listener: TablesListener<Schemas>, mutator?: boolean): Id;
+  addTablesListener(listener: TablesListener, mutator?: boolean): Id;
 
   /**
    * The addTableIdsListener method registers a listener function with the Store
@@ -3925,10 +3445,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addTableIdsListener(
-    listener: TableIdsListener<Schemas>,
-    mutator?: boolean,
-  ): Id;
+  addTableIdsListener(listener: TableIdsListener, mutator?: boolean): Id;
 
   /**
    * The addTableListener method registers a listener function with the Store
@@ -4021,9 +3538,9 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addTableListener<TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null>(
-    tableId: TableIdOrNull,
-    listener: TableListener<Schemas, TableIdOrNull>,
+  addTableListener(
+    tableId: IdOrNull,
+    listener: TableListener,
     mutator?: boolean,
   ): Id;
 
@@ -4113,9 +3630,9 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addRowIdsListener<TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null>(
-    tableId: TableIdOrNull,
-    listener: RowIdsListener<Schemas, TableIdOrNull>,
+  addRowIdsListener(
+    tableId: IdOrNull,
+    listener: RowIdsListener,
     mutator?: boolean,
   ): Id;
 
@@ -4335,26 +3852,13 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Listener
    * @since v2.0.0
    */
-  addSortedRowIdsListener<
-    TableId extends TableIdFromSchema<Schemas[0]>,
-    CellId extends CellIdFromSchema<Schemas[0], TableId> | undefined,
-    Descending extends boolean,
-    Offset extends number,
-    Limit extends number | undefined,
-  >(
-    tableId: TableId,
-    cellId: CellId,
-    descending: Descending,
-    offset: Offset,
-    limit: Limit,
-    listener: SortedRowIdsListener<
-      Schemas,
-      TableId,
-      CellId,
-      Descending,
-      Offset,
-      Limit
-    >,
+  addSortedRowIdsListener(
+    tableId: Id,
+    cellId: Id | undefined,
+    descending: boolean,
+    offset: number,
+    limit: number | undefined,
+    listener: SortedRowIdsListener,
     mutator?: boolean,
   ): Id;
 
@@ -4461,13 +3965,10 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addRowListener<
-    TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
-    RowIdOrNull extends IdOrNull,
-  >(
-    tableId: TableIdOrNull,
-    rowId: RowIdOrNull,
-    listener: RowListener<Schemas, TableIdOrNull, RowIdOrNull>,
+  addRowListener(
+    tableId: IdOrNull,
+    rowId: IdOrNull,
+    listener: RowListener,
     mutator?: boolean,
   ): Id;
 
@@ -4570,13 +4071,10 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addCellIdsListener<
-    TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
-    RowIdOrNull extends IdOrNull,
-  >(
-    tableId: TableIdOrNull,
-    rowId: RowIdOrNull,
-    listener: CellIdsListener<Schemas, TableIdOrNull, RowIdOrNull>,
+  addCellIdsListener(
+    tableId: IdOrNull,
+    rowId: IdOrNull,
+    listener: CellIdsListener,
     mutator?: boolean,
   ): Id;
 
@@ -4692,24 +4190,10 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  addCellListener<
-    TableIdOrNull extends TableIdFromSchema<Schemas[0]> | null,
-    RowIdOrNull extends IdOrNull,
-    CellIdOrNull extends
-      | (TableIdOrNull extends TableIdFromSchema<Schemas[0]>
-          ? CellIdFromSchema<Schemas[0], TableIdOrNull>
-          : AllCellIdFromSchema<Schemas[0]>)
-      | null,
-    CellListener extends CellListenerAlias<
-      Schemas,
-      TableIdOrNull,
-      RowIdOrNull,
-      CellIdOrNull
-    >,
-  >(
-    tableId: TableIdOrNull,
-    rowId: RowIdOrNull,
-    cellId: CellIdOrNull,
+  addCellListener(
+    tableId: IdOrNull,
+    rowId: IdOrNull,
+    cellId: IdOrNull,
     listener: CellListener,
     mutator?: boolean,
   ): Id;
@@ -4773,7 +4257,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Listener
    * @since v3.0.0
    */
-  addValuesListener(listener: ValuesListener<Schemas>, mutator?: boolean): Id;
+  addValuesListener(listener: ValuesListener, mutator?: boolean): Id;
 
   /**
    * The addValueIdsListener method registers a listener function with the Store
@@ -4837,10 +4321,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Listener
    * @since v3.0.0
    */
-  addValueIdsListener(
-    listener: ValueIdsListener<Schemas>,
-    mutator?: boolean,
-  ): Id;
+  addValueIdsListener(listener: ValueIdsListener, mutator?: boolean): Id;
 
   /**
    * The addValueListener method registers a listener function with the Store
@@ -4929,11 +4410,8 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Listener
    * @since v3.0.0
    */
-  addValueListener<
-    ValueIdOrNull extends ValueIdFromSchema<Schemas[1]> | null,
-    ValueListener = ValueListenerAlias<Schemas, ValueIdOrNull>,
-  >(
-    valueId: ValueIdOrNull,
+  addValueListener(
+    valueId: IdOrNull,
     listener: ValueListener,
     mutator?: boolean,
   ): Id;
@@ -5165,7 +4643,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
     tableId: IdOrNull,
     rowId: IdOrNull,
     cellId: IdOrNull,
-    listener: InvalidCellListener<Schemas>,
+    listener: InvalidCellListener,
     mutator?: boolean,
   ): Id;
 
@@ -5341,7 +4819,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    */
   addInvalidValueListener(
     valueId: IdOrNull,
-    listener: InvalidValueListener<Schemas>,
+    listener: InvalidValueListener,
     mutator?: boolean,
   ): Id;
 
@@ -5435,7 +4913,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Listener
    * @since v1.3.0
    */
-  addWillFinishTransactionListener(listener: TransactionListener<Schemas>): Id;
+  addWillFinishTransactionListener(listener: TransactionListener): Id;
 
   /**
    * The addDidFinishTransactionListener method registers a listener function
@@ -5528,7 +5006,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * @category Listener
    * @since v1.3.0
    */
-  addDidFinishTransactionListener(listener: TransactionListener<Schemas>): Id;
+  addDidFinishTransactionListener(listener: TransactionListener): Id;
 
   /**
    * The callListener method provides a way for you to manually provoke a
@@ -5645,7 +5123,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  callListener(listenerId: Id): Store<Schemas>;
+  callListener(listenerId: Id): Store;
 
   /**
    * The delListener method removes a listener that was previously added to the
@@ -5678,7 +5156,7 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
    * ```
    * @category Listener
    */
-  delListener(listenerId: Id): Store<Schemas>;
+  delListener(listenerId: Id): Store;
 
   /**
    * The getListenerStats method provides a set of statistics about the
@@ -5755,389 +5233,3 @@ export interface Store<Schemas extends OptionalSchemas = NoSchemas> {
  * @category Creation
  */
 export function createStore(): Store;
-
-/**
- * The TablesFromSchema type is a utility for determining a Tables structure
- * from a provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type TablesFromSchema<
-  Schema extends OptionalTablesSchema,
-  WhenSet extends boolean = false,
-> = {
-  -readonly [TableId in TableIdFromSchema<Schema>]?: TableFromSchema<
-    Schema,
-    TableId,
-    WhenSet
-  >;
-};
-
-/**
- * The TableIdFromSchema type is a utility for determining the Id of Tables from
- * a provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type TableIdFromSchema<Schema extends OptionalTablesSchema> = AsId<
-  keyof Schema
->;
-
-/**
- * The TableFromSchema type is a utility for determining a Table structure from
- * a provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type TableFromSchema<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  WhenSet extends boolean = false,
-> = {[rowId: Id]: RowFromSchema<Schema, TableId, WhenSet>};
-
-/**
- * The RowFromSchema type is a utility for determining a Row structure from a
- * provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type RowFromSchema<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  WhenSet extends boolean = false,
-> = (WhenSet extends true
-  ? {
-      -readonly [CellId in DefaultCellIdFromSchema<
-        Schema,
-        TableId
-      >]?: CellFromSchema<Schema, TableId, CellId>;
-    }
-  : {
-      -readonly [CellId in DefaultCellIdFromSchema<
-        Schema,
-        TableId
-      >]: CellFromSchema<Schema, TableId, CellId>;
-    }) & {
-  -readonly [CellId in DefaultCellIdFromSchema<
-    Schema,
-    TableId,
-    false
-  >]?: CellFromSchema<Schema, TableId, CellId>;
-};
-
-/**
- * The CellIdFromSchema type is a utility for determining the Id of Cells from a
- * provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type CellIdFromSchema<
-  Schema extends OptionalTablesSchema,
-  TableId extends TableIdFromSchema<Schema>,
-> = AsId<keyof Schema[TableId]>;
-
-/**
- * The DefaultCellIdFromSchema type is a utility for determining Cells with or
- * without default status from a provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type DefaultCellIdFromSchema<
-  Schema extends OptionalTablesSchema,
-  TableId extends TableIdFromSchema<Schema>,
-  IsDefaulted extends boolean = true,
-> = AsId<
-  {
-    [CellId in CellIdFromSchema<
-      Schema,
-      TableId
-    >]: Schema[TableId][CellId] extends {
-      default: string | number | boolean;
-    }
-      ? IsDefaulted extends true
-        ? CellId
-        : never
-      : IsDefaulted extends true
-      ? never
-      : CellId;
-  }[CellIdFromSchema<Schema, TableId>]
->;
-
-/**
- * The AllCellIdFromSchema type is a utility for determining the Id of Cells
- * across all Tables, from a provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type AllCellIdFromSchema<
-  Schema extends OptionalTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-> = TableId extends TableIdFromSchema<Schema>
-  ? CellIdFromSchema<Schema, TableId>
-  : never;
-
-/**
- * The CellFromSchema type is a utility for determining a Cell type from a
- * provided TablesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type CellFromSchema<
-  Schema extends OptionalTablesSchema,
-  TableId extends TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId>,
-  CellType = Schema[TableId][CellId]['type'],
-> = CellType extends 'string'
-  ? string
-  : CellType extends 'number'
-  ? number
-  : CellType extends 'boolean'
-  ? boolean
-  : string | number | boolean;
-
-/**
- * The ValuesFromSchema type is a utility for determining a Values structure
- * from a provided ValuesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type ValuesFromSchema<
-  Schema extends OptionalValuesSchema,
-  WhenSet extends boolean = false,
-> = (WhenSet extends true
-  ? {
-      -readonly [ValueId in DefaultValueIdFromSchema<Schema>]?: ValueFromSchema<
-        Schema,
-        ValueId
-      >;
-    }
-  : {
-      -readonly [ValueId in DefaultValueIdFromSchema<Schema>]: ValueFromSchema<
-        Schema,
-        ValueId
-      >;
-    }) & {
-  -readonly [ValueId in DefaultValueIdFromSchema<
-    Schema,
-    false
-  >]?: ValueFromSchema<Schema, ValueId>;
-};
-
-/**
- * The ValueIdFromSchema type is a utility for determining the Id of Values from
- * a provided ValuesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type ValueIdFromSchema<Schema extends OptionalValuesSchema> = AsId<
-  keyof Schema
->;
-
-/**
- * The DefaultValueIdFromSchema type is a utility for determining Values with or
- * without default status from a provided ValuesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type DefaultValueIdFromSchema<
-  Schema extends OptionalValuesSchema,
-  IsDefaulted extends boolean = true,
-> = {
-  [ValueId in ValueIdFromSchema<Schema>]: Schema[ValueId] extends {
-    default: string | number | boolean;
-  }
-    ? IsDefaulted extends true
-      ? ValueId
-      : never
-    : IsDefaulted extends true
-    ? never
-    : ValueId;
-}[ValueIdFromSchema<Schema>];
-
-/**
- * The ValueFromSchema type is a utility for determining a Value type from a
- * provided ValuesSchema.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type ValueFromSchema<
-  Schema extends OptionalValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema>,
-  ValueType = Schema[ValueId]['type'],
-> = ValueType extends 'string'
-  ? string
-  : ValueType extends 'number'
-  ? number
-  : ValueType extends 'boolean'
-  ? boolean
-  : string | number | boolean;
-
-/**
- * The AsId type is a utility for coercing keys to be Id-like.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type AsId<Key> = Exclude<Key & Id, number>;
-
-/**
- * The TablesSchemaAlias type is a duplicate of TablesSchema, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type TablesSchemaAlias = TablesSchema;
-
-/**
- * The ValuesSchemaAlias type is a duplicate of ValuesSchema, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type ValuesSchemaAlias = ValuesSchema;
-
-/**
- * The TableCallbackAlias type is a duplicate of TableCallback, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type TableCallbackAlias<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-> = TableCallback<Schema, TableId>;
-
-/**
- * The RowCallbackAlias type is a duplicate of RowCallback, used to mask complex
- * generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type RowCallbackAlias<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-> = RowCallback<Schema, TableId>;
-
-/**
- * The CellCallbackAlias type is a duplicate of CellCallback, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type CellCallbackAlias<
-  Schema extends OptionalTablesSchema = NoTablesSchema,
-  TableId extends TableIdFromSchema<Schema> = TableIdFromSchema<Schema>,
-  CellId extends CellIdFromSchema<Schema, TableId> = CellIdFromSchema<
-    Schema,
-    TableId
-  >,
-> = CellCallback<Schema, TableId, CellId>;
-
-/**
- * The ValueCallbackAlias type is a duplicate of ValueCallback, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type ValueCallbackAlias<
-  Schema extends OptionalValuesSchema = NoValuesSchema,
-  ValueId extends ValueIdFromSchema<Schema> = ValueIdFromSchema<Schema>,
-> = ValueCallback<Schema, ValueId>;
-
-/**
- * The CellListenerAlias type is a duplicate of CellListener, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type CellListenerAlias<
-  Schemas extends OptionalSchemas = NoSchemas,
-  TableIdOrNull extends TableIdFromSchema<
-    Schemas[0]
-  > | null = TableIdFromSchema<Schemas[0]> | null,
-  RowIdOrNull extends IdOrNull = IdOrNull,
-  CellIdOrNull extends
-    | (TableIdOrNull extends TableIdFromSchema<Schemas[0]>
-        ? CellIdFromSchema<Schemas[0], TableIdOrNull>
-        : AllCellIdFromSchema<Schemas[0]>)
-    | null =
-    | (TableIdOrNull extends TableIdFromSchema<Schemas[0]>
-        ? CellIdFromSchema<Schemas[0], TableIdOrNull>
-        : AllCellIdFromSchema<Schemas[0]>)
-    | null,
-> = CellListener<Schemas, TableIdOrNull, RowIdOrNull, CellIdOrNull>;
-
-/**
- * The ValueListenerAlias type is a duplicate of ValueListener, used to mask
- * complex generics from documentation.
- *
- * This type is used internally to the TinyBase type system and you are not
- * expected to need to use it directly.
- *
- * @category Internal
- */
-export type ValueListenerAlias<
-  Schemas extends OptionalSchemas = NoSchemas,
-  ValueIdOrNull extends ValueIdFromSchema<
-    Schemas[1]
-  > | null = ValueIdFromSchema<Schemas[1]> | null,
-> = ValueListener<Schemas, ValueIdOrNull>;