tinybase 1.3.3 → 1.3.6

package/lib/checkpoints.js

@@ -1 +1 @@
-const e=(e,t)=>e.includes(t),t=(e,t)=>e.forEach(t),n=e=>e.length,s=e=>0==n(e),r=e=>e.slice(1),o=(e,t)=>e.push(t),c=e=>e.pop(),l=e=>null==e,i=(e,t,n)=>l(e)?n?.():t(e),a=(e,t)=>e?.has(t)??!1,d=e=>l(e)||0==(e=>e.size)(e),h=(e,t)=>e?.forEach(t),u=(e,t)=>e?.delete(t),p=e=>new Map(e),C=(e,t)=>e?.get(t),g=(e,t,n)=>l(n)?(u(e,t),e):e?.set(t,n),k=(e,t,n)=>(a(e,t)||e.set(t,n()),C(e,t)),f=e=>new Set(e),L=(e,t,o)=>n(o)<2?((e,t)=>e?.add(t))(s(o)?e:k(e,o[0],f),t):L(k(e,o[0],p),t,r(o)),w=e=>{const n=(o,c,...l)=>i(o,(o=>s(l)?e(o,c):t([l[0],null],(e=>n(C(o,e),c,...r(l))))));return n},v=Object.freeze,S=(e=>{const t=new WeakMap;return n=>(t.has(n)||t.set(n,e(n)),t.get(n))})((r=>{let S,z,E,I=100,M=p(),b=1;const j=f(),x=p(),[y,B,F]=(e=>{let s,r=0;const a=[],d=p();return[(t,n,o=[])=>{s??=e();const l=c(a)??""+r++;return g(d,l,[t,n,o]),L(n,l,o),l},(e,t=[],...n)=>w(h)(e,(e=>i(C(d,e),(([e])=>e(s,...t,...n)))),...t),e=>i(C(d,e),(([,t,s])=>(w(u)(t,e,...s),g(d,e),n(a)<1e3&&o(a,e),s)),(()=>[])),(e,r,o)=>i(C(d,e),(([e,,c])=>{const i=(...a)=>{const d=n(a);d==n(c)?e(s,...a,...o(a)):l(c[d])?t(r[d](...a),(e=>i(...a,e))):i(...a,c[d])};i()}))]})((()=>V)),O=p(),T=p(),W=[],m=[],q=(e,t)=>{b=0,r.transaction((()=>h(C(O,t),((t,n)=>h(t,((t,s)=>h(t,((t,o)=>l(t[e])?r.delCell(n,s,o,!0):r.setCell(n,s,o,t[e]))))))))),b=1},A=e=>{g(O,e),g(T,e),B(x,[e])},D=(e,s)=>t(((e,t)=>e.splice(0,t))(e,s??n(e)),A),G=()=>D(W,n(W)-I),H=r.addCellListener(null,null,null,((e,t,n,s,r,l)=>{if(b){i(S,(()=>{o(W,S),G(),D(m),S=void 0,E=1}));const e=k(M,t,p),a=k(e,n,p),h=k(a,s,(()=>[l,void 0]));h[1]=r,h[0]===r&&d(g(a,s))&&d(g(e,n))&&d(g(M,t))&&(S=c(W),E=1),P()}})),J=(e="")=>(l(S)&&(S=""+z++,g(O,S,M),R(S,e),M=p(),E=1),S),K=()=>{s(W)||(m.unshift(J()),q(0,S),S=c(W),E=1)},N=()=>{s(m)||(o(W,S),S=m.shift(),q(1,S),E=1)},P=()=>{E&&(B(j),E=0)},Q=e=>{const t=J(e);return P(),t},R=(e,t)=>(U(e)&&C(T,e)!==t&&(g(T,e,t),B(x,[e])),V),U=e=>a(O,e),V={setSize:e=>(I=e,G(),V),addCheckpoint:Q,setCheckpoint:R,getStore:()=>r,getCheckpointIds:()=>[[...W],S,[...m]],forEachCheckpoint:e=>{return t=e,h(T,((e,n)=>t(n,e)));var t},hasCheckpoint:U,getCheckpoint:e=>C(T,e),goBackward:()=>(K(),P(),V),goForward:()=>(N(),P(),V),goTo:t=>{const n=e(W,t)?K:e(m,t)?N:null;for(;!l(n)&&t!=S;)n();return P(),V},addCheckpointIdsListener:e=>y(e,j),addCheckpointListener:(e,t)=>y(t,x,[e]),delListener:e=>(F(e),V),clear:()=>(D(W),D(m),l(S)||A(S),S=void 0,z=0,Q(),V),destroy:()=>{r.delListener(H)},getListenerStats:()=>({})};return v(V.clear())}));export{S as createCheckpoints};
+const e=(e,t)=>e.includes(t),t=(e,t)=>e.forEach(t),n=e=>e.length,r=e=>0==n(e),s=e=>e.slice(1),o=(e,t)=>e.push(t),c=e=>e.pop(),l=e=>null==e,i=(e,t,n)=>l(e)?n?.():t(e),a=(e,t)=>e?.has(t)??!1,d=e=>l(e)||0==(e=>e.size)(e),h=(e,t)=>e?.forEach(t),u=(e,t)=>e?.delete(t),p=e=>new Map(e),C=(e,t)=>e?.get(t),g=(e,t,n)=>l(n)?(u(e,t),e):e?.set(t,n),k=(e,t,n)=>(a(e,t)||g(e,t,n()),C(e,t)),f=e=>new Set(e),L=(e,t,o)=>n(o)<2?((e,t)=>e?.add(t))(r(o)?e:k(e,o[0],f),t):L(k(e,o[0],p),t,s(o)),w=e=>{const n=(o,c,...l)=>i(o,(o=>r(l)?e(o,c):t([l[0],null],(e=>n(C(o,e),c,...s(l))))));return n},v=Object.freeze,S=(e=>{const t=new WeakMap;return n=>(t.has(n)||t.set(n,e(n)),t.get(n))})((s=>{let S,z,E,I=100,M=p(),b=1;const j=f(),x=p(),[y,B,F]=(e=>{let r,s=0;const a=[],d=p();return[(t,n,o=[])=>{r??=e();const l=c(a)??""+s++;return g(d,l,[t,n,o]),L(n,l,o),l},(e,t=[],...n)=>w(h)(e,(e=>i(C(d,e),(([e])=>e(r,...t,...n)))),...t),e=>i(C(d,e),(([,t,r])=>(w(u)(t,e,...r),g(d,e),n(a)<1e3&&o(a,e),r)),(()=>[])),(e,s,o)=>i(C(d,e),(([e,,c])=>{const i=(...a)=>{const d=n(a);d==n(c)?e(r,...a,...o(a)):l(c[d])?t(s[d](...a),(e=>i(...a,e))):i(...a,c[d])};i()}))]})((()=>V)),O=p(),T=p(),W=[],m=[],q=(e,t)=>{b=0,s.transaction((()=>h(C(O,t),((t,n)=>h(t,((t,r)=>h(t,((t,o)=>l(t[e])?s.delCell(n,r,o,!0):s.setCell(n,r,o,t[e]))))))))),b=1},A=e=>{g(O,e),g(T,e),B(x,[e])},D=(e,r)=>t(((e,t)=>e.splice(0,t))(e,r??n(e)),A),G=()=>D(W,n(W)-I),H=s.addCellListener(null,null,null,((e,t,n,r,s,l)=>{if(b){i(S,(()=>{o(W,S),G(),D(m),S=void 0,E=1}));const e=k(M,t,p),a=k(e,n,p),h=k(a,r,(()=>[l,void 0]));h[1]=s,h[0]===s&&d(g(a,r))&&d(g(e,n))&&d(g(M,t))&&(S=c(W),E=1),P()}})),J=(e="")=>(l(S)&&(S=""+z++,g(O,S,M),R(S,e),M=p(),E=1),S),K=()=>{r(W)||(m.unshift(J()),q(0,S),S=c(W),E=1)},N=()=>{r(m)||(o(W,S),S=m.shift(),q(1,S),E=1)},P=()=>{E&&(B(j),E=0)},Q=e=>{const t=J(e);return P(),t},R=(e,t)=>(U(e)&&C(T,e)!==t&&(g(T,e,t),B(x,[e])),V),U=e=>a(O,e),V={setSize:e=>(I=e,G(),V),addCheckpoint:Q,setCheckpoint:R,getStore:()=>s,getCheckpointIds:()=>[[...W],S,[...m]],forEachCheckpoint:e=>{return t=e,h(T,((e,n)=>t(n,e)));var t},hasCheckpoint:U,getCheckpoint:e=>C(T,e),goBackward:()=>(K(),P(),V),goForward:()=>(N(),P(),V),goTo:t=>{const n=e(W,t)?K:e(m,t)?N:null;for(;!l(n)&&t!=S;)n();return P(),V},addCheckpointIdsListener:e=>y(e,j),addCheckpointListener:(e,t)=>y(t,x,[e]),delListener:e=>(F(e),V),clear:()=>(D(W),D(m),l(S)||A(S),S=void 0,z=0,Q(),V),destroy:()=>{s.delListener(H)},getListenerStats:()=>({})};return v(V.clear())}));export{S as createCheckpoints};

package/lib/common.js

@@ -1 +1 @@
-const o=(o,t)=>o<t?-1:1;export{o as defaultSorter};
+const o=(o,t)=>o<t?-1:1,t=o=>""+o;export{o as defaultSorter,t as id};

package/lib/debug/checkpoints.js

@@ -30,7 +30,7 @@ const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue) => {
   if (!collHas(map, key)) {
-    map.set(key, getDefaultValue());
+    mapSet(map, key, getDefaultValue());
   }
   return mapGet(map, key);
 };

package/lib/debug/common.js

@@ -1,3 +1,6 @@
+const EMPTY_STRING = '';
+
 const defaultSorter = (sortKey1, sortKey2) => (sortKey1 < sortKey2 ? -1 : 1);
+const id = (key) => EMPTY_STRING + key;
 
-export {defaultSorter};
+export {defaultSorter, id};

package/lib/debug/indexes.js

@@ -41,7 +41,7 @@ const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue) => {
   if (!collHas(map, key)) {
-    map.set(key, getDefaultValue());
+    mapSet(map, key, getDefaultValue());
   }
   return mapGet(map, key);
 };

package/lib/debug/metrics.js

@@ -46,7 +46,7 @@ const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue) => {
   if (!collHas(map, key)) {
-    map.set(key, getDefaultValue());
+    mapSet(map, key, getDefaultValue());
   }
   return mapGet(map, key);
 };

package/lib/debug/relationships.js

@@ -36,7 +36,7 @@ const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue) => {
   if (!collHas(map, key)) {
-    map.set(key, getDefaultValue());
+    mapSet(map, key, getDefaultValue());
   }
   return mapGet(map, key);
 };
@@ -256,7 +256,7 @@ const createRelationships = getCreateFunction((store) => {
     hasRelationship,
     getLocalTableId,
     getRelationship,
-    _setRelationship,
+    ,
     setDefinition,
     delDefinition,
     destroy,

package/lib/debug/store.d.ts

@@ -390,6 +390,7 @@ export type CellListener = (
  * @param cellId The Id of the Cell that was being changed.
  * @param invalidCells An array of the values of the Cell that were invalid.
  * @category Listener
+ * @since v1.1.0
  */
 export type InvalidCellListener = (
   store: Store,
@@ -521,6 +522,7 @@ export type CellSchema =
  * different value and then changed back.
  *
  * @category Transaction
+ * @since v1.2.0
  */
 export type ChangedCells = {
   [tableId: Id]: {
@@ -543,6 +545,7 @@ export type ChangedCells = {
  * change a Cell during the transaction are described.
  *
  * @category Transaction
+ * @since v1.2.0
  */
 export type InvalidCells = {
   [tableId: Id]: {
@@ -1710,7 +1713,7 @@ export interface Store {
    *
    * @param actions The function to be executed as a transaction.
    * @param doRollback An optional callback that should return `true` if you
-   * want to rollback the transaction at the end.
+   * want to rollback the transaction at the end. Since v1.2.0.
    * @returns Whatever value the provided transaction function returns.
    * @example
    * This example makes changes to two Cells, first outside, and secondly
@@ -1846,6 +1849,7 @@ export interface Store {
    * // -> 'Fido changed'
    * ```
    * @category Transaction
+   * @since v1.3.0
    */
   startTransaction(): Store;
 
@@ -1923,6 +1927,7 @@ export interface Store {
    * // -> {pets: {fido: {species: 'dog', color: 'brown'}}}
    * ```
    * @category Transaction
+   * @since v1.3.0
    */
   finishTransaction(
     doRollback?: (
@@ -2897,6 +2902,7 @@ export interface Store {
    * store.delListener(listenerId);
    * ```
    * @category Listener
+   * @since v1.1.0
    */
   addInvalidCellListener(
     tableId: IdOrNull,
@@ -2971,6 +2977,7 @@ export interface Store {
    * store.delListener(listenerId).delListener(listenerId2);
    * ```
    * @category Listener
+   * @since v1.3.0
    */
   addWillFinishTransactionListener(listener: TransactionListener): Id;
 
@@ -3040,6 +3047,7 @@ export interface Store {
    * store.delListener(listenerId).delListener(listenerId2);
    * ```
    * @category Listener
+   * @since v1.3.0
    */
   addDidFinishTransactionListener(listener: TransactionListener): Id;
 

package/lib/debug/store.js

@@ -11,6 +11,7 @@ const DEFAULT = 'default';
 const arrayPair = (value) => [value, value];
 const arrayHas = (array, value) => array.includes(value);
 const arrayForEach = (array, cb) => array.forEach(cb);
+const arrayMap = (array, cb) => array.map(cb);
 const arrayLength = (array) => array.length;
 const arrayIsEmpty = (array) => arrayLength(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
@@ -65,7 +66,7 @@ const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
 const mapEnsure = (map, key, getDefaultValue) => {
   if (!collHas(map, key)) {
-    map.set(key, getDefaultValue());
+    mapSet(map, key, getDefaultValue());
   }
   return mapGet(map, key);
 };
@@ -176,15 +177,17 @@ const getListenerFunctions = (getThing) => {
   return [addListener, callListeners, delListener, callListener];
 };
 
+const id = (key) => EMPTY_STRING + key;
+
 const transformMap = (map, toBeLikeObject, setId, delId = mapSet) => {
   const idsToDelete = arrayFilter(
     mapKeys(map),
-    (id) => !objHas(toBeLikeObject, id),
+    (id2) => !objHas(toBeLikeObject, id2),
   );
-  arrayForEach(objIds(toBeLikeObject), (id) =>
-    setId(map, id, toBeLikeObject[id]),
+  arrayForEach(objIds(toBeLikeObject), (id2) =>
+    setId(map, id2, toBeLikeObject[id2]),
   );
-  arrayForEach(idsToDelete, (id) => delId(map, id));
+  arrayForEach(idsToDelete, (id2) => delId(map, id2));
   return map;
 };
 const getCellType = (cell) => {
@@ -198,15 +201,15 @@ const validate = (obj, validateChild, onInvalidObj) => {
     onInvalidObj?.();
     return false;
   }
-  objForEach(obj, (child, id) => {
-    if (!validateChild(child, id)) {
-      objDel(obj, id);
+  objForEach(obj, (child, id2) => {
+    if (!validateChild(child, id2)) {
+      objDel(obj, id2);
     }
   });
   return !objIsEmpty(obj);
 };
-const idsChanged = (ids, id, added) =>
-  mapSet(ids, id, mapGet(ids, id) == -added ? void 0 : added);
+const idsChanged = (ids, id2, added) =>
+  mapSet(ids, id2, mapGet(ids, id2) == -added ? void 0 : added);
 const createStore = () => {
   let hasSchema;
   let cellsTouched;
@@ -235,7 +238,7 @@ const createStore = () => {
     validate(schema, (tableSchema) =>
       validate(tableSchema, (cellSchema) => {
         if (
-          !validate(cellSchema, (_child, id) => arrayHas([TYPE, DEFAULT], id))
+          !validate(cellSchema, (_child, id2) => arrayHas([TYPE, DEFAULT], id2))
         ) {
           return false;
         }
@@ -381,7 +384,7 @@ const createStore = () => {
         ),
     );
   const getNewRowId = (tableMap) => {
-    const rowId = '' + nextRowId++;
+    const rowId = EMPTY_STRING + nextRowId++;
     if (!collHas(tableMap, rowId)) {
       return rowId;
     }
@@ -532,26 +535,28 @@ const createStore = () => {
       }
     }
   };
-  const fluentTransaction = (actions) => {
-    transaction(actions);
+  const fluentTransaction = (actions, ...args) => {
+    transaction(() => actions(...arrayMap(args, id)));
     return store;
   };
   const getTables = () =>
     mapToObj(tablesMap, (table) => mapToObj(table, mapToObj));
   const getTableIds = () => mapKeys(tablesMap);
-  const getTable = (tableId) => mapToObj(mapGet(tablesMap, tableId), mapToObj);
-  const getRowIds = (tableId) => mapKeys(mapGet(tablesMap, tableId));
+  const getTable = (tableId) =>
+    mapToObj(mapGet(tablesMap, id(tableId)), mapToObj);
+  const getRowIds = (tableId) => mapKeys(mapGet(tablesMap, id(tableId)));
   const getRow = (tableId, rowId) =>
-    mapToObj(mapGet(mapGet(tablesMap, tableId), rowId));
+    mapToObj(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)));
   const getCellIds = (tableId, rowId) =>
-    mapKeys(mapGet(mapGet(tablesMap, tableId), rowId));
+    mapKeys(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)));
   const getCell = (tableId, rowId, cellId) =>
-    mapGet(mapGet(mapGet(tablesMap, tableId), rowId), cellId);
+    mapGet(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), id(cellId));
   const hasTables = () => !collIsEmpty(tablesMap);
-  const hasTable = (tableId) => collHas(tablesMap, tableId);
-  const hasRow = (tableId, rowId) => collHas(mapGet(tablesMap, tableId), rowId);
+  const hasTable = (tableId) => collHas(tablesMap, id(tableId));
+  const hasRow = (tableId, rowId) =>
+    collHas(mapGet(tablesMap, id(tableId)), id(rowId));
   const hasCell = (tableId, rowId, cellId) =>
-    collHas(mapGet(mapGet(tablesMap, tableId), rowId), cellId);
+    collHas(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), id(cellId));
   const getJson = () => jsonString(tablesMap);
   const getSchemaJson = () => jsonString(schemaMap);
   const setTables = (tables) =>
@@ -559,19 +564,30 @@ const createStore = () => {
       validateTables(tables) ? setValidTables(tables) : 0,
     );
   const setTable = (tableId, table) =>
-    fluentTransaction(() =>
-      validateTable(table, tableId) ? setValidTable(tableId, table) : 0,
+    fluentTransaction(
+      (tableId2) =>
+        validateTable(table, tableId2) ? setValidTable(tableId2, table) : 0,
+      tableId,
     );
   const setRow = (tableId, rowId, row) =>
-    fluentTransaction(() =>
-      validateRow(tableId, rowId, row)
-        ? setValidRow(tableId, getOrCreateTable(tableId), rowId, row)
-        : 0,
+    fluentTransaction(
+      (tableId2, rowId2) =>
+        validateRow(id(tableId2), id(rowId2), row)
+          ? setValidRow(
+              id(tableId2),
+              getOrCreateTable(id(tableId2)),
+              id(rowId2),
+              row,
+            )
+          : 0,
+      tableId,
+      rowId,
     );
   const addRow = (tableId, row) =>
     transaction(() => {
       let rowId = void 0;
       if (validateRow(tableId, rowId, row)) {
+        tableId = id(tableId);
         setValidRow(
           tableId,
           getOrCreateTable(tableId),
@@ -582,32 +598,40 @@ const createStore = () => {
       return rowId;
     });
   const setPartialRow = (tableId, rowId, partialRow) =>
-    fluentTransaction(() => {
-      if (validateRow(tableId, rowId, partialRow, 1)) {
-        const table = getOrCreateTable(tableId);
-        objForEach(partialRow, (cell, cellId) =>
-          setCellIntoDefaultRow(tableId, table, rowId, cellId, cell),
-        );
-      }
-    });
+    fluentTransaction(
+      (tableId2, rowId2) => {
+        if (validateRow(tableId2, rowId2, partialRow, 1)) {
+          const table = getOrCreateTable(tableId2);
+          objForEach(partialRow, (cell, cellId) =>
+            setCellIntoDefaultRow(tableId2, table, rowId2, cellId, cell),
+          );
+        }
+      },
+      tableId,
+      rowId,
+    );
   const setCell = (tableId, rowId, cellId, cell) =>
-    fluentTransaction(() =>
-      ifNotUndefined(
-        getValidatedCell(
-          tableId,
-          rowId,
-          cellId,
-          isFunction(cell) ? cell(getCell(tableId, rowId, cellId)) : cell,
-        ),
-        (validCell) =>
-          setCellIntoDefaultRow(
-            tableId,
-            getOrCreateTable(tableId),
-            rowId,
-            cellId,
-            validCell,
+    fluentTransaction(
+      (tableId2, rowId2, cellId2) =>
+        ifNotUndefined(
+          getValidatedCell(
+            tableId2,
+            rowId2,
+            cellId2,
+            isFunction(cell) ? cell(getCell(tableId2, rowId2, cellId2)) : cell,
           ),
-      ),
+          (validCell) =>
+            setCellIntoDefaultRow(
+              tableId2,
+              getOrCreateTable(tableId2),
+              rowId2,
+              cellId2,
+              validCell,
+            ),
+        ),
+      tableId,
+      rowId,
+      cellId,
     );
   const setJson = (json) => {
     try {
@@ -628,24 +652,42 @@ const createStore = () => {
     });
   const delTables = () => fluentTransaction(() => setValidTables({}));
   const delTable = (tableId) =>
-    fluentTransaction(() =>
-      collHas(tablesMap, tableId) ? delValidTable(tableId) : 0,
+    fluentTransaction(
+      (tableId2) =>
+        collHas(tablesMap, tableId2) ? delValidTable(tableId2) : 0,
+      tableId,
     );
   const delRow = (tableId, rowId) =>
-    fluentTransaction(() =>
-      ifNotUndefined(mapGet(tablesMap, tableId), (tableMap) =>
-        collHas(tableMap, rowId) ? delValidRow(tableId, tableMap, rowId) : 0,
-      ),
+    fluentTransaction(
+      (tableId2, rowId2) =>
+        ifNotUndefined(mapGet(tablesMap, tableId2), (tableMap) =>
+          collHas(tableMap, rowId2)
+            ? delValidRow(tableId2, tableMap, rowId2)
+            : 0,
+        ),
+      tableId,
+      rowId,
     );
   const delCell = (tableId, rowId, cellId, forceDel) =>
-    fluentTransaction(() =>
-      ifNotUndefined(mapGet(tablesMap, tableId), (tableMap) =>
-        ifNotUndefined(mapGet(tableMap, rowId), (rowMap) =>
-          collHas(rowMap, cellId)
-            ? delValidCell(tableId, tableMap, rowId, rowMap, cellId, forceDel)
-            : 0,
+    fluentTransaction(
+      (tableId2, rowId2, cellId2) =>
+        ifNotUndefined(mapGet(tablesMap, tableId2), (tableMap) =>
+          ifNotUndefined(mapGet(tableMap, rowId2), (rowMap) =>
+            collHas(rowMap, cellId2)
+              ? delValidCell(
+                  tableId2,
+                  tableMap,
+                  rowId2,
+                  rowMap,
+                  cellId2,
+                  forceDel,
+                )
+              : 0,
+          ),
         ),
-      ),
+      tableId,
+      rowId,
+      cellId,
     );
   const delSchema = () =>
     fluentTransaction(() => {
@@ -741,11 +783,11 @@ const createStore = () => {
       ),
     );
   const forEachRow = (tableId, rowCallback) =>
-    collForEach(mapGet(tablesMap, tableId), (rowMap, rowId) =>
+    collForEach(mapGet(tablesMap, id(tableId)), (rowMap, rowId) =>
       rowCallback(rowId, (cellCallback) => mapForEach(rowMap, cellCallback)),
     );
   const forEachCell = (tableId, rowId, cellCallback) =>
-    mapForEach(mapGet(mapGet(tablesMap, tableId), rowId), cellCallback);
+    mapForEach(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), cellCallback);
   const addTablesListener = (listener, mutator) =>
     addListener(listener, tablesListeners[mutator ? 1 : 0]);
   const addTableIdsListener = (listener, mutator) =>