tinybase 5.0.0-beta.25 → 5.0.0-beta.27

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

@@ -548,10 +548,15 @@ var __async$4 = (__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 = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -560,7 +565,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -577,7 +582,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -595,7 +600,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$4(void 0, null, function* () {
       /* istanbul ignore else */
@@ -771,7 +776,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -828,7 +833,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     {[getThing]: () => db},
     db,
   );
@@ -864,7 +869,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -984,7 +989,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     {[getThing]: () => db},
     db,
   );
@@ -1135,7 +1140,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -1192,7 +1197,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -1251,7 +1256,7 @@ const createSqlite3Persister = (
     (observer) => db.off(CHANGE, observer),
     onSqlCommand,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     db,
   );
 

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

@@ -548,10 +548,15 @@ var __async$4 = (__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 = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -560,7 +565,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -577,7 +582,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -595,7 +600,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$4(void 0, null, function* () {
       /* istanbul ignore else */
@@ -771,7 +776,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -828,7 +833,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     {[getThing]: () => db},
     db,
   );
@@ -864,7 +869,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -984,7 +989,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     {[getThing]: () => db},
     db,
   );
@@ -1135,7 +1140,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -1192,7 +1197,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -1251,7 +1256,7 @@ const createSqlite3Persister = (
     (observer) => db.off(CHANGE, observer),
     onSqlCommand,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     db,
   );
 

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

@@ -120,10 +120,15 @@ 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 = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -132,7 +137,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -149,7 +154,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -167,7 +172,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$1(void 0, null, function* () {
       /* istanbul ignore else */
@@ -520,7 +525,7 @@ const createYjsPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     {getYDoc: () => yDoc},
   );
 };

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

@@ -120,10 +120,15 @@ 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 = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -132,7 +137,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -149,7 +154,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -167,7 +172,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$1(void 0, null, function* () {
       /* istanbul ignore else */
@@ -520,7 +525,7 @@ const createYjsPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     {getYDoc: () => yDoc},
   );
 };

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

@@ -97,10 +97,15 @@ var __async = (__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 = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -109,7 +114,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -126,7 +131,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -144,7 +149,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async(void 0, null, function* () {
       /* istanbul ignore else */
@@ -291,4 +296,4 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-export {createCustomPersister};
+export {Persists, createCustomPersister};

package/es6/synchronizers/index.js

@@ -73,20 +73,6 @@ 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;
@@ -132,10 +118,15 @@ 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 = (supportedStoreType = 1, store) =>
-  supportedStoreType > 1 && store.isMergeable()
+const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+  persist != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -144,7 +135,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persist != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -161,7 +152,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persist,
   extra = {},
   scheduleId = [],
 ) => {
@@ -179,7 +170,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persist, store);
   const run = () =>
     __async$1(void 0, null, function* () {
       /* istanbul ignore else */
@@ -326,6 +317,20 @@ 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(
@@ -390,14 +395,16 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const RESPONSE = 0;
-const GET_CONTENT_HASHES = 1;
-const CONTENT_HASHES = 2;
-const CONTENT_DIFF = 3;
-const GET_TABLE_DIFF = 4;
-const GET_ROW_DIFF = 5;
-const GET_CELL_DIFF = 6;
-const GET_VALUE_DIFF = 7;
+const Message = {
+  Response: 0,
+  GetContentHashes: 1,
+  ContentHashes: 2,
+  ContentDiff: 3,
+  GetTableDiff: 4,
+  GetRowDiff: 5,
+  GetCellDiff: 6,
+  GetValueDiff: 7,
+};
 const createCustomSynchronizer = (
   store,
   send,
@@ -411,41 +418,39 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  onReceive((fromClientId, requestId, messageType, messageBody) => {
+  onReceive((fromClientId, requestId, message, body) => {
     receives++;
-    if (messageType == RESPONSE) {
+    if (message == Message.Response) {
       ifNotUndefined(
         mapGet(pendingRequests, requestId),
         ([toClientId, handleResponse]) =>
           isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(messageBody, fromClientId)
+            ? handleResponse(body, fromClientId)
             : /* istanbul ignore next */
               0,
       );
-    } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
+      getChangesFromOtherStore(fromClientId, body).then((changes) => {
         persisterListener == null ? void 0 : persisterListener(void 0, changes);
       });
-    } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-      persisterListener == null
-        ? void 0
-        : persisterListener(void 0, messageBody);
+    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+      persisterListener == null ? void 0 : persisterListener(void 0, body);
     } else {
       ifNotUndefined(
-        messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+        message == Message.GetContentHashes && persister.isAutoSaving()
           ? store.getMergeableContentHashes()
-          : messageType == GET_TABLE_DIFF
-            ? store.getMergeableTableDiff(messageBody)
-            : messageType == GET_ROW_DIFF
-              ? store.getMergeableRowDiff(messageBody)
-              : messageType == GET_CELL_DIFF
-                ? store.getMergeableCellDiff(messageBody)
-                : messageType == GET_VALUE_DIFF
-                  ? store.getMergeableValueDiff(messageBody)
+          : 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, RESPONSE, response);
+          send(fromClientId, requestId, Message.Response, response);
         },
       );
     }
@@ -454,13 +459,13 @@ const createCustomSynchronizer = (
     __async(
       void 0,
       [_0, _1, ..._2],
-      function* (toClientId, messageType, messageBody = EMPTY_STRING) {
+      function* (toClientId, message, body = EMPTY_STRING) {
         return promiseNew((resolve, reject) => {
           const requestId = getUniqueId();
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${messageType}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -472,7 +477,7 @@ const createCustomSynchronizer = (
             },
           ]);
           sends++;
-          send(toClientId, requestId, messageType, messageBody);
+          send(toClientId, requestId, message, body);
         });
       },
     );
@@ -497,7 +502,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          GET_CONTENT_HASHES,
+          Message.GetContentHashes,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -506,21 +511,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          GET_TABLE_DIFF,
+          Message.GetTableDiff,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            GET_ROW_DIFF,
+            Message.GetRowDiff,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              GET_CELL_DIFF,
+              Message.GetCellDiff,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -533,7 +538,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              GET_VALUE_DIFF,
+              Message.GetValueDiff,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -550,9 +555,14 @@ const createCustomSynchronizer = (
     __async(void 0, null, function* () {
       sends++;
       if (changes) {
-        send(null, null, CONTENT_DIFF, changes);
+        send(null, null, Message.ContentDiff, changes);
       } else {
-        send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+        send(
+          null,
+          null,
+          Message.ContentHashes,
+          store.getMergeableContentHashes(),
+        );
       }
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
@@ -576,10 +586,10 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    2,
+    Persists.MergeableStoreOnly,
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
   );
   return persister;
 };
 
-export {createCustomSynchronizer};
+export {Message, createCustomSynchronizer};