tinybase 6.1.0-beta.4 → 6.1.0-beta.5

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

@@ -5,7 +5,10 @@ const TINYBASE = 'tinybase';
 const EMPTY_STRING = '';
 const COMMA = ',';
 const STRING = getTypeOf(EMPTY_STRING);
+const TRUE = 'true';
 const UNDEFINED = '\uFFFC';
+const strReplace = (str, searchValue, replaceValue) =>
+  str.replace(searchValue, replaceValue);
 
 const promise = Promise;
 const THOUSAND = 1e3;
@@ -21,10 +24,19 @@ const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
+const noop = () => {};
 const promiseAll = async (promises) => promise.all(promises);
 const errorNew = (message) => {
   throw new Error(message);
 };
+const tryCatch = async (action, then1, then2) => {
+  try {
+    return await action();
+  } catch (error) {
+    /* istanbul ignore next */
+    then1?.(error);
+  }
+};
 
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
@@ -48,14 +60,20 @@ const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
 const SELECT = 'SELECT';
 const WHERE = 'WHERE';
 const TABLE = 'TABLE';
+const INSERT = 'INSERT';
+const DELETE = 'DELETE';
+const UPDATE = 'UPDATE';
 const ALTER_TABLE = 'ALTER ' + TABLE;
-const DELETE_FROM = 'DELETE FROM';
-const SELECT_STAR_FROM = SELECT + '*FROM';
+const FROM = 'FROM';
+const DELETE_FROM = DELETE + ' ' + FROM;
+const SELECT_STAR_FROM = SELECT + '*' + FROM;
 const PRAGMA = 'pragma_';
 const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
-const FROM = 'FROM ';
 const PRAGMA_TABLE = 'pragma_table_';
+const CREATE = 'CREATE ';
+const CREATE_TABLE = CREATE + TABLE;
+const TABLE_NAME_PLACEHOLDER = '$tableName';
 const getWrappedCommand = (executeCommand, onSqlCommand) =>
   onSqlCommand
     ? async (sql, params) => {
@@ -63,7 +81,7 @@ const getWrappedCommand = (executeCommand, onSqlCommand) =>
         return await executeCommand(sql, params);
       }
     : executeCommand;
-const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
+const escapeId = (str) => `"${strReplace(str, /"/g, '""')}"`;
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
 const getPlaceholders = (array, offset = [1]) =>
@@ -71,6 +89,9 @@ const getPlaceholders = (array, offset = [1]) =>
     arrayMap(array, () => '$' + offset[0]++),
     COMMA,
   );
+const getWhereCondition = (tableName, condition = TRUE) =>
+  WHERE +
+  `(${strReplace(condition, TABLE_NAME_PLACEHOLDER, escapeId(tableName))})`;
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
@@ -105,6 +126,8 @@ const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
+const mapForEach = (map, cb) =>
+  collForEach(map, (value, key) => cb(key, value));
 const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
@@ -159,6 +182,7 @@ const TABLE_ID = 'tableId';
 const TABLE_NAME = 'tableName';
 const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
 const DELETE_EMPTY_TABLE = 'deleteEmptyTable';
+const CONDITION = 'condition';
 const DEFAULT_CONFIG = {
   mode: JSON$1,
   [AUTO_LOAD_INTERVAL_SECONDS]: 1,
@@ -226,29 +250,42 @@ const getConfigStructures = (configOrStoreTableName) => {
   const valuesTable = valuesConfig[2];
   const managedTableNames = setNew(valuesTable);
   const excludedTableNames = setNew(valuesTable);
-  const tabularConfig = [
-    getDefaultedTabularConfigMap(
-      load,
-      {[TABLE_ID]: null, [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME},
-      TABLE_ID,
-      (tableName) => collHas(excludedTableNames, tableName),
-      (tableName) => setAdd(managedTableNames, tableName),
-    ),
-    getDefaultedTabularConfigMap(
-      save,
-      {
-        [TABLE_NAME]: null,
-        [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
-        [DELETE_EMPTY_COLUMNS]: 0,
-        [DELETE_EMPTY_TABLE]: 0,
-      },
-      TABLE_NAME,
-      (_, tableName) => collHas(excludedTableNames, tableName),
-      (_, tableName) => setAdd(managedTableNames, tableName),
-    ),
-    valuesConfig,
+  const tablesLoadConfig = getDefaultedTabularConfigMap(
+    load,
+    {
+      [TABLE_ID]: null,
+      [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
+      [CONDITION]: TRUE,
+    },
+    TABLE_ID,
+    (tableName) => collHas(excludedTableNames, tableName),
+    (tableName) => setAdd(managedTableNames, tableName),
+  );
+  const tablesSaveConfig = getDefaultedTabularConfigMap(
+    save,
+    {
+      [TABLE_NAME]: null,
+      [ROW_ID_COLUMN_NAME]: DEFAULT_ROW_ID_COLUMN_NAME,
+      [DELETE_EMPTY_COLUMNS]: 0,
+      [DELETE_EMPTY_TABLE]: 0,
+      [CONDITION]: null,
+    },
+    TABLE_NAME,
+    (_, tableName) => collHas(excludedTableNames, tableName),
+    (_, tableName) => setAdd(managedTableNames, tableName),
+  );
+  mapForEach(
+    tablesSaveConfig,
+    (_, tableSaveConfig) =>
+      (tableSaveConfig[4] ??=
+        mapGet(tablesLoadConfig, tableSaveConfig[0])?.[2] ?? TRUE),
+  );
+  return [
+    0,
+    autoLoadIntervalSeconds,
+    [tablesLoadConfig, tablesSaveConfig, valuesConfig],
+    managedTableNames,
   ];
-  return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
 };
 
 const jsonString = JSON.stringify;
@@ -414,12 +451,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {
-          /* istanbul ignore next */
-          onIgnoredError?.(error);
-        }
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -439,21 +471,23 @@ const createCustomPersister = (
       setStatus(1 /* Loading */);
       loads++;
       await schedule(async () => {
-        try {
-          const content = await getPersisted();
-          if (isArray(content)) {
-            setContentOrChanges(content);
-          } else if (initialContent) {
-            setDefaultContent(initialContent);
-          } else {
-            errorNew(`Content is not an array: ${content}`);
-          }
-        } catch (error) {
-          onIgnoredError?.(error);
-          if (initialContent) {
-            setDefaultContent(initialContent);
-          }
-        }
+        await tryCatch(
+          async () => {
+            const content = await getPersisted();
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else if (initialContent) {
+              setDefaultContent(initialContent);
+            } else {
+              errorNew(`Content is not an array: ${content}`);
+            }
+          },
+          () => {
+            if (initialContent) {
+              setDefaultContent(initialContent);
+            }
+          },
+        );
         setStatus(0 /* Idle */);
       });
     }
@@ -462,29 +496,33 @@ const createCustomPersister = (
   const startAutoLoad = async (initialContent) => {
     stopAutoLoad();
     await load(initialContent);
-    try {
-      autoLoadHandle = await addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (status != 2 /* Saving */) {
-            setStatus(1 /* Loading */);
-            loads++;
-            setContentOrChanges(changes ?? content);
-            setStatus(0 /* Idle */);
-          }
-        } else {
-          await load();
-        }
-      });
-    } catch (error) {
-      /* istanbul ignore next */
-      onIgnoredError?.(error);
-    }
+    await tryCatch(
+      async () =>
+        (autoLoadHandle = await addPersisterListener(
+          async (content, changes) => {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (status != 2 /* Saving */) {
+                setStatus(1 /* Loading */);
+                loads++;
+                setContentOrChanges(changes ?? content);
+                setStatus(0 /* Idle */);
+              }
+            } else {
+              await load();
+            }
+          },
+        )),
+      onIgnoredError,
+    );
     return persister;
   };
-  const stopAutoLoad = () => {
+  const stopAutoLoad = async () => {
     if (autoLoadHandle) {
-      delPersisterListener(autoLoadHandle);
+      await tryCatch(
+        () => delPersisterListener(autoLoadHandle),
+        onIgnoredError,
+      );
       autoLoadHandle = void 0;
     }
     return persister;
@@ -496,12 +534,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {
-          /* istanbul ignore next */
-          onIgnoredError?.(error);
-        }
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -518,7 +551,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -539,9 +572,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => {
+  const destroy = async () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    return stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    return await persister.stopAutoSave();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -585,13 +619,15 @@ const getCommandFunctions = (
       ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
     );
   };
-  const loadTable = async (tableName, rowIdColumnName) =>
+  const loadTable = async (tableName, rowIdColumnName, condition) =>
     canSelect(tableName, rowIdColumnName)
       ? objNew(
           arrayFilter(
             arrayMap(
               await databaseExecuteCommand(
-                SELECT_STAR_FROM + escapeId(tableName),
+                SELECT_STAR_FROM +
+                  escapeId(tableName) +
+                  getWhereCondition(tableName, condition),
               ),
               (row) => [
                 row[rowIdColumnName],
@@ -611,6 +647,7 @@ const getCommandFunctions = (
     deleteEmptyColumns,
     deleteEmptyTable,
     partial = false,
+    condition = TRUE,
   ) => {
     const settingColumnNameSet = setNew();
     objMap(content ?? {}, (contentRow) =>
@@ -622,6 +659,7 @@ const getCommandFunctions = (
     if (
       !partial &&
       deleteEmptyTable &&
+      condition == TRUE &&
       arrayIsEmpty(settingColumnNames) &&
       collHas(schemaMap, tableName)
     ) {
@@ -634,8 +672,7 @@ const getCommandFunctions = (
     if (!arrayIsEmpty(settingColumnNames)) {
       if (!collHas(schemaMap, tableName)) {
         await databaseExecuteCommand(
-          'CREATE ' +
-            TABLE +
+          CREATE_TABLE +
             escapeId(tableName) +
             `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
               arrayMap(
@@ -698,7 +735,9 @@ const getCommandFunctions = (
     if (partial) {
       if (isUndefined(content)) {
         await databaseExecuteCommand(
-          DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          DELETE_FROM +
+            escapeId(tableName) +
+            getWhereCondition(tableName, condition),
         );
       } else {
         await promiseAll(
@@ -707,9 +746,8 @@ const getCommandFunctions = (
               await databaseExecuteCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
-                  WHERE +
-                  escapeId(rowIdColumnName) +
-                  '=$1',
+                  getWhereCondition(tableName, condition) +
+                  `AND(${escapeId(rowIdColumnName)}=$1)`,
                 [rowId],
               );
             } else if (!arrayIsEmpty(settingColumnNames)) {
@@ -753,14 +791,15 @@ const getCommandFunctions = (
         await databaseExecuteCommand(
           DELETE_FROM +
             escapeId(tableName) +
-            WHERE +
-            escapeId(rowIdColumnName) +
-            `NOT IN(${getPlaceholders(deleteRowIds)})`,
+            getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
           deleteRowIds,
         );
       } else if (collHas(schemaMap, tableName)) {
         await databaseExecuteCommand(
-          DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          DELETE_FROM +
+            escapeId(tableName) +
+            getWhereCondition(tableName, condition),
         );
       }
     }
@@ -768,11 +807,7 @@ const getCommandFunctions = (
   const transaction = async (actions) => {
     let result;
     await databaseExecuteCommand('BEGIN');
-    try {
-      result = await actions();
-    } catch (error) {
-      onIgnoredError?.(error);
-    }
+    await tryCatch(async () => (result = await actions()), onIgnoredError);
     await databaseExecuteCommand('END');
     return result;
   };
@@ -787,7 +822,8 @@ const defaultUpsert = async (
 ) => {
   const offset = [1];
   await executeCommand(
-    'INSERT INTO' +
+    INSERT +
+      ' INTO' +
       escapeId(tableName) +
       '(' +
       escapeColumnNames(rowIdColumnName, ...changingColumnNames) +
@@ -802,7 +838,7 @@ const defaultUpsert = async (
       ) +
       'ON CONFLICT(' +
       escapeId(rowIdColumnName) +
-      ')DO UPDATE SET' +
+      `)DO ${UPDATE} SET` +
       arrayJoin(
         arrayMap(
           changingColumnNames,
@@ -824,7 +860,7 @@ const createJsonPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  destroyImpl,
+  extraDestroy,
   persist,
   [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
@@ -843,8 +879,8 @@ const createJsonPersister = (
       columnType,
       upsert,
     );
-  const getPersisted = async () =>
-    await transaction(async () => {
+  const getPersisted = () =>
+    transaction(async () => {
       await refreshSchema();
       return jsonParseWithUndefined(
         (await loadTable(storeTableName, storeIdColumnName))[SINGLE_ROW_ID]?.[
@@ -852,8 +888,8 @@ const createJsonPersister = (
         ] ?? 'null',
       );
     });
-  const setPersisted = async (getContent) =>
-    await transaction(async () => {
+  const setPersisted = (getContent) =>
+    transaction(async () => {
       await refreshSchema();
       await saveTable(
         storeTableName,
@@ -867,9 +903,10 @@ const createJsonPersister = (
         true,
       );
     });
-  const destroy = () => {
-    persister.stopAutoLoad().stopAutoSave();
-    destroyImpl();
+  const destroy = async () => {
+    await persister.stopAutoLoad();
+    await persister.stopAutoSave();
+    extraDestroy();
     return persister;
   };
   const persister = createCustomPersister(
@@ -893,7 +930,7 @@ const createTabularPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  destroyImpl,
+  extraDestroy,
   persist,
   [
     tablesLoadConfig,
@@ -920,12 +957,18 @@ const createTabularPersister = (
       encode,
       decode,
     );
-  const saveTables = async (tables, partial) =>
-    await promiseAll(
+  const saveTables = (tables, partial) =>
+    promiseAll(
       mapMap(
         tablesSaveConfig,
         async (
-          [tableName, rowIdColumnName, deleteEmptyColumns, deleteEmptyTable],
+          [
+            tableName,
+            rowIdColumnName,
+            deleteEmptyColumns,
+            deleteEmptyTable,
+            condition,
+          ],
           tableId,
         ) => {
           if (!partial || objHas(tables, tableId)) {
@@ -936,6 +979,7 @@ const createTabularPersister = (
               deleteEmptyColumns,
               deleteEmptyTable,
               partial,
+              condition,
             );
           }
         },
@@ -958,9 +1002,9 @@ const createTabularPersister = (
         await promiseAll(
           mapMap(
             tablesLoadConfig,
-            async ([tableId, rowIdColumnName], tableName) => [
+            async ([tableId, rowIdColumnName, condition], tableName) => [
               tableId,
-              await loadTable(tableName, rowIdColumnName),
+              await loadTable(tableName, rowIdColumnName, condition),
             ],
           ),
         ),
@@ -973,8 +1017,8 @@ const createTabularPersister = (
           SINGLE_ROW_ID
         ]
       : {};
-  const getPersisted = async () =>
-    await transaction(async () => {
+  const getPersisted = () =>
+    transaction(async () => {
       await refreshSchema();
       const tables = await loadTables();
       const values = await loadValues();
@@ -982,8 +1026,8 @@ const createTabularPersister = (
         ? [tables, values]
         : void 0;
     });
-  const setPersisted = async (getContent, changes) =>
-    await transaction(async () => {
+  const setPersisted = (getContent, changes) =>
+    transaction(async () => {
       await refreshSchema();
       if (!isUndefined(changes)) {
         await saveTables(changes[0], true);
@@ -994,9 +1038,10 @@ const createTabularPersister = (
         await saveValues(values);
       }
     });
-  const destroy = () => {
-    persister.stopAutoLoad().stopAutoSave();
-    destroyImpl();
+  const destroy = async () => {
+    await persister.stopAutoLoad();
+    await persister.stopAutoSave();
+    extraDestroy();
     return persister;
   };
   const persister = createCustomPersister(
@@ -1041,22 +1086,24 @@ const createCustomSqlitePersister = (
   const addPersisterListener = (listener) => {
     let interval;
     const startPolling = () =>
-      (interval = startInterval(async () => {
-        try {
-          const [{d, s, c}] = await executeCommand(
-            // eslint-disable-next-line max-len
-            `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-          );
-          if (d != dataVersion || s != schemaVersion || c != totalChanges) {
-            if (dataVersion != null) {
-              listener();
+      (interval = startInterval(
+        () =>
+          tryCatch(async () => {
+            const [{d, s, c}] = await executeCommand(
+              SELECT + // eslint-disable-next-line max-len
+                ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+            );
+            if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+              if (dataVersion != null) {
+                listener();
+              }
+              dataVersion = d;
+              schemaVersion = s;
+              totalChanges = c;
             }
-            dataVersion = d;
-            schemaVersion = s;
-            totalChanges = c;
-          }
-        } catch {}
-      }, autoLoadIntervalSeconds));
+          }),
+        autoLoadIntervalSeconds,
+      ));
     const stopPolling = () => {
       dataVersion = schemaVersion = totalChanges = null;
       stopInterval(interval);
@@ -1088,8 +1135,8 @@ const createCustomSqlitePersister = (
     collValues(managedTableNamesSet),
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
-        // eslint-disable-next-line max-len
-        `${SELECT} t.name tn,c.name cn ${FROM}${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
+        SELECT + // eslint-disable-next-line max-len
+          ` t.name tn,c.name cn FROM ${PRAGMA_TABLE}list()t,${PRAGMA_TABLE}info(t.name)c ${WHERE} t.schema='main'AND t.type IN('table','view')AND t.name IN(${getPlaceholders(managedTableNames)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
@@ -1118,7 +1165,7 @@ const createExpoSqlitePersister = (
     (subscription) => subscription.remove(),
     onSqlCommand,
     onIgnoredError,
-    () => 0,
+    noop,
     3,
     // StoreOrMergeableStore,
     db,