tinybase 5.2.0-beta.2 → 5.2.0-beta.4

package/persisters/persister-sqlite3/index.js

@@ -7,7 +7,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -47,6 +46,13 @@ const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const FROM = 'FROM ';
 const PRAGMA_TABLE = 'pragma_table_';
+const getWrappedCommand = (rawCmd, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, args) => {
+        onSqlCommand(sql, args);
+        return await rawCmd(sql, args);
+      }
+    : rawCmd;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -84,14 +90,18 @@ const objDel = (obj, id) => {
 };
 const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+const objMap = (obj, cb) =>
+  objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
@@ -188,9 +198,11 @@ const createCustomPersister = (
       await schedule(async () => {
         try {
           const content = await getPersisted();
-          isArray(content)
-            ? setContentOrChanges(content)
-            : errorNew(`Content is not an array ${content}`);
+          if (isArray(content)) {
+            setContentOrChanges(content);
+          } else {
+            errorNew(`Content is not an array ${content}`);
+          }
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -307,7 +319,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -326,7 +341,9 @@ const getCommandFunctions = (
               await cmd(SELECT_STAR_FROM + escapeId(tableName)),
               (row) => [
                 row[rowIdColumnName],
-                objDel({...row}, rowIdColumnName),
+                decode
+                  ? objMap(objDel(row, rowIdColumnName), decode)
+                  : objDel(row, rowIdColumnName),
               ],
             ),
             ([rowId, row]) => !isUndefined(rowId) && !objIsEmpty(row),
@@ -366,10 +383,10 @@ const getCommandFunctions = (
           'CREATE ' +
             TABLE +
             escapeId(tableName) +
-            `(${escapeId(rowIdColumnName)}text PRIMARY KEY${arrayJoin(
+            `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
               arrayMap(
                 tableColumnNames,
-                (columnName) => COMMA + escapeId(columnName) + 'json',
+                (columnName) => COMMA + escapeId(columnName) + columnType,
               ),
             )});`,
         );
@@ -389,7 +406,7 @@ const getCommandFunctions = (
                     escapeId(tableName) +
                     'ADD' +
                     escapeId(columnName) +
-                    (index == 0 ? 'text' : 'json'),
+                    columnType,
                 );
                 if (index == 0) {
                   await cmd(
@@ -441,8 +458,13 @@ const getCommandFunctions = (
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [rowId, ...objValues(row)],
-                useOnConflict,
+                [
+                  rowId,
+                  ...(encode
+                    ? arrayMap(objValues(row), encode)
+                    : objValues(row)),
+                ],
+                orReplace,
               );
             }
           }),
@@ -460,7 +482,9 @@ const getCommandFunctions = (
           arrayPush(
             args,
             rowId,
-            ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+            ...arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
+            ),
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -470,7 +494,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
-          useOnConflict,
+          orReplace,
         );
         await cmd(
           DELETE_FROM +
@@ -504,11 +528,11 @@ const upsert = async (
   rowIdColumnName,
   changingColumnNames,
   args,
-  useOnConflict = true,
+  orReplace = 0,
 ) =>
   await cmd(
     'INSERT ' +
-      (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+      (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
       'INTO' +
       escapeId(tableName) +
       '(' +
@@ -521,8 +545,9 @@ const upsert = async (
       ) +
       ')VALUES' +
       getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-      (useOnConflict
-        ? 'ON CONFLICT(' +
+      (orReplace
+        ? EMPTY_STRING
+        : 'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
           ')DO UPDATE SET' +
           arrayJoin(
@@ -532,8 +557,7 @@ const upsert = async (
                 escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
             COMMA,
-          )
-        : EMPTY_STRING),
+          )),
     arrayMap(args, (arg) => arg ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -567,7 +591,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -575,7 +600,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -637,7 +663,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -645,7 +674,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = async (tables, partial) =>
     await promiseAll(
@@ -847,7 +879,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -855,52 +887,59 @@ const createSqlitePersister = (
   persist,
   thing,
   getThing = 'getDb',
-  useOnConflict,
+  orReplace,
 ) => {
   let dataVersion;
   let schemaVersion;
   let totalChanges;
+  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
     defaultedConfig,
     managedTableNamesSet,
   ] = getConfigStructures(configOrStoreTableName);
-  const addPersisterListener = (listener) => [
-    startInterval(async () => {
-      try {
-        const [{d, s, c}] = await cmd(
-          SELECT +
-            ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-        );
-        if (
-          d != (dataVersion ??= d) ||
-          s != (schemaVersion ??= s) ||
-          c != (totalChanges ??= c)
-        ) {
-          listener();
-          dataVersion = d;
-          schemaVersion = s;
-        }
-      } catch {}
-    }, autoLoadIntervalSeconds),
-    addUpdateListener((tableName) =>
-      managedTableNamesSet.has(tableName) ? listener() : 0,
-    ),
-  ];
-  const delPersisterListener = ([interval, listeningHandle]) => {
-    stopInterval(interval);
-    dataVersion = schemaVersion = totalChanges = null;
-    delUpdateListener(listeningHandle);
+  const addPersisterListener = (listener) => {
+    let interval;
+    const startPolling = () =>
+      (interval = startInterval(async () => {
+        try {
+          const [{d, s, c}] = await cmd(
+            // 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();
+            }
+            dataVersion = d;
+            schemaVersion = s;
+            totalChanges = c;
+          }
+        } catch {}
+      }, autoLoadIntervalSeconds));
+    const stopPolling = () => {
+      dataVersion = schemaVersion = totalChanges = null;
+      stopInterval(interval);
+    };
+    const listeningHandle = addUpdateListener((tableName) => {
+      if (managedTableNamesSet.has(tableName)) {
+        stopPolling();
+        listener();
+        startPolling();
+      }
+    });
+    startPolling();
+    return () => {
+      stopPolling();
+      delUpdateListener(listeningHandle);
+    };
   };
+  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+    stopPollingAndDelUpdateListener();
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    onSqlCommand
-      ? async (sql, args) => {
-          onSqlCommand(sql, args);
-          return await cmd(sql, args);
-        }
-      : cmd,
+    cmd,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -916,7 +955,11 @@ const createSqlitePersister = (
       ),
     thing,
     getThing,
-    useOnConflict,
+    EMPTY_STRING,
+    orReplace,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
   );
 };
 

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

@@ -7,7 +7,6 @@ const UNDEFINED = '\uFFFC';
 
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -47,6 +46,13 @@ const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const FROM = 'FROM ';
 const PRAGMA_TABLE = 'pragma_table_';
+const getWrappedCommand = (rawCmd, onSqlCommand) =>
+  onSqlCommand
+    ? async (sql, args) => {
+        onSqlCommand(sql, args);
+        return await rawCmd(sql, args);
+      }
+    : rawCmd;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -84,14 +90,18 @@ const objDel = (obj, id) => {
 };
 const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
+const objMap = (obj, cb) =>
+  objNew(objToArray(obj, (value, id) => [id, cb(value, id)]));
 const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
 const jsonStringWithUndefined = (obj) =>
-  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+  jsonString(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
 const jsonParseWithUndefined = (str) =>
-  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
+  jsonParse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
 const mapNew = (entries) => new Map(entries);
 const mapGet = (map, key) => map?.get(key);
@@ -188,9 +198,11 @@ const createCustomPersister = (
       await schedule(async () => {
         try {
           const content = await getPersisted();
-          isArray(content)
-            ? setContentOrChanges(content)
-            : errorNew(`Content is not an array ${content}`);
+          if (isArray(content)) {
+            setContentOrChanges(content);
+          } else {
+            errorNew(`Content is not an array ${content}`);
+          }
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {
@@ -307,7 +319,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -326,7 +341,9 @@ const getCommandFunctions = (
               await cmd(SELECT_STAR_FROM + escapeId(tableName)),
               (row) => [
                 row[rowIdColumnName],
-                objDel({...row}, rowIdColumnName),
+                decode
+                  ? objMap(objDel(row, rowIdColumnName), decode)
+                  : objDel(row, rowIdColumnName),
               ],
             ),
             ([rowId, row]) => !isUndefined(rowId) && !objIsEmpty(row),
@@ -366,10 +383,10 @@ const getCommandFunctions = (
           'CREATE ' +
             TABLE +
             escapeId(tableName) +
-            `(${escapeId(rowIdColumnName)}text PRIMARY KEY${arrayJoin(
+            `(${escapeId(rowIdColumnName)}${columnType} PRIMARY KEY${arrayJoin(
               arrayMap(
                 tableColumnNames,
-                (columnName) => COMMA + escapeId(columnName) + 'json',
+                (columnName) => COMMA + escapeId(columnName) + columnType,
               ),
             )});`,
         );
@@ -389,7 +406,7 @@ const getCommandFunctions = (
                     escapeId(tableName) +
                     'ADD' +
                     escapeId(columnName) +
-                    (index == 0 ? 'text' : 'json'),
+                    columnType,
                 );
                 if (index == 0) {
                   await cmd(
@@ -441,8 +458,13 @@ const getCommandFunctions = (
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [rowId, ...objValues(row)],
-                useOnConflict,
+                [
+                  rowId,
+                  ...(encode
+                    ? arrayMap(objValues(row), encode)
+                    : objValues(row)),
+                ],
+                orReplace,
               );
             }
           }),
@@ -460,7 +482,9 @@ const getCommandFunctions = (
           arrayPush(
             args,
             rowId,
-            ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+            ...arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
+            ),
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -470,7 +494,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
-          useOnConflict,
+          orReplace,
         );
         await cmd(
           DELETE_FROM +
@@ -504,11 +528,11 @@ const upsert = async (
   rowIdColumnName,
   changingColumnNames,
   args,
-  useOnConflict = true,
+  orReplace = 0,
 ) =>
   await cmd(
     'INSERT ' +
-      (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+      (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
       'INTO' +
       escapeId(tableName) +
       '(' +
@@ -521,8 +545,9 @@ const upsert = async (
       ) +
       ')VALUES' +
       getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-      (useOnConflict
-        ? 'ON CONFLICT(' +
+      (orReplace
+        ? EMPTY_STRING
+        : 'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
           ')DO UPDATE SET' +
           arrayJoin(
@@ -532,8 +557,7 @@ const upsert = async (
                 escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
             COMMA,
-          )
-        : EMPTY_STRING),
+          )),
     arrayMap(args, (arg) => arg ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -567,7 +591,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -575,7 +600,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -637,7 +663,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -645,7 +674,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = async (tables, partial) =>
     await promiseAll(
@@ -847,7 +879,7 @@ const getConfigStructures = (configOrStoreTableName) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -855,52 +887,59 @@ const createSqlitePersister = (
   persist,
   thing,
   getThing = 'getDb',
-  useOnConflict,
+  orReplace,
 ) => {
   let dataVersion;
   let schemaVersion;
   let totalChanges;
+  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
     defaultedConfig,
     managedTableNamesSet,
   ] = getConfigStructures(configOrStoreTableName);
-  const addPersisterListener = (listener) => [
-    startInterval(async () => {
-      try {
-        const [{d, s, c}] = await cmd(
-          SELECT +
-            ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-        );
-        if (
-          d != (dataVersion ??= d) ||
-          s != (schemaVersion ??= s) ||
-          c != (totalChanges ??= c)
-        ) {
-          listener();
-          dataVersion = d;
-          schemaVersion = s;
-        }
-      } catch {}
-    }, autoLoadIntervalSeconds),
-    addUpdateListener((tableName) =>
-      managedTableNamesSet.has(tableName) ? listener() : 0,
-    ),
-  ];
-  const delPersisterListener = ([interval, listeningHandle]) => {
-    stopInterval(interval);
-    dataVersion = schemaVersion = totalChanges = null;
-    delUpdateListener(listeningHandle);
+  const addPersisterListener = (listener) => {
+    let interval;
+    const startPolling = () =>
+      (interval = startInterval(async () => {
+        try {
+          const [{d, s, c}] = await cmd(
+            // 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();
+            }
+            dataVersion = d;
+            schemaVersion = s;
+            totalChanges = c;
+          }
+        } catch {}
+      }, autoLoadIntervalSeconds));
+    const stopPolling = () => {
+      dataVersion = schemaVersion = totalChanges = null;
+      stopInterval(interval);
+    };
+    const listeningHandle = addUpdateListener((tableName) => {
+      if (managedTableNamesSet.has(tableName)) {
+        stopPolling();
+        listener();
+        startPolling();
+      }
+    });
+    startPolling();
+    return () => {
+      stopPolling();
+      delUpdateListener(listeningHandle);
+    };
   };
+  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+    stopPollingAndDelUpdateListener();
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    onSqlCommand
-      ? async (sql, args) => {
-          onSqlCommand(sql, args);
-          return await cmd(sql, args);
-        }
-      : cmd,
+    cmd,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -916,7 +955,11 @@ const createSqlitePersister = (
       ),
     thing,
     getThing,
-    useOnConflict,
+    EMPTY_STRING,
+    orReplace,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
   );
 };
 

package/persisters/persister-yjs/index.js

@@ -148,9 +148,11 @@ const createCustomPersister = (
       await schedule(async () => {
         try {
           const content = await getPersisted();
-          isArray(content)
-            ? setContentOrChanges(content)
-            : errorNew(`Content is not an array ${content}`);
+          if (isArray(content)) {
+            setContentOrChanges(content);
+          } else {
+            errorNew(`Content is not an array ${content}`);
+          }
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {

package/persisters/persister-yjs/with-schemas/index.js

@@ -148,9 +148,11 @@ const createCustomPersister = (
       await schedule(async () => {
         try {
           const content = await getPersisted();
-          isArray(content)
-            ? setContentOrChanges(content)
-            : errorNew(`Content is not an array ${content}`);
+          if (isArray(content)) {
+            setContentOrChanges(content);
+          } else {
+            errorNew(`Content is not an array ${content}`);
+          }
         } catch (error) {
           onIgnoredError?.(error);
           if (initialContent) {