tinybase 4.4.0-beta.0 → 4.4.0-beta.2

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

@@ -53,6 +53,7 @@ const TYPE = 'type';
 const DEFAULT = 'default';
 const LISTENER = 'Listener';
 const ADD = 'add';
+const HAS = 'Has';
 const IDS = 'Ids';
 const TABLE = 'Table';
 const TABLES = TABLE + 's';
@@ -80,6 +81,7 @@ const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
+const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
 
 const {
@@ -108,24 +110,31 @@ const getIndexStoreTableId = (indexes, indexId) => [
 const arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
 const arrayIsEqual = (array1, array2) =>
-  arrayLength(array1) === arrayLength(array2) &&
+  size(array1) === size(array2) &&
   arrayEvery(array1, (value1, index) => array2[index] === value1);
 const arraySort = (array, sorter) => array.sort(sorter);
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayJoin = (array, sep = EMPTY_STRING) => array.join(sep);
 const arrayMap = (array, cb) => array.map(cb);
-const arrayLength = (array) => array.length;
-const arrayIsEmpty = (array) => arrayLength(array) == 0;
+const arrayIsEmpty = (array) => size(array) == 0;
 const arrayReduce = (array, cb, initial) => array.reduce(cb, initial);
 const arrayPush = (array, ...values) => array.push(...values);
 const arrayShift = (array) => array.shift();
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objIds = object.keys;
 const objFrozen = object.isFrozen;
 const objFreeze = object.freeze;
 const isObject = (obj) =>
-  isInstanceOf(obj, object) && obj.constructor == object;
+  !isUndefined(obj) &&
+  ifNotUndefined(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isUndefined(getPrototypeOf(objPrototype)),
+    () => true,
+  );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objHas = (obj, id) => !isUndefined(objGet(obj, id));
@@ -135,7 +144,7 @@ const objDel = (obj, id) => {
 };
 const objMap = (obj, cb) =>
   arrayMap(object.entries(obj), ([id, value]) => cb(value, id));
-const objSize = (obj) => arrayLength(objIds(obj));
+const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
 const jsonString = (obj) =>
@@ -195,89 +204,85 @@ const EDIT_SVG = PRE + `<path d='${PENCIL}' />` + POST;
 const DONE_SVG = PRE + `<path d='${PENCIL}M20 20l60 60' />` + POST;
 
 const SCROLLBAR = '*::-webkit-scrollbar';
-const APP_STYLESHEET = `#${UNIQUE_ID}{
-  all:initial;font-family:sans-serif;font-size:0.75rem;position:fixed;z-index:999999;
-  ${arrayJoin(
-    objMap(
-      {
-        '*': 'all:revert',
-        '*::before': 'all:revert',
-        '*::after': 'all:revert',
-        [SCROLLBAR]: 'width:0.5rem;height:0.5rem;',
-        [SCROLLBAR + '-track']: 'background:#111',
-        [SCROLLBAR + '-thumb']: 'background:#999;border:1px solid #111',
-        [SCROLLBAR + '-thumb:hover']: 'background:#fff',
-        [SCROLLBAR + '-corner']: 'background:#111',
-        img: 'width:1rem;height:1rem;background:#111;border:0;vertical-align:text-bottom',
-        // Nub
-        '>img': 'padding:0.25rem;bottom:0;right:0;position:fixed;' + LOGO_SVG,
-        ...objNew(
-          arrayMap(['bottom:0;left:0', 'top:0;right:0'], (css, p) => [
-            `>img[data-position='${p}']`,
-            css,
-          ]),
-        ),
-        // Panel
-        main: 'display:flex;flex-direction:column;background:#111d;color:#fff;position:fixed;',
-        ...objNew(
-          arrayMap(
-            [
-              'bottom:0;left:0;width:35vw;height:100vh',
-              'top:0;right:0;width:100vw;height:30vh',
-              'bottom:0;left:0;width:100vw;height:30vh',
-              'top:0;right:0;width:35vw;height:100vh',
-              'top:0;right:0;width:100vw;height:100vh',
-            ],
-            (css, p) => [`main[data-position='${p}']`, css],
-          ),
-        ),
-        // Header
-        header:
-          'display:flex;padding:0.25rem;background:#000;align-items:center',
-        'header>img:nth-of-type(1)': LOGO_SVG,
-        'header>img:nth-of-type(6)': CLOSE_SVG,
-        ...objNew(
-          arrayMap(POSITIONS_SVG, (SVG, p) => [
-            `header>img[data-id='${p}']`,
-            SVG,
-          ]),
+const APP_STYLESHEET = arrayJoin(
+  objMap(
+    {
+      '': 'all:initial;font-family:sans-serif;font-size:0.75rem;position:fixed;z-index:999999',
+      '*': 'all:revert',
+      '*::before': 'all:revert',
+      '*::after': 'all:revert',
+      [SCROLLBAR]: 'width:0.5rem;height:0.5rem;',
+      [SCROLLBAR + '-track']: 'background:#111',
+      [SCROLLBAR + '-thumb']: 'background:#999;border:1px solid #111',
+      [SCROLLBAR + '-thumb:hover']: 'background:#fff',
+      [SCROLLBAR + '-corner']: 'background:#111',
+      img: 'width:1rem;height:1rem;background:#111;border:0;vertical-align:text-bottom',
+      // Nub
+      '>img': 'padding:0.25rem;bottom:0;right:0;position:fixed;' + LOGO_SVG,
+      ...objNew(
+        arrayMap(['bottom:0;left:0', 'top:0;right:0'], (css, p) => [
+          `>img[data-position='${p}']`,
+          css,
+        ]),
+      ),
+      // Panel
+      main: 'display:flex;flex-direction:column;background:#111d;color:#fff;position:fixed;',
+      ...objNew(
+        arrayMap(
+          [
+            'bottom:0;left:0;width:35vw;height:100vh',
+            'top:0;right:0;width:100vw;height:30vh',
+            'bottom:0;left:0;width:100vw;height:30vh',
+            'top:0;right:0;width:35vw;height:100vh',
+            'top:0;right:0;width:100vw;height:100vh',
+          ],
+          (css, p) => [`main[data-position='${p}']`, css],
         ),
-        'header>span':
-          'flex:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-left:0.25rem',
-        // Body
-        article: 'padding:0.25rem 0.25rem 0.25rem 0.5rem;overflow:auto;flex:1',
-        details: 'margin-left:0.75rem;width:fit-content;',
-        'details img': 'display:none',
-        'details[open]>summary img':
-          'display:unset;background:none;margin-left:0.25rem',
-        'details[open]>summary img.edit': EDIT_SVG,
-        'details[open]>summary img.done': DONE_SVG,
-        summary:
-          'margin-left:-0.75rem;line-height:1.25rem;user-select:none;width:fit-content',
-        // tables
-        table:
-          'border-collapse:collapse;table-layout:fixed;margin-bottom:0.5rem',
-        'table input':
-          'background:#111;color:unset;padding:0 0.25rem;border:0;font-size:unset;vertical-align:top;margin:0',
-        'table input[type="number"]': 'width:4rem',
-        'table tbody button':
-          'font-size:0;background:#fff;border-radius:50%;margin:0 0.125rem 0 0;width:0.85rem;color:#111',
-        'table button:first-letter': 'font-size:0.75rem',
-        thead: 'background:#222',
-        'th:nth-of-type(1)': 'min-width:2rem;',
-        'th.sorted': 'background:#000',
-        'table caption':
-          'text-align:left;white-space:nowrap;line-height:1.25rem',
-        button: 'width:1.5rem;border:none;background:none;color:#fff;padding:0',
-        'button[disabled]': 'color:#777',
-        'button.next': 'margin-right:0.5rem',
-        [`th,td`]:
-          'overflow:hidden;text-overflow:ellipsis;padding:0.25rem 0.5rem;max-width:12rem;white-space:nowrap;border-width:1px 0;border-style:solid;border-color:#777;text-align:left',
-        'span.warn': 'margin:0.25rem;color:#d81b60',
-      },
-      (style, selector) => (style ? `& ${selector}{${style}}` : ''),
-    ),
-  )}`;
+      ),
+      // Header
+      header: 'display:flex;padding:0.25rem;background:#000;align-items:center',
+      'header>img:nth-of-type(1)': LOGO_SVG,
+      'header>img:nth-of-type(6)': CLOSE_SVG,
+      ...objNew(
+        arrayMap(POSITIONS_SVG, (SVG, p) => [
+          `header>img[data-id='${p}']`,
+          SVG,
+        ]),
+      ),
+      'header>span':
+        'flex:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;margin-left:0.25rem',
+      // Body
+      article: 'padding:0.25rem 0.25rem 0.25rem 0.5rem;overflow:auto;flex:1',
+      details: 'margin-left:0.75rem;width:fit-content;',
+      'details img': 'display:none',
+      'details[open]>summary img':
+        'display:unset;background:none;margin-left:0.25rem',
+      'details[open]>summary img.edit': EDIT_SVG,
+      'details[open]>summary img.done': DONE_SVG,
+      summary:
+        'margin-left:-0.75rem;line-height:1.25rem;user-select:none;width:fit-content',
+      // tables
+      table: 'border-collapse:collapse;table-layout:fixed;margin-bottom:0.5rem',
+      'table input':
+        'background:#111;color:unset;padding:0 0.25rem;border:0;font-size:unset;vertical-align:top;margin:0',
+      'table input[type="number"]': 'width:4rem',
+      'table tbody button':
+        'font-size:0;background:#fff;border-radius:50%;margin:0 0.125rem 0 0;width:0.85rem;color:#111',
+      'table button:first-letter': 'font-size:0.75rem',
+      thead: 'background:#222',
+      'th:nth-of-type(1)': 'min-width:2rem;',
+      'th.sorted': 'background:#000',
+      'table caption': 'text-align:left;white-space:nowrap;line-height:1.25rem',
+      button: 'width:1.5rem;border:none;background:none;color:#fff;padding:0',
+      'button[disabled]': 'color:#777',
+      'button.next': 'margin-right:0.5rem',
+      [`th,#${UNIQUE_ID} td`]:
+        'overflow:hidden;text-overflow:ellipsis;padding:0.25rem 0.5rem;max-width:12rem;white-space:nowrap;border-width:1px 0;border-style:solid;border-color:#777;text-align:left',
+      'span.warn': 'margin:0.25rem;color:#d81b60',
+    },
+    (style, selector) => (style ? `#${UNIQUE_ID} ${selector}{${style}}` : ''),
+  ),
+);
 
 const Nub = ({s}) => {
   const position = useValue(POSITION_VALUE, s) ?? 1;
@@ -589,7 +594,13 @@ const RelationshipInHtmlRow = ({
     ),
   );
 };
-const EditableThing = ({thing, onThingChange, className, hasSchema}) => {
+const EditableThing = ({
+  thing,
+  onThingChange,
+  className,
+  hasSchema,
+  showType = true,
+}) => {
   const [thingType, setThingType] = useState();
   const [currentThing, setCurrentThing] = useState();
   const [stringThing, setStringThing] = useState();
@@ -610,37 +621,37 @@ const EditableThing = ({thing, onThingChange, className, hasSchema}) => {
     },
     [onThingChange],
   );
+  const handleTypeChange = useCallback(() => {
+    if (!hasSchema?.()) {
+      const nextType = getTypeCase(thingType, NUMBER, BOOLEAN, STRING);
+      const thing2 = getTypeCase(
+        nextType,
+        stringThing,
+        numberThing,
+        booleanThing,
+      );
+      setThingType(nextType);
+      setCurrentThing(thing2);
+      onThingChange(thing2);
+    }
+  }, [
+    hasSchema,
+    onThingChange,
+    stringThing,
+    numberThing,
+    booleanThing,
+    thingType,
+  ]);
   return /* @__PURE__ */ createElement(
     'div',
     {className},
-    /* @__PURE__ */ createElement(
-      'button',
-      {
-        className: thingType,
-        onClick: useCallback(() => {
-          if (!hasSchema?.()) {
-            const nextType = getTypeCase(thingType, NUMBER, BOOLEAN, STRING);
-            const thing2 = getTypeCase(
-              nextType,
-              stringThing,
-              numberThing,
-              booleanThing,
-            );
-            setThingType(nextType);
-            setCurrentThing(thing2);
-            onThingChange(thing2);
-          }
-        }, [
-          hasSchema,
-          onThingChange,
-          stringThing,
-          numberThing,
-          booleanThing,
+    showType
+      ? /* @__PURE__ */ createElement(
+          'button',
+          {className: thingType, onClick: handleTypeChange},
           thingType,
-        ]),
-      },
-      thingType,
-    ),
+        )
+      : null,
     getTypeCase(
       thingType,
       /* @__PURE__ */ createElement('input', {
@@ -943,7 +954,14 @@ const ResultSortedTableInHtmlTable = ({
     ),
   });
 };
-const EditableCellView = ({tableId, rowId, cellId, store, className}) =>
+const EditableCellView = ({
+  tableId,
+  rowId,
+  cellId,
+  store,
+  className,
+  showType,
+}) =>
   /* @__PURE__ */ createElement(EditableThing, {
     thing: useCell(tableId, rowId, cellId, store),
     onThingChange: useSetCellCallback(
@@ -955,13 +973,15 @@ const EditableCellView = ({tableId, rowId, cellId, store, className}) =>
       store,
     ),
     className: className ?? EDITABLE + CELL,
+    showType,
     hasSchema: useStoreOrStoreById(store)?.hasTablesSchema,
   });
-const EditableValueView = ({valueId, store, className}) =>
+const EditableValueView = ({valueId, store, className, showType}) =>
   /* @__PURE__ */ createElement(EditableThing, {
     thing: useValue(valueId, store),
     onThingChange: useSetValueCallback(valueId, (value) => value, [], store),
     className: className ?? EDITABLE + VALUE,
+    showType,
     hasSchema: useStoreOrStoreById(store)?.hasValuesSchema,
   });
 const SortedTablePaginator = ({
@@ -1426,8 +1446,8 @@ class ErrorBoundary extends PureComponent {
       console.error(error, info.componentStack);
     this.state = {e: 0};
   }
-  static {
-    this.getDerivedStateFromError = () => ({e: 1});
+  static getDerivedStateFromError() {
+    return {e: 1};
   }
   render() {
     return this.state.e
@@ -1552,10 +1572,10 @@ const visitTree = (node, path, ensureLeaf, pruneLeaf, p = 0) =>
     (ensureLeaf ? mapEnsure : mapGet)(
       node,
       path[p],
-      p > arrayLength(path) - 2 ? ensureLeaf : mapNew,
+      p > size(path) - 2 ? ensureLeaf : mapNew,
     ),
     (nodeOrLeaf) => {
-      if (p > arrayLength(path) - 2) {
+      if (p > size(path) - 2) {
         if (pruneLeaf?.(nodeOrLeaf)) {
           mapSet(node, path[p]);
         }
@@ -1578,6 +1598,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  [getThing, thing] = [],
   scheduleId = [],
 ) => {
   let listenerId;
@@ -1694,6 +1715,7 @@ const createCustomPersister = (
     },
     stopAutoSave: () => {
       ifNotUndefined(listenerId, store.delListener);
+      listenerId = void 0;
       return persister;
     },
     schedule: async (...actions) => {
@@ -1705,6 +1727,9 @@ const createCustomPersister = (
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
   };
+  if (getThing) {
+    persister[getThing] = () => thing;
+  }
   return objFreeze(persister);
 };
 
@@ -1737,6 +1762,7 @@ const createStoragePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    ['getStorageName', storageName],
   );
 };
 const createSessionPersister = (store, storageName, onIgnoredError) =>
@@ -1757,7 +1783,7 @@ const getPoolFunctions = () => {
   return [
     (reuse) => (reuse ? arrayShift(pool) : null) ?? EMPTY_STRING + nextId++,
     (id) => {
-      if (test(INTEGER, id) && arrayLength(pool) < 1e3) {
+      if (test(INTEGER, id) && size(pool) < 1e3) {
         arrayPush(pool, id);
       }
     },
@@ -1767,7 +1793,7 @@ const getPoolFunctions = () => {
 const getWildcardedLeaves = (deepIdSet, path = [EMPTY_STRING]) => {
   const leaves = [];
   const deep = (node, p) =>
-    p == arrayLength(path)
+    p == size(path)
       ? arrayPush(leaves, node)
       : path[p] === null
       ? collForEach(node, (node2) => deep(node2, p + 1))
@@ -1819,8 +1845,8 @@ const getListenerFunctions = (getThing) => {
       mapGet(allListeners, id),
       ([listener, , path = [], pathGetters, extraArgsGetter]) => {
         const callWithIds = (...ids) => {
-          const index = arrayLength(ids);
-          index == arrayLength(path)
+          const index = size(ids);
+          index == size(path)
             ? listener(thing, ...ids, ...extraArgsGetter(ids))
             : isUndefined(path[index])
             ? arrayForEach(pathGetters[index]?.(...ids) ?? [], (id2) =>
@@ -1866,6 +1892,8 @@ const createStore = () => {
   let hasValuesSchema;
   let cellsTouched = false;
   let valuesTouched = false;
+  let hadTables = false;
+  let hadValues = false;
   let transactions = 0;
   const changedTableIds = mapNew();
   const changedTableCellIds = mapNew();
@@ -1886,20 +1914,27 @@ const createStore = () => {
   const tableCellIds = mapNew();
   const tablesMap = mapNew();
   const valuesMap = mapNew();
+  const hasTablesListeners = pairNewMap();
   const tablesListeners = pairNewMap();
   const tableIdsListeners = pairNewMap();
+  const hasTableListeners = pairNewMap();
   const tableListeners = pairNewMap();
   const tableCellIdsListeners = pairNewMap();
+  const hasTableCellListeners = pairNewMap();
   const rowCountListeners = pairNewMap();
   const rowIdsListeners = pairNewMap();
   const sortedRowIdsListeners = pairNewMap();
+  const hasRowListeners = pairNewMap();
   const rowListeners = pairNewMap();
   const cellIdsListeners = pairNewMap();
+  const hasCellListeners = pairNewMap();
   const cellListeners = pairNewMap();
   const invalidCellListeners = pairNewMap();
   const invalidValueListeners = pairNewMap();
+  const hasValuesListeners = pairNewMap();
   const valuesListeners = pairNewMap();
   const valueIdsListeners = pairNewMap();
+  const hasValueListeners = pairNewMap();
   const valueListeners = pairNewMap();
   const startTransactionListeners = mapNew();
   const finishTransactionListeners = pairNewMap();
@@ -2294,29 +2329,45 @@ const createStore = () => {
             ),
         )
       : 0;
-  const callIdsListenersIfChanged = (listeners, changedIds, ids) => {
+  const callIdsAndHasListenersIfChanged = (
+    changedIds,
+    idListeners,
+    hasListeners,
+    ids,
+  ) => {
     if (!collIsEmpty(changedIds)) {
-      callListeners(listeners, ids, () => mapToObj(changedIds));
+      callListeners(idListeners, ids, () => mapToObj(changedIds));
+      mapForEach(changedIds, (changedId, changed) =>
+        callListeners(hasListeners, [...(ids ?? []), changedId], changed == 1),
+      );
       return 1;
     }
   };
   const callTabularListenersForChanges = (mutator) => {
+    const hasTablesNow = hasTables();
+    if (hasTablesNow != hadTables) {
+      callListeners(hasTablesListeners[mutator], void 0, hasTablesNow);
+    }
     const emptySortedRowIdListeners = collIsEmpty(
       sortedRowIdsListeners[mutator],
     );
-    const emptyIdListeners =
+    const emptyIdAndHasListeners =
       collIsEmpty(cellIdsListeners[mutator]) &&
+      collIsEmpty(hasCellListeners[mutator]) &&
+      collIsEmpty(rowIdsListeners[mutator]) &&
+      collIsEmpty(hasRowListeners[mutator]) &&
       collIsEmpty(tableCellIdsListeners[mutator]) &&
+      collIsEmpty(hasTableCellListeners[mutator]) &&
       collIsEmpty(rowCountListeners[mutator]) &&
-      collIsEmpty(rowIdsListeners[mutator]) &&
       emptySortedRowIdListeners &&
-      collIsEmpty(tableIdsListeners[mutator]);
+      collIsEmpty(tableIdsListeners[mutator]) &&
+      collIsEmpty(hasTableListeners[mutator]);
     const emptyOtherListeners =
       collIsEmpty(cellListeners[mutator]) &&
       collIsEmpty(rowListeners[mutator]) &&
       collIsEmpty(tableListeners[mutator]) &&
       collIsEmpty(tablesListeners[mutator]);
-    if (!emptyIdListeners || !emptyOtherListeners) {
+    if (!emptyIdAndHasListeners || !emptyOtherListeners) {
       const changes = mutator
         ? [
             mapClone(changedTableIds),
@@ -2334,12 +2385,17 @@ const createStore = () => {
             changedCellIds,
             changedCells,
           ];
-      if (!emptyIdListeners) {
-        callIdsListenersIfChanged(tableIdsListeners[mutator], changes[0]);
+      if (!emptyIdAndHasListeners) {
+        callIdsAndHasListenersIfChanged(
+          changes[0],
+          tableIdsListeners[mutator],
+          hasTableListeners[mutator],
+        );
         collForEach(changes[1], (changedIds, tableId) =>
-          callIdsListenersIfChanged(
-            tableCellIdsListeners[mutator],
+          callIdsAndHasListenersIfChanged(
             changedIds,
+            tableCellIdsListeners[mutator],
+            hasTableCellListeners[mutator],
             [tableId],
           ),
         );
@@ -2355,9 +2411,12 @@ const createStore = () => {
         const calledSortableTableIds = setNew();
         collForEach(changes[3], (changedIds, tableId) => {
           if (
-            callIdsListenersIfChanged(rowIdsListeners[mutator], changedIds, [
-              tableId,
-            ]) &&
+            callIdsAndHasListenersIfChanged(
+              changedIds,
+              rowIdsListeners[mutator],
+              hasRowListeners[mutator],
+              [tableId],
+            ) &&
             !emptySortedRowIdListeners
           ) {
             callListeners(sortedRowIdsListeners[mutator], [tableId, null]);
@@ -2386,10 +2445,12 @@ const createStore = () => {
         }
         collForEach(changes[4], (rowCellIds, tableId) =>
           collForEach(rowCellIds, (changedIds, rowId) =>
-            callIdsListenersIfChanged(cellIdsListeners[mutator], changedIds, [
-              tableId,
-              rowId,
-            ]),
+            callIdsAndHasListenersIfChanged(
+              changedIds,
+              cellIdsListeners[mutator],
+              hasCellListeners[mutator],
+              [tableId, rowId],
+            ),
           ),
         );
       }
@@ -2429,17 +2490,27 @@ const createStore = () => {
       }
     }
   };
-  const callKeyedValuesListenersForChanges = (mutator) => {
-    const emptyIdListeners = collIsEmpty(valueIdsListeners[mutator]);
+  const callValuesListenersForChanges = (mutator) => {
+    const hasValuesNow = hasValues();
+    if (hasValuesNow != hadValues) {
+      callListeners(hasValuesListeners[mutator], void 0, hasValuesNow);
+    }
+    const emptyIdAndHasListeners =
+      collIsEmpty(valueIdsListeners[mutator]) &&
+      collIsEmpty(hasValueListeners[mutator]);
     const emptyOtherListeners =
       collIsEmpty(valueListeners[mutator]) &&
       collIsEmpty(valuesListeners[mutator]);
-    if (!emptyIdListeners || !emptyOtherListeners) {
+    if (!emptyIdAndHasListeners || !emptyOtherListeners) {
       const changes = mutator
         ? [mapClone(changedValueIds), mapClone(changedValues)]
         : [changedValueIds, changedValues];
-      if (!emptyIdListeners) {
-        callIdsListenersIfChanged(valueIdsListeners[mutator], changes[0]);
+      if (!emptyIdAndHasListeners) {
+        callIdsAndHasListenersIfChanged(
+          changes[0],
+          valueIdsListeners[mutator],
+          hasValueListeners[mutator],
+        );
       }
       if (!emptyOtherListeners) {
         let valuesChanged;
@@ -2812,7 +2883,7 @@ const createStore = () => {
         }
         callInvalidValueListeners(1);
         if (valuesTouched) {
-          callKeyedValuesListenersForChanges(1);
+          callValuesListenersForChanges(1);
         }
         if (doRollback?.(getTransactionChanges, getTransactionLog)) {
           collForEach(changedCells, (table, tableId) =>
@@ -2840,7 +2911,7 @@ const createStore = () => {
         }
         callInvalidValueListeners(0);
         if (valuesTouched) {
-          callKeyedValuesListenersForChanges(0);
+          callValuesListenersForChanges(0);
         }
         callListeners(
           finishTransactionListeners[1],
@@ -2850,6 +2921,8 @@ const createStore = () => {
         );
         transactions = 0;
         cellsTouched = valuesTouched = false;
+        hadTables = hasTables();
+        hadValues = hasValues();
         arrayForEach(
           [
             changedTableIds,
@@ -2946,19 +3019,26 @@ const createStore = () => {
     return store;
   };
   const getListenerStats = () => ({
+    hasTables: pairCollSize2(hasTablesListeners),
     tables: pairCollSize2(tablesListeners),
     tableIds: pairCollSize2(tableIdsListeners),
-    tableCellIds: pairCollSize2(tableCellIdsListeners),
+    hasTable: pairCollSize2(hasTableListeners),
     table: pairCollSize2(tableListeners),
+    tableCellIds: pairCollSize2(tableCellIdsListeners),
+    hasTableCell: pairCollSize2(hasTableCellListeners, collSize3),
     rowCount: pairCollSize2(rowCountListeners),
     rowIds: pairCollSize2(rowIdsListeners),
     sortedRowIds: pairCollSize2(sortedRowIdsListeners),
+    hasRow: pairCollSize2(hasRowListeners, collSize3),
     row: pairCollSize2(rowListeners, collSize3),
     cellIds: pairCollSize2(cellIdsListeners, collSize3),
+    hasCell: pairCollSize2(hasCellListeners, collSize4),
     cell: pairCollSize2(cellListeners, collSize4),
     invalidCell: pairCollSize2(invalidCellListeners, collSize4),
+    hasValues: pairCollSize2(hasValuesListeners),
     values: pairCollSize2(valuesListeners),
     valueIds: pairCollSize2(valueIdsListeners),
+    hasValue: pairCollSize2(hasValueListeners),
     value: pairCollSize2(valueListeners),
     invalidValue: pairCollSize2(invalidValueListeners),
     transaction:
@@ -3043,14 +3123,39 @@ const createStore = () => {
   };
   objMap(
     {
+      [HAS + TABLES]: [0, hasTablesListeners, [], () => [hasTables()]],
       [TABLES]: [0, tablesListeners],
       [TABLE_IDS]: [0, tableIdsListeners],
+      [HAS + TABLE]: [
+        1,
+        hasTableListeners,
+        [getTableIds],
+        (ids) => [hasTable(...ids)],
+      ],
       [TABLE]: [1, tableListeners, [getTableIds]],
       [TABLE + CELL_IDS]: [1, tableCellIdsListeners, [getTableIds]],
+      [HAS + TABLE + CELL]: [
+        2,
+        hasTableCellListeners,
+        [getTableIds, getTableCellIds],
+        (ids) => [hasTableCell(...ids)],
+      ],
       [ROW_COUNT]: [1, rowCountListeners, [getTableIds]],
       [ROW_IDS]: [1, rowIdsListeners, [getTableIds]],
+      [HAS + ROW]: [
+        2,
+        hasRowListeners,
+        [getTableIds, getRowIds],
+        (ids) => [hasRow(...ids)],
+      ],
       [ROW]: [2, rowListeners, [getTableIds, getRowIds]],
       [CELL_IDS]: [2, cellIdsListeners, [getTableIds, getRowIds]],
+      [HAS + CELL]: [
+        3,
+        hasCellListeners,
+        [getTableIds, getRowIds, getCellIds],
+        (ids) => [hasCell(...ids)],
+      ],
       [CELL]: [
         3,
         cellListeners,
@@ -3058,8 +3163,15 @@ const createStore = () => {
         (ids) => pairNew(getCell(...ids)),
       ],
       InvalidCell: [3, invalidCellListeners],
+      [HAS + VALUES]: [0, hasValuesListeners, [], () => [hasValues()]],
       [VALUES]: [0, valuesListeners],
       [VALUE_IDS]: [0, valueIdsListeners],
+      [HAS + VALUE]: [
+        1,
+        hasValueListeners,
+        [getValueIds],
+        (ids) => [hasValue(...ids)],
+      ],
       [VALUE]: [
         1,
         valueListeners,