tinybase 5.1.3 → 5.1.5

package/cjs/es6/synchronizers/synchronizer-local/with-schemas/index.cjs

@@ -226,9 +226,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/cjs/es6/synchronizers/synchronizer-ws-client/index.cjs

@@ -63,9 +63,9 @@ const jsonParseWithUndefined = (str) =>
 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) =>
@@ -250,9 +250,11 @@ const createCustomPersister = (
           __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/cjs/es6/synchronizers/synchronizer-ws-client/with-schemas/index.cjs

@@ -63,9 +63,9 @@ const jsonParseWithUndefined = (str) =>
 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) =>
@@ -250,9 +250,11 @@ const createCustomPersister = (
           __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/cjs/es6/synchronizers/synchronizer-ws-server/index.cjs

@@ -131,9 +131,9 @@ const jsonParseWithUndefined = (str) =>
 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) =>
@@ -291,9 +291,11 @@ const createCustomPersister = (
           __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);
@@ -750,19 +752,21 @@ const getListenerFunctions = (getThing) => {
         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();
       },
@@ -853,24 +857,24 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
       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) => {
@@ -897,9 +901,11 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
             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 */) {
               yield startServerClient(serverClient);

package/cjs/es6/synchronizers/synchronizer-ws-server/with-schemas/index.cjs

@@ -131,9 +131,9 @@ const jsonParseWithUndefined = (str) =>
 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) =>
@@ -291,9 +291,11 @@ const createCustomPersister = (
           __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);
@@ -750,19 +752,21 @@ const getListenerFunctions = (getThing) => {
         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();
       },
@@ -853,24 +857,24 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
       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) => {
@@ -897,9 +901,11 @@ const createWsServer = (webSocketServer, createPersisterForPath) => {
             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 */) {
               yield startServerClient(serverClient);

package/cjs/es6/synchronizers/with-schemas/index.cjs

@@ -223,9 +223,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/cjs/es6/ui-react-inspector/index.cjs

@@ -1634,7 +1634,8 @@ class ErrorBoundary extends PureComponent {
           {className: 'warn'},
           'Inspector error: please see console for details.',
         )
-      : this.props.children;
+      : // eslint-disable-next-line react/prop-types
+        this.props.children;
   }
 }
 
@@ -1756,9 +1757,9 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   collForEach(map, (mapValue, id) => {
     if (!(excludeMapValue == null ? void 0 : excludeMapValue(mapValue, id))) {
       const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      (excludeObjValue == null ? void 0 : excludeObjValue(objValue))
-        ? 0
-        : (obj[id] = objValue);
+      if (!(excludeObjValue == null ? void 0 : excludeObjValue(objValue))) {
+        obj[id] = objValue;
+      }
     }
   });
   return obj;
@@ -1942,9 +1943,11 @@ const createCustomPersister = (
           __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);
@@ -2219,19 +2222,21 @@ const getListenerFunctions = (getThing) => {
         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();
       },
@@ -2589,7 +2594,11 @@ const createStore = () => {
       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/cjs/es6/ui-react-inspector/with-schemas/index.cjs

@@ -1634,7 +1634,8 @@ class ErrorBoundary extends PureComponent {
           {className: 'warn'},
           'Inspector error: please see console for details.',
         )
-      : this.props.children;
+      : // eslint-disable-next-line react/prop-types
+        this.props.children;
   }
 }
 
@@ -1756,9 +1757,9 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   collForEach(map, (mapValue, id) => {
     if (!(excludeMapValue == null ? void 0 : excludeMapValue(mapValue, id))) {
       const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      (excludeObjValue == null ? void 0 : excludeObjValue(objValue))
-        ? 0
-        : (obj[id] = objValue);
+      if (!(excludeObjValue == null ? void 0 : excludeObjValue(objValue))) {
+        obj[id] = objValue;
+      }
     }
   });
   return obj;
@@ -1942,9 +1943,11 @@ const createCustomPersister = (
           __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);
@@ -2219,19 +2222,21 @@ const getListenerFunctions = (getThing) => {
         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();
       },
@@ -2589,7 +2594,11 @@ const createStore = () => {
       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/cjs/es6/with-schemas/index.cjs

@@ -197,9 +197,9 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   collForEach(map, (mapValue, id) => {
     if (!(excludeMapValue == null ? void 0 : excludeMapValue(mapValue, id))) {
       const objValue = valueMapper ? valueMapper(mapValue, id) : mapValue;
-      (excludeObjValue == null ? void 0 : excludeObjValue(objValue))
-        ? 0
-        : (obj[id] = objValue);
+      if (!(excludeObjValue == null ? void 0 : excludeObjValue(objValue))) {
+        obj[id] = objValue;
+      }
     }
   });
   return obj;
@@ -539,19 +539,21 @@ const getListenerFunctions = (getThing) => {
         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();
       },
@@ -1354,9 +1356,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) {
@@ -2799,7 +2803,11 @@ const createStore = () => {
       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/cjs/index.cjs

@@ -173,7 +173,9 @@ const mapToObj = (map, valueMapper, excludeMapValue, excludeObjValue) => {
   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;
@@ -487,13 +489,15 @@ const getListenerFunctions = (getThing) => {
       ([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();
       },
@@ -1232,9 +1236,11 @@ const createCustomPersister = (
       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) {
@@ -2569,7 +2575,11 @@ const createStore = () => {
       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/cjs/indexes/index.cjs

@@ -340,13 +340,15 @@ const getListenerFunctions = (getThing) => {
       ([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();
       },