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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinybase",
-  "version": "5.0.0-beta.24",
+  "version": "5.0.0-beta.26",
   "author": "jamesgpearce",
   "repository": "github:tinyplex/tinybase",
   "license": "MIT",
@@ -25,17 +25,17 @@
     "@libsql/client": "^0.6.2",
     "@sqlite.org/sqlite-wasm": "^3.46.0-build2",
     "@vlcn.io/crsqlite-wasm": "^0.16.0",
-    "electric-sql": "^0.12.0",
+    "electric-sql": "^0.12.1",
     "expo": "^51.0.0",
-    "expo-sqlite": "^14.0.0",
-    "partykit": "^0.0.105",
+    "expo-sqlite": "^14.0.3",
+    "partykit": "^0.0.107",
     "partysocket": "^1.0.1",
     "prettier": "^3.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "sqlite3": "^5.1.7",
     "ws": "^8.17.0",
-    "yjs": "^13.6.16"
+    "yjs": "^13.6.18"
   },
   "peerDependenciesMeta": {
     "@automerge/automerge-repo": {

package/persisters/index.js

@@ -42,10 +42,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,
@@ -54,7 +59,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -71,7 +76,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -89,7 +94,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -219,4 +224,4 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-export {createCustomPersister};
+export {Persists, createCustomPersister};

package/persisters/persister-automerge/index.js

@@ -60,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,
@@ -72,7 +77,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -89,7 +94,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -107,7 +112,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -362,7 +367,7 @@ const createAutomergePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     {getDocHandle: () => docHandle},
   );
 };

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

@@ -60,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,
@@ -72,7 +77,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -89,7 +94,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -107,7 +112,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -362,7 +367,7 @@ const createAutomergePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     {getDocHandle: () => docHandle},
   );
 };

package/persisters/persister-browser/index.js

@@ -1,5 +1,7 @@
 const UNDEFINED = '\uFFFC';
 
+const GLOBAL = globalThis;
+const WINDOW = GLOBAL.window;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -30,12 +32,6 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const jsonParse = JSON.parse;
-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);
 
@@ -50,10 +46,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,
@@ -62,7 +63,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -79,7 +80,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -97,7 +98,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -227,8 +228,13 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+const jsonParse = JSON.parse;
+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 STORAGE = 'storage';
-const WINDOW = globalThis.window;
 const createStoragePersister = (
   store,
   storageName,
@@ -261,7 +267,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

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

@@ -1,5 +1,7 @@
 const UNDEFINED = '\uFFFC';
 
+const GLOBAL = globalThis;
+const WINDOW = GLOBAL.window;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -30,12 +32,6 @@ const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
-const jsonParse = JSON.parse;
-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);
 
@@ -50,10 +46,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,
@@ -62,7 +63,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -79,7 +80,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -97,7 +98,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -227,8 +228,13 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
+const jsonParse = JSON.parse;
+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 STORAGE = 'storage';
-const WINDOW = globalThis.window;
 const createStoragePersister = (
   store,
   storageName,
@@ -261,7 +267,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    3,
+    Persists.StoreOrMergeableStore,
     {getStorageName: () => storageName},
   );
 };

package/persisters/persister-cr-sqlite-wasm/index.js

@@ -387,10 +387,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,
@@ -399,7 +404,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -416,7 +421,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -434,7 +439,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -570,7 +575,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -610,7 +615,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -623,7 +628,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -717,7 +722,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -839,7 +844,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -890,7 +895,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -914,7 +919,7 @@ const createCrSqliteWasmPersister = (
     (removeListener) => removeListener(),
     onSqlCommand,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     db,
   );
 

package/persisters/persister-cr-sqlite-wasm/with-schemas/index.js

@@ -387,10 +387,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,
@@ -399,7 +404,7 @@ const getStoreFunctions = (supportedStoreType = 1, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : supportedStoreType != 2
+    : persistable != Persists.MergeableStoreOnly
       ? [
           0,
           store.getContent,
@@ -416,7 +421,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   extra = {},
   scheduleId = [],
 ) => {
@@ -434,7 +439,7 @@ const createCustomPersister = (
     getChanges,
     hasChanges,
     setDefaultContent,
-  ] = getStoreFunctions(supportedStoreType, store);
+  ] = getStoreFunctions(persistable, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -570,7 +575,7 @@ const createJsonSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
@@ -610,7 +615,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -623,7 +628,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -717,7 +722,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     {[getThing]: () => db},
     db,
   );
@@ -839,7 +844,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
-  supportedStoreType,
+  persistable,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -890,7 +895,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persistable,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -914,7 +919,7 @@ const createCrSqliteWasmPersister = (
     (removeListener) => removeListener(),
     onSqlCommand,
     onIgnoredError,
-    1,
+    Persists.StoreOnly,
     db,
   );
 

package/persisters/persister-electric-sql/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',
   );