tinybase 8.1.0-beta.3 → 8.1.0-beta.4

package/ui-svelte/with-schemas/index.js

@@ -1,6 +1,7 @@
 import {getContext, setContext, untrack} from 'svelte';
 import * as $ from 'svelte/internal/client';
 import 'svelte/internal/disclose-version';
+import {createSubscriber} from 'svelte/reactivity';
 
 const getTypeOf = (thing) => typeof thing;
 const TINYBASE = 'tinybase';
@@ -44,10 +45,13 @@ const getIfNotFunction = (predicate) => (value, then, otherwise) =>
     ? /* istanbul ignore next */
       otherwise?.()
     : then(value);
+const GLOBAL = globalThis;
 const isUndefined = (thing) => thing === void 0;
+const hasWindow = () => !isUndefined(GLOBAL.window);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
+const noop = () => {};
 
 const object = Object;
 const objIds = object.keys;
@@ -55,7 +59,40 @@ const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 
 const TINYBASE_CONTEXT_KEY = TINYBASE + '_uisc';
 
-/* hooks.svelte.ts generated by Svelte v5.54.0 */
+/* functions.svelte.ts generated by Svelte v5.55.1 */
+
+class ReactiveHandle {
+  #get;
+  #sub;
+
+  constructor(getCurrent, subscribe) {
+    this.#get = getCurrent;
+    this.#sub = subscribe;
+  }
+
+  get current() {
+    this.#sub();
+
+    return this.#get();
+  }
+}
+
+class WritableHandle extends ReactiveHandle {
+  #set;
+
+  constructor(getCurrent, setCurrent, subscribe) {
+    super(getCurrent, subscribe);
+    this.#set = setCurrent;
+  }
+
+  get current() {
+    return super.current;
+  }
+
+  set current(value) {
+    this.#set(value);
+  }
+}
 
 const EMPTY_ARR = [];
 const EMPTY_OBJ = {};
@@ -78,10 +115,10 @@ const getThing = (contextValue, thingOrThingId, offset) =>
       ? objGet(contextValue[offset * 2 + 1], thingOrThingId)
       : thingOrThingId;
 
-const useThing = (thingOrThingId, offset) =>
+const getProvidedThing = (thingOrThingId, offset) =>
   getThing(getContextValue(), thingOrThingId, offset);
 
-const useThingOrThingById = (thingOrThingId, offset) => {
+const resolveProvidedThing = (thingOrThingId, offset) => {
   const contextValue = getContextValue();
 
   return () => getThing(contextValue, maybeGet(thingOrThingId), offset);
@@ -90,66 +127,65 @@ const useThingOrThingById = (thingOrThingId, offset) => {
 const getThingIds = (contextValue, offset) =>
   objIds(contextValue[offset * 2 + 1] ?? EMPTY_OBJ);
 
-const useStoreOrStoreById = (storeOrStoreId) =>
-  useThingOrThingById(storeOrStoreId, OFFSET_STORE);
-const useMetricsOrMetricsById = (metricsOrMetricsId) =>
-  useThingOrThingById(metricsOrMetricsId, OFFSET_METRICS);
-const useIndexesOrIndexesById = (indexesOrIndexesId) =>
-  useThingOrThingById(indexesOrIndexesId, OFFSET_INDEXES);
-const useRelationshipsOrRelationshipsById = (relationshipsOrRelationshipsId) =>
-  useThingOrThingById(relationshipsOrRelationshipsId, OFFSET_RELATIONSHIPS);
-const useQueriesOrQueriesById = (queriesOrQueriesId) =>
-  useThingOrThingById(queriesOrQueriesId, OFFSET_QUERIES);
-const useCheckpointsOrCheckpointsById = (checkpointsOrCheckpointsId) =>
-  useThingOrThingById(checkpointsOrCheckpointsId, OFFSET_CHECKPOINTS);
-const usePersisterOrPersisterById = (persisterOrPersisterId) =>
-  useThingOrThingById(persisterOrPersisterId, OFFSET_PERSISTER);
-const useSynchronizerOrSynchronizerById = (synchronizerOrSynchronizerId) =>
-  useThingOrThingById(synchronizerOrSynchronizerId, OFFSET_SYNCHRONIZER);
-
-const useListenable = (
+const resolveStore = (storeOrStoreId) =>
+  resolveProvidedThing(storeOrStoreId, OFFSET_STORE);
+const resolveMetrics = (metricsOrMetricsId) =>
+  resolveProvidedThing(metricsOrMetricsId, OFFSET_METRICS);
+const resolveIndexes = (indexesOrIndexesId) =>
+  resolveProvidedThing(indexesOrIndexesId, OFFSET_INDEXES);
+const resolveRelationships = (relationshipsOrRelationshipsId) =>
+  resolveProvidedThing(relationshipsOrRelationshipsId, OFFSET_RELATIONSHIPS);
+const resolveQueries = (queriesOrQueriesId) =>
+  resolveProvidedThing(queriesOrQueriesId, OFFSET_QUERIES);
+const resolveCheckpoints = (checkpointsOrCheckpointsId) =>
+  resolveProvidedThing(checkpointsOrCheckpointsId, OFFSET_CHECKPOINTS);
+const resolvePersister = (persisterOrPersisterId) =>
+  resolveProvidedThing(persisterOrPersisterId, OFFSET_PERSISTER);
+const resolveSynchronizer = (synchronizerOrSynchronizerId) =>
+  resolveProvidedThing(synchronizerOrSynchronizerId, OFFSET_SYNCHRONIZER);
+
+const createListenable = (
   getThing2,
   listenable,
   defaultValue,
   getArgs = () => EMPTY_ARR,
   isHas,
 ) => {
-  const getMethod = (isHas ? _HAS : GET) + listenable;
-  const addMethod = ADD + (isHas ? HAS : '') + listenable + LISTENER;
-  let value = $.state(
-    $.proxy(getThing2()?.[getMethod]?.(...getArgs()) ?? defaultValue),
-  );
+  const getListenableMethod = (isHas ? _HAS : GET) + listenable;
+  const addListenableMethod = ADD + (isHas ? HAS : '') + listenable + LISTENER;
+  let subscribe = $.state($.proxy(noop));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       const thing = getThing2();
       const args = getArgs();
 
-      $.set(value, thing?.[getMethod]?.(...args) ?? defaultValue, true);
-
-      const listenerId = thing?.[addMethod]?.(...args, () => {
-        $.set(value, thing[getMethod](...getArgs()) ?? defaultValue, true);
-      });
+      $.set(
+        subscribe,
+        createSubscriber((update) => {
+          const listenerId = thing?.[addListenableMethod]?.(...args, update);
 
-      return () => thing?.delListener?.(listenerId);
+          return () => thing?.delListener?.(listenerId);
+        }),
+        true,
+      );
     });
   }
 
-  return {
-    get current() {
-      return $.get(value);
-    },
-  };
+  return new ReactiveHandle(
+    () => getThing2()?.[getListenableMethod]?.(...getArgs()) ?? defaultValue,
+    () => $.get(subscribe)(),
+  );
 };
 
-const useListener = (
+const addListenerEffect = (
   getThing2,
   listenable,
   listener,
   getPreArgs = () => EMPTY_ARR,
   mutator,
 ) => {
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       const thing = getThing2();
       const preArgs = getPreArgs();
@@ -164,55 +200,55 @@ const useListener = (
   }
 };
 
-const useHasTables = (storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createHasTables = (storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     TABLES,
     false,
     () => EMPTY_ARR,
     1,
   );
-const useTables = (storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), TABLES, EMPTY_OBJ);
-const useTableIds = (storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), TABLE_IDS, EMPTY_ARR);
-const useHasTable = (tableId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createTables = (storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), TABLES, EMPTY_OBJ);
+const createTableIds = (storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), TABLE_IDS, EMPTY_ARR);
+const createHasTable = (tableId, storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     TABLE,
     false,
     () => [maybeGet(tableId)],
     1,
   );
-const useTable = (tableId, storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), TABLE, EMPTY_OBJ, () => [
+const createTable = (tableId, storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), TABLE, EMPTY_OBJ, () => [
     maybeGet(tableId),
   ]);
-const useTableCellIds = (tableId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createTableCellIds = (tableId, storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     TABLE + CELL_IDS,
     EMPTY_ARR,
     () => [maybeGet(tableId)],
   );
-const useHasTableCell = (tableId, cellId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createHasTableCell = (tableId, cellId, storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     TABLE + CELL,
     false,
     () => [maybeGet(tableId), maybeGet(cellId)],
     1,
   );
-const useRowCount = (tableId, storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), ROW_COUNT, 0, () => [
+const createRowCount = (tableId, storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), ROW_COUNT, 0, () => [
     maybeGet(tableId),
   ]);
-const useRowIds = (tableId, storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), ROW_IDS, EMPTY_ARR, () => [
+const createRowIds = (tableId, storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), ROW_IDS, EMPTY_ARR, () => [
     maybeGet(tableId),
   ]);
 
-const useSortedRowIds = (
+const createSortedRowIds = (
   tableId,
   cellId,
   descending = false,
@@ -220,8 +256,8 @@ const useSortedRowIds = (
   limit,
   storeOrStoreId,
 ) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+  createListenable(
+    resolveStore(storeOrStoreId),
     SORTED_ROW_IDS,
     EMPTY_ARR,
     () => [
@@ -233,144 +269,135 @@ const useSortedRowIds = (
     ],
   );
 
-const useHasRow = (tableId, rowId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createHasRow = (tableId, rowId, storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     ROW,
     false,
     () => [maybeGet(tableId), maybeGet(rowId)],
     1,
   );
-const useRow = (tableId, rowId, storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), ROW, EMPTY_OBJ, () => [
+const createRow = (tableId, rowId, storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), ROW, EMPTY_OBJ, () => [
     maybeGet(tableId),
     maybeGet(rowId),
   ]);
-const useCellIds = (tableId, rowId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
-    CELL_IDS,
-    EMPTY_ARR,
-    () => [maybeGet(tableId), maybeGet(rowId)],
-  );
-const useHasCell = (tableId, rowId, cellId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createCellIds = (tableId, rowId, storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), CELL_IDS, EMPTY_ARR, () => [
+    maybeGet(tableId),
+    maybeGet(rowId),
+  ]);
+const createHasCell = (tableId, rowId, cellId, storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     CELL,
     false,
     () => [maybeGet(tableId), maybeGet(rowId), maybeGet(cellId)],
     1,
   );
-const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), CELL, void 0, () => [
-    maybeGet(tableId),
-    maybeGet(rowId),
-    maybeGet(cellId),
-  ]);
 
-const useBindableCell = (tableId, rowId, cellId, storeOrStoreId) => {
-  const getS = useStoreOrStoreById(storeOrStoreId);
-  let value = $.state(
-    $.proxy(
-      getS()?.getCell(maybeGet(tableId), maybeGet(rowId), maybeGet(cellId)),
-    ),
-  );
+const createCell = (tableId, rowId, cellId, storeOrStoreId) => {
+  const getStore2 = resolveStore(storeOrStoreId);
+  let subscribe = $.state($.proxy(noop));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
-      const s = getS();
-
-      const t = maybeGet(tableId),
-        r = maybeGet(rowId),
-        c = maybeGet(cellId);
-
-      $.set(value, s?.getCell(t, r, c), true);
-
-      const listenerId = s?.addCellListener(t, r, c, (st) => {
-        $.set(
-          value,
-          st.getCell(maybeGet(tableId), maybeGet(rowId), maybeGet(cellId)),
-          true,
-        );
-      });
+      const store = getStore2();
+      const tableIdValue = maybeGet(tableId);
+      const rowIdValue = maybeGet(rowId);
+      const cellIdValue = maybeGet(cellId);
+
+      $.set(
+        subscribe,
+        createSubscriber((update) => {
+          const listenerId = store?.addCellListener(
+            tableIdValue,
+            rowIdValue,
+            cellIdValue,
+            update,
+          );
 
-      return () => s?.delListener?.(listenerId);
+          return () => store?.delListener?.(listenerId);
+        }),
+        true,
+      );
     });
   }
 
-  return {
-    get current() {
-      return $.get(value);
-    },
-
-    set current(v) {
-      getS()?.setCell(maybeGet(tableId), maybeGet(rowId), maybeGet(cellId), v);
-    },
-  };
+  return new WritableHandle(
+    () =>
+      getStore2()?.getCell(
+        maybeGet(tableId),
+        maybeGet(rowId),
+        maybeGet(cellId),
+      ),
+    (nextCell) =>
+      getStore2()?.setCell(
+        maybeGet(tableId),
+        maybeGet(rowId),
+        maybeGet(cellId),
+        nextCell,
+      ),
+    () => $.get(subscribe)(),
+  );
 };
 
-const useHasValues = (storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createHasValues = (storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     VALUES,
     false,
     () => EMPTY_ARR,
     1,
   );
-const useValues = (storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), VALUES, EMPTY_OBJ);
-const useValueIds = (storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), VALUE_IDS, EMPTY_ARR);
-const useHasValue = (valueId, storeOrStoreId) =>
-  useListenable(
-    useStoreOrStoreById(storeOrStoreId),
+const createValues = (storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), VALUES, EMPTY_OBJ);
+const createValueIds = (storeOrStoreId) =>
+  createListenable(resolveStore(storeOrStoreId), VALUE_IDS, EMPTY_ARR);
+const createHasValue = (valueId, storeOrStoreId) =>
+  createListenable(
+    resolveStore(storeOrStoreId),
     VALUE,
     false,
     () => [maybeGet(valueId)],
     1,
   );
-const useValue = (valueId, storeOrStoreId) =>
-  useListenable(useStoreOrStoreById(storeOrStoreId), VALUE, void 0, () => [
-    maybeGet(valueId),
-  ]);
 
-const useBindableValue = (valueId, storeOrStoreId) => {
-  const getS = useStoreOrStoreById(storeOrStoreId);
-  let value = $.state($.proxy(getS()?.getValue(maybeGet(valueId))));
+const createValue = (valueId, storeOrStoreId) => {
+  const getStore2 = resolveStore(storeOrStoreId);
+  let subscribe = $.state($.proxy(noop));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
-      const s = getS();
-      const vid = maybeGet(valueId);
-
-      $.set(value, s?.getValue(vid), true);
+      const store = getStore2();
+      const valueIdValue = maybeGet(valueId);
 
-      const listenerId = s?.addValueListener(vid, (st) => {
-        $.set(value, st.getValue(maybeGet(valueId)), true);
-      });
+      $.set(
+        subscribe,
+        createSubscriber((update) => {
+          const listenerId = store?.addValueListener(valueIdValue, update);
 
-      return () => s?.delListener?.(listenerId);
+          return () => store?.delListener?.(listenerId);
+        }),
+        true,
+      );
     });
   }
 
-  return {
-    get current() {
-      return $.get(value);
-    },
-
-    set current(v) {
-      getS()?.setValue(maybeGet(valueId), v);
-    },
-  };
+  return new WritableHandle(
+    () => getStore2()?.getValue(maybeGet(valueId)),
+    (nextValue) => getStore2()?.setValue(maybeGet(valueId), nextValue),
+    () => $.get(subscribe)(),
+  );
 };
 
-const useStore = (id) => useThing(id, OFFSET_STORE);
+const getStore = (id) => getProvidedThing(id, OFFSET_STORE);
 
-const useStoreIds = () => {
+const createStoreIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_STORE)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_STORE), true);
     });
@@ -383,13 +410,13 @@ const useStoreIds = () => {
   };
 };
 
-const useMetrics = (id) => useThing(id, OFFSET_METRICS);
+const getMetrics = (id) => getProvidedThing(id, OFFSET_METRICS);
 
-const useMetricsIds = () => {
+const createMetricsIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_METRICS)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_METRICS), true);
     });
@@ -402,26 +429,19 @@ const useMetricsIds = () => {
   };
 };
 
-const useMetricIds = (metricsOrMetricsId) =>
-  useListenable(
-    useMetricsOrMetricsById(metricsOrMetricsId),
-    METRIC + IDS,
-    EMPTY_ARR,
-  );
-const useMetric = (metricId, metricsOrMetricsId) =>
-  useListenable(
-    useMetricsOrMetricsById(metricsOrMetricsId),
-    METRIC,
-    void 0,
-    () => [maybeGet(metricId)],
-  );
-const useIndexes = (id) => useThing(id, OFFSET_INDEXES);
+const createMetricIds = (metricsOrMetricsId) =>
+  createListenable(resolveMetrics(metricsOrMetricsId), METRIC + IDS, EMPTY_ARR);
+const createMetric = (metricId, metricsOrMetricsId) =>
+  createListenable(resolveMetrics(metricsOrMetricsId), METRIC, void 0, () => [
+    maybeGet(metricId),
+  ]);
+const getIndexes = (id) => getProvidedThing(id, OFFSET_INDEXES);
 
-const useIndexesIds = () => {
+const createIndexesIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_INDEXES)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_INDEXES), true);
     });
@@ -434,48 +454,44 @@ const useIndexesIds = () => {
   };
 };
 
-const useIndexIds = (indexesOrIndexesId) =>
-  useListenable(
-    useIndexesOrIndexesById(indexesOrIndexesId),
-    INDEX + IDS,
-    EMPTY_ARR,
-  );
-const useSliceIds = (indexId, indexesOrIndexesId) =>
-  useListenable(
-    useIndexesOrIndexesById(indexesOrIndexesId),
+const createIndexIds = (indexesOrIndexesId) =>
+  createListenable(resolveIndexes(indexesOrIndexesId), INDEX + IDS, EMPTY_ARR);
+const createSliceIds = (indexId, indexesOrIndexesId) =>
+  createListenable(
+    resolveIndexes(indexesOrIndexesId),
     SLICE + IDS,
     EMPTY_ARR,
     () => [maybeGet(indexId)],
   );
-const useSliceRowIds = (indexId, sliceId, indexesOrIndexesId) =>
-  useListenable(
-    useIndexesOrIndexesById(indexesOrIndexesId),
+const createSliceRowIds = (indexId, sliceId, indexesOrIndexesId) =>
+  createListenable(
+    resolveIndexes(indexesOrIndexesId),
     SLICE + ROW_IDS,
     EMPTY_ARR,
     () => [maybeGet(indexId), maybeGet(sliceId)],
   );
 
-const useIndexStoreTableId = (indexesOrId, indexId) => {
-  const getI = useIndexesOrIndexesById(indexesOrId);
+const getIndexStoreTableId = (indexesOrId, indexId) => {
+  const getIndexes2 = resolveIndexes(indexesOrId);
 
   return {
     get store() {
-      return getI()?.getStore();
+      return getIndexes2()?.getStore();
     },
 
     get tableId() {
-      return getI()?.getTableId(maybeGet(indexId));
+      return getIndexes2()?.getTableId(maybeGet(indexId));
     },
   };
 };
 
-const useQueries = (id) => useThing(id, OFFSET_QUERIES);
+const getQueries = (id) => getProvidedThing(id, OFFSET_QUERIES);
 
-const useQueriesIds = () => {
+const createQueriesIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_QUERIES)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_QUERIES), true);
     });
@@ -488,42 +504,38 @@ const useQueriesIds = () => {
   };
 };
 
-const useQueryIds = (queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
-    QUERY + IDS,
-    EMPTY_ARR,
-  );
-const useResultTable = (queryId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createQueryIds = (queriesOrQueriesId) =>
+  createListenable(resolveQueries(queriesOrQueriesId), QUERY + IDS, EMPTY_ARR);
+const createResultTable = (queryId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + TABLE,
     EMPTY_OBJ,
     () => [maybeGet(queryId)],
   );
-const useResultTableCellIds = (queryId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createResultTableCellIds = (queryId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + TABLE + CELL_IDS,
     EMPTY_ARR,
     () => [maybeGet(queryId)],
   );
-const useResultRowCount = (queryId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createResultRowCount = (queryId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + ROW_COUNT,
     0,
     () => [maybeGet(queryId)],
   );
-const useResultRowIds = (queryId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createResultRowIds = (queryId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + ROW_IDS,
     EMPTY_ARR,
     () => [maybeGet(queryId)],
   );
 
-const useResultSortedRowIds = (
+const createResultSortedRowIds = (
   queryId,
   cellId,
   descending = false,
@@ -531,8 +543,8 @@ const useResultSortedRowIds = (
   limit,
   queriesOrQueriesId,
 ) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + SORTED_ROW_IDS,
     EMPTY_ARR,
     () => [
@@ -544,34 +556,34 @@ const useResultSortedRowIds = (
     ],
   );
 
-const useResultRow = (queryId, rowId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createResultRow = (queryId, rowId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + ROW,
     EMPTY_OBJ,
     () => [maybeGet(queryId), maybeGet(rowId)],
   );
-const useResultCellIds = (queryId, rowId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createResultCellIds = (queryId, rowId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + CELL_IDS,
     EMPTY_ARR,
     () => [maybeGet(queryId), maybeGet(rowId)],
   );
-const useResultCell = (queryId, rowId, cellId, queriesOrQueriesId) =>
-  useListenable(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const createResultCell = (queryId, rowId, cellId, queriesOrQueriesId) =>
+  createListenable(
+    resolveQueries(queriesOrQueriesId),
     RESULT + CELL,
     void 0,
     () => [maybeGet(queryId), maybeGet(rowId), maybeGet(cellId)],
   );
-const useRelationships = (id) => useThing(id, OFFSET_RELATIONSHIPS);
+const getRelationships = (id) => getProvidedThing(id, OFFSET_RELATIONSHIPS);
 
-const useRelationshipsIds = () => {
+const createRelationshipsIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_RELATIONSHIPS)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_RELATIONSHIPS), true);
     });
@@ -584,71 +596,71 @@ const useRelationshipsIds = () => {
   };
 };
 
-const useRelationshipIds = (relationshipsOrRelationshipsId) =>
-  useListenable(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+const createRelationshipIds = (relationshipsOrRelationshipsId) =>
+  createListenable(
+    resolveRelationships(relationshipsOrRelationshipsId),
     RELATIONSHIP + IDS,
     EMPTY_ARR,
   );
-const useRemoteRowId = (
+const createRemoteRowId = (
   relationshipId,
   localRowId,
   relationshipsOrRelationshipsId,
 ) =>
-  useListenable(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+  createListenable(
+    resolveRelationships(relationshipsOrRelationshipsId),
     REMOTE_ROW_ID,
     void 0,
     () => [maybeGet(relationshipId), maybeGet(localRowId)],
   );
-const useLocalRowIds = (
+const createLocalRowIds = (
   relationshipId,
   remoteRowId,
   relationshipsOrRelationshipsId,
 ) =>
-  useListenable(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+  createListenable(
+    resolveRelationships(relationshipsOrRelationshipsId),
     LOCAL + ROW_IDS,
     EMPTY_ARR,
     () => [maybeGet(relationshipId), maybeGet(remoteRowId)],
   );
-const useLinkedRowIds = (
+const createLinkedRowIds = (
   relationshipId,
   firstRowId,
   relationshipsOrRelationshipsId,
 ) =>
-  useListenable(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+  createListenable(
+    resolveRelationships(relationshipsOrRelationshipsId),
     LINKED + ROW_IDS,
     EMPTY_ARR,
     () => [maybeGet(relationshipId), maybeGet(firstRowId)],
   );
 
-const useRelationshipsStoreTableIds = (relationshipsOrId, relationshipId) => {
-  const getR = useRelationshipsOrRelationshipsById(relationshipsOrId);
+const getRelationshipsStoreTableIds = (relationshipsOrId, relationshipId) => {
+  const getRelationships2 = resolveRelationships(relationshipsOrId);
 
   return {
     get store() {
-      return getR()?.getStore();
+      return getRelationships2()?.getStore();
     },
 
     get localTableId() {
-      return getR()?.getLocalTableId(maybeGet(relationshipId));
+      return getRelationships2()?.getLocalTableId(maybeGet(relationshipId));
     },
 
     get remoteTableId() {
-      return getR()?.getRemoteTableId(maybeGet(relationshipId));
+      return getRelationships2()?.getRemoteTableId(maybeGet(relationshipId));
     },
   };
 };
 
-const useCheckpoints = (id) => useThing(id, OFFSET_CHECKPOINTS);
+const getCheckpoints = (id) => getProvidedThing(id, OFFSET_CHECKPOINTS);
 
-const useCheckpointsIds = () => {
+const createCheckpointsIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_CHECKPOINTS)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_CHECKPOINTS), true);
     });
@@ -661,39 +673,39 @@ const useCheckpointsIds = () => {
   };
 };
 
-const useCheckpointIds = (checkpointsOrCheckpointsId) =>
-  useListenable(
-    useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
+const createCheckpointIds = (checkpointsOrCheckpointsId) =>
+  createListenable(
+    resolveCheckpoints(checkpointsOrCheckpointsId),
     CHECKPOINT + IDS,
     DEFAULT_CHECKPOINT_IDS,
   );
-const useCheckpoint = (checkpointId, checkpointsOrCheckpointsId) =>
-  useListenable(
-    useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
+const createCheckpoint = (checkpointId, checkpointsOrCheckpointsId) =>
+  createListenable(
+    resolveCheckpoints(checkpointsOrCheckpointsId),
     CHECKPOINT,
     void 0,
     () => [maybeGet(checkpointId)],
   );
 
-const useGoBackwardCallback = (checkpointsOrCheckpointsId) => {
-  const getC = useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId);
+const createGoBackwardCallback = (checkpointsOrCheckpointsId) => {
+  const getCheckpoints2 = resolveCheckpoints(checkpointsOrCheckpointsId);
 
-  return () => getC()?.goBackward();
+  return () => getCheckpoints2()?.goBackward();
 };
 
-const useGoForwardCallback = (checkpointsOrCheckpointsId) => {
-  const getC = useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId);
+const createGoForwardCallback = (checkpointsOrCheckpointsId) => {
+  const getCheckpoints2 = resolveCheckpoints(checkpointsOrCheckpointsId);
 
-  return () => getC()?.goForward();
+  return () => getCheckpoints2()?.goForward();
 };
 
-const usePersister = (id) => useThing(id, OFFSET_PERSISTER);
+const getPersister = (id) => getProvidedThing(id, OFFSET_PERSISTER);
 
-const usePersisterIds = () => {
+const createPersisterIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_PERSISTER)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_PERSISTER), true);
     });
@@ -706,15 +718,15 @@ const usePersisterIds = () => {
   };
 };
 
-const usePersisterStatus = (persisterOrPersisterId) =>
-  useListenable(usePersisterOrPersisterById(persisterOrPersisterId), STATUS, 0);
-const useSynchronizer = (id) => useThing(id, OFFSET_SYNCHRONIZER);
+const createPersisterStatus = (persisterOrPersisterId) =>
+  createListenable(resolvePersister(persisterOrPersisterId), STATUS, 0);
+const getSynchronizer = (id) => getProvidedThing(id, OFFSET_SYNCHRONIZER);
 
-const useSynchronizerIds = () => {
+const createSynchronizerIds = () => {
   const contextValue = getContextValue();
   let ids = $.state($.proxy(getThingIds(contextValue, OFFSET_SYNCHRONIZER)));
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       $.set(ids, getThingIds(contextValue, OFFSET_SYNCHRONIZER), true);
     });
@@ -727,92 +739,86 @@ const useSynchronizerIds = () => {
   };
 };
 
-const useSynchronizerStatus = (synchronizerOrSynchronizerId) =>
-  useListenable(
-    useSynchronizerOrSynchronizerById(synchronizerOrSynchronizerId),
+const createSynchronizerStatus = (synchronizerOrSynchronizerId) =>
+  createListenable(
+    resolveSynchronizer(synchronizerOrSynchronizerId),
     STATUS,
     0,
   );
-const useHasTablesListener = (listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasTables = (listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + TABLES,
     listener,
     () => EMPTY_ARR,
     mutator,
   );
-const useTablesListener = (listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onTables = (listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     TABLES,
     listener,
     () => EMPTY_ARR,
     mutator,
   );
-const useTableIdsListener = (listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onTableIds = (listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     TABLE_IDS,
     listener,
     () => EMPTY_ARR,
     mutator,
   );
-const useHasTableListener = (tableId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasTable = (tableId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + TABLE,
     listener,
     () => [maybeGet(tableId)],
     mutator,
   );
-const useTableListener = (tableId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onTable = (tableId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     TABLE,
     listener,
     () => [maybeGet(tableId)],
     mutator,
   );
-const useTableCellIdsListener = (tableId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onTableCellIds = (tableId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     TABLE + CELL_IDS,
     listener,
     () => [maybeGet(tableId)],
     mutator,
   );
-const useHasTableCellListener = (
-  tableId,
-  cellId,
-  listener,
-  mutator,
-  storeOrStoreId,
-) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasTableCell = (tableId, cellId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + TABLE + CELL,
     listener,
     () => [maybeGet(tableId), maybeGet(cellId)],
     mutator,
   );
-const useRowCountListener = (tableId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onRowCount = (tableId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     ROW_COUNT,
     listener,
     () => [maybeGet(tableId)],
     mutator,
   );
-const useRowIdsListener = (tableId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onRowIds = (tableId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     ROW_IDS,
     listener,
     () => [maybeGet(tableId)],
     mutator,
   );
 
-const useSortedRowIdsListener = (
+const onSortedRowIds = (
   tableId,
   cellId,
   descending,
@@ -822,8 +828,8 @@ const useSortedRowIdsListener = (
   mutator,
   storeOrStoreId,
 ) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     SORTED_ROW_IDS,
     listener,
     () => [
@@ -836,220 +842,195 @@ const useSortedRowIdsListener = (
     mutator,
   );
 
-const useHasRowListener = (tableId, rowId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasRow = (tableId, rowId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + ROW,
     listener,
     () => [maybeGet(tableId), maybeGet(rowId)],
     mutator,
   );
-const useRowListener = (tableId, rowId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onRow = (tableId, rowId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     ROW,
     listener,
     () => [maybeGet(tableId), maybeGet(rowId)],
     mutator,
   );
-const useCellIdsListener = (
-  tableId,
-  rowId,
-  listener,
-  mutator,
-  storeOrStoreId,
-) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onCellIds = (tableId, rowId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     CELL_IDS,
     listener,
     () => [maybeGet(tableId), maybeGet(rowId)],
     mutator,
   );
-const useHasCellListener = (
-  tableId,
-  rowId,
-  cellId,
-  listener,
-  mutator,
-  storeOrStoreId,
-) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasCell = (tableId, rowId, cellId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + CELL,
     listener,
     () => [maybeGet(tableId), maybeGet(rowId), maybeGet(cellId)],
     mutator,
   );
-const useCellListener = (
-  tableId,
-  rowId,
-  cellId,
-  listener,
-  mutator,
-  storeOrStoreId,
-) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onCell = (tableId, rowId, cellId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     CELL,
     listener,
     () => [maybeGet(tableId), maybeGet(rowId), maybeGet(cellId)],
     mutator,
   );
-const useHasValuesListener = (listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasValues = (listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + VALUES,
     listener,
     () => EMPTY_ARR,
     mutator,
   );
-const useValuesListener = (listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onValues = (listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     VALUES,
     listener,
     () => EMPTY_ARR,
     mutator,
   );
-const useValueIdsListener = (listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onValueIds = (listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     VALUE_IDS,
     listener,
     () => EMPTY_ARR,
     mutator,
   );
-const useHasValueListener = (valueId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onHasValue = (valueId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     HAS + VALUE,
     listener,
     () => [maybeGet(valueId)],
     mutator,
   );
-const useValueListener = (valueId, listener, mutator, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onValue = (valueId, listener, mutator, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     VALUE,
     listener,
     () => [maybeGet(valueId)],
     mutator,
   );
-const useStartTransactionListener = (listener, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onStartTransaction = (listener, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     'Start' + TRANSACTION,
     listener,
   );
-const useWillFinishTransactionListener = (listener, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onWillFinishTransaction = (listener, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     'Will' + FINISH + TRANSACTION,
     listener,
   );
-const useDidFinishTransactionListener = (listener, storeOrStoreId) =>
-  useListener(
-    useStoreOrStoreById(storeOrStoreId),
+const onDidFinishTransaction = (listener, storeOrStoreId) =>
+  addListenerEffect(
+    resolveStore(storeOrStoreId),
     'Did' + FINISH + TRANSACTION,
     listener,
   );
-const useMetricListener = (metricId, listener, metricsOrMetricsId) =>
-  useListener(
-    useMetricsOrMetricsById(metricsOrMetricsId),
+const onMetric = (metricId, listener, metricsOrMetricsId) =>
+  addListenerEffect(
+    resolveMetrics(metricsOrMetricsId),
     METRIC,
     listener,
     () => [maybeGet(metricId)],
   );
-const useSliceIdsListener = (indexId, listener, indexesOrIndexesId) =>
-  useListener(
-    useIndexesOrIndexesById(indexesOrIndexesId),
+const onSliceIds = (indexId, listener, indexesOrIndexesId) =>
+  addListenerEffect(
+    resolveIndexes(indexesOrIndexesId),
     SLICE + IDS,
     listener,
     () => [maybeGet(indexId)],
   );
-const useSliceRowIdsListener = (
-  indexId,
-  sliceId,
-  listener,
-  indexesOrIndexesId,
-) =>
-  useListener(
-    useIndexesOrIndexesById(indexesOrIndexesId),
+const onSliceRowIds = (indexId, sliceId, listener, indexesOrIndexesId) =>
+  addListenerEffect(
+    resolveIndexes(indexesOrIndexesId),
     SLICE + ROW_IDS,
     listener,
     () => [maybeGet(indexId), maybeGet(sliceId)],
   );
 
-const useRemoteRowIdListener = (
+const onRemoteRowId = (
   relationshipId,
   localRowId,
   listener,
   relationshipsOrRelationshipsId,
 ) =>
-  useListener(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+  addListenerEffect(
+    resolveRelationships(relationshipsOrRelationshipsId),
     REMOTE_ROW_ID,
     listener,
     () => [maybeGet(relationshipId), maybeGet(localRowId)],
   );
 
-const useLocalRowIdsListener = (
+const onLocalRowIds = (
   relationshipId,
   remoteRowId,
   listener,
   relationshipsOrRelationshipsId,
 ) =>
-  useListener(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+  addListenerEffect(
+    resolveRelationships(relationshipsOrRelationshipsId),
     LOCAL + ROW_IDS,
     listener,
     () => [maybeGet(relationshipId), maybeGet(remoteRowId)],
   );
 
-const useLinkedRowIdsListener = (
+const onLinkedRowIds = (
   relationshipId,
   firstRowId,
   listener,
   relationshipsOrRelationshipsId,
 ) =>
-  useListener(
-    useRelationshipsOrRelationshipsById(relationshipsOrRelationshipsId),
+  addListenerEffect(
+    resolveRelationships(relationshipsOrRelationshipsId),
     LINKED + ROW_IDS,
     listener,
     () => [maybeGet(relationshipId), maybeGet(firstRowId)],
   );
 
-const useResultTableListener = (queryId, listener, queriesOrQueriesId) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultTable = (queryId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + TABLE,
     listener,
     () => [maybeGet(queryId)],
   );
-const useResultTableCellIdsListener = (queryId, listener, queriesOrQueriesId) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultTableCellIds = (queryId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + TABLE + CELL_IDS,
     listener,
     () => [maybeGet(queryId)],
   );
-const useResultRowCountListener = (queryId, listener, queriesOrQueriesId) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultRowCount = (queryId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + ROW_COUNT,
     listener,
     () => [maybeGet(queryId)],
   );
-const useResultRowIdsListener = (queryId, listener, queriesOrQueriesId) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultRowIds = (queryId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + ROW_IDS,
     listener,
     () => [maybeGet(queryId)],
   );
 
-const useResultSortedRowIdsListener = (
+const onResultSortedRowIds = (
   queryId,
   cellId,
   descending,
@@ -1058,8 +1039,8 @@ const useResultSortedRowIdsListener = (
   listener,
   queriesOrQueriesId,
 ) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + SORTED_ROW_IDS,
     listener,
     () => [
@@ -1071,86 +1052,59 @@ const useResultSortedRowIdsListener = (
     ],
   );
 
-const useResultRowListener = (queryId, rowId, listener, queriesOrQueriesId) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultRow = (queryId, rowId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + ROW,
     listener,
     () => [maybeGet(queryId), maybeGet(rowId)],
   );
-const useResultCellIdsListener = (
-  queryId,
-  rowId,
-  listener,
-  queriesOrQueriesId,
-) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultCellIds = (queryId, rowId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + CELL_IDS,
     listener,
     () => [maybeGet(queryId), maybeGet(rowId)],
   );
-const useResultCellListener = (
-  queryId,
-  rowId,
-  cellId,
-  listener,
-  queriesOrQueriesId,
-) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onResultCell = (queryId, rowId, cellId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     RESULT + CELL,
     listener,
     () => [maybeGet(queryId), maybeGet(rowId), maybeGet(cellId)],
   );
-const useParamValuesListener = (queryId, listener, queriesOrQueriesId) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onParamValues = (queryId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     'ParamValues',
     listener,
     () => [maybeGet(queryId)],
   );
-const useParamValueListener = (
-  queryId,
-  paramId,
-  listener,
-  queriesOrQueriesId,
-) =>
-  useListener(
-    useQueriesOrQueriesById(queriesOrQueriesId),
+const onParamValue = (queryId, paramId, listener, queriesOrQueriesId) =>
+  addListenerEffect(
+    resolveQueries(queriesOrQueriesId),
     'ParamValue',
     listener,
     () => [maybeGet(queryId), maybeGet(paramId)],
   );
-const useCheckpointIdsListener = (listener, checkpointsOrCheckpointsId) =>
-  useListener(
-    useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
+const onCheckpointIds = (listener, checkpointsOrCheckpointsId) =>
+  addListenerEffect(
+    resolveCheckpoints(checkpointsOrCheckpointsId),
     CHECKPOINT + IDS,
     listener,
   );
-const useCheckpointListener = (
-  checkpointId,
-  listener,
-  checkpointsOrCheckpointsId,
-) =>
-  useListener(
-    useCheckpointsOrCheckpointsById(checkpointsOrCheckpointsId),
+const onCheckpoint = (checkpointId, listener, checkpointsOrCheckpointsId) =>
+  addListenerEffect(
+    resolveCheckpoints(checkpointsOrCheckpointsId),
     CHECKPOINT,
     listener,
     () => [maybeGet(checkpointId)],
   );
-const usePersisterStatusListener = (listener, persisterOrPersisterId) =>
-  useListener(
-    usePersisterOrPersisterById(persisterOrPersisterId),
-    STATUS,
-    listener,
-  );
-const useSynchronizerStatusListener = (
-  listener,
-  synchronizerOrSynchronizerId,
-) =>
-  useListener(
-    useSynchronizerOrSynchronizerById(synchronizerOrSynchronizerId),
+const onPersisterStatus = (listener, persisterOrPersisterId) =>
+  addListenerEffect(resolvePersister(persisterOrPersisterId), STATUS, listener);
+const onSynchronizerStatus = (listener, synchronizerOrSynchronizerId) =>
+  addListenerEffect(
+    resolveSynchronizer(synchronizerOrSynchronizerId),
     STATUS,
     listener,
   );
@@ -1158,7 +1112,7 @@ const useSynchronizerStatusListener = (
 const provideThing = (thingId, thing, offset) => {
   const contextValue = getContextValue();
 
-  if (typeof window !== 'undefined') {
+  if (hasWindow()) {
     $.user_effect(() => {
       contextValue[16]?.(offset, thingId, thing);
 
@@ -1187,7 +1141,7 @@ const provideSynchronizer = (synchronizerId, synchronizer) =>
 function CheckpointView($$anchor, $$props) {
   $.push($$props, true);
 
-  const checkpoint = useCheckpoint(
+  const checkpoint = createCheckpoint(
     () => $$props.checkpointId,
     () => $$props.checkpoints,
   );
@@ -1318,7 +1272,7 @@ function Wrap($$anchor, $$props) {
 function BackwardCheckpointsView($$anchor, $$props) {
   $.push($$props, true);
 
-  const checkpointIds = useCheckpointIds(() => $$props.checkpoints);
+  const checkpointIds = createCheckpointIds(() => $$props.checkpoints);
   const ids = $.derived(() => checkpointIds.current[0]);
 
   {
@@ -1365,7 +1319,7 @@ function BackwardCheckpointsView($$anchor, $$props) {
 function CellView($$anchor, $$props) {
   $.push($$props, true);
 
-  const cell = useCell(
+  const cell = createCell(
     () => $$props.tableId,
     () => $$props.rowId,
     () => $$props.cellId,
@@ -1389,7 +1343,7 @@ function CellView($$anchor, $$props) {
 function CurrentCheckpointView($$anchor, $$props) {
   $.push($$props, true);
 
-  const checkpointIds = useCheckpointIds(() => $$props.checkpoints);
+  const checkpointIds = createCheckpointIds(() => $$props.checkpoints);
   const currentId = $.derived(() => checkpointIds.current[1]);
   var fragment = $.comment();
   var node = $.first_child(fragment);
@@ -1451,7 +1405,7 @@ function CurrentCheckpointView($$anchor, $$props) {
 function ForwardCheckpointsView($$anchor, $$props) {
   $.push($$props, true);
 
-  const checkpointIds = useCheckpointIds(() => $$props.checkpoints);
+  const checkpointIds = createCheckpointIds(() => $$props.checkpoints);
   const ids = $.derived(() => checkpointIds.current[2]);
 
   {
@@ -1498,7 +1452,7 @@ function ForwardCheckpointsView($$anchor, $$props) {
 function RowView($$anchor, $$props) {
   $.push($$props, true);
 
-  const defaultCellIds = useCellIds(
+  const defaultCellIds = createCellIds(
     () => $$props.tableId,
     () => $$props.rowId,
     () => $$props.store,
@@ -1563,11 +1517,11 @@ function RowView($$anchor, $$props) {
 function SliceView($$anchor, $$props) {
   $.push($$props, true);
 
-  const {store, tableId} = useIndexStoreTableId(
+  const {store, tableId} = getIndexStoreTableId(
     () => $$props.indexes,
     () => $$props.indexId,
   );
-  const rowIds = useSliceRowIds(
+  const rowIds = createSliceRowIds(
     () => $$props.indexId,
     () => $$props.sliceId,
     () => $$props.indexes,
@@ -1638,7 +1592,7 @@ function SliceView($$anchor, $$props) {
 function IndexView($$anchor, $$props) {
   $.push($$props, true);
 
-  const sliceIds = useSliceIds(
+  const sliceIds = createSliceIds(
     () => $$props.indexId,
     () => $$props.indexes,
   );
@@ -1695,11 +1649,11 @@ function IndexView($$anchor, $$props) {
 function LinkedRowsView($$anchor, $$props) {
   $.push($$props, true);
 
-  const {store, localTableId} = useRelationshipsStoreTableIds(
+  const {store, localTableId} = getRelationshipsStoreTableIds(
     () => $$props.relationships,
     () => $$props.relationshipId,
   );
-  const rowIds = useLinkedRowIds(
+  const rowIds = createLinkedRowIds(
     () => $$props.relationshipId,
     () => $$props.firstRowId,
     () => $$props.relationships,
@@ -1770,11 +1724,11 @@ function LinkedRowsView($$anchor, $$props) {
 function LocalRowsView($$anchor, $$props) {
   $.push($$props, true);
 
-  const {store, localTableId} = useRelationshipsStoreTableIds(
+  const {store, localTableId} = getRelationshipsStoreTableIds(
     () => $$props.relationships,
     () => $$props.relationshipId,
   );
-  const rowIds = useLocalRowIds(
+  const rowIds = createLocalRowIds(
     () => $$props.relationshipId,
     () => $$props.remoteRowId,
     () => $$props.relationships,
@@ -1845,7 +1799,7 @@ function LocalRowsView($$anchor, $$props) {
 function MetricView($$anchor, $$props) {
   $.push($$props, true);
 
-  const metric = useMetric(
+  const metric = createMetric(
     () => $$props.metricId,
     () => $$props.metrics,
   );
@@ -1987,11 +1941,11 @@ var root = $.from_html(`<!><!><!>`, 1);
 function RemoteRowView($$anchor, $$props) {
   $.push($$props, true);
 
-  const {store, remoteTableId} = useRelationshipsStoreTableIds(
+  const {store, remoteTableId} = getRelationshipsStoreTableIds(
     () => $$props.relationships,
     () => $$props.relationshipId,
   );
-  const remoteRowId = useRemoteRowId(
+  const remoteRowId = createRemoteRowId(
     () => $$props.relationshipId,
     () => $$props.localRowId,
     () => $$props.relationships,
@@ -2092,7 +2046,7 @@ function RemoteRowView($$anchor, $$props) {
 function ResultCellView($$anchor, $$props) {
   $.push($$props, true);
 
-  const cell = useResultCell(
+  const cell = createResultCell(
     () => $$props.queryId,
     () => $$props.rowId,
     () => $$props.cellId,
@@ -2116,7 +2070,7 @@ function ResultCellView($$anchor, $$props) {
 function ResultRowView($$anchor, $$props) {
   $.push($$props, true);
 
-  const cellIds = useResultCellIds(
+  const cellIds = createResultCellIds(
     () => $$props.queryId,
     () => $$props.rowId,
     () => $$props.queries,
@@ -2178,7 +2132,7 @@ function ResultRowView($$anchor, $$props) {
 function ResultSortedTableView($$anchor, $$props) {
   $.push($$props, true);
 
-  const rowIds = useResultSortedRowIds(
+  const rowIds = createResultSortedRowIds(
     () => $$props.queryId,
     () => $$props.cellId,
     () => $$props.descending ?? false,
@@ -2239,7 +2193,7 @@ function ResultSortedTableView($$anchor, $$props) {
 function ResultTableView($$anchor, $$props) {
   $.push($$props, true);
 
-  const rowIds = useResultRowIds(
+  const rowIds = createResultRowIds(
     () => $$props.queryId,
     () => $$props.queries,
   );
@@ -2296,7 +2250,7 @@ function ResultTableView($$anchor, $$props) {
 function SortedTableView($$anchor, $$props) {
   $.push($$props, true);
 
-  const rowIds = useSortedRowIds(
+  const rowIds = createSortedRowIds(
     () => $$props.tableId,
     () => $$props.cellId,
     () => $$props.descending ?? false,
@@ -2361,7 +2315,7 @@ function SortedTableView($$anchor, $$props) {
 function TableView($$anchor, $$props) {
   $.push($$props, true);
 
-  const rowIds = useRowIds(
+  const rowIds = createRowIds(
     () => $$props.tableId,
     () => $$props.store,
   );
@@ -2422,7 +2376,7 @@ function TableView($$anchor, $$props) {
 function TablesView($$anchor, $$props) {
   $.push($$props, true);
 
-  const tableIds = useTableIds(() => $$props.store);
+  const tableIds = createTableIds(() => $$props.store);
 
   {
     const children = ($$anchor, tableId = $.noop) => {
@@ -2468,7 +2422,7 @@ function TablesView($$anchor, $$props) {
 function ValueView($$anchor, $$props) {
   $.push($$props, true);
 
-  const value = useValue(
+  const value = createValue(
     () => $$props.valueId,
     () => $$props.store,
   );
@@ -2492,7 +2446,7 @@ function ValueView($$anchor, $$props) {
 function ValuesView($$anchor, $$props) {
   $.push($$props, true);
 
-  const valueIds = useValueIds(() => $$props.store);
+  const valueIds = createValueIds(() => $$props.store);
 
   {
     const children = ($$anchor, valueId = $.noop) => {
@@ -2539,12 +2493,117 @@ export {
   BackwardCheckpointsView,
   CellView,
   CheckpointView,
+  createCell,
+  createCellIds,
+  createCheckpoint,
+  createCheckpointIds,
+  createCheckpointsIds,
+  createGoBackwardCallback,
+  createGoForwardCallback,
+  createHasCell,
+  createHasRow,
+  createHasTable,
+  createHasTableCell,
+  createHasTables,
+  createHasValue,
+  createHasValues,
+  createIndexesIds,
+  createIndexIds,
+  createLinkedRowIds,
+  createLocalRowIds,
+  createMetric,
+  createMetricIds,
+  createMetricsIds,
+  createPersisterIds,
+  createPersisterStatus,
+  createQueriesIds,
+  createQueryIds,
+  createRelationshipIds,
+  createRelationshipsIds,
+  createRemoteRowId,
+  createResultCell,
+  createResultCellIds,
+  createResultRow,
+  createResultRowCount,
+  createResultRowIds,
+  createResultSortedRowIds,
+  createResultTable,
+  createResultTableCellIds,
+  createRow,
+  createRowCount,
+  createRowIds,
+  createSliceIds,
+  createSliceRowIds,
+  createSortedRowIds,
+  createStoreIds,
+  createSynchronizerIds,
+  createSynchronizerStatus,
+  createTable,
+  createTableCellIds,
+  createTableIds,
+  createTables,
+  createValue,
+  createValueIds,
+  createValues,
   CurrentCheckpointView,
   ForwardCheckpointsView,
+  getCheckpoints,
+  getIndexes,
+  getIndexStoreTableId,
+  getMetrics,
+  getPersister,
+  getQueries,
+  getRelationships,
+  getRelationshipsStoreTableIds,
+  getStore,
+  getSynchronizer,
   IndexView,
   LinkedRowsView,
   LocalRowsView,
   MetricView,
+  onCell,
+  onCellIds,
+  onCheckpoint,
+  onCheckpointIds,
+  onDidFinishTransaction,
+  onHasCell,
+  onHasRow,
+  onHasTable,
+  onHasTableCell,
+  onHasTables,
+  onHasValue,
+  onHasValues,
+  onLinkedRowIds,
+  onLocalRowIds,
+  onMetric,
+  onParamValue,
+  onParamValues,
+  onPersisterStatus,
+  onRemoteRowId,
+  onResultCell,
+  onResultCellIds,
+  onResultRow,
+  onResultRowCount,
+  onResultRowIds,
+  onResultSortedRowIds,
+  onResultTable,
+  onResultTableCellIds,
+  onRow,
+  onRowCount,
+  onRowIds,
+  onSliceIds,
+  onSliceRowIds,
+  onSortedRowIds,
+  onStartTransaction,
+  onSynchronizerStatus,
+  onTable,
+  onTableCellIds,
+  onTableIds,
+  onTables,
+  onValue,
+  onValueIds,
+  onValues,
+  onWillFinishTransaction,
   provideCheckpoints,
   provideIndexes,
   provideMetrics,
@@ -2555,6 +2614,14 @@ export {
   provideStore,
   provideSynchronizer,
   RemoteRowView,
+  resolveCheckpoints,
+  resolveIndexes,
+  resolveMetrics,
+  resolvePersister,
+  resolveQueries,
+  resolveRelationships,
+  resolveStore,
+  resolveSynchronizer,
   ResultCellView,
   ResultRowView,
   ResultSortedTableView,
@@ -2564,121 +2631,6 @@ export {
   SortedTableView,
   TablesView,
   TableView,
-  useBindableCell,
-  useBindableValue,
-  useCell,
-  useCellIds,
-  useCellIdsListener,
-  useCellListener,
-  useCheckpoint,
-  useCheckpointIds,
-  useCheckpointIdsListener,
-  useCheckpointListener,
-  useCheckpoints,
-  useCheckpointsIds,
-  useCheckpointsOrCheckpointsById,
-  useDidFinishTransactionListener,
-  useGoBackwardCallback,
-  useGoForwardCallback,
-  useHasCell,
-  useHasCellListener,
-  useHasRow,
-  useHasRowListener,
-  useHasTable,
-  useHasTableCell,
-  useHasTableCellListener,
-  useHasTableListener,
-  useHasTables,
-  useHasTablesListener,
-  useHasValue,
-  useHasValueListener,
-  useHasValues,
-  useHasValuesListener,
-  useIndexes,
-  useIndexesIds,
-  useIndexesOrIndexesById,
-  useIndexIds,
-  useIndexStoreTableId,
-  useLinkedRowIds,
-  useLinkedRowIdsListener,
-  useLocalRowIds,
-  useLocalRowIdsListener,
-  useMetric,
-  useMetricIds,
-  useMetricListener,
-  useMetrics,
-  useMetricsIds,
-  useMetricsOrMetricsById,
-  useParamValueListener,
-  useParamValuesListener,
-  usePersister,
-  usePersisterIds,
-  usePersisterOrPersisterById,
-  usePersisterStatus,
-  usePersisterStatusListener,
-  useQueries,
-  useQueriesIds,
-  useQueriesOrQueriesById,
-  useQueryIds,
-  useRelationshipIds,
-  useRelationships,
-  useRelationshipsIds,
-  useRelationshipsOrRelationshipsById,
-  useRelationshipsStoreTableIds,
-  useRemoteRowId,
-  useRemoteRowIdListener,
-  useResultCell,
-  useResultCellIds,
-  useResultCellIdsListener,
-  useResultCellListener,
-  useResultRow,
-  useResultRowCount,
-  useResultRowCountListener,
-  useResultRowIds,
-  useResultRowIdsListener,
-  useResultRowListener,
-  useResultSortedRowIds,
-  useResultSortedRowIdsListener,
-  useResultTable,
-  useResultTableCellIds,
-  useResultTableCellIdsListener,
-  useResultTableListener,
-  useRow,
-  useRowCount,
-  useRowCountListener,
-  useRowIds,
-  useRowIdsListener,
-  useRowListener,
-  useSliceIds,
-  useSliceIdsListener,
-  useSliceRowIds,
-  useSliceRowIdsListener,
-  useSortedRowIds,
-  useSortedRowIdsListener,
-  useStartTransactionListener,
-  useStore,
-  useStoreIds,
-  useStoreOrStoreById,
-  useSynchronizer,
-  useSynchronizerIds,
-  useSynchronizerOrSynchronizerById,
-  useSynchronizerStatus,
-  useSynchronizerStatusListener,
-  useTable,
-  useTableCellIds,
-  useTableCellIdsListener,
-  useTableIds,
-  useTableIdsListener,
-  useTableListener,
-  useTables,
-  useTablesListener,
-  useValue,
-  useValueIds,
-  useValueIdsListener,
-  useValueListener,
-  useValues,
-  useValuesListener,
-  useWillFinishTransactionListener,
   ValuesView,
   ValueView,
 };