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

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

@@ -236,9 +236,11 @@
             __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/umd/es6/synchronizers/synchronizer-local/index.js

@@ -239,9 +239,11 @@
             __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/umd/es6/synchronizers/synchronizer-local/with-schemas/index.js

@@ -239,9 +239,11 @@
             __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/umd/es6/synchronizers/synchronizer-ws-client/index.js

@@ -78,9 +78,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) =>
@@ -265,9 +265,11 @@
             __async$2(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/umd/es6/synchronizers/synchronizer-ws-client/with-schemas/index.js

@@ -78,9 +78,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) =>
@@ -265,9 +265,11 @@
             __async$2(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/umd/es6/synchronizers/synchronizer-ws-server/index.js

@@ -12,6 +12,7 @@
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
   const UNDEFINED = '\uFFFC';
+  const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
   const promise = Promise;
   const GLOBAL = globalThis;
@@ -152,9 +153,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) =>
@@ -312,9 +313,11 @@
             __async$2(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) {
                 if (initialContent) {
                   setDefaultContent(initialContent);
@@ -784,19 +787,21 @@
           const callWithIds = (...ids) => {
             var _a, _b;
             const index = size(ids);
-            index == size(path)
-              ? listener(thing, ...ids, ...extraArgsGetter(ids))
-              : isUndefined(path[index])
-                ? arrayForEach(
-                    (_b =
-                      (_a = pathGetters[index]) == null
-                        ? void 0
-                        : _a.call(pathGetters, ...ids)) != null
-                      ? _b
-                      : [],
-                    (id2) => callWithIds(...ids, id2),
-                  )
-                : callWithIds(...ids, path[index]);
+            if (index == size(path)) {
+              listener(thing, ...ids, ...extraArgsGetter(ids));
+            } else if (isUndefined(path[index])) {
+              arrayForEach(
+                (_b =
+                  (_a = pathGetters[index]) == null
+                    ? void 0
+                    : _a.call(pathGetters, ...ids)) != null
+                  ? _b
+                  : [],
+                (id2) => callWithIds(...ids, id2),
+              );
+            } else {
+              callWithIds(...ids, path[index]);
+            }
           };
           callWithIds();
         },
@@ -838,38 +843,40 @@
       () => wsServer,
     );
     const configureServerClient = (serverClient, pathId, clients) =>
-      ifNotUndefined(
-        createPersisterForPath == null
-          ? void 0
-          : 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;
-        },
-      );
+      __async(void 0, null, function* () {
+        return ifNotUndefined(
+          yield createPersisterForPath == null
+            ? void 0
+            : 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 = (serverClient) =>
       __async(void 0, null, function* () {
         serverClient[0 /* State */] = 2 /* Starting */;
@@ -891,75 +898,72 @@
         var _a, _b, _c;
         const forwardedPayload = createRawPayload(clientId, remainder);
         if (toClientId === EMPTY_STRING) {
-          clientId !== SERVER_CLIENT_ID
-            ? (_a = serverClient[3 /* Send */]) == null
+          if (clientId !== SERVER_CLIENT_ID) {
+            (_a = serverClient[3 /* Send */]) == null
               ? void 0
-              : _a.call(serverClient, forwardedPayload)
-            : 0;
+              : _a.call(serverClient, forwardedPayload);
+          }
           mapForEach(clients, (otherClientId, otherWebSocket) =>
             otherClientId !== clientId
               ? otherWebSocket.send(forwardedPayload)
               : 0,
           );
+        } else if (toClientId === SERVER_CLIENT_ID) {
+          (_b = serverClient[3 /* Send */]) == null
+            ? void 0
+            : _b.call(serverClient, forwardedPayload);
         } else {
-          toClientId === SERVER_CLIENT_ID
-            ? (_b = serverClient[3 /* Send */]) == null
-              ? void 0
-              : _b.call(serverClient, forwardedPayload)
-            : (_c = mapGet(clients, toClientId)) == null
-              ? void 0
-              : _c.send(forwardedPayload);
+          (_c = mapGet(clients, toClientId)) == null
+            ? void 0
+            : _c.send(forwardedPayload);
         }
       });
-    webSocketServer.on('connection', (webSocket, request) => {
-      var _a;
-      return ifNotUndefined(
-        (_a = request.url) == null ? void 0 : _a.match(PATH_REGEX),
-        ([, pathId]) =>
-          ifNotUndefined(request.headers['sec-websocket-key'], (clientId) =>
-            __async(void 0, null, function* () {
-              const clients = mapEnsure(clientsByPath, pathId, mapNew);
-              const serverClient = mapEnsure(
-                serverClientsByPath,
-                pathId,
-                () => [0 /* Ready */],
-              );
-              const messageHandler = getMessageHandler(
-                clientId,
-                clients,
-                serverClient,
-              );
-              if (collIsEmpty(clients)) {
-                callListeners(pathIdListeners, void 0, pathId, 1);
-                configureServerClient(serverClient, pathId, clients);
+    webSocketServer.on('connection', (webSocket, request) =>
+      ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
+        ifNotUndefined(request.headers['sec-websocket-key'], (clientId) =>
+          __async(void 0, null, function* () {
+            const clients = mapEnsure(clientsByPath, pathId, mapNew);
+            const serverClient = mapEnsure(serverClientsByPath, pathId, () => [
+              0 /* Ready */,
+            ]);
+            const messageHandler = getMessageHandler(
+              clientId,
+              clients,
+              serverClient,
+            );
+            if (collIsEmpty(clients)) {
+              callListeners(pathIdListeners, void 0, pathId, 1);
+              yield configureServerClient(serverClient, pathId, clients);
+            }
+            mapSet(clients, clientId, webSocket);
+            callListeners(clientIdListeners, [pathId], clientId, 1);
+            webSocket.on('message', (data) => {
+              const payload = data.toString(UTF8);
+              if (serverClient[0 /* State */] == 0 /* Ready */) {
+                messageHandler(payload);
+              } else {
+                arrayPush(serverClient[4 /* Buffer */], payload);
               }
-              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 */] == 1 /* Configured */) {
-                yield startServerClient(serverClient);
-                arrayForEach(serverClient[4 /* Buffer */], messageHandler);
-                serverClient[4 /* Buffer */] = [];
+            });
+            if (serverClient[0 /* State */] == 1 /* Configured */) {
+              yield startServerClient(serverClient);
+              arrayForEach(serverClient[4 /* Buffer */], messageHandler);
+              serverClient[4 /* Buffer */] = [];
+            }
+            webSocket.on('close', () => {
+              collDel(clients, clientId);
+              callListeners(clientIdListeners, [pathId], clientId, -1);
+              if (collIsEmpty(clients)) {
+                stopServerClient(serverClient);
+                collDel(serverClientsByPath, pathId);
+                collDel(clientsByPath, pathId);
+                callListeners(pathIdListeners, void 0, pathId, -1);
               }
-              webSocket.on('close', () => {
-                collDel(clients, clientId);
-                callListeners(clientIdListeners, [pathId], clientId, -1);
-                if (collIsEmpty(clients)) {
-                  stopServerClient(serverClient);
-                  collDel(serverClientsByPath, pathId);
-                  collDel(clientsByPath, pathId);
-                  callListeners(pathIdListeners, void 0, pathId, -1);
-                }
-              });
-            }),
-          ),
-      );
-    });
+            });
+          }),
+        ),
+      ),
+    );
     const getWebSocketServer = () => webSocketServer;
     const getPathIds = () => mapKeys(clientsByPath);
     const getClientIds = (path) => mapKeys(mapGet(clientsByPath, path));