[hash] Move common functions together

Author: jamesgpearce

src/common/hash.ts

@@ -1,4 +1,13 @@
-import {arrayForEach} from './array.ts';
+import type {
+  CellOrUndefined,
+  Hash,
+  Hlc,
+  Id,
+  ValueOrUndefined,
+} from '../@types/index.d.ts';
+import {arrayForEach, arrayReduce} from './array.ts';
+import {jsonStringWithUndefined} from './json.ts';
+import {objEntries} from './obj.ts';
 import {GLOBAL} from './other.ts';
 
 const textEncoder = /* @__PURE__ */ new GLOBAL.TextEncoder();
@@ -13,3 +22,27 @@ export const getHash = (value: string): number => {
   });
   return hash >>> 0;
 };
+
+export const addOrRemoveHash = (hash1: Hash, hash2: Hash): Hash =>
+  hash1 ^ hash2;
+
+export const getHashOfChild = (id: Id, hash: Hash): Hash =>
+  getHash(id + ':' + hash);
+
+export const getValuesHash = (children: {[id: Id]: Hash}, hlc: Hlc): Hash =>
+  arrayReduce(
+    objEntries(children),
+    (hash, [childId, childHash]) =>
+      addOrRemoveHash(hash, getHashOfChild(childId, childHash)),
+    getHash(hlc),
+  );
+
+export const getValueHash = (
+  cellOrValue: CellOrUndefined | ValueOrUndefined,
+  hlc: Hlc,
+): Hash => getHash(jsonStringWithUndefined(cellOrValue) + ':' + hlc);
+
+export const getCellHash = getValueHash;
+export const getRowHash = getValuesHash;
+export const getTableHash = getValuesHash;
+export const getTablesHash = getTableHash;

src/common/obj.ts

@@ -7,9 +7,10 @@ export type IdObj2<Value> = IdObj<IdObj<Value>>;
 
 export const object = Object;
 const getPrototypeOf = (obj: any) => object.getPrototypeOf(obj);
-const objEntries = object.entries;
 const objFrozen = object.isFrozen;
 
+export const objEntries = object.entries;
+
 export const isObject = (obj: unknown): obj is IdObj<unknown> =>
   !isUndefined(obj) &&
   (ifNotUndefined(

src/common/stamps.ts

@@ -41,8 +41,6 @@ export const stampNewWithHash = <Value>(
 
 export const getStampHash = (stamp: Stamp<unknown, true>): Hash => stamp[2];
 
-export const hashIdAndHash = (id: Id, hash: Hash) => getHash(id + ':' + hash);
-
 export const replaceHlcHash = (oldHlc: Hlc, newHlc: Hlc) =>
   newHlc > oldHlc ? (oldHlc ? getHash(oldHlc) : 0) ^ getHash(newHlc) : 0;
 

src/mergeable-store/index.ts

@@ -24,9 +24,8 @@ import type {
 } from '../@types/store/index.d.ts';
 import {isCellOrValueOrNullOrUndefined} from '../common/cell.ts';
 import {collClear, collForEach} from '../common/coll.ts';
-import {getHash} from '../common/hash.ts';
+import {addOrRemoveHash, getCellHash, getHashOfChild} from '../common/hash.ts';
 import {getHlcFunctions} from '../common/hlc.ts';
-import {jsonStringWithUndefined} from '../common/json.ts';
 import {
   mapEnsure,
   mapForEach,
@@ -54,7 +53,6 @@ import {
   ValuesStampMap,
   getLatestHlc,
   getStampHash,
-  hashIdAndHash,
   replaceHlcHash,
   stampClone,
   stampMapToObjWithHash,
@@ -217,8 +215,10 @@ export const createMergeableStore = ((
 
           tableHash ^= isContent
             ? 0
-            : (oldRowHash ? hashIdAndHash(rowId, oldRowHash) : 0) ^
-              hashIdAndHash(rowId, rowHash);
+            : addOrRemoveHash(
+                oldRowHash ? getHashOfChild(rowId, oldRowHash) : 0,
+                getHashOfChild(rowId, rowHash),
+              );
           tableHlc = getLatestHlc(tableHlc, rowHlc);
         });
 
@@ -229,8 +229,10 @@ export const createMergeableStore = ((
 
         tablesHash ^= isContent
           ? 0
-          : (oldTableHash ? hashIdAndHash(tableId, oldTableHash) : 0) ^
-            hashIdAndHash(tableId, tableStampMap[2]);
+          : addOrRemoveHash(
+              oldTableHash ? getHashOfChild(tableId, oldTableHash) : 0,
+              getHashOfChild(tableId, tableStampMap[2]),
+            );
         tablesHlc = getLatestHlc(tablesHlc, tableHlc);
       },
     );
@@ -283,16 +285,16 @@ export const createMergeableStore = ((
           stampUpdate(
             thingStampMap,
             thingHlc,
-            isContent
-              ? incomingThingHash
-              : getHash(jsonStringWithUndefined(thing) + ':' + thingHlc),
+            isContent ? incomingThingHash : getCellHash(thing, thingHlc),
           );
           thingStampMap[0] = thing;
           thingsChanges[thingId] = thing;
           thingsHash ^= isContent
             ? 0
-            : hashIdAndHash(thingId, oldThingHash) ^
-              hashIdAndHash(thingId, thingStampMap[2]);
+            : addOrRemoveHash(
+                getHashOfChild(thingId, oldThingHash),
+                getHashOfChild(thingId, thingStampMap[2]),
+              );
           thingsHlc = getLatestHlc(thingsHlc, thingHlc);
         }
       },