tinybase 5.5.0-beta.0 → 6.0.0-beta.0

package/umd/es6/persisters/persister-postgres/with-schemas/index.js

@@ -701,7 +701,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -830,7 +830,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1243,7 +1243,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-powersync/index.js

@@ -710,7 +710,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -839,7 +839,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1252,7 +1252,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-powersync/with-schemas/index.js

@@ -710,7 +710,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -839,7 +839,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1252,7 +1252,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-sqlite-wasm/index.js

@@ -710,7 +710,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -839,7 +839,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1252,7 +1252,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-sqlite-wasm/with-schemas/index.js

@@ -710,7 +710,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -839,7 +839,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1252,7 +1252,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-sqlite3/index.js

@@ -711,7 +711,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -840,7 +840,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1253,7 +1253,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-sqlite3/with-schemas/index.js

@@ -711,7 +711,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -840,7 +840,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1253,7 +1253,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/persisters/persister-yjs/index.js

@@ -55,6 +55,8 @@
   const objHas = (obj, id) => id in obj;
   const objToArray = (obj, cb) =>
     arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+  const objMap = (obj, cb) =>
+    objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
   const objSize = (obj) => size(objIds(obj));
   const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
   const objEnsure = (obj, id, getDefaultValue) => {
@@ -617,7 +619,7 @@
     let changesFailed = 1;
     ifNotUndefined(changes, ([cellChanges, valueChanges]) => {
       changesFailed = 0;
-      objToArray(cellChanges, (table, tableId) =>
+      objMap(cellChanges, (table, tableId) =>
         changesFailed
           ? 0
           : isUndefined(table)
@@ -625,7 +627,7 @@
             : ifNotUndefined(
                 yTables.get(tableId),
                 (yTable) =>
-                  objToArray(table, (row, rowId) =>
+                  objMap(table, (row, rowId) =>
                     changesFailed
                       ? 0
                       : isUndefined(row)
@@ -633,7 +635,7 @@
                         : ifNotUndefined(
                             yTable.get(rowId),
                             (yRow) =>
-                              objToArray(row, (cell, cellId) =>
+                              objMap(row, (cell, cellId) =>
                                 isUndefined(cell)
                                   ? yRow.delete(cellId)
                                   : yRow.set(cellId, cell),
@@ -644,7 +646,7 @@
                 changesDidFail,
               ),
       );
-      objToArray(valueChanges, (value, valueId) =>
+      objMap(valueChanges, (value, valueId) =>
         changesFailed
           ? 0
           : isUndefined(value)
@@ -679,7 +681,7 @@
         ? _a
         : yMapOrParent.set(idInParent, new yjs.Map());
     let changed;
-    objToArray(obj, (value, id) => {
+    objMap(obj, (value, id) => {
       if (set(yMap, id, value)) {
         changed = 1;
       }

package/umd/es6/persisters/persister-yjs/with-schemas/index.js

@@ -55,6 +55,8 @@
   const objHas = (obj, id) => id in obj;
   const objToArray = (obj, cb) =>
     arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+  const objMap = (obj, cb) =>
+    objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
   const objSize = (obj) => size(objIds(obj));
   const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
   const objEnsure = (obj, id, getDefaultValue) => {
@@ -617,7 +619,7 @@
     let changesFailed = 1;
     ifNotUndefined(changes, ([cellChanges, valueChanges]) => {
       changesFailed = 0;
-      objToArray(cellChanges, (table, tableId) =>
+      objMap(cellChanges, (table, tableId) =>
         changesFailed
           ? 0
           : isUndefined(table)
@@ -625,7 +627,7 @@
             : ifNotUndefined(
                 yTables.get(tableId),
                 (yTable) =>
-                  objToArray(table, (row, rowId) =>
+                  objMap(table, (row, rowId) =>
                     changesFailed
                       ? 0
                       : isUndefined(row)
@@ -633,7 +635,7 @@
                         : ifNotUndefined(
                             yTable.get(rowId),
                             (yRow) =>
-                              objToArray(row, (cell, cellId) =>
+                              objMap(row, (cell, cellId) =>
                                 isUndefined(cell)
                                   ? yRow.delete(cellId)
                                   : yRow.set(cellId, cell),
@@ -644,7 +646,7 @@
                 changesDidFail,
               ),
       );
-      objToArray(valueChanges, (value, valueId) =>
+      objMap(valueChanges, (value, valueId) =>
         changesFailed
           ? 0
           : isUndefined(value)
@@ -679,7 +681,7 @@
         ? _a
         : yMapOrParent.set(idInParent, new yjs.Map());
     let changed;
-    objToArray(obj, (value, id) => {
+    objMap(obj, (value, id) => {
       if (set(yMap, id, value)) {
         changed = 1;
       }

package/umd/es6/persisters/with-schemas/index.js

@@ -721,7 +721,7 @@
     ) =>
       __async$4(void 0, null, function* () {
         const settingColumnNameSet = setNew();
-        objToArray(content != null ? content : {}, (contentRow) =>
+        objMap(content != null ? content : {}, (contentRow) =>
           arrayMap(
             objIds(contentRow != null ? contentRow : {}),
             (cellOrValueId) => setAdd(settingColumnNameSet, cellOrValueId),
@@ -850,7 +850,7 @@
             );
             const rows = {};
             const deleteRowIds = [];
-            objToArray(content != null ? content : {}, (row, rowId) => {
+            objMap(content != null ? content : {}, (row, rowId) => {
               rows[rowId] = arrayMap(changingColumnNames, (cellId) =>
                 encode
                   ? encode(row == null ? void 0 : row[cellId])
@@ -1263,7 +1263,7 @@
     then,
   ) => {
     const configMap = mapNew();
-    objToArray(configsObj, (configObj, id) => {
+    objMap(configsObj, (configObj, id) => {
       const defaultedConfig = slice(
         objValues(
           objMerge(

package/umd/es6/queries/index.js

@@ -38,7 +38,11 @@
   const isFiniteNumber = isFinite;
   const isUndefined = (thing) => thing == void 0;
   const ifNotUndefined = (value, then, otherwise) =>
-    isUndefined(value) ? void 0 : then(value);
+    isUndefined(value)
+      ? otherwise == null
+        ? void 0
+        : otherwise()
+      : then(value);
   const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
   const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
   const isArray = (thing) => Array.isArray(thing);
@@ -60,8 +64,11 @@
   const object = Object;
   const objEntries = object.entries;
   const objFreeze = object.freeze;
+  const objNew = (entries = []) => object.fromEntries(entries);
   const objToArray = (obj, cb) =>
     arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+  const objMap = (obj, cb) =>
+    objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 
   const collSize = (coll) => {
     var _a;
@@ -826,6 +833,7 @@
     };
     const getListenerStats = () => {
       const _a = resultStore.getListenerStats(),
+        {tables: _1, tableIds: _2, transaction: _3} = _a,
         stats = __objRest(_a, ['tables', 'tableIds', 'transaction']);
       return stats;
     };
@@ -842,7 +850,7 @@
       destroy,
       getListenerStats,
     };
-    objToArray(
+    objMap(
       {
         [TABLE]: [1, 1],
         [TABLE + CELL_IDS]: [0, 1],

package/umd/es6/queries/with-schemas/index.js

@@ -38,7 +38,11 @@
   const isFiniteNumber = isFinite;
   const isUndefined = (thing) => thing == void 0;
   const ifNotUndefined = (value, then, otherwise) =>
-    isUndefined(value) ? void 0 : then(value);
+    isUndefined(value)
+      ? otherwise == null
+        ? void 0
+        : otherwise()
+      : then(value);
   const isTypeStringOrBoolean = (type) => type == STRING || type == BOOLEAN;
   const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
   const isArray = (thing) => Array.isArray(thing);
@@ -60,8 +64,11 @@
   const object = Object;
   const objEntries = object.entries;
   const objFreeze = object.freeze;
+  const objNew = (entries = []) => object.fromEntries(entries);
   const objToArray = (obj, cb) =>
     arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+  const objMap = (obj, cb) =>
+    objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 
   const collSize = (coll) => {
     var _a;
@@ -826,6 +833,7 @@
     };
     const getListenerStats = () => {
       const _a = resultStore.getListenerStats(),
+        {tables: _1, tableIds: _2, transaction: _3} = _a,
         stats = __objRest(_a, ['tables', 'tableIds', 'transaction']);
       return stats;
     };
@@ -842,7 +850,7 @@
       destroy,
       getListenerStats,
     };
-    objToArray(
+    objMap(
       {
         [TABLE]: [1, 1],
         [TABLE + CELL_IDS]: [0, 1],

package/umd/es6/relationships/index.js

@@ -15,7 +15,11 @@
 
   const isUndefined = (thing) => thing == void 0;
   const ifNotUndefined = (value, then, otherwise) =>
-    isUndefined(value) ? void 0 : then(value);
+    isUndefined(value)
+      ? otherwise == null
+        ? void 0
+        : otherwise()
+      : then(value);
   const isString = (thing) => getTypeOf(thing) == STRING;
   const isArray = (thing) => Array.isArray(thing);
   const size = (arrayOrString) => arrayOrString.length;

package/umd/es6/relationships/with-schemas/index.js

@@ -15,7 +15,11 @@
 
   const isUndefined = (thing) => thing == void 0;
   const ifNotUndefined = (value, then, otherwise) =>
-    isUndefined(value) ? void 0 : then(value);
+    isUndefined(value)
+      ? otherwise == null
+        ? void 0
+        : otherwise()
+      : then(value);
   const isString = (thing) => getTypeOf(thing) == STRING;
   const isArray = (thing) => Array.isArray(thing);
   const size = (arrayOrString) => arrayOrString.length;

package/umd/es6/store/index.js

@@ -79,13 +79,18 @@
     );
   const objIds = object.keys;
   const objFreeze = object.freeze;
+  const objNew = (entries = []) => object.fromEntries(entries);
   const objHas = (obj, id) => id in obj;
   const objDel = (obj, id) => {
     delete obj[id];
     return obj;
   };
+  const objForEach = (obj, cb) =>
+    arrayForEach(objEntries(obj), ([id, value]) => cb(value, id));
   const objToArray = (obj, cb) =>
     arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+  const objMap = (obj, cb) =>
+    objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
   const objSize = (obj) => size(objIds(obj));
   const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
   const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
@@ -98,7 +103,7 @@
       onInvalidObj == null ? void 0 : onInvalidObj();
       return false;
     }
-    objToArray(obj, (child, id) => {
+    objForEach(obj, (child, id) => {
       if (!validateChild(child, id)) {
         objDel(obj, id);
       }
@@ -167,7 +172,7 @@
     return mapGet(map, key);
   };
   const mapMatch = (map, obj, set, del = mapSet) => {
-    objToArray(obj, (value, id) => set(map, id, value));
+    objMap(obj, (value, id) => set(map, id, value));
     mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
     return map;
   };
@@ -1140,9 +1145,12 @@
     const getSchemaJson = () =>
       jsonStringWithMap([tablesSchemaMap, valuesSchemaMap]);
     const setContent = (content) =>
-      fluentTransaction(() =>
-        validateContent(content) ? setValidContent(content) : 0,
-      );
+      fluentTransaction(() => {
+        const content2 = isFunction(content) ? content() : content;
+        if (validateContent(content2)) {
+          setValidContent(content2);
+        }
+      });
     const setTables = (tables) =>
       fluentTransaction(() =>
         validateTables(tables) ? setValidTables(tables) : 0,
@@ -1181,7 +1189,7 @@
         (tableId2, rowId2) => {
           if (validateRow(tableId2, rowId2, partialRow, 1)) {
             const table = getOrCreateTable(tableId2);
-            objToArray(partialRow, (cell, cellId) =>
+            objMap(partialRow, (cell, cellId) =>
               setCellIntoDefaultRow(tableId2, table, rowId2, cellId, cell),
             );
           }
@@ -1221,7 +1229,7 @@
     const setPartialValues = (partialValues) =>
       fluentTransaction(() =>
         validateValues(partialValues, 1)
-          ? objToArray(partialValues, (value, valueId) =>
+          ? objMap(partialValues, (value, valueId) =>
               setValidValue(valueId, value),
             )
           : 0,
@@ -1240,18 +1248,18 @@
       );
     const applyChanges = (changes) =>
       fluentTransaction(() => {
-        objToArray(changes[0], (table, tableId) =>
+        objMap(changes[0], (table, tableId) =>
           isUndefined(table)
             ? delTable(tableId)
-            : objToArray(table, (row, rowId) =>
+            : objMap(table, (row, rowId) =>
                 isUndefined(row)
                   ? delRow(tableId, rowId)
-                  : objToArray(row, (cell, cellId) =>
+                  : objMap(row, (cell, cellId) =>
                       setOrDelCell(store, tableId, rowId, cellId, cell),
                     ),
               ),
         );
-        objToArray(changes[1], (value, valueId) =>
+        objMap(changes[1], (value, valueId) =>
           setOrDelValue(store, valueId, value),
         );
       });
@@ -1695,7 +1703,7 @@
       callListeners,
       setInternalListeners,
     };
-    objToArray(
+    objMap(
       {
         [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
         [TABLES]: [0, tablesListeners],

package/umd/es6/store/with-schemas/index.js

@@ -79,13 +79,18 @@
     );
   const objIds = object.keys;
   const objFreeze = object.freeze;
+  const objNew = (entries = []) => object.fromEntries(entries);
   const objHas = (obj, id) => id in obj;
   const objDel = (obj, id) => {
     delete obj[id];
     return obj;
   };
+  const objForEach = (obj, cb) =>
+    arrayForEach(objEntries(obj), ([id, value]) => cb(value, id));
   const objToArray = (obj, cb) =>
     arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+  const objMap = (obj, cb) =>
+    objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
   const objSize = (obj) => size(objIds(obj));
   const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
   const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
@@ -98,7 +103,7 @@
       onInvalidObj == null ? void 0 : onInvalidObj();
       return false;
     }
-    objToArray(obj, (child, id) => {
+    objForEach(obj, (child, id) => {
       if (!validateChild(child, id)) {
         objDel(obj, id);
       }
@@ -167,7 +172,7 @@
     return mapGet(map, key);
   };
   const mapMatch = (map, obj, set, del = mapSet) => {
-    objToArray(obj, (value, id) => set(map, id, value));
+    objMap(obj, (value, id) => set(map, id, value));
     mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
     return map;
   };
@@ -1140,9 +1145,12 @@
     const getSchemaJson = () =>
       jsonStringWithMap([tablesSchemaMap, valuesSchemaMap]);
     const setContent = (content) =>
-      fluentTransaction(() =>
-        validateContent(content) ? setValidContent(content) : 0,
-      );
+      fluentTransaction(() => {
+        const content2 = isFunction(content) ? content() : content;
+        if (validateContent(content2)) {
+          setValidContent(content2);
+        }
+      });
     const setTables = (tables) =>
       fluentTransaction(() =>
         validateTables(tables) ? setValidTables(tables) : 0,
@@ -1181,7 +1189,7 @@
         (tableId2, rowId2) => {
           if (validateRow(tableId2, rowId2, partialRow, 1)) {
             const table = getOrCreateTable(tableId2);
-            objToArray(partialRow, (cell, cellId) =>
+            objMap(partialRow, (cell, cellId) =>
               setCellIntoDefaultRow(tableId2, table, rowId2, cellId, cell),
             );
           }
@@ -1221,7 +1229,7 @@
     const setPartialValues = (partialValues) =>
       fluentTransaction(() =>
         validateValues(partialValues, 1)
-          ? objToArray(partialValues, (value, valueId) =>
+          ? objMap(partialValues, (value, valueId) =>
               setValidValue(valueId, value),
             )
           : 0,
@@ -1240,18 +1248,18 @@
       );
     const applyChanges = (changes) =>
       fluentTransaction(() => {
-        objToArray(changes[0], (table, tableId) =>
+        objMap(changes[0], (table, tableId) =>
           isUndefined(table)
             ? delTable(tableId)
-            : objToArray(table, (row, rowId) =>
+            : objMap(table, (row, rowId) =>
                 isUndefined(row)
                   ? delRow(tableId, rowId)
-                  : objToArray(row, (cell, cellId) =>
+                  : objMap(row, (cell, cellId) =>
                       setOrDelCell(store, tableId, rowId, cellId, cell),
                     ),
               ),
         );
-        objToArray(changes[1], (value, valueId) =>
+        objMap(changes[1], (value, valueId) =>
           setOrDelValue(store, valueId, value),
         );
       });
@@ -1695,7 +1703,7 @@
       callListeners,
       setInternalListeners,
     };
-    objToArray(
+    objMap(
       {
         [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
         [TABLES]: [0, tablesListeners],

package/umd/es6/tools/index.js

@@ -475,13 +475,13 @@ ${text.replace(
 
   const getSchemaFunctions = (tablesSchema, valuesSchema, addConstant) => {
     const mapTablesSchema = (callback) =>
-      objToArray(tablesSchema, (_, tableId) => {
-        return callback(
+      objToArray(tablesSchema, (_, tableId) =>
+        callback(
           tableId,
           camel(tableId, 1),
           addConstant(snake(tableId), `'${tableId}'`),
-        );
-      });
+        ),
+      );
     const mapCellSchema = (tableId, callback) =>
       objToArray(tablesSchema[tableId], (cellSchema, cellId) =>
         callback(

package/umd/es6/tools/with-schemas/index.js

@@ -475,13 +475,13 @@ ${text.replace(
 
   const getSchemaFunctions = (tablesSchema, valuesSchema, addConstant) => {
     const mapTablesSchema = (callback) =>
-      objToArray(tablesSchema, (_, tableId) => {
-        return callback(
+      objToArray(tablesSchema, (_, tableId) =>
+        callback(
           tableId,
           camel(tableId, 1),
           addConstant(snake(tableId), `'${tableId}'`),
-        );
-      });
+        ),
+      );
     const mapCellSchema = (tableId, callback) =>
       objToArray(tablesSchema[tableId], (cellSchema, cellId) =>
         callback(