tinybase 5.2.0-beta.3 → 5.2.0-beta.5

package/es6/persisters/persister-browser/index.js

@@ -33,11 +33,12 @@ const objFreeze = object.freeze;
 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 collHas = (coll, keyOrValue) => {
   var _a;

package/es6/persisters/persister-browser/with-schemas/index.js

@@ -33,11 +33,12 @@ const objFreeze = object.freeze;
 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 collHas = (coll, keyOrValue) => {
   var _a;

package/es6/persisters/persister-cr-sqlite-wasm/index.js

@@ -94,14 +94,14 @@ const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const FROM = 'FROM ';
 const PRAGMA_TABLE = 'pragma_table_';
-const getWrappedCommand = (rawCmd, onSqlCommand) =>
+const getWrappedCommand = (executeCommand, onSqlCommand) =>
   onSqlCommand
-    ? (sql, args) =>
+    ? (sql, params) =>
         __async$6(void 0, null, function* () {
-          onSqlCommand(sql, args);
-          return yield rawCmd(sql, args);
+          onSqlCommand(sql, params);
+          return yield executeCommand(sql, params);
         })
-    : rawCmd;
+    : executeCommand;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -148,14 +148,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 == null ? void 0 : map.get(key));
@@ -179,25 +183,25 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   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;
 };
@@ -411,7 +415,7 @@ const createCustomPersister = (
     return stopAutoLoad().stopAutoSave();
   };
   const getStats = () => ({loads, saves});
-  const persister = __spreadValues$1(
+  const persister = __spreadValues(
     {
       load,
       startAutoLoad,
@@ -439,28 +443,6 @@ const setNew = (entryOrEntries) =>
   );
 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) => {
@@ -485,11 +467,14 @@ var __async$4 = (__this, __arguments, generator) => {
   });
 };
 const getCommandFunctions = (
-  cmd,
+  databaseExecuteCommand,
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -497,8 +482,9 @@ const getCommandFunctions = (
   const refreshSchema = () =>
     __async$4(void 0, null, function* () {
       collClear(schemaMap);
-      arrayMap(yield querySchema(cmd, managedTableNames), ({tn, cn}) =>
-        setAdd(mapEnsure(schemaMap, tn, setNew), cn),
+      arrayMap(
+        yield querySchema(databaseExecuteCommand, managedTableNames),
+        ({tn, cn}) => setAdd(mapEnsure(schemaMap, tn, setNew), cn),
       );
     });
   const loadTable = (tableName, rowIdColumnName) =>
@@ -507,10 +493,14 @@ const getCommandFunctions = (
         ? objNew(
             arrayFilter(
               arrayMap(
-                yield cmd(SELECT_STAR_FROM + escapeId(tableName)),
+                yield databaseExecuteCommand(
+                  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),
@@ -541,7 +531,7 @@ const getCommandFunctions = (
         arrayIsEmpty(tableColumnNames) &&
         collHas(schemaMap, tableName)
       ) {
-        yield cmd('DROP ' + TABLE + escapeId(tableName));
+        yield databaseExecuteCommand('DROP ' + TABLE + escapeId(tableName));
         mapSet(schemaMap, tableName);
         return;
       }
@@ -549,14 +539,14 @@ const getCommandFunctions = (
       const currentColumnNames = setNew(collValues(tableSchemaColumns));
       if (!arrayIsEmpty(tableColumnNames)) {
         if (!collHas(schemaMap, tableName)) {
-          yield cmd(
+          yield databaseExecuteCommand(
             '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,
                 ),
               )});`,
           );
@@ -572,15 +562,15 @@ const getCommandFunctions = (
               (columnName, index) =>
                 __async$4(void 0, null, function* () {
                   if (!collDel(currentColumnNames, columnName)) {
-                    yield cmd(
+                    yield databaseExecuteCommand(
                       ALTER_TABLE +
                         escapeId(tableName) +
                         'ADD' +
                         escapeId(columnName) +
-                        (index == 0 ? 'text' : 'json'),
+                        columnType,
                     );
                     if (index == 0) {
-                      yield cmd(
+                      yield databaseExecuteCommand(
                         'CREATE UNIQUE INDEX pk ON ' +
                           escapeId(tableName) +
                           `(${escapeId(rowIdColumnName)})`,
@@ -598,7 +588,7 @@ const getCommandFunctions = (
           ? arrayMap(collValues(currentColumnNames), (columnName) =>
               __async$4(void 0, null, function* () {
                 if (columnName != rowIdColumnName) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     ALTER_TABLE +
                       escapeId(tableName) +
                       'DROP' +
@@ -612,13 +602,15 @@ const getCommandFunctions = (
       ]);
       if (partial) {
         if (isUndefined(content)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         } else {
           yield promiseAll(
             objToArray(content, (row, rowId) =>
               __async$4(void 0, null, function* () {
                 if (isUndefined(row)) {
-                  yield cmd(
+                  yield databaseExecuteCommand(
                     DELETE_FROM +
                       escapeId(tableName) +
                       WHERE +
@@ -628,12 +620,17 @@ const getCommandFunctions = (
                   );
                 } else if (!arrayIsEmpty(tableColumnNames)) {
                   yield upsert(
-                    cmd,
+                    databaseExecuteCommand,
                     tableName,
                     rowIdColumnName,
                     objIds(row),
-                    [rowId, ...objValues(row)],
-                    useOnConflict,
+                    [
+                      rowId,
+                      ...(encode
+                        ? arrayMap(objValues(row), encode)
+                        : objValues(row)),
+                    ],
+                    orReplace,
                   );
                 }
               }),
@@ -646,27 +643,31 @@ const getCommandFunctions = (
             collValues(mapGet(schemaMap, tableName)),
             (columnName) => columnName != rowIdColumnName,
           );
-          const args = [];
+          const params = [];
           const deleteRowIds = [];
           objToArray(content != null ? content : {}, (row, rowId) => {
             arrayPush(
-              args,
+              params,
               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);
           });
           yield upsert(
-            cmd,
+            databaseExecuteCommand,
             tableName,
             rowIdColumnName,
             changingColumnNames,
-            args,
-            useOnConflict,
+            params,
+            orReplace,
           );
-          yield cmd(
+          yield databaseExecuteCommand(
             DELETE_FROM +
               escapeId(tableName) +
               WHERE +
@@ -675,36 +676,38 @@ const getCommandFunctions = (
             deleteRowIds,
           );
         } else if (collHas(schemaMap, tableName)) {
-          yield cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' true');
+          yield databaseExecuteCommand(
+            DELETE_FROM + escapeId(tableName) + WHERE + ' true',
+          );
         }
       }
     });
   const transaction = (actions) =>
     __async$4(void 0, null, function* () {
       let result;
-      yield cmd('BEGIN');
+      yield databaseExecuteCommand('BEGIN');
       try {
         result = yield actions();
       } catch (error) {
         onIgnoredError == null ? void 0 : onIgnoredError(error);
       }
-      yield cmd('END');
+      yield databaseExecuteCommand('END');
       return result;
     });
   return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = (
-  cmd,
+  executeCommand,
   tableName,
   rowIdColumnName,
   changingColumnNames,
-  args,
-  useOnConflict = true,
+  params,
+  orReplace = 0,
 ) =>
   __async$4(void 0, null, function* () {
-    return yield cmd(
+    return yield executeCommand(
       'INSERT ' +
-        (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+        (orReplace ? 'OR REPLACE ' : EMPTY_STRING) +
         'INTO' +
         escapeId(tableName) +
         '(' +
@@ -716,9 +719,10 @@ const upsert = (
           ),
         ) +
         ')VALUES' +
-        getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-        (useOnConflict
-          ? 'ON CONFLICT(' +
+        getUpsertPlaceholders(params, size(changingColumnNames) + 1) +
+        (orReplace
+          ? EMPTY_STRING
+          : 'ON CONFLICT(' +
             escapeId(rowIdColumnName) +
             ')DO UPDATE SET' +
             arrayJoin(
@@ -728,9 +732,8 @@ const upsert = (
                   escapeId(columnName) + '=excluded.' + escapeId(columnName),
               ),
               COMMA,
-            )
-          : EMPTY_STRING),
-      arrayMap(args, (arg) => (arg != null ? arg : null)),
+            )),
+      arrayMap(params, (param) => (param != null ? param : null)),
     );
   });
 const getUpsertPlaceholders = (array, columnCount) =>
@@ -776,7 +779,7 @@ var __async$3 = (__this, __arguments, generator) => {
 };
 const createJsonPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -787,15 +790,17 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = () =>
     __async$3(void 0, null, function* () {
@@ -882,7 +887,7 @@ var __async$2 = (__this, __arguments, generator) => {
 };
 const createTabularPersister = (
   store,
-  cmd,
+  executeCommand,
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
@@ -897,15 +902,21 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
-      cmd,
+      executeCommand,
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = (tables, partial) =>
     __async$2(void 0, null, function* () {
@@ -1159,23 +1170,24 @@ var __async$1 = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const createSqlitePersister = (
+const createCustomSqlitePersister = (
   store,
   configOrStoreTableName,
-  rawCmd,
-  addUpdateListener,
-  delUpdateListener,
+  rawExecuteCommand,
+  addChangeListener,
+  delChangeListener,
   onSqlCommand,
   onIgnoredError,
+  destroy,
   persist,
   thing,
   getThing = 'getDb',
-  useOnConflict,
+  orReplace,
 ) => {
   let dataVersion;
   let schemaVersion;
   let totalChanges;
-  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
+  const executeCommand = getWrappedCommand(rawExecuteCommand, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
@@ -1189,7 +1201,7 @@ const createSqlitePersister = (
         () =>
           __async$1(void 0, null, function* () {
             try {
-              const [{d, s, c}] = yield cmd(
+              const [{d, s, c}] = yield executeCommand(
                 // eslint-disable-next-line max-len
                 `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
               );
@@ -1209,7 +1221,7 @@ const createSqlitePersister = (
       dataVersion = schemaVersion = totalChanges = null;
       stopInterval(interval);
     };
-    const listeningHandle = addUpdateListener((tableName) => {
+    const listeningHandle = addChangeListener((tableName) => {
       if (managedTableNamesSet.has(tableName)) {
         stopPolling();
         listener();
@@ -1219,24 +1231,24 @@ const createSqlitePersister = (
     startPolling();
     return () => {
       stopPolling();
-      delUpdateListener(listeningHandle);
+      delChangeListener(listeningHandle);
     };
   };
   const delPersisterListener = (stopPollingAndDelUpdateListener) =>
     stopPollingAndDelUpdateListener();
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    cmd,
+    executeCommand,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    () => 0,
+    destroy,
     persist,
     defaultedConfig,
     collValues(managedTableNamesSet),
-    (cmd2, managedTableNames) =>
+    (executeCommand2, managedTableNames) =>
       __async$1(void 0, null, function* () {
-        return yield cmd2(
+        return yield executeCommand2(
           // eslint-disable-next-line max-len
           `${SELECT} t.name tn,c.name cn ${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`,
           managedTableNames,
@@ -1244,7 +1256,11 @@ const createSqlitePersister = (
       }),
     thing,
     getThing,
-    useOnConflict,
+    EMPTY_STRING,
+    orReplace,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
   );
 };
 
@@ -1278,17 +1294,18 @@ const createCrSqliteWasmPersister = (
   onSqlCommand,
   onIgnoredError,
 ) =>
-  createSqlitePersister(
+  createCustomSqlitePersister(
     store,
     configOrStoreTableName,
     (_0, ..._1) =>
-      __async(void 0, [_0, ..._1], function* (sql, args = []) {
-        return yield db.execO(sql, args);
+      __async(void 0, [_0, ..._1], function* (sql, params = []) {
+        return yield db.execO(sql, params);
       }),
     (listener) => db.onUpdate((_, _2, tableName) => listener(tableName)),
     (removeListener) => removeListener(),
     onSqlCommand,
     onIgnoredError,
+    () => 0,
     1,
     // StoreOnly,
     db,