tinybase 5.2.0-beta.4 → 5.2.0

package/cjs/es6/persisters/persister-electric-sql/index.cjs

@@ -97,14 +97,14 @@ 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
-    ? (sql, args) =>
+    ? (sql, params) =>
         __async$6(void 0, null, function* () {
-          onSqlCommand(sql, args);
-          return yield rawCmd(sql, args);
+          onSqlCommand(sql, params);
+          return yield executeCommand(sql, params);
         })
-    : rawCmd;
+    : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -470,7 +470,7 @@ var __async$4 = (__this, __arguments, generator) => {
   });
 };
 const getCommandFunctions = (
-  cmd,
+  databaseExecuteCommand,
   managedTableNames,
   querySchema,
   onIgnoredError,
@@ -485,8 +485,9 @@ const getCommandFunctions = (
   const refreshSchema = () =>
     __async$4(void 0, null, function* () {
       collClear(schemaMap);
-      arrayMap(yield querySchema(cmd, managedTableNames), ({tn, cn}) =>
-        setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+      arrayMap(
+        yield querySchema(databaseExecuteCommand, managedTableNames),
+        ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
       );
     });
   const loadTable = (tableName, rowIdColumnName) =>
@@ -495,7 +496,9 @@ const getCommandFunctions = (
         ? objNew(
             arrayFilter(
               arrayMap(
-                yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                yield databaseExecuteCommand(
+                  SELECT_STAR_FROM + escapeId(tableName),
+                ),
                 (row) => [
                   row[rowIdColumnName],
                   decode
@@ -531,7 +534,7 @@ const getCommandFunctions = (
         arrayIsEmpty(tableColumnNames) &&
         collHas(schemaMap, tableName)
       ) {
-        yield cmd('DROP ' + TABLE + escapeId(tableName));
+        yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
         mapSet(schemaMap, tableName);
         return;
       }
@@ -539,7 +542,7 @@ const getCommandFunctions = (
       const currentColumnNames = setNew(collValues(tableSchemaColumns));
       if (!arrayIsEmpty(tableColumnNames)) {
         if (!collHas(schemaMap, tableName)) {
-          yield cmd(
+          yield databaseExecuteCommand(
             'CREATE ' +
               TABLE +
               escapeId(tableName) +
@@ -562,7 +565,7 @@ const getCommandFunctions = (
               (columnName, index) =>
                 __async$4(void 0, null, function* () {
                   if (!collDel(currentColumnNames, columnName)) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'ADD' +
@@ -570,7 +573,7 @@ const getCommandFunctions = (
                         columnType,
                     );
                     if (index == 0) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         'CREATE UNIQUE INDEX pk ON ' +
                           escapeId(tableName) +
                           `(${escapeId(rowIdColumnName)})`,
@@ -588,7 +591,7 @@ const getCommandFunctions = (
           ? arrayMap(collValues(currentColumnNames), (columnName) =>
               __async$4(void 0, null, function* () {
                 if (columnName != rowIdColumnName) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     ALTER_TABLE +
                       escapeId(tableName) +
                       'DROP' +
@@ -602,13 +605,15 @@ const getCommandFunctions = (
       ]);
       if (partial) {
         if (isUndefined(content)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         } else {
           yield promiseAll(
             objToArray(content, (row, rowId) =>
               __async$4(void 0, null, function* () {
                 if (isUndefined(row)) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     DELETE_FROM +
                       escapeId(tableName) +
                       WHERE +
@@ -618,7 +623,7 @@ const getCommandFunctions = (
                   );
                 } else if (!arrayIsEmpty(tableColumnNames)) {
                   yield upsert(
-                    cmd,
+                    databaseExecuteCommand,
                     tableName,
                     rowIdColumnName,
                     objIds(row),
@@ -641,11 +646,11 @@ const getCommandFunctions = (
             collValues(mapGet(schemaMap, tableName)),
             (columnName) => columnName != rowIdColumnName,
           );
-          const args = [];
+          const params = [];
           const deleteRowIds = [];
           objToArray(content != null ? content : {}, (row, rowId) => {
             arrayPush(
-              args,
+              params,
               rowId,
               ...arrayMap(changingColumnNames, (cellId) =>
                 encode
@@ -658,14 +663,14 @@ const getCommandFunctions = (
             arrayPush(deleteRowIds, rowId);
           });
           yield upsert(
-            cmd,
+            databaseExecuteCommand,
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            args,
+            params,
             orReplace,
           );
-          yield cmd(
+          yield databaseExecuteCommand(
             DELETE_FROM +
               escapeId(tableName) +
               WHERE +
@@ -674,34 +679,36 @@ const getCommandFunctions = (
             deleteRowIds,
           );
         } else if (collHas(schemaMap, tableName)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         }
       }
     });
   const transaction = (actions) =>
     __async$4(void 0, null, function* () {
       let result;
-      yield cmd('BEGIN');
+      yield databaseExecuteCommand('BEGIN');
       try {
         result = yield actions();
       } catch (error) {
         onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      yield cmd('END');
+      yield databaseExecuteCommand('END');
       return result;
     });
   return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = (
-  cmd,
+  executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  args,
+  params,
   orReplace = 0,
 ) =>
   __async$4(void 0, null, function* () {
-    return yield cmd(
+    return yield executeCommand(
       'INSERT ' +
         (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
@@ -715,7 +722,7 @@ const upsert = (
           ),
         ) +
         ')VALUES' +
-        getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+        getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
         (orReplace
           ? EMPTY_STRING
           : 'ON CONFLICT(' +
@@ -729,7 +736,7 @@ const upsert = (
               ),
               COMMA,
             )),
-      arrayMap(args, (arg) => (arg != null ? arg : null)),
+      arrayMap(params, (param) => (param != null ? param : null)),
     );
   });
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -775,7 +782,7 @@ var __async$3 = (__this, __arguments, generator) => {
 };
 const createJsonPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -791,7 +798,7 @@ const createJsonPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -883,7 +890,7 @@ var __async$2 = (__this, __arguments, generator) => {
 };
 const createTabularPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -905,7 +912,7 @@ const createTabularPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -1166,14 +1173,15 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const createSqlitePersister = (
+const createCustomSqlitePersister = (
   store,
   configOrStoreTableName,
-  rawCmd,
-  addUpdateListener,
-  delUpdateListener,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
   onSqlCommand,
   onIgnoredError,
+  destroy,
   persist,
   thing,
   getThing = 'getDb',
@@ -1182,7 +1190,7 @@ const createSqlitePersister = (
   let dataVersion;
   let schemaVersion;
   let totalChanges;
-  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
@@ -1196,7 +1204,7 @@ const createSqlitePersister = (
         () =>
           __async$1(void 0, null, function* () {
             try {
-              const [{d, s, c}] = yield cmd(
+              const [{d, s, c}] = yield 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}`,
               );
@@ -1216,7 +1224,7 @@ const createSqlitePersister = (
       dataVersion = schemaVersion = totalChanges = null;
       stopInterval(interval);
     };
-    const listeningHandle = addUpdateListener((tableName) => {
+    const listeningHandle = addChangeListener((tableName) => {
       if (managedTableNamesSet.has(tableName)) {
         stopPolling();
         listener();
@@ -1226,24 +1234,24 @@ 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),
-    (cmd2, managedTableNames) =>
+    (executeCommand2, managedTableNames) =>
       __async$1(void 0, null, function* () {
-        return yield cmd2(
+        return yield 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,
@@ -1289,7 +1297,7 @@ const createElectricSqlPersister = (
   onSqlCommand,
   onIgnoredError,
 ) =>
-  createSqlitePersister(
+  createCustomSqlitePersister(
     store,
     configOrStoreTableName,
     (_0, ..._1) =>
@@ -1306,6 +1314,7 @@ const createElectricSqlPersister = (
     (unsubscribeFunction) => unsubscribeFunction(),
     onSqlCommand,
     onIgnoredError,
+    () => 0,
     1,
     // StoreOnly,
     electricClient,

package/cjs/es6/persisters/persister-electric-sql/with-schemas/index.cjs

@@ -97,14 +97,14 @@ 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
-    ? (sql, args) =>
+    ? (sql, params) =>
         __async$6(void 0, null, function* () {
-          onSqlCommand(sql, args);
-          return yield rawCmd(sql, args);
+          onSqlCommand(sql, params);
+          return yield executeCommand(sql, params);
         })
-    : rawCmd;
+    : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -470,7 +470,7 @@ var __async$4 = (__this, __arguments, generator) => {
   });
 };
 const getCommandFunctions = (
-  cmd,
+  databaseExecuteCommand,
   managedTableNames,
   querySchema,
   onIgnoredError,
@@ -485,8 +485,9 @@ const getCommandFunctions = (
   const refreshSchema = () =>
     __async$4(void 0, null, function* () {
       collClear(schemaMap);
-      arrayMap(yield querySchema(cmd, managedTableNames), ({tn, cn}) =>
-        setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+      arrayMap(
+        yield querySchema(databaseExecuteCommand, managedTableNames),
+        ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
       );
     });
   const loadTable = (tableName, rowIdColumnName) =>
@@ -495,7 +496,9 @@ const getCommandFunctions = (
         ? objNew(
             arrayFilter(
               arrayMap(
-                yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                yield databaseExecuteCommand(
+                  SELECT_STAR_FROM + escapeId(tableName),
+                ),
                 (row) => [
                   row[rowIdColumnName],
                   decode
@@ -531,7 +534,7 @@ const getCommandFunctions = (
         arrayIsEmpty(tableColumnNames) &&
         collHas(schemaMap, tableName)
       ) {
-        yield cmd('DROP ' + TABLE + escapeId(tableName));
+        yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
         mapSet(schemaMap, tableName);
         return;
       }
@@ -539,7 +542,7 @@ const getCommandFunctions = (
       const currentColumnNames = setNew(collValues(tableSchemaColumns));
       if (!arrayIsEmpty(tableColumnNames)) {
         if (!collHas(schemaMap, tableName)) {
-          yield cmd(
+          yield databaseExecuteCommand(
             'CREATE ' +
               TABLE +
               escapeId(tableName) +
@@ -562,7 +565,7 @@ const getCommandFunctions = (
               (columnName, index) =>
                 __async$4(void 0, null, function* () {
                   if (!collDel(currentColumnNames, columnName)) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'ADD' +
@@ -570,7 +573,7 @@ const getCommandFunctions = (
                         columnType,
                     );
                     if (index == 0) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         'CREATE UNIQUE INDEX pk ON ' +
                           escapeId(tableName) +
                           `(${escapeId(rowIdColumnName)})`,
@@ -588,7 +591,7 @@ const getCommandFunctions = (
           ? arrayMap(collValues(currentColumnNames), (columnName) =>
               __async$4(void 0, null, function* () {
                 if (columnName != rowIdColumnName) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     ALTER_TABLE +
                       escapeId(tableName) +
                       'DROP' +
@@ -602,13 +605,15 @@ const getCommandFunctions = (
       ]);
       if (partial) {
         if (isUndefined(content)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         } else {
           yield promiseAll(
             objToArray(content, (row, rowId) =>
               __async$4(void 0, null, function* () {
                 if (isUndefined(row)) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     DELETE_FROM +
                       escapeId(tableName) +
                       WHERE +
@@ -618,7 +623,7 @@ const getCommandFunctions = (
                   );
                 } else if (!arrayIsEmpty(tableColumnNames)) {
                   yield upsert(
-                    cmd,
+                    databaseExecuteCommand,
                     tableName,
                     rowIdColumnName,
                     objIds(row),
@@ -641,11 +646,11 @@ const getCommandFunctions = (
             collValues(mapGet(schemaMap, tableName)),
             (columnName) => columnName != rowIdColumnName,
           );
-          const args = [];
+          const params = [];
           const deleteRowIds = [];
           objToArray(content != null ? content : {}, (row, rowId) => {
             arrayPush(
-              args,
+              params,
               rowId,
               ...arrayMap(changingColumnNames, (cellId) =>
                 encode
@@ -658,14 +663,14 @@ const getCommandFunctions = (
             arrayPush(deleteRowIds, rowId);
           });
           yield upsert(
-            cmd,
+            databaseExecuteCommand,
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            args,
+            params,
             orReplace,
           );
-          yield cmd(
+          yield databaseExecuteCommand(
             DELETE_FROM +
               escapeId(tableName) +
               WHERE +
@@ -674,34 +679,36 @@ const getCommandFunctions = (
             deleteRowIds,
           );
         } else if (collHas(schemaMap, tableName)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         }
       }
     });
   const transaction = (actions) =>
     __async$4(void 0, null, function* () {
       let result;
-      yield cmd('BEGIN');
+      yield databaseExecuteCommand('BEGIN');
       try {
         result = yield actions();
       } catch (error) {
         onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      yield cmd('END');
+      yield databaseExecuteCommand('END');
       return result;
     });
   return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = (
-  cmd,
+  executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  args,
+  params,
   orReplace = 0,
 ) =>
   __async$4(void 0, null, function* () {
-    return yield cmd(
+    return yield executeCommand(
       'INSERT ' +
         (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
@@ -715,7 +722,7 @@ const upsert = (
           ),
         ) +
         ')VALUES' +
-        getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+        getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
         (orReplace
           ? EMPTY_STRING
           : 'ON CONFLICT(' +
@@ -729,7 +736,7 @@ const upsert = (
               ),
               COMMA,
             )),
-      arrayMap(args, (arg) => (arg != null ? arg : null)),
+      arrayMap(params, (param) => (param != null ? param : null)),
     );
   });
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -775,7 +782,7 @@ var __async$3 = (__this, __arguments, generator) => {
 };
 const createJsonPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -791,7 +798,7 @@ const createJsonPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -883,7 +890,7 @@ var __async$2 = (__this, __arguments, generator) => {
 };
 const createTabularPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -905,7 +912,7 @@ const createTabularPersister = (
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
@@ -1166,14 +1173,15 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const createSqlitePersister = (
+const createCustomSqlitePersister = (
   store,
   configOrStoreTableName,
-  rawCmd,
-  addUpdateListener,
-  delUpdateListener,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
   onSqlCommand,
   onIgnoredError,
+  destroy,
   persist,
   thing,
   getThing = 'getDb',
@@ -1182,7 +1190,7 @@ const createSqlitePersister = (
   let dataVersion;
   let schemaVersion;
   let totalChanges;
-  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
@@ -1196,7 +1204,7 @@ const createSqlitePersister = (
         () =>
           __async$1(void 0, null, function* () {
             try {
-              const [{d, s, c}] = yield cmd(
+              const [{d, s, c}] = yield 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}`,
               );
@@ -1216,7 +1224,7 @@ const createSqlitePersister = (
       dataVersion = schemaVersion = totalChanges = null;
       stopInterval(interval);
     };
-    const listeningHandle = addUpdateListener((tableName) => {
+    const listeningHandle = addChangeListener((tableName) => {
       if (managedTableNamesSet.has(tableName)) {
         stopPolling();
         listener();
@@ -1226,24 +1234,24 @@ 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),
-    (cmd2, managedTableNames) =>
+    (executeCommand2, managedTableNames) =>
       __async$1(void 0, null, function* () {
-        return yield cmd2(
+        return yield 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,
@@ -1289,7 +1297,7 @@ const createElectricSqlPersister = (
   onSqlCommand,
   onIgnoredError,
 ) =>
-  createSqlitePersister(
+  createCustomSqlitePersister(
     store,
     configOrStoreTableName,
     (_0, ..._1) =>
@@ -1306,6 +1314,7 @@ const createElectricSqlPersister = (
     (unsubscribeFunction) => unsubscribeFunction(),
     onSqlCommand,
     onIgnoredError,
+    () => 0,
     1,
     // StoreOnly,
     electricClient,