tinybase 5.0.0-beta.24 → 5.0.0-beta.26

package/persisters/persister-electric-sql/with-schemas/index.js

@@ -388,10 +388,15 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -400,7 +405,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -417,7 +422,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -435,7 +440,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -571,7 +576,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -611,7 +616,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -624,7 +629,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -718,7 +723,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -840,7 +845,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -891,7 +896,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -921,7 +926,7 @@ const createElectricSqlPersister = (
     (unsubscribeFunction) => unsubscribeFunction(),
     onSqlCommand,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     electricClient,
     'getElectricClient',
   );

package/persisters/persister-expo-sqlite/index.js

@@ -389,10 +389,15 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -401,7 +406,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -418,7 +423,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -436,7 +441,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -572,7 +577,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -612,7 +617,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -625,7 +630,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -719,7 +724,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -841,7 +846,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -892,7 +897,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -917,7 +922,7 @@ const createExpoSqlitePersister = (
     (subscription) => subscription.remove(),
     onSqlCommand,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     db,
   );
 

package/persisters/persister-expo-sqlite/with-schemas/index.js

@@ -389,10 +389,15 @@ const jsonStringWithUndefined = (obj) =>
 const jsonParseWithUndefined = (str) =>
   JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -401,7 +406,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -418,7 +423,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -436,7 +441,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -572,7 +577,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -612,7 +617,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -625,7 +630,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -719,7 +724,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -841,7 +846,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -892,7 +897,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -917,7 +922,7 @@ const createExpoSqlitePersister = (
     (subscription) => subscription.remove(),
     onSqlCommand,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     db,
   );
 

package/persisters/persister-file/index.js

@@ -34,11 +34,6 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
-
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
@@ -53,10 +48,15 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -65,7 +65,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -82,7 +82,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -100,7 +100,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -230,6 +230,11 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+const jsonStringWithUndefined = (obj) =>
+  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+
 const createFilePersister = (store, filePath, onIgnoredError) => {
   const getPersisted = async () =>
     jsonParseWithUndefined(await readFile(filePath, UTF8));
@@ -244,7 +249,7 @@ const createFilePersister = (store, filePath, onIgnoredError) => {
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getFilePath: () => filePath},
   );
 };

package/persisters/persister-file/with-schemas/index.js

@@ -34,11 +34,6 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
-const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
-
 const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
 const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 
@@ -53,10 +48,15 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -65,7 +65,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -82,7 +82,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -100,7 +100,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -230,6 +230,11 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+const jsonStringWithUndefined = (obj) =>
+  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+
 const createFilePersister = (store, filePath, onIgnoredError) => {
   const getPersisted = async () =>
     jsonParseWithUndefined(await readFile(filePath, UTF8));
@@ -244,7 +249,7 @@ const createFilePersister = (store, filePath, onIgnoredError) => {
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getFilePath: () => filePath},
   );
 };

package/persisters/persister-indexed-db/index.js

@@ -2,6 +2,8 @@ const T = 't';
 const V = 'v';
 
 const promise = Promise;
+const GLOBAL = globalThis;
+const WINDOW = GLOBAL.window;
 const startInterval = (callback, sec, immediate) => {
   return setInterval(callback, sec * 1e3);
 };
@@ -58,10 +60,15 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -70,7 +77,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -87,7 +94,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -105,7 +112,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -235,7 +242,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const WINDOW = globalThis.window;
 const OBJECT_STORE_NAMES = [T, V];
 const KEY_PATH = {keyPath: 'k'};
 const objectStoreMatch = async (objectStore, obj) => {
@@ -325,7 +331,7 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     {getDbName: () => dbName},
   );
 };

package/persisters/persister-indexed-db/with-schemas/index.js

@@ -2,6 +2,8 @@ const T = 't';
 const V = 'v';
 
 const promise = Promise;
+const GLOBAL = globalThis;
+const WINDOW = GLOBAL.window;
 const startInterval = (callback, sec, immediate) => {
   return setInterval(callback, sec * 1e3);
 };
@@ -58,10 +60,15 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   return mapGet(map, key);
 };
 
+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 = (persistable = Persists.StoreOnly, store) =>
+  persistable != Persists.StoreOnly && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -70,7 +77,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -87,7 +94,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -105,7 +112,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -235,7 +242,6 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const WINDOW = globalThis.window;
 const OBJECT_STORE_NAMES = [T, V];
 const KEY_PATH = {keyPath: 'k'};
 const objectStoreMatch = async (objectStore, obj) => {
@@ -325,7 +331,7 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     {getDbName: () => dbName},
   );
 };