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

package/umd/persisters/persister-postgres/index.js

@@ -92,16 +92,18 @@
   };
   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);
@@ -323,7 +325,10 @@
     managedTableNames,
     querySchema,
     onIgnoredError,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const schemaMap = mapNew();
     const canSelect = (tableName, rowIdColumnName) =>
@@ -342,7 +347,9 @@
                 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),
@@ -382,10 +389,10 @@
             '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,
                 ),
               )});`,
           );
@@ -405,7 +412,7 @@
                       escapeId(tableName) +
                       'ADD' +
                       escapeId(columnName) +
-                      (index == 0 ? 'text' : 'json'),
+                      columnType,
                   );
                   if (index == 0) {
                     await cmd(
@@ -457,8 +464,13 @@
                   tableName,
                   rowIdColumnName,
                   objIds(row),
-                  [rowId, ...objValues(row)],
-                  useOnConflict,
+                  [
+                    rowId,
+                    ...(encode
+                      ? arrayMap(objValues(row), encode)
+                      : objValues(row)),
+                  ],
+                  orReplace,
                 );
               }
             }),
@@ -476,7 +488,9 @@
             arrayPush(
               args,
               rowId,
-              ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+              ...arrayMap(changingColumnNames, (cellId) =>
+                encode ? encode(row?.[cellId]) : row?.[cellId],
+              ),
             );
             arrayPush(deleteRowIds, rowId);
           });
@@ -486,7 +500,7 @@
             rowIdColumnName,
             changingColumnNames,
             args,
-            useOnConflict,
+            orReplace,
           );
           await cmd(
             DELETE_FROM +
@@ -520,11 +534,11 @@
     rowIdColumnName,
     changingColumnNames,
     args,
-    useOnConflict = true,
+    orReplace = 0,
   ) =>
     await cmd(
       'INSERT ' +
-        (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
         escapeId(tableName) +
         '(' +
@@ -537,8 +551,9 @@
         ) +
         ')VALUES' +
         getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-        (useOnConflict
-          ? 'ON CONFLICT(' +
+        (orReplace
+          ? EMPTY_STRING
+          : 'ON CONFLICT(' +
             escapeId(rowIdColumnName) +
             ')DO UPDATE SET' +
             arrayJoin(
@@ -548,8 +563,7 @@
                   escapeId(columnName) + '=excluded.' + escapeId(columnName),
               ),
               COMMA,
-            )
-          : EMPTY_STRING),
+            )),
       arrayMap(args, (arg) => arg ?? null),
     );
   const getUpsertPlaceholders = (array, columnCount) =>
@@ -583,7 +597,8 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -591,7 +606,8 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
       );
     const getPersisted = async () =>
       await transaction(async () => {
@@ -653,7 +669,10 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -661,7 +680,10 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
+        encode,
+        decode,
       );
     const saveTables = async (tables, partial) =>
       await promiseAll(
@@ -948,6 +970,10 @@
         ),
       thing,
       getThing,
+      'text',
+      0,
+      (cellOrValue) => jsonString(cellOrValue),
+      (field) => jsonParse(field),
     );
   };
 

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

@@ -92,16 +92,18 @@
   };
   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);
@@ -323,7 +325,10 @@
     managedTableNames,
     querySchema,
     onIgnoredError,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const schemaMap = mapNew();
     const canSelect = (tableName, rowIdColumnName) =>
@@ -342,7 +347,9 @@
                 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),
@@ -382,10 +389,10 @@
             '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,
                 ),
               )});`,
           );
@@ -405,7 +412,7 @@
                       escapeId(tableName) +
                       'ADD' +
                       escapeId(columnName) +
-                      (index == 0 ? 'text' : 'json'),
+                      columnType,
                   );
                   if (index == 0) {
                     await cmd(
@@ -457,8 +464,13 @@
                   tableName,
                   rowIdColumnName,
                   objIds(row),
-                  [rowId, ...objValues(row)],
-                  useOnConflict,
+                  [
+                    rowId,
+                    ...(encode
+                      ? arrayMap(objValues(row), encode)
+                      : objValues(row)),
+                  ],
+                  orReplace,
                 );
               }
             }),
@@ -476,7 +488,9 @@
             arrayPush(
               args,
               rowId,
-              ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+              ...arrayMap(changingColumnNames, (cellId) =>
+                encode ? encode(row?.[cellId]) : row?.[cellId],
+              ),
             );
             arrayPush(deleteRowIds, rowId);
           });
@@ -486,7 +500,7 @@
             rowIdColumnName,
             changingColumnNames,
             args,
-            useOnConflict,
+            orReplace,
           );
           await cmd(
             DELETE_FROM +
@@ -520,11 +534,11 @@
     rowIdColumnName,
     changingColumnNames,
     args,
-    useOnConflict = true,
+    orReplace = 0,
   ) =>
     await cmd(
       'INSERT ' +
-        (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
         escapeId(tableName) +
         '(' +
@@ -537,8 +551,9 @@
         ) +
         ')VALUES' +
         getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-        (useOnConflict
-          ? 'ON CONFLICT(' +
+        (orReplace
+          ? EMPTY_STRING
+          : 'ON CONFLICT(' +
             escapeId(rowIdColumnName) +
             ')DO UPDATE SET' +
             arrayJoin(
@@ -548,8 +563,7 @@
                   escapeId(columnName) + '=excluded.' + escapeId(columnName),
               ),
               COMMA,
-            )
-          : EMPTY_STRING),
+            )),
       arrayMap(args, (arg) => arg ?? null),
     );
   const getUpsertPlaceholders = (array, columnCount) =>
@@ -583,7 +597,8 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -591,7 +606,8 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
       );
     const getPersisted = async () =>
       await transaction(async () => {
@@ -653,7 +669,10 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -661,7 +680,10 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
+        encode,
+        decode,
       );
     const saveTables = async (tables, partial) =>
       await promiseAll(
@@ -948,6 +970,10 @@
         ),
       thing,
       getThing,
+      'text',
+      0,
+      (cellOrValue) => jsonString(cellOrValue),
+      (field) => jsonParse(field),
     );
   };
 

package/umd/persisters/persister-powersync/index.js

@@ -100,16 +100,18 @@
   };
   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);
@@ -331,7 +333,10 @@
     managedTableNames,
     querySchema,
     onIgnoredError,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const schemaMap = mapNew();
     const canSelect = (tableName, rowIdColumnName) =>
@@ -350,7 +355,9 @@
                 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),
@@ -390,10 +397,10 @@
             '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,
                 ),
               )});`,
           );
@@ -413,7 +420,7 @@
                       escapeId(tableName) +
                       'ADD' +
                       escapeId(columnName) +
-                      (index == 0 ? 'text' : 'json'),
+                      columnType,
                   );
                   if (index == 0) {
                     await cmd(
@@ -465,8 +472,13 @@
                   tableName,
                   rowIdColumnName,
                   objIds(row),
-                  [rowId, ...objValues(row)],
-                  useOnConflict,
+                  [
+                    rowId,
+                    ...(encode
+                      ? arrayMap(objValues(row), encode)
+                      : objValues(row)),
+                  ],
+                  orReplace,
                 );
               }
             }),
@@ -484,7 +496,9 @@
             arrayPush(
               args,
               rowId,
-              ...arrayMap(changingColumnNames, (cellId) => row?.[cellId]),
+              ...arrayMap(changingColumnNames, (cellId) =>
+                encode ? encode(row?.[cellId]) : row?.[cellId],
+              ),
             );
             arrayPush(deleteRowIds, rowId);
           });
@@ -494,7 +508,7 @@
             rowIdColumnName,
             changingColumnNames,
             args,
-            useOnConflict,
+            orReplace,
           );
           await cmd(
             DELETE_FROM +
@@ -528,11 +542,11 @@
     rowIdColumnName,
     changingColumnNames,
     args,
-    useOnConflict = true,
+    orReplace = 0,
   ) =>
     await cmd(
       'INSERT ' +
-        (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
         escapeId(tableName) +
         '(' +
@@ -545,8 +559,9 @@
         ) +
         ')VALUES' +
         getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-        (useOnConflict
-          ? 'ON CONFLICT(' +
+        (orReplace
+          ? EMPTY_STRING
+          : 'ON CONFLICT(' +
             escapeId(rowIdColumnName) +
             ')DO UPDATE SET' +
             arrayJoin(
@@ -556,8 +571,7 @@
                   escapeId(columnName) + '=excluded.' + escapeId(columnName),
               ),
               COMMA,
-            )
-          : EMPTY_STRING),
+            )),
       arrayMap(args, (arg) => arg ?? null),
     );
   const getUpsertPlaceholders = (array, columnCount) =>
@@ -591,7 +605,8 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -599,7 +614,8 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
       );
     const getPersisted = async () =>
       await transaction(async () => {
@@ -661,7 +677,10 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -669,7 +688,10 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
+        encode,
+        decode,
       );
     const saveTables = async (tables, partial) =>
       await promiseAll(
@@ -882,7 +904,7 @@
     persist,
     thing,
     getThing = 'getDb',
-    useOnConflict,
+    orReplace,
   ) => {
     let dataVersion;
     let schemaVersion;
@@ -950,7 +972,11 @@
         ),
       thing,
       getThing,
-      useOnConflict,
+      EMPTY_STRING,
+      orReplace,
+      (cellOrValue) =>
+        cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+      void 0,
     );
   };
 
@@ -960,7 +986,7 @@
     configOrStoreTableName,
     onSqlCommand,
     onIgnoredError,
-    useOnConflict = false,
+    orReplace = 1,
   ) =>
     createSqlitePersister(
       store,
@@ -989,7 +1015,7 @@
       // StoreOnly,
       powerSync,
       'getPowerSync',
-      useOnConflict,
+      orReplace,
     );
 
   exports.createPowerSyncPersister = createPowerSyncPersister;