tinybase 5.2.0-beta.3 → 5.2.0-beta.4

package/persisters/persister-postgres/index.js

@@ -81,14 +81,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);
@@ -306,7 +310,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -325,7 +332,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),
@@ -365,10 +374,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,
               ),
             )});`,
         );
@@ -388,7 +397,7 @@ const getCommandFunctions = (
                     escapeId(tableName) +
                     'ADD' +
                     escapeId(columnName) +
-                    (index == 0 ? 'text' : 'json'),
+                    columnType,
                 );
                 if (index == 0) {
                   await cmd(
@@ -440,8 +449,13 @@ const getCommandFunctions = (
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [rowId, ...objValues(row)],
-                useOnConflict,
+                [
+                  rowId,
+                  ...(encode
+                    ? arrayMap(objValues(row), encode)
+                    : objValues(row)),
+                ],
+                orReplace,
               );
             }
           }),
@@ -459,7 +473,9 @@ const getCommandFunctions = (
           arrayPush(
             args,
             rowId,
-            ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+            ...arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
+            ),
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -469,7 +485,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
-          useOnConflict,
+          orReplace,
         );
         await cmd(
           DELETE_FROM +
@@ -503,11 +519,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) +
       '(' +
@@ -520,8 +536,9 @@ const upsert = async (
       ) +
       ')VALUES' +
       getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-      (useOnConflict
-        ? 'ON CONFLICT(' +
+      (orReplace
+        ? EMPTY_STRING
+        : 'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
           ')DO UPDATE SET' +
           arrayJoin(
@@ -531,8 +548,7 @@ const upsert = async (
                 escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
             COMMA,
-          )
-        : EMPTY_STRING),
+          )),
     arrayMap(args, (arg) => arg ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -566,7 +582,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -574,7 +591,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -636,7 +654,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -644,7 +665,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = async (tables, partial) =>
     await promiseAll(
@@ -929,6 +953,10 @@ const createPostgreSqlPersister = (
       ),
     thing,
     getThing,
+    'text',
+    0,
+    (cellOrValue) => jsonString(cellOrValue),
+    (field) => jsonParse(field),
   );
 };
 

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

@@ -81,14 +81,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);
@@ -306,7 +310,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -325,7 +332,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),
@@ -365,10 +374,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,
               ),
             )});`,
         );
@@ -388,7 +397,7 @@ const getCommandFunctions = (
                     escapeId(tableName) +
                     'ADD' +
                     escapeId(columnName) +
-                    (index == 0 ? 'text' : 'json'),
+                    columnType,
                 );
                 if (index == 0) {
                   await cmd(
@@ -440,8 +449,13 @@ const getCommandFunctions = (
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [rowId, ...objValues(row)],
-                useOnConflict,
+                [
+                  rowId,
+                  ...(encode
+                    ? arrayMap(objValues(row), encode)
+                    : objValues(row)),
+                ],
+                orReplace,
               );
             }
           }),
@@ -459,7 +473,9 @@ const getCommandFunctions = (
           arrayPush(
             args,
             rowId,
-            ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+            ...arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
+            ),
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -469,7 +485,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
-          useOnConflict,
+          orReplace,
         );
         await cmd(
           DELETE_FROM +
@@ -503,11 +519,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) +
       '(' +
@@ -520,8 +536,9 @@ const upsert = async (
       ) +
       ')VALUES' +
       getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-      (useOnConflict
-        ? 'ON CONFLICT(' +
+      (orReplace
+        ? EMPTY_STRING
+        : 'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
           ')DO UPDATE SET' +
           arrayJoin(
@@ -531,8 +548,7 @@ const upsert = async (
                 escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
             COMMA,
-          )
-        : EMPTY_STRING),
+          )),
     arrayMap(args, (arg) => arg ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -566,7 +582,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -574,7 +591,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -636,7 +654,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -644,7 +665,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = async (tables, partial) =>
     await promiseAll(
@@ -929,6 +953,10 @@ const createPostgreSqlPersister = (
       ),
     thing,
     getThing,
+    'text',
+    0,
+    (cellOrValue) => jsonString(cellOrValue),
+    (field) => jsonParse(field),
   );
 };
 

package/persisters/persister-powersync/index.js

@@ -89,14 +89,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);
@@ -314,7 +318,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -333,7 +340,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),
@@ -373,10 +382,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,
               ),
             )});`,
         );
@@ -396,7 +405,7 @@ const getCommandFunctions = (
                     escapeId(tableName) +
                     'ADD' +
                     escapeId(columnName) +
-                    (index == 0 ? 'text' : 'json'),
+                    columnType,
                 );
                 if (index == 0) {
                   await cmd(
@@ -448,8 +457,13 @@ const getCommandFunctions = (
                 tableName,
                 rowIdColumnName,
                 objIds(row),
-                [rowId, ...objValues(row)],
-                useOnConflict,
+                [
+                  rowId,
+                  ...(encode
+                    ? arrayMap(objValues(row), encode)
+                    : objValues(row)),
+                ],
+                orReplace,
               );
             }
           }),
@@ -467,7 +481,9 @@ const getCommandFunctions = (
           arrayPush(
             args,
             rowId,
-            ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+            ...arrayMap(changingColumnNames, (cellId) =>
+              encode ? encode(row?.[cellId]) : row?.[cellId],
+            ),
           );
           arrayPush(deleteRowIds, rowId);
         });
@@ -477,7 +493,7 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
-          useOnConflict,
+          orReplace,
         );
         await cmd(
           DELETE_FROM +
@@ -511,11 +527,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) +
       '(' +
@@ -528,8 +544,9 @@ const upsert = async (
       ) +
       ')VALUES' +
       getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-      (useOnConflict
-        ? 'ON CONFLICT(' +
+      (orReplace
+        ? EMPTY_STRING
+        : 'ON CONFLICT(' +
           escapeId(rowIdColumnName) +
           ')DO UPDATE SET' +
           arrayJoin(
@@ -539,8 +556,7 @@ const upsert = async (
                 escapeId(columnName) + '=excluded.' + escapeId(columnName),
             ),
             COMMA,
-          )
-        : EMPTY_STRING),
+          )),
     arrayMap(args, (arg) => arg ?? null),
   );
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -574,7 +590,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -582,7 +599,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = async () =>
     await transaction(async () => {
@@ -644,7 +662,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -652,7 +673,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = async (tables, partial) =>
     await promiseAll(
@@ -862,7 +886,7 @@ const createSqlitePersister = (
   persist,
   thing,
   getThing = 'getDb',
-  useOnConflict,
+  orReplace,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -930,7 +954,11 @@ const createSqlitePersister = (
       ),
     thing,
     getThing,
-    useOnConflict,
+    EMPTY_STRING,
+    orReplace,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
   );
 };
 
@@ -940,7 +968,7 @@ const createPowerSyncPersister = (
   configOrStoreTableName,
   onSqlCommand,
   onIgnoredError,
-  useOnConflict = false,
+  orReplace = 1,
 ) =>
   createSqlitePersister(
     store,
@@ -967,7 +995,7 @@ const createPowerSyncPersister = (
     // StoreOnly,
     powerSync,
     'getPowerSync',
-    useOnConflict,
+    orReplace,
   );
 
 export {createPowerSyncPersister};