tinybase 5.0.0-beta.2 → 5.0.0-beta.3

package/lib/debug/persisters/persister-electric-sql.js

@@ -56,8 +56,7 @@ const isObject = (obj) =>
   );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objMerge = (...objs) => object.assign({}, ...objs);
-const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
-const objHas = (obj, id) => !isUndefined(objGet(obj, id));
+const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
   return obj;
@@ -100,7 +99,12 @@ const setAdd = (set, value) => set?.add(value);
 const SELECT_STAR_FROM = SELECT + '*FROM';
 const FROM_PRAGMA_TABLE = 'FROM pragma_table_';
 const WHERE = 'WHERE';
-const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
+const getCommandFunctions = (
+  cmd,
+  managedTableNames,
+  onIgnoredError,
+  useOnConflict,
+) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
     !isUndefined(mapGet(mapGet(schemaMap, tableName), rowIdColumnName));
@@ -113,7 +117,7 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
             await cmd(
               'SELECT name ' +
                 FROM_PRAGMA_TABLE +
-                `list WHERE schema='main'AND type='table'AND name IN(` +
+                `list WHERE schema='main'AND(type='table'OR type='view')AND name IN(` +
                 getPlaceholders(managedTableNames) +
                 `)ORDER BY name`,
               managedTableNames,
@@ -168,16 +172,18 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
   const saveTable = async (
     tableName,
     rowIdColumnName,
-    table,
+    content,
     deleteEmptyColumns,
     deleteEmptyTable,
     partial = false,
   ) => {
-    const tableCellIds = setNew();
-    objToArray(table ?? {}, (row) =>
-      arrayMap(objIds(row ?? {}), (cellId) => setAdd(tableCellIds, cellId)),
+    const tableCellOrValueIds = setNew();
+    objToArray(content ?? {}, (contentRow) =>
+      arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
+        setAdd(tableCellOrValueIds, cellOrValueId),
+      ),
     );
-    const tableColumnNames = collValues(tableCellIds);
+    const tableColumnNames = collValues(tableCellOrValueIds);
     if (
       !partial &&
       deleteEmptyTable &&
@@ -235,11 +241,11 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
       ]);
     }
     if (partial) {
-      if (isUndefined(table)) {
+      if (isUndefined(content)) {
         await cmd('DELETE FROM' + escapeId(tableName) + 'WHERE 1');
       } else {
         await promiseAll(
-          objToArray(table, async (row, rowId) => {
+          objToArray(content, async (row, rowId) => {
             if (isUndefined(row)) {
               await cmd(
                 'DELETE FROM' +
@@ -250,10 +256,14 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
                 [rowId],
               );
             } else if (!arrayIsEmpty(tableColumnNames)) {
-              await upsert(cmd, tableName, rowIdColumnName, objIds(row), [
-                rowId,
-                ...objValues(row),
-              ]);
+              await upsert(
+                cmd,
+                tableName,
+                rowIdColumnName,
+                objIds(row),
+                [rowId, ...objValues(row)],
+                useOnConflict,
+              );
             }
           }),
         );
@@ -266,7 +276,7 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
         );
         const args = [];
         const deleteRowIds = [];
-        objToArray(table ?? {}, (row, rowId) => {
+        objToArray(content ?? {}, (row, rowId) => {
           arrayPush(
             args,
             rowId,
@@ -315,9 +325,12 @@ const upsert = async (
   rowIdColumnName,
   changingColumnNames,
   args,
+  useOnConflict = true,
 ) =>
   await cmd(
-    'INSERT INTO' +
+    'INSERT ' +
+      (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+      'INTO' +
       escapeId(tableName) +
       '(' +
       escapeId(rowIdColumnName) +
@@ -335,18 +348,20 @@ const upsert = async (
         ),
         1,
       ) +
-      'ON CONFLICT(' +
-      escapeId(rowIdColumnName) +
-      ')DO UPDATE SET' +
-      arrayJoin(
-        arrayMap(
-          changingColumnNames,
-          (columnName) =>
-            escapeId(columnName) + '=excluded.' + escapeId(columnName),
-        ),
-        COMMA,
-      ),
-    args,
+      (useOnConflict
+        ? 'ON CONFLICT(' +
+          escapeId(rowIdColumnName) +
+          ')DO UPDATE SET' +
+          arrayJoin(
+            arrayMap(
+              changingColumnNames,
+              (columnName) =>
+                escapeId(columnName) + '=excluded.' + escapeId(columnName),
+            ),
+            COMMA,
+          )
+        : EMPTY_STRING),
+    arrayMap(args, (arg) => arg ?? null),
   );
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -369,6 +384,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportsMergeableStore,
   [getThing, thing] = [],
   scheduleId = [],
 ) => {
@@ -381,6 +397,10 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
+  const getContent =
+    (supportsMergeableStore ? store.getMergeableContent : null) ??
+    store.getContent;
+  const getChanges = store.getTransactionChanges;
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -416,7 +436,10 @@ const createCustomPersister = (
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
+          const content = await getPersisted();
+          (supportsMergeableStore && isString(content[0])
+            ? store.applyMergeableChanges
+            : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
         }
@@ -426,16 +449,14 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) => {
-          if (getTransactionChanges) {
-            const transactionChanges = getTransactionChanges();
-            await loadLock(async () =>
-              store.setTransactionChanges(transactionChanges),
-            );
+        async (getContent2, getChanges2) => {
+          if (getChanges2) {
+            const changes = getChanges2();
+            await loadLock(async () => store.applyChanges(changes));
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent?.() ?? (await getPersisted()));
+                store.setContent(getContent2?.() ?? (await getPersisted()));
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -453,7 +474,7 @@ const createCustomPersister = (
       }
       return persister;
     },
-    save: async (getTransactionChanges) => {
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -462,7 +483,7 @@ const createCustomPersister = (
         }
         await persister.schedule(async () => {
           try {
-            await setPersisted(store.getContent, getTransactionChanges);
+            await setPersisted(getContent, getChanges2);
           } catch (error) {
             /* istanbul ignore next */
             onIgnoredError?.(error);
@@ -474,14 +495,12 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) => {
-          const [tableChanges, valueChanges] = getTransactionChanges();
-          if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-            persister.save(() => [tableChanges, valueChanges]);
-          }
-        },
-      );
+      listenerId = store.addDidFinishTransactionListener(() => {
+        const [tableChanges, valueChanges] = getChanges();
+        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
+          persister.save(() => [tableChanges, valueChanges]);
+        }
+      });
       return persister;
     },
     stopAutoSave: () => {
@@ -547,6 +566,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     [getThing, db],
     db,
   );
@@ -567,9 +587,10 @@ const createTabularSqlitePersister = (
   managedTableNames,
   db,
   getThing,
+  useOnConflict,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
-    getCommandFunctions(cmd, managedTableNames, onIgnoredError);
+    getCommandFunctions(cmd, managedTableNames, onIgnoredError, useOnConflict);
   const saveTables = async (tables, partial) =>
     await promiseAll(
       mapMap(
@@ -578,12 +599,11 @@ const createTabularSqlitePersister = (
           [tableName, rowIdColumnName, deleteEmptyColumns, deleteEmptyTable],
           tableId,
         ) => {
-          const table = tables[tableId];
-          if (!partial || table !== void 0) {
+          if (!partial || objHas(tables, tableId)) {
             await saveTable(
               tableName,
               rowIdColumnName,
-              table,
+              tables[tableId],
               deleteEmptyColumns,
               deleteEmptyTable,
               partial,
@@ -633,11 +653,11 @@ const createTabularSqlitePersister = (
         ? [tables, values]
         : void 0;
     });
-  const setPersisted = async (getContent, getTransactionChanges) =>
+  const setPersisted = async (getContent, getChanges) =>
     await transaction(async () => {
       await refreshSchema();
-      if (!isUndefined(getTransactionChanges)) {
-        const [tableChanges, valueChanges] = getTransactionChanges();
+      if (!isUndefined(getChanges)) {
+        const [tableChanges, valueChanges] = getChanges();
         await saveTables(tableChanges, true);
         await saveValues(valueChanges, true);
       } else {
@@ -653,6 +673,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     [getThing, db],
     db,
   );
@@ -765,6 +786,7 @@ const createSqlitePersister = (
   onIgnoredError,
   db,
   getThing = 'getDb',
+  useOnConflict,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -827,6 +849,7 @@ const createSqlitePersister = (
     collValues(managedTableNamesSet),
     db,
     getThing,
+    useOnConflict,
   );
 };
 

package/lib/debug/persisters/persister-expo-sqlite-next.js

@@ -57,8 +57,7 @@ const isObject = (obj) =>
   );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objMerge = (...objs) => object.assign({}, ...objs);
-const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
-const objHas = (obj, id) => !isUndefined(objGet(obj, id));
+const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
   return obj;
@@ -101,7 +100,12 @@ const setAdd = (set, value) => set?.add(value);
 const SELECT_STAR_FROM = SELECT + '*FROM';
 const FROM_PRAGMA_TABLE = 'FROM pragma_table_';
 const WHERE = 'WHERE';
-const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
+const getCommandFunctions = (
+  cmd,
+  managedTableNames,
+  onIgnoredError,
+  useOnConflict,
+) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
     !isUndefined(mapGet(mapGet(schemaMap, tableName), rowIdColumnName));
@@ -114,7 +118,7 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
             await cmd(
               'SELECT name ' +
                 FROM_PRAGMA_TABLE +
-                `list WHERE schema='main'AND type='table'AND name IN(` +
+                `list WHERE schema='main'AND(type='table'OR type='view')AND name IN(` +
                 getPlaceholders(managedTableNames) +
                 `)ORDER BY name`,
               managedTableNames,
@@ -169,16 +173,18 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
   const saveTable = async (
     tableName,
     rowIdColumnName,
-    table,
+    content,
     deleteEmptyColumns,
     deleteEmptyTable,
     partial = false,
   ) => {
-    const tableCellIds = setNew();
-    objToArray(table ?? {}, (row) =>
-      arrayMap(objIds(row ?? {}), (cellId) => setAdd(tableCellIds, cellId)),
+    const tableCellOrValueIds = setNew();
+    objToArray(content ?? {}, (contentRow) =>
+      arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
+        setAdd(tableCellOrValueIds, cellOrValueId),
+      ),
     );
-    const tableColumnNames = collValues(tableCellIds);
+    const tableColumnNames = collValues(tableCellOrValueIds);
     if (
       !partial &&
       deleteEmptyTable &&
@@ -236,11 +242,11 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
       ]);
     }
     if (partial) {
-      if (isUndefined(table)) {
+      if (isUndefined(content)) {
         await cmd('DELETE FROM' + escapeId(tableName) + 'WHERE 1');
       } else {
         await promiseAll(
-          objToArray(table, async (row, rowId) => {
+          objToArray(content, async (row, rowId) => {
             if (isUndefined(row)) {
               await cmd(
                 'DELETE FROM' +
@@ -251,10 +257,14 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
                 [rowId],
               );
             } else if (!arrayIsEmpty(tableColumnNames)) {
-              await upsert(cmd, tableName, rowIdColumnName, objIds(row), [
-                rowId,
-                ...objValues(row),
-              ]);
+              await upsert(
+                cmd,
+                tableName,
+                rowIdColumnName,
+                objIds(row),
+                [rowId, ...objValues(row)],
+                useOnConflict,
+              );
             }
           }),
         );
@@ -267,7 +277,7 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
         );
         const args = [];
         const deleteRowIds = [];
-        objToArray(table ?? {}, (row, rowId) => {
+        objToArray(content ?? {}, (row, rowId) => {
           arrayPush(
             args,
             rowId,
@@ -316,9 +326,12 @@ const upsert = async (
   rowIdColumnName,
   changingColumnNames,
   args,
+  useOnConflict = true,
 ) =>
   await cmd(
-    'INSERT INTO' +
+    'INSERT ' +
+      (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+      'INTO' +
       escapeId(tableName) +
       '(' +
       escapeId(rowIdColumnName) +
@@ -336,18 +349,20 @@ const upsert = async (
         ),
         1,
       ) +
-      'ON CONFLICT(' +
-      escapeId(rowIdColumnName) +
-      ')DO UPDATE SET' +
-      arrayJoin(
-        arrayMap(
-          changingColumnNames,
-          (columnName) =>
-            escapeId(columnName) + '=excluded.' + escapeId(columnName),
-        ),
-        COMMA,
-      ),
-    args,
+      (useOnConflict
+        ? 'ON CONFLICT(' +
+          escapeId(rowIdColumnName) +
+          ')DO UPDATE SET' +
+          arrayJoin(
+            arrayMap(
+              changingColumnNames,
+              (columnName) =>
+                escapeId(columnName) + '=excluded.' + escapeId(columnName),
+            ),
+            COMMA,
+          )
+        : EMPTY_STRING),
+    arrayMap(args, (arg) => arg ?? null),
   );
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -370,6 +385,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportsMergeableStore,
   [getThing, thing] = [],
   scheduleId = [],
 ) => {
@@ -382,6 +398,10 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
+  const getContent =
+    (supportsMergeableStore ? store.getMergeableContent : null) ??
+    store.getContent;
+  const getChanges = store.getTransactionChanges;
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -417,7 +437,10 @@ const createCustomPersister = (
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
+          const content = await getPersisted();
+          (supportsMergeableStore && isString(content[0])
+            ? store.applyMergeableChanges
+            : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
         }
@@ -427,16 +450,14 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) => {
-          if (getTransactionChanges) {
-            const transactionChanges = getTransactionChanges();
-            await loadLock(async () =>
-              store.setTransactionChanges(transactionChanges),
-            );
+        async (getContent2, getChanges2) => {
+          if (getChanges2) {
+            const changes = getChanges2();
+            await loadLock(async () => store.applyChanges(changes));
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent?.() ?? (await getPersisted()));
+                store.setContent(getContent2?.() ?? (await getPersisted()));
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -454,7 +475,7 @@ const createCustomPersister = (
       }
       return persister;
     },
-    save: async (getTransactionChanges) => {
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -463,7 +484,7 @@ const createCustomPersister = (
         }
         await persister.schedule(async () => {
           try {
-            await setPersisted(store.getContent, getTransactionChanges);
+            await setPersisted(getContent, getChanges2);
           } catch (error) {
             /* istanbul ignore next */
             onIgnoredError?.(error);
@@ -475,14 +496,12 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) => {
-          const [tableChanges, valueChanges] = getTransactionChanges();
-          if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-            persister.save(() => [tableChanges, valueChanges]);
-          }
-        },
-      );
+      listenerId = store.addDidFinishTransactionListener(() => {
+        const [tableChanges, valueChanges] = getChanges();
+        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
+          persister.save(() => [tableChanges, valueChanges]);
+        }
+      });
       return persister;
     },
     stopAutoSave: () => {
@@ -548,6 +567,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     [getThing, db],
     db,
   );
@@ -568,9 +588,10 @@ const createTabularSqlitePersister = (
   managedTableNames,
   db,
   getThing,
+  useOnConflict,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
-    getCommandFunctions(cmd, managedTableNames, onIgnoredError);
+    getCommandFunctions(cmd, managedTableNames, onIgnoredError, useOnConflict);
   const saveTables = async (tables, partial) =>
     await promiseAll(
       mapMap(
@@ -579,12 +600,11 @@ const createTabularSqlitePersister = (
           [tableName, rowIdColumnName, deleteEmptyColumns, deleteEmptyTable],
           tableId,
         ) => {
-          const table = tables[tableId];
-          if (!partial || table !== void 0) {
+          if (!partial || objHas(tables, tableId)) {
             await saveTable(
               tableName,
               rowIdColumnName,
-              table,
+              tables[tableId],
               deleteEmptyColumns,
               deleteEmptyTable,
               partial,
@@ -634,11 +654,11 @@ const createTabularSqlitePersister = (
         ? [tables, values]
         : void 0;
     });
-  const setPersisted = async (getContent, getTransactionChanges) =>
+  const setPersisted = async (getContent, getChanges) =>
     await transaction(async () => {
       await refreshSchema();
-      if (!isUndefined(getTransactionChanges)) {
-        const [tableChanges, valueChanges] = getTransactionChanges();
+      if (!isUndefined(getChanges)) {
+        const [tableChanges, valueChanges] = getChanges();
         await saveTables(tableChanges, true);
         await saveValues(valueChanges, true);
       } else {
@@ -654,6 +674,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     [getThing, db],
     db,
   );
@@ -766,6 +787,7 @@ const createSqlitePersister = (
   onIgnoredError,
   db,
   getThing = 'getDb',
+  useOnConflict,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -828,6 +850,7 @@ const createSqlitePersister = (
     collValues(managedTableNamesSet),
     db,
     getThing,
+    useOnConflict,
   );
 };