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

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

@@ -157,16 +157,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 == null ? void 0 : map.get(key));
@@ -190,25 +192,25 @@
     return mapGet(map, key);
   };
 
-  var __defProp$1 = Object.defineProperty;
-  var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$1 = (obj, key, value) =>
+  var __defProp = Object.defineProperty;
+  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+  var __hasOwnProp = Object.prototype.hasOwnProperty;
+  var __propIsEnum = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp = (obj, key, value) =>
     key in obj
-      ? __defProp$1(obj, key, {
+      ? __defProp(obj, key, {
           enumerable: true,
           configurable: true,
           writable: true,
           value,
         })
       : (obj[key] = value);
-  var __spreadValues$1 = (a, b) => {
+  var __spreadValues = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-    if (__getOwnPropSymbols$1)
-      for (var prop of __getOwnPropSymbols$1(b)) {
-        if (__propIsEnum$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
+      if (__hasOwnProp.call(b, prop)) __defNormalProp(a, prop, b[prop]);
+    if (__getOwnPropSymbols)
+      for (var prop of __getOwnPropSymbols(b)) {
+        if (__propIsEnum.call(b, prop)) __defNormalProp(a, prop, b[prop]);
       }
     return a;
   };
@@ -422,7 +424,7 @@
       return stopAutoLoad().stopAutoSave();
     };
     const getStats = () => ({loads, saves});
-    const persister = __spreadValues$1(
+    const persister = __spreadValues(
       {
         load,
         startAutoLoad,
@@ -450,28 +452,6 @@
     );
   const setAdd = (set, value) => (set == null ? void 0 : set.add(value));
 
-  var __defProp = Object.defineProperty;
-  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __propIsEnum = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp = (obj, key, value) =>
-    key in obj
-      ? __defProp(obj, key, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value,
-        })
-      : (obj[key] = value);
-  var __spreadValues = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp.call(b, prop)) __defNormalProp(a, prop, b[prop]);
-    if (__getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(b)) {
-        if (__propIsEnum.call(b, prop)) __defNormalProp(a, prop, b[prop]);
-      }
-    return a;
-  };
   var __async$4 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -500,7 +480,10 @@
     managedTableNames,
     querySchema,
     onIgnoredError,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const schemaMap = mapNew();
     const canSelect = (tableName, rowIdColumnName) =>
@@ -521,7 +504,9 @@
                   yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
                   (row) => [
                     row[rowIdColumnName],
-                    objDel(__spreadValues({}, row), rowIdColumnName),
+                    decode
+                      ? objMap(objDel(row, rowIdColumnName), decode)
+                      : objDel(row, rowIdColumnName),
                   ],
                 ),
                 ([rowId, row]) => !isUndefined(rowId) && !objIsEmpty(row),
@@ -564,10 +549,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,
                   ),
                 )});`,
             );
@@ -588,7 +573,7 @@
                           escapeId(tableName) +
                           'ADD' +
                           escapeId(columnName) +
-                          (index == 0 ? 'text' : 'json'),
+                          columnType,
                       );
                       if (index == 0) {
                         yield cmd(
@@ -643,8 +628,13 @@
                       tableName,
                       rowIdColumnName,
                       objIds(row),
-                      [rowId, ...objValues(row)],
-                      useOnConflict,
+                      [
+                        rowId,
+                        ...(encode
+                          ? arrayMap(objValues(row), encode)
+                          : objValues(row)),
+                      ],
+                      orReplace,
                     );
                   }
                 }),
@@ -664,7 +654,11 @@
                 args,
                 rowId,
                 ...arrayMap(changingColumnNames, (cellId) =>
-                  row == null ? void 0 : row[cellId],
+                  encode
+                    ? encode(row == null ? void 0 : row[cellId])
+                    : row == null
+                      ? void 0
+                      : row[cellId],
                 ),
               );
               arrayPush(deleteRowIds, rowId);
@@ -675,7 +669,7 @@
               rowIdColumnName,
               changingColumnNames,
               args,
-              useOnConflict,
+              orReplace,
             );
             yield cmd(
               DELETE_FROM +
@@ -710,12 +704,12 @@
     rowIdColumnName,
     changingColumnNames,
     args,
-    useOnConflict = true,
+    orReplace = 0,
   ) =>
     __async$4(void 0, null, function* () {
       return yield cmd(
         'INSERT ' +
-          (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+          (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
           'INTO' +
           escapeId(tableName) +
           '(' +
@@ -728,8 +722,9 @@
           ) +
           ')VALUES' +
           getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-          (useOnConflict
-            ? 'ON CONFLICT(' +
+          (orReplace
+            ? EMPTY_STRING
+            : 'ON CONFLICT(' +
               escapeId(rowIdColumnName) +
               ')DO UPDATE SET' +
               arrayJoin(
@@ -739,8 +734,7 @@
                     escapeId(columnName) + '=excluded.' + escapeId(columnName),
                 ),
                 COMMA,
-              )
-            : EMPTY_STRING),
+              )),
         arrayMap(args, (arg) => (arg != null ? arg : null)),
       );
     });
@@ -798,7 +792,8 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -806,7 +801,8 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
       );
     const getPersisted = () =>
       __async$3(void 0, null, function* () {
@@ -908,7 +904,10 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -916,7 +915,10 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
+        encode,
+        decode,
       );
     const saveTables = (tables, partial) =>
       __async$2(void 0, null, function* () {
@@ -1268,6 +1270,10 @@
         }),
       thing,
       getThing,
+      'text',
+      0,
+      (cellOrValue) => jsonString(cellOrValue),
+      (field) => jsonParse(field),
     );
   };
 

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

@@ -157,16 +157,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 == null ? void 0 : map.get(key));
@@ -190,25 +192,25 @@
     return mapGet(map, key);
   };
 
-  var __defProp$1 = Object.defineProperty;
-  var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-  var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-  var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp$1 = (obj, key, value) =>
+  var __defProp = Object.defineProperty;
+  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+  var __hasOwnProp = Object.prototype.hasOwnProperty;
+  var __propIsEnum = Object.prototype.propertyIsEnumerable;
+  var __defNormalProp = (obj, key, value) =>
     key in obj
-      ? __defProp$1(obj, key, {
+      ? __defProp(obj, key, {
           enumerable: true,
           configurable: true,
           writable: true,
           value,
         })
       : (obj[key] = value);
-  var __spreadValues$1 = (a, b) => {
+  var __spreadValues = (a, b) => {
     for (var prop in b || (b = {}))
-      if (__hasOwnProp$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
-    if (__getOwnPropSymbols$1)
-      for (var prop of __getOwnPropSymbols$1(b)) {
-        if (__propIsEnum$1.call(b, prop)) __defNormalProp$1(a, prop, b[prop]);
+      if (__hasOwnProp.call(b, prop)) __defNormalProp(a, prop, b[prop]);
+    if (__getOwnPropSymbols)
+      for (var prop of __getOwnPropSymbols(b)) {
+        if (__propIsEnum.call(b, prop)) __defNormalProp(a, prop, b[prop]);
       }
     return a;
   };
@@ -422,7 +424,7 @@
       return stopAutoLoad().stopAutoSave();
     };
     const getStats = () => ({loads, saves});
-    const persister = __spreadValues$1(
+    const persister = __spreadValues(
       {
         load,
         startAutoLoad,
@@ -450,28 +452,6 @@
     );
   const setAdd = (set, value) => (set == null ? void 0 : set.add(value));
 
-  var __defProp = Object.defineProperty;
-  var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-  var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __propIsEnum = Object.prototype.propertyIsEnumerable;
-  var __defNormalProp = (obj, key, value) =>
-    key in obj
-      ? __defProp(obj, key, {
-          enumerable: true,
-          configurable: true,
-          writable: true,
-          value,
-        })
-      : (obj[key] = value);
-  var __spreadValues = (a, b) => {
-    for (var prop in b || (b = {}))
-      if (__hasOwnProp.call(b, prop)) __defNormalProp(a, prop, b[prop]);
-    if (__getOwnPropSymbols)
-      for (var prop of __getOwnPropSymbols(b)) {
-        if (__propIsEnum.call(b, prop)) __defNormalProp(a, prop, b[prop]);
-      }
-    return a;
-  };
   var __async$4 = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
       var fulfilled = (value) => {
@@ -500,7 +480,10 @@
     managedTableNames,
     querySchema,
     onIgnoredError,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const schemaMap = mapNew();
     const canSelect = (tableName, rowIdColumnName) =>
@@ -521,7 +504,9 @@
                   yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
                   (row) => [
                     row[rowIdColumnName],
-                    objDel(__spreadValues({}, row), rowIdColumnName),
+                    decode
+                      ? objMap(objDel(row, rowIdColumnName), decode)
+                      : objDel(row, rowIdColumnName),
                   ],
                 ),
                 ([rowId, row]) => !isUndefined(rowId) && !objIsEmpty(row),
@@ -564,10 +549,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,
                   ),
                 )});`,
             );
@@ -588,7 +573,7 @@
                           escapeId(tableName) +
                           'ADD' +
                           escapeId(columnName) +
-                          (index == 0 ? 'text' : 'json'),
+                          columnType,
                       );
                       if (index == 0) {
                         yield cmd(
@@ -643,8 +628,13 @@
                       tableName,
                       rowIdColumnName,
                       objIds(row),
-                      [rowId, ...objValues(row)],
-                      useOnConflict,
+                      [
+                        rowId,
+                        ...(encode
+                          ? arrayMap(objValues(row), encode)
+                          : objValues(row)),
+                      ],
+                      orReplace,
                     );
                   }
                 }),
@@ -664,7 +654,11 @@
                 args,
                 rowId,
                 ...arrayMap(changingColumnNames, (cellId) =>
-                  row == null ? void 0 : row[cellId],
+                  encode
+                    ? encode(row == null ? void 0 : row[cellId])
+                    : row == null
+                      ? void 0
+                      : row[cellId],
                 ),
               );
               arrayPush(deleteRowIds, rowId);
@@ -675,7 +669,7 @@
               rowIdColumnName,
               changingColumnNames,
               args,
-              useOnConflict,
+              orReplace,
             );
             yield cmd(
               DELETE_FROM +
@@ -710,12 +704,12 @@
     rowIdColumnName,
     changingColumnNames,
     args,
-    useOnConflict = true,
+    orReplace = 0,
   ) =>
     __async$4(void 0, null, function* () {
       return yield cmd(
         'INSERT ' +
-          (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+          (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
           'INTO' +
           escapeId(tableName) +
           '(' +
@@ -728,8 +722,9 @@
           ) +
           ')VALUES' +
           getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-          (useOnConflict
-            ? 'ON CONFLICT(' +
+          (orReplace
+            ? EMPTY_STRING
+            : 'ON CONFLICT(' +
               escapeId(rowIdColumnName) +
               ')DO UPDATE SET' +
               arrayJoin(
@@ -739,8 +734,7 @@
                     escapeId(columnName) + '=excluded.' + escapeId(columnName),
                 ),
                 COMMA,
-              )
-            : EMPTY_STRING),
+              )),
         arrayMap(args, (arg) => (arg != null ? arg : null)),
       );
     });
@@ -798,7 +792,8 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -806,7 +801,8 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
       );
     const getPersisted = () =>
       __async$3(void 0, null, function* () {
@@ -908,7 +904,10 @@
     querySchema,
     thing,
     getThing,
-    useOnConflict,
+    columnType,
+    orReplace,
+    encode,
+    decode,
   ) => {
     const [refreshSchema, loadTable, saveTable, transaction] =
       getCommandFunctions(
@@ -916,7 +915,10 @@
         managedTableNames,
         querySchema,
         onIgnoredError,
-        useOnConflict,
+        columnType,
+        orReplace,
+        encode,
+        decode,
       );
     const saveTables = (tables, partial) =>
       __async$2(void 0, null, function* () {
@@ -1268,6 +1270,10 @@
         }),
       thing,
       getThing,
+      'text',
+      0,
+      (cellOrValue) => jsonString(cellOrValue),
+      (field) => jsonParse(field),
     );
   };