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

package/store/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;
 };
@@ -1024,9 +1029,12 @@ const createStore = () => {
   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,
@@ -1065,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),
           );
         }
@@ -1103,7 +1111,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objToArray(partialValues, (value, valueId) =>
+        ? objMap(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -1122,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),
       );
     });
@@ -1565,7 +1573,7 @@ const createStore = () => {
     callListeners,
     setInternalListeners,
   };
-  objToArray(
+  objMap(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],

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;
 };
@@ -1024,9 +1029,12 @@ const createStore = () => {
   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,
@@ -1065,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),
           );
         }
@@ -1103,7 +1111,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objToArray(partialValues, (value, valueId) =>
+        ? objMap(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -1122,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),
       );
     });
@@ -1565,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(