tinybase 5.2.0-beta.4 → 5.2.0

package/cjs/persisters/persister-sqlite3/with-schemas/index.cjs

@@ -48,13 +48,13 @@ const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const FROM = 'FROM ';
 const PRAGMA_TABLE = 'pragma_table_';
-const getWrappedCommand = (rawCmd, onSqlCommand) =>
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
   onSqlCommand
-    ? async (sql, args) => {
-        onSqlCommand(sql, args);
-        return await rawCmd(sql, args);
+    ? async (sql, params) => {
+        onSqlCommand(sql, params);
+        return await executeCommand(sql, params);
       }
-    : rawCmd;
+    : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -317,7 +317,7 @@ const setNew = (entryOrEntries) =>
 const setAdd = (set, value) => set?.add(value);
 
 const getCommandFunctions = (
-  cmd,
+  databaseExecuteCommand,
   managedTableNames,
   querySchema,
   onIgnoredError,
@@ -331,8 +331,9 @@ const getCommandFunctions = (
     collHas(mapGet(schemaMap, tableName), rowIdColumnName);
   const refreshSchema = async () => {
     collClear(schemaMap);
-    arrayMap(await querySchema(cmd, managedTableNames), ({tn, cn}) =>
-      setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+    arrayMap(
+      await querySchema(databaseExecuteCommand, managedTableNames),
+      ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
     );
   };
   const loadTable = async (tableName, rowIdColumnName) =>
@@ -340,7 +341,9 @@ const getCommandFunctions = (
       ? objNew(
           arrayFilter(
             arrayMap(
-              await cmd(SELECT_STAR_FROM + escapeId(tableName)),
+              await databaseExecuteCommand(
+                SELECT_STAR_FROM + escapeId(tableName),
+              ),
               (row) => [
                 row[rowIdColumnName],
                 decode
@@ -373,7 +376,7 @@ const getCommandFunctions = (
       arrayIsEmpty(tableColumnNames) &&
       collHas(schemaMap, tableName)
     ) {
-      await cmd('DROP ' + TABLE + escapeId(tableName));
+      await databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
       mapSet(schemaMap, tableName);
       return;
     }
@@ -381,7 +384,7 @@ const getCommandFunctions = (
     const currentColumnNames = setNew(collValues(tableSchemaColumns));
     if (!arrayIsEmpty(tableColumnNames)) {
       if (!collHas(schemaMap, tableName)) {
-        await cmd(
+        await databaseExecuteCommand(
           'CREATE ' +
             TABLE +
             escapeId(tableName) +
@@ -403,7 +406,7 @@ const getCommandFunctions = (
             [rowIdColumnName, ...tableColumnNames],
             async (columnName, index) => {
               if (!collDel(currentColumnNames, columnName)) {
-                await cmd(
+                await databaseExecuteCommand(
                   ALTER_TABLE +
                     escapeId(tableName) +
                     'ADD' +
@@ -411,7 +414,7 @@ const getCommandFunctions = (
                     columnType,
                 );
                 if (index == 0) {
-                  await cmd(
+                  await databaseExecuteCommand(
                     'CREATE UNIQUE INDEX pk ON ' +
                       escapeId(tableName) +
                       `(${escapeId(rowIdColumnName)})`,
@@ -428,7 +431,7 @@ const getCommandFunctions = (
       ...(!partial && deleteEmptyColumns
         ? arrayMap(collValues(currentColumnNames), async (columnName) => {
             if (columnName != rowIdColumnName) {
-              await cmd(
+              await databaseExecuteCommand(
                 ALTER_TABLE +
                   escapeId(tableName) +
                   'DROP' +
@@ -441,12 +444,14 @@ const getCommandFunctions = (
     ]);
     if (partial) {
       if (isUndefined(content)) {
-        await cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+        await databaseExecuteCommand(
+          DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+        );
       } else {
         await promiseAll(
           objToArray(content, async (row, rowId) => {
             if (isUndefined(row)) {
-              await cmd(
+              await databaseExecuteCommand(
                 DELETE_FROM +
                   escapeId(tableName) +
                   WHERE +
@@ -456,7 +461,7 @@ const getCommandFunctions = (
               );
             } else if (!arrayIsEmpty(tableColumnNames)) {
               await upsert(
-                cmd,
+                databaseExecuteCommand,
                 tableName,
                 rowIdColumnName,
                 objIds(row),
@@ -478,11 +483,11 @@ const getCommandFunctions = (
           collValues(mapGet(schemaMap, tableName)),
           (columnName) => columnName != rowIdColumnName,
         );
-        const args = [];
+        const params = [];
         const deleteRowIds = [];
         objToArray(content ?? {}, (row, rowId) => {
           arrayPush(
-            args,
+            params,
             rowId,
             ...arrayMap(changingColumnNames, (cellId) =>
               encode ? encode(row?.[cellId]) : row?.[cellId],
@@ -491,14 +496,14 @@ const getCommandFunctions = (
           arrayPush(deleteRowIds, rowId);
         });
         await upsert(
-          cmd,
+          databaseExecuteCommand,
           tableName,
           rowIdColumnName,
           changingColumnNames,
-          args,
+          params,
           orReplace,
         );
-        await cmd(
+        await databaseExecuteCommand(
           DELETE_FROM +
             escapeId(tableName) +
             WHERE +
@@ -507,32 +512,34 @@ const getCommandFunctions = (
           deleteRowIds,
         );
       } else if (collHas(schemaMap, tableName)) {
-        await cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+        await databaseExecuteCommand(
+          DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+        );
       }
     }
   };
   const transaction = async (actions) => {
     let result;
-    await cmd('BEGIN');
+    await databaseExecuteCommand('BEGIN');
     try {
       result = await actions();
     } catch (error) {
       onIgnoredError?.(error);
     }
-    await cmd('END');
+    await databaseExecuteCommand('END');
     return result;
   };
   return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = async (
-  cmd,
+  executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  args,
+  params,
   orReplace = 0,
 ) =>
-  await cmd(
+  await executeCommand(
     'INSERT ' +
       (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
       'INTO' +
@@ -546,7 +553,7 @@ const upsert = async (
         ),
       ) +
       ')VALUES' +
-      getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+      getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
       (orReplace
         ? EMPTY_STRING
         : 'ON CONFLICT(' +
@@ -560,7 +567,7 @@ const upsert = async (
             ),
             COMMA,
           )),
-    arrayMap(args, (arg) => arg ?? null),
+    arrayMap(params, (param) => param ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
   arrayJoin(
@@ -582,7 +589,7 @@ const getUpsertPlaceholders = (array, columnCount) =>
 
 const createJsonPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -598,7 +605,7 @@ const createJsonPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -650,7 +657,7 @@ const createJsonPersister = (
 
 const createTabularPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -672,7 +679,7 @@ const createTabularPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -878,14 +885,15 @@ const getConfigStructures = (configOrStoreTableName) => {
   return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
 };
 
-const createSqlitePersister = (
+const createCustomSqlitePersister = (
   store,
   configOrStoreTableName,
-  rawCmd,
-  addUpdateListener,
-  delUpdateListener,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
   onSqlCommand,
   onIgnoredError,
+  destroy,
   persist,
   thing,
   getThing = 'getDb',
@@ -894,7 +902,7 @@ const createSqlitePersister = (
   let dataVersion;
   let schemaVersion;
   let totalChanges;
-  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
@@ -906,7 +914,7 @@ const createSqlitePersister = (
     const startPolling = () =>
       (interval = startInterval(async () => {
         try {
-          const [{d, s, c}] = await cmd(
+          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}`,
           );
@@ -924,7 +932,7 @@ const createSqlitePersister = (
       dataVersion = schemaVersion = totalChanges = null;
       stopInterval(interval);
     };
-    const listeningHandle = addUpdateListener((tableName) => {
+    const listeningHandle = addChangeListener((tableName) => {
       if (managedTableNamesSet.has(tableName)) {
         stopPolling();
         listener();
@@ -934,23 +942,23 @@ const createSqlitePersister = (
     startPolling();
     return () => {
       stopPolling();
-      delUpdateListener(listeningHandle);
+      delChangeListener(listeningHandle);
     };
   };
   const delPersisterListener = (stopPollingAndDelUpdateListener) =>
     stopPollingAndDelUpdateListener();
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    () => 0,
+    destroy,
     persist,
     defaultedConfig,
     collValues(managedTableNamesSet),
-    async (cmd2, managedTableNames) =>
-      await cmd2(
+    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`,
         managedTableNames,
@@ -973,12 +981,12 @@ const createSqlite3Persister = (
   onSqlCommand,
   onIgnoredError,
 ) =>
-  createSqlitePersister(
+  createCustomSqlitePersister(
     store,
     configOrStoreTableName,
-    async (sql, args = []) =>
+    async (sql, params = []) =>
       await promiseNew((resolve, reject) =>
-        db.all(sql, args, (error, rows) =>
+        db.all(sql, params, (error, rows) =>
           error ? reject(error) : resolve(rows),
         ),
       ),
@@ -990,6 +998,7 @@ const createSqlite3Persister = (
     (observer) => db.off(CHANGE, observer),
     onSqlCommand,
     onIgnoredError,
+    () => 0,
     3,
     // StoreOrMergeableStore,
     db,