tinybase 5.2.0-beta.4 → 5.2.0

package/umd/es6/persisters/persister-expo-sqlite/index.js

@@ -112,14 +112,14 @@
   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(
@@ -487,7 +487,7 @@
     });
   };
   const getCommandFunctions = (
-    cmd,
+    databaseExecuteCommand,
     managedTableNames,
     querySchema,
     onIgnoredError,
@@ -502,8 +502,9 @@
     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) =>
@@ -512,7 +513,9 @@
           ? objNew(
               arrayFilter(
                 arrayMap(
-                  yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                  yield databaseExecuteCommand(
+                    SELECT_STAR_FROM + escapeId(tableName),
+                  ),
                   (row) => [
                     row[rowIdColumnName],
                     decode
@@ -548,7 +551,7 @@
           arrayIsEmpty(tableColumnNames) &&
           collHas(schemaMap, tableName)
         ) {
-          yield cmd('DROP ' + TABLE + escapeId(tableName));
+          yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
           mapSet(schemaMap, tableName);
           return;
         }
@@ -556,7 +559,7 @@
         const currentColumnNames = setNew(collValues(tableSchemaColumns));
         if (!arrayIsEmpty(tableColumnNames)) {
           if (!collHas(schemaMap, tableName)) {
-            yield cmd(
+            yield databaseExecuteCommand(
               'CREATE ' +
                 TABLE +
                 escapeId(tableName) +
@@ -579,7 +582,7 @@
                 (columnName, index) =>
                   __async$4(void 0, null, function* () {
                     if (!collDel(currentColumnNames, columnName)) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         ALTER_TABLE +
                           escapeId(tableName) +
                           'ADD' +
@@ -587,7 +590,7 @@
                           columnType,
                       );
                       if (index == 0) {
-                        yield cmd(
+                        yield databaseExecuteCommand(
                           'CREATE UNIQUE INDEX pk ON ' +
                             escapeId(tableName) +
                             `(${escapeId(rowIdColumnName)})`,
@@ -605,7 +608,7 @@
             ? arrayMap(collValues(currentColumnNames), (columnName) =>
                 __async$4(void 0, null, function* () {
                   if (columnName != rowIdColumnName) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'DROP' +
@@ -619,13 +622,15 @@
         ]);
         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 +
@@ -635,7 +640,7 @@
                     );
                   } else if (!arrayIsEmpty(tableColumnNames)) {
                     yield upsert(
-                      cmd,
+                      databaseExecuteCommand,
                       tableName,
                       rowIdColumnName,
                       objIds(row),
@@ -658,11 +663,11 @@
               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
@@ -675,14 +680,14 @@
               arrayPush(deleteRowIds, rowId);
             });
             yield upsert(
-              cmd,
+              databaseExecuteCommand,
               tableName,
               rowIdColumnName,
               changingColumnNames,
-              args,
+              params,
               orReplace,
             );
-            yield cmd(
+            yield databaseExecuteCommand(
               DELETE_FROM +
                 escapeId(tableName) +
                 WHERE +
@@ -691,34 +696,36 @@
               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' +
@@ -732,7 +739,7 @@
             ),
           ) +
           ')VALUES' +
-          getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+          getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
           (orReplace
             ? EMPTY_STRING
             : 'ON CONFLICT(' +
@@ -746,7 +753,7 @@
                 ),
                 COMMA,
               )),
-        arrayMap(args, (arg) => (arg != null ? arg : null)),
+        arrayMap(params, (param) => (param != null ? param : null)),
       );
     });
   const getUpsertPlaceholders = (array, columnCount) =>
@@ -792,7 +799,7 @@
   };
   const createJsonPersister = (
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -808,7 +815,7 @@
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
-        cmd,
+        executeCommand,
         managedTableNames,
         querySchema,
         onIgnoredError,
@@ -900,7 +907,7 @@
   };
   const createTabularPersister = (
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -922,7 +929,7 @@
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
-        cmd,
+        executeCommand,
         managedTableNames,
         querySchema,
         onIgnoredError,
@@ -1189,14 +1196,15 @@
       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',
@@ -1205,7 +1213,7 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
-    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+    const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
@@ -1219,7 +1227,7 @@
           () =>
             __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}`,
                 );
@@ -1243,7 +1251,7 @@
         dataVersion = schemaVersion = totalChanges = null;
         stopInterval(interval);
       };
-      const listeningHandle = addUpdateListener((tableName) => {
+      const listeningHandle = addChangeListener((tableName) => {
         if (managedTableNamesSet.has(tableName)) {
           stopPolling();
           listener();
@@ -1253,24 +1261,24 @@
       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,
@@ -1316,12 +1324,12 @@
     onSqlCommand,
     onIgnoredError,
   ) =>
-    createSqlitePersister(
+    createCustomSqlitePersister(
       store,
       configOrStoreTableName,
       (_0, ..._1) =>
-        __async(void 0, [_0, ..._1], function* (sql, args = []) {
-          return yield db.getAllAsync(sql, args);
+        __async(void 0, [_0, ..._1], function* (sql, params = []) {
+          return yield db.getAllAsync(sql, params);
         }),
       (listener) =>
         expoSqlite.addDatabaseChangeListener(({tableName}) =>
@@ -1330,6 +1338,7 @@
       (subscription) => subscription.remove(),
       onSqlCommand,
       onIgnoredError,
+      () => 0,
       3,
       // StoreOrMergeableStore,
       db,

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

@@ -112,14 +112,14 @@
   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(
@@ -487,7 +487,7 @@
     });
   };
   const getCommandFunctions = (
-    cmd,
+    databaseExecuteCommand,
     managedTableNames,
     querySchema,
     onIgnoredError,
@@ -502,8 +502,9 @@
     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) =>
@@ -512,7 +513,9 @@
           ? objNew(
               arrayFilter(
                 arrayMap(
-                  yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                  yield databaseExecuteCommand(
+                    SELECT_STAR_FROM + escapeId(tableName),
+                  ),
                   (row) => [
                     row[rowIdColumnName],
                     decode
@@ -548,7 +551,7 @@
           arrayIsEmpty(tableColumnNames) &&
           collHas(schemaMap, tableName)
         ) {
-          yield cmd('DROP ' + TABLE + escapeId(tableName));
+          yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
           mapSet(schemaMap, tableName);
           return;
         }
@@ -556,7 +559,7 @@
         const currentColumnNames = setNew(collValues(tableSchemaColumns));
         if (!arrayIsEmpty(tableColumnNames)) {
           if (!collHas(schemaMap, tableName)) {
-            yield cmd(
+            yield databaseExecuteCommand(
               'CREATE ' +
                 TABLE +
                 escapeId(tableName) +
@@ -579,7 +582,7 @@
                 (columnName, index) =>
                   __async$4(void 0, null, function* () {
                     if (!collDel(currentColumnNames, columnName)) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         ALTER_TABLE +
                           escapeId(tableName) +
                           'ADD' +
@@ -587,7 +590,7 @@
                           columnType,
                       );
                       if (index == 0) {
-                        yield cmd(
+                        yield databaseExecuteCommand(
                           'CREATE UNIQUE INDEX pk ON ' +
                             escapeId(tableName) +
                             `(${escapeId(rowIdColumnName)})`,
@@ -605,7 +608,7 @@
             ? arrayMap(collValues(currentColumnNames), (columnName) =>
                 __async$4(void 0, null, function* () {
                   if (columnName != rowIdColumnName) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'DROP' +
@@ -619,13 +622,15 @@
         ]);
         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 +
@@ -635,7 +640,7 @@
                     );
                   } else if (!arrayIsEmpty(tableColumnNames)) {
                     yield upsert(
-                      cmd,
+                      databaseExecuteCommand,
                       tableName,
                       rowIdColumnName,
                       objIds(row),
@@ -658,11 +663,11 @@
               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
@@ -675,14 +680,14 @@
               arrayPush(deleteRowIds, rowId);
             });
             yield upsert(
-              cmd,
+              databaseExecuteCommand,
               tableName,
               rowIdColumnName,
               changingColumnNames,
-              args,
+              params,
               orReplace,
             );
-            yield cmd(
+            yield databaseExecuteCommand(
               DELETE_FROM +
                 escapeId(tableName) +
                 WHERE +
@@ -691,34 +696,36 @@
               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' +
@@ -732,7 +739,7 @@
             ),
           ) +
           ')VALUES' +
-          getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
+          getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
           (orReplace
             ? EMPTY_STRING
             : 'ON CONFLICT(' +
@@ -746,7 +753,7 @@
                 ),
                 COMMA,
               )),
-        arrayMap(args, (arg) => (arg != null ? arg : null)),
+        arrayMap(params, (param) => (param != null ? param : null)),
       );
     });
   const getUpsertPlaceholders = (array, columnCount) =>
@@ -792,7 +799,7 @@
   };
   const createJsonPersister = (
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -808,7 +815,7 @@
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
-        cmd,
+        executeCommand,
         managedTableNames,
         querySchema,
         onIgnoredError,
@@ -900,7 +907,7 @@
   };
   const createTabularPersister = (
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -922,7 +929,7 @@
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
-        cmd,
+        executeCommand,
         managedTableNames,
         querySchema,
         onIgnoredError,
@@ -1189,14 +1196,15 @@
       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',
@@ -1205,7 +1213,7 @@
     let dataVersion;
     let schemaVersion;
     let totalChanges;
-    const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+    const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
     const [
       isJson,
       autoLoadIntervalSeconds,
@@ -1219,7 +1227,7 @@
           () =>
             __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}`,
                 );
@@ -1243,7 +1251,7 @@
         dataVersion = schemaVersion = totalChanges = null;
         stopInterval(interval);
       };
-      const listeningHandle = addUpdateListener((tableName) => {
+      const listeningHandle = addChangeListener((tableName) => {
         if (managedTableNamesSet.has(tableName)) {
           stopPolling();
           listener();
@@ -1253,24 +1261,24 @@
       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,
@@ -1316,12 +1324,12 @@
     onSqlCommand,
     onIgnoredError,
   ) =>
-    createSqlitePersister(
+    createCustomSqlitePersister(
       store,
       configOrStoreTableName,
       (_0, ..._1) =>
-        __async(void 0, [_0, ..._1], function* (sql, args = []) {
-          return yield db.getAllAsync(sql, args);
+        __async(void 0, [_0, ..._1], function* (sql, params = []) {
+          return yield db.getAllAsync(sql, params);
         }),
       (listener) =>
         expoSqlite.addDatabaseChangeListener(({tableName}) =>
@@ -1330,6 +1338,7 @@
       (subscription) => subscription.remove(),
       onSqlCommand,
       onIgnoredError,
+      () => 0,
       3,
       // StoreOrMergeableStore,
       db,