tinybase 5.4.6 → 5.4.7

package/store/with-schemas/index.js

@@ -64,13 +64,18 @@ const isObject = (obj) =>
   );
 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) => {
@@ -83,7 +88,7 @@ const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
     onInvalidObj?.();
     return false;
   }
-  objToArray(obj, (child, id) => {
+  objForEach(obj, (child, id) => {
     if (!validateChild(child, id)) {
       objDel(obj, id);
     }
@@ -122,7 +127,7 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   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;
 };
@@ -1068,7 +1073,7 @@ const createStore = () => {
       (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),
           );
         }
@@ -1106,7 +1111,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objToArray(partialValues, (value, valueId) =>
+        ? objMap(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -1125,18 +1130,18 @@ const createStore = () => {
     );
   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),
       );
     });
@@ -1568,7 +1573,7 @@ const createStore = () => {
     callListeners,
     setInternalListeners,
   };
-  objToArray(
+  objMap(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],

package/tools/index.js

@@ -411,13 +411,13 @@ const getCreateFunction = (getFunction, initFunction) => {
 
 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/tools/with-schemas/index.js

@@ -411,13 +411,13 @@ const getCreateFunction = (getFunction, initFunction) => {
 
 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/ui-react-inspector/index.js

@@ -159,6 +159,8 @@ 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) =>
@@ -175,7 +177,7 @@ const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
     onInvalidObj?.();
     return false;
   }
-  objToArray(obj, (child, id) => {
+  objForEach(obj, (child, id) => {
     if (!validateChild(child, id)) {
       objDel(obj, id);
     }
@@ -1554,7 +1556,7 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   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;
 };
@@ -2731,7 +2733,7 @@ const createStore = () => {
       (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),
           );
         }
@@ -2769,7 +2771,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objToArray(partialValues, (value, valueId) =>
+        ? objMap(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -2788,18 +2790,18 @@ const createStore = () => {
     );
   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),
       );
     });
@@ -3231,7 +3233,7 @@ const createStore = () => {
     callListeners,
     setInternalListeners,
   };
-  objToArray(
+  objMap(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],

package/ui-react-inspector/with-schemas/index.js

@@ -159,6 +159,8 @@ 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) =>
@@ -175,7 +177,7 @@ const objValidate = (obj, validateChild, onInvalidObj, emptyIsValid = 0) => {
     onInvalidObj?.();
     return false;
   }
-  objToArray(obj, (child, id) => {
+  objForEach(obj, (child, id) => {
     if (!validateChild(child, id)) {
       objDel(obj, id);
     }
@@ -1554,7 +1556,7 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   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;
 };
@@ -2731,7 +2733,7 @@ const createStore = () => {
       (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),
           );
         }
@@ -2769,7 +2771,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objToArray(partialValues, (value, valueId) =>
+        ? objMap(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -2788,18 +2790,18 @@ const createStore = () => {
     );
   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),
       );
     });
@@ -3231,7 +3233,7 @@ const createStore = () => {
     callListeners,
     setInternalListeners,
   };
-  objToArray(
+  objMap(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],

package/umd/es6/index.js

@@ -120,6 +120,8 @@
     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 objEnsure = (obj, id, getDefaultValue) => {
@@ -138,7 +140,7 @@
       onInvalidObj == null ? undefined : onInvalidObj();
       return false;
     }
-    objToArray(obj, (child, id) => {
+    objForEach(obj, (child, id) => {
       if (!validateChild(child, id)) {
         objDel(obj, id);
       }
@@ -208,7 +210,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;
   };
@@ -1713,7 +1715,7 @@
       destroy,
       getListenerStats,
     };
-    objToArray(
+    objMap(
       {
         [TABLE]: [1, 1],
         [TABLE + CELL_IDS]: [0, 1],
@@ -2819,7 +2821,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),
             );
           }
@@ -2859,7 +2861,7 @@
     const setPartialValues = (partialValues) =>
       fluentTransaction(() =>
         validateValues(partialValues, 1)
-          ? objToArray(partialValues, (value, valueId) =>
+          ? objMap(partialValues, (value, valueId) =>
               setValidValue(valueId, value),
             )
           : 0,
@@ -2878,18 +2880,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),
         );
       });
@@ -3333,7 +3335,7 @@
       callListeners,
       setInternalListeners,
     };
-    objToArray(
+    objMap(
       {
         [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
         [TABLES]: [0, tablesListeners],
@@ -3955,7 +3957,7 @@
       cellChanged,
       valueChanged,
     );
-    objToArray(
+    objMap(
       store,
       (method, name) =>
         (mergeableStore[name] = // fluent methods

package/umd/es6/mergeable-store/index.js

@@ -101,6 +101,8 @@
     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 objEnsure = (obj, id, getDefaultValue) => {
@@ -119,7 +121,7 @@
       onInvalidObj == null ? undefined : onInvalidObj();
       return false;
     }
-    objToArray(obj, (child, id) => {
+    objForEach(obj, (child, id) => {
       if (!validateChild(child, id)) {
         objDel(obj, id);
       }
@@ -197,7 +199,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;
   };
@@ -1292,7 +1294,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),
             );
           }
@@ -1332,7 +1334,7 @@
     const setPartialValues = (partialValues) =>
       fluentTransaction(() =>
         validateValues(partialValues, 1)
-          ? objToArray(partialValues, (value, valueId) =>
+          ? objMap(partialValues, (value, valueId) =>
               setValidValue(valueId, value),
             )
           : 0,
@@ -1351,18 +1353,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),
         );
       });
@@ -1806,7 +1808,7 @@
       callListeners,
       setInternalListeners,
     };
-    objToArray(
+    objMap(
       {
         [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
         [TABLES]: [0, tablesListeners],
@@ -2428,7 +2430,7 @@
       cellChanged,
       valueChanged,
     );
-    objToArray(
+    objMap(
       store,
       (method, name) =>
         (mergeableStore[name] = // fluent methods

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

@@ -101,6 +101,8 @@
     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 objEnsure = (obj, id, getDefaultValue) => {
@@ -119,7 +121,7 @@
       onInvalidObj == null ? undefined : onInvalidObj();
       return false;
     }
-    objToArray(obj, (child, id) => {
+    objForEach(obj, (child, id) => {
       if (!validateChild(child, id)) {
         objDel(obj, id);
       }
@@ -197,7 +199,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;
   };
@@ -1292,7 +1294,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),
             );
           }
@@ -1332,7 +1334,7 @@
     const setPartialValues = (partialValues) =>
       fluentTransaction(() =>
         validateValues(partialValues, 1)
-          ? objToArray(partialValues, (value, valueId) =>
+          ? objMap(partialValues, (value, valueId) =>
               setValidValue(valueId, value),
             )
           : 0,
@@ -1351,18 +1353,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),
         );
       });
@@ -1806,7 +1808,7 @@
       callListeners,
       setInternalListeners,
     };
-    objToArray(
+    objMap(
       {
         [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
         [TABLES]: [0, tablesListeners],
@@ -2428,7 +2430,7 @@
       cellChanged,
       valueChanged,
     );
-    objToArray(
+    objMap(
       store,
       (method, name) =>
         (mergeableStore[name] = // fluent methods