tinybase 9.5.0 → 9.6.0-beta.1

package/persisters/persister-electric-sql/with-schemas/index.js

@@ -138,9 +138,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1002,6 +1003,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1212,7 +1214,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1231,6 +1233,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1264,13 +1267,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1313,6 +1317,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1326,7 +1331,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1362,6 +1371,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1373,6 +1383,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1440,6 +1451,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1451,6 +1463,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1710,12 +1723,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq 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`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq 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, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,

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

@@ -140,9 +140,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1004,6 +1005,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1214,7 +1216,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1233,6 +1235,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1266,13 +1269,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1315,6 +1319,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1328,7 +1333,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1364,6 +1373,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1375,6 +1385,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1442,6 +1453,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1453,6 +1465,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1712,12 +1725,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq 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`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq 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, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,

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

@@ -140,9 +140,10 @@ const escapeId = (str) =>
   );
 const escapeColumnNames = (...columnNames) =>
   arrayJoin(arrayMap(columnNames, escapeId), COMMA);
-const getPlaceholders = (array, offset = [1]) =>
+const anonymousPlaceholder = () => '?';
+const getPlaceholders = (array, getPlaceholder, offset = [1]) =>
   arrayJoin(
-    arrayMap(array, () => '$' + offset[0]++),
+    arrayMap(array, () => getPlaceholder(offset)),
     COMMA,
   );
 const getWhereCondition = (tableName, condition = TRUE) =>
@@ -1004,6 +1005,7 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   columnType,
+  getPlaceholder,
   upsert = defaultUpsert,
   encode,
   decode,
@@ -1214,7 +1216,7 @@ const getCommandFunctions = (
                 DELETE_FROM +
                   escapeId(tableName) +
                   getWhereCondition(tableName, condition) +
-                  `AND(${escapeId(rowIdColumnName)}=$1)`,
+                  `AND(${escapeId(rowIdColumnName)}=${getPlaceholder([1])})`,
                 [rowId],
               );
             } else if (!isEmpty(settingColumnNames)) {
@@ -1233,6 +1235,7 @@ const getCommandFunctions = (
                       encode ? encode(row[cellId]) : row[cellId],
                     ),
                   },
+                  getPlaceholder,
                   currentColumnNames,
                 );
               }
@@ -1266,13 +1269,14 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           rows,
+          getPlaceholder,
           currentColumnNames,
         );
         await executeCommand(
           DELETE_FROM +
             escapeId(tableName) +
             getWhereCondition(tableName, condition) + // eslint-disable-next-line max-len
-            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds)})`,
+            `AND${escapeId(rowIdColumnName)}NOT IN(${getPlaceholders(deleteRowIds, getPlaceholder)})`,
           deleteRowIds,
         );
       } else if (
@@ -1315,6 +1319,7 @@ const defaultUpsert = async (
   rowIdColumnName,
   changingColumnNames,
   rows,
+  getPlaceholder,
 ) => {
   const offset = [1];
   await executeCommand(
@@ -1328,7 +1333,11 @@ const defaultUpsert = async (
         objToArray(
           rows,
           (row) =>
-            '($' + offset[0]++ + ',' + getPlaceholders(row, offset) + ')',
+            '(' +
+            getPlaceholder(offset) +
+            ',' +
+            getPlaceholders(row, getPlaceholder, offset) +
+            ')',
         ),
         COMMA,
       ) +
@@ -1364,6 +1373,7 @@ const createJsonPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   _encode,
   _decode,
@@ -1375,6 +1385,7 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       void 0,
       void 0,
@@ -1442,6 +1453,7 @@ const createTabularPersister = (
   thing,
   getThing,
   columnType,
+  getPlaceholder,
   upsert,
   encode,
   decode,
@@ -1453,6 +1465,7 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       columnType,
+      getPlaceholder,
       upsert,
       encode,
       decode,
@@ -1712,12 +1725,13 @@ const createCustomSqlitePersister = (
     async (executeCommand2, managedTableNames) =>
       await executeCommand2(
         SELECT + // eslint-disable-next-line max-len
-          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq 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`,
+          ` t.name tn,c.name cn,c.pk OR EXISTS(${SELECT} 1 FROM ${PRAGMA}index_list(t.name)i,${PRAGMA}index_info(i.name)ii ${WHERE} i."unique"=1 AND ii.name=c.name AND(${SELECT} count(*) FROM ${PRAGMA}index_info(i.name))=1)uq 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, anonymousPlaceholder)})ORDER BY t.name,c.name`,
         managedTableNames,
       ),
     thing,
     getThing,
     EMPTY_STRING,
+    anonymousPlaceholder,
     upsert,
     (cellOrValue) =>
       isTrue(cellOrValue) ? 1 : isFalse(cellOrValue) ? 0 : cellOrValue,

package/persisters/persister-indexed-db/index.js

@@ -1,5 +1,6 @@
 const TINYBASE = 'tinybase';
 const EMPTY_STRING = '';
+const M = 'm';
 const T = 't';
 const V = 'v';
 const UNDEFINED = '\uFFFC';
@@ -773,7 +774,10 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const OBJECT_STORE_NAMES = [T, V];
+const CONTENT_OBJECT_STORE_NAMES = [T, V];
+const MERGEABLE_OBJECT_STORE_NAMES = [M];
+const OBJECT_STORE_NAMES = [...CONTENT_OBJECT_STORE_NAMES, M];
+const VERSION = 3;
 const KEY_PATH = {keyPath: 'k'};
 const objectStoreMatch = async (objectStore, obj) => {
   const actions = objToArray(obj, (v, k) =>
@@ -799,6 +803,7 @@ const createIndexedDbPersister = (
   onIgnoredError,
 ) => {
   const forObjectStores = async (
+    objectStoreNames,
     forObjectStore,
     params = [],
     create = 0,
@@ -807,7 +812,7 @@ const createIndexedDbPersister = (
     promiseNew((resolve, reject) => {
       const request = (WINDOW ? WINDOW.indexedDB : indexedDB).open(
         dbName,
-        create ? 2 : void 0,
+        create ? VERSION : void 0,
       );
       let blocked = 0;
       request.onupgradeneeded = () =>
@@ -828,7 +833,7 @@ const createIndexedDbPersister = (
               async () => {
                 request.result.onversionchange = () => request.result.close();
                 const transaction = request.result.transaction(
-                  OBJECT_STORE_NAMES,
+                  objectStoreNames,
                   mode,
                 );
                 const transactionComplete = promiseNew((resolve2, reject2) => {
@@ -838,7 +843,7 @@ const createIndexedDbPersister = (
                 });
                 const [result] = await promiseAll([
                   promiseAll(
-                    arrayMap(OBJECT_STORE_NAMES, (objectStoreName, index) =>
+                    arrayMap(objectStoreNames, (objectStoreName, index) =>
                       forObjectStore(
                         transaction.objectStore(objectStoreName),
                         params[index],
@@ -857,22 +862,45 @@ const createIndexedDbPersister = (
             );
       request.onerror = () => reject(errorNew(ERROR_INDEXED_DB_OPEN));
     });
-  const getPersisted = async () =>
-    await forObjectStores(async (objectStore) =>
-      objNew(
-        arrayMap(await execObjectStore(objectStore, 'getAll'), ({k, v}) => [
-          k,
-          v,
-        ]),
-      ),
+  const getObjectStoreEntries = async (objectStore) =>
+    objNew(
+      arrayMap(await execObjectStore(objectStore, 'getAll'), ({k, v}) => [
+        k,
+        v,
+      ]),
     );
-  const setPersisted = (getContent) =>
-    forObjectStores(
-      (objectStore, content) => objectStoreMatch(objectStore, content),
-      getContent(),
-      1,
-      'readwrite',
+  const getPersisted = async () => {
+    if (!store.isMergeable()) {
+      return await forObjectStores(
+        CONTENT_OBJECT_STORE_NAMES,
+        getObjectStoreEntries,
+      );
+    }
+    const [mergeable] = await forObjectStores(
+      MERGEABLE_OBJECT_STORE_NAMES,
+      getObjectStoreEntries,
     );
+    return objHas(mergeable, T) ? [mergeable[T], mergeable[V]] : void 0;
+  };
+  const setPersisted = async (getContent) => {
+    const content = getContent();
+    await (store.isMergeable()
+      ? forObjectStores(
+          MERGEABLE_OBJECT_STORE_NAMES,
+          (objectStore, mergeable) => objectStoreMatch(objectStore, mergeable),
+          [{[T]: content[0], [V]: content[1]}],
+          1,
+          'readwrite',
+        )
+      : forObjectStores(
+          CONTENT_OBJECT_STORE_NAMES,
+          (objectStore, tablesOrValues) =>
+            objectStoreMatch(objectStore, tablesOrValues),
+          content,
+          1,
+          'readwrite',
+        ));
+  };
   const addPersisterListener = (listener) =>
     getPersisted().then((content) => {
       let active = 1;
@@ -915,8 +943,8 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
-    // StoreOnly,
+    3,
+    // StoreOrMergeableStore,
     {getDbName: () => dbName},
   );
 };

package/persisters/persister-indexed-db/with-schemas/index.js

@@ -1,5 +1,6 @@
 const TINYBASE = 'tinybase';
 const EMPTY_STRING = '';
+const M = 'm';
 const T = 't';
 const V = 'v';
 const UNDEFINED = '\uFFFC';
@@ -773,7 +774,10 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const OBJECT_STORE_NAMES = [T, V];
+const CONTENT_OBJECT_STORE_NAMES = [T, V];
+const MERGEABLE_OBJECT_STORE_NAMES = [M];
+const OBJECT_STORE_NAMES = [...CONTENT_OBJECT_STORE_NAMES, M];
+const VERSION = 3;
 const KEY_PATH = {keyPath: 'k'};
 const objectStoreMatch = async (objectStore, obj) => {
   const actions = objToArray(obj, (v, k) =>
@@ -799,6 +803,7 @@ const createIndexedDbPersister = (
   onIgnoredError,
 ) => {
   const forObjectStores = async (
+    objectStoreNames,
     forObjectStore,
     params = [],
     create = 0,
@@ -807,7 +812,7 @@ const createIndexedDbPersister = (
     promiseNew((resolve, reject) => {
       const request = (WINDOW ? WINDOW.indexedDB : indexedDB).open(
         dbName,
-        create ? 2 : void 0,
+        create ? VERSION : void 0,
       );
       let blocked = 0;
       request.onupgradeneeded = () =>
@@ -828,7 +833,7 @@ const createIndexedDbPersister = (
               async () => {
                 request.result.onversionchange = () => request.result.close();
                 const transaction = request.result.transaction(
-                  OBJECT_STORE_NAMES,
+                  objectStoreNames,
                   mode,
                 );
                 const transactionComplete = promiseNew((resolve2, reject2) => {
@@ -838,7 +843,7 @@ const createIndexedDbPersister = (
                 });
                 const [result] = await promiseAll([
                   promiseAll(
-                    arrayMap(OBJECT_STORE_NAMES, (objectStoreName, index) =>
+                    arrayMap(objectStoreNames, (objectStoreName, index) =>
                       forObjectStore(
                         transaction.objectStore(objectStoreName),
                         params[index],
@@ -857,22 +862,45 @@ const createIndexedDbPersister = (
             );
       request.onerror = () => reject(errorNew(ERROR_INDEXED_DB_OPEN));
     });
-  const getPersisted = async () =>
-    await forObjectStores(async (objectStore) =>
-      objNew(
-        arrayMap(await execObjectStore(objectStore, 'getAll'), ({k, v}) => [
-          k,
-          v,
-        ]),
-      ),
+  const getObjectStoreEntries = async (objectStore) =>
+    objNew(
+      arrayMap(await execObjectStore(objectStore, 'getAll'), ({k, v}) => [
+        k,
+        v,
+      ]),
     );
-  const setPersisted = (getContent) =>
-    forObjectStores(
-      (objectStore, content) => objectStoreMatch(objectStore, content),
-      getContent(),
-      1,
-      'readwrite',
+  const getPersisted = async () => {
+    if (!store.isMergeable()) {
+      return await forObjectStores(
+        CONTENT_OBJECT_STORE_NAMES,
+        getObjectStoreEntries,
+      );
+    }
+    const [mergeable] = await forObjectStores(
+      MERGEABLE_OBJECT_STORE_NAMES,
+      getObjectStoreEntries,
     );
+    return objHas(mergeable, T) ? [mergeable[T], mergeable[V]] : void 0;
+  };
+  const setPersisted = async (getContent) => {
+    const content = getContent();
+    await (store.isMergeable()
+      ? forObjectStores(
+          MERGEABLE_OBJECT_STORE_NAMES,
+          (objectStore, mergeable) => objectStoreMatch(objectStore, mergeable),
+          [{[T]: content[0], [V]: content[1]}],
+          1,
+          'readwrite',
+        )
+      : forObjectStores(
+          CONTENT_OBJECT_STORE_NAMES,
+          (objectStore, tablesOrValues) =>
+            objectStoreMatch(objectStore, tablesOrValues),
+          content,
+          1,
+          'readwrite',
+        ));
+  };
   const addPersisterListener = (listener) =>
     getPersisted().then((content) => {
       let active = 1;
@@ -915,8 +943,8 @@ const createIndexedDbPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    1,
-    // StoreOnly,
+    3,
+    // StoreOrMergeableStore,
     {getDbName: () => dbName},
   );
 };