tinybase 5.0.0-beta.14 → 5.0.0-beta.15

package/lib/debug/persisters/persister-cr-sqlite-wasm.js

@@ -3,6 +3,7 @@ const TINYBASE = 'tinybase';
 const EMPTY_STRING = '';
 const COMMA = ',';
 const STRING = getTypeOf(EMPTY_STRING);
+const UNDEFINED = '\uFFFC';
 const strRepeat = (str, count) => str.repeat(count);
 
 const promise = Promise;
@@ -11,7 +12,6 @@ const startInterval = (callback, sec, immediate) => {
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
-const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -21,11 +21,6 @@ const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseAll = async (promises) => promise.all(promises);
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-const SELECT = 'SELECT';
-
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
 const arrayIsEmpty = (array) => size(array) == 0;
@@ -87,6 +82,11 @@ const mapMatch = (map, obj, set, del = mapSet) => {
   return map;
 };
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
+const SELECT = 'SELECT';
+
 const setNew = (entryOrEntries) =>
   new Set(
     isArray(entryOrEntries) || isUndefined(entryOrEntries)
@@ -378,11 +378,10 @@ const getPlaceholders = (array) =>
     COMMA,
   );
 
-const jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
-    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
-  );
-const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
@@ -568,14 +567,14 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const STORE_COLUMN = 'store';
 const createJsonSqlitePersister = (
   store,
   cmd,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  [storeTableName],
+  supportedStoreType,
+  [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
   getThing,
@@ -586,10 +585,10 @@ const createJsonSqlitePersister = (
   const getPersisted = async () =>
     await transaction(async () => {
       await refreshSchema();
-      return jsonParse(
-        (await loadTable(storeTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
-          SINGLE_ROW_ID
-        ]?.[STORE_COLUMN] ?? 'null',
+      return jsonParseWithUndefined(
+        (await loadTable(storeTableName, storeIdColumnName))[SINGLE_ROW_ID]?.[
+          storeColumnName
+        ] ?? 'null',
       );
     });
   const setPersisted = async (getContent) =>
@@ -597,10 +596,10 @@ const createJsonSqlitePersister = (
       await refreshSchema();
       await saveTable(
         storeTableName,
-        DEFAULT_ROW_ID_COLUMN_NAME,
+        storeIdColumnName,
         {
           [SINGLE_ROW_ID]: {
-            [STORE_COLUMN]: jsonStringWithMap(getContent() ?? null),
+            [storeColumnName]: jsonStringWithUndefined(getContent() ?? null),
           },
         },
         true,
@@ -614,7 +613,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    supportedStoreType,
     {[getThing]: () => db},
     db,
   );
@@ -627,6 +626,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportedStoreType,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -720,17 +720,21 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    supportedStoreType,
     {[getThing]: () => db},
     db,
   );
   return persister;
 };
 
+const COLUMN_NAME = 'ColumnName';
+const STORE = 'store';
 const JSON$1 = 'json';
+const STORE_TABLE_NAME = STORE + 'TableName';
+const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
+const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
 const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
-const STORE_TABLE_NAME = 'storeTableName';
-const ROW_ID_COLUMN_NAME = 'rowIdColumnName';
+const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
 const TABLE_ID = 'tableId';
 const TABLE_NAME = 'tableName';
 const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
@@ -755,7 +759,8 @@ const getDefaultedTabularConfigMap = (
   configsObj,
   defaultObj,
   tableField,
-  filter,
+  exclude,
+  then,
 ) => {
   const configMap = mapNew();
   objToArray(configsObj, (configObj, id) => {
@@ -769,7 +774,8 @@ const getDefaultedTabularConfigMap = (
       0,
       objSize(defaultObj),
     );
-    if (!isUndefined(defaultedConfig[0]) && !filter(id, defaultedConfig[0])) {
+    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
+      then(id, defaultedConfig[0]);
       mapSet(configMap, id, defaultedConfig);
     }
   });
@@ -779,11 +785,15 @@ const getConfigStructures = (configOrStoreTableName) => {
   const config = getDefaultedConfig(configOrStoreTableName);
   const autoLoadIntervalSeconds = config[AUTO_LOAD_INTERVAL_SECONDS];
   if (config.mode == JSON$1) {
-    const {storeTableName = TINYBASE} = config;
+    const storeTableName = config[STORE_TABLE_NAME] ?? TINYBASE;
     return [
       1,
       autoLoadIntervalSeconds,
-      [storeTableName],
+      [
+        storeTableName,
+        config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
+        config[STORE_COLUMN_NAME] ?? STORE,
+      ],
       setNew(storeTableName),
     ];
   }
@@ -795,13 +805,14 @@ 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) =>
-        setAdd(managedTableNames, tableName) && tableName == valuesTable,
+      (tableName) => collHas(excludedTableNames, tableName),
+      (tableName) => setAdd(managedTableNames, tableName),
     ),
     getDefaultedTabularConfigMap(
       save,
@@ -812,15 +823,15 @@ const getConfigStructures = (configOrStoreTableName) => {
         [DELETE_EMPTY_TABLE]: 0,
       },
       TABLE_NAME,
-      (_, tableName) =>
-        setAdd(managedTableNames, tableName) && tableName == valuesTable,
+      (_, tableName) => collHas(excludedTableNames, tableName),
+      (_, tableName) => setAdd(managedTableNames, tableName),
     ),
     valuesConfig,
   ];
   return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
 };
 
-const PRAGMA = 'pragma ';
+const PRAGMA = 'pragma_';
 const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const createSqlitePersister = (
@@ -831,6 +842,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
+  supportedStoreType,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -838,7 +850,6 @@ const createSqlitePersister = (
   let dataVersion;
   let schemaVersion;
   let totalChanges;
-  const CHANGES_COLUMN = 'c';
   const [
     isJson,
     autoLoadIntervalSeconds,
@@ -848,23 +859,17 @@ const createSqlitePersister = (
   const addPersisterListener = (listener) => [
     startInterval(async () => {
       try {
-        const newDataVersion = (await cmd(PRAGMA + DATA_VERSION))[0][
-          DATA_VERSION
-        ];
-        const newSchemaVersion = (await cmd(PRAGMA + SCHEMA_VERSION))[0][
-          SCHEMA_VERSION
-        ];
-        const newTotalChanges = (
-          await cmd(SELECT + ' TOTAL_CHANGES() ' + CHANGES_COLUMN)
-        )[0][CHANGES_COLUMN];
+        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 (
-          newDataVersion != (dataVersion ??= newDataVersion) ||
-          newSchemaVersion != (schemaVersion ??= newSchemaVersion) ||
-          newTotalChanges != (totalChanges ??= newTotalChanges)
+          d != (dataVersion ??= d) ||
+          s != (schemaVersion ??= s) ||
+          c != (totalChanges ??= c)
         ) {
           listener();
-          dataVersion = newDataVersion;
-          schemaVersion = newSchemaVersion;
+          dataVersion = d;
+          schemaVersion = s;
         }
       } catch {}
     }, autoLoadIntervalSeconds),
@@ -874,7 +879,7 @@ const createSqlitePersister = (
   ];
   const delPersisterListener = ([interval, listeningHandle]) => {
     stopInterval(interval);
-    dataVersion = schemaVersion = null;
+    dataVersion = schemaVersion = totalChanges = null;
     delUpdateListener(listeningHandle);
   };
   return (isJson ? createJsonSqlitePersister : createTabularSqlitePersister)(
@@ -888,6 +893,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    supportedStoreType,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -911,6 +917,7 @@ const createCrSqliteWasmPersister = (
     (removeListener) => removeListener(),
     onSqlCommand,
     onIgnoredError,
+    1,
     db,
   );
 

package/lib/debug/persisters/persister-electric-sql.js

@@ -3,6 +3,7 @@ const TINYBASE = 'tinybase';
 const EMPTY_STRING = '';
 const COMMA = ',';
 const STRING = getTypeOf(EMPTY_STRING);
+const UNDEFINED = '\uFFFC';
 const strRepeat = (str, count) => str.repeat(count);
 
 const promise = Promise;
@@ -11,7 +12,6 @@ const startInterval = (callback, sec, immediate) => {
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
-const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
@@ -21,11 +21,6 @@ const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseAll = async (promises) => promise.all(promises);
 
-const SINGLE_ROW_ID = '_';
-const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
-const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
-const SELECT = 'SELECT';
-
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
@@ -88,6 +83,11 @@ const mapMatch = (map, obj, set, del = mapSet) => {
   return map;
 };
 
+const SINGLE_ROW_ID = '_';
+const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
+const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
+const SELECT = 'SELECT';
+
 const setNew = (entryOrEntries) =>
   new Set(
     isArray(entryOrEntries) || isUndefined(entryOrEntries)
@@ -379,11 +379,10 @@ const getPlaceholders = (array) =>
     COMMA,
   );
 
-const jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
-    isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
-  );
-const jsonParse = JSON.parse;
+const jsonStringWithUndefined = (obj) =>
+  JSON.stringify(obj, (_key, value) => (value === void 0 ? UNDEFINED : value));
+const jsonParseWithUndefined = (str) =>
+  JSON.parse(str, (_key, value) => (value === UNDEFINED ? void 0 : value));
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
@@ -569,14 +568,14 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const STORE_COLUMN = 'store';
 const createJsonSqlitePersister = (
   store,
   cmd,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  [storeTableName],
+  supportedStoreType,
+  [storeTableName, storeIdColumnName, storeColumnName],
   managedTableNames,
   db,
   getThing,
@@ -587,10 +586,10 @@ const createJsonSqlitePersister = (
   const getPersisted = async () =>
     await transaction(async () => {
       await refreshSchema();
-      return jsonParse(
-        (await loadTable(storeTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
-          SINGLE_ROW_ID
-        ]?.[STORE_COLUMN] ?? 'null',
+      return jsonParseWithUndefined(
+        (await loadTable(storeTableName, storeIdColumnName))[SINGLE_ROW_ID]?.[
+          storeColumnName
+        ] ?? 'null',
       );
     });
   const setPersisted = async (getContent) =>
@@ -598,10 +597,10 @@ const createJsonSqlitePersister = (
       await refreshSchema();
       await saveTable(
         storeTableName,
-        DEFAULT_ROW_ID_COLUMN_NAME,
+        storeIdColumnName,
         {
           [SINGLE_ROW_ID]: {
-            [STORE_COLUMN]: jsonStringWithMap(getContent() ?? null),
+            [storeColumnName]: jsonStringWithUndefined(getContent() ?? null),
           },
         },
         true,
@@ -615,7 +614,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    supportedStoreType,
     {[getThing]: () => db},
     db,
   );
@@ -628,6 +627,7 @@ const createTabularSqlitePersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportedStoreType,
   [
     tablesLoadConfig,
     tablesSaveConfig,
@@ -721,17 +721,21 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
+    supportedStoreType,
     {[getThing]: () => db},
     db,
   );
   return persister;
 };
 
+const COLUMN_NAME = 'ColumnName';
+const STORE = 'store';
 const JSON$1 = 'json';
+const STORE_TABLE_NAME = STORE + 'TableName';
+const STORE_ID_COLUMN_NAME = STORE + 'Id' + COLUMN_NAME;
+const STORE_COLUMN_NAME = STORE + COLUMN_NAME;
 const AUTO_LOAD_INTERVAL_SECONDS = 'autoLoadIntervalSeconds';
-const STORE_TABLE_NAME = 'storeTableName';
-const ROW_ID_COLUMN_NAME = 'rowIdColumnName';
+const ROW_ID_COLUMN_NAME = 'rowId' + COLUMN_NAME;
 const TABLE_ID = 'tableId';
 const TABLE_NAME = 'tableName';
 const DELETE_EMPTY_COLUMNS = 'deleteEmptyColumns';
@@ -756,7 +760,8 @@ const getDefaultedTabularConfigMap = (
   configsObj,
   defaultObj,
   tableField,
-  filter,
+  exclude,
+  then,
 ) => {
   const configMap = mapNew();
   objToArray(configsObj, (configObj, id) => {
@@ -770,7 +775,8 @@ const getDefaultedTabularConfigMap = (
       0,
       objSize(defaultObj),
     );
-    if (!isUndefined(defaultedConfig[0]) && !filter(id, defaultedConfig[0])) {
+    if (!isUndefined(defaultedConfig[0]) && !exclude(id, defaultedConfig[0])) {
+      then(id, defaultedConfig[0]);
       mapSet(configMap, id, defaultedConfig);
     }
   });
@@ -780,11 +786,15 @@ const getConfigStructures = (configOrStoreTableName) => {
   const config = getDefaultedConfig(configOrStoreTableName);
   const autoLoadIntervalSeconds = config[AUTO_LOAD_INTERVAL_SECONDS];
   if (config.mode == JSON$1) {
-    const {storeTableName = TINYBASE} = config;
+    const storeTableName = config[STORE_TABLE_NAME] ?? TINYBASE;
     return [
       1,
       autoLoadIntervalSeconds,
-      [storeTableName],
+      [
+        storeTableName,
+        config[STORE_ID_COLUMN_NAME] ?? DEFAULT_ROW_ID_COLUMN_NAME,
+        config[STORE_COLUMN_NAME] ?? STORE,
+      ],
       setNew(storeTableName),
     ];
   }
@@ -796,13 +806,14 @@ 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) =>
-        setAdd(managedTableNames, tableName) && tableName == valuesTable,
+      (tableName) => collHas(excludedTableNames, tableName),
+      (tableName) => setAdd(managedTableNames, tableName),
     ),
     getDefaultedTabularConfigMap(
       save,
@@ -813,15 +824,15 @@ const getConfigStructures = (configOrStoreTableName) => {
         [DELETE_EMPTY_TABLE]: 0,
       },
       TABLE_NAME,
-      (_, tableName) =>
-        setAdd(managedTableNames, tableName) && tableName == valuesTable,
+      (_, tableName) => collHas(excludedTableNames, tableName),
+      (_, tableName) => setAdd(managedTableNames, tableName),
     ),
     valuesConfig,
   ];
   return [0, autoLoadIntervalSeconds, tabularConfig, managedTableNames];
 };
 
-const PRAGMA = 'pragma ';
+const PRAGMA = 'pragma_';
 const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const createSqlitePersister = (
@@ -832,6 +843,7 @@ const createSqlitePersister = (
   delUpdateListener,
   onSqlCommand,
   onIgnoredError,
+  supportedStoreType,
   db,
   getThing = 'getDb',
   useOnConflict,
@@ -839,7 +851,6 @@ const createSqlitePersister = (
   let dataVersion;
   let schemaVersion;
   let totalChanges;
-  const CHANGES_COLUMN = 'c';
   const [
     isJson,
     autoLoadIntervalSeconds,
@@ -849,23 +860,17 @@ const createSqlitePersister = (
   const addPersisterListener = (listener) => [
     startInterval(async () => {
       try {
-        const newDataVersion = (await cmd(PRAGMA + DATA_VERSION))[0][
-          DATA_VERSION
-        ];
-        const newSchemaVersion = (await cmd(PRAGMA + SCHEMA_VERSION))[0][
-          SCHEMA_VERSION
-        ];
-        const newTotalChanges = (
-          await cmd(SELECT + ' TOTAL_CHANGES() ' + CHANGES_COLUMN)
-        )[0][CHANGES_COLUMN];
+        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 (
-          newDataVersion != (dataVersion ??= newDataVersion) ||
-          newSchemaVersion != (schemaVersion ??= newSchemaVersion) ||
-          newTotalChanges != (totalChanges ??= newTotalChanges)
+          d != (dataVersion ??= d) ||
+          s != (schemaVersion ??= s) ||
+          c != (totalChanges ??= c)
         ) {
           listener();
-          dataVersion = newDataVersion;
-          schemaVersion = newSchemaVersion;
+          dataVersion = d;
+          schemaVersion = s;
         }
       } catch {}
     }, autoLoadIntervalSeconds),
@@ -875,7 +880,7 @@ const createSqlitePersister = (
   ];
   const delPersisterListener = ([interval, listeningHandle]) => {
     stopInterval(interval);
-    dataVersion = schemaVersion = null;
+    dataVersion = schemaVersion = totalChanges = null;
     delUpdateListener(listeningHandle);
   };
   return (isJson ? createJsonSqlitePersister : createTabularSqlitePersister)(
@@ -889,6 +894,7 @@ const createSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    supportedStoreType,
     defaultedConfig,
     collValues(managedTableNamesSet),
     db,
@@ -918,6 +924,7 @@ const createElectricSqlPersister = (
     (unsubscribeFunction) => unsubscribeFunction(),
     onSqlCommand,
     onIgnoredError,
+    1,
     electricClient,
     'getElectricClient',
   );