tinybase 5.0.0-beta.25 → 5.0.0-beta.26

package/@types/tools/with-schemas/index.d.cts

@@ -116,6 +116,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @returns A StoreStats object containing statistics about the Store.
    * @example
    * This example creates a Tools object and gets basic statistics about it.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -136,6 +137,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * ```
    * @example
    * This example creates a Tools object and gets detailed statistics about it.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -188,6 +190,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and gets the schema of a Store that
    * already has a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -208,6 +211,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and infers the schema of a Store that
    * doesn't already have a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -252,6 +256,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and gets the schema of a Store that
    * already has a ValuesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -268,6 +273,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and infers the schema of a Store that
    * doesn't already have a ValuesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -295,12 +301,12 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    *
    * The method takes a single argument which represents the name you want the
    * generated store object to have in code. You are expected to save the four
-   * files yourself, as, respectively:
+   * files yourself, as the following:
    *
-   * - `[storeName].d.cts`
-   * - `[storeName].ts`
-   * - `[storeName]-ui-react.d.cts`
-   * - `[storeName]-ui-react.tsx`
+   * - `[storeName].d.cts` as the main definition,
+   * - `[storeName].ts` as the main library,
+   * - `[storeName]-ui-react.d.cts` as the ui-react module definition,
+   * - `[storeName]-ui-react.tsx` as the ui-react module library.
    *
    * Also you should save these alongside each other so that the `.ts(x)` files
    * can import types from the `.d.cts` files.
@@ -347,6 +353,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * already has a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -370,6 +377,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * doesn't already have a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -409,12 +417,12 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    *
    * The method takes a single argument which represents the name you want the
    * generated store object to have in code. You are expected to save the four
-   * files yourself, as, respectively:
+   * files yourself, as the following:
    *
-   * - `[storeName].d.cts`
-   * - `[storeName].ts`
-   * - `[storeName]-ui-react.d.cts`
-   * - `[storeName]-ui-react.tsx`
+   * - `[storeName].d.cts` as the main definition,
+   * - `[storeName].ts` as the main library,
+   * - `[storeName]-ui-react.d.cts` as the ui-react module definition,
+   * - `[storeName]-ui-react.tsx` as the ui-react module library.
    *
    * Also you should save these alongside each other so that the `.ts(x)` files
    * can import types from the `.d.cts` files.
@@ -428,6 +436,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * already has a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -451,6 +460,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * doesn't already have a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';

package/@types/tools/with-schemas/index.d.ts

@@ -116,6 +116,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @returns A StoreStats object containing statistics about the Store.
    * @example
    * This example creates a Tools object and gets basic statistics about it.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -136,6 +137,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * ```
    * @example
    * This example creates a Tools object and gets detailed statistics about it.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -188,6 +190,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and gets the schema of a Store that
    * already has a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -208,6 +211,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and infers the schema of a Store that
    * doesn't already have a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -252,6 +256,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and gets the schema of a Store that
    * already has a ValuesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -268,6 +273,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and infers the schema of a Store that
    * doesn't already have a ValuesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -295,12 +301,12 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    *
    * The method takes a single argument which represents the name you want the
    * generated store object to have in code. You are expected to save the four
-   * files yourself, as, respectively:
+   * files yourself, as the following:
    *
-   * - `[storeName].d.ts`
-   * - `[storeName].ts`
-   * - `[storeName]-ui-react.d.ts`
-   * - `[storeName]-ui-react.tsx`
+   * - `[storeName].d.ts` as the main definition,
+   * - `[storeName].ts` as the main library,
+   * - `[storeName]-ui-react.d.ts` as the ui-react module definition,
+   * - `[storeName]-ui-react.tsx` as the ui-react module library.
    *
    * Also you should save these alongside each other so that the `.ts(x)` files
    * can import types from the `.d.ts` files.
@@ -347,6 +353,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * already has a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -370,6 +377,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * doesn't already have a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -409,12 +417,12 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    *
    * The method takes a single argument which represents the name you want the
    * generated store object to have in code. You are expected to save the four
-   * files yourself, as, respectively:
+   * files yourself, as the following:
    *
-   * - `[storeName].d.ts`
-   * - `[storeName].ts`
-   * - `[storeName]-ui-react.d.ts`
-   * - `[storeName]-ui-react.tsx`
+   * - `[storeName].d.ts` as the main definition,
+   * - `[storeName].ts` as the main library,
+   * - `[storeName]-ui-react.d.ts` as the ui-react module definition,
+   * - `[storeName]-ui-react.tsx` as the ui-react module library.
    *
    * Also you should save these alongside each other so that the `.ts(x)` files
    * can import types from the `.d.ts` files.
@@ -428,6 +436,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * already has a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';
@@ -451,6 +460,7 @@ export interface Tools<in out Schemas extends OptionalSchemas> {
    * @example
    * This example creates a Tools object and generates code for a Store that
    * doesn't already have a TablesSchema.
+   *
    * ```js
    * import {createStore} from 'tinybase';
    * import {createTools} from 'tinybase/tools';

package/@types/ui-react/index.d.cts

@@ -324,7 +324,7 @@ export function useCreateStore(
 ): Store;
 
 /**
- * The useCreateMergeableStore hook
+ * The useCreateMergeableStore hook.
  */
 export function useCreateMergeableStore(
   create: () => MergeableStore,

package/@types/ui-react/index.d.ts

@@ -324,7 +324,7 @@ export function useCreateStore(
 ): Store;
 
 /**
- * The useCreateMergeableStore hook
+ * The useCreateMergeableStore hook.
  */
 export function useCreateMergeableStore(
   create: () => MergeableStore,

package/@types/ui-react/with-schemas/index.d.cts

@@ -406,7 +406,7 @@ export type WithSchemas<Schemas extends OptionalSchemas> = {
   ) => Store<Schemas>;
 
   /**
- * The useCreateMergeableStore hook
+ * The useCreateMergeableStore hook.
  */
   useCreateMergeableStore: (
     create: () => MergeableStore<Schemas>,

package/@types/ui-react/with-schemas/index.d.ts

@@ -406,7 +406,7 @@ export type WithSchemas<Schemas extends OptionalSchemas> = {
   ) => Store<Schemas>;
 
   /**
- * The useCreateMergeableStore hook
+ * The useCreateMergeableStore hook.
  */
   useCreateMergeableStore: (
     create: () => MergeableStore<Schemas>,

package/@types/ui-react-dom/index.d.cts

@@ -275,7 +275,7 @@ export type SliceInHtmlTableProps = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  * @category Props
  * @since v4.1.0
  */
@@ -1057,7 +1057,7 @@ export function SliceInHtmlTable(
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  *
  * This component uses the useRowIds and useRemoteRowId hooks under the covers,
  * which means that any changes to the structure of either Table resulting in a

package/@types/ui-react-dom/index.d.ts

@@ -275,7 +275,7 @@ export type SliceInHtmlTableProps = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  * @category Props
  * @since v4.1.0
  */
@@ -1057,7 +1057,7 @@ export function SliceInHtmlTable(
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  *
  * This component uses the useRowIds and useRemoteRowId hooks under the covers,
  * which means that any changes to the structure of either Table resulting in a

package/@types/ui-react-dom/with-schemas/index.d.cts

@@ -320,7 +320,7 @@ export type SliceInHtmlTableProps<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  * @category Props
  * @since v4.1.0
  */
@@ -1150,7 +1150,7 @@ export type WithSchemas<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  *
  * This component uses the useRowIds and useRemoteRowId hooks under the covers,
  * which means that any changes to the structure of either Table resulting in a

package/@types/ui-react-dom/with-schemas/index.d.ts

@@ -320,7 +320,7 @@ export type SliceInHtmlTableProps<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  * @category Props
  * @since v4.1.0
  */
@@ -1150,7 +1150,7 @@ export type WithSchemas<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  *
  * This component uses the useRowIds and useRemoteRowId hooks under the covers,
  * which means that any changes to the structure of either Table resulting in a

package/@types/ui-react-inspector/with-schemas/index.d.cts

@@ -319,7 +319,7 @@ export type SliceInHtmlTableProps<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  * @category Props
  * @since v4.1.0
  */
@@ -1127,7 +1127,7 @@ export type WithSchemas<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  *
  * This component uses the useRowIds and useRemoteRowId hooks under the covers,
  * which means that any changes to the structure of either Table resulting in a

package/@types/ui-react-inspector/with-schemas/index.d.ts

@@ -319,7 +319,7 @@ export type SliceInHtmlTableProps<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  * @category Props
  * @since v4.1.0
  */
@@ -1127,7 +1127,7 @@ export type WithSchemas<Schemas extends OptionalSchemas> = {
  * Note the use of dotted 'tableId.cellId' string pairs when specifying custom
  * rendering for the cells in this table, since Cells from both the
  * relationship's 'local' and 'remote' Table objects can be rendered and need to
- * be distinguished
+ * be distinguished.
  *
  * This component uses the useRowIds and useRemoteRowId hooks under the covers,
  * which means that any changes to the structure of either Table resulting in a

package/cjs/es6/index.cjs

@@ -1261,10 +1261,15 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+const Persists = {
+  StoreOnly: 1,
+  MergeableStoreOnly: 2,
+  StoreOrMergeableStore: 3,
+};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1273,7 +1278,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -1290,7 +1295,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -1308,7 +1313,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = () =>
     __async$1(void 0, null, function* () {
       /* istanbul ignore else */
@@ -1737,7 +1742,7 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    2,
+    Persists.MergeableStoreOnly,
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
   );
   return persister;
@@ -4102,20 +4107,20 @@ const createMergeableStore = (uniqueId) => {
     mapToObj(contentStampMap[0][0], getStampHash);
   const getMergeableTableDiff = (otherTableHashes) => {
     const newTables = stampNewObj(contentStampMap[0][1]);
-    const differentTableHashes = {};
+    const differingTableHashes = {};
     mapForEach(
       contentStampMap[0][0],
       (tableId, [tableStampMap, tableTime, hash]) =>
         objHas(otherTableHashes, tableId)
           ? hash != otherTableHashes[tableId]
-            ? (differentTableHashes[tableId] = hash)
+            ? (differingTableHashes[tableId] = hash)
             : 0
           : (newTables[0][tableId] = stampMapToObjWithoutHash(
               [tableStampMap, tableTime],
               (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
             )),
     );
-    return [newTables, differentTableHashes];
+    return [newTables, differingTableHashes];
   };
   const getMergeableRowHashes = (otherTableHashes) => {
     const rowHashes = {};
@@ -4136,7 +4141,7 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableRowDiff = (otherTableRowHashes) => {
     const newRows = stampNewObj(contentStampMap[0][1]);
-    const differentRowHashes = {};
+    const differingRowHashes = {};
     objForEach(otherTableRowHashes, (otherRowHashes, tableId) => {
       var _a;
       return mapForEach(
@@ -4144,13 +4149,13 @@ const createMergeableStore = (uniqueId) => {
         (rowId, [rowStampMap, rowTime, hash]) =>
           objHas(otherRowHashes, rowId)
             ? hash !== otherRowHashes[rowId]
-              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              ? (objEnsure(differingRowHashes, tableId, objNew)[rowId] = hash)
               : 0
             : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
                 stampMapToObjWithoutHash([rowStampMap, rowTime])),
       );
     });
-    return [newRows, differentRowHashes];
+    return [newRows, differingRowHashes];
   };
   const getMergeableCellHashes = (otherTableRowHashes) => {
     const cellHashes = {};
@@ -4207,13 +4212,13 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
-  const getMergeableValueDiff = (relativeTo) => {
+  const getMergeableValueDiff = (otherValueHashes) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
       stampCloneWithoutHash,
       ([, , hash], valueId) =>
-        hash == (relativeTo == null ? void 0 : relativeTo[valueId]),
+        hash == (otherValueHashes == null ? void 0 : otherValueHashes[valueId]),
     );
     return newStamp(values, valuesTime);
   };
@@ -4340,6 +4345,7 @@ const createMergeableStore = (uniqueId) => {
   return objFreeze(mergeableStore);
 };
 
+exports.Persists = Persists;
 exports.createCheckpoints = createCheckpoints;
 exports.createCustomPersister = createCustomPersister;
 exports.createCustomSynchronizer = createCustomSynchronizer;

package/cjs/es6/mergeable-store/index.cjs

@@ -2115,20 +2115,20 @@ const createMergeableStore = (uniqueId) => {
     mapToObj(contentStampMap[0][0], getStampHash);
   const getMergeableTableDiff = (otherTableHashes) => {
     const newTables = stampNewObj(contentStampMap[0][1]);
-    const differentTableHashes = {};
+    const differingTableHashes = {};
     mapForEach(
       contentStampMap[0][0],
       (tableId, [tableStampMap, tableTime, hash]) =>
         objHas(otherTableHashes, tableId)
           ? hash != otherTableHashes[tableId]
-            ? (differentTableHashes[tableId] = hash)
+            ? (differingTableHashes[tableId] = hash)
             : 0
           : (newTables[0][tableId] = stampMapToObjWithoutHash(
               [tableStampMap, tableTime],
               (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
             )),
     );
-    return [newTables, differentTableHashes];
+    return [newTables, differingTableHashes];
   };
   const getMergeableRowHashes = (otherTableHashes) => {
     const rowHashes = {};
@@ -2149,7 +2149,7 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableRowDiff = (otherTableRowHashes) => {
     const newRows = stampNewObj(contentStampMap[0][1]);
-    const differentRowHashes = {};
+    const differingRowHashes = {};
     objForEach(otherTableRowHashes, (otherRowHashes, tableId) => {
       var _a;
       return mapForEach(
@@ -2157,13 +2157,13 @@ const createMergeableStore = (uniqueId) => {
         (rowId, [rowStampMap, rowTime, hash]) =>
           objHas(otherRowHashes, rowId)
             ? hash !== otherRowHashes[rowId]
-              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              ? (objEnsure(differingRowHashes, tableId, objNew)[rowId] = hash)
               : 0
             : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
                 stampMapToObjWithoutHash([rowStampMap, rowTime])),
       );
     });
-    return [newRows, differentRowHashes];
+    return [newRows, differingRowHashes];
   };
   const getMergeableCellHashes = (otherTableRowHashes) => {
     const cellHashes = {};
@@ -2220,13 +2220,13 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
-  const getMergeableValueDiff = (relativeTo) => {
+  const getMergeableValueDiff = (otherValueHashes) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
       stampCloneWithoutHash,
       ([, , hash], valueId) =>
-        hash == (relativeTo == null ? void 0 : relativeTo[valueId]),
+        hash == (otherValueHashes == null ? void 0 : otherValueHashes[valueId]),
     );
     return newStamp(values, valuesTime);
   };

package/cjs/es6/mergeable-store/with-schemas/index.cjs

@@ -2115,20 +2115,20 @@ const createMergeableStore = (uniqueId) => {
     mapToObj(contentStampMap[0][0], getStampHash);
   const getMergeableTableDiff = (otherTableHashes) => {
     const newTables = stampNewObj(contentStampMap[0][1]);
-    const differentTableHashes = {};
+    const differingTableHashes = {};
     mapForEach(
       contentStampMap[0][0],
       (tableId, [tableStampMap, tableTime, hash]) =>
         objHas(otherTableHashes, tableId)
           ? hash != otherTableHashes[tableId]
-            ? (differentTableHashes[tableId] = hash)
+            ? (differingTableHashes[tableId] = hash)
             : 0
           : (newTables[0][tableId] = stampMapToObjWithoutHash(
               [tableStampMap, tableTime],
               (rowStampMap) => stampMapToObjWithoutHash(rowStampMap),
             )),
     );
-    return [newTables, differentTableHashes];
+    return [newTables, differingTableHashes];
   };
   const getMergeableRowHashes = (otherTableHashes) => {
     const rowHashes = {};
@@ -2149,7 +2149,7 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableRowDiff = (otherTableRowHashes) => {
     const newRows = stampNewObj(contentStampMap[0][1]);
-    const differentRowHashes = {};
+    const differingRowHashes = {};
     objForEach(otherTableRowHashes, (otherRowHashes, tableId) => {
       var _a;
       return mapForEach(
@@ -2157,13 +2157,13 @@ const createMergeableStore = (uniqueId) => {
         (rowId, [rowStampMap, rowTime, hash]) =>
           objHas(otherRowHashes, rowId)
             ? hash !== otherRowHashes[rowId]
-              ? (objEnsure(differentRowHashes, tableId, objNew)[rowId] = hash)
+              ? (objEnsure(differingRowHashes, tableId, objNew)[rowId] = hash)
               : 0
             : (objEnsure(newRows[0], tableId, stampNewObj)[0][rowId] =
                 stampMapToObjWithoutHash([rowStampMap, rowTime])),
       );
     });
-    return [newRows, differentRowHashes];
+    return [newRows, differingRowHashes];
   };
   const getMergeableCellHashes = (otherTableRowHashes) => {
     const cellHashes = {};
@@ -2220,13 +2220,13 @@ const createMergeableStore = (uniqueId) => {
   };
   const getMergeableValueHashes = () =>
     mapToObj(contentStampMap[1][0], getStampHash);
-  const getMergeableValueDiff = (relativeTo) => {
+  const getMergeableValueDiff = (otherValueHashes) => {
     const [, [valueStampMaps, valuesTime]] = contentStampMap;
     const values = mapToObj(
       valueStampMaps,
       stampCloneWithoutHash,
       ([, , hash], valueId) =>
-        hash == (relativeTo == null ? void 0 : relativeTo[valueId]),
+        hash == (otherValueHashes == null ? void 0 : otherValueHashes[valueId]),
     );
     return newStamp(values, valuesTime);
   };