tinybase 4.5.0-beta.0 → 4.5.0

package/lib/debug/persisters/persister-partykit-server.js

@@ -67,15 +67,12 @@ const RESPONSE_HEADERS = objNew(
     '*',
   ]),
 );
-const hasStore = async (that) =>
-  await that.party.storage.get(
-    (that.config.storagePrefix ?? EMPTY_STRING) + HAS_STORE,
-  );
-const loadStore = async (that) => {
+const hasStoreInStorage = async (storage, storagePrefix = EMPTY_STRING) =>
+  !!(await storage.get(storagePrefix + HAS_STORE));
+const loadStoreFromStorage = async (storage, storagePrefix = EMPTY_STRING) => {
   const tables = {};
   const values = {};
-  const storagePrefix = that.config.storagePrefix ?? EMPTY_STRING;
-  mapForEach(await that.party.storage.list(), (key, cellOrValue) =>
+  mapForEach(await storage.list(), (key, cellOrValue) =>
     ifNotUndefined(deconstruct(storagePrefix, key), ([type, ids]) => {
       if (type == T) {
         const [tableId, rowId, cellId] = jsonParse('[' + ids + ']');
@@ -95,9 +92,9 @@ const saveStore = async (
   requestOrConnection,
 ) => {
   const storage = that.party.storage;
-  const prefix = that.config.storagePrefix ?? EMPTY_STRING;
+  const storagePrefix = that.config.storagePrefix;
   const keysToSet = {
-    [prefix + HAS_STORE]: 1,
+    [storagePrefix + HAS_STORE]: 1,
   };
   const keysToDel = [];
   const keyPrefixesToDel = [];
@@ -108,7 +105,7 @@ const saveStore = async (
           that.canDelTable(tableId, requestOrConnection) &&
           arrayUnshift(
             keyPrefixesToDel,
-            constructStorageKey(prefix, T, tableId),
+            constructStorageKey(storagePrefix, T, tableId),
           )
         : that.canSetTable(tableId, initialSave, requestOrConnection) &&
           (await promiseAll(
@@ -118,7 +115,7 @@ const saveStore = async (
                   that.canDelRow(tableId, rowId, requestOrConnection) &&
                   arrayPush(
                     keyPrefixesToDel,
-                    constructStorageKey(prefix, T, tableId, rowId),
+                    constructStorageKey(storagePrefix, T, tableId, rowId),
                   )
                 : that.canSetRow(
                     tableId,
@@ -129,7 +126,7 @@ const saveStore = async (
                   (await promiseAll(
                     objMap(row, async (cell, cellId) => {
                       const ids = [tableId, rowId, cellId];
-                      const key = constructStorageKey(prefix, T, ...ids);
+                      const key = constructStorageKey(storagePrefix, T, ...ids);
                       isUndefined(cell)
                         ? !initialSave &&
                           that.canDelCell(...ids, requestOrConnection) &&
@@ -149,7 +146,7 @@ const saveStore = async (
   );
   await promiseAll(
     objMap(transactionChanges[1], async (value, valueId) => {
-      const key = prefix + V + valueId;
+      const key = storagePrefix + V + valueId;
       isUndefined(value)
         ? !initialSave &&
           that.canDelValue(valueId, requestOrConnection) &&
@@ -181,17 +178,24 @@ const constructStorageKey = (storagePrefix, type, ...ids) =>
 const createResponse = async (that, status, body = null) =>
   new Response(body, {
     status,
-    headers: that.config.responseHeaders ?? RESPONSE_HEADERS,
+    headers: that.config.responseHeaders,
   });
 class TinyBasePartyKitServer {
   constructor(party) {
     this.party = party;
     this.config = {};
+    this.config.storePath ??= STORE_PATH;
+    this.config.messagePrefix ??= EMPTY_STRING;
+    this.config.storagePrefix ??= EMPTY_STRING;
+    this.config.responseHeaders ??= RESPONSE_HEADERS;
   }
   async onRequest(request) {
-    const storePath = this.config.storePath ?? STORE_PATH;
+    const {
+      party: {storage},
+      config: {storePath, storagePrefix},
+    } = this;
     if (new URL(request.url).pathname.endsWith(storePath)) {
-      const hasExistingStore = await hasStore(this);
+      const hasExistingStore = await hasStoreInStorage(storage, storagePrefix);
       const text = await request.text();
       if (request.method == PUT) {
         if (hasExistingStore) {
@@ -203,19 +207,29 @@ class TinyBasePartyKitServer {
       return createResponse(
         this,
         200,
-        hasExistingStore ? jsonString(await loadStore(this)) : EMPTY_STRING,
+        hasExistingStore
+          ? jsonString(await loadStoreFromStorage(storage, storagePrefix))
+          : EMPTY_STRING,
       );
     }
     return createResponse(this, 404);
   }
   async onMessage(message, connection) {
-    const messagePrefix = this.config.messagePrefix ?? EMPTY_STRING;
+    const {
+      party: {storage, broadcast},
+      config: {messagePrefix, storagePrefix},
+    } = this;
     await ifNotUndefined(
       deconstruct(messagePrefix, message, 1),
       async ([type, payload]) => {
-        if (type == SET_CHANGES && (await hasStore(this))) {
+        if (
+          type == SET_CHANGES &&
+          (await hasStoreInStorage(storage, storagePrefix))
+        ) {
           await saveStore(this, payload, false, connection);
-          this.party.broadcast(construct(messagePrefix, SET_CHANGES, payload));
+          broadcast(construct(messagePrefix, SET_CHANGES, payload), [
+            connection.id,
+          ]);
         }
       },
     );
@@ -254,4 +268,4 @@ class TinyBasePartyKitServer {
   }
 }
 
-export {TinyBasePartyKitServer};
+export {TinyBasePartyKitServer, hasStoreInStorage, loadStoreFromStorage};

package/lib/debug/persisters/persister-yjs.js

@@ -275,35 +275,35 @@ const setTransactionChangesToYDoc = (
       transactionChangesFailed
         ? 0
         : isUndefined(table)
-        ? yTables.delete(tableId)
-        : ifNotUndefined(
-            yTables.get(tableId),
-            (yTable) =>
-              objMap(table, (row, rowId) =>
-                transactionChangesFailed
-                  ? 0
-                  : isUndefined(row)
-                  ? yTable.delete(rowId)
-                  : ifNotUndefined(
-                      yTable.get(rowId),
-                      (yRow) =>
-                        objMap(row, (cell, cellId) =>
-                          isUndefined(cell)
-                            ? yRow.delete(cellId)
-                            : yRow.set(cellId, cell),
+          ? yTables.delete(tableId)
+          : ifNotUndefined(
+              yTables.get(tableId),
+              (yTable) =>
+                objMap(table, (row, rowId) =>
+                  transactionChangesFailed
+                    ? 0
+                    : isUndefined(row)
+                      ? yTable.delete(rowId)
+                      : ifNotUndefined(
+                          yTable.get(rowId),
+                          (yRow) =>
+                            objMap(row, (cell, cellId) =>
+                              isUndefined(cell)
+                                ? yRow.delete(cellId)
+                                : yRow.set(cellId, cell),
+                            ),
+                          transactionChangesDidFail,
                         ),
-                      transactionChangesDidFail,
-                    ),
-              ),
-            transactionChangesDidFail,
-          ),
+                ),
+              transactionChangesDidFail,
+            ),
     );
     objMap(valueChanges, (value, valueId) =>
       transactionChangesFailed
         ? 0
         : isUndefined(value)
-        ? yValues.delete(valueId)
-        : yValues.set(valueId, value),
+          ? yValues.delete(valueId)
+          : yValues.set(valueId, value),
     );
   });
   if (transactionChangesFailed) {

package/lib/debug/queries.js

@@ -160,8 +160,8 @@ const getAggregateValue = (
       aggregateValue = isUndefined(oldValue)
         ? aggregateAdd?.(aggregateValue, newValue, oldLength++)
         : isUndefined(newValue)
-        ? aggregateRemove?.(aggregateValue, oldValue, oldLength--)
-        : aggregateReplace?.(aggregateValue, newValue, oldValue, oldLength);
+          ? aggregateRemove?.(aggregateValue, oldValue, oldLength--)
+          : aggregateReplace?.(aggregateValue, newValue, oldValue, oldLength);
       force ||= isUndefined(aggregateValue);
     }
   });
@@ -454,8 +454,8 @@ const createQueries = getCreateFunction((store) => {
         isFunction(arg1)
           ? arg1
           : isUndefined(arg3)
-          ? (getTableCell) => getTableCell(arg1) === arg2
-          : (getTableCell) => getTableCell(arg1, arg2) === arg3,
+            ? (getTableCell) => getTableCell(arg1) === arg2
+            : (getTableCell) => getTableCell(arg1, arg2) === arg3,
       );
     const group = (
       selectedCellId,
@@ -658,12 +658,12 @@ const createQueries = getCreateFunction((store) => {
           ...(isUndefined(arg2)
             ? [tableId, rootRowId, arg1]
             : arg1 === tableId
-            ? [tableId, rootRowId, arg2]
-            : [
-                mapGet(joins, arg1)?.[0],
-                mapGet(mapGet(joins, arg1)?.[4], rootRowId)?.[0],
-                arg2,
-              ]),
+              ? [tableId, rootRowId, arg2]
+              : [
+                  mapGet(joins, arg1)?.[0],
+                  mapGet(mapGet(joins, arg1)?.[4], rootRowId)?.[0],
+                  arg2,
+                ]),
         );
       selectJoinWhereStore.transaction(() =>
         arrayEvery(wheres, (where2) => where2(getTableCell))

package/lib/debug/relationships.js

@@ -268,8 +268,8 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
     p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
-      ? collForEach(node, (node2) => deep(node2, p + 1))
-      : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
+        ? collForEach(node, (node2) => deep(node2, p + 1))
+        : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
   deep(deepIdSet, 0);
   return leaves;
 };
@@ -321,10 +321,10 @@ const getListenerFunctions = (getThing) => {
           index == size(path)
             ? listener(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
-            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                callWithIds(...ids, id2),
-              )
-            : callWithIds(...ids, path[index]);
+              ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                  callWithIds(...ids, id2),
+                )
+              : callWithIds(...ids, path[index]);
         };
         callWithIds();
       },

package/lib/debug/store.js

@@ -182,8 +182,8 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
     p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
-      ? collForEach(node, (node2) => deep(node2, p + 1))
-      : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
+        ? collForEach(node, (node2) => deep(node2, p + 1))
+        : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
   deep(deepIdSet, 0);
   return leaves;
 };
@@ -235,10 +235,10 @@ const getListenerFunctions = (getThing) => {
           index == size(path)
             ? listener(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
-            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                callWithIds(...ids, id2),
-              )
-            : callWithIds(...ids, path[index]);
+              ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                  callWithIds(...ids, id2),
+                )
+              : callWithIds(...ids, path[index]);
         };
         callWithIds();
       },
@@ -400,8 +400,8 @@ const createStore = () => {
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
-      ? cellInvalid(tableId, rowId, cellId, cell)
-      : cell;
+        ? cellInvalid(tableId, rowId, cellId, cell)
+        : cell;
   const validateValues = (values, skipDefaults) =>
     validate(
       skipDefaults ? values : addDefaultsToValues(values),
@@ -427,8 +427,8 @@ const createStore = () => {
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))
-      ? valueInvalid(valueId, value)
-      : value;
+        ? valueInvalid(valueId, value)
+        : value;
   const addDefaultsToRow = (row, tableId, rowId) => {
     ifNotUndefined(
       mapGet(tablesSchemaRowCache, tableId),

package/lib/debug/tinybase.js

@@ -386,8 +386,8 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
     p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
-      ? collForEach(node, (node2) => deep(node2, p + 1))
-      : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
+        ? collForEach(node, (node2) => deep(node2, p + 1))
+        : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
   deep(deepIdSet, 0);
   return leaves;
 };
@@ -439,10 +439,10 @@ const getListenerFunctions = (getThing) => {
           index == size(path)
             ? listener(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
-            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                callWithIds(...ids, id2),
-              )
-            : callWithIds(...ids, path[index]);
+              ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                  callWithIds(...ids, id2),
+                )
+              : callWithIds(...ids, path[index]);
         };
         callWithIds();
       },
@@ -621,8 +621,8 @@ const createCheckpoints = getCreateFunction((store) => {
     const action = arrayHas(backwardIds, checkpointId)
       ? goBackwardImpl
       : arrayHas(forwardIds, checkpointId)
-      ? goForwardImpl
-      : null;
+        ? goForwardImpl
+        : null;
     while (!isUndefined(action) && checkpointId != currentId) {
       action();
     }
@@ -707,8 +707,8 @@ const createIndexes = getCreateFunction((store) => {
       isUndefined(value)
         ? EMPTY_STRING
         : isArray(value)
-        ? arrayMap(value, id)
-        : id(value),
+          ? arrayMap(value, id)
+          : id(value),
     addListener,
     callListeners,
   );
@@ -938,8 +938,8 @@ const getAggregateValue = (
       aggregateValue = isUndefined(oldValue)
         ? aggregateAdd?.(aggregateValue, newValue, oldLength++)
         : isUndefined(newValue)
-        ? aggregateRemove?.(aggregateValue, oldValue, oldLength--)
-        : aggregateReplace?.(aggregateValue, newValue, oldValue, oldLength);
+          ? aggregateRemove?.(aggregateValue, oldValue, oldLength--)
+          : aggregateReplace?.(aggregateValue, newValue, oldValue, oldLength);
       force ||= isUndefined(aggregateValue);
     }
   });
@@ -1301,8 +1301,8 @@ const createQueries = getCreateFunction((store) => {
         isFunction(arg1)
           ? arg1
           : isUndefined(arg3)
-          ? (getTableCell) => getTableCell(arg1) === arg2
-          : (getTableCell) => getTableCell(arg1, arg2) === arg3,
+            ? (getTableCell) => getTableCell(arg1) === arg2
+            : (getTableCell) => getTableCell(arg1, arg2) === arg3,
       );
     const group = (
       selectedCellId,
@@ -1505,12 +1505,12 @@ const createQueries = getCreateFunction((store) => {
           ...(isUndefined(arg2)
             ? [tableId, rootRowId, arg1]
             : arg1 === tableId
-            ? [tableId, rootRowId, arg2]
-            : [
-                mapGet(joins, arg1)?.[0],
-                mapGet(mapGet(joins, arg1)?.[4], rootRowId)?.[0],
-                arg2,
-              ]),
+              ? [tableId, rootRowId, arg2]
+              : [
+                  mapGet(joins, arg1)?.[0],
+                  mapGet(mapGet(joins, arg1)?.[4], rootRowId)?.[0],
+                  arg2,
+                ]),
         );
       selectJoinWhereStore.transaction(() =>
         arrayEvery(wheres, (where2) => where2(getTableCell))
@@ -1980,8 +1980,8 @@ const createStore = () => {
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
-      ? cellInvalid(tableId, rowId, cellId, cell)
-      : cell;
+        ? cellInvalid(tableId, rowId, cellId, cell)
+        : cell;
   const validateValues = (values, skipDefaults) =>
     validate(
       skipDefaults ? values : addDefaultsToValues(values),
@@ -2007,8 +2007,8 @@ const createStore = () => {
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))
-      ? valueInvalid(valueId, value)
-      : value;
+        ? valueInvalid(valueId, value)
+        : value;
   const addDefaultsToRow = (row, tableId, rowId) => {
     ifNotUndefined(
       mapGet(tablesSchemaRowCache, tableId),

package/lib/debug/tools.js

@@ -361,8 +361,8 @@ const getCodeFunctions = () => {
                 ? -1
                 : 1
               : import1 > import2
-              ? 1
-              : -1,
+                ? 1
+                : -1,
         ),
         EMPTY_STRING,
       ],

package/lib/debug/ui-react-dom.js

@@ -575,8 +575,8 @@ const RelationshipInHtmlRow = ({
           tableId === localTableId
             ? localRowId
             : tableId === remoteTableId
-            ? remoteRowId
-            : null;
+              ? remoteRowId
+              : null;
         return isUndefined(rowId)
           ? null
           : /* @__PURE__ */ createElement(
@@ -1796,8 +1796,8 @@ const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
     p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
-      ? collForEach(node, (node2) => deep(node2, p + 1))
-      : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
+        ? collForEach(node, (node2) => deep(node2, p + 1))
+        : arrayForEach([path[p], null], (id) => deep(mapGet(node, id), p + 1));
   deep(deepIdSet, 0);
   return leaves;
 };
@@ -1849,10 +1849,10 @@ const getListenerFunctions = (getThing) => {
           index == size(path)
             ? listener(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
-            ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                callWithIds(...ids, id2),
-              )
-            : callWithIds(...ids, path[index]);
+              ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                  callWithIds(...ids, id2),
+                )
+              : callWithIds(...ids, path[index]);
         };
         callWithIds();
       },
@@ -1995,8 +1995,8 @@ const createStore = () => {
           () => cellInvalid(tableId, rowId, cellId, cell),
         )
       : isUndefined(getCellOrValueType(cell))
-      ? cellInvalid(tableId, rowId, cellId, cell)
-      : cell;
+        ? cellInvalid(tableId, rowId, cellId, cell)
+        : cell;
   const validateValues = (values, skipDefaults) =>
     validate(
       skipDefaults ? values : addDefaultsToValues(values),
@@ -2022,8 +2022,8 @@ const createStore = () => {
           () => valueInvalid(valueId, value),
         )
       : isUndefined(getCellOrValueType(value))
-      ? valueInvalid(valueId, value)
-      : value;
+        ? valueInvalid(valueId, value)
+        : value;
   const addDefaultsToRow = (row, tableId, rowId) => {
     ifNotUndefined(
       mapGet(tablesSchemaRowCache, tableId),