tinybase 5.1.0-beta.0 → 5.1.0

package/es6/synchronizers/with-schemas/index.js

@@ -17,6 +17,7 @@ const errorNew = (message) => {
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -73,6 +74,20 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
+new GLOBAL.TextEncoder();
+
+const newStamp = (value, time) => (time ? [value, time] : [value]);
+const getLatestTime = (time1, time2) => {
+  var _a;
+  return (_a =
+    (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
+      ? time1
+      : time2) != null
+    ? _a
+    : '';
+};
+const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
 var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
@@ -118,15 +133,10 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -135,7 +145,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -210,7 +220,10 @@ const createCustomPersister = (
         yield schedule(() =>
           __async$1(void 0, null, function* () {
             try {
-              setContentOrChanges(yield getPersisted());
+              const content = yield getPersisted();
+              isArray(content)
+                ? setContentOrChanges(content)
+                : errorNew(`Content is not an array ${content}`);
             } catch (error) {
               onIgnoredError == null ? void 0 : onIgnoredError(error);
               if (initialContent) {
@@ -226,21 +239,26 @@ const createCustomPersister = (
   const startAutoLoad = (initialContent) =>
     __async$1(void 0, null, function* () {
       yield stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener((content, changes) =>
-        __async$1(void 0, null, function* () {
-          if (changes || content) {
-            /* istanbul ignore else */
-            if (loadSave != 2) {
-              loadSave = 1;
-              loads++;
-              setContentOrChanges(changes != null ? changes : content);
-              loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener((content, changes) =>
+          __async$1(void 0, null, function* () {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (loadSave != 2) {
+                loadSave = 1;
+                loads++;
+                setContentOrChanges(changes != null ? changes : content);
+                loadSave = 0;
+              }
+            } else {
+              yield load();
             }
-          } else {
-            yield load();
-          }
-        }),
-      );
+          }),
+        );
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
+      }
       return persister;
     });
   const stopAutoLoad = () => {
@@ -295,7 +313,10 @@ const createCustomPersister = (
       return persister;
     });
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = __spreadValues$1(
     {
@@ -317,20 +338,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-new GLOBAL.TextEncoder();
-
-const newStamp = (value, time) => (time ? [value, time] : [value]);
-const getLatestTime = (time1, time2) => {
-  var _a;
-  return (_a =
-    (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
-      ? time1
-      : time2) != null
-    ? _a
-    : '';
-};
-const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
 const MASK6 = 63;
 const ENCODE =
   '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -396,14 +403,14 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 const Message = {
-  Response: 0,
-  GetContentHashes: 1,
-  ContentHashes: 2,
-  ContentDiff: 3,
-  GetTableDiff: 4,
-  GetRowDiff: 5,
-  GetCellDiff: 6,
-  GetValueDiff: 7,
+  Response: 0 /* Response */,
+  GetContentHashes: 1 /* GetContentHashes */,
+  ContentHashes: 2 /* ContentHashes */,
+  ContentDiff: 3 /* ContentDiff */,
+  GetTableDiff: 4 /* GetTableDiff */,
+  GetRowDiff: 5 /* GetRowDiff */,
+  GetCellDiff: 6 /* GetCellDiff */,
+  GetValueDiff: 7 /* GetValueDiff */,
 };
 const createCustomSynchronizer = (
   store,
@@ -411,6 +418,8 @@ const createCustomSynchronizer = (
   registerReceive,
   destroyImpl,
   requestTimeoutSeconds,
+  onSend,
+  onReceive,
   onIgnoredError,
   extra = {},
 ) => {
@@ -418,43 +427,11 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  registerReceive((fromClientId, requestId, message, body) => {
-    receives++;
-    if (message == Message.Response) {
-      ifNotUndefined(
-        mapGet(pendingRequests, requestId),
-        ([toClientId, handleResponse]) =>
-          isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(body, fromClientId)
-            : /* istanbul ignore next */
-              0,
-      );
-    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener == null ? void 0 : persisterListener(void 0, changes);
-      });
-    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
-      persisterListener == null ? void 0 : persisterListener(void 0, body);
-    } else {
-      ifNotUndefined(
-        message == Message.GetContentHashes && persister.isAutoSaving()
-          ? store.getMergeableContentHashes()
-          : message == Message.GetTableDiff
-            ? store.getMergeableTableDiff(body)
-            : message == Message.GetRowDiff
-              ? store.getMergeableRowDiff(body)
-              : message == Message.GetCellDiff
-                ? store.getMergeableCellDiff(body)
-                : message == Message.GetValueDiff
-                  ? store.getMergeableValueDiff(body)
-                  : void 0,
-        (response) => {
-          sends++;
-          send(fromClientId, requestId, Message.Response, response);
-        },
-      );
-    }
-  });
+  const sendImpl = (toClientId, requestId, message, body) => {
+    sends++;
+    onSend == null ? void 0 : onSend(toClientId, requestId, message, body);
+    send(toClientId, requestId, message, body);
+  };
   const request = (_0, _1, ..._2) =>
     __async(
       void 0,
@@ -465,7 +442,8 @@ const createCustomSynchronizer = (
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
+                message,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -476,8 +454,7 @@ const createCustomSynchronizer = (
               resolve([response, fromClientId]);
             },
           ]);
-          sends++;
-          send(toClientId, requestId, message, body);
+          sendImpl(toClientId, requestId, message, body);
         });
       },
     );
@@ -502,7 +479,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          Message.GetContentHashes,
+          1 /* GetContentHashes */,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -511,21 +488,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          Message.GetTableDiff,
+          4 /* GetTableDiff */,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            Message.GetRowDiff,
+            5 /* GetRowDiff */,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              Message.GetCellDiff,
+              6 /* GetCellDiff */,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -538,7 +515,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              Message.GetValueDiff,
+              7 /* GetValueDiff */,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -553,17 +530,14 @@ const createCustomSynchronizer = (
     });
   const setPersisted = (_getContent, changes) =>
     __async(void 0, null, function* () {
-      sends++;
-      if (changes) {
-        send(null, null, Message.ContentDiff, changes);
-      } else {
-        send(
-          null,
-          null,
-          Message.ContentHashes,
-          store.getMergeableContentHashes(),
-        );
-      }
+      return changes
+        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        : sendImpl(
+            null,
+            null,
+            2 /* ContentHashes */,
+            store.getMergeableContentHashes(),
+          );
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
@@ -586,9 +560,49 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.MergeableStoreOnly,
+    2,
+    // MergeableStoreOnly
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
   );
+  registerReceive((fromClientId, requestId, message, body) => {
+    receives++;
+    onReceive == null
+      ? void 0
+      : onReceive(fromClientId, requestId, message, body);
+    if (message == 0 /* Response */) {
+      ifNotUndefined(
+        mapGet(pendingRequests, requestId),
+        ([toClientId, handleResponse]) =>
+          isUndefined(toClientId) || toClientId == fromClientId
+            ? handleResponse(body, fromClientId)
+            : /* istanbul ignore next */
+              0,
+      );
+    } else if (message == 2 /* ContentHashes */ && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, body).then((changes) => {
+        persisterListener == null ? void 0 : persisterListener(void 0, changes);
+      });
+    } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+      persisterListener == null ? void 0 : persisterListener(void 0, body);
+    } else {
+      ifNotUndefined(
+        message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+          ? store.getMergeableContentHashes()
+          : message == 4 /* GetTableDiff */
+            ? store.getMergeableTableDiff(body)
+            : message == 5 /* GetRowDiff */
+              ? store.getMergeableRowDiff(body)
+              : message == 6 /* GetCellDiff */
+                ? store.getMergeableCellDiff(body)
+                : message == 7 /* GetValueDiff */
+                  ? store.getMergeableValueDiff(body)
+                  : void 0,
+        (response) => {
+          sendImpl(fromClientId, requestId, 0 /* Response */, response);
+        },
+      );
+    }
+  });
   return persister;
 };
 

package/es6/ui-react/index.js

@@ -39,6 +39,7 @@ const arrayIsEqual = (array1, array2) =>
   arrayEvery(array1, (value1, index) => array2[index] === value1);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
+const arrayFilter = (array, cb) => array.filter(cb);
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -127,28 +128,6 @@ lower(LISTENER);
 const TRANSACTION = 'Transaction';
 lower(TRANSACTION);
 
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) =>
-  key in obj
-    ? __defProp$1(obj, key, {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value,
-      })
-    : (obj[key] = value);
-var __spreadValues$1 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -256,12 +235,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
     [thing, returnType, listenable, ...args],
   );
-  const result = useSyncExternalStore(subscribe, getResult);
-  return returnType == 0 /* Object */
-    ? __spreadValues$1({}, result)
-    : returnType < 3 /* CellOrValue */
-      ? [...result]
-      : result;
+  return useSyncExternalStore(subscribe, getResult);
 };
 const useListener = (
   listenable,
@@ -293,9 +267,7 @@ const useSetCallback = (
         ifNotUndefined(get(parameter, store2), (thing) =>
           then(
             store2['set' + settable](
-              ...arrayMap(args, (arg) =>
-                isFunction(arg) ? arg(parameter, store2) : arg,
-              ),
+              ...argsOrGetArgs(args, store2, parameter),
               thing,
             ),
             thing,
@@ -303,9 +275,12 @@ const useSetCallback = (
         ),
       ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [store, settable, ...getDeps, ...thenDeps, ...args],
+    [store, settable, ...getDeps, ...thenDeps, ...nonFunctionDeps(args)],
   );
 };
+const argsOrGetArgs = (args, store, parameter) =>
+  arrayMap(args, (arg) => (isFunction(arg) ? arg(parameter, store) : arg));
+const nonFunctionDeps = (args) => arrayFilter(args, (arg) => !isFunction(arg));
 const useDel = (
   storeOrStoreId,
   deletable,
@@ -315,9 +290,14 @@ const useDel = (
 ) => {
   const store = useStoreOrStoreById(storeOrStoreId);
   return useCallback$2(
-    () => then(store == null ? void 0 : store['del' + deletable](...args)),
+    (parameter) =>
+      then(
+        store == null
+          ? void 0
+          : store['del' + deletable](...argsOrGetArgs(args, store, parameter)),
+      ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [store, deletable, ...thenDeps, ...args],
+    [store, deletable, ...thenDeps, ...nonFunctionDeps(args)],
   );
 };
 const useCheckpointAction = (checkpointsOrCheckpointsId, action, arg) => {

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

@@ -39,6 +39,7 @@ const arrayIsEqual = (array1, array2) =>
   arrayEvery(array1, (value1, index) => array2[index] === value1);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
+const arrayFilter = (array, cb) => array.filter(cb);
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -127,28 +128,6 @@ lower(LISTENER);
 const TRANSACTION = 'Transaction';
 lower(TRANSACTION);
 
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) =>
-  key in obj
-    ? __defProp$1(obj, key, {
-        enumerable: true,
-        configurable: true,
-        writable: true,
-        value,
-      })
-    : (obj[key] = value);
-var __spreadValues$1 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-    }
-  return a;
-};
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -256,12 +235,7 @@ const useListenable = (listenable, thing, returnType, args = EMPTY_ARRAY) => {
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
     [thing, returnType, listenable, ...args],
   );
-  const result = useSyncExternalStore(subscribe, getResult);
-  return returnType == 0 /* Object */
-    ? __spreadValues$1({}, result)
-    : returnType < 3 /* CellOrValue */
-      ? [...result]
-      : result;
+  return useSyncExternalStore(subscribe, getResult);
 };
 const useListener = (
   listenable,
@@ -293,9 +267,7 @@ const useSetCallback = (
         ifNotUndefined(get(parameter, store2), (thing) =>
           then(
             store2['set' + settable](
-              ...arrayMap(args, (arg) =>
-                isFunction(arg) ? arg(parameter, store2) : arg,
-              ),
+              ...argsOrGetArgs(args, store2, parameter),
               thing,
             ),
             thing,
@@ -303,9 +275,12 @@ const useSetCallback = (
         ),
       ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [store, settable, ...getDeps, ...thenDeps, ...args],
+    [store, settable, ...getDeps, ...thenDeps, ...nonFunctionDeps(args)],
   );
 };
+const argsOrGetArgs = (args, store, parameter) =>
+  arrayMap(args, (arg) => (isFunction(arg) ? arg(parameter, store) : arg));
+const nonFunctionDeps = (args) => arrayFilter(args, (arg) => !isFunction(arg));
 const useDel = (
   storeOrStoreId,
   deletable,
@@ -315,9 +290,14 @@ const useDel = (
 ) => {
   const store = useStoreOrStoreById(storeOrStoreId);
   return useCallback$2(
-    () => then(store == null ? void 0 : store['del' + deletable](...args)),
+    (parameter) =>
+      then(
+        store == null
+          ? void 0
+          : store['del' + deletable](...argsOrGetArgs(args, store, parameter)),
+      ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [store, deletable, ...thenDeps, ...args],
+    [store, deletable, ...thenDeps, ...nonFunctionDeps(args)],
   );
 };
 const useCheckpointAction = (checkpointsOrCheckpointsId, action, arg) => {

package/es6/ui-react-inspector/index.js

@@ -129,6 +129,7 @@ const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
+const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
@@ -1861,15 +1862,10 @@ var __async$2 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
-};
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1878,7 +1874,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -1950,7 +1946,10 @@ const createCustomPersister = (
         yield schedule(() =>
           __async$2(void 0, null, function* () {
             try {
-              setContentOrChanges(yield getPersisted());
+              const content = yield getPersisted();
+              isArray(content)
+                ? setContentOrChanges(content)
+                : errorNew(`Content is not an array ${content}`);
             } catch (error) {
               if (initialContent) {
                 setDefaultContent(initialContent);
@@ -1965,21 +1964,23 @@ const createCustomPersister = (
   const startAutoLoad = (initialContent) =>
     __async$2(void 0, null, function* () {
       yield stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener((content, changes) =>
-        __async$2(void 0, null, function* () {
-          if (changes || content) {
-            /* istanbul ignore else */
-            if (loadSave != 2) {
-              loadSave = 1;
-              loads++;
-              setContentOrChanges(changes != null ? changes : content);
-              loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener((content, changes) =>
+          __async$2(void 0, null, function* () {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (loadSave != 2) {
+                loadSave = 1;
+                loads++;
+                setContentOrChanges(changes != null ? changes : content);
+                loadSave = 0;
+              }
+            } else {
+              yield load();
             }
-          } else {
-            yield load();
-          }
-        }),
-      );
+          }),
+        );
+      } catch (error) {}
       return persister;
     });
   const stopAutoLoad = () => {
@@ -2031,7 +2032,10 @@ const createCustomPersister = (
       return persister;
     });
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = __spreadValues(
     {
@@ -2116,7 +2120,8 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.StoreOrMergeableStore,
+    3,
+    // StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };
@@ -2333,6 +2338,7 @@ const createStore = () => {
     }
     return true;
   };
+  const validateContent = isArray;
   const validateTables = (tables) =>
     objValidate(tables, validateTable, cellInvalid);
   const validateTable = (table, tableId) =>
@@ -2478,6 +2484,10 @@ const createStore = () => {
     );
   const setOrDelTables = (tables) =>
     objIsEmpty(tables) ? delTables() : setTables(tables);
+  const setValidContent = ([tables, values]) => {
+    (objIsEmpty(tables) ? delTables : setTables)(tables);
+    (objIsEmpty(values) ? delValues : setValues)(values);
+  };
   const setValidTables = (tables) =>
     mapMatch(
       tablesMap,
@@ -2981,11 +2991,10 @@ const createStore = () => {
   const getValuesSchemaJson = () => jsonStringWithMap(valuesSchemaMap);
   const getSchemaJson = () =>
     jsonStringWithMap([tablesSchemaMap, valuesSchemaMap]);
-  const setContent = ([tables, values]) =>
-    fluentTransaction(() => {
-      (objIsEmpty(tables) ? delTables : setTables)(tables);
-      (objIsEmpty(values) ? delValues : setValues)(values);
-    });
+  const setContent = (content) =>
+    fluentTransaction(() =>
+      validateContent(content) ? setValidContent(content) : 0,
+    );
   const setTables = (tables) =>
     fluentTransaction(() =>
       validateTables(tables) ? setValidTables(tables) : 0,