tinybase 5.0.0-beta.5 → 5.0.0-beta.6

package/lib/types/store.d.ts

@@ -10,8 +10,8 @@
  * @module store
  */
 
-import {Id, IdOrNull, Ids, Json} from './common.d';
-import {StoreAlias} from './internal/store.d';
+import {Id, IdOrNull, Ids, Json} from './common.d.ts';
+import {StoreAlias} from './internal/store.d.ts';
 
 /**
  * The TablesSchema type describes the tabular structure of a Store in terms of
@@ -156,7 +156,35 @@ export type OptionalSchemas = [OptionalTablesSchema, OptionalValuesSchema];
  */
 export type NoSchemas = [NoTablesSchema, NoValuesSchema];
 
-// Content
+/**
+ * The Content type describes both the Tables and Values in a Store.
+ *
+ * It is an array of two objects, representing tabular and keyed value content.
+ * @example
+ * The following is a valid Content array:
+ * ```json
+ * [
+ *   {
+ *     "pets": {
+ *       "fido": {
+ *         "sold": false,
+ *         "price": 4,
+ *       },
+ *       "felix": {
+ *         "sold": true,
+ *         "price": 5,
+ *       },
+ *     },
+ *   },
+ *   {
+ *     open: true,
+ *     employees: 3,
+ *   },
+ * ]
+ * ```
+ * @category Store
+ * @since v5.0.0
+ */
 export type Content = [Tables, Values];
 
 /**
@@ -1317,6 +1345,9 @@ export type InvalidValues = {[valueId: Id]: any[]};
  * If not empty, the second object has an entry for each Value in a Store that
  * has had a change. If the entry is null, the Value was deleted, otherwise it
  * will contain the new Value it was changed to during the transaction.
+ *
+ * A third, required, item in the array is the digit `1`, so that instances of
+ * Content and Changes types can be disambiguated.
  * @example
  * The following is a valid Changes array that conveys the following:
  * ```json
@@ -1332,6 +1363,7 @@ export type InvalidValues = {[valueId: Id]: any[]};
  *     "pendingSales": null, // this Table was deleted
  *   },
  *   {},                   // no changes to keyed value data in the Store
+ *   1,                    // indicates that this is a Changes array
  * ]
  * ```
  * @category Transaction
@@ -1344,6 +1376,7 @@ export type Changes = [
       | undefined;
   },
   changedValues: {[valueId: Id]: ValueOrUndefined},
+  isChanges: 1,
 ];
 
 /**

package/lib/types/tinybase.d.ts

@@ -3,12 +3,12 @@
  * @packageDocumentation
  */
 
-export * from './checkpoints.d';
-export * from './common.d';
-export * from './indexes.d';
-export * from './metrics.d';
-export * from './persisters.d';
-export * from './queries.d';
-export * from './relationships.d';
-export * from './mergeable-store.d';
-export * from './store.d';
+export * from './checkpoints.d.ts';
+export * from './common.d.ts';
+export * from './indexes.d.ts';
+export * from './metrics.d.ts';
+export * from './persisters.d.ts';
+export * from './queries.d.ts';
+export * from './relationships.d.ts';
+export * from './mergeable-store.d.ts';
+export * from './store.d.ts';

package/lib/types/tools.d.ts

@@ -9,8 +9,8 @@
  * @since v2.2.0
  */
 
-import {Store, TablesSchema, ValuesSchema} from './store.d';
-import {Id} from './common.d';
+import {Store, TablesSchema, ValuesSchema} from './store.d.ts';
+import {Id} from './common.d.ts';
 
 /**
  * The StoreStats type describes a set of statistics about the Store, and

package/lib/types/ui-react.d.ts

@@ -22,7 +22,7 @@
  * @module ui-react
  */
 
-import {Callback, Id, IdOrNull, Ids, ParameterizedCallback} from './common.d';
+import {Callback, Id, IdOrNull, Ids, ParameterizedCallback} from './common.d.ts';
 import {
   Cell,
   CellIdsListener,
@@ -56,22 +56,22 @@ import {
   ValueOrUndefined,
   Values,
   ValuesListener,
-} from './store.d';
+} from './store.d.ts';
 import {
   CheckpointIds,
   CheckpointIdsListener,
   CheckpointListener,
   Checkpoints,
-} from './checkpoints.d';
+} from './checkpoints.d.ts';
 import {ComponentType, ReactElement} from 'react';
-import {Indexes, SliceIdsListener, SliceRowIdsListener} from './indexes.d';
+import {Indexes, SliceIdsListener, SliceRowIdsListener} from './indexes.d.ts';
 import {
   LinkedRowIdsListener,
   LocalRowIdsListener,
   Relationships,
   RemoteRowIdListener,
-} from './relationships.d';
-import {MetricListener, Metrics} from './metrics.d';
+} from './relationships.d.ts';
+import {MetricListener, Metrics} from './metrics.d.ts';
 import {
   Queries,
   ResultCellIdsListener,
@@ -82,8 +82,8 @@ import {
   ResultSortedRowIdsListener,
   ResultTableCellIdsListener,
   ResultTableListener,
-} from './queries.d';
-import {Persister} from './persisters.d';
+} from './queries.d.ts';
+import {Persister} from './persisters.d.ts';
 
 /**
  * The StoreOrStoreId type is used when you need to refer to a Store in a React

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

@@ -10,8 +10,8 @@
  * @module checkpoints
  */
 
-import {Id, IdOrNull, Ids} from './common.d';
-import {OptionalSchemas, Store} from './store.d';
+import {Id, IdOrNull, Ids} from './common.d.ts';
+import {OptionalSchemas, Store} from './store.d.ts';
 
 /**
  * The CheckpointIds type is a representation of the list of checkpoint Ids

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

@@ -17,8 +17,8 @@ import {
   OptionalTablesSchema,
   RowCallback,
   Store,
-} from './store.d';
-import {Id, IdOrNull, Ids, SortKey} from './common.d';
+} from './store.d.ts';
+import {Id, IdOrNull, Ids, SortKey} from './common.d.ts';
 
 /**
  * The Index type represents the concept of a map of Slice objects, keyed by Id.

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

@@ -2,6 +2,7 @@
  * The mergeable-store module
  * @packageDocumentation
  * @module mergeable-store
+ * @since v5.0.0
  */
 
 import {
@@ -21,9 +22,8 @@ import {
   TablesSchema,
   ValueOrUndefined,
   ValuesSchema,
-} from './store.d';
-import {Id} from './common';
-import {IdObj} from '../../common/obj';
+} from './store.d.ts';
+import {Id, Ids} from './common';
 
 /**
  * The Hash type
@@ -37,39 +37,127 @@ export type Hash = number;
  */
 export type Time = string;
 
-/**
- * The HashStamp type
- * @category Stamps
- */
-export type HashStamp<Thing> = [time: Time, thing: Thing, hash: Hash];
-
 /**
  * The Stamp type
  * @category Stamps
  */
-export type Stamp<Thing> = [time: Time, thing: Thing];
+export type Stamp<Thing, Hashed extends boolean = false> = Hashed extends true
+  ? [time: Time, thing: Thing, hash: Hash]
+  : [time: Time, thing: Thing];
+
+// ContentHashes
+export type ContentHashes = [time: Time, [tablesHash: Hash, valuesHash: Hash]];
+
+// TablesStamp
+export type TablesStamp<
+  Schema extends OptionalTablesSchema,
+  Hashed extends boolean = false,
+> = Stamp<
+  {
+    [TableId in TableIdFromSchema<Schema>]?: TableStamp<
+      Schema,
+      TableId,
+      Hashed
+    >;
+  },
+  Hashed
+>;
+
+// TableHashes
+export type TableHashes<Schema extends OptionalTablesSchema> = {
+  [TableId in TableIdFromSchema<Schema>]?: Hash;
+};
+
+// TableIdsDiff
+export type TableIdsDiff<Schema extends OptionalTablesSchema> =
+  TableIdFromSchema<Schema>[];
+
+// TableStamp
+export type TableStamp<
+  Schema extends OptionalTablesSchema,
+  TableId extends TableIdFromSchema<Schema>,
+  Hashed extends boolean = false,
+> = Stamp<{[rowId: Id]: RowStamp<Schema, TableId, Hashed>}, Hashed>;
+
+// RowHashes
+export type RowHashes<Schema extends OptionalTablesSchema> = {
+  [TableId in TableIdFromSchema<Schema>]?: {[rowId: Id]: Hash};
+};
+
+// RowIdsDiff
+export type RowIdsDiff<Schema extends OptionalTablesSchema> = {
+  [TableId in TableIdFromSchema<Schema>]?: Ids;
+};
+
+// RowStamp
+export type RowStamp<
+  Schema extends OptionalTablesSchema,
+  TableId extends TableIdFromSchema<Schema>,
+  Hashed extends boolean = false,
+> = Stamp<
+  {
+    [CellId in CellIdFromSchema<Schema, TableId>]?: CellStamp<
+      Schema,
+      TableId,
+      CellId,
+      Hashed
+    >;
+  },
+  Hashed
+>;
+
+// CellHashes
+export type CellHashes<Schema extends OptionalTablesSchema> = {
+  [TableId in TableIdFromSchema<Schema>]?: {
+    [rowId: Id]: {[CellId in CellIdFromSchema<Schema, TableId>]?: Hash};
+  };
+};
+
+// CellStamp
+export type CellStamp<
+  Schema extends OptionalTablesSchema,
+  TableId extends TableIdFromSchema<Schema>,
+  CellId extends CellIdFromSchema<Schema, TableId>,
+  Hashed extends boolean = false,
+> = Stamp<CellOrUndefined<Schema, TableId, CellId>, Hashed>;
+
+// ValuesStamp
+export type ValuesStamp<
+  Schema extends OptionalValuesSchema,
+  Hashed extends boolean = false,
+> = Stamp<
+  {
+    [ValueId in ValueIdFromSchema<Schema>]?: ValueStamp<
+      Schema,
+      ValueId,
+      Hashed
+    >;
+  },
+  Hashed
+>;
+
+// ValuesHashes
+export type ValuesHashes<Schema extends OptionalValuesSchema> = {
+  [ValueId in ValueIdFromSchema<Schema>]?: Hash;
+};
+
+// ValueStamp
+export type ValueStamp<
+  Schema extends OptionalValuesSchema,
+  ValueId extends ValueIdFromSchema<Schema>,
+  Hashed extends boolean = false,
+> = Stamp<ValueOrUndefined<Schema, ValueId>, Hashed>;
 
 /**
  * The MergeableContent type
  * @category Mergeable
  */
-export type MergeableContent<Schemas extends OptionalSchemas> = HashStamp<
+export type MergeableContent<Schemas extends OptionalSchemas> = Stamp<
   [
-    mergeableTables: HashStamp<{
-      [TableId in TableIdFromSchema<Schemas[0]>]?: HashStamp<{
-        [rowId: Id]: HashStamp<{
-          [CellId in CellIdFromSchema<Schemas[0], TableId>]?: HashStamp<
-            CellOrUndefined<Schemas[0], TableId, CellId>
-          >;
-        }>;
-      }>;
-    }>,
-    mergeableValues: HashStamp<{
-      [ValueId in ValueIdFromSchema<Schemas[1]>]?: HashStamp<
-        ValueOrUndefined<Schemas[1], ValueId>
-      >;
-    }>,
-  ]
+    mergeableTables: TablesStamp<Schemas[0], true>,
+    mergeableValues: ValuesStamp<Schemas[1], true>,
+  ],
+  true
 >;
 
 /**
@@ -78,22 +166,9 @@ export type MergeableContent<Schemas extends OptionalSchemas> = HashStamp<
  */
 export type MergeableChanges<Schemas extends OptionalSchemas> = Stamp<
   [
-    mergeableTables: Stamp<{
-      [TableId in TableIdFromSchema<Schemas[0]>]?: Stamp<
-        IdObj<
-          Stamp<{
-            [CellId in CellIdFromSchema<Schemas[0], TableId>]?: Stamp<
-              CellOrUndefined<Schemas[0], TableId, CellId>
-            >;
-          }>
-        >
-      >;
-    }>,
-    mergeableValues: Stamp<{
-      [ValueId in ValueIdFromSchema<Schemas[1]>]?: Stamp<
-        ValueOrUndefined<Schemas[1], ValueId>
-      >;
-    }>,
+    mergeableTables: TablesStamp<Schemas[0]>,
+    mergeableValues: ValuesStamp<Schemas[1]>,
+    isChanges: 1,
   ]
 >;
 
@@ -105,87 +180,110 @@ export interface MergeableStore<Schemas extends OptionalSchemas>
   extends Store<Schemas> {
   //
   /**
-   * The merge method
-   * @category Merging
+   * The getId method
+   * @category Getter
    */
-  merge(mergeableStore: MergeableStore<Schemas>): MergeableStore<Schemas>;
+  getId(): Id;
 
   /**
    * The getMergeableContent method
-   * @category Merging
+   * @category Getter
    */
   getMergeableContent(): MergeableContent<Schemas>;
 
   /**
-   * The setMergeableContent method
-   * @category Merging
+   * The getMergeableContentHashes method
+   * @category Syncing
    */
-  setMergeableContent(
-    mergeableContent: MergeableContent<Schemas>,
-  ): MergeableStore<Schemas>;
+  getMergeableContentHashes(): ContentHashes;
 
   /**
-   * The getTransactionMergeableChanges method
-   * @category Merging
+   * The getMergeableTableHashes method
+   * @category Syncing
    */
-  getTransactionMergeableChanges(): MergeableChanges<Schemas>;
+  getMergeableTableHashes(): TableHashes<Schemas[0]>;
 
   /**
-   * The applyMergeableChanges method
-   * @category Merging
+   * The getMergeableTableIdsDiff method
+   * @category Syncing
    */
-  applyMergeableChanges(
-    mergeableChanges: MergeableChanges<Schemas> | MergeableContent<Schemas>,
-  ): MergeableStore<Schemas>;
+  getMergeableTableIdsDiff(
+    relativeTo: TableHashes<Schemas[0]>,
+  ): TableIdsDiff<Schemas[0]>;
+
+  /**
+   * The getMergeableRowHashes method
+   * @category Syncing
+   */
+  getMergeableRowHashes(
+    tablesDelta: TableIdsDiff<Schemas[0]>,
+  ): RowHashes<Schemas[0]>;
 
   /**
-   * The getContentHash method
-   * @category Hashes
+   * The getMergeableRowIdsDiff method
+   * @category Syncing
    */
-  getContentHash(): Hash;
+  getMergeableRowIdsDiff(
+    relativeTo: RowHashes<Schemas[0]>,
+  ): RowIdsDiff<Schemas[0]>;
 
   /**
-   * The getTablesHash method
-   * @category Hashes
+   * The getMergeableCellHashes method
+   * @category Syncing
    */
-  getTablesHash(): Hash;
+  getMergeableCellHashes(
+    tableDelta: RowIdsDiff<Schemas[0]>,
+  ): CellHashes<Schemas[0]>;
 
   /**
-   * The getTableHash method
-   * @category Hashes
+   * The getMergeableTablesChanges method
+   * @category Syncing
    */
-  getTableHash(tableId: TableIdFromSchema<Schemas[0]>): Hash;
+  getMergeableTablesChanges(
+    relativeTo: CellHashes<Schemas[0]>,
+  ): TablesStamp<Schemas[0]>;
 
   /**
-   * The getRowHash method
-   * @category Hashes
+   * The getMergeableValuesHashes method
+   * @category Syncing
+   */
+  getMergeableValuesHashes(): ValuesHashes<Schemas[1]>;
+
+  /**
+   * The getMergeableValuesChanges method
+   * @category Syncing
+   */
+  getMergeableValuesChanges(
+    relativeTo: ValuesHashes<Schemas[1]>,
+  ): ValuesStamp<Schemas[1]>;
+
+  /**
+   * The setMergeableContent method
+   * @category Setter
    */
-  getRowHash<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-    rowId: Id,
-  ): Hash;
+  setMergeableContent(
+    mergeableContent: MergeableContent<Schemas>,
+  ): MergeableStore<Schemas>;
 
   /**
-   * The getCellHash method
-   * @category Hashes
+   * The getTransactionMergeableChanges method
+   * @category Getter
    */
-  getCellHash<TableId extends TableIdFromSchema<Schemas[0]>>(
-    tableId: TableId,
-    rowId: Id,
-    cellId: CellIdFromSchema<Schemas[0], TableId>,
-  ): Hash;
+  getTransactionMergeableChanges(): MergeableChanges<Schemas>;
 
   /**
-   * The getValuesHash method
-   * @category Hashes
+   * The applyMergeableChanges method
+   * @category Setter
    */
-  getValuesHash(): Hash;
+  applyMergeableChanges(
+    mergeableChanges: MergeableChanges<Schemas> | MergeableContent<Schemas>,
+  ): MergeableStore<Schemas>;
 
   /**
-   * The getValueHash method
-   * @category Hashes
+   * The merge method
+   * @category Setter
    */
-  getValueHash(valueId: ValueIdFromSchema<Schemas[1]>): Hash;
+  merge(mergeableStore: MergeableStore<Schemas>): MergeableStore<Schemas>;
 
   /**
    * The setTablesSchema method lets you specify the TablesSchema of the tabular

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

@@ -11,8 +11,8 @@
  */
 
 import {CellIdFromSchema, TableIdFromSchema} from './internal/store';
-import {GetCell, OptionalSchemas, Store} from './store.d';
-import {Id, IdOrNull, Ids} from './common.d';
+import {GetCell, OptionalSchemas, Store} from './store.d.ts';
+import {Id, IdOrNull, Ids} from './common.d.ts';
 
 /**
  * The Metric type is simply an alias, but represents a number formed by

package/lib/types/with-schemas/persisters/persister-automerge.d.ts

@@ -21,6 +21,9 @@ import {Persister} from '../persisters';
  *
  * It simply provides an extra getDocHandle method for accessing the Automerge
  * document handler the Store is being persisted to.
+ *
+ * You should use the createAutomergePersister function to create an
+ * AutomergePersister object.
  * @category Persister
  * @since v4.3.14
  */
@@ -47,7 +50,7 @@ export interface AutomergePersister<Schemas extends OptionalSchemas>
    * @category Getter
    * @since v4.3.14
    */
-  getDocHandle: () => DocHandle<any>;
+  getDocHandle(): DocHandle<any>;
 }
 
 /**

package/lib/types/with-schemas/persisters/persister-browser.d.ts

@@ -15,6 +15,7 @@
  */
 
 import {OptionalSchemas, Store} from '../store';
+import {MergeableStore} from '../mergeable-store';
 import {Persister} from '../persisters';
 
 /**
@@ -23,6 +24,9 @@ import {Persister} from '../persisters';
  *
  * It simply provides an extra getStorageName method for accessing the unique
  * key of the storage location the Store is being persisted to.
+ *
+ * You should use the createSessionPersister function to create a
+ * SessionPersister object.
  * @category Persister
  * @since v4.3.14
  */
@@ -48,7 +52,7 @@ export interface SessionPersister<Schemas extends OptionalSchemas>
    * @category Getter
    * @since v4.3.14
    */
-  getStorageName: () => string;
+  getStorageName(): string;
 }
 
 /**
@@ -56,6 +60,9 @@ export interface SessionPersister<Schemas extends OptionalSchemas>
  *
  * It simply provides an extra getStorageName method for accessing the unique
  * key of the storage location the Store is being persisted to.
+ *
+ * You should use the createLocalPersister function to create a LocalPersister
+ * object.
  * @category Persister
  * @since v4.3.14
  */
@@ -81,7 +88,7 @@ export interface LocalPersister<Schemas extends OptionalSchemas>
    * @category Getter
    * @since v4.3.14
    */
-  getStorageName: () => string;
+  getStorageName(): string;
 }
 
 /**
@@ -92,7 +99,7 @@ export interface LocalPersister<Schemas extends OptionalSchemas>
  *
  * ```ts override
  * createSessionPersister(
- *   store: Store,
+ *   store: Store | MergeableStore,
  *   storageName: string,
  *   onIgnoredError?: (error: any) => void,
  * ): SessionPersister;
@@ -125,7 +132,7 @@ export interface LocalPersister<Schemas extends OptionalSchemas>
  * @category Creation
  */
 export function createSessionPersister<Schemas extends OptionalSchemas>(
-  store: Store<Schemas>,
+  store: Store<Schemas> | MergeableStore<Schemas>,
   storageName: string,
   onIgnoredError?: (error: any) => void,
 ): SessionPersister<Schemas>;
@@ -138,7 +145,7 @@ export function createSessionPersister<Schemas extends OptionalSchemas>(
  *
  * ```ts override
  * createLocalPersister(
- *   store: Store,
+ *   store: Store | MergeableStore,
  *   storageName: string,
  *   onIgnoredError?: (error: any) => void,
  * ): LocalPersister;
@@ -171,7 +178,7 @@ export function createSessionPersister<Schemas extends OptionalSchemas>(
  * @category Creation
  */
 export function createLocalPersister<Schemas extends OptionalSchemas>(
-  store: Store<Schemas>,
+  store: Store<Schemas> | MergeableStore<Schemas>,
   storageName: string,
   onIgnoredError?: (error: any) => void,
 ): LocalPersister<Schemas>;

package/lib/types/with-schemas/persisters/persister-cr-sqlite-wasm.d.ts

@@ -18,6 +18,9 @@ import {DB} from '@vlcn.io/crsqlite-wasm';
  *
  * It simply provides an extra getDb method for accessing a reference to the
  * database instance the Store is being persisted to.
+ *
+ * You should use the createCrSqliteWasmPersister function to create a
+ * CrSqliteWasmPersister object.
  * @category Persister
  * @since v4.3.14
  */
@@ -45,7 +48,7 @@ export interface CrSqliteWasmPersister<Schemas extends OptionalSchemas>
    * @category Getter
    * @since v4.3.14
    */
-  getDb: () => DB;
+  getDb(): DB;
 }
 
 /**

package/lib/types/with-schemas/persisters/persister-electric-sql.d.ts

@@ -18,6 +18,9 @@ import {ElectricClient} from 'electric-sql/client/model';
  *
  * It simply provides an extra getElectricClient method for accessing a
  * reference to the Electric client the Store is being persisted to.
+ *
+ * You should use the createElectricSqlPersister function to create an
+ * ElectricSqlPersister object.
  * @category Persister
  * @since v4.6.0
  */
@@ -52,7 +55,7 @@ export interface ElectricSqlPersister<Schemas extends OptionalSchemas>
    * @category Getter
    * @since v4.6.0
    */
-  getElectricClient: () => ElectricClient<any>;
+  getElectricClient(): ElectricClient<any>;
 }
 
 /**