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

package/umd/with-schemas/index.js

@@ -116,6 +116,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) => {
@@ -134,7 +136,7 @@
       onInvalidObj?.();
       return false;
     }
-    objToArray(obj, (child, id) => {
+    objForEach(obj, (child, id) => {
       if (!validateChild(child, id)) {
         objDel(obj, id);
       }
@@ -177,7 +179,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;
   };
@@ -1611,7 +1613,7 @@
       destroy,
       getListenerStats,
     };
-    objToArray(
+    objMap(
       {
         [TABLE]: [1, 1],
         [TABLE + CELL_IDS]: [0, 1],
@@ -2635,9 +2637,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,
@@ -2676,7 +2681,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),
             );
           }
@@ -2716,7 +2721,7 @@
     const setPartialValues = (partialValues) =>
       fluentTransaction(() =>
         validateValues(partialValues, 1)
-          ? objToArray(partialValues, (value, valueId) =>
+          ? objMap(partialValues, (value, valueId) =>
               setValidValue(valueId, value),
             )
           : 0,
@@ -2735,18 +2740,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),
         );
       });
@@ -3182,7 +3187,7 @@
       callListeners,
       setInternalListeners,
     };
-    objToArray(
+    objMap(
       {
         [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
         [TABLES]: [0, tablesListeners],
@@ -3793,7 +3798,7 @@
       cellChanged,
       valueChanged,
     );
-    objToArray(
+    objMap(
       store,
       (method, name) =>
         (mergeableStore[name] = // fluent methods

package/with-schemas/index.js

@@ -105,6 +105,8 @@ 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 objEnsure = (obj, id, getDefaultValue) => {
@@ -123,7 +125,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);
     }
@@ -162,7 +164,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;
 };
@@ -1575,7 +1577,7 @@ const createQueries = getCreateFunction((store) => {
     destroy,
     getListenerStats,
   };
-  objToArray(
+  objMap(
     {
       [TABLE]: [1, 1],
       [TABLE + CELL_IDS]: [0, 1],
@@ -2572,9 +2574,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,
@@ -2613,7 +2618,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),
           );
         }
@@ -2651,7 +2656,7 @@ const createStore = () => {
   const setPartialValues = (partialValues) =>
     fluentTransaction(() =>
       validateValues(partialValues, 1)
-        ? objToArray(partialValues, (value, valueId) =>
+        ? objMap(partialValues, (value, valueId) =>
             setValidValue(valueId, value),
           )
         : 0,
@@ -2670,18 +2675,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),
       );
     });
@@ -3113,7 +3118,7 @@ const createStore = () => {
     callListeners,
     setInternalListeners,
   };
-  objToArray(
+  objMap(
     {
       [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],
@@ -3708,7 +3713,7 @@ const createMergeableStore = (uniqueId) => {
     cellChanged,
     valueChanged,
   );
-  objToArray(
+  objMap(
     store,
     (method, name) =>
       (mergeableStore[name] = // fluent methods