tinybase 5.2.0-beta.2 → 5.2.0-beta.4

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

@@ -5,7 +5,7 @@ const COMMA = ',';
 const STRING = getTypeOf(EMPTY_STRING);
 const UNDEFINED = '\uFFFC';
 
-var __async$6 = (__this, __arguments, generator) => {
+var __async$7 = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
       try {
@@ -30,7 +30,6 @@ var __async$6 = (__this, __arguments, generator) => {
 };
 const promise = Promise;
 const startInterval = (callback, sec, immediate) => {
-  callback();
   return setInterval(callback, sec * 1e3);
 };
 const stopInterval = clearInterval;
@@ -42,7 +41,7 @@ const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const promiseAll = (promises) =>
-  __async$6(void 0, null, function* () {
+  __async$7(void 0, null, function* () {
     return promise.all(promises);
   });
 const errorNew = (message) => {
@@ -59,6 +58,29 @@ const arrayClear = (array, to) => array.splice(0, to);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
+var __async$6 = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) =>
+      x.done
+        ? resolve(x.value)
+        : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 const SINGLE_ROW_ID = '_';
 const DEFAULT_ROW_ID_COLUMN_NAME = '_id';
 const SELECT = 'SELECT';
@@ -72,6 +94,14 @@ const DATA_VERSION = 'data_version';
 const SCHEMA_VERSION = 'schema_version';
 const FROM = 'FROM ';
 const PRAGMA_TABLE = 'pragma_table_';
+const getWrappedCommand = (rawCmd, onSqlCommand) =>
+  onSqlCommand
+    ? (sql, args) =>
+        __async$6(void 0, null, function* () {
+          onSqlCommand(sql, args);
+          return yield rawCmd(sql, args);
+        })
+    : rawCmd;
 const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -118,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));
@@ -149,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;
 };
@@ -282,9 +316,11 @@ const createCustomPersister = (
           __async$5(void 0, null, function* () {
             try {
               const content = yield getPersisted();
-              isArray(content)
-                ? setContentOrChanges(content)
-                : errorNew(`Content is not an array ${content}`);
+              if (isArray(content)) {
+                setContentOrChanges(content);
+              } else {
+                errorNew(`Content is not an array ${content}`);
+              }
             } catch (error) {
               onIgnoredError == null ? void 0 : onIgnoredError(error);
               if (initialContent) {
@@ -379,7 +415,7 @@ const createCustomPersister = (
     return stopAutoLoad().stopAutoSave();
   };
   const getStats = () => ({loads, saves});
-  const persister = __spreadValues$1(
+  const persister = __spreadValues(
     {
       load,
       startAutoLoad,
@@ -407,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) => {
@@ -457,7 +471,10 @@ const getCommandFunctions = (
   managedTableNames,
   querySchema,
   onIgnoredError,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
@@ -478,7 +495,9 @@ const getCommandFunctions = (
                 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),
@@ -521,10 +540,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,
                 ),
               )});`,
           );
@@ -545,7 +564,7 @@ const getCommandFunctions = (
                         escapeId(tableName) +
                         'ADD' +
                         escapeId(columnName) +
-                        (index == 0 ? 'text' : 'json'),
+                        columnType,
                     );
                     if (index == 0) {
                       yield cmd(
@@ -600,8 +619,13 @@ const getCommandFunctions = (
                     tableName,
                     rowIdColumnName,
                     objIds(row),
-                    [rowId, ...objValues(row)],
-                    useOnConflict,
+                    [
+                      rowId,
+                      ...(encode
+                        ? arrayMap(objValues(row), encode)
+                        : objValues(row)),
+                    ],
+                    orReplace,
                   );
                 }
               }),
@@ -621,7 +645,11 @@ const getCommandFunctions = (
               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);
@@ -632,7 +660,7 @@ const getCommandFunctions = (
             rowIdColumnName,
             changingColumnNames,
             args,
-            useOnConflict,
+            orReplace,
           );
           yield cmd(
             DELETE_FROM +
@@ -667,12 +695,12 @@ const upsert = (
   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) +
         '(' +
@@ -685,8 +713,9 @@ const upsert = (
         ) +
         ')VALUES' +
         getUpsertPlaceholders(args, size(changingColumnNames) + 1) +
-        (useOnConflict
-          ? 'ON CONFLICT(' +
+        (orReplace
+          ? EMPTY_STRING
+          : 'ON CONFLICT(' +
             escapeId(rowIdColumnName) +
             ')DO UPDATE SET' +
             arrayJoin(
@@ -696,8 +725,7 @@ const upsert = (
                   escapeId(columnName) + '=excluded.' + escapeId(columnName),
               ),
               COMMA,
-            )
-          : EMPTY_STRING),
+            )),
       arrayMap(args, (arg) => (arg != null ? arg : null)),
     );
   });
@@ -755,7 +783,8 @@ const createJsonPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -763,7 +792,8 @@ const createJsonPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
     );
   const getPersisted = () =>
     __async$3(void 0, null, function* () {
@@ -865,7 +895,10 @@ const createTabularPersister = (
   querySchema,
   thing,
   getThing,
-  useOnConflict,
+  columnType,
+  orReplace,
+  encode,
+  decode,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
     getCommandFunctions(
@@ -873,7 +906,10 @@ const createTabularPersister = (
       managedTableNames,
       querySchema,
       onIgnoredError,
-      useOnConflict,
+      columnType,
+      orReplace,
+      encode,
+      decode,
     );
   const saveTables = (tables, partial) =>
     __async$2(void 0, null, function* () {
@@ -1130,7 +1166,7 @@ var __async$1 = (__this, __arguments, generator) => {
 const createSqlitePersister = (
   store,
   configOrStoreTableName,
-  cmd,
+  rawCmd,
   addUpdateListener,
   delUpdateListener,
   onSqlCommand,
@@ -1138,58 +1174,63 @@ const createSqlitePersister = (
   persist,
   thing,
   getThing = 'getDb',
-  useOnConflict,
+  orReplace,
 ) => {
   let dataVersion;
   let schemaVersion;
   let totalChanges;
+  const cmd = getWrappedCommand(rawCmd, onSqlCommand);
   const [
     isJson,
     autoLoadIntervalSeconds,
     defaultedConfig,
     managedTableNamesSet,
   ] = getConfigStructures(configOrStoreTableName);
-  const addPersisterListener = (listener) => [
-    startInterval(
-      () =>
-        __async$1(void 0, null, function* () {
-          try {
-            const [{d, s, c}] = yield cmd(
-              SELECT +
-                ` ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
-            );
-            if (
-              d != (dataVersion != null ? dataVersion : (dataVersion = d)) ||
-              s !=
-                (schemaVersion != null ? schemaVersion : (schemaVersion = s)) ||
-              c != (totalChanges != null ? totalChanges : (totalChanges = c))
-            ) {
-              listener();
-              dataVersion = d;
-              schemaVersion = s;
-            }
-          } catch (e) {}
-        }),
-      autoLoadIntervalSeconds,
-    ),
-    addUpdateListener((tableName) =>
-      managedTableNamesSet.has(tableName) ? listener() : 0,
-    ),
-  ];
-  const delPersisterListener = ([interval, listeningHandle]) => {
-    stopInterval(interval);
-    dataVersion = schemaVersion = totalChanges = null;
-    delUpdateListener(listeningHandle);
+  const addPersisterListener = (listener) => {
+    let interval;
+    const startPolling = () =>
+      (interval = startInterval(
+        () =>
+          __async$1(void 0, null, function* () {
+            try {
+              const [{d, s, c}] = yield cmd(
+                // eslint-disable-next-line max-len
+                `${SELECT} ${DATA_VERSION} d,${SCHEMA_VERSION} s,TOTAL_CHANGES() c FROM ${PRAGMA}${DATA_VERSION} JOIN ${PRAGMA}${SCHEMA_VERSION}`,
+              );
+              if (d != dataVersion || s != schemaVersion || c != totalChanges) {
+                if (dataVersion != null) {
+                  listener();
+                }
+                dataVersion = d;
+                schemaVersion = s;
+                totalChanges = c;
+              }
+            } catch (e) {}
+          }),
+        autoLoadIntervalSeconds,
+      ));
+    const stopPolling = () => {
+      dataVersion = schemaVersion = totalChanges = null;
+      stopInterval(interval);
+    };
+    const listeningHandle = addUpdateListener((tableName) => {
+      if (managedTableNamesSet.has(tableName)) {
+        stopPolling();
+        listener();
+        startPolling();
+      }
+    });
+    startPolling();
+    return () => {
+      stopPolling();
+      delUpdateListener(listeningHandle);
+    };
   };
+  const delPersisterListener = (stopPollingAndDelUpdateListener) =>
+    stopPollingAndDelUpdateListener();
   return (isJson ? createJsonPersister : createTabularPersister)(
     store,
-    onSqlCommand
-      ? (sql, args) =>
-          __async$1(void 0, null, function* () {
-            onSqlCommand(sql, args);
-            return yield cmd(sql, args);
-          })
-      : cmd,
+    cmd,
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
@@ -1207,7 +1248,11 @@ const createSqlitePersister = (
       }),
     thing,
     getThing,
-    useOnConflict,
+    EMPTY_STRING,
+    orReplace,
+    (cellOrValue) =>
+      cellOrValue === true ? 1 : cellOrValue === false ? 0 : cellOrValue,
+    void 0,
   );
 };
 

package/es6/persisters/persister-partykit-client/index.js

@@ -37,11 +37,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 jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
+  jsonString(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
-const jsonParse = JSON.parse;
 
 const SET_CHANGES = 's';
 const STORE_PATH = '/store';
@@ -212,9 +213,11 @@ const createCustomPersister = (
           __async$1(void 0, null, function* () {
             try {
               const content = yield getPersisted();
-              isArray(content)
-                ? setContentOrChanges(content)
-                : errorNew(`Content is not an array ${content}`);
+              if (isArray(content)) {
+                setContentOrChanges(content);
+              } else {
+                errorNew(`Content is not an array ${content}`);
+              }
             } catch (error) {
               onIgnoredError == null ? void 0 : onIgnoredError(error);
               if (initialContent) {

package/es6/persisters/persister-partykit-client/with-schemas/index.js

@@ -37,11 +37,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 jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
+  jsonString(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
-const jsonParse = JSON.parse;
 
 const SET_CHANGES = 's';
 const STORE_PATH = '/store';
@@ -212,9 +213,11 @@ const createCustomPersister = (
           __async$1(void 0, null, function* () {
             try {
               const content = yield getPersisted();
-              isArray(content)
-                ? setContentOrChanges(content)
-                : errorNew(`Content is not an array ${content}`);
+              if (isArray(content)) {
+                setContentOrChanges(content);
+              } else {
+                errorNew(`Content is not an array ${content}`);
+              }
             } catch (error) {
               onIgnoredError == null ? void 0 : onIgnoredError(error);
               if (initialContent) {

package/es6/persisters/persister-partykit-server/index.js

@@ -60,11 +60,12 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
+const jsonString = JSON.stringify;
+const jsonParse = JSON.parse;
 const jsonStringWithMap = (obj) =>
-  JSON.stringify(obj, (_key, value) =>
+  jsonString(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
-const jsonParse = JSON.parse;
 
 const SET_CHANGES = 's';
 const STORE_PATH = '/store';
@@ -222,20 +223,27 @@ const saveStore = (that, changes, initialSave, requestOrConnection) =>
                                     T,
                                     ...ids,
                                   );
-                                  isUndefined(cell)
-                                    ? !initialSave &&
+                                  if (isUndefined(cell)) {
+                                    if (
+                                      !initialSave &&
                                       (yield that.canDelCell(
                                         ...ids,
                                         requestOrConnection,
-                                      )) &&
-                                      arrayPush(keysToDel, key)
-                                    : (yield that.canSetCell(
-                                        ...ids,
-                                        cell,
-                                        initialSave,
-                                        requestOrConnection,
-                                        yield storage.get(key),
-                                      )) && (keysToSet[key] = cell);
+                                      ))
+                                    ) {
+                                      arrayPush(keysToDel, key);
+                                    }
+                                  } else if (
+                                    yield that.canSetCell(
+                                      ...ids,
+                                      cell,
+                                      initialSave,
+                                      requestOrConnection,
+                                      yield storage.get(key),
+                                    )
+                                  ) {
+                                    keysToSet[key] = cell;
+                                  }
                                 }),
                               ),
                             ));
@@ -249,17 +257,24 @@ const saveStore = (that, changes, initialSave, requestOrConnection) =>
       objToArray(changes[1], (value, valueId) =>
         __async(void 0, null, function* () {
           const key = storagePrefix + V + valueId;
-          isUndefined(value)
-            ? !initialSave &&
-              (yield that.canDelValue(valueId, requestOrConnection)) &&
-              arrayPush(keysToDel, key)
-            : (yield that.canSetValue(
-                valueId,
-                value,
-                initialSave,
-                requestOrConnection,
-                yield storage.get(key),
-              )) && (keysToSet[key] = value);
+          if (isUndefined(value)) {
+            if (
+              !initialSave &&
+              (yield that.canDelValue(valueId, requestOrConnection))
+            ) {
+              arrayPush(keysToDel, key);
+            }
+          } else if (
+            yield that.canSetValue(
+              valueId,
+              value,
+              initialSave,
+              requestOrConnection,
+              yield storage.get(key),
+            )
+          ) {
+            keysToSet[key] = value;
+          }
         }),
       ),
     );