tinybase 5.2.0-beta.1 → 5.2.0-beta.3

package/umd/store/index.js

@@ -146,7 +146,9 @@
     collForEach(map, (mapValue, id) => {
       if (!excludeMapValue?.(mapValue, id)) {
         const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-        excludeObjValue?.(objValue) ? 0 : (obj[id] = objValue);
+        if (!excludeObjValue?.(objValue)) {
+          obj[id] = objValue;
+        }
       }
     });
     return obj;
@@ -274,13 +276,15 @@
         ([listener, , path = [], pathGetters, extraArgsGetter]) => {
           const callWithIds = (...ids) => {
             const index = size(ids);
-            index == size(path)
-              ? listener(thing, ...ids, ...extraArgsGetter(ids))
-              : isUndefined(path[index])
-                ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                    callWithIds(...ids, id2),
-                  )
-                : callWithIds(...ids, path[index]);
+            if (index == size(path)) {
+              listener(thing, ...ids, ...extraArgsGetter(ids));
+            } else if (isUndefined(path[index])) {
+              arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              );
+            } else {
+              callWithIds(...ids, path[index]);
+            }
           };
           callWithIds();
         },
@@ -665,7 +669,11 @@
         cellIdsChanged(tableId, rowId, cellId2, -1);
         mapSet(row, cellId2);
       };
-      isUndefined(defaultCell) ? delCell2(cellId) : mapForEach(row, delCell2);
+      if (isUndefined(defaultCell)) {
+        delCell2(cellId);
+      } else {
+        mapForEach(row, delCell2);
+      }
       if (collIsEmpty(row)) {
         rowIdsChanged(tableId, rowId, -1);
         if (collIsEmpty(mapSet(table, rowId))) {

package/umd/store/with-schemas/index.js

@@ -146,7 +146,9 @@
     collForEach(map, (mapValue, id) => {
       if (!excludeMapValue?.(mapValue, id)) {
         const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-        excludeObjValue?.(objValue) ? 0 : (obj[id] = objValue);
+        if (!excludeObjValue?.(objValue)) {
+          obj[id] = objValue;
+        }
       }
     });
     return obj;
@@ -274,13 +276,15 @@
         ([listener, , path = [], pathGetters, extraArgsGetter]) => {
           const callWithIds = (...ids) => {
             const index = size(ids);
-            index == size(path)
-              ? listener(thing, ...ids, ...extraArgsGetter(ids))
-              : isUndefined(path[index])
-                ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                    callWithIds(...ids, id2),
-                  )
-                : callWithIds(...ids, path[index]);
+            if (index == size(path)) {
+              listener(thing, ...ids, ...extraArgsGetter(ids));
+            } else if (isUndefined(path[index])) {
+              arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              );
+            } else {
+              callWithIds(...ids, path[index]);
+            }
           };
           callWithIds();
         },
@@ -665,7 +669,11 @@
         cellIdsChanged(tableId, rowId, cellId2, -1);
         mapSet(row, cellId2);
       };
-      isUndefined(defaultCell) ? delCell2(cellId) : mapForEach(row, delCell2);
+      if (isUndefined(defaultCell)) {
+        delCell2(cellId);
+      } else {
+        mapForEach(row, delCell2);
+      }
       if (collIsEmpty(row)) {
         rowIdsChanged(tableId, rowId, -1);
         if (collIsEmpty(mapSet(table, rowId))) {

package/umd/synchronizers/index.js

@@ -166,9 +166,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-broadcast-channel/index.js

@@ -166,9 +166,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-broadcast-channel/with-schemas/index.js

@@ -166,9 +166,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-local/index.js

@@ -169,9 +169,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-local/with-schemas/index.js

@@ -169,9 +169,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-ws-client/index.js

@@ -74,9 +74,9 @@
   const MESSAGE_SEPARATOR = '\n';
   const ifPayloadValid = (payload, then) => {
     const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-    splitAt !== -1
-      ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
-      : 0;
+    if (splitAt !== -1) {
+      then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+    }
   };
   const receivePayload = (payload, receive) =>
     ifPayloadValid(payload, (fromClientId, remainder) =>
@@ -192,9 +192,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-ws-client/with-schemas/index.js

@@ -74,9 +74,9 @@
   const MESSAGE_SEPARATOR = '\n';
   const ifPayloadValid = (payload, then) => {
     const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-    splitAt !== -1
-      ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
-      : 0;
+    if (splitAt !== -1) {
+      then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+    }
   };
   const receivePayload = (payload, receive) =>
     ifPayloadValid(payload, (fromClientId, remainder) =>
@@ -192,9 +192,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/synchronizers/synchronizer-ws-server/index.js

@@ -12,6 +12,7 @@
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
   const UNDEFINED = '\uFFFC';
+  const strMatch = (str, regex) => str?.match(regex);
 
   const promise = Promise;
   const GLOBAL = globalThis;
@@ -127,9 +128,9 @@
   const MESSAGE_SEPARATOR = '\n';
   const ifPayloadValid = (payload, then) => {
     const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-    splitAt !== -1
-      ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
-      : 0;
+    if (splitAt !== -1) {
+      then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+    }
   };
   const receivePayload = (payload, receive) =>
     ifPayloadValid(payload, (fromClientId, remainder) =>
@@ -228,9 +229,11 @@
         await schedule(async () => {
           try {
             const content = await 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) {
             if (initialContent) {
               setDefaultContent(initialContent);
@@ -617,13 +620,15 @@
         ([listener, , path = [], pathGetters, extraArgsGetter]) => {
           const callWithIds = (...ids) => {
             const index = size(ids);
-            index == size(path)
-              ? listener(thing, ...ids, ...extraArgsGetter(ids))
-              : isUndefined(path[index])
-                ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                    callWithIds(...ids, id2),
-                  )
-                : callWithIds(...ids, path[index]);
+            if (index == size(path)) {
+              listener(thing, ...ids, ...extraArgsGetter(ids));
+            } else if (isUndefined(path[index])) {
+              arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              );
+            } else {
+              callWithIds(...ids, path[index]);
+            }
           };
           callWithIds();
         },
@@ -641,32 +646,37 @@
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => wsServer,
     );
-    const configureServerClient = (serverClient, pathId, clients) =>
-      ifNotUndefined(createPersisterForPath?.(pathId), (persisterMaybeThen) => {
-        serverClient[0 /* State */] = 1;
-        serverClient[1 /* Persister */] = isArray(persisterMaybeThen)
-          ? persisterMaybeThen[0]
-          : persisterMaybeThen;
-        const messageHandler = getMessageHandler(
-          SERVER_CLIENT_ID,
-          clients,
-          serverClient,
-        );
-        serverClient[2 /* Synchronizer */] = createCustomSynchronizer(
-          serverClient[1 /* Persister */].getStore(),
-          (toClientId, requestId, message, body) =>
-            messageHandler(createPayload(toClientId, requestId, message, body)),
-          (receive) =>
-            (serverClient[3 /* Send */] = (payload) =>
-              receivePayload(payload, receive)),
-          () => {},
-          1,
-        );
-        serverClient[4 /* Buffer */] = [];
-        serverClient[5 /* Then */] = isArray(persisterMaybeThen)
-          ? persisterMaybeThen[1]
-          : (_) => 0;
-      });
+    const configureServerClient = async (serverClient, pathId, clients) =>
+      ifNotUndefined(
+        await createPersisterForPath?.(pathId),
+        (persisterMaybeThen) => {
+          serverClient[0 /* State */] = 1;
+          serverClient[1 /* Persister */] = isArray(persisterMaybeThen)
+            ? persisterMaybeThen[0]
+            : persisterMaybeThen;
+          const messageHandler = getMessageHandler(
+            SERVER_CLIENT_ID,
+            clients,
+            serverClient,
+          );
+          serverClient[2 /* Synchronizer */] = createCustomSynchronizer(
+            serverClient[1 /* Persister */].getStore(),
+            (toClientId, requestId, message, body) =>
+              messageHandler(
+                createPayload(toClientId, requestId, message, body),
+              ),
+            (receive) =>
+              (serverClient[3 /* Send */] = (payload) =>
+                receivePayload(payload, receive)),
+            () => {},
+            1,
+          );
+          serverClient[4 /* Buffer */] = [];
+          serverClient[5 /* Then */] = isArray(persisterMaybeThen)
+            ? persisterMaybeThen[1]
+            : (_) => 0;
+        },
+      );
     const startServerClient = async (serverClient) => {
       serverClient[0 /* State */] = 2 /* Starting */;
       await serverClient[1 /* Persister */].schedule(
@@ -685,22 +695,22 @@
       ifPayloadValid(payload, (toClientId, remainder) => {
         const forwardedPayload = createRawPayload(clientId, remainder);
         if (toClientId === EMPTY_STRING) {
-          clientId !== SERVER_CLIENT_ID
-            ? serverClient[3 /* Send */]?.(forwardedPayload)
-            : 0;
+          if (clientId !== SERVER_CLIENT_ID) {
+            serverClient[3 /* Send */]?.(forwardedPayload);
+          }
           mapForEach(clients, (otherClientId, otherWebSocket) =>
             otherClientId !== clientId
               ? otherWebSocket.send(forwardedPayload)
               : 0,
           );
+        } else if (toClientId === SERVER_CLIENT_ID) {
+          serverClient[3 /* Send */]?.(forwardedPayload);
         } else {
-          toClientId === SERVER_CLIENT_ID
-            ? serverClient[3 /* Send */]?.(forwardedPayload)
-            : mapGet(clients, toClientId)?.send(forwardedPayload);
+          mapGet(clients, toClientId)?.send(forwardedPayload);
         }
       });
     webSocketServer.on('connection', (webSocket, request) =>
-      ifNotUndefined(request.url?.match(PATH_REGEX), ([, pathId]) =>
+      ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
           async (clientId) => {
@@ -715,15 +725,17 @@
             );
             if (collIsEmpty(clients)) {
               callListeners(pathIdListeners, void 0, pathId, 1);
-              configureServerClient(serverClient, pathId, clients);
+              await configureServerClient(serverClient, pathId, clients);
             }
             mapSet(clients, clientId, webSocket);
             callListeners(clientIdListeners, [pathId], clientId, 1);
             webSocket.on('message', (data) => {
               const payload = data.toString(UTF8);
-              serverClient[0 /* State */] == 0 /* Ready */
-                ? messageHandler(payload)
-                : arrayPush(serverClient[4 /* Buffer */], payload);
+              if (serverClient[0 /* State */] == 0 /* Ready */) {
+                messageHandler(payload);
+              } else {
+                arrayPush(serverClient[4 /* Buffer */], payload);
+              }
             });
             if (serverClient[0 /* State */] == 1 /* Configured */) {
               await startServerClient(serverClient);

package/umd/synchronizers/synchronizer-ws-server/with-schemas/index.js

@@ -12,6 +12,7 @@
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
   const UNDEFINED = '\uFFFC';
+  const strMatch = (str, regex) => str?.match(regex);
 
   const promise = Promise;
   const GLOBAL = globalThis;
@@ -127,9 +128,9 @@
   const MESSAGE_SEPARATOR = '\n';
   const ifPayloadValid = (payload, then) => {
     const splitAt = payload.indexOf(MESSAGE_SEPARATOR);
-    splitAt !== -1
-      ? then(slice(payload, 0, splitAt), slice(payload, splitAt + 1))
-      : 0;
+    if (splitAt !== -1) {
+      then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
+    }
   };
   const receivePayload = (payload, receive) =>
     ifPayloadValid(payload, (fromClientId, remainder) =>
@@ -228,9 +229,11 @@
         await schedule(async () => {
           try {
             const content = await 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) {
             if (initialContent) {
               setDefaultContent(initialContent);
@@ -617,13 +620,15 @@
         ([listener, , path = [], pathGetters, extraArgsGetter]) => {
           const callWithIds = (...ids) => {
             const index = size(ids);
-            index == size(path)
-              ? listener(thing, ...ids, ...extraArgsGetter(ids))
-              : isUndefined(path[index])
-                ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
-                    callWithIds(...ids, id2),
-                  )
-                : callWithIds(...ids, path[index]);
+            if (index == size(path)) {
+              listener(thing, ...ids, ...extraArgsGetter(ids));
+            } else if (isUndefined(path[index])) {
+              arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
+                callWithIds(...ids, id2),
+              );
+            } else {
+              callWithIds(...ids, path[index]);
+            }
           };
           callWithIds();
         },
@@ -641,32 +646,37 @@
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => wsServer,
     );
-    const configureServerClient = (serverClient, pathId, clients) =>
-      ifNotUndefined(createPersisterForPath?.(pathId), (persisterMaybeThen) => {
-        serverClient[0 /* State */] = 1;
-        serverClient[1 /* Persister */] = isArray(persisterMaybeThen)
-          ? persisterMaybeThen[0]
-          : persisterMaybeThen;
-        const messageHandler = getMessageHandler(
-          SERVER_CLIENT_ID,
-          clients,
-          serverClient,
-        );
-        serverClient[2 /* Synchronizer */] = createCustomSynchronizer(
-          serverClient[1 /* Persister */].getStore(),
-          (toClientId, requestId, message, body) =>
-            messageHandler(createPayload(toClientId, requestId, message, body)),
-          (receive) =>
-            (serverClient[3 /* Send */] = (payload) =>
-              receivePayload(payload, receive)),
-          () => {},
-          1,
-        );
-        serverClient[4 /* Buffer */] = [];
-        serverClient[5 /* Then */] = isArray(persisterMaybeThen)
-          ? persisterMaybeThen[1]
-          : (_) => 0;
-      });
+    const configureServerClient = async (serverClient, pathId, clients) =>
+      ifNotUndefined(
+        await createPersisterForPath?.(pathId),
+        (persisterMaybeThen) => {
+          serverClient[0 /* State */] = 1;
+          serverClient[1 /* Persister */] = isArray(persisterMaybeThen)
+            ? persisterMaybeThen[0]
+            : persisterMaybeThen;
+          const messageHandler = getMessageHandler(
+            SERVER_CLIENT_ID,
+            clients,
+            serverClient,
+          );
+          serverClient[2 /* Synchronizer */] = createCustomSynchronizer(
+            serverClient[1 /* Persister */].getStore(),
+            (toClientId, requestId, message, body) =>
+              messageHandler(
+                createPayload(toClientId, requestId, message, body),
+              ),
+            (receive) =>
+              (serverClient[3 /* Send */] = (payload) =>
+                receivePayload(payload, receive)),
+            () => {},
+            1,
+          );
+          serverClient[4 /* Buffer */] = [];
+          serverClient[5 /* Then */] = isArray(persisterMaybeThen)
+            ? persisterMaybeThen[1]
+            : (_) => 0;
+        },
+      );
     const startServerClient = async (serverClient) => {
       serverClient[0 /* State */] = 2 /* Starting */;
       await serverClient[1 /* Persister */].schedule(
@@ -685,22 +695,22 @@
       ifPayloadValid(payload, (toClientId, remainder) => {
         const forwardedPayload = createRawPayload(clientId, remainder);
         if (toClientId === EMPTY_STRING) {
-          clientId !== SERVER_CLIENT_ID
-            ? serverClient[3 /* Send */]?.(forwardedPayload)
-            : 0;
+          if (clientId !== SERVER_CLIENT_ID) {
+            serverClient[3 /* Send */]?.(forwardedPayload);
+          }
           mapForEach(clients, (otherClientId, otherWebSocket) =>
             otherClientId !== clientId
               ? otherWebSocket.send(forwardedPayload)
               : 0,
           );
+        } else if (toClientId === SERVER_CLIENT_ID) {
+          serverClient[3 /* Send */]?.(forwardedPayload);
         } else {
-          toClientId === SERVER_CLIENT_ID
-            ? serverClient[3 /* Send */]?.(forwardedPayload)
-            : mapGet(clients, toClientId)?.send(forwardedPayload);
+          mapGet(clients, toClientId)?.send(forwardedPayload);
         }
       });
     webSocketServer.on('connection', (webSocket, request) =>
-      ifNotUndefined(request.url?.match(PATH_REGEX), ([, pathId]) =>
+      ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(
           request.headers['sec-websocket-key'],
           async (clientId) => {
@@ -715,15 +725,17 @@
             );
             if (collIsEmpty(clients)) {
               callListeners(pathIdListeners, void 0, pathId, 1);
-              configureServerClient(serverClient, pathId, clients);
+              await configureServerClient(serverClient, pathId, clients);
             }
             mapSet(clients, clientId, webSocket);
             callListeners(clientIdListeners, [pathId], clientId, 1);
             webSocket.on('message', (data) => {
               const payload = data.toString(UTF8);
-              serverClient[0 /* State */] == 0 /* Ready */
-                ? messageHandler(payload)
-                : arrayPush(serverClient[4 /* Buffer */], payload);
+              if (serverClient[0 /* State */] == 0 /* Ready */) {
+                messageHandler(payload);
+              } else {
+                arrayPush(serverClient[4 /* Buffer */], payload);
+              }
             });
             if (serverClient[0 /* State */] == 1 /* Configured */) {
               await startServerClient(serverClient);

package/umd/synchronizers/with-schemas/index.js

@@ -166,9 +166,11 @@
         await schedule(async () => {
           try {
             const content = await 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?.(error);
             if (initialContent) {

package/umd/tools/index.js

@@ -3320,7 +3320,7 @@ ${text.replace(
           await import(PRETTIER_PLUGINS + 'estree'),
           await import(PRETTIER_PLUGINS + 'typescript'),
         );
-      } catch (e) {
+      } catch {
         format = async (str) => str;
       }
       return await promiseAll(

package/umd/tools/with-schemas/index.js

@@ -3320,7 +3320,7 @@ ${text.replace(
           await import(PRETTIER_PLUGINS + 'estree'),
           await import(PRETTIER_PLUGINS + 'typescript'),
         );
-      } catch (e) {
+      } catch {
         format = async (str) => str;
       }
       return await promiseAll(